From ccb0be404c6a550eb57de04372ca8a95d9471c89 Mon Sep 17 00:00:00 2001
From: Don Richards <highlander411@gmail.com>
Date: Fri, 3 Nov 2023 10:35:55 -0400
Subject: [PATCH] Drupal Version Update

---
 .gitattributes                                |    16 +-
 composer.json                                 |    26 +-
 composer.lock                                 |   791 +-
 config/export/admin_toolbar.settings.yml      |     3 -
 .../export/admin_toolbar_search.settings.yml  |     3 -
 .../export/admin_toolbar_tools.settings.yml   |     5 -
 config/export/advanced_search.settings.yml    |    11 -
 config/export/automated_cron.settings.yml     |     3 -
 ...csl_style.american_medical_association.yml |   289 -
 .../export/bibcite.bibcite_csl_style.apa.yml  |  1581 --
 ....bibcite_csl_style.chicago_author_date.yml |   670 -
 ..._csl_style.modern_language_association.yml |   473 -
 ...odern_language_association_8th_edition.yml |   323 -
 config/export/bibcite.settings.yml            |     4 -
 ...ck.block.bootstrap_barrio_account_menu.yml |    27 -
 ...ock.block.bootstrap_barrio_breadcrumbs.yml |    22 -
 .../block.block.bootstrap_barrio_content.yml  |    22 -
 ...otstrap_barrio_creatorsandcontributors.yml |    37 -
 ...o_exposedformsolr_search_contentpage_1.yml |    25 -
 .../block.block.bootstrap_barrio_help.yml     |    22 -
 ...block.block.bootstrap_barrio_main_menu.yml |    27 -
 .../block.block.bootstrap_barrio_messages.yml |    22 -
 ...lock.block.bootstrap_barrio_page_title.yml |    20 -
 ...ck.block.bootstrap_barrio_physicalform.yml |    31 -
 .../block.block.bootstrap_barrio_powered.yml  |    22 -
 ...bootstrap_barrio_primary_admin_actions.yml |    20 -
 ...k.bootstrap_barrio_primary_local_tasks.yml |    22 -
 ...bootstrap_barrio_secondary_local_tasks.yml |    22 -
 ...k.block.bootstrap_barrio_site_branding.yml |    25 -
 .../block.block.bootstrap_barrio_subject.yml  |    31 -
 ...ock.block.bootstrap_barrio_subjectname.yml |    31 -
 ...block.block.bootstrap_barrio_syndicate.yml |    23 -
 ...block.bootstrap_barrio_temporalsubject.yml |    31 -
 .../export/block.block.claro_breadcrumbs.yml  |    22 -
 config/export/block.block.claro_content.yml   |    22 -
 config/export/block.block.claro_help.yml      |    22 -
 .../block.block.claro_local_actions.yml       |    20 -
 config/export/block.block.claro_messages.yml  |    22 -
 .../export/block.block.claro_page_title.yml   |    20 -
 .../block.block.claro_primary_local_tasks.yml |    22 -
 ...lock.block.claro_secondary_local_tasks.yml |    22 -
 config/export/block.block.footer.yml          |    51 -
 ....block.idc_ui_theme_boots_account_menu.yml |    27 -
 ...lock.block.idc_ui_theme_boots_branding.yml |    42 -
 ...k.block.idc_ui_theme_boots_breadcrumbs.yml |    22 -
 ...block.block.idc_ui_theme_boots_content.yml |    22 -
 ...ui_theme_boots_creatorsandcontributors.yml |    37 -
 ...s_exposedformsolr_search_contentpage_1.yml |    51 -
 .../block.block.idc_ui_theme_boots_help.yml   |    22 -
 ...block.idc_ui_theme_boots_local_actions.yml |    20 -
 ...k.block.idc_ui_theme_boots_local_tasks.yml |    22 -
 ...ock.block.idc_ui_theme_boots_main_menu.yml |    53 -
 ...lock.block.idc_ui_theme_boots_memberof.yml |    55 -
 ...lock.block.idc_ui_theme_boots_messages.yml |    22 -
 ...ck.block.idc_ui_theme_boots_page_title.yml |    51 -
 ....block.idc_ui_theme_boots_physicalform.yml |    31 -
 ...c_ui_theme_boots_primary_admin_actions.yml |    20 -
 ...idc_ui_theme_boots_primary_local_tasks.yml |    22 -
 ....block.idc_ui_theme_boots_resourcetype.yml |    55 -
 ...lock.idc_ui_theme_boots_resourcetype_2.yml |    54 -
 ...c_ui_theme_boots_secondary_local_tasks.yml |    22 -
 ...block.idc_ui_theme_boots_site_branding.yml |    25 -
 ....block.idc_ui_theme_boots_sitebranding.yml |    42 -
 ...searchcontentsearchresultspagerforpage.yml |    50 -
 ...block.block.idc_ui_theme_boots_subject.yml |    31 -
 ...k.block.idc_ui_theme_boots_subjectname.yml |    31 -
 ...ock.block.idc_ui_theme_boots_syndicate.yml |    23 -
 ...ock.idc_ui_theme_boots_temporalsubject.yml |    31 -
 .../block.block.idc_ui_theme_boots_year.yml   |    55 -
 config/export/block.block.memberof.yml        |    55 -
 config/export/block.block.pagetitle.yml       |    50 -
 config/export/block.block.search.yml          |    56 -
 ...olrsearchcontentadvancedsearchforblock.yml |    50 -
 ...solrsearchcontentadvancedsearchforpage.yml |    56 -
 ...earchcontentsearchresultspagerforblock.yml |    45 -
 ...searchcontentsearchresultspagerforpage.yml |    51 -
 ...ews_block__solr_search_content_block_1.yml |    47 -
 config/export/block.block.year.yml            |    55 -
 config/export/block.block.yearswc.yml         |    50 -
 config/export/block_content.type.basic.yml    |    10 -
 config/export/bootstrap_barrio.settings.yml   |    27 -
 config/export/citation_select.settings.yml    |    12 -
 config/export/claro.settings.yml              |     3 -
 config/export/comment.settings.yml            |     3 -
 config/export/comment.type.comment.yml        |    10 -
 config/export/contact.form.feedback.yml       |    14 -
 config/export/contact.form.personal.yml       |    13 -
 config/export/contact.settings.yml            |     7 -
 config/export/context.context.all_media.yml   |    50 -
 config/export/context.context.audio.yml       |    23 -
 .../context.context.audio_original_file.yml   |    36 -
 config/export/context.context.basic_image.yml |    23 -
 config/export/context.context.basic_pages.yml |    28 -
 config/export/context.context.binary.yml      |    31 -
 .../export/context.context.book_or_page.yml   |    27 -
 config/export/context.context.collection.yml  |    66 -
 ...context.context.compound_member_object.yml |    13 -
 ...context.context.compound_parent_object.yml |    27 -
 .../export/context.context.external_files.yml |    34 -
 .../context.context.image_original_file.yml   |    37 -
 config/export/context.context.large_image.yml |    23 -
 config/export/context.context.newspaper.yml   |    49 -
 .../context.context.newspaper_issue.yml       |    27 -
 .../export/context.context.open_seadragon.yml |    31 -
 .../context.context.openseadragon_block.yml   |    48 -
 ...xt.context.paged_content_openseadragon.yml |    29 -
 config/export/context.context.pages.yml       |    38 -
 .../context.context.pdf_original_file.yml     |    37 -
 config/export/context.context.pdfjs.yml       |    28 -
 .../export/context.context.remote_media.yml   |    13 -
 .../context.context.repository_content.yml    |    43 -
 .../export/context.context.taxonomy_terms.yml |    36 -
 ...t.context.technical_metadata_on_ingest.yml |    30 -
 .../context.context.video_original_file.yml   |    37 -
 ...ase_field_override.media.audio.changed.yml |    20 -
 ...ase_field_override.media.audio.created.yml |    20 -
 ...e.base_field_override.media.audio.name.yml |    22 -
 ...e.base_field_override.media.audio.path.yml |    22 -
 ...base_field_override.media.audio.status.yml |    24 -
 ...e_field_override.media.audio.thumbnail.yml |    39 -
 ...re.base_field_override.media.audio.uid.yml |    22 -
 ...base_field_override.media.file.changed.yml |    20 -
 ...base_field_override.media.file.created.yml |    20 -
 ...re.base_field_override.media.file.name.yml |    22 -
 ...re.base_field_override.media.file.path.yml |    22 -
 ....base_field_override.media.file.status.yml |    24 -
 ...se_field_override.media.file.thumbnail.yml |    39 -
 ...ore.base_field_override.media.file.uid.yml |    22 -
 ...ase_field_override.media.image.changed.yml |    20 -
 ...ase_field_override.media.image.created.yml |    20 -
 ...e.base_field_override.media.image.name.yml |    22 -
 ...e.base_field_override.media.image.path.yml |    22 -
 ...base_field_override.media.image.status.yml |    24 -
 ...e_field_override.media.image.thumbnail.yml |    39 -
 ...re.base_field_override.media.image.uid.yml |    22 -
 ...ase_field_override.media.video.changed.yml |    20 -
 ...ase_field_override.media.video.created.yml |    20 -
 ...e.base_field_override.media.video.name.yml |    22 -
 ...e.base_field_override.media.video.path.yml |    22 -
 ...base_field_override.media.video.status.yml |    24 -
 ...e_field_override.media.video.thumbnail.yml |    39 -
 ...re.base_field_override.media.video.uid.yml |    22 -
 ...override.node.islandora_object.changed.yml |    20 -
 ...override.node.islandora_object.created.yml |    20 -
 ...erride.node.islandora_object.menu_link.yml |    22 -
 ...ld_override.node.islandora_object.path.yml |    22 -
 ...override.node.islandora_object.promote.yml |    24 -
 ..._override.node.islandora_object.status.yml |    24 -
 ..._override.node.islandora_object.sticky.yml |    24 -
 ...d_override.node.islandora_object.title.yml |    20 -
 ...eld_override.node.islandora_object.uid.yml |    22 -
 ....base_field_override.node.page.promote.yml |    24 -
 config/export/core.date_format.fallback.yml   |    10 -
 config/export/core.date_format.html_date.yml  |    10 -
 .../export/core.date_format.html_datetime.yml |    10 -
 config/export/core.date_format.html_month.yml |    10 -
 config/export/core.date_format.html_time.yml  |    10 -
 config/export/core.date_format.html_week.yml  |    10 -
 config/export/core.date_format.html_year.yml  |    10 -
 .../core.date_format.html_yearless_date.yml   |    10 -
 config/export/core.date_format.long.yml       |    10 -
 config/export/core.date_format.medium.yml     |    10 -
 config/export/core.date_format.short.yml      |    10 -
 ...rm_display.block_content.basic.default.yml |    42 -
 ...y_form_display.comment.comment.default.yml |    43 -
 ...ntity_form_display.media.audio.default.yml |   108 -
 ...ty_form_display.media.document.default.yml |   107 -
 ...m_display.media.extracted_text.default.yml |    84 -
 ...entity_form_display.media.file.default.yml |   105 -
 ...ntity_form_display.media.image.default.yml |   111 -
 ...orm_display.media.remote_video.default.yml |    63 -
 ...ntity_form_display.media.video.default.yml |   106 -
 ...tity_form_display.node.article.default.yml |   116 -
 ...display.node.collection_object.default.yml |   331 -
 ..._display.node.islandora_object.default.yml |   943 -
 ....entity_form_display.node.page.default.yml |    86 -
 ...axonomy_term.copyright_and_use.default.yml |    70 -
 ...y.taxonomy_term.corporate_body.default.yml |   177 -
 ..._display.taxonomy_term.country.default.yml |    68 -
 ...m_display.taxonomy_term.family.default.yml |   133 -
 ...play.taxonomy_term.frequencies.default.yml |    68 -
 ...rm_display.taxonomy_term.genre.default.yml |    77 -
 ...lay.taxonomy_term.geo_location.default.yml |   109 -
 ...axonomy_term.islandora_display.default.yml |    66 -
 ...onomy_term.islandora_media_use.default.yml |    68 -
 ...taxonomy_term.islandora_models.default.yml |    68 -
 ...y.taxonomy_term.issuance_modes.default.yml |    68 -
 ...display.taxonomy_term.language.default.yml |    68 -
 ...m_display.taxonomy_term.person.default.yml |   181 -
 ...ay.taxonomy_term.physical_form.default.yml |    68 -
 ...y.taxonomy_term.resource_types.default.yml |    68 -
 ..._display.taxonomy_term.subject.default.yml |    78 -
 ...axonomy_term.temporal_subjects.default.yml |    68 -
 ....entity_form_display.user.user.default.yml |    50 -
 .../core.entity_form_mode.user.register.yml   |    12 -
 ...ew_display.block_content.basic.default.yml |    26 -
 ...y_view_display.comment.comment.default.yml |    29 -
 ...ntity_view_display.media.audio.default.yml |    93 -
 ...view_display.media.audio.file_download.yml |    46 -
 ...entity_view_display.media.audio.source.yml |    52 -
 ...ty_view_display.media.document.default.yml |    90 -
 ...w_display.media.document.file_download.yml |    50 -
 ...tity_view_display.media.document.pdfjs.yml |    51 -
 ...ity_view_display.media.document.source.yml |    45 -
 ...w_display.media.extracted_text.default.yml |    69 -
 ...entity_view_display.media.file.default.yml |    90 -
 ..._view_display.media.file.file_download.yml |    46 -
 ...view_display.media.file.open_seadragon.yml |    44 -
 ...e.entity_view_display.media.file.pdfjs.yml |    51 -
 ....entity_view_display.media.file.source.yml |    45 -
 ....media.fits_technical_metadata.default.yml |    63 -
 ...nical_metadata.fits_technical_metadata.yml |    71 -
 ...ntity_view_display.media.image.default.yml |   114 -
 ...view_display.media.image.file_download.yml |    50 -
 ...iew_display.media.image.open_seadragon.yml |    48 -
 ...entity_view_display.media.image.source.yml |    50 -
 ...ity_view_display.media.image.thumbnail.yml |    53 -
 ...iew_display.media.remote_video.default.yml |    32 -
 ...ntity_view_display.media.video.default.yml |    96 -
 ...view_display.media.video.file_download.yml |    46 -
 ...entity_view_display.media.video.source.yml |    55 -
 ...tity_view_display.node.article.default.yml |    87 -
 ...e.entity_view_display.node.article.rss.yml |    50 -
 ...ntity_view_display.node.article.teaser.yml |    79 -
 ...display.node.collection_object.default.yml |   152 -
 ..._display.node.collection_object.teaser.yml |    97 -
 ...w_display.node.islandora_object.binary.yml |   422 -
 ..._display.node.islandora_object.default.yml |   738 -
 ...y.node.islandora_object.open_seadragon.yml |   422 -
 ...ew_display.node.islandora_object.pdfjs.yml |   422 -
 ...lay.node.islandora_object.search_index.yml |   503 -
 ...ay.node.islandora_object.search_result.yml |   268 -
 ...w_display.node.islandora_object.teaser.yml |   190 -
 ....entity_view_display.node.page.default.yml |    50 -
 ...e.entity_view_display.node.page.teaser.yml |    52 -
 ...axonomy_term.copyright_and_use.default.yml |    46 -
 ...y.taxonomy_term.corporate_body.default.yml |   161 -
 ..._display.taxonomy_term.country.default.yml |    39 -
 ...w_display.taxonomy_term.family.default.yml |   112 -
 ...play.taxonomy_term.frequencies.default.yml |    39 -
 ...ew_display.taxonomy_term.genre.default.yml |    48 -
 ...lay.taxonomy_term.geo_location.default.yml |    80 -
 ...axonomy_term.islandora_display.default.yml |    39 -
 ...onomy_term.islandora_media_use.default.yml |    39 -
 ...taxonomy_term.islandora_models.default.yml |    39 -
 ...y.taxonomy_term.issuance_modes.default.yml |    39 -
 ...display.taxonomy_term.language.default.yml |    39 -
 ...w_display.taxonomy_term.person.default.yml |   157 -
 ...ay.taxonomy_term.physical_form.default.yml |    39 -
 ...y.taxonomy_term.resource_types.default.yml |    39 -
 ..._display.taxonomy_term.subject.default.yml |    48 -
 ...axonomy_term.temporal_subjects.default.yml |    39 -
 ....entity_view_display.user.user.compact.yml |    33 -
 ....entity_view_display.user.user.default.yml |    34 -
 .../core.entity_view_mode.block.token.yml     |    10 -
 ...re.entity_view_mode.block_content.full.yml |    12 -
 ...e.entity_view_mode.block_content.token.yml |    10 -
 .../core.entity_view_mode.comment.full.yml    |    12 -
 .../core.entity_view_mode.comment.token.yml   |    10 -
 ...entity_view_mode.contact_message.token.yml |    10 -
 .../core.entity_view_mode.file.token.yml      |    10 -
 .../core.entity_view_mode.media.download.yml  |    10 -
 ...e.entity_view_mode.media.file_download.yml |    10 -
 ...iew_mode.media.fits_technical_metadata.yml |    12 -
 .../core.entity_view_mode.media.full.yml      |    12 -
 ...e.entity_view_mode.media.media_library.yml |    10 -
 ....entity_view_mode.media.open_seadragon.yml |    12 -
 .../core.entity_view_mode.media.pdfjs.yml     |    12 -
 .../core.entity_view_mode.media.source.yml    |    12 -
 .../core.entity_view_mode.media.thumbnail.yml |    10 -
 .../core.entity_view_mode.media.token.yml     |    10 -
 .../core.entity_view_mode.media.video.yml     |    10 -
 ...tity_view_mode.menu_link_content.token.yml |    10 -
 .../core.entity_view_mode.node.basic.yml      |    10 -
 .../core.entity_view_mode.node.binary.yml     |    12 -
 .../core.entity_view_mode.node.collection.yml |    10 -
 .../core.entity_view_mode.node.compound.yml   |    10 -
 ....entity_view_mode.node.compound_member.yml |    10 -
 .../core.entity_view_mode.node.full.yml       |    12 -
 .../core.entity_view_mode.node.media_evas.yml |    10 -
 .../core.entity_view_mode.node.newspaper.yml  |    10 -
 ...e.entity_view_mode.node.open_seadragon.yml |    12 -
 .../core.entity_view_mode.node.paged.yml      |    10 -
 .../core.entity_view_mode.node.pdfjs.yml      |    12 -
 ...ore.entity_view_mode.node.remote_media.yml |    10 -
 .../core.entity_view_mode.node.revision.yml   |    10 -
 .../export/core.entity_view_mode.node.rss.yml |    12 -
 ...ore.entity_view_mode.node.search_index.yml |    12 -
 ...re.entity_view_mode.node.search_result.yml |    12 -
 ...e.entity_view_mode.node.something_else.yml |    10 -
 .../core.entity_view_mode.node.teaser.yml     |    12 -
 .../core.entity_view_mode.node.token.yml      |    10 -
 ...core.entity_view_mode.path_alias.token.yml |    10 -
 .../core.entity_view_mode.shortcut.token.yml  |    10 -
 ...re.entity_view_mode.taxonomy_term.full.yml |    12 -
 ...e.entity_view_mode.taxonomy_term.token.yml |    10 -
 .../core.entity_view_mode.tour.token.yml      |    10 -
 .../core.entity_view_mode.user.compact.yml    |    12 -
 .../core.entity_view_mode.user.full.yml       |    12 -
 .../core.entity_view_mode.user.token.yml      |    10 -
 config/export/core.extension.yml              |   139 -
 .../core.menu.static_menu_link_overrides.yml  |     3 -
 config/export/dblog.settings.yml              |     3 -
 config/export/devel.settings.yml              |    12 -
 config/export/devel.toolbar.settings.yml      |    10 -
 config/export/editor.editor.basic_html.yml    |    66 -
 config/export/editor.editor.full_html.yml     |    57 -
 ...facets.facet.creators_and_contributors.yml |    71 -
 ...ts.facet.creators_and_contributors_swc.yml |    79 -
 config/export/facets.facet.member_of.yml      |    74 -
 .../facets.facet.member_of_content_title.yml  |    74 -
 config/export/facets.facet.member_of_swc.yml  |    79 -
 config/export/facets.facet.physical_form.yml  |    76 -
 .../export/facets.facet.physical_form_swc.yml |    79 -
 config/export/facets.facet.resource_type.yml  |    74 -
 .../export/facets.facet.resource_type_2.yml   |    73 -
 config/export/facets.facet.subject.yml        |    76 -
 config/export/facets.facet.subject_name.yml   |    76 -
 .../export/facets.facet.temporal_subject.yml  |    76 -
 config/export/facets.facet.year.yml           |    67 -
 config/export/facets.facet.year_swc.yml       |    67 -
 ...eatures.bundle.controlled_access_terms.yml |   100 -
 config/export/features.bundle.default.yml     |   100 -
 config/export/features.bundle.islandora.yml   |   103 -
 config/export/features.settings.yml           |     5 -
 .../field.field.block_content.basic.body.yml  |    25 -
 ...eld.field.comment.comment.comment_body.yml |    23 -
 ...ield.field.media.audio.field_file_size.yml |    25 -
 ...eld.media.audio.field_media_audio_file.yml |    29 -
 ...field.field.media.audio.field_media_of.yml |    23 -
 ...ield.field.media.audio.field_media_use.yml |    31 -
 ...ield.field.media.audio.field_mime_type.yml |    21 -
 ....field.media.audio.field_original_name.yml |    21 -
 .../field.field.media.audio.field_track.yml   |    38 -
 ...document.field_display_mode_for_viewer.yml |    24 -
 ...d.field.media.document.field_file_size.yml |    25 -
 ...ld.media.document.field_media_document.yml |    29 -
 ...ld.field.media.document.field_media_of.yml |    23 -
 ...d.field.media.document.field_media_use.yml |    31 -
 ...d.field.media.document.field_mime_type.yml |    21 -
 ...eld.media.document.field_original_name.yml |    21 -
 ...media.extracted_text.field_edited_text.yml |    23 -
 ....media.extracted_text.field_media_file.yml |    29 -
 ...ld.media.extracted_text.field_media_of.yml |    27 -
 ...d.media.extracted_text.field_media_use.yml |    31 -
 ...d.media.extracted_text.field_mime_type.yml |    23 -
 ...dia.file.field_display_mode_for_viewer.yml |    26 -
 ...field.field.media.file.field_file_size.yml |    25 -
 ...ield.field.media.file.field_media_file.yml |    34 -
 .../field.field.media.file.field_media_of.yml |    23 -
 ...field.field.media.file.field_media_use.yml |    31 -
 ...field.field.media.file.field_mime_type.yml |    21 -
 ...d.field.media.file.field_original_name.yml |    21 -
 ...fits_technical_metadata.field_complete.yml |    25 -
 ...its_technical_metadata.field_file_size.yml |    25 -
 ...ts_technical_metadata.field_media_file.yml |    29 -
 ...fits_technical_metadata.field_media_of.yml |    23 -
 ...its_technical_metadata.field_media_use.yml |    23 -
 ...its_technical_metadata.field_mime_type.yml |    21 -
 ...adata.fits_ois_file_information_md5che.yml |    23 -
 ...ia.image.field_display_mode_for_viewer.yml |    24 -
 ...ield.field.media.image.field_file_size.yml |    25 -
 .../field.field.media.image.field_height.yml  |    25 -
 ...ld.field.media.image.field_media_image.yml |    40 -
 ...field.field.media.image.field_media_of.yml |    23 -
 ...ield.field.media.image.field_media_use.yml |    31 -
 ...ield.field.media.image.field_mime_type.yml |    21 -
 ....field.media.image.field_original_name.yml |    21 -
 .../field.field.media.image.field_width.yml   |    25 -
 ....remote_video.field_media_oembed_video.yml |    21 -
 ...ield.field.media.video.field_file_size.yml |    25 -
 ...field.field.media.video.field_media_of.yml |    23 -
 ...ield.field.media.video.field_media_use.yml |    31 -
 ...eld.media.video.field_media_video_file.yml |    29 -
 ...ield.field.media.video.field_mime_type.yml |    20 -
 ....field.media.video.field_original_name.yml |    21 -
 .../field.field.media.video.field_track.yml   |    29 -
 .../export/field.field.node.article.body.yml  |    25 -
 .../field.field.node.article.comment.yml      |    35 -
 .../field.field.node.article.field_image.yml  |    40 -
 .../field.field.node.article.field_tags.yml   |    29 -
 ...lection_object.field_alternative_title.yml |    21 -
 ..._object.field_collection_contact_email.yml |    27 -
 ...n_object.field_collection_contact_name.yml |    27 -
 ...lection_object.field_collection_number.yml |    27 -
 ....collection_object.field_date_captured.yml |    26 -
 ....collection_object.field_date_modified.yml |    26 -
 ...ode.collection_object.field_date_valid.yml |    26 -
 ...de.collection_object.field_description.yml |    27 -
 ....collection_object.field_display_hints.yml |    35 -
 ...node.collection_object.field_edtf_date.yml |    26 -
 ...lection_object.field_edtf_date_created.yml |    26 -
 ...llection_object.field_edtf_date_issued.yml |    26 -
 ...ld.node.collection_object.field_extent.yml |    25 -
 ....collection_object.field_featured_item.yml |    31 -
 ...de.collection_object.field_finding_aid.yml |    30 -
 ...ection_object.field_geographic_subject.yml |    35 -
 ...e.collection_object.field_linked_agent.yml |   312 -
 ...node.collection_object.field_member_of.yml |    23 -
 ...eld.node.collection_object.field_model.yml |    41 -
 ....collection_object.field_resource_type.yml |    39 -
 ...ld.node.collection_object.field_rights.yml |    25 -
 ...ollection_object.field_subject_general.yml |    43 -
 ....collection_object.field_subjects_name.yml |    39 -
 ...llection_object.field_temporal_subject.yml |    35 -
 ...node.collection_object.field_unique_id.yml |    29 -
 ...ld.node.collection_object.field_weight.yml |    29 -
 ...d.node.islandora_object.field_abstract.yml |    23 -
 ....node.islandora_object.field_alt_title.yml |    21 -
 ...landora_object.field_alternative_title.yml |    19 -
 ...ode.islandora_object.field_citable_url.yml |    23 -
 ....islandora_object.field_classification.yml |    21 -
 ...landora_object.field_collection_number.yml |    25 -
 ...ode.islandora_object.field_contributor.yml |   313 -
 ...ode.islandora_object.field_coordinates.yml |    23 -
 ...slandora_object.field_coordinates_text.yml |    21 -
 ...landora_object.field_copyright_and_use.yml |    35 -
 ....islandora_object.field_copyright_date.yml |    23 -
 ...slandora_object.field_copyright_holder.yml |    39 -
 ...ld.node.islandora_object.field_creator.yml |   312 -
 ....islandora_object.field_date_available.yml |    26 -
 ...e.islandora_object.field_date_captured.yml |    23 -
 ...slandora_object.field_date_copyrighted.yml |    26 -
 ...e.islandora_object.field_date_modified.yml |    23 -
 ....islandora_object.field_date_published.yml |    26 -
 ...node.islandora_object.field_date_valid.yml |    23 -
 ...ode.islandora_object.field_description.yml |    21 -
 ...dora_object.field_dewey_classification.yml |    21 -
 ...andora_object.field_digital_identifier.yml |    25 -
 ...landora_object.field_digital_publisher.yml |    39 -
 ...e.islandora_object.field_display_hints.yml |    31 -
 ...landora_object.field_dspace_identifier.yml |    28 -
 ....islandora_object.field_dspace_item_id.yml |    25 -
 ...ld.node.islandora_object.field_edition.yml |    21 -
 ....node.islandora_object.field_edtf_date.yml |    23 -
 ...landora_object.field_edtf_date_created.yml |    23 -
 ...slandora_object.field_edtf_date_issued.yml |    23 -
 ...eld.node.islandora_object.field_extent.yml |    21 -
 ...e.islandora_object.field_featured_item.yml |    29 -
 ...ode.islandora_object.field_finding_aid.yml |    28 -
 ....node.islandora_object.field_frequency.yml |    31 -
 ...node.islandora_object.field_full_title.yml |    21 -
 ...ield.node.islandora_object.field_genre.yml |    31 -
 ...andora_object.field_geographic_subject.yml |    31 -
 ....islandora_object.field_geoportal_link.yml |    28 -
 ...node.islandora_object.field_identifier.yml |    21 -
 ...node.islandora_object.field_is_part_of.yml |    28 -
 ...field.node.islandora_object.field_isbn.yml |    21 -
 ...field.node.islandora_object.field_issn.yml |    25 -
 ...de.islandora_object.field_item_barcode.yml |    25 -
 ...field.node.islandora_object.field_jhir.yml |    28 -
 ...d.node.islandora_object.field_language.yml |    31 -
 ...andora_object.field_lcc_classification.yml |    21 -
 ...dora_object.field_library_catalog_link.yml |    28 -
 ...de.islandora_object.field_linked_agent.yml |   309 -
 ...slandora_object.field_local_identifier.yml |    21 -
 ....node.islandora_object.field_member_of.yml |    38 -
 ...slandora_object.field_mode_of_issuance.yml |    31 -
 ...ield.node.islandora_object.field_model.yml |    31 -
 ...field.node.islandora_object.field_note.yml |    23 -
 ...ode.islandora_object.field_oclc_number.yml |    21 -
 ...e.islandora_object.field_physical_form.yml |    31 -
 ....field.node.islandora_object.field_pid.yml |    21 -
 ...islandora_object.field_place_published.yml |    21 -
 ...a_object.field_place_published_country.yml |    31 -
 ....node.islandora_object.field_publisher.yml |    39 -
 ...landora_object.field_publisher_country.yml |    35 -
 ...e.islandora_object.field_resource_type.yml |    31 -
 ...eld.node.islandora_object.field_rights.yml |    21 -
 ...slandora_object.field_spatial_coverage.yml |    35 -
 ...ld.node.islandora_object.field_subject.yml |    31 -
 ...islandora_object.field_subject_general.yml |    39 -
 ...e.islandora_object.field_subjects_name.yml |    35 -
 ...landora_object.field_table_of_contents.yml |    23 -
 ...slandora_object.field_temporal_subject.yml |    31 -
 ....node.islandora_object.field_unique_id.yml |    27 -
 ...eld.node.islandora_object.field_weight.yml |    25 -
 ...ield.node.islandora_object.field_years.yml |    21 -
 config/export/field.field.node.page.body.yml  |    25 -
 ...copyright_and_use.field_authority_link.yml |    30 -
 ...term.copyright_and_use.field_unique_id.yml |    27 -
 ...rm.corporate_body.field_authority_link.yml |    36 -
 ...rm.corporate_body.field_cat_date_begin.yml |    23 -
 ...term.corporate_body.field_cat_date_end.yml |    23 -
 ...ate_body.field_corporate_body_alt_name.yml |    25 -
 ...axonomy_term.corporate_body.field_date.yml |    26 -
 ...e_body.field_date_of_meeting_or_treaty.yml |    26 -
 ...rporate_body.field_location_of_meeting.yml |    25 -
 ...rate_body.field_num_of_section_or_meet.yml |    25 -
 ...term.corporate_body.field_primary_name.yml |    25 -
 ...erm.corporate_body.field_relationships.yml |    48 -
 ....corporate_body.field_subordinate_name.yml |    25 -
 ...axonomy_term.corporate_body.field_type.yml |    23 -
 ...my_term.corporate_body.field_unique_id.yml |    27 -
 ...nomy_term.country.field_authority_link.yml |    28 -
 ...onomy_term.family.field_authority_link.yml |    34 -
 ...onomy_term.family.field_cat_date_begin.yml |    23 -
 ...axonomy_term.family.field_cat_date_end.yml |    23 -
 ....field.taxonomy_term.family.field_date.yml |    26 -
 ...taxonomy_term.family.field_family_name.yml |    25 -
 ...xonomy_term.family.field_relationships.yml |    43 -
 ...erm.family.field_title_and_other_words.yml |    25 -
 ...d.taxonomy_term.family.field_unique_id.yml |    27 -
 ..._term.frequencies.field_authority_link.yml |    28 -
 ...xonomy_term.genre.field_authority_link.yml |    30 -
 ...ld.taxonomy_term.genre.field_unique_id.yml |    27 -
 ...term.geo_location.field_authority_link.yml |    29 -
 ...xonomy_term.geo_location.field_broader.yml |    28 -
 ...y_term.geo_location.field_geo_alt_name.yml |    21 -
 ...erm.geo_location.field_geo_geolocation.yml |    23 -
 ...nomy_term.geo_location.field_unique_id.yml |    27 -
 ...m.islandora_display.field_external_uri.yml |    25 -
 ...islandora_media_use.field_external_uri.yml |    25 -
 ...rm.islandora_models.field_external_uri.yml |    25 -
 ...rm.issuance_modes.field_authority_link.yml |    28 -
 ...omy_term.language.field_authority_link.yml |    28 -
 ...onomy_term.person.field_authority_link.yml |    36 -
 ...onomy_term.person.field_cat_date_begin.yml |    23 -
 ...axonomy_term.person.field_cat_date_end.yml |    23 -
 ....field.taxonomy_term.person.field_date.yml |    26 -
 ...erm.person.field_person_alternate_name.yml |    25 -
 ...erson.field_preferred_name_fuller_form.yml |    25 -
 ...erm.person.field_preferred_name_number.yml |    25 -
 ...erm.person.field_preferred_name_prefix.yml |    25 -
 ..._term.person.field_preferred_name_rest.yml |    25 -
 ...erm.person.field_preferred_name_suffix.yml |    25 -
 ...term.person.field_primary_part_of_name.yml |    25 -
 ...xonomy_term.person.field_relationships.yml |    51 -
 ...d.taxonomy_term.person.field_unique_id.yml |    27 -
 ...erm.physical_form.field_authority_link.yml |    28 -
 ...rm.resource_types.field_authority_link.yml |    30 -
 ...nomy_term.subject.field_authority_link.yml |    41 -
 ....taxonomy_term.subject.field_unique_id.yml |    27 -
 ...temporal_subjects.field_authority_link.yml |    28 -
 .../field.field.user.user.user_picture.yml    |    40 -
 config/export/field.settings.yml              |     3 -
 .../field.storage.block_content.body.yml      |    21 -
 .../field.storage.comment.comment_body.yml    |    21 -
 ...ield.storage.group_content.group_roles.yml |    21 -
 .../field.storage.media.field_complete.yml    |    20 -
 ...ge.media.field_display_mode_for_viewer.yml |    25 -
 .../field.storage.media.field_edited_text.yml |    21 -
 .../field.storage.media.field_file_size.yml   |    22 -
 .../field.storage.media.field_height.yml      |    22 -
 ...d.storage.media.field_media_audio_file.yml |    25 -
 ...eld.storage.media.field_media_document.yml |    25 -
 .../field.storage.media.field_media_file.yml  |    29 -
 .../field.storage.media.field_media_image.yml |    32 -
 ...storage.media.field_media_oembed_video.yml |    23 -
 .../field.storage.media.field_media_of.yml    |    22 -
 .../field.storage.media.field_media_use.yml   |    26 -
 ...d.storage.media.field_media_video_file.yml |    25 -
 .../field.storage.media.field_mime_type.yml   |    23 -
 ...ield.storage.media.field_original_name.yml |    21 -
 .../field.storage.media.field_track.yml       |    30 -
 .../field.storage.media.field_width.yml       |    22 -
 ...media.fits_ois_file_information_md5che.yml |    22 -
 config/export/field.storage.node.body.yml     |    21 -
 config/export/field.storage.node.comment.yml  |    22 -
 .../field.storage.node.field_abstract.yml     |    20 -
 .../field.storage.node.field_alt_title.yml    |    27 -
 ...d.storage.node.field_alternative_title.yml |    27 -
 .../field.storage.node.field_citable_url.yml  |    23 -
 ...ield.storage.node.field_classification.yml |    27 -
 ...ge.node.field_collection_contact_email.yml |    24 -
 ...age.node.field_collection_contact_name.yml |    27 -
 ...d.storage.node.field_collection_number.yml |    27 -
 .../field.storage.node.field_contributor.yml  |    25 -
 .../field.storage.node.field_coordinates.yml  |    25 -
 ...ld.storage.node.field_coordinates_text.yml |    27 -
 ...d.storage.node.field_copyright_and_use.yml |    24 -
 ...ield.storage.node.field_copyright_date.yml |    28 -
 ...ld.storage.node.field_copyright_holder.yml |    24 -
 .../field.storage.node.field_creator.yml      |    25 -
 ...ield.storage.node.field_date_available.yml |    26 -
 ...field.storage.node.field_date_captured.yml |    28 -
 ...ld.storage.node.field_date_copyrighted.yml |    26 -
 ...field.storage.node.field_date_modified.yml |    28 -
 ...ield.storage.node.field_date_published.yml |    26 -
 .../field.storage.node.field_date_valid.yml   |    28 -
 .../field.storage.node.field_description.yml  |    21 -
 ...torage.node.field_dewey_classification.yml |    27 -
 ....storage.node.field_digital_identifier.yml |    25 -
 ...d.storage.node.field_digital_publisher.yml |    24 -
 ...field.storage.node.field_display_hints.yml |    26 -
 ...d.storage.node.field_dspace_identifier.yml |    23 -
 ...ield.storage.node.field_dspace_item_id.yml |    25 -
 .../field.storage.node.field_edition.yml      |    27 -
 .../field.storage.node.field_edtf_date.yml    |    27 -
 ...d.storage.node.field_edtf_date_created.yml |    27 -
 ...ld.storage.node.field_edtf_date_issued.yml |    27 -
 .../field.storage.node.field_extent.yml       |    27 -
 ...field.storage.node.field_featured_item.yml |    24 -
 .../field.storage.node.field_finding_aid.yml  |    25 -
 .../field.storage.node.field_frequency.yml    |    26 -
 .../field.storage.node.field_full_title.yml   |    25 -
 .../export/field.storage.node.field_genre.yml |    26 -
 ....storage.node.field_geographic_subject.yml |    26 -
 ...ield.storage.node.field_geoportal_link.yml |    23 -
 .../field.storage.node.field_identifier.yml   |    23 -
 .../export/field.storage.node.field_image.yml |    34 -
 .../field.storage.node.field_is_part_of.yml   |    23 -
 .../export/field.storage.node.field_isbn.yml  |    27 -
 .../export/field.storage.node.field_issn.yml  |    25 -
 .../field.storage.node.field_item_barcode.yml |    25 -
 .../export/field.storage.node.field_jhir.yml  |    23 -
 .../field.storage.node.field_language.yml     |    26 -
 ....storage.node.field_lcc_classification.yml |    27 -
 ...torage.node.field_library_catalog_link.yml |    23 -
 .../field.storage.node.field_linked_agent.yml |    27 -
 ...ld.storage.node.field_local_identifier.yml |    27 -
 .../field.storage.node.field_member_of.yml    |    25 -
 ...ld.storage.node.field_mode_of_issuance.yml |    26 -
 .../export/field.storage.node.field_model.yml |    26 -
 .../export/field.storage.node.field_note.yml  |    24 -
 .../field.storage.node.field_oclc_number.yml  |    27 -
 ...field.storage.node.field_physical_form.yml |    26 -
 .../export/field.storage.node.field_pid.yml   |    27 -
 ...eld.storage.node.field_place_published.yml |    27 -
 ...age.node.field_place_published_country.yml |    26 -
 .../field.storage.node.field_publisher.yml    |    24 -
 ...d.storage.node.field_publisher_country.yml |    24 -
 ...field.storage.node.field_resource_type.yml |    26 -
 .../field.storage.node.field_rights.yml       |    27 -
 ...ld.storage.node.field_spatial_coverage.yml |    24 -
 .../field.storage.node.field_subject.yml      |    22 -
 ...eld.storage.node.field_subject_general.yml |    26 -
 ...field.storage.node.field_subjects_name.yml |    26 -
 ...d.storage.node.field_table_of_contents.yml |    24 -
 .../export/field.storage.node.field_tags.yml  |    22 -
 ...ld.storage.node.field_temporal_subject.yml |    26 -
 .../field.storage.node.field_unique_id.yml    |    27 -
 .../field.storage.node.field_weight.yml       |    28 -
 .../export/field.storage.node.field_years.yml |    26 -
 ...age.taxonomy_term.field_authority_link.yml |    25 -
 ...ld.storage.taxonomy_term.field_broader.yml |    23 -
 ...age.taxonomy_term.field_cat_date_begin.yml |    24 -
 ...orage.taxonomy_term.field_cat_date_end.yml |    24 -
 ...omy_term.field_corporate_body_alt_name.yml |    25 -
 ...field.storage.taxonomy_term.field_date.yml |    26 -
 ...y_term.field_date_of_meeting_or_treaty.yml |    26 -
 ...orage.taxonomy_term.field_external_uri.yml |    21 -
 ...torage.taxonomy_term.field_family_name.yml |    25 -
 ...orage.taxonomy_term.field_geo_alt_name.yml |    23 -
 ...ge.taxonomy_term.field_geo_geolocation.yml |    21 -
 ...axonomy_term.field_location_of_meeting.yml |    25 -
 ...nomy_term.field_num_of_section_or_meet.yml |    25 -
 ...onomy_term.field_person_alternate_name.yml |    25 -
 ..._term.field_preferred_name_fuller_form.yml |    25 -
 ...onomy_term.field_preferred_name_number.yml |    25 -
 ...onomy_term.field_preferred_name_prefix.yml |    25 -
 ...axonomy_term.field_preferred_name_rest.yml |    25 -
 ...onomy_term.field_preferred_name_suffix.yml |    25 -
 ...orage.taxonomy_term.field_primary_name.yml |    25 -
 ...xonomy_term.field_primary_part_of_name.yml |    25 -
 ...rage.taxonomy_term.field_relationships.yml |    22 -
 ...e.taxonomy_term.field_subordinate_name.yml |    25 -
 ...onomy_term.field_title_and_other_words.yml |    25 -
 ...field.storage.taxonomy_term.field_type.yml |    56 -
 ....storage.taxonomy_term.field_unique_id.yml |    25 -
 .../field.storage.user.user_picture.yml       |    34 -
 config/export/field_ui.settings.yml           |     3 -
 config/export/file.settings.yml               |     8 -
 config/export/filehash.settings.yml           |    26 -
 config/export/filter.format.basic_html.yml    |    45 -
 config/export/filter.format.full_html.yml     |    52 -
 config/export/filter.format.plain_text.yml    |    29 -
 .../export/filter.format.restricted_html.yml  |    32 -
 config/export/filter.settings.yml             |     4 -
 config/export/group.settings.yml              |     3 -
 config/export/hal.settings.yml                |     3 -
 config/export/idc_ui_theme_boots.settings.yml |    95 -
 config/export/image.settings.yml              |     5 -
 config/export/image.style.large.yml           |    17 -
 config/export/image.style.max_1300x1300.yml   |    20 -
 config/export/image.style.max_2600x2600.yml   |    20 -
 config/export/image.style.max_325x325.yml     |    20 -
 config/export/image.style.max_650x650.yml     |    20 -
 config/export/image.style.medium.yml          |    17 -
 config/export/image.style.thumbnail.yml       |    17 -
 config/export/image.style.wide.yml            |    17 -
 config/export/islandora.settings.yml          |    15 -
 .../islandora_advanced_search.settings.yml    |     5 -
 .../islandora_breadcrumbs.breadcrumbs.yml     |    12 -
 config/export/islandora_iiif.settings.yml     |     3 -
 config/export/jsonld.settings.yml             |    58 -
 config/export/jwt.config.yml                  |     2 -
 config/export/key.key.islandora_rsa_key.yml   |    17 -
 .../language.content_settings.media.audio.yml |    20 -
 ....content_settings.media.extracted_text.yml |    13 -
 .../language.content_settings.media.file.yml  |    20 -
 .../language.content_settings.media.image.yml |    20 -
 .../language.content_settings.media.video.yml |    20 -
 ...ontent_settings.node.collection_object.yml |    11 -
 ...content_settings.node.islandora_object.yml |    20 -
 ...content_settings.path_alias.path_alias.yml |    13 -
 ...ttings.taxonomy_term.copyright_and_use.yml |    11 -
 ..._settings.taxonomy_term.corporate_body.yml |    18 -
 ...content_settings.taxonomy_term.country.yml |    20 -
 ....content_settings.taxonomy_term.family.yml |    18 -
 ...ent_settings.taxonomy_term.frequencies.yml |    18 -
 ...e.content_settings.taxonomy_term.genre.yml |    20 -
 ...nt_settings.taxonomy_term.geo_location.yml |    18 -
 ...ings.taxonomy_term.islandora_media_use.yml |    18 -
 ...ettings.taxonomy_term.islandora_models.yml |    18 -
 ..._settings.taxonomy_term.issuance_modes.yml |    18 -
 ...ontent_settings.taxonomy_term.language.yml |    20 -
 ....content_settings.taxonomy_term.person.yml |    18 -
 ...t_settings.taxonomy_term.physical_form.yml |    20 -
 ..._settings.taxonomy_term.resource_types.yml |    18 -
 ...content_settings.taxonomy_term.subject.yml |    18 -
 ...ttings.taxonomy_term.temporal_subjects.yml |    18 -
 config/export/language.entity.en.yml          |    11 -
 config/export/language.entity.und.yml         |    11 -
 config/export/language.entity.zxx.yml         |    11 -
 config/export/language.mappings.yml           |    13 -
 config/export/language.negotiation.yml        |    12 -
 config/export/language.types.yml              |    35 -
 config/export/matomo.settings.yml             |    59 -
 config/export/media.settings.yml              |     6 -
 config/export/media.type.audio.yml            |    18 -
 config/export/media.type.document.yml         |    18 -
 config/export/media.type.extracted_text.yml   |    15 -
 config/export/media.type.file.yml             |    18 -
 .../media.type.fits_technical_metadata.yml    |    18 -
 config/export/media.type.image.yml            |    20 -
 config/export/media.type.remote_video.yml     |    20 -
 config/export/media.type.video.yml            |    18 -
 config/export/menu_ui.settings.yml            |     3 -
 ...n.idc_default_migration_menu_link_main.yml |    99 -
 ...plus.migration.islandora_defaults_tags.yml |    39 -
 .../migrate_plus.migration.islandora_tags.yml |    35 -
 ...plus.migration_group.idc_initial_setup.yml |    10 -
 ...migrate_plus.migration_group.islandora.yml |    12 -
 config/export/node.settings.yml               |     3 -
 config/export/node.type.article.yml           |    13 -
 config/export/node.type.collection_object.yml |    20 -
 config/export/node.type.islandora_object.yml  |    20 -
 config/export/node.type.page.yml              |    13 -
 config/export/openseadragon.settings.yml      |   126 -
 config/export/pathauto.pattern.basic_page.yml |    22 -
 .../export/pathauto.pattern.group_content.yml |    18 -
 .../pathauto.pattern.islandora_content.yml    |    23 -
 .../pathauto.pattern.taxonomy_terms.yml       |    38 -
 config/export/pathauto.settings.yml           |    53 -
 config/export/rdf.mapping.comment.comment.yml |    36 -
 config/export/rdf.mapping.media.audio.yml     |    51 -
 config/export/rdf.mapping.media.document.yml  |    51 -
 .../rdf.mapping.media.extracted_text.yml      |    51 -
 config/export/rdf.mapping.media.file.yml      |    51 -
 config/export/rdf.mapping.media.image.yml     |    57 -
 config/export/rdf.mapping.media.video.yml     |    51 -
 config/export/rdf.mapping.node.article.yml    |    52 -
 .../rdf.mapping.node.islandora_object.yml     |   171 -
 config/export/rdf.mapping.node.page.yml       |    43 -
 ...f.mapping.taxonomy_term.corporate_body.yml |    39 -
 .../rdf.mapping.taxonomy_term.country.yml     |    25 -
 .../rdf.mapping.taxonomy_term.family.yml      |    36 -
 .../rdf.mapping.taxonomy_term.genre.yml       |    30 -
 ...rdf.mapping.taxonomy_term.geo_location.yml |    37 -
 ...apping.taxonomy_term.islandora_display.yml |    33 -
 ...ping.taxonomy_term.islandora_media_use.yml |    30 -
 ...mapping.taxonomy_term.islandora_models.yml |    30 -
 .../rdf.mapping.taxonomy_term.language.yml    |    30 -
 .../rdf.mapping.taxonomy_term.person.yml      |    42 -
 ...df.mapping.taxonomy_term.physical_form.yml |    30 -
 ...f.mapping.taxonomy_term.resource_types.yml |    30 -
 .../rdf.mapping.taxonomy_term.subject.yml     |    30 -
 .../export/rdf.mapping.taxonomy_term.tags.yml |    22 -
 ...apping.taxonomy_term.temporal_subjects.yml |    30 -
 config/export/rdf.mapping.user.user.yml       |    17 -
 .../export/responsive_image.styles.narrow.yml |    25 -
 .../export/responsive_image.styles.wide.yml   |    27 -
 ...st.resource.entity.entity_form_display.yml |    19 -
 .../rest.resource.entity.field_config.yml     |    20 -
 ...t.resource.entity.field_storage_config.yml |    20 -
 config/export/rest.resource.entity.file.yml   |    46 -
 config/export/rest.resource.entity.media.yml  |    46 -
 .../rest.resource.entity.media_type.yml       |    20 -
 config/export/rest.resource.entity.node.yml   |    46 -
 .../rest.resource.entity.path_alias.yml       |    20 -
 .../rest.resource.entity.taxonomy_term.yml    |    46 -
 ...st.resource.entity.taxonomy_vocabulary.yml |    20 -
 config/export/rest.resource.entity.user.yml   |    20 -
 config/export/rest.resource.file.upload.yml   |    20 -
 config/export/rest.resource.oai_pmh.yml       |    20 -
 config/export/rest_oai_pmh.settings.yml       |    28 -
 .../search_api.index.default_solr_index.yml   |   492 -
 .../search_api.server.default_solr_server.yml |    74 -
 config/export/search_api.settings.yml         |    28 -
 ...olr_cache.cache_document_default_7_0_0.yml |    17 -
 ...lr.solr_field_type.text_edge_und_3_6_0.yml |    75 -
 ...lr.solr_field_type.text_edge_und_4_5_0.yml |    74 -
 ...lr.solr_field_type.text_edge_und_6_0_0.yml |    74 -
 ...lr.solr_field_type.text_edge_und_7_0_0.yml |    76 -
 ...r_field_type.text_edgestring_und_3_6_0.yml |    44 -
 ...r_field_type.text_edgestring_und_4_5_0.yml |    44 -
 ...r_field_type.text_edgestring_und_6_0_0.yml |    44 -
 ...api_solr.solr_field_type.text_en_3_6_0.yml |   400 -
 ...api_solr.solr_field_type.text_en_4_5_0.yml |   425 -
 ...api_solr.solr_field_type.text_en_6_0_0.yml | 17949 -------------
 ...api_solr.solr_field_type.text_en_7_0_0.yml | 17949 -------------
 ...r.solr_field_type.text_ngram_und_3_6_0.yml |    75 -
 ...r.solr_field_type.text_ngram_und_4_5_0.yml |    74 -
 ...r.solr_field_type.text_ngram_und_6_0_0.yml |    74 -
 ...r.solr_field_type.text_ngram_und_7_0_0.yml |    76 -
 ..._field_type.text_ngramstring_und_3_6_0.yml |    44 -
 ..._field_type.text_ngramstring_und_4_5_0.yml |    44 -
 ..._field_type.text_ngramstring_und_6_0_0.yml |    44 -
 ...solr_field_type.text_phonetic_en_7_0_0.yml |    88 -
 ...olr_field_type.text_phonetic_und_7_0_0.yml |    90 -
 ....solr_field_type.text_string_und_6_0_0.yml |    34 -
 ...pi_solr.solr_field_type.text_und_3_6_0.yml |   288 -
 ...pi_solr.solr_field_type.text_und_4_5_0.yml |   315 -
 ...pi_solr.solr_field_type.text_und_6_0_0.yml |   343 -
 ...pi_solr.solr_field_type.text_und_7_0_0.yml |   345 -
 ...t_dispatcher_httpcaching_default_7_0_0.yml |    18 -
 ...patcher_httpcachingnever_default_7_0_0.yml |    14 -
 ...est_handler_autocomplete_default_7_0_0.yml |    54 -
 ....request_handler_elevate_default_7_0_0.yml |    43 -
 ....request_handler_extract_default_7_0_0.yml |    35 -
 ...dler.request_handler_mlt_default_7_0_0.yml |    31 -
 ...er.request_handler_query_default_7_0_0.yml |    31 -
 ...andler_replicationmaster_default_7_0_0.yml |    31 -
 ...handler_replicationslave_default_7_0_0.yml |    28 -
 ...r.request_handler_select_default_7_0_0.yml |    45 -
 ...er.request_handler_spell_default_7_0_0.yml |    62 -
 ....request_handler_suggest_default_7_0_0.yml |    35 -
 ...ler.request_handler_tvrh_default_7_0_0.yml |    36 -
 config/export/shortcut.set.default.yml        |     8 -
 config/export/syslog.settings.yml             |     5 -
 ...e_a_service_file_from_an_original_file.yml |    22 -
 .../system.action.comment_delete_action.yml   |    13 -
 .../system.action.comment_publish_action.yml  |    13 -
 .../system.action.comment_save_action.yml     |    13 -
 ...system.action.comment_unpublish_action.yml |    13 -
 ...delete_file_as_fedora_external_content.yml |    15 -
 .../system.action.delete_media_and_file.yml   |    14 -
 ...m.action.delete_media_from_triplestore.yml |    15 -
 .../system.action.delete_node_from_fedora.yml |    15 -
 ...em.action.delete_node_from_triplestore.yml |    15 -
 ....action.delete_taxonomy_term_in_fedora.yml |    15 -
 ...on.delete_taxonomy_term_in_triplestore.yml |    15 -
 ...rate_a_thumbnail_from_an_original_file.yml |    22 -
 ...nerate_a_technical_metadata_derivative.yml |    22 -
 .../system.action.get_ocr_from_image.yml      |    22 -
 ...e_a_service_file_from_an_original_file.yml |    22 -
 ...rate_a_thumbnail_from_an_original_file.yml |    22 -
 ....index_file_as_fedora_external_content.yml |    15 -
 .../system.action.index_media_in_fedora.yml   |    15 -
 ...stem.action.index_media_in_triplestore.yml |    15 -
 .../system.action.index_node_in_fedora.yml    |    15 -
 ...ystem.action.index_node_in_triplestore.yml |    15 -
 ...m.action.index_taxonomy_term_in_fedora.yml |    15 -
 ...index_taxonomy_term_in_the_triplestore.yml |    15 -
 .../system.action.media_delete_action.yml     |    13 -
 .../system.action.media_publish_action.yml    |    13 -
 .../system.action.media_save_action.yml       |    13 -
 .../system.action.media_unpublish_action.yml  |    13 -
 .../system.action.node_delete_action.yml      |    13 -
 .../system.action.node_make_sticky_action.yml |    13 -
 ...ystem.action.node_make_unsticky_action.yml |    13 -
 .../system.action.node_promote_action.yml     |    13 -
 .../system.action.node_publish_action.yml     |    13 -
 .../export/system.action.node_save_action.yml |    13 -
 .../system.action.node_unpromote_action.yml   |    13 -
 .../system.action.node_unpublish_action.yml   |    13 -
 ...stem.action.pathauto_update_alias_node.yml |    16 -
 ...stem.action.pathauto_update_alias_user.yml |    16 -
 ...em.action.taxonomy_term_publish_action.yml |    13 -
 ....action.taxonomy_term_unpublish_action.yml |    13 -
 ...ion.user_add_role_action.administrator.yml |    14 -
 ...on.user_add_role_action.content_editor.yml |    14 -
 ...ction.user_add_role_action.fedoraadmin.yml |    14 -
 .../system.action.user_block_user_action.yml  |    13 -
 .../system.action.user_cancel_user_action.yml |    13 -
 ....user_remove_role_action.administrator.yml |    14 -
 ...user_remove_role_action.content_editor.yml |    14 -
 ...on.user_remove_role_action.fedoraadmin.yml |    14 -
 ...system.action.user_unblock_user_action.yml |    13 -
 ...e_a_service_file_from_an_original_file.yml |    22 -
 ....video_generate_a_thumbnail_at_0_00_03.yml |    20 -
 ...rate_a_thumbnail_from_an_original_file.yml |    22 -
 config/export/system.advisories.yml           |     4 -
 config/export/system.cron.yml                 |     6 -
 config/export/system.date.yml                 |    11 -
 config/export/system.diff.yml                 |     5 -
 config/export/system.file.yml                 |     5 -
 config/export/system.image.gd.yml             |     3 -
 config/export/system.image.yml                |     3 -
 config/export/system.logging.yml              |     3 -
 config/export/system.mail.yml                 |     4 -
 config/export/system.maintenance.yml          |     4 -
 config/export/system.menu.account.yml         |    10 -
 config/export/system.menu.admin.yml           |    10 -
 config/export/system.menu.devel.yml           |    13 -
 config/export/system.menu.footer.yml          |    10 -
 config/export/system.menu.main.yml            |    10 -
 config/export/system.menu.tools.yml           |    10 -
 config/export/system.performance.yml          |    17 -
 config/export/system.rss.yml                  |     4 -
 config/export/system.site.yml                 |    14 -
 config/export/system.theme.global.yml         |    16 -
 config/export/system.theme.yml                |     4 -
 config/export/taxonomy.settings.yml           |     5 -
 .../taxonomy.vocabulary.copyright_and_use.yml |     8 -
 .../taxonomy.vocabulary.corporate_body.yml    |    10 -
 config/export/taxonomy.vocabulary.country.yml |    10 -
 config/export/taxonomy.vocabulary.family.yml  |    10 -
 .../taxonomy.vocabulary.frequencies.yml       |    10 -
 config/export/taxonomy.vocabulary.genre.yml   |    10 -
 .../taxonomy.vocabulary.geo_location.yml      |    10 -
 .../taxonomy.vocabulary.islandora_display.yml |    10 -
 ...axonomy.vocabulary.islandora_media_use.yml |    10 -
 .../taxonomy.vocabulary.islandora_models.yml  |    10 -
 .../taxonomy.vocabulary.issuance_modes.yml    |    10 -
 .../export/taxonomy.vocabulary.language.yml   |    10 -
 config/export/taxonomy.vocabulary.person.yml  |    10 -
 .../taxonomy.vocabulary.physical_form.yml     |    10 -
 .../taxonomy.vocabulary.resource_types.yml    |    10 -
 config/export/taxonomy.vocabulary.subject.yml |    10 -
 config/export/taxonomy.vocabulary.tags.yml    |    10 -
 .../taxonomy.vocabulary.temporal_subjects.yml |    10 -
 config/export/taxonomy_manager.settings.yml   |     2 -
 config/export/text.settings.yml               |     3 -
 config/export/tour.tour.block-layout.yml      |    48 -
 config/export/tour.tour.language-add.yml      |    34 -
 config/export/tour.tour.language-edit.yml     |    48 -
 config/export/tour.tour.language.yml          |    55 -
 .../tour.tour.search-api-index-fields.yml     |    91 -
 .../tour.tour.search-api-index-form.yml       |    65 -
 .../tour.tour.search-api-index-processors.yml |    42 -
 config/export/tour.tour.search-api-index.yml  |    98 -
 .../tour.tour.search-api-server-form.yml      |    44 -
 config/export/tour.tour.search-api-server.yml |    49 -
 config/export/tour.tour.views-ui.yml          |    88 -
 config/export/update.settings.yml             |    13 -
 config/export/user.flood.yml                  |     7 -
 config/export/user.mail.yml                   |   116 -
 config/export/user.role.administrator.yml     |    11 -
 config/export/user.role.anonymous.yml         |    24 -
 config/export/user.role.authenticated.yml     |    30 -
 config/export/user.role.content_editor.yml    |    48 -
 config/export/user.role.fedoraadmin.yml       |    11 -
 config/export/user.settings.yml               |    18 -
 config/export/views.settings.yml              |    49 -
 .../export/views.view.all_taxonomy_terms.yml  |   173 -
 config/export/views.view.archive.yml          |   247 -
 .../views.view.article_mods_mapping.yml       |   330 -
 config/export/views.view.block_content.yml    |   543 -
 .../export/views.view.collection_children.yml |   810 -
 .../views.view.collection_object_models.yml   |   252 -
 config/export/views.view.comment.yml          |  1598 --
 config/export/views.view.comments_recent.yml  |   270 -
 config/export/views.view.content.yml          |  1259 -
 config/export/views.view.content_recent.yml   |   323 -
 config/export/views.view.display_media.yml    |   683 -
 config/export/views.view.file_checksum.yml    |   209 -
 config/export/views.view.files.yml            |  1178 -
 config/export/views.view.frontpage.yml        |   252 -
 config/export/views.view.glossary.yml         |   473 -
 config/export/views.view.group_media.yml      |   917 -
 config/export/views.view.group_members.yml    |   738 -
 config/export/views.view.group_nodes.yml      |   957 -
 ...ws.view.home_page_featured_collections.yml |   670 -
 config/export/views.view.iiif_manifest.yml    |   686 -
 config/export/views.view.manage_members.yml   |   354 -
 config/export/views.view.media.yml            |  2089 --
 config/export/views.view.media_of.yml         |  1234 -
 config/export/views.view.members.yml          |   305 -
 config/export/views.view.missing_media.yml    |  4404 ---
 config/export/views.view.newspapers.yml       |   676 -
 config/export/views.view.non_fedora_files.yml |   199 -
 config/export/views.view.oai_pmh.yml          |   461 -
 .../views.view.openseadragon_media_evas.yml   |   459 -
 config/export/views.view.pdfjs_media_evas.yml |   459 -
 config/export/views.view.reorder_children.yml |   271 -
 ...iew.search_within_this_collection_link.yml |   223 -
 .../export/views.view.solr_search_content.yml |  1059 -
 config/export/views.view.taxonomy_term.yml    |   319 -
 config/export/views.view.taxonomy_terms.yml   |   994 -
 .../export/views.view.term_from_term_name.yml |   322 -
 config/export/views.view.term_from_uri.yml    |   352 -
 .../export/views.view.terms_in_vocabulary.yml |   242 -
 config/export/views.view.thumbnail.yml        |   308 -
 .../views.view.thumbnail_of_first_child.yml   |   272 -
 .../views.view.top_level_collections.yml      |   506 -
 .../export/views.view.user_admin_people.yml   |   927 -
 config/export/views.view.watchdog.yml         |   712 -
 config/export/views.view.who_s_new.yml        |   197 -
 config/export/views.view.who_s_online.yml     |   226 -
 config/export/views_field_view.settings.yml   |     3 -
 ...block.block.idc_ui_theme_boots_content.yml |     2 +-
 ...ui_theme_boots_creatorsandcontributors.yml |     2 +-
 ...s_exposedformsolr_search_contentpage_1.yml |     2 +-
 .../block.block.idc_ui_theme_boots_help.yml   |     4 +-
 ...block.idc_ui_theme_boots_local_actions.yml |     2 +-
 ...k.block.idc_ui_theme_boots_local_tasks.yml |     2 +-
 ...lock.block.idc_ui_theme_boots_memberof.yml |     6 +-
 ...ck.block.idc_ui_theme_boots_page_title.yml |     6 +-
 ....block.idc_ui_theme_boots_physicalform.yml |     2 +-
 ....block.idc_ui_theme_boots_resourcetype.yml |     2 +-
 ...block.block.idc_ui_theme_boots_subject.yml |     2 +-
 ...k.block.idc_ui_theme_boots_subjectname.yml |     2 +-
 ...ock.idc_ui_theme_boots_temporalsubject.yml |     2 +-
 .../block.block.idc_ui_theme_boots_year.yml   |     2 +-
 config/sync/block.block.memberof.yml          |     6 +-
 config/sync/block.block.pagetitle.yml         |    50 -
 config/sync/block.block.search.yml            |    15 +-
 ...olrsearchcontentadvancedsearchforblock.yml |     2 +-
 ...solrsearchcontentadvancedsearchforpage.yml |     6 +-
 ...earchcontentsearchresultspagerforblock.yml |     2 +-
 ...searchcontentsearchresultspagerforpage.yml |     2 +-
 ...ews_block__solr_search_content_block_1.yml |    24 +-
 config/sync/block.block.year.yml              |     6 +-
 config/sync/block.block.yearswc.yml           |     6 +-
 .../context.context.audio_original_file.yml   |     2 +-
 .../context.context.image_original_file.yml   |     2 +-
 config/sync/context.context.pages.yml         |     2 +-
 .../context.context.pdf_original_file.yml     |     2 +-
 .../context.context.video_original_file.yml   |     2 +-
 ..._display.node.islandora_object.default.yml |    38 +-
 config/sync/core.extension.yml                |     1 +
 ...torage.group_relationship.group_roles.yml} |     8 +-
 .../sync/pathauto.pattern.group_content.yml   |    18 -
 .../pathauto.pattern.group_relationship.yml   |    18 +
 .../search_api.index.default_solr_index.yml   |    76 +-
 ...olr_cache.cache_document_default_9_0_0.yml |    17 +
 ..._cache.cache_fieldvalue_default_9_0_0.yml} |    10 +-
 ...solr_cache.cache_filter_default_9_0_0.yml} |    10 +-
 ...ache.cache_persegfilter_default_9_0_0.yml} |    10 +-
 ...cache.cache_queryresult_default_9_0_0.yml} |    10 +-
 ...lr.solr_field_type.text_edge_und_3_6_0.yml |     5 +-
 ...lr.solr_field_type.text_edge_und_4_5_0.yml |     5 +-
 ...lr.solr_field_type.text_edge_und_6_0_0.yml |     7 +-
 ...lr.solr_field_type.text_edge_und_7_0_0.yml |     7 +-
 ...r_field_type.text_edgestring_und_3_6_0.yml |     1 +
 ...r_field_type.text_edgestring_und_4_5_0.yml |     1 +
 ...r_field_type.text_edgestring_und_6_0_0.yml |     3 +-
 ...api_solr.solr_field_type.text_en_3_6_0.yml |    10 +-
 ...api_solr.solr_field_type.text_en_4_5_0.yml |    10 +-
 ...api_solr.solr_field_type.text_en_6_0_0.yml |    12 +-
 ...api_solr.solr_field_type.text_en_7_0_0.yml |    16 +-
 ...r.solr_field_type.text_ngram_und_3_6_0.yml |     5 +-
 ...r.solr_field_type.text_ngram_und_4_5_0.yml |     5 +-
 ...r.solr_field_type.text_ngram_und_6_0_0.yml |     7 +-
 ...r.solr_field_type.text_ngram_und_7_0_0.yml |     7 +-
 ..._field_type.text_ngramstring_und_3_6_0.yml |     1 +
 ..._field_type.text_ngramstring_und_4_5_0.yml |     1 +
 ..._field_type.text_ngramstring_und_6_0_0.yml |     3 +-
 ...solr_field_type.text_phonetic_en_7_0_0.yml |     7 +-
 ...olr_field_type.text_phonetic_und_7_0_0.yml |     7 +-
 ....solr_field_type.text_string_und_6_0_0.yml |     3 +-
 ...pi_solr.solr_field_type.text_und_3_6_0.yml |     6 +-
 ...pi_solr.solr_field_type.text_und_4_5_0.yml |     6 +-
 ...pi_solr.solr_field_type.text_und_6_0_0.yml |    12 +-
 ...pi_solr.solr_field_type.text_und_7_0_0.yml |    12 +-
 config/sync/system.date.yml                   |     4 +-
 config/sync/system.file.yml                   |     2 +-
 config/sync/system.logging.yml                |     2 +-
 config/sync/views.view.content.yml            |   165 +-
 config/sync/views.view.group_media.yml        |   131 +-
 config/sync/views.view.group_members.yml      |    82 +-
 config/sync/views.view.group_nodes.yml        |    88 +-
 .../sync/views.view.solr_search_content.yml   |    47 +-
 web/.ht.router.php                            |     6 +
 web/.htaccess                                 |     8 +-
 web/core/.cspell.json                         |     3 +-
 web/core/.env.example                         |     4 +
 web/core/.eslintrc.json                       |     3 +-
 web/core/.stylelintrc.json                    |     4 +-
 web/core/COPYRIGHT.txt                        |    47 +-
 web/core/INSTALL.txt                          |     7 +-
 web/core/MAINTAINERS.txt                      |    29 +-
 .../scaffold/files/default.services.yml       |    27 +-
 .../scaffold/files/default.settings.php       |   130 +-
 .../scaffold/files/example.settings.local.php |     2 +-
 web/core/assets/scaffold/files/gitattributes  |    16 +-
 web/core/assets/scaffold/files/ht.router.php  |     6 +
 web/core/assets/scaffold/files/htaccess       |     8 +-
 web/core/assets/scaffold/files/robots.txt     |     4 +
 web/core/assets/scaffold/files/web.config     |     2 +-
 web/core/composer.json                        |    11 +-
 .../config/schema/core.data_types.schema.yml  |    12 +-
 web/core/config/schema/core.entity.schema.yml |    12 +-
 web/core/core.api.php                         |    72 +
 web/core/core.libraries.yml                   |   149 +-
 web/core/core.services.yml                    |    53 +-
 web/core/includes/common.inc                  |     8 +-
 web/core/includes/errors.inc                  |     2 +-
 web/core/includes/file.inc                    |     2 +-
 web/core/includes/form.inc                    |     4 +-
 web/core/includes/install.core.inc            |    91 +-
 web/core/includes/install.inc                 |    24 +-
 web/core/includes/module.inc                  |     4 +-
 web/core/includes/theme.inc                   |    10 +-
 web/core/includes/theme.maintenance.inc       |     8 +-
 web/core/includes/update.inc                  |    14 +-
 web/core/install.php                          |     2 +-
 web/core/lib/Drupal.php                       |    22 +-
 .../Drupal/Component/Annotation/composer.json |    42 +-
 .../Drupal/Component/Assertion/composer.json  |    31 +-
 .../lib/Drupal/Component/Bridge/composer.json |    34 +-
 .../Component/ClassFinder/composer.json       |    31 +-
 .../Drupal/Component/Datetime/composer.json   |    36 +-
 .../DependencyInjection/Container.php         |    12 +-
 .../Dumper/OptimizedPhpArrayDumper.php        |     1 +
 .../DependencyInjection/composer.json         |    53 +-
 .../Component/Diff/Engine/DiffEngine.php      |     1 +
 .../lib/Drupal/Component/Diff/composer.json   |    31 +-
 .../Drupal/Component/Discovery/composer.json  |    38 +-
 .../Component/EventDispatcher/composer.json   |    37 +-
 .../Drupal/Component/FileCache/composer.json  |    31 +-
 .../Component/FileSecurity/composer.json      |    31 +-
 .../Drupal/Component/FileSystem/composer.json |    31 +-
 .../Component/FrontMatter/composer.json       |    36 +-
 .../lib/Drupal/Component/Gettext/PoHeader.php |     8 +-
 .../lib/Drupal/Component/Gettext/PoItem.php   |    12 +-
 .../Component/Gettext/PoStreamInterface.php   |     2 +-
 .../Component/Gettext/PoStreamReader.php      |     9 +-
 .../Drupal/Component/Gettext/composer.json    |    41 +-
 web/core/lib/Drupal/Component/Graph/Graph.php |     2 +-
 .../lib/Drupal/Component/Graph/composer.json  |    31 +-
 .../Component/HttpFoundation/composer.json    |    33 +-
 .../MTimeProtectedFastFileStorage.php         |     3 +-
 .../Drupal/Component/PhpStorage/composer.json |    36 +-
 .../Plugin/ContextAwarePluginBase.php         |     7 +
 .../Plugin/Definition/PluginDefinition.php    |     1 +
 .../Discovery/StaticDiscoveryDecorator.php    |     2 +-
 .../lib/Drupal/Component/Plugin/composer.json |    41 +-
 .../Component/ProxyBuilder/composer.json      |    32 +-
 .../Component/Render/FormattableMarkup.php    |    18 +-
 .../lib/Drupal/Component/Render/composer.json |    36 +-
 .../Component/Serialization/composer.json     |    33 +-
 .../Transliteration/PhpTransliteration.php    |     2 +
 .../Component/Transliteration/composer.json   |    33 +-
 .../lib/Drupal/Component/Utility/Color.php    |     3 +-
 .../Component/Utility/DeprecatedArray.php     |     2 +
 .../lib/Drupal/Component/Utility/Html.php     |    12 +-
 .../lib/Drupal/Component/Utility/Unicode.php  |     5 +-
 .../Drupal/Component/Utility/UrlHelper.php    |     2 +-
 web/core/lib/Drupal/Component/Utility/Xss.php |    14 +-
 .../Drupal/Component/Utility/composer.json    |    31 +-
 .../Drupal/Component/Uuid/UuidInterface.php   |     2 +-
 .../lib/Drupal/Component/Uuid/composer.json   |    36 +-
 .../Drupal/Component/Version/composer.json    |    31 +-
 .../Core/Access/AccessResultInterface.php     |    14 +-
 .../Drupal/Core/Access/CsrfAccessCheck.php    |    16 +-
 .../Core/Action/Plugin/Action/EmailAction.php |    14 +-
 .../Core/Action/Plugin/Action/GotoAction.php  |     4 +-
 .../Action/Plugin/Action/MessageAction.php    |     4 +-
 .../lib/Drupal/Core/Ajax/AfterCommand.php     |     4 +-
 .../Ajax/AjaxResponseAttachmentsProcessor.php |     4 +-
 .../lib/Drupal/Core/Ajax/AppendCommand.php    |     4 +-
 .../lib/Drupal/Core/Ajax/BeforeCommand.php    |     4 +-
 web/core/lib/Drupal/Core/Ajax/HtmlCommand.php |     2 +-
 .../lib/Drupal/Core/Ajax/InsertCommand.php    |     6 +-
 .../Drupal/Core/Ajax/OpenDialogCommand.php    |    10 +-
 .../lib/Drupal/Core/Ajax/PrependCommand.php   |     4 +-
 .../lib/Drupal/Core/Ajax/ReplaceCommand.php   |     2 +-
 .../Drupal/Core/Annotation/QueueWorker.php    |    19 +-
 .../lib/Drupal/Core/Asset/AssetResolver.php   |    13 +-
 .../lib/Drupal/Core/Asset/CssOptimizer.php    |     6 +-
 .../Core/Asset/LibraryDiscoveryParser.php     |    12 +
 .../Drupal/Core/Block/BlockPluginTrait.php    |     2 +-
 .../Core/Cache/CacheTagsChecksumTrait.php     |     2 +-
 .../Cache/Context/CacheContextsManager.php    |     5 +
 .../lib/Drupal/Core/Cache/DatabaseBackend.php |     4 +-
 web/core/lib/Drupal/Core/Cache/PhpBackend.php |     7 +-
 .../Command/GenerateProxyClassApplication.php |     3 +
 .../Command/GenerateProxyClassCommand.php     |     3 +
 .../lib/Drupal/Core/Composer/Composer.php     |    30 +
 .../lib/Drupal/Core/Config/ConfigImporter.php |    59 +-
 .../Drupal/Core/Config/DatabaseStorage.php    |    11 +-
 .../Config/Entity/ConfigDependencyManager.php |     2 +-
 .../Core/Config/Entity/ConfigEntityBase.php   |     1 +
 .../Core/Config/Entity/Query/QueryFactory.php |    10 +
 .../lib/Drupal/Core/Config/FileStorage.php    |     5 +-
 .../Core/Config/Schema/ArrayElement.php       |     3 +-
 .../Core/Config/Schema/SchemaCheckTrait.php   |     2 +-
 .../Drupal/Core/Config/StorageComparer.php    |     7 +
 .../Config/TypedConfigManagerInterface.php    |     7 +-
 .../Drupal/Core/Controller/TitleResolver.php  |    13 +-
 .../lib/Drupal/Core/CoreServiceProvider.php   |     2 -
 web/core/lib/Drupal/Core/Cron.php             |     7 +-
 web/core/lib/Drupal/Core/CronInterface.php    |     2 +-
 .../lib/Drupal/Core/Database/Connection.php   |    90 +-
 .../lib/Drupal/Core/Database/Database.php     |    29 +-
 .../Core/Database/DatabaseException.php       |     7 +-
 .../Database/DatabaseExceptionWrapper.php     |     3 +-
 .../Drupal/Core/Database/ExceptionHandler.php |     7 +-
 .../Drupal/Core/Database/Install/Tasks.php    |     4 +-
 web/core/lib/Drupal/Core/Database/Log.php     |     4 +-
 .../Database/Query/AlterableInterface.php     |     8 +-
 .../Database/Query/ConditionInterface.php     |     4 +-
 .../lib/Drupal/Core/Database/Query/Insert.php |     2 +-
 .../lib/Drupal/Core/Database/Query/Merge.php  |     3 +-
 .../Database/Query/PlaceholderInterface.php   |     2 +-
 .../lib/Drupal/Core/Database/Query/Select.php |    20 +-
 .../Core/Database/Query/SelectInterface.php   |    37 +-
 .../Drupal/Core/Database/Query/Truncate.php   |    18 +-
 .../lib/Drupal/Core/Database/Query/Update.php |     2 +-
 .../Core/Database/RowCountException.php       |     2 +-
 web/core/lib/Drupal/Core/Database/Schema.php  |    23 +-
 .../Core/Database/StatementInterface.php      |    56 +-
 .../Core/Database/StatementPrefetch.php       |     9 +-
 .../Drupal/Core/Database/StatementWrapper.php |     2 +-
 ...ctionExplicitCommitNotAllowedException.php |     2 +-
 .../lib/Drupal/Core/Database/database.api.php |    13 +-
 .../Drupal/Core/Datetime/DateFormatter.php    |    18 +-
 .../lib/Drupal/Core/Datetime/DateHelper.php   |    34 +-
 .../Drupal/Core/Datetime/Element/Datelist.php |     2 +-
 .../DependencySerializationTraitPass.php      |    34 +-
 .../Compiler/ProxyServicesPass.php            |     2 +
 .../Core/DependencyInjection/Container.php    |    12 -
 .../DependencyInjection/ContainerBuilder.php  |    71 +-
 .../DependencySerializationTrait.php          |    56 +-
 .../DependencyInjection/YamlFileLoader.php    |   146 +-
 web/core/lib/Drupal/Core/DrupalKernel.php     |   103 +-
 .../lib/Drupal/Core/DrupalKernelInterface.php |    18 +-
 .../Annotation/EntityReferenceSelection.php   |     5 +-
 .../Core/Entity/ContentEntityStorageBase.php  |     3 -
 .../Entity/Controller/EntityController.php    |     7 +-
 .../Controller/EntityViewController.php       |     2 -
 .../Entity/EntityAccessControlHandler.php     |     2 +
 .../Core/Entity/EntityAutocompleteMatcher.php |     2 +-
 .../Core/Entity/EntityChangedInterface.php    |     2 +
 .../Entity/EntityCreateAnyAccessCheck.php     |    14 +-
 ...EntityDefinitionUpdateManagerInterface.php |     5 +-
 .../Drupal/Core/Entity/EntityDisplayBase.php  |    15 +-
 .../Drupal/Core/Entity/EntityFieldManager.php |    17 +-
 .../Core/Entity/EntityPublishedInterface.php  |     2 +
 .../Core/Entity/EntityResolverManager.php     |     7 +
 .../Core/Entity/EntityStorageInterface.php    |     4 +-
 .../lib/Drupal/Core/Entity/EntityType.php     |    12 +-
 .../Core/Entity/EntityTypeInterface.php       |    18 +-
 .../Entity/EntityViewBuilderInterface.php     |     2 +-
 .../Derivative/DefaultSelectionDeriver.php    |     4 +-
 .../EntityReferenceSelection/Broken.php       |     2 +-
 .../Drupal/Core/Entity/Query/QueryBase.php    |     5 +
 .../Core/Entity/Query/Sql/Condition.php       |    11 +-
 .../Entity/Query/Sql/ConditionAggregate.php   |    11 +-
 .../Drupal/Core/Entity/Query/Sql/Query.php    |     7 +-
 .../Core/Entity/RevisionLogInterface.php      |     2 +
 .../Core/Entity/RevisionableInterface.php     |     4 +-
 .../Core/Entity/Sql/DefaultTableMapping.php   |     5 +-
 .../Core/Entity/SynchronizableEntityTrait.php |     3 +-
 .../Core/Entity/TranslatableInterface.php     |     2 +
 .../lib/Drupal/Core/Entity/entity.api.php     |    36 +-
 .../ConfigImportSubscriber.php                |    12 +-
 .../ExceptionTestSiteSubscriber.php           |    63 -
 .../Fast404ExceptionHtmlSubscriber.php        |    73 +-
 .../FinalExceptionSubscriber.php              |     2 +-
 .../FinishResponseSubscriber.php              |     9 +-
 .../MaintenanceModeSubscriber.php             |     2 +-
 .../RedirectLeadingSlashesSubscriber.php      |     8 +-
 .../RedirectResponseSubscriber.php            |     5 +
 .../lib/Drupal/Core/Extension/Extension.php   |     1 +
 .../ModuleDependencyMessageTrait.php          |     5 +-
 .../Drupal/Core/Extension/ModuleHandler.php   |     6 +-
 .../Core/Extension/ModuleHandlerInterface.php |     8 +-
 .../Drupal/Core/Extension/ModuleInstaller.php |     2 +-
 .../Core/Extension/ThemeHandlerInterface.php  |     2 +-
 .../lib/Drupal/Core/Extension/module.api.php  |   101 +-
 .../Core/Field/Annotation/FieldFormatter.php  |     7 +-
 .../Core/Field/Annotation/FieldWidget.php     |     6 +-
 .../lib/Drupal/Core/Field/FieldConfigBase.php |     6 +-
 .../Core/Field/FormatterPluginManager.php     |     8 +-
 .../FieldFormatter/BasicStringFormatter.php   |     3 -
 .../Field/FieldFormatter/DecimalFormatter.php |     8 +-
 .../EntityReferenceEntityFormatter.php        |     4 +-
 .../EntityReferenceLabelFormatter.php         |     4 +-
 .../FieldFormatter/NumericFormatterBase.php   |    18 +-
 .../Field/FieldFormatter/StringFormatter.php  |     3 -
 .../Plugin/Field/FieldType/DecimalItem.php    |    11 +-
 .../Plugin/Field/FieldType/EmailItem.php      |     8 +-
 .../Field/FieldType/EntityReferenceItem.php   |    20 +-
 .../Plugin/Field/FieldType/IntegerItem.php    |     5 +-
 .../Field/FieldType/NumericItemBase.php       |    23 +-
 .../Plugin/Field/FieldType/StringItem.php     |     6 +-
 .../Plugin/Field/FieldType/StringItemBase.php |     2 -
 .../FieldWidget/BooleanCheckboxWidget.php     |     4 +-
 .../Field/FieldWidget/EmailDefaultWidget.php  |    10 +-
 .../EntityReferenceAutocompleteWidget.php     |    22 +-
 .../Plugin/Field/FieldWidget/NumberWidget.php |     8 +-
 .../FieldWidget/OptionsButtonsWidget.php      |     2 +-
 .../Field/FieldWidget/OptionsSelectWidget.php |     6 +-
 .../Field/FieldWidget/OptionsWidgetBase.php   |    28 +-
 .../FieldWidget/StringTextareaWidget.php      |    10 +-
 .../FieldWidget/StringTextfieldWidget.php     |    10 +-
 web/core/lib/Drupal/Core/Field/WidgetBase.php |     3 +-
 .../Drupal/Core/Field/WidgetPluginManager.php |     8 +-
 web/core/lib/Drupal/Core/File/FileSystem.php  |     3 +-
 .../Drupal/Core/File/FileSystemInterface.php  |     7 +-
 .../MimeType/ExtensionMimeTypeGuesser.php     |     2 +-
 .../Core/File/MimeType/MimeTypeGuesser.php    |     2 +-
 web/core/lib/Drupal/Core/File/file.api.php    |     2 +-
 .../Drupal/Core/FileTransfer/FileTransfer.php |    66 +-
 .../lib/Drupal/Core/Flood/FloodInterface.php  |     7 +-
 web/core/lib/Drupal/Core/Form/FormBuilder.php |    13 +-
 web/core/lib/Drupal/Core/Form/FormState.php   |    46 +-
 .../lib/Drupal/Core/Image/ImageInterface.php  |     3 +-
 .../ImageToolkitOperationBase.php             |     3 +-
 .../Exception/AlreadyInstalledException.php   |    11 +-
 .../Core/Installer/Form/SiteSettingsForm.php  |     2 +-
 .../Core/Installer/InstallerRedirectTrait.php |     3 +-
 .../NormalInstallerServiceProvider.php        |     2 +-
 .../Drupal/Core/Language/LanguageManager.php  |    10 +-
 .../lib/Drupal/Core/Layout/LayoutDefault.php  |     1 +
 web/core/lib/Drupal/Core/Link.php             |     2 +-
 web/core/lib/Drupal/Core/Mail/MailManager.php |     8 +-
 .../Drupal/Core/Mail/Plugin/Mail/PhpMail.php  |    67 +-
 web/core/lib/Drupal/Core/Menu/menu.api.php    |    18 +-
 .../Core/ParamConverter/EntityConverter.php   |    13 +-
 .../Core/Password/PhpassHashedPassword.php    |     2 +
 .../Core/Path/PathValidatorInterface.php      |     6 +-
 .../Core/Plugin/ContextAwarePluginBase.php    |     2 +-
 .../Core/Plugin/DefaultPluginManager.php      |    24 +-
 .../Discovery/AnnotatedClassDiscovery.php     |     4 +
 .../lib/Drupal/Core/Queue/DatabaseQueue.php   |     2 +-
 .../lib/Drupal/Core/Queue/QueueInterface.php  |     4 +-
 .../lib/Drupal/Core/Queue/QueueWorkerBase.php |     2 +
 .../Core/Queue/QueueWorkerInterface.php       |     2 +
 .../AttachmentsResponseProcessorInterface.php |     4 +
 .../Drupal/Core/Render/BubbleableMetadata.php |     4 +-
 web/core/lib/Drupal/Core/Render/Element.php   |     6 +-
 .../Drupal/Core/Render/Element/Details.php    |     2 +-
 .../lib/Drupal/Core/Render/Element/File.php   |    26 +
 .../Core/Render/Element/PathElement.php       |     2 +-
 .../Core/Render/Element/StatusMessages.php    |     4 +-
 .../Core/Render/Element/Tableselect.php       |    10 +-
 .../HtmlResponseAttachmentsProcessor.php      |     8 +-
 .../Core/Render/MainContent/HtmlRenderer.php  |    10 +-
 web/core/lib/Drupal/Core/Render/Renderer.php  |    79 +
 web/core/lib/Drupal/Core/Render/theme.api.php |    52 +-
 .../OutboundRouteProcessorInterface.php       |     3 -
 .../Enhancer/ParamConversionEnhancer.php      |     7 +
 .../Drupal/Core/Routing/FilterInterface.php   |     5 +-
 .../Core/Routing/LazyRouteCollection.php      |     2 +-
 .../lib/Drupal/Core/Routing/NullGenerator.php |     2 +-
 .../lib/Drupal/Core/Routing/UrlGenerator.php  |    22 +-
 .../Core/Routing/UrlGeneratorInterface.php    |     4 +-
 .../Core/Session/SessionConfiguration.php     |     7 +-
 .../lib/Drupal/Core/Session/UserSession.php   |     1 +
 web/core/lib/Drupal/Core/Site/Settings.php    |     4 +
 .../StreamWrapper/StreamWrapperInterface.php  |    11 +-
 .../StreamWrapper/StreamWrapperManager.php    |    31 +
 .../Drupal/Core/Template/TwigEnvironment.php  |     3 +-
 .../Drupal/Core/Template/TwigExtension.php    |     4 +-
 .../Drupal/Core/Template/TwigNodeVisitor.php  |     5 +
 .../Core/Template/TwigSandboxPolicy.php       |     5 +-
 .../Core/Test/FunctionalTestSetupTrait.php    |     8 +-
 .../Core/Test/PerformanceTestRecorder.php     |     4 +-
 .../lib/Drupal/Core/Test/TestDatabase.php     |     2 +
 web/core/lib/Drupal/Core/Test/TestKernel.php  |    22 +
 .../lib/Drupal/Core/Test/TestSetupTrait.php   |     2 +-
 web/core/lib/Drupal/Core/Theme/Registry.php   |    14 +-
 .../Drupal/Core/Theme/ThemeInitialization.php |     7 -
 .../Drupal/Core/TypedData/DataDefinition.php  |     4 +-
 .../TypedData/DataDefinitionInterface.php     |    11 +-
 .../TypedData/Plugin/DataType/Language.php    |     2 +-
 .../RecursiveContextualValidator.php          |     5 +
 web/core/lib/Drupal/Core/Updater/Updater.php  |    10 +
 web/core/lib/Drupal/Core/Url.php              |    14 +-
 web/core/lib/Drupal/Core/Utility/Error.php    |     2 +-
 .../lib/Drupal/Core/Utility/LinkGenerator.php |     4 +-
 .../lib/Drupal/Core/Utility/ProjectInfo.php   |     2 +-
 .../lib/Drupal/Core/Utility/ThemeRegistry.php |     2 +-
 web/core/lib/Drupal/Core/Utility/Token.php    |     4 +-
 .../lib/Drupal/Core/Utility/token.api.php     |     2 +-
 .../Core/Validation/Annotation/Constraint.php |     9 +-
 .../Validation/ConstraintValidatorFactory.php |     5 +
 .../Constraint/UniqueFieldValueValidator.php  |     2 +-
 .../Core/Validation/TranslatorInterface.php   |     2 +-
 web/core/misc/active-link.js                  |     5 -
 web/core/misc/ajax.es6.js                     |   288 +-
 web/core/misc/ajax.js                         |   246 +-
 web/core/misc/announce.js                     |     6 -
 web/core/misc/autocomplete.js                 |    26 -
 web/core/misc/batch.js                        |     4 -
 web/core/misc/checkbox.js                     |     1 -
 web/core/misc/collapse.js                     |    10 -
 web/core/misc/cspell/dictionary.txt           |   112 +-
 web/core/misc/date.js                         |    24 +-
 web/core/misc/debounce.js                     |     7 -
 web/core/misc/details-aria.js                 |     1 -
 web/core/misc/details-summarized-content.js   |     4 -
 web/core/misc/dialog/dialog.ajax.js           |    24 -
 web/core/misc/dialog/dialog.jquery-ui.js      |    15 +-
 web/core/misc/dialog/dialog.js                |     7 -
 web/core/misc/dialog/dialog.position.js       |    11 -
 web/core/misc/dialog/off-canvas.base.css      |   194 +-
 web/core/misc/dialog/off-canvas.es6.js        |     2 +-
 web/core/misc/dialog/off-canvas.js            |    16 +-
 web/core/misc/dialog/off-canvas.reset.css     |   870 +-
 web/core/misc/displace.js                     |    21 -
 web/core/misc/dropbutton/dropbutton.css       |     2 +-
 web/core/misc/dropbutton/dropbutton.js        |     7 -
 web/core/misc/drupal.init.js                  |     5 -
 web/core/misc/drupal.js                       |    47 +-
 web/core/misc/drupalSettingsLoader.js         |     2 -
 web/core/misc/entity-form.js                  |     5 -
 web/core/misc/form.js                         |    26 -
 web/core/misc/jquery.cookie.shim.js           |    24 +-
 web/core/misc/jquery.once.bc.js               |     7 -
 web/core/misc/jquery.tabbable.shim.es6.js     |     2 +-
 web/core/misc/jquery.tabbable.shim.js         |     6 +-
 web/core/misc/machine-name.js                 |    20 -
 web/core/misc/message.js                      |    25 +-
 web/core/misc/modernizr-additional-tests.js   |    17 +-
 web/core/misc/polyfills/array.find.js         |     8 -
 web/core/misc/polyfills/array.includes.js     |    11 -
 web/core/misc/polyfills/customevent.js        |     3 -
 web/core/misc/polyfills/element.closest.js    |     3 -
 web/core/misc/polyfills/element.matches.js    |     1 -
 web/core/misc/polyfills/nodelist.foreach.js   |     1 -
 web/core/misc/polyfills/object.assign.js      |     5 -
 web/core/misc/polyfills/string.includes.js    |     3 -
 web/core/misc/position.es6.js                 |     5 +-
 web/core/misc/position.js                     |    45 +-
 web/core/misc/progress.js                     |    10 -
 web/core/misc/states.es6.js                   |    11 +-
 web/core/misc/states.js                       |    54 +-
 web/core/misc/tabbingmanager.js               |    37 +-
 web/core/misc/tabledrag.es6.js                |     2 +-
 web/core/misc/tabledrag.js                    |   169 +-
 web/core/misc/tableheader.js                  |    20 -
 web/core/misc/tableresponsive.js              |     9 -
 web/core/misc/tableselect.js                  |    15 -
 web/core/misc/timezone.js                     |     6 -
 web/core/misc/touchevents-test.js             |     1 -
 web/core/misc/vertical-tabs.es6.js            |    15 +
 web/core/misc/vertical-tabs.js                |    24 +-
 .../modules/action/src/ActionListBuilder.php  |     2 +-
 .../src/Functional/ConfigurationTest.php      |     3 +-
 .../src/Unit/Menu/ActionLocalTasksTest.php    |     3 +
 web/core/modules/aggregator/aggregator.module |     5 +-
 .../help_topics/aggregator.creating.html.twig |     9 +-
 .../help_topics/aggregator.managing.html.twig |     7 +-
 .../src/Controller/AggregatorController.php   |     2 +-
 .../AggregatorTitleFormatter.php              |     6 +-
 .../aggregator/fetcher/DefaultFetcher.php     |     4 +-
 .../aggregator/parser/DefaultParser.php       |     5 +-
 .../aggregator/processor/DefaultProcessor.php |    18 +-
 ...ggregator_display_configurable_test.module |     3 +-
 .../aggregator/processor/TestProcessor.php    |     4 +-
 .../tests/src/Functional/AddFeedTest.php      |     3 +
 .../AggregatorDisplayConfigurableTest.php     |     9 +-
 .../Functional/AggregatorRenderingTest.php    |     5 +
 .../migrate_drupal_ui/d6/UpgradeTest.php      |     1 -
 .../d7/MultilingualReviewPageTest.php         |     2 +-
 .../d7/NoMultilingualReviewPageTest.php       |     2 +-
 .../migrate_drupal_ui/d7/UpgradeTest.php      |     3 +-
 .../tests/src/Kernel/AggregatorTitleTest.php  |     2 +-
 .../Kernel/Migrate/d6/MigrateBlockTest.php    |    13 +-
 .../AggregatorPluginSettingsBaseTest.php      |     9 +-
 .../Plugin/migrate/destination/BlockedIp.php  |     2 +
 .../Migrate/d7/MigrateBlockedIpsTest.php      |     4 +-
 .../basic_auth/basic_auth.services.yml        |     8 +-
 .../tests/src/Traits/BasicAuthTestTrait.php   |     2 +-
 web/core/modules/big_pipe/js/big_pipe.es6.js  |     5 +
 web/core/modules/big_pipe/js/big_pipe.js      |    17 +-
 .../src/BigPipePlaceholderTestCases.php       |    14 +-
 .../tests/src/Functional/BigPipeTest.php      |     6 +-
 .../big_pipe_test_theme.info.yml              |     2 +-
 web/core/modules/block/block.module           |     1 +
 web/core/modules/block/js/block.admin.js      |     5 -
 web/core/modules/block/js/block.es6.js        |    10 +-
 web/core/modules/block/js/block.js            |    35 +-
 .../modules/block/migrations/d6_block.yml     |    10 +-
 .../modules/block/migrations/d7_block.yml     |    35 +-
 .../modules/block/src/BlockListBuilder.php    |    19 +-
 .../src/Plugin/migrate/process/BlockTheme.php |     5 +
 .../migrate/process/BlockVisibility.php       |     5 +-
 .../modules/block/templates/block.html.twig   |     1 +
 .../src/Plugin/Block/TestAccessBlock.php      |     5 +
 .../block_test_specialchars_theme.info.yml    |     2 +-
 .../block_test_theme.info.yml                 |     2 +-
 .../Functional/AssertBlockAppearsTrait.php    |     6 +
 .../src/Functional/BlockAdminThemeTest.php    |    18 +-
 .../tests/src/Functional/BlockCacheTest.php   |     3 +
 .../tests/src/Functional/BlockDemoTest.php    |     3 +-
 .../src/Functional/BlockHiddenRegionTest.php  |     9 +-
 .../src/Functional/BlockHookOperationTest.php |     3 +
 .../tests/src/Functional/BlockHtmlTest.php    |     3 +
 .../src/Functional/BlockInvalidRegionTest.php |     6 +-
 .../src/Functional/BlockLanguageCacheTest.php |     3 +
 .../src/Functional/BlockLanguageTest.php      |     6 +-
 .../src/Functional/BlockRenderOrderTest.php   |     3 +
 .../block/tests/src/Functional/BlockTest.php  |    41 +-
 .../tests/src/Functional/BlockUiTest.php      |    35 +-
 .../Functional/NonDefaultBlockAdminTest.php   |     6 +-
 .../src/FunctionalJavascript/BlockAddTest.php |     4 +-
 .../tests/src/Kernel/BlockStorageUnitTest.php |     3 +
 .../tests/src/Kernel/BlockViewBuilderTest.php |     2 +-
 .../Kernel/Migrate/d6/MigrateBlockTest.php    |    34 +-
 .../Kernel/Migrate/d7/MigrateBlockTest.php    |    24 +-
 .../src/Kernel/NewDefaultThemeBlocksTest.php  |    10 +-
 .../src/Unit/BlockConfigEntityUnitTest.php    |     8 +-
 .../block/tests/src/Unit/BlockFormTest.php    |    12 +-
 .../tests/src/Unit/BlockRepositoryTest.php    |    14 +-
 .../src/Unit/CategoryAutocompleteTest.php     |     5 +-
 .../src/Unit/Menu/BlockLocalTasksTest.php     |     5 +-
 .../DisplayVariant/BlockPageVariantTest.php   |     2 +-
 .../migrate/process/BlockRegionTest.php       |     4 +
 .../block_content/block_content.module        |     7 +
 .../block_content.post_update.php             |     7 +
 .../block_content/src/Entity/BlockContent.php |    24 +-
 .../Functional/BlockContentCreationTest.php   |     2 +-
 .../src/Functional/BlockContentTypeTest.php   |    15 +-
 .../Functional/BlockContentValidationTest.php |     2 +-
 .../tests/src/Functional/PageEditTest.php     |     3 +
 .../Rest/BlockContentTypeResourceTestBase.php |     2 +-
 .../Functional/Views/BlockContentTestBase.php |     3 +
 .../src/Kernel/BlockContentDeletionTest.php   |    21 +
 .../Unit/Menu/BlockContentLocalTasksTest.php  |     5 +-
 web/core/modules/book/book.install            |     2 +-
 web/core/modules/book/book.js                 |     4 -
 web/core/modules/book/book.module             |     2 +-
 web/core/modules/book/book.views.inc          |     2 +-
 .../modules/book/src/BookManagerInterface.php |    18 +-
 .../modules/book/src/BookOutlineStorage.php   |     3 +-
 .../src/Plugin/Block/BookNavigationBlock.php  |     2 +-
 .../book_test_views/book_test_views.info.yml  |     4 +-
 .../src/Functional/BookBreadcrumbTest.php     |    10 +-
 .../Functional/BookContentModerationTest.php  |     2 +-
 .../book/tests/src/Functional/BookTest.php    |     2 +-
 .../tests/src/Functional/BookTestTrait.php    |     6 +-
 .../src/Unit/Menu/BookLocalTasksTest.php      |     3 +
 .../src/Kernel/BreakpointDiscoveryTest.php    |     5 +-
 .../tests/src/Unit/BreakpointTest.php         |     3 +
 .../breakpoint_theme_test.info.yml            |     2 +-
 web/core/modules/ckeditor/ckeditor.info.yml   |     2 +
 .../modules/ckeditor/ckeditor.libraries.yml   |     7 +
 web/core/modules/ckeditor/ckeditor.module     |    73 +
 .../modules/ckeditor/css/ckeditor.admin.css   |     3 +
 web/core/modules/ckeditor/css/ckeditor.css    |    16 +-
 .../modules/ckeditor/js/ckeditor.admin.js     |    39 -
 .../ckeditor/js/ckeditor.drupalimage.admin.js |     5 -
 web/core/modules/ckeditor/js/ckeditor.js      |    22 -
 .../ckeditor/js/ckeditor.language.admin.js    |     3 -
 .../js/ckeditor.off-canvas-css-reset.js       |     8 -
 .../ckeditor/js/ckeditor.stylescombo.admin.js |    10 -
 web/core/modules/ckeditor/js/models/Model.js  |     1 -
 .../ckeditor/js/plugins/drupalimage/plugin.js |    39 -
 .../js/plugins/drupalimagecaption/plugin.js   |    34 -
 .../ckeditor/js/plugins/drupallink/plugin.js  |    37 -
 .../modules/ckeditor/js/views/AuralView.js    |    14 -
 .../ckeditor/js/views/ControllerView.js       |    31 -
 .../modules/ckeditor/js/views/KeyboardView.js |    14 -
 .../modules/ckeditor/js/views/VisualView.js   |     9 -
 .../ckeditor/tests/modules/js/ajax-css.js     |     1 -
 .../tests/modules/src/Form/AjaxCssForm.php    |     2 +-
 .../src/Plugin/CKEditorPlugin/Llama.php       |     2 +
 .../src/Plugin/CKEditorPlugin/LlamaButton.php |     2 +-
 .../LlamaContextualAndButton.php              |     7 +-
 .../src/Plugin/CKEditorPlugin/LlamaCss.php    |     2 +-
 .../src/Functional/CKEditorAdminTest.php      |     4 +
 .../src/Functional/CKEditorLoadingTest.php    |     4 +
 .../CKEditorStylesComboAdminTest.php          |     1 +
 .../CKEditorStylesComboTranslationTest.php    |     1 +
 .../Functional/CKEditorToolbarButtonTest.php  |     1 +
 .../src/FunctionalJavascript/AjaxCssTest.php  |     1 +
 .../BigPipeRegressionTest.php                 |     3 +-
 .../CKEditor5CKEditor4Compatibility.php       |     1 +
 .../CKEditorIntegrationTest.php               |    10 +-
 .../FormErrorHandlerCKEditorTest.php          |     3 +-
 .../src/Kernel/CKEditorPluginManagerTest.php  |     4 +
 .../tests/src/Kernel/CKEditorTest.php         |     4 +
 .../Plugin/CKEditorPlugin/InternalTest.php    |     1 +
 .../src/Unit/CKEditorPluginManagerTest.php    |     3 +-
 .../Plugin/CKEditorPlugin/LanguageTest.php    |     1 +
 .../modules/ckeditor5/ckeditor5.ckeditor5.yml |    77 +-
 web/core/modules/ckeditor5/ckeditor5.info.yml |     3 +-
 .../modules/ckeditor5/ckeditor5.libraries.yml |    94 +-
 web/core/modules/ckeditor5/ckeditor5.module   |    10 +-
 .../ckeditor5/ckeditor5.post_update.php       |     3 +-
 .../modules/ckeditor5/ckeditor5.services.yml  |     1 -
 .../config/schema/ckeditor5.schema.yml        |     2 +-
 .../modules/ckeditor5/css/internal.admin.css  |    45 -
 .../ckeditor5/css/quickedit-override.css      |     9 -
 web/core/modules/ckeditor5/css/quickedit.css  |     4 -
 .../ckeditor5/js/build/ckeditor5.types.jsdoc  |    36 +-
 .../ckeditor5/js/ckeditor5.admin.es6.js       |    17 -
 .../modules/ckeditor5/js/ckeditor5.admin.js   |   132 +-
 .../ckeditor5/js/ckeditor5.dialog.fix.js      |     1 -
 .../modules/ckeditor5/js/ckeditor5.es6.js     |    39 +-
 .../ckeditor5/js/ckeditor5.filter.admin.js    |     4 -
 web/core/modules/ckeditor5/js/ckeditor5.js    |   116 +-
 .../ckeditor5/js/ckeditor5.style.admin.js     |     3 -
 .../ckeditor5_plugins/drupalMedia/README.md   |    39 -
 .../ckeditor5/js/ie11.filter.warnings.js      |     8 -
 .../ckeditor5/js/ie11.user.warnings.js        |     5 -
 .../js/media_embed_ckeditor5.theme.es6.js     |    19 -
 .../js/media_embed_ckeditor5.theme.js         |    12 -
 .../CKEditor5AspectsOfCKEditor5Plugin.php     |     4 +-
 .../Controller/CKEditor5ImageController.php   |     4 +-
 .../ckeditor5/src/HTMLRestrictions.php        |     1 +
 .../src/Plugin/CKEditor5Plugin/Media.php      |     2 +-
 .../Plugin/CKEditor5Plugin/MediaLibrary.php   |     8 +-
 .../src/Plugin/CKEditor5PluginDefinition.php  |     4 +-
 .../src/Plugin/CKEditor5PluginInterface.php   |     2 +-
 .../src/Plugin/CKEditor5PluginManager.php     |     6 +-
 .../ckeditor5/src/Plugin/Editor/CKEditor5.php |    10 +-
 .../ckeditor5/src/SmartDefaultSettings.php    |    32 +-
 .../src/Functional/AddedStylesheetsTest.php   |     4 +-
 .../CKEditor5QuickEditLibraryTest.php         |    94 -
 .../Update/CKEditor5UpdateAlignmentTest.php   |     3 +-
 .../CKEditor5UpdateImageToolbarItemTest.php   |     4 +-
 .../src/FunctionalJavascript/AdminUiTest.php  |     2 +-
 .../CKEditor5AllowedTagsTest.php              |     2 +-
 .../CKEditor5FragmentLinkTest.php             |    11 +-
 .../CKEditor5OffCanvasTest.php                |     2 +-
 .../FunctionalJavascript/CKEditor5Test.php    |     4 +-
 .../src/FunctionalJavascript/ImageTest.php    |     2 +
 .../FunctionalJavascript/ImageTestBase.php    |    15 +-
 .../src/FunctionalJavascript/ImageUrlTest.php |    10 +-
 .../FunctionalJavascript/MediaLibraryTest.php |    22 +-
 .../src/FunctionalJavascript/MediaTest.php    |    35 +-
 .../src/FunctionalJavascript/TableTest.php    |     8 +-
 .../src/Kernel/CKEditor5PluginManagerTest.php |    64 +-
 .../src/Kernel/SmartDefaultSettingsTest.php   |    37 +-
 .../Nightwatch/Tests/drupalHtmlBuilderTest.js |    11 +-
 web/core/modules/ckeditor5/webpack.config.js  |     3 +-
 web/core/modules/color/color.js               |    31 -
 .../help_topics/color.changing.html.twig      |     7 +-
 web/core/modules/color/preview.js             |     4 -
 .../themes/color_test_theme/color/color.inc   |    11 +
 .../js/color_test_theme-fontsize.js           |     1 -
 .../src/Functional/ColorConfigSchemaTest.php  |     7 +-
 .../color/tests/src/Functional/ColorTest.php  |   169 +-
 .../modules/comment/comment-entity-form.js    |     1 -
 web/core/modules/comment/comment.module       |     4 +-
 .../config/schema/comment.views.schema.yml    |     4 +
 .../modules/comment/js/comment-by-viewer.js   |     1 -
 .../comment/js/comment-new-indicator.js       |     9 -
 .../comment/js/node-new-comments-link.js      |    13 -
 web/core/modules/comment/src/CommentForm.php  |     6 +-
 .../modules/comment/src/CommentStorage.php    |    23 +-
 .../src/Controller/CommentController.php      |     2 +-
 .../CommentSelection.php                      |    81 +-
 .../Plugin/Field/FieldType/CommentItem.php    |    45 +-
 .../Field/FieldWidget/CommentWidget.php       |    16 +-
 .../src/Plugin/migrate/source/d6/Comment.php  |     8 +-
 .../Plugin/views/field/NodeNewComments.php    |    12 +-
 .../views/field/StatisticsLastCommentName.php |    10 +
 .../views/field/StatisticsLastUpdated.php     |     5 +
 .../views/filter/StatisticsLastUpdated.php    |     5 +
 .../views/sort/StatisticsLastCommentName.php  |    10 +
 .../views/sort/StatisticsLastUpdated.php      |    10 +
 .../comment_empty_title_test.module           |     3 +-
 .../modules/comment_test/comment_test.module  |     3 +-
 .../tests/src/Functional/CommentAdminTest.php |     3 +
 .../src/Functional/CommentAnonymousTest.php   |     3 +
 .../tests/src/Functional/CommentBlockTest.php |     5 +-
 .../tests/src/Functional/CommentBookTest.php  |     3 +
 .../tests/src/Functional/CommentCSSTest.php   |    10 +-
 .../CommentDisplayConfigurableTest.php        |     5 +-
 .../src/Functional/CommentEntityTest.php      |     3 +
 .../src/Functional/CommentInterfaceTest.php   |     2 +-
 .../src/Functional/CommentLanguageTest.php    |     3 +
 .../src/Functional/CommentLinksAlterTest.php  |     3 +
 .../src/Functional/CommentNodeAccessTest.php  |     3 +
 .../src/Functional/CommentNonNodeTest.php     |    16 +-
 .../src/Functional/CommentPreviewTest.php     |    13 +-
 .../src/Functional/CommentStatisticsTest.php  |     3 +
 .../tests/src/Functional/CommentTestBase.php  |     5 +-
 .../tests/src/Functional/CommentTitleTest.php |     5 +-
 .../Functional/CommentTokenReplaceTest.php    |     3 +-
 .../Functional/CommentTranslationUITest.php   |     3 +
 .../src/Functional/Views/CommentEditTest.php  |     2 +-
 .../Views/CommentFieldFilterTest.php          |     3 +
 .../src/Functional/Views/CommentTestBase.php  |     3 +
 .../Views/DefaultViewRecentCommentsTest.php   |     5 +-
 .../tests/src/Kernel/CommentBaseFieldTest.php |     3 +
 .../CommentDefaultFormatterCacheTagsTest.php  |     3 +-
 .../src/Kernel/CommentFieldAccessTest.php     |    10 +-
 .../tests/src/Kernel/CommentItemTest.php      |     3 +
 .../Kernel/CommentStringIdEntitiesTest.php    |     3 +
 .../Views/CommentViewsKernelTestBase.php      |     3 +
 .../tests/src/Unit/CommentManagerTest.php     |    10 +-
 .../src/Unit/CommentStatisticsUnitTest.php    |     6 +-
 .../tests/src/Unit/Entity/CommentLockTest.php |    18 +-
 .../views/field/CommentBulkFormTest.php       |    12 +-
 .../src/Form/ConfigSingleImportForm.php       |    22 +-
 .../modules/config/src/Form/ConfigSync.php    |    23 +-
 .../install/config_schema_test.ignore.yml     |     4 +-
 .../install/config_schema_test.noschema.yml   |     4 +-
 .../install/config_schema_test.someschema.yml |     4 +-
 .../config/schema/config_test.schema.yml      |    34 +-
 .../tests/src/Functional/ConfigEntityTest.php |     2 +-
 .../src/Functional/ConfigImportAllTest.php    |     3 +
 .../ConfigImportInstallProfileTest.php        |     3 +
 .../src/Functional/ConfigImportUITest.php     |    22 +-
 .../src/Functional/ConfigImportUploadTest.php |     3 +
 .../ConfigInstallProfileOverrideTest.php      |     6 +-
 .../src/Functional/ConfigInstallWebTest.php   |     6 +-
 .../ConfigSingleImportExportTest.php          |     3 +
 .../ConfigUninstallViaCliImportTest.php       |     6 +-
 .../src/Unit/Menu/ConfigLocalTasksTest.php    |     3 +
 ...instance_label_description_translation.yml |     4 +-
 ...instance_label_description_translation.yml |     6 +-
 .../d7_field_instance_option_translation.yml  |     6 +-
 .../Functional/ConfigTranslationCacheTest.php |     3 +
 .../ConfigTranslationDateFormatUiTest.php     |     3 +
 .../ConfigTranslationListUiTest.php           |     3 +
 .../ConfigTranslationOverviewTest.php         |     3 +
 .../Functional/ConfigTranslationUiTest.php    |     8 +-
 .../ConfigTranslationUiThemeTest.php          |     3 +
 .../ConfigTranslationViewListUiTest.php       |     3 +
 .../tests/src/Unit/ConfigEntityMapperTest.php |    23 +-
 .../tests/src/Unit/ConfigFieldMapperTest.php  |     8 +-
 .../src/Unit/ConfigMapperManagerTest.php      |    11 +-
 .../tests/src/Unit/ConfigNamesMapperTest.php  |     5 +-
 .../config_translation_test_theme.info.yml    |     2 +-
 .../contact/src/ContactFormInterface.php      |     6 +-
 .../tests/drupal-7.contact.database.php       |    12 +-
 .../src/Functional/ContactPersonalTest.php    |     3 +
 .../src/Functional/ContactSitewideTest.php    |     2 +-
 .../tests/src/Kernel/MessageEntityTest.php    |     3 +
 .../tests/src/Unit/MailHandlerTest.php        |     4 +-
 .../src/Entity/ContentModerationState.php     |     7 +-
 .../src/Kernel/ContentModerationStateTest.php |     3 +-
 .../ContentModerationRouteSubscriberTest.php  |     4 +-
 .../content_translation.admin.js              |    10 -
 .../content_translation.module                |     2 +-
 .../content_translation.migrate_drupal.yml    |     2 +-
 .../src/ContentTranslationHandler.php         |     5 +-
 .../ContentTranslationHandlerInterface.php    |     3 +-
 .../ContentTranslationContextualLinks.php     |     5 +-
 .../ContentTranslationContextualLinksTest.php |     3 +
 .../ContentTranslationEntityBundleUITest.php  |     3 +
 .../ContentTranslationLinkTagTest.php         |     2 +-
 ...slationOutdatedRevisionTranslationTest.php |     6 +-
 ...slationRevisionTranslationDeletionTest.php |     6 +-
 .../ContentTranslationSettingsTest.php        |     3 +
 .../ContentTranslationSyncImageTest.php       |     3 +
 .../Functional/ContentTranslationTestBase.php |     3 +
 .../ContentTranslationUITestBase.php          |     2 +-
 .../ContentTranslationWorkflowsTest.php       |     3 +
 .../Functional/Views/TranslationLinkTest.php  |     3 +
 .../ContentTranslationConfigImportTest.php    |     3 +-
 .../Kernel/ContentTranslationSyncUnitTest.php |     3 +
 .../d6/MigrateTaxonomyTermTranslationTest.php |     2 +-
 ...ontentTranslationManageAccessCheckTest.php |    10 +-
 .../Menu/ContentTranslationLocalTasksTest.php |     7 +-
 .../modules/contextual/js/contextual.es6.js   |    10 +-
 web/core/modules/contextual/js/contextual.js  |    24 +-
 .../contextual/js/contextual.toolbar.js       |     4 -
 .../contextual/js/models/StateModel.es6.js    |     2 +-
 .../contextual/js/models/StateModel.js        |     4 -
 .../js/toolbar/models/StateModel.es6.js       |     2 +-
 .../js/toolbar/models/StateModel.js           |     1 -
 .../js/toolbar/views/AuralView.es6.js         |     2 +-
 .../contextual/js/toolbar/views/AuralView.js  |     5 -
 .../js/toolbar/views/VisualView.es6.js        |     2 +-
 .../contextual/js/toolbar/views/VisualView.js |     2 -
 .../contextual/js/views/AuralView.es6.js      |     2 +-
 .../modules/contextual/js/views/AuralView.js  |     2 -
 .../contextual/js/views/KeyboardView.es6.js   |     2 +-
 .../contextual/js/views/KeyboardView.js       |     1 -
 .../contextual/js/views/RegionView.es6.js     |     2 +-
 .../modules/contextual/js/views/RegionView.js |     1 -
 .../contextual/js/views/VisualView.es6.js     |     2 +-
 .../modules/contextual/js/views/VisualView.js |     4 -
 .../src/Element/ContextualLinks.php           |     5 +-
 .../ContextualDynamicContextTest.php          |    11 +-
 .../ContextualLinksTest.php                   |    17 +
 .../tests/src/Kernel/ContextualUnitTest.php   |    91 +-
 .../DateTimeDefaultFormatter.php              |     6 +-
 .../Field/FieldType/DateTimeFieldItemList.php |    14 +-
 .../Plugin/Field/FieldType/DateTimeItem.php   |    15 +-
 .../FieldWidget/DateTimeDatelistWidget.php    |    30 +-
 .../src/Functional/DateTimeWidgetTest.php     |     4 +-
 .../src/Functional/Views/FilterDateTest.php   |    51 +
 .../tests/src/Kernel/DateTimeItemTest.php     |     3 +
 .../Plugin/migrate/field/DateFieldTest.php    |     2 +-
 .../src/Functional/DateRangeFieldTest.php     |     6 +-
 .../src/Plugin/views/filter/DblogTypes.php    |     9 +
 .../dblog/tests/src/Functional/DbLogTest.php  |     8 +-
 .../tests/src/Functional/DbLogViewsTest.php   |     3 +-
 .../tests/src/Kernel/DbLogControllerTest.php  |     3 +
 .../Migrate/d6/MigrateDblogConfigsTest.php    |     7 +-
 web/core/modules/editor/editor.libraries.yml  |    10 -
 web/core/modules/editor/editor.module         |    12 -
 web/core/modules/editor/editor.routing.yml    |    12 -
 web/core/modules/editor/js/editor.admin.js    |    63 -
 web/core/modules/editor/js/editor.dialog.js   |     1 -
 .../js/editor.formattedTextEditor.es6.js      |   244 -
 .../editor/js/editor.formattedTextEditor.js   |   134 -
 web/core/modules/editor/js/editor.js          |    26 -
 .../src/Ajax/GetUntransformedTextCommand.php  |    10 +-
 .../modules/editor/src/EditorController.php   |    31 -
 web/core/modules/editor/src/Entity/Editor.php |     3 +-
 .../src/Plugin/InPlaceEditor/Editor.php       |    15 +-
 .../install/editor.editor.private_images.yml  |    34 -
 .../install/filter.format.private_images.yml  |    23 -
 .../editor_private_test.info.yml              |     8 -
 .../config/schema/editor_test.schema.yml      |    17 -
 .../editor/tests/modules/editor_test.info.yml |     5 -
 .../tests/modules/editor_test.libraries.yml   |     8 -
 .../editor/tests/modules/editor_test.module   |    93 -
 .../modules/src/EditorXssFilter/Insecure.php  |    21 -
 .../modules/src/Plugin/Editor/TRexEditor.php  |    65 -
 .../src/Plugin/Editor/UnicornEditor.php       |    82 -
 .../FieldType/EditorTestTextLongItem.php      |    21 -
 .../tests/src/Functional/EditorAdminTest.php  |     3 +
 .../src/Functional/EditorDialogAccessTest.php |    19 +-
 .../src/Functional/EditorLoadingTest.php      |     3 +
 .../EditorPrivateFileReferenceFilterTest.php  |     6 +-
 .../src/Functional/EditorSecurityTest.php     |     6 +-
 .../FunctionalJavascript/EditorAdminTest.php  |    20 +-
 .../tests/src/Kernel/EditorFileUsageTest.php  |     3 +
 .../src/Kernel/EditorImageDialogTest.php      |     2 +-
 .../tests/src/Kernel/EditorManagerTest.php    |     3 +
 .../src/Unit/EditorConfigEntityUnitTest.php   |    16 +-
 .../src/Unit/EditorXssFilter/StandardTest.php |     9 +-
 .../modules/field/migrations/d6_field.yml     |     3 +-
 .../d6_field_formatter_settings.yml           |   232 +-
 .../d6_field_instance_widget_settings.yml     |     1 +
 .../migrations/state/field.migrate_drupal.yml |     1 +
 .../modules/field_test/field_test.module      |     2 +-
 .../TestFieldDefaultFormatter.php             |     4 +-
 .../TestFieldEmptySettingFormatter.php        |     4 +-
 .../TestFieldMultipleFormatter.php            |     4 +-
 .../TestFieldPrepareViewFormatter.php         |     4 +-
 .../src/Plugin/Field/FieldType/TestItem.php   |    13 +-
 .../TestItemWithPreconfiguredOptions.php      |     5 +-
 .../Field/FieldWidget/TestFieldWidget.php     |     6 +-
 .../FieldWidget/TestFieldWidgetMultiple.php   |    18 +-
 .../src/Functional/Email/EmailFieldTest.php   |     3 +
 .../EntityReferenceAdminTest.php              |     6 +-
 .../EntityReferenceAutoCreateTest.php         |     8 +-
 .../EntityReferenceFieldDefaultValueTest.php  |     3 +
 ...erenceFieldTranslatedReferenceViewTest.php |    15 +-
 .../EntityReferenceFileUploadTest.php         |     5 +-
 .../tests/src/Functional/FieldAccessTest.php  |     3 +
 .../tests/src/Functional/FieldHelpTest.php    |     3 +
 .../FieldImportDeleteUninstallUiTest.php      |     6 +-
 .../tests/src/Functional/FieldTestBase.php    |     2 +-
 .../field/tests/src/Functional/FormTest.php   |     3 +
 .../tests/src/Functional/NestedFormTest.php   |     3 +
 .../src/Functional/Number/NumberFieldTest.php |     3 +
 .../Functional/ReEnableModuleFieldTest.php    |     3 +
 .../src/Functional/String/StringFieldTest.php |     3 +
 .../src/Functional/TranslationWebTest.php     |     5 +
 .../src/Functional/Views/FieldTestBase.php    |     6 +-
 .../EntityReferenceAdminTest.php              |     3 +-
 .../field/tests/src/Kernel/BulkDeleteTest.php |     9 +
 .../field/tests/src/Kernel/DisplayApiTest.php |     3 +
 .../tests/src/Kernel/Email/EmailItemTest.php  |     3 +
 ...qlContentEntityStorageSchemaColumnTest.php |     2 +-
 .../EntityReferenceFormatterTest.php          |    18 +-
 .../Views/EntityReferenceRelationshipTest.php |     2 +-
 .../tests/src/Kernel/FieldAttachOtherTest.php |     3 +
 .../src/Kernel/FieldAttachStorageTest.php     |     3 +
 .../field/tests/src/Kernel/FieldCrudTest.php  |     3 +
 .../tests/src/Kernel/FieldDataCountTest.php   |     3 +-
 .../Kernel/FieldImportDeleteUninstallTest.php |     9 +-
 .../tests/src/Kernel/FieldKernelTestBase.php  |     2 +-
 .../tests/src/Kernel/FieldValidationTest.php  |     3 +
 ...rateFieldInstanceOptionTranslationTest.php |    10 +-
 .../Kernel/Migrate/d6/MigrateFieldTest.php    |     6 +
 .../d6/MigrateFieldWidgetSettingsTest.php     |     5 +
 .../src/Kernel/Number/NumberItemTest.php      |     3 +
 .../Plugin/migrate/source/d7/FieldTest.php    |    16 +-
 .../field/tests/src/Kernel/ShapeItemTest.php  |     3 +
 .../field/tests/src/Kernel/TestItemTest.php   |     3 +
 .../src/Unit/FieldConfigEntityUnitTest.php    |    22 +-
 ...dStorageConfigAccessControlHandlerTest.php |    14 +-
 .../Unit/FieldStorageConfigEntityUnitTest.php |     4 +-
 .../tests/src/Functional/FieldLayoutTest.php  |     4 +-
 .../FunctionalJavascript/FieldLayoutTest.php  |    18 +-
 .../tests/src/Unit/FieldLayoutBuilderTest.php |     2 +
 web/core/modules/field_ui/field_ui.es6.js     |    45 +-
 web/core/modules/field_ui/field_ui.js         |    46 +-
 .../modules/field_ui/field_ui.services.yml    |     6 +-
 .../Plugin/Derivative/FieldUiLocalAction.php  |     5 +
 .../ManageDisplayTest.php                     |     7 +
 .../tests/src/Kernel/EntityDisplayTest.php    |     3 +
 .../src/Kernel/EntityFormDisplayTest.php      |     3 +
 .../src/Unit/FieldUiRouteEnhancerTest.php     |     3 +-
 web/core/modules/file/file.install            |     4 +-
 web/core/modules/file/file.js                 |    11 -
 web/core/modules/file/file.module             |    12 +-
 web/core/modules/file/migrations/d6_file.yml  |    34 +-
 web/core/modules/file/migrations/d7_file.yml  |    24 +-
 .../modules/file/src/Element/ManagedFile.php  |     7 +-
 web/core/modules/file/src/Entity/File.php     |    17 +
 web/core/modules/file/src/FileRepository.php  |     6 +-
 web/core/modules/file/src/FileViewsData.php   |     8 +-
 .../Field/FieldFormatter/TableFormatter.php   |     2 +-
 .../src/Plugin/Field/FieldType/FileItem.php   |    40 +-
 .../Plugin/Field/FieldWidget/FileWidget.php   |    33 +-
 .../FileValidationConstraintValidator.php     |    12 +
 .../Plugin/migrate/process/d6/FieldFile.php   |     5 +
 .../src/Plugin/migrate/process/d6/FileUri.php |     2 +-
 .../src/Plugin/migrate/source/d6/File.php     |    26 +
 .../src/Plugin/migrate/source/d6/Upload.php   |     5 +
 .../migrate/source/d6/UploadInstance.php      |     5 +
 .../src/Plugin/migrate/source/d7/File.php     |    23 +
 .../file/tests/file_test/file_test.module     |     7 +-
 .../tests/file_test/file_test.routing.yml     |     6 +
 .../DummyExternalReadOnlyWrapper.php          |    38 +-
 .../tests/src/Functional/DownloadTest.php     |    33 +-
 .../src/Functional/FileFieldValidateTest.php  |     6 +-
 .../tests/src/Functional/FileListingTest.php  |     3 +
 .../src/Functional/FileManagedTestBase.php    |    12 +-
 .../tests/src/Functional/FilePrivateTest.php  |     3 +
 .../src/Functional/FileTokenReplaceTest.php   |     3 +-
 .../Functional/RemoteFileSaveUploadTest.php   |     3 +
 .../tests/src/Functional/SaveUploadTest.php   |    37 +-
 .../FileFieldValidateTest.php                 |     6 +-
 .../file/tests/src/Kernel/CopyTest.php        |     1 +
 .../file/tests/src/Kernel/FileItemTest.php    |     3 +
 .../src/Kernel/FileManagedUnitTestBase.php    |    12 +-
 .../tests/src/Kernel/FileRepositoryTest.php   |     1 +
 .../file/tests/src/Kernel/MoveTest.php        |     1 +
 .../file/tests/src/Kernel/SpaceUsedTest.php   |     3 +
 .../file/tests/src/Kernel/ValidatorTest.php   |     3 +
 web/core/modules/filter/filter.admin.js       |     6 -
 .../filter/filter.filter_html.admin.js        |    39 -
 web/core/modules/filter/filter.js             |     2 -
 web/core/modules/filter/filter.module         |    80 +-
 .../filter/src/FilterFormatFormBase.php       |     6 +-
 .../filter/src/Plugin/Filter/FilterHtml.php   |     1 +
 .../process/d6/FilterFormatPermission.php     |     5 +
 .../src/Functional/FilterFormatAccessTest.php |     3 +
 .../Functional/FilterHtmlImageSecureTest.php  |     5 +-
 .../src/Functional/FilterSecurityTest.php     |     7 +-
 .../FunctionalJavascript/FilterHtmlTest.php   |     3 +-
 .../filter/tests/src/Kernel/FilterAPITest.php |    10 +-
 .../src/Kernel/FilterDefaultConfigTest.php    |     3 +
 .../tests/src/Kernel/FilterKernelTest.php     |   257 +-
 .../optional/rdf.mapping.node.forum.yml       |    40 -
 .../rdf.mapping.taxonomy_term.forums.yml      |    20 -
 web/core/modules/forum/forum.install          |    10 +-
 web/core/modules/forum/forum.module           |     2 +-
 .../forum/src/Controller/ForumController.php  |     1 -
 .../modules/forum/src/Form/ContainerForm.php  |     2 +-
 web/core/modules/forum/src/Form/ForumForm.php |     2 +-
 .../forum/src/ForumManagerInterface.php       |     2 +-
 .../forum/src/ForumUninstallValidator.php     |     9 +-
 .../tests/src/Functional/ForumBlockTest.php   |     3 +
 .../tests/src/Functional/ForumIndexTest.php   |     3 +
 .../src/Functional/ForumNodeAccessTest.php    |     3 +
 .../forum/tests/src/Functional/ForumTest.php  |    35 +-
 .../src/Functional/ForumUninstallTest.php     |    20 +
 .../Functional/Views/ForumIntegrationTest.php |     3 +
 .../ForumBreadcrumbBuilderBaseTest.php        |     8 +-
 .../ForumListingBreadcrumbBuilderTest.php     |     4 +-
 .../ForumNodeBreadcrumbBuilderTest.php        |     6 +-
 .../forum/tests/src/Unit/ForumManagerTest.php |    10 +-
 web/core/modules/hal/hal.services.yml         |     8 +-
 .../comment/Views/CommentHalExportTest.php    |     3 +
 .../rest/Views/StyleSerializerTest.php        |     3 +
 .../taxonomy/TermHalJsonAnonTest.php          |     2 +-
 .../tests/src/Kernel/EntityResolverTest.php   |     3 +
 ...eldNormalizerDenormalizeExceptionsTest.php |     2 +-
 .../tests/src/Functional/HelpBlockTest.php    |     3 +
 .../help/tests/src/Functional/HelpTest.php    |     9 +
 .../help/tests/src/Functional/NoHelpTest.php  |     3 +
 .../block.block.seven_help_search.yml         |    29 -
 .../help_topics/help_topics.services.yml      |     2 +-
 .../help_topics/ban.banning_ips.html.twig     |     5 +-
 .../help_topics/block.configure.html.twig     |     5 +-
 .../help_topics/block_content.add.html.twig   |     5 +-
 .../help_topics/block_content.type.html.twig  |     5 +-
 .../help_topics/book.adding.html.twig         |     5 +-
 .../help_topics/book.configuring.html.twig    |     5 +-
 .../help_topics/book.organizing.html.twig     |     5 +-
 .../help_topics/config.export_full.html.twig  |     5 +-
 .../config.export_single.html.twig            |     5 +-
 .../help_topics/config.import_full.html.twig  |     5 +-
 .../config.import_single.html.twig            |     5 +-
 .../config_translation.overview.html.twig     |     5 +-
 .../contact.adding_fields.html.twig           |     5 +-
 .../contact.configuring_personal.html.twig    |    10 +-
 .../help_topics/contact.creating.html.twig    |     5 +-
 .../contact.setting_default.html.twig         |     5 +-
 .../content_translation.overview.html.twig    |     5 +-
 .../core.content_structure.html.twig          |     4 +-
 .../help_topics/core.cron.html.twig           |     5 +-
 .../help_topics/core.security.html.twig       |     3 +
 .../help_topics/core.web_services.html.twig   |     2 -
 .../help_topics/editor.overview.html.twig     |    15 +-
 .../help_topics/field_ui.add_field.html.twig  |     5 +-
 .../field_ui.manage_display.html.twig         |     5 +-
 .../field_ui.manage_form.html.twig            |     5 +-
 .../field_ui.reference_field.html.twig        |     5 +-
 .../help_topics/filter.overview.html.twig     |     5 +-
 .../help_topics/forum.configuring.html.twig   |    15 +-
 .../help_topics/forum.locking.html.twig       |     5 +-
 .../help_topics/forum.moving.html.twig        |     5 +-
 .../help_topics/forum.starting.html.twig      |     5 +-
 .../help.help_topic_search.html.twig          |    10 +-
 .../help_topics/image.style.html.twig         |     5 +-
 .../help_topics/language.add.html.twig        |     5 +-
 .../help_topics/language.detect.html.twig     |     5 +-
 .../layout_builder.overview.html.twig         |     5 +-
 .../help_topics/locale.import.html.twig       |     5 +-
 .../locale.translate_strings.html.twig        |     5 +-
 .../locale.translation_status.html.twig       |    10 +-
 .../help_topics/media.media_type.html.twig    |     5 +-
 ...nu_ui.content_type_configuration.html.twig |     5 +-
 .../menu_ui.menu_item_add.html.twig           |     7 +-
 .../menu_ui.menu_operations.html.twig         |     5 +-
 .../help_topics/menu_ui.overriding.html.twig  |     5 +-
 .../migrate_drupal_ui.upgrading.html.twig     |     6 +-
 .../responsive_image.style.html.twig          |     5 +-
 .../help_topics/search.configuring.html.twig  |     5 +-
 .../help_topics/search.index.html.twig        |     5 +-
 .../help_topics/system.reports.html.twig      |     2 +-
 .../views_ui.bulk_operations.html.twig        |     2 +-
 .../Plugin/HelpSection/HelpTopicSection.php   |     2 +-
 .../bad_help_topics.translated.html.twig      |     1 +
 .../tests/src/Functional/HelpTopicTest.php    |     9 +-
 .../HelpTopicTranslatedTestBase.php           |     9 +-
 .../src/Functional/HelpTopicsSyntaxTest.php   |   110 +-
 .../help_topics_test_theme.info.yml           |     2 +-
 web/core/modules/history/history.module       |     9 +-
 web/core/modules/history/js/history.js        |     8 -
 web/core/modules/history/js/mark-as-read.js   |     1 -
 .../tests/src/Functional/HistoryTest.php      |     3 +
 web/core/modules/image/image.admin.inc        |     2 +-
 web/core/modules/image/image.module           |     2 +-
 .../ImageStyleDownloadController.php          |    16 +-
 .../modules/image/src/Entity/ImageStyle.php   |     4 +-
 .../Field/FieldFormatter/ImageFormatter.php   |    20 +-
 .../FieldFormatter/ImageUrlFormatter.php      |   101 +-
 .../src/Plugin/Field/FieldType/ImageItem.php  |    77 +-
 .../Plugin/Field/FieldWidget/ImageWidget.php  |    19 +-
 .../Plugin/ImageEffect/ConvertImageEffect.php |     2 +-
 .../Plugin/ImageEffect/CropImageEffect.php    |    22 +-
 .../Plugin/ImageEffect/ResizeImageEffect.php  |     8 +-
 .../Plugin/ImageEffect/RotateImageEffect.php  |    12 +-
 .../Plugin/ImageEffect/ScaleImageEffect.php   |     4 +-
 .../image/src/Routing/ImageStyleRoutes.php    |     2 +-
 .../FieldFormatter/DummyAjaxFormatter.php     |     2 +-
 .../ImageEffect/AjaxTestImageEffect.php       |     2 +-
 .../src/Functional/ImageFieldDisplayTest.php  |    15 +
 .../src/Functional/ImageFieldTestBase.php     |     3 +
 .../image/tests/src/Kernel/ImageItemTest.php  |     3 +
 .../src/Kernel/ImageThemeFunctionTest.php     |     9 +-
 .../Migrate/d6/MigrateImageCacheTest.php      |    54 +-
 .../Views/RelationshipUserImageDataTest.php   |     3 +
 .../image/tests/src/Unit/ImageStyleTest.php   |    22 +-
 .../DenyPrivateImageStyleDownloadTest.php     |     5 +-
 .../src/FormErrorHandler.php                  |     2 +-
 .../src/Normalizer/FieldItemNormalizer.php    |    73 +
 .../Normalizer/HttpExceptionNormalizer.php    |    11 +-
 .../jsonapi/src/Normalizer/NormalizerBase.php |     7 +-
 .../ResourceTypeRepositoryInterface.php       |     2 +-
 .../src/Functional/JsonApiRegressionTest.php  |   132 +-
 .../tests/src/Functional/RdfMappingTest.php   |   154 -
 .../tests/src/Functional/ResourceTestBase.php |    24 +-
 .../src/Functional/RestJsonApiUnsupported.php |     6 +-
 .../JsonApiDocumentTopLevelNormalizerTest.php |   112 +-
 .../LinkCollectionNormalizerTest.php          |     4 +-
 .../ResourceTypeRepositoryTest.php            |     3 +-
 .../HttpExceptionNormalizerTest.php           |     7 +
 web/core/modules/language/language.admin.js   |     3 -
 .../d6_language_content_settings.yml          |     4 +-
 .../d7_language_content_settings.yml          |     4 +-
 .../src/ConfigurableLanguageManager.php       |    32 +-
 .../src/Entity/ConfigurableLanguage.php       |     2 +-
 .../src/Form/NegotiationConfigureForm.php     |     4 +-
 .../src/HttpKernel/PathProcessorLanguage.php  |     2 +-
 .../language/src/LanguageListBuilder.php      |     6 +-
 .../LanguageNegotiationMethodInterface.php    |    11 +-
 .../src/LanguageNegotiationMethodManager.php  |     5 +
 .../language/src/LanguageNegotiator.php       |    13 +-
 .../src/LanguageNegotiatorInterface.php       |     4 +-
 .../src/Plugin/Block/LanguageBlock.php        |     6 +-
 .../src/Plugin/Condition/Language.php         |     4 +-
 .../src/Plugin/Derivative/LanguageBlock.php   |     7 +-
 .../LanguageNegotiationContentEntity.php      |    18 +-
 .../tests/language_test/language_test.module  |     3 +-
 .../AdminPathEntityConverterLanguageTest.php  |     3 +
 .../LanguageBrowserDetectionTest.php          |     3 +-
 .../LanguageConfigurationElementTest.php      |     3 +
 .../Functional/LanguageConfigurationTest.php  |     2 +-
 .../LanguageListModuleInstallTest.php         |     3 +-
 .../LanguageNegotiationSessionTest.php        |    30 +-
 .../LanguagePathMonolingualTest.php           |     3 +
 .../src/Functional/LanguageSwitchingTest.php  |   209 +-
 .../LanguageUILanguageNegotiationTest.php     |     3 +
 .../Functional/LanguageUrlRewritingTest.php   |     3 +
 .../Condition/LanguageConditionTest.php       |     6 +-
 .../src/Kernel/EntityUrlLanguageTest.php      |     3 +
 .../LanguageDependencyInjectionTest.php       |     3 +-
 .../d6/MigrateLanguageContentSettingsTest.php |     4 +-
 .../d7/MigrateLanguageContentSettingsTest.php |     4 +-
 .../src/Kernel/OverriddenConfigImportTest.php |     3 +-
 .../src/Kernel/Views/LanguageTestBase.php     |     3 +
 .../Unit/ContentLanguageSettingsUnitTest.php  |    10 +-
 .../src/Unit/LanguageNegotiationUrlTest.php   |    13 +-
 .../src/Unit/Menu/LanguageLocalTasksTest.php  |     3 +
 .../src/Unit/process/LanguageDomainsTest.php  |     2 +-
 .../layout_builder/js/layout-builder.es6.js   |    15 +-
 .../layout_builder/js/layout-builder.js       |    40 +-
 .../layout_builder/layout_builder.info.yml    |     2 -
 .../layout_builder/layout_builder.module      |     2 +-
 .../layout_builder/layout_builder.routing.yml |     4 +-
 .../layout_builder.services.yml               |     2 +-
 .../layout--fourcol-section.html.twig         |     1 +
 .../layout--threecol-section.html.twig        |     1 +
 .../layout--twocol-section.html.twig          |     1 +
 .../src/Cache/LayoutBuilderUiCacheContext.php |     6 +-
 .../BlockComponentRenderArray.php             |     1 +
 .../src/Form/ConfigureSectionForm.php         |    64 +-
 .../layout_builder/src/Form/MoveBlockForm.php |     2 +
 .../Plugin/Derivative/FieldBlockDeriver.php   |     9 +-
 .../SectionStorage/DefaultsSectionStorage.php |    13 +-
 .../modules/layout_builder/src/Section.php    |     8 +-
 .../src/EventSubscriber/TestPrepareLayout.php |     3 +-
 .../layout_builder_test.module                |    56 +
 .../Functional/LayoutBuilderAccessTest.php    |     3 +-
 .../LayoutBuilderPrepareLayoutTest.php        |     1 +
 .../LayoutBuilderSectionStorageTest.php       |     1 +
 .../src/Functional/LayoutBuilderTest.php      |    72 +-
 .../LayoutBuilderThemeSuggestionsTest.php     |    13 +-
 .../LayoutBuilderTranslationTest.php          |    22 +-
 .../src/Functional/LayoutSectionTest.php      |     2 +-
 .../Functional/Rest/LayoutRestTestBase.php    |    15 +-
 .../FunctionalJavascript/AjaxBlockTest.php    |    32 +-
 .../FunctionalJavascript/BlockFilterTest.php  |    49 +-
 .../BlockFormMessagesTest.php                 |    22 +-
 .../ContentPreviewToggleTest.php              |    15 +-
 .../ContextualLinksTest.php                   |    20 +-
 .../FunctionalJavascript/FieldBlockTest.php   |     6 +-
 .../InlineBlockPrivateFilesTest.php           |    22 +-
 .../FunctionalJavascript/InlineBlockTest.php  |    48 +-
 .../ItemLayoutFieldBlockTest.php              |    13 +-
 .../LayoutBuilderDisableInteractionsTest.php  |     4 +-
 .../LayoutBuilderNestedFormUiTest.php         |     3 +-
 .../LayoutBuilderOptInTest.php                |     2 +-
 .../LayoutBuilderTest.php                     |     3 +-
 .../LayoutBuilderToolbarTest.php              |     3 +-
 .../LayoutBuilderUiTest.php                   |     6 +-
 .../MoveBlockFormTest.php                     |    76 +-
 .../TestMultiWidthLayoutsTest.php             |    24 +-
 .../LayoutBuilderCompatibilityTestBase.php    |     4 +-
 .../Unit/BlockComponentRenderArrayTest.php    |    18 +-
 .../src/Unit/DefaultsSectionStorageTest.php   |    22 +
 .../tests/src/Unit/SectionRenderTest.php      |     3 +
 .../layout_discovery/layout_discovery.module  |     3 +-
 .../layouts/onecol/layout--onecol.html.twig   |     1 +
 .../layout--threecol-25-50-25.html.twig       |     1 +
 .../layout--threecol-33-34-33.html.twig       |     1 +
 .../layouts/twocol/layout--twocol.html.twig   |     1 +
 .../layout--twocol-bricks.html.twig           |     1 +
 .../modules/link/src/LinkItemInterface.php    |     3 +
 .../Field/FieldFormatter/LinkFormatter.php    |    34 +-
 .../src/Plugin/Field/FieldType/LinkItem.php   |    23 +-
 .../Plugin/Field/FieldWidget/LinkWidget.php   |     9 +-
 .../tests/src/Functional/LinkFieldTest.php    |    29 +-
 .../link/tests/src/Kernel/LinkItemTest.php    |     3 +
 .../LinkAccessConstraintValidatorTest.php     |     3 +-
 web/core/modules/locale/locale.admin.js       |     7 -
 web/core/modules/locale/locale.batch.inc      |     4 +-
 web/core/modules/locale/locale.bulk.inc       |    36 +-
 web/core/modules/locale/locale.bulk.js        |     3 -
 web/core/modules/locale/locale.compare.inc    |     5 +-
 web/core/modules/locale/locale.module         |    54 +-
 .../modules/locale/locale.translation.inc     |     5 +-
 .../locale/src/LocaleConfigManager.php        |    30 +
 web/core/modules/locale/src/LocaleEvent.php   |     2 +-
 .../modules/locale/src/LocaleTranslation.php  |     5 +
 .../modules/locale/src/PoDatabaseReader.php   |     2 +-
 .../modules/locale/src/PoDatabaseWriter.php   |     2 +-
 web/core/modules/locale/tests/locale_test.js  |     1 -
 .../locale_test_development_release.info.yml  |     2 +-
 .../schema/locale_test_translate.schema.yml   |     2 +
 .../locale_test_translate.module              |    12 +
 .../LocaleConfigTranslationImportTest.php     |    62 +
 .../src/Functional/LocaleContentTest.php      |     3 +-
 .../tests/src/Functional/LocaleExportTest.php |     3 +-
 .../Functional/LocaleImportFunctionalTest.php |     6 +-
 .../src/Functional/LocalePluralFormatTest.php |     3 +-
 .../LocaleTranslatedSchemaDefinitionTest.php  |     3 +-
 .../Functional/LocaleTranslationUiTest.php    |     6 +-
 .../tests/src/Functional/LocaleUpdateBase.php |     3 +-
 .../LocaleUpdateDevelopmentReleaseTest.php    |     3 +
 .../tests/src/Kernel/LocaleStringTest.php     |     2 +-
 .../tests/src/Unit/LocaleLookupTest.php       |    12 +-
 .../drupalmedia/ckeditor.drupalmedia.css      |    41 -
 web/core/modules/media/js/form.js             |     4 -
 .../js/media_embed_ckeditor.theme.es6.js      |    13 +-
 .../media/js/media_embed_ckeditor.theme.js    |     5 -
 .../js/plugins/drupalmedia/plugin.es6.js      |   499 -
 .../media/js/plugins/drupalmedia/plugin.js    |   335 -
 web/core/modules/media/js/type_form.es6.js    |    18 +-
 web/core/modules/media/js/type_form.js        |    19 +-
 web/core/modules/media/media.libraries.yml    |     2 +
 web/core/modules/media/media.module           |     6 +-
 .../media/src/Annotation/MediaSource.php      |    14 +
 .../src/Controller/OEmbedIframeController.php |     8 +-
 web/core/modules/media/src/Entity/Media.php   |    52 +
 .../media/src/Form/EditorMediaDialog.php      |     1 -
 .../src/Plugin/CKEditorPlugin/DrupalMedia.php |   132 -
 .../MediaThumbnailFormatter.php               |    35 +-
 .../media/src/Plugin/media/Source/OEmbed.php  |     4 +-
 .../src/Plugin/media/Source/OEmbedDeriver.php |     7 +-
 .../media_test_embed.info.yml                 |     4 +-
 .../media_test_embed/media_test_embed.module  |     3 +-
 .../Controller/TestMediaFilterController.php  |     2 +-
 .../tests/src/Functional/MediaAccessTest.php  |    14 +-
 .../src/Functional/MediaOverviewPageTest.php  |     8 +-
 .../Functional/Rest/MediaResourceTestBase.php |     8 +-
 .../tests/src/Functional/UrlResolverTest.php  |     6 +-
 .../CKEditorIntegrationTest.php               |  1603 --
 .../FunctionalJavascript/MediaDisplayTest.php |    52 +-
 .../MediaEmbedFilterConfigurationUiTest.php   |     3 +-
 .../MediaJavascriptTestBase.php               |     2 +-
 .../MediaSourceAudioVideoTest.php             |     2 +-
 .../MediaSourceFileTest.php                   |    10 +-
 .../MediaSourceImageTest.php                  |     9 +-
 .../MediaSourceOEmbedVideoTest.php            |    16 +-
 .../MediaStandardProfileTest.php              |    45 +-
 .../tests/src/Kernel/MediaEmbedFilterTest.php |     2 -
 .../MediaEmbedFilterTranslationTest.php       |     8 +-
 .../tests/src/Kernel/MediaSourceTest.php      |    19 +
 .../src/Kernel/OEmbedIframeControllerTest.php |     2 +-
 .../tests/src/Traits/OEmbedTestTrait.php      |    16 +-
 .../js/media_library.click_to_select.js       |     5 +-
 .../media_library/js/media_library.ui.es6.js  |    42 +-
 .../media_library/js/media_library.ui.js      |    62 +-
 .../media_library/js/media_library.view.js    |     2 -
 .../media_library/js/media_library.widget.js  |     1 -
 .../icons/drupalmedialibrary.png              |   Bin 283 -> 0 bytes
 .../icons/hidpi/drupalmedialibrary.png        |   Bin 620 -> 0 bytes
 .../plugins/drupalmedialibrary/plugin.es6.js  |    76 -
 .../js/plugins/drupalmedialibrary/plugin.js   |    64 -
 .../media_library/media_library.libraries.yml |     1 +
 .../media_library/media_library.module        |    72 -
 .../src/MediaLibraryEditorOpener.php          |     4 +-
 .../CKEditorPlugin/DrupalMediaLibrary.php     |   170 -
 .../Field/FieldWidget/MediaLibraryWidget.php  |    16 +-
 .../media_library_test.module                 |     5 +-
 .../CKEditorIntegrationTest.php               |   328 -
 .../ContentModerationTest.php                 |     2 +-
 .../EntityReferenceWidgetTest.php             |    13 +-
 .../FieldUiIntegrationTest.php                |     5 +
 .../MediaLibraryTestBase.php                  |     3 +-
 .../MediaOverviewTest.php                     |    15 +-
 .../FunctionalJavascript/TranslationsTest.php |    10 +-
 .../ViewsUiIntegrationTest.php                |    13 +-
 .../FunctionalJavascript/WidgetAccessTest.php |    47 +-
 .../WidgetAnonymousTest.php                   |     5 +
 .../FunctionalJavascript/WidgetOEmbedTest.php |    19 +-
 .../FunctionalJavascript/WidgetUploadTest.php |     5 +
 .../FunctionalJavascript/WidgetViewsTest.php  |    16 +-
 .../WidgetWithoutTypesTest.php                |     9 +-
 .../src/Plugin/migrate/source/MenuLink.php    |    56 +-
 .../MenuLinkContentTranslationUITest.php      |    10 +-
 ...enuLinkContentCacheabilityBubblingTest.php |     5 +-
 .../Kernel/Migrate/d7/MigrateMenuLinkTest.php |     5 +
 .../Plugin/migrate/source/MenuLinkTest.php    |    31 +
 .../Unit/MenuLinkContentEntityAccessTest.php  |     2 +-
 .../menu_ui/config/schema/menu_ui.schema.yml  |     4 +-
 web/core/modules/menu_ui/menu_ui.admin.js     |     3 -
 web/core/modules/menu_ui/menu_ui.js           |     7 -
 .../src/Functional/MenuUiLanguageTest.php     |     3 +
 .../tests/src/Functional/MenuUiNodeTest.php   |     3 +
 .../tests/src/Functional/MenuUiTest.php       |     9 +-
 .../src/Event/MigrateIdMapMessageEvent.php    |     7 +-
 .../modules/migrate/src/Plugin/Migration.php  |     6 +-
 .../migrate/src/Plugin/MigrationInterface.php |     6 +-
 .../src/Plugin/migrate/destination/Entity.php |     5 +
 .../migrate/destination/EntityContentBase.php |    10 +-
 .../migrate/src/Plugin/migrate/id_map/Sql.php |    40 +-
 .../src/Plugin/migrate/process/Route.php      |     5 +
 .../src/Plugin/migrate/source/EmptySource.php |     2 +-
 .../migrate/source/SourcePluginBase.php       |     5 +-
 .../src/Plugin/migrate/source/SqlBase.php     |    10 +
 .../migrate_prepare_row_test.module           |     3 +-
 .../migrate_skip_all_rows_test.module         |     3 +-
 .../Plugin/migrate/source/SqlCountCache.php   |     2 +-
 .../migrations/track_changes_test.yml         |     1 +
 .../Kernel/MigrateEntityContentBaseTest.php   |    48 +
 .../src/Kernel/MigrateExecutableTest.php      |     3 +
 .../src/Kernel/MigrateSqlSourceTestBase.php   |     2 +-
 .../Kernel/Plugin/MigrationPluginListTest.php |     1 +
 .../src/Kernel/Plugin/id_map/SqlTest.php      |     4 +-
 .../tests/src/Kernel/TrackChangesTest.php     |     2 +-
 .../tests/src/Unit/MigrateExecutableTest.php  |    24 +-
 .../tests/src/Unit/MigrateSourceTest.php      |     9 +-
 .../Unit/MigrateSqlIdMapEnsureTablesTest.php  |    25 +-
 .../tests/src/Unit/MigrateSqlIdMapTest.php    |    21 +-
 .../migrate/tests/src/Unit/RowTest.php        |    32 +-
 .../migrate/tests/src/Unit/TestSqlIdMap.php   |    14 +-
 .../tests/src/Unit/destination/ConfigTest.php |    18 +-
 .../Unit/destination/EntityRevisionTest.php   |     3 +
 .../tests/src/Unit/process/ExplodeTest.php    |     6 +-
 .../tests/src/Unit/process/GetTest.php        |     9 +-
 .../process/MakeUniqueEntityFieldTest.php     |     4 +-
 .../state/migrate_drupal.migrate_drupal.yml   |     1 +
 .../Plugin/migrate/source/DrupalSqlBase.php   |    10 +-
 .../src/Tests/StubTestTrait.php               |     2 +-
 .../migrate_drupal/tests/fixtures/drupal6.php |    49 +
 .../migrate_drupal/tests/fixtures/drupal7.php | 22296 ++++++++++------
 .../tests/src/Kernel/StateFileExistsTest.php  |     1 +
 .../src/Kernel/d6/EntityContentBaseTest.php   |    10 +-
 .../src/Kernel/d6/FieldDiscoveryTest.php      |     1 +
 .../Kernel/d6/MigrateDrupal6AuditIdsTest.php  |     1 +
 .../Kernel/d7/MigrateDrupal7AuditIdsTest.php  |     1 +
 .../tests/src/Unit/FieldDiscoveryTest.php     |     2 +-
 .../migrate_drupal_ui.routing.yml             |     2 +-
 .../src/Batch/MigrateUpgradeImportBatch.php   |     8 +-
 .../src/Form/CredentialForm.php               |   113 +-
 .../src/Form/OverviewForm.php                 |     6 +-
 .../migration_provider_no_annotation.yml      |     2 +-
 .../d6/MultilingualReviewPageTest.php         |     3 +
 .../d6/NoMultilingualReviewPageTest.php       |     3 +
 .../tests/src/Functional/d6/Upgrade6Test.php  |     8 +-
 .../d7/MultilingualReviewPageTest.php         |     7 +-
 .../d7/NoMultilingualReviewPageTest.php       |     4 +-
 .../tests/src/Functional/d7/Upgrade7Test.php  |     4 +-
 .../src/Driver/Database/mysql/Connection.php  |     2 +-
 .../src/Driver/Database/mysql/Schema.php      |     4 +-
 .../mysql/tests/src/Unit/ConnectionTest.php   |    24 +-
 web/core/modules/node/content_types.es6.js    |    30 +-
 web/core/modules/node/content_types.js        |    35 +-
 web/core/modules/node/node.api.php            |    11 +-
 web/core/modules/node/node.es6.js             |     6 +-
 web/core/modules/node/node.js                 |    12 +-
 web/core/modules/node/node.module             |    15 +-
 web/core/modules/node/node.preview.js         |     5 -
 .../node/src/Controller/NodeController.php    |     4 +-
 .../node/src/NodeGrantDatabaseStorage.php     |    14 +-
 web/core/modules/node/src/NodePermissions.php |     2 +
 .../modules/node/src/NodeTypeListBuilder.php  |     4 +-
 web/core/modules/node/src/NodeViewsData.php   |     3 -
 .../src/Plugin/Action/AssignOwnerNode.php     |     8 +-
 .../Plugin/Action/UnpublishByKeywordNode.php  |     4 +-
 .../node/src/Plugin/Block/SyndicateBlock.php  |     2 +-
 .../node/src/Plugin/Search/NodeSearch.php     |    24 +-
 .../node/src/Plugin/migrate/D6NodeDeriver.php |     4 +-
 .../node/src/Plugin/migrate/D7NodeDeriver.php |     4 +-
 .../src/Plugin/migrate/source/d6/Node.php     |    26 +-
 .../Plugin/migrate/source/d6/NodeRevision.php |     2 +-
 .../Plugin/migrate/source/d7/NodeRevision.php |     2 +-
 .../node/src/Plugin/views/argument/Type.php   |     6 +-
 .../node/src/Plugin/views/field/Node.php      |     4 +-
 .../modules/node/src/Plugin/views/row/Rss.php |     9 -
 .../node_access_test_language.info.yml        |     2 +-
 .../config/install/rdf.mapping.node.page.yml  |    40 -
 .../node_display_configurable_test.info.yml   |     5 -
 .../node_display_configurable_test.module     |    29 -
 .../Functional/NodeAccessBaseTableTest.php    |    52 +-
 .../src/Functional/NodeAccessFieldTest.php    |     3 +
 .../src/Functional/NodeAccessMenuLinkTest.php |     3 +
 .../src/Functional/NodeAccessPagerTest.php    |     3 +
 .../NodeAccessRebuildNodeGrantsTest.php       |     3 +-
 .../tests/src/Functional/NodeAdminTest.php    |     3 +
 .../Functional/NodeBlockFunctionalTest.php    |     3 +
 .../tests/src/Functional/NodeCreationTest.php |     3 +
 .../NodeDisplayConfigurableTest.php           |   182 -
 .../tests/src/Functional/NodeEditFormTest.php |     3 +
 .../Functional/NodeFieldMultilingualTest.php  |     3 +
 .../src/Functional/NodePostSettingsTest.php   |     6 +-
 .../src/Functional/NodeQueryAlterTest.php     |     3 +
 .../src/Functional/NodeRSSContentTest.php     |     3 +
 .../NodeRevisionPermissionsTest.php           |     3 +
 .../src/Functional/NodeRevisionsAllTest.php   |     5 +-
 .../src/Functional/NodeRevisionsTest.php      |     3 +-
 .../tests/src/Functional/NodeSaveTest.php     |     3 +
 .../src/Functional/NodeSyndicateBlockTest.php |     7 +-
 .../tests/src/Functional/NodeTitleXSSTest.php |     3 +-
 .../src/Functional/NodeTranslationUITest.php  |    13 +-
 .../NodeTypeInitialLanguageTest.php           |     3 +
 .../Functional/NodeTypeTranslationTest.php    |     3 +
 .../tests/src/Functional/NodeViewTest.php     |    12 +-
 .../tests/src/Functional/PagePreviewTest.php  |    12 +-
 .../src/Functional/Views/BulkFormTest.php     |     4 +-
 .../src/Functional/Views/FrontPageTest.php    |    11 +-
 .../src/Functional/Views/PathPluginTest.php   |     2 +-
 .../TestSettingSummariesContentType.php       |    56 -
 .../Action/UnpublishByKeywordActionTest.php   |     3 +
 ...NodeAccessLanguageAwareCombinationTest.php |     8 +-
 .../Kernel/NodeAccessLanguageAwareTest.php    |     6 +-
 .../src/Kernel/NodeAccessLanguageTest.php     |     3 +-
 .../src/Kernel/NodeBodyFieldStorageTest.php   |     3 +
 .../tests/src/Kernel/NodeConditionTest.php    |     3 +
 .../tests/src/Kernel/NodeFieldAccessTest.php  |     4 +-
 .../tests/src/Kernel/NodeListBuilderTest.php  |     3 +
 .../node/tests/src/Kernel/NodeOwnerTest.php   |     3 +
 .../tests/src/Kernel/NodeTokenReplaceTest.php |     3 +-
 .../src/Unit/NodeOperationAccessTest.php      |     2 +-
 .../Unit/PageCache/DenyNodePreviewTest.php    |     5 +-
 .../Plugin/views/field/NodeBulkFormTest.php   |    12 +-
 .../Plugin/Field/FieldType/ListFloatItem.php  |    15 +-
 .../Field/FieldType/ListIntegerItem.php       |    15 +-
 .../Plugin/Field/FieldType/ListItemBase.php   |    15 +-
 .../Plugin/Field/FieldType/ListStringItem.php |    13 +-
 .../OptionsDynamicValuesTestBase.php          |     5 +-
 .../src/Functional/OptionsFieldUITest.php     |     7 +-
 .../OptionsFloatFieldImportTest.php           |     3 +
 .../src/Functional/OptionsWidgetsTest.php     |     3 +
 .../tests/src/Kernel/OptionsFieldTest.php     |    10 +
 .../src/Kernel/Views/OptionsTestBase.php      |     3 +
 .../tests/src/Functional/PageCacheTest.php    |     5 +-
 web/core/modules/path/path.js                 |     1 -
 .../Plugin/Field/FieldWidget/PathWidget.php   |     4 +-
 .../tests/src/Functional/PathAdminTest.php    |     3 +
 .../tests/src/Functional/PathAliasTest.php    |    26 +-
 .../Functional/PathContentModerationTest.php  |    16 +-
 .../tests/src/Functional/PathLanguageTest.php |     3 +
 .../src/Functional/PathLanguageUiTest.php     |     3 +
 .../src/Functional/PathMediaFormTest.php      |     6 +-
 .../tests/src/Functional/PathNodeFormTest.php |     9 +-
 .../src/Functional/PathTaxonomyTermTest.php   |     3 +
 .../tests/src/Functional/PathTestBase.php     |     3 +
 .../src/Kernel/PathNoCanonicalLinkTest.php    |     3 +
 .../modules/path_alias/src/AliasManager.php   |     5 +-
 .../tests/src/Unit/AliasManagerTest.php       |    63 +-
 .../PathProcessor/AliasPathProcessorTest.php  |     3 +
 .../src/Driver/Database/pgsql/Connection.php  |     2 +-
 .../src/Driver/Database/pgsql/Schema.php      |    10 +-
 .../pgsql/tests/src/Unit/SchemaTest.php       |     2 +-
 .../quickedit/js/editors/formEditor.js        |    22 -
 .../modules/quickedit/js/editors/image.js     |    23 -
 .../quickedit/js/editors/plainTextEditor.js   |    15 -
 .../modules/quickedit/js/models/AppModel.js   |     1 -
 .../modules/quickedit/js/models/BaseModel.js  |     4 -
 .../quickedit/js/models/EditorModel.js        |     1 -
 .../quickedit/js/models/EntityModel.js        |    39 -
 .../modules/quickedit/js/models/FieldModel.js |     4 -
 .../modules/quickedit/js/quickedit.es6.js     |     9 +-
 web/core/modules/quickedit/js/quickedit.js    |    69 +-
 web/core/modules/quickedit/js/theme.js        |    21 -
 web/core/modules/quickedit/js/util.js         |     7 -
 .../modules/quickedit/js/views/AppView.js     |    31 -
 .../quickedit/js/views/ContextualLinkView.js  |     2 -
 .../modules/quickedit/js/views/EditorView.js  |    20 -
 .../js/views/EntityDecorationView.js          |     1 -
 .../quickedit/js/views/EntityToolbarView.js   |    28 -
 .../quickedit/js/views/FieldDecorationView.js |    30 -
 .../quickedit/js/views/FieldToolbarView.js    |    15 -
 web/core/modules/quickedit/quickedit.api.php  |     2 +-
 web/core/modules/quickedit/quickedit.info.yml |     2 +
 .../modules/quickedit/quickedit.libraries.yml |    20 +
 web/core/modules/quickedit/quickedit.module   |    15 +
 .../modules/quickedit/quickedit.routing.yml   |    12 +
 .../quickedit/src/Ajax/EntitySavedCommand.php |     3 +-
 .../quickedit/src/Ajax/FieldFormCommand.php   |     3 +-
 .../src/Ajax/FieldFormSavedCommand.php        |     4 +-
 .../Ajax/FieldFormValidationErrorsCommand.php |     3 +-
 .../quickedit/src/QuickEditController.php     |    32 +
 .../EditorIntegrationLoadingTest.php          |    10 +-
 ...EditLayoutBuilderEntityViewDisplayTest.php |     1 +
 .../Functional/LayoutBuilderQuickEditTest.php |    12 +-
 .../QuickEditCustomPipelineTest.php           |     1 +
 .../QuickEditEndPointAccessTest.php           |     1 +
 .../QuickEditImageControllerTest.php          |     1 +
 .../src/Functional/QuickEditMinimalTest.php   |     1 +
 ...utBuilderEntityViewDisplayJsonAnonTest.php |     1 +
 ...lderEntityViewDisplayJsonBasicAuthTest.php |     1 +
 ...BuilderEntityViewDisplayJsonCookieTest.php |     1 +
 ...outBuilderEntityViewDisplayXmlAnonTest.php |     1 +
 ...ilderEntityViewDisplayXmlBasicAuthTest.php |     1 +
 ...tBuilderEntityViewDisplayXmlCookieTest.php |     1 +
 .../CKEditor5IntegrationTest.php              |     1 +
 .../src/FunctionalJavascript/FieldTest.php    |     1 +
 .../InlineFormErrorsIntegrationTest.php       |     3 +-
 .../LayoutBuilderIntegrationTest.php          |    23 +-
 .../LayoutBuilderQuickEditTest.php            |     4 +-
 .../QuickEditAutocompleteTermTest.php         |     1 +
 .../QuickEditFileTest.php                     |     1 +
 .../QuickEditImageTest.php                    |     1 +
 .../QuickEditLoadingTest.php                  |    12 +-
 .../SettingsTrayIntegrationTest.php           |     1 +
 .../src/Kernel/EditorIntegrationTest.php      |    29 +-
 .../tests/src/Kernel/EditorSelectionTest.php  |     6 +
 ...diaEmbedFilterDisabledIntegrationsTest.php |     1 +
 .../src/Kernel/MetadataGeneratorTest.php      |     4 +
 .../tests/src/Kernel/QuickEditLoadingTest.php |     7 +-
 .../QuickEditEntityFieldAccessCheckTest.php   |     5 +-
 web/core/modules/rdf/rdf.info.yml             |     2 +
 web/core/modules/rdf/rdf.module               |    18 +
 .../src/Functional/CommentAttributesTest.php  |     4 +
 .../EntityReferenceFieldAttributesTest.php    |     4 +
 .../Functional/FileFieldAttributesTest.php    |     4 +
 .../src/Functional/GetRdfNamespacesTest.php   |     1 +
 .../Functional/ImageFieldAttributesTest.php   |     4 +
 .../Migrate/NoMultilingualReviewPageTest.php  |     1 +
 .../src/Functional/Migrate/Upgrade7Test.php   |     1 +
 .../src/Functional/NodeAttributesTest.php     |     4 +
 .../Rest/RdfMappingJsonAnonTest.php           |     1 +
 .../Rest/RdfMappingJsonBasicAuthTest.php      |     1 +
 .../Rest/RdfMappingJsonCookieTest.php         |     1 +
 .../Functional/Rest/RdfMappingXmlAnonTest.php |     1 +
 .../Rest/RdfMappingXmlBasicAuthTest.php       |     1 +
 .../Rest/RdfMappingXmlCookieTest.php          |     1 +
 .../src/Functional/StandardProfileTest.php    |    54 +-
 .../src/Functional/TaxonomyAttributesTest.php |     4 +
 .../src/Functional/UserAttributesTest.php     |     4 +
 .../modules/rdf/tests/src/Kernel/CrudTest.php |     4 +
 .../Kernel/Field/DateTimeFieldRdfaTest.php    |     4 +
 .../src/Kernel/Field/EmailFieldRdfaTest.php   |     4 +
 .../Kernel/Field/EntityReferenceRdfaTest.php  |     4 +
 .../Field/FieldRdfaDatatypeCallbackTest.php   |     4 +
 .../src/Kernel/Field/LinkFieldRdfaTest.php    |     1 +
 .../src/Kernel/Field/NumberFieldRdfaTest.php  |    17 +-
 .../src/Kernel/Field/StringFieldRdfaTest.php  |     4 +
 .../Kernel/Field/TelephoneFieldRdfaTest.php   |     4 +
 .../src/Kernel/Field/TextFieldRdfaTest.php    |     4 +
 .../Migrate/d7/MigrateRdfMappingTest.php      |     1 +
 .../migrate/source/d7/RdfMappingTest.php      |     1 +
 .../src/Kernel/RdfCommentStorageLoadTest.php  |     1 +
 .../tests/src/Kernel/RdfaAttributesTest.php   |     1 +
 .../Unit/RdfMappingConfigEntityUnitTest.php   |    16 +-
 .../js/responsive_image.ajax.js               |     1 -
 .../migrations/d7_responsive_image_styles.yml |     4 +-
 .../responsive_image/responsive_image.module  |     4 +-
 .../ResponsiveImageFormatter.php              |    20 +-
 .../src/ResponsiveImageStyleForm.php          |     1 +
 .../Functional/ResponsiveImageAdminUITest.php |    11 +-
 .../ResponsiveImageFieldDisplayTest.php       |     6 +-
 ...sponsiveImageStyleConfigEntityUnitTest.php |    50 +-
 .../ResourceResponseSubscriber.php            |     5 +-
 .../rest/src/Routing/ResourceRoutes.php       |     2 +-
 .../modules/rest_test/rest_test.services.yml  |     8 +-
 .../EntityResource/EntityResourceTestBase.php |    25 +-
 .../Functional/Views/StyleSerializerTest.php  |     3 +
 .../rest/tests/src/Unit/CollectRoutesTest.php |    12 +-
 .../EntityResourceValidationTraitTest.php     |     2 +-
 .../ResourceResponseSubscriberTest.php        |    22 +-
 .../search/src/SearchPageListBuilder.php      |     3 +-
 web/core/modules/search/src/SearchQuery.php   |     2 +-
 .../Plugin/Search/SearchExtraTypeSearch.php   |     8 +-
 .../search_langcode_test.module               |     7 +-
 .../src/Functional/SearchAdminThemeTest.php   |     2 +-
 .../SearchAdvancedSearchFormTest.php          |     3 +
 .../tests/src/Functional/SearchBlockTest.php  |    14 +-
 .../SearchCommentCountToggleTest.php          |     3 +
 .../src/Functional/SearchCommentTest.php      |     3 +
 .../SearchConfigSettingsFormTest.php          |    34 +-
 .../src/Functional/SearchDateIntervalTest.php |     3 +
 .../src/Functional/SearchEmbedFormTest.php    |     3 +
 .../SearchKeywordsConditionsTest.php          |     3 +
 .../src/Functional/SearchLanguageTest.php     |     3 +
 .../SearchMultilingualEntityTest.php          |     3 +
 .../Functional/SearchNodeDiacriticsTest.php   |     3 +
 .../Functional/SearchNodePunctuationTest.php  |     7 +-
 .../SearchNodeUpdateAndDeletionTest.php       |     3 +
 .../Functional/SearchNumberMatchingTest.php   |     3 +
 .../src/Functional/SearchNumbersTest.php      |     3 +
 .../src/Functional/SearchPageOverrideTest.php |     3 +
 .../src/Functional/SearchPageTextTest.php     |    16 +-
 .../SearchPreprocessLangcodeTest.php          |     3 +
 .../src/Functional/SearchRankingTest.php      |     3 +
 .../src/Functional/SearchSetLocaleTest.php    |     3 +
 .../src/Unit/SearchPageRepositoryTest.php     |    62 +-
 .../src/Unit/SearchPluginCollectionTest.php   |     6 +-
 .../serialization/serialization.services.yml  |    14 +-
 .../src/Kernel/EntitySerializationTest.php    |    10 +-
 .../tests/src/Kernel/NormalizerTestBase.php   |     3 +
 .../tests/src/Kernel/SerializationTest.php    |     3 +
 .../tests/src/Unit/Encoder/XmlEncoderTest.php |     7 +-
 .../ChainEntityResolverTest.php               |     2 +-
 .../Unit/EntityResolver/UuidResolverTest.php  |    12 +-
 .../Normalizer/ConfigEntityNormalizerTest.php |     2 +-
 .../ContentEntityNormalizerTest.php           |    10 +-
 .../DateTimeIso8601NormalizerTest.php         |     2 +
 .../Normalizer/DateTimeNormalizerTest.php     |     2 +
 .../Unit/Normalizer/EntityNormalizerTest.php  |    56 +-
 .../Unit/Normalizer/ListNormalizerTest.php    |     7 +-
 .../Normalizer/TimestampNormalizerTest.php    |     2 +
 .../Normalizer/TypedDataNormalizerTest.php    |     5 +-
 .../modules/settings_tray/js/settings_tray.js |    27 -
 .../settings_tray_test_css.info.yml           |     2 +-
 .../SettingsTrayTestBase.php                  |     6 +-
 .../shortcut/migrations/d7_shortcut.yml       |     6 +-
 web/core/modules/shortcut/shortcut.module     |     4 +-
 .../src/Functional/ShortcutLinksTest.php      |    20 +-
 .../tests/src/Functional/ShortcutTestBase.php |     3 +
 .../Kernel/ShortcutSevenIntegrationTest.php   |    31 -
 .../src/Unit/Menu/ShortcutLocalTasksTest.php  |     5 +-
 .../src/Driver/Database/sqlite/Schema.php     |     4 +-
 .../src/Driver/Database/sqlite/Statement.php  |    39 -
 .../Plugin/Block/StatisticsPopularBlock.php   |    10 +-
 web/core/modules/statistics/statistics.js     |     1 -
 .../modules/statistics/statistics.views.inc   |     4 +-
 .../src/Functional/StatisticsAdminTest.php    |     3 +
 .../src/Functional/StatisticsLoggingTest.php  |     3 +
 .../src/Functional/StatisticsTestBase.php     |     5 +-
 .../Functional/StatisticsTokenReplaceTest.php |     3 +-
 .../src/Functional/Views/IntegrationTest.php  |     3 +
 .../statistics_test_attached.info.yml         |     2 +-
 web/core/modules/syslog/syslog.module         |     2 +-
 .../Migrate/d6/MigrateSyslogConfigsTest.php   |     5 +
 .../system/config/install/system.mail.yml     |     2 +-
 .../system/config/schema/system.schema.yml    |     7 +
 .../css/components/tabledrag.module.css       |    14 +-
 web/core/modules/system/js/system.date.js     |     4 -
 web/core/modules/system/js/system.js          |     3 -
 web/core/modules/system/js/system.modules.js  |    22 +-
 .../system/migrations/d7_theme_settings.yml   |     9 +-
 .../state/system.migrate_drupal.yml           |     2 +-
 .../system/migrations/system_maintenance.yml  |    18 +-
 .../src/Controller/TimezoneController.php     |    37 +-
 .../system/src/FileDownloadController.php     |     2 +-
 web/core/modules/system/src/Form/CronForm.php |     1 +
 .../system/src/Form/ModulesListForm.php       |     2 +-
 .../Form/ModulesListNonStableConfirmForm.php  |     4 +-
 .../system/src/Form/ModulesUninstallForm.php  |    18 +-
 .../system/src/Form/ThemeSettingsForm.php     |     1 -
 .../system/src/PathBasedBreadcrumbBuilder.php |     8 +-
 .../src/Plugin/Block/SystemMenuBlock.php      |     2 +-
 .../src/Plugin/ImageToolkit/GDToolkit.php     |    10 +-
 .../migrate/destination/d7/ThemeSettings.php  |     1 +
 web/core/modules/system/src/SystemManager.php |     3 +-
 .../system/src/Theme/BatchNegotiator.php      |     2 +-
 web/core/modules/system/system.install        |    53 +-
 web/core/modules/system/system.module         |    30 +-
 web/core/modules/system/system.routing.yml    |     3 +
 web/core/modules/system/system.tokens.inc     |    13 +-
 .../block--system-menu-block.html.twig        |     1 +
 .../src/AcceptHeaderMiddleware.php            |     5 +
 .../Form/AjaxFormsTestAjaxElementsForm.php    |     3 +-
 .../modules/ajax_test/ajax_test.libraries.yml |    36 +-
 .../modules/ajax_test/ajax_test.routing.yml   |    22 +
 .../tests/modules/ajax_test/js/focus-ajax.js  |     1 -
 .../tests/modules/ajax_test/js/insert-ajax.js |     1 -
 .../src/Controller/AjaxTestController.php     |    33 +
 .../common_test/common_test.libraries.yml     |     9 +-
 .../modules/common_test/common_test.module    |    20 +-
 .../common_test/common_test.routing.yml       |     8 +
 .../src/Controller/CommonTestController.php   |    15 +
 .../condition_test/src/FormController.php     |    37 +-
 .../js/disable_transitions.theme.js           |     1 -
 .../database_test/database_test.install       |     4 +-
 .../dialog_renderer_test.services.yml         |     4 +-
 .../DisplayVariant/TestDisplayVariant.php     |     2 +
 .../src/EarlyRenderingTestController.php      |     9 +-
 .../entity_reference_test_views.info.yml      |     2 +-
 .../modules/entity_test/entity_test.module    |    16 +-
 .../src/EntityTestAccessControlHandler.php    |     3 +
 .../Plugin/Field/FieldType/FieldTestItem.php  |     2 -
 .../Rest/EntityTestResourceTestBase.php       |    18 +-
 .../src/Controller/LonelyMonkeyController.php |     5 +
 .../src/LonelyMonkeyClass.php                 |     5 +
 .../src/MonkeysInTheControlRoom.php           |     5 +
 .../modules/form_test/form_test.routing.yml   |     8 +
 .../Form/FormTestGroupVerticalTabsForm.php    |    13 +
 .../src/Form/JavascriptStatesForm.php         |   178 +
 .../Controller/ImageLazyLoadController.php    |     6 +-
 .../js/jquery.keyevent.polyfill.js            |     7 -
 .../js_ajax_test/js/js_ajax_test.ajax.js      |     1 -
 .../js_cookie_test/js/js_cookie_shim_test.js  |     1 -
 .../js/js_deprecation_test.js                 |     7 +-
 .../js_errors_test/js/js_errors_test.js       |     3 +-
 .../js/js_interaction_test.trigger_link.js    |     1 -
 .../src/Controller/JSInteractionTestForm.php  |     2 +-
 .../js_message_test/js/js_message_test.js     |     2 -
 .../js_testing_log_test/js/js_testing_log.js  |     4 -
 ...js_webassert_test.no_element_after_wait.js |     1 -
 ...js_webassert_test.wait_for_ajax_request.js |     2 -
 .../js/js_webassert_test.wait_for_element.js  |     1 -
 .../templates/layout-test-1col.html.twig      |     3 +
 .../menu_test/menu_test.links.contextual.yml  |     3 +
 .../MenuLinkTestWithUnsafeTitle.php           |     6 +-
 .../js/access-unsupported-property.js         |     1 -
 .../src/EventSubscriber.php                   |     6 +-
 .../modules/module_test/module_test.module    |     2 +-
 .../module_test/module_test.permissions.yml   |     2 +-
 .../off_canvas_test/js/resize-helper.js       |     2 -
 ...tity_form_display.node.article.default.yml |     4 +-
 .../modules/olivero_test/js/log-errors.js     |     1 -
 .../src/Plugin/MockBlockManager.php           |    25 +-
 .../mock_block/MockLayoutBlockDeriver.php     |     5 +-
 .../mock_block/MockMenuBlockDeriver.php       |    11 +-
 .../mock_block/TypedDataStringBlock.php       |     4 +-
 .../requirements1_test.install                |    12 +
 .../src/Controller/SessionTestController.php  |     3 +-
 .../tabledrag_test/js/tabledrag_test.js       |     1 -
 .../src/Theme/HighPriorityThemeNegotiator.php |     2 +-
 .../modules/theme_test/theme_test.module      |    16 +
 .../modules/token_test/token_test.info.yml    |     4 +-
 .../src/TwigThemeTestController.php           |     7 +
 .../twig_theme_test.attach_library.html.twig  |     2 +-
 .../twig_theme_test/twig_theme_test.module    |     4 +
 .../twig_theme_test.routing.yml               |     7 +
 .../update_test_description.install           |     2 +
 .../src/Functional/Ajax/FrameworkTest.php     |     7 +-
 .../tests/src/Functional/Batch/PageTest.php   |     8 +-
 .../src/Functional/Batch/ProcessingTest.php   |     2 +-
 .../src/Functional/Cache/CacheTestBase.php    |     2 +-
 .../tests/src/Functional/Cache/ClearTest.php  |     3 +
 .../tests/src/Functional/Common/AlterTest.php |     6 +-
 .../Condition/ConditionFormTest.php           |    14 +-
 .../Functional/Database/DatabaseTestBase.php  |    14 +-
 .../Datetime/DrupalDateTimeTest.php           |    14 -
 .../src/Functional/Entity/EntityAddUITest.php |    11 +
 .../src/Functional/Entity/EntityFormTest.php  |     3 +
 .../Entity/EntityOperationsTest.php           |     3 +
 .../Functional/Entity/EntityRevisionsTest.php |     6 +-
 .../Entity/EntityTranslationFormTest.php      |     3 +
 .../Entity/EntityViewControllerTest.php       |    21 +-
 .../Traits/EntityDefinitionTestTrait.php      |     3 +-
 .../tests/src/Functional/File/ConfigTest.php  |     3 +
 .../FileTransfer/FileTransferTest.php         |     6 +-
 .../FileTransfer/TestFileTransfer.php         |     5 +-
 .../Functional/Form/ArbitraryRebuildTest.php  |     3 +
 .../src/Functional/Form/CheckboxTest.php      |     5 +-
 .../tests/src/Functional/Form/ElementTest.php |     2 +-
 .../Functional/Form/ElementsLabelsTest.php    |     9 +-
 .../Form/ElementsTableSelectTest.php          |     6 +-
 .../Form/ElementsVerticalTabsTest.php         |     3 +
 .../tests/src/Functional/Form/FormTest.php    |    38 +-
 .../Form/LanguageSelectElementTest.php        |    11 +-
 .../tests/src/Functional/Form/RebuildTest.php |     3 +
 .../Form/StateValuesCleanAdvancedTest.php     |     4 +-
 .../Functional/Form/StateValuesCleanTest.php  |     5 +-
 .../tests/src/Functional/Form/StorageTest.php |     6 +-
 .../src/Functional/Mail/HtmlToTextTest.php    |    20 +-
 .../Menu/BreadcrumbFrontCacheContextsTest.php |     2 +-
 .../src/Functional/Menu/BreadcrumbTest.php    |     3 +
 .../src/Functional/Menu/LocalTasksTest.php    |     2 +-
 .../src/Functional/Menu/MenuRouterTest.php    |    38 +-
 .../src/Functional/Module/DependencyTest.php  |    40 +-
 .../src/Functional/Module/ModuleTestBase.php  |     3 +
 .../src/Functional/Module/UninstallTest.php   |    14 +
 .../tests/src/Functional/Pager/PagerTest.php  |     6 +-
 .../ParamConverter/UpcastingTest.php          |     2 +-
 .../Functional/Render/AjaxPageStateTest.php   |     3 +
 .../Render/HtmlResponseAttachmentsTest.php    |     5 +-
 .../src/Functional/Routing/RouterTest.php     |    15 +-
 .../Functional/Session/SessionHttpsTest.php   |     4 +-
 .../src/Functional/Session/SessionTest.php    |     7 +-
 .../Functional/System/AccessDeniedTest.php    |     3 +
 .../tests/src/Functional/System/AdminTest.php |     3 +
 .../src/Functional/System/DateTimeTest.php    |     8 +-
 .../System/DefaultMobileMetaTagsTest.php      |     3 +
 .../src/Functional/System/FrontPageTest.php   |     3 +
 .../src/Functional/System/HtaccessTest.php    |     4 +
 .../src/Functional/System/IndexPhpTest.php    |     3 +
 .../System/MainContentFallbackTest.php        |     3 +
 .../Functional/System/PageNotFoundTest.php    |     3 +
 .../src/Functional/System/PageTitleTest.php   |     2 +-
 .../Functional/System/PhpRequirementTest.php  |    26 +-
 .../System/ShutdownFunctionsTest.php          |     3 +
 .../Functional/System/SiteMaintenanceTest.php |    11 +-
 .../Functional/System/SystemAuthorizeTest.php |     3 +
 .../tests/src/Functional/System/ThemeTest.php |   132 +-
 .../Functional/Theme/EngineNyanCatTest.php    |     3 +
 .../src/Functional/Theme/EngineTwigTest.php   |     5 +-
 .../Theme/EntityFilteringThemeTest.php        |    24 +-
 .../tests/src/Functional/Theme/FastTest.php   |     3 +
 .../Theme/ThemeEarlyInitializationTest.php    |     7 +-
 .../src/Functional/Theme/ThemeInfoTest.php    |     4 +-
 .../src/Functional/Theme/ThemeLegacyTest.php  |     3 +
 .../Theme/ThemeSuggestionsAlterTest.php       |     3 +
 .../tests/src/Functional/Theme/ThemeTest.php  |     2 +-
 .../src/Functional/Theme/ThemeTokenTest.php   |    10 +-
 .../src/Functional/Theme/ThemeUpdateTest.php  |     2 +-
 .../Functional/Theme/TwigExtensionTest.php    |    36 +-
 .../Theme/TwigRegistryLoaderTest.php          |     3 +
 .../Update/ClassyUninstallUpdateTest.php      |     3 +-
 .../Update/StableUninstallUpdateTest.php      |     1 +
 .../UpdateSystem/BrokenCacheUpdateTest.php    |     4 +-
 .../DependencyHookInvocationTest.php          |     6 +-
 .../UpdateSystem/DependencyMissingTest.php    |     3 +
 .../UpdateSystem/DependencyOrderingTest.php   |     3 +
 .../UpdateSystem/InvalidUpdateHookTest.php    |     9 +-
 .../NoPreExistingSchemaUpdateTest.php         |     3 +
 .../UpdateSystem/UpdateScriptTest.php         |     9 +-
 .../UpdateSystem/UpdatesWith7xTest.php        |     9 +-
 .../Form/ElementsTableSelectTest.php          |    48 +
 .../FunctionalJavascript/FrameworkTest.php    |     2 +-
 .../OffCanvasTestBase.php                     |     2 +-
 .../src/Kernel/Block/SystemMenuBlockTest.php  |     2 +-
 .../Kernel/Common/FormElementsRenderTest.php  |     5 +-
 .../src/Kernel/Common/PageRenderTest.php      |    15 +
 .../tests/src/Kernel/Common/UrlTest.php       |     9 +-
 .../tests/src/Kernel/DecoratedServiceTest.php |     5 +-
 .../Kernel/Entity/ConfigEntityImportTest.php  |     4 +-
 ...ityReferenceSelectionReferenceableTest.php |     5 +-
 .../Kernel/Extension/ModuleHandlerTest.php    |     6 +-
 .../tests/src/Kernel/Form/FormObjectTest.php  |     3 +
 .../src/Kernel/Form/ProgrammaticTest.php      |     3 +-
 .../system/tests/src/Kernel/Mail/MailTest.php |    21 +-
 .../Migrate/d7/MigrateThemeSettingsTest.php   |     8 +-
 .../migrate/source/d7/ThemeSettingsTest.php   |     4 +-
 .../tests/src/Kernel/Render/ClassyTest.php    |    49 -
 .../tests/src/Kernel/System/FloodTest.php     |    41 -
 .../tests/src/Kernel/Theme/FunctionsTest.php  |    42 +-
 .../src/Kernel/Theme/TwigNamespaceTest.php    |     7 +-
 .../Kernel/Token/TokenReplaceKernelTest.php   |     3 +-
 .../Token/TokenReplaceKernelTestBase.php      |     3 +
 .../PathBasedBreadcrumbBuilderTest.php        |    18 +-
 .../SecurityFileUploadEventSubscriberTest.php |     3 +
 .../src/Unit/Menu/SystemLocalTasksTest.php    |    14 +-
 .../MachineNameControllerTest.php             |     3 +
 .../test_basetheme/test_basetheme.info.yml    |     9 +-
 .../test_core_semver.info.yml                 |     2 +-
 .../test_invalid_core_semver.info.yml         |     2 +-
 .../test_invalid_region.info.yml              |     2 +-
 .../test_messages/test_messages.info.yml      |     2 +-
 .../test_subseven/test_subseven.info.yml      |     5 -
 .../test_subtheme/test_subtheme.info.yml      |     2 +-
 .../themes/test_theme/test_theme.info.yml     |    19 +-
 ...veery_long_name_which_is_too_long.info.yml |     2 +-
 .../test_theme_libraries_empty.info.yml       |     2 +-
 .../test_theme_libraries_extend.info.yml      |     4 +-
 ...ies_override_with_drupal_settings.info.yml |     2 +-
 ...aries_override_with_invalid_asset.info.yml |     2 +-
 .../test_theme_settings_features.info.yml     |     2 +-
 .../test_theme_twig_registry_loader.info.yml  |     2 +-
 .../test_wild_west/test_wild_west.info.yml    |     2 +-
 .../d6_vocabulary_field_instance.yml          |    12 +-
 web/core/modules/taxonomy/src/Entity/Term.php |     2 +-
 .../taxonomy/src/Form/OverviewTerms.php       |     2 +-
 .../Plugin/migrate/D7TaxonomyTermDeriver.php  |     4 +-
 .../Plugin/views/field/TaxonomyIndexTid.php   |     6 +-
 .../src/Plugin/views/field/TermName.php       |     7 +-
 .../Plugin/views/filter/TaxonomyIndexTid.php  |     2 +-
 web/core/modules/taxonomy/src/TermForm.php    |    28 +-
 web/core/modules/taxonomy/src/TermStorage.php |     9 +-
 .../taxonomy/src/TermStorageInterface.php     |     8 +-
 web/core/modules/taxonomy/taxonomy.js         |     6 -
 web/core/modules/taxonomy/taxonomy.module     |     4 +-
 .../modules/taxonomy/taxonomy.services.yml    |     8 +-
 ...nomy_term_display_configurable_test.module |     3 +-
 .../tests/src/Functional/EarlyDateTest.php    |     3 +
 .../tests/src/Functional/LoadMultipleTest.php |     6 +-
 .../taxonomy/tests/src/Functional/RssTest.php |     6 +-
 .../src/Functional/TaxonomyImageTest.php      |   119 -
 .../TaxonomyTermIndentationTest.php           |     3 +
 .../src/Functional/TermAutocompleteTest.php   |     2 +-
 .../tests/src/Functional/TermIndexTest.php    |     5 +-
 .../tests/src/Functional/TermLanguageTest.php |     3 +
 .../tests/src/Functional/TermTest.php         |    16 +
 .../TermTranslationFieldViewTest.php          |     3 +
 .../src/Functional/TermTranslationUITest.php  |     3 +
 .../tests/src/Functional/ThemeTest.php        |     3 +
 .../tests/src/Functional/TokenReplaceTest.php |     6 +-
 .../Views/TaxonomyFieldFilterTest.php         |     3 +
 .../Functional/Views/TermNameFieldTest.php    |    14 +
 .../src/Functional/VocabularyLanguageTest.php |     3 +
 .../Functional/VocabularyPermissionsTest.php  |     3 +
 .../tests/src/Functional/VocabularyUiTest.php |     3 +
 .../MigrateTermLocalizedTranslationTest.php   |     2 +-
 .../Kernel/Migrate/d6/MigrateTermNodeTest.php |     3 +-
 .../Migrate/d7/MigrateTaxonomyTermTest.php    |     2 +-
 .../d7/MigrateTaxonomyTermTranslationTest.php |     2 +-
 .../MigrateTermLocalizedTranslationTest.php   |     2 +-
 .../d7/TermLocalizedTranslationTest.php       |     6 +-
 .../tests/src/Kernel/TermKernelTest.php       |     2 +-
 .../src/Unit/Menu/TaxonomyLocalTasksTest.php  |     3 +
 .../FieldFormatter/TelephoneLinkFormatter.php |     6 +-
 .../Plugin/Field/FieldType/TelephoneItem.php  |    15 +-
 .../FieldWidget/TelephoneDefaultWidget.php    |    10 +-
 .../src/Functional/TelephoneFieldTest.php     |     2 +
 .../tests/src/Kernel/TelephoneItemTest.php    |     3 +
 .../FieldFormatter/TextTrimmedFormatter.php   |     8 +-
 .../src/Plugin/Field/FieldType/TextItem.php   |     6 +-
 .../Field/FieldType/TextWithSummaryItem.php   |    15 +-
 .../Field/FieldWidget/TextareaWidget.php      |     2 +-
 .../FieldWidget/TextareaWithSummaryWidget.php |    16 +-
 .../Field/FieldWidget/TextfieldWidget.php     |     2 +-
 .../tests/src/Functional/TextFieldTest.php    |     3 +
 .../TextareaWithSummaryTest.php               |    44 +-
 .../text/tests/src/Kernel/TextSummaryTest.php |    12 +-
 .../src/Kernel/TextWithSummaryItemTest.php    |     3 +
 .../src/Unit/Migrate/d6/TextFieldTest.php     |    24 +-
 .../Plugin/migrate/field/d6/TextFieldTest.php |    24 +-
 web/core/modules/text/text.js                 |     6 -
 web/core/modules/text/text.module             |     2 +-
 .../modules/toolbar/css/toolbar.theme.css     |     3 +-
 web/core/modules/toolbar/js/escapeAdmin.js    |     4 -
 .../modules/toolbar/js/models/MenuModel.js    |     1 -
 .../modules/toolbar/js/models/ToolbarModel.js |     1 -
 web/core/modules/toolbar/js/toolbar.js        |    12 -
 web/core/modules/toolbar/js/toolbar.menu.js   |    16 -
 .../toolbar/js/views/BodyVisualView.js        |     1 -
 .../toolbar/js/views/MenuVisualView.js        |     3 -
 .../toolbar/js/views/ToolbarAuralView.js      |     5 -
 .../toolbar/js/views/ToolbarVisualView.js     |    15 -
 .../src/Controller/ToolbarController.php      |     2 +-
 .../src/Functional/ToolbarAdminMenuTest.php   |    24 +-
 .../src/Functional/ToolbarHookToolbarTest.php |     3 +
 .../Functional/ToolbarMenuTranslationTest.php |     3 +
 .../Unit/PageCache/AllowToolbarPathTest.php   |     3 +
 web/core/modules/toolbar/toolbar.api.php      |     2 +-
 web/core/modules/tour/js/tour.js              |    12 -
 web/core/modules/tour/src/TourViewBuilder.php |     6 +-
 .../tour/tests/src/Functional/TourTest.php    |     6 +-
 .../tests/src/Functional/TourTestBase.php     |     3 +-
 .../tests/src/Functional/TourTestBasic.php    |     9 +-
 .../FunctionalJavascript/TourLegacyTest.php   |     4 +-
 .../tour/tests/src/Unit/Entity/TourTest.php   |     2 +-
 .../src/Plugin/tour/tip/TipPluginImage.php    |     4 +-
 web/core/modules/tour/tour.libraries.yml      |     2 +-
 ...tracker.tracking_changed_content.html.twig |     7 +-
 .../modules/tracker/js/tracker-history.js     |    16 -
 .../src/Functional/TrackerNodeAccessTest.php  |     3 +
 .../tests/src/Functional/TrackerTest.php      |     3 +
 .../Migrate/d7/MigrateTrackerNodeTest.php     |     3 +-
 .../Migrate/d7/MigrateTrackerSettingsTest.php |     4 +-
 .../Migrate/d7/MigrateTrackerUserTest.php     |     3 +-
 web/core/modules/update/src/UpdateFetcher.php |     2 +-
 .../modules/update/src/UpdateProcessor.php    |     5 +
 .../update/templates/update-version.html.twig |     5 -
 .../FileTransferAuthorizeFormTest.php         |     3 +
 .../src/Functional/UpdateContribTest.php      |    19 +-
 .../src/Functional/UpdateSemverCoreTest.php   |     3 +-
 .../src/Functional/UpdateSemverTestBase.php   |    16 +-
 .../tests/src/Functional/UpdateTestBase.php   |    23 +-
 .../tests/src/Functional/UpdateUploadTest.php |     3 +
 .../src/Unit/Menu/UpdateLocalTasksTest.php    |     3 +
 .../tests/src/Unit/UpdateFetcherTest.php      |     6 +-
 .../update_test_basetheme.info.yml            |     2 +-
 web/core/modules/update/update.api.php        |     2 +-
 web/core/modules/update/update.compare.inc    |     2 +-
 web/core/modules/update/update.fetch.inc      |     3 +-
 web/core/modules/update/update.install        |     2 +-
 web/core/modules/update/update.manager.inc    |     4 +-
 web/core/modules/update/update.module         |    21 +-
 .../config/optional/rdf.mapping.user.user.yml |    14 -
 .../user/config/schema/user.schema.yml        |    61 +-
 .../modules/user/migrations/d7_user_mail.yml  |    28 +-
 web/core/modules/user/src/AccountForm.php     |     2 +-
 .../src/Authentication/Provider/Cookie.php    |     4 +-
 .../user/src/Controller/UserController.php    |    89 +-
 web/core/modules/user/src/Entity/Role.php     |     5 +-
 .../modules/user/src/EntityOwnerInterface.php |     2 +
 .../user/src/Form/RoleSettingsForm.php        |     2 +-
 .../src/Plugin/Action/ChangeUserRoleBase.php  |     2 +-
 .../user/src/Plugin/views/field/Roles.php     |     2 +-
 .../user/src/Plugin/views/filter/Name.php     |     5 +
 web/core/modules/user/src/RoleStorage.php     |     8 +-
 web/core/modules/user/src/UserInterface.php   |     4 +-
 .../Functional/Rest/UserResourceTestBase.php  |    12 +-
 .../Update/UserUpdateRoleDependenciesTest.php |     2 +-
 .../src/Functional/UserAdminLanguageTest.php  |     3 +
 .../tests/src/Functional/UserAdminTest.php    |    16 +-
 .../tests/src/Functional/UserBlocksTest.php   |     3 +
 .../tests/src/Functional/UserCancelTest.php   |     3 +
 .../tests/src/Functional/UserCreateTest.php   |     3 +-
 .../Functional/UserLanguageCreationTest.php   |     3 +-
 .../src/Functional/UserLoginHttpTest.php      |     4 +
 .../tests/src/Functional/UserLoginTest.php    |    40 +-
 .../src/Functional/UserPasswordResetTest.php  |    19 +-
 .../src/Functional/UserPermissionsTest.php    |     6 +-
 .../tests/src/Functional/UserPictureTest.php  |     5 +-
 .../Functional/UserRolesAssignmentTest.php    |     9 +-
 .../tests/src/Functional/UserSearchTest.php   |     3 +-
 .../src/Functional/UserTokenReplaceTest.php   |     3 +-
 .../src/Functional/UserTranslationUITest.php  |     3 +
 .../Views/FilterPermissionUiTest.php          |     3 +
 .../Views/HandlerFilterUserNameTest.php       |     3 +
 .../src/Functional/Views/UserChangedTest.php  |     3 +
 .../Views/UserFieldsAccessChangeTest.php      |     4 +-
 .../src/Functional/Views/UserTestBase.php     |     3 +
 .../Condition/UserRoleConditionTest.php       |     2 +-
 .../Kernel/Migrate/d6/MigrateUserRoleTest.php |     3 +-
 .../migrate/source/ProfileFieldTest.php       |     2 +-
 .../src/Kernel/UserAccountFormFieldsTest.php  |     3 +-
 .../src/Kernel/UserActionConfigSchemaTest.php |     3 +-
 .../tests/src/Kernel/UserMailNotifyTest.php   |     2 +
 .../tests/src/Kernel/UserRoleDeleteTest.php   |     3 +
 .../tests/src/Kernel/UserRoleEntityTest.php   |    12 +
 .../tests/src/Kernel/UserSaveStatusTest.php   |     3 +
 .../src/Kernel/Views/UserKernelTestBase.php   |     3 +
 .../tests/src/Kernel/WhosOnlineBlockTest.php  |     2 +-
 .../tests/src/Traits/UserCreationTrait.php    |     3 +-
 .../src/Unit/Menu/UserLocalTasksTest.php      |     5 +-
 .../Unit/Plugin/Action/AddRoleUserTest.php    |     4 +-
 .../Unit/Plugin/Action/RemoveRoleUserTest.php |     4 +-
 .../src/Unit/Plugin/Core/Entity/UserTest.php  |     4 +-
 .../Plugin/Derivative/UserLocalTaskTest.php   |     3 +
 .../Plugin/views/field/UserBulkFormTest.php   |    12 +-
 .../src/Unit/Theme/AdminNegotiatorTest.php    |     2 +-
 .../src/Unit/UserAccessControlHandlerTest.php |    16 +-
 .../user/tests/src/Unit/UserAuthTest.php      |    81 +-
 .../src/Unit/Views/Argument/RolesRidTest.php  |     6 +-
 .../js/password-theme-functions.js            |     4 -
 .../user_test_theme/user_test_theme.info.yml  |     2 +-
 web/core/modules/user/user.install            |     4 +
 web/core/modules/user/user.js                 |    33 -
 web/core/modules/user/user.libraries.yml      |     1 +
 web/core/modules/user/user.module             |    22 +-
 web/core/modules/user/user.permissions.js     |     4 -
 web/core/modules/user/user.post_update.php    |    17 +
 web/core/modules/user/user.routing.yml        |     8 +
 web/core/modules/user/user.theme.js           |     3 -
 .../config/schema/views.display.schema.yml    |     4 +-
 web/core/modules/views/js/ajax_view.js        |    18 -
 web/core/modules/views/js/base.js             |    18 -
 .../src/Controller/ViewAjaxController.php     |    24 +-
 .../ViewsEntitySchemaSubscriber.php           |    29 +-
 .../views/src/Form/ViewsExposedForm.php       |     3 +
 web/core/modules/views/src/Form/ViewsForm.php |     2 +-
 .../modules/views/src/ManyToOneHelper.php     |     6 +-
 .../Plugin/Block/ViewsExposedFilterBlock.php  |     4 +-
 .../src/Plugin/Derivative/ViewsBlock.php      |     2 +-
 .../src/Plugin/Derivative/ViewsEntityRow.php  |     5 +-
 .../Derivative/ViewsExposedFilterBlock.php    |     5 +-
 .../ViewsSelection.php                        |    10 +-
 .../src/Plugin/views/BrokenHandlerTrait.php   |     9 +-
 .../views/src/Plugin/views/HandlerBase.php    |    14 +-
 .../views/src/Plugin/views/PluginBase.php     |     9 +-
 .../Plugin/views/ViewsHandlerInterface.php    |    15 +-
 .../src/Plugin/views/ViewsPluginInterface.php |     8 +-
 .../src/Plugin/views/area/DisplayLink.php     |     8 +-
 .../views/area/TokenizeAreaPluginBase.php     |     4 +-
 .../views/src/Plugin/views/area/View.php      |     2 +-
 .../views/argument/ArgumentPluginBase.php     |    58 +-
 .../views/src/Plugin/views/argument/Date.php  |     3 +-
 .../Plugin/views/argument/NullArgument.php    |     9 +-
 .../ArgumentDefaultPluginBase.php             |     2 +
 .../views/argument_default/QueryParameter.php |     8 +-
 .../Plugin/views/cache/CachePluginBase.php    |     7 +-
 .../src/Plugin/views/display/Attachment.php   |    13 +-
 .../views/display/DisplayPluginBase.php       |    39 +-
 .../views/display/DisplayPluginInterface.php  |     4 +-
 .../Plugin/views/display/EntityReference.php  |    13 +-
 .../DisplayExtenderPluginBase.php             |     3 +-
 .../exposed_form/ExposedFormPluginBase.php    |     2 +-
 .../views/src/Plugin/views/field/Boolean.php  |    10 +-
 .../src/Plugin/views/field/EntityField.php    |     2 +-
 .../Plugin/views/field/EntityOperations.php   |     8 +-
 .../views/field/FieldHandlerInterface.php     |     3 +-
 .../Plugin/views/field/FieldPluginBase.php    |    27 +-
 .../views/src/Plugin/views/field/LinkBase.php |     2 +-
 .../src/Plugin/views/field/TimeInterval.php   |     5 +-
 .../views/src/Plugin/views/filter/Combine.php |    11 +-
 .../Plugin/views/filter/FilterPluginBase.php  |    35 +-
 .../src/Plugin/views/filter/InOperator.php    |     6 +-
 .../src/Plugin/views/filter/ManyToOne.php     |     3 +-
 .../src/Plugin/views/filter/StringFilter.php  |     5 +
 .../src/Plugin/views/join/JoinPluginBase.php  |     1 +
 .../Plugin/views/pager/PagerPluginBase.php    |    10 +-
 .../views/src/Plugin/views/pager/SqlBase.php  |     2 +-
 .../Plugin/views/query/QueryPluginBase.php    |    17 +-
 .../views/src/Plugin/views/query/Sql.php      |    92 +-
 .../relationship/RelationshipPluginBase.php   |     2 +
 .../src/Plugin/views/row/RowPluginBase.php    |     6 +-
 .../src/Plugin/views/sort/GroupByNumeric.php  |     5 +
 .../views/src/Plugin/views/style/Opml.php     |     4 -
 .../views/src/Plugin/views/style/Rss.php      |     6 +-
 .../Plugin/views/style/StylePluginBase.php    |    14 +-
 .../views/src/Plugin/views/style/Table.php    |     4 +-
 .../Plugin/views/wizard/WizardPluginBase.php  |     4 +-
 web/core/modules/views/src/ResultRow.php      |     1 +
 web/core/modules/views/src/ViewExecutable.php |    22 +-
 web/core/modules/views/src/Views.php          |    16 +-
 .../src/ViewsConfigEntityTestViewsData.php    |     2 +-
 .../test_views/views.view.test_area_order.yml |     4 +-
 .../views.view.test_exposed_form_pager.yml    |    20 +-
 .../views.view.test_page_display.yml          |     3 +
 .../views_test_config.module                  |    15 +
 .../views/field/FieldFormButtonTest.php       |     2 +-
 .../tests/src/Functional/DefaultViewsTest.php |     3 +
 .../FieldRenderedEntityTranslationTest.php    |     2 +-
 .../tests/src/Functional/Handler/AreaTest.php |     3 +
 .../Handler/FieldEntityOperationsTest.php     |     3 +
 .../src/Functional/Handler/FieldWebTest.php   |     9 +-
 .../src/Functional/Handler/FilterDateTest.php |     5 +-
 .../src/Functional/Handler/HandlerTest.php    |     3 +
 .../src/Functional/Plugin/AccessTest.php      |     3 +
 .../Functional/Plugin/ArgumentDefaultTest.php |     7 +-
 .../src/Functional/Plugin/CacheTagTest.php    |     3 +
 .../ContextualFiltersBlockContextTest.php     |     4 +-
 .../Plugin/ContextualFiltersStringTest.php    |     2 +-
 .../Functional/Plugin/DisabledDisplayTest.php |     5 +-
 .../Plugin/DisplayAttachmentTest.php          |     5 +-
 .../Plugin/DisplayEntityReferenceTest.php     |    17 +
 .../src/Functional/Plugin/DisplayFeedTest.php |     5 +-
 .../Plugin/DisplayFeedTranslationTest.php     |     3 +
 .../Functional/Plugin/DisplayPageWebTest.php  |     2 +-
 .../src/Functional/Plugin/DisplayTest.php     |     8 +-
 .../src/Functional/Plugin/ExposedFormTest.php |    20 +-
 .../src/Functional/Plugin/FilterTest.php      |     6 +-
 .../src/Functional/Plugin/MiniPagerTest.php   |     3 +
 .../Plugin/NumericFormatPluralTest.php        |     3 +
 .../Functional/Plugin/StyleSummaryTest.php    |     4 +-
 .../src/Functional/Plugin/ViewsBulkTest.php   |     3 +
 .../src/Functional/RenderCacheWebTest.php     |     2 +-
 .../src/Functional/UserBatchActionTest.php    |     2 +-
 .../tests/src/Functional/ViewAjaxTest.php     |     3 +
 .../tests/src/Functional/ViewElementTest.php  |     5 +-
 .../tests/src/Functional/ViewTestBase.php     |    10 +
 .../Functional/ViewsThemeIntegrationTest.php  |     3 +-
 .../tests/src/Functional/Wizard/BasicTest.php |     3 +
 .../Functional/Wizard/ItemsPerPageTest.php    |     6 +-
 .../src/Functional/Wizard/SortingTest.php     |     3 +
 .../src/Functional/Wizard/TaggedWithTest.php  |     3 +
 .../src/Functional/Wizard/WizardTestBase.php  |     3 +
 .../ExposedFilterAJAXTest.php                 |    42 +-
 .../FunctionalJavascript/GlossaryViewTest.php |     2 +-
 .../PaginationAJAXTest.php                    |     2 +-
 .../src/Kernel/Entity/EntityViewsDataTest.php |    12 +-
 .../src/Kernel/Handler/AreaEntityTest.php     |     4 +-
 .../src/Kernel/Handler/AreaOrderTest.php      |    18 +-
 .../tests/src/Kernel/Handler/AreaTextTest.php |     3 +
 .../tests/src/Kernel/Handler/FieldUrlTest.php |     2 +-
 .../FilterBooleanOperatorStringTest.php       |     3 +-
 .../src/Kernel/Handler/FilterCombineTest.php  |   144 +-
 .../src/Kernel/Handler/FilterNumericTest.php  |     9 +-
 .../src/Kernel/Handler/HandlerAliasTest.php   |     3 +
 .../tests/src/Kernel/Handler/SortDateTest.php |     2 +-
 .../tests/src/Kernel/Plugin/CacheTest.php     |     2 +-
 .../src/Kernel/Plugin/DisplayPageTest.php     |     2 +-
 .../tests/src/Kernel/Plugin/JoinTest.php      |     3 +
 .../src/Kernel/Plugin/PluginBaseTest.php      |     3 +
 .../Plugin/RelationshipJoinTestBase.php       |     5 +-
 .../src/Kernel/Plugin/ViewsBlockTest.php      |     2 +-
 .../tests/src/Kernel/PluginInstanceTest.php   |     3 +
 .../tests/src/Kernel/QueryGroupByTest.php     |     2 +-
 .../tests/src/Kernel/ViewElementTest.php      |     3 +-
 .../views/tests/src/Kernel/ViewsHooksTest.php |     3 +
 .../tests/src/Kernel/ViewsTemplateTest.php    |    38 +-
 .../Wizard/WizardPluginBaseKernelTest.php     |     3 +
 .../Controller/ViewAjaxControllerTest.php     |    26 +-
 .../EventSubscriber/RouteSubscriberTest.php   |    17 +-
 .../src/Unit/Plugin/Block/ViewsBlockTest.php  |     8 +-
 .../Plugin/Derivative/ViewsLocalTaskTest.php  |    47 +-
 .../tests/src/Unit/Plugin/area/ResultTest.php |     3 +
 .../tests/src/Unit/Plugin/area/ViewTest.php   |     2 +-
 .../argument_default/QueryParameterTest.php   |    18 +
 .../Unit/Plugin/argument_default/RawTest.php  |     4 +-
 .../Plugin/argument_validator/EntityTest.php  |     6 +-
 .../Plugin/display/PathPluginBaseTest.php     |     7 +-
 .../Unit/Plugin/field/FieldPluginBaseTest.php |    10 +-
 .../tests/src/Unit/Plugin/field/FieldTest.php |     5 +
 .../Unit/Plugin/pager/PagerPluginBaseTest.php |    17 +-
 .../Unit/Plugin/views/display/BlockTest.php   |     6 +-
 .../views/field/EntityOperationsUnitTest.php  |    26 +-
 .../Unit/Routing/ViewPageControllerTest.php   |     7 +-
 .../tests/src/Unit/ViewsDataHelperTest.php    |     2 +-
 .../views/tests/src/Unit/ViewsDataTest.php    |    12 +-
 .../views/tests/src/Unit/ViewsTest.php        |    12 +-
 .../views_test_checkboxes_theme.info.yml      |     2 +-
 .../views_test_theme.info.yml                 |     2 +-
 web/core/modules/views/views.api.php          |     4 +-
 web/core/modules/views/views.module           |    12 +-
 web/core/modules/views/views.services.yml     |     2 +-
 web/core/modules/views/views.theme.inc        |     2 +-
 web/core/modules/views/views.views.inc        |    12 +-
 .../modules/views/views.views_execution.inc   |     2 +-
 web/core/modules/views_ui/admin.inc           |    13 +-
 .../views_ui/css/views_ui.admin.theme.css     |    17 -
 web/core/modules/views_ui/js/ajax.js          |    17 -
 web/core/modules/views_ui/js/dialog.views.js  |     3 -
 web/core/modules/views_ui/js/views-admin.js   |    76 -
 .../modules/views_ui/js/views_ui.listing.js   |    19 +-
 .../views_ui/src/Form/Ajax/ConfigHandler.php  |     3 +-
 .../views_ui/src/Form/Ajax/EditDetails.php    |     8 +-
 .../modules/views_ui/src/ViewEditForm.php     |     2 +-
 web/core/modules/views_ui/src/ViewUI.php      |    34 +-
 .../src/Functional/ArgumentValidatorTest.php  |     3 +-
 .../tests/src/Functional/DefaultViewsTest.php |     3 +
 .../tests/src/Functional/DisplayPathTest.php  |     3 +
 .../tests/src/Functional/DuplicateTest.php    |     5 +-
 .../src/Functional/ExposedFormUITest.php      |     3 +
 .../src/Functional/OverrideDisplaysTest.php   |     3 +
 .../tests/src/Functional/PreviewTest.php      |    32 +-
 .../tests/src/Functional/RedirectTest.php     |     2 +-
 .../tests/src/Functional/ReportTest.php       |     2 +-
 .../tests/src/Functional/SettingsTest.php     |     2 +-
 .../src/Functional/TranslatedViewTest.php     |     3 +
 .../tests/src/Functional/ViewsUITourTest.php  |    11 +-
 .../LibraryCachingTest.php                    |    74 -
 .../tests/src/Unit/ViewListBuilderTest.php    |     9 +-
 .../tests/src/Unit/ViewUIObjectTest.php       |     6 +-
 web/core/modules/views_ui/views_ui.module     |     2 +
 .../workflows/src/WorkflowTypeInterface.php   |     7 +-
 .../WorkspaceRequestSubscriber.php            |     2 +-
 .../workspaces/src/WorkspaceManager.php       |     4 +-
 .../workspaces/src/WorkspaceRepository.php    |     1 +
 .../tests/src/Kernel/WorkspaceCRUDTest.php    |     8 +
 .../modules/workspaces/workspaces.info.yml    |     2 +-
 web/core/package.json                         |    83 +-
 web/core/phpcs.xml.dist                       |     8 +-
 web/core/postcss.config.js                    |    20 -
 ...tity_form_display.node.article.default.yml |     8 +-
 .../install/editor.editor.basic_html.yml      |    76 +-
 .../install/editor.editor.full_html.yml       |    74 +-
 .../install/filter.format.basic_html.yml      |     2 +-
 .../install/rdf.mapping.node.article.yml      |    38 -
 .../config/install/rdf.mapping.node.page.yml  |    33 -
 .../rdf.mapping.taxonomy_term.tags.yml        |    19 -
 .../config/install/user.role.author.yml       |     8 +
 .../config/install/user.role.editor.yml       |     8 +
 .../profiles/demo_umami/demo_umami.info.yml   |     3 +-
 .../demo_umami_content/src/InstallHelper.php  |     5 +
 .../src/Functional/DemoUmamiProfileTest.php   |     9 +-
 .../demo_umami/themes/umami/css/base.css      |    48 +-
 .../umami/css/components/tour/tour.theme.css  |     1 +
 .../js/classy/media_embed_ckeditor.theme.js   |     1 -
 .../navigation/menu-main/menu-main.js         |     3 -
 .../layout--oneplusfourgrid-section.html.twig |     1 +
 .../block/block--system-menu-block.html.twig  |     1 +
 .../templates/classy/block/block.html.twig    |     1 +
 .../classy/misc/rdf-metadata.html.twig        |    20 -
 .../block--bundle--banner-block.html.twig     |     1 +
 ...lock--bundle--footer-promo-block.html.twig |     1 +
 .../help-block/block--help.html.twig          |     1 +
 .../block--umami-main-menu.html.twig          |     1 +
 .../search/block--search-form-block.html.twig |     1 +
 .../demo_umami/themes/umami/umami.info.yml    |     7 +-
 .../themes/umami/umami.libraries.yml          |    30 +-
 ...tity_form_display.node.article.default.yml |     4 +-
 .../install/editor.editor.basic_html.yml      |    79 +-
 .../install/editor.editor.full_html.yml       |    80 +-
 .../install/filter.format.basic_html.yml      |     2 +-
 .../install/rdf.mapping.comment.comment.yml   |    33 -
 .../install/rdf.mapping.node.article.yml      |    49 -
 .../config/install/rdf.mapping.node.page.yml  |    40 -
 .../rdf.mapping.taxonomy_term.tags.yml        |    19 -
 web/core/profiles/standard/standard.info.yml  |     3 +-
 .../tests/src/Functional/StandardTest.php     |    26 +-
 ...ystemListingCrossProfileCompatibleTest.php |     3 +-
 ..._install_profile_all_dependencies.info.yml |     2 +-
 ...ting_install_profile_dependencies.info.yml |     2 +-
 web/core/scripts/css/compile.js               |     9 +-
 web/core/scripts/dev/commit-code-check.sh     |    58 +-
 web/core/scripts/generate-proxy-class.php     |     9 +-
 web/core/scripts/js/vendor-update.js          |     5 +
 web/core/scripts/run-tests.sh                 |    22 +-
 web/core/scripts/transliteration_data.php.txt |   664 -
 .../BuildTests/Composer/LegacyScriptsTest.php |     1 +
 .../Template/ComposerProjectTemplatesTest.php |    26 +-
 .../Ajax/AjaxFormPageCacheTest.php            |     2 +-
 .../Ajax/AjaxTest.php                         |    53 +-
 .../Ajax/DialogTest.php                       |     2 +-
 .../Ajax/ElementValidationTest.php            |     2 +-
 .../Ajax/MultiFormTest.php                    |    20 +-
 .../BrowserWithJavascriptTest.php             |     2 +-
 .../Core/Form/FormGroupingElementsTest.php    |    29 +
 .../Core/Form/JavascriptStatesTest.php        |   154 +-
 .../DrupalSelenium2Driver.php                 |    55 +-
 .../EntityReferenceAutocompleteWidgetTest.php |    13 +-
 .../FunctionalJavascriptTests/JSWebAssert.php |     3 +-
 .../Tests/JSWebAssertTest.php                 |     6 +-
 .../FunctionalTests/AssertLegacyTrait.php     |     3 +-
 .../Bootstrap/UncaughtExceptionTest.php       |     6 +-
 .../FunctionalTests/BrowserTestBaseTest.php   |     4 +-
 ...EntityFormFieldValidationFilteringTest.php |     2 +-
 .../Entity/DeleteMultipleFormTest.php         |     2 +-
 .../Entity/EntityBundleListCacheTest.php      |     2 +-
 .../Drupal/FunctionalTests/FolderTest.php     |     4 +-
 .../FunctionalTests/Image/ToolkitTestBase.php |     6 +-
 ...istributionProfileExistingSettingsTest.php |     2 +-
 .../Installer/DistributionProfileTest.php     |     2 +-
 ...istributionProfileTranslationQueryTest.php |     2 +-
 .../DistributionProfileTranslationTest.php    |     2 +-
 .../InstallerExistingDatabaseSettingsTest.php |     3 +-
 .../InstallerExistingInstallationTest.php     |     3 +-
 .../InstallerSiteConfigProfileTest.php        |     3 +-
 .../Installer/InstallerTest.php               |     2 +-
 .../Installer/InstallerTranslationTest.php    |    10 +-
 .../MultipleDistributionsProfileTest.php      |     4 +-
 .../Installer/StandardInstallerTest.php       |     2 +-
 .../Libraries/JqueryUiLibraryAssetsTest.php   |     2 +-
 .../FunctionalTests/MailCaptureTest.php       |     6 +-
 .../Menu/MenuActiveTrail403Test.php           |     2 +-
 .../Routing/PathEncodedTest.php               |     2 +-
 .../Routing/RouteCachingLanguageTest.php      |     3 +
 ...eCachingNonPathLanguageNegotiationTest.php |     3 +
 .../FunctionalTests/Theme/BartikTest.php      |    32 -
 .../Theme/ClaroLayoutBuilderTest.php          |     1 +
 .../FunctionalTests/Theme/ClaroTest.php       |     6 +-
 .../FunctionalTests/Theme/ClassyTest.php      |    30 -
 .../FunctionalTests/Theme/OliveroTest.php     |     2 +-
 .../Theme/SevenLayoutBuilderTest.php          |   112 -
 .../Drupal/KernelTests/AssertContentTrait.php |     3 +-
 .../KernelTests/Config/DefaultConfigTest.php  |    32 +-
 .../Core/Action/EmailActionTest.php           |     2 +
 .../Core/Asset/AttachedAssetsTest.php         |    10 +-
 .../Asset/LibraryDiscoveryIntegrationTest.php |    89 +-
 ...solvedLibraryDefinitionsFilesMatchTest.php |     6 +-
 .../Core/Cache/DatabaseBackendTest.php        |     2 +-
 .../Cache/GenericCacheBackendUnitTestBase.php |    34 +-
 .../Core/Cache/MemoryBackendTest.php          |     2 +-
 .../KernelTests/Core/Cache/PhpBackendTest.php |     4 +-
 .../KernelTests/Core/Common/SizeTest.php      |     3 +-
 .../KernelTests/Core/Common/XssUnitTest.php   |    10 +-
 .../Core/Config/ConfigEntityNormalizeTest.php |     3 +
 .../Core/Config/ConfigEntityStorageTest.php   |     3 +-
 .../Core/Config/ConfigExportStorageTest.php   |     3 +
 .../Core/Config/ConfigImportRecreateTest.php  |     6 +-
 .../ConfigImportRenameValidationTest.php      |     3 +-
 .../ConfigImporterMissingContentTest.php      |     6 +-
 .../Core/Config/ConfigImporterTest.php        |    87 +-
 .../Core/Config/ConfigInstallTest.php         |     3 +-
 .../Core/Config/ConfigOverrideTest.php        |     7 +-
 .../Config/ConfigOverridesPriorityTest.php    |     9 +-
 .../Core/Config/DefaultConfigTest.php         |    16 -
 .../Core/Config/ExportStorageManagerTest.php  |     2 +-
 .../Config/ImportStorageTransformerTest.php   |     4 +-
 .../Core/Config/Storage/CachedStorageTest.php |     3 +
 .../Core/Database/ConnectionTest.php          |    16 -
 .../Core/Database/ConnectionUnitTest.php      |   289 -
 .../Database/DatabaseExceptionWrapperTest.php |    35 -
 .../Core/Database/DatabaseTestBase.php        |   143 +-
 .../Core/Database/LargeQueryTest.php          |    52 -
 .../KernelTests/Core/Database/LoggingTest.php |     2 +-
 .../Core/Database/MysqlDriverLegacyTest.php   |    88 -
 .../KernelTests/Core/Database/NextIdTest.php  |    35 -
 .../Core/Database/PgsqlDriverLegacyTest.php   |   115 -
 .../Core/Database/PrefixInfoTest.php          |    72 -
 .../Core/Database/ReservedWordTest.php        |    26 +
 .../KernelTests/Core/Database/SchemaTest.php  |   150 -
 .../Core/Database/SelectComplexTest.php       |    10 +-
 .../Core/Database/SelectSubqueryTest.php      |     6 +-
 .../KernelTests/Core/Database/SqlModeTest.php |    50 -
 .../Core/Database/SqliteDriverLegacyTest.php  |   105 -
 .../Entity/BundleConstraintValidatorTest.php  |     3 +
 .../Core/Entity/ConfigEntityQueryTest.php     |     3 +
 .../Entity/ContentEntityNullStorageTest.php   |     3 +-
 .../EntityAutocompleteElementFormTest.php     |    13 +-
 .../Entity/EntityAccessControlHandlerTest.php |    14 +-
 .../KernelTests/Core/Entity/EntityApiTest.php |     2 +-
 .../Core/Entity/EntityCrudHookTest.php        |     5 +
 .../Entity/EntityDefinitionUpdateTest.php     |    20 +
 .../Entity/EntityFieldDefaultValueTest.php    |     3 +
 .../Core/Entity/EntityFieldTest.php           |     6 +-
 .../Core/Entity/EntityKernelTestBase.php      |     3 +
 .../Core/Entity/EntityLanguageTestBase.php    |     3 +
 ...tyNonRevisionableTranslatableFieldTest.php |     3 +
 .../Core/Entity/EntityQueryAggregateTest.php  |     3 +
 .../Entity/EntityQueryRelationshipTest.php    |     5 +-
 .../Core/Entity/EntityQueryTest.php           |    38 +-
 .../EntityReferenceSelectionSortTest.php      |     3 +
 .../Core/Entity/EntityTranslationTest.php     |    12 +-
 .../EntityTypeConstraintValidatorTest.php     |     3 +
 .../Entity/EntityTypedDataDefinitionTest.php  |     3 +
 .../Core/Entity/EntityUUIDTest.php            |     3 +
 .../Core/Entity/FieldSqlStorageTest.php       |     3 +
 .../Extension/ModuleImplementsAlterTest.php   |     3 +-
 .../Core/Field/FieldAccessTest.php            |     3 +
 .../KernelTests/Core/File/DirectoryTest.php   |     5 +-
 .../KernelTests/Core/File/FileTestBase.php    |     9 +-
 .../KernelTests/Core/File/MimeTypeTest.php    |     4 +-
 .../KernelTests/Core/File/NameMungingTest.php |     6 +-
 .../File/RemoteFileDeleteRecursiveTest.php    |     3 +
 .../Core/File/RemoteFileDeleteTest.php        |     3 +
 .../Core/File/RemoteFileDirectoryTest.php     |     3 +
 .../Core/File/RemoteFileMoveTest.php          |     3 +
 .../Core/File/RemoteFileSaveDataTest.php      |     3 +
 .../Core/File/RemoteFileScanDirectoryTest.php |     3 +
 .../Core/File/RemoteFileUnmanagedCopyTest.php |     3 +
 .../Core/File/ScanDirectoryTest.php           |     3 +-
 .../Core/File/StreamWrapperTest.php           |     3 +
 .../Core/File/UrlTransformRelativeTest.php    |     2 +-
 .../KernelTests/Core/Form/FormCacheTest.php   |     9 +-
 .../Core/Http/BlockInterestCohortTest.php     |    83 -
 .../KernelTests/Core/Image/ToolkitGdTest.php  |     2 +
 .../DatabaseStorageExpirableTest.php          |     3 +
 .../KeyValueStore/GarbageCollectionTest.php   |    10 +-
 .../KeyValueContentEntityStorageTest.php      |     2 +-
 .../Core/KeyValueStore/StorageTestBase.php    |     3 +
 .../Drupal/KernelTests/Core/Lock/LockTest.php |     3 +
 .../EntityConverterLatestRevisionTest.php     |    62 +
 .../Core/Plugin/Condition/RequestPathTest.php |     3 +-
 .../Discovery/AnnotatedClassDiscoveryTest.php |     6 +-
 .../CustomAnnotationClassDiscoveryTest.php    |     3 +
 ...omDirectoryAnnotatedClassDiscoveryTest.php |     9 +-
 .../Plugin/Discovery/StaticDiscoveryTest.php  |     3 +
 .../Core/Plugin/InspectionTest.php            |     2 +-
 .../Core/Plugin/PluginTestBase.php            |     3 +
 .../Render/Element/RenderElementTypesTest.php |     3 +
 .../Core/Render/Element/TableTest.php         |    12 +-
 .../Render/ElementInfoIntegrationTest.php     |     4 +-
 .../Core/Routing/MatcherDumperTest.php        |     3 +
 .../Core/Routing/RouteProviderTest.php        |     6 +
 .../Core/Test/EnvironmentCleanerTest.php      |     2 +-
 .../Core/Theme/BaseThemeRequiredTest.php      |     4 +-
 .../Theme/ConfigImportThemeInstallTest.php    |     3 +
 .../Core/Theme/ConfirmClassyCopiesTest.php    |    10 +-
 .../KernelTests/Core/Theme/ImageTest.php      |     3 +
 .../KernelTests/Core/Theme/MessageTest.php    |     6 +-
 .../Core/Theme/RegistryLegacyTest.php         |    12 +-
 .../KernelTests/Core/Theme/RegistryTest.php   |    12 +-
 .../Core/Theme/Stable9LibraryOverrideTest.php |     4 +
 .../Theme/Stable9TemplateOverrideTest.php     |     4 +-
 .../Core/Theme/StableLibraryOverrideTest.php  |    15 +-
 .../Core/Theme/StableTemplateOverrideTest.php |     7 +-
 .../Core/Theme/ThemeInstallerTest.php         |     9 +-
 .../Core/Theme/ThemeSettingsTest.php          |     3 +
 .../AllowedValuesConstraintValidatorTest.php  |     3 +
 .../ComplexDataConstraintValidatorTest.php    |     6 +-
 .../TypedData/TypedDataDefinitionTest.php     |     3 +
 .../Core/TypedData/TypedDataTest.php          |     3 +
 .../Validation/UniqueFieldConstraintTest.php  |     2 +-
 .../Drupal/KernelTests/KernelTestBase.php     |    52 +-
 .../Drupal/KernelTests/KernelTestBaseTest.php |     9 +-
 .../Drupal/KernelTests/RouteProvider.php      |     5 +
 .../Drupal/Nightwatch/Tests/statesTest.js     |    24 +
 .../Nightwatch/Tests/tabbableShimTest.js      |     4 +-
 web/core/tests/Drupal/Nightwatch/globals.js   |    13 -
 .../Drupal/Nightwatch/nightwatch.conf.js      |     4 +-
 .../Commands/TestSiteInstallCommand.php       |    42 +
 .../Commands/TestSiteUserLoginCommand.php     |     2 +-
 .../tests/Drupal/Tests/BrowserTestBase.php    |     8 +-
 .../Component/ClassFinder/ClassFinderTest.php |     5 +-
 .../Component/Datetime/DateTimePlusTest.php   |     7 +-
 .../DependencyInjection/ContainerTest.php     |    26 +-
 .../Dumper/OptimizedPhpArrayDumperTest.php    |    59 +-
 .../Discovery/YamlDirectoryDiscoveryTest.php  |    19 +-
 .../Tests/Component/DrupalComponentTest.php   |     4 +-
 .../ContainerAwareEventDispatcherTest.php     |     6 +
 .../FileCache/FileCacheFactoryTest.php        |     2 +-
 .../Component/FileCache/FileCacheTest.php     |    14 +-
 .../MTimeProtectedFileStorageBase.php         |     5 +
 .../Render/FormattableMarkupTest.php          |    23 +
 .../Component/Serialization/YamlTest.php      |     6 +
 .../Tests/Component/Utility/BytesTest.php     |     1 +
 .../Tests/Component/Utility/HtmlTest.php      |    16 +
 .../Component/Utility/NestedArrayTest.php     |     2 +-
 .../Tests/Component/Utility/UrlHelperTest.php |    28 +-
 .../Tests/Component/Utility/VariableTest.php  |     5 +-
 .../Tests/Component/Utility/XssTest.php       |    40 +-
 .../VendorHardeningPluginTest.php             |     3 +
 .../tests/Drupal/Tests/ConfigTestTrait.php    |     3 +-
 .../Tests/Core/Access/AccessManagerTest.php   |    26 +-
 .../Tests/Core/Access/AccessResultTest.php    |     4 +-
 .../Tests/Core/Access/CsrfAccessCheckTest.php |    17 +-
 .../Core/Access/CsrfTokenGeneratorTest.php    |     8 +-
 .../Core/Access/CustomAccessCheckTest.php     |     6 +-
 .../Core/Access/RouteProcessorCsrfTest.php    |     3 +
 .../Tests/Core/Ajax/AjaxResponseTest.php      |     9 +-
 .../Tests/Core/Asset/AssetResolverTest.php    |     3 -
 .../Asset/CssCollectionGrouperUnitTest.php    |     7 +-
 .../Asset/CssCollectionOptimizerUnitTest.php  |     3 +
 .../Tests/Core/Asset/CssOptimizerUnitTest.php |     5 +-
 .../Asset/LibraryDependencyResolverTest.php   |     2 +-
 .../Asset/LibraryDiscoveryCollectorTest.php   |     2 +-
 .../Core/Asset/LibraryDiscoveryParserTest.php |    50 +-
 .../AuthenticationManagerTest.php             |     2 +-
 .../Core/Breadcrumb/BreadcrumbManagerTest.php |    12 +-
 .../BackendChainImplementationUnitTest.php    |     9 +-
 .../Tests/Core/Cache/CacheCollectorTest.php   |    16 +-
 .../Tests/Core/Cache/CacheFactoryTest.php     |     8 +-
 .../Core/Cache/CacheableMetadataTest.php      |     2 +-
 .../Core/Cache/ChainedFastBackendTest.php     |     8 +-
 .../Cache/Context/SessionCacheContextTest.php |     5 +-
 .../Tests/Core/Command/GenerateThemeTest.php  |    29 +-
 .../Tests/Core/Common/DiffArrayTest.php       |     3 +
 .../ConditionAccessResolverTraitTest.php      |     8 +-
 .../Tests/Core/Config/CachedStorageTest.php   |     2 +-
 .../Drupal/Tests/Core/Config/ConfigTest.php   |     3 +
 .../Entity/ConfigEntityBaseUnitTest.php       |    32 +-
 .../Config/Entity/ConfigEntityTypeTest.php    |     4 +
 .../Entity/EntityDisplayModeBaseUnitTest.php  |     4 +-
 .../Tests/Core/Config/ImmutableConfigTest.php |     3 +
 .../Tests/Core/Config/StorageComparerTest.php |   113 +-
 .../Core/Controller/ControllerBaseTest.php    |     5 +-
 .../Core/Controller/TitleResolverTest.php     |    37 +-
 web/core/tests/Drupal/Tests/Core/CronTest.php |    25 +-
 .../Tests/Core/Database/DatabaseTest.php      |    16 +-
 .../Core/Database/RowCountExceptionTest.php   |     2 +-
 .../Core/Database/Stub/StubConnection.php     |     7 +
 .../Tests/Core/Database/UrlConversionTest.php |    27 +-
 .../Tests/Core/Datetime/DateHelperTest.php    |   130 +
 .../Drupal/Tests/Core/Datetime/DateTest.php   |     9 +-
 .../Compiler/TaggedHandlersPassTest.php       |     9 +-
 .../ContainerBuilderTest.php                  |    31 -
 .../DependencyInjection/ContainerTest.php     |    12 -
 .../DependencySerializationTest.php           |    22 +-
 .../DependencyInjection/Fixture/BarClass.php  |     2 +-
 .../YamlFileLoaderTest.php                    |   114 +
 .../Core/DrupalKernel/DrupalKernelTest.php    |    15 +
 .../tests/Drupal/Tests/Core/DrupalTest.php    |    12 +-
 .../EntityRevisionRouteEnhancerTest.php       |     2 +-
 .../Enhancer/ParamConversionEnhancerTest.php  |     8 +-
 ...ityFormDisplayAccessControlHandlerTest.php |    22 +-
 ...ityViewDisplayAccessControlHandlerTest.php |     2 +-
 .../Core/Entity/BaseFieldDefinitionTest.php   |    12 +-
 .../Core/Entity/ContentEntityBaseUnitTest.php |    51 +-
 .../Entity/EntityCreateAccessCheckTest.php    |     8 +-
 .../Core/Entity/EntityFieldManagerTest.php    |    95 +-
 .../Core/Entity/EntityFormBuilderTest.php     |     8 +-
 .../Tests/Core/Entity/EntityFormTest.php      |    24 +-
 .../Tests/Core/Entity/EntityLinkTest.php      |     2 +-
 .../Core/Entity/EntityListBuilderTest.php     |     8 +-
 .../Core/Entity/EntityResolverManagerTest.php |     8 +-
 .../Entity/EntityStorageDeprecationTest.php   |    14 +-
 .../Core/Entity/EntityTypeBundleInfoTest.php  |    13 +-
 .../Core/Entity/EntityTypeManagerTest.php     |     2 +-
 .../Core/Entity/EntityTypeRepositoryTest.php  |     3 +-
 .../Tests/Core/Entity/EntityTypeTest.php      |    36 -
 .../Tests/Core/Entity/EntityUnitTest.php      |    34 +-
 .../Tests/Core/Entity/FieldDefinitionTest.php |     2 +-
 .../KeyValueEntityStorageTest.php             |    68 +-
 .../Entity/Sql/DefaultTableMappingTest.php    |     8 +-
 .../Sql/SqlContentEntityStorageSchemaTest.php |    74 +-
 .../Sql/SqlContentEntityStorageTest.php       |   145 +-
 .../TypedData/EntityAdapterUnitTest.php       |    18 +-
 .../CustomPageExceptionHtmlSubscriberTest.php |     2 +-
 .../ModuleRouteSubscriberTest.php             |     5 +-
 .../Core/Extension/ExtensionDiscoveryTest.php |    14 +-
 .../Core/Extension/ModuleHandlerTest.php      |     2 +-
 ...RequiredByThemesUninstallValidatorTest.php |    12 +-
 .../Tests/Core/Extension/ThemeHandlerTest.php |    16 +-
 .../Field/BaseFieldDefinitionTestBase.php     |     2 +-
 .../Field/FieldDefinitionListenerTest.php     |     5 -
 .../Tests/Core/Field/FieldItemListTest.php    |     6 +-
 .../Drupal/Tests/Core/File/FileSystemTest.php |    13 +-
 .../Tests/Core/Form/ConfirmFormHelperTest.php |     8 +-
 .../FormAjaxSubscriberTest.php                |     4 +-
 .../Tests/Core/Form/FormBuilderTest.php       |    51 +-
 .../Tests/Core/Form/FormSubmitterTest.php     |     2 +-
 .../Drupal/Tests/Core/Form/FormTestBase.php   |     4 +-
 .../Tests/Core/Form/FormValidatorTest.php     |     4 +-
 .../Drupal/Tests/Core/Image/ImageTest.php     |    14 +-
 .../Tests/Core/Language/LanguageUnitTest.php  |     2 +-
 .../Tests/Core/Layout/LayoutDefaultTest.php   |     1 +
 .../Core/Lock/LockBackendAbstractTest.php     |     7 +-
 .../Tests/Core/Logger/LoggerChannelTest.php   |     4 +-
 .../Tests/Core/Mail/MailManagerTest.php       |     2 +-
 .../Core/Menu/ContextualLinkDefaultTest.php   |     9 +-
 .../Core/Menu/ContextualLinkManagerTest.php   |    17 +-
 .../DefaultMenuLinkTreeManipulatorsTest.php   |    19 +-
 .../Core/Menu/LocalActionDefaultTest.php      |     9 +-
 .../Core/Menu/LocalActionManagerTest.php      |    16 +-
 .../Tests/Core/Menu/LocalTaskDefaultTest.php  |    19 +-
 .../Menu/LocalTaskIntegrationTestBase.php     |     4 +-
 .../Tests/Core/Menu/LocalTaskManagerTest.php  |    14 +-
 .../Tests/Core/Menu/MenuActiveTrailTest.php   |     6 +-
 .../Core/Menu/StaticMenuLinkOverridesTest.php |     6 +-
 .../Core/PageCache/ChainRequestPolicyTest.php |    13 +-
 .../PageCache/ChainResponsePolicyTest.php     |     9 +-
 .../CommandLineOrUnsafeMethodTest.php         |     7 +-
 .../Core/PageCache/NoSessionOpenTest.php      |     3 +
 .../ParamConverterManagerTest.php             |     6 +-
 .../Core/PathProcessor/PathProcessorTest.php  |    15 +-
 .../CategorizingPluginManagerTraitTest.php    |     6 +-
 .../Tests/Core/Plugin/ContextHandlerTest.php  |    36 +-
 .../Core/Plugin/DefaultPluginManagerTest.php  |     8 +-
 ...tainerDerivativeDiscoveryDecoratorTest.php |     4 +-
 .../DerivativeDiscoveryDecoratorTest.php      |    12 +-
 .../Plugin/Discovery/HookDiscoveryTest.php    |     9 -
 .../Discovery/YamlDiscoveryDecoratorTest.php  |     5 +-
 .../Plugin/Discovery/YamlDiscoveryTest.php    |     3 +
 .../Plugin/LazyPluginCollectionTestBase.php   |     7 +-
 .../Drupal/Tests/Core/PrivateKeyTest.php      |     4 +-
 .../Drupal/Tests/Core/Render/ElementTest.php  |    23 +
 .../Core/Render/PlaceholderGeneratorTest.php  |    18 +-
 .../Core/Render/RendererBubblingTest.php      |     4 +-
 .../Core/Render/RendererPlaceholdersTest.php  |     7 +-
 .../Drupal/Tests/Core/Render/RendererTest.php |    27 +-
 .../Tests/Core/Render/RendererTestBase.php    |     1 +
 .../RouteProcessorManagerTest.php             |     3 +
 .../Core/Routing/AccessAwareRouterTest.php    |     2 +-
 .../Core/Routing/LazyRouteCollectionTest.php  |     6 +-
 .../Tests/Core/Routing/RouteBuilderTest.php   |    29 +-
 .../Tests/Core/Routing/RoutePreloaderTest.php |    12 +-
 .../Tests/Core/Routing/UrlGeneratorTest.php   |    13 +-
 .../Session/PermissionsHashGeneratorTest.php  |    18 +-
 .../Tests/Core/Session/UserSessionTest.php    |     2 +-
 .../Session/WriteSafeSessionHandlerTest.php   |     5 +-
 .../Drupal/Tests/Core/Site/SettingsTest.php   |     4 +
 .../NegotiationMiddlewareTest.php             |     2 +-
 .../Core/TempStore/PrivateTempStoreTest.php   |    14 +-
 .../Core/TempStore/SharedTempStoreTest.php    |    32 +-
 .../Tests/Core/Template/TwigExtensionTest.php |    15 +-
 .../Tests/Core/Test/TestDiscoveryTest.php     |     3 +-
 .../Core/Theme/AjaxBasePageNegotiatorTest.php |    12 +-
 .../Theme/ClassyPreprocessUnchangedTest.php   |     5 +-
 .../ClassyTemplatesIdenticalToStableTest.php  |     3 +
 .../Tests/Core/Theme/RegistryLegacyTest.php   |    11 +-
 .../Drupal/Tests/Core/Theme/RegistryTest.php  |    13 +-
 .../Tests/Core/Theme/ThemeNegotiatorTest.php  |    28 +-
 .../RecursiveContextualValidatorTest.php      |    13 +-
 web/core/tests/Drupal/Tests/Core/UrlTest.php  |    28 +-
 .../Tests/Core/Utility/LinkGeneratorTest.php  |    10 +-
 .../Drupal/Tests/Core/Utility/TokenTest.php   |     6 +-
 .../tests/Drupal/Tests/DocumentElement.php    |     4 +-
 .../Listeners/DeprecationListenerTrait.php    |     8 +
 .../Tests/Scripts/TestSiteApplicationTest.php |     6 -
 .../Drupal/Tests/TestFileCreationTrait.php    |     5 +-
 web/core/tests/Drupal/Tests/UiHelperTrait.php |     4 +-
 web/core/tests/Drupal/Tests/UnitTestCase.php  |     6 +-
 web/core/tests/Drupal/Tests/WebAssert.php     |    11 +-
 web/core/tests/bootstrap.php                  |    39 +
 .../fixtures/test_stable/test_stable.info.yml |     3 +-
 web/core/themes/bartik/bartik.info.yml        |     2 +
 web/core/themes/bartik/color/preview.js       |     3 -
 .../js/classy/media_embed_ckeditor.theme.js   |     1 -
 .../block--search-form-block.html.twig        |     1 +
 .../block--system-menu-block.html.twig        |     1 +
 .../themes/bartik/templates/block.html.twig   |     1 +
 web/core/themes/claro/claro.info.yml          |     2 +-
 web/core/themes/claro/claro.libraries.yml     |     2 +-
 web/core/themes/claro/claro.theme             |    25 +-
 web/core/themes/claro/css/base/print.css      |     6 +-
 web/core/themes/claro/css/base/variables.css  |    48 +-
 .../themes/claro/css/base/variables.pcss.css  |     1 +
 .../claro/css/components/accordion.pcss.css   |    36 +-
 .../claro/css/components/action-link.css      |    18 +
 .../claro/css/components/breadcrumb.css       |    10 +-
 .../themes/claro/css/components/button.css    |     7 +-
 .../themes/claro/css/components/details.css   |    16 +-
 .../claro/css/components/details.pcss.css     |    11 +
 .../themes/claro/css/components/dialog.css    |    10 +-
 .../claro/css/components/dropbutton.css       |    40 +-
 .../claro/css/components/dropbutton.pcss.css  |     9 +
 .../css/components/form--password-confirm.css |    12 +-
 .../claro/css/components/form--select.css     |    25 +-
 .../claro/css/components/jquery.ui/theme.css  |     2 -
 .../css/components/jquery.ui/theme.pcss.css   |     2 -
 .../themes/claro/css/components/messages.css  |     5 +-
 .../claro/css/components/messages.pcss.css    |     1 +
 .../themes/claro/css/components/pager.css     |     4 +-
 .../css/components/system-admin--modules.css  |     3 +
 .../css/components/system-status-report.css   |     2 +-
 .../components/system-status-report.pcss.css  |     2 +-
 .../themes/claro/css/components/tabledrag.css |     7 +-
 .../themes/claro/css/components/tables.css    |    29 +-
 .../claro/css/components/tables.pcss.css      |    13 +
 .../css/components/tablesort-indicator.css    |    36 +-
 web/core/themes/claro/css/components/tabs.css |    10 +-
 .../claro/css/components/toolbar.module.css   |     3 +
 .../claro/css/components/vertical-tabs.css    |     4 +-
 .../themes/claro/css/components/views-ui.css  |    16 +-
 .../claro/css/components/views-ui.pcss.css    |     8 +-
 .../claro/css/theme/ckeditor-editor.css       |     3 +-
 .../themes/claro/css/theme/install-page.css   |    21 +-
 .../claro/css/theme/install-page.pcss.css     |    19 +-
 .../claro/css/theme/maintenance-page.css      |   148 +-
 .../claro/css/theme/maintenance-page.pcss.css |   141 +-
 .../themes/claro/css/theme/media-library.css  |    31 +-
 .../themes/claro/css/theme/toolbar.theme.css  |     3 +-
 .../claro/css/theme/toolbar.theme.pcss.css    |     3 +-
 .../claro/css/theme/views_ui.admin.theme.css  |    25 +-
 .../css/theme/views_ui.admin.theme.pcss.css   |    21 -
 web/core/themes/claro/js/ajax.js              |     3 -
 web/core/themes/claro/js/autocomplete.js      |     4 -
 web/core/themes/claro/js/checkbox.js          |     1 -
 .../js/classy/media_embed_ckeditor.theme.js   |     1 -
 web/core/themes/claro/js/details.js           |     5 -
 web/core/themes/claro/js/dropbutton.js        |     1 -
 web/core/themes/claro/js/media-library.ui.js  |     7 -
 web/core/themes/claro/js/messages.js          |     3 +-
 web/core/themes/claro/js/mobile.install.js    |     6 -
 web/core/themes/claro/js/nav-tabs.js          |    10 -
 .../themes/claro/js/responsive-details.js     |     6 -
 web/core/themes/claro/js/tabledrag.js         |     5 -
 web/core/themes/claro/js/user.theme.js        |     4 -
 web/core/themes/claro/js/vertical-tabs.js     |     1 -
 .../templates/admin/update-version.html.twig  |     5 -
 .../block/block--search-form-block.html.twig  |     1 +
 .../block/block--system-menu-block.html.twig  |     1 +
 .../templates/classy/block/block.html.twig    |     1 +
 .../claro/templates/install-page.html.twig    |     6 +-
 .../templates/maintenance-page.html.twig      |     8 +-
 .../templates/menu-local-tasks.html.twig      |     4 +-
 web/core/themes/classy/classy.info.yml        |     2 +
 web/core/themes/classy/classy.theme           |     2 +
 .../classy/js/media_embed_ckeditor.theme.js   |     1 -
 .../block/block--search-form-block.html.twig  |     1 +
 .../block/block--system-menu-block.html.twig  |     1 +
 .../classy/templates/block/block.html.twig    |     1 +
 web/core/themes/olivero/css/base/base.css     |    68 +-
 web/core/themes/olivero/css/base/utility.css  |    40 +-
 .../themes/olivero/css/base/variables.css     |    50 +-
 .../olivero/css/components/action-links.css   |    26 +-
 .../css/components/ajax-progress.module.css   |    22 +-
 .../autocomplete-loading.module.css           |    24 +-
 .../themes/olivero/css/components/book.css    |    78 +-
 .../olivero/css/components/breadcrumb.css     |   154 +-
 .../themes/olivero/css/components/button.css  |   123 +-
 .../olivero/css/components/cke-dialog.css     |     6 +-
 .../olivero/css/components/comments.css       |   280 +-
 .../css/components/content-moderation.css     |   170 +-
 .../themes/olivero/css/components/details.css |    40 +-
 .../olivero/css/components/dropbutton.css     |   118 +-
 .../olivero/css/components/embedded-media.css |   148 +-
 .../themes/olivero/css/components/feed.css    |    18 +-
 .../themes/olivero/css/components/field.css   |    32 +-
 .../olivero/css/components/fieldset.css       |    18 +-
 .../themes/olivero/css/components/footer.css  |    30 +-
 .../olivero/css/components/form-boolean.css   |   133 +-
 .../olivero/css/components/form-select.css    |   122 +-
 .../olivero/css/components/form-text.css      |   226 +-
 .../themes/olivero/css/components/form.css    |    54 +-
 .../themes/olivero/css/components/forum.css   |     4 +-
 .../css/components/header-buttons-mobile.css  |    24 +-
 .../css/components/header-navigation.css      |   178 +-
 .../css/components/header-search-narrow.css   |   325 +-
 .../components/header-search-narrow.pcss.css  |     2 +-
 .../css/components/header-search-wide.css     |   360 +-
 .../components/header-search-wide.pcss.css    |     2 +-
 .../css/components/header-site-branding.css   |   146 +-
 .../css/components/header-sticky-toggle.css   |   118 +-
 .../themes/olivero/css/components/hero.css    |    38 +-
 .../themes/olivero/css/components/links.css   |    32 +-
 .../css/components/maintenance-page.css       |    12 +-
 .../olivero/css/components/messages.css       |    67 +-
 .../components/navigation/menu-sidebar.css    |    76 +-
 .../navigation/nav-button-mobile.css          |   114 +-
 .../navigation/nav-primary-button.css         |   207 +-
 .../navigation/nav-primary-no-js.css          |   268 +-
 .../navigation/nav-primary-wide.css           |   597 +-
 .../css/components/navigation/nav-primary.css |   152 +-
 .../components/navigation/nav-secondary.css   |   130 +-
 .../components/navigation/wide-nav-expand.css |   112 +-
 .../olivero/css/components/node-teaser.css    |   212 +-
 .../themes/olivero/css/components/node.css    |    50 +-
 .../olivero/css/components/off-canvas.css     |   116 +-
 .../themes/olivero/css/components/pager.css   |    24 +-
 .../css/components/powered-by-block.css       |    42 +-
 .../olivero/css/components/search-results.css |    98 +-
 .../olivero/css/components/site-header.css    |    79 +-
 .../olivero/css/components/skip-link.css      |    25 +-
 .../themes/olivero/css/components/table.css   |   314 +-
 .../themes/olivero/css/components/tabs.css    |   186 +-
 .../themes/olivero/css/components/tags.css    |    34 +-
 .../olivero/css/components/text-content.css   |   284 +-
 .../olivero/css/components/vertical-tabs.css  |    80 +-
 .../olivero/css/components/wide-image.css     |    98 +-
 web/core/themes/olivero/css/layout/grid.css   |    44 +-
 .../layout/layout-builder-fourcol-section.css |   106 +-
 .../layout-builder-threecol-section.css       |    94 +-
 .../layout/layout-builder-twocol-section.css  |   158 +-
 .../css/layout/layout-content-medium.css      |    42 +-
 .../css/layout/layout-content-narrow.css      |   371 +-
 .../layout-discovery-section-layout.css       |    14 +-
 .../olivero/css/layout/layout-footer.css      |    42 +-
 .../olivero/css/layout/layout-sidebar.css     |   104 +-
 .../layout/layout-views-grid-horizontal.css   |   546 +-
 .../css/layout/layout-views-grid-vertical.css |   118 +-
 web/core/themes/olivero/css/layout/layout.css |    38 +-
 .../themes/olivero/css/layout/layout.pcss.css |     2 +-
 .../css/layout/region-content-below.css       |    82 +-
 .../olivero/css/layout/region-content.css     |    14 +-
 .../themes/olivero/css/layout/region-hero.css |     4 +-
 .../css/layout/region-secondary-menu.css      |    22 +-
 web/core/themes/olivero/css/layout/region.css |    14 +-
 .../themes/olivero/css/layout/social-bar.css  |   168 +-
 web/core/themes/olivero/css/layout/views.css  |    14 +-
 web/core/themes/olivero/js/checkbox.js        |     1 -
 web/core/themes/olivero/js/comments.js        |     2 -
 web/core/themes/olivero/js/message.theme.js   |     7 +-
 web/core/themes/olivero/js/messages.js        |     2 -
 web/core/themes/olivero/js/nav-resize.js      |     6 -
 .../themes/olivero/js/navigation-utils.js     |    25 +-
 web/core/themes/olivero/js/navigation.es6.js  |     2 +-
 web/core/themes/olivero/js/navigation.js      |    10 +-
 web/core/themes/olivero/js/search.js          |    13 -
 .../olivero/js/second-level-navigation.js     |    14 -
 web/core/themes/olivero/js/tabs.js            |     6 -
 web/core/themes/olivero/olivero.libraries.yml |     1 -
 .../block/block--page-title-block.html.twig   |     1 +
 ...nu--plugin-id--search-form-block.html.twig |     1 +
 .../block/block--secondary-menu.html.twig     |     1 +
 .../block/block--system-menu-block.html.twig  |     1 +
 .../block--system-powered-by-block.html.twig  |     2 +-
 .../olivero/templates/block/block.html.twig   |     1 +
 web/core/themes/seven/css/base/elements.css   |     3 -
 web/core/themes/seven/css/components/form.css |     2 +-
 .../seven/css/components/jquery.ui/theme.css  |     3 -
 .../js/classy/media_embed_ckeditor.theme.js   |     1 -
 web/core/themes/seven/js/mobile.install.js    |     6 -
 web/core/themes/seven/js/nav-tabs.js          |     8 -
 .../themes/seven/js/responsive-details.js     |     6 -
 web/core/themes/seven/seven.info.yml          |     3 +-
 .../block/block--search-form-block.html.twig  |     1 +
 .../block/block--system-menu-block.html.twig  |     1 +
 .../templates/classy/block/block.html.twig    |     1 +
 .../css/core/dialog/off-canvas.base.css       |   194 +-
 .../css/core/dialog/off-canvas.reset.css      |   873 +-
 .../stable/css/toolbar/toolbar.theme.css      |     3 +-
 .../css/views_ui/views_ui.admin.theme.css     |    17 -
 web/core/themes/stable/js/ajax.js             |     1 -
 web/core/themes/stable/js/tour.js             |    16 -
 web/core/themes/stable/js/user.theme.js       |     2 -
 .../layout--fourcol-section.html.twig         |     1 +
 .../layout--threecol-section.html.twig        |     1 +
 .../layout--twocol-section.html.twig          |     1 +
 web/core/themes/stable/stable.info.yml        |    12 +
 .../admin/simpletest-result-summary.html.twig |    20 -
 .../block/block--system-menu-block.html.twig  |     1 +
 .../stable/templates/block/block.html.twig    |     1 +
 .../templates/layout/layout--onecol.html.twig |     1 +
 .../layout--threecol-25-50-25.html.twig       |     1 +
 .../layout--threecol-33-34-33.html.twig       |     1 +
 .../layout/layout--twocol-bricks.html.twig    |     1 +
 .../templates/layout/layout--twocol.html.twig |     1 +
 .../css/core/dialog/off-canvas.base.css       |   194 +-
 .../css/core/dialog/off-canvas.reset.css      |   870 +-
 .../stable9/css/toolbar/toolbar.theme.css     |     3 +-
 .../css/views_ui/views_ui.admin.theme.css     |    17 -
 web/core/themes/stable9/js/tour.js            |    16 -
 web/core/themes/stable9/js/user.theme.js      |     2 -
 .../layout--fourcol-section.html.twig         |     1 +
 .../layout--threecol-section.html.twig        |     1 +
 .../layout--twocol-section.html.twig          |     1 +
 .../onecol/layout--onecol.html.twig           |     1 +
 .../layout--threecol-25-50-25.html.twig       |     1 +
 .../layout--threecol-33-34-33.html.twig       |     1 +
 .../twocol/layout--twocol.html.twig           |     1 +
 .../layout--twocol-bricks.html.twig           |     1 +
 web/core/themes/stable9/stable9.info.yml      |    12 +-
 .../block/block--system-menu-block.html.twig  |     1 +
 .../stable9/templates/block/block.html.twig   |     1 +
 web/core/themes/stark/stark.breakpoints.yml   |     2 +-
 .../block/block--search-form-block.html.twig  |     1 +
 .../block/block--system-menu-block.html.twig  |     1 +
 .../templates/block/block.html.twig           |     1 +
 web/core/yarn.lock                            |  5372 ++--
 web/robots.txt                                |     4 +
 web/sites/default/default.services.yml        |    27 +-
 web/sites/default/default.settings.php        |   130 +-
 web/sites/example.settings.local.php          |     2 +-
 web/web.config                                |     2 +-
 3812 files changed, 40560 insertions(+), 143030 deletions(-)
 delete mode 100644 config/export/admin_toolbar.settings.yml
 delete mode 100644 config/export/admin_toolbar_search.settings.yml
 delete mode 100644 config/export/admin_toolbar_tools.settings.yml
 delete mode 100644 config/export/advanced_search.settings.yml
 delete mode 100644 config/export/automated_cron.settings.yml
 delete mode 100644 config/export/bibcite.bibcite_csl_style.american_medical_association.yml
 delete mode 100644 config/export/bibcite.bibcite_csl_style.apa.yml
 delete mode 100644 config/export/bibcite.bibcite_csl_style.chicago_author_date.yml
 delete mode 100644 config/export/bibcite.bibcite_csl_style.modern_language_association.yml
 delete mode 100644 config/export/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml
 delete mode 100644 config/export/bibcite.settings.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_account_menu.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_breadcrumbs.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_content.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_creatorsandcontributors.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_exposedformsolr_search_contentpage_1.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_help.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_main_menu.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_messages.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_page_title.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_physicalform.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_powered.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_primary_admin_actions.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_primary_local_tasks.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_secondary_local_tasks.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_site_branding.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_subject.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_subjectname.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_syndicate.yml
 delete mode 100644 config/export/block.block.bootstrap_barrio_temporalsubject.yml
 delete mode 100644 config/export/block.block.claro_breadcrumbs.yml
 delete mode 100644 config/export/block.block.claro_content.yml
 delete mode 100644 config/export/block.block.claro_help.yml
 delete mode 100644 config/export/block.block.claro_local_actions.yml
 delete mode 100644 config/export/block.block.claro_messages.yml
 delete mode 100644 config/export/block.block.claro_page_title.yml
 delete mode 100644 config/export/block.block.claro_primary_local_tasks.yml
 delete mode 100644 config/export/block.block.claro_secondary_local_tasks.yml
 delete mode 100644 config/export/block.block.footer.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_account_menu.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_branding.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_breadcrumbs.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_content.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_creatorsandcontributors.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_help.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_local_actions.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_local_tasks.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_main_menu.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_memberof.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_messages.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_page_title.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_physicalform.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_primary_admin_actions.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_primary_local_tasks.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_resourcetype.yml
 delete mode 100755 config/export/block.block.idc_ui_theme_boots_resourcetype_2.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_secondary_local_tasks.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_site_branding.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_sitebranding.yml
 delete mode 100755 config/export/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_subject.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_subjectname.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_syndicate.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_temporalsubject.yml
 delete mode 100644 config/export/block.block.idc_ui_theme_boots_year.yml
 delete mode 100644 config/export/block.block.memberof.yml
 delete mode 100644 config/export/block.block.pagetitle.yml
 delete mode 100644 config/export/block.block.search.yml
 delete mode 100644 config/export/block.block.solrsearchcontentadvancedsearchforblock.yml
 delete mode 100644 config/export/block.block.solrsearchcontentadvancedsearchforpage.yml
 delete mode 100644 config/export/block.block.solrsearchcontentsearchresultspagerforblock.yml
 delete mode 100644 config/export/block.block.solrsearchcontentsearchresultspagerforpage.yml
 delete mode 100644 config/export/block.block.views_block__solr_search_content_block_1.yml
 delete mode 100644 config/export/block.block.year.yml
 delete mode 100644 config/export/block.block.yearswc.yml
 delete mode 100644 config/export/block_content.type.basic.yml
 delete mode 100644 config/export/bootstrap_barrio.settings.yml
 delete mode 100644 config/export/citation_select.settings.yml
 delete mode 100644 config/export/claro.settings.yml
 delete mode 100644 config/export/comment.settings.yml
 delete mode 100644 config/export/comment.type.comment.yml
 delete mode 100644 config/export/contact.form.feedback.yml
 delete mode 100644 config/export/contact.form.personal.yml
 delete mode 100644 config/export/contact.settings.yml
 delete mode 100644 config/export/context.context.all_media.yml
 delete mode 100644 config/export/context.context.audio.yml
 delete mode 100644 config/export/context.context.audio_original_file.yml
 delete mode 100644 config/export/context.context.basic_image.yml
 delete mode 100644 config/export/context.context.basic_pages.yml
 delete mode 100644 config/export/context.context.binary.yml
 delete mode 100644 config/export/context.context.book_or_page.yml
 delete mode 100644 config/export/context.context.collection.yml
 delete mode 100644 config/export/context.context.compound_member_object.yml
 delete mode 100644 config/export/context.context.compound_parent_object.yml
 delete mode 100644 config/export/context.context.external_files.yml
 delete mode 100644 config/export/context.context.image_original_file.yml
 delete mode 100644 config/export/context.context.large_image.yml
 delete mode 100644 config/export/context.context.newspaper.yml
 delete mode 100644 config/export/context.context.newspaper_issue.yml
 delete mode 100644 config/export/context.context.open_seadragon.yml
 delete mode 100644 config/export/context.context.openseadragon_block.yml
 delete mode 100644 config/export/context.context.paged_content_openseadragon.yml
 delete mode 100644 config/export/context.context.pages.yml
 delete mode 100644 config/export/context.context.pdf_original_file.yml
 delete mode 100644 config/export/context.context.pdfjs.yml
 delete mode 100644 config/export/context.context.remote_media.yml
 delete mode 100644 config/export/context.context.repository_content.yml
 delete mode 100644 config/export/context.context.taxonomy_terms.yml
 delete mode 100644 config/export/context.context.technical_metadata_on_ingest.yml
 delete mode 100644 config/export/context.context.video_original_file.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.changed.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.created.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.name.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.path.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.status.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.thumbnail.yml
 delete mode 100644 config/export/core.base_field_override.media.audio.uid.yml
 delete mode 100644 config/export/core.base_field_override.media.file.changed.yml
 delete mode 100644 config/export/core.base_field_override.media.file.created.yml
 delete mode 100644 config/export/core.base_field_override.media.file.name.yml
 delete mode 100644 config/export/core.base_field_override.media.file.path.yml
 delete mode 100644 config/export/core.base_field_override.media.file.status.yml
 delete mode 100644 config/export/core.base_field_override.media.file.thumbnail.yml
 delete mode 100644 config/export/core.base_field_override.media.file.uid.yml
 delete mode 100644 config/export/core.base_field_override.media.image.changed.yml
 delete mode 100644 config/export/core.base_field_override.media.image.created.yml
 delete mode 100644 config/export/core.base_field_override.media.image.name.yml
 delete mode 100644 config/export/core.base_field_override.media.image.path.yml
 delete mode 100644 config/export/core.base_field_override.media.image.status.yml
 delete mode 100644 config/export/core.base_field_override.media.image.thumbnail.yml
 delete mode 100644 config/export/core.base_field_override.media.image.uid.yml
 delete mode 100644 config/export/core.base_field_override.media.video.changed.yml
 delete mode 100644 config/export/core.base_field_override.media.video.created.yml
 delete mode 100644 config/export/core.base_field_override.media.video.name.yml
 delete mode 100644 config/export/core.base_field_override.media.video.path.yml
 delete mode 100644 config/export/core.base_field_override.media.video.status.yml
 delete mode 100644 config/export/core.base_field_override.media.video.thumbnail.yml
 delete mode 100644 config/export/core.base_field_override.media.video.uid.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.changed.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.created.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.menu_link.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.path.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.promote.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.status.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.sticky.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.title.yml
 delete mode 100644 config/export/core.base_field_override.node.islandora_object.uid.yml
 delete mode 100644 config/export/core.base_field_override.node.page.promote.yml
 delete mode 100644 config/export/core.date_format.fallback.yml
 delete mode 100644 config/export/core.date_format.html_date.yml
 delete mode 100644 config/export/core.date_format.html_datetime.yml
 delete mode 100644 config/export/core.date_format.html_month.yml
 delete mode 100644 config/export/core.date_format.html_time.yml
 delete mode 100644 config/export/core.date_format.html_week.yml
 delete mode 100644 config/export/core.date_format.html_year.yml
 delete mode 100644 config/export/core.date_format.html_yearless_date.yml
 delete mode 100644 config/export/core.date_format.long.yml
 delete mode 100644 config/export/core.date_format.medium.yml
 delete mode 100644 config/export/core.date_format.short.yml
 delete mode 100644 config/export/core.entity_form_display.block_content.basic.default.yml
 delete mode 100644 config/export/core.entity_form_display.comment.comment.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.audio.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.document.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.extracted_text.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.file.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.image.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.remote_video.default.yml
 delete mode 100644 config/export/core.entity_form_display.media.video.default.yml
 delete mode 100644 config/export/core.entity_form_display.node.article.default.yml
 delete mode 100644 config/export/core.entity_form_display.node.collection_object.default.yml
 delete mode 100644 config/export/core.entity_form_display.node.islandora_object.default.yml
 delete mode 100644 config/export/core.entity_form_display.node.page.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.corporate_body.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.country.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.family.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.frequencies.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.genre.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.geo_location.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.islandora_display.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.islandora_media_use.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.islandora_models.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.issuance_modes.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.language.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.person.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.physical_form.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.resource_types.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.subject.default.yml
 delete mode 100644 config/export/core.entity_form_display.taxonomy_term.temporal_subjects.default.yml
 delete mode 100644 config/export/core.entity_form_display.user.user.default.yml
 delete mode 100644 config/export/core.entity_form_mode.user.register.yml
 delete mode 100644 config/export/core.entity_view_display.block_content.basic.default.yml
 delete mode 100644 config/export/core.entity_view_display.comment.comment.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.audio.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.audio.file_download.yml
 delete mode 100644 config/export/core.entity_view_display.media.audio.source.yml
 delete mode 100644 config/export/core.entity_view_display.media.document.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.document.file_download.yml
 delete mode 100644 config/export/core.entity_view_display.media.document.pdfjs.yml
 delete mode 100644 config/export/core.entity_view_display.media.document.source.yml
 delete mode 100644 config/export/core.entity_view_display.media.extracted_text.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.file.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.file.file_download.yml
 delete mode 100644 config/export/core.entity_view_display.media.file.open_seadragon.yml
 delete mode 100644 config/export/core.entity_view_display.media.file.pdfjs.yml
 delete mode 100644 config/export/core.entity_view_display.media.file.source.yml
 delete mode 100644 config/export/core.entity_view_display.media.fits_technical_metadata.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.fits_technical_metadata.fits_technical_metadata.yml
 delete mode 100644 config/export/core.entity_view_display.media.image.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.image.file_download.yml
 delete mode 100644 config/export/core.entity_view_display.media.image.open_seadragon.yml
 delete mode 100644 config/export/core.entity_view_display.media.image.source.yml
 delete mode 100644 config/export/core.entity_view_display.media.image.thumbnail.yml
 delete mode 100644 config/export/core.entity_view_display.media.remote_video.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.video.default.yml
 delete mode 100644 config/export/core.entity_view_display.media.video.file_download.yml
 delete mode 100644 config/export/core.entity_view_display.media.video.source.yml
 delete mode 100644 config/export/core.entity_view_display.node.article.default.yml
 delete mode 100644 config/export/core.entity_view_display.node.article.rss.yml
 delete mode 100644 config/export/core.entity_view_display.node.article.teaser.yml
 delete mode 100644 config/export/core.entity_view_display.node.collection_object.default.yml
 delete mode 100644 config/export/core.entity_view_display.node.collection_object.teaser.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.binary.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.default.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.open_seadragon.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.pdfjs.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.search_index.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.search_result.yml
 delete mode 100644 config/export/core.entity_view_display.node.islandora_object.teaser.yml
 delete mode 100644 config/export/core.entity_view_display.node.page.default.yml
 delete mode 100644 config/export/core.entity_view_display.node.page.teaser.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.copyright_and_use.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.corporate_body.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.country.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.family.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.frequencies.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.genre.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.geo_location.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.islandora_display.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.islandora_media_use.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.islandora_models.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.issuance_modes.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.language.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.person.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.physical_form.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.resource_types.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.subject.default.yml
 delete mode 100644 config/export/core.entity_view_display.taxonomy_term.temporal_subjects.default.yml
 delete mode 100644 config/export/core.entity_view_display.user.user.compact.yml
 delete mode 100644 config/export/core.entity_view_display.user.user.default.yml
 delete mode 100644 config/export/core.entity_view_mode.block.token.yml
 delete mode 100644 config/export/core.entity_view_mode.block_content.full.yml
 delete mode 100644 config/export/core.entity_view_mode.block_content.token.yml
 delete mode 100644 config/export/core.entity_view_mode.comment.full.yml
 delete mode 100644 config/export/core.entity_view_mode.comment.token.yml
 delete mode 100644 config/export/core.entity_view_mode.contact_message.token.yml
 delete mode 100644 config/export/core.entity_view_mode.file.token.yml
 delete mode 100644 config/export/core.entity_view_mode.media.download.yml
 delete mode 100644 config/export/core.entity_view_mode.media.file_download.yml
 delete mode 100644 config/export/core.entity_view_mode.media.fits_technical_metadata.yml
 delete mode 100644 config/export/core.entity_view_mode.media.full.yml
 delete mode 100644 config/export/core.entity_view_mode.media.media_library.yml
 delete mode 100644 config/export/core.entity_view_mode.media.open_seadragon.yml
 delete mode 100644 config/export/core.entity_view_mode.media.pdfjs.yml
 delete mode 100644 config/export/core.entity_view_mode.media.source.yml
 delete mode 100644 config/export/core.entity_view_mode.media.thumbnail.yml
 delete mode 100644 config/export/core.entity_view_mode.media.token.yml
 delete mode 100644 config/export/core.entity_view_mode.media.video.yml
 delete mode 100644 config/export/core.entity_view_mode.menu_link_content.token.yml
 delete mode 100644 config/export/core.entity_view_mode.node.basic.yml
 delete mode 100644 config/export/core.entity_view_mode.node.binary.yml
 delete mode 100644 config/export/core.entity_view_mode.node.collection.yml
 delete mode 100644 config/export/core.entity_view_mode.node.compound.yml
 delete mode 100644 config/export/core.entity_view_mode.node.compound_member.yml
 delete mode 100644 config/export/core.entity_view_mode.node.full.yml
 delete mode 100644 config/export/core.entity_view_mode.node.media_evas.yml
 delete mode 100644 config/export/core.entity_view_mode.node.newspaper.yml
 delete mode 100644 config/export/core.entity_view_mode.node.open_seadragon.yml
 delete mode 100644 config/export/core.entity_view_mode.node.paged.yml
 delete mode 100644 config/export/core.entity_view_mode.node.pdfjs.yml
 delete mode 100644 config/export/core.entity_view_mode.node.remote_media.yml
 delete mode 100644 config/export/core.entity_view_mode.node.revision.yml
 delete mode 100644 config/export/core.entity_view_mode.node.rss.yml
 delete mode 100644 config/export/core.entity_view_mode.node.search_index.yml
 delete mode 100644 config/export/core.entity_view_mode.node.search_result.yml
 delete mode 100644 config/export/core.entity_view_mode.node.something_else.yml
 delete mode 100644 config/export/core.entity_view_mode.node.teaser.yml
 delete mode 100644 config/export/core.entity_view_mode.node.token.yml
 delete mode 100644 config/export/core.entity_view_mode.path_alias.token.yml
 delete mode 100644 config/export/core.entity_view_mode.shortcut.token.yml
 delete mode 100644 config/export/core.entity_view_mode.taxonomy_term.full.yml
 delete mode 100644 config/export/core.entity_view_mode.taxonomy_term.token.yml
 delete mode 100644 config/export/core.entity_view_mode.tour.token.yml
 delete mode 100644 config/export/core.entity_view_mode.user.compact.yml
 delete mode 100644 config/export/core.entity_view_mode.user.full.yml
 delete mode 100644 config/export/core.entity_view_mode.user.token.yml
 delete mode 100644 config/export/core.extension.yml
 delete mode 100644 config/export/core.menu.static_menu_link_overrides.yml
 delete mode 100644 config/export/dblog.settings.yml
 delete mode 100644 config/export/devel.settings.yml
 delete mode 100644 config/export/devel.toolbar.settings.yml
 delete mode 100644 config/export/editor.editor.basic_html.yml
 delete mode 100644 config/export/editor.editor.full_html.yml
 delete mode 100644 config/export/facets.facet.creators_and_contributors.yml
 delete mode 100644 config/export/facets.facet.creators_and_contributors_swc.yml
 delete mode 100644 config/export/facets.facet.member_of.yml
 delete mode 100644 config/export/facets.facet.member_of_content_title.yml
 delete mode 100644 config/export/facets.facet.member_of_swc.yml
 delete mode 100644 config/export/facets.facet.physical_form.yml
 delete mode 100644 config/export/facets.facet.physical_form_swc.yml
 delete mode 100644 config/export/facets.facet.resource_type.yml
 delete mode 100755 config/export/facets.facet.resource_type_2.yml
 delete mode 100644 config/export/facets.facet.subject.yml
 delete mode 100644 config/export/facets.facet.subject_name.yml
 delete mode 100644 config/export/facets.facet.temporal_subject.yml
 delete mode 100644 config/export/facets.facet.year.yml
 delete mode 100644 config/export/facets.facet.year_swc.yml
 delete mode 100644 config/export/features.bundle.controlled_access_terms.yml
 delete mode 100644 config/export/features.bundle.default.yml
 delete mode 100644 config/export/features.bundle.islandora.yml
 delete mode 100644 config/export/features.settings.yml
 delete mode 100644 config/export/field.field.block_content.basic.body.yml
 delete mode 100644 config/export/field.field.comment.comment.comment_body.yml
 delete mode 100644 config/export/field.field.media.audio.field_file_size.yml
 delete mode 100644 config/export/field.field.media.audio.field_media_audio_file.yml
 delete mode 100644 config/export/field.field.media.audio.field_media_of.yml
 delete mode 100644 config/export/field.field.media.audio.field_media_use.yml
 delete mode 100644 config/export/field.field.media.audio.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.audio.field_original_name.yml
 delete mode 100644 config/export/field.field.media.audio.field_track.yml
 delete mode 100644 config/export/field.field.media.document.field_display_mode_for_viewer.yml
 delete mode 100644 config/export/field.field.media.document.field_file_size.yml
 delete mode 100644 config/export/field.field.media.document.field_media_document.yml
 delete mode 100644 config/export/field.field.media.document.field_media_of.yml
 delete mode 100644 config/export/field.field.media.document.field_media_use.yml
 delete mode 100644 config/export/field.field.media.document.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.document.field_original_name.yml
 delete mode 100644 config/export/field.field.media.extracted_text.field_edited_text.yml
 delete mode 100644 config/export/field.field.media.extracted_text.field_media_file.yml
 delete mode 100644 config/export/field.field.media.extracted_text.field_media_of.yml
 delete mode 100644 config/export/field.field.media.extracted_text.field_media_use.yml
 delete mode 100644 config/export/field.field.media.extracted_text.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.file.field_display_mode_for_viewer.yml
 delete mode 100644 config/export/field.field.media.file.field_file_size.yml
 delete mode 100644 config/export/field.field.media.file.field_media_file.yml
 delete mode 100644 config/export/field.field.media.file.field_media_of.yml
 delete mode 100644 config/export/field.field.media.file.field_media_use.yml
 delete mode 100644 config/export/field.field.media.file.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.file.field_original_name.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.field_complete.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.field_file_size.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.field_media_file.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.field_media_of.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.field_media_use.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.fits_technical_metadata.fits_ois_file_information_md5che.yml
 delete mode 100644 config/export/field.field.media.image.field_display_mode_for_viewer.yml
 delete mode 100644 config/export/field.field.media.image.field_file_size.yml
 delete mode 100644 config/export/field.field.media.image.field_height.yml
 delete mode 100644 config/export/field.field.media.image.field_media_image.yml
 delete mode 100644 config/export/field.field.media.image.field_media_of.yml
 delete mode 100644 config/export/field.field.media.image.field_media_use.yml
 delete mode 100644 config/export/field.field.media.image.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.image.field_original_name.yml
 delete mode 100644 config/export/field.field.media.image.field_width.yml
 delete mode 100644 config/export/field.field.media.remote_video.field_media_oembed_video.yml
 delete mode 100644 config/export/field.field.media.video.field_file_size.yml
 delete mode 100644 config/export/field.field.media.video.field_media_of.yml
 delete mode 100644 config/export/field.field.media.video.field_media_use.yml
 delete mode 100644 config/export/field.field.media.video.field_media_video_file.yml
 delete mode 100644 config/export/field.field.media.video.field_mime_type.yml
 delete mode 100644 config/export/field.field.media.video.field_original_name.yml
 delete mode 100644 config/export/field.field.media.video.field_track.yml
 delete mode 100644 config/export/field.field.node.article.body.yml
 delete mode 100644 config/export/field.field.node.article.comment.yml
 delete mode 100644 config/export/field.field.node.article.field_image.yml
 delete mode 100644 config/export/field.field.node.article.field_tags.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_alternative_title.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_collection_contact_email.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_collection_contact_name.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_collection_number.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_date_captured.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_date_modified.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_date_valid.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_description.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_display_hints.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_edtf_date.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_edtf_date_created.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_edtf_date_issued.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_extent.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_featured_item.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_finding_aid.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_geographic_subject.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_linked_agent.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_member_of.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_model.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_resource_type.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_rights.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_subject_general.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_subjects_name.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_temporal_subject.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_unique_id.yml
 delete mode 100644 config/export/field.field.node.collection_object.field_weight.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_abstract.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_alt_title.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_alternative_title.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_citable_url.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_classification.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_collection_number.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_contributor.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_coordinates.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_coordinates_text.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_copyright_and_use.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_copyright_date.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_copyright_holder.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_creator.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_date_available.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_date_captured.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_date_copyrighted.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_date_modified.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_date_published.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_date_valid.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_description.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_dewey_classification.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_digital_identifier.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_digital_publisher.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_display_hints.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_dspace_identifier.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_dspace_item_id.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_edition.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_edtf_date.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_edtf_date_created.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_edtf_date_issued.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_extent.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_featured_item.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_finding_aid.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_frequency.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_full_title.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_genre.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_geographic_subject.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_geoportal_link.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_identifier.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_is_part_of.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_isbn.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_issn.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_item_barcode.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_jhir.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_language.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_lcc_classification.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_library_catalog_link.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_linked_agent.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_local_identifier.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_member_of.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_mode_of_issuance.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_model.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_note.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_oclc_number.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_physical_form.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_pid.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_place_published.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_place_published_country.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_publisher.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_publisher_country.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_resource_type.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_rights.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_spatial_coverage.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_subject.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_subject_general.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_subjects_name.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_table_of_contents.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_temporal_subject.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_unique_id.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_weight.yml
 delete mode 100644 config/export/field.field.node.islandora_object.field_years.yml
 delete mode 100644 config/export/field.field.node.page.body.yml
 delete mode 100644 config/export/field.field.taxonomy_term.copyright_and_use.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.copyright_and_use.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_cat_date_begin.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_cat_date_end.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_corporate_body_alt_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_date.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_date_of_meeting_or_treaty.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_location_of_meeting.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_num_of_section_or_meet.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_primary_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_relationships.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_subordinate_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_type.yml
 delete mode 100644 config/export/field.field.taxonomy_term.corporate_body.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.country.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_cat_date_begin.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_cat_date_end.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_date.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_family_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_relationships.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_title_and_other_words.yml
 delete mode 100644 config/export/field.field.taxonomy_term.family.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.frequencies.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.genre.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.genre.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.geo_location.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.geo_location.field_broader.yml
 delete mode 100644 config/export/field.field.taxonomy_term.geo_location.field_geo_alt_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.geo_location.field_geo_geolocation.yml
 delete mode 100644 config/export/field.field.taxonomy_term.geo_location.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.islandora_display.field_external_uri.yml
 delete mode 100644 config/export/field.field.taxonomy_term.islandora_media_use.field_external_uri.yml
 delete mode 100644 config/export/field.field.taxonomy_term.islandora_models.field_external_uri.yml
 delete mode 100644 config/export/field.field.taxonomy_term.issuance_modes.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.language.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_cat_date_begin.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_cat_date_end.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_date.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_person_alternate_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_preferred_name_fuller_form.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_preferred_name_number.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_preferred_name_prefix.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_preferred_name_rest.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_preferred_name_suffix.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_primary_part_of_name.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_relationships.yml
 delete mode 100644 config/export/field.field.taxonomy_term.person.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.physical_form.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.resource_types.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.subject.field_authority_link.yml
 delete mode 100644 config/export/field.field.taxonomy_term.subject.field_unique_id.yml
 delete mode 100644 config/export/field.field.taxonomy_term.temporal_subjects.field_authority_link.yml
 delete mode 100644 config/export/field.field.user.user.user_picture.yml
 delete mode 100644 config/export/field.settings.yml
 delete mode 100644 config/export/field.storage.block_content.body.yml
 delete mode 100644 config/export/field.storage.comment.comment_body.yml
 delete mode 100644 config/export/field.storage.group_content.group_roles.yml
 delete mode 100644 config/export/field.storage.media.field_complete.yml
 delete mode 100644 config/export/field.storage.media.field_display_mode_for_viewer.yml
 delete mode 100644 config/export/field.storage.media.field_edited_text.yml
 delete mode 100644 config/export/field.storage.media.field_file_size.yml
 delete mode 100644 config/export/field.storage.media.field_height.yml
 delete mode 100644 config/export/field.storage.media.field_media_audio_file.yml
 delete mode 100644 config/export/field.storage.media.field_media_document.yml
 delete mode 100644 config/export/field.storage.media.field_media_file.yml
 delete mode 100644 config/export/field.storage.media.field_media_image.yml
 delete mode 100644 config/export/field.storage.media.field_media_oembed_video.yml
 delete mode 100644 config/export/field.storage.media.field_media_of.yml
 delete mode 100644 config/export/field.storage.media.field_media_use.yml
 delete mode 100644 config/export/field.storage.media.field_media_video_file.yml
 delete mode 100644 config/export/field.storage.media.field_mime_type.yml
 delete mode 100644 config/export/field.storage.media.field_original_name.yml
 delete mode 100644 config/export/field.storage.media.field_track.yml
 delete mode 100644 config/export/field.storage.media.field_width.yml
 delete mode 100644 config/export/field.storage.media.fits_ois_file_information_md5che.yml
 delete mode 100644 config/export/field.storage.node.body.yml
 delete mode 100644 config/export/field.storage.node.comment.yml
 delete mode 100644 config/export/field.storage.node.field_abstract.yml
 delete mode 100644 config/export/field.storage.node.field_alt_title.yml
 delete mode 100644 config/export/field.storage.node.field_alternative_title.yml
 delete mode 100644 config/export/field.storage.node.field_citable_url.yml
 delete mode 100644 config/export/field.storage.node.field_classification.yml
 delete mode 100644 config/export/field.storage.node.field_collection_contact_email.yml
 delete mode 100644 config/export/field.storage.node.field_collection_contact_name.yml
 delete mode 100644 config/export/field.storage.node.field_collection_number.yml
 delete mode 100644 config/export/field.storage.node.field_contributor.yml
 delete mode 100644 config/export/field.storage.node.field_coordinates.yml
 delete mode 100644 config/export/field.storage.node.field_coordinates_text.yml
 delete mode 100644 config/export/field.storage.node.field_copyright_and_use.yml
 delete mode 100644 config/export/field.storage.node.field_copyright_date.yml
 delete mode 100644 config/export/field.storage.node.field_copyright_holder.yml
 delete mode 100644 config/export/field.storage.node.field_creator.yml
 delete mode 100644 config/export/field.storage.node.field_date_available.yml
 delete mode 100644 config/export/field.storage.node.field_date_captured.yml
 delete mode 100644 config/export/field.storage.node.field_date_copyrighted.yml
 delete mode 100644 config/export/field.storage.node.field_date_modified.yml
 delete mode 100644 config/export/field.storage.node.field_date_published.yml
 delete mode 100644 config/export/field.storage.node.field_date_valid.yml
 delete mode 100644 config/export/field.storage.node.field_description.yml
 delete mode 100644 config/export/field.storage.node.field_dewey_classification.yml
 delete mode 100644 config/export/field.storage.node.field_digital_identifier.yml
 delete mode 100644 config/export/field.storage.node.field_digital_publisher.yml
 delete mode 100644 config/export/field.storage.node.field_display_hints.yml
 delete mode 100644 config/export/field.storage.node.field_dspace_identifier.yml
 delete mode 100644 config/export/field.storage.node.field_dspace_item_id.yml
 delete mode 100644 config/export/field.storage.node.field_edition.yml
 delete mode 100644 config/export/field.storage.node.field_edtf_date.yml
 delete mode 100644 config/export/field.storage.node.field_edtf_date_created.yml
 delete mode 100644 config/export/field.storage.node.field_edtf_date_issued.yml
 delete mode 100644 config/export/field.storage.node.field_extent.yml
 delete mode 100644 config/export/field.storage.node.field_featured_item.yml
 delete mode 100644 config/export/field.storage.node.field_finding_aid.yml
 delete mode 100644 config/export/field.storage.node.field_frequency.yml
 delete mode 100644 config/export/field.storage.node.field_full_title.yml
 delete mode 100644 config/export/field.storage.node.field_genre.yml
 delete mode 100644 config/export/field.storage.node.field_geographic_subject.yml
 delete mode 100644 config/export/field.storage.node.field_geoportal_link.yml
 delete mode 100644 config/export/field.storage.node.field_identifier.yml
 delete mode 100644 config/export/field.storage.node.field_image.yml
 delete mode 100644 config/export/field.storage.node.field_is_part_of.yml
 delete mode 100644 config/export/field.storage.node.field_isbn.yml
 delete mode 100644 config/export/field.storage.node.field_issn.yml
 delete mode 100644 config/export/field.storage.node.field_item_barcode.yml
 delete mode 100644 config/export/field.storage.node.field_jhir.yml
 delete mode 100644 config/export/field.storage.node.field_language.yml
 delete mode 100644 config/export/field.storage.node.field_lcc_classification.yml
 delete mode 100644 config/export/field.storage.node.field_library_catalog_link.yml
 delete mode 100644 config/export/field.storage.node.field_linked_agent.yml
 delete mode 100644 config/export/field.storage.node.field_local_identifier.yml
 delete mode 100644 config/export/field.storage.node.field_member_of.yml
 delete mode 100644 config/export/field.storage.node.field_mode_of_issuance.yml
 delete mode 100644 config/export/field.storage.node.field_model.yml
 delete mode 100644 config/export/field.storage.node.field_note.yml
 delete mode 100644 config/export/field.storage.node.field_oclc_number.yml
 delete mode 100644 config/export/field.storage.node.field_physical_form.yml
 delete mode 100644 config/export/field.storage.node.field_pid.yml
 delete mode 100644 config/export/field.storage.node.field_place_published.yml
 delete mode 100644 config/export/field.storage.node.field_place_published_country.yml
 delete mode 100644 config/export/field.storage.node.field_publisher.yml
 delete mode 100644 config/export/field.storage.node.field_publisher_country.yml
 delete mode 100644 config/export/field.storage.node.field_resource_type.yml
 delete mode 100644 config/export/field.storage.node.field_rights.yml
 delete mode 100644 config/export/field.storage.node.field_spatial_coverage.yml
 delete mode 100644 config/export/field.storage.node.field_subject.yml
 delete mode 100644 config/export/field.storage.node.field_subject_general.yml
 delete mode 100644 config/export/field.storage.node.field_subjects_name.yml
 delete mode 100644 config/export/field.storage.node.field_table_of_contents.yml
 delete mode 100644 config/export/field.storage.node.field_tags.yml
 delete mode 100644 config/export/field.storage.node.field_temporal_subject.yml
 delete mode 100644 config/export/field.storage.node.field_unique_id.yml
 delete mode 100644 config/export/field.storage.node.field_weight.yml
 delete mode 100644 config/export/field.storage.node.field_years.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_authority_link.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_broader.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_cat_date_begin.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_cat_date_end.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_corporate_body_alt_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_date.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_date_of_meeting_or_treaty.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_external_uri.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_family_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_geo_alt_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_geo_geolocation.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_location_of_meeting.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_num_of_section_or_meet.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_person_alternate_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_preferred_name_fuller_form.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_preferred_name_number.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_preferred_name_prefix.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_preferred_name_rest.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_preferred_name_suffix.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_primary_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_primary_part_of_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_relationships.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_subordinate_name.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_title_and_other_words.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_type.yml
 delete mode 100644 config/export/field.storage.taxonomy_term.field_unique_id.yml
 delete mode 100644 config/export/field.storage.user.user_picture.yml
 delete mode 100644 config/export/field_ui.settings.yml
 delete mode 100644 config/export/file.settings.yml
 delete mode 100644 config/export/filehash.settings.yml
 delete mode 100644 config/export/filter.format.basic_html.yml
 delete mode 100644 config/export/filter.format.full_html.yml
 delete mode 100644 config/export/filter.format.plain_text.yml
 delete mode 100644 config/export/filter.format.restricted_html.yml
 delete mode 100644 config/export/filter.settings.yml
 delete mode 100644 config/export/group.settings.yml
 delete mode 100644 config/export/hal.settings.yml
 delete mode 100644 config/export/idc_ui_theme_boots.settings.yml
 delete mode 100644 config/export/image.settings.yml
 delete mode 100644 config/export/image.style.large.yml
 delete mode 100644 config/export/image.style.max_1300x1300.yml
 delete mode 100644 config/export/image.style.max_2600x2600.yml
 delete mode 100644 config/export/image.style.max_325x325.yml
 delete mode 100644 config/export/image.style.max_650x650.yml
 delete mode 100644 config/export/image.style.medium.yml
 delete mode 100644 config/export/image.style.thumbnail.yml
 delete mode 100644 config/export/image.style.wide.yml
 delete mode 100644 config/export/islandora.settings.yml
 delete mode 100755 config/export/islandora_advanced_search.settings.yml
 delete mode 100644 config/export/islandora_breadcrumbs.breadcrumbs.yml
 delete mode 100644 config/export/islandora_iiif.settings.yml
 delete mode 100644 config/export/jsonld.settings.yml
 delete mode 100644 config/export/jwt.config.yml
 delete mode 100644 config/export/key.key.islandora_rsa_key.yml
 delete mode 100644 config/export/language.content_settings.media.audio.yml
 delete mode 100644 config/export/language.content_settings.media.extracted_text.yml
 delete mode 100644 config/export/language.content_settings.media.file.yml
 delete mode 100644 config/export/language.content_settings.media.image.yml
 delete mode 100644 config/export/language.content_settings.media.video.yml
 delete mode 100644 config/export/language.content_settings.node.collection_object.yml
 delete mode 100644 config/export/language.content_settings.node.islandora_object.yml
 delete mode 100644 config/export/language.content_settings.path_alias.path_alias.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.copyright_and_use.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.corporate_body.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.country.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.family.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.frequencies.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.genre.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.geo_location.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.islandora_media_use.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.islandora_models.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.issuance_modes.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.language.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.person.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.physical_form.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.resource_types.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.subject.yml
 delete mode 100644 config/export/language.content_settings.taxonomy_term.temporal_subjects.yml
 delete mode 100644 config/export/language.entity.en.yml
 delete mode 100644 config/export/language.entity.und.yml
 delete mode 100644 config/export/language.entity.zxx.yml
 delete mode 100644 config/export/language.mappings.yml
 delete mode 100644 config/export/language.negotiation.yml
 delete mode 100644 config/export/language.types.yml
 delete mode 100644 config/export/matomo.settings.yml
 delete mode 100644 config/export/media.settings.yml
 delete mode 100644 config/export/media.type.audio.yml
 delete mode 100644 config/export/media.type.document.yml
 delete mode 100644 config/export/media.type.extracted_text.yml
 delete mode 100644 config/export/media.type.file.yml
 delete mode 100644 config/export/media.type.fits_technical_metadata.yml
 delete mode 100644 config/export/media.type.image.yml
 delete mode 100644 config/export/media.type.remote_video.yml
 delete mode 100644 config/export/media.type.video.yml
 delete mode 100644 config/export/menu_ui.settings.yml
 delete mode 100644 config/export/migrate_plus.migration.idc_default_migration_menu_link_main.yml
 delete mode 100644 config/export/migrate_plus.migration.islandora_defaults_tags.yml
 delete mode 100644 config/export/migrate_plus.migration.islandora_tags.yml
 delete mode 100644 config/export/migrate_plus.migration_group.idc_initial_setup.yml
 delete mode 100644 config/export/migrate_plus.migration_group.islandora.yml
 delete mode 100644 config/export/node.settings.yml
 delete mode 100644 config/export/node.type.article.yml
 delete mode 100644 config/export/node.type.collection_object.yml
 delete mode 100644 config/export/node.type.islandora_object.yml
 delete mode 100644 config/export/node.type.page.yml
 delete mode 100644 config/export/openseadragon.settings.yml
 delete mode 100644 config/export/pathauto.pattern.basic_page.yml
 delete mode 100644 config/export/pathauto.pattern.group_content.yml
 delete mode 100644 config/export/pathauto.pattern.islandora_content.yml
 delete mode 100644 config/export/pathauto.pattern.taxonomy_terms.yml
 delete mode 100644 config/export/pathauto.settings.yml
 delete mode 100644 config/export/rdf.mapping.comment.comment.yml
 delete mode 100644 config/export/rdf.mapping.media.audio.yml
 delete mode 100644 config/export/rdf.mapping.media.document.yml
 delete mode 100644 config/export/rdf.mapping.media.extracted_text.yml
 delete mode 100644 config/export/rdf.mapping.media.file.yml
 delete mode 100644 config/export/rdf.mapping.media.image.yml
 delete mode 100644 config/export/rdf.mapping.media.video.yml
 delete mode 100644 config/export/rdf.mapping.node.article.yml
 delete mode 100644 config/export/rdf.mapping.node.islandora_object.yml
 delete mode 100644 config/export/rdf.mapping.node.page.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.corporate_body.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.country.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.family.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.genre.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.geo_location.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.islandora_display.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.islandora_media_use.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.islandora_models.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.language.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.person.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.physical_form.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.resource_types.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.subject.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.tags.yml
 delete mode 100644 config/export/rdf.mapping.taxonomy_term.temporal_subjects.yml
 delete mode 100644 config/export/rdf.mapping.user.user.yml
 delete mode 100644 config/export/responsive_image.styles.narrow.yml
 delete mode 100644 config/export/responsive_image.styles.wide.yml
 delete mode 100644 config/export/rest.resource.entity.entity_form_display.yml
 delete mode 100644 config/export/rest.resource.entity.field_config.yml
 delete mode 100644 config/export/rest.resource.entity.field_storage_config.yml
 delete mode 100644 config/export/rest.resource.entity.file.yml
 delete mode 100644 config/export/rest.resource.entity.media.yml
 delete mode 100644 config/export/rest.resource.entity.media_type.yml
 delete mode 100644 config/export/rest.resource.entity.node.yml
 delete mode 100644 config/export/rest.resource.entity.path_alias.yml
 delete mode 100644 config/export/rest.resource.entity.taxonomy_term.yml
 delete mode 100644 config/export/rest.resource.entity.taxonomy_vocabulary.yml
 delete mode 100644 config/export/rest.resource.entity.user.yml
 delete mode 100644 config/export/rest.resource.file.upload.yml
 delete mode 100644 config/export/rest.resource.oai_pmh.yml
 delete mode 100644 config/export/rest_oai_pmh.settings.yml
 delete mode 100644 config/export/search_api.index.default_solr_index.yml
 delete mode 100644 config/export/search_api.server.default_solr_server.yml
 delete mode 100644 config/export/search_api.settings.yml
 delete mode 100644 config/export/search_api_solr.solr_cache.cache_document_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_en_3_6_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_en_4_5_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_en_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_en_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_und_3_6_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_und_4_5_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_und_6_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_field_type.text_und_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml
 delete mode 100644 config/export/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml
 delete mode 100644 config/export/shortcut.set.default.yml
 delete mode 100644 config/export/syslog.settings.yml
 delete mode 100644 config/export/system.action.audio_generate_a_service_file_from_an_original_file.yml
 delete mode 100644 config/export/system.action.comment_delete_action.yml
 delete mode 100644 config/export/system.action.comment_publish_action.yml
 delete mode 100644 config/export/system.action.comment_save_action.yml
 delete mode 100644 config/export/system.action.comment_unpublish_action.yml
 delete mode 100644 config/export/system.action.delete_file_as_fedora_external_content.yml
 delete mode 100644 config/export/system.action.delete_media_and_file.yml
 delete mode 100644 config/export/system.action.delete_media_from_triplestore.yml
 delete mode 100644 config/export/system.action.delete_node_from_fedora.yml
 delete mode 100644 config/export/system.action.delete_node_from_triplestore.yml
 delete mode 100644 config/export/system.action.delete_taxonomy_term_in_fedora.yml
 delete mode 100644 config/export/system.action.delete_taxonomy_term_in_triplestore.yml
 delete mode 100644 config/export/system.action.digital_document_generate_a_thumbnail_from_an_original_file.yml
 delete mode 100644 config/export/system.action.generate_a_technical_metadata_derivative.yml
 delete mode 100644 config/export/system.action.get_ocr_from_image.yml
 delete mode 100644 config/export/system.action.image_generate_a_service_file_from_an_original_file.yml
 delete mode 100644 config/export/system.action.image_generate_a_thumbnail_from_an_original_file.yml
 delete mode 100644 config/export/system.action.index_file_as_fedora_external_content.yml
 delete mode 100644 config/export/system.action.index_media_in_fedora.yml
 delete mode 100644 config/export/system.action.index_media_in_triplestore.yml
 delete mode 100644 config/export/system.action.index_node_in_fedora.yml
 delete mode 100644 config/export/system.action.index_node_in_triplestore.yml
 delete mode 100644 config/export/system.action.index_taxonomy_term_in_fedora.yml
 delete mode 100644 config/export/system.action.index_taxonomy_term_in_the_triplestore.yml
 delete mode 100644 config/export/system.action.media_delete_action.yml
 delete mode 100644 config/export/system.action.media_publish_action.yml
 delete mode 100644 config/export/system.action.media_save_action.yml
 delete mode 100644 config/export/system.action.media_unpublish_action.yml
 delete mode 100644 config/export/system.action.node_delete_action.yml
 delete mode 100644 config/export/system.action.node_make_sticky_action.yml
 delete mode 100644 config/export/system.action.node_make_unsticky_action.yml
 delete mode 100644 config/export/system.action.node_promote_action.yml
 delete mode 100644 config/export/system.action.node_publish_action.yml
 delete mode 100644 config/export/system.action.node_save_action.yml
 delete mode 100644 config/export/system.action.node_unpromote_action.yml
 delete mode 100644 config/export/system.action.node_unpublish_action.yml
 delete mode 100644 config/export/system.action.pathauto_update_alias_node.yml
 delete mode 100644 config/export/system.action.pathauto_update_alias_user.yml
 delete mode 100644 config/export/system.action.taxonomy_term_publish_action.yml
 delete mode 100644 config/export/system.action.taxonomy_term_unpublish_action.yml
 delete mode 100644 config/export/system.action.user_add_role_action.administrator.yml
 delete mode 100644 config/export/system.action.user_add_role_action.content_editor.yml
 delete mode 100644 config/export/system.action.user_add_role_action.fedoraadmin.yml
 delete mode 100644 config/export/system.action.user_block_user_action.yml
 delete mode 100644 config/export/system.action.user_cancel_user_action.yml
 delete mode 100644 config/export/system.action.user_remove_role_action.administrator.yml
 delete mode 100644 config/export/system.action.user_remove_role_action.content_editor.yml
 delete mode 100644 config/export/system.action.user_remove_role_action.fedoraadmin.yml
 delete mode 100644 config/export/system.action.user_unblock_user_action.yml
 delete mode 100644 config/export/system.action.video_generate_a_service_file_from_an_original_file.yml
 delete mode 100644 config/export/system.action.video_generate_a_thumbnail_at_0_00_03.yml
 delete mode 100644 config/export/system.action.video_generate_a_thumbnail_from_an_original_file.yml
 delete mode 100644 config/export/system.advisories.yml
 delete mode 100644 config/export/system.cron.yml
 delete mode 100644 config/export/system.date.yml
 delete mode 100644 config/export/system.diff.yml
 delete mode 100644 config/export/system.file.yml
 delete mode 100644 config/export/system.image.gd.yml
 delete mode 100644 config/export/system.image.yml
 delete mode 100644 config/export/system.logging.yml
 delete mode 100644 config/export/system.mail.yml
 delete mode 100644 config/export/system.maintenance.yml
 delete mode 100644 config/export/system.menu.account.yml
 delete mode 100644 config/export/system.menu.admin.yml
 delete mode 100644 config/export/system.menu.devel.yml
 delete mode 100644 config/export/system.menu.footer.yml
 delete mode 100644 config/export/system.menu.main.yml
 delete mode 100644 config/export/system.menu.tools.yml
 delete mode 100644 config/export/system.performance.yml
 delete mode 100644 config/export/system.rss.yml
 delete mode 100644 config/export/system.site.yml
 delete mode 100644 config/export/system.theme.global.yml
 delete mode 100644 config/export/system.theme.yml
 delete mode 100644 config/export/taxonomy.settings.yml
 delete mode 100644 config/export/taxonomy.vocabulary.copyright_and_use.yml
 delete mode 100644 config/export/taxonomy.vocabulary.corporate_body.yml
 delete mode 100644 config/export/taxonomy.vocabulary.country.yml
 delete mode 100644 config/export/taxonomy.vocabulary.family.yml
 delete mode 100644 config/export/taxonomy.vocabulary.frequencies.yml
 delete mode 100644 config/export/taxonomy.vocabulary.genre.yml
 delete mode 100644 config/export/taxonomy.vocabulary.geo_location.yml
 delete mode 100644 config/export/taxonomy.vocabulary.islandora_display.yml
 delete mode 100644 config/export/taxonomy.vocabulary.islandora_media_use.yml
 delete mode 100644 config/export/taxonomy.vocabulary.islandora_models.yml
 delete mode 100644 config/export/taxonomy.vocabulary.issuance_modes.yml
 delete mode 100644 config/export/taxonomy.vocabulary.language.yml
 delete mode 100644 config/export/taxonomy.vocabulary.person.yml
 delete mode 100644 config/export/taxonomy.vocabulary.physical_form.yml
 delete mode 100644 config/export/taxonomy.vocabulary.resource_types.yml
 delete mode 100644 config/export/taxonomy.vocabulary.subject.yml
 delete mode 100644 config/export/taxonomy.vocabulary.tags.yml
 delete mode 100644 config/export/taxonomy.vocabulary.temporal_subjects.yml
 delete mode 100644 config/export/taxonomy_manager.settings.yml
 delete mode 100644 config/export/text.settings.yml
 delete mode 100644 config/export/tour.tour.block-layout.yml
 delete mode 100644 config/export/tour.tour.language-add.yml
 delete mode 100644 config/export/tour.tour.language-edit.yml
 delete mode 100644 config/export/tour.tour.language.yml
 delete mode 100644 config/export/tour.tour.search-api-index-fields.yml
 delete mode 100644 config/export/tour.tour.search-api-index-form.yml
 delete mode 100644 config/export/tour.tour.search-api-index-processors.yml
 delete mode 100644 config/export/tour.tour.search-api-index.yml
 delete mode 100644 config/export/tour.tour.search-api-server-form.yml
 delete mode 100644 config/export/tour.tour.search-api-server.yml
 delete mode 100644 config/export/tour.tour.views-ui.yml
 delete mode 100644 config/export/update.settings.yml
 delete mode 100644 config/export/user.flood.yml
 delete mode 100644 config/export/user.mail.yml
 delete mode 100644 config/export/user.role.administrator.yml
 delete mode 100644 config/export/user.role.anonymous.yml
 delete mode 100644 config/export/user.role.authenticated.yml
 delete mode 100644 config/export/user.role.content_editor.yml
 delete mode 100644 config/export/user.role.fedoraadmin.yml
 delete mode 100644 config/export/user.settings.yml
 delete mode 100644 config/export/views.settings.yml
 delete mode 100644 config/export/views.view.all_taxonomy_terms.yml
 delete mode 100644 config/export/views.view.archive.yml
 delete mode 100644 config/export/views.view.article_mods_mapping.yml
 delete mode 100644 config/export/views.view.block_content.yml
 delete mode 100644 config/export/views.view.collection_children.yml
 delete mode 100644 config/export/views.view.collection_object_models.yml
 delete mode 100644 config/export/views.view.comment.yml
 delete mode 100644 config/export/views.view.comments_recent.yml
 delete mode 100644 config/export/views.view.content.yml
 delete mode 100644 config/export/views.view.content_recent.yml
 delete mode 100644 config/export/views.view.display_media.yml
 delete mode 100644 config/export/views.view.file_checksum.yml
 delete mode 100644 config/export/views.view.files.yml
 delete mode 100644 config/export/views.view.frontpage.yml
 delete mode 100644 config/export/views.view.glossary.yml
 delete mode 100644 config/export/views.view.group_media.yml
 delete mode 100644 config/export/views.view.group_members.yml
 delete mode 100644 config/export/views.view.group_nodes.yml
 delete mode 100644 config/export/views.view.home_page_featured_collections.yml
 delete mode 100644 config/export/views.view.iiif_manifest.yml
 delete mode 100644 config/export/views.view.manage_members.yml
 delete mode 100644 config/export/views.view.media.yml
 delete mode 100644 config/export/views.view.media_of.yml
 delete mode 100644 config/export/views.view.members.yml
 delete mode 100644 config/export/views.view.missing_media.yml
 delete mode 100644 config/export/views.view.newspapers.yml
 delete mode 100644 config/export/views.view.non_fedora_files.yml
 delete mode 100644 config/export/views.view.oai_pmh.yml
 delete mode 100644 config/export/views.view.openseadragon_media_evas.yml
 delete mode 100644 config/export/views.view.pdfjs_media_evas.yml
 delete mode 100644 config/export/views.view.reorder_children.yml
 delete mode 100644 config/export/views.view.search_within_this_collection_link.yml
 delete mode 100644 config/export/views.view.solr_search_content.yml
 delete mode 100644 config/export/views.view.taxonomy_term.yml
 delete mode 100644 config/export/views.view.taxonomy_terms.yml
 delete mode 100644 config/export/views.view.term_from_term_name.yml
 delete mode 100644 config/export/views.view.term_from_uri.yml
 delete mode 100644 config/export/views.view.terms_in_vocabulary.yml
 delete mode 100644 config/export/views.view.thumbnail.yml
 delete mode 100644 config/export/views.view.thumbnail_of_first_child.yml
 delete mode 100644 config/export/views.view.top_level_collections.yml
 delete mode 100644 config/export/views.view.user_admin_people.yml
 delete mode 100644 config/export/views.view.watchdog.yml
 delete mode 100644 config/export/views.view.who_s_new.yml
 delete mode 100644 config/export/views.view.who_s_online.yml
 delete mode 100644 config/export/views_field_view.settings.yml
 delete mode 100644 config/sync/block.block.pagetitle.yml
 rename config/sync/{field.storage.group_content.group_roles.yml => field.storage.group_relationship.group_roles.yml} (61%)
 delete mode 100644 config/sync/pathauto.pattern.group_content.yml
 create mode 100644 config/sync/pathauto.pattern.group_relationship.yml
 create mode 100644 config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
 rename config/{export/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml => sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml} (56%)
 rename config/{export/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml => sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml} (56%)
 rename config/{export/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml => sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml} (53%)
 rename config/{export/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml => sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml} (64%)
 delete mode 100644 web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
 delete mode 100644 web/core/modules/ckeditor5/css/internal.admin.css
 delete mode 100644 web/core/modules/ckeditor5/css/quickedit-override.css
 delete mode 100644 web/core/modules/ckeditor5/css/quickedit.css
 delete mode 100644 web/core/modules/ckeditor5/js/ckeditor5_plugins/drupalMedia/README.md
 delete mode 100644 web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.es6.js
 delete mode 100644 web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.js
 delete mode 100644 web/core/modules/ckeditor5/tests/src/Functional/CKEditor5QuickEditLibraryTest.php
 delete mode 100644 web/core/modules/editor/js/editor.formattedTextEditor.es6.js
 delete mode 100644 web/core/modules/editor/js/editor.formattedTextEditor.js
 delete mode 100644 web/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml
 delete mode 100644 web/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml
 delete mode 100644 web/core/modules/editor/tests/editor_private_test/editor_private_test.info.yml
 delete mode 100644 web/core/modules/editor/tests/modules/config/schema/editor_test.schema.yml
 delete mode 100644 web/core/modules/editor/tests/modules/editor_test.info.yml
 delete mode 100644 web/core/modules/editor/tests/modules/editor_test.libraries.yml
 delete mode 100644 web/core/modules/editor/tests/modules/editor_test.module
 delete mode 100644 web/core/modules/editor/tests/modules/src/EditorXssFilter/Insecure.php
 delete mode 100644 web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
 delete mode 100644 web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
 delete mode 100644 web/core/modules/editor/tests/modules/src/Plugin/Field/FieldType/EditorTestTextLongItem.php
 delete mode 100644 web/core/modules/forum/config/optional/rdf.mapping.node.forum.yml
 delete mode 100644 web/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml
 delete mode 100644 web/core/modules/help_topics/config/optional/block.block.seven_help_search.yml
 delete mode 100644 web/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php
 delete mode 100644 web/core/modules/media/css/plugins/drupalmedia/ckeditor.drupalmedia.css
 delete mode 100644 web/core/modules/media/js/plugins/drupalmedia/plugin.es6.js
 delete mode 100644 web/core/modules/media/js/plugins/drupalmedia/plugin.js
 delete mode 100644 web/core/modules/media/src/Plugin/CKEditorPlugin/DrupalMedia.php
 delete mode 100644 web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
 delete mode 100644 web/core/modules/media_library/js/plugins/drupalmedialibrary/icons/drupalmedialibrary.png
 delete mode 100644 web/core/modules/media_library/js/plugins/drupalmedialibrary/icons/hidpi/drupalmedialibrary.png
 delete mode 100644 web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.es6.js
 delete mode 100644 web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.js
 delete mode 100644 web/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
 delete mode 100644 web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
 delete mode 100644 web/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml
 delete mode 100644 web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.info.yml
 delete mode 100644 web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.module
 delete mode 100644 web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
 delete mode 100644 web/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php
 delete mode 100644 web/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php
 delete mode 100644 web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php
 delete mode 100644 web/core/modules/system/tests/themes/test_subseven/test_subseven.info.yml
 delete mode 100644 web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
 delete mode 100644 web/core/modules/user/config/optional/rdf.mapping.user.user.yml
 delete mode 100644 web/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
 delete mode 100644 web/core/postcss.config.js
 delete mode 100644 web/core/profiles/demo_umami/config/install/rdf.mapping.node.article.yml
 delete mode 100644 web/core/profiles/demo_umami/config/install/rdf.mapping.node.page.yml
 delete mode 100644 web/core/profiles/demo_umami/config/install/rdf.mapping.taxonomy_term.tags.yml
 delete mode 100644 web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig
 delete mode 100644 web/core/profiles/standard/config/install/rdf.mapping.comment.comment.yml
 delete mode 100644 web/core/profiles/standard/config/install/rdf.mapping.node.article.yml
 delete mode 100644 web/core/profiles/standard/config/install/rdf.mapping.node.page.yml
 delete mode 100644 web/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
 delete mode 100644 web/core/scripts/transliteration_data.php.txt
 delete mode 100644 web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php
 delete mode 100644 web/core/tests/Drupal/FunctionalTests/Theme/ClassyTest.php
 delete mode 100644 web/core/tests/Drupal/FunctionalTests/Theme/SevenLayoutBuilderTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/MysqlDriverLegacyTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/PgsqlDriverLegacyTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/SqlModeTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Database/SqliteDriverLegacyTest.php
 delete mode 100644 web/core/tests/Drupal/KernelTests/Core/Http/BlockInterestCohortTest.php
 delete mode 100644 web/core/themes/stable/templates/admin/simpletest-result-summary.html.twig

diff --git a/.gitattributes b/.gitattributes
index a37894e8e..76ea8feeb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,24 +19,24 @@
 *.config  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.dist    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.html    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
-*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.js      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.json    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.lock    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.map     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.md      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.po      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.script  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.sql     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.svg     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.twig    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.txt     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
diff --git a/composer.json b/composer.json
index 7585f7eef..c64ad2758 100644
--- a/composer.json
+++ b/composer.json
@@ -83,18 +83,18 @@
         "academicpuma/locales": "1.0.x-dev",
         "composer/installers": "*",
         "cweagans/composer-patches": "^1.7",
-        "drupal/admin_toolbar": "^3.1",
+        "drupal/admin_toolbar": "^3.4",
         "drupal/advanced_search": "^2.0",
         "drupal/better_exposed_filters": "^6.0",
-        "drupal/bibcite": "^2.0@beta",
+        "drupal/bibcite": "^3.0@beta",
         "drupal/block_class": "^2.0",
-        "drupal/citation_select": "^1.0@beta",
+        "drupal/citation_select": "1.0.0-beta5",
         "drupal/config_delete": "^2.0",
         "drupal/config_inspector": "^2.1",
-        "drupal/core-composer-scaffold": "9.4.12",
-        "drupal/core-project-message": "9.4.12",
-        "drupal/core-recommended": "9.4.12",
-        "drupal/csv_serialization": "^2.1",
+        "drupal/core-composer-scaffold": "9.5.11",
+        "drupal/core-project-message": "9.5.11",
+        "drupal/core-recommended": "9.5.11",
+        "drupal/csv_serialization": "^3.0",
         "drupal/epp": "^1.3",
         "drupal/eva": "*",
         "drupal/facets": "^2",
@@ -102,25 +102,27 @@
         "drupal/field_permissions": "^1",
         "drupal/field_report": "^2.1",
         "drupal/flysystem": "^2.0@alpha",
-        "drupal/group": "^1.5",
-        "drupal/groupmedia": "^2.0@RC",
+        "drupal/groupmedia": "^4.0",
         "drupal/jquery_ui": "^1.6",
         "drupal/jquery_ui_autocomplete": "^2.0",
         "drupal/jquery_ui_datepicker": "^2.0",
         "drupal/jquery_ui_menu": "^2.0",
         "drupal/matomo": "^1.19",
         "drupal/migrate_tools": "^6.0",
-        "drupal/pathauto": "^1.11",
+        "drupal/pathauto": "^1.12",
         "drupal/pdf": "^1.1",
         "drupal/reference_value_pair": "^3.0@alpha",
         "drupal/rest_oai_pmh": "^2.0@beta",
-        "drupal/search_api_solr": "^4.2.10",
+        "drupal/search_api": "^1.30",
+        "drupal/search_api_solr": "^4.3",
         "drupal/taxonomy_manager": "^2.0",
         "drupal/title_length": "^2.0@RC",
+        "drupal/token": "^1.13",
         "drupal/transliterate_filenames": "^2.0",
         "drupal/twig_tweak": "^3.2",
+        "drupal/variationcache": "^1.3",
         "drupal/view_mode_switch": "^2.0",
-        "drupal/views_data_export": "^1.2",
+        "drupal/views_data_export": "^1.4",
         "drupal/views_field_view": "^1.0@beta",
         "drush/drush": "^11",
         "islandora-rdm/islandora_fits": "dev-8.x-1.x as 1.x-dev",
diff --git a/composer.lock b/composer.lock
index 408bbb04d..871cb22d4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "41690edad0cfb29e6781dcad42fb2db6",
+    "content-hash": "c0418e24db11bef0a4edde2cda9ad859",
     "packages": [
         {
             "name": "academicpuma/citeproc-php",
@@ -1511,17 +1511,17 @@
         },
         {
             "name": "drupal/admin_toolbar",
-            "version": "3.4.1",
+            "version": "3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/admin_toolbar.git",
-                "reference": "3.4.1"
+                "reference": "3.4.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.1.zip",
-                "reference": "3.4.1",
-                "shasum": "bcb15ab40016becdb3ac8f21d7d1a721f48f3577"
+                "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip",
+                "reference": "3.4.2",
+                "shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854"
             },
             "require": {
                 "drupal/core": "^9.2 || ^10"
@@ -1532,8 +1532,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.4.1",
-                    "datestamp": "1684944156",
+                    "version": "3.4.2",
+                    "datestamp": "1696006195",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -1592,17 +1592,17 @@
         },
         {
             "name": "drupal/advanced_search",
-            "version": "2.0.0",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/advanced_search.git",
-                "reference": "2.0.0"
+                "reference": "2.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/advanced_search-2.0.0.zip",
-                "reference": "2.0.0",
-                "shasum": "c5417df7fb411dea032975ea1dfb87e9f658a589"
+                "url": "https://ftp.drupal.org/files/projects/advanced_search-2.0.1.zip",
+                "reference": "2.0.1",
+                "shasum": "698f1690c7e88c6fe4ac21a9bfb431c26696f530"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9 || ^10",
@@ -1618,8 +1618,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0",
-                    "datestamp": "1695751418",
+                    "version": "2.0.1",
+                    "datestamp": "1697564812",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -1754,17 +1754,17 @@
         },
         {
             "name": "drupal/bibcite",
-            "version": "2.0.0-beta3",
+            "version": "3.0.0-beta3",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/bibcite.git",
-                "reference": "2.0.0-beta3"
+                "reference": "3.0.0-beta3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/bibcite-2.0.0-beta3.zip",
-                "reference": "2.0.0-beta3",
-                "shasum": "2ccb09b8be2d3cc5713c4b41156719808d5eb78e"
+                "url": "https://ftp.drupal.org/files/projects/bibcite-3.0.0-beta3.zip",
+                "reference": "3.0.0-beta3",
+                "shasum": "0f56b2078fb4751999e5cd4e936f11efaa8d9858"
             },
             "require": {
                 "academicpuma/citeproc-php": "~1.0",
@@ -1791,8 +1791,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-beta3",
-                    "datestamp": "1688554407",
+                    "version": "3.0.0-beta3",
+                    "datestamp": "1689237020",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -1996,20 +1996,20 @@
         },
         {
             "name": "drupal/citation_select",
-            "version": "1.0.0-beta3",
+            "version": "1.0.0-beta5",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/citation_select.git",
-                "reference": "1.0.0-beta3"
+                "reference": "1.0.0-beta5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/citation_select-1.0.0-beta3.zip",
-                "reference": "1.0.0-beta3",
-                "shasum": "d5388bd0f724cd19f0caf950be8d0774958551f7"
+                "url": "https://ftp.drupal.org/files/projects/citation_select-1.0.0-beta5.zip",
+                "reference": "1.0.0-beta5",
+                "shasum": "974d26b8cd9508de9a615accf03720fcf4adfac0"
             },
             "require": {
-                "drupal/bibcite": "^2.0@beta",
+                "drupal/bibcite": "^3.0@beta",
                 "drupal/core": "^8.8 || ^9 || ^10",
                 "drupal/token": "^1.9",
                 "professional-wiki/edtf": "~2.0"
@@ -2017,8 +2017,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "1.0.0-beta3",
-                    "datestamp": "1677182811",
+                    "version": "1.0.0-beta5",
+                    "datestamp": "1698419516",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -2105,26 +2105,26 @@
         },
         {
             "name": "drupal/config_inspector",
-            "version": "2.1.3",
+            "version": "2.1.7",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/config_inspector.git",
-                "reference": "2.1.3"
+                "reference": "2.1.7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/config_inspector-2.1.3.zip",
-                "reference": "2.1.3",
-                "shasum": "a4370f7355e8eca05919e2879211f1bc1e4dcc28"
+                "url": "https://ftp.drupal.org/files/projects/config_inspector-2.1.7.zip",
+                "reference": "2.1.7",
+                "shasum": "31ae3e429d23cf559c0e1ff55b4e41c45bb62797"
             },
             "require": {
-                "drupal/core": "^9.2 || ^10"
+                "drupal/core": "^9.2 || ^10 || ^11"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.1.3",
-                    "datestamp": "1692715904",
+                    "version": "2.1.7",
+                    "datestamp": "1698249898",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2339,16 +2339,16 @@
         },
         {
             "name": "drupal/core",
-            "version": "9.4.12",
+            "version": "9.5.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "266198e66fc5c890640c37abcfc395fef28031b4"
+                "reference": "8afcb233c2a71501b35fed2713167c37831d5c19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/266198e66fc5c890640c37abcfc395fef28031b4",
-                "reference": "266198e66fc5c890640c37abcfc395fef28031b4",
+                "url": "https://api.github.com/repos/drupal/core/zipball/8afcb233c2a71501b35fed2713167c37831d5c19",
+                "reference": "8afcb233c2a71501b35fed2713167c37831d5c19",
                 "shasum": ""
             },
             "require": {
@@ -2371,8 +2371,8 @@
                 "ext-tokenizer": "*",
                 "ext-xml": "*",
                 "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",
-                "laminas/laminas-diactoros": "^2.11",
                 "laminas/laminas-feed": "^2.17",
+                "longwave/laminas-diactoros": "^2.14",
                 "masterminds/html5": "^2.7",
                 "pear/archive_tar": "^1.4.14",
                 "php": ">=7.3.0",
@@ -2385,8 +2385,8 @@
                 "symfony/http-foundation": "^4.4.7",
                 "symfony/http-kernel": "^4.4",
                 "symfony/mime": "^5.4",
-                "symfony/polyfill-iconv": "^1.25",
-                "symfony/polyfill-php80": "^1.25",
+                "symfony/polyfill-iconv": "^1.26",
+                "symfony/polyfill-php80": "^1.26",
                 "symfony/process": "^4.4",
                 "symfony/psr-http-message-bridge": "^2.1",
                 "symfony/routing": "^4.4",
@@ -2500,22 +2500,22 @@
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
             "support": {
-                "source": "https://github.com/drupal/core/tree/9.4.12"
+                "source": "https://github.com/drupal/core/tree/9.5.11"
             },
-            "time": "2023-03-15T14:30:36+00:00"
+            "time": "2023-09-19T17:58:28+00:00"
         },
         {
             "name": "drupal/core-composer-scaffold",
-            "version": "9.4.12",
+            "version": "9.5.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-composer-scaffold.git",
-                "reference": "5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f"
+                "reference": "08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f",
-                "reference": "5f37a9e4008b34e3e4f6bb34ce0b3f7e5ec8984f",
+                "url": "https://api.github.com/repos/drupal/core-composer-scaffold/zipball/08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7",
+                "reference": "08da8e59c6f1bd0b1a58d18f8addc0d937bbacc7",
                 "shasum": ""
             },
             "require": {
@@ -2550,13 +2550,13 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.12"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.11"
             },
-            "time": "2022-06-19T16:14:23+00:00"
+            "time": "2023-04-30T16:17:33+00:00"
         },
         {
             "name": "drupal/core-project-message",
-            "version": "9.4.12",
+            "version": "9.5.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-project-message.git",
@@ -2591,40 +2591,37 @@
                 "drupal"
             ],
             "support": {
-                "source": "https://github.com/drupal/core-project-message/tree/9.5.4"
+                "source": "https://github.com/drupal/core-project-message/tree/9.5.11"
             },
             "time": "2022-02-24T17:40:53+00:00"
         },
         {
             "name": "drupal/core-recommended",
-            "version": "9.4.12",
+            "version": "9.5.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "71c412828ca9997e21c99c55b938172c0b719f5b"
+                "reference": "af3521be5376e333ddcdbd31c5a169f16423b46f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/71c412828ca9997e21c99c55b938172c0b719f5b",
-                "reference": "71c412828ca9997e21c99c55b938172c0b719f5b",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/af3521be5376e333ddcdbd31c5a169f16423b46f",
+                "reference": "af3521be5376e333ddcdbd31c5a169f16423b46f",
                 "shasum": ""
             },
             "require": {
                 "asm89/stack-cors": "~1.3.0",
                 "composer/semver": "~3.3.2",
-                "doctrine/annotations": "~1.13.2",
+                "doctrine/annotations": "~1.13.3",
                 "doctrine/lexer": "~1.2.3",
                 "doctrine/reflection": "~1.2.3",
-                "drupal/core": "9.4.12",
-                "egulias/email-validator": "~3.2",
+                "drupal/core": "9.5.11",
+                "egulias/email-validator": "~3.2.1",
                 "guzzlehttp/guzzle": "~6.5.8",
-                "guzzlehttp/promises": "~1.5.1",
-                "guzzlehttp/psr7": "~1.9.0",
-                "laminas/laminas-diactoros": "~2.11.1",
-                "laminas/laminas-escaper": "~2.9.0",
-                "laminas/laminas-feed": "~2.17.0",
-                "laminas/laminas-stdlib": "~3.7.1",
-                "masterminds/html5": "~2.7.5",
+                "guzzlehttp/promises": "~1.5.2",
+                "guzzlehttp/psr7": "~1.9.1",
+                "longwave/laminas-diactoros": "~2.14.2",
+                "masterminds/html5": "~2.7.6",
                 "pear/archive_tar": "~1.4.14",
                 "pear/console_getopt": "~v1.4.3",
                 "pear/pear-core-minimal": "~v1.10.11",
@@ -2664,7 +2661,7 @@
                 "symfony/validator": "~v4.4.48",
                 "symfony/var-dumper": "~v5.4.19",
                 "symfony/yaml": "~v4.4.45",
-                "twig/twig": "~v2.15.3",
+                "twig/twig": "~v2.15.4",
                 "typo3/phar-stream-wrapper": "~v3.1.7"
             },
             "conflict": {
@@ -2677,37 +2674,36 @@
             ],
             "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
             "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.4.12"
+                "source": "https://github.com/drupal/core-recommended/tree/9.5.11"
             },
-            "time": "2023-03-15T14:30:36+00:00"
+            "time": "2023-09-19T17:58:28+00:00"
         },
         {
             "name": "drupal/csv_serialization",
-            "version": "2.1.0",
+            "version": "3.0.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/csv_serialization.git",
-                "reference": "8.x-2.1"
+                "reference": "3.0.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/csv_serialization-8.x-2.1.zip",
-                "reference": "8.x-2.1",
-                "shasum": "10b8629a5808ed1ecf358d5ca7054d6c14a476d4"
+                "url": "https://ftp.drupal.org/files/projects/csv_serialization-3.0.1.zip",
+                "reference": "3.0.1",
+                "shasum": "05367f75a98fc3b92660c6de3852a6ebc39252e2"
             },
             "require": {
-                "drupal/core": "^8 || ^9",
-                "league/csv": "^9.1"
+                "drupal/core": "^9.4",
+                "league/csv": "^9.7"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
                 "drupal/coder": "^8.3"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.1",
-                    "datestamp": "1655054417",
+                    "version": "3.0.1",
+                    "datestamp": "1698701716",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -2715,6 +2711,14 @@
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
+            "scripts": {
+                "phpcs": [
+                    "vendor/bin/phpcs"
+                ],
+                "test": [
+                    "@phpcs"
+                ]
+            },
             "license": [
                 "GPL-2.0-or-later"
             ],
@@ -3480,6 +3484,58 @@
                 }
             ]
         },
+        {
+            "name": "drupal/flexible_permissions",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/flexible_permissions.git",
+                "reference": "1.1.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/flexible_permissions-1.1.0.zip",
+                "reference": "1.1.0",
+                "shasum": "cfda615388131e96a5cf3fce1f24b1c220f91fce"
+            },
+            "require": {
+                "drupal/core": "^9.5 || ^10",
+                "drupal/variationcache": "^1.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "1.1.0",
+                    "datestamp": "1697027409",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "Kristiaan Van den Eynde",
+                    "homepage": "https://www.drupal.org/u/kristiaanvandeneynde",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Mathias Wächter",
+                    "homepage": "https://www.drupal.org/u/mef",
+                    "role": "Maintainer"
+                }
+            ],
+            "description": "This module allows you to gather, calculate and cache permissions from a myriad of sources",
+            "homepage": "http://drupal.org/project/flexible_permissions",
+            "support": {
+                "source": "https://git.drupalcode.org/project/flexible_permissions",
+                "issues": "https://drupal.org/project/issues/flexible_permissions"
+            }
+        },
         {
             "name": "drupal/flysystem",
             "version": "2.0.0-beta2",
@@ -3628,28 +3684,28 @@
         },
         {
             "name": "drupal/group",
-            "version": "1.5.0",
+            "version": "3.2.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/group.git",
-                "reference": "8.x-1.5"
+                "reference": "3.2.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/group-8.x-1.5.zip",
-                "reference": "8.x-1.5",
-                "shasum": "4b890350749ff1d388425da8343b8835847492d8"
+                "url": "https://ftp.drupal.org/files/projects/group-3.2.1.zip",
+                "reference": "3.2.1",
+                "shasum": "7774014794ad8cc39b1e22737e48cdbdd60513db"
             },
             "require": {
-                "drupal/core": "^9.3 || ^10",
+                "drupal/core": "^9.5 || ^10",
                 "drupal/entity": "^1.2",
-                "drupal/variationcache": "^1.1"
+                "drupal/flexible_permissions": "^1.0"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.5",
-                    "datestamp": "1685706327",
+                    "version": "3.2.1",
+                    "datestamp": "1697204379",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3680,21 +3736,21 @@
         },
         {
             "name": "drupal/groupmedia",
-            "version": "2.1.0",
+            "version": "4.0.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/groupmedia.git",
-                "reference": "8.x-2.1"
+                "reference": "4.0.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/groupmedia-8.x-2.1.zip",
-                "reference": "8.x-2.1",
-                "shasum": "dc2cfd516c5a28f18861830f45552924a17cb3b5"
+                "url": "https://ftp.drupal.org/files/projects/groupmedia-4.0.2.zip",
+                "reference": "4.0.2",
+                "shasum": "95bbec1b6a2c28bc976ec43ecb3f1330fd509fcd"
             },
             "require": {
                 "drupal/core": "^9 || ^10",
-                "drupal/group": "^1.5"
+                "drupal/group": "^3.0"
             },
             "require-dev": {
                 "drupal/paragraphs": "*",
@@ -3703,8 +3759,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.1",
-                    "datestamp": "1693953964",
+                    "version": "4.0.2",
+                    "datestamp": "1694467520",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3713,7 +3769,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {
@@ -4563,17 +4619,17 @@
         },
         {
             "name": "drupal/pathauto",
-            "version": "1.11.0",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/pathauto.git",
-                "reference": "8.x-1.11"
+                "reference": "8.x-1.12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.11.zip",
-                "reference": "8.x-1.11",
-                "shasum": "a006fe9e6046a9833711a1ae56aa4752e65bcdc8"
+                "url": "https://ftp.drupal.org/files/projects/pathauto-8.x-1.12.zip",
+                "reference": "8.x-1.12",
+                "shasum": "b7b6432e315e38e59a7c6cc117134326c580de4c"
             },
             "require": {
                 "drupal/core": "^9.3 || ^10",
@@ -4586,8 +4642,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.11",
-                    "datestamp": "1660129564",
+                    "version": "8.x-1.12",
+                    "datestamp": "1696776683",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4896,17 +4952,17 @@
         },
         {
             "name": "drupal/rest_oai_pmh",
-            "version": "2.0.0-beta12",
+            "version": "2.0.0-beta15",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/rest_oai_pmh.git",
-                "reference": "2.0.0-beta12"
+                "reference": "2.0.0-beta15"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/rest_oai_pmh-2.0.0-beta12.zip",
-                "reference": "2.0.0-beta12",
-                "shasum": "83a2ffcf6e61085548ecda2d84a9d43bea9bccab"
+                "url": "https://ftp.drupal.org/files/projects/rest_oai_pmh-2.0.0-beta15.zip",
+                "reference": "2.0.0-beta15",
+                "shasum": "8c9ab48198a5a0a2e9657f2d85c1a80f70dd0476"
             },
             "require": {
                 "drupal/core": "^9 || ^10"
@@ -4914,8 +4970,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-beta12",
-                    "datestamp": "1686681467",
+                    "version": "2.0.0-beta15",
+                    "datestamp": "1697747057",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -4944,17 +5000,17 @@
         },
         {
             "name": "drupal/search_api",
-            "version": "1.29.0",
+            "version": "1.30.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/search_api.git",
-                "reference": "8.x-1.29"
+                "reference": "8.x-1.30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.29.zip",
-                "reference": "8.x-1.29",
-                "shasum": "4663abbcfe5dfc159ee0886fc6c437e998fc0653"
+                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.30.zip",
+                "reference": "8.x-1.30",
+                "shasum": "25bd2cfab6a6332c595fbc8be1c4cfff33a85ce8"
             },
             "require": {
                 "drupal/core": "^9.3 || ^10.0"
@@ -4975,8 +5031,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.29",
-                    "datestamp": "1679910252",
+                    "version": "8.x-1.30",
+                    "datestamp": "1697366291",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4984,7 +5040,7 @@
                 },
                 "drush": {
                     "services": {
-                        "drush.services.yml": "^9 || ^10"
+                        "drush.services.yml": "^9 || ^10 || ^11"
                     }
                 }
             },
@@ -5016,19 +5072,20 @@
         },
         {
             "name": "drupal/search_api_solr",
-            "version": "4.2.12",
+            "version": "4.3.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/search_api_solr.git",
-                "reference": "4.2.12"
+                "reference": "4.3.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/search_api_solr-4.2.12.zip",
-                "reference": "4.2.12",
-                "shasum": "3e6c7b22cdd1339e8373f700fdfdec332ea24e02"
+                "url": "https://ftp.drupal.org/files/projects/search_api_solr-4.3.0.zip",
+                "reference": "4.3.0",
+                "shasum": "222e14f9ab49efb519e3a78674606880a2b07416"
             },
             "require": {
+                "composer-runtime-api": ">=2.0",
                 "composer/semver": "^1.0|^3.0",
                 "consolidation/annotated-command": "^2.12|^4.1",
                 "drupal/core": "^9.3 || ^10.0",
@@ -5064,8 +5121,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.2.12",
-                    "datestamp": "1687445036",
+                    "version": "4.3.0",
+                    "datestamp": "1696589367",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5259,17 +5316,17 @@
         },
         {
             "name": "drupal/token",
-            "version": "1.12.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/token.git",
-                "reference": "8.x-1.12"
+                "reference": "8.x-1.13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.12.zip",
-                "reference": "8.x-1.12",
-                "shasum": "cefe1b203b793682f74ea43e18d0a814cf768763"
+                "url": "https://ftp.drupal.org/files/projects/token-8.x-1.13.zip",
+                "reference": "8.x-1.13",
+                "shasum": "f2a074b51726de3727c1d900237d6d471806a4d2"
             },
             "require": {
                 "drupal/core": "^9.2 || ^10"
@@ -5277,8 +5334,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.12",
-                    "datestamp": "1688015262",
+                    "version": "8.x-1.13",
+                    "datestamp": "1697885927",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5286,7 +5343,7 @@
                 },
                 "drush": {
                     "services": {
-                        "drush.services.yml": "^9 || ^10"
+                        "drush.services.yml": ">=9"
                     }
                 }
             },
@@ -5328,17 +5385,17 @@
         },
         {
             "name": "drupal/transliterate_filenames",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/transliterate_filenames.git",
-                "reference": "2.0.1"
+                "reference": "2.0.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/transliterate_filenames-2.0.1.zip",
-                "reference": "2.0.1",
-                "shasum": "bd905924e7b0f2b960267be1a7f65c8830e1e424"
+                "url": "https://ftp.drupal.org/files/projects/transliterate_filenames-2.0.2.zip",
+                "reference": "2.0.2",
+                "shasum": "204bcd65f79eeb6c4a43b3c63d0bbd325edfb127"
             },
             "require": {
                 "drupal/core": "^9.3 || ^10"
@@ -5346,8 +5403,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.1",
-                    "datestamp": "1659789907",
+                    "version": "2.0.2",
+                    "datestamp": "1698338671",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5444,26 +5501,26 @@
         },
         {
             "name": "drupal/variationcache",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/variationcache.git",
-                "reference": "8.x-1.2"
+                "reference": "8.x-1.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/variationcache-8.x-1.2.zip",
-                "reference": "8.x-1.2",
-                "shasum": "ad8edeb2c408f82e08bb22fafb362a516d3e56a3"
+                "url": "https://ftp.drupal.org/files/projects/variationcache-8.x-1.3.zip",
+                "reference": "8.x-1.3",
+                "shasum": "92d1e4f6c2661498bff777f22246bf27d6a03a71"
             },
             "require": {
-                "drupal/core": "^9.3 || ^10"
+                "drupal/core": "^9.5 || ^10"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.2",
-                    "datestamp": "1668086673",
+                    "version": "8.x-1.3",
+                    "datestamp": "1679575893",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -5544,21 +5601,21 @@
         },
         {
             "name": "drupal/views_data_export",
-            "version": "1.3.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/views_data_export.git",
-                "reference": "8.x-1.3"
+                "reference": "8.x-1.4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.3.zip",
-                "reference": "8.x-1.3",
-                "shasum": "a8a5483e13787f2bb3eb66d9b0f19d96c0d8d7c1"
+                "url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.4.zip",
+                "reference": "8.x-1.4",
+                "shasum": "70dede9fdf50601232f068e67309d361341e88c5"
             },
             "require": {
                 "drupal/core": "^9 || ^10",
-                "drupal/csv_serialization": "~1.4 || ~2.0 || ~3"
+                "drupal/csv_serialization": "~1.4 || ~2.0 || ~3 || ~4"
             },
             "require-dev": {
                 "drupal/search_api": "~1.12",
@@ -5567,8 +5624,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.3",
-                    "datestamp": "1679072666",
+                    "version": "8.x-1.4",
+                    "datestamp": "1698948991",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -6935,95 +6992,58 @@
             "type": "drupal-theme"
         },
         {
-            "name": "laminas/laminas-diactoros",
-            "version": "2.11.3",
+            "name": "laminas/laminas-escaper",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-diactoros.git",
-                "reference": "1f97b0c52eafd108e09c76d6b29d83ef4a855f76"
+                "url": "https://github.com/laminas/laminas-escaper.git",
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/1f97b0c52eafd108e09c76d6b29d83ef4a855f76",
-                "reference": "1f97b0c52eafd108e09c76d6b29d83ef4a855f76",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
+                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0 || ~8.1.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0"
+                "ext-ctype": "*",
+                "ext-mbstring": "*",
+                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
             },
             "conflict": {
-                "phpspec/prophecy": "<1.9.0",
-                "zendframework/zend-diactoros": "*"
-            },
-            "provide": {
-                "psr/http-factory-implementation": "1.0",
-                "psr/http-message-implementation": "1.0"
+                "zendframework/zend-escaper": "*"
             },
             "require-dev": {
-                "ext-curl": "*",
-                "ext-dom": "*",
-                "ext-gd": "*",
-                "ext-libxml": "*",
-                "http-interop/http-factory-tests": "^0.8.0",
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "php-http/psr7-integration-tests": "^1.1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.1",
-                "psalm/plugin-phpunit": "^0.14.0",
-                "vimeo/psalm": "^4.3"
+                "infection/infection": "^0.26.6",
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "maglnet/composer-require-checker": "^3.8.0",
+                "phpunit/phpunit": "^9.5.18",
+                "psalm/plugin-phpunit": "^0.17.0",
+                "vimeo/psalm": "^4.22.0"
             },
             "type": "library",
-            "extra": {
-                "laminas": {
-                    "config-provider": "Laminas\\Diactoros\\ConfigProvider",
-                    "module": "Laminas\\Diactoros"
-                }
-            },
             "autoload": {
-                "files": [
-                    "src/functions/create_uploaded_file.php",
-                    "src/functions/marshal_headers_from_sapi.php",
-                    "src/functions/marshal_method_from_sapi.php",
-                    "src/functions/marshal_protocol_version_from_sapi.php",
-                    "src/functions/marshal_uri_from_sapi.php",
-                    "src/functions/normalize_server.php",
-                    "src/functions/normalize_uploaded_files.php",
-                    "src/functions/parse_cookie_header.php",
-                    "src/functions/create_uploaded_file.legacy.php",
-                    "src/functions/marshal_headers_from_sapi.legacy.php",
-                    "src/functions/marshal_method_from_sapi.legacy.php",
-                    "src/functions/marshal_protocol_version_from_sapi.legacy.php",
-                    "src/functions/marshal_uri_from_sapi.legacy.php",
-                    "src/functions/normalize_server.legacy.php",
-                    "src/functions/normalize_uploaded_files.legacy.php",
-                    "src/functions/parse_cookie_header.legacy.php"
-                ],
                 "psr-4": {
-                    "Laminas\\Diactoros\\": "src/"
+                    "Laminas\\Escaper\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "PSR HTTP Message implementations",
+            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
             "homepage": "https://laminas.dev",
             "keywords": [
-                "http",
-                "laminas",
-                "psr",
-                "psr-17",
-                "psr-7"
+                "escaper",
+                "laminas"
             ],
             "support": {
                 "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-diactoros/",
+                "docs": "https://docs.laminas.dev/laminas-escaper/",
                 "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-diactoros/issues",
-                "rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
-                "source": "https://github.com/laminas/laminas-diactoros"
+                "issues": "https://github.com/laminas/laminas-escaper/issues",
+                "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
+                "source": "https://github.com/laminas/laminas-escaper"
             },
             "funding": [
                 {
@@ -7031,61 +7051,79 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-07-06T09:24:53+00:00"
+            "time": "2022-10-10T10:11:09+00:00"
         },
         {
-            "name": "laminas/laminas-escaper",
-            "version": "2.9.0",
+            "name": "laminas/laminas-feed",
+            "version": "2.18.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f"
+                "url": "https://github.com/laminas/laminas-feed.git",
+                "reference": "a57fdb9df42950d5b7f052509fbdab0d081c6b6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/891ad70986729e20ed2e86355fcf93c9dc238a5f",
-                "reference": "891ad70986729e20ed2e86355fcf93c9dc238a5f",
+                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/a57fdb9df42950d5b7f052509fbdab0d081c6b6d",
+                "reference": "a57fdb9df42950d5b7f052509fbdab0d081c6b6d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "laminas/laminas-escaper": "^2.9",
+                "laminas/laminas-servicemanager": "^3.14.0",
+                "laminas/laminas-stdlib": "^3.6",
+                "php": "^7.4 || ~8.0.0 || ~8.1.0"
             },
             "conflict": {
-                "zendframework/zend-escaper": "*"
+                "laminas/laminas-servicemanager": "<3.3",
+                "zendframework/zend-feed": "*"
             },
             "require-dev": {
+                "laminas/laminas-cache": "^2.13.2 || ^3.1.3",
+                "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.0.0",
                 "laminas/laminas-coding-standard": "~2.3.0",
-                "phpunit/phpunit": "^9.3",
-                "psalm/plugin-phpunit": "^0.12.2",
-                "vimeo/psalm": "^3.16"
+                "laminas/laminas-db": "^2.13.3",
+                "laminas/laminas-http": "^2.15",
+                "laminas/laminas-validator": "^2.15",
+                "phpunit/phpunit": "^9.5.5",
+                "psalm/plugin-phpunit": "^0.17.0",
+                "psr/http-message": "^1.0.1",
+                "vimeo/psalm": "^4.24.0"
             },
             "suggest": {
-                "ext-iconv": "*",
-                "ext-mbstring": "*"
+                "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
+                "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
+                "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
+                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
+                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
+                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
             },
             "type": "library",
             "autoload": {
                 "psr-4": {
-                    "Laminas\\Escaper\\": "src/"
+                    "Laminas\\Feed\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "Securely and safely escape HTML, HTML attributes, JavaScript, CSS, and URLs",
+            "description": "provides functionality for creating and consuming RSS and Atom feeds",
             "homepage": "https://laminas.dev",
             "keywords": [
-                "escaper",
-                "laminas"
+                "atom",
+                "feed",
+                "laminas",
+                "rss"
             ],
             "support": {
                 "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-escaper/",
+                "docs": "https://docs.laminas.dev/laminas-feed/",
                 "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-escaper/issues",
-                "rss": "https://github.com/laminas/laminas-escaper/releases.atom",
-                "source": "https://github.com/laminas/laminas-escaper"
+                "issues": "https://github.com/laminas/laminas-feed/issues",
+                "rss": "https://github.com/laminas/laminas-feed/releases.atom",
+                "source": "https://github.com/laminas/laminas-feed"
             },
             "funding": [
                 {
@@ -7093,76 +7131,90 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-09-02T17:10:53+00:00"
+            "time": "2022-08-08T17:02:35+00:00"
         },
         {
-            "name": "laminas/laminas-feed",
-            "version": "2.17.0",
+            "name": "laminas/laminas-servicemanager",
+            "version": "3.17.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/laminas/laminas-feed.git",
-                "reference": "1ccb024ea615606ed1d676ba0fa3f22a398f3ac0"
+                "url": "https://github.com/laminas/laminas-servicemanager.git",
+                "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/1ccb024ea615606ed1d676ba0fa3f22a398f3ac0",
-                "reference": "1ccb024ea615606ed1d676ba0fa3f22a398f3ac0",
+                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/360be5f16955dd1edbcce1cfaa98ed82a17f02ec",
+                "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec",
                 "shasum": ""
             },
             "require": {
-                "ext-dom": "*",
-                "ext-libxml": "*",
-                "laminas/laminas-escaper": "^2.9",
-                "laminas/laminas-stdlib": "^3.6",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "laminas/laminas-stdlib": "^3.2.1",
+                "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
+                "psr/container": "^1.0"
             },
             "conflict": {
-                "laminas/laminas-servicemanager": "<3.3",
-                "zendframework/zend-feed": "*"
+                "ext-psr": "*",
+                "laminas/laminas-code": "<3.3.1",
+                "zendframework/zend-code": "<3.3.1",
+                "zendframework/zend-servicemanager": "*"
+            },
+            "provide": {
+                "psr/container-implementation": "^1.0"
+            },
+            "replace": {
+                "container-interop/container-interop": "^1.2.0"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^2.7.2",
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "laminas/laminas-db": "^2.13.3",
-                "laminas/laminas-http": "^2.15",
-                "laminas/laminas-servicemanager": "^3.7",
-                "laminas/laminas-validator": "^2.15",
+                "composer/package-versions-deprecated": "^1.0",
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "laminas/laminas-container-config-test": "^0.7",
+                "laminas/laminas-dependency-plugin": "^2.1.2",
+                "mikey179/vfsstream": "^1.6.10@alpha",
+                "ocramius/proxy-manager": "^2.11",
+                "phpbench/phpbench": "^1.1",
+                "phpspec/prophecy-phpunit": "^2.0",
                 "phpunit/phpunit": "^9.5.5",
-                "psalm/plugin-phpunit": "^0.13.0",
-                "psr/http-message": "^1.0.1",
-                "vimeo/psalm": "^4.1"
+                "psalm/plugin-phpunit": "^0.17.0",
+                "vimeo/psalm": "^4.8"
             },
             "suggest": {
-                "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests",
-                "laminas/laminas-db": "Laminas\\Db component, for use with PubSubHubbub",
-                "laminas/laminas-http": "Laminas\\Http for PubSubHubbub, and optionally for use with Laminas\\Feed\\Reader",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component, for easily extending ExtensionManager implementations",
-                "laminas/laminas-validator": "Laminas\\Validator component, for validating email addresses used in Atom feeds and entries when using the Writer subcomponent",
-                "psr/http-message": "PSR-7 ^1.0.1, if you wish to use Laminas\\Feed\\Reader\\Http\\Psr7ResponseDecorator"
+                "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services"
             },
+            "bin": [
+                "bin/generate-deps-for-config-factory",
+                "bin/generate-factory-for-class"
+            ],
             "type": "library",
             "autoload": {
+                "files": [
+                    "src/autoload.php"
+                ],
                 "psr-4": {
-                    "Laminas\\Feed\\": "src/"
+                    "Laminas\\ServiceManager\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "BSD-3-Clause"
             ],
-            "description": "provides functionality for consuming RSS and Atom feeds",
+            "description": "Factory-Driven Dependency Injection Container",
             "homepage": "https://laminas.dev",
             "keywords": [
-                "feed",
-                "laminas"
+                "PSR-11",
+                "dependency-injection",
+                "di",
+                "dic",
+                "laminas",
+                "service-manager",
+                "servicemanager"
             ],
             "support": {
                 "chat": "https://laminas.dev/chat",
-                "docs": "https://docs.laminas.dev/laminas-feed/",
+                "docs": "https://docs.laminas.dev/laminas-servicemanager/",
                 "forum": "https://discourse.laminas.dev",
-                "issues": "https://github.com/laminas/laminas-feed/issues",
-                "rss": "https://github.com/laminas/laminas-feed/releases.atom",
-                "source": "https://github.com/laminas/laminas-feed"
+                "issues": "https://github.com/laminas/laminas-servicemanager/issues",
+                "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom",
+                "source": "https://github.com/laminas/laminas-servicemanager"
             },
             "funding": [
                 {
@@ -7170,34 +7222,35 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-03-24T10:26:04+00:00"
+            "time": "2022-09-22T11:33:46+00:00"
         },
         {
             "name": "laminas/laminas-stdlib",
-            "version": "3.7.1",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "bcd869e2fe88d567800057c1434f2380354fe325"
+                "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/bcd869e2fe88d567800057c1434f2380354fe325",
-                "reference": "bcd869e2fe88d567800057c1434f2380354fe325",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/66a6d03c381f6c9f1dd988bf8244f9afb9380d76",
+                "reference": "66a6d03c381f6c9f1dd988bf8244f9afb9380d76",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "^7.4 || ~8.0.0 || ~8.1.0"
             },
             "conflict": {
                 "zendframework/zend-stdlib": "*"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.3.0",
-                "phpbench/phpbench": "^1.0",
-                "phpunit/phpunit": "^9.3.7",
-                "psalm/plugin-phpunit": "^0.16.0",
-                "vimeo/psalm": "^4.7"
+                "phpbench/phpbench": "^1.2.6",
+                "phpstan/phpdoc-parser": "^0.5.4",
+                "phpunit/phpunit": "^9.5.23",
+                "psalm/plugin-phpunit": "^0.17.0",
+                "vimeo/psalm": "^4.26"
             },
             "type": "library",
             "autoload": {
@@ -7229,7 +7282,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-01-21T15:50:46+00:00"
+            "time": "2022-08-24T13:56:50+00:00"
         },
         {
             "name": "league/container",
@@ -7606,6 +7659,102 @@
             },
             "type": "drupal-library"
         },
+        {
+            "name": "longwave/laminas-diactoros",
+            "version": "2.14.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/longwave/laminas-diactoros.git",
+                "reference": "ae4f0becf249ae8eea8f2f8f9fb927104e55a885"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/longwave/laminas-diactoros/zipball/ae4f0becf249ae8eea8f2f8f9fb927104e55a885",
+                "reference": "ae4f0becf249ae8eea8f2f8f9fb927104e55a885",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.3 || ~8.0.0 || ~8.1.0 || ~8.2.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "conflict": {
+                "phpspec/prophecy": "<1.9.0",
+                "zendframework/zend-diactoros": "*"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "replace": {
+                "laminas/laminas-diactoros": "2.18.1"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "ext-gd": "*",
+                "ext-libxml": "*",
+                "http-interop/http-factory-tests": "^0.9.0",
+                "laminas/laminas-coding-standard": "~2.3.0",
+                "php-http/psr7-integration-tests": "^1.1.1",
+                "phpspec/prophecy-phpunit": "^2.0",
+                "phpunit/phpunit": "^9.5",
+                "psalm/plugin-phpunit": "^0.17.0",
+                "vimeo/psalm": "^4.24.0"
+            },
+            "type": "library",
+            "extra": {
+                "laminas": {
+                    "config-provider": "Laminas\\Diactoros\\ConfigProvider",
+                    "module": "Laminas\\Diactoros"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/marshal_uri_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php",
+                    "src/functions/create_uploaded_file.legacy.php",
+                    "src/functions/marshal_headers_from_sapi.legacy.php",
+                    "src/functions/marshal_method_from_sapi.legacy.php",
+                    "src/functions/marshal_protocol_version_from_sapi.legacy.php",
+                    "src/functions/marshal_uri_from_sapi.legacy.php",
+                    "src/functions/normalize_server.legacy.php",
+                    "src/functions/normalize_uploaded_files.legacy.php",
+                    "src/functions/parse_cookie_header.legacy.php"
+                ],
+                "psr-4": {
+                    "Laminas\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "http",
+                "laminas",
+                "psr",
+                "psr-17",
+                "psr-7"
+            ],
+            "support": {
+                "chat": "https://laminas.dev/chat",
+                "docs": "https://docs.laminas.dev/laminas-diactoros/",
+                "forum": "https://discourse.laminas.dev",
+                "issues": "https://github.com/laminas/laminas-diactoros/issues",
+                "rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
+                "source": "https://github.com/laminas/laminas-diactoros"
+            },
+            "time": "2023-04-26T21:27:14+00:00"
+        },
         {
             "name": "maennchen/zipstream-php",
             "version": "2.2.6",
@@ -7932,16 +8081,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.70.0",
+            "version": "2.71.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d"
+                "reference": "98276233188583f2ff845a0f992a235472d9466a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3298b38ea8612e5f77d38d1a99438e42f70341d",
-                "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/98276233188583f2ff845a0f992a235472d9466a",
+                "reference": "98276233188583f2ff845a0f992a235472d9466a",
                 "shasum": ""
             },
             "require": {
@@ -8034,7 +8183,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-09-07T16:43:50+00:00"
+            "time": "2023-09-25T11:31:05+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -8625,16 +8774,16 @@
         },
         {
             "name": "psr/http-client",
-            "version": "1.0.2",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-client.git",
-                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31"
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31",
-                "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
                 "shasum": ""
             },
             "require": {
@@ -8671,9 +8820,9 @@
                 "psr-18"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-client/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-client"
             },
-            "time": "2023-04-10T20:12:12+00:00"
+            "time": "2023-09-23T14:17:50+00:00"
         },
         {
             "name": "psr/http-factory",
@@ -11726,16 +11875,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v5.4.28",
+            "version": "v5.4.29",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73"
+                "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73",
-                "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65",
+                "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65",
                 "shasum": ""
             },
             "require": {
@@ -11795,7 +11944,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v5.4.28"
+                "source": "https://github.com/symfony/var-dumper/tree/v5.4.29"
             },
             "funding": [
                 {
@@ -11811,7 +11960,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-24T13:38:36+00:00"
+            "time": "2023-09-12T10:09:58+00:00"
         },
         {
             "name": "symfony/yaml",
@@ -12795,16 +12944,16 @@
         },
         {
             "name": "doctrine/deprecations",
-            "version": "v1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/deprecations.git",
-                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3"
+                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
-                "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3",
+                "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
+                "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931",
                 "shasum": ""
             },
             "require": {
@@ -12836,9 +12985,9 @@
             "homepage": "https://www.doctrine-project.org/",
             "support": {
                 "issues": "https://github.com/doctrine/deprecations/issues",
-                "source": "https://github.com/doctrine/deprecations/tree/v1.1.1"
+                "source": "https://github.com/doctrine/deprecations/tree/1.1.2"
             },
-            "time": "2023-06-03T09:27:29+00:00"
+            "time": "2023-09-27T20:04:15+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -13619,16 +13768,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.24.0",
+            "version": "1.24.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6"
+                "reference": "bcad8d995980440892759db0c32acae7c8e79442"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6",
-                "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442",
+                "reference": "bcad8d995980440892759db0c32acae7c8e79442",
                 "shasum": ""
             },
             "require": {
@@ -13660,9 +13809,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2"
             },
-            "time": "2023-09-07T20:46:32+00:00"
+            "time": "2023-09-26T12:28:12+00:00"
         },
         {
             "name": "sirbrillig/phpcs-variable-analysis",
@@ -14515,9 +14664,7 @@
     "stability-flags": {
         "academicpuma/locales": 20,
         "drupal/bibcite": 10,
-        "drupal/citation_select": 10,
         "drupal/flysystem": 15,
-        "drupal/groupmedia": 5,
         "drupal/reference_value_pair": 15,
         "drupal/rest_oai_pmh": 10,
         "drupal/title_length": 5,
diff --git a/config/export/admin_toolbar.settings.yml b/config/export/admin_toolbar.settings.yml
deleted file mode 100644
index 93a66955e..000000000
--- a/config/export/admin_toolbar.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: jvTSppzcgH5wnzBhX5xnAExcp2I1CzkQ_aky65XNfYI
-menu_depth: 4
diff --git a/config/export/admin_toolbar_search.settings.yml b/config/export/admin_toolbar_search.settings.yml
deleted file mode 100644
index 4ae977535..000000000
--- a/config/export/admin_toolbar_search.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: AAmWcgwzGYbXfR6wfEfMyoi3r5QZwlpxvq5dHbupnJo
-display_menu_item: 0
diff --git a/config/export/admin_toolbar_tools.settings.yml b/config/export/admin_toolbar_tools.settings.yml
deleted file mode 100644
index bc96a02f5..000000000
--- a/config/export/admin_toolbar_tools.settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: WgdZsrd_5w9jlmcHV4R9dD2tG9OZEkYo4I_O8h7Gq8Q
-max_bundle_number: 20
-hoverintent_functionality: true
-show_local_tasks: false
diff --git a/config/export/advanced_search.settings.yml b/config/export/advanced_search.settings.yml
deleted file mode 100644
index 55a7067da..000000000
--- a/config/export/advanced_search.settings.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-lucene_on_off: 1
-lucene_label: Keyword
-all_fields_on_off: 1
-list_on_off: 1
-grid_on_off: 1
-default-display-mode: list
-search_query_parameter: a
-search_recursive_parameter: r
-search_add_operator: +
-search_remove_operator: '-'
-facet_truncate: '32'
diff --git a/config/export/automated_cron.settings.yml b/config/export/automated_cron.settings.yml
deleted file mode 100644
index 3fc5821fe..000000000
--- a/config/export/automated_cron.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: fUksROt4FfkAU9BV4hV2XvhTBSS2nTNrZS4U7S-tKrs
-interval: 10800
diff --git a/config/export/bibcite.bibcite_csl_style.american_medical_association.yml b/config/export/bibcite.bibcite_csl_style.american_medical_association.yml
deleted file mode 100644
index 4cd6c85f8..000000000
--- a/config/export/bibcite.bibcite_csl_style.american_medical_association.yml
+++ /dev/null
@@ -1,289 +0,0 @@
-uuid: fe18b2ab-ba61-4ed7-9ae1-53655635268e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: PWpxQYdw3OW0popF7vCzlSWdG-rM2ol9apgadLTEo5A
-id: american_medical_association
-parent: null
-label: 'American Medical Association 10th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
-    <info>
-    <title>American Medical Association 10th edition</title>
-    <title-short>AMA (10th ed.)</title-short>
-    <id>http://www.zotero.org/styles/american-medical-association-10th-edition</id>
-    <link href="http://www.zotero.org/styles/american-medical-association-10th-edition" rel="self"/>
-    <link href="https://westlibrary.txwes.edu/sites/default/files/pdf/AMACitationStyle.pdf" rel="documentation"/>
-    <author>
-    <name>Julian Onions</name>
-    <email>julian.onions@gmail.com</email>
-    </author>
-    <contributor>
-    <name>Christian Pietsch</name>
-    <uri>http://purl.org/net/pietsch</uri>
-    </contributor>
-    <contributor>
-    <name>Daniel W Chan</name>
-    <email>danwchan@protonmail.com</email>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <summary>The American Medical Association style as used in JAMA.</summary>
-    <updated>2020-05-03T02:23:16+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="page-range-delimiter">-</term>
-    </terms>
-    </locale>
-    <macro name="editor">
-    <names variable="editor">
-    <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    </names>
-    </macro>
-    <macro name="author">
-    <group suffix=".">
-    <names variable="author">
-    <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </group>
-    </macro>
-    <macro name="access">
-    <choose>
-    <if type="article-newspaper" match="none">
-    <choose>
-    <if variable="DOI">
-    <text value="doi:"/>
-    <text variable="DOI"/>
-    </if>
-    <else-if variable="URL">
-    <group delimiter=". " suffix=".">
-    <text variable="URL"/>
-    <choose>
-    <if type="webpage">
-    <date variable="issued" prefix="Published " form="text"/>
-    </if>
-    </choose>
-    <group>
-    <text term="accessed" text-case="capitalize-first" suffix=" "/>
-    <date variable="accessed">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    </group>
-    </else-if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <text variable="title" font-style="italic" text-case="title"/>
-    </if>
-    <else>
-    <text variable="title"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="publisher">
-  <group delimiter=": ">
-        <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" suffix="."/>
-    </else>
-    </choose>
-    </macro>
-    <citation collapse="citation-number">
-    <sort>
-    <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-    <text variable="citation-number"/>
-    <group prefix="(" suffix=")">
-    <label variable="locator" form="short" strip-periods="true"/>
-    <text variable="locator"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3" second-field-align="flush">
-    <layout>
-    <text variable="citation-number" suffix=". "/>
-    <text macro="author"/>
-    <text macro="title" prefix=" " suffix="."/>
-    <choose>
-    <if type="bill book graphic legislation motion_picture report song" match="any">
-    <group suffix="." prefix=" " delimiter=" ">
-    <group delimiter=" ">
-    <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
-    <text variable="volume" suffix="."/>
-    </group>
-    <text macro="edition"/>
-    <text macro="editor" prefix="(" suffix=")"/>
-    </group>
-    <text macro="publisher" prefix=" "/>
-    <group suffix="." prefix="; ">
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    <text variable="page" prefix=":"/>
-    </group>
-    </if>
-    <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-    <group prefix=" " delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=":"/>
-    <text macro="editor"/>
-    <text variable="container-title" font-style="italic" suffix="." text-case="title"/>
-    <group delimiter=" ">
-    <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
-    <text variable="volume" suffix="."/>
-    </group>
-    <text macro="edition"/>
-    <text variable="collection-title" suffix="."/>
-    <group suffix=".">
-    <text macro="publisher"/>
-    <group suffix="." prefix="; ">
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    <text variable="page" prefix=":"/>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="article-newspaper">
-    <text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
-    <choose>
-    <if variable="URL">
-    <group delimiter=". " suffix=".">
-    <text variable="URL"/>
-    <group prefix="Published ">
-    <date variable="issued">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    <group>
-    <text term="accessed" text-case="capitalize-first" suffix=" "/>
-    <date variable="accessed">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    </group>
-    </if>
-    <else>
-    <group delimiter=":" suffix=".">
-    <group>
-    <date variable="issued">
-    <date-part name="month" suffix=" "/>
-    <date-part name="day" suffix=", "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    <text variable="page"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="legal_case">
-    <group suffix="," prefix=" " delimiter=" ">
-    <text macro="editor" prefix="(" suffix=")"/>
-    </group>
-    <group prefix=" " delimiter=" ">
-    <text variable="container-title"/>
-    <text variable="volume"/>
-    </group>
-    <text variable="page" prefix=", " suffix=" "/>
-    <group prefix="(" suffix=")." delimiter=" ">
-    <text variable="authority"/>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </else-if>
-    <else-if type="webpage">
-    <text variable="container-title" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="speech">
-    <group prefix=" " suffix=":">
-    <choose>
-    <if variable="genre">
-    <text variable="genre" suffix=" "/>
-    <text term="presented at"/>
-    </if>
-    <else>
-    <text term="presented at" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    </group>
-    <group delimiter="; " prefix=" " suffix=".">
-    <text variable="event"/>
-    <group>
-    <date delimiter=" " variable="issued">
-    <date-part name="month"/>
-    <date-part name="day" suffix=","/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    <text variable="event-place"/>
-    </group>
-    </else-if>
-    <else>
-    <text macro="editor" prefix=" " suffix="."/>
-    <group prefix=" " suffix=".">
-    <text variable="container-title" font-style="italic" form="short" strip-periods="true" suffix="."/>
-    <group delimiter=";" prefix=" ">
-    <choose>
-    <if variable="issue volume" match="any">
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="month" suffix=" "/>
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    <group>
-    <text variable="volume"/>
-    <text variable="issue" prefix="(" suffix=")"/>
-    </group>
-    </group>
-    <text variable="page" prefix=":"/>
-    </group>
-    </else>
-    </choose>
-    <text prefix=" " macro="access"/>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1588472596
-custom: true
-url_id: 'http://www.zotero.org/styles/american-medical-association-10th-edition'
diff --git a/config/export/bibcite.bibcite_csl_style.apa.yml b/config/export/bibcite.bibcite_csl_style.apa.yml
deleted file mode 100644
index 3418ec913..000000000
--- a/config/export/bibcite.bibcite_csl_style.apa.yml
+++ /dev/null
@@ -1,1581 +0,0 @@
-uuid: 8e672182-4b31-4fcd-ad13-0adc05ed9f9e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 5itCumXb5qKQiZx5WTe0z8QzMFFiFAIc9_d8AJCiq0M
-id: apa
-parent: null
-label: 'American Psychological Association 6th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
-    <info>
-    <title>American Psychological Association 6th edition</title>
-    <title-short>APA (6th ed.)</title-short>
-    <id>http://www.zotero.org/styles/apa-6th-edition</id>
-    <link href="http://www.zotero.org/styles/apa-6th-edition" rel="self"/>
-    <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
-    <author>
-    <name>Simon Kornblith</name>
-    <email>simon@simonster.com</email>
-    </author>
-    <author>
-    <name> Brenton M. Wiernik</name>
-    <email>zotero@wiernik.org</email>
-    </author>
-    <contributor>
-    <name>Bruce D'Arcus</name>
-    </contributor>
-    <contributor>
-    <name>Curtis M. Humphrey</name>
-    </contributor>
-    <contributor>
-    <name>Richard Karnesky</name>
-    <email>karnesky+zotero@gmail.com</email>
-    <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-    <name>Sebastian Karcher</name>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="psychology"/>
-    <category field="generic-base"/>
-    <updated>2020-08-07T02:45:06+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="editortranslator" form="short">
-    <single>ed. &amp; trans.</single>
-    <multiple>eds. &amp; trans.</multiple>
-    </term>
-    <term name="translator" form="short">trans.</term>
-    <term name="interviewer" form="short">
-    <single>interviewer</single>
-    <multiple>interviewers</multiple>
-    </term>
-    <term name="collection-editor" form="short">
-    <single>series ed.</single>
-    <multiple>series eds.</multiple>
-    </term>
-    <term name="circa" form="short">ca.</term>
-    <term name="bc"> B.C.E.</term>
-    <term name="ad"> C.E.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="es">
-    <terms>
-    <term name="from">de</term>
-    </terms>
-    </locale>
-    <locale xml:lang="de">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="da">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="nn">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="nl">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="nb">
-    <terms>
-    <term name="et-al">et al.</term>
-    </terms>
-    </locale>
-    <locale xml:lang="fr">
-    <terms>
-    <term name="editor" form="short">
-    <single>éd.</single>
-    <multiple>éds.</multiple>
-    </term>
-    </terms>
-    </locale>
-    <macro name="container-contributors-booklike">
-    <choose>
-    <if variable="container-title">
-    <names variable="editor translator" delimiter=", &amp; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=" (" text-case="title" suffix=")"/>
-    <substitute>
-    <names variable="editorial-director"/>
-    <names variable="collection-editor"/>
-    <names variable="container-author"/>
-    </substitute>
-    </names>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-contributors">
-    <choose>
-    <!-- book is here to catch software with container titles -->
-    <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map personal_communication report speech" match="any">
-    <text macro="container-contributors-booklike"/>
-    </if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="collection-editor container-author editor" match="any">
-    <text macro="container-contributors-booklike"/>
-    </if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="secondary-contributors-booklike">
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <choose>
-    <if variable="container-title" match="none">
-    <group delimiter="; ">
-    <names variable="container-author">
-    <label form="verb-short" suffix=" " text-case="title"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    <names variable="editor translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="secondary-contributors">
-    <choose>
-    <!-- book is here to catch software with container titles -->
-    <if type="book broadcast chapter entry entry-dictionary entry-encyclopedia graphic map report" match="any">
-    <text macro="secondary-contributors-booklike"/>
-    </if>
-    <else-if type="personal_communication">
-    <group delimiter="; ">
-    <group delimiter=" ">
-    <choose>
-    <if variable="genre" match="any">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <text term="letter" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <names variable="recipient" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="symbol" delimiter=", "/>
-    </names>
-    </group>
-    <text variable="medium" text-case="capitalize-first"/>
-    <choose>
-    <if variable="container-title" match="none">
-    <names variable="editor translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    </group>
-    </else-if>
-    <else-if type="song">
-    <choose>
-    <if variable="original-author composer" match="any">
-    <group delimiter="; ">
-    <!-- Replace prefix with performer label as that becomes available -->
-    <names variable="author" prefix="Recorded by ">
-    <label form="verb" text-case="title"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    <names variable="translator">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="article-journal article-magazine article-newspaper" match="any">
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="collection-editor editor" match="any">
-    <text macro="secondary-contributors-booklike"/>
-    </if>
-    <else>
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else>
-    <group delimiter="; ">
-    <choose>
-    <if variable="title">
-    <names variable="interviewer">
-    <name and="symbol" initialize-with=". " delimiter="; "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="editor translator" delimiter="; ">
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    <label form="short" prefix=", " text-case="title"/>
-    </names>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="author">
-    <choose>
-    <if type="song">
-    <names variable="composer" delimiter=", ">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <substitute>
-    <names variable="original-author"/>
-    <names variable="author"/>
-    <names variable="translator">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <group delimiter=" ">
-    <text macro="title"/>
-    <text macro="description"/>
-    <text macro="format"/>
-    </group>
-    </substitute>
-    </names>
-    </if>
-    <else-if type="treaty"/>
-    <else>
-    <names variable="author" delimiter=", ">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <substitute>
-    <names variable="illustrator"/>
-    <names variable="composer"/>
-    <names variable="director">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="long" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <choose>
-    <if variable="container-title">
-    <choose>
-    <if type="book entry entry-dictionary entry-encyclopedia">
-    <text macro="title"/>
-    </if>
-    <else>
-    <names variable="translator"/>
-    </else>
-    </choose>
-    <names variable="translator">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    </if>
-    </choose>
-    <names variable="editor translator" delimiter=", ">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <names variable="editorial-director">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <names variable="collection-editor">
-    <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=" (" suffix=")" text-case="title"/>
-    </names>
-    <choose>
-    <if type="report">
-    <text variable="publisher"/>
-    </if>
-    </choose>
-    <group delimiter=" ">
-    <text macro="title"/>
-    <text macro="description"/>
-    <text macro="format"/>
-    </group>
-    </substitute>
-    </names>
-    </else>
-    </choose>
-    </macro>
-    <macro name="author-short">
-    <choose>
-    <if type="patent" variable="number" match="all">
-    <text macro="patent-number"/>
-    </if>
-    <else-if type="treaty">
-    <text variable="title" form="short" text-case="title"/>
-    </else-if>
-    <else-if type="personal_communication">
-    <choose>
-    <if variable="archive DOI publisher URL" match="none">
-    <group delimiter=", ">
-    <names variable="author">
-    <name and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </substitute>
-    </names>
-    <!-- This should be localized -->
-    <text value="personal communication"/>
-    </group>
-    </if>
-    <else>
-    <names variable="author" delimiter=", ">
-    <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <choose>
-    <if variable="container-title">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </if>
-    <else>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </else>
-    </choose>
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </substitute>
-    </names>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="song">
-    <names variable="composer" delimiter=", ">
-    <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="original-author"/>
-    <names variable="author"/>
-    <names variable="translator"/>
-    <choose>
-    <if variable="container-title">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </if>
-    <else>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </else>
-    </choose>
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </substitute>
-    </names>
-    </else-if>
-    <else>
-    <names variable="author" delimiter=", ">
-    <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="illustrator"/>
-    <names variable="composer"/>
-    <names variable="director"/>
-    <choose>
-    <if variable="container-title">
-    <choose>
-    <if type="book entry entry-dictionary entry-encyclopedia">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </if>
-    <else>
-    <names variable="translator"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    <names variable="editor"/>
-    <names variable="editorial-director"/>
-    <names variable="translator"/>
-    <choose>
-    <if type="report" variable="publisher" match="all">
-    <text variable="publisher"/>
-    </if>
-    <else-if type="legal_case">
-    <text variable="title" font-style="italic"/>
-    </else-if>
-    <else-if type="bill legislation" match="any">
-    <text variable="title" form="short" text-case="title"/>
-    </else-if>
-    <else-if variable="reviewed-author" type="review review-book" match="any">
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </else-if>
-    <else-if type="post post-weblog webpage" variable="container-title" match="any">
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </else-if>
-    <else>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </else>
-    </choose>
-    <text macro="format-short" prefix="[" suffix="]"/>
-    </substitute>
-    </names>
-    </else>
-    </choose>
-    </macro>
-    <macro name="patent-number">
-  <!-- authority: U.S. ; genre: patent ; number: 123,445 -->
-    <group delimiter=" ">
-    <text variable="authority"/>
-    <choose>
-    <if variable="genre">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <!-- This should be localized -->
-    <text value="patent" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <group delimiter=" ">
-    <text term="issue" form="short" text-case="capitalize-first"/>
-    <text variable="number"/>
-    </group>
-    </group>
-    </macro>
-    <macro name="access">
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if variable="DOI" match="any">
-    <text variable="DOI" prefix="https://doi.org/"/>
-    </else-if>
-    <else-if variable="URL">
-    <group delimiter=" ">
-    <text term="retrieved" text-case="capitalize-first"/>
-    <choose>
-    <if type="post post-weblog webpage" match="any">
-    <date variable="accessed" form="text" suffix=","/>
-    </if>
-    </choose>
-    <text term="from"/>
-    <choose>
-    <if type="report">
-    <choose>
-    <if variable="author editor translator" match="any">
-    <!-- This should be localized -->
-    <text variable="publisher" suffix=" website:"/>
-    </if>
-    </choose>
-    </if>
-    <else-if type="post post-weblog webpage" match="any">
-    <!-- This should be localized -->
-    <text variable="container-title" suffix=" website:"/>
-    </else-if>
-    </choose>
-    <text variable="URL"/>
-    </group>
-    </else-if>
-    <else-if variable="archive">
-    <choose>
-    <if type="article article-journal article-magazine article-newspaper dataset paper-conference report speech thesis" match="any">
-    <!-- This section is for electronic database locations. Physical archives for these and other item types are called in 'publisher' macro -->
-    <choose>
-    <if variable="archive-place" match="none">
-    <group delimiter=" ">
-    <text term="retrieved" text-case="capitalize-first"/>
-    <text term="from"/>
-    <text variable="archive" suffix="."/>
-    <text variable="archive_location" prefix="(" suffix=")"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if type="treaty">
-    <group delimiter=", ">
-    <text variable="title" text-case="title"/>
-    <names variable="author">
-    <name initialize-with="." form="short" delimiter="-"/>
-    </names>
-    </group>
-    </if>
-    <else-if type="patent" variable="number" match="all">
-    <text macro="patent-number" font-style="italic"/>
-    </else-if>
-    <else-if variable="title">
-    <choose>
-    <if variable="version" type="book" match="all">
-    <!---This is a hack until we have a software type -->
-    <text variable="title"/>
-    </if>
-    <else-if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-    <choose>
-    <if variable="reviewed-title">
-    <choose>
-    <if type="post post-weblog webpage" variable="container-title" match="any">
-    <text variable="title"/>
-    </if>
-    <else>
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="post post-weblog webpage" variable="container-title" match="any">
-    <text variable="title"/>
-    </else-if>
-    <else>
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if variable="interviewer" type="interview" match="any">
-    <names variable="interviewer">
-    <label form="verb-short" suffix=" " text-case="capitalize-first"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    </else-if>
-    </choose>
-    </macro>
-  <!-- APA has four descriptive sections following the title: -->
-    <!-- (description), [format], container, event -->
-    <macro name="description">
-    <group prefix="(" suffix=")">
-    <choose>
-    <!-- book is here to catch software with container titles -->
-    <if type="book report" match="any">
-    <choose>
-    <if variable="container-title">
-    <text macro="secondary-contributors"/>
-    </if>
-    <else>
-    <group delimiter="; ">
-    <text macro="description-report"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else-if type="thesis">
-    <group delimiter="; ">
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <choose>
-    <!-- In APA journals, the university of a thesis is always cited, even if another locator is given -->
-    <if variable="DOI URL archive" match="any">
-    <text variable="publisher"/>
-    </if>
-    </choose>
-    </group>
-    <text macro="locators"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else-if>
-    <else-if type="book interview manuscript motion_picture musical_score pamphlet post-weblog speech webpage" match="any">
-    <group delimiter="; ">
-    <text macro="locators"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else-if>
-    <else-if type="song">
-    <choose>
-    <if variable="container-title" match="none">
-    <text macro="locators"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="article dataset figure" match="any">
-    <choose>
-    <if variable="container-title">
-    <text macro="secondary-contributors"/>
-    </if>
-    <else>
-    <group delimiter="; ">
-    <text macro="locators"/>
-    <text macro="secondary-contributors"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="bill legislation legal_case patent treaty personal_communication" match="none">
-    <text macro="secondary-contributors"/>
-    </else-if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="format">
-    <group prefix="[" suffix="]">
-    <choose>
-    <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-    <group delimiter=", ">
-    <choose>
-    <if variable="genre">
-    <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <choose>
-    <if variable="reviewed-title">
-    <text variable="reviewed-title" font-style="italic"/>
-    </if>
-    <else>
-    <!-- Assume `title` is title of reviewed work -->
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else>
-    <!-- This should be localized -->
-    <group delimiter=" ">
-    <text value="Review of"/>
-    <choose>
-    <if variable="reviewed-title">
-    <text variable="reviewed-title" font-style="italic"/>
-    </if>
-    <else>
-    <!-- Assume `title` is title of reviewed work -->
-    <text variable="title" font-style="italic"/>
-    </else>
-    </choose>
-    </group>
-    </else>
-    </choose>
-    <names variable="reviewed-author">
-    <label form="verb-short" suffix=" "/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    </group>
-    </if>
-    <else>
-    <text macro="format-short"/>
-    </else>
-    </choose>
-    </group>
-    </macro>
-    <macro name="format-short">
-    <choose>
-    <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-    <choose>
-    <if variable="reviewed-title" match="none">
-    <choose>
-    <if variable="genre">
-    <!-- Delimiting by , rather than "of" to avoid incorrect grammar -->
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </group>
-    </if>
-    <else>
-    <!-- This should be localized -->
-    <group delimiter=" ">
-    <text value="Review of"/>
-    <text variable="title" form="short" text-case="title" font-style="italic"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <text variable="title" form="short" text-case="title" quotes="true"/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="speech thesis" match="any">
-    <text variable="medium" text-case="capitalize-first"/>
-    </else-if>
-    <!-- book is here to catch software with container titles -->
-    <else-if type="book report" match="any">
-    <choose>
-    <if variable="container-title" match="none">
-    <text macro="format-report"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="manuscript pamphlet" match="any">
-    <text variable="medium" text-case="capitalize-first"/>
-    </else-if>
-    <else-if type="personal_communication">
-    <text macro="secondary-contributors"/>
-    </else-if>
-    <else-if type="song">
-    <group delimiter="; ">
-    <text macro="secondary-contributors"/>
-    <choose>
-    <if variable="container-title" match="none">
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </if>
-    </choose>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <group delimiter=", ">
-    <choose>
-    <if variable="collection-editor editor issue page volume" match="any">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </else-if>
-    <else-if type="bill legislation legal_case patent treaty" match="none">
-    <choose>
-    <if variable="genre medium" match="any">
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </if>
-    <else-if type="dataset">
-    <!-- This should be localized -->
-    <text value="Data set"/>
-    </else-if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="description-report">
-    <choose>
-    <if variable="number">
-    <group delimiter="; ">
-    <group delimiter=" ">
-    <text variable="genre" text-case="title"/>
-    <!-- Replace with term="number" if that becomes available -->
-    <text term="issue" form="short" text-case="capitalize-first"/>
-    <text variable="number"/>
-    </group>
-    <text macro="locators"/>
-    </group>
-    </if>
-    <else>
-    <text macro="locators"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="format-report">
-    <choose>
-    <if variable="number">
-    <text variable="medium" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title-and-descriptions">
-    <group delimiter=" ">
-    <text macro="title"/>
-    <choose>
-    <if variable="title interviewer" type="interview" match="any">
-    <group delimiter=" ">
-    <text macro="description"/>
-    <text macro="format"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <text macro="format"/>
-    <text macro="description"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    </macro>
-    <macro name="archive">
-    <group delimiter=". ">
-    <group delimiter=", ">
-    <choose>
-    <if type="manuscript">
-    <text variable="genre"/>
-    </if>
-    </choose>
-    <group delimiter=" ">
-    <!-- Replace "archive" with "archive_collection" as that becomes available -->
-    <text variable="archive"/>
-    <text variable="archive_location" prefix="(" suffix=")"/>
-    </group>
-    </group>
-    <group delimiter=", ">
-    <!-- Move "archive" here when "archive_collection" becomes available -->
-    <text variable="archive-place"/>
-    </group>
-    </group>
-    </macro>
-    <macro name="publisher">
-    <choose>
-    <if type="manuscript pamphlet" match="any">
-    <choose>
-    <if variable="archive archive_location archive-place" match="any">
-    <group delimiter=". ">
-  <group delimiter=": ">
-                  <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    <text macro="archive"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text variable="genre"/>
-    <text variable="publisher"/>
-    <text variable="publisher-place"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else-if type="thesis" match="any">
-    <group delimiter=". ">
-    <group delimiter=", ">
-    <text variable="publisher"/>
-    <text variable="publisher-place"/>
-    </group>
-    <text macro="archive"/>
-    </group>
-    </else-if>
-    <else-if type="patent">
-    <group delimiter=". ">
-  <group delimiter=": ">
-              <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    <text macro="archive"/>
-    </group>
-    </else-if>
-    <else-if type="article-journal article-magazine article-newspaper" match="any">
-    <text macro="archive"/>
-    </else-if>
-    <else-if type="post post-weblog webpage" match="none">
-    <group delimiter=". ">
-    <choose>
-    <if variable="event">
-    <choose>
-    <!-- Only print publisher info if published in a proceedings -->
-    <if variable="collection-editor editor issue page volume" match="any">
-  <group delimiter=": ">
-                      <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    <else>
-  <group delimiter=": ">
-                  <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </else>
-    </choose>
-    <text macro="archive"/>
-    </group>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="event">
-    <choose>
-    <if variable="event" type="speech paper-conference" match="any">
-    <choose>
-    <!-- Don't print event info if published in a proceedings -->
-    <if variable="collection-editor editor issue page volume" match="none">
-    <group delimiter=" ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <group delimiter=" ">
-    <choose>
-    <if variable="genre">
-    <text term="presented at"/>
-    </if>
-    <else>
-    <text term="presented at" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <group delimiter=", ">
-    <text variable="event"/>
-    <text variable="event-place"/>
-    </group>
-    </group>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="issued">
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if variable="issued">
-    <group>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    <text variable="year-suffix"/>
-    <choose>
-    <if type="speech">
-    <date variable="issued" delimiter=" ">
-    <date-part prefix=", " name="month"/>
-    </date>
-    </if>
-    <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-    <date variable="issued">
-    <date-part prefix=", " name="month"/>
-    <date-part prefix=" " name="day"/>
-    </date>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="container-title" match="none">
-    <date variable="issued">
-    <date-part prefix=", " name="month"/>
-    <date-part prefix=" " name="day"/>
-    </date>
-    </if>
-    </choose>
-    </else-if>
-  <!-- Only year: article-journal chapter entry entry-dictionary entry-encyclopedia dataset figure graphic motion_picture manuscript map musical_score paper-conference [published] patent report review review-book song thesis -->
-    </choose>
-    </group>
-    </else-if>
-    <else-if variable="status">
-    <group>
-    <text variable="status" text-case="lowercase"/>
-    <text variable="year-suffix" prefix="-"/>
-    </group>
-    </else-if>
-    <else>
-    <group>
-    <text term="no date" form="short"/>
-    <text variable="year-suffix" prefix="-"/>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="issued-sort">
-    <choose>
-    <if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog speech treaty webpage" match="any">
-    <date variable="issued">
-    <date-part name="year"/>
-    <date-part name="month"/>
-    <date-part name="day"/>
-    </date>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    </macro>
-    <macro name="issued-year">
-    <group>
-    <choose>
-    <if type="personal_communication">
-    <choose>
-    <if variable="archive DOI publisher URL" match="none">
-    <!-- These variables indicate that the letter is retrievable by the reader. If not, then use the APA in-text-only personal communication format -->
-    <date variable="issued" form="text"/>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    <text variable="year-suffix"/>
-    </group>
-    </macro>
-    <macro name="issued-citation">
-    <choose>
-    <if variable="issued">
-    <group delimiter="/">
-    <choose>
-    <if is-uncertain-date="original-date">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <date variable="original-date">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </if>
-    <else>
-    <date variable="original-date">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    <choose>
-    <if is-uncertain-date="issued">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <text macro="issued-year"/>
-    </group>
-    </if>
-    <else>
-    <text macro="issued-year"/>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else-if variable="status">
-    <text variable="status" text-case="lowercase"/>
-    <text variable="year-suffix" prefix="-"/>
-    </else-if>
-    <else>
-    <text term="no date" form="short"/>
-    <text variable="year-suffix" prefix="-"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="original-date">
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if type="speech">
-    <date variable="original-date" delimiter=" ">
-    <date-part name="month"/>
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if type="article article-magazine article-newspaper broadcast interview pamphlet personal_communication post post-weblog treaty webpage" match="any">
-    <date variable="original-date" form="text"/>
-    </else-if>
-    <else>
-    <date variable="original-date">
-    <date-part name="year"/>
-    </date>
-    </else>
-    </choose>
-    </macro>
-    <macro name="original-published">
-    <!--This should be localized -->
-    <choose>
-    <if type="bill legal_case legislation" match="any"/>
-    <else-if type="interview motion_picture song" match="any">
-    <text value="Original work recorded"/>
-    </else-if>
-    <else-if type="broadcast">
-    <text value="Original work broadcast"/>
-    </else-if>
-    <else>
-    <text value="Original work published"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="locators">
-    <choose>
-    <if type="article-journal article-magazine figure review review-book" match="any">
-    <group delimiter=", ">
-    <group>
-    <text variable="volume" font-style="italic"/>
-    <text variable="issue" prefix="(" suffix=")"/>
-    </group>
-    <text variable="page"/>
-    </group>
-    </if>
-    <else-if type="article-newspaper">
-    <group delimiter=" ">
-    <label variable="page" form="short"/>
-    <text variable="page"/>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="collection-editor editor" match="any">
-    <text macro="locators-booklike"/>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <group>
-    <text variable="volume" font-style="italic"/>
-    <text variable="issue" prefix="(" suffix=")"/>
-    </group>
-    <text variable="page"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="bill broadcast interview legal_case legislation patent post post-weblog speech treaty webpage" match="none">
-    <text macro="locators-booklike"/>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="locators-booklike">
-    <group delimiter=", ">
-    <text macro="edition"/>
-    <group delimiter=" ">
-    <text term="version" text-case="capitalize-first"/>
-    <text variable="version"/>
-    </group>
-    <choose>
-    <if variable="volume" match="any">
-    <choose>
-    <if is-numeric="volume" match="none"/>
-    <else-if variable="collection-title">
-    <choose>
-    <if variable="editor translator" match="none">
-    <choose>
-    <if variable="collection-number">
-    <group>
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    <else>
-    <group>
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <group>
-    <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-    <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-    </group>
-    </else>
-    </choose>
-    <group>
-    <label variable="page" form="short" suffix=" "/>
-    <text variable="page"/>
-    </group>
-    </group>
-    </macro>
-    <macro name="citation-locator">
-    <group>
-    <choose>
-    <if locator="chapter">
-    <label variable="locator" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <label variable="locator" form="short"/>
-    </else>
-    </choose>
-    <text variable="locator" prefix=" "/>
-    </group>
-    </macro>
-    <macro name="container">
-    <choose>
-    <if type="article article-journal article-magazine article-newspaper review review-book" match="any">
-    <group delimiter=", ">
-    <text macro="container-title"/>
-    <text macro="locators"/>
-    </group>
-    <choose>
-    <!--for advance online publication-->
-    <if variable="issued">
-    <choose>
-    <if variable="page issue" match="none">
-    <text variable="status" text-case="capitalize-first" prefix=". "/>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </if>
-    <else-if type="article dataset figure" match="any">
-    <choose>
-    <if variable="container-title">
-    <group delimiter=", ">
-    <text macro="container-title"/>
-    <text macro="locators"/>
-    </group>
-    <choose>
-    <!--for advance online publication-->
-    <if variable="issued">
-    <choose>
-    <if variable="page issue" match="none">
-    <text variable="status" text-case="capitalize-first" prefix=". "/>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </else-if>
-    <!-- book is here to catch software with container titles -->
-    <else-if type="book" variable="container-title" match="all">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <group delimiter=" ">
-    <text macro="container-title"/>
-    <text macro="description-report" prefix="(" suffix=")"/>
-    <text macro="format-report" prefix="[" suffix="]"/>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="report" variable="container-title" match="all">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <group delimiter=" ">
-    <text macro="container-title"/>
-    <text macro="description-report" prefix="(" suffix=")"/>
-    <text macro="format-report" prefix="[" suffix="]"/>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="song" variable="container-title" match="all">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <group delimiter=" ">
-    <text macro="container-title"/>
-    <text macro="locators" prefix="(" suffix=")"/>
-    <group delimiter=", " prefix="[" suffix="]">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </group>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="paper-conference">
-    <choose>
-    <if variable="editor collection-editor container-author" match="any">
-    <text macro="container-booklike"/>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text macro="container-title"/>
-    <text macro="locators"/>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="book">
-    <choose>
-    <!-- book and software should not cite collection-title, only container-title -->
-    <if variable="container-title">
-    <text macro="container-booklike"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if type="broadcast chapter entry entry-dictionary entry-encyclopedia graphic map speech" match="any">
-    <text macro="container-booklike"/>
-    </else-if>
-    <else-if type="bill legal_case legislation treaty" match="any">
-    <text macro="legal-cites"/>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="container-booklike">
-    <choose>
-    <if variable="container-title collection-title" match="any">
-    <group delimiter=" ">
-    <text term="in" text-case="capitalize-first"/>
-    <group delimiter=", ">
-    <text macro="container-contributors"/>
-    <choose>
-    <if variable="container-author editor translator" match="none">
-    <group delimiter=". ">
-  <group delimiter=": ">
-                      <text variable="collection-title" font-style="italic" text-case="title"/>
-                        <choose>
-                        <if variable="collection-title">
-                        <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <number variable="collection-number" font-style="italic" form="numeric"/>
-                        <choose>
-                        <if variable="collection-number" match="none">
-                        <number variable="volume" font-style="italic" form="numeric"/>
-                        </if>
-                        </choose>
-                        </group>
-                        </if>
-                        </choose>
-    </group>
-    <!-- Replace with volume-title as that becomes available -->
-  <group delimiter=": ">
-                      <text macro="container-title"/>
-                        <choose>
-                        <if variable="collection-title" is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                        </group>
-                        </if>
-                        </choose>
-    </group>
-    </group>
-    </if>
-    <else>
-    <!-- Replace with volume-title as that becomes available -->
-  <group delimiter=": ">
-                    <text macro="container-title"/>
-                        <choose>
-                        <if is-numeric="volume" match="none">
-                        <group delimiter=" ">
-                        <text term="volume" form="short" font-style="italic" text-case="capitalize-first"/>
-                        <text variable="volume" font-style="italic"/>
-                        </group>
-                        </if>
-                        </choose>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <group delimiter="; " prefix="(" suffix=")">
-    <text macro="locators"/>
-    <names variable="container-author">
-    <label form="verb-short" suffix=" " text-case="title"/>
-    <name and="symbol" initialize-with=". " delimiter=", "/>
-    </names>
-    </group>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-title">
-    <choose>
-    <if type="article article-journal article-magazine article-newspaper dataset" match="any">
-    <text variable="container-title" font-style="italic" text-case="title"/>
-    </if>
-    <else-if type="paper-conference speech">
-    <choose>
-    <if variable="collection-editor container-author editor" match="any">
-    <text variable="container-title" font-style="italic"/>
-    </if>
-    <else>
-    <text variable="container-title" font-style="italic" text-case="title"/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="bill legal_case legislation post-weblog webpage" match="none">
-    <text variable="container-title" font-style="italic"/>
-    </else-if>
-    </choose>
-    </macro>
-    <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
-    <macro name="publication-history">
-    <choose>
-    <if type="patent" match="none">
-    <group prefix="(" suffix=")">
-    <choose>
-    <if variable="references">
-    <!-- This provides the option for more elaborate description
-    of publication history, such as full "reprinted" references
-    (example 26) or retracted references -->
-    <text variable="references"/>
-    </if>
-    <else>
-    <choose>
-    <if variable="original-date">
-    <group delimiter=" ">
-    <text macro="original-published"/>
-    <choose>
-    <if is-uncertain-date="original-date">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <text macro="original-date"/>
-    </group>
-    </if>
-    <else>
-    <text macro="original-date"/>
-    </else>
-    </choose>
-    </group>
-    </if>
-    </choose>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else>
-    <text variable="references" prefix="(" suffix=")"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="legal-cites">
-    <choose>
-    <if type="legal_case">
-    <group prefix=", " delimiter=" ">
-    <group delimiter=" ">
-    <choose>
-    <if variable="container-title">
-    <text variable="volume"/>
-    <text variable="container-title"/>
-    <group delimiter=" ">
-    <!--change to label variable="section" as that becomes available -->
-    <text term="section" form="symbol"/>
-    <text variable="section"/>
-    </group>
-    <text variable="page"/>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <choose>
-    <if is-numeric="number">
-    <!-- Replace with term="number" if that becomes available -->
-    <text term="issue" form="short" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    <text variable="number"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <group prefix="(" suffix=")" delimiter=" ">
-    <text variable="authority"/>
-    <choose>
-    <if variable="container-title" match="any">
-    <!--Only print year for cases published in reporters-->
-    <date variable="issued" form="numeric" date-parts="year"/>
-    </if>
-    <else>
-    <date variable="issued" form="text"/>
-    </else>
-    </choose>
-    </group>
-    </group>
-    </if>
-    <else-if type="bill legislation" match="any">
-    <group prefix=", " delimiter=" ">
-    <group delimiter=", ">
-    <choose>
-    <if variable="number">
-    <!--There's a public law number-->
-    <text variable="number" prefix="Pub. L. No. "/>
-    <group delimiter=" ">
-    <!--change to label variable="section" as that becomes available -->
-    <text term="section" form="symbol"/>
-    <text variable="section"/>
-    </group>
-    <group delimiter=" ">
-    <text variable="volume"/>
-    <text variable="container-title"/>
-    <text variable="page-first"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <text variable="volume"/>
-    <text variable="container-title"/>
-    <!--change to label variable="section" as that becomes available -->
-    <text term="section" form="symbol"/>
-    <text variable="section"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <date variable="issued" prefix="(" suffix=")">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </else-if>
-    <else-if type="treaty">
-    <group delimiter=" ">
-    <number variable="volume"/>
-    <text variable="container-title"/>
-    <text variable="page"/>
-    </group>
-    </else-if>
-    </choose>
-    </macro>
-    <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
-    <sort>
-    <key macro="author" names-min="8" names-use-first="6"/>
-    <key macro="issued-sort"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <group delimiter=", ">
-    <text macro="author-short"/>
-    <text macro="issued-citation"/>
-    <text macro="citation-locator"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
-    <sort>
-    <key macro="author"/>
-    <key macro="issued-sort" sort="ascending"/>
-    <key macro="title"/>
-    </sort>
-    <layout>
-    <group delimiter=" ">
-    <group delimiter=". " suffix=".">
-    <text macro="author"/>
-    <choose>
-    <if is-uncertain-date="issued">
-    <group prefix="[" suffix="]" delimiter=" ">
-    <text term="circa" form="short"/>
-    <text macro="issued"/>
-    </group>
-    </if>
-    <else>
-    <text macro="issued" prefix="(" suffix=")"/>
-    </else>
-    </choose>
-    <text macro="title-and-descriptions"/>
-    <text macro="container"/>
-    <text macro="event"/>
-    <text macro="publisher"/>
-    </group>
-    <text macro="access"/>
-    <text macro="publication-history"/>
-    </group>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1596768306
-custom: true
-url_id: 'http://www.zotero.org/styles/apa-6th-edition'
diff --git a/config/export/bibcite.bibcite_csl_style.chicago_author_date.yml b/config/export/bibcite.bibcite_csl_style.chicago_author_date.yml
deleted file mode 100644
index 240747148..000000000
--- a/config/export/bibcite.bibcite_csl_style.chicago_author_date.yml
+++ /dev/null
@@ -1,670 +0,0 @@
-uuid: 3b0a3238-98e2-47b1-8e6f-0ea403a1faf5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: uKTD7PvBOSjC4G6K4Cwquf7ds33h_qGDl9x96WCDSoU
-id: chicago_author_date
-parent: null
-label: 'Chicago Manual of Style 16th edition (author-date)'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="display-and-sort" page-range-format="chicago">
-    <info>
-    <title>Chicago Manual of Style 16th edition (author-date)</title>
-    <id>http://www.zotero.org/styles/chicago-author-date-16th-edition</id>
-    <link href="http://www.zotero.org/styles/chicago-author-date-16th-edition" rel="self"/>
-    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
-    <author>
-    <name>Julian Onions</name>
-    <email>julian.onions@gmail.com</email>
-    </author>
-    <contributor>
-    <name>Sebastian Karcher</name>
-    </contributor>
-    <contributor>
-    <name>Richard Karnesky</name>
-    <email>karnesky+zotero@gmail.com</email>
-    <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-    </contributor>
-    <contributor>
-    <name>Andrew Dunning</name>
-    <email>andrew.dunning@utoronto.ca</email>
-    </contributor>
-    <contributor>
-    <name>Brenton M. Wiernik</name>
-    </contributor>
-    <category citation-format="author-date"/>
-    <category field="generic-base"/>
-    <summary>The author-date variant of the Chicago style</summary>
-    <updated>2020-04-26T18:22:50+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="container-author" form="verb">by</term>
-    <term name="translator" form="verb-short">trans.</term>
-    <term name="editortranslator" form="verb">edited and translated by</term>
-    <term name="translator" form="short">trans.</term>
-    </terms>
-    </locale>
-    <macro name="secondary-contributors">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
-    <group delimiter=". ">
-    <names variable="editor translator" delimiter=". ">
-    <label form="verb" text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    <names variable="director" delimiter=". ">
-    <label form="verb" text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-contributors">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <group prefix=", " delimiter=", ">
-    <names variable="container-author" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    <names variable="editor translator" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="editor">
-    <names variable="editor">
-    <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    </names>
-    </macro>
-    <macro name="translator">
-    <names variable="translator">
-    <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    </names>
-    </macro>
-    <macro name="recipient">
-    <choose>
-    <if type="personal_communication">
-    <choose>
-    <if variable="genre">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    <else>
-    <text term="letter" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    <names variable="recipient" delimiter=", ">
-    <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </macro>
-    <macro name="substitute-title">
-    <choose>
-    <if type="article-magazine article-newspaper review review-book" match="any">
-    <text macro="container-title"/>
-    </if>
-    </choose>
-    </macro>
-    <macro name="contributors">
-    <group delimiter=". ">
-    <names variable="author">
-    <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <names variable="director"/>
-    <text macro="substitute-title"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    <text macro="recipient"/>
-    </group>
-    </macro>
-    <macro name="contributors-short">
-    <names variable="author">
-    <name form="short" and="text" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <names variable="director"/>
-    <text macro="substitute-title"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="interviewer">
-    <names variable="interviewer" delimiter=", ">
-    <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </macro>
-    <macro name="archive">
-    <group delimiter=". ">
-    <text variable="archive_location" text-case="capitalize-first"/>
-    <text variable="archive"/>
-    <text variable="archive-place"/>
-    </group>
-    </macro>
-    <macro name="access">
-    <group delimiter=". ">
-    <choose>
-    <if type="graphic report" match="any">
-    <text macro="archive"/>
-    </if>
-    <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
-    <text macro="archive"/>
-    </else-if>
-    </choose>
-    <choose>
-    <if type="webpage post-weblog" match="any">
-    <date variable="issued" delimiter=" ">
-    <date-part name="month"/>
-    <date-part name="day"/>
-    </date>
-    </if>
-    </choose>
-    <choose>
-    <if variable="issued" match="none">
-    <group delimiter=" ">
-    <text term="accessed" text-case="capitalize-first"/>
-    <date variable="accessed" delimiter=" ">
-    <date-part name="month"/>
-    <date-part name="day"/>
-    </date>
-    </group>
-    </if>
-    </choose>
-    <choose>
-    <if type="legal_case" match="none">
-    <choose>
-    <if variable="DOI">
-    <text variable="DOI" prefix="doi:"/>
-    </if>
-    <else>
-    <text variable="URL"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if variable="title" match="none">
-    <choose>
-    <if type="personal_communication" match="none">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    </if>
-    <else-if type="bill book graphic legislation motion_picture song" match="any">
-    <text variable="title" text-case="title" font-style="italic"/>
-    <group prefix=" (" suffix=")" delimiter=" ">
-    <text term="version"/>
-    <text variable="version"/>
-    </group>
-    </else-if>
-    <else-if variable="reviewed-author">
-    <choose>
-    <if variable="reviewed-title">
-    <group delimiter=". ">
-    <text variable="title" text-case="title" quotes="true"/>
-    <group delimiter=", ">
-    <text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
-    <names variable="reviewed-author">
-    <label form="verb-short" text-case="lowercase" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </group>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
-    <names variable="reviewed-author">
-    <label form="verb-short" text-case="lowercase" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </group>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="legal_case interview patent" match="any">
-    <text variable="title"/>
-    </else-if>
-    <else>
-    <text variable="title" text-case="title" quotes="true"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" " prefix=". ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short" strip-periods="true"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" text-case="capitalize-first" prefix=". "/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" " prefix=", ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" prefix=", "/>
-    </else>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="locators">
-    <choose>
-    <if type="article-journal">
-    <choose>
-    <if variable="volume">
-    <text variable="volume" prefix=" "/>
-    <group prefix=" (" suffix=")">
-    <choose>
-    <if variable="issue">
-    <text variable="issue"/>
-    </if>
-    <else>
-    <date variable="issued">
-    <date-part name="month"/>
-    </date>
-    </else>
-    </choose>
-    </group>
-    </if>
-    <else-if variable="issue">
-    <group delimiter=" " prefix=", ">
-    <text term="issue" form="short"/>
-    <text variable="issue"/>
-    <date variable="issued" prefix="(" suffix=")">
-    <date-part name="month"/>
-    </date>
-    </group>
-    </else-if>
-    <else>
-    <date variable="issued" prefix=", ">
-    <date-part name="month"/>
-    </date>
-    </else>
-    </choose>
-    </if>
-    <else-if type="legal_case">
-    <text variable="volume" prefix=", "/>
-    <text variable="container-title" prefix=" "/>
-    <text variable="page" prefix=" "/>
-    </else-if>
-    <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <group prefix=". " delimiter=". ">
-    <group>
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    <group>
-    <number variable="number-of-volumes" form="numeric"/>
-    <text term="volume" form="short" prefix=" " plural="true"/>
-    </group>
-    </group>
-    </else-if>
-    <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <choose>
-    <if variable="page" match="none">
-    <group prefix=". ">
-    <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    </group>
-    </if>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="locators-chapter">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <choose>
-    <if variable="page">
-    <group prefix=", ">
-    <text variable="volume" suffix=":"/>
-    <text variable="page"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="locators-article">
-    <choose>
-    <if type="article-newspaper">
-    <group prefix=", " delimiter=", ">
-    <group delimiter=" ">
-    <text variable="edition"/>
-    <text term="edition"/>
-    </group>
-    <group>
-    <text term="section" form="short" suffix=" "/>
-    <text variable="section"/>
-    </group>
-    </group>
-    </if>
-    <else-if type="article-journal">
-    <choose>
-    <if variable="volume issue" match="any">
-  <text variable="page" prefix=": "/>
-            </if>
-            <else>
-              <text variable="page" prefix=", "/>
-    </else>
-    </choose>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="point-locators">
-    <choose>
-    <if variable="locator">
-    <choose>
-    <if locator="page" match="none">
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <choose>
-    <if variable="volume">
-    <group>
-    <text term="volume" form="short" suffix=" "/>
-    <number variable="volume" form="numeric"/>
-    <label variable="locator" form="short" prefix=", " suffix=" "/>
-    </group>
-    </if>
-    <else>
-    <label variable="locator" form="short" suffix=" "/>
-    </else>
-    </choose>
-    </if>
-    <else>
-    <label variable="locator" form="short" suffix=" "/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <number variable="volume" form="numeric" suffix=":"/>
-    </else-if>
-    </choose>
-    <text variable="locator"/>
-    </if>
-    </choose>
-    </macro>
-    <macro name="container-prefix">
-    <text term="in" text-case="capitalize-first"/>
-    </macro>
-    <macro name="container-title">
-    <choose>
-    <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
-    <text macro="container-prefix" suffix=" "/>
-    </if>
-    </choose>
-    <choose>
-    <if type="legal_case" match="none">
-    <text variable="container-title" text-case="title" font-style="italic"/>
-    </if>
-    </choose>
-    </macro>
-    <macro name="publisher">
-  <group delimiter=": ">
-        <text variable="publisher-place"/>
-                        <text variable="publisher"/>
-    </group>
-    </macro>
-    <macro name="date">
-    <choose>
-    <if variable="issued">
-    <group delimiter=" ">
-    <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </if>
-    <else-if variable="accessed">
-    <date variable="accessed">
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if variable="status">
-    <text variable="status" text-case="capitalize-first"/>
-    </else-if>
-    <else>
-    <text term="no date" form="short"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="date-in-text">
-    <choose>
-    <if variable="issued">
-    <group delimiter=" ">
-    <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </if>
-    <else-if variable="accessed">
-    <date variable="accessed">
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if variable="status">
-    <text variable="status"/>
-    </else-if>
-    <else>
-    <text term="no date" form="short"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="day-month">
-    <date variable="issued">
-    <date-part name="month"/>
-    <date-part name="day" prefix=" "/>
-    </date>
-    </macro>
-    <macro name="collection-title">
-    <choose>
-    <if match="none" type="article-journal">
-    <choose>
-    <if match="none" is-numeric="collection-number">
-    <group delimiter=", ">
-    <text variable="collection-title" text-case="title"/>
-    <text variable="collection-number"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=" ">
-    <text variable="collection-title" text-case="title"/>
-    <text variable="collection-number"/>
-    </group>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="collection-title-journal">
-    <choose>
-    <if type="article-journal">
-    <group delimiter=" ">
-    <text variable="collection-title"/>
-    <text variable="collection-number"/>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <macro name="event">
-    <group delimiter=" ">
-    <choose>
-    <if variable="genre">
-    <text term="presented at"/>
-    </if>
-    <else>
-    <text term="presented at" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <text variable="event"/>
-    </group>
-    </macro>
-    <macro name="description">
-    <choose>
-    <if type="interview">
-    <group delimiter=". ">
-    <text macro="interviewer"/>
-    <text variable="medium" text-case="capitalize-first"/>
-    </group>
-    </if>
-    <else-if type="patent">
-    <group delimiter=" " prefix=". ">
-    <text variable="authority"/>
-    <text variable="number"/>
-    </group>
-    </else-if>
-    <else>
-    <text variable="medium" text-case="capitalize-first" prefix=". "/>
-    </else>
-    </choose>
-    <choose>
-    <if variable="title" match="none"/>
-    <else-if type="thesis personal_communication speech" match="any"/>
-    <else>
-    <group delimiter=" " prefix=". ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <choose>
-    <if type="report">
-    <text variable="number"/>
-    </if>
-    </choose>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <macro name="issue">
-    <choose>
-    <if type="legal_case">
-    <text variable="authority" prefix=". "/>
-    </if>
-    <else-if type="speech">
-    <group prefix=". " delimiter=", ">
-    <group delimiter=" ">
-    <text variable="genre" text-case="capitalize-first"/>
-    <text macro="event"/>
-    </group>
-    <text variable="event-place"/>
-    <text macro="day-month"/>
-    </group>
-    </else-if>
-    <else-if type="article-newspaper article-magazine personal_communication" match="any">
-    <text macro="day-month" prefix=", "/>
-    </else-if>
-    <else-if type="patent">
-    <group delimiter=", " prefix=", ">
-    <group delimiter=" ">
-    <!--Needs Localization-->
-    <text value="filed"/>
-    <date variable="submitted" form="text"/>
-    </group>
-    <group delimiter=" ">
-    <choose>
-    <if variable="issued submitted" match="all">
-    <text term="and"/>
-    </if>
-    </choose>
-    <!--Needs Localization-->
-    <text value="issued"/>
-    <date variable="issued" form="text"/>
-    </group>
-    </group>
-    </else-if>
-    <else>
-    <group prefix=". " delimiter=", ">
-    <choose>
-    <if type="thesis">
-    <text variable="genre" text-case="capitalize-first"/>
-    </if>
-    </choose>
-    <text macro="publisher"/>
-    </group>
-    </else>
-    </choose>
-    </macro>
-    <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year">
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <group delimiter=", ">
-    <choose>
-    <if variable="issued accessed" match="any">
-    <group delimiter=" ">
-    <text macro="contributors-short"/>
-    <text macro="date-in-text"/>
-    </group>
-    </if>
-    <!---comma before forthcoming and n.d.-->
-    <else>
-    <group delimiter=", ">
-    <text macro="contributors-short"/>
-    <text macro="date-in-text"/>
-    </group>
-    </else>
-    </choose>
-    <text macro="point-locators"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
-    <sort>
-    <key macro="contributors"/>
-    <key variable="issued"/>
-    <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-    <group delimiter=". ">
-    <text macro="contributors"/>
-    <text macro="date"/>
-    <text macro="title"/>
-    </group>
-    <text macro="description"/>
-    <text macro="secondary-contributors" prefix=". "/>
-    <text macro="container-title" prefix=". "/>
-    <text macro="container-contributors"/>
-    <text macro="edition"/>
-    <text macro="locators-chapter"/>
-    <text macro="collection-title-journal" prefix=", " suffix=", "/>
-    <text macro="locators"/>
-    <text macro="collection-title" prefix=". "/>
-    <text macro="issue"/>
-    <text macro="locators-article"/>
-    <text macro="access" prefix=". "/>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1587925370
-custom: true
-url_id: 'http://www.zotero.org/styles/chicago-author-date-16th-edition'
diff --git a/config/export/bibcite.bibcite_csl_style.modern_language_association.yml b/config/export/bibcite.bibcite_csl_style.modern_language_association.yml
deleted file mode 100644
index 5270c3444..000000000
--- a/config/export/bibcite.bibcite_csl_style.modern_language_association.yml
+++ /dev/null
@@ -1,473 +0,0 @@
-uuid: eb171f45-2f0c-483c-98ee-8abae13a2ebc
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ZsuK1_nEMKxHCv_L1dmQpr1AceMJkwqOmxVyVEoUJqI
-id: modern_language_association
-parent: null
-label: 'Modern Language Association 7th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
-    <info>
-    <title>Modern Language Association 7th edition</title>
-    <title-short>MLA</title-short>
-    <id>http://www.zotero.org/styles/modern-language-association-7th-edition</id>
-    <link href="http://www.zotero.org/styles/modern-language-association-7th-edition" rel="self"/>
-    <link href="http://owl.english.purdue.edu/owl/section/2/11/" rel="documentation"/>
-    <author>
-    <name>Ilouise S. Bradford</name>
-    <email>isbradford@gmail.com</email>
-    </author>
-    <contributor>
-    <name>Sarah Ficke</name>
-    <email>sficke@email.unc.edu</email>
-    </contributor>
-    <contributor>
-    <name>Sebastian Karcher</name>
-    <email>karcher@u.northwestern.edu</email>
-    </contributor>
-    <contributor>
-    <name>Christian Werthschulte</name>
-    <email>Christian.Werthschulte@rub.de</email>
-    </contributor>
-    <contributor>
-    <name>Simon Kornblith</name>
-    <email>simon@simonster.com</email>
-    </contributor>
-    <contributor>
-    <name>James Johnston</name>
-    <email>thejamesjohnston@gmail.com</email>
-    </contributor>
-    <category citation-format="author"/>
-    <category field="generic-base"/>
-  <summary>This style adheres to the MLA 7th edition handbook and contains modifications to these types of sources: e-mail, forum posts, interviews, manuscripts, maps, presentations, TV broadcasts, and web pages.</summary>
-    <updated>2017-09-29T03:07:06+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <terms>
-    <term name="month-01" form="short">Jan.</term>
-    <term name="month-02" form="short">Feb.</term>
-    <term name="month-03" form="short">Mar.</term>
-    <term name="month-04" form="short">Apr.</term>
-    <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">June</term>
-    <term name="month-07" form="short">July</term>
-    <term name="month-08" form="short">Aug.</term>
-    <term name="month-09" form="short">Sept.</term>
-    <term name="month-10" form="short">Oct.</term>
-    <term name="month-11" form="short">Nov.</term>
-    <term name="month-12" form="short">Dec.</term>
-    <term name="volume" form="short">
-    <single>Vol.</single>
-    <multiple>vols</multiple>
-    </term>
-    <term name="edition" form="short">ed</term>
-    <term name="editor" form="verb-short">ed.</term>
-    <term name="translator" form="verb-short">trans.</term>
-    <term name="translator" form="short">trans.</term>
-    </terms>
-    </locale>
-    <macro name="editor-translator">
-    <names variable="editor translator" delimiter=". ">
-    <label form="verb-short" text-case="capitalize-first" suffix=" "/>
-    <name and="text" delimiter=", "/>
-    </names>
-    </macro>
-    <macro name="author">
-    <names variable="author">
-    <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-    <label form="short" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="author-short">
-    <names variable="author">
-    <name form="short" and="text" delimiter=", " initialize-with=". "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title-short"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="access">
-    <group delimiter=" ">
-    <date variable="accessed">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" "/>
-    <date-part name="year"/>
-    </date>
-    </group>
-    </macro>
-    <macro name="issued-full-date">
-    <choose>
-    <if variable="issued">
-    <date variable="issued">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" " strip-periods="false"/>
-    <date-part name="year"/>
-    </date>
-    </if>
-    <else>
-    <text term="no date" form="short"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="medium">
-    <choose>
-    <if type="motion_picture">
-    <choose>
-    <if variable="medium">
-    <text variable="medium" prefix=" "/>
-    </if>
-    <else>
-    <text value="Film" prefix=" "/>
-    </else>
-    </choose>
-    </if>
-    <else-if type="broadcast">
-    <choose>
-    <if variable="medium">
-    <text variable="medium" prefix=" "/>
-    </if>
-    <else>
-    <text value="Television" prefix=" "/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="manuscript">
-    <text value=""/>
-    </else-if>
-    <else-if type="personal_communication" match="any">
-    <text value="" prefix=" "/>
-    </else-if>
-    <else-if type="speech" match="any">
-    <text value=""/>
-    </else-if>
-    <else-if type="interview">
-    <text variable="medium" prefix=" "/>
-    </else-if>
-    <else-if type="song">
-    <choose>
-    <if variable="medium">
-    <text variable="medium" prefix=" "/>
-    </if>
-    <else>
-    <text value="Audio Recording" prefix=" "/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="graphic" variable="medium" match="all">
-    <text variable="medium" prefix=" "/>
-    </else-if>
-    <else>
-    <choose>
-    <if variable="URL DOI" match="any">
-    <text variable="source" prefix=" " suffix="." font-style="italic"/>
-    <group>
-    <text value="Web." prefix=" "/>
-    </group>
-    <text prefix=" " suffix="." macro="access"/>
-    </if>
-    <else>
-    <text value="Print" prefix=" "/>
-    </else>
-    </choose>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any">
-    <text variable="title" font-style="italic" text-case="title"/>
-    </if>
-    <else-if type="interview personal_communication" match="any">
-    <text variable="title" text-case="title" quotes="false"/>
-    </else-if>
-    <else>
-    <text variable="title" text-case="title" quotes="true"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title-short">
-    <choose>
-    <if type="bill book graphic legal_case legislation manuscript motion_picture report song" match="any">
-    <text variable="title" text-case="title" form="short" font-style="italic"/>
-    </if>
-    <else>
-    <text variable="title" text-case="title" form="short" quotes="true"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="pages">
-    <choose>
-    <if variable="page">
-    <text variable="page"/>
-    </if>
-    <else-if type="personal_communication interview" match="any">
-    <text value=""/>
-    </else-if>
-    <else>
-    <text value="n. pag"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="edition">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="volume">
-    <choose>
-    <if is-numeric="volume">
-    <group delimiter=" ">
-    <text term="volume" form="short" strip-periods="false"/>
-    <number variable="volume"/>
-    </group>
-    </if>
-    <else>
-    <text variable="volume"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="number-of-volumes-only">
-    <choose>
-    <if variable="volume" match="none">
-    <choose>
-    <if is-numeric="number-of-volumes">
-    <group delimiter=" ">
-    <number variable="number-of-volumes"/>
-    <text term="volume" form="short" plural="true" strip-periods="true"/>
-    </group>
-    </if>
-    <else>
-    <text variable="number-of-volumes"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="number-of-volumes-optional">
-    <choose>
-    <if variable="volume">
-    <choose>
-    <if is-numeric="number-of-volumes">
-    <group delimiter=" ">
-    <number variable="number-of-volumes"/>
-    <text term="volume" form="short" plural="true" strip-periods="true"/>
-    </group>
-    </if>
-    <else>
-    <text variable="number-of-volumes"/>
-    </else>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="collection-title">
-    <text variable="collection-title" text-case="title" prefix=" "/>
-    </macro>
-    <macro name="collection-number">
-    <text variable="collection-number" prefix=" " suffix="."/>
-    </macro>
-    <macro name="publisher">
-    <choose>
-    <if variable="publisher">
-    <text variable="publisher"/>
-    </if>
-    <else>
-    <text value="N.p."/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="publisher-year">
-    <group delimiter=", ">
-  <group delimiter=": ">
-          <text variable="publisher-place"/>
-                        <text macro="publisher"/>
-    </group>
-    <date variable="issued">
-    <date-part name="year"/>
-    </date>
-    </group>
-    </macro>
-    <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <group delimiter=" ">
-    <choose>
-    <if variable="author editor translator" match="any">
-    <group delimiter=", ">
-    <text macro="author-short"/>
-    <choose>
-    <if disambiguate="true">
-    <text macro="title-short"/>
-    </if>
-    </choose>
-    </group>
-    </if>
-    <else>
-    <text macro="title-short"/>
-    </else>
-    </choose>
-    <text variable="locator"/>
-    </group>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" line-spacing="2" entry-spacing="0" subsequent-author-substitute="---">
-    <sort>
-    <key macro="author"/>
-    <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-    <text macro="author" suffix="."/>
-    <text macro="title" prefix=" " suffix="."/>
-    <choose>
-    <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-    <text macro="editor-translator" prefix=" " suffix="."/>
-    <text macro="edition" prefix=" " suffix="."/>
-    <text macro="volume" prefix=" " suffix="."/>
-    <text macro="number-of-volumes-only" prefix=" " suffix="."/>
-    <text macro="publisher-year" prefix=" " suffix="."/>
-    </if>
-    <else-if type="chapter paper-conference" match="any">
-    <group>
-    <text variable="container-title" text-case="title" font-style="italic" prefix=" " suffix="."/>
-    <text macro="editor-translator" prefix=" " suffix="."/>
-    <text macro="edition" prefix=" " suffix="."/>
-    <text macro="volume" prefix=" " suffix="."/>
-    <text macro="number-of-volumes-only" prefix=" " suffix="."/>
-    <text macro="publisher-year" prefix=" " suffix="."/>
-    </group>
-    <text variable="page" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="thesis">
-    <text variable="genre" prefix=" " suffix="."/>
-    <group delimiter=", ">
-    <text macro="publisher" prefix=" "/>
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="year"/>
-    </date>
-    </group>
-    <text variable="archive_location" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="manuscript">
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="year"/>
-    </date>
-    <text variable="genre" prefix=" " suffix="."/>
-    <text variable="archive_location" prefix=" " suffix="."/>
-    <text variable="publisher-place" prefix=" "/>
-    </else-if>
-    <else-if type="personal_communication">
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" "/>
-    <date-part name="year"/>
-    </date>
-    <choose>
-    <if variable="genre">
-    <text prefix=" " suffix="." variable="genre"/>
-    </if>
-    <else>
-    <text prefix=" " suffix="." value="E-mail"/>
-    </else>
-    </choose>
-    </else-if>
-    <else-if type="map">
-    <text variable="genre" prefix=" " suffix="."/>
-    <text variable="publisher-place" prefix=" " suffix=":"/>
-    <text macro="publisher" prefix=" "/>
-    <date variable="issued" prefix=" " suffix=",">
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else-if type="speech">
-    <text variable="event" prefix=" " suffix="."/>
-    <text variable="publisher-place" prefix=" " suffix="."/>
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="year"/>
-    </date>
-    <text variable="genre" prefix=" " suffix="."/>
-    </else-if>
-    <else-if type="webpage post-weblog" match="any">
-    <text variable="genre" prefix=" " suffix="."/>
-    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-    <group delimiter=", " prefix=" ">
-    <text macro="publisher"/>
-    <text macro="issued-full-date" suffix="."/>
-    </group>
-    </else-if>
-    <else-if type="broadcast">
-    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-    <text macro="publisher" prefix=" " suffix=","/>
-    <date variable="issued" prefix=" " suffix=".">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" form="short" suffix=" " strip-periods="false"/>
-    <date-part name="year"/>
-    </date>
-    </else-if>
-    <else>
-  <group prefix=" " suffix="." delimiter=": ">
-              <group delimiter=" ">
-                <text macro="editor-translator" suffix="."/>
-                                              <text variable="container-title" font-style="italic"/>
-                                              <choose>
-                                              <if type="article-journal">
-                                              <group delimiter=" ">
-                                              <group delimiter=".">
-                                              <text variable="volume"/>
-                                              <text variable="issue"/>
-                                              </group>
-                                              <date variable="issued" prefix="(" suffix="):">
-                                              <date-part name="year"/>
-                                              </date>
-                                              </group>
-                                              <text macro="pages" prefix=" "/>
-                                              </if>
-                                              <else>
-                                              <group>
-                                              <date variable="issued">
-                                              <date-part name="day" suffix=" "/>
-                                              <date-part name="month" form="short" suffix=" " strip-periods="false"/>
-                                              <date-part name="year"/>
-                                              </date>
-                                              <choose>
-                                              <if variable="URL DOI" match="any">
-                                              <text variable="page" prefix=": "/>
-                        </if>
-                        <else>
-                          <text macro="pages" prefix=": "/>
-                        </else>
-                      </choose>
-                    </group>
-                  </else>
-                </choose>
-              </group>
-            </group>
-          </else>
-        </choose>
-        <text macro="medium" suffix="."/>
-    <text macro="number-of-volumes-optional" suffix="." prefix=" "/>
-    <text macro="collection-title"/>
-    <text macro="collection-number"/>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1506654426
-custom: true
-url_id: 'http://www.zotero.org/styles/modern-language-association-7th-edition'
diff --git a/config/export/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml b/config/export/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml
deleted file mode 100644
index 2bc59b60e..000000000
--- a/config/export/bibcite.bibcite_csl_style.modern_language_association_8th_edition.yml
+++ /dev/null
@@ -1,323 +0,0 @@
-uuid: 3785853e-99d0-44b8-871c-f4c35b5326db
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: QDkjTNcuHQSSZxWLYq0gDDnmCVbuXmpVvMobNde32ME
-id: modern_language_association_8th_edition
-parent: null
-label: 'Modern Language Association 8th edition'
-csl: |
-  <?xml version="1.0" encoding="utf-8"?>
-    <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="minimal-two">
-    <info>
-    <title>Modern Language Association 8th edition</title>
-    <title-short>MLA</title-short>
-    <id>http://www.zotero.org/styles/modern-language-association</id>
-    <link href="http://www.zotero.org/styles/modern-language-association" rel="self"/>
-    <link href="http://style.mla.org" rel="documentation"/>
-    <author>
-    <name>Sebastian Karcher</name>
-    </author>
-    <category citation-format="author"/>
-    <category field="generic-base"/>
-    <summary>This style adheres to the MLA 8th edition handbook. Follows the structure of references as outlined in the MLA Manual closely</summary>
-    <updated>2019-10-11T02:36:27+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    </info>
-    <locale xml:lang="en">
-    <date form="text">
-    <date-part name="day" suffix=" "/>
-    <date-part name="month" suffix=" " form="short"/>
-    <date-part name="year"/>
-    </date>
-    <terms>
-    <term name="month-01" form="short">Jan.</term>
-    <term name="month-02" form="short">Feb.</term>
-    <term name="month-03" form="short">Mar.</term>
-    <term name="month-04" form="short">Apr.</term>
-    <term name="month-05" form="short">May</term>
-    <term name="month-06" form="short">June</term>
-    <term name="month-07" form="short">July</term>
-    <term name="month-08" form="short">Aug.</term>
-    <term name="month-09" form="short">Sept.</term>
-    <term name="month-10" form="short">Oct.</term>
-    <term name="month-11" form="short">Nov.</term>
-    <term name="month-12" form="short">Dec.</term>
-    <term name="translator" form="short">trans.</term>
-    </terms>
-    </locale>
-    <macro name="author">
-    <names variable="author">
-    <name name-as-sort-order="first" and="text" delimiter-precedes-last="always" delimiter-precedes-et-al="always" initialize="false" initialize-with=". "/>
-    <label form="long" prefix=", "/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title"/>
-    </substitute>
-    </names>
-    </macro>
-    <macro name="author-short">
-    <group delimiter=", ">
-    <names variable="author">
-    <name form="short" initialize-with=". " and="text"/>
-    <substitute>
-    <names variable="editor"/>
-    <names variable="translator"/>
-    <text macro="title-short"/>
-    </substitute>
-    </names>
-    <choose>
-    <if disambiguate="true">
-    <text macro="title-short"/>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="title">
-    <choose>
-    <if variable="container-title" match="any">
-    <text variable="title" quotes="true" text-case="title"/>
-    </if>
-    <else>
-    <text variable="title" font-style="italic" text-case="title"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="title-short">
-    <choose>
-    <if variable="container-title" match="any">
-    <text variable="title" form="short" quotes="true" text-case="title"/>
-    </if>
-    <else>
-    <text variable="title" form="short" font-style="italic" text-case="title"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="container-title">
-    <text variable="container-title" font-style="italic" text-case="title"/>
-    </macro>
-    <macro name="other-contributors">
-    <group delimiter=", ">
-    <choose>
-    <if variable="container-title" match="any">
-    <names variable="container-author editor illustrator interviewer translator" delimiter=", ">
-    <label form="verb" suffix=" "/>
-    <name and="text"/>
-    </names>
-    </if>
-    <else>
-    <names variable="container-author editor illustrator interviewer translator" delimiter=", ">
-    <label form="verb" suffix=" " text-case="capitalize-first"/>
-    <name and="text"/>
-    </names>
-    </else>
-    </choose>
-    <names variable="director">
-    <label form="verb" suffix=" " text-case="capitalize-first"/>
-    <name and="text"/>
-    </names>
-    </group>
-    </macro>
-    <macro name="version">
-    <group delimiter=", ">
-    <choose>
-    <if is-numeric="edition">
-    <group delimiter=" ">
-    <number variable="edition" form="ordinal"/>
-    <text term="edition" form="short"/>
-    </group>
-    </if>
-    <else>
-    <text variable="edition" text-case="capitalize-first"/>
-    </else>
-    </choose>
-    <text variable="version"/>
-    </group>
-    </macro>
-    <macro name="volume-lowercase">
-    <group delimiter=" ">
-    <text term="volume" form="short"/>
-    <text variable="volume"/>
-    </group>
-    </macro>
-    <macro name="number">
-    <group delimiter=", ">
-    <group>
-    <choose>
-    <!--lowercase if we have a preceding element-->
-    <if variable="edition container-title" match="any">
-    <text macro="volume-lowercase"/>
-    </if>
-    <!--other contributors preceding the volume-->
-    <else-if variable="author" match="all">
-    <choose>
-    <if variable="editor translator container-author illustrator interviewer director" match="any">
-    <text macro="volume-lowercase"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if variable="editor" match="all">
-    <choose>
-    <if variable="translator container-author illustrator interviewer director" match="any">
-    <text macro="volume-lowercase"/>
-    </if>
-    </choose>
-    </else-if>
-    <else-if variable="container-author illustrator interviewer director" match="any">
-    <text macro="volume-lowercase"/>
-    </else-if>
-    <else>
-    <group delimiter=" ">
-    <text term="volume" form="short" text-case="capitalize-first"/>
-    <text variable="volume"/>
-    </group>
-    </else>
-    </choose>
-    </group>
-    <group delimiter=" ">
-    <text term="issue" form="short"/>
-    <text variable="issue"/>
-    </group>
-    <choose>
-    <if type="report">
-    <text variable="genre"/>
-    </if>
-    </choose>
-    <text variable="number"/>
-    </group>
-    </macro>
-    <macro name="publisher">
-    <text variable="publisher"/>
-    </macro>
-    <macro name="publication-date">
-    <choose>
-    <if type="book chapter paper-conference motion_picture" match="any">
-    <date variable="issued" form="numeric" date-parts="year"/>
-    </if>
-    <else-if type="article-journal article-magazine" match="any">
-    <date variable="issued" form="text" date-parts="year-month"/>
-    </else-if>
-    <else-if type="speech" match="none">
-    <date variable="issued" form="text"/>
-    </else-if>
-    </choose>
-    </macro>
-    <macro name="location">
-    <group delimiter=", ">
-    <group delimiter=" ">
-    <label variable="page" form="short"/>
-    <text variable="page"/>
-    </group>
-    <choose>
-    <if variable="source" match="none">
-    <text macro="URI"/>
-    </if>
-    </choose>
-    </group>
-    </macro>
-    <macro name="container2-title">
-    <group delimiter=", ">
-    <choose>
-    <if type="speech">
-    <text variable="event"/>
-    <date variable="event-date" form="text"/>
-    <text variable="event-place"/>
-    </if>
-    </choose>
-    <text variable="archive"/>
-    <text variable="archive-place"/>
-    <text variable="archive_location"/>
-    </group>
-    </macro>
-    <macro name="container2-location">
-    <choose>
-    <if variable="source">
-    <choose>
-    <if variable="DOI URL" match="any">
-    <group delimiter=", ">
-    <text variable="source" font-style="italic"/>
-    <text macro="URI"/>
-    </group>
-    </if>
-    </choose>
-    </if>
-    </choose>
-    </macro>
-    <macro name="URI">
-    <choose>
-    <if variable="DOI">
-    <text variable="DOI" prefix="doi:"/>
-    </if>
-    <else>
-    <text variable="URL"/>
-    </else>
-    </choose>
-    </macro>
-    <macro name="accessed">
-    <!--using accessed where we don't have an issued date; follows recommendation on p. 53 -->
-    <choose>
-    <if variable="issued" match="none">
-    <group delimiter=" ">
-    <text term="accessed" text-case="capitalize-first"/>
-    <date variable="accessed" form="text"/>
-    </group>
-    </if>
-    </choose>
-    </macro>
-    <citation et-al-min="3" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true">
-    <layout prefix="(" suffix=")" delimiter="; ">
-    <choose>
-    <if locator="page line" match="any">
-    <group delimiter=" ">
-    <text macro="author-short"/>
-    <text variable="locator"/>
-    </group>
-    </if>
-    <else>
-    <group delimiter=", ">
-    <text macro="author-short"/>
-    <group>
-    <label variable="locator" form="short"/>
-    <text variable="locator"/>
-    </group>
-    </group>
-    </else>
-    </choose>
-    </layout>
-    </citation>
-    <bibliography hanging-indent="true" et-al-min="3" et-al-use-first="1" line-spacing="2" entry-spacing="0" subsequent-author-substitute="---">
-    <sort>
-    <key macro="author"/>
-    <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-    <group delimiter=". ">
-    <text macro="author"/>
-    <text macro="title"/>
-    <date variable="original-date" form="numeric" date-parts="year"/>
-    <group delimiter=", ">
-    <!---This group corresponds to MLA's "Container 1"-->
-    <text macro="container-title"/>
-    <text macro="other-contributors"/>
-    <text macro="version"/>
-    <text macro="number"/>
-    <text macro="publisher"/>
-    <text macro="publication-date"/>
-    <text macro="location"/>
-    </group>
-    <group delimiter=", ">
-    <!---This group corresponds to MLA's "Container 2"-->
-    <!--currently just using this one for archival info-->
-    <text macro="container2-title"/>
-    <text macro="container2-location"/>
-    </group>
-    <text macro="accessed"/>
-    </group>
-    </layout>
-    </bibliography>
-    </style>
-updated: 1570761387
-custom: true
-url_id: 'http://www.zotero.org/styles/modern-language-association'
diff --git a/config/export/bibcite.settings.yml b/config/export/bibcite.settings.yml
deleted file mode 100644
index ededcfd9e..000000000
--- a/config/export/bibcite.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: xrKaN_2e7lR23yRaoflUaJktwsTkUG0r5Ux2mKNAiVs
-processor: citeproc-php
-default_style: apa
diff --git a/config/export/block.block.bootstrap_barrio_account_menu.yml b/config/export/block.block.bootstrap_barrio_account_menu.yml
deleted file mode 100644
index e8865d303..000000000
--- a/config/export/block.block.bootstrap_barrio_account_menu.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: bd9403a7-f2f4-4776-ba5b-9b7299eae991
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.account
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: UnALXKN9BfRPollIjAI9kSu6YpvuB6zhseorFtN2xW8
-id: bootstrap_barrio_account_menu
-theme: bootstrap_barrio
-region: secondary_menu
-weight: -7
-provider: null
-plugin: 'system_menu_block:account'
-settings:
-  id: 'system_menu_block:account'
-  label: 'User account menu'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 1
-  expand_all_items: false
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_breadcrumbs.yml b/config/export/block.block.bootstrap_barrio_breadcrumbs.yml
deleted file mode 100644
index 51ae6573d..000000000
--- a/config/export/block.block.bootstrap_barrio_breadcrumbs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: ad9db811-951a-4120-af01-85777ca73e9c
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: xk8HAWIUZCzYFsUX2sNmTNDUxSoCdwrEI1tpTT5LW9s
-id: bootstrap_barrio_breadcrumbs
-theme: bootstrap_barrio
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_content.yml b/config/export/block.block.bootstrap_barrio_content.yml
deleted file mode 100644
index e57d63d29..000000000
--- a/config/export/block.block.bootstrap_barrio_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: f6c084c2-7a8c-43e4-b42d-84d7fb5368fa
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: GuQlH3j65O5SXgAliLjf1Ben7XBU6qxvW7xXUo6q0rk
-id: bootstrap_barrio_content
-theme: bootstrap_barrio
-region: content
-weight: -3
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_creatorsandcontributors.yml b/config/export/block.block.bootstrap_barrio_creatorsandcontributors.yml
deleted file mode 100644
index bc2fd94db..000000000
--- a/config/export/block.block.bootstrap_barrio_creatorsandcontributors.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-uuid: 6170187e-96b2-46fc-8a2a-6500c8da8fb4
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.creators_and_contributors
-  module:
-    - facets
-    - islandora
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: jziE1LayhQhICzoN5LBg3jdBwNieZWUHHr4xGAlwj_o
-id: bootstrap_barrio_creatorsandcontributors
-theme: bootstrap_barrio
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:creators_and_contributors'
-settings:
-  id: 'facet_block:creators_and_contributors'
-  label: 'Creators and Contributors'
-  label_display: visible
-  provider: facets
-  block_id: creatorsandcontributors
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.bootstrap_barrio_exposedformsolr_search_contentpage_1.yml b/config/export/block.block.bootstrap_barrio_exposedformsolr_search_contentpage_1.yml
deleted file mode 100644
index 461cdd38c..000000000
--- a/config/export/block.block.bootstrap_barrio_exposedformsolr_search_contentpage_1.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 46fc414a-387d-4495-9e2d-e61bb5f7fed6
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.solr_search_content
-  module:
-    - views
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: UGbvzHUCMdMe84lOKlLRajT3aIi2OFnAGpZw1eceoQY
-id: bootstrap_barrio_exposedformsolr_search_contentpage_1
-theme: bootstrap_barrio
-region: header
-weight: 1
-provider: null
-plugin: 'views_exposed_filter_block:solr_search_content-page_1'
-settings:
-  id: 'views_exposed_filter_block:solr_search_content-page_1'
-  label: ''
-  label_display: visible
-  provider: views
-  views_label: ''
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_help.yml b/config/export/block.block.bootstrap_barrio_help.yml
deleted file mode 100644
index 3c5db9740..000000000
--- a/config/export/block.block.bootstrap_barrio_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 6dc9b5dd-1f37-4052-b6d9-0d478a54061b
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: b6CHwczHyuqKRuf-Oi4zY6q-9HCsLyWRGkk8-reVCfk
-id: bootstrap_barrio_help
-theme: bootstrap_barrio
-region: highlighted
-weight: -2
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_main_menu.yml b/config/export/block.block.bootstrap_barrio_main_menu.yml
deleted file mode 100644
index fe4583f51..000000000
--- a/config/export/block.block.bootstrap_barrio_main_menu.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: bc61f1af-f5d6-4ca5-857e-edafdd407d58
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: Vrn8CVbuNQkElxVQ1UJS57jzA7WHlZ_6EJMfWkspfr0
-id: bootstrap_barrio_main_menu
-theme: bootstrap_barrio
-region: primary_menu
-weight: -6
-provider: null
-plugin: 'system_menu_block:main'
-settings:
-  id: 'system_menu_block:main'
-  label: 'Main navigation'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 2
-  expand_all_items: true
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_messages.yml b/config/export/block.block.bootstrap_barrio_messages.yml
deleted file mode 100644
index 07efd19cf..000000000
--- a/config/export/block.block.bootstrap_barrio_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 33be5c6a-32af-4226-a5c6-20c8029306e0
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: VZDxR0xdW-n-VWQRlRQjsiN-dgDS3-1Es-s1vXLfgsI
-id: bootstrap_barrio_messages
-theme: bootstrap_barrio
-region: highlighted
-weight: -6
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_page_title.yml b/config/export/block.block.bootstrap_barrio_page_title.yml
deleted file mode 100644
index 4ddac2ee7..000000000
--- a/config/export/block.block.bootstrap_barrio_page_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 877d9cb7-5f15-42ab-9d95-89cbfa0882f0
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: ouz-Jr5EfrE6iN708-53o8J41W-9mqW2ELMpI9jYMAA
-id: bootstrap_barrio_page_title
-theme: bootstrap_barrio
-region: content
-weight: -7
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_physicalform.yml b/config/export/block.block.bootstrap_barrio_physicalform.yml
deleted file mode 100644
index 125ab1545..000000000
--- a/config/export/block.block.bootstrap_barrio_physicalform.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 36e7fe20-9edc-4b47-bd15-47e3a61dde91
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.physical_form
-  module:
-    - facets
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: Gb14JbPGc1IX6-hfhZr_EVEg-AUiYnV50EJcfUIIgHc
-id: bootstrap_barrio_physicalform
-theme: bootstrap_barrio
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:physical_form'
-settings:
-  id: 'facet_block:physical_form'
-  label: 'Physical Form'
-  label_display: visible
-  provider: facets
-  block_id: physicalform
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.bootstrap_barrio_powered.yml b/config/export/block.block.bootstrap_barrio_powered.yml
deleted file mode 100644
index 85815f1d5..000000000
--- a/config/export/block.block.bootstrap_barrio_powered.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: ce12efd7-376e-4fb7-a274-432a6679b8da
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: uHGQeXpjudF5HkwGniQ_zzUngqcc3iAzzE7fdjWJiyA
-id: bootstrap_barrio_powered
-theme: bootstrap_barrio
-region: footer_fifth
-weight: -7
-provider: null
-plugin: system_powered_by_block
-settings:
-  id: system_powered_by_block
-  label: 'Powered by Drupal'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_primary_admin_actions.yml b/config/export/block.block.bootstrap_barrio_primary_admin_actions.yml
deleted file mode 100644
index 7e7cabc71..000000000
--- a/config/export/block.block.bootstrap_barrio_primary_admin_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: a6394bfb-5db1-42b9-a17d-294d73393765
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: MY-b6RFbUcofefyaeI8uMqaPh2bJOasn2y1bvGVF4dw
-id: bootstrap_barrio_primary_admin_actions
-theme: bootstrap_barrio
-region: content
-weight: -6
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_primary_local_tasks.yml b/config/export/block.block.bootstrap_barrio_primary_local_tasks.yml
deleted file mode 100644
index 3f9d3a9d1..000000000
--- a/config/export/block.block.bootstrap_barrio_primary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 3384b16c-b6c2-49a8-8619-09f8bae0f905
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: IsKUlBAi-gl90iZ3w0OI3XZvSYDrtxg4nF1aDhfLWIA
-id: bootstrap_barrio_primary_local_tasks
-theme: bootstrap_barrio
-region: content
-weight: -5
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Primary tabs'
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: false
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_secondary_local_tasks.yml b/config/export/block.block.bootstrap_barrio_secondary_local_tasks.yml
deleted file mode 100644
index 772f5b889..000000000
--- a/config/export/block.block.bootstrap_barrio_secondary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 8b983efa-64e8-48de-9a59-ae8e1d9c2a59
-langcode: en
-status: true
-dependencies:
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: lpVq_Qyojss-EfQ_LgUPkPSbXcUD9ojyNZgmUZP4d7I
-id: bootstrap_barrio_secondary_local_tasks
-theme: bootstrap_barrio
-region: content
-weight: -4
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Secondary tabs'
-  label_display: '0'
-  provider: core
-  primary: false
-  secondary: true
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_site_branding.yml b/config/export/block.block.bootstrap_barrio_site_branding.yml
deleted file mode 100644
index 211d22a0c..000000000
--- a/config/export/block.block.bootstrap_barrio_site_branding.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 1a0de20e-cfcb-4b97-8635-e604157cb19d
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: lE5hyDUbMWVcRxvlVMAwguAJFBiZH2Xf-59wmBIq9co
-id: bootstrap_barrio_site_branding
-theme: bootstrap_barrio
-region: header
-weight: -7
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: false
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_subject.yml b/config/export/block.block.bootstrap_barrio_subject.yml
deleted file mode 100644
index d9baf2785..000000000
--- a/config/export/block.block.bootstrap_barrio_subject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 2ea32c20-df33-4c39-a075-39377c7b12fe
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.subject
-  module:
-    - facets
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: 8CNTurKBSOQZRTrWiaCmfAwseQyzXZOb8gJohUvIBFw
-id: bootstrap_barrio_subject
-theme: bootstrap_barrio
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:subject'
-settings:
-  id: 'facet_block:subject'
-  label: Subject
-  label_display: visible
-  provider: facets
-  block_id: subject
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.bootstrap_barrio_subjectname.yml b/config/export/block.block.bootstrap_barrio_subjectname.yml
deleted file mode 100644
index d87934a8d..000000000
--- a/config/export/block.block.bootstrap_barrio_subjectname.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: ac3449c2-0ddc-49ab-b82c-223d829a832c
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.subject_name
-  module:
-    - facets
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: VFNCtt7POqemCYyZ3x3gWDwdyJfoAmbqHim37oy6onU
-id: bootstrap_barrio_subjectname
-theme: bootstrap_barrio
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:subject_name'
-settings:
-  id: 'facet_block:subject_name'
-  label: 'Subject (name)'
-  label_display: visible
-  provider: facets
-  block_id: subjectname
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.bootstrap_barrio_syndicate.yml b/config/export/block.block.bootstrap_barrio_syndicate.yml
deleted file mode 100644
index 191c04acd..000000000
--- a/config/export/block.block.bootstrap_barrio_syndicate.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 2f244621-4148-4f5a-94e7-8638813f29be
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: 0gq3VPg-_UM69FCCWurLFIrrnIjC2HLKhwo9iQNtcUo
-id: bootstrap_barrio_syndicate
-theme: bootstrap_barrio
-region: top_header
-weight: 0
-provider: null
-plugin: node_syndicate_block
-settings:
-  id: node_syndicate_block
-  label: 'RSS feed'
-  label_display: '0'
-  provider: node
-  block_count: 10
-visibility: {  }
diff --git a/config/export/block.block.bootstrap_barrio_temporalsubject.yml b/config/export/block.block.bootstrap_barrio_temporalsubject.yml
deleted file mode 100644
index 5493f7eb8..000000000
--- a/config/export/block.block.bootstrap_barrio_temporalsubject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: bbcbc71f-5b35-42f2-9bc7-35cd04554874
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.temporal_subject
-  module:
-    - facets
-    - system
-  theme:
-    - bootstrap_barrio
-_core:
-  default_config_hash: 1BMA18tJL_4xlrR2wg5QSmr499p157HBiWAgv_rJmQ4
-id: bootstrap_barrio_temporalsubject
-theme: bootstrap_barrio
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:temporal_subject'
-settings:
-  id: 'facet_block:temporal_subject'
-  label: 'Temporal Subject'
-  label_display: visible
-  provider: facets
-  block_id: temporalsubject
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.claro_breadcrumbs.yml b/config/export/block.block.claro_breadcrumbs.yml
deleted file mode 100644
index 10c12b44f..000000000
--- a/config/export/block.block.claro_breadcrumbs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 04e5298f-1671-4c75-8371-8020feafc968
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - claro
-_core:
-  default_config_hash: NjcxOBrPOiK5-38t56DwFBDVY4yer7YSlbRWXFuHe7A
-id: claro_breadcrumbs
-theme: claro
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.claro_content.yml b/config/export/block.block.claro_content.yml
deleted file mode 100644
index c3f66a80e..000000000
--- a/config/export/block.block.claro_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 171aa20c-cba5-40b4-9692-106450a04a17
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - claro
-_core:
-  default_config_hash: a0Yyx1GeyKarZ4T_yXQBR_ZFKnXiFLtxAb6gWLd8nr0
-id: claro_content
-theme: claro
-region: content
-weight: 0
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.claro_help.yml b/config/export/block.block.claro_help.yml
deleted file mode 100644
index 5b0e9deba..000000000
--- a/config/export/block.block.claro_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: e524857e-9ffb-43ca-a3a6-345843fe33dd
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - claro
-_core:
-  default_config_hash: jccFSSVqV0WCDb6NtML1VWAWTtDbZ-zn5YgTRMgMrIM
-id: claro_help
-theme: claro
-region: help
-weight: 0
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/config/export/block.block.claro_local_actions.yml b/config/export/block.block.claro_local_actions.yml
deleted file mode 100644
index d27269f62..000000000
--- a/config/export/block.block.claro_local_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 39c2ba17-b7e5-4073-b059-23b796cbd82c
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: CdXfDmRgAvms7EQovxxWPdYi0GitxeRbVtScYK16ZH0
-id: claro_local_actions
-theme: claro
-region: content
-weight: -10
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/export/block.block.claro_messages.yml b/config/export/block.block.claro_messages.yml
deleted file mode 100644
index 37155aaf4..000000000
--- a/config/export/block.block.claro_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 1cdb3f25-5e60-4438-ac52-67d5fa368d81
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - claro
-_core:
-  default_config_hash: '-Ac3ISpIT0PQ-whzD7_dw0SdKi6dAbRFNWdSjOiVDqg'
-id: claro_messages
-theme: claro
-region: highlighted
-weight: 0
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.claro_page_title.yml b/config/export/block.block.claro_page_title.yml
deleted file mode 100644
index f4d7a15c7..000000000
--- a/config/export/block.block.claro_page_title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: defaec36-d4df-4dff-8612-dabf86b93a7a
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: fNwDdW063tk_ktzSWzZVeQS9wzvLooVO280BQ9WrsIs
-id: claro_page_title
-theme: claro
-region: header
-weight: -30
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/export/block.block.claro_primary_local_tasks.yml b/config/export/block.block.claro_primary_local_tasks.yml
deleted file mode 100644
index d1ab2daa6..000000000
--- a/config/export/block.block.claro_primary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 97185aca-ce5e-4054-80dc-811dfe907cb2
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: ACjBZI5shAMiiUpsz-inLYVXDqNNXRnSzAWV3kV_8Hw
-id: claro_primary_local_tasks
-theme: claro
-region: header
-weight: 0
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Primary tabs'
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: false
-visibility: {  }
diff --git a/config/export/block.block.claro_secondary_local_tasks.yml b/config/export/block.block.claro_secondary_local_tasks.yml
deleted file mode 100644
index 9531ec460..000000000
--- a/config/export/block.block.claro_secondary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 5c251d07-cdc3-4d5b-ac8a-8cccb9deb713
-langcode: en
-status: true
-dependencies:
-  theme:
-    - claro
-_core:
-  default_config_hash: 2L0geP-ixCbCkEpW6BVF6H7vDUZN4ea07_Y9CociQm4
-id: claro_secondary_local_tasks
-theme: claro
-region: pre_content
-weight: 0
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Secondary tabs'
-  label_display: '0'
-  provider: core
-  primary: false
-  secondary: true
-visibility: {  }
diff --git a/config/export/block.block.footer.yml b/config/export/block.block.footer.yml
deleted file mode 100644
index ecc9c3387..000000000
--- a/config/export/block.block.footer.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 6fd5eeca-b4e7-4ef6-aa5b-79290c3d83af
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.footer
-  module:
-    - context
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-id: footer
-theme: idc_ui_theme_boots
-region: footer_third
-weight: 0
-provider: null
-plugin: 'system_menu_block:footer'
-settings:
-  id: 'system_menu_block:footer'
-  label: Footer
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 0
-  expand_all_items: false
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_account_menu.yml b/config/export/block.block.idc_ui_theme_boots_account_menu.yml
deleted file mode 100644
index b37f4d5f1..000000000
--- a/config/export/block.block.idc_ui_theme_boots_account_menu.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 6fc7c68b-4887-4ab0-b571-ef9b2e182b6a
-langcode: en
-status: false
-dependencies:
-  config:
-    - system.menu.account
-  module:
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: gmxYWWHmgbe0Pnv8y48ZLSLH5mEHejOjAP6RLxUfdzU
-id: idc_ui_theme_boots_account_menu
-theme: idc_ui_theme_boots
-region: secondary_menu
-weight: -10
-provider: null
-plugin: 'system_menu_block:account'
-settings:
-  id: 'system_menu_block:account'
-  label: 'User account menu'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 1
-  expand_all_items: false
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_branding.yml b/config/export/block.block.idc_ui_theme_boots_branding.yml
deleted file mode 100644
index f856af89e..000000000
--- a/config/export/block.block.idc_ui_theme_boots_branding.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: dec916ec-70d2-46c8-b5f9-e4a6cecdaf13
-langcode: en
-status: false
-dependencies:
-  module:
-    - context
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: Uh1uXyIia-DXvwCH8GlmWet0iyjZN40kRqvBO8sO0ck
-id: idc_ui_theme_boots_branding
-theme: idc_ui_theme_boots
-region: header
-weight: -10
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: true
-visibility:
-  view_inclusion:
-    id: view_inclusion
-    negate: null
-    context_mapping: {  }
-    view_inclusion: {  }
-  request_path_exclusion:
-    id: request_path_exclusion
-    negate: null
-    context_mapping: {  }
-    pages: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_breadcrumbs.yml b/config/export/block.block.idc_ui_theme_boots_breadcrumbs.yml
deleted file mode 100644
index 9052af152..000000000
--- a/config/export/block.block.idc_ui_theme_boots_breadcrumbs.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 58586bdc-2dcf-4253-a3b7-14b1c8eb28a7
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: VhBzWb7lMRtIOg9G7VSw_0uopi-7zXeHq4vXqqV1HFE
-id: idc_ui_theme_boots_breadcrumbs
-theme: idc_ui_theme_boots
-region: breadcrumb
-weight: 0
-provider: null
-plugin: system_breadcrumb_block
-settings:
-  id: system_breadcrumb_block
-  label: Breadcrumbs
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_content.yml b/config/export/block.block.idc_ui_theme_boots_content.yml
deleted file mode 100644
index bdbe0280a..000000000
--- a/config/export/block.block.idc_ui_theme_boots_content.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 72ff5a03-cec4-4a7e-814c-c0ce33db0228
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: erQSEZF2XUjNmgTl0uNRBzmg18ZGXwUcw2FhApoeuHk
-id: idc_ui_theme_boots_content
-theme: idc_ui_theme_boots
-region: content
-weight: -10
-provider: null
-plugin: system_main_block
-settings:
-  id: system_main_block
-  label: 'Main page content'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_creatorsandcontributors.yml b/config/export/block.block.idc_ui_theme_boots_creatorsandcontributors.yml
deleted file mode 100644
index a739cff15..000000000
--- a/config/export/block.block.idc_ui_theme_boots_creatorsandcontributors.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-uuid: 6652277d-5c6c-4f7c-b4e6-13702af4c422
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.creators_and_contributors
-  module:
-    - facets
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: jziE1LayhQhICzoN5LBg3jdBwNieZWUHHr4xGAlwj_o
-id: idc_ui_theme_boots_creatorsandcontributors
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -15
-provider: null
-plugin: 'facet_block:creators_and_contributors'
-settings:
-  id: 'facet_block:creators_and_contributors'
-  label: 'Creators and Contributors'
-  label_display: visible
-  provider: facets
-  block_id: creatorsandcontributors
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml b/config/export/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml
deleted file mode 100644
index 64a3bb67e..000000000
--- a/config/export/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 0fd27c5d-2482-41a4-9e88-5efcf43c9788
-langcode: en
-status: false
-dependencies:
-  config:
-    - views.view.solr_search_content
-  module:
-    - context
-    - islandora
-    - views
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: UGbvzHUCMdMe84lOKlLRajT3aIi2OFnAGpZw1eceoQY
-id: idc_ui_theme_boots_exposedformsolr_search_contentpage_1
-theme: idc_ui_theme_boots
-region: header
-weight: -10
-provider: null
-plugin: 'views_exposed_filter_block:solr_search_content-page_1'
-settings:
-  id: 'views_exposed_filter_block:solr_search_content-page_1'
-  label: ''
-  label_display: '0'
-  provider: views
-  views_label: ''
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_help.yml b/config/export/block.block.idc_ui_theme_boots_help.yml
deleted file mode 100644
index 8953f735a..000000000
--- a/config/export/block.block.idc_ui_theme_boots_help.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 708bd022-0d77-46fa-8afd-6b2f06c23369
-langcode: en
-status: true
-dependencies:
-  module:
-    - help
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: VfPFqqxfkomud5CO8DUijw85QIl9GIxh_nIxLOYESxg
-id: idc_ui_theme_boots_help
-theme: idc_ui_theme_boots
-region: top_header
-weight: -6
-provider: null
-plugin: help_block
-settings:
-  id: help_block
-  label: Help
-  label_display: '0'
-  provider: help
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_local_actions.yml b/config/export/block.block.idc_ui_theme_boots_local_actions.yml
deleted file mode 100644
index 2e000372a..000000000
--- a/config/export/block.block.idc_ui_theme_boots_local_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 6c481d9c-6e3c-4297-819d-04df06e6e4bb
-langcode: en
-status: true
-dependencies:
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: 3YhiHkVshhPZ5VIR7-ZjGNmUTjtq8QAhEwu5gpIrNyU
-id: idc_ui_theme_boots_local_actions
-theme: idc_ui_theme_boots
-region: content
-weight: -5
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_local_tasks.yml b/config/export/block.block.idc_ui_theme_boots_local_tasks.yml
deleted file mode 100644
index 8b793f6cd..000000000
--- a/config/export/block.block.idc_ui_theme_boots_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: b15d832d-10e7-4096-97a9-3de4e77b0ba3
-langcode: en
-status: false
-dependencies:
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: gUw6yvXTwg-Ldx15B87h7SjnUcF64ANf635LkieF8rg
-id: idc_ui_theme_boots_local_tasks
-theme: idc_ui_theme_boots
-region: content
-weight: -7
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: Tabs
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: true
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_main_menu.yml b/config/export/block.block.idc_ui_theme_boots_main_menu.yml
deleted file mode 100644
index d2b5359d5..000000000
--- a/config/export/block.block.idc_ui_theme_boots_main_menu.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-uuid: 27861613-0e57-4a7a-872c-3ce56dfb889f
-langcode: en
-status: true
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - context
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: KWAiziL39uEzmOJEql_wbUP2RtqGceL3WM2CfxhMelE
-id: idc_ui_theme_boots_main_menu
-theme: idc_ui_theme_boots
-region: secondary_menu
-weight: -11
-provider: null
-plugin: 'system_menu_block:main'
-settings:
-  id: 'system_menu_block:main'
-  label: 'Main navigation'
-  label_display: '0'
-  provider: system
-  level: 1
-  depth: 5
-  expand_all_items: true
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_memberof.yml b/config/export/block.block.idc_ui_theme_boots_memberof.yml
deleted file mode 100644
index 0a129e799..000000000
--- a/config/export/block.block.idc_ui_theme_boots_memberof.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: 1ba6cb69-c81c-4c9d-b955-b57256008603
-langcode: en
-status: false
-dependencies:
-  config:
-    - facets.facet.member_of
-  module:
-    - context
-    - facets
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-id: idc_ui_theme_boots_memberof
-theme: idc_ui_theme_boots
-region: top_header
-weight: -11
-provider: null
-plugin: 'facet_block:member_of'
-settings:
-  id: 'facet_block:member_of'
-  label: 'Member of'
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: memberof
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: /solr-search/content
diff --git a/config/export/block.block.idc_ui_theme_boots_messages.yml b/config/export/block.block.idc_ui_theme_boots_messages.yml
deleted file mode 100644
index f33e01c26..000000000
--- a/config/export/block.block.idc_ui_theme_boots_messages.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: e04bd2dd-af06-41fd-87cd-1c5af9f18acb
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: BZ5tpW7H8X4PVGRm3MImTIHd2tN0eF7zOtp4SpRYUA0
-id: idc_ui_theme_boots_messages
-theme: idc_ui_theme_boots
-region: highlighted
-weight: -5
-provider: null
-plugin: system_messages_block
-settings:
-  id: system_messages_block
-  label: 'Status messages'
-  label_display: '0'
-  provider: system
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_page_title.yml b/config/export/block.block.idc_ui_theme_boots_page_title.yml
deleted file mode 100644
index 8570458d7..000000000
--- a/config/export/block.block.idc_ui_theme_boots_page_title.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 2d5933d0-c5a8-427c-a8de-fcfb23dfd90d
-langcode: en
-status: false
-dependencies:
-  module:
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: 6aOgWsNTXjqrDm98TXSAjP6qd2nCijD1xw45MrnbK-Y
-id: idc_ui_theme_boots_page_title
-theme: idc_ui_theme_boots
-region: top_header
-weight: -8
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  context:
-    id: context
-    negate: null
-    values: ''
-  request_path_exclusion:
-    id: request_path_exclusion
-    negate: true
-    pages: '<front>'
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_physicalform.yml b/config/export/block.block.idc_ui_theme_boots_physicalform.yml
deleted file mode 100644
index dad2a4f90..000000000
--- a/config/export/block.block.idc_ui_theme_boots_physicalform.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: c25b7813-d677-47ee-a268-604a254dab8c
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.physical_form
-  module:
-    - facets
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: Gb14JbPGc1IX6-hfhZr_EVEg-AUiYnV50EJcfUIIgHc
-id: idc_ui_theme_boots_physicalform
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -14
-provider: null
-plugin: 'facet_block:physical_form'
-settings:
-  id: 'facet_block:physical_form'
-  label: 'Physical Form'
-  label_display: visible
-  provider: facets
-  block_id: physicalform
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.idc_ui_theme_boots_primary_admin_actions.yml b/config/export/block.block.idc_ui_theme_boots_primary_admin_actions.yml
deleted file mode 100644
index ac84eebf9..000000000
--- a/config/export/block.block.idc_ui_theme_boots_primary_admin_actions.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 3e9c93d3-5c87-45f5-bdff-e4024c7598f6
-langcode: en
-status: true
-dependencies:
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: Q9_2whdOj1YIomfvsIfopROW4FT_X5pY0DjdOiOaQ5U
-id: idc_ui_theme_boots_primary_admin_actions
-theme: idc_ui_theme_boots
-region: highlighted
-weight: -6
-provider: null
-plugin: local_actions_block
-settings:
-  id: local_actions_block
-  label: 'Primary admin actions'
-  label_display: '0'
-  provider: core
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_primary_local_tasks.yml b/config/export/block.block.idc_ui_theme_boots_primary_local_tasks.yml
deleted file mode 100644
index c005d0446..000000000
--- a/config/export/block.block.idc_ui_theme_boots_primary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 84e0d500-0948-4b71-af39-27d74ee9bf47
-langcode: en
-status: true
-dependencies:
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: nGE3EoPQQaQCuqTUtZgw0-KIzmrqdKDzdNQf2JyPUt4
-id: idc_ui_theme_boots_primary_local_tasks
-theme: idc_ui_theme_boots
-region: highlighted
-weight: -4
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Primary tabs'
-  label_display: '0'
-  provider: core
-  primary: true
-  secondary: false
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_resourcetype.yml b/config/export/block.block.idc_ui_theme_boots_resourcetype.yml
deleted file mode 100644
index 33ffb2f74..000000000
--- a/config/export/block.block.idc_ui_theme_boots_resourcetype.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: 3487476e-d986-49e8-9267-18c12eaa3db1
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.resource_type
-  module:
-    - context
-    - facets
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-id: idc_ui_theme_boots_resourcetype
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -16
-provider: null
-plugin: 'facet_block:resource_type'
-settings:
-  id: 'facet_block:resource_type'
-  label: 'Resource Type'
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: resourcetype
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: /solr-search/content
diff --git a/config/export/block.block.idc_ui_theme_boots_resourcetype_2.yml b/config/export/block.block.idc_ui_theme_boots_resourcetype_2.yml
deleted file mode 100755
index a34c8e968..000000000
--- a/config/export/block.block.idc_ui_theme_boots_resourcetype_2.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.resource_type_2
-  module:
-    - context
-    - facets
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-id: idc_ui_theme_boots_resourcetype_2
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -10
-provider: null
-plugin: 'facet_block:resource_type_2'
-settings:
-  id: 'facet_block:resource_type_2'
-  label: 'Resource Type'
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: resourcetype_2
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: '/node/*/search'
diff --git a/config/export/block.block.idc_ui_theme_boots_secondary_local_tasks.yml b/config/export/block.block.idc_ui_theme_boots_secondary_local_tasks.yml
deleted file mode 100644
index 246e75971..000000000
--- a/config/export/block.block.idc_ui_theme_boots_secondary_local_tasks.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 6f8adfb3-ec46-4398-96d8-0e3fc99364bd
-langcode: en
-status: true
-dependencies:
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: ydSxdq7R66I8UMC460rOzlfzvlUL4VRbdwc6z9DWaUI
-id: idc_ui_theme_boots_secondary_local_tasks
-theme: idc_ui_theme_boots
-region: highlighted
-weight: -3
-provider: null
-plugin: local_tasks_block
-settings:
-  id: local_tasks_block
-  label: 'Secondary tabs'
-  label_display: '0'
-  provider: core
-  primary: false
-  secondary: true
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_site_branding.yml b/config/export/block.block.idc_ui_theme_boots_site_branding.yml
deleted file mode 100644
index c58f35818..000000000
--- a/config/export/block.block.idc_ui_theme_boots_site_branding.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 73365296-5801-49ad-b74a-1a6e30ffb83b
-langcode: en
-status: true
-dependencies:
-  module:
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: n_nlgjggHVfQt2H__zvLOKB2YtjPDbQ5tHijF9LE1aM
-id: idc_ui_theme_boots_site_branding
-theme: idc_ui_theme_boots
-region: header
-weight: -11
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: false
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_sitebranding.yml b/config/export/block.block.idc_ui_theme_boots_sitebranding.yml
deleted file mode 100644
index 1b8cb748e..000000000
--- a/config/export/block.block.idc_ui_theme_boots_sitebranding.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: 28e6999f-81a0-4c6b-83a4-5ea808edfac1
-langcode: en
-status: true
-dependencies:
-  module:
-    - context
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: Qe6YFMsxZxHcUdSm0nXTftS8MjGN2cX-lfUJievSwXU
-id: idc_ui_theme_boots_sitebranding
-theme: idc_ui_theme_boots
-region: footer_first
-weight: -9
-provider: null
-plugin: system_branding_block
-settings:
-  id: system_branding_block
-  label: 'Site branding'
-  label_display: '0'
-  provider: system
-  use_site_logo: true
-  use_site_name: true
-  use_site_slogan: true
-visibility:
-  view_inclusion:
-    id: view_inclusion
-    negate: null
-    context_mapping: {  }
-    view_inclusion: {  }
-  request_path_exclusion:
-    id: request_path_exclusion
-    negate: null
-    context_mapping: {  }
-    pages: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml b/config/export/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml
deleted file mode 100755
index 35ea79dd6..000000000
--- a/config/export/block.block.idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - context
-    - islandora
-    - islandora_advanced_search
-  theme:
-    - idc_ui_theme_boots
-id: idc_ui_theme_boots_solrsearchcontentsearchresultspagerforpage
-theme: idc_ui_theme_boots
-region: content
-weight: -11
-provider: null
-plugin: 'islandora_advanced_search_result_pager:solr_search_content__page_1'
-settings:
-  id: 'islandora_advanced_search_result_pager:solr_search_content__page_1'
-  label: 'Solr search content: Search Results Pager for Page'
-  label_display: visible
-  provider: islandora_advanced_search
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-collection_children-page_1: view-collection_children-page_1
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.idc_ui_theme_boots_subject.yml b/config/export/block.block.idc_ui_theme_boots_subject.yml
deleted file mode 100644
index 9252a613b..000000000
--- a/config/export/block.block.idc_ui_theme_boots_subject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: eedc559b-5340-4852-9853-c8a24191ae17
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.subject
-  module:
-    - facets
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: 8CNTurKBSOQZRTrWiaCmfAwseQyzXZOb8gJohUvIBFw
-id: idc_ui_theme_boots_subject
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -9
-provider: null
-plugin: 'facet_block:subject'
-settings:
-  id: 'facet_block:subject'
-  label: Subject
-  label_display: visible
-  provider: facets
-  block_id: subject
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.idc_ui_theme_boots_subjectname.yml b/config/export/block.block.idc_ui_theme_boots_subjectname.yml
deleted file mode 100644
index 80a45cae2..000000000
--- a/config/export/block.block.idc_ui_theme_boots_subjectname.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: e4a64e7f-d79b-458e-98c6-ce9bf7bd2ad0
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.subject_name
-  module:
-    - facets
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: VFNCtt7POqemCYyZ3x3gWDwdyJfoAmbqHim37oy6onU
-id: idc_ui_theme_boots_subjectname
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -12
-provider: null
-plugin: 'facet_block:subject_name'
-settings:
-  id: 'facet_block:subject_name'
-  label: 'Subject (name)'
-  label_display: visible
-  provider: facets
-  block_id: subjectname
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.idc_ui_theme_boots_syndicate.yml b/config/export/block.block.idc_ui_theme_boots_syndicate.yml
deleted file mode 100644
index 78193e161..000000000
--- a/config/export/block.block.idc_ui_theme_boots_syndicate.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: df12edea-ae6b-4a16-951e-98267aa6f216
-langcode: en
-status: false
-dependencies:
-  module:
-    - node
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: 0gq3VPg-_UM69FCCWurLFIrrnIjC2HLKhwo9iQNtcUo
-id: idc_ui_theme_boots_syndicate
-theme: idc_ui_theme_boots
-region: top_header
-weight: -1
-provider: null
-plugin: node_syndicate_block
-settings:
-  id: node_syndicate_block
-  label: 'RSS feed'
-  label_display: '0'
-  provider: node
-  block_count: 10
-visibility: {  }
diff --git a/config/export/block.block.idc_ui_theme_boots_temporalsubject.yml b/config/export/block.block.idc_ui_theme_boots_temporalsubject.yml
deleted file mode 100644
index 62b2fe242..000000000
--- a/config/export/block.block.idc_ui_theme_boots_temporalsubject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: b8a8cc1e-fb40-4b06-8b76-4f851363aca8
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.temporal_subject
-  module:
-    - facets
-    - system
-  theme:
-    - idc_ui_theme_boots
-_core:
-  default_config_hash: 1BMA18tJL_4xlrR2wg5QSmr499p157HBiWAgv_rJmQ4
-id: idc_ui_theme_boots_temporalsubject
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -11
-provider: null
-plugin: 'facet_block:temporal_subject'
-settings:
-  id: 'facet_block:temporal_subject'
-  label: 'Temporal Subject'
-  label_display: visible
-  provider: facets
-  block_id: temporalsubject
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /solr-search/content
diff --git a/config/export/block.block.idc_ui_theme_boots_year.yml b/config/export/block.block.idc_ui_theme_boots_year.yml
deleted file mode 100644
index c938a2c04..000000000
--- a/config/export/block.block.idc_ui_theme_boots_year.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: a486d028-b15c-49ca-a154-058075e85dce
-langcode: en
-status: true
-dependencies:
-  config:
-    - facets.facet.year
-  module:
-    - context
-    - facets
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-id: idc_ui_theme_boots_year
-theme: idc_ui_theme_boots
-region: sidebar_first
-weight: -13
-provider: null
-plugin: 'facet_block:year'
-settings:
-  id: 'facet_block:year'
-  label: Year
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: year
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  request_path:
-    id: request_path
-    negate: false
-    pages: /solr-search/content
diff --git a/config/export/block.block.memberof.yml b/config/export/block.block.memberof.yml
deleted file mode 100644
index d4c0d0080..000000000
--- a/config/export/block.block.memberof.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: 75be2606-c8db-4b9d-b8f4-fb61551c741b
-langcode: en
-status: false
-dependencies:
-  config:
-    - facets.facet.member_of
-  module:
-    - context
-    - facets
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: memberof
-theme: idc_ui_theme_boots
-region: top_header
-weight: -12
-provider: null
-plugin: 'facet_block:member_of'
-settings:
-  id: 'facet_block:member_of'
-  label: 'Member of'
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: memberof
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
diff --git a/config/export/block.block.pagetitle.yml b/config/export/block.block.pagetitle.yml
deleted file mode 100644
index 9e1322057..000000000
--- a/config/export/block.block.pagetitle.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 77c1752b-a3e4-4c4f-820b-e9f32f7a5c57
-langcode: en
-status: false
-dependencies:
-  module:
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: pagetitle
-theme: idc_ui_theme_boots
-region: content
-weight: -8
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
diff --git a/config/export/block.block.search.yml b/config/export/block.block.search.yml
deleted file mode 100644
index 557024501..000000000
--- a/config/export/block.block.search.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-uuid: e31cee54-f0e1-4ac3-bf84-c89584745b31
-langcode: en
-status: true
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-    - system
-  theme:
-    - idc_ui_theme_boots
-id: search
-theme: idc_ui_theme_boots
-region: primary_menu
-weight: -11
-provider: null
-plugin: search_block
-settings:
-  id: search_block
-  label: Search
-  label_display: '0'
-  provider: advanced_search
-  block_id: search
-  search_view_machine_name: view.solr_search_content.page_1
-  search_textfield_label: Keyword
-  search_placeholder: ''
-  search_submit_label: Search
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  request_path:
-    id: request_path
-    negate: true
-    pages: /search
diff --git a/config/export/block.block.solrsearchcontentadvancedsearchforblock.yml b/config/export/block.block.solrsearchcontentadvancedsearchforblock.yml
deleted file mode 100644
index 9f84ee687..000000000
--- a/config/export/block.block.solrsearchcontentadvancedsearchforblock.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: e26b17b6-a1f5-4eb8-9ad3-28e7b8f352d2
-langcode: en
-status: true
-dependencies:
-  module:
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentadvancedsearchforblock
-theme: idc_ui_theme_boots
-region: top_header
-weight: -15
-provider: null
-plugin: 'advanced_search_block:solr_search_content__block_1'
-settings:
-  id: 'advanced_search_block:solr_search_content__block_1'
-  label: 'Search within Collection'
-  label_display: visible
-  provider: advanced_search
-  fields:
-    - title_aggregated_fulltext
-    - abstract_description_fulltext
-    - linked_agent_name_fulltext
-  context_filter: field_member_of
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.solrsearchcontentadvancedsearchforpage.yml b/config/export/block.block.solrsearchcontentadvancedsearchforpage.yml
deleted file mode 100644
index 727231b3e..000000000
--- a/config/export/block.block.solrsearchcontentadvancedsearchforpage.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-uuid: 0224ff66-123d-4d86-94e0-0915b7cc0542
-langcode: en
-status: false
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentadvancedsearchforpage
-theme: idc_ui_theme_boots
-region: top_header
-weight: -16
-provider: null
-plugin: 'advanced_search_block:solr_search_content__page_1'
-settings:
-  id: 'advanced_search_block:solr_search_content__page_1'
-  label: Search
-  label_display: visible
-  provider: advanced_search
-  fields:
-    - title_aggregated_fulltext
-    - abstract_description_fulltext
-    - linked_agent_name_fulltext
-  context_filter: null
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
diff --git a/config/export/block.block.solrsearchcontentsearchresultspagerforblock.yml b/config/export/block.block.solrsearchcontentsearchresultspagerforblock.yml
deleted file mode 100644
index 9f027ecd4..000000000
--- a/config/export/block.block.solrsearchcontentsearchresultspagerforblock.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-uuid: 93af8e5e-0844-454f-9bdb-50dee29e52d3
-langcode: en
-status: true
-dependencies:
-  module:
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentsearchresultspagerforblock
-theme: idc_ui_theme_boots
-region: content
-weight: -10
-provider: null
-plugin: 'advanced_search_result_pager:solr_search_content__block_1'
-settings:
-  id: 'advanced_search_result_pager:solr_search_content__block_1'
-  label: 'Solr search content: Search Results Pager for Block'
-  label_display: '0'
-  provider: advanced_search
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.solrsearchcontentsearchresultspagerforpage.yml b/config/export/block.block.solrsearchcontentsearchresultspagerforpage.yml
deleted file mode 100644
index 521000876..000000000
--- a/config/export/block.block.solrsearchcontentsearchresultspagerforpage.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: e99d15e7-3690-48bc-8225-bc498c9a3604
-langcode: en
-status: true
-dependencies:
-  module:
-    - advanced_search
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: solrsearchcontentsearchresultspagerforpage
-theme: idc_ui_theme_boots
-region: content
-weight: -12
-provider: null
-plugin: 'advanced_search_result_pager:solr_search_content__page_1'
-settings:
-  id: 'advanced_search_result_pager:solr_search_content__page_1'
-  label: 'Solr search content: Search Results Pager for Page'
-  label_display: '0'
-  provider: advanced_search
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.views_block__solr_search_content_block_1.yml b/config/export/block.block.views_block__solr_search_content_block_1.yml
deleted file mode 100644
index 6e7152bb1..000000000
--- a/config/export/block.block.views_block__solr_search_content_block_1.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-uuid: d9ad9477-0f98-4086-9711-33986fcd0121
-langcode: en
-status: true
-dependencies:
-  module:
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: views_block__solr_search_content_block_1
-theme: idc_ui_theme_boots
-region: content
-weight: -9
-provider: null
-plugin: 'views_block:solr_search_content-block_1'
-settings:
-  id: 'views_block:solr_search_content-block_1'
-  label: Broken/Missing
-  label_display: '0'
-  provider: core
-  views_label: ''
-  items_per_page: none
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block.block.year.yml b/config/export/block.block.year.yml
deleted file mode 100644
index 7c89c419e..000000000
--- a/config/export/block.block.year.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: e5f139d7-33fc-4da5-ae00-ffefb45e2816
-langcode: en
-status: false
-dependencies:
-  config:
-    - facets.facet.year
-  module:
-    - context
-    - facets
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: year
-theme: idc_ui_theme_boots
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:year'
-settings:
-  id: 'facet_block:year'
-  label: Year
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: year
-visibility:
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
diff --git a/config/export/block.block.yearswc.yml b/config/export/block.block.yearswc.yml
deleted file mode 100644
index 0874cf479..000000000
--- a/config/export/block.block.yearswc.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: c6a1b124-c1d0-4249-9c5a-3eb0963f25a1
-langcode: en
-status: false
-dependencies:
-  config:
-    - facets.facet.year_swc
-  module:
-    - context
-    - facets
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: yearswc
-theme: idc_ui_theme_boots
-region: top_header
-weight: 0
-provider: null
-plugin: 'facet_block:year_swc'
-settings:
-  id: 'facet_block:year_swc'
-  label: Year
-  label_display: visible
-  provider: facets
-  context_mapping: {  }
-  block_id: yearswc
-visibility:
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
diff --git a/config/export/block_content.type.basic.yml b/config/export/block_content.type.basic.yml
deleted file mode 100644
index d07ed3b38..000000000
--- a/config/export/block_content.type.basic.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: a56ea544-e048-44db-9c16-02c2b5e147b0
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
-id: basic
-label: 'Basic block'
-revision: 0
-description: 'A basic block contains a title and a body.'
diff --git a/config/export/bootstrap_barrio.settings.yml b/config/export/bootstrap_barrio.settings.yml
deleted file mode 100644
index 79c4abd57..000000000
--- a/config/export/bootstrap_barrio.settings.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-_core:
-  default_config_hash: t6US_F0C6QlULV41MsacNyE5f9Nxrp1jNM3MkChYtDY
-bootstrap_barrio_library: production
-bootstrap_barrio_fluid_container: 0
-bootstrap_barrio_sidebar_position: both
-bootstrap_barrio_content_offset: 0
-bootstrap_barrio_sidebar_first_width: 4
-bootstrap_barrio_sidebar_first_offset: 0
-bootstrap_barrio_sidebar_second_width: 3
-bootstrap_barrio_sidebar_second_offset: 0
-bootstrap_barrio_button: 1
-bootstrap_barrio_button_size: ''
-bootstrap_barrio_button_outline: 0
-bootstrap_barrio_navbar_container: navbar-toggleable-md
-bootstrap_barrio_navbar_toggle: navbar-toggleable-lg
-bootstrap_barrio_navbar_top_position: ''
-bootstrap_barrio_navbar_top_color: navbar-dark
-bootstrap_barrio_navbar_top_background: bg-secondary
-bootstrap_barrio_navbar_position: ''
-bootstrap_barrio_navbar_color: navbar-dark
-bootstrap_barrio_navbar_background: bg-primary
-bootstrap_barrio_messages_widget: toasts
-bootstrap_barrio_bootstrap_icons: 1
-bootstrap_barrio_system_messages: messages_white
-bootstrap_barrio_table_style: table-striped
-bootstrap_barrio_table_hover: 1
-bootstrap_barrio_button_type: primary
diff --git a/config/export/citation_select.settings.yml b/config/export/citation_select.settings.yml
deleted file mode 100644
index 1ae0324c5..000000000
--- a/config/export/citation_select.settings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-_core:
-  default_config_hash: Hp8pxCkOLxZjIb2VJfTXGKWTUscMK3f3cg0McSzAmKo
-csl_map:
-  title:
-    - title
-  'current url':
-    - URL
-typed_relation_map:
-  'relators:aut': author
-  'relators:ctb': contributor
-  'relators:edt': editor
-  'relators:pbl': publisher
diff --git a/config/export/claro.settings.yml b/config/export/claro.settings.yml
deleted file mode 100644
index 6bba58bc7..000000000
--- a/config/export/claro.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-third_party_settings:
-  shortcut:
-    module_link: true
diff --git a/config/export/comment.settings.yml b/config/export/comment.settings.yml
deleted file mode 100644
index 5b7ad98a8..000000000
--- a/config/export/comment.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: YNUW2Ij5uE7a4oaXp3i_2lvaFdYM1zNKPPfnEjB0jEc
-log_ip_addresses: false
diff --git a/config/export/comment.type.comment.yml b/config/export/comment.type.comment.yml
deleted file mode 100644
index 56db717f3..000000000
--- a/config/export/comment.type.comment.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 28b375a9-fee1-4840-8059-b7839e0f0303
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: bqZsN31T2n0UjcbyCpOPi9D2iO0sAOHR7FnEs9qMvaA
-id: comment
-label: 'Default comments'
-target_entity_type_id: node
-description: 'Allows commenting on content'
diff --git a/config/export/contact.form.feedback.yml b/config/export/contact.form.feedback.yml
deleted file mode 100644
index a7070aec0..000000000
--- a/config/export/contact.form.feedback.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 3e371e21-1cad-48c6-a416-8c496e6a6f03
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: vymHlgJy26BuI5GGj9-IXjwR3dRC5C0tij4BpWJnoqw
-id: feedback
-label: 'Website feedback'
-recipients:
-  - admin@example.com
-reply: ''
-weight: 0
-message: 'Your message has been sent.'
-redirect: ''
diff --git a/config/export/contact.form.personal.yml b/config/export/contact.form.personal.yml
deleted file mode 100644
index 8438dc171..000000000
--- a/config/export/contact.form.personal.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: edea0493-7c2e-4911-897b-fcc5ec370537
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: jonvgt3CkUM2eMLTFwWfHileWWDC4YtXCuIlCahTk_I
-id: personal
-label: 'Personal contact form'
-recipients: {  }
-reply: ''
-weight: 0
-message: 'Your message has been sent.'
-redirect: ''
diff --git a/config/export/contact.settings.yml b/config/export/contact.settings.yml
deleted file mode 100644
index 1c949a66a..000000000
--- a/config/export/contact.settings.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-_core:
-  default_config_hash: U69DBeuvXuNVOC15rVNaBjDPK2fWFbo9v4takdYSSO8
-default_form: feedback
-flood:
-  limit: 5
-  interval: 3600
-user_default_enabled: true
diff --git a/config/export/context.context.all_media.yml b/config/export/context.context.all_media.yml
deleted file mode 100644
index 1f08e3835..000000000
--- a/config/export/context.context.all_media.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 8d5dff96-4f1a-4958-bf0f-ba83de62986e
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 0ipt7H647M0BLxXJETg1ktGLwD1IsWRJvjveTP-PCKA
-label: 'All Media'
-name: all_media
-group: Indexing
-description: 'Index all media bundles in Fedora and Blazegraph'
-requireAllConditions: false
-disabled: false
-conditions:
-  islandora_entity_bundle:
-    id: islandora_entity_bundle
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    bundles:
-      audio: audio
-      document: document
-      extracted_text: extracted_text
-      file: file
-      fits_technical_metadata: fits_technical_metadata
-      image: image
-      remote_video: remote_video
-      video: video
-reactions:
-  alter_jsonld_type:
-    id: alter_jsonld_type
-    saved: false
-    source_field: field_media_use
-  islandora_map_uri_predicate:
-    id: islandora_map_uri_predicate
-    saved: false
-    drupal_uri_predicate: 'iana:describedby'
-  index:
-    id: index
-    saved: false
-    actions:
-      index_media_in_fedora: index_media_in_fedora
-      index_media_in_triplestore: index_media_in_triplestore
-  delete:
-    id: delete
-    saved: false
-    actions:
-      delete_media_from_triplestore: delete_media_from_triplestore
-weight: -8
diff --git a/config/export/context.context.audio.yml b/config/export/context.context.audio.yml
deleted file mode 100644
index 997bede46..000000000
--- a/config/export/context.context.audio.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: ae4d5cd2-15b4-4d0d-b6bc-2052f20f4907
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: Audio
-name: audio
-group: Display
-description: 'Audio player'
-requireAllConditions: false
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    uuid: 0cfb89ac-df90-4530-aa56-364ac4c50ef1
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://purl.org/coar/resource_type/c_18cc'
-    logic: and
-reactions: {  }
-weight: 0
diff --git a/config/export/context.context.audio_original_file.yml b/config/export/context.context.audio_original_file.yml
deleted file mode 100644
index af2252aaf..000000000
--- a/config/export/context.context.audio_original_file.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: 31359591-29f0-4a08-b7e4-be677f80c7ce
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: LF_53zO22iJb5lGnTEum37B_719Nz_EM5iG-fOKt3-I
-label: 'Audio Derivatives'
-name: audio_original_file
-group: Derivatives
-description: 'Derivatives for Audio'
-requireAllConditions: true
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://pcdm.org/use#OriginalFile'
-    logic: and
-  parent_node_has_term:
-    id: parent_node_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://purl.org/coar/resource_type/c_18cc'
-    logic: and
-reactions:
-  derivative:
-    id: derivative
-    saved: false
-    actions:
-      audio_generate_a_service_file_from_an_original_file: audio_generate_a_service_file_from_an_original_file
-weight: -8
diff --git a/config/export/context.context.basic_image.yml b/config/export/context.context.basic_image.yml
deleted file mode 100644
index 9b8b422ec..000000000
--- a/config/export/context.context.basic_image.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a93863b4-2722-4b67-b1f3-457032fb6e54
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: 'Basic Image'
-name: basic_image
-group: Display
-description: 'jpg, bmp, png, etc'
-requireAllConditions: false
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    uuid: bd5de267-83c8-469b-a58c-34436d7538ce
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://purl.org/coar/resource_type/c_c513,http://purl.org/dc/dcmitype/StillImage'
-    logic: and
-reactions: {  }
-weight: 0
diff --git a/config/export/context.context.basic_pages.yml b/config/export/context.context.basic_pages.yml
deleted file mode 100644
index db052abe8..000000000
--- a/config/export/context.context.basic_pages.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 0da942b4-9831-43de-9676-0f02e5ec5b01
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-    - node
-label: 'Basic Pages'
-name: basic_pages
-group: Display
-description: 'Basic Pages layout'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_type:
-    id: node_type
-    negate: false
-    uuid: aaabe174-b6d6-4b51-9c61-4d5f8bf243e3
-    context_mapping:
-      node: '@node.node_route_context:node'
-    bundles:
-      page: page
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: media.full
-weight: 0
diff --git a/config/export/context.context.binary.yml b/config/export/context.context.binary.yml
deleted file mode 100644
index b53fbcbe4..000000000
--- a/config/export/context.context.binary.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 184c9417-055b-422c-8c59-90cee3fe5017
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: oGkVaBYKYomHuP2Z9rfQhrLtOz__N6ss2_GoosejYLk
-label: Binary
-name: binary
-group: Display
-description: 'Binary Object Display'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'http://purl.org/coar/resource_type/c_1843'
-    logic: and
-    tids:
-      -
-        target_id: 5
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: node.binary
-weight: 0
diff --git a/config/export/context.context.book_or_page.yml b/config/export/context.context.book_or_page.yml
deleted file mode 100644
index e3714dd98..000000000
--- a/config/export/context.context.book_or_page.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: ecd8c8b2-58e7-425f-a493-10c85ed28fdc
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: 'Book or Page'
-name: book_or_page
-group: Display
-description: 'parent of pages'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    uuid: cd223e50-0f6d-4e66-8a34-1e149789308a
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'https://schema.org/Book,http://purl.org/dc/dcmitype/Collection'
-    logic: and
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: node.paged
-weight: 0
diff --git a/config/export/context.context.collection.yml b/config/export/context.context.collection.yml
deleted file mode 100644
index 7ef48eebc..000000000
--- a/config/export/context.context.collection.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-uuid: a936e30e-a520-47c8-a872-ee479fda3493
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.members
-  module:
-    - islandora
-    - views
-_core:
-  default_config_hash: vH6Z5udf5Ab9cLW3Zl2-6VCbT0hagmZfalNjb654KVs
-label: 'Collection (members of)'
-name: collection
-group: Display
-description: 'If a Collection or Compound, display a block of children'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'http://purl.org/dc/dcmitype/Collection,http://vocab.getty.edu/aat/300242735'
-    logic: or
-reactions:
-  blocks:
-    id: blocks
-    blocks:
-      71991e2c-74a8-4200-b085-2bf6e6d0a046:
-        uuid: 71991e2c-74a8-4200-b085-2bf6e6d0a046
-        id: 'views_block:members-block_1'
-        label: ''
-        provider: views
-        label_display: visible
-        region: content
-        weight: '0'
-        custom_id: views_block_members_block_1
-        theme: olivero
-        css_class: ''
-        unique: 0
-        context_id: collection
-        context_mapping: {  }
-        views_label: ''
-        items_per_page: none
-        third_party_settings: {  }
-      925dee73-f840-41b9-8137-7c1be8347665:
-        uuid: 925dee73-f840-41b9-8137-7c1be8347665
-        id: 'views_block:members-block_1'
-        label: ''
-        provider: views
-        label_display: visible
-        region: content
-        weight: '10'
-        custom_id: views_block_members_block_1
-        theme: idc_ui_theme_boots
-        css_class: views_block_members_block_class
-        unique: 1
-        context_id: collection
-        context_mapping: {  }
-        views_label: ''
-        items_per_page: none
-        third_party_settings: {  }
-    include_default_blocks: 1
-    saved: false
-weight: 1
diff --git a/config/export/context.context.compound_member_object.yml b/config/export/context.context.compound_member_object.yml
deleted file mode 100644
index b7867a2db..000000000
--- a/config/export/context.context.compound_member_object.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 8582a828-8b99-458d-ad14-5a1838230c26
-langcode: en
-status: true
-dependencies: {  }
-label: 'Compound member object'
-name: compound_member_object
-group: Display
-description: 'Compound member object'
-requireAllConditions: true
-disabled: false
-conditions: {  }
-reactions: {  }
-weight: 0
diff --git a/config/export/context.context.compound_parent_object.yml b/config/export/context.context.compound_parent_object.yml
deleted file mode 100644
index 59c22d3c9..000000000
--- a/config/export/context.context.compound_parent_object.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 3adb18a7-1c37-4bd4-888c-254cabdcc3bc
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: 'Compound Parent Object'
-name: compound_parent_object
-group: Display
-description: 'Compound Parent Object'
-requireAllConditions: true
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    uuid: 5dbdd84a-18cf-422a-80ca-4018f991ca47
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'http://purl.org/dc/dcmitype/Collection,http://vocab.getty.edu/aat/300242735'
-    logic: and
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: node.compound
-weight: 0
diff --git a/config/export/context.context.external_files.yml b/config/export/context.context.external_files.yml
deleted file mode 100644
index c93a32bde..000000000
--- a/config/export/context.context.external_files.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: 0913dd70-8444-46ff-8bd2-27cf89748cee
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 5SUy4U9p47y_Ke10LfvsOR2RVkjpRjPQ5tgAG4Fs1wk
-label: 'External Files'
-name: external_files
-group: Indexing
-description: 'Index files not in Fedora in Fedora and Blazegraph'
-requireAllConditions: false
-disabled: false
-conditions:
-  file_uses_filesystem:
-    id: file_uses_filesystem
-    negate: false
-    context_mapping:
-      file: '@islandora.file_route_context_provider:file'
-    filesystems:
-      public: public
-reactions:
-  index:
-    id: index
-    saved: false
-    actions:
-      index_file_as_fedora_external_content: index_file_as_fedora_external_content
-  delete:
-    id: delete
-    saved: false
-    actions:
-      delete_file_as_fedora_external_content: delete_file_as_fedora_external_content
-weight: -7
diff --git a/config/export/context.context.image_original_file.yml b/config/export/context.context.image_original_file.yml
deleted file mode 100644
index fba98fcf4..000000000
--- a/config/export/context.context.image_original_file.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-uuid: d99ec3c0-6333-4ccf-9bd3-ff874a8f59ff
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: _w1tI4doB71OVhr9ylF4DCZRMGXy8Mtjcuk-8iAOz7Y
-label: 'Image Derivatives'
-name: image_original_file
-group: Derivatives
-description: 'Derivatives for Images'
-requireAllConditions: true
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://pcdm.org/use#OriginalFile'
-    logic: and
-  parent_node_has_term:
-    id: parent_node_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://purl.org/coar/resource_type/c_c513'
-    logic: and
-reactions:
-  derivative:
-    id: derivative
-    saved: false
-    actions:
-      image_generate_a_service_file_from_an_original_file: image_generate_a_service_file_from_an_original_file
-      image_generate_a_thumbnail_from_an_original_file: image_generate_a_thumbnail_from_an_original_file
-weight: -3
diff --git a/config/export/context.context.large_image.yml b/config/export/context.context.large_image.yml
deleted file mode 100644
index b4c6d2772..000000000
--- a/config/export/context.context.large_image.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 263ae238-770d-4ac8-9289-e0b0e64d9721
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: 'Large Image'
-name: large_image
-group: Display
-description: 'tiff, jp2, etc'
-requireAllConditions: false
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    uuid: f3ac7c4d-c61f-4801-9dd2-d2854f1a7fbc
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://purl.org/dc/dcmitype/Image,http://purl.org/dc/dcmitype/StillImage'
-    logic: and
-reactions: {  }
-weight: 0
diff --git a/config/export/context.context.newspaper.yml b/config/export/context.context.newspaper.yml
deleted file mode 100644
index 03d76a611..000000000
--- a/config/export/context.context.newspaper.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-uuid: 1efd72d3-7a06-4f43-9249-3ccea32d300d
-langcode: en
-status: true
-dependencies:
-  config:
-    - views.view.newspapers
-  module:
-    - islandora
-    - views
-label: Newspaper
-name: newspaper
-group: Display
-description: 'If a Newspaper, display the newspaper''s children (issues) by date.'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    uuid: 0906379e-21e5-483f-9248-56ec7ef9eeba
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'https://schema.org/Newspaper'
-    logic: and
-reactions:
-  blocks:
-    id: blocks
-    uuid: 83998c46-0118-4deb-9c12-10e33d02b49b
-    blocks:
-      ed4c4f13-b90a-4274-9d88-ef9d69c8c34b:
-        uuid: ed4c4f13-b90a-4274-9d88-ef9d69c8c34b
-        id: 'views_block:newspapers-block_1'
-        label: ''
-        provider: views
-        label_display: '0'
-        region: content
-        weight: '0'
-        custom_id: views_block_newspapers_block_1
-        theme: olivero
-        css_class: ''
-        unique: 0
-        context_id: newspaper
-        context_mapping: {  }
-        views_label: ''
-        items_per_page: none
-        third_party_settings: {  }
-    include_default_blocks: 1
-    saved: false
-weight: 0
diff --git a/config/export/context.context.newspaper_issue.yml b/config/export/context.context.newspaper_issue.yml
deleted file mode 100644
index 9aff4bdcb..000000000
--- a/config/export/context.context.newspaper_issue.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: ea4e08ae-606d-4726-b30d-56fdd5641519
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: 'Newspaper Issue'
-name: newspaper_issue
-group: Display
-description: 'Newspaper Issue'
-requireAllConditions: true
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    uuid: 759841b3-6786-4bfa-8c14-fb13db664635
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'https://schema.org/PublicationIssue,http://purl.org/dc/dcmitype/Collection'
-    logic: and
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: node.paged
-weight: 0
diff --git a/config/export/context.context.open_seadragon.yml b/config/export/context.context.open_seadragon.yml
deleted file mode 100644
index 278afd6ec..000000000
--- a/config/export/context.context.open_seadragon.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 001addcf-8c88-4a8a-8b92-59cfdbdfd0fe
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: Da9SKh2OX1dNN8-V54Zrhcsnb5bNRwQanxqlujk9tzA
-label: 'Open Seadragon'
-name: open_seadragon
-group: Display
-description: 'Open Seadragon viewer for Images'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'http://openseadragon.github.io'
-    logic: and
-    tids:
-      -
-        target_id: 35
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: node.open_seadragon
-weight: -2
diff --git a/config/export/context.context.openseadragon_block.yml b/config/export/context.context.openseadragon_block.yml
deleted file mode 100644
index ace992805..000000000
--- a/config/export/context.context.openseadragon_block.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: bbd4f114-c54d-492c-9268-99ddd6f518cb
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-    - openseadragon
-_core:
-  default_config_hash: sN9l77XqTzoy1x5fp1O7v91Di5_6iCx9prNHDvGYrKo
-label: 'Openseadragon Block - Multipaged items'
-name: openseadragon_block
-group: Display
-description: 'If Paged Content or Publication Issue, display Openseadragon from manifest.'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    uuid: e5689bd5-7eec-4378-b329-2f35d5bb35b0
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'https://schema.org/Book,https://schema.org/PublicationIssue'
-    logic: or
-reactions:
-  blocks:
-    id: blocks
-    uuid: 50b9b25e-0836-4531-8a78-9698d71d81de
-    blocks:
-      30e02221-7810-425f-abed-5b5f82da4612:
-        uuid: 30e02221-7810-425f-abed-5b5f82da4612
-        id: openseadragon_block
-        label: 'Multipage Viewer'
-        provider: openseadragon
-        label_display: visible
-        region: content_above
-        weight: '0'
-        custom_id: openseadragon_block
-        theme: olivero
-        css_class: ''
-        unique: 0
-        context_id: openseadragon_block
-        context_mapping: {  }
-        iiif_manifest_url: 'node/[node:nid]/book-manifest'
-        third_party_settings: {  }
-    include_default_blocks: 1
-    saved: false
-weight: -1
diff --git a/config/export/context.context.paged_content_openseadragon.yml b/config/export/context.context.paged_content_openseadragon.yml
deleted file mode 100644
index 92a3a05a0..000000000
--- a/config/export/context.context.paged_content_openseadragon.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: b8eca5eb-5d17-4a1d-8809-e72c645c4a7f
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-label: 'Paged Content - Openseadragon'
-name: paged_content_openseadragon
-group: Display
-description: 'Display a block for Paged Content'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    uuid: 49390c36-e529-41ec-9ff5-105c7b992326
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'http://openseadragon.github.io,https://schema.org/Book'
-    logic: and
-reactions:
-  blocks:
-    id: blocks
-    uuid: c9658346-1109-4738-9fe1-9edeaad42cb8
-    blocks: {  }
-    include_default_blocks: 1
-    saved: false
-weight: 0
diff --git a/config/export/context.context.pages.yml b/config/export/context.context.pages.yml
deleted file mode 100644
index 883cb5316..000000000
--- a/config/export/context.context.pages.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 27b7544f-8c79-4c52-ba89-436affb8f787
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: xavOhHKb20w-w4Izd0AAF6xMVnVZJo00Wv3MFho81pc
-label: 'Page Derivatives'
-name: pages
-group: Derivatives
-description: 'Derivatives for Pages'
-requireAllConditions: true
-disabled: false
-conditions:
-  parent_node_has_term:
-    id: parent_node_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://id.loc.gov/ontologies/bibframe/part'
-    logic: and
-  media_has_term:
-    id: media_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://pcdm.org/use#OriginalFile'
-    logic: and
-reactions:
-  derivative:
-    id: derivative
-    saved: false
-    actions:
-      get_ocr_from_image: get_ocr_from_image
-      image_generate_a_service_file_from_an_original_file: image_generate_a_service_file_from_an_original_file
-      image_generate_a_thumbnail_from_an_original_file: image_generate_a_thumbnail_from_an_original_file
-weight: -7
diff --git a/config/export/context.context.pdf_original_file.yml b/config/export/context.context.pdf_original_file.yml
deleted file mode 100644
index afc0034a2..000000000
--- a/config/export/context.context.pdf_original_file.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-uuid: 17241c20-ca14-4009-a42f-2348994b1468
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: c7_MtAQ35bFVk9PanoKR52wijgATcHFDBpFQ7MB7NPQ
-label: 'PDF Derivatives'
-name: pdf_original_file
-group: Derivatives
-description: 'Derivatives for PDF documents'
-requireAllConditions: true
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://pcdm.org/use#OriginalFile'
-    logic: and
-  parent_node_has_term:
-    id: parent_node_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'https://schema.org/DigitalDocument'
-    logic: and
-reactions:
-  derivative:
-    id: derivative
-    saved: false
-    actions:
-      digital_document_generate_a_thumbnail_from_an_original_file: digital_document_generate_a_thumbnail_from_an_original_file
-      get_ocr_from_image: get_ocr_from_image
-weight: -6
diff --git a/config/export/context.context.pdfjs.yml b/config/export/context.context.pdfjs.yml
deleted file mode 100644
index cbbc9d621..000000000
--- a/config/export/context.context.pdfjs.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 2ed4bdff-4f31-49a0-b007-74b129260733
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: Tr1c1AVZTJkM0732yQxi9xQuBpCN7X6V_CWkbKwjrN8
-label: 'PDFjs Viewer'
-name: pdfjs
-group: Display
-description: 'Displays file using the PDFjs viewer'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_has_term:
-    id: node_has_term
-    negate: false
-    context_mapping:
-      node: '@node.node_route_context:node'
-    uri: 'http://mozilla.github.io/pdf.js'
-    logic: and
-reactions:
-  view_mode_alter:
-    id: view_mode_alter
-    saved: false
-    mode: node.pdfjs
-weight: 0
diff --git a/config/export/context.context.remote_media.yml b/config/export/context.context.remote_media.yml
deleted file mode 100644
index b2c4e5ad3..000000000
--- a/config/export/context.context.remote_media.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: bb713ec8-4ee3-461b-bb0d-e69619e55a86
-langcode: en
-status: true
-dependencies: {  }
-label: 'Remote Media'
-name: remote_media
-group: Display
-description: 'Displays remote video or audio'
-requireAllConditions: false
-disabled: false
-conditions: {  }
-reactions: {  }
-weight: 0
diff --git a/config/export/context.context.repository_content.yml b/config/export/context.context.repository_content.yml
deleted file mode 100644
index c65a9cfba..000000000
--- a/config/export/context.context.repository_content.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: f23608eb-477d-4532-816a-8bcbf13b83e2
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: o5KHcnyibXt-7SXqNpNyHTd8qYFOrDh1bk5I4aQo91Y
-label: Content
-name: repository_content
-group: Indexing
-description: 'Index all Islandora nodes in Fedora and Blazegraph.'
-requireAllConditions: false
-disabled: false
-conditions:
-  node_is_islandora_object:
-    id: node_is_islandora_object
-    negate: 0
-    uuid: ce7f5b47-6998-4ddf-bbf5-87401bcc145b
-    context_mapping:
-      node: '@node.node_route_context:node'
-reactions:
-  index:
-    id: index
-    saved: false
-    actions:
-      index_node_in_fedora: index_node_in_fedora
-      index_node_in_triplestore: index_node_in_triplestore
-  delete:
-    id: delete
-    saved: false
-    actions:
-      delete_node_from_fedora: delete_node_from_fedora
-      delete_node_from_triplestore: delete_node_from_triplestore
-  islandora_map_uri_predicate:
-    id: islandora_map_uri_predicate
-    saved: false
-    drupal_uri_predicate: 'schema:sameAs'
-  alter_jsonld_type:
-    id: alter_jsonld_type
-    saved: false
-    source_field: field_model
-weight: -5
diff --git a/config/export/context.context.taxonomy_terms.yml b/config/export/context.context.taxonomy_terms.yml
deleted file mode 100644
index 43391165e..000000000
--- a/config/export/context.context.taxonomy_terms.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: d558a755-bcde-4424-84ba-0b623d6a08cf
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 6RXlwQmbN073bHOiyMIfbdyUvCyjEXjfxpr65b_1ssg
-label: 'Taxonomy Terms'
-name: taxonomy_terms
-group: Indexing
-description: 'Index all taxonomy terms in Fedora and Blazegraph'
-requireAllConditions: false
-disabled: false
-conditions:
-  content_entity_type:
-    id: content_entity_type
-    negate: false
-    context_mapping:
-      taxonomy_term: '@islandora.taxonomy_term_route_context_provider:taxonomy_term'
-    types:
-      taxonomy_term: taxonomy_term
-reactions:
-  index:
-    id: index
-    saved: false
-    actions:
-      index_taxonomy_term_in_fedora: index_taxonomy_term_in_fedora
-      index_taxonomy_term_in_the_triplestore: index_taxonomy_term_in_the_triplestore
-  delete:
-    id: delete
-    saved: false
-    actions:
-      delete_taxonomy_term_in_fedora: delete_taxonomy_term_in_fedora
-      delete_taxonomy_term_in_triplestore: delete_taxonomy_term_in_triplestore
-weight: -4
diff --git a/config/export/context.context.technical_metadata_on_ingest.yml b/config/export/context.context.technical_metadata_on_ingest.yml
deleted file mode 100644
index 37bf95f59..000000000
--- a/config/export/context.context.technical_metadata_on_ingest.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 579c2116-df88-474e-8096-1cabca0d0e59
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: XtBYoGhM0h6E6KN_OfmCVMN8ey6inC6fdogp7FuSQPE
-label: 'FITS derivatives'
-name: technical_metadata_on_ingest
-group: Derivatives
-description: 'FITS derivatives for all original files'
-requireAllConditions: false
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    uuid: b270cb14-b960-4494-9ccf-1c9433092837
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://pcdm.org/use#OriginalFile'
-    logic: and
-reactions:
-  derivative:
-    id: derivative
-    saved: false
-    actions:
-      generate_a_technical_metadata_derivative: generate_a_technical_metadata_derivative
-weight: 0
diff --git a/config/export/context.context.video_original_file.yml b/config/export/context.context.video_original_file.yml
deleted file mode 100644
index e7c740258..000000000
--- a/config/export/context.context.video_original_file.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-uuid: 51bff83c-8c70-4709-95ca-c71df90dd72d
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 1hWjMsl225Q8XunEOdRDfkkuswJrsGmg2qhYd1i36XQ
-label: 'Video Derivatives'
-name: video_original_file
-group: Derivatives
-description: 'Derivatives for Video'
-requireAllConditions: true
-disabled: false
-conditions:
-  media_has_term:
-    id: media_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://pcdm.org/use#OriginalFile'
-    logic: and
-  parent_node_has_term:
-    id: parent_node_has_term
-    negate: false
-    context_mapping:
-      media: '@islandora.media_route_context_provider:media'
-    uri: 'http://purl.org/coar/resource_type/c_12ce'
-    logic: and
-reactions:
-  derivative:
-    id: derivative
-    saved: false
-    actions:
-      video_generate_a_service_file_from_an_original_file: video_generate_a_service_file_from_an_original_file
-      video_generate_a_thumbnail_from_an_original_file: video_generate_a_thumbnail_from_an_original_file
-weight: -5
diff --git a/config/export/core.base_field_override.media.audio.changed.yml b/config/export/core.base_field_override.media.audio.changed.yml
deleted file mode 100644
index c86a8d26b..000000000
--- a/config/export/core.base_field_override.media.audio.changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 851ecdf5-687b-4310-b032-28585c27d132
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-_core:
-  default_config_hash: qTIW8jApL5XMixeqe9-LeOkaRUKR1GfCQ-BAsz0rzvk
-id: media.audio.changed
-field_name: changed
-entity_type: media
-bundle: audio
-label: Changed
-description: 'The time the media item was last edited.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: changed
diff --git a/config/export/core.base_field_override.media.audio.created.yml b/config/export/core.base_field_override.media.audio.created.yml
deleted file mode 100644
index 4a31725a7..000000000
--- a/config/export/core.base_field_override.media.audio.created.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 9eee5ef8-984c-4ae2-849d-52cdd53a3369
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-_core:
-  default_config_hash: BhJH9pn-WDdp5mhe0dv25WVxMVbZciWtJbd6aVk3nYw
-id: media.audio.created
-field_name: created
-entity_type: media
-bundle: audio
-label: 'Authored on'
-description: 'The time the media item was created.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getRequestTime'
-settings: {  }
-field_type: created
diff --git a/config/export/core.base_field_override.media.audio.name.yml b/config/export/core.base_field_override.media.audio.name.yml
deleted file mode 100644
index 332396ef0..000000000
--- a/config/export/core.base_field_override.media.audio.name.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: f653155c-26c7-4178-a601-663439c35d05
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-_core:
-  default_config_hash: 3WLLqnUkB2L1I0zrqorLpcwe4eti11D9p6XOK2qxdcg
-id: media.audio.name
-field_name: name
-entity_type: media
-bundle: audio
-label: Name
-description: ''
-required: true
-translatable: true
-default_value:
-  -
-    value: ''
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/core.base_field_override.media.audio.path.yml b/config/export/core.base_field_override.media.audio.path.yml
deleted file mode 100644
index 937b99658..000000000
--- a/config/export/core.base_field_override.media.audio.path.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: cfaed09f-395e-4ce4-bec8-0b386e2aaa37
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-  module:
-    - path
-_core:
-  default_config_hash: q5ByGnUHg6E2zWOVhF_7ZHhVCv6zKwQx4JNyESNgG4k
-id: media.audio.path
-field_name: path
-entity_type: media
-bundle: audio
-label: 'URL alias'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: path
diff --git a/config/export/core.base_field_override.media.audio.status.yml b/config/export/core.base_field_override.media.audio.status.yml
deleted file mode 100644
index 437fc1ad2..000000000
--- a/config/export/core.base_field_override.media.audio.status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 16f47928-c536-44ab-9992-a2a2b49131b6
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-_core:
-  default_config_hash: n2G2117mFQVI2O2jhXUDB0Ojgy9QqS5EXq_CqbEq-lo
-id: media.audio.status
-field_name: status
-entity_type: media
-bundle: audio
-label: Published
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.media.audio.thumbnail.yml b/config/export/core.base_field_override.media.audio.thumbnail.yml
deleted file mode 100644
index 31789ed6c..000000000
--- a/config/export/core.base_field_override.media.audio.thumbnail.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 709ffa76-6cc1-4266-bd33-3777f35205a0
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-  module:
-    - image
-_core:
-  default_config_hash: MwkcFHeT_--p0X0a3XB34tzrewKmSVFogJP6rhr33-Y
-id: media.audio.thumbnail
-field_name: thumbnail
-entity_type: media
-bundle: audio
-label: Thumbnail
-description: 'The thumbnail of the media item.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: default
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/core.base_field_override.media.audio.uid.yml b/config/export/core.base_field_override.media.audio.uid.yml
deleted file mode 100644
index 80919aed6..000000000
--- a/config/export/core.base_field_override.media.audio.uid.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 2f60ea23-513e-4f8d-bae7-0c3d16c25c24
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-_core:
-  default_config_hash: qIOGEtzIWuxpt_0ix1YL5IOKOr5PYB25oLleeKYsNSk
-id: media.audio.uid
-field_name: uid
-entity_type: media
-bundle: audio
-label: 'Authored by'
-description: 'The user ID of the author.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getDefaultEntityOwner'
-settings:
-  handler: default
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/core.base_field_override.media.file.changed.yml b/config/export/core.base_field_override.media.file.changed.yml
deleted file mode 100644
index bc6e41d6f..000000000
--- a/config/export/core.base_field_override.media.file.changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 77700a62-d881-4147-af5e-d9e47b4f0c48
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-_core:
-  default_config_hash: uy3KuTrDiyBPwoByHxogH_dPK0oJHczqD5JT-49sjf8
-id: media.file.changed
-field_name: changed
-entity_type: media
-bundle: file
-label: Changed
-description: 'The time the media item was last edited.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: changed
diff --git a/config/export/core.base_field_override.media.file.created.yml b/config/export/core.base_field_override.media.file.created.yml
deleted file mode 100644
index 6d3303b11..000000000
--- a/config/export/core.base_field_override.media.file.created.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 277f9656-f79f-471b-af6b-3b35156e4eca
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-_core:
-  default_config_hash: mY2VGrFj7Oo3n3srimSZjwS4WpwoPGse2Ge5Wnivcuk
-id: media.file.created
-field_name: created
-entity_type: media
-bundle: file
-label: 'Authored on'
-description: 'The time the media item was created.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getRequestTime'
-settings: {  }
-field_type: created
diff --git a/config/export/core.base_field_override.media.file.name.yml b/config/export/core.base_field_override.media.file.name.yml
deleted file mode 100644
index eb6d62ef4..000000000
--- a/config/export/core.base_field_override.media.file.name.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: a1fd4265-b100-49be-ac1f-59d8d41e32c4
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-_core:
-  default_config_hash: uKtxUqXK61EbMT74jJM6mMVDnjax5MtLqwRJ0_AM1_c
-id: media.file.name
-field_name: name
-entity_type: media
-bundle: file
-label: Name
-description: ''
-required: true
-translatable: true
-default_value:
-  -
-    value: ''
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/core.base_field_override.media.file.path.yml b/config/export/core.base_field_override.media.file.path.yml
deleted file mode 100644
index 9cafe2a68..000000000
--- a/config/export/core.base_field_override.media.file.path.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: fba77cc6-43e9-41d3-bac9-12cad68e5f1f
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-  module:
-    - path
-_core:
-  default_config_hash: LBphK6UZJLRYa91yT7zVe8-_yqboNVXTdOzItPbiu0M
-id: media.file.path
-field_name: path
-entity_type: media
-bundle: file
-label: 'URL alias'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: path
diff --git a/config/export/core.base_field_override.media.file.status.yml b/config/export/core.base_field_override.media.file.status.yml
deleted file mode 100644
index 6f8cfdfa1..000000000
--- a/config/export/core.base_field_override.media.file.status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 0b471e4d-968c-447c-8cd7-c809ed2e6dd6
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-_core:
-  default_config_hash: msBL8N4SjfVUkKEXr0WUt04uQsoo31V29IuyooqXxC4
-id: media.file.status
-field_name: status
-entity_type: media
-bundle: file
-label: Published
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.media.file.thumbnail.yml b/config/export/core.base_field_override.media.file.thumbnail.yml
deleted file mode 100644
index e4db1f0d5..000000000
--- a/config/export/core.base_field_override.media.file.thumbnail.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 1e0f0aad-4014-4b7c-bc75-6f37c281198a
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-  module:
-    - image
-_core:
-  default_config_hash: LIpRLg2zzlvAksG-WJ5HqK5IQ_UHbDBgImX0AyUzvPs
-id: media.file.thumbnail
-field_name: thumbnail
-entity_type: media
-bundle: file
-label: Thumbnail
-description: 'The thumbnail of the media item.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: default
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/core.base_field_override.media.file.uid.yml b/config/export/core.base_field_override.media.file.uid.yml
deleted file mode 100644
index 47a67e7c0..000000000
--- a/config/export/core.base_field_override.media.file.uid.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: bfdeb0f2-d26a-498d-bea0-697ef862af67
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-_core:
-  default_config_hash: s1opVWRHwqmv__D85qw0HKtR6vy7vviXGcQp0fhS4FI
-id: media.file.uid
-field_name: uid
-entity_type: media
-bundle: file
-label: 'Authored by'
-description: 'The user ID of the author.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getDefaultEntityOwner'
-settings:
-  handler: default
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/core.base_field_override.media.image.changed.yml b/config/export/core.base_field_override.media.image.changed.yml
deleted file mode 100644
index 0e10f887c..000000000
--- a/config/export/core.base_field_override.media.image.changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: d6883d61-86bc-4060-9581-ee993af5d680
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-_core:
-  default_config_hash: 5HVSmzFl909_BK78549b-yy0sAPGNL7UjNUM954_wUs
-id: media.image.changed
-field_name: changed
-entity_type: media
-bundle: image
-label: Changed
-description: 'The time the media item was last edited.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: changed
diff --git a/config/export/core.base_field_override.media.image.created.yml b/config/export/core.base_field_override.media.image.created.yml
deleted file mode 100644
index 6c0c5a76d..000000000
--- a/config/export/core.base_field_override.media.image.created.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 890a5654-13bd-4289-bedf-9a482bcadfa9
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-_core:
-  default_config_hash: VJzBEV4Of0nqQVuXJlaRkEl7NX0gu5jmRMxuihGV8EI
-id: media.image.created
-field_name: created
-entity_type: media
-bundle: image
-label: 'Authored on'
-description: 'The time the media item was created.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getRequestTime'
-settings: {  }
-field_type: created
diff --git a/config/export/core.base_field_override.media.image.name.yml b/config/export/core.base_field_override.media.image.name.yml
deleted file mode 100644
index a84dcc12a..000000000
--- a/config/export/core.base_field_override.media.image.name.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: d4d574c2-edae-4fc4-8d2a-f6c87709980d
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-_core:
-  default_config_hash: h18PNrH5ndi-j2d3SyJLxFon1zFSukgffMiz7dln0Gw
-id: media.image.name
-field_name: name
-entity_type: media
-bundle: image
-label: Name
-description: ''
-required: true
-translatable: true
-default_value:
-  -
-    value: ''
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/core.base_field_override.media.image.path.yml b/config/export/core.base_field_override.media.image.path.yml
deleted file mode 100644
index 5f77702fd..000000000
--- a/config/export/core.base_field_override.media.image.path.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 685328ed-4a01-4068-9da3-cd8406f313f6
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-  module:
-    - path
-_core:
-  default_config_hash: DQJkTlRZvato7RyvNlRQvy4ArbM6p_r7FAGQe7kCd70
-id: media.image.path
-field_name: path
-entity_type: media
-bundle: image
-label: 'URL alias'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: path
diff --git a/config/export/core.base_field_override.media.image.status.yml b/config/export/core.base_field_override.media.image.status.yml
deleted file mode 100644
index afc3f7b0d..000000000
--- a/config/export/core.base_field_override.media.image.status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 887ca70a-4432-42a8-b6d5-a5ea18537eac
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-_core:
-  default_config_hash: zTh6FRayjF4sB7x52aahw1pif31JH25YQtPmfQKYoSo
-id: media.image.status
-field_name: status
-entity_type: media
-bundle: image
-label: Published
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.media.image.thumbnail.yml b/config/export/core.base_field_override.media.image.thumbnail.yml
deleted file mode 100644
index ad516fdaa..000000000
--- a/config/export/core.base_field_override.media.image.thumbnail.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 5cc2905f-288c-4730-b068-65263ac4fb8b
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-  module:
-    - image
-_core:
-  default_config_hash: oguI7ZT6nFjnmbR-rfWpGO9bDslCYEPM4OkHW9BF7Gk
-id: media.image.thumbnail
-field_name: thumbnail
-entity_type: media
-bundle: image
-label: Thumbnail
-description: 'The thumbnail of the media item.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: default
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/core.base_field_override.media.image.uid.yml b/config/export/core.base_field_override.media.image.uid.yml
deleted file mode 100644
index 749751ab5..000000000
--- a/config/export/core.base_field_override.media.image.uid.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: acddf357-70f7-45be-a168-0521a700a46d
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-_core:
-  default_config_hash: s6wX-OIAen7UrilcuW_WoHqOK6zOIvMUGMqCT1BjzaU
-id: media.image.uid
-field_name: uid
-entity_type: media
-bundle: image
-label: 'Authored by'
-description: 'The user ID of the author.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getDefaultEntityOwner'
-settings:
-  handler: default
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/core.base_field_override.media.video.changed.yml b/config/export/core.base_field_override.media.video.changed.yml
deleted file mode 100644
index f6e77c0a5..000000000
--- a/config/export/core.base_field_override.media.video.changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: d3560cf3-9bc7-4a2d-8d1f-3cb331f26a51
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-_core:
-  default_config_hash: A5f2t6b-bDZUUX83-suEhkxFFE3UP_MmxqZOprX2baU
-id: media.video.changed
-field_name: changed
-entity_type: media
-bundle: video
-label: Changed
-description: 'The time the media item was last edited.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: changed
diff --git a/config/export/core.base_field_override.media.video.created.yml b/config/export/core.base_field_override.media.video.created.yml
deleted file mode 100644
index 369d09f91..000000000
--- a/config/export/core.base_field_override.media.video.created.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 2131e335-75cd-4784-ac82-3f42c3234e62
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-_core:
-  default_config_hash: o8Ix4Ak8Hy4PT_jm7rBfWmeLSDJyXZWOG-o597Zhv_k
-id: media.video.created
-field_name: created
-entity_type: media
-bundle: video
-label: 'Authored on'
-description: 'The time the media item was created.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getRequestTime'
-settings: {  }
-field_type: created
diff --git a/config/export/core.base_field_override.media.video.name.yml b/config/export/core.base_field_override.media.video.name.yml
deleted file mode 100644
index bd39b0afa..000000000
--- a/config/export/core.base_field_override.media.video.name.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 79b08d2e-afab-4293-b336-2e0fccfa3840
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-_core:
-  default_config_hash: IQWsECCfmPY2ej2CeeDlg1PmvJ_3-4pGfvX-1s-X0HY
-id: media.video.name
-field_name: name
-entity_type: media
-bundle: video
-label: Name
-description: ''
-required: true
-translatable: true
-default_value:
-  -
-    value: ''
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/core.base_field_override.media.video.path.yml b/config/export/core.base_field_override.media.video.path.yml
deleted file mode 100644
index c31fe0ee5..000000000
--- a/config/export/core.base_field_override.media.video.path.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 754009c8-0472-4338-bd3d-00abe2cbfc53
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-  module:
-    - path
-_core:
-  default_config_hash: h5jssdKqYFnmuEatlGfw4Mhdf4s92G2PMxEHLqEfQWY
-id: media.video.path
-field_name: path
-entity_type: media
-bundle: video
-label: 'URL alias'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: path
diff --git a/config/export/core.base_field_override.media.video.status.yml b/config/export/core.base_field_override.media.video.status.yml
deleted file mode 100644
index 0fe4ec822..000000000
--- a/config/export/core.base_field_override.media.video.status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: b76f8bcd-5fe5-40e5-b650-c3cdc4cadc4a
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-_core:
-  default_config_hash: LWtDkEOUpIT8TeyOdvM2pgQrX4bYIbjgaNR9ciL1mtg
-id: media.video.status
-field_name: status
-entity_type: media
-bundle: video
-label: Published
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.media.video.thumbnail.yml b/config/export/core.base_field_override.media.video.thumbnail.yml
deleted file mode 100644
index fd8e2cf0c..000000000
--- a/config/export/core.base_field_override.media.video.thumbnail.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: dfb478f1-d56b-4608-8f36-8ac1cba5420c
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-  module:
-    - image
-_core:
-  default_config_hash: lRYs_Ep78Dx_lJJCFy5ujhPaQRq4a6VTMtUbpeo0TG4
-id: media.video.thumbnail
-field_name: thumbnail
-entity_type: media
-bundle: video
-label: Thumbnail
-description: 'The thumbnail of the media item.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: default
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/core.base_field_override.media.video.uid.yml b/config/export/core.base_field_override.media.video.uid.yml
deleted file mode 100644
index e67f762b7..000000000
--- a/config/export/core.base_field_override.media.video.uid.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 09686bc2-50db-407a-8d17-45d388405575
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-_core:
-  default_config_hash: wO1PQxr2G2C-lkIr3pzoLY-TC1PiRs4P26P4HJDeN5M
-id: media.video.uid
-field_name: uid
-entity_type: media
-bundle: video
-label: 'Authored by'
-description: 'The user ID of the author.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\media\Entity\Media::getDefaultEntityOwner'
-settings:
-  handler: default
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/core.base_field_override.node.islandora_object.changed.yml b/config/export/core.base_field_override.node.islandora_object.changed.yml
deleted file mode 100644
index 2e0455943..000000000
--- a/config/export/core.base_field_override.node.islandora_object.changed.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: cd5225a3-2760-47f3-acca-96efd60212ac
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: LLL4Ifzyon9Q1aapBWH8t3OeF7_DmDSzAL2gj8KCg3I
-id: node.islandora_object.changed
-field_name: changed
-entity_type: node
-bundle: islandora_object
-label: Changed
-description: 'The time that the node was last edited.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: changed
diff --git a/config/export/core.base_field_override.node.islandora_object.created.yml b/config/export/core.base_field_override.node.islandora_object.created.yml
deleted file mode 100644
index 5103aea32..000000000
--- a/config/export/core.base_field_override.node.islandora_object.created.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 0b04a9c3-99f6-4302-83ab-9b2481b1240b
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: vwqJTnii6G9YPWUu4bRG8hZjhF9BC9zziUTkR1163PE
-id: node.islandora_object.created
-field_name: created
-entity_type: node
-bundle: islandora_object
-label: 'Authored on'
-description: 'The time that the node was created.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: created
diff --git a/config/export/core.base_field_override.node.islandora_object.menu_link.yml b/config/export/core.base_field_override.node.islandora_object.menu_link.yml
deleted file mode 100644
index 8ba49ea44..000000000
--- a/config/export/core.base_field_override.node.islandora_object.menu_link.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: f5ab2bcf-7858-4294-9c5b-7197eed208a0
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: JsCXlShNN0Qit8lhfUAtCYPEP0RBYzGB_tlzYghfSOs
-id: node.islandora_object.menu_link
-field_name: menu_link
-entity_type: node
-bundle: islandora_object
-label: 'Menu link'
-description: 'Computed menu link for the node (only available during node saving).'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: default
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/core.base_field_override.node.islandora_object.path.yml b/config/export/core.base_field_override.node.islandora_object.path.yml
deleted file mode 100644
index d18e498d7..000000000
--- a/config/export/core.base_field_override.node.islandora_object.path.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 7fecf5ea-f1eb-4a58-bb6e-27b00a100f59
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-  module:
-    - path
-_core:
-  default_config_hash: VeoPdiMPVN49mrAAx_WFyeS16ZhYEM7GH8zZ96ZWPuE
-id: node.islandora_object.path
-field_name: path
-entity_type: node
-bundle: islandora_object
-label: 'URL alias'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: path
diff --git a/config/export/core.base_field_override.node.islandora_object.promote.yml b/config/export/core.base_field_override.node.islandora_object.promote.yml
deleted file mode 100644
index 99b99c8f9..000000000
--- a/config/export/core.base_field_override.node.islandora_object.promote.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: b57f407f-5852-48fb-95cf-38515c284da1
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: nYdar2D6NOkEngbyKDhFTj1idPQqtP0U3ReJK2u-59s
-id: node.islandora_object.promote
-field_name: promote
-entity_type: node
-bundle: islandora_object
-label: 'Promoted to front page'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.node.islandora_object.status.yml b/config/export/core.base_field_override.node.islandora_object.status.yml
deleted file mode 100644
index d2c94d137..000000000
--- a/config/export/core.base_field_override.node.islandora_object.status.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 162973ee-46ed-4ebf-9285-476c50b8f168
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: 6b4KFr0Z6wLZP_1aZqDvJu9LKXJXiiqZMUNOgi7XMRM
-id: node.islandora_object.status
-field_name: status
-entity_type: node
-bundle: islandora_object
-label: Published
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 1
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.node.islandora_object.sticky.yml b/config/export/core.base_field_override.node.islandora_object.sticky.yml
deleted file mode 100644
index f9b957c61..000000000
--- a/config/export/core.base_field_override.node.islandora_object.sticky.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: a1b4f7d2-f3c0-4267-85dc-2e8f3cc5ab64
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: sq8ComJdVg-Bahy1MsEgWSe7LOpJjWM4sry56pvnBmI
-id: node.islandora_object.sticky
-field_name: sticky
-entity_type: node
-bundle: islandora_object
-label: 'Sticky at top of lists'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.base_field_override.node.islandora_object.title.yml b/config/export/core.base_field_override.node.islandora_object.title.yml
deleted file mode 100644
index efafac0fe..000000000
--- a/config/export/core.base_field_override.node.islandora_object.title.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 6d35b5fb-8fa5-44ad-b286-6aca92cde6d5
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: goFbXmRwXz8Ka0Vyu-jFOIqF6x7T5I8a7Eby6kfDKzQ
-id: node.islandora_object.title
-field_name: title
-entity_type: node
-bundle: islandora_object
-label: Title
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/core.base_field_override.node.islandora_object.uid.yml b/config/export/core.base_field_override.node.islandora_object.uid.yml
deleted file mode 100644
index 4eb6bbddf..000000000
--- a/config/export/core.base_field_override.node.islandora_object.uid.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 56d898f6-8c0e-428e-8565-7a877de853d3
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-_core:
-  default_config_hash: R9tzl3gXbLnojgU6wijGL671X4z_kNWUcGJf7YPgwek
-id: node.islandora_object.uid
-field_name: uid
-entity_type: node
-bundle: islandora_object
-label: 'Authored by'
-description: 'The username of the content author.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: 'Drupal\node\Entity\Node::getDefaultEntityOwner'
-settings:
-  handler: default
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/core.base_field_override.node.page.promote.yml b/config/export/core.base_field_override.node.page.promote.yml
deleted file mode 100644
index d4b7dc705..000000000
--- a/config/export/core.base_field_override.node.page.promote.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 7228cfbf-fb2e-4ede-8365-348b097cea1e
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.page
-_core:
-  default_config_hash: fPUEnm4T5zfZRr3ttDUqq7yCDd2uW3clWD-pvos4tlQ
-id: node.page.promote
-field_name: promote
-entity_type: node
-bundle: page
-label: 'Promoted to front page'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: 'On'
-  off_label: 'Off'
-field_type: boolean
diff --git a/config/export/core.date_format.fallback.yml b/config/export/core.date_format.fallback.yml
deleted file mode 100644
index 9544dcf18..000000000
--- a/config/export/core.date_format.fallback.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: afeb5150-a63e-472e-97d7-145d988532b2
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 7klS5IWXrwzVaPpYZFAs6wcx8U2FF1X73OfrtTsvuvE
-id: fallback
-label: 'Fallback date format'
-locked: true
-pattern: 'D, m/d/Y - H:i'
diff --git a/config/export/core.date_format.html_date.yml b/config/export/core.date_format.html_date.yml
deleted file mode 100644
index c925d2a98..000000000
--- a/config/export/core.date_format.html_date.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: d854afa8-17e8-4c67-9dfe-0431412836d9
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: EOQltUQPmgc6UQ2rcJ4Xi_leCEJj5ui0TR-12duS-Tk
-id: html_date
-label: 'HTML Date'
-locked: true
-pattern: Y-m-d
diff --git a/config/export/core.date_format.html_datetime.yml b/config/export/core.date_format.html_datetime.yml
deleted file mode 100644
index 8dc9ef815..000000000
--- a/config/export/core.date_format.html_datetime.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: ea06668d-5b90-4073-8b47-f1f907a466d0
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: jxfClwZIRXIdcvMrE--WkcZxDGUVoOIE3Sm2NRZlFuE
-id: html_datetime
-label: 'HTML Datetime'
-locked: true
-pattern: 'Y-m-d\TH:i:sO'
diff --git a/config/export/core.date_format.html_month.yml b/config/export/core.date_format.html_month.yml
deleted file mode 100644
index b019a44ae..000000000
--- a/config/export/core.date_format.html_month.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 147466dd-81a3-4409-bc46-2f394844f7ca
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Z7KuCUwM_WdTNvLcoltuX3_8d-s-8FZkTN6KgNwF0eM
-id: html_month
-label: 'HTML Month'
-locked: true
-pattern: Y-m
diff --git a/config/export/core.date_format.html_time.yml b/config/export/core.date_format.html_time.yml
deleted file mode 100644
index c3910a170..000000000
--- a/config/export/core.date_format.html_time.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: f480f320-2f56-48b1-8e4d-7ff64e50ee57
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: M7yqicYkU36hRy5p9drAaGBBihhUD1OyujFrAaQ93ZE
-id: html_time
-label: 'HTML Time'
-locked: true
-pattern: 'H:i:s'
diff --git a/config/export/core.date_format.html_week.yml b/config/export/core.date_format.html_week.yml
deleted file mode 100644
index 23e3da418..000000000
--- a/config/export/core.date_format.html_week.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: c7684755-08db-4a5c-af32-f33d49c4f6bf
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: wKD4WsoV_wFgv2vgI4mcAAFSIzrye17ykzdwrnApkfY
-id: html_week
-label: 'HTML Week'
-locked: true
-pattern: Y-\WW
diff --git a/config/export/core.date_format.html_year.yml b/config/export/core.date_format.html_year.yml
deleted file mode 100644
index dd4d059c4..000000000
--- a/config/export/core.date_format.html_year.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 48ae8bd5-eb36-4b21-b72b-2c28d91742a8
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: OjekiQuX9RbVQ2_8jOHBL94RgYLePqX7wpfNGgcQzrk
-id: html_year
-label: 'HTML Year'
-locked: true
-pattern: 'Y'
diff --git a/config/export/core.date_format.html_yearless_date.yml b/config/export/core.date_format.html_yearless_date.yml
deleted file mode 100644
index 4086e6fcd..000000000
--- a/config/export/core.date_format.html_yearless_date.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 4b16a3d3-4f22-4623-b5f5-ce756ad84d69
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 5VpawMrKPEPCkoO4YpPa0TDFO2dgiIHfTziJtwlmUxc
-id: html_yearless_date
-label: 'HTML Yearless date'
-locked: true
-pattern: m-d
diff --git a/config/export/core.date_format.long.yml b/config/export/core.date_format.long.yml
deleted file mode 100644
index 78e5c0321..000000000
--- a/config/export/core.date_format.long.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 9e3e259d-c845-4bbb-8316-dec2b0929dbb
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: og8sWXhBuHbLMw3CoiBEZjgqSyhFBFmcbUW_wLcfNbo
-id: long
-label: 'Default long date'
-locked: false
-pattern: 'l, F j, Y - H:i'
diff --git a/config/export/core.date_format.medium.yml b/config/export/core.date_format.medium.yml
deleted file mode 100644
index addfc4a53..000000000
--- a/config/export/core.date_format.medium.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 0991a663-34df-477d-99b7-15b5ac8d5664
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: nzL5d024NjXIX_8TlT6uFAu973lmfkmHklJC-2i9rAE
-id: medium
-label: 'Default medium date'
-locked: false
-pattern: 'D, m/d/Y - H:i'
diff --git a/config/export/core.date_format.short.yml b/config/export/core.date_format.short.yml
deleted file mode 100644
index 293819c82..000000000
--- a/config/export/core.date_format.short.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 91905f7c-cfb6-4074-a01d-c353cd8f8a87
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: AlzeyytA8InBgxIG9H2UDJYs3CG98Zj6yRsDKmlbZwA
-id: short
-label: 'Default short date'
-locked: false
-pattern: 'm/d/Y - H:i'
diff --git a/config/export/core.entity_form_display.block_content.basic.default.yml b/config/export/core.entity_form_display.block_content.basic.default.yml
deleted file mode 100644
index 18a3106ab..000000000
--- a/config/export/core.entity_form_display.block_content.basic.default.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: bb149ade-0593-477a-ac04-8b9280531a80
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-    - field.field.block_content.basic.body
-  module:
-    - text
-_core:
-  default_config_hash: jAps3FCxvKecABS_tgExbhCZrBLQB3bNPWw18WjE3ss
-id: block_content.basic.default
-targetEntityType: block_content
-bundle: basic
-mode: default
-content:
-  body:
-    type: text_textarea_with_summary
-    weight: -4
-    region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
-    third_party_settings: {  }
-  info:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.comment.comment.default.yml b/config/export/core.entity_form_display.comment.comment.default.yml
deleted file mode 100644
index 1c74f237a..000000000
--- a/config/export/core.entity_form_display.comment.comment.default.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: 7605c4ea-b2ac-4b35-95c9-8fbcaf2dc550
-langcode: en
-status: true
-dependencies:
-  config:
-    - comment.type.comment
-    - field.field.comment.comment.comment_body
-  module:
-    - text
-_core:
-  default_config_hash: I0Pa0aQvT_jawlPo9oz4FE3h_ickc55dYKTPl6gILes
-id: comment.comment.default
-targetEntityType: comment
-bundle: comment
-mode: default
-content:
-  author:
-    weight: -2
-    region: content
-  comment_body:
-    type: text_textarea
-    weight: 11
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  subject:
-    type: string_textfield
-    weight: 10
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.media.audio.default.yml b/config/export/core.entity_form_display.media.audio.default.yml
deleted file mode 100644
index b6053aa8b..000000000
--- a/config/export/core.entity_form_display.media.audio.default.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-uuid: 625643d5-db4a-45c8-8492-d7492308b4f9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.audio.field_file_size
-    - field.field.media.audio.field_media_audio_file
-    - field.field.media.audio.field_media_of
-    - field.field.media.audio.field_media_use
-    - field.field.media.audio.field_mime_type
-    - field.field.media.audio.field_original_name
-    - field.field.media.audio.field_track
-    - media.type.audio
-  module:
-    - file
-    - islandora
-    - path
-_core:
-  default_config_hash: Yn8eodNOBbempx1_qeBOIbHMk3lCLqSqLQ-FYSdm83A
-id: media.audio.default
-targetEntityType: media
-bundle: audio
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_audio_file:
-    type: file_generic
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  field_media_of:
-    type: entity_reference_autocomplete
-    weight: 3
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_media_use:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_original_name:
-    type: string_textarea
-    weight: 8
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_track:
-    type: media_track
-    weight: 9
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 10
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_file_size: true
-  field_mime_type: true
-  langcode: true
diff --git a/config/export/core.entity_form_display.media.document.default.yml b/config/export/core.entity_form_display.media.document.default.yml
deleted file mode 100644
index b51e1790c..000000000
--- a/config/export/core.entity_form_display.media.document.default.yml
+++ /dev/null
@@ -1,107 +0,0 @@
-uuid: 4c68e767-06fb-4fa8-b94d-fbc4d69f7c30
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.document.field_display_mode_for_viewer
-    - field.field.media.document.field_file_size
-    - field.field.media.document.field_media_document
-    - field.field.media.document.field_media_of
-    - field.field.media.document.field_media_use
-    - field.field.media.document.field_mime_type
-    - field.field.media.document.field_original_name
-    - media.type.document
-  module:
-    - file
-    - path
-    - view_mode_switch
-_core:
-  default_config_hash: H8rwcqLpsXqtZdgT7Gnf-Z9lUhlnRVKsK0eSEa1N3iw
-id: media.document.default
-targetEntityType: media
-bundle: document
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_display_mode_for_viewer:
-    type: view_mode_switch
-    weight: 8
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_document:
-    type: file_generic
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  field_media_of:
-    type: entity_reference_autocomplete
-    weight: 3
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_media_use:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_original_name:
-    type: string_textarea
-    weight: 7
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 9
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 9
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_file_size: true
-  field_mime_type: true
-  langcode: true
diff --git a/config/export/core.entity_form_display.media.extracted_text.default.yml b/config/export/core.entity_form_display.media.extracted_text.default.yml
deleted file mode 100644
index a92b802a0..000000000
--- a/config/export/core.entity_form_display.media.extracted_text.default.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-uuid: 118250de-d9a6-46bf-9cd8-83b757dc52f7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.extracted_text.field_edited_text
-    - field.field.media.extracted_text.field_media_file
-    - field.field.media.extracted_text.field_media_of
-    - field.field.media.extracted_text.field_media_use
-    - field.field.media.extracted_text.field_mime_type
-    - media.type.extracted_text
-  module:
-    - file
-    - path
-    - text
-_core:
-  default_config_hash: 0Zeu8012np-BZS2tUHhI5CnSeZbuJD7pUtXGIsgDUdk
-id: media.extracted_text.default
-targetEntityType: media
-bundle: extracted_text
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_edited_text:
-    type: text_textarea
-    weight: 7
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_media_file:
-    type: file_generic
-    weight: 6
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 1
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 5
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 2
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
diff --git a/config/export/core.entity_form_display.media.file.default.yml b/config/export/core.entity_form_display.media.file.default.yml
deleted file mode 100644
index da90f4132..000000000
--- a/config/export/core.entity_form_display.media.file.default.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-uuid: cd80b005-d315-44f3-8866-b01cb7e6d254
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.file.field_display_mode_for_viewer
-    - field.field.media.file.field_file_size
-    - field.field.media.file.field_media_file
-    - field.field.media.file.field_media_of
-    - field.field.media.file.field_media_use
-    - field.field.media.file.field_mime_type
-    - field.field.media.file.field_original_name
-    - media.type.file
-  module:
-    - file
-    - path
-    - view_mode_switch
-_core:
-  default_config_hash: KBFaIyU4BWuyhM9EC8IsREAxU8F0OqcQJ9a1V5HaiKo
-id: media.file.default
-targetEntityType: media
-bundle: file
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_display_mode_for_viewer:
-    type: view_mode_switch
-    weight: 27
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_file:
-    type: file_generic
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  field_media_of:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_media_use:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_original_name:
-    type: string_textarea
-    weight: 26
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 8
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 9
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_file_size: true
-  field_mime_type: true
-  langcode: true
diff --git a/config/export/core.entity_form_display.media.image.default.yml b/config/export/core.entity_form_display.media.image.default.yml
deleted file mode 100644
index 61d05e6f9..000000000
--- a/config/export/core.entity_form_display.media.image.default.yml
+++ /dev/null
@@ -1,111 +0,0 @@
-uuid: b7d7d96f-2367-487b-928e-3b0233e4ae37
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.image.field_display_mode_for_viewer
-    - field.field.media.image.field_file_size
-    - field.field.media.image.field_height
-    - field.field.media.image.field_media_image
-    - field.field.media.image.field_media_of
-    - field.field.media.image.field_media_use
-    - field.field.media.image.field_mime_type
-    - field.field.media.image.field_original_name
-    - field.field.media.image.field_width
-    - image.style.thumbnail
-    - media.type.image
-  module:
-    - image
-    - path
-    - view_mode_switch
-_core:
-  default_config_hash: 0m1---KA1hTxMlNoqo1kI1ZG5TBbGQy4sQ1rOMy9Ovg
-id: media.image.default
-targetEntityType: media
-bundle: image
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_display_mode_for_viewer:
-    type: view_mode_switch
-    weight: 27
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_image:
-    type: image_image
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  field_media_of:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_media_use:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_original_name:
-    type: string_textarea
-    weight: 26
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 8
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 9
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_file_size: true
-  field_height: true
-  field_mime_type: true
-  field_width: true
-  langcode: true
diff --git a/config/export/core.entity_form_display.media.remote_video.default.yml b/config/export/core.entity_form_display.media.remote_video.default.yml
deleted file mode 100644
index d25e05803..000000000
--- a/config/export/core.entity_form_display.media.remote_video.default.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-uuid: 542aadd3-1b53-43d8-ba06-f065cef7d431
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.remote_video.field_media_oembed_video
-    - media.type.remote_video
-  module:
-    - media
-    - path
-_core:
-  default_config_hash: pM8mGlwfpvfG_y5tZn0lGAXFLXz2_yKkL7MvWZsRqdA
-id: media.remote_video.default
-targetEntityType: media
-bundle: remote_video
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_oembed_video:
-    type: oembed_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  name: true
diff --git a/config/export/core.entity_form_display.media.video.default.yml b/config/export/core.entity_form_display.media.video.default.yml
deleted file mode 100644
index 3bb98b09d..000000000
--- a/config/export/core.entity_form_display.media.video.default.yml
+++ /dev/null
@@ -1,106 +0,0 @@
-uuid: 5ca545df-5264-4d07-96e3-2bde71e68ec7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.video.field_file_size
-    - field.field.media.video.field_media_of
-    - field.field.media.video.field_media_use
-    - field.field.media.video.field_media_video_file
-    - field.field.media.video.field_mime_type
-    - field.field.media.video.field_original_name
-    - field.field.media.video.field_track
-    - media.type.video
-  module:
-    - file
-    - islandora
-    - path
-_core:
-  default_config_hash: OmfTLG22H4-yDtPxlJffsgiBdIVPy_ioRtu7psvscpI
-id: media.video.default
-targetEntityType: media
-bundle: video
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_of:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_media_use:
-    type: options_buttons
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_media_video_file:
-    type: file_generic
-    weight: 1
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  field_original_name:
-    type: string_textarea
-    weight: 26
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_track:
-    type: media_track
-    weight: 27
-    region: content
-    settings:
-      progress_indicator: throbber
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 7
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 8
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 9
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_file_size: true
-  field_mime_type: true
-  langcode: true
diff --git a/config/export/core.entity_form_display.node.article.default.yml b/config/export/core.entity_form_display.node.article.default.yml
deleted file mode 100644
index 48bcbd502..000000000
--- a/config/export/core.entity_form_display.node.article.default.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-uuid: 29f0ee86-e434-418a-923a-721dee3d6b21
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.article.body
-    - field.field.node.article.comment
-    - field.field.node.article.field_image
-    - field.field.node.article.field_tags
-    - image.style.thumbnail
-    - node.type.article
-  module:
-    - comment
-    - image
-    - path
-    - text
-_core:
-  default_config_hash: Pzq9mzrsfoPf775qgEU_SUbHSro9pv1ga-Euh1Ykd_k
-id: node.article.default
-targetEntityType: node
-bundle: article
-mode: default
-content:
-  body:
-    type: text_textarea_with_summary
-    weight: 1
-    region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
-    third_party_settings: {  }
-  comment:
-    type: comment_default
-    weight: 20
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  created:
-    type: datetime_timestamp
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_image:
-    type: image_image
-    weight: 4
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-  field_tags:
-    type: entity_reference_autocomplete_tags
-    weight: 3
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    weight: 15
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 120
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    weight: 16
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  title:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.node.collection_object.default.yml b/config/export/core.entity_form_display.node.collection_object.default.yml
deleted file mode 100644
index 33448de50..000000000
--- a/config/export/core.entity_form_display.node.collection_object.default.yml
+++ /dev/null
@@ -1,331 +0,0 @@
-uuid: fd6deb42-cbff-4d9f-bb78-f4900da85632
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.collection_object.field_alternative_title
-    - field.field.node.collection_object.field_collection_contact_email
-    - field.field.node.collection_object.field_collection_contact_name
-    - field.field.node.collection_object.field_collection_number
-    - field.field.node.collection_object.field_date_captured
-    - field.field.node.collection_object.field_date_modified
-    - field.field.node.collection_object.field_date_valid
-    - field.field.node.collection_object.field_description
-    - field.field.node.collection_object.field_display_hints
-    - field.field.node.collection_object.field_edtf_date
-    - field.field.node.collection_object.field_edtf_date_created
-    - field.field.node.collection_object.field_edtf_date_issued
-    - field.field.node.collection_object.field_extent
-    - field.field.node.collection_object.field_featured_item
-    - field.field.node.collection_object.field_finding_aid
-    - field.field.node.collection_object.field_geographic_subject
-    - field.field.node.collection_object.field_linked_agent
-    - field.field.node.collection_object.field_member_of
-    - field.field.node.collection_object.field_model
-    - field.field.node.collection_object.field_resource_type
-    - field.field.node.collection_object.field_rights
-    - field.field.node.collection_object.field_subject_general
-    - field.field.node.collection_object.field_subjects_name
-    - field.field.node.collection_object.field_temporal_subject
-    - field.field.node.collection_object.field_unique_id
-    - field.field.node.collection_object.field_weight
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - link
-    - path
-_core:
-  default_config_hash: ZaLPFlxFe0NJApwG98_vYftEPMQzsxfMPP0pDPJrgTs
-id: node.collection_object.default
-targetEntityType: node
-bundle: collection_object
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_alternative_title:
-    type: string_textfield
-    weight: 121
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_collection_contact_email:
-    type: email_default
-    weight: 123
-    region: content
-    settings:
-      placeholder: ''
-      size: 60
-    third_party_settings: {  }
-  field_collection_contact_name:
-    type: string_textfield
-    weight: 124
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_collection_number:
-    type: string_textfield
-    weight: 125
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_date_captured:
-    type: edtf_default
-    weight: 135
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_modified:
-    type: edtf_default
-    weight: 138
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_valid:
-    type: edtf_default
-    weight: 139
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_description:
-    type: string_textarea
-    weight: 126
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_display_hints:
-    type: entity_reference_autocomplete
-    weight: 140
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_edtf_date:
-    type: edtf_default
-    weight: 134
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_edtf_date_created:
-    type: edtf_default
-    weight: 136
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_edtf_date_issued:
-    type: edtf_default
-    weight: 137
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_extent:
-    type: string_textfield
-    weight: 141
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_featured_item:
-    type: boolean_checkbox
-    weight: 127
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  field_finding_aid:
-    type: link_default
-    weight: 128
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_geographic_subject:
-    type: entity_reference_autocomplete
-    weight: 145
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_linked_agent:
-    type: typed_relation_default
-    weight: 142
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    third_party_settings: {  }
-  field_member_of:
-    type: entity_reference_autocomplete
-    weight: 130
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_model:
-    type: entity_reference_autocomplete
-    weight: 129
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_resource_type:
-    type: entity_reference_autocomplete
-    weight: 133
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_rights:
-    type: string_textfield
-    weight: 143
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_subject_general:
-    type: entity_reference_autocomplete
-    weight: 144
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_subjects_name:
-    type: entity_reference_autocomplete
-    weight: 146
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_temporal_subject:
-    type: entity_reference_autocomplete
-    weight: 147
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 131
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_weight:
-    type: number
-    weight: 132
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    weight: 15
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 120
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    weight: 16
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  title:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.node.islandora_object.default.yml b/config/export/core.entity_form_display.node.islandora_object.default.yml
deleted file mode 100644
index 9b31f09df..000000000
--- a/config/export/core.entity_form_display.node.islandora_object.default.yml
+++ /dev/null
@@ -1,943 +0,0 @@
-uuid: ec576230-8fc4-446e-94a2-58f3328e74c5
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - field_group
-    - geolocation
-    - link
-    - path
-    - text
-third_party_settings:
-  field_group:
-    group_structure:
-      children:
-        - langcode
-        - field_display_hints
-        - field_weight
-        - translation
-        - path
-        - status
-        - promote
-        - uid
-        - created
-        - sticky
-      label: System
-      region: content
-      parent_name: ''
-      weight: 23
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: ''
-        required_fields: true
-    group_required:
-      children:
-        - title
-        - field_model
-      label: Required
-      region: content
-      parent_name: ''
-      weight: 0
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: true
-        description: 'The title recorded here will be the main display title used within the system, and is limited to 255 characters. If your title is longer, enter a truncated version that will differentiate this resource from others in displays. Full titles longer than 255 characters may be optionally recorded below.'
-        required_fields: true
-    group_relationships:
-      children:
-        - field_member_of
-      label: Relationships
-      region: content
-      parent_name: ''
-      weight: 1
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: 'Relationships between this resource and other resources'
-        required_fields: true
-        weight: 0
-        formatter: closed
-        direction: vertical
-    group_title_details:
-      children:
-        - field_full_title
-        - field_alt_title
-      label: 'Title Details'
-      region: content
-      parent_name: ''
-      weight: 2
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: 'More specific title fields that are needed less frequently'
-        required_fields: true
-        weight: 0
-        formatter: closed
-        direction: vertical
-    group_identifiers:
-      children:
-        - field_identifier
-        - field_isbn
-        - field_oclc_number
-        - field_local_identifier
-        - field_pid
-      label: Identifiers
-      region: content
-      parent_name: ''
-      weight: 21
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: ''
-        required_fields: true
-    group_publication_details:
-      children:
-        - field_mode_of_issuance
-        - field_frequency
-      label: 'Publication Details'
-      region: content
-      parent_name: ''
-      weight: 9
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: ''
-        required_fields: true
-    group_additional_date_types:
-      children:
-        - field_edtf_date
-        - field_copyright_date
-        - field_date_valid
-        - field_date_captured
-        - field_date_modified
-      label: 'Additional Date Types'
-      region: content
-      parent_name: ''
-      weight: 7
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: 'Less-frequently needed fields for specific types of dates'
-        required_fields: true
-    group_specific_description_field:
-      children:
-        - field_abstract
-        - field_table_of_contents
-        - field_note
-      label: 'Specific Description Fields'
-      region: content
-      parent_name: ''
-      weight: 11
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: 'Fields that capture description elements of specific types'
-        required_fields: true
-    group_classification_:
-      children:
-        - field_dewey_classification
-        - field_lcc_classification
-        - field_classification
-      label: 'Classification '
-      region: content
-      parent_name: ''
-      weight: 20
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: ''
-        required_fields: true
-    group_specific_subject_types:
-      children:
-        - field_subject
-        - field_geographic_subject
-        - field_subjects_name
-        - field_temporal_subject
-        - group_geographic_coordinates
-      label: 'Specific Subject Types'
-      region: content
-      parent_name: ''
-      weight: 19
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: ''
-        required_fields: true
-    group_geographic_coordinates:
-      children:
-        - field_coordinates
-        - field_coordinates_text
-      label: 'Geographic Coordinates'
-      region: content
-      parent_name: group_specific_subject_types
-      weight: 22
-      format_type: details
-      format_settings:
-        classes: ''
-        id: ''
-        open: false
-        description: ''
-        required_fields: true
-_core:
-  default_config_hash: wnUDv31TLzQaxvdHct4EV2lXhhaWUIf_1g_d0fLUWs4
-id: node.islandora_object.default
-targetEntityType: node
-bundle: islandora_object
-mode: default
-content:
-  created:
-    type: datetime_timestamp
-    weight: 44
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_abstract:
-    type: text_textarea
-    weight: 14
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_alt_title:
-    type: string_textfield
-    weight: 9
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_alternative_title:
-    type: string_textfield
-    weight: 72
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_citable_url:
-    type: link_default
-    weight: 46
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_classification:
-    type: string_textfield
-    weight: 26
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_collection_number:
-    type: string_textfield
-    weight: 47
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_contributor:
-    type: typed_relation_default
-    weight: 48
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    third_party_settings: {  }
-  field_coordinates:
-    type: geolocation_latlng
-    weight: 23
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_coordinates_text:
-    type: string_textfield
-    weight: 24
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_copyright_and_use:
-    type: entity_reference_autocomplete
-    weight: 49
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_copyright_date:
-    type: edtf_default
-    weight: 14
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_copyright_holder:
-    type: entity_reference_autocomplete
-    weight: 50
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_creator:
-    type: typed_relation_default
-    weight: 51
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    third_party_settings: {  }
-  field_date_available:
-    type: edtf_default
-    weight: 52
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_captured:
-    type: edtf_default
-    weight: 17
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_copyrighted:
-    type: edtf_default
-    weight: 53
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_modified:
-    type: edtf_default
-    weight: 18
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_published:
-    type: edtf_default
-    weight: 54
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_valid:
-    type: edtf_default
-    weight: 16
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_description:
-    type: string_textarea
-    weight: 10
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_dewey_classification:
-    type: string_textfield
-    weight: 24
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_digital_identifier:
-    type: string_textfield
-    weight: 55
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_digital_publisher:
-    type: entity_reference_autocomplete
-    weight: 56
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_dspace_identifier:
-    type: link_default
-    weight: 57
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_dspace_item_id:
-    type: string_textfield
-    weight: 58
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_edition:
-    type: string_textfield
-    weight: 8
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_edtf_date:
-    type: edtf_default
-    weight: 13
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-      sets: false
-    third_party_settings: {  }
-  field_edtf_date_created:
-    type: edtf_default
-    weight: 6
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-      sets: false
-    third_party_settings: {  }
-  field_edtf_date_issued:
-    type: edtf_default
-    weight: 5
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-      sets: false
-    third_party_settings: {  }
-  field_extent:
-    type: string_textfield
-    weight: 16
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_featured_item:
-    type: boolean_checkbox
-    weight: 59
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  field_finding_aid:
-    type: link_default
-    weight: 60
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_frequency:
-    type: entity_reference_autocomplete
-    weight: 32
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_full_title:
-    type: string_textarea
-    weight: 8
-    region: content
-    settings:
-      rows: 2
-      placeholder: ''
-    third_party_settings: {  }
-  field_genre:
-    type: entity_reference_autocomplete
-    weight: 14
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_geographic_subject:
-    type: entity_reference_autocomplete
-    weight: 19
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_geoportal_link:
-    type: link_default
-    weight: 61
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_identifier:
-    type: string_textfield
-    weight: 18
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_is_part_of:
-    type: link_default
-    weight: 62
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_isbn:
-    type: string_textfield
-    weight: 19
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_issn:
-    type: string_textfield
-    weight: 63
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_item_barcode:
-    type: string_textfield
-    weight: 64
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_jhir:
-    type: link_default
-    weight: 65
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_language:
-    type: entity_reference_autocomplete
-    weight: 12
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_lcc_classification:
-    type: string_textfield
-    weight: 25
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_library_catalog_link:
-    type: link_default
-    weight: 66
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_linked_agent:
-    type: typed_relation_default
-    weight: 3
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    third_party_settings: {  }
-  field_local_identifier:
-    type: string_textfield
-    weight: 21
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_member_of:
-    type: entity_reference_autocomplete
-    weight: 33
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_mode_of_issuance:
-    type: entity_reference_autocomplete
-    weight: 31
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_model:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_note:
-    type: text_textarea
-    weight: 16
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_oclc_number:
-    type: string_textfield
-    weight: 20
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_physical_form:
-    type: entity_reference_autocomplete
-    weight: 15
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_pid:
-    type: string_textfield
-    weight: 22
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_place_published:
-    type: string_textfield
-    weight: 4
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_publisher:
-    type: entity_reference_autocomplete
-    weight: 67
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_publisher_country:
-    type: entity_reference_autocomplete
-    weight: 68
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_resource_type:
-    type: options_select
-    weight: 13
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_rights:
-    type: string_textfield
-    weight: 22
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_spatial_coverage:
-    type: entity_reference_autocomplete
-    weight: 69
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_subject:
-    type: entity_reference_autocomplete
-    weight: 18
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_subject_general:
-    type: entity_reference_autocomplete
-    weight: 17
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_subjects_name:
-    type: entity_reference_autocomplete
-    weight: 20
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_table_of_contents:
-    type: text_textarea
-    weight: 15
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_temporal_subject:
-    type: entity_reference_autocomplete
-    weight: 21
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 70
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_weight:
-    type: number
-    weight: 38
-    region: content
-    settings:
-      placeholder: ''
-    third_party_settings: {  }
-  field_years:
-    type: edtf_default
-    weight: 71
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 34
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 40
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    weight: 42
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 41
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    weight: 45
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  title:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  translation:
-    weight: 39
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 43
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden:
-  field_display_hints: true
-  field_place_published_country: true
diff --git a/config/export/core.entity_form_display.node.page.default.yml b/config/export/core.entity_form_display.node.page.default.yml
deleted file mode 100644
index 3f5f1b6f6..000000000
--- a/config/export/core.entity_form_display.node.page.default.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-uuid: 049183e3-2cc2-4292-a08e-9ab4f9d52c78
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.page.body
-    - node.type.page
-  module:
-    - path
-    - text
-_core:
-  default_config_hash: SfpLhPExzvR0MgFp0Wp7CrmgEnhcqQ-fXIWFhbf4ue0
-id: node.page.default
-targetEntityType: node
-bundle: page
-mode: default
-content:
-  body:
-    type: text_textarea_with_summary
-    weight: 31
-    region: content
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-      show_summary: false
-    third_party_settings: {  }
-  created:
-    type: datetime_timestamp
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  promote:
-    type: boolean_checkbox
-    weight: 15
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 120
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  sticky:
-    type: boolean_checkbox
-    weight: 16
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  title:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  uid:
-    type: entity_reference_autocomplete
-    weight: 5
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml b/config/export/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml
deleted file mode 100644
index 09e1600cc..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.copyright_and_use.default.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-uuid: 514b432e-6b7f-4334-8bab-5c2202278989
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.copyright_and_use.field_authority_link
-    - field.field.taxonomy_term.copyright_and_use.field_unique_id
-    - taxonomy.vocabulary.copyright_and_use
-  module:
-    - controlled_access_terms
-    - path
-    - text
-id: taxonomy_term.copyright_and_use.default
-targetEntityType: taxonomy_term
-bundle: copyright_and_use
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 101
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 102
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.corporate_body.default.yml b/config/export/core.entity_form_display.taxonomy_term.corporate_body.default.yml
deleted file mode 100644
index 7c3712533..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.corporate_body.default.yml
+++ /dev/null
@@ -1,177 +0,0 @@
-uuid: c5a46931-b77b-4993-8752-12b4e1fe64e4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.corporate_body.field_authority_link
-    - field.field.taxonomy_term.corporate_body.field_cat_date_begin
-    - field.field.taxonomy_term.corporate_body.field_cat_date_end
-    - field.field.taxonomy_term.corporate_body.field_corporate_body_alt_name
-    - field.field.taxonomy_term.corporate_body.field_date
-    - field.field.taxonomy_term.corporate_body.field_date_of_meeting_or_treaty
-    - field.field.taxonomy_term.corporate_body.field_location_of_meeting
-    - field.field.taxonomy_term.corporate_body.field_num_of_section_or_meet
-    - field.field.taxonomy_term.corporate_body.field_primary_name
-    - field.field.taxonomy_term.corporate_body.field_relationships
-    - field.field.taxonomy_term.corporate_body.field_subordinate_name
-    - field.field.taxonomy_term.corporate_body.field_type
-    - field.field.taxonomy_term.corporate_body.field_unique_id
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: Z26S89S-0cqYggliefiijqELUP7YKg5MMaf5abqH1Dg
-id: taxonomy_term.corporate_body.default
-targetEntityType: taxonomy_term
-bundle: corporate_body
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 7
-    region: content
-    settings:
-      rows: 9
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 3
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_cat_date_begin:
-    type: edtf_default
-    weight: 4
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-    third_party_settings: {  }
-  field_cat_date_end:
-    type: edtf_default
-    weight: 5
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-    third_party_settings: {  }
-  field_corporate_body_alt_name:
-    type: string_textfield
-    weight: 101
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_date:
-    type: edtf_default
-    weight: 106
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_date_of_meeting_or_treaty:
-    type: edtf_default
-    weight: 102
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_location_of_meeting:
-    type: string_textfield
-    weight: 103
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_num_of_section_or_meet:
-    type: string_textfield
-    weight: 104
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_primary_name:
-    type: string_textfield
-    weight: 105
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_relationships:
-    type: typed_relation_default
-    weight: 10
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_subordinate_name:
-    type: string_textfield
-    weight: 108
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_type:
-    type: options_select
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 107
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 2
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.country.default.yml b/config/export/core.entity_form_display.taxonomy_term.country.default.yml
deleted file mode 100644
index e78f1dbb1..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.country.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: 051a95e8-e371-4a04-b141-5209c0a7a3fc
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.country.field_authority_link
-    - taxonomy.vocabulary.country
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: jjCMjwGvyxCVjSwFLhyeWDvxXTXWAzxbICOos3vWXPs
-id: taxonomy_term.country.default
-targetEntityType: taxonomy_term
-bundle: country
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 31
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.family.default.yml b/config/export/core.entity_form_display.taxonomy_term.family.default.yml
deleted file mode 100644
index 91abf2a75..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.family.default.yml
+++ /dev/null
@@ -1,133 +0,0 @@
-uuid: 53b139ea-2c27-4ceb-a964-1a291090979b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.family.field_authority_link
-    - field.field.taxonomy_term.family.field_cat_date_begin
-    - field.field.taxonomy_term.family.field_cat_date_end
-    - field.field.taxonomy_term.family.field_date
-    - field.field.taxonomy_term.family.field_family_name
-    - field.field.taxonomy_term.family.field_relationships
-    - field.field.taxonomy_term.family.field_title_and_other_words
-    - field.field.taxonomy_term.family.field_unique_id
-    - taxonomy.vocabulary.family
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: BjyADh-LMRM2m1r1SnzCIMX7METfRii5LLfuf8vGb-o
-id: taxonomy_term.family.default
-targetEntityType: taxonomy_term
-bundle: family
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 122
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_cat_date_begin:
-    type: edtf_default
-    weight: 8
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-    third_party_settings: {  }
-  field_cat_date_end:
-    type: edtf_default
-    weight: 9
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-    third_party_settings: {  }
-  field_date:
-    type: edtf_default
-    weight: 124
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_family_name:
-    type: string_textfield
-    weight: 125
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_relationships:
-    type: typed_relation_default
-    weight: 123
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_title_and_other_words:
-    type: string_textfield
-    weight: 126
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 127
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.frequencies.default.yml b/config/export/core.entity_form_display.taxonomy_term.frequencies.default.yml
deleted file mode 100644
index f69b7c2e0..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.frequencies.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: 916bcfb0-6cb8-4ade-92fb-f19a7245a4b3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.frequencies.field_authority_link
-    - taxonomy.vocabulary.frequencies
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: e4LrcJMfC9M33DZk_7wIwjuF7ZQMqeNd9suJxr62Y6A
-id: taxonomy_term.frequencies.default
-targetEntityType: taxonomy_term
-bundle: frequencies
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 101
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.genre.default.yml b/config/export/core.entity_form_display.taxonomy_term.genre.default.yml
deleted file mode 100644
index 03584b072..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.genre.default.yml
+++ /dev/null
@@ -1,77 +0,0 @@
-uuid: 8a199d96-8a74-4023-8371-d5dc54c085bd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.genre.field_authority_link
-    - field.field.taxonomy_term.genre.field_unique_id
-    - taxonomy.vocabulary.genre
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: 3NcYhdVDz3Ze-NzJuK_Xzqi33TJmBFiKpiPgS8Z0izc
-id: taxonomy_term.genre.default
-targetEntityType: taxonomy_term
-bundle: genre
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 0
-    region: content
-    settings:
-      placeholder: ''
-      size: 60
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 2
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 101
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.geo_location.default.yml b/config/export/core.entity_form_display.taxonomy_term.geo_location.default.yml
deleted file mode 100644
index eab9f4b39..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.geo_location.default.yml
+++ /dev/null
@@ -1,109 +0,0 @@
-uuid: f35a007e-82cd-418b-b765-b67ba61c78ea
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.geo_location.field_authority_link
-    - field.field.taxonomy_term.geo_location.field_broader
-    - field.field.taxonomy_term.geo_location.field_geo_alt_name
-    - field.field.taxonomy_term.geo_location.field_geo_geolocation
-    - field.field.taxonomy_term.geo_location.field_unique_id
-    - taxonomy.vocabulary.geo_location
-  module:
-    - controlled_access_terms
-    - geolocation
-    - link
-    - path
-    - text
-_core:
-  default_config_hash: i7uRsqg6AGmJND-V2OR0NAM8KUwrvk4Nbt2DYNEhnlI
-id: taxonomy_term.geo_location.default
-targetEntityType: taxonomy_term
-bundle: geo_location
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 5
-    region: content
-    settings:
-      placeholder: ''
-      rows: 9
-      summary_rows: 3
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 3
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_broader:
-    type: link_default
-    weight: 29
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_geo_alt_name:
-    type: string_textfield
-    weight: 26
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_geo_geolocation:
-    type: geolocation_latlng
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 28
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 1
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 2
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  created: true
-  promote: true
-  sticky: true
-  uid: true
diff --git a/config/export/core.entity_form_display.taxonomy_term.islandora_display.default.yml b/config/export/core.entity_form_display.taxonomy_term.islandora_display.default.yml
deleted file mode 100644
index 9e0ba58be..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.islandora_display.default.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-uuid: 0b9a0a73-2728-477a-beed-66f6d783b750
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.islandora_display.field_external_uri
-    - taxonomy.vocabulary.islandora_display
-  module:
-    - link
-    - path
-    - text
-_core:
-  default_config_hash: BKrU19uYOV9lkGmYByQBzELCBoSQpme1Xg9bgdNUdNM
-id: taxonomy_term.islandora_display.default
-targetEntityType: taxonomy_term
-bundle: islandora_display
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 1
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_external_uri:
-    type: link_default
-    weight: 2
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 3
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.islandora_media_use.default.yml b/config/export/core.entity_form_display.taxonomy_term.islandora_media_use.default.yml
deleted file mode 100644
index 78066b63f..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.islandora_media_use.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: c58a25a7-6300-47db-9855-9baf65a8ce55
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.islandora_media_use.field_external_uri
-    - taxonomy.vocabulary.islandora_media_use
-  module:
-    - link
-    - path
-    - text
-_core:
-  default_config_hash: j5yJaNcQl6teTfPQonPyQC4t_WudF4iEzIPxxwC-81o
-id: taxonomy_term.islandora_media_use.default
-targetEntityType: taxonomy_term
-bundle: islandora_media_use
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 1
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_external_uri:
-    type: link_default
-    weight: 2
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 3
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.islandora_models.default.yml b/config/export/core.entity_form_display.taxonomy_term.islandora_models.default.yml
deleted file mode 100644
index 9b690f13c..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.islandora_models.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: 539b09f8-696d-4fa6-9136-4bd25362a4f2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.islandora_models.field_external_uri
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - link
-    - path
-    - text
-_core:
-  default_config_hash: '-r2-EeiU1FvA8VH1oRACzmiK9EYTflb0ITtbPnTxmS0'
-id: taxonomy_term.islandora_models.default
-targetEntityType: taxonomy_term
-bundle: islandora_models
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 1
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_external_uri:
-    type: link_default
-    weight: 2
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 3
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.issuance_modes.default.yml b/config/export/core.entity_form_display.taxonomy_term.issuance_modes.default.yml
deleted file mode 100644
index f77b6799e..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.issuance_modes.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: f3ac5fb6-803f-4453-84ec-9aca225d3d2b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.issuance_modes.field_authority_link
-    - taxonomy.vocabulary.issuance_modes
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: _j-CqXI61yrP5UpxIGFA1jlElMDGRnTZu9FLOHGMeOU
-id: taxonomy_term.issuance_modes.default
-targetEntityType: taxonomy_term
-bundle: issuance_modes
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 1
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 2
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 3
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 6
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.language.default.yml b/config/export/core.entity_form_display.taxonomy_term.language.default.yml
deleted file mode 100644
index c1b668c4d..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.language.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: a9581693-7ee5-4564-b793-c0a045f92068
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.language.field_authority_link
-    - taxonomy.vocabulary.language
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: C56opIwc14F8xGc0jbrPwVD4KSyLuhoBDfJT-3VUCUw
-id: taxonomy_term.language.default
-targetEntityType: taxonomy_term
-bundle: language
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 101
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.person.default.yml b/config/export/core.entity_form_display.taxonomy_term.person.default.yml
deleted file mode 100644
index e213fbe5a..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.person.default.yml
+++ /dev/null
@@ -1,181 +0,0 @@
-uuid: bf6b358a-55bf-47de-a39c-8dd73cb49a91
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.person.field_authority_link
-    - field.field.taxonomy_term.person.field_cat_date_begin
-    - field.field.taxonomy_term.person.field_cat_date_end
-    - field.field.taxonomy_term.person.field_date
-    - field.field.taxonomy_term.person.field_person_alternate_name
-    - field.field.taxonomy_term.person.field_preferred_name_fuller_form
-    - field.field.taxonomy_term.person.field_preferred_name_number
-    - field.field.taxonomy_term.person.field_preferred_name_prefix
-    - field.field.taxonomy_term.person.field_preferred_name_rest
-    - field.field.taxonomy_term.person.field_preferred_name_suffix
-    - field.field.taxonomy_term.person.field_primary_part_of_name
-    - field.field.taxonomy_term.person.field_relationships
-    - field.field.taxonomy_term.person.field_unique_id
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: lJpvaB2FNcQ3KUo85b0QbrBtpeX38YpRlPXskVn8p5k
-id: taxonomy_term.person.default
-targetEntityType: taxonomy_term
-bundle: person
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 5
-    region: content
-    settings:
-      rows: 9
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 1
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_cat_date_begin:
-    type: edtf_default
-    weight: 7
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-      sets: false
-    third_party_settings: {  }
-  field_cat_date_end:
-    type: edtf_default
-    weight: 8
-    region: content
-    settings:
-      strict_dates: false
-      intervals: false
-      sets: false
-    third_party_settings: {  }
-  field_date:
-    type: edtf_default
-    weight: 19
-    region: content
-    settings:
-      strict_dates: false
-      intervals: true
-      sets: false
-    third_party_settings: {  }
-  field_person_alternate_name:
-    type: string_textfield
-    weight: 11
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_preferred_name_fuller_form:
-    type: string_textfield
-    weight: 12
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_preferred_name_number:
-    type: string_textfield
-    weight: 13
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_preferred_name_prefix:
-    type: string_textfield
-    weight: 14
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_preferred_name_rest:
-    type: string_textfield
-    weight: 16
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_preferred_name_suffix:
-    type: string_textfield
-    weight: 17
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_primary_part_of_name:
-    type: string_textfield
-    weight: 15
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_relationships:
-    type: typed_relation_default
-    weight: 9
-    region: content
-    settings:
-      match_operator: CONTAINS
-      size: 60
-      placeholder: ''
-      match_limit: 10
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 18
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 10
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 6
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.physical_form.default.yml b/config/export/core.entity_form_display.taxonomy_term.physical_form.default.yml
deleted file mode 100644
index 2d0fb551f..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.physical_form.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: fe39faf5-c14b-4d95-8a5f-48bddb1d7896
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.physical_form.field_authority_link
-    - taxonomy.vocabulary.physical_form
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: FALkpj92dP_sBubaUE4lQ7bCKP53BZRSCTthWZ6FhyY
-id: taxonomy_term.physical_form.default
-targetEntityType: taxonomy_term
-bundle: physical_form
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 31
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.resource_types.default.yml b/config/export/core.entity_form_display.taxonomy_term.resource_types.default.yml
deleted file mode 100644
index 363d6fdbc..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.resource_types.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: 8449e6f4-5ecb-4c36-be18-81cf90071f0d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.resource_types.field_authority_link
-    - taxonomy.vocabulary.resource_types
-  module:
-    - link
-    - path
-    - text
-_core:
-  default_config_hash: Osl9c_Yf9MjIGTvFaf1MgaLn7-g6shLhCPymeG2iKt8
-id: taxonomy_term.resource_types.default
-targetEntityType: taxonomy_term
-bundle: resource_types
-mode: default
-content:
-  description:
-    type: text_textarea
-    weight: 1
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: link_default
-    weight: 2
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 3
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 5
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 4
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.subject.default.yml b/config/export/core.entity_form_display.taxonomy_term.subject.default.yml
deleted file mode 100644
index a9d12084e..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.subject.default.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-uuid: 295e8729-fc6f-43c8-8ce8-60258850b7cf
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.subject.field_authority_link
-    - field.field.taxonomy_term.subject.field_unique_id
-    - taxonomy.vocabulary.subject
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: _QSjbT7vTynU0RBGcZLX31hEIL3SXszK9Zt30QuJ07A
-id: taxonomy_term.subject.default
-targetEntityType: taxonomy_term
-bundle: subject
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 121
-    region: content
-    settings:
-      placeholder: ''
-      rows: 9
-      summary_rows: 3
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 123
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  field_unique_id:
-    type: string_textfield
-    weight: 124
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.taxonomy_term.temporal_subjects.default.yml b/config/export/core.entity_form_display.taxonomy_term.temporal_subjects.default.yml
deleted file mode 100644
index 50a51a988..000000000
--- a/config/export/core.entity_form_display.taxonomy_term.temporal_subjects.default.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-uuid: 076daa0b-d43d-4b45-a22f-50b270418ac9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.temporal_subjects.field_authority_link
-    - taxonomy.vocabulary.temporal_subjects
-  module:
-    - controlled_access_terms
-    - path
-    - text
-_core:
-  default_config_hash: MGm_H0jvw6Kixq5XAdLcR-H4I6Lr_9AplPWMBsVqubA
-id: taxonomy_term.temporal_subjects.default
-targetEntityType: taxonomy_term
-bundle: temporal_subjects
-mode: default
-content:
-  description:
-    type: text_textfield
-    weight: 0
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  field_authority_link:
-    type: authority_link_default
-    weight: 101
-    region: content
-    settings:
-      placeholder_url: ''
-      placeholder_title: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    region: content
-    settings:
-      include_locked: true
-    third_party_settings: {  }
-  name:
-    type: string_textfield
-    weight: -5
-    region: content
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  status:
-    type: boolean_checkbox
-    weight: 100
-    region: content
-    settings:
-      display_label: true
-    third_party_settings: {  }
-  translation:
-    weight: 10
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-hidden: {  }
diff --git a/config/export/core.entity_form_display.user.user.default.yml b/config/export/core.entity_form_display.user.user.default.yml
deleted file mode 100644
index c3883bd4f..000000000
--- a/config/export/core.entity_form_display.user.user.default.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 52d5e687-5f6f-449e-a757-2b49f8127fbf
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.user.user.user_picture
-    - image.style.thumbnail
-  module:
-    - image
-    - user
-_core:
-  default_config_hash: FaQ9Ptcpxpg30AtiqRDtl_8zbJArHP1LPfug_s59TOA
-id: user.user.default
-targetEntityType: user
-bundle: user
-mode: default
-content:
-  account:
-    weight: -10
-    region: content
-  contact:
-    weight: 5
-    region: content
-  language:
-    weight: 0
-    region: content
-  matomo:
-    weight: 3
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  path:
-    type: path
-    weight: 30
-    region: content
-    settings: {  }
-    third_party_settings: {  }
-  timezone:
-    weight: 6
-    region: content
-  user_picture:
-    type: image_image
-    weight: -1
-    region: content
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-hidden:
-  langcode: true
diff --git a/config/export/core.entity_form_mode.user.register.yml b/config/export/core.entity_form_mode.user.register.yml
deleted file mode 100644
index 9c320144d..000000000
--- a/config/export/core.entity_form_mode.user.register.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: f6e3baf9-6142-489f-b7bc-aa726d8ae7df
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI
-id: user.register
-label: Register
-targetEntityType: user
-cache: true
diff --git a/config/export/core.entity_view_display.block_content.basic.default.yml b/config/export/core.entity_view_display.block_content.basic.default.yml
deleted file mode 100644
index 8e4ddc568..000000000
--- a/config/export/core.entity_view_display.block_content.basic.default.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 0edb068f-8683-418e-83ef-d22346ccb5a4
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-    - field.field.block_content.basic.body
-  module:
-    - text
-_core:
-  default_config_hash: hBNNDTFwakREOTa6GGMqN899Iyrii0hInwSJtQ7Kj30
-id: block_content.basic.default
-targetEntityType: block_content
-bundle: basic
-mode: default
-content:
-  body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.comment.comment.default.yml b/config/export/core.entity_view_display.comment.comment.default.yml
deleted file mode 100644
index 23e019758..000000000
--- a/config/export/core.entity_view_display.comment.comment.default.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 55613f69-35a0-4f16-a286-9f4bb0421611
-langcode: en
-status: true
-dependencies:
-  config:
-    - comment.type.comment
-    - field.field.comment.comment.comment_body
-  module:
-    - text
-_core:
-  default_config_hash: aBQUGsQ46M4048fIlFuTXwl2zV0j2cJX89CTUobh9hA
-id: comment.comment.default
-targetEntityType: comment
-bundle: comment
-mode: default
-content:
-  comment_body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  links:
-    weight: 100
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.media.audio.default.yml b/config/export/core.entity_view_display.media.audio.default.yml
deleted file mode 100644
index 8dfe33ea3..000000000
--- a/config/export/core.entity_view_display.media.audio.default.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-uuid: 5b7add9a-d106-4f8a-a512-57752c119005
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.audio.field_file_size
-    - field.field.media.audio.field_media_audio_file
-    - field.field.media.audio.field_media_of
-    - field.field.media.audio.field_media_use
-    - field.field.media.audio.field_mime_type
-    - field.field.media.audio.field_original_name
-    - field.field.media.audio.field_track
-    - media.type.audio
-  module:
-    - islandora_audio
-_core:
-  default_config_hash: 2FZ_TcS2MGA5tQMskHrjKwJ_ucnDEdIfsnMG5MHhjyA
-id: media.audio.default
-targetEntityType: media
-bundle: audio
-mode: default
-content:
-  field_file_size:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  field_media_audio_file:
-    type: islandora_file_audio
-    label: visually_hidden
-    settings:
-      controls: true
-      autoplay: false
-      loop: false
-      multiple_file_display_type: tags
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_media_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_mime_type:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_original_name:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 101
-    region: content
-  name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_track: true
-  langcode: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.audio.file_download.yml b/config/export/core.entity_view_display.media.audio.file_download.yml
deleted file mode 100644
index b5e44a868..000000000
--- a/config/export/core.entity_view_display.media.audio.file_download.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: d967c8ef-8d1d-45bc-a320-d269ecf1666c
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.file_download
-    - field.field.media.audio.field_file_size
-    - field.field.media.audio.field_media_audio_file
-    - field.field.media.audio.field_media_of
-    - field.field.media.audio.field_media_use
-    - field.field.media.audio.field_mime_type
-    - field.field.media.audio.field_original_name
-    - field.field.media.audio.field_track
-    - media.type.audio
-  module:
-    - filehash
-_core:
-  default_config_hash: 2FZ_TcS2MGA5tQMskHrjKwJ_ucnDEdIfsnMG5MHhjyA
-id: media.audio.file_download
-targetEntityType: media
-bundle: audio
-mode: file_download
-content:
-  field_media_audio_file:
-    type: filehash_table
-    label: visually_hidden
-    settings:
-      algo: sha1
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_track: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.audio.source.yml b/config/export/core.entity_view_display.media.audio.source.yml
deleted file mode 100644
index b3fa917ec..000000000
--- a/config/export/core.entity_view_display.media.audio.source.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: dd97dd58-f360-444f-8c2a-9edbf8b85ce1
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.source
-    - field.field.media.audio.field_file_size
-    - field.field.media.audio.field_media_audio_file
-    - field.field.media.audio.field_media_of
-    - field.field.media.audio.field_media_use
-    - field.field.media.audio.field_mime_type
-    - field.field.media.audio.field_original_name
-    - field.field.media.audio.field_track
-    - media.type.audio
-  module:
-    - islandora_audio
-_core:
-  default_config_hash: WkacGkCcx7wkdncVI8sq5snOYKKAD2URkVHjFnqsXHE
-id: media.audio.source
-targetEntityType: media
-bundle: audio
-mode: source
-content:
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  field_media_audio_file:
-    type: islandora_file_audio
-    label: visually_hidden
-    settings:
-      controls: true
-      autoplay: false
-      loop: false
-      multiple_file_display_type: tags
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_file_size: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_track: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.document.default.yml b/config/export/core.entity_view_display.media.document.default.yml
deleted file mode 100644
index 4b359e652..000000000
--- a/config/export/core.entity_view_display.media.document.default.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-uuid: fe1b5651-e739-40e5-a6a7-45a6c31aef41
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.document.field_display_mode_for_viewer
-    - field.field.media.document.field_file_size
-    - field.field.media.document.field_media_document
-    - field.field.media.document.field_media_of
-    - field.field.media.document.field_media_use
-    - field.field.media.document.field_mime_type
-    - field.field.media.document.field_original_name
-    - media.type.document
-  module:
-    - file
-_core:
-  default_config_hash: 4yXGTC9oOSH5Olk67Ro48R69mP2Ya6EKedPLK10f-nM
-id: media.document.default
-targetEntityType: media
-bundle: document
-mode: default
-content:
-  field_file_size:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  field_media_document:
-    type: file_default
-    label: visually_hidden
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_media_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_mime_type:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_original_name:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  langcode: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.document.file_download.yml b/config/export/core.entity_view_display.media.document.file_download.yml
deleted file mode 100644
index 0ae65afb6..000000000
--- a/config/export/core.entity_view_display.media.document.file_download.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 7bc8f412-336b-4a2d-91e6-e0b94f380a6f
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.file_download
-    - field.field.media.document.field_display_mode_for_viewer
-    - field.field.media.document.field_file_size
-    - field.field.media.document.field_media_document
-    - field.field.media.document.field_media_of
-    - field.field.media.document.field_media_use
-    - field.field.media.document.field_mime_type
-    - field.field.media.document.field_original_name
-    - media.type.document
-  module:
-    - filehash
-_core:
-  default_config_hash: 4yXGTC9oOSH5Olk67Ro48R69mP2Ya6EKedPLK10f-nM
-id: media.document.file_download
-targetEntityType: media
-bundle: document
-mode: file_download
-content:
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  field_media_document:
-    type: filehash_table
-    label: visually_hidden
-    settings:
-      algo: sha1
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.document.pdfjs.yml b/config/export/core.entity_view_display.media.document.pdfjs.yml
deleted file mode 100644
index b95063607..000000000
--- a/config/export/core.entity_view_display.media.document.pdfjs.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: c8666889-2738-4390-845d-9c6765313f67
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.pdfjs
-    - field.field.media.document.field_display_mode_for_viewer
-    - field.field.media.document.field_file_size
-    - field.field.media.document.field_media_document
-    - field.field.media.document.field_media_of
-    - field.field.media.document.field_media_use
-    - field.field.media.document.field_mime_type
-    - field.field.media.document.field_original_name
-    - media.type.document
-  module:
-    - pdf
-_core:
-  default_config_hash: 6vOcvK9Iktr-wVFR-MWAJpJbmAMpLs0JBrBVHFoOdcQ
-id: media.document.pdfjs
-targetEntityType: media
-bundle: document
-mode: pdfjs
-content:
-  field_media_document:
-    type: pdf_default
-    label: visually_hidden
-    settings:
-      keep_pdfjs: '1'
-      width: 100%
-      height: 640px
-      page: ''
-      zoom: ''
-      custom_zoom: ''
-      pagemode: ''
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.document.source.yml b/config/export/core.entity_view_display.media.document.source.yml
deleted file mode 100644
index c07076690..000000000
--- a/config/export/core.entity_view_display.media.document.source.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-uuid: dc30dd56-c45d-42d1-8a66-58378a5511cc
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.source
-    - field.field.media.document.field_display_mode_for_viewer
-    - field.field.media.document.field_file_size
-    - field.field.media.document.field_media_document
-    - field.field.media.document.field_media_of
-    - field.field.media.document.field_media_use
-    - field.field.media.document.field_mime_type
-    - field.field.media.document.field_original_name
-    - media.type.document
-  module:
-    - file
-_core:
-  default_config_hash: 7dZMpQQwFR4OCRiqsp83SE85Nmq_SgDsgdIOMXpNxmI
-id: media.document.source
-targetEntityType: media
-bundle: document
-mode: source
-content:
-  field_media_document:
-    type: file_default
-    label: hidden
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.extracted_text.default.yml b/config/export/core.entity_view_display.media.extracted_text.default.yml
deleted file mode 100644
index 3994059ab..000000000
--- a/config/export/core.entity_view_display.media.extracted_text.default.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-uuid: 5195a688-8a5b-4467-9d83-7d2a98ee06ae
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.extracted_text.field_edited_text
-    - field.field.media.extracted_text.field_media_file
-    - field.field.media.extracted_text.field_media_of
-    - field.field.media.extracted_text.field_media_use
-    - field.field.media.extracted_text.field_mime_type
-    - media.type.extracted_text
-  module:
-    - file
-    - text
-    - user
-_core:
-  default_config_hash: 98rg2WZr7qjNh0gmlzYQcToIh749Znv-1ZYBDHYSAwc
-id: media.extracted_text.default
-targetEntityType: media
-bundle: extracted_text
-mode: default
-content:
-  created:
-    type: timestamp
-    label: hidden
-    settings:
-      date_format: medium
-      custom_date_format: ''
-      timezone: ''
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_edited_text:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_media_file:
-    type: file_default
-    label: above
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  uid:
-    type: author
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  field_media_use: true
-  field_mime_type: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
diff --git a/config/export/core.entity_view_display.media.file.default.yml b/config/export/core.entity_view_display.media.file.default.yml
deleted file mode 100644
index 53c847eed..000000000
--- a/config/export/core.entity_view_display.media.file.default.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-uuid: 5705a395-c403-4b35-a411-ff3460ecebea
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.file.field_display_mode_for_viewer
-    - field.field.media.file.field_file_size
-    - field.field.media.file.field_media_file
-    - field.field.media.file.field_media_of
-    - field.field.media.file.field_media_use
-    - field.field.media.file.field_mime_type
-    - field.field.media.file.field_original_name
-    - media.type.file
-  module:
-    - file
-_core:
-  default_config_hash: xvDrCk0MLOxsyqOt9bqbAvT-qq1yONc-knLG55Rf9Aw
-id: media.file.default
-targetEntityType: media
-bundle: file
-mode: default
-content:
-  field_file_size:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_media_file:
-    type: file_default
-    label: visually_hidden
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_media_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_mime_type:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_original_name:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  langcode: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.file.file_download.yml b/config/export/core.entity_view_display.media.file.file_download.yml
deleted file mode 100644
index 0fb4cb915..000000000
--- a/config/export/core.entity_view_display.media.file.file_download.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: e8adec66-2bdf-42b3-ba6e-18dbac816166
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.file_download
-    - field.field.media.file.field_display_mode_for_viewer
-    - field.field.media.file.field_file_size
-    - field.field.media.file.field_media_file
-    - field.field.media.file.field_media_of
-    - field.field.media.file.field_media_use
-    - field.field.media.file.field_mime_type
-    - field.field.media.file.field_original_name
-    - media.type.file
-  module:
-    - filehash
-_core:
-  default_config_hash: xvDrCk0MLOxsyqOt9bqbAvT-qq1yONc-knLG55Rf9Aw
-id: media.file.file_download
-targetEntityType: media
-bundle: file
-mode: file_download
-content:
-  field_media_file:
-    type: filehash_table
-    label: visually_hidden
-    settings:
-      algo: sha1
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.file.open_seadragon.yml b/config/export/core.entity_view_display.media.file.open_seadragon.yml
deleted file mode 100644
index 5be683dd1..000000000
--- a/config/export/core.entity_view_display.media.file.open_seadragon.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: b29b4c2b-8eed-46eb-a64b-4c89f83a51b9
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.open_seadragon
-    - field.field.media.file.field_display_mode_for_viewer
-    - field.field.media.file.field_file_size
-    - field.field.media.file.field_media_file
-    - field.field.media.file.field_media_of
-    - field.field.media.file.field_media_use
-    - field.field.media.file.field_mime_type
-    - field.field.media.file.field_original_name
-    - media.type.file
-  module:
-    - openseadragon
-_core:
-  default_config_hash: 1RU-4AH3ijXEa2J5JyfU1PqmtJfgLfPLCQL9qkNDb0U
-id: media.file.open_seadragon
-targetEntityType: media
-bundle: file
-mode: open_seadragon
-content:
-  field_media_file:
-    type: openseadragon_image
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.file.pdfjs.yml b/config/export/core.entity_view_display.media.file.pdfjs.yml
deleted file mode 100644
index 42c74a2ed..000000000
--- a/config/export/core.entity_view_display.media.file.pdfjs.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 3c858f32-8f9c-4ad8-928a-c56bb8529b4c
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.pdfjs
-    - field.field.media.file.field_display_mode_for_viewer
-    - field.field.media.file.field_file_size
-    - field.field.media.file.field_media_file
-    - field.field.media.file.field_media_of
-    - field.field.media.file.field_media_use
-    - field.field.media.file.field_mime_type
-    - field.field.media.file.field_original_name
-    - media.type.file
-  module:
-    - pdf
-_core:
-  default_config_hash: yAsoVBXZAeFYwVJ93Pwvjp8njirRyKVR1oZyGQa-pus
-id: media.file.pdfjs
-targetEntityType: media
-bundle: file
-mode: pdfjs
-content:
-  field_media_file:
-    type: pdf_default
-    label: visually_hidden
-    settings:
-      keep_pdfjs: '1'
-      width: 100%
-      height: 640px
-      page: ''
-      zoom: ''
-      custom_zoom: ''
-      pagemode: ''
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.file.source.yml b/config/export/core.entity_view_display.media.file.source.yml
deleted file mode 100644
index 0b9722f56..000000000
--- a/config/export/core.entity_view_display.media.file.source.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-uuid: 983b1e7c-02b0-42a1-ba82-8fa84f3110f9
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.source
-    - field.field.media.file.field_display_mode_for_viewer
-    - field.field.media.file.field_file_size
-    - field.field.media.file.field_media_file
-    - field.field.media.file.field_media_of
-    - field.field.media.file.field_media_use
-    - field.field.media.file.field_mime_type
-    - field.field.media.file.field_original_name
-    - media.type.file
-  module:
-    - file
-_core:
-  default_config_hash: fycfkDR1DcjLO5Lm6dWvsqBM45Mzl_EycZf83fqH2IU
-id: media.file.source
-targetEntityType: media
-bundle: file
-mode: source
-content:
-  field_media_file:
-    type: file_default
-    label: hidden
-    settings:
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.fits_technical_metadata.default.yml b/config/export/core.entity_view_display.media.fits_technical_metadata.default.yml
deleted file mode 100644
index 08c2af123..000000000
--- a/config/export/core.entity_view_display.media.fits_technical_metadata.default.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-uuid: a99c6379-32ad-4a01-9c4a-3fa4eba49872
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.fits_technical_metadata.field_complete
-    - field.field.media.fits_technical_metadata.field_file_size
-    - field.field.media.fits_technical_metadata.field_media_file
-    - field.field.media.fits_technical_metadata.field_media_of
-    - field.field.media.fits_technical_metadata.field_media_use
-    - field.field.media.fits_technical_metadata.field_mime_type
-    - field.field.media.fits_technical_metadata.fits_ois_file_information_md5che
-    - media.type.fits_technical_metadata
-  module:
-    - islandora_fits
-_core:
-  default_config_hash: eQIgNGtw_hfVQxGPLc_JeBC1l1whFSoMsEYYNx0vOv4
-id: media.fits_technical_metadata.default
-targetEntityType: media
-bundle: fits_technical_metadata
-mode: default
-content:
-  field_media_file:
-    type: fits_formatter
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_media_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_mime_type:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  created: true
-  field_complete: true
-  field_file_size: true
-  fits_ois_file_information_md5che: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.fits_technical_metadata.fits_technical_metadata.yml b/config/export/core.entity_view_display.media.fits_technical_metadata.fits_technical_metadata.yml
deleted file mode 100644
index 603a738b8..000000000
--- a/config/export/core.entity_view_display.media.fits_technical_metadata.fits_technical_metadata.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-uuid: b9103c3d-6bcc-4cf0-9e68-f9a74e63ae8f
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.fits_technical_metadata
-    - field.field.media.fits_technical_metadata.field_complete
-    - field.field.media.fits_technical_metadata.field_file_size
-    - field.field.media.fits_technical_metadata.field_media_file
-    - field.field.media.fits_technical_metadata.field_media_of
-    - field.field.media.fits_technical_metadata.field_media_use
-    - field.field.media.fits_technical_metadata.field_mime_type
-    - field.field.media.fits_technical_metadata.fits_ois_file_information_md5che
-    - image.style.thumbnail
-    - media.type.fits_technical_metadata
-  module:
-    - image
-    - islandora_fits
-    - user
-_core:
-  default_config_hash: 26WttTG6uQXIDjcL50RF8WEpTDsIDtDaUjZDd0AwBAg
-id: media.fits_technical_metadata.fits_technical_metadata
-targetEntityType: media
-bundle: fits_technical_metadata
-mode: fits_technical_metadata
-content:
-  created:
-    type: timestamp
-    label: hidden
-    settings:
-      date_format: medium
-      custom_date_format: ''
-      timezone: ''
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_media_file:
-    type: fits_formatter
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  thumbnail:
-    type: image
-    label: hidden
-    settings:
-      image_link: ''
-      image_style: thumbnail
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  uid:
-    type: author
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  field_complete: true
-  field_file_size: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  fits_ois_file_information_md5che: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.media.image.default.yml b/config/export/core.entity_view_display.media.image.default.yml
deleted file mode 100644
index 6797804e8..000000000
--- a/config/export/core.entity_view_display.media.image.default.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-uuid: befd9d16-a6f8-4587-b973-642390eab5e2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.image.field_display_mode_for_viewer
-    - field.field.media.image.field_file_size
-    - field.field.media.image.field_height
-    - field.field.media.image.field_media_image
-    - field.field.media.image.field_media_of
-    - field.field.media.image.field_media_use
-    - field.field.media.image.field_mime_type
-    - field.field.media.image.field_original_name
-    - field.field.media.image.field_width
-    - image.style.max_1300x1300
-    - media.type.image
-  module:
-    - image
-_core:
-  default_config_hash: mH-3GLriL2Vx34DOnmHTqPxMCEmqJLtesug6_H_6piM
-id: media.image.default
-targetEntityType: media
-bundle: image
-mode: default
-content:
-  field_file_size:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_height:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_media_image:
-    type: image
-    label: visually_hidden
-    settings:
-      image_link: ''
-      image_style: max_1300x1300
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_media_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_mime_type:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_original_name:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_width:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  langcode: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.image.file_download.yml b/config/export/core.entity_view_display.media.image.file_download.yml
deleted file mode 100644
index 1f5648caa..000000000
--- a/config/export/core.entity_view_display.media.image.file_download.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 9a552ec4-ca85-4bc0-810d-33239e07ea23
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.file_download
-    - field.field.media.image.field_display_mode_for_viewer
-    - field.field.media.image.field_file_size
-    - field.field.media.image.field_height
-    - field.field.media.image.field_media_image
-    - field.field.media.image.field_media_of
-    - field.field.media.image.field_media_use
-    - field.field.media.image.field_mime_type
-    - field.field.media.image.field_original_name
-    - field.field.media.image.field_width
-    - media.type.image
-  module:
-    - filehash
-_core:
-  default_config_hash: mH-3GLriL2Vx34DOnmHTqPxMCEmqJLtesug6_H_6piM
-id: media.image.file_download
-targetEntityType: media
-bundle: image
-mode: file_download
-content:
-  field_media_image:
-    type: filehash_table
-    label: visually_hidden
-    settings:
-      algo: sha1
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_height: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_width: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.image.open_seadragon.yml b/config/export/core.entity_view_display.media.image.open_seadragon.yml
deleted file mode 100644
index 86bbd1c7e..000000000
--- a/config/export/core.entity_view_display.media.image.open_seadragon.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 5e55832f-7ac8-4e4f-8f29-3efb87b24247
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.open_seadragon
-    - field.field.media.image.field_display_mode_for_viewer
-    - field.field.media.image.field_file_size
-    - field.field.media.image.field_height
-    - field.field.media.image.field_media_image
-    - field.field.media.image.field_media_of
-    - field.field.media.image.field_media_use
-    - field.field.media.image.field_mime_type
-    - field.field.media.image.field_original_name
-    - field.field.media.image.field_width
-    - media.type.image
-  module:
-    - openseadragon
-_core:
-  default_config_hash: gR-7blbYp7lcArjW4cg_S8RMu5ZeaN3lfh35Cjssgik
-id: media.image.open_seadragon
-targetEntityType: media
-bundle: image
-mode: open_seadragon
-content:
-  field_media_image:
-    type: openseadragon_image
-    label: visually_hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_height: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_width: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.image.source.yml b/config/export/core.entity_view_display.media.image.source.yml
deleted file mode 100644
index f43fecc1d..000000000
--- a/config/export/core.entity_view_display.media.image.source.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 67da4560-e668-4198-9a19-32f706b2b2c2
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.source
-    - field.field.media.image.field_display_mode_for_viewer
-    - field.field.media.image.field_file_size
-    - field.field.media.image.field_height
-    - field.field.media.image.field_media_image
-    - field.field.media.image.field_media_of
-    - field.field.media.image.field_media_use
-    - field.field.media.image.field_mime_type
-    - field.field.media.image.field_original_name
-    - field.field.media.image.field_width
-    - media.type.image
-  module:
-    - islandora
-_core:
-  default_config_hash: '-vLESMk73DIY-JW-T0G6sbYhKFRFBoIFxvByDS9wdJU'
-id: media.image.source
-targetEntityType: media
-bundle: image
-mode: source
-content:
-  field_media_image:
-    type: islandora_image
-    label: visually_hidden
-    settings:
-      image_link: content
-      image_style: ''
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_height: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_width: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.image.thumbnail.yml b/config/export/core.entity_view_display.media.image.thumbnail.yml
deleted file mode 100644
index 135909dd3..000000000
--- a/config/export/core.entity_view_display.media.image.thumbnail.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-uuid: bee6fc5a-6083-4917-a770-cacd702d4335
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.thumbnail
-    - field.field.media.image.field_display_mode_for_viewer
-    - field.field.media.image.field_file_size
-    - field.field.media.image.field_height
-    - field.field.media.image.field_media_image
-    - field.field.media.image.field_media_of
-    - field.field.media.image.field_media_use
-    - field.field.media.image.field_mime_type
-    - field.field.media.image.field_original_name
-    - field.field.media.image.field_width
-    - image.style.medium
-    - media.type.image
-  module:
-    - islandora
-_core:
-  default_config_hash: mH-3GLriL2Vx34DOnmHTqPxMCEmqJLtesug6_H_6piM
-id: media.image.thumbnail
-targetEntityType: media
-bundle: image
-mode: thumbnail
-content:
-  field_media_image:
-    type: islandora_image
-    label: visually_hidden
-    settings:
-      image_link: content
-      image_style: medium
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_display_mode_for_viewer: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_height: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_width: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.remote_video.default.yml b/config/export/core.entity_view_display.media.remote_video.default.yml
deleted file mode 100644
index 360cdd7bf..000000000
--- a/config/export/core.entity_view_display.media.remote_video.default.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-uuid: d33f983e-a295-4219-8597-4872741f9928
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.remote_video.field_media_oembed_video
-    - media.type.remote_video
-  module:
-    - media
-_core:
-  default_config_hash: zQoBQ0BtnMM_rlDdgftyu6eI4AVs9mo5K8xq7NFO2Zc
-id: media.remote_video.default
-targetEntityType: media
-bundle: remote_video
-mode: default
-content:
-  field_media_oembed_video:
-    type: oembed
-    label: hidden
-    settings:
-      max_width: 0
-      max_height: 0
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.video.default.yml b/config/export/core.entity_view_display.media.video.default.yml
deleted file mode 100644
index 0dcf2817e..000000000
--- a/config/export/core.entity_view_display.media.video.default.yml
+++ /dev/null
@@ -1,96 +0,0 @@
-uuid: fd4ad2f9-12de-4b26-a8cc-04dc896c78d1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.media.video.field_file_size
-    - field.field.media.video.field_media_of
-    - field.field.media.video.field_media_use
-    - field.field.media.video.field_media_video_file
-    - field.field.media.video.field_mime_type
-    - field.field.media.video.field_original_name
-    - field.field.media.video.field_track
-    - media.type.video
-  module:
-    - islandora_video
-_core:
-  default_config_hash: uu0AyLKPsOKaxVZYcZhYaPRZ7JOotztenkoxCiLJ51o
-id: media.video.default
-targetEntityType: media
-bundle: video
-mode: default
-content:
-  field_file_size:
-    type: number_integer
-    label: above
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  field_media_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_media_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_media_video_file:
-    type: islandora_file_video
-    label: visually_hidden
-    settings:
-      controls: true
-      autoplay: false
-      loop: false
-      multiple_file_display_type: tags
-      muted: false
-      width: 640
-      height: 480
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_mime_type:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_original_name:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 101
-    region: content
-  name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_track: true
-  langcode: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.video.file_download.yml b/config/export/core.entity_view_display.media.video.file_download.yml
deleted file mode 100644
index 777207561..000000000
--- a/config/export/core.entity_view_display.media.video.file_download.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 5212957a-1c4a-4268-be7c-5f38f62cfe72
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.file_download
-    - field.field.media.video.field_file_size
-    - field.field.media.video.field_media_of
-    - field.field.media.video.field_media_use
-    - field.field.media.video.field_media_video_file
-    - field.field.media.video.field_mime_type
-    - field.field.media.video.field_original_name
-    - field.field.media.video.field_track
-    - media.type.video
-  module:
-    - filehash
-_core:
-  default_config_hash: uu0AyLKPsOKaxVZYcZhYaPRZ7JOotztenkoxCiLJ51o
-id: media.video.file_download
-targetEntityType: media
-bundle: video
-mode: file_download
-content:
-  field_media_video_file:
-    type: filehash_table
-    label: visually_hidden
-    settings:
-      algo: sha1
-      use_description_as_link_text: true
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_file_size: true
-  field_gemini_uri: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_track: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.media.video.source.yml b/config/export/core.entity_view_display.media.video.source.yml
deleted file mode 100644
index 0aa178f6e..000000000
--- a/config/export/core.entity_view_display.media.video.source.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: 309bbcfa-8dfa-4e4c-8f00-67747f516075
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.source
-    - field.field.media.video.field_file_size
-    - field.field.media.video.field_media_of
-    - field.field.media.video.field_media_use
-    - field.field.media.video.field_media_video_file
-    - field.field.media.video.field_mime_type
-    - field.field.media.video.field_original_name
-    - field.field.media.video.field_track
-    - media.type.video
-  module:
-    - islandora_video
-_core:
-  default_config_hash: h5fVMfcI16Wt4zPnxik3f0JdSLeiSlk4h3a8IRBSa8w
-id: media.video.source
-targetEntityType: media
-bundle: video
-mode: source
-content:
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  field_media_video_file:
-    type: islandora_file_video
-    label: visually_hidden
-    settings:
-      controls: true
-      autoplay: false
-      loop: false
-      multiple_file_display_type: tags
-      muted: false
-      width: 640
-      height: 480
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  created: true
-  field_file_size: true
-  field_media_of: true
-  field_media_use: true
-  field_mime_type: true
-  field_original_name: true
-  field_track: true
-  langcode: true
-  name: true
-  search_api_excerpt: true
-  thumbnail: true
-  uid: true
diff --git a/config/export/core.entity_view_display.node.article.default.yml b/config/export/core.entity_view_display.node.article.default.yml
deleted file mode 100644
index 2785475ba..000000000
--- a/config/export/core.entity_view_display.node.article.default.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-uuid: 6fd3ab0e-3c7e-4db2-aac3-34636f33066f
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_display.comment.comment.default
-    - field.field.node.article.body
-    - field.field.node.article.comment
-    - field.field.node.article.field_image
-    - field.field.node.article.field_tags
-    - image.style.wide
-    - node.type.article
-  module:
-    - comment
-    - image
-    - text
-    - user
-_core:
-  default_config_hash: 7fb0j9HnIXfP9ndewzgPPzzeX_SV532wuYpkscrCMCk
-id: node.article.default
-targetEntityType: node
-bundle: article
-mode: default
-content:
-  body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  comment:
-    type: comment_default
-    label: above
-    settings:
-      view_mode: default
-      pager_id: 0
-    third_party_settings: {  }
-    weight: 110
-    region: content
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_thumbnail:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_image:
-    type: image
-    label: hidden
-    settings:
-      image_link: ''
-      image_style: wide
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: -1
-    region: content
-  field_tags:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.article.rss.yml b/config/export/core.entity_view_display.node.article.rss.yml
deleted file mode 100644
index 86b5775a2..000000000
--- a/config/export/core.entity_view_display.node.article.rss.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: d60a136a-bce0-409d-b3f2-badca7c8d1cd
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.rss
-    - field.field.node.article.body
-    - field.field.node.article.comment
-    - field.field.node.article.field_image
-    - field.field.node.article.field_tags
-    - node.type.article
-  module:
-    - user
-_core:
-  default_config_hash: 2rIr6K5Q0UQ9khg0zE_CK-PtJH76UL-BDDZcZnZzwCc
-id: node.article.rss
-targetEntityType: node
-bundle: article
-mode: rss
-content:
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_thumbnail:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  links:
-    weight: 100
-    region: content
-hidden:
-  body: true
-  comment: true
-  field_image: true
-  field_tags: true
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.article.teaser.yml b/config/export/core.entity_view_display.node.article.teaser.yml
deleted file mode 100644
index 201743ad0..000000000
--- a/config/export/core.entity_view_display.node.article.teaser.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-uuid: 5c6d195d-914f-411c-826a-329d8dbbf797
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - field.field.node.article.body
-    - field.field.node.article.comment
-    - field.field.node.article.field_image
-    - field.field.node.article.field_tags
-    - image.style.medium
-    - node.type.article
-  module:
-    - image
-    - text
-    - user
-_core:
-  default_config_hash: 83jX5ChAGdMzOxiDA_B1NjgebVMuD8lNVDgClg_QVP8
-id: node.article.teaser
-targetEntityType: node
-bundle: article
-mode: teaser
-content:
-  body:
-    type: text_summary_or_trimmed
-    label: hidden
-    settings:
-      trim_length: 600
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_thumbnail:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_image:
-    type: image
-    label: hidden
-    settings:
-      image_link: content
-      image_style: medium
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: -1
-    region: content
-  field_tags:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  links:
-    weight: 100
-    region: content
-hidden:
-  comment: true
-  field_image: true
-  field_tags: true
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.collection_object.default.yml b/config/export/core.entity_view_display.node.collection_object.default.yml
deleted file mode 100644
index 22a7a59f1..000000000
--- a/config/export/core.entity_view_display.node.collection_object.default.yml
+++ /dev/null
@@ -1,152 +0,0 @@
-uuid: 55a8afa7-46cc-4c68-8544-e3fbdf8f781a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.collection_object.field_alternative_title
-    - field.field.node.collection_object.field_collection_contact_email
-    - field.field.node.collection_object.field_collection_contact_name
-    - field.field.node.collection_object.field_collection_number
-    - field.field.node.collection_object.field_date_captured
-    - field.field.node.collection_object.field_date_modified
-    - field.field.node.collection_object.field_date_valid
-    - field.field.node.collection_object.field_description
-    - field.field.node.collection_object.field_display_hints
-    - field.field.node.collection_object.field_edtf_date
-    - field.field.node.collection_object.field_edtf_date_created
-    - field.field.node.collection_object.field_edtf_date_issued
-    - field.field.node.collection_object.field_extent
-    - field.field.node.collection_object.field_featured_item
-    - field.field.node.collection_object.field_finding_aid
-    - field.field.node.collection_object.field_geographic_subject
-    - field.field.node.collection_object.field_linked_agent
-    - field.field.node.collection_object.field_member_of
-    - field.field.node.collection_object.field_model
-    - field.field.node.collection_object.field_resource_type
-    - field.field.node.collection_object.field_rights
-    - field.field.node.collection_object.field_subject_general
-    - field.field.node.collection_object.field_subjects_name
-    - field.field.node.collection_object.field_temporal_subject
-    - field.field.node.collection_object.field_unique_id
-    - field.field.node.collection_object.field_weight
-    - node.type.collection_object
-  module:
-    - link
-    - user
-_core:
-  default_config_hash: nOH9IgmB5ShW70MAoolW3M2EJ8AvawslUIgyeQRZRJU
-id: node.collection_object.default
-targetEntityType: node
-bundle: collection_object
-mode: default
-content:
-  display_media_thumbnail:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 31
-    region: content
-  field_alternative_title:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_collection_contact_email:
-    type: basic_string
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_collection_contact_name:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_collection_number:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: true
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_description:
-    type: basic_string
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_finding_aid:
-    type: link
-    label: inline
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: inline
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_unique_id:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 12
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_entity_view_3: true
-  display_media_original_download: true
-  display_media_service_file: true
-  field_date_captured: true
-  field_date_modified: true
-  field_date_valid: true
-  field_display_hints: true
-  field_edtf_date: true
-  field_edtf_date_created: true
-  field_edtf_date_issued: true
-  field_extent: true
-  field_featured_item: true
-  field_geographic_subject: true
-  field_linked_agent: true
-  field_model: true
-  field_resource_type: true
-  field_rights: true
-  field_subject_general: true
-  field_subjects_name: true
-  field_temporal_subject: true
-  field_weight: true
-  islandora_fits_checksum: true
-  langcode: true
-  links: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
-  search_within_this_collection_link_entity_view_1: true
diff --git a/config/export/core.entity_view_display.node.collection_object.teaser.yml b/config/export/core.entity_view_display.node.collection_object.teaser.yml
deleted file mode 100644
index b96248d75..000000000
--- a/config/export/core.entity_view_display.node.collection_object.teaser.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-uuid: 1c5a88bf-dadd-42a1-8666-6b6dc24a2a43
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - field.field.node.collection_object.field_alternative_title
-    - field.field.node.collection_object.field_collection_contact_email
-    - field.field.node.collection_object.field_collection_contact_name
-    - field.field.node.collection_object.field_collection_number
-    - field.field.node.collection_object.field_date_captured
-    - field.field.node.collection_object.field_date_modified
-    - field.field.node.collection_object.field_date_valid
-    - field.field.node.collection_object.field_description
-    - field.field.node.collection_object.field_display_hints
-    - field.field.node.collection_object.field_edtf_date
-    - field.field.node.collection_object.field_edtf_date_created
-    - field.field.node.collection_object.field_edtf_date_issued
-    - field.field.node.collection_object.field_extent
-    - field.field.node.collection_object.field_featured_item
-    - field.field.node.collection_object.field_finding_aid
-    - field.field.node.collection_object.field_geographic_subject
-    - field.field.node.collection_object.field_linked_agent
-    - field.field.node.collection_object.field_member_of
-    - field.field.node.collection_object.field_model
-    - field.field.node.collection_object.field_resource_type
-    - field.field.node.collection_object.field_rights
-    - field.field.node.collection_object.field_subject_general
-    - field.field.node.collection_object.field_subjects_name
-    - field.field.node.collection_object.field_temporal_subject
-    - field.field.node.collection_object.field_unique_id
-    - field.field.node.collection_object.field_weight
-    - node.type.collection_object
-  module:
-    - user
-_core:
-  default_config_hash: mud0t7Nke0Cx1Re571_lTiqPsroupMMG1GgySIBGpFk
-id: node.collection_object.teaser
-targetEntityType: node
-bundle: collection_object
-mode: teaser
-content:
-  display_media_entity_view_3:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_alternative_title:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 3
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_original_download: true
-  display_media_service_file: true
-  display_media_thumbnail: true
-  field_collection_contact_email: true
-  field_collection_contact_name: true
-  field_collection_number: true
-  field_date_captured: true
-  field_date_modified: true
-  field_date_valid: true
-  field_description: true
-  field_display_hints: true
-  field_edtf_date: true
-  field_edtf_date_created: true
-  field_edtf_date_issued: true
-  field_extent: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_gemini_uri: true
-  field_geographic_subject: true
-  field_linked_agent: true
-  field_member_of: true
-  field_model: true
-  field_resource_type: true
-  field_rights: true
-  field_subject_general: true
-  field_subjects_name: true
-  field_temporal_subject: true
-  field_unique_id: true
-  field_weight: true
-  islandora_fits_checksum: true
-  langcode: true
-  links: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
-  search_within_this_collection_link_entity_view_1: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.binary.yml b/config/export/core.entity_view_display.node.islandora_object.binary.yml
deleted file mode 100644
index 5729ca8e8..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.binary.yml
+++ /dev/null
@@ -1,422 +0,0 @@
-uuid: 07db5594-3aa4-48e5-8ab0-36f5a498695f
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.binary
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - geolocation
-    - text
-    - user
-_core:
-  default_config_hash: F84yh2PZaba596y4gtXQiaS3901N7DBv3IcJDxcyr6Y
-id: node.islandora_object.binary
-targetEntityType: node
-bundle: islandora_object
-mode: binary
-content:
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  display_media_entity_view_3:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  display_media_original_download:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_abstract:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  field_coordinates:
-    type: geolocation_latlng
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 22
-    region: content
-  field_coordinates_text:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 23
-    region: content
-  field_description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_dewey_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 26
-    region: content
-  field_edition:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_edtf_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_edtf_date_created:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_edtf_date_issued:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_extent:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 18
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 33
-    region: content
-  field_genre:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_geographic_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 21
-    region: content
-  field_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_isbn:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 30
-    region: content
-  field_language:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_lcc_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 27
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_local_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 29
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_note:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
-    region: content
-  field_oclc_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 31
-    region: content
-  field_physical_form:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 17
-    region: content
-  field_place_published:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_resource_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_rights:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 20
-    region: content
-  field_subjects_name:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 25
-    region: content
-  field_table_of_contents:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 16
-    region: content
-  field_temporal_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 24
-    region: content
-  islandora_fits_checksum:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  search_within_this_collection_link_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_service_file: true
-  display_media_thumbnail: true
-  field_alt_title: true
-  field_alternative_title: true
-  field_citable_url: true
-  field_collection_number: true
-  field_contributor: true
-  field_copyright_and_use: true
-  field_copyright_date: true
-  field_copyright_holder: true
-  field_creator: true
-  field_date_available: true
-  field_date_captured: true
-  field_date_copyrighted: true
-  field_date_modified: true
-  field_date_published: true
-  field_date_valid: true
-  field_digital_identifier: true
-  field_digital_publisher: true
-  field_display_hints: true
-  field_dspace_identifier: true
-  field_dspace_item_id: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_frequency: true
-  field_full_title: true
-  field_geoportal_link: true
-  field_is_part_of: true
-  field_issn: true
-  field_item_barcode: true
-  field_jhir: true
-  field_library_catalog_link: true
-  field_mode_of_issuance: true
-  field_model: true
-  field_pid: true
-  field_place_published_country: true
-  field_publisher: true
-  field_publisher_country: true
-  field_spatial_coverage: true
-  field_subject_general: true
-  field_unique_id: true
-  field_weight: true
-  field_years: true
-  langcode: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.default.yml b/config/export/core.entity_view_display.node.islandora_object.default.yml
deleted file mode 100644
index 040f64373..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.default.yml
+++ /dev/null
@@ -1,738 +0,0 @@
-uuid: 33b47944-9724-4a7a-88ad-2198357b9c5e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - geolocation
-    - link
-    - text
-    - user
-_core:
-  default_config_hash: 7nAsgKpklfcldz5UjF5QnwGQqa2f2zypALWMvnJ8PeI
-id: node.islandora_object.default
-targetEntityType: node
-bundle: islandora_object
-mode: default
-content:
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 44
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  display_media_original_download:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 43
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_abstract:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_alt_title:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_alternative_title:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 71
-    region: content
-  field_citable_url:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 45
-    region: content
-  field_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 36
-    region: content
-  field_collection_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 46
-    region: content
-  field_contributor:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 47
-    region: content
-  field_coordinates:
-    type: geolocation_latlng
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
-    region: content
-  field_coordinates_text:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 33
-    region: content
-  field_copyright_and_use:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 48
-    region: content
-  field_copyright_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_copyright_holder:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 49
-    region: content
-  field_creator:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 50
-    region: content
-  field_date_available:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 51
-    region: content
-  field_date_captured:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_date_copyrighted:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 52
-    region: content
-  field_date_modified:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_date_published:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 53
-    region: content
-  field_date_valid:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 18
-    region: content
-  field_dewey_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 34
-    region: content
-  field_digital_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 54
-    region: content
-  field_digital_publisher:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 55
-    region: content
-  field_dspace_identifier:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 56
-    region: content
-  field_dspace_item_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 57
-    region: content
-  field_edition:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_edtf_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_edtf_date_created:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_edtf_date_issued:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_extent:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 26
-    region: content
-  field_featured_item:
-    type: boolean
-    label: above
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-    weight: 58
-    region: content
-  field_finding_aid:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 59
-    region: content
-  field_frequency:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 17
-    region: content
-  field_full_title:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 42
-    region: content
-  field_genre:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 24
-    region: content
-  field_geographic_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 29
-    region: content
-  field_geoportal_link:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 60
-    region: content
-  field_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 37
-    region: content
-  field_is_part_of:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 61
-    region: content
-  field_isbn:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 38
-    region: content
-  field_issn:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 62
-    region: content
-  field_item_barcode:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 63
-    region: content
-  field_jhir:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 64
-    region: content
-  field_language:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 22
-    region: content
-  field_lcc_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 35
-    region: content
-  field_library_catalog_link:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 65
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_local_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 40
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_mode_of_issuance:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 16
-    region: content
-  field_note:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 21
-    region: content
-  field_oclc_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 39
-    region: content
-  field_physical_form:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 25
-    region: content
-  field_place_published:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_publisher:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 66
-    region: content
-  field_publisher_country:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 67
-    region: content
-  field_resource_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 23
-    region: content
-  field_rights:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 41
-    region: content
-  field_spatial_coverage:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 68
-    region: content
-  field_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  field_subject_general:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 27
-    region: content
-  field_subjects_name:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 30
-    region: content
-  field_table_of_contents:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 20
-    region: content
-  field_temporal_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 31
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 69
-    region: content
-  field_years:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 70
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  search_within_this_collection_link_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  display_media_entity_view_3: true
-  display_media_thumbnail: true
-  field_display_hints: true
-  field_model: true
-  field_pid: true
-  field_place_published_country: true
-  field_weight: true
-  islandora_fits_checksum: true
-  langcode: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.open_seadragon.yml b/config/export/core.entity_view_display.node.islandora_object.open_seadragon.yml
deleted file mode 100644
index 5845a919b..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.open_seadragon.yml
+++ /dev/null
@@ -1,422 +0,0 @@
-uuid: 6ef6f184-e296-447c-8306-9537a7ecd9e2
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.open_seadragon
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - geolocation
-    - text
-    - user
-_core:
-  default_config_hash: Ng6UdUGTRjKU2K_cTs3kd41mAS-Vmj598dpgLXaDsNQ
-id: node.islandora_object.open_seadragon
-targetEntityType: node
-bundle: islandora_object
-mode: open_seadragon
-content:
-  display_media_entity_view_3:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  display_media_original_download:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_abstract:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  field_coordinates:
-    type: geolocation_latlng
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 22
-    region: content
-  field_coordinates_text:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 23
-    region: content
-  field_description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_dewey_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 26
-    region: content
-  field_edition:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_edtf_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_edtf_date_created:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_edtf_date_issued:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_extent:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 18
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 33
-    region: content
-  field_genre:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_geographic_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 21
-    region: content
-  field_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_isbn:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 30
-    region: content
-  field_language:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_lcc_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 27
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_local_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 29
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_note:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
-    region: content
-  field_oclc_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 31
-    region: content
-  field_physical_form:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 17
-    region: content
-  field_place_published:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_resource_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_rights:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 20
-    region: content
-  field_subjects_name:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 25
-    region: content
-  field_table_of_contents:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 16
-    region: content
-  field_temporal_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 24
-    region: content
-  islandora_fits_checksum:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  openseadragon_media_evas_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  search_within_this_collection_link_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_entity_view_2: true
-  display_media_service_file: true
-  display_media_thumbnail: true
-  field_alt_title: true
-  field_alternative_title: true
-  field_citable_url: true
-  field_collection_number: true
-  field_contributor: true
-  field_copyright_and_use: true
-  field_copyright_date: true
-  field_copyright_holder: true
-  field_creator: true
-  field_date_available: true
-  field_date_captured: true
-  field_date_copyrighted: true
-  field_date_modified: true
-  field_date_published: true
-  field_date_valid: true
-  field_digital_identifier: true
-  field_digital_publisher: true
-  field_display_hints: true
-  field_dspace_identifier: true
-  field_dspace_item_id: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_frequency: true
-  field_full_title: true
-  field_geoportal_link: true
-  field_is_part_of: true
-  field_issn: true
-  field_item_barcode: true
-  field_jhir: true
-  field_library_catalog_link: true
-  field_mode_of_issuance: true
-  field_model: true
-  field_pid: true
-  field_place_published_country: true
-  field_publisher: true
-  field_publisher_country: true
-  field_spatial_coverage: true
-  field_subject_general: true
-  field_unique_id: true
-  field_weight: true
-  field_years: true
-  langcode: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.pdfjs.yml b/config/export/core.entity_view_display.node.islandora_object.pdfjs.yml
deleted file mode 100644
index bf6dd463f..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.pdfjs.yml
+++ /dev/null
@@ -1,422 +0,0 @@
-uuid: c462aab8-55d3-4721-8c20-f19374ba6075
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.pdfjs
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - geolocation
-    - text
-    - user
-_core:
-  default_config_hash: '-Vv4WbpVPAiJnQKMrjkVm2ZOUkPsp6kZJUfH_mPD6RQ'
-id: node.islandora_object.pdfjs
-targetEntityType: node
-bundle: islandora_object
-mode: pdfjs
-content:
-  display_media_entity_view_3:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_original_download:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_abstract:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  field_coordinates:
-    type: geolocation_latlng
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 22
-    region: content
-  field_coordinates_text:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 23
-    region: content
-  field_description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_dewey_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 26
-    region: content
-  field_edition:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_edtf_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_edtf_date_created:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_edtf_date_issued:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_extent:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 18
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 30
-    region: content
-  field_genre:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_geographic_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 21
-    region: content
-  field_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_isbn:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 31
-    region: content
-  field_language:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_lcc_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 27
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_local_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 29
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_note:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 33
-    region: content
-  field_oclc_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 32
-    region: content
-  field_physical_form:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 17
-    region: content
-  field_place_published:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_resource_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_rights:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 20
-    region: content
-  field_subjects_name:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 25
-    region: content
-  field_table_of_contents:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 16
-    region: content
-  field_temporal_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 24
-    region: content
-  islandora_fits_checksum:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  pdfjs_media_evas_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  search_within_this_collection_link_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_entity_view_2: true
-  display_media_service_file: true
-  display_media_thumbnail: true
-  field_alt_title: true
-  field_alternative_title: true
-  field_citable_url: true
-  field_collection_number: true
-  field_contributor: true
-  field_copyright_and_use: true
-  field_copyright_date: true
-  field_copyright_holder: true
-  field_creator: true
-  field_date_available: true
-  field_date_captured: true
-  field_date_copyrighted: true
-  field_date_modified: true
-  field_date_published: true
-  field_date_valid: true
-  field_digital_identifier: true
-  field_digital_publisher: true
-  field_display_hints: true
-  field_dspace_identifier: true
-  field_dspace_item_id: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_frequency: true
-  field_full_title: true
-  field_geoportal_link: true
-  field_is_part_of: true
-  field_issn: true
-  field_item_barcode: true
-  field_jhir: true
-  field_library_catalog_link: true
-  field_mode_of_issuance: true
-  field_model: true
-  field_pid: true
-  field_place_published_country: true
-  field_publisher: true
-  field_publisher_country: true
-  field_spatial_coverage: true
-  field_subject_general: true
-  field_unique_id: true
-  field_weight: true
-  field_years: true
-  langcode: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.search_index.yml b/config/export/core.entity_view_display.node.islandora_object.search_index.yml
deleted file mode 100644
index 9435f80c0..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.search_index.yml
+++ /dev/null
@@ -1,503 +0,0 @@
-uuid: 7dc00254-0960-4016-a55e-70edee4697f7
-langcode: en
-status: false
-dependencies:
-  config:
-    - core.entity_view_mode.node.search_index
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - geolocation
-    - text
-    - user
-_core:
-  default_config_hash: 7nAsgKpklfcldz5UjF5QnwGQqa2f2zypALWMvnJ8PeI
-id: node.islandora_object.search_index
-targetEntityType: node
-bundle: islandora_object
-mode: search_index
-content:
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 44
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  display_media_original_download:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 43
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_abstract:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 19
-    region: content
-  field_alt_title:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 36
-    region: content
-  field_coordinates:
-    type: geolocation_latlng
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 32
-    region: content
-  field_coordinates_text:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 33
-    region: content
-  field_copyright_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_date_captured:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_date_modified:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_date_valid:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_description:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 18
-    region: content
-  field_dewey_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 34
-    region: content
-  field_edition:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_edtf_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_edtf_date_created:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_edtf_date_issued:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_extent:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 26
-    region: content
-  field_frequency:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 17
-    region: content
-  field_full_title:
-    type: basic_string
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_gemini_uri:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 42
-    region: content
-  field_genre:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 24
-    region: content
-  field_geographic_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 29
-    region: content
-  field_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 37
-    region: content
-  field_isbn:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 38
-    region: content
-  field_language:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 22
-    region: content
-  field_lcc_classification:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 35
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_local_identifier:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 40
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_mode_of_issuance:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 16
-    region: content
-  field_note:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 21
-    region: content
-  field_oclc_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 39
-    region: content
-  field_physical_form:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 25
-    region: content
-  field_place_published:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_resource_type:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 23
-    region: content
-  field_rights:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 41
-    region: content
-  field_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 28
-    region: content
-  field_subject_general:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 27
-    region: content
-  field_subjects_name:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 30
-    region: content
-  field_table_of_contents:
-    type: text_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 20
-    region: content
-  field_temporal_subject:
-    type: entity_reference_label
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 31
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  search_within_this_collection_link_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  display_media_entity_view_3: true
-  display_media_thumbnail: true
-  field_alternative_title: true
-  field_citable_url: true
-  field_collection_number: true
-  field_contributor: true
-  field_copyright_and_use: true
-  field_copyright_holder: true
-  field_creator: true
-  field_date_available: true
-  field_date_copyrighted: true
-  field_date_published: true
-  field_digital_identifier: true
-  field_digital_publisher: true
-  field_display_hints: true
-  field_dspace_identifier: true
-  field_dspace_item_id: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_geoportal_link: true
-  field_is_part_of: true
-  field_issn: true
-  field_item_barcode: true
-  field_jhir: true
-  field_library_catalog_link: true
-  field_model: true
-  field_pid: true
-  field_place_published_country: true
-  field_publisher: true
-  field_publisher_country: true
-  field_spatial_coverage: true
-  field_unique_id: true
-  field_weight: true
-  field_years: true
-  islandora_fits_checksum: true
-  langcode: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.search_result.yml b/config/export/core.entity_view_display.node.islandora_object.search_result.yml
deleted file mode 100644
index 40e771035..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.search_result.yml
+++ /dev/null
@@ -1,268 +0,0 @@
-uuid: 0f9f6b23-0a1b-4d28-b9e7-cbded2204478
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.search_result
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - text
-    - user
-_core:
-  default_config_hash: 7nAsgKpklfcldz5UjF5QnwGQqa2f2zypALWMvnJ8PeI
-id: node.islandora_object.search_result
-targetEntityType: node
-bundle: islandora_object
-mode: search_result
-content:
-  field_abstract:
-    type: text_trimmed
-    label: inline
-    settings:
-      trim_length: 600
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_description:
-    type: basic_string
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_edition:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_edtf_date:
-    type: edtf_default
-    label: inline
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_edtf_date_created:
-    type: edtf_default
-    label: inline
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_edtf_date_issued:
-    type: edtf_default
-    label: inline
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_identifier:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: hidden
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_member_of:
-    type: entity_reference_label
-    label: inline
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_resource_type:
-    type: entity_reference_label
-    label: inline
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  links:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  search_api_excerpt:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 11
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_entity_view_2: true
-  display_media_entity_view_3: true
-  display_media_original_download: true
-  display_media_service_file: true
-  display_media_thumbnail: true
-  field_alt_title: true
-  field_alternative_title: true
-  field_citable_url: true
-  field_classification: true
-  field_collection_number: true
-  field_contributor: true
-  field_coordinates: true
-  field_coordinates_text: true
-  field_copyright_and_use: true
-  field_copyright_date: true
-  field_copyright_holder: true
-  field_creator: true
-  field_date_available: true
-  field_date_captured: true
-  field_date_copyrighted: true
-  field_date_modified: true
-  field_date_published: true
-  field_date_valid: true
-  field_dewey_classification: true
-  field_digital_identifier: true
-  field_digital_publisher: true
-  field_display_hints: true
-  field_dspace_identifier: true
-  field_dspace_item_id: true
-  field_extent: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_frequency: true
-  field_full_title: true
-  field_gemini_uri: true
-  field_genre: true
-  field_geographic_subject: true
-  field_geoportal_link: true
-  field_is_part_of: true
-  field_isbn: true
-  field_issn: true
-  field_item_barcode: true
-  field_jhir: true
-  field_language: true
-  field_lcc_classification: true
-  field_library_catalog_link: true
-  field_local_identifier: true
-  field_mode_of_issuance: true
-  field_model: true
-  field_note: true
-  field_oclc_number: true
-  field_physical_form: true
-  field_pid: true
-  field_place_published: true
-  field_place_published_country: true
-  field_publisher: true
-  field_publisher_country: true
-  field_rights: true
-  field_spatial_coverage: true
-  field_subject: true
-  field_subject_general: true
-  field_subjects_name: true
-  field_table_of_contents: true
-  field_temporal_subject: true
-  field_unique_id: true
-  field_weight: true
-  field_years: true
-  islandora_fits_checksum: true
-  langcode: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_within_this_collection_link_entity_view_1: true
diff --git a/config/export/core.entity_view_display.node.islandora_object.teaser.yml b/config/export/core.entity_view_display.node.islandora_object.teaser.yml
deleted file mode 100644
index 855ac7bd1..000000000
--- a/config/export/core.entity_view_display.node.islandora_object.teaser.yml
+++ /dev/null
@@ -1,190 +0,0 @@
-uuid: 7f1af8fc-1c67-447a-a195-7b8ec5961082
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - field.field.node.islandora_object.field_abstract
-    - field.field.node.islandora_object.field_alt_title
-    - field.field.node.islandora_object.field_alternative_title
-    - field.field.node.islandora_object.field_citable_url
-    - field.field.node.islandora_object.field_classification
-    - field.field.node.islandora_object.field_collection_number
-    - field.field.node.islandora_object.field_contributor
-    - field.field.node.islandora_object.field_coordinates
-    - field.field.node.islandora_object.field_coordinates_text
-    - field.field.node.islandora_object.field_copyright_and_use
-    - field.field.node.islandora_object.field_copyright_date
-    - field.field.node.islandora_object.field_copyright_holder
-    - field.field.node.islandora_object.field_creator
-    - field.field.node.islandora_object.field_date_available
-    - field.field.node.islandora_object.field_date_captured
-    - field.field.node.islandora_object.field_date_copyrighted
-    - field.field.node.islandora_object.field_date_modified
-    - field.field.node.islandora_object.field_date_published
-    - field.field.node.islandora_object.field_date_valid
-    - field.field.node.islandora_object.field_description
-    - field.field.node.islandora_object.field_dewey_classification
-    - field.field.node.islandora_object.field_digital_identifier
-    - field.field.node.islandora_object.field_digital_publisher
-    - field.field.node.islandora_object.field_display_hints
-    - field.field.node.islandora_object.field_dspace_identifier
-    - field.field.node.islandora_object.field_dspace_item_id
-    - field.field.node.islandora_object.field_edition
-    - field.field.node.islandora_object.field_edtf_date
-    - field.field.node.islandora_object.field_edtf_date_created
-    - field.field.node.islandora_object.field_edtf_date_issued
-    - field.field.node.islandora_object.field_extent
-    - field.field.node.islandora_object.field_featured_item
-    - field.field.node.islandora_object.field_finding_aid
-    - field.field.node.islandora_object.field_frequency
-    - field.field.node.islandora_object.field_full_title
-    - field.field.node.islandora_object.field_genre
-    - field.field.node.islandora_object.field_geographic_subject
-    - field.field.node.islandora_object.field_geoportal_link
-    - field.field.node.islandora_object.field_identifier
-    - field.field.node.islandora_object.field_is_part_of
-    - field.field.node.islandora_object.field_isbn
-    - field.field.node.islandora_object.field_issn
-    - field.field.node.islandora_object.field_item_barcode
-    - field.field.node.islandora_object.field_jhir
-    - field.field.node.islandora_object.field_language
-    - field.field.node.islandora_object.field_lcc_classification
-    - field.field.node.islandora_object.field_library_catalog_link
-    - field.field.node.islandora_object.field_linked_agent
-    - field.field.node.islandora_object.field_local_identifier
-    - field.field.node.islandora_object.field_member_of
-    - field.field.node.islandora_object.field_mode_of_issuance
-    - field.field.node.islandora_object.field_model
-    - field.field.node.islandora_object.field_note
-    - field.field.node.islandora_object.field_oclc_number
-    - field.field.node.islandora_object.field_physical_form
-    - field.field.node.islandora_object.field_pid
-    - field.field.node.islandora_object.field_place_published
-    - field.field.node.islandora_object.field_place_published_country
-    - field.field.node.islandora_object.field_publisher
-    - field.field.node.islandora_object.field_publisher_country
-    - field.field.node.islandora_object.field_resource_type
-    - field.field.node.islandora_object.field_rights
-    - field.field.node.islandora_object.field_spatial_coverage
-    - field.field.node.islandora_object.field_subject
-    - field.field.node.islandora_object.field_subject_general
-    - field.field.node.islandora_object.field_subjects_name
-    - field.field.node.islandora_object.field_table_of_contents
-    - field.field.node.islandora_object.field_temporal_subject
-    - field.field.node.islandora_object.field_unique_id
-    - field.field.node.islandora_object.field_weight
-    - field.field.node.islandora_object.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - user
-_core:
-  default_config_hash: JknApCSkcV3PzfTMK_yhbY65o6sBHvjIs5J6dJF2YI0
-id: node.islandora_object.teaser
-targetEntityType: node
-bundle: islandora_object
-mode: teaser
-content:
-  display_media_entity_view_3:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_linked_agent:
-    type: typed_relation_default
-    label: hidden
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 3
-    region: content
-hidden:
-  display_media_entity_view_1: true
-  display_media_entity_view_2: true
-  display_media_original_download: true
-  display_media_service_file: true
-  display_media_thumbnail: true
-  field_abstract: true
-  field_alt_title: true
-  field_alternative_title: true
-  field_citable_url: true
-  field_classification: true
-  field_collection_number: true
-  field_contributor: true
-  field_coordinates: true
-  field_coordinates_text: true
-  field_copyright_and_use: true
-  field_copyright_date: true
-  field_copyright_holder: true
-  field_creator: true
-  field_date_available: true
-  field_date_captured: true
-  field_date_copyrighted: true
-  field_date_modified: true
-  field_date_published: true
-  field_date_valid: true
-  field_description: true
-  field_dewey_classification: true
-  field_digital_identifier: true
-  field_digital_publisher: true
-  field_display_hints: true
-  field_dspace_identifier: true
-  field_dspace_item_id: true
-  field_edition: true
-  field_edtf_date: true
-  field_edtf_date_created: true
-  field_edtf_date_issued: true
-  field_extent: true
-  field_featured_item: true
-  field_finding_aid: true
-  field_frequency: true
-  field_full_title: true
-  field_gemini_uri: true
-  field_genre: true
-  field_geographic_subject: true
-  field_geoportal_link: true
-  field_identifier: true
-  field_is_part_of: true
-  field_isbn: true
-  field_issn: true
-  field_item_barcode: true
-  field_jhir: true
-  field_language: true
-  field_lcc_classification: true
-  field_library_catalog_link: true
-  field_local_identifier: true
-  field_member_of: true
-  field_mode_of_issuance: true
-  field_model: true
-  field_note: true
-  field_oclc_number: true
-  field_physical_form: true
-  field_pid: true
-  field_place_published: true
-  field_place_published_country: true
-  field_publisher: true
-  field_publisher_country: true
-  field_resource_type: true
-  field_rights: true
-  field_spatial_coverage: true
-  field_subject: true
-  field_subject_general: true
-  field_subjects_name: true
-  field_table_of_contents: true
-  field_temporal_subject: true
-  field_unique_id: true
-  field_weight: true
-  field_years: true
-  islandora_fits_checksum: true
-  langcode: true
-  links: true
-  members_eva_entity_view_1: true
-  openseadragon_media_evas_entity_view_1: true
-  openseadragon_media_evas_entity_view_2: true
-  openseadragon_media_evas_service_file: true
-  pdfjs_media_evas_entity_view_1: true
-  pdfjs_media_evas_entity_view_2: true
-  pdfjs_media_evas_service_file: true
-  search_api_excerpt: true
-  search_within_this_collection_link_entity_view_1: true
diff --git a/config/export/core.entity_view_display.node.page.default.yml b/config/export/core.entity_view_display.node.page.default.yml
deleted file mode 100644
index 478cdbe8a..000000000
--- a/config/export/core.entity_view_display.node.page.default.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: b73f6a3c-5516-4557-a360-193f17be3889
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.node.page.body
-    - node.type.page
-  module:
-    - text
-    - user
-_core:
-  default_config_hash: M_Y8L5tfmhx7DR143E05YyZSpvgil6VFvqcfBWykalg
-id: node.page.default
-targetEntityType: node
-bundle: page
-mode: default
-content:
-  body:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_thumbnail:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  links:
-    weight: 101
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.node.page.teaser.yml b/config/export/core.entity_view_display.node.page.teaser.yml
deleted file mode 100644
index faf05fb51..000000000
--- a/config/export/core.entity_view_display.node.page.teaser.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: 6b61fb2b-66b9-4f52-a801-5f0a2f09f44d
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - field.field.node.page.body
-    - node.type.page
-  module:
-    - text
-    - user
-_core:
-  default_config_hash: 8BgdRtLbtQ0F__o0FHSH0Mx5fvXOra9tfT1GmNKbRYw
-id: node.page.teaser
-targetEntityType: node
-bundle: page
-mode: teaser
-content:
-  body:
-    type: text_summary_or_trimmed
-    label: hidden
-    settings:
-      trim_length: 600
-    third_party_settings: {  }
-    weight: 100
-    region: content
-  display_media_entity_view_1:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_entity_view_2:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_service_file:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  display_media_thumbnail:
-    settings: {  }
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  links:
-    weight: 101
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.copyright_and_use.default.yml b/config/export/core.entity_view_display.taxonomy_term.copyright_and_use.default.yml
deleted file mode 100644
index 7d6177107..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.copyright_and_use.default.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 5beacfd8-b4cb-4e36-ac9c-0999b3b48267
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.copyright_and_use.field_authority_link
-    - field.field.taxonomy_term.copyright_and_use.field_unique_id
-    - taxonomy.vocabulary.copyright_and_use
-  module:
-    - controlled_access_terms
-    - text
-id: taxonomy_term.copyright_and_use.default
-targetEntityType: taxonomy_term
-bundle: copyright_and_use
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.corporate_body.default.yml b/config/export/core.entity_view_display.taxonomy_term.corporate_body.default.yml
deleted file mode 100644
index 6eda70fb1..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.corporate_body.default.yml
+++ /dev/null
@@ -1,161 +0,0 @@
-uuid: 88fc40e6-783e-428c-aacf-26f33122b894
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.corporate_body.field_authority_link
-    - field.field.taxonomy_term.corporate_body.field_cat_date_begin
-    - field.field.taxonomy_term.corporate_body.field_cat_date_end
-    - field.field.taxonomy_term.corporate_body.field_corporate_body_alt_name
-    - field.field.taxonomy_term.corporate_body.field_date
-    - field.field.taxonomy_term.corporate_body.field_date_of_meeting_or_treaty
-    - field.field.taxonomy_term.corporate_body.field_location_of_meeting
-    - field.field.taxonomy_term.corporate_body.field_num_of_section_or_meet
-    - field.field.taxonomy_term.corporate_body.field_primary_name
-    - field.field.taxonomy_term.corporate_body.field_relationships
-    - field.field.taxonomy_term.corporate_body.field_subordinate_name
-    - field.field.taxonomy_term.corporate_body.field_type
-    - field.field.taxonomy_term.corporate_body.field_unique_id
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-    - options
-    - text
-_core:
-  default_config_hash: eg7su46-dvGu8agiWB3umWh6Q43kphzdGfbB3zcmlOc
-id: taxonomy_term.corporate_body.default
-targetEntityType: taxonomy_term
-bundle: corporate_body
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_cat_date_begin:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_cat_date_end:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_corporate_body_alt_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_date_of_meeting_or_treaty:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_location_of_meeting:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_num_of_section_or_meet:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_primary_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_relationships:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_subordinate_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 15
-    region: content
-  field_type:
-    type: list_default
-    label: above
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 14
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.country.default.yml b/config/export/core.entity_view_display.taxonomy_term.country.default.yml
deleted file mode 100644
index 064e5f84c..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.country.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 3cc07ba3-6fa4-43ee-b73e-e6ce3c60f63d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.country.field_authority_link
-    - taxonomy.vocabulary.country
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: CwK5rkemUZGOqxX5uiQ4zzbaTEZlqLVP3JU4duGdYm0
-id: taxonomy_term.country.default
-targetEntityType: taxonomy_term
-bundle: country
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.family.default.yml b/config/export/core.entity_view_display.taxonomy_term.family.default.yml
deleted file mode 100644
index 1403e64cf..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.family.default.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-uuid: 88ed4fbf-19d0-4e73-ab22-54fe6f0b8776
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.family.field_authority_link
-    - field.field.taxonomy_term.family.field_cat_date_begin
-    - field.field.taxonomy_term.family.field_cat_date_end
-    - field.field.taxonomy_term.family.field_date
-    - field.field.taxonomy_term.family.field_family_name
-    - field.field.taxonomy_term.family.field_relationships
-    - field.field.taxonomy_term.family.field_title_and_other_words
-    - field.field.taxonomy_term.family.field_unique_id
-    - taxonomy.vocabulary.family
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: 4NbQYruYFUapF4M8iOlQBaNczr0hr6KhxR-PhRQxjZs
-id: taxonomy_term.family.default
-targetEntityType: taxonomy_term
-bundle: family
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_cat_date_begin:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_cat_date_end:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_family_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 13
-    region: content
-  field_relationships:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_title_and_other_words:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 15
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.frequencies.default.yml b/config/export/core.entity_view_display.taxonomy_term.frequencies.default.yml
deleted file mode 100644
index 537021cb8..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.frequencies.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 57071666-556f-4543-bb9e-b02abb3cb512
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.frequencies.field_authority_link
-    - taxonomy.vocabulary.frequencies
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: 7VmnAl6W-srQIwcGpbYTMLkwd9fRlf3lhPvjTmbC1Y8
-id: taxonomy_term.frequencies.default
-targetEntityType: taxonomy_term
-bundle: frequencies
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.genre.default.yml b/config/export/core.entity_view_display.taxonomy_term.genre.default.yml
deleted file mode 100644
index 440b11e8e..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.genre.default.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 42a3e6b7-18e1-4c7f-b819-3400b1263f5d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.genre.field_authority_link
-    - field.field.taxonomy_term.genre.field_unique_id
-    - taxonomy.vocabulary.genre
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: dqReSRpiwgsw70IML1yD4yHdffSWD3G7wWNSEycgDz8
-id: taxonomy_term.genre.default
-targetEntityType: taxonomy_term
-bundle: genre
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 2
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.geo_location.default.yml b/config/export/core.entity_view_display.taxonomy_term.geo_location.default.yml
deleted file mode 100644
index d221641b5..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.geo_location.default.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-uuid: a04ae45b-dd3a-406c-991a-08315cf4d451
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.geo_location.field_authority_link
-    - field.field.taxonomy_term.geo_location.field_broader
-    - field.field.taxonomy_term.geo_location.field_geo_alt_name
-    - field.field.taxonomy_term.geo_location.field_geo_geolocation
-    - field.field.taxonomy_term.geo_location.field_unique_id
-    - taxonomy.vocabulary.geo_location
-  module:
-    - controlled_access_terms
-    - geolocation
-    - link
-    - text
-_core:
-  default_config_hash: 2IWu7AK6BJrbzWfbJyQntIT3yljHO6KDqltuhjUMQQU
-id: taxonomy_term.geo_location.default
-targetEntityType: taxonomy_term
-bundle: geo_location
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: inline
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-  field_broader:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_geo_alt_name:
-    type: string
-    label: inline
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_geo_geolocation:
-    type: geolocation_latlng
-    label: inline
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 7
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.islandora_display.default.yml b/config/export/core.entity_view_display.taxonomy_term.islandora_display.default.yml
deleted file mode 100644
index 099b3c9f2..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.islandora_display.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: f012aa47-6877-41ea-843a-b9edfaf95223
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.islandora_display.field_external_uri
-    - taxonomy.vocabulary.islandora_display
-  module:
-    - link
-    - text
-_core:
-  default_config_hash: pCLXyfeM4YAzdP2UDvOoybTAd33kS8HXnQc5wqAusOk
-id: taxonomy_term.islandora_display.default
-targetEntityType: taxonomy_term
-bundle: islandora_display
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_external_uri:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.islandora_media_use.default.yml b/config/export/core.entity_view_display.taxonomy_term.islandora_media_use.default.yml
deleted file mode 100644
index 5de730a10..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.islandora_media_use.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: f3c9c937-37e6-4bfa-9ecd-00e57ecd9fc1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.islandora_media_use.field_external_uri
-    - taxonomy.vocabulary.islandora_media_use
-  module:
-    - link
-    - text
-_core:
-  default_config_hash: AWQvwUv2d5J2082A_AzmhRK4O3XFkHCEr_IRunRHaVo
-id: taxonomy_term.islandora_media_use.default
-targetEntityType: taxonomy_term
-bundle: islandora_media_use
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_external_uri:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.islandora_models.default.yml b/config/export/core.entity_view_display.taxonomy_term.islandora_models.default.yml
deleted file mode 100644
index 03952bc5f..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.islandora_models.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 14fe682d-8327-4374-bd71-91fe4f80021e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.islandora_models.field_external_uri
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - link
-    - text
-_core:
-  default_config_hash: Y-gOXIhSmxlX1Dl4mPKJS39A4nH47vbEMlQu4uBa7XM
-id: taxonomy_term.islandora_models.default
-targetEntityType: taxonomy_term
-bundle: islandora_models
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_external_uri:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.issuance_modes.default.yml b/config/export/core.entity_view_display.taxonomy_term.issuance_modes.default.yml
deleted file mode 100644
index 53233d302..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.issuance_modes.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: ac6b1643-1bff-4eaa-ae2a-3bcec0c740f8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.issuance_modes.field_authority_link
-    - taxonomy.vocabulary.issuance_modes
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: dOboywHDW3gkSFjB0DB5ireByItfM9eWXeZt-eIxPDI
-id: taxonomy_term.issuance_modes.default
-targetEntityType: taxonomy_term
-bundle: issuance_modes
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.language.default.yml b/config/export/core.entity_view_display.taxonomy_term.language.default.yml
deleted file mode 100644
index 61fceb6f8..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.language.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: c3a04eaa-edcd-4056-969f-c9d8bf7703da
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.language.field_authority_link
-    - taxonomy.vocabulary.language
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: _MbQPbUt0Qly57l3YdcfkFSKztJIxn_MULR-b4rcTuc
-id: taxonomy_term.language.default
-targetEntityType: taxonomy_term
-bundle: language
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.person.default.yml b/config/export/core.entity_view_display.taxonomy_term.person.default.yml
deleted file mode 100644
index bb52539d1..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.person.default.yml
+++ /dev/null
@@ -1,157 +0,0 @@
-uuid: 3fda8e47-f957-476c-8737-4e01d71d74a7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.person.field_authority_link
-    - field.field.taxonomy_term.person.field_cat_date_begin
-    - field.field.taxonomy_term.person.field_cat_date_end
-    - field.field.taxonomy_term.person.field_date
-    - field.field.taxonomy_term.person.field_person_alternate_name
-    - field.field.taxonomy_term.person.field_preferred_name_fuller_form
-    - field.field.taxonomy_term.person.field_preferred_name_number
-    - field.field.taxonomy_term.person.field_preferred_name_prefix
-    - field.field.taxonomy_term.person.field_preferred_name_rest
-    - field.field.taxonomy_term.person.field_preferred_name_suffix
-    - field.field.taxonomy_term.person.field_primary_part_of_name
-    - field.field.taxonomy_term.person.field_relationships
-    - field.field.taxonomy_term.person.field_unique_id
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: '-KViCNNPm8unAlNoDOlCV3TXc7sXbpeK7gRW5vD_ypA'
-id: taxonomy_term.person.default
-targetEntityType: taxonomy_term
-bundle: person
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 2
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_cat_date_begin:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: space
-      date_order: little_endian
-      month_format: mmm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 3
-    region: content
-  field_cat_date_end:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: space
-      date_order: little_endian
-      month_format: mmm
-      day_format: dd
-    third_party_settings: {  }
-    weight: 4
-    region: content
-  field_date:
-    type: edtf_default
-    label: above
-    settings:
-      date_separator: dash
-      date_order: big_endian
-      month_format: mm
-      day_format: dd
-      year_format: 'y'
-    third_party_settings: {  }
-    weight: 14
-    region: content
-  field_person_alternate_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 6
-    region: content
-  field_preferred_name_fuller_form:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 7
-    region: content
-  field_preferred_name_number:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 8
-    region: content
-  field_preferred_name_prefix:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 9
-    region: content
-  field_preferred_name_rest:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 11
-    region: content
-  field_preferred_name_suffix:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 12
-    region: content
-  field_primary_part_of_name:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 10
-    region: content
-  field_relationships:
-    type: typed_relation_default
-    label: above
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 5
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 13
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.physical_form.default.yml b/config/export/core.entity_view_display.taxonomy_term.physical_form.default.yml
deleted file mode 100644
index fe10320a7..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.physical_form.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: c0ed01c2-a1fd-4be6-b394-db1d73c287f1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.physical_form.field_authority_link
-    - taxonomy.vocabulary.physical_form
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: 7esFqnYo_84BYbxSC05U6mkL1KNPze2_qAbAZrbHGng
-id: taxonomy_term.physical_form.default
-targetEntityType: taxonomy_term
-bundle: physical_form
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.resource_types.default.yml b/config/export/core.entity_view_display.taxonomy_term.resource_types.default.yml
deleted file mode 100644
index 640a9d087..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.resource_types.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: a872c3a3-39d3-40cf-8d50-9c724a7a00a2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.resource_types.field_authority_link
-    - taxonomy.vocabulary.resource_types
-  module:
-    - link
-    - text
-_core:
-  default_config_hash: W82-1KTjwwd5e98Euc8TFmDyiBrEnKMhpUlbDE_lFJc
-id: taxonomy_term.resource_types.default
-targetEntityType: taxonomy_term
-bundle: resource_types
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: link
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.subject.default.yml b/config/export/core.entity_view_display.taxonomy_term.subject.default.yml
deleted file mode 100644
index 060d55fc7..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.subject.default.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: bfbacbbc-56b1-4200-ac12-555670f4901c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.subject.field_authority_link
-    - field.field.taxonomy_term.subject.field_unique_id
-    - taxonomy.vocabulary.subject
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: 3yMrATFYT7qVlZ_yZ36wuZPE_ueigt20gMnev5Yf_QE
-id: taxonomy_term.subject.default
-targetEntityType: taxonomy_term
-bundle: subject
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 101
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 103
-    region: content
-  field_unique_id:
-    type: string
-    label: above
-    settings:
-      link_to_entity: false
-    third_party_settings: {  }
-    weight: 104
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.taxonomy_term.temporal_subjects.default.yml b/config/export/core.entity_view_display.taxonomy_term.temporal_subjects.default.yml
deleted file mode 100644
index f1d9e41bd..000000000
--- a/config/export/core.entity_view_display.taxonomy_term.temporal_subjects.default.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: ccaa1ec9-d46e-4d91-859a-0884b0fa248a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.taxonomy_term.temporal_subjects.field_authority_link
-    - taxonomy.vocabulary.temporal_subjects
-  module:
-    - controlled_access_terms
-    - text
-_core:
-  default_config_hash: PTVcsTMcIUevDTgzcJGOjg993LBE_ndBfadMZCzXk-c
-id: taxonomy_term.temporal_subjects.default
-targetEntityType: taxonomy_term
-bundle: temporal_subjects
-mode: default
-content:
-  description:
-    type: text_default
-    label: hidden
-    settings: {  }
-    third_party_settings: {  }
-    weight: 0
-    region: content
-  field_authority_link:
-    type: authority_formatter_default
-    label: above
-    settings:
-      trim_length: 80
-      url_only: false
-      url_plain: false
-      rel: ''
-      target: _blank
-    third_party_settings: {  }
-    weight: 1
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.user.user.compact.yml b/config/export/core.entity_view_display.user.user.compact.yml
deleted file mode 100644
index 7ca2ef777..000000000
--- a/config/export/core.entity_view_display.user.user.compact.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: edeceffc-e529-423d-ae42-56af651ff4d3
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.user.compact
-    - field.field.user.user.user_picture
-    - image.style.thumbnail
-  module:
-    - image
-    - user
-_core:
-  default_config_hash: 00zr_RBdTjPjBGITD3h4c1ESQZimjdVCcHGt1trLqIY
-id: user.user.compact
-targetEntityType: user
-bundle: user
-mode: compact
-content:
-  user_picture:
-    type: image
-    label: hidden
-    settings:
-      image_link: content
-      image_style: thumbnail
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  langcode: true
-  member_for: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_display.user.user.default.yml b/config/export/core.entity_view_display.user.user.default.yml
deleted file mode 100644
index 70ac6eea0..000000000
--- a/config/export/core.entity_view_display.user.user.default.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: c268376a-c705-40a8-8801-3bd709281aaa
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.field.user.user.user_picture
-    - image.style.thumbnail
-  module:
-    - image
-    - user
-_core:
-  default_config_hash: mZLyuWM9CQx2ZJVqFGSbzgFnHzudVbHBYmdU256A5Wk
-id: user.user.default
-targetEntityType: user
-bundle: user
-mode: default
-content:
-  member_for:
-    weight: 5
-    region: content
-  user_picture:
-    type: image
-    label: hidden
-    settings:
-      image_link: content
-      image_style: thumbnail
-      image_loading:
-        attribute: lazy
-    third_party_settings: {  }
-    weight: 0
-    region: content
-hidden:
-  langcode: true
-  search_api_excerpt: true
diff --git a/config/export/core.entity_view_mode.block.token.yml b/config/export/core.entity_view_mode.block.token.yml
deleted file mode 100644
index 81367ada1..000000000
--- a/config/export/core.entity_view_mode.block.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: d8fa837f-f244-4b73-a05b-2fe7aa530c94
-langcode: en
-status: true
-dependencies:
-  module:
-    - block
-id: block.token
-label: Token
-targetEntityType: block
-cache: true
diff --git a/config/export/core.entity_view_mode.block_content.full.yml b/config/export/core.entity_view_mode.block_content.full.yml
deleted file mode 100644
index 982604020..000000000
--- a/config/export/core.entity_view_mode.block_content.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 5b9db463-37a6-425c-8736-ab0920f9cc3b
-langcode: en
-status: false
-dependencies:
-  module:
-    - block_content
-_core:
-  default_config_hash: 4tedlMuvQjDOdvHdw86_e-2Rt78aR7TGFMfOK8Ejppg
-id: block_content.full
-label: Full
-targetEntityType: block_content
-cache: true
diff --git a/config/export/core.entity_view_mode.block_content.token.yml b/config/export/core.entity_view_mode.block_content.token.yml
deleted file mode 100644
index 3923b2211..000000000
--- a/config/export/core.entity_view_mode.block_content.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 562e7ea3-8f95-44f7-83fd-aac7681b1e76
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-id: block_content.token
-label: Token
-targetEntityType: block_content
-cache: true
diff --git a/config/export/core.entity_view_mode.comment.full.yml b/config/export/core.entity_view_mode.comment.full.yml
deleted file mode 100644
index 6d7c6de02..000000000
--- a/config/export/core.entity_view_mode.comment.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 03214dad-f8b8-42af-9717-e6a49f44c2c2
-langcode: en
-status: false
-dependencies:
-  module:
-    - comment
-_core:
-  default_config_hash: K7eNlfU7NEUajz01wItywZklr2oaPgL6s1_97fmDXLA
-id: comment.full
-label: 'Full comment'
-targetEntityType: comment
-cache: true
diff --git a/config/export/core.entity_view_mode.comment.token.yml b/config/export/core.entity_view_mode.comment.token.yml
deleted file mode 100644
index 46bba9026..000000000
--- a/config/export/core.entity_view_mode.comment.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: e9dbc908-b9b6-477e-92f1-585a7274fa77
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-id: comment.token
-label: Token
-targetEntityType: comment
-cache: true
diff --git a/config/export/core.entity_view_mode.contact_message.token.yml b/config/export/core.entity_view_mode.contact_message.token.yml
deleted file mode 100644
index 761e65963..000000000
--- a/config/export/core.entity_view_mode.contact_message.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 00c24c1e-0081-419a-b060-001fd18389b2
-langcode: en
-status: true
-dependencies:
-  module:
-    - contact
-id: contact_message.token
-label: Token
-targetEntityType: contact_message
-cache: true
diff --git a/config/export/core.entity_view_mode.file.token.yml b/config/export/core.entity_view_mode.file.token.yml
deleted file mode 100644
index 80ad3d396..000000000
--- a/config/export/core.entity_view_mode.file.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 926f8872-7e28-4065-8cd8-1d85c3b6f793
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-id: file.token
-label: Token
-targetEntityType: file
-cache: true
diff --git a/config/export/core.entity_view_mode.media.download.yml b/config/export/core.entity_view_mode.media.download.yml
deleted file mode 100644
index 80cdfa052..000000000
--- a/config/export/core.entity_view_mode.media.download.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: db5a6446-20e4-4018-88ad-1ecf47236879
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-id: media.download
-label: Download
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.file_download.yml b/config/export/core.entity_view_mode.media.file_download.yml
deleted file mode 100644
index ff1497cb3..000000000
--- a/config/export/core.entity_view_mode.media.file_download.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: f707f16c-e2f3-4111-a583-c44bdeac44e2
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-id: media.file_download
-label: 'File Download'
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.fits_technical_metadata.yml b/config/export/core.entity_view_mode.media.fits_technical_metadata.yml
deleted file mode 100644
index 35e880a93..000000000
--- a/config/export/core.entity_view_mode.media.fits_technical_metadata.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: a2bb6595-7072-4217-95c3-45eeebf9d99e
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: iSghNI9O-6dPp9cMQTGYgytj7Wb3c-PR9eUCvJcEMhk
-id: media.fits_technical_metadata
-label: 'FITS Technical Metadata'
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.full.yml b/config/export/core.entity_view_mode.media.full.yml
deleted file mode 100644
index e7f735a9a..000000000
--- a/config/export/core.entity_view_mode.media.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 95ebc1d6-9c36-4b75-b847-e464fcf3922b
-langcode: en
-status: false
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: 6NBUEuGmlkClK8Fb76tSMMpO2eZ4LWCBdbUk4z7CuP0
-id: media.full
-label: 'Full content'
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.media_library.yml b/config/export/core.entity_view_mode.media.media_library.yml
deleted file mode 100644
index 3ebace9a8..000000000
--- a/config/export/core.entity_view_mode.media.media_library.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: e605478f-13b8-42e3-bc15-c5e7d64aee93
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-id: media.media_library
-label: 'Media library'
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.open_seadragon.yml b/config/export/core.entity_view_mode.media.open_seadragon.yml
deleted file mode 100644
index b3a349a45..000000000
--- a/config/export/core.entity_view_mode.media.open_seadragon.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: d51600e8-bdec-4710-ba31-28bd7d2fdc46
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: Psm3qxSAE17ncDreigYEVbFKSAvxxwqGUFp_MrebIyo
-id: media.open_seadragon
-label: 'Open Seadragon'
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.pdfjs.yml b/config/export/core.entity_view_mode.media.pdfjs.yml
deleted file mode 100644
index 41b42ad3b..000000000
--- a/config/export/core.entity_view_mode.media.pdfjs.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: f0db8ba1-c60b-4709-b596-2027ea66a183
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: qFLXTd7sBpfQLcPgH68KJ9WK9FIx24hHbCQeg892PmY
-id: media.pdfjs
-label: PDFjs
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.source.yml b/config/export/core.entity_view_mode.media.source.yml
deleted file mode 100644
index 01af010b5..000000000
--- a/config/export/core.entity_view_mode.media.source.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 14f2823b-0587-43a4-a2f7-4e5708bd60ec
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: dPggGijBYXwTv5scVAfcGwySk1Ysl3Zzj_JK747Z0qk
-id: media.source
-label: Source
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.thumbnail.yml b/config/export/core.entity_view_mode.media.thumbnail.yml
deleted file mode 100644
index 0c3a7fc4a..000000000
--- a/config/export/core.entity_view_mode.media.thumbnail.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 0f6963bf-fd15-4134-abb5-5d9c79a7f3ed
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-id: media.thumbnail
-label: Thumbnail
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.token.yml b/config/export/core.entity_view_mode.media.token.yml
deleted file mode 100644
index 134d69abe..000000000
--- a/config/export/core.entity_view_mode.media.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: dbb1df79-1f76-4ba2-8102-a1e81894a424
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-id: media.token
-label: Token
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.media.video.yml b/config/export/core.entity_view_mode.media.video.yml
deleted file mode 100644
index 68466a8f1..000000000
--- a/config/export/core.entity_view_mode.media.video.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 0d574ffd-9fdb-411f-8192-a188776df568
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-id: media.video
-label: Video
-targetEntityType: media
-cache: true
diff --git a/config/export/core.entity_view_mode.menu_link_content.token.yml b/config/export/core.entity_view_mode.menu_link_content.token.yml
deleted file mode 100644
index 5ec5e0a7c..000000000
--- a/config/export/core.entity_view_mode.menu_link_content.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: ba13f0c9-49a8-4298-89d4-b60692fc4c92
-langcode: en
-status: true
-dependencies:
-  module:
-    - menu_link_content
-id: menu_link_content.token
-label: Token
-targetEntityType: menu_link_content
-cache: true
diff --git a/config/export/core.entity_view_mode.node.basic.yml b/config/export/core.entity_view_mode.node.basic.yml
deleted file mode 100644
index 027638f9a..000000000
--- a/config/export/core.entity_view_mode.node.basic.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 6cb79907-dc7f-4866-a030-948aacbdd852
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.basic
-label: Basic
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.binary.yml b/config/export/core.entity_view_mode.node.binary.yml
deleted file mode 100644
index 2cca90cc3..000000000
--- a/config/export/core.entity_view_mode.node.binary.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 1eba70af-f291-427c-b9c6-1aba3349dfec
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: Zctdw0Qjxs9yz0TgG8o5WEVPoCvtxKAIx8MgaMXtZzQ
-id: node.binary
-label: Binary
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.collection.yml b/config/export/core.entity_view_mode.node.collection.yml
deleted file mode 100644
index 73c2929d0..000000000
--- a/config/export/core.entity_view_mode.node.collection.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 1693a0f4-7e53-4542-bb44-e038aa8f2591
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.collection
-label: Collection
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.compound.yml b/config/export/core.entity_view_mode.node.compound.yml
deleted file mode 100644
index 7e83beddb..000000000
--- a/config/export/core.entity_view_mode.node.compound.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 1289cd6a-2c26-496d-bac6-1e8dc47c088e
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.compound
-label: Compound
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.compound_member.yml b/config/export/core.entity_view_mode.node.compound_member.yml
deleted file mode 100644
index 92360e69a..000000000
--- a/config/export/core.entity_view_mode.node.compound_member.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 645d7fae-7c63-479b-be7b-b90a70e62a3d
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.compound_member
-label: 'Compound - Member'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.full.yml b/config/export/core.entity_view_mode.node.full.yml
deleted file mode 100644
index bc8d1b063..000000000
--- a/config/export/core.entity_view_mode.node.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: fcf01773-2b03-464b-808f-99384b22a2d7
-langcode: en
-status: false
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk
-id: node.full
-label: 'Full content'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.media_evas.yml b/config/export/core.entity_view_mode.node.media_evas.yml
deleted file mode 100644
index 5781b49b5..000000000
--- a/config/export/core.entity_view_mode.node.media_evas.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: f04cc9e5-e7b2-45b3-83e7-cfa3e064db97
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.media_evas
-label: 'Media EVAs'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.newspaper.yml b/config/export/core.entity_view_mode.node.newspaper.yml
deleted file mode 100644
index 0885bae7c..000000000
--- a/config/export/core.entity_view_mode.node.newspaper.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 0ffa1463-84d8-41d5-9cf8-7b891c1028c2
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.newspaper
-label: Newspaper
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.open_seadragon.yml b/config/export/core.entity_view_mode.node.open_seadragon.yml
deleted file mode 100644
index 885ae8260..000000000
--- a/config/export/core.entity_view_mode.node.open_seadragon.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 072509a2-ad8f-43ff-a94a-6730f7caaf8a
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: 3gngsdemEmmFuj-H0Jo-6M8jGLvV7KErOZY44fxBhU0
-id: node.open_seadragon
-label: 'Open Seadragon'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.paged.yml b/config/export/core.entity_view_mode.node.paged.yml
deleted file mode 100644
index 5c15323fa..000000000
--- a/config/export/core.entity_view_mode.node.paged.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 0f889b59-7b12-4c85-8b8e-62a216c35a4f
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.paged
-label: Paged
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.pdfjs.yml b/config/export/core.entity_view_mode.node.pdfjs.yml
deleted file mode 100644
index 8d9e52367..000000000
--- a/config/export/core.entity_view_mode.node.pdfjs.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: d74bcea2-1457-47d0-abfc-25168c35ecc2
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: icNxZKY6SpxkaiQfnOd2CeeyIG4zuUHhCla7oaMGov0
-id: node.pdfjs
-label: PDFjs
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.remote_media.yml b/config/export/core.entity_view_mode.node.remote_media.yml
deleted file mode 100644
index d2f513e82..000000000
--- a/config/export/core.entity_view_mode.node.remote_media.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 1bc0d1e9-723d-46dc-953b-5774ff72476f
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.remote_media
-label: 'Remote Media'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.revision.yml b/config/export/core.entity_view_mode.node.revision.yml
deleted file mode 100644
index d77d95fcd..000000000
--- a/config/export/core.entity_view_mode.node.revision.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: a8cb9757-b2bb-445f-b5e3-84184992b165
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.revision
-label: Revision
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.rss.yml b/config/export/core.entity_view_mode.node.rss.yml
deleted file mode 100644
index 25e300b43..000000000
--- a/config/export/core.entity_view_mode.node.rss.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 9eefaab0-0f8f-44d0-a89b-ee4a5caf4cca
-langcode: en
-status: false
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU
-id: node.rss
-label: RSS
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.search_index.yml b/config/export/core.entity_view_mode.node.search_index.yml
deleted file mode 100644
index 6da2cc45e..000000000
--- a/config/export/core.entity_view_mode.node.search_index.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 93bddf83-3211-427b-9180-d45ece9e5c9c
-langcode: en
-status: false
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY
-id: node.search_index
-label: 'Search index'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.search_result.yml b/config/export/core.entity_view_mode.node.search_result.yml
deleted file mode 100644
index 8ff159f97..000000000
--- a/config/export/core.entity_view_mode.node.search_result.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 0a3b23e1-de7e-4546-a726-7c405d92c5a2
-langcode: en
-status: false
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM
-id: node.search_result
-label: 'Search result highlighting input'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.something_else.yml b/config/export/core.entity_view_mode.node.something_else.yml
deleted file mode 100644
index 58271dd96..000000000
--- a/config/export/core.entity_view_mode.node.something_else.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 28cc9ef9-33bd-4279-ace4-a7727f242a5b
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.something_else
-label: 'Something Else'
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.teaser.yml b/config/export/core.entity_view_mode.node.teaser.yml
deleted file mode 100644
index 0ef0960df..000000000
--- a/config/export/core.entity_view_mode.node.teaser.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 0c16309a-bbb5-4060-8d1e-d31af4483732
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
-id: node.teaser
-label: Teaser
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.node.token.yml b/config/export/core.entity_view_mode.node.token.yml
deleted file mode 100644
index 35e350d0b..000000000
--- a/config/export/core.entity_view_mode.node.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: e78e5e9d-32b0-471d-b3d3-76af94f5621e
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.token
-label: Token
-targetEntityType: node
-cache: true
diff --git a/config/export/core.entity_view_mode.path_alias.token.yml b/config/export/core.entity_view_mode.path_alias.token.yml
deleted file mode 100644
index d075b89f7..000000000
--- a/config/export/core.entity_view_mode.path_alias.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: ec9b7247-a611-4dd8-9a56-b4cfbedb2b22
-langcode: en
-status: true
-dependencies:
-  module:
-    - path_alias
-id: path_alias.token
-label: Token
-targetEntityType: path_alias
-cache: true
diff --git a/config/export/core.entity_view_mode.shortcut.token.yml b/config/export/core.entity_view_mode.shortcut.token.yml
deleted file mode 100644
index b162afb48..000000000
--- a/config/export/core.entity_view_mode.shortcut.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: e289bb7d-d52a-4a43-87b7-cc0b826a9875
-langcode: en
-status: true
-dependencies:
-  module:
-    - shortcut
-id: shortcut.token
-label: Token
-targetEntityType: shortcut
-cache: true
diff --git a/config/export/core.entity_view_mode.taxonomy_term.full.yml b/config/export/core.entity_view_mode.taxonomy_term.full.yml
deleted file mode 100644
index 08146d19c..000000000
--- a/config/export/core.entity_view_mode.taxonomy_term.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: bf55a9f3-493d-4866-a0ae-7f8cb8282e0a
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-_core:
-  default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE'
-id: taxonomy_term.full
-label: 'Taxonomy term page'
-targetEntityType: taxonomy_term
-cache: true
diff --git a/config/export/core.entity_view_mode.taxonomy_term.token.yml b/config/export/core.entity_view_mode.taxonomy_term.token.yml
deleted file mode 100644
index 34d569edf..000000000
--- a/config/export/core.entity_view_mode.taxonomy_term.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: de4decd0-9d51-4c24-99c4-971e1aa3d4ed
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-id: taxonomy_term.token
-label: Token
-targetEntityType: taxonomy_term
-cache: true
diff --git a/config/export/core.entity_view_mode.tour.token.yml b/config/export/core.entity_view_mode.tour.token.yml
deleted file mode 100644
index f6fb55a9e..000000000
--- a/config/export/core.entity_view_mode.tour.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 6608a510-e2aa-4004-a812-6338ca619d25
-langcode: en
-status: true
-dependencies:
-  module:
-    - tour
-id: tour.token
-label: Token
-targetEntityType: tour
-cache: true
diff --git a/config/export/core.entity_view_mode.user.compact.yml b/config/export/core.entity_view_mode.user.compact.yml
deleted file mode 100644
index d2f0dacd5..000000000
--- a/config/export/core.entity_view_mode.user.compact.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: f591d08c-5d6b-4ea0-899b-dded3c35d8af
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: 71CSAr_LNPcgu6D6jI4INl1KATkahmeyUFBETAWya8g
-id: user.compact
-label: Compact
-targetEntityType: user
-cache: true
diff --git a/config/export/core.entity_view_mode.user.full.yml b/config/export/core.entity_view_mode.user.full.yml
deleted file mode 100644
index 038f62ff4..000000000
--- a/config/export/core.entity_view_mode.user.full.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 23142e28-ded1-46e0-9e0e-9065de65426c
-langcode: en
-status: false
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: mQIF_foYjmnVSr9MpcD4CTaJE_FpO1AyDd_DskztGhM
-id: user.full
-label: 'User account'
-targetEntityType: user
-cache: true
diff --git a/config/export/core.entity_view_mode.user.token.yml b/config/export/core.entity_view_mode.user.token.yml
deleted file mode 100644
index 634a171dd..000000000
--- a/config/export/core.entity_view_mode.user.token.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: ca0a9752-6141-496d-a579-9880af7e1932
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-id: user.token
-label: Token
-targetEntityType: user
-cache: true
diff --git a/config/export/core.extension.yml b/config/export/core.extension.yml
deleted file mode 100644
index 475d9a4bc..000000000
--- a/config/export/core.extension.yml
+++ /dev/null
@@ -1,139 +0,0 @@
-_core:
-  default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
-module:
-  action: 0
-  admin_toolbar: 0
-  admin_toolbar_search: 0
-  admin_toolbar_tools: 0
-  advanced_search: 0
-  automated_cron: 0
-  basic_auth: 0
-  better_exposed_filters: 0
-  bibcite: 0
-  big_pipe: 0
-  block: 0
-  block_content: 0
-  breakpoint: 0
-  citation_select: 0
-  ckeditor5: 0
-  comment: 0
-  config: 0
-  config_delete: 0
-  config_inspector: 0
-  config_update: 0
-  contact: 0
-  context: 0
-  context_ui: 0
-  contextual: 0
-  controlled_access_terms: 0
-  controlled_access_terms_defaults: 0
-  csv_serialization: 0
-  ctools: 0
-  datetime: 0
-  dblog: 0
-  devel: 0
-  dynamic_page_cache: 0
-  editor: 0
-  entity: 0
-  epp: 0
-  eva: 0
-  facets: 0
-  facets_summary: 0
-  features: 0
-  features_ui: 0
-  field: 0
-  field_group: 0
-  field_permissions: 0
-  field_report: 0
-  field_ui: 0
-  file: 0
-  file_replace: 0
-  filehash: 0
-  filter: 0
-  flysystem: 0
-  geolocation: 0
-  gnode: 0
-  group: 0
-  groupmedia: 0
-  hal: 0
-  help: 0
-  history: 0
-  idc_default_migration: 0
-  image: 0
-  islandora: 0
-  islandora_audio: 0
-  islandora_breadcrumbs: 0
-  islandora_core_feature: 0
-  islandora_fits: 0
-  islandora_iiif: 0
-  islandora_image: 0
-  islandora_text_extraction: 0
-  islandora_text_extraction_defaults: 0
-  islandora_video: 0
-  islandora_workbench_integration: 0
-  jquery_ui: 0
-  jquery_ui_autocomplete: 0
-  jquery_ui_datepicker: 0
-  jquery_ui_menu: 0
-  jquery_ui_slider: 0
-  jquery_ui_touch_punch: 0
-  jsonld: 0
-  jwt: 0
-  key: 0
-  language: 0
-  link: 0
-  matomo: 0
-  media: 0
-  menu_link_content: 0
-  menu_ui: 0
-  migrate: 0
-  migrate_plus: 0
-  migrate_source_csv: 0
-  migrate_tools: 0
-  mysql: 0
-  node: 0
-  openseadragon: 0
-  options: 0
-  page_cache: 0
-  path: 0
-  path_alias: 0
-  pdf: 0
-  pgsql: 0
-  prepopulate: 0
-  rdf: 0
-  responsive_image: 0
-  rest: 0
-  rest_oai_pmh: 0
-  search_api: 0
-  search_api_solr: 0
-  search_api_solr_legacy: 0
-  serialization: 0
-  shortcut: 0
-  sqlite: 0
-  syslog: 0
-  system: 0
-  taxonomy: 0
-  taxonomy_manager: 0
-  text: 0
-  token: 0
-  toolbar: 0
-  tour: 0
-  transliterate_filenames: 0
-  twig_tweak: 0
-  update: 0
-  user: 0
-  variationcache: 0
-  view_mode_switch: 0
-  views_data_export: 0
-  views_field_view: 0
-  views_nested_details: 0
-  views_ui: 0
-  pathauto: 1
-  content_translation: 10
-  views: 10
-  minimal: 1000
-theme:
-  claro: 0
-  bootstrap_barrio: 0
-  idc_ui_theme_boots: 0
-profile: minimal
diff --git a/config/export/core.menu.static_menu_link_overrides.yml b/config/export/core.menu.static_menu_link_overrides.yml
deleted file mode 100644
index c7854c771..000000000
--- a/config/export/core.menu.static_menu_link_overrides.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: CXhei_vpaZk-3f_Mj2cH0YmpK-ZpKHoSzVA3yZrDq0g
-definitions: {  }
diff --git a/config/export/dblog.settings.yml b/config/export/dblog.settings.yml
deleted file mode 100644
index fbd17ea50..000000000
--- a/config/export/dblog.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: e883aGsrt1wFrsydlYU584PZONCSfRy0DtkZ9KzHb58
-row_limit: 1000
diff --git a/config/export/devel.settings.yml b/config/export/devel.settings.yml
deleted file mode 100644
index ebe78a9a4..000000000
--- a/config/export/devel.settings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-_core:
-  default_config_hash: Aqx6J0yYT6mVqT0fbjeP4JkoL-700nmudVF5d6Pq2Yo
-page_alter: false
-raw_names: false
-error_handlers:
-  1: 1
-rebuild_theme: true
-debug_mail_file_format: '%to-%subject-%datetime.mail.txt'
-debug_mail_directory: 'temporary://devel-mails'
-devel_dumper: kint
-debug_logfile: 'temporary://drupal_debug.txt'
-debug_pre: true
diff --git a/config/export/devel.toolbar.settings.yml b/config/export/devel.toolbar.settings.yml
deleted file mode 100644
index 76ada43ce..000000000
--- a/config/export/devel.toolbar.settings.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-_core:
-  default_config_hash: IQjf_ytthngZTAk_MU8-74VecArWD3G5g0oEH6PM6GA
-toolbar_items:
-  - devel.admin_settings_link
-  - devel.cache_clear
-  - devel.container_info.service
-  - devel.menu_rebuild
-  - devel.reinstall
-  - devel.route_info
-  - devel.run_cron
diff --git a/config/export/editor.editor.basic_html.yml b/config/export/editor.editor.basic_html.yml
deleted file mode 100644
index 5fa14c17f..000000000
--- a/config/export/editor.editor.basic_html.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-uuid: fef8df9d-82c3-406e-bbbf-60774521e018
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.basic_html
-  module:
-    - ckeditor5
-format: basic_html
-editor: ckeditor5
-settings:
-  toolbar:
-    items:
-      - bold
-      - italic
-      - '|'
-      - link
-      - '|'
-      - bulletedList
-      - numberedList
-      - '|'
-      - blockQuote
-      - drupalInsertImage
-      - '|'
-      - heading
-      - '|'
-      - sourceEditing
-      - '|'
-      - code
-  plugins:
-    ckeditor5_heading:
-      enabled_headings:
-        - heading2
-        - heading3
-        - heading4
-        - heading5
-        - heading6
-    ckeditor5_sourceEditing:
-      allowed_tags:
-        - '<cite>'
-        - '<dl>'
-        - '<dt>'
-        - '<dd>'
-        - '<span>'
-        - '<a hreflang>'
-        - '<blockquote cite>'
-        - '<ul type>'
-        - '<ol type>'
-        - '<h2 id>'
-        - '<h3 id>'
-        - '<h4 id>'
-        - '<h5 id>'
-        - '<h6 id>'
-    ckeditor5_list:
-      reversed: false
-      startIndex: true
-    ckeditor5_imageResize:
-      allow_resize: true
-image_upload:
-  status: true
-  scheme: public
-  directory: inline-images
-  max_size: ''
-  max_dimensions:
-    width: 0
-    height: 0
diff --git a/config/export/editor.editor.full_html.yml b/config/export/editor.editor.full_html.yml
deleted file mode 100644
index 436e7765e..000000000
--- a/config/export/editor.editor.full_html.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-uuid: 8ba2adb9-470c-422f-8f85-a74e7994c8a1
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.full_html
-  module:
-    - ckeditor5
-format: full_html
-editor: ckeditor5
-settings:
-  toolbar:
-    items:
-      - bold
-      - italic
-      - strikethrough
-      - superscript
-      - subscript
-      - removeFormat
-      - '|'
-      - link
-      - '|'
-      - bulletedList
-      - numberedList
-      - '|'
-      - blockQuote
-      - drupalInsertImage
-      - insertTable
-      - horizontalLine
-      - '|'
-      - heading
-      - codeBlock
-      - '|'
-      - sourceEditing
-  plugins:
-    ckeditor5_heading:
-      enabled_headings:
-        - heading2
-        - heading3
-        - heading4
-        - heading5
-        - heading6
-    ckeditor5_sourceEditing:
-      allowed_tags: {  }
-    ckeditor5_list:
-      reversed: true
-      startIndex: true
-    ckeditor5_imageResize:
-      allow_resize: true
-image_upload:
-  status: true
-  scheme: public
-  directory: inline-images
-  max_size: ''
-  max_dimensions:
-    width: 0
-    height: 0
diff --git a/config/export/facets.facet.creators_and_contributors.yml b/config/export/facets.facet.creators_and_contributors.yml
deleted file mode 100644
index 681f37985..000000000
--- a/config/export/facets.facet.creators_and_contributors.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-uuid: 2080817b-9118-4764-a193-c2a36dc6c25e
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-_core:
-  default_config_hash: KVrlVS15Yhsmk2_CUOmVE0pC_7Rv17neR0FD8ZNymFY
-id: creators_and_contributors
-name: 'Creators and Contributors'
-weight: -3
-min_count: 1
-missing: false
-missing_label: others
-url_alias: creators_and_contributors
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: field_linked_agent_name
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: true
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: true
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.creators_and_contributors_swc.yml b/config/export/facets.facet.creators_and_contributors_swc.yml
deleted file mode 100644
index 92ee3e3cf..000000000
--- a/config/export/facets.facet.creators_and_contributors_swc.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-uuid: beab2212-f472-470c-bbbf-3f4bcc375ba4
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: creators_and_contributors_swc
-name: 'Creators and Contributors_swc'
-weight: -1
-min_count: 1
-missing: false
-missing_label: others
-url_alias: creators_and_contributors
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: field_linked_agent_name
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.member_of.yml b/config/export/facets.facet.member_of.yml
deleted file mode 100644
index d3e37334f..000000000
--- a/config/export/facets.facet.member_of.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: 0b05acbf-44dd-4780-b00b-943a9c6a3cbd
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: member_of
-name: 'Member of'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: member_of
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: member_of_title
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.member_of_content_title.yml b/config/export/facets.facet.member_of_content_title.yml
deleted file mode 100644
index 77ef7b16f..000000000
--- a/config/export/facets.facet.member_of_content_title.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: d7044666-52d9-4e22-a387-2e9b7e1cfec2
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: member_of_content_title
-name: 'Member of » Content » Title'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: member_of_content_title
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: member_of_title
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.member_of_swc.yml b/config/export/facets.facet.member_of_swc.yml
deleted file mode 100644
index 34c4061fd..000000000
--- a/config/export/facets.facet.member_of_swc.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-uuid: 866fe7f3-0d45-46a5-aa1a-de5873e6888e
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: member_of_swc
-name: 'Member Of SwC'
-weight: -2
-min_count: 1
-missing: false
-missing_label: others
-url_alias: member_of
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: member_of_title
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.physical_form.yml b/config/export/facets.facet.physical_form.yml
deleted file mode 100644
index a1c5d2303..000000000
--- a/config/export/facets.facet.physical_form.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-uuid: ad6fa672-e09e-41f4-b5a7-0931e7780a36
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-_core:
-  default_config_hash: '-kS3T9_5sZ-R0F3FpEYcphpjlBCsF0vRw8LlzbmKo6E'
-id: physical_form
-name: 'Physical Form'
-weight: 1
-min_count: 1
-missing: false
-missing_label: others
-url_alias: physical_form
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: field_physical_form
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: true
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: true
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_non_narrowing_result_processor:
-    processor_id: hide_non_narrowing_result_processor
-    weights:
-      build: 40
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.physical_form_swc.yml b/config/export/facets.facet.physical_form_swc.yml
deleted file mode 100644
index 8e2d257a1..000000000
--- a/config/export/facets.facet.physical_form_swc.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-uuid: 379bc639-0f34-4e8f-8c04-366d9eeb5e2c
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: physical_form_swc
-name: 'Physical Form SwC'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: physical_form_swc
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: field_physical_form
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.resource_type.yml b/config/export/facets.facet.resource_type.yml
deleted file mode 100644
index fcf032b71..000000000
--- a/config/export/facets.facet.resource_type.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: 96364d5a-060b-42a6-b97a-1ccfd59ce42d
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: resource_type
-name: 'Resource Type'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: resource_type
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: field_resource_type
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.resource_type_2.yml b/config/export/facets.facet.resource_type_2.yml
deleted file mode 100755
index ad6b5a119..000000000
--- a/config/export/facets.facet.resource_type_2.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: resource_type_2
-name: 'Resource Type'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: resource_type
-facet_source_id: 'search_api:views_page__solr_search_content__page_2'
-field_identifier: field_resource_type
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: false
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.subject.yml b/config/export/facets.facet.subject.yml
deleted file mode 100644
index 2d02bdf09..000000000
--- a/config/export/facets.facet.subject.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-uuid: 1c174624-10d1-4f3c-aad4-8c3ec48de036
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-_core:
-  default_config_hash: IdY4LD9C_1MCrj4vFYQYMLD6GvkEv6WtaqJpwp0jpXg
-id: subject
-name: Subject
-weight: -2
-min_count: 1
-missing: false
-missing_label: others
-url_alias: subject
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: subject_general_name
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: true
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: true
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_non_narrowing_result_processor:
-    processor_id: hide_non_narrowing_result_processor
-    weights:
-      build: 40
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.subject_name.yml b/config/export/facets.facet.subject_name.yml
deleted file mode 100644
index 829143de8..000000000
--- a/config/export/facets.facet.subject_name.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-uuid: cc139c21-e5e4-4215-9fb7-f601b212924b
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-_core:
-  default_config_hash: 7wIVHSpCnRPcuQN3CG6sK7bDUdbHR0waVas0fLnWV7k
-id: subject_name
-name: 'Subject (Names)'
-weight: -1
-min_count: 1
-missing: false
-missing_label: others
-url_alias: subject_name
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: subject_names_name
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: true
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: true
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_non_narrowing_result_processor:
-    processor_id: hide_non_narrowing_result_processor
-    weights:
-      build: 40
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.temporal_subject.yml b/config/export/facets.facet.temporal_subject.yml
deleted file mode 100644
index cea6b5e98..000000000
--- a/config/export/facets.facet.temporal_subject.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-uuid: 51e76c99-0c5d-41d4-af04-e14ad731c60a
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-_core:
-  default_config_hash: m8xjlb85p3PCns2LJMakGwaXjxaJJN_ZhZKfJm55ymU
-id: temporal_subject
-name: 'Subject (Temporal)'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: temporal_subject
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: subject_temporal_name
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 10
-    show_reset_link: true
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: true
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  active_widget_order:
-    processor_id: active_widget_order
-    weights:
-      sort: 20
-    settings:
-      sort: DESC
-  count_widget_order:
-    processor_id: count_widget_order
-    weights:
-      sort: 30
-    settings:
-      sort: DESC
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_non_narrowing_result_processor:
-    processor_id: hide_non_narrowing_result_processor
-    weights:
-      build: 40
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.year.yml b/config/export/facets.facet.year.yml
deleted file mode 100644
index ccf0eaa33..000000000
--- a/config/export/facets.facet.year.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-uuid: a6278648-4668-4594-93e3-2eeebad2993f
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: year
-name: Year
-weight: 3
-min_count: 1
-missing: false
-missing_label: others
-url_alias: year
-facet_source_id: 'search_api:views_page__solr_search_content__page_1'
-field_identifier: edtf_year
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/facets.facet.year_swc.yml b/config/export/facets.facet.year_swc.yml
deleted file mode 100644
index 0a27df43f..000000000
--- a/config/export/facets.facet.year_swc.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-uuid: 3392f222-24f9-4208-8820-7c5d23fac26b
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api.index.default_solr_index
-    - views.view.solr_search_content
-  module:
-    - search_api
-id: year_swc
-name: 'Year SwC'
-weight: 0
-min_count: 1
-missing: false
-missing_label: others
-url_alias: year
-facet_source_id: 'search_api:views_block__solr_search_content__block_1'
-field_identifier: edtf_year
-query_operator: or
-hard_limit: 0
-exclude: false
-use_hierarchy: false
-keep_hierarchy_parents_active: false
-hierarchy:
-  type: taxonomy
-  config: {  }
-expand_hierarchy: false
-enable_parent_when_child_gets_disabled: true
-widget:
-  type: links
-  config:
-    show_numbers: true
-    soft_limit: 0
-    show_reset_link: false
-    reset_text: 'Show all'
-    hide_reset_when_no_selection: false
-    soft_limit_settings:
-      show_less_label: 'Show less'
-      show_more_label: 'Show more'
-empty_behavior:
-  behavior: none
-only_visible_when_facet_source_is_visible: true
-show_only_one_result: false
-show_title: false
-processor_configs:
-  display_value_widget_order:
-    processor_id: display_value_widget_order
-    weights:
-      sort: 40
-    settings:
-      sort: ASC
-  hide_inactive_siblings_processor:
-    processor_id: hide_inactive_siblings_processor
-    weights:
-      build: 10
-    settings: {  }
-  hierarchy_processor:
-    processor_id: hierarchy_processor
-    weights:
-      build: 100
-    settings: {  }
-  url_processor_handler:
-    processor_id: url_processor_handler
-    weights:
-      pre_query: 50
-      build: 15
-    settings: {  }
diff --git a/config/export/features.bundle.controlled_access_terms.yml b/config/export/features.bundle.controlled_access_terms.yml
deleted file mode 100644
index 64763469a..000000000
--- a/config/export/features.bundle.controlled_access_terms.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-uuid: fc1e4f17-68c8-4c58-b003-5ecb8d121e15
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Eu8CvZYqHh4Zx02qu1Xf9a7QC3JnDQTOZmSWkD8h4ic
-machine_name: controlled_access_terms
-name: 'Controlled Access Terms'
-description: 'Auto-generated bundle from package Controlled Access Terms'
-assignments:
-  alter:
-    enabled: true
-    weight: 0
-    core: true
-    uuid: true
-    user_permissions: true
-  base:
-    enabled: true
-    weight: -2
-    types:
-      config:
-        comment_type: comment_type
-        node_type: node_type
-      content:
-        user: user
-  core:
-    enabled: true
-    weight: 5
-    types:
-      config:
-        date_format: date_format
-        field_storage_config: field_storage_config
-        entity_form_mode: entity_form_mode
-        image_style: image_style
-        menu: menu
-        responsive_image_style: responsive_image_style
-        user_role: user_role
-        entity_view_mode: entity_view_mode
-  dependency:
-    enabled: true
-    weight: 15
-  exclude:
-    enabled: true
-    weight: -5
-    types:
-      config:
-        features_bundle: features_bundle
-    curated: true
-    module:
-      installed: true
-      profile: true
-      namespace: true
-      namespace_any: false
-  existing:
-    enabled: true
-    weight: 12
-  forward_dependency:
-    enabled: true
-    weight: 4
-  namespace:
-    enabled: true
-    weight: 0
-  optional:
-    enabled: true
-    weight: 0
-    types:
-      config: {  }
-  packages:
-    enabled: true
-    weight: -20
-  profile:
-    enabled: true
-    weight: 10
-    curated: true
-    standard:
-      files: true
-      dependencies: true
-    types:
-      config:
-        block: block
-        language_content_settings: language_content_settings
-        configurable_language: configurable_language
-        migration: migration
-        shortcut_set: shortcut_set
-        tour: tour
-  site:
-    enabled: true
-    weight: 7
-    types:
-      config:
-        action: action
-        contact_form: contact_form
-        block_content_type: block_content_type
-        rdf_mapping: rdf_mapping
-        search_page: search_page
-        taxonomy_vocabulary: taxonomy_vocabulary
-        editor: editor
-        filter_format: filter_format
-profile_name: ''
-is_profile: false
diff --git a/config/export/features.bundle.default.yml b/config/export/features.bundle.default.yml
deleted file mode 100644
index 41b7f9cf2..000000000
--- a/config/export/features.bundle.default.yml
+++ /dev/null
@@ -1,100 +0,0 @@
-uuid: 3947ca94-2809-4e55-a693-da06c24644bb
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Eu8CvZYqHh4Zx02qu1Xf9a7QC3JnDQTOZmSWkD8h4ic
-machine_name: default
-name: Default
-description: ''
-assignments:
-  alter:
-    enabled: true
-    weight: 0
-    core: true
-    uuid: true
-    user_permissions: true
-  base:
-    enabled: true
-    weight: -2
-    types:
-      config:
-        comment_type: comment_type
-        node_type: node_type
-      content:
-        user: user
-  core:
-    enabled: true
-    weight: 5
-    types:
-      config:
-        date_format: date_format
-        field_storage_config: field_storage_config
-        entity_form_mode: entity_form_mode
-        image_style: image_style
-        menu: menu
-        responsive_image_style: responsive_image_style
-        user_role: user_role
-        entity_view_mode: entity_view_mode
-  dependency:
-    enabled: true
-    weight: 15
-  exclude:
-    enabled: true
-    weight: -5
-    types:
-      config:
-        features_bundle: features_bundle
-    curated: true
-    module:
-      installed: true
-      profile: true
-      namespace: true
-      namespace_any: false
-  existing:
-    enabled: true
-    weight: 12
-  forward_dependency:
-    enabled: true
-    weight: 4
-  namespace:
-    enabled: true
-    weight: 0
-  optional:
-    enabled: true
-    weight: 0
-    types:
-      config: {  }
-  packages:
-    enabled: true
-    weight: -20
-  profile:
-    enabled: true
-    weight: 10
-    curated: true
-    standard:
-      files: true
-      dependencies: true
-    types:
-      config:
-        block: block
-        language_content_settings: language_content_settings
-        configurable_language: configurable_language
-        migration: migration
-        shortcut_set: shortcut_set
-        tour: tour
-  site:
-    enabled: true
-    weight: 7
-    types:
-      config:
-        action: action
-        contact_form: contact_form
-        block_content_type: block_content_type
-        rdf_mapping: rdf_mapping
-        search_page: search_page
-        taxonomy_vocabulary: taxonomy_vocabulary
-        editor: editor
-        filter_format: filter_format
-profile_name: ''
-is_profile: false
diff --git a/config/export/features.bundle.islandora.yml b/config/export/features.bundle.islandora.yml
deleted file mode 100644
index c4ebc90a2..000000000
--- a/config/export/features.bundle.islandora.yml
+++ /dev/null
@@ -1,103 +0,0 @@
-uuid: 92bfce41-ae78-431b-a51a-54fae2055872
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - islandora_core_feature
-_core:
-  default_config_hash: bSyM0wMJJc5ZfovGNJ-eE-9rtwFDRLaSmdwB9-18zUA
-machine_name: islandora
-name: Islandora
-description: 'Features for islandora'
-assignments:
-  alter:
-    enabled: true
-    weight: 0
-    core: true
-    uuid: true
-    user_permissions: true
-  base:
-    enabled: true
-    weight: -2
-    types:
-      config:
-        comment_type: comment_type
-        node_type: node_type
-      content:
-        user: user
-  core:
-    enabled: true
-    weight: 5
-    types:
-      config:
-        date_format: date_format
-        field_storage_config: field_storage_config
-        entity_form_mode: entity_form_mode
-        image_style: image_style
-        menu: menu
-        responsive_image_style: responsive_image_style
-        user_role: user_role
-        entity_view_mode: entity_view_mode
-  dependency:
-    enabled: true
-    weight: 15
-  exclude:
-    enabled: true
-    weight: -5
-    types:
-      config:
-        features_bundle: features_bundle
-    curated: true
-    module:
-      installed: true
-      profile: true
-      namespace: true
-      namespace_any: false
-  existing:
-    enabled: true
-    weight: 12
-  forward_dependency:
-    enabled: true
-    weight: 4
-  namespace:
-    enabled: true
-    weight: 0
-  optional:
-    enabled: true
-    weight: 0
-    types:
-      config: {  }
-  packages:
-    enabled: true
-    weight: -20
-  profile:
-    enabled: true
-    weight: 10
-    curated: true
-    standard:
-      files: true
-      dependencies: true
-    types:
-      config:
-        block: block
-        language_content_settings: language_content_settings
-        configurable_language: configurable_language
-        migration: migration
-        shortcut_set: shortcut_set
-        tour: tour
-  site:
-    enabled: true
-    weight: 7
-    types:
-      config:
-        action: action
-        contact_form: contact_form
-        block_content_type: block_content_type
-        rdf_mapping: rdf_mapping
-        search_page: search_page
-        taxonomy_vocabulary: taxonomy_vocabulary
-        editor: editor
-        filter_format: filter_format
-profile_name: ''
-is_profile: false
diff --git a/config/export/features.settings.yml b/config/export/features.settings.yml
deleted file mode 100644
index cce3a8950..000000000
--- a/config/export/features.settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: YS8SFNy6Qff2UEsQ5zXWEj-ABeRS-jCgcHJrXHJhtJ0
-export:
-  folder: custom
-langcode: en
diff --git a/config/export/field.field.block_content.basic.body.yml b/config/export/field.field.block_content.basic.body.yml
deleted file mode 100644
index ed771bbb4..000000000
--- a/config/export/field.field.block_content.basic.body.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 90699b87-75f9-4f95-aeb4-4fba7eabdab9
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-    - field.storage.block_content.body
-  module:
-    - text
-_core:
-  default_config_hash: foetbaMhlB6uLc2bn-PESvaPkbuDWj0MEjpQVwQiP-o
-id: block_content.basic.body
-field_name: body
-entity_type: block_content
-bundle: basic
-label: Body
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: false
-  required_summary: false
-field_type: text_with_summary
diff --git a/config/export/field.field.comment.comment.comment_body.yml b/config/export/field.field.comment.comment.comment_body.yml
deleted file mode 100644
index 80579f5f8..000000000
--- a/config/export/field.field.comment.comment.comment_body.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 68b80456-e30e-4e56-9446-e71db637d7ea
-langcode: en
-status: true
-dependencies:
-  config:
-    - comment.type.comment
-    - field.storage.comment.comment_body
-  module:
-    - text
-_core:
-  default_config_hash: TmAKjNrJ7RR60YpqvJq_QqEewYe_S8Kd23n8VRCqiWs
-id: comment.comment.comment_body
-field_name: comment_body
-entity_type: comment
-bundle: comment
-label: Comment
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/config/export/field.field.media.audio.field_file_size.yml b/config/export/field.field.media.audio.field_file_size.yml
deleted file mode 100644
index 66d5a24e3..000000000
--- a/config/export/field.field.media.audio.field_file_size.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c814b62c-4a52-4bc4-a44b-1219c94d9f78
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_file_size
-    - media.type.audio
-_core:
-  default_config_hash: vP0SGgHATPIG4wnyKPt_yPp_BbBMFv2QD-c1eSSc_jQ
-id: media.audio.field_file_size
-field_name: field_file_size
-entity_type: media
-bundle: audio
-label: 'File size'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.audio.field_media_audio_file.yml b/config/export/field.field.media.audio.field_media_audio_file.yml
deleted file mode 100644
index c33ebcd88..000000000
--- a/config/export/field.field.media.audio.field_media_audio_file.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: d501ea63-3ce2-498c-ad24-64fb9577c8b2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_audio_file
-    - media.type.audio
-  module:
-    - file
-_core:
-  default_config_hash: Dxz-WEngY38KoRu0t1OD9c63Yysfs3GDAf2wndSH408
-id: media.audio.field_media_audio_file
-field_name: field_media_audio_file
-entity_type: media
-bundle: audio
-label: 'Audio file'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'mp3 wav aac'
-  max_filesize: ''
-  description_field: false
-field_type: file
diff --git a/config/export/field.field.media.audio.field_media_of.yml b/config/export/field.field.media.audio.field_media_of.yml
deleted file mode 100644
index b45ee30b8..000000000
--- a/config/export/field.field.media.audio.field_media_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 22e27d48-241e-42d8-9c78-b9c7eec19599
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.audio
-_core:
-  default_config_hash: InUFyVlpxFYVY-YhhapTUcRhFN2ckUDTH37xpa3Gs2M
-id: media.audio.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: audio
-label: 'Media of'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.audio.field_media_use.yml b/config/export/field.field.media.audio.field_media_use.yml
deleted file mode 100644
index 1131f3af6..000000000
--- a/config/export/field.field.media.audio.field_media_use.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 1563d9ce-b004-4b7a-a783-0b0d30fc02cd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.audio
-    - taxonomy.vocabulary.islandora_media_use
-_core:
-  default_config_hash: C5NjuB4IRbBnEpI-vmqLBitkXyR5GqMMjt-Zn39VGyk
-id: media.audio.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: audio
-label: 'Media Use'
-description: 'Defined by <a href="https://pcdm.org/2015/05/12/use">Portland Common Data Model: Use Extension</a>. ''Original File'' will trigger creation of derivatives. ''Service File'' will be shown on the node. Selecting multiple values is accepted. Derivatives where both the source and target terms are on the same media will be skipped.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_media_use: islandora_media_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.media.audio.field_mime_type.yml b/config/export/field.field.media.audio.field_mime_type.yml
deleted file mode 100644
index 96736be46..000000000
--- a/config/export/field.field.media.audio.field_mime_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 69010fbb-2b37-40dc-ae3b-f8eb93cac3c2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-    - media.type.audio
-_core:
-  default_config_hash: gn7p6M0YOBKc6By22FhqBtqsJ4TDeBzu4QRZBdF4t3U
-id: media.audio.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: audio
-label: 'MIME type'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.audio.field_original_name.yml b/config/export/field.field.media.audio.field_original_name.yml
deleted file mode 100644
index 734bc5458..000000000
--- a/config/export/field.field.media.audio.field_original_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 8682bb67-ca11-4bf2-bf90-1e4e3a650d30
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_original_name
-    - media.type.audio
-_core:
-  default_config_hash: N-iyRU1YnBUbRUTfNbSrr0uDrUirRqaAD2aBnPEyIEo
-id: media.audio.field_original_name
-field_name: field_original_name
-entity_type: media
-bundle: audio
-label: 'Original Name'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.media.audio.field_track.yml b/config/export/field.field.media.audio.field_track.yml
deleted file mode 100644
index c1bbde89f..000000000
--- a/config/export/field.field.media.audio.field_track.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 4a0f63db-439a-4229-8766-e5a3c60898ce
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_track
-    - media.type.audio
-  module:
-    - content_translation
-    - islandora
-third_party_settings:
-  content_translation:
-    translation_sync:
-      file: '0'
-      label: '0'
-      kind: '0'
-      srclang: '0'
-      default: '0'
-_core:
-  default_config_hash: nyFltcz_B1bghGp34hIbTiqNa440C2E3h7pvNFEyZIM
-id: media.audio.field_track
-field_name: field_track
-entity_type: media
-bundle: audio
-label: Track
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: vtt
-  max_filesize: ''
-  languages: installed
-field_type: media_track
diff --git a/config/export/field.field.media.document.field_display_mode_for_viewer.yml b/config/export/field.field.media.document.field_display_mode_for_viewer.yml
deleted file mode 100644
index ea3cb63a2..000000000
--- a/config/export/field.field.media.document.field_display_mode_for_viewer.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: f10721f2-19b2-4109-a40e-c8fab7677428
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.pdfjs
-    - field.storage.media.field_display_mode_for_viewer
-    - media.type.document
-  module:
-    - view_mode_switch
-id: media.document.field_display_mode_for_viewer
-field_name: field_display_mode_for_viewer
-entity_type: media
-bundle: document
-label: 'Display Mode for Viewer'
-description: 'If this media should be displayed in an alternate viewer than set in the "Source" view mode, select it here.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  allowed_view_modes:
-    pdfjs: pdfjs
-field_type: view_mode_switch
diff --git a/config/export/field.field.media.document.field_file_size.yml b/config/export/field.field.media.document.field_file_size.yml
deleted file mode 100644
index 5114aca98..000000000
--- a/config/export/field.field.media.document.field_file_size.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 22b4da0b-7cdd-4e81-bf9d-e2efe234fec2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_file_size
-    - media.type.document
-_core:
-  default_config_hash: k40RrBQ_U9rVpOArPA2S2EFjGMALeJDBtkxgjQ9ewZk
-id: media.document.field_file_size
-field_name: field_file_size
-entity_type: media
-bundle: document
-label: 'File size'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.document.field_media_document.yml b/config/export/field.field.media.document.field_media_document.yml
deleted file mode 100644
index 7f94534bb..000000000
--- a/config/export/field.field.media.document.field_media_document.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: b2226105-2106-462c-b098-88533f2b2e2c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_document
-    - media.type.document
-  module:
-    - file
-_core:
-  default_config_hash: DY5HtJTxUjFRGU_PaY6ifo2nhR-nAZ0y0s6kLmUbv5g
-id: media.document.field_media_document
-field_name: field_media_document
-entity_type: media
-bundle: document
-label: Document
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages'
-  max_filesize: ''
-  description_field: false
-field_type: file
diff --git a/config/export/field.field.media.document.field_media_of.yml b/config/export/field.field.media.document.field_media_of.yml
deleted file mode 100644
index 9fa14a192..000000000
--- a/config/export/field.field.media.document.field_media_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 7b69dbc2-0379-4ff6-bcff-fd5ea5f17b10
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.document
-_core:
-  default_config_hash: hCtesdEi_L52_jy8fXeSz8iof2nR_h6KdIHwHhojtvg
-id: media.document.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: document
-label: 'Media of'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.document.field_media_use.yml b/config/export/field.field.media.document.field_media_use.yml
deleted file mode 100644
index 0e662ee1e..000000000
--- a/config/export/field.field.media.document.field_media_use.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: eb2779c1-4931-47c8-ba6e-1677af16ff89
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.document
-    - taxonomy.vocabulary.islandora_media_use
-_core:
-  default_config_hash: TJZ3dn9Mw-JJQxNvcLzm0GEyyOFz-_HbmyrZD0Jg8IM
-id: media.document.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: document
-label: 'Media Use'
-description: 'Defined by <a href="https://pcdm.org/2015/05/12/use">Portland Common Data Model: Use Extension</a>. ''Original File'' will trigger creation of derivatives. ''Service File'' will be shown on the node. Selecting multiple values is accepted. Derivatives where both the source and target terms are on the same media will be skipped.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_media_use: islandora_media_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.media.document.field_mime_type.yml b/config/export/field.field.media.document.field_mime_type.yml
deleted file mode 100644
index 5365d7e40..000000000
--- a/config/export/field.field.media.document.field_mime_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: dd728529-ce43-49fc-af59-4167b80b00aa
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-    - media.type.document
-_core:
-  default_config_hash: LlueLcXuuC0vvdACUMg2wr0j1Zk5O7tEOuOWFi0DF9o
-id: media.document.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: document
-label: 'MIME type'
-description: 'MIME type of the underlying file'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.document.field_original_name.yml b/config/export/field.field.media.document.field_original_name.yml
deleted file mode 100644
index 6e1ead5fa..000000000
--- a/config/export/field.field.media.document.field_original_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: fa6efdaa-70a6-4564-884c-610e8ca3eac8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_original_name
-    - media.type.document
-_core:
-  default_config_hash: 3lOx0X4ItI3_ySupV1efbUiZWw2Vl985-oA1rfShz2E
-id: media.document.field_original_name
-field_name: field_original_name
-entity_type: media
-bundle: document
-label: 'Original Name'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.media.extracted_text.field_edited_text.yml b/config/export/field.field.media.extracted_text.field_edited_text.yml
deleted file mode 100644
index c4e1ba65d..000000000
--- a/config/export/field.field.media.extracted_text.field_edited_text.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: c2ef5454-2547-4ff4-a61d-69cc13df6a14
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_edited_text
-    - media.type.extracted_text
-  module:
-    - text
-_core:
-  default_config_hash: PFEjmDTu5NiDBpIWn3uT7EbTugdW8f1WbzN5ND7k_PQ
-id: media.extracted_text.field_edited_text
-field_name: field_edited_text
-entity_type: media
-bundle: extracted_text
-label: 'Edited Text'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/config/export/field.field.media.extracted_text.field_media_file.yml b/config/export/field.field.media.extracted_text.field_media_file.yml
deleted file mode 100644
index 0ce2e4e51..000000000
--- a/config/export/field.field.media.extracted_text.field_media_file.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: b913cb7d-8e36-4542-986e-07b0074fdf4d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_file
-    - media.type.extracted_text
-  module:
-    - file
-_core:
-  default_config_hash: QYFdk6Ti48HSzotIjNbsg1nR4vsqGrwZLc6hlm2Odi0
-id: media.extracted_text.field_media_file
-field_name: field_media_file
-entity_type: media
-bundle: extracted_text
-label: File
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'txt doc docx pdf'
-  max_filesize: ''
-  description_field: false
-field_type: file
diff --git a/config/export/field.field.media.extracted_text.field_media_of.yml b/config/export/field.field.media.extracted_text.field_media_of.yml
deleted file mode 100644
index d503fa6fa..000000000
--- a/config/export/field.field.media.extracted_text.field_media_of.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 21001381-f3ae-4d62-b8d4-29d6cd5f4db1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.extracted_text
-_core:
-  default_config_hash: y9R5H1jor6fE99GN9mvpbOkNiq3_xWCt-ROho5REz2U
-id: media.extracted_text.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: extracted_text
-label: 'Media of'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings:
-    target_bundles: null
-    sort:
-      field: _none
-    auto_create: false
-field_type: entity_reference
diff --git a/config/export/field.field.media.extracted_text.field_media_use.yml b/config/export/field.field.media.extracted_text.field_media_use.yml
deleted file mode 100644
index 9331de13e..000000000
--- a/config/export/field.field.media.extracted_text.field_media_use.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 28f79405-2f6b-47ca-b5db-d39df006e378
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.extracted_text
-    - taxonomy.vocabulary.islandora_media_use
-_core:
-  default_config_hash: 0c2ZdJwKpk-6OU5QP48sRuCJoe90GTP-sFXYgSMD9Hc
-id: media.extracted_text.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: extracted_text
-label: 'Media Use'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_media_use: islandora_media_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.media.extracted_text.field_mime_type.yml b/config/export/field.field.media.extracted_text.field_mime_type.yml
deleted file mode 100644
index b92adee24..000000000
--- a/config/export/field.field.media.extracted_text.field_mime_type.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e1a132b0-f5bf-4fb5-a230-f40de9816d3e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-    - media.type.extracted_text
-_core:
-  default_config_hash: A-J-N_Qq9nk6RLP4YyDM04XGAoi3soR-On_D9qJPrsQ
-id: media.extracted_text.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: extracted_text
-label: 'MIME type'
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: text/plain
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.file.field_display_mode_for_viewer.yml b/config/export/field.field.media.file.field_display_mode_for_viewer.yml
deleted file mode 100644
index 0254abbbe..000000000
--- a/config/export/field.field.media.file.field_display_mode_for_viewer.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 5b49a51e-6054-4f2a-a8e2-c19044df2473
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.open_seadragon
-    - core.entity_view_mode.media.pdfjs
-    - field.storage.media.field_display_mode_for_viewer
-    - media.type.file
-  module:
-    - view_mode_switch
-id: media.file.field_display_mode_for_viewer
-field_name: field_display_mode_for_viewer
-entity_type: media
-bundle: file
-label: 'Display Mode for Viewer'
-description: 'If this media should be displayed in an alternate viewer, select it here.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  allowed_view_modes:
-    open_seadragon: open_seadragon
-    pdfjs: pdfjs
-field_type: view_mode_switch
diff --git a/config/export/field.field.media.file.field_file_size.yml b/config/export/field.field.media.file.field_file_size.yml
deleted file mode 100644
index 879de6b23..000000000
--- a/config/export/field.field.media.file.field_file_size.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: d1eb811b-7cc1-4b7d-8cd2-386c37b8d2fb
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_file_size
-    - media.type.file
-_core:
-  default_config_hash: I32_XkXB9KUj0YCqBknXeq_3h_-nxj3fvVxtFvkm28Q
-id: media.file.field_file_size
-field_name: field_file_size
-entity_type: media
-bundle: file
-label: 'File size'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.file.field_media_file.yml b/config/export/field.field.media.file.field_media_file.yml
deleted file mode 100644
index 534f09ad8..000000000
--- a/config/export/field.field.media.file.field_media_file.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: efe8942c-7bb3-4f1a-9099-ad964619dbef
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_file
-    - media.type.file
-  module:
-    - file
-    - filehash
-third_party_settings:
-  filehash:
-    dedupe: 0
-    dedupe_original: false
-_core:
-  default_config_hash: nvfDHoMQmVfRuyJ3o-0vnC0FIqJAvzYgtteAXWxKkp0
-id: media.file.field_media_file
-field_name: field_media_file
-entity_type: media
-bundle: file
-label: File
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'txt rtf doc docx ppt pptx xls xlsx pdf odf odg odp ods odt fodt fods fodp fodg key numbers pages tiff tif jp2 xml zip vtt'
-  max_filesize: ''
-  description_field: false
-field_type: file
diff --git a/config/export/field.field.media.file.field_media_of.yml b/config/export/field.field.media.file.field_media_of.yml
deleted file mode 100644
index 4d61353ec..000000000
--- a/config/export/field.field.media.file.field_media_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 3fcea3d2-b9a5-4458-bd88-ac56bed9ced3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.file
-_core:
-  default_config_hash: ZoFg1xcTNbj60kVradrk0lqIv9uKpyipN6vwxdFV7nQ
-id: media.file.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: file
-label: 'Media of'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.file.field_media_use.yml b/config/export/field.field.media.file.field_media_use.yml
deleted file mode 100644
index a04988186..000000000
--- a/config/export/field.field.media.file.field_media_use.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 26336fb1-e459-406b-ae48-0a9df9939b1c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.file
-    - taxonomy.vocabulary.islandora_media_use
-_core:
-  default_config_hash: K7sb837Z41iGeMJj24U9ezv9LmaHxibXFPASUvK0t9I
-id: media.file.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: file
-label: 'Media Use'
-description: 'Defined by <a href="https://pcdm.org/2015/05/12/use">Portland Common Data Model: Use Extension</a>. ''Original File'' will trigger creation of derivatives. ''Service File'' will be shown on the node. Selecting multiple values is accepted. Derivatives where both the source and target terms are on the same media will be skipped.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_media_use: islandora_media_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.media.file.field_mime_type.yml b/config/export/field.field.media.file.field_mime_type.yml
deleted file mode 100644
index 4a658e426..000000000
--- a/config/export/field.field.media.file.field_mime_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 2c35bc46-c35b-405e-82f8-8a67f59552d6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-    - media.type.file
-_core:
-  default_config_hash: M4fmG1BYu2hErFm9UvXV5zAhBgtiExjztr-UwaO6EBQ
-id: media.file.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: file
-label: 'MIME type'
-description: 'MIME type of the underlying file'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.file.field_original_name.yml b/config/export/field.field.media.file.field_original_name.yml
deleted file mode 100644
index d980693d9..000000000
--- a/config/export/field.field.media.file.field_original_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 26a667bd-39d5-4a25-902b-efc0c4ddb800
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_original_name
-    - media.type.file
-_core:
-  default_config_hash: 2EG6bBoWagYUlv5daiSJg7Y_SgpM5yyxZmrFevg2qmk
-id: media.file.field_original_name
-field_name: field_original_name
-entity_type: media
-bundle: file
-label: 'Original Name'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.media.fits_technical_metadata.field_complete.yml b/config/export/field.field.media.fits_technical_metadata.field_complete.yml
deleted file mode 100644
index 80a179949..000000000
--- a/config/export/field.field.media.fits_technical_metadata.field_complete.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 00485647-e99d-4744-81d1-a04ba1b59f0e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_complete
-    - media.type.fits_technical_metadata
-_core:
-  default_config_hash: J9VO6DNaeBvhft0mHZoCyTNiKRLD-OgFXlkLufgQCVU
-id: media.fits_technical_metadata.field_complete
-field_name: field_complete
-entity_type: media
-bundle: fits_technical_metadata
-label: Complete
-description: ''
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: Complete
-  off_label: Incomplete
-field_type: boolean
diff --git a/config/export/field.field.media.fits_technical_metadata.field_file_size.yml b/config/export/field.field.media.fits_technical_metadata.field_file_size.yml
deleted file mode 100644
index 6efec0c1f..000000000
--- a/config/export/field.field.media.fits_technical_metadata.field_file_size.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 001594c3-dba9-4682-be89-716ff52411dc
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_file_size
-    - media.type.fits_technical_metadata
-_core:
-  default_config_hash: U2awJyFX-gUw2puYre_7hUWMqz7NzUNnI0Kf8pNK2qo
-id: media.fits_technical_metadata.field_file_size
-field_name: field_file_size
-entity_type: media
-bundle: fits_technical_metadata
-label: 'File size'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.fits_technical_metadata.field_media_file.yml b/config/export/field.field.media.fits_technical_metadata.field_media_file.yml
deleted file mode 100644
index 7bb2c4b76..000000000
--- a/config/export/field.field.media.fits_technical_metadata.field_media_file.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 51e020d6-0055-4290-b639-f47741d454a6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_file
-    - media.type.fits_technical_metadata
-  module:
-    - file
-_core:
-  default_config_hash: lJ6fDNUm7Radgk9UXOvc_GlwItQQN4SM6D78lzYG_XE
-id: media.fits_technical_metadata.field_media_file
-field_name: field_media_file
-entity_type: media
-bundle: fits_technical_metadata
-label: File
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: xml
-  max_filesize: ''
-  description_field: false
-field_type: file
diff --git a/config/export/field.field.media.fits_technical_metadata.field_media_of.yml b/config/export/field.field.media.fits_technical_metadata.field_media_of.yml
deleted file mode 100644
index c145f0437..000000000
--- a/config/export/field.field.media.fits_technical_metadata.field_media_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: d8abe5db-d411-4827-a388-ca7d4afb5442
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.fits_technical_metadata
-_core:
-  default_config_hash: 8CDR4tcfysCDQ6CBinsRniQdpngQlB7dyoDF2xQTj04
-id: media.fits_technical_metadata.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: fits_technical_metadata
-label: 'Media of'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.fits_technical_metadata.field_media_use.yml b/config/export/field.field.media.fits_technical_metadata.field_media_use.yml
deleted file mode 100644
index 11dbd9002..000000000
--- a/config/export/field.field.media.fits_technical_metadata.field_media_use.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 50232f03-aff9-4b65-a316-f6ebaeda3ec7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.fits_technical_metadata
-_core:
-  default_config_hash: EnP_zEWaW9ftTG-UqJU-BoWJ0c9vejH_tnGShd7r3Ug
-id: media.fits_technical_metadata.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: fits_technical_metadata
-label: 'Media Use'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.fits_technical_metadata.field_mime_type.yml b/config/export/field.field.media.fits_technical_metadata.field_mime_type.yml
deleted file mode 100644
index adc85330a..000000000
--- a/config/export/field.field.media.fits_technical_metadata.field_mime_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 0fb41f33-de24-4baa-ac42-62e4146cda06
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-    - media.type.fits_technical_metadata
-_core:
-  default_config_hash: w2bEZIfJyXhaB6fHHX9tUep2dbQxQebfqunqm0_lDMI
-id: media.fits_technical_metadata.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: fits_technical_metadata
-label: 'MIME type'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.fits_technical_metadata.fits_ois_file_information_md5che.yml b/config/export/field.field.media.fits_technical_metadata.fits_ois_file_information_md5che.yml
deleted file mode 100644
index 21724a950..000000000
--- a/config/export/field.field.media.fits_technical_metadata.fits_ois_file_information_md5che.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 1c60471b-39e1-468f-a7fa-88384d392259
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.fits_ois_file_information_md5che
-    - media.type.fits_technical_metadata
-  module:
-    - text
-_core:
-  default_config_hash: VmcX-8rAuR3i849ZK_yUZ6wI4zxZmToV_Pq9aX7fL8U
-id: media.fits_technical_metadata.fits_ois_file_information_md5che
-field_name: fits_ois_file_information_md5che
-entity_type: media
-bundle: fits_technical_metadata
-label: OIS_File_Information_Md5checksum
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text
diff --git a/config/export/field.field.media.image.field_display_mode_for_viewer.yml b/config/export/field.field.media.image.field_display_mode_for_viewer.yml
deleted file mode 100644
index 55aba44c4..000000000
--- a/config/export/field.field.media.image.field_display_mode_for_viewer.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 0b47ce79-4085-4f3a-9ec5-390a71b96231
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.open_seadragon
-    - field.storage.media.field_display_mode_for_viewer
-    - media.type.image
-  module:
-    - view_mode_switch
-id: media.image.field_display_mode_for_viewer
-field_name: field_display_mode_for_viewer
-entity_type: media
-bundle: image
-label: 'Display Mode for Viewer'
-description: 'If this media should be displayed in an alternate viewer than what''s configured in the "Source" view mode, select it here.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  allowed_view_modes:
-    open_seadragon: open_seadragon
-field_type: view_mode_switch
diff --git a/config/export/field.field.media.image.field_file_size.yml b/config/export/field.field.media.image.field_file_size.yml
deleted file mode 100644
index 7f56a4833..000000000
--- a/config/export/field.field.media.image.field_file_size.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 2d5e1951-e4a2-4892-b790-2d2e0bcc0149
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_file_size
-    - media.type.image
-_core:
-  default_config_hash: G8_aciRGv4iXPN6ddyZrHicmB5lQbj9X6yPY-UWIwmA
-id: media.image.field_file_size
-field_name: field_file_size
-entity_type: media
-bundle: image
-label: 'File size'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.image.field_height.yml b/config/export/field.field.media.image.field_height.yml
deleted file mode 100644
index e009e9941..000000000
--- a/config/export/field.field.media.image.field_height.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: fde681e7-9493-4bac-8ad2-155a0017ba1a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_height
-    - media.type.image
-_core:
-  default_config_hash: 4LhgCjcEdM8QcjuC0rtzHHhL34Dn_VZ_kfPT3Hf_ttk
-id: media.image.field_height
-field_name: field_height
-entity_type: media
-bundle: image
-label: Height
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.image.field_media_image.yml b/config/export/field.field.media.image.field_media_image.yml
deleted file mode 100644
index 8ef0cb953..000000000
--- a/config/export/field.field.media.image.field_media_image.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: 692f22d4-faea-4f38-81fe-fec49a31f933
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_image
-    - media.type.image
-  module:
-    - image
-_core:
-  default_config_hash: idm-WOGrZKncw6SH8HGFJ6IzrgFpS0ifbdaK1x-81SA
-id: media.image.field_media_image
-field_name: field_media_image
-entity_type: media
-bundle: image
-label: Image
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/field.field.media.image.field_media_of.yml b/config/export/field.field.media.image.field_media_of.yml
deleted file mode 100644
index 7b2fb536c..000000000
--- a/config/export/field.field.media.image.field_media_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: d7b62bf1-a651-42e9-a14f-a16542328ff2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.image
-_core:
-  default_config_hash: II3-g2WzFJTItCsK7PFCOchXURVgIiu6X9J4NBpEju0
-id: media.image.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: image
-label: 'Media of'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.image.field_media_use.yml b/config/export/field.field.media.image.field_media_use.yml
deleted file mode 100644
index dc95d88d4..000000000
--- a/config/export/field.field.media.image.field_media_use.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 5c5ddfb6-18bb-4d62-98fc-4830c7d78787
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.image
-    - taxonomy.vocabulary.islandora_media_use
-_core:
-  default_config_hash: bfstL81O8B-mDI8L3ueHM8dLjsJt7rTvPJRpEVXXSQ8
-id: media.image.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: image
-label: 'Media Use'
-description: 'Defined by <a href="https://pcdm.org/2015/05/12/use">Portland Common Data Model: Use Extension</a>. ''Original File'' will trigger creation of derivatives. ''Service File'' will be shown on the node. Selecting multiple values is accepted. Derivatives where both the source and target terms are on the same media will be skipped.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_media_use: islandora_media_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.media.image.field_mime_type.yml b/config/export/field.field.media.image.field_mime_type.yml
deleted file mode 100644
index 0139a1d21..000000000
--- a/config/export/field.field.media.image.field_mime_type.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: ae2933db-e700-48ed-bcb4-9f7eb783f497
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-    - media.type.image
-_core:
-  default_config_hash: 0BPru0UosRliILaltdnUM_bZyg_c0uD9EL-0OBAV-Ck
-id: media.image.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: image
-label: 'MIME type'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.image.field_original_name.yml b/config/export/field.field.media.image.field_original_name.yml
deleted file mode 100644
index 21a2c7f2b..000000000
--- a/config/export/field.field.media.image.field_original_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 9c75a6b7-120c-4603-bb5a-64afe5df1363
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_original_name
-    - media.type.image
-_core:
-  default_config_hash: sd2wfEfGGrnfJ5l1772vucf0dcJGCfwE5dhCe6eVQhg
-id: media.image.field_original_name
-field_name: field_original_name
-entity_type: media
-bundle: image
-label: 'Original Name'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.media.image.field_width.yml b/config/export/field.field.media.image.field_width.yml
deleted file mode 100644
index b97c07aa6..000000000
--- a/config/export/field.field.media.image.field_width.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 24b42519-0e52-41bc-843e-066cf0592dda
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_width
-    - media.type.image
-_core:
-  default_config_hash: Hn6FngV0d-St8D7Czxlzb-O-IOTL9u-BNDoaMZAOiu0
-id: media.image.field_width
-field_name: field_width
-entity_type: media
-bundle: image
-label: Width
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.remote_video.field_media_oembed_video.yml b/config/export/field.field.media.remote_video.field_media_oembed_video.yml
deleted file mode 100644
index 2ff536170..000000000
--- a/config/export/field.field.media.remote_video.field_media_oembed_video.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: cafd405f-f8c4-4a57-9271-7f4e022cddf1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_oembed_video
-    - media.type.remote_video
-_core:
-  default_config_hash: Eo4HHenV5iZat_kEWgr_wydD3TgwURMCzwt-7qIEyoM
-id: media.remote_video.field_media_oembed_video
-field_name: field_media_oembed_video
-entity_type: media
-bundle: remote_video
-label: 'Video URL'
-description: ''
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.video.field_file_size.yml b/config/export/field.field.media.video.field_file_size.yml
deleted file mode 100644
index 5c866507b..000000000
--- a/config/export/field.field.media.video.field_file_size.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: cb542d31-6aad-48b1-a1fe-2ba2151a4806
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_file_size
-    - media.type.video
-_core:
-  default_config_hash: zH3Rn7ZU6uSjbpw7u7YomCMvji5rI2Y19zJP0tJP1D0
-id: media.video.field_file_size
-field_name: field_file_size
-entity_type: media
-bundle: video
-label: 'File size'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.media.video.field_media_of.yml b/config/export/field.field.media.video.field_media_of.yml
deleted file mode 100644
index 6cc2ab63a..000000000
--- a/config/export/field.field.media.video.field_media_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 026054be-f947-406c-ad17-637a81b01a8b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - media.type.video
-_core:
-  default_config_hash: h5JQnggi4jLBpJfch-_9pxhCzQem-ZkOjnrOrHqNHHo
-id: media.video.field_media_of
-field_name: field_media_of
-entity_type: media
-bundle: video
-label: 'Media of'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.media.video.field_media_use.yml b/config/export/field.field.media.video.field_media_use.yml
deleted file mode 100644
index 64febddeb..000000000
--- a/config/export/field.field.media.video.field_media_use.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 696e0f70-09df-4f7f-9664-401e5c365471
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - media.type.video
-    - taxonomy.vocabulary.islandora_media_use
-_core:
-  default_config_hash: ItCCR1HuFMVGf78Nuj-Z05cB0GeyzPgPY9vORuQu8l4
-id: media.video.field_media_use
-field_name: field_media_use
-entity_type: media
-bundle: video
-label: 'Media Use'
-description: 'Defined by <a href="https://pcdm.org/2015/05/12/use">Portland Common Data Model: Use Extension</a>. ''Original File'' will trigger creation of derivatives. ''Service File'' will be shown on the node. Selecting multiple values is accepted. Derivatives where both the source and target terms are on the same media will be skipped.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_media_use: islandora_media_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.media.video.field_media_video_file.yml b/config/export/field.field.media.video.field_media_video_file.yml
deleted file mode 100644
index 561f0157f..000000000
--- a/config/export/field.field.media.video.field_media_video_file.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: b12b1817-3ec4-4719-a2ca-777103767682
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_video_file
-    - media.type.video
-  module:
-    - file
-_core:
-  default_config_hash: aVsH94glMbKDyF_GDPdx83nXIjQmnd9chf7vHN1ApGc
-id: media.video.field_media_video_file
-field_name: field_media_video_file
-entity_type: media
-bundle: video
-label: 'Video file'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: mp4
-  max_filesize: ''
-  description_field: false
-field_type: file
diff --git a/config/export/field.field.media.video.field_mime_type.yml b/config/export/field.field.media.video.field_mime_type.yml
deleted file mode 100644
index 7548c2cc5..000000000
--- a/config/export/field.field.media.video.field_mime_type.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: ea28bd08-3201-4089-a72f-fcead77382dc
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_mime_type
-_core:
-  default_config_hash: _cHp1IxgQg4nx6340EAIT6PiCRpSgiEY3It5PRK6SCY
-id: media.video.field_mime_type
-field_name: field_mime_type
-entity_type: media
-bundle: video
-label: 'MIME type'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.media.video.field_original_name.yml b/config/export/field.field.media.video.field_original_name.yml
deleted file mode 100644
index 8e21b612c..000000000
--- a/config/export/field.field.media.video.field_original_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 6cd4e831-6d98-4f7d-8a86-481875f3cdf1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_original_name
-    - media.type.video
-_core:
-  default_config_hash: BiGfmIIgL79cf8MjbsvdJI5_4A2WPYm5bAFAskD-rho
-id: media.video.field_original_name
-field_name: field_original_name
-entity_type: media
-bundle: video
-label: 'Original Name'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.media.video.field_track.yml b/config/export/field.field.media.video.field_track.yml
deleted file mode 100644
index a5b9ed56c..000000000
--- a/config/export/field.field.media.video.field_track.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 20870d2d-ddda-4bfb-993e-6482719c8783
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_track
-    - media.type.video
-  module:
-    - islandora
-_core:
-  default_config_hash: I-lLYtbtQuId1NQ5d8LPg-wg3A4TpqTodY7SBMreXnI
-id: media.video.field_track
-field_name: field_track
-entity_type: media
-bundle: video
-label: Track
-description: 'Supply a caption file here.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: vtt
-  max_filesize: ''
-  languages: installed
-field_type: media_track
diff --git a/config/export/field.field.node.article.body.yml b/config/export/field.field.node.article.body.yml
deleted file mode 100644
index 37fd8bcc8..000000000
--- a/config/export/field.field.node.article.body.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 7de0a9ee-e1e3-4161-b1c0-58fb3a2ea2a4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.body
-    - node.type.article
-  module:
-    - text
-_core:
-  default_config_hash: IjZnOLWk1Pjq3WRg2pLSA1ERh7Po7izCq_p6UztZr2c
-id: node.article.body
-field_name: body
-entity_type: node
-bundle: article
-label: Body
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: true
-  required_summary: false
-field_type: text_with_summary
diff --git a/config/export/field.field.node.article.comment.yml b/config/export/field.field.node.article.comment.yml
deleted file mode 100644
index 522593228..000000000
--- a/config/export/field.field.node.article.comment.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 220219f8-8044-4d97-87a8-5ef04c7f5ee9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.comment
-    - node.type.article
-  module:
-    - comment
-_core:
-  default_config_hash: UqXlkKC4v2-bDfWx4zcXQrD5YIi3d5byENEmWv-G_Uc
-id: node.article.comment
-field_name: comment
-entity_type: node
-bundle: article
-label: Comments
-description: ''
-required: false
-translatable: true
-default_value:
-  -
-    status: 2
-    cid: 0
-    last_comment_timestamp: 0
-    last_comment_name: null
-    last_comment_uid: 0
-    comment_count: 0
-default_value_callback: ''
-settings:
-  default_mode: 1
-  per_page: 50
-  anonymous: 0
-  form_location: true
-  preview: 1
-field_type: comment
diff --git a/config/export/field.field.node.article.field_image.yml b/config/export/field.field.node.article.field_image.yml
deleted file mode 100644
index 27990df01..000000000
--- a/config/export/field.field.node.article.field_image.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: 6043d2f6-65bb-418b-a39d-91b32a44abf9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_image
-    - node.type.article
-  module:
-    - image
-_core:
-  default_config_hash: PmVL51L3A9QGbPLoeLHw5epAPszeZRasCeC3imeeDRQ
-id: node.article.field_image
-field_name: field_image
-entity_type: node
-bundle: article
-label: Image
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: '[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: true
-  alt_field_required: true
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/field.field.node.article.field_tags.yml b/config/export/field.field.node.article.field_tags.yml
deleted file mode 100644
index fa434bed3..000000000
--- a/config/export/field.field.node.article.field_tags.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: f920822b-77ca-485d-aa02-88845cf3d5a1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_tags
-    - node.type.article
-    - taxonomy.vocabulary.tags
-_core:
-  default_config_hash: QdUgf_beeoaPiyKorFv0q1fcJpWH_uZTqe_xoVJacrw
-id: node.article.field_tags
-field_name: field_tags
-entity_type: node
-bundle: article
-label: Tags
-description: 'Enter a comma-separated list. For example: Amsterdam, Mexico City, "Cleveland, Ohio"'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      tags: tags
-    sort:
-      field: _none
-    auto_create: true
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_alternative_title.yml b/config/export/field.field.node.collection_object.field_alternative_title.yml
deleted file mode 100644
index 9bad9caa1..000000000
--- a/config/export/field.field.node.collection_object.field_alternative_title.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: a340e4d9-7a8a-4616-9de8-bca79d42e02a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_alternative_title
-    - node.type.collection_object
-_core:
-  default_config_hash: x1kVsa3o35jt8DrMLPWOhcqt8BjgNxcJaID6T-Q8f6Q
-id: node.collection_object.field_alternative_title
-field_name: field_alternative_title
-entity_type: node
-bundle: collection_object
-label: 'Alternative Title'
-description: '<b>Optional</b>. If available, record an alternative name for the resource.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.collection_object.field_collection_contact_email.yml b/config/export/field.field.node.collection_object.field_collection_contact_email.yml
deleted file mode 100644
index 149cad538..000000000
--- a/config/export/field.field.node.collection_object.field_collection_contact_email.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: bb368b0e-8411-415c-9a46-f1a62f82f631
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_collection_contact_email
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: 3YQmSHL1YYw-Q4fHsSK9LaKbTRIjo0X0An4dkEkJ46M
-id: node.collection_object.field_collection_contact_email
-field_name: field_collection_contact_email
-entity_type: node
-bundle: collection_object
-label: 'Collection Contact Email'
-description: 'Email address of a person one can contact to ask questions about the collection and its items.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: email
diff --git a/config/export/field.field.node.collection_object.field_collection_contact_name.yml b/config/export/field.field.node.collection_object.field_collection_contact_name.yml
deleted file mode 100644
index 4c8a9e859..000000000
--- a/config/export/field.field.node.collection_object.field_collection_contact_name.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 0f644ffa-de61-4518-a25a-49e88d7a34d3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_collection_contact_name
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: uPlfc18VK1ZjWoUTufqv1J-z2l7Rf8GCYmcfrpsJwFA
-id: node.collection_object.field_collection_contact_name
-field_name: field_collection_contact_name
-entity_type: node
-bundle: collection_object
-label: 'Collection Contact Name'
-description: 'Name of person that can be contacted to ask questions to about the collection and its items. '
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.collection_object.field_collection_number.yml b/config/export/field.field.node.collection_object.field_collection_number.yml
deleted file mode 100644
index a52efc22d..000000000
--- a/config/export/field.field.node.collection_object.field_collection_number.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 2522ff5a-3812-43bd-bccd-31fc801fc197
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_collection_number
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: 4reJd59phgHp6IdGEmTCBSRf1UDWJXVfQLzktLfMJQg
-id: node.collection_object.field_collection_number
-field_name: field_collection_number
-entity_type: node
-bundle: collection_object
-label: 'Collection Number'
-description: 'Example: COLL-0001'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.collection_object.field_date_captured.yml b/config/export/field.field.node.collection_object.field_date_captured.yml
deleted file mode 100644
index 1a7d483e7..000000000
--- a/config/export/field.field.node.collection_object.field_date_captured.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 1e95a4ca-c4ef-494d-880d-0e1abcf89dbb
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_captured
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_date_captured
-field_name: field_date_captured
-entity_type: node
-bundle: collection_object
-label: 'Date Captured'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.collection_object.field_date_modified.yml b/config/export/field.field.node.collection_object.field_date_modified.yml
deleted file mode 100644
index 7b9d93189..000000000
--- a/config/export/field.field.node.collection_object.field_date_modified.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 24ece564-0cb2-406f-8a1f-c520b0e0e624
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_modified
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_date_modified
-field_name: field_date_modified
-entity_type: node
-bundle: collection_object
-label: 'Date Modified'
-description: 'Date on which the original resource being represented in Islandora was changed. Typically modification dates of digital representations of the resource stored in Islandora will be recorded on the relevant Media instead of here.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.collection_object.field_date_valid.yml b/config/export/field.field.node.collection_object.field_date_valid.yml
deleted file mode 100644
index c49baac28..000000000
--- a/config/export/field.field.node.collection_object.field_date_valid.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 1088ff32-c6af-4e81-96f6-e976a7695146
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_valid
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_date_valid
-field_name: field_date_valid
-entity_type: node
-bundle: collection_object
-label: 'Date Valid'
-description: 'Date (often a range) of validity of a resource.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.collection_object.field_description.yml b/config/export/field.field.node.collection_object.field_description.yml
deleted file mode 100644
index fb50e4e0f..000000000
--- a/config/export/field.field.node.collection_object.field_description.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 40000d05-880f-49a9-9603-3f0558cd0c9e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_description
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: xhbdJ_NmAlM2Xt18g-FfB4Know0k1CoL_-r3DEYT1GA
-id: node.collection_object.field_description
-field_name: field_description
-entity_type: node
-bundle: collection_object
-label: Description
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.node.collection_object.field_display_hints.yml b/config/export/field.field.node.collection_object.field_display_hints.yml
deleted file mode 100644
index 1b8700d7d..000000000
--- a/config/export/field.field.node.collection_object.field_display_hints.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 2dbbf3c4-a55c-4b8b-bb07-c70c6a362035
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_display_hints
-    - node.type.collection_object
-    - taxonomy.vocabulary.islandora_display
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_display_hints
-field_name: field_display_hints
-entity_type: node
-bundle: collection_object
-label: 'Display Hints'
-description: 'Terms that will change how this resource is displayed.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_display: islandora_display
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_edtf_date.yml b/config/export/field.field.node.collection_object.field_edtf_date.yml
deleted file mode 100644
index 23c45e2fc..000000000
--- a/config/export/field.field.node.collection_object.field_edtf_date.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 3d714177-818d-415c-941f-56c6071878e1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_edtf_date
-field_name: field_edtf_date
-entity_type: node
-bundle: collection_object
-label: 'Date (Unspecified)'
-description: 'A date without a type or relationship to the resource specified'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.collection_object.field_edtf_date_created.yml b/config/export/field.field.node.collection_object.field_edtf_date_created.yml
deleted file mode 100644
index c9ae96896..000000000
--- a/config/export/field.field.node.collection_object.field_edtf_date_created.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: ac13ff66-2a73-4767-8d6b-208d03a05df4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date_created
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_edtf_date_created
-field_name: field_edtf_date_created
-entity_type: node
-bundle: collection_object
-label: 'Date Created'
-description: 'Date of creation of the resource'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.collection_object.field_edtf_date_issued.yml b/config/export/field.field.node.collection_object.field_edtf_date_issued.yml
deleted file mode 100644
index 6f4861d18..000000000
--- a/config/export/field.field.node.collection_object.field_edtf_date_issued.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: e9d691a2-2c2e-4236-a69b-71b3dbcd23b3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date_issued
-    - node.type.collection_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_edtf_date_issued
-field_name: field_edtf_date_issued
-entity_type: node
-bundle: collection_object
-label: 'Date Issued'
-description: 'Date of formal issuance of the resource. This includes publication dates.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.collection_object.field_extent.yml b/config/export/field.field.node.collection_object.field_extent.yml
deleted file mode 100644
index d044e6e28..000000000
--- a/config/export/field.field.node.collection_object.field_extent.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 0d910318-1f2e-4aa1-a483-b0252cdb446c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_extent
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_extent
-field_name: field_extent
-entity_type: node
-bundle: collection_object
-label: Extent
-description: 'The size or duration of the resource in its original form. Extent of representations of the resource stored in Islandora should be recorded on the relevant Media files.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.collection_object.field_featured_item.yml b/config/export/field.field.node.collection_object.field_featured_item.yml
deleted file mode 100644
index dc40ecb5b..000000000
--- a/config/export/field.field.node.collection_object.field_featured_item.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 04ec05f4-ca7a-46ba-852a-b1d92bd49621
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_featured_item
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: 5sxKqq1HREqz2dUwdRT5UC0FDbHWLayNCt_oRCHBl7M
-id: node.collection_object.field_featured_item
-field_name: field_featured_item
-entity_type: node
-bundle: collection_object
-label: 'Featured Item'
-description: 'Enabling this will cause this item to be displayed in the "featured item" section on the collection page. '
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: Featured
-  off_label: 'Not Featured'
-field_type: boolean
diff --git a/config/export/field.field.node.collection_object.field_finding_aid.yml b/config/export/field.field.node.collection_object.field_finding_aid.yml
deleted file mode 100644
index 1af0cba87..000000000
--- a/config/export/field.field.node.collection_object.field_finding_aid.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: c60dc668-9d48-4911-9ab3-329506c36aeb
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_finding_aid
-    - node.type.collection_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: STEhvYGTDCX93VFP-NqYSqlDr1ITLd5ICvzlzczyshA
-id: node.collection_object.field_finding_aid
-field_name: field_finding_aid
-entity_type: node
-bundle: collection_object
-label: 'Finding Aid'
-description: 'A link to the relevant finding aid record in Johns Hopkins Libraries'' instance of <a href="https://aspace.library.jhu.edu/" target="_blank">ArchivesSpace</a>.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.collection_object.field_geographic_subject.yml b/config/export/field.field.node.collection_object.field_geographic_subject.yml
deleted file mode 100644
index cb92ec61c..000000000
--- a/config/export/field.field.node.collection_object.field_geographic_subject.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 610c67f6-6a0c-4f2d-9dc8-30bba815a400
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_geographic_subject
-    - node.type.collection_object
-    - taxonomy.vocabulary.geo_location
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_geographic_subject
-field_name: field_geographic_subject
-entity_type: node
-bundle: collection_object
-label: 'Subject (Geographic)'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      geo_location: geo_location
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: subject
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_linked_agent.yml b/config/export/field.field.node.collection_object.field_linked_agent.yml
deleted file mode 100644
index f6560a871..000000000
--- a/config/export/field.field.node.collection_object.field_linked_agent.yml
+++ /dev/null
@@ -1,312 +0,0 @@
-uuid: 861637fa-10e9-4f0c-aa8f-b4eb78ce88e6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_linked_agent
-    - node.type.collection_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_linked_agent
-field_name: field_linked_agent
-entity_type: node
-bundle: collection_object
-label: 'Linked Agent'
-description: 'Names of entities having some relationship to the resource, and, optionally, the relationship to the resource. If a relationship is not specified, it will be recorded as <a href="https://id.loc.gov/vocabulary/relators/asn.html">Associated Name</a> in the system''s linked data representation. <br /> <em>Publisher/manufacturer/distributor/etc. name is recorded here, with the appropriate relationship specified.</em>'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-  rel_types:
-    'relators:asn': ''
-    'relators:abr': Abridger
-    'relators:act': Actor
-    'relators:adp': Adapter
-    'relators:rcp': Addressee
-    'relators:anl': Analyst
-    'relators:anm': Animator
-    'relators:ann': Annotator
-    'relators:apl': Appellant
-    'relators:ape': Appellee
-    'relators:app': Applicant
-    'relators:arc': Architect
-    'relators:arr': Arranger
-    'relators:acp': 'Art copyist'
-    'relators:adi': 'Art director'
-    'relators:art': Artist
-    'relators:ard': 'Artistic director'
-    'relators:asg': Assignee
-    'relators:att': 'Attributed name'
-    'relators:auc': Auctioneer
-    'relators:aut': Author
-    'relators:aqt': 'Author in quotations or text abstracts'
-    'relators:aft': 'Author of afterword, colophon, etc.'
-    'relators:aud': 'Author of dialog'
-    'relators:aui': 'Author of introduction, etc.'
-    'relators:ato': Autographer
-    'relators:ant': 'Bibliographic antecedent'
-    'relators:bnd': Binder
-    'relators:bdd': 'Binding designer'
-    'relators:blw': 'Blurb writer'
-    'relators:bkd': 'Book designer'
-    'relators:bkp': 'Book producer'
-    'relators:bjd': 'Bookjacket designer'
-    'relators:bpd': 'Bookplate designer'
-    'relators:bsl': Bookseller
-    'relators:brl': 'Braille embosser'
-    'relators:brd': Broadcaster
-    'relators:cll': Calligrapher
-    'relators:ctg': Cartographer
-    'relators:cas': Caster
-    'relators:cns': Censor
-    'relators:chr': Choreographer
-    'relators:clb': 'Collaborator (deprecated, use Contributor)'
-    'relators:cng': Cinematographer
-    'relators:cli': Client
-    'relators:cor': 'Collection registrar'
-    'relators:col': Collector
-    'relators:clt': Collotyper
-    'relators:clr': Colorist
-    'relators:cmm': Commentator
-    'relators:cwt': 'Commentator for written text'
-    'relators:com': Compiler
-    'relators:cpl': Complainant
-    'relators:cpt': Complainant-appellant
-    'relators:cpe': Complainant-appellee
-    'relators:cmp': Composer
-    'relators:cmt': Compositor
-    'relators:ccp': Conceptor
-    'relators:cnd': Conductor
-    'relators:con': Conservator
-    'relators:csl': Consultant
-    'relators:csp': 'Consultant to a project'
-    'relators:cos': Contestant
-    'relators:cot': Contestant-appellant
-    'relators:coe': Contestant-appellee
-    'relators:cts': Contestee
-    'relators:ctt': Contestee-appellant
-    'relators:cte': Contestee-appellee
-    'relators:ctr': Contractor
-    'relators:ctb': Contributor
-    'relators:cpc': 'Copyright claimant'
-    'relators:cph': 'Copyright holder'
-    'relators:crr': Corrector
-    'relators:crp': Correspondent
-    'relators:cst': 'Costume designer'
-    'relators:cou': 'Court governed'
-    'relators:crt': 'Court reporter'
-    'relators:cov': 'Cover designer'
-    'relators:cre': Creator
-    'relators:cur': Curator
-    'relators:dnc': Dancer
-    'relators:dtc': 'Data contributor'
-    'relators:dtm': 'Data manager'
-    'relators:dte': Dedicatee
-    'relators:dto': Dedicator
-    'relators:dfd': Defendant
-    'relators:dft': Defendant-appellant
-    'relators:dfe': Defendant-appellee
-    'relators:dgg': 'Degree granting institution'
-    'relators:dgs': 'Degree supervisor'
-    'relators:dln': Delineator
-    'relators:dpc': Depicted
-    'relators:dpt': Depositor
-    'relators:dsr': Designer
-    'relators:drt': Director
-    'relators:dis': Dissertant
-    'relators:dbp': 'Distribution place'
-    'relators:dst': Distributor
-    'relators:dnr': Donor
-    'relators:drm': Draftsman
-    'relators:dub': 'Dubious author'
-    'relators:edt': Editor
-    'relators:edc': 'Editor of compilation'
-    'relators:edm': 'Editor of moving image work'
-    'relators:elg': Electrician
-    'relators:elt': Electrotyper
-    'relators:enj': 'Enacting jurisdiction'
-    'relators:eng': Engineer
-    'relators:egr': Engraver
-    'relators:etr': Etcher
-    'relators:evp': 'Event place'
-    'relators:exp': Expert
-    'relators:fac': Facsimilist
-    'relators:fld': 'Field director'
-    'relators:fmd': 'Film director'
-    'relators:fds': 'Film distributor'
-    'relators:flm': 'Film editor'
-    'relators:fmp': 'Film producer'
-    'relators:fmk': Filmmaker
-    'relators:fpy': 'First party'
-    'relators:frg': Forger
-    'relators:fmo': 'Former owner'
-    'relators:fnd': Funder
-    'relators:gis': 'Geographic information specialist'
-    'relators:grt': 'Graphic technician (deprecated, use Artist)'
-    'relators:hnr': Honoree
-    'relators:hst': Host
-    'relators:his': 'Host institution'
-    'relators:ilu': Illuminator
-    'relators:ill': Illustrator
-    'relators:ins': Inscriber
-    'relators:itr': Instrumentalist
-    'relators:ive': Interviewee
-    'relators:ivr': Interviewer
-    'relators:inv': Inventor
-    'relators:isb': 'Issuing body'
-    'relators:jud': Judge
-    'relators:jug': 'Jurisdiction governed'
-    'relators:lbr': Laboratory
-    'relators:ldr': 'Laboratory director'
-    'relators:lsa': 'Landscape architect'
-    'relators:led': Lead
-    'relators:len': Lender
-    'relators:lil': Libelant
-    'relators:lit': Libelant-appellant
-    'relators:lie': Libelant-appellee
-    'relators:lel': Libelee
-    'relators:let': Libelee-appellant
-    'relators:lee': Libelee-appellee
-    'relators:lbt': Librettist
-    'relators:lse': Licensee
-    'relators:lso': Licensor
-    'relators:lgd': 'Lighting designer'
-    'relators:ltg': Lithographer
-    'relators:lyr': Lyricist
-    'relators:mfp': 'Manufacture place'
-    'relators:mfr': Manufacturer
-    'relators:mrb': Marbler
-    'relators:mrk': 'Markup editor'
-    'relators:med': Medium
-    'relators:mdc': 'Metadata contact'
-    'relators:mte': Metal-engraver
-    'relators:mtk': 'Minute taker'
-    'relators:mod': Moderator
-    'relators:mon': Monitor
-    'relators:mcp': 'Music copyist'
-    'relators:msd': 'Musical director'
-    'relators:mus': Musician
-    'relators:nrt': Narrator
-    'relators:osp': 'Onscreen presenter'
-    'relators:opn': Opponent
-    'relators:orm': Organizer
-    'relators:org': Originator
-    'relators:oth': Other
-    'relators:own': Owner
-    'relators:pan': Panelist
-    'relators:ppm': Papermaker
-    'relators:pta': 'Patent applicant'
-    'relators:pth': 'Patent holder'
-    'relators:pat': Patron
-    'relators:prf': Performer
-    'relators:pma': 'Permitting agency'
-    'relators:pht': Photographer
-    'relators:ptf': Plaintiff
-    'relators:ptt': Plaintiff-appellant
-    'relators:pte': Plaintiff-appellee
-    'relators:plt': Platemaker
-    'relators:pra': Praeses
-    'relators:pre': Presenter
-    'relators:prt': Printer
-    'relators:pop': 'Printer of plates'
-    'relators:prm': Printmaker
-    'relators:prc': 'Process contact'
-    'relators:pro': Producer
-    'relators:prn': 'Production company'
-    'relators:prs': 'Production designer'
-    'relators:pmn': 'Production manager'
-    'relators:prd': 'Production personnel'
-    'relators:prp': 'Production place'
-    'relators:prg': Programmer
-    'relators:pdr': 'Project director'
-    'relators:pfr': Proofreader
-    'relators:prv': Provider
-    'relators:pup': 'Publication place'
-    'relators:pbl': Publisher
-    'relators:pbd': 'Publishing director'
-    'relators:ppt': Puppeteer
-    'relators:rdd': 'Radio director'
-    'relators:rpc': 'Radio producer'
-    'relators:rce': 'Recording engineer'
-    'relators:rcd': Recordist
-    'relators:red': Redaktor
-    'relators:ren': Renderer
-    'relators:rpt': Reporter
-    'relators:rps': Repository
-    'relators:rth': 'Research team head'
-    'relators:rtm': 'Research team member'
-    'relators:res': Researcher
-    'relators:rsp': Respondent
-    'relators:rst': Respondent-appellant
-    'relators:rse': Respondent-appellee
-    'relators:rpy': 'Responsible party'
-    'relators:rsg': Restager
-    'relators:rsr': Restorationist
-    'relators:rev': Reviewer
-    'relators:rbr': Rubricator
-    'relators:sce': Scenarist
-    'relators:sad': 'Scientific advisor'
-    'relators:aus': Screenwriter
-    'relators:scr': Scribe
-    'relators:scl': Sculptor
-    'relators:spy': 'Second party'
-    'relators:sec': Secretary
-    'relators:sll': Seller
-    'relators:std': 'Set designer'
-    'relators:stg': Setting
-    'relators:sgn': Signer
-    'relators:sng': Singer
-    'relators:sds': 'Sound designer'
-    'relators:spk': Speaker
-    'relators:spn': Sponsor
-    'relators:sgd': 'Stage director'
-    'relators:stm': 'Stage manager'
-    'relators:stn': 'Standards body'
-    'relators:str': Stereotyper
-    'relators:stl': Storyteller
-    'relators:sht': 'Supporting host'
-    'relators:srv': Surveyor
-    'relators:tch': Teacher
-    'relators:tcd': 'Technical director'
-    'relators:tld': 'Television director'
-    'relators:tlp': 'Television producer'
-    'relators:ths': 'Thesis advisor'
-    'relators:trc': Transcriber
-    'relators:trl': Translator
-    'relators:tyd': 'Type designer'
-    'relators:tyg': Typographer
-    'relators:uvp': 'University place'
-    'relators:vdg': Videographer
-    'relators:voc': 'Vocalist (deprecated, use Singer)'
-    'relators:vac': 'Voice actor'
-    'relators:wit': Witness
-    'relators:wde': 'Wood engraver'
-    'relators:wdc': Woodcutter
-    'relators:wam': 'Writer of accompanying material'
-    'relators:wac': 'Writer of added commentary'
-    'relators:wal': 'Writer of added lyrics'
-    'relators:wat': 'Writer of added text'
-    'relators:win': 'Writer of introduction'
-    'relators:wpr': 'Writer of preface'
-    'relators:wst': 'Writer of supplementary textual content'
-field_type: typed_relation
diff --git a/config/export/field.field.node.collection_object.field_member_of.yml b/config/export/field.field.node.collection_object.field_member_of.yml
deleted file mode 100644
index ebde985df..000000000
--- a/config/export/field.field.node.collection_object.field_member_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 83e0cb09-baa0-4595-9939-40f73432ca9c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_member_of
-    - node.type.collection_object
-_core:
-  default_config_hash: Y4yKpaHmxm0mkyZa5wCOpNT9ilZcsd1VFvBglMaJaMk
-id: node.collection_object.field_member_of
-field_name: field_member_of
-entity_type: node
-bundle: collection_object
-label: 'Parent Collection (member of)'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings: {  }
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_model.yml b/config/export/field.field.node.collection_object.field_model.yml
deleted file mode 100644
index 3aeeb00a6..000000000
--- a/config/export/field.field.node.collection_object.field_model.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-uuid: 788247d1-0ecd-4c6a-9f84-139ec541fb78
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_model
-    - node.type.collection_object
-    - taxonomy.vocabulary.islandora_models
-  content:
-    - 'taxonomy_term:islandora_models:26e3ab11-d978-416f-926f-9884fd483bde'
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: QqAkPbIlYxbbmliKLbAdXx1WHw6iyrWRYB7pkkNMYBI
-id: node.collection_object.field_model
-field_name: field_model
-entity_type: node
-bundle: collection_object
-label: Model
-description: ''
-required: true
-translatable: true
-default_value:
-  -
-    target_uuid: 26e3ab11-d978-416f-926f-9884fd483bde
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_models: islandora_models
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_resource_type.yml b/config/export/field.field.node.collection_object.field_resource_type.yml
deleted file mode 100644
index a70ca045b..000000000
--- a/config/export/field.field.node.collection_object.field_resource_type.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: bd9bdcf3-28a4-41d5-9335-df2538aa02e4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_resource_type
-    - node.type.collection_object
-    - taxonomy.vocabulary.resource_types
-  content:
-    - 'taxonomy_term:resource_types:63178ab8-7b32-42b5-aa0a-ace431321e34'
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_resource_type
-field_name: field_resource_type
-entity_type: node
-bundle: collection_object
-label: Type
-description: ''
-required: false
-translatable: true
-default_value:
-  -
-    target_uuid: 63178ab8-7b32-42b5-aa0a-ace431321e34
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      resource_types: resource_types
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_rights.yml b/config/export/field.field.node.collection_object.field_rights.yml
deleted file mode 100644
index a45246309..000000000
--- a/config/export/field.field.node.collection_object.field_rights.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: b6f00e16-b74b-4cd7-932a-ac1d9b128687
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_rights
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_rights
-field_name: field_rights
-entity_type: node
-bundle: collection_object
-label: Rights
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.collection_object.field_subject_general.yml b/config/export/field.field.node.collection_object.field_subject_general.yml
deleted file mode 100644
index eb8416ea4..000000000
--- a/config/export/field.field.node.collection_object.field_subject_general.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: b5bb0a3b-a88b-4cfd-809e-6da5a4e51c08
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_subject_general
-    - node.type.collection_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.geo_location
-    - taxonomy.vocabulary.person
-    - taxonomy.vocabulary.subject
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_subject_general
-field_name: field_subject_general
-entity_type: node
-bundle: collection_object
-label: Subject
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      geo_location: geo_location
-      person: person
-      subject: subject
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: subject
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_subjects_name.yml b/config/export/field.field.node.collection_object.field_subjects_name.yml
deleted file mode 100644
index 98090354d..000000000
--- a/config/export/field.field.node.collection_object.field_subjects_name.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 4788f8c7-9536-4e7c-a986-2098595a7825
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_subjects_name
-    - node.type.collection_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_subjects_name
-field_name: field_subjects_name
-entity_type: node
-bundle: collection_object
-label: 'Subject (Name)'
-description: 'Any new term added by typing it here will be added to the Person taxonomy. If you need to create a new Corporate Body or Family taxonomy term, do <i>Structure > Taxonomy > [the appropriate taxonomy] > Add terms</i> to add terms. You may need to save this form and reload it for your terms to be available here.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: person
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_temporal_subject.yml b/config/export/field.field.node.collection_object.field_temporal_subject.yml
deleted file mode 100644
index dce105770..000000000
--- a/config/export/field.field.node.collection_object.field_temporal_subject.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: f49055f2-5ce9-4c79-bc72-caabc189fb97
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_temporal_subject
-    - node.type.collection_object
-    - taxonomy.vocabulary.temporal_subjects
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_temporal_subject
-field_name: field_temporal_subject
-entity_type: node
-bundle: collection_object
-label: 'Subject (Temporal)'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      temporal_subjects: temporal_subjects
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.collection_object.field_unique_id.yml b/config/export/field.field.node.collection_object.field_unique_id.yml
deleted file mode 100644
index 9f66c6f9e..000000000
--- a/config/export/field.field.node.collection_object.field_unique_id.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: ca83e01a-0ed6-44b9-b3c5-b4ad5ee7c725
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_unique_id
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-_core:
-  default_config_hash: BOLtvOMucTdMeFs-g-t_8fqCdG4joQwDLwq_ltm21bY
-id: node.collection_object.field_unique_id
-field_name: field_unique_id
-entity_type: node
-bundle: collection_object
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field. Generally, this should not be edited.'
-required: true
-translatable: false
-default_value:
-  -
-    value: 1ae7f8b2-eaaa-4764-a602-b6d355985e83
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.collection_object.field_weight.yml b/config/export/field.field.node.collection_object.field_weight.yml
deleted file mode 100644
index 03f92347f..000000000
--- a/config/export/field.field.node.collection_object.field_weight.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 32d11d11-e2bc-4dd4-8502-26bdf3508cd2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_weight
-    - node.type.collection_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.collection_object.field_weight
-field_name: field_weight
-entity_type: node
-bundle: collection_object
-label: 'Custom Sort Value'
-description: 'Sorting order'
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: 1
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.node.islandora_object.field_abstract.yml b/config/export/field.field.node.islandora_object.field_abstract.yml
deleted file mode 100644
index 9c6622bb2..000000000
--- a/config/export/field.field.node.islandora_object.field_abstract.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: cfc7a183-a2b8-4831-a111-3887e09ae1f1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_abstract
-    - node.type.islandora_object
-  module:
-    - text
-_core:
-  default_config_hash: r2tcw25l3BnD3JSUlKXj6NWsGJ0Ik6YdUiTqqGW0EwA
-id: node.islandora_object.field_abstract
-field_name: field_abstract
-entity_type: node
-bundle: islandora_object
-label: Abstract
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/config/export/field.field.node.islandora_object.field_alt_title.yml b/config/export/field.field.node.islandora_object.field_alt_title.yml
deleted file mode 100644
index c2855d23e..000000000
--- a/config/export/field.field.node.islandora_object.field_alt_title.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: d85d8344-8210-4b3f-823e-710a5202a9bd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_alt_title
-    - node.type.islandora_object
-_core:
-  default_config_hash: dMouFg1OR13vwI4XJXZhga423_Qwc42cjpNg10g5TqQ
-id: node.islandora_object.field_alt_title
-field_name: field_alt_title
-entity_type: node
-bundle: islandora_object
-label: 'Alternative Title'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_alternative_title.yml b/config/export/field.field.node.islandora_object.field_alternative_title.yml
deleted file mode 100644
index b7348f52f..000000000
--- a/config/export/field.field.node.islandora_object.field_alternative_title.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: 39afa9fb-01c7-48ad-8e20-6b33d6c9a0b9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_alternative_title
-    - node.type.islandora_object
-id: node.islandora_object.field_alternative_title
-field_name: field_alternative_title
-entity_type: node
-bundle: islandora_object
-label: 'Alternative Title'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_citable_url.yml b/config/export/field.field.node.islandora_object.field_citable_url.yml
deleted file mode 100644
index f0959db5e..000000000
--- a/config/export/field.field.node.islandora_object.field_citable_url.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 1e23ee5d-06d2-453e-b529-50934f1cb221
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_citable_url
-    - node.type.islandora_object
-  module:
-    - link
-id: node.islandora_object.field_citable_url
-field_name: field_citable_url
-entity_type: node
-bundle: islandora_object
-label: 'Citable URL'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 1
-  link_type: 17
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_classification.yml b/config/export/field.field.node.islandora_object.field_classification.yml
deleted file mode 100644
index 43ada3c05..000000000
--- a/config/export/field.field.node.islandora_object.field_classification.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 229de43a-c4da-42f3-bc62-a2354f9b4c7f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_classification
-    - node.type.islandora_object
-_core:
-  default_config_hash: HtAP6NLeT_vMHO7F9z4IC9bVkGGPa1RiKOzKa9VAg_0
-id: node.islandora_object.field_classification
-field_name: field_classification
-entity_type: node
-bundle: islandora_object
-label: 'Classification (Other)'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_collection_number.yml b/config/export/field.field.node.islandora_object.field_collection_number.yml
deleted file mode 100644
index 41420b6f8..000000000
--- a/config/export/field.field.node.islandora_object.field_collection_number.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 364252d5-c64b-4ccd-ad7b-7c3532ba2f1e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_collection_number
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_collection_number
-field_name: field_collection_number
-entity_type: node
-bundle: islandora_object
-label: 'Collection Number'
-description: '<b>Optional.</b> If applicable, record the relevant collection number as written in Johns Hopkins Libraries'' instance of <a href="https://aspace.library.jhu.edu/" target="_blank">ArchivesSpace</a>. Example: RG.14.050'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_contributor.yml b/config/export/field.field.node.islandora_object.field_contributor.yml
deleted file mode 100644
index 17cad8202..000000000
--- a/config/export/field.field.node.islandora_object.field_contributor.yml
+++ /dev/null
@@ -1,313 +0,0 @@
-uuid: 8650501c-bb11-4202-8073-8db2fdc5a09e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_contributor
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: node.islandora_object.field_contributor
-field_name: field_contributor
-entity_type: node
-bundle: islandora_object
-label: Contributor
-description: '<b>Optional.</b> If available, record one or more agents (people, corporate bodies, or families) responsible for making contributions to the resource. Use or add names from <a href="/admin/structure/taxonomy/manage/person/overview" target="_blank">Person</a>, <a href="/admin/structure/taxonomy/manage/corporate_body/overview" target="_blank">Corporate Body</a>, or <a href="/admin/structure/taxonomy/manage/family/overview" target="_blank">Family</a> taxonomies. If known, indicate a more specific role of the contributor agent for the resource. For example, an agent may be linked as a "contributor" to a resource with the more specific role of "editor."'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: corporate_body
-  rel_types:
-    'relators:abr': 'Abridger (abr)'
-    'relators:act': 'Actor (act)'
-    'relators:adp': 'Adapter (adp)'
-    'relators:rcp': 'Addressee (rcp)'
-    'relators:anl': 'Analyst (anl)'
-    'relators:anm': 'Animator (anm)'
-    'relators:ann': 'Annotator (ann)'
-    'relators:apl': 'Appellant (apl)'
-    'relators:ape': 'Appellee (ape)'
-    'relators:app': 'Applicant (app)'
-    'relators:arc': 'Architect (arc)'
-    'relators:arr': 'Arranger (arr)'
-    'relators:acp': 'Art copyist (acp)'
-    'relators:adi': 'Art director (adi)'
-    'relators:art': 'Artist (art)'
-    'relators:ard': 'Artistic director (ard)'
-    'relators:asg': 'Assignee (asg)'
-    'relators:asn': 'Associated name (asn)'
-    'relators:att': 'Attributed name (att)'
-    'relators:auc': 'Auctioneer (auc)'
-    'relators:aut': 'Author (aut)'
-    'relators:aqt': 'Author in quotations or text abstracts (aqt)'
-    'relators:aft': 'Author of afterword, colophon, etc. (aft)'
-    'relators:aud': 'Author of dialog (aud)'
-    'relators:aui': 'Author of introduction, etc. (aui)'
-    'relators:ato': 'Autographer (ato)'
-    'relators:ant': 'Bibliographic antecedent (ant)'
-    'relators:bnd': 'Binder (bnd)'
-    'relators:bdd': 'Binding designer (bdd)'
-    'relators:blw': 'Blurb writer (blw)'
-    'relators:bkd': 'Book designer (bkd)'
-    'relators:bkp': 'Book producer (bkp)'
-    'relators:bjd': 'Bookjacket designer (bjd)'
-    'relators:bpd': 'Bookplate designer (bpd)'
-    'relators:bsl': 'Bookseller (bsl)'
-    'relators:brl': 'Braille embosser (brl)'
-    'relators:brd': 'Broadcaster (brd)'
-    'relators:cll': 'Calligrapher (cll)'
-    'relators:ctg': 'Cartographer (ctg)'
-    'relators:cas': 'Caster (cas)'
-    'relators:cns': 'Censor (cns)'
-    'relators:chr': 'Choreographer (chr)'
-    'relators:clb': 'Collaborator (clb; deprecated, use Contributor)'
-    'relators:cng': 'Cinematographer (cng)'
-    'relators:cli': 'Client (cli)'
-    'relators:cor': 'Collection registrar (cor)'
-    'relators:col': 'Collector (col)'
-    'relators:clt': 'Collotyper (clt)'
-    'relators:clr': 'Colorist (clr)'
-    'relators:cmm': 'Commentator (cmm)'
-    'relators:cwt': 'Commentator for written text (cwt)'
-    'relators:com': 'Compiler (com)'
-    'relators:cpl': 'Complainant (cpl)'
-    'relators:cpt': 'Complainant-appellant (cpt)'
-    'relators:cpe': 'Complainant-appellee (cpe)'
-    'relators:cmp': 'Composer (cmp)'
-    'relators:cmt': 'Compositor (cmt)'
-    'relators:ccp': 'Conceptor (ccp)'
-    'relators:cnd': 'Conductor (cnd)'
-    'relators:con': 'Conservator (con)'
-    'relators:csl': 'Consultant (csl)'
-    'relators:csp': 'Consultant to a project (csp)'
-    'relators:cos': 'Contestant (cos)'
-    'relators:cot': 'Contestant-appellant (cot)'
-    'relators:coe': 'Contestant-appellee (coe)'
-    'relators:cts': 'Contestee (cts)'
-    'relators:ctt': 'Contestee-appellant (ctt)'
-    'relators:cte': 'Contestee-appellee (cte)'
-    'relators:ctr': 'Contractor (ctr)'
-    'relators:ctb': 'Contributor (ctb)'
-    'relators:cpc': 'Copyright claimant (cpc)'
-    'relators:cph': 'Copyright holder (cph)'
-    'relators:crr': 'Corrector (crr)'
-    'relators:crp': 'Correspondent (crp)'
-    'relators:cst': 'Costume designer (cst)'
-    'relators:cou': 'Court governed (cou)'
-    'relators:crt': 'Court reporter (crt)'
-    'relators:cov': 'Cover designer (cov)'
-    'relators:cre': 'Creator (cre)'
-    'relators:cur': 'Curator (cur)'
-    'relators:dnc': 'Dancer (dnc)'
-    'relators:dtc': 'Data contributor (dtc)'
-    'relators:dtm': 'Data manager (dtm)'
-    'relators:dte': 'Dedicatee (dte)'
-    'relators:dto': 'Dedicator (dto)'
-    'relators:dfd': 'Defendant (dfd)'
-    'relators:dft': 'Defendant-appellant (dft)'
-    'relators:dfe': 'Defendant-appellee (dfe)'
-    'relators:dgg': 'Degree granting institution (dgg)'
-    'relators:dgs': 'Degree supervisor (dgs)'
-    'relators:dln': 'Delineator (dln)'
-    'relators:dpc': 'Depicted (dpc)'
-    'relators:dpt': 'Depositor (dpt)'
-    'relators:dsr': 'Designer (dsr)'
-    'relators:drt': 'Director (drt)'
-    'relators:dis': 'Dissertant (dis)'
-    'relators:dbp': 'Distribution place (dbp)'
-    'relators:dst': 'Distributor (dst)'
-    'relators:dnr': 'Donor (dnr)'
-    'relators:drm': 'Draftsman (drm)'
-    'relators:dub': 'Dubious author (dub)'
-    'relators:edt': 'Editor (edt)'
-    'relators:edc': 'Editor of compilation (edc)'
-    'relators:edm': 'Editor of moving image work (edm)'
-    'relators:elg': 'Electrician (elg)'
-    'relators:elt': 'Electrotyper (elt)'
-    'relators:enj': 'Enacting jurisdiction (enj)'
-    'relators:eng': 'Engineer (eng)'
-    'relators:egr': 'Engraver (egr)'
-    'relators:etr': 'Etcher (etr)'
-    'relators:evp': 'Event place (evp)'
-    'relators:exp': 'Expert (exp)'
-    'relators:fac': 'Facsimilist (fac)'
-    'relators:fld': 'Field director (fld)'
-    'relators:fmd': 'Film director (fmd)'
-    'relators:fds': 'Film distributor (fds)'
-    'relators:flm': 'Film editor (flm)'
-    'relators:fmp': 'Film producer (fmp)'
-    'relators:fmk': 'Filmmaker (fmk)'
-    'relators:fpy': 'First party (fpy)'
-    'relators:frg': 'Forger (frg)'
-    'relators:fmo': 'Former owner (fmo)'
-    'relators:fnd': 'Funder (fnd)'
-    'relators:gis': 'Geographic information specialist (gis)'
-    'relators:grt': 'Graphic technician (grt; deprecated, use Artist)'
-    'bibframe:heldBy': 'Held by'
-    'relators:hnr': 'Honoree (hnr)'
-    'relators:hst': 'Host (hst)'
-    'relators:his': 'Host institution (his)'
-    'relators:ilu': 'Illuminator (ilu)'
-    'relators:ill': 'Illustrator (ill)'
-    'relators:ins': 'Inscriber (ins)'
-    'relators:itr': 'Instrumentalist (itr)'
-    'relators:ive': 'Interviewee (ive)'
-    'relators:ivr': 'Interviewer (ivr)'
-    'relators:inv': 'Inventor (inv)'
-    'relators:isb': 'Issuing body (isb)'
-    'relators:jud': 'Judge (jud)'
-    'relators:jug': 'Jurisdiction governed (jug)'
-    'relators:lbr': 'Laboratory (lbr)'
-    'relators:ldr': 'Laboratory director (ldr)'
-    'relators:lsa': 'Landscape architect (lsa)'
-    'relators:led': 'Lead (led)'
-    'relators:len': 'Lender (len)'
-    'relators:lil': 'Libelant (lil)'
-    'relators:lit': 'Libelant-appellant (lit)'
-    'relators:lie': 'Libelant-appellee (lie)'
-    'relators:lel': 'Libelee (lel)'
-    'relators:let': 'Libelee-appellant (let)'
-    'relators:lee': 'Libelee-appellee (lee)'
-    'relators:lbt': 'Librettist (lbt)'
-    'relators:lse': 'Licensee (lse)'
-    'relators:lso': 'Licensor (lso)'
-    'relators:lgd': 'Lighting designer (lgd)'
-    'relators:ltg': 'Lithographer (ltg)'
-    'relators:lyr': 'Lyricist (lyr)'
-    'relators:mfp': 'Manufacture place (mfp)'
-    'relators:mfr': 'Manufacturer (mfr)'
-    'relators:mrb': 'Marbler (mrb)'
-    'relators:mrk': 'Markup editor (mrk)'
-    'relators:med': 'Medium (med)'
-    'relators:mdc': 'Metadata contact (mdc)'
-    'relators:mte': 'Metal-engraver (mte)'
-    'relators:mtk': 'Minute taker (mtk)'
-    'relators:mod': 'Moderator (mod)'
-    'relators:mon': 'Monitor (mon)'
-    'relators:mcp': 'Music copyist (mcp)'
-    'relators:msd': 'Musical director (msd)'
-    'relators:mus': 'Musician (mus)'
-    'relators:nrt': 'Narrator (nrt)'
-    'relators:osp': 'Onscreen presenter (osp)'
-    'relators:opn': 'Opponent (opn)'
-    'relators:orm': 'Organizer (orm)'
-    'relators:org': 'Originator (org)'
-    'relators:oth': 'Other (oth)'
-    'relators:own': 'Owner (own)'
-    'relators:pan': 'Panelist (pan)'
-    'relators:ppm': 'Papermaker (ppm)'
-    'relators:pta': 'Patent applicant (pta)'
-    'relators:pth': 'Patent holder (pth)'
-    'relators:pat': 'Patron (pat)'
-    'relators:prf': 'Performer (prf)'
-    'relators:pma': 'Permitting agency (pma)'
-    'relators:pht': 'Photographer (pht)'
-    'relators:ptf': 'Plaintiff (ptf)'
-    'relators:ptt': 'Plaintiff-appellant (ptt)'
-    'relators:pte': 'Plaintiff-appellee (pte)'
-    'relators:plt': 'Platemaker (plt)'
-    'relators:pra': 'Praeses (pra)'
-    'relators:pre': 'Presenter (pre)'
-    'relators:prt': 'Printer (prt)'
-    'relators:pop': 'Printer of plates (pop)'
-    'relators:prm': 'Printmaker (prm)'
-    'relators:prc': 'Process contact (prc)'
-    'relators:pro': 'Producer (pro)'
-    'relators:prn': 'Production company (prn)'
-    'relators:prs': 'Production designer (prs)'
-    'relators:pmn': 'Production manager (pmn)'
-    'relators:prd': 'Production personnel (prd)'
-    'relators:prp': 'Production place (prp)'
-    'relators:prg': 'Programmer (prg)'
-    'relators:pdr': 'Project director (pdr)'
-    'relators:pfr': 'Proofreader (pfr)'
-    'relators:prv': 'Provider (prv)'
-    'relators:pup': 'Publication place (pup)'
-    'relators:pbl': 'Publisher (pbl)'
-    'relators:pbd': 'Publishing director (pbd)'
-    'relators:ppt': 'Puppeteer (ppt)'
-    'relators:rdd': 'Radio director (rdd)'
-    'relators:rpc': 'Radio producer (rpc)'
-    'relators:rce': 'Recording engineer (rce)'
-    'relators:rcd': 'Recordist (rcd)'
-    'relators:red': 'Redaktor (red)'
-    'relators:ren': 'Renderer (ren)'
-    'relators:rpt': 'Reporter (rpt)'
-    'relators:rps': 'Repository (rps)'
-    'relators:rth': 'Research team head (rth)'
-    'relators:rtm': 'Research team member (rtm)'
-    'relators:res': 'Researcher (res)'
-    'relators:rsp': 'Respondent (rsp)'
-    'relators:rst': 'Respondent-appellant (rst)'
-    'relators:rse': 'Respondent-appellee (rse)'
-    'relators:rpy': 'Responsible party (rpy)'
-    'relators:rsg': 'Restager (rsg)'
-    'relators:rsr': 'Restorationist (rsr)'
-    'relators:rev': 'Reviewer (rev)'
-    'relators:rbr': 'Rubricator (rbr)'
-    'relators:sce': 'Scenarist (sce)'
-    'relators:sad': 'Scientific advisor (sad)'
-    'relators:aus': 'Screenwriter (aus)'
-    'relators:scr': 'Scribe (scr)'
-    'relators:scl': 'Sculptor (scl)'
-    'relators:spy': 'Second party (spy)'
-    'relators:sec': 'Secretary (sec)'
-    'relators:sll': 'Seller (sll)'
-    'relators:std': 'Set designer (std)'
-    'relators:stg': 'Setting (stg)'
-    'relators:sgn': 'Signer (sgn)'
-    'relators:sng': 'Singer (sng)'
-    'relators:sds': 'Sound designer (sds)'
-    'relators:spk': 'Speaker (spk)'
-    'relators:spn': 'Sponsor (spn)'
-    'relators:sgd': 'Stage director (sgd)'
-    'relators:stm': 'Stage manager (stm)'
-    'relators:stn': 'Standards body (stn)'
-    'relators:str': 'Stereotyper (str)'
-    'relators:stl': 'Storyteller (stl)'
-    'relators:sht': 'Supporting host (sht)'
-    'relators:srv': 'Surveyor (srv)'
-    'relators:tch': 'Teacher (tch)'
-    'relators:tcd': 'Technical director (tcd)'
-    'relators:tld': 'Television director (tld)'
-    'relators:tlp': 'Television producer (tlp)'
-    'relators:ths': 'Thesis advisor (ths)'
-    'relators:trc': 'Transcriber (trc)'
-    'relators:trl': 'Translator (trl)'
-    'relators:tyd': 'Type designer (tyd)'
-    'relators:tyg': 'Typographer (tyg)'
-    'relators:uvp': 'University place (uvp)'
-    'relators:vdg': 'Videographer (vdg)'
-    'relators:voc': 'Vocalist (voc; deprecated, use Singer)'
-    'relators:vac': 'Voice actor (vac)'
-    'relators:wit': 'Witness (wit)'
-    'relators:wde': 'Wood engraver (wde)'
-    'relators:wdc': 'Woodcutter (wdc)'
-    'relators:wam': 'Writer of accompanying material (wam)'
-    'relators:wac': 'Writer of added commentary (wac)'
-    'relators:wal': 'Writer of added lyrics (wal)'
-    'relators:wat': 'Writer of added text (wat)'
-    'relators:win': 'Writer of introduction (win)'
-    'relators:wpr': 'Writer of preface (wpr)'
-    'relators:wst': 'Writer of supplementary textual content (wst)'
-field_type: typed_relation
diff --git a/config/export/field.field.node.islandora_object.field_coordinates.yml b/config/export/field.field.node.islandora_object.field_coordinates.yml
deleted file mode 100644
index d7fad86fe..000000000
--- a/config/export/field.field.node.islandora_object.field_coordinates.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 611cbb06-2748-4df0-9e22-846a2c1e24a0
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_coordinates
-    - node.type.islandora_object
-  module:
-    - geolocation
-_core:
-  default_config_hash: 3LJiS71wStGgGqLOAspiDwwhKqHn5EbM8qOFW0u2JxQ
-id: node.islandora_object.field_coordinates
-field_name: field_coordinates
-entity_type: node
-bundle: islandora_object
-label: Coordinates
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: geolocation
diff --git a/config/export/field.field.node.islandora_object.field_coordinates_text.yml b/config/export/field.field.node.islandora_object.field_coordinates_text.yml
deleted file mode 100644
index 50f5131c6..000000000
--- a/config/export/field.field.node.islandora_object.field_coordinates_text.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: a126205a-f78e-4adc-89e8-02304cb82912
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_coordinates_text
-    - node.type.islandora_object
-_core:
-  default_config_hash: mKgSwGZaa_U9LzzPRT1De3Qsvv-uTlz9e32lk31xAac
-id: node.islandora_object.field_coordinates_text
-field_name: field_coordinates_text
-entity_type: node
-bundle: islandora_object
-label: 'Coordinates (Text)'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_copyright_and_use.yml b/config/export/field.field.node.islandora_object.field_copyright_and_use.yml
deleted file mode 100644
index b9350986c..000000000
--- a/config/export/field.field.node.islandora_object.field_copyright_and_use.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 6a8d3ba8-5abf-4aab-83c1-8c78ba3ce247
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_copyright_and_use
-    - node.type.islandora_object
-    - taxonomy.vocabulary.copyright_and_use
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_copyright_and_use
-field_name: field_copyright_and_use
-entity_type: node
-bundle: islandora_object
-label: 'Copyright and Use'
-description: '<b>Required.</b> Select a RightsStatement.org statement about various property rights associated with the resource, including intellectual property rights. Term(s) from the <a href="/admin/structure/taxonomy/manage/copyright_and_use/overview" target="_blank">Copyright and Use</a> taxonomy.'
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      copyright_and_use: copyright_and_use
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_copyright_date.yml b/config/export/field.field.node.islandora_object.field_copyright_date.yml
deleted file mode 100644
index 16ca3b9cb..000000000
--- a/config/export/field.field.node.islandora_object.field_copyright_date.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 1f4e9d5d-03d8-4212-888c-5e2b3eaea3f3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_copyright_date
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: tLzHU_CS3zWYHu8Pt-6CzkMmIWrVbmM3dWMqCzhgs90
-id: node.islandora_object.field_copyright_date
-field_name: field_copyright_date
-entity_type: node
-bundle: islandora_object
-label: 'Copyright Date'
-description: 'Date of copyright of the resource.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_copyright_holder.yml b/config/export/field.field.node.islandora_object.field_copyright_holder.yml
deleted file mode 100644
index d48d7153a..000000000
--- a/config/export/field.field.node.islandora_object.field_copyright_holder.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 1bec53d4-1990-4a3e-a1a7-b4ade5ee7956
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_copyright_holder
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_copyright_holder
-field_name: field_copyright_holder
-entity_type: node
-bundle: islandora_object
-label: 'Copyright Holder'
-description: "<b>Optional</b>.   If applicable, record one or more agents (people, corporate bodies, or families) owning or managing rights over the resource. Use term(s) from the <a href=\"/admin/structure/taxonomy/manage/person/overview\" target=\"_blank\">Person</a>, <a href=\"/admin/structure/taxonomy/manage/corporate_body/overview\" target=\"_blank\">Corporate Body</a>, or <a href=\"/admin/structure/taxonomy/manage/family/overview\" target=\"_blank\">Family</a> taxonomies.\r\n"
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_creator.yml b/config/export/field.field.node.islandora_object.field_creator.yml
deleted file mode 100644
index d1128ea51..000000000
--- a/config/export/field.field.node.islandora_object.field_creator.yml
+++ /dev/null
@@ -1,312 +0,0 @@
-uuid: c17f0da2-4467-4053-ae0d-492079ba7178
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_creator
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_creator
-field_name: field_creator
-entity_type: node
-bundle: islandora_object
-label: Creator
-description: '<b>Required if known.</b> Record one or more agents (people, corporate bodies, or families) responsible for making the resource. Use or add names from <a href="/admin/structure/taxonomy/manage/person/overview" target="_blank">Person</a>, <a href="/admin/structure/taxonomy/manage/corporate_body/overview" target="_blank">Corporate Body</a>, or <a href="/admin/structure/taxonomy/manage/family/overview" target="_blank">Family</a> taxonomies. If known, indicate a more specific role of the creator agent for the resource. For example, an agent may be linked as a "creator" to a resource with the more specific role of "illustrator."'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-  rel_types:
-    'relators:abr': 'Abridger (abr)'
-    'relators:act': 'Actor (act)'
-    'relators:adp': 'Adapter (adp)'
-    'relators:rcp': 'Addressee (rcp)'
-    'relators:anl': 'Analyst (anl)'
-    'relators:anm': 'Animator (anm)'
-    'relators:ann': 'Annotator (ann)'
-    'relators:apl': 'Appellant (apl)'
-    'relators:ape': 'Appellee (ape)'
-    'relators:app': 'Applicant (app)'
-    'relators:arc': 'Architect (arc)'
-    'relators:arr': 'Arranger (arr)'
-    'relators:acp': 'Art copyist (acp)'
-    'relators:adi': 'Art director (adi)'
-    'relators:art': 'Artist (art)'
-    'relators:ard': 'Artistic director (ard)'
-    'relators:asg': 'Assignee (asg)'
-    'relators:asn': 'Associated name (asn)'
-    'relators:att': 'Attributed name (att)'
-    'relators:auc': 'Auctioneer (auc)'
-    'relators:aut': 'Author (aut)'
-    'relators:aqt': 'Author in quotations or text abstracts (aqt)'
-    'relators:aft': 'Author of afterword, colophon, etc. (aft)'
-    'relators:aud': 'Author of dialog (aud)'
-    'relators:aui': 'Author of introduction, etc. (aui)'
-    'relators:ato': 'Autographer (ato)'
-    'relators:ant': 'Bibliographic antecedent (ant)'
-    'relators:bnd': 'Binder (bnd)'
-    'relators:bdd': 'Binding designer (bdd)'
-    'relators:blw': 'Blurb writer (blw)'
-    'relators:bkd': 'Book designer (bkd)'
-    'relators:bkp': 'Book producer (bkp)'
-    'relators:bjd': 'Bookjacket designer (bjd)'
-    'relators:bpd': 'Bookplate designer (bpd)'
-    'relators:bsl': 'Bookseller (bsl)'
-    'relators:brl': 'Braille embosser (brl)'
-    'relators:brd': 'Broadcaster (brd)'
-    'relators:cll': 'Calligrapher (cll)'
-    'relators:ctg': 'Cartographer (ctg)'
-    'relators:cas': 'Caster (cas)'
-    'relators:cns': 'Censor (cns)'
-    'relators:chr': 'Choreographer (chr)'
-    'relators:clb': 'Collaborator (clb; deprecated, use Contributor)'
-    'relators:cng': 'Cinematographer (cng)'
-    'relators:cli': 'Client (cli)'
-    'relators:cor': 'Collection registrar (cor)'
-    'relators:col': 'Collector (col)'
-    'relators:clt': 'Collotyper (clt)'
-    'relators:clr': 'Colorist (clr)'
-    'relators:cmm': 'Commentator (cmm)'
-    'relators:cwt': 'Commentator for written text (cwt)'
-    'relators:com': 'Compiler (com)'
-    'relators:cpl': 'Complainant (cpl)'
-    'relators:cpt': 'Complainant-appellant (cpt)'
-    'relators:cpe': 'Complainant-appellee (cpe)'
-    'relators:cmp': 'Composer (cmp)'
-    'relators:cmt': 'Compositor (cmt)'
-    'relators:ccp': 'Conceptor (ccp)'
-    'relators:cnd': 'Conductor (cnd)'
-    'relators:con': 'Conservator (con)'
-    'relators:csl': 'Consultant (csl)'
-    'relators:csp': 'Consultant to a project (csp)'
-    'relators:cos': 'Contestant (cos)'
-    'relators:cot': 'Contestant-appellant (cot)'
-    'relators:coe': 'Contestant-appellee (coe)'
-    'relators:cts': 'Contestee (cts)'
-    'relators:ctt': 'Contestee-appellant (ctt)'
-    'relators:cte': 'Contestee-appellee (cte)'
-    'relators:ctr': 'Contractor (ctr)'
-    'relators:ctb': 'Contributor (ctb)'
-    'relators:cpc': 'Copyright claimant (cpc)'
-    'relators:cph': 'Copyright holder (cph)'
-    'relators:crr': 'Corrector (crr)'
-    'relators:crp': 'Correspondent (crp)'
-    'relators:cst': 'Costume designer (cst)'
-    'relators:cou': 'Court governed (cou)'
-    'relators:crt': 'Court reporter (crt)'
-    'relators:cov': 'Cover designer (cov)'
-    'relators:cre': 'Creator (cre)'
-    'relators:cur': 'Curator (cur)'
-    'relators:dnc': 'Dancer (dnc)'
-    'relators:dtc': 'Data contributor (dtc)'
-    'relators:dtm': 'Data manager (dtm)'
-    'relators:dte': 'Dedicatee (dte)'
-    'relators:dto': 'Dedicator (dto)'
-    'relators:dfd': 'Defendant (dfd)'
-    'relators:dft': 'Defendant-appellant (dft)'
-    'relators:dfe': 'Defendant-appellee (dfe)'
-    'relators:dgg': 'Degree granting institution (dgg)'
-    'relators:dgs': 'Degree supervisor (dgs)'
-    'relators:dln': 'Delineator (dln)'
-    'relators:dpc': 'Depicted (dpc)'
-    'relators:dpt': 'Depositor (dpt)'
-    'relators:dsr': 'Designer (dsr)'
-    'relators:drt': 'Director (drt)'
-    'relators:dis': 'Dissertant (dis)'
-    'relators:dbp': 'Distribution place (dbp)'
-    'relators:dst': 'Distributor (dst)'
-    'relators:dnr': 'Donor (dnr)'
-    'relators:drm': 'Draftsman (drm)'
-    'relators:dub': 'Dubious author (dub)'
-    'relators:edt': 'Editor (edt)'
-    'relators:edc': 'Editor of compilation (edc)'
-    'relators:edm': 'Editor of moving image work (edm)'
-    'relators:elg': 'Electrician (elg)'
-    'relators:elt': 'Electrotyper (elt)'
-    'relators:enj': 'Enacting jurisdiction (enj)'
-    'relators:eng': 'Engineer (eng)'
-    'relators:egr': 'Engraver (egr)'
-    'relators:etr': 'Etcher (etr)'
-    'relators:evp': 'Event place (evp)'
-    'relators:exp': 'Expert (exp)'
-    'relators:fac': 'Facsimilist (fac)'
-    'relators:fld': 'Field director (fld)'
-    'relators:fmd': 'Film director (fmd)'
-    'relators:fds': 'Film distributor (fds)'
-    'relators:flm': 'Film editor (flm)'
-    'relators:fmp': 'Film producer (fmp)'
-    'relators:fmk': 'Filmmaker (fmk)'
-    'relators:fpy': 'First party (fpy)'
-    'relators:frg': 'Forger (frg)'
-    'relators:fmo': 'Former owner (fmo)'
-    'relators:fnd': 'Funder (fnd)'
-    'relators:gis': 'Geographic information specialist (gis)'
-    'relators:grt': 'Graphic technician (grt; deprecated, use Artist)'
-    'relators:hnr': 'Honoree (hnr)'
-    'relators:hst': 'Host (hst)'
-    'relators:his': 'Host institution (his)'
-    'relators:ilu': 'Illuminator (ilu)'
-    'relators:ill': 'Illustrator (ill)'
-    'relators:ins': 'Inscriber (ins)'
-    'relators:itr': 'Instrumentalist (itr)'
-    'relators:ive': 'Interviewee (ive)'
-    'relators:ivr': 'Interviewer (ivr)'
-    'relators:inv': 'Inventor (inv)'
-    'relators:isb': 'Issuing body (isb)'
-    'relators:jud': 'Judge (jud)'
-    'relators:jug': 'Jurisdiction governed (jug)'
-    'relators:lbr': 'Laboratory (lbr)'
-    'relators:ldr': 'Laboratory director (ldr)'
-    'relators:lsa': 'Landscape architect (lsa)'
-    'relators:led': 'Lead (led)'
-    'relators:len': 'Lender (len)'
-    'relators:lil': 'Libelant (lil)'
-    'relators:lit': 'Libelant-appellant (lit)'
-    'relators:lie': 'Libelant-appellee (lie)'
-    'relators:lel': 'Libelee (lel)'
-    'relators:let': 'Libelee-appellant (let)'
-    'relators:lee': 'Libelee-appellee (lee)'
-    'relators:lbt': 'Librettist (lbt)'
-    'relators:lse': 'Licensee (lse)'
-    'relators:lso': 'Licensor (lso)'
-    'relators:lgd': 'Lighting designer (lgd)'
-    'relators:ltg': 'Lithographer (ltg)'
-    'relators:lyr': 'Lyricist (lyr)'
-    'relators:mfp': 'Manufacture place (mfp)'
-    'relators:mfr': 'Manufacturer (mfr)'
-    'relators:mrb': 'Marbler (mrb)'
-    'relators:mrk': 'Markup editor (mrk)'
-    'relators:med': 'Medium (med)'
-    'relators:mdc': 'Metadata contact (mdc)'
-    'relators:mte': 'Metal-engraver (mte)'
-    'relators:mtk': 'Minute taker (mtk)'
-    'relators:mod': 'Moderator (mod)'
-    'relators:mon': 'Monitor (mon)'
-    'relators:mcp': 'Music copyist (mcp)'
-    'relators:msd': 'Musical director (msd)'
-    'relators:mus': 'Musician (mus)'
-    'relators:nrt': 'Narrator (nrt)'
-    'relators:osp': 'Onscreen presenter (osp)'
-    'relators:opn': 'Opponent (opn)'
-    'relators:orm': 'Organizer (orm)'
-    'relators:org': 'Originator (org)'
-    'relators:oth': 'Other (oth)'
-    'relators:own': 'Owner (own)'
-    'relators:pan': 'Panelist (pan)'
-    'relators:ppm': 'Papermaker (ppm)'
-    'relators:pta': 'Patent applicant (pta)'
-    'relators:pth': 'Patent holder (pth)'
-    'relators:pat': 'Patron (pat)'
-    'relators:prf': 'Performer (prf)'
-    'relators:pma': 'Permitting agency (pma)'
-    'relators:pht': 'Photographer (pht)'
-    'relators:ptf': 'Plaintiff (ptf)'
-    'relators:ptt': 'Plaintiff-appellant (ptt)'
-    'relators:pte': 'Plaintiff-appellee (pte)'
-    'relators:plt': 'Platemaker (plt)'
-    'relators:pra': 'Praeses (pra)'
-    'relators:pre': 'Presenter (pre)'
-    'relators:prt': 'Printer (prt)'
-    'relators:pop': 'Printer of plates (pop)'
-    'relators:prm': 'Printmaker (prm)'
-    'relators:prc': 'Process contact (prc)'
-    'relators:pro': 'Producer (pro)'
-    'relators:prn': 'Production company (prn)'
-    'relators:prs': 'Production designer (prs)'
-    'relators:pmn': 'Production manager (pmn)'
-    'relators:prd': 'Production personnel (prd)'
-    'relators:prp': 'Production place (prp)'
-    'relators:prg': 'Programmer (prg)'
-    'relators:pdr': 'Project director (pdr)'
-    'relators:pfr': 'Proofreader (pfr)'
-    'relators:prv': 'Provider (prv)'
-    'relators:pup': 'Publication place (pup)'
-    'relators:pbl': 'Publisher (pbl)'
-    'relators:pbd': 'Publishing director (pbd)'
-    'relators:ppt': 'Puppeteer (ppt)'
-    'relators:rdd': 'Radio director (rdd)'
-    'relators:rpc': 'Radio producer (rpc)'
-    'relators:rce': 'Recording engineer (rce)'
-    'relators:rcd': 'Recordist (rcd)'
-    'relators:red': 'Redaktor (red)'
-    'relators:ren': 'Renderer (ren)'
-    'relators:rpt': 'Reporter (rpt)'
-    'relators:rps': 'Repository (rps)'
-    'relators:rth': 'Research team head (rth)'
-    'relators:rtm': 'Research team member (rtm)'
-    'relators:res': 'Researcher (res)'
-    'relators:rsp': 'Respondent (rsp)'
-    'relators:rst': 'Respondent-appellant (rst)'
-    'relators:rse': 'Respondent-appellee (rse)'
-    'relators:rpy': 'Responsible party (rpy)'
-    'relators:rsg': 'Restager (rsg)'
-    'relators:rsr': 'Restorationist (rsr)'
-    'relators:rev': 'Reviewer (rev)'
-    'relators:rbr': 'Rubricator (rbr)'
-    'relators:sce': 'Scenarist (sce)'
-    'relators:sad': 'Scientific advisor (sad)'
-    'relators:aus': 'Screenwriter (aus)'
-    'relators:scr': 'Scribe (scr)'
-    'relators:scl': 'Sculptor (scl)'
-    'relators:spy': 'Second party (spy)'
-    'relators:sec': 'Secretary (sec)'
-    'relators:sll': 'Seller (sll)'
-    'relators:std': 'Set designer (std)'
-    'relators:stg': 'Setting (stg)'
-    'relators:sgn': 'Signer (sgn)'
-    'relators:sng': 'Singer (sng)'
-    'relators:sds': 'Sound designer (sds)'
-    'relators:spk': 'Speaker (spk)'
-    'relators:spn': 'Sponsor (spn)'
-    'relators:sgd': 'Stage director (sgd)'
-    'relators:stm': 'Stage manager (stm)'
-    'relators:stn': 'Standards body (stn)'
-    'relators:str': 'Stereotyper (str)'
-    'relators:stl': 'Storyteller (stl)'
-    'relators:sht': 'Supporting host (sht)'
-    'relators:srv': 'Surveyor (srv)'
-    'relators:tch': 'Teacher (tch)'
-    'relators:tcd': 'Technical director (tcd)'
-    'relators:tld': 'Television director (tld)'
-    'relators:tlp': 'Television producer (tlp)'
-    'relators:ths': 'Thesis advisor (ths)'
-    'relators:trc': 'Transcriber (trc)'
-    'relators:trl': 'Translator (trl)'
-    'relators:tyd': 'Type designer (tyd)'
-    'relators:tyg': 'Typographer (tyg)'
-    'relators:uvp': 'University place (uvp)'
-    'relators:vdg': 'Videographer (vdg)'
-    'relators:voc': 'Vocalist (voc; deprecated, use Singer)'
-    'relators:vac': 'Voice actor (vac)'
-    'relators:wit': 'Witness (wit)'
-    'relators:wde': 'Wood engraver (wde)'
-    'relators:wdc': 'Woodcutter (wdc)'
-    'relators:wam': 'Writer of accompanying material (wam)'
-    'relators:wac': 'Writer of added commentary (wac)'
-    'relators:wal': 'Writer of added lyrics (wal)'
-    'relators:wat': 'Writer of added text (wat)'
-    'relators:win': 'Writer of introduction (win)'
-    'relators:wpr': 'Writer of preface (wpr)'
-    'relators:wst': 'Writer of supplementary textual content (wst)'
-field_type: typed_relation
diff --git a/config/export/field.field.node.islandora_object.field_date_available.yml b/config/export/field.field.node.islandora_object.field_date_available.yml
deleted file mode 100644
index 95d0abfea..000000000
--- a/config/export/field.field.node.islandora_object.field_date_available.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 1c296e49-98e5-4388-979d-c8c92a97fbcd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_available
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_date_available
-field_name: field_date_available
-entity_type: node
-bundle: islandora_object
-label: 'Date Available'
-description: "<b>Required.</b>  Record date that the resource became or will become digitally available for public-viewing.\r\nUse the format YYYY-MM-DD or  YYYY-MM or YYYY  (<a href=\"https://www.loc.gov/standards/datetime/\" target=\"_blank\">EDTF</a>)."
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_date_captured.yml b/config/export/field.field.node.islandora_object.field_date_captured.yml
deleted file mode 100644
index d7e107c25..000000000
--- a/config/export/field.field.node.islandora_object.field_date_captured.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: ee5837ca-6e64-41d8-bbf9-d22167d0ec87
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_captured
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: b6PQWQgWsPtva8l0QqWucImMDIKKZAEvGXq2Lz80BZw
-id: node.islandora_object.field_date_captured
-field_name: field_date_captured
-entity_type: node
-bundle: islandora_object
-label: 'Date Captured'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_date_copyrighted.yml b/config/export/field.field.node.islandora_object.field_date_copyrighted.yml
deleted file mode 100644
index 6b27dd7ab..000000000
--- a/config/export/field.field.node.islandora_object.field_date_copyrighted.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 9ad6f04f-9667-4595-acf8-b814ca445c71
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_copyrighted
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_date_copyrighted
-field_name: field_date_copyrighted
-entity_type: node
-bundle: islandora_object
-label: 'Date Copyrighted'
-description: "<b>Optional.</b> If available, record the date associated with a claim of protection under copyright.\r\n\r\nUse the format YYYY-MM-DD or  YYYY-MM or YYYY (<a href=\"https://www.loc.gov/standards/datetime/\" target=\"_blank\">EDTF</a>)."
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_date_modified.yml b/config/export/field.field.node.islandora_object.field_date_modified.yml
deleted file mode 100644
index 53e94c7a6..000000000
--- a/config/export/field.field.node.islandora_object.field_date_modified.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 28b39aaa-cf11-4579-9d9e-241e9cde00a4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_modified
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: I-cN7Bdj3HlLlWipBTjVAEYztLDaeP-ipdBoCXnE7wA
-id: node.islandora_object.field_date_modified
-field_name: field_date_modified
-entity_type: node
-bundle: islandora_object
-label: 'Date Modified'
-description: 'Date on which the original resource being represented in Islandora was changed. Typically modification dates of digital representations of the resource stored in Islandora will be recorded on the relevant Media instead of here.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_date_published.yml b/config/export/field.field.node.islandora_object.field_date_published.yml
deleted file mode 100644
index 1a4b2a4d1..000000000
--- a/config/export/field.field.node.islandora_object.field_date_published.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 146a9b37-702d-441d-82c7-1eff76784ed8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_published
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_date_published
-field_name: field_date_published
-entity_type: node
-bundle: islandora_object
-label: 'Date Published'
-description: "<b>Required if there is no \"Date Created\" value.</b>  Record the date of formal issuance or publication of the resource.\r\n<br>\r\nIf both \"Date Created\" and \"Date Published\" of the resource are unknown, please provide an estimated date range of the resource's creation in the Date Created field. This can be as broad (1800/1900) or as specific (1800-05/1800-06) as needed. Use the format YYYY-MM-DD or YYYY-MM or YYYY (<a href=\"https://www.loc.gov/standards/datetime/\" target=\"_blank\">EDTF</a>)."
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_date_valid.yml b/config/export/field.field.node.islandora_object.field_date_valid.yml
deleted file mode 100644
index 24dc5a544..000000000
--- a/config/export/field.field.node.islandora_object.field_date_valid.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e56640fa-bf91-43b0-8eef-8fad324a745f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_date_valid
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: g1IRNnmkaVGyZbhPbJKkcaQcFCYBbUCPFa_G5shat74
-id: node.islandora_object.field_date_valid
-field_name: field_date_valid
-entity_type: node
-bundle: islandora_object
-label: 'Date Valid'
-description: 'Date (often a range) of validity of a resource.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_description.yml b/config/export/field.field.node.islandora_object.field_description.yml
deleted file mode 100644
index a6ca0ab64..000000000
--- a/config/export/field.field.node.islandora_object.field_description.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: b81af947-8620-4ee0-9cff-c32a81db3d69
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_description
-    - node.type.islandora_object
-_core:
-  default_config_hash: 45Ooobxf-P9ggXWsF5nCo2gvhlbqHwA-GnnTM97CzOc
-id: node.islandora_object.field_description
-field_name: field_description
-entity_type: node
-bundle: islandora_object
-label: Description
-description: 'Description of the resource. Description may include but is not limited to: an abstract, a table of contents, a graphical representation, or a free-text account of the resource.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.node.islandora_object.field_dewey_classification.yml b/config/export/field.field.node.islandora_object.field_dewey_classification.yml
deleted file mode 100644
index 3d3403537..000000000
--- a/config/export/field.field.node.islandora_object.field_dewey_classification.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 6cf983bc-79f1-40b6-9ba2-391878d6b589
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_dewey_classification
-    - node.type.islandora_object
-_core:
-  default_config_hash: Ftlt8RnvkLCbQs8VnyGf29AVc7tAow-i-UtKcEnbb9k
-id: node.islandora_object.field_dewey_classification
-field_name: field_dewey_classification
-entity_type: node
-bundle: islandora_object
-label: 'Dewey Classification'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_digital_identifier.yml b/config/export/field.field.node.islandora_object.field_digital_identifier.yml
deleted file mode 100644
index e6641f0d5..000000000
--- a/config/export/field.field.node.islandora_object.field_digital_identifier.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 08eec68d-119a-4b48-b3e7-ac79b6e727c1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_digital_identifier
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_digital_identifier
-field_name: field_digital_identifier
-entity_type: node
-bundle: islandora_object
-label: 'Digital Identifier'
-description: "<b>Optional</b>.  If available, record relevant external (non-Islandora) digital identifiers. Example: jhu_coll-0002_03359\r\n"
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_digital_publisher.yml b/config/export/field.field.node.islandora_object.field_digital_publisher.yml
deleted file mode 100644
index 3b9a04a74..000000000
--- a/config/export/field.field.node.islandora_object.field_digital_publisher.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: d7706990-0ba4-4daf-a026-4f90d393f66e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_digital_publisher
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: node.islandora_object.field_digital_publisher
-field_name: field_digital_publisher
-entity_type: node
-bundle: islandora_object
-label: 'Digital Publisher'
-description: '<b>Required if known</b>. Record the agent responsible for publishing, releasing, or issuing a digital version of the resource. Please add or use terms from <a href="/admin/structure/taxonomy/manage/person/overview" target="_blank">Person</a>, <a href="/admin/structure/taxonomy/manage/corporate_body/overview" target="_blank">Corporate Body</a>, or <a href="/admin/structure/taxonomy/manage/family/overview" target="_blank">Family</a> taxonomies. If digitized by the library, please select "Johns Hopkins Sheridan Libraries" as the digital publisher.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_display_hints.yml b/config/export/field.field.node.islandora_object.field_display_hints.yml
deleted file mode 100644
index 18d4ddf1c..000000000
--- a/config/export/field.field.node.islandora_object.field_display_hints.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: ff6fd0d8-152e-4653-bbc7-31d7a4c665e4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_display_hints
-    - node.type.islandora_object
-    - taxonomy.vocabulary.islandora_display
-_core:
-  default_config_hash: GPit06qAZQfLGXCF-QJ6XMpY3smhl6TrzWZRSiV97Gk
-id: node.islandora_object.field_display_hints
-field_name: field_display_hints
-entity_type: node
-bundle: islandora_object
-label: 'Display Hints'
-description: 'Terms that will change how this resource is displayed.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_display: islandora_display
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_dspace_identifier.yml b/config/export/field.field.node.islandora_object.field_dspace_identifier.yml
deleted file mode 100644
index 48a456954..000000000
--- a/config/export/field.field.node.islandora_object.field_dspace_identifier.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 0e4497b7-f106-495a-8d63-03e8c2c60ce9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_dspace_identifier
-    - node.type.islandora_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_dspace_identifier
-field_name: field_dspace_identifier
-entity_type: node
-bundle: islandora_object
-label: 'DSpace Identifier'
-description: '<b>Optional.</b> Record a legacy item''s URI from DSpace platform.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_dspace_item_id.yml b/config/export/field.field.node.islandora_object.field_dspace_item_id.yml
deleted file mode 100644
index 1fd7b2b6a..000000000
--- a/config/export/field.field.node.islandora_object.field_dspace_item_id.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 3ec3fc0c-e7e5-400f-a2dd-9b5f9fbce466
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_dspace_item_id
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_dspace_item_id
-field_name: field_dspace_item_id
-entity_type: node
-bundle: islandora_object
-label: 'DSpace Item ID'
-description: '<b>Optional.</b> Record a legacy item''s UUID from DSpace platform.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_edition.yml b/config/export/field.field.node.islandora_object.field_edition.yml
deleted file mode 100644
index cdea60b08..000000000
--- a/config/export/field.field.node.islandora_object.field_edition.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: f117d31a-3e4a-4279-a552-254e8a20ec26
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edition
-    - node.type.islandora_object
-_core:
-  default_config_hash: RZMKGbGrqQ9o4umnRD3Ar74MPJCrVenzoILIBxfR1lo
-id: node.islandora_object.field_edition
-field_name: field_edition
-entity_type: node
-bundle: islandora_object
-label: 'Edition Statement'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_edtf_date.yml b/config/export/field.field.node.islandora_object.field_edtf_date.yml
deleted file mode 100644
index b669be267..000000000
--- a/config/export/field.field.node.islandora_object.field_edtf_date.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 79967ce5-e031-4566-878f-1ad6698b784a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: 4Bq5Big0haWxqlgFvefCOYmMdrewPQ7_pPQpEeTyTCE
-id: node.islandora_object.field_edtf_date
-field_name: field_edtf_date
-entity_type: node
-bundle: islandora_object
-label: 'Date (Unspecified)'
-description: 'A date without a type or relationship to the resource specified'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_edtf_date_created.yml b/config/export/field.field.node.islandora_object.field_edtf_date_created.yml
deleted file mode 100644
index 77cbf6f60..000000000
--- a/config/export/field.field.node.islandora_object.field_edtf_date_created.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 5764581e-60b2-40c1-bc21-cd01a22faa13
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date_created
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: az1ueHHmVIOW8aWHwzZYT0SNhvvnBeQF34XPs59BV7U
-id: node.islandora_object.field_edtf_date_created
-field_name: field_edtf_date_created
-entity_type: node
-bundle: islandora_object
-label: 'Date Created'
-description: 'Date of creation of the resource'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_edtf_date_issued.yml b/config/export/field.field.node.islandora_object.field_edtf_date_issued.yml
deleted file mode 100644
index a6aef3ccb..000000000
--- a/config/export/field.field.node.islandora_object.field_edtf_date_issued.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: f529820b-b926-4211-bc6b-ab648248ecb1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date_issued
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: Fo7qdbkWTpjZWExUJVr3EB5tJo-6zFKccR1bL8uLDPE
-id: node.islandora_object.field_edtf_date_issued
-field_name: field_edtf_date_issued
-entity_type: node
-bundle: islandora_object
-label: 'Date Issued'
-description: 'Date of formal issuance of the resource. This includes publication dates.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.islandora_object.field_extent.yml b/config/export/field.field.node.islandora_object.field_extent.yml
deleted file mode 100644
index eca348087..000000000
--- a/config/export/field.field.node.islandora_object.field_extent.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 5ac9308b-baab-466c-94c3-ef55ec258592
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_extent
-    - node.type.islandora_object
-_core:
-  default_config_hash: iHcODx2RZgZbguT3z1VJMDoGHYDinWc0o3TPG6RJGp8
-id: node.islandora_object.field_extent
-field_name: field_extent
-entity_type: node
-bundle: islandora_object
-label: Extent
-description: 'The size or duration of the resource in its original form. Extent of representations of the resource stored in Islandora should be recorded on the relevant Media files.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_featured_item.yml b/config/export/field.field.node.islandora_object.field_featured_item.yml
deleted file mode 100644
index 7017e0d95..000000000
--- a/config/export/field.field.node.islandora_object.field_featured_item.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: d592538c-8d0b-43c1-9df0-d822434dc33f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_featured_item
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_featured_item
-field_name: field_featured_item
-entity_type: node
-bundle: islandora_object
-label: 'Featured Item'
-description: 'Enabling this will cause this item to be displayed in the "featured item" section on the collection page. '
-required: false
-translatable: false
-default_value:
-  -
-    value: 0
-default_value_callback: ''
-settings:
-  on_label: Featured
-  off_label: 'Not Featured'
-field_type: boolean
diff --git a/config/export/field.field.node.islandora_object.field_finding_aid.yml b/config/export/field.field.node.islandora_object.field_finding_aid.yml
deleted file mode 100644
index 8b052b625..000000000
--- a/config/export/field.field.node.islandora_object.field_finding_aid.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 4c4f952e-6275-46a4-8606-61261e8345b1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_finding_aid
-    - node.type.islandora_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_finding_aid
-field_name: field_finding_aid
-entity_type: node
-bundle: islandora_object
-label: 'Finding Aid'
-description: '<b>Optional</b>. If available, record a link to the relevant finding aid record in Johns Hopkins Libraries'' instance of <a href="https://aspace.library.jhu.edu/" target="_blank">ArchivesSpace</a>.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_frequency.yml b/config/export/field.field.node.islandora_object.field_frequency.yml
deleted file mode 100644
index d65be0326..000000000
--- a/config/export/field.field.node.islandora_object.field_frequency.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 37ab7374-fac9-4856-a544-3acb83497039
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_frequency
-    - node.type.islandora_object
-    - taxonomy.vocabulary.frequencies
-_core:
-  default_config_hash: x6L4RaSUMALP2cG8a6P1CucO-PneosTIKrX9Hr3fYDw
-id: node.islandora_object.field_frequency
-field_name: field_frequency
-entity_type: node
-bundle: islandora_object
-label: Frequency
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      frequencies: frequencies
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_full_title.yml b/config/export/field.field.node.islandora_object.field_full_title.yml
deleted file mode 100644
index 2c24927c1..000000000
--- a/config/export/field.field.node.islandora_object.field_full_title.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 51ffafeb-eea8-45c5-a902-270a4fc4d2c8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_full_title
-    - node.type.islandora_object
-_core:
-  default_config_hash: Z-SrfiHLAiTx5FMtdRjJfe-JDb8UFGzVAtu3If26S6U
-id: node.islandora_object.field_full_title
-field_name: field_full_title
-entity_type: node
-bundle: islandora_object
-label: 'Full Title'
-description: 'If the full resource title is longer than 255 characters and you truncated it in the required Title field above, record the full title here.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string_long
diff --git a/config/export/field.field.node.islandora_object.field_genre.yml b/config/export/field.field.node.islandora_object.field_genre.yml
deleted file mode 100644
index c79c74f09..000000000
--- a/config/export/field.field.node.islandora_object.field_genre.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: f4bd5463-c7bb-47f8-a7a1-5cbf60f3c817
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_genre
-    - node.type.islandora_object
-    - taxonomy.vocabulary.genre
-_core:
-  default_config_hash: PI3UoNVeBb23r3Dt_dbXddoa4ihN89QS7mFHothrwp8
-id: node.islandora_object.field_genre
-field_name: field_genre
-entity_type: node
-bundle: islandora_object
-label: Genre
-description: 'A term or terms that designate a category characterizing a particular style, form, or content, such as artistic, musical, literary composition, etc.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      genre: genre
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_geographic_subject.yml b/config/export/field.field.node.islandora_object.field_geographic_subject.yml
deleted file mode 100644
index fa5a86d19..000000000
--- a/config/export/field.field.node.islandora_object.field_geographic_subject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 8c530ecd-36de-4b47-ab1b-4850f05b3701
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_geographic_subject
-    - node.type.islandora_object
-    - taxonomy.vocabulary.geo_location
-_core:
-  default_config_hash: eofoDyu6R77-CEMPzgB90La1pTDGamyEfNsGjvlnwsg
-id: node.islandora_object.field_geographic_subject
-field_name: field_geographic_subject
-entity_type: node
-bundle: islandora_object
-label: 'Subject (Geographic)'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      geo_location: geo_location
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_geoportal_link.yml b/config/export/field.field.node.islandora_object.field_geoportal_link.yml
deleted file mode 100644
index ee6b60585..000000000
--- a/config/export/field.field.node.islandora_object.field_geoportal_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 17b1f6c4-0e7c-4d56-9270-468fc81971cd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_geoportal_link
-    - node.type.islandora_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_geoportal_link
-field_name: field_geoportal_link
-entity_type: node
-bundle: islandora_object
-label: 'Geoportal Link'
-description: '<b>Optional</b>. Record the link to the resource record in GeoBlacklight platform. '
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_identifier.yml b/config/export/field.field.node.islandora_object.field_identifier.yml
deleted file mode 100644
index 568ea4687..000000000
--- a/config/export/field.field.node.islandora_object.field_identifier.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: f09301e5-47ac-4a17-9078-e9e6730517a8
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_identifier
-    - node.type.islandora_object
-_core:
-  default_config_hash: dxi9NM-C39djxUptg_qVZLiAYIAo-yS7KVL85GACi80
-id: node.islandora_object.field_identifier
-field_name: field_identifier
-entity_type: node
-bundle: islandora_object
-label: Identifier
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_is_part_of.yml b/config/export/field.field.node.islandora_object.field_is_part_of.yml
deleted file mode 100644
index 7674f52ac..000000000
--- a/config/export/field.field.node.islandora_object.field_is_part_of.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 41ada863-6eb6-4a36-9d3c-81b9da369d97
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_is_part_of
-    - node.type.islandora_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_is_part_of
-field_name: field_is_part_of
-entity_type: node
-bundle: islandora_object
-label: 'Is Part Of'
-description: '<b>Optional</b>. If applicable, record a related resource in which the described resource is physically or logically included.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_isbn.yml b/config/export/field.field.node.islandora_object.field_isbn.yml
deleted file mode 100644
index fc6264015..000000000
--- a/config/export/field.field.node.islandora_object.field_isbn.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 7b907341-68d4-482c-ae48-4f80b409f8ee
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_isbn
-    - node.type.islandora_object
-_core:
-  default_config_hash: tV4_LkPhpgBPBxcMsh4hQYhgfWU5N0YTTtzQhT90_Hc
-id: node.islandora_object.field_isbn
-field_name: field_isbn
-entity_type: node
-bundle: islandora_object
-label: ISBN
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_issn.yml b/config/export/field.field.node.islandora_object.field_issn.yml
deleted file mode 100644
index 9a7c5fd88..000000000
--- a/config/export/field.field.node.islandora_object.field_issn.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 860a1f44-73d9-44d3-81ca-24f2ba85f68d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_issn
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_issn
-field_name: field_issn
-entity_type: node
-bundle: islandora_object
-label: ISSN
-description: '<b>Optional</b>. If available, record the 8-digit International Standard Serial Number associated with the resource.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_item_barcode.yml b/config/export/field.field.node.islandora_object.field_item_barcode.yml
deleted file mode 100644
index b9c496b3e..000000000
--- a/config/export/field.field.node.islandora_object.field_item_barcode.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 8062d98c-0439-4a04-9893-39227428bfeb
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_item_barcode
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_item_barcode
-field_name: field_item_barcode
-entity_type: node
-bundle: islandora_object
-label: 'Item Barcode'
-description: "<b>Required if known</b>. Record a Johns Hopkins Libraries item barcode for the resource. Example: 31151027501737\r\n"
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_jhir.yml b/config/export/field.field.node.islandora_object.field_jhir.yml
deleted file mode 100644
index 49ac52cba..000000000
--- a/config/export/field.field.node.islandora_object.field_jhir.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 7b3a4526-17e8-4dfb-a924-da484fd0b66a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_jhir
-    - node.type.islandora_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_jhir
-field_name: field_jhir
-entity_type: node
-bundle: islandora_object
-label: JHIR
-description: '<b>Optional.</b> Record a legacy item''s citable URI from DSpace.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_language.yml b/config/export/field.field.node.islandora_object.field_language.yml
deleted file mode 100644
index 96097c2a4..000000000
--- a/config/export/field.field.node.islandora_object.field_language.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 9664b08b-0052-44b0-ab01-637809d5fc37
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_language
-    - node.type.islandora_object
-    - taxonomy.vocabulary.language
-_core:
-  default_config_hash: v9wwx8Vyosd0BWtE0ioibx6ak7wBLsKLTSbDF3kHOdY
-id: node.islandora_object.field_language
-field_name: field_language
-entity_type: node
-bundle: islandora_object
-label: Language
-description: 'Language of the resource content'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      language: language
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: language
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_lcc_classification.yml b/config/export/field.field.node.islandora_object.field_lcc_classification.yml
deleted file mode 100644
index 06ac77c84..000000000
--- a/config/export/field.field.node.islandora_object.field_lcc_classification.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 86f471b2-e224-4247-a4e5-7c863a88e795
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_lcc_classification
-    - node.type.islandora_object
-_core:
-  default_config_hash: YKG8lGMv_h5Ydll2V5yaYEQx2trYqoXEKzcQMP2aHIg
-id: node.islandora_object.field_lcc_classification
-field_name: field_lcc_classification
-entity_type: node
-bundle: islandora_object
-label: 'Library of Congress Classification'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_library_catalog_link.yml b/config/export/field.field.node.islandora_object.field_library_catalog_link.yml
deleted file mode 100644
index 11831c4e5..000000000
--- a/config/export/field.field.node.islandora_object.field_library_catalog_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 02301db0-901b-4167-a4ea-be9c6c90f767
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_library_catalog_link
-    - node.type.islandora_object
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_library_catalog_link
-field_name: field_library_catalog_link
-entity_type: node
-bundle: islandora_object
-label: 'Library Catalog Link'
-description: '<b>Required if known</b>. Record the link to the resource record in <a href="https://catalyst.library.jhu.edu/" target="_blank">Catalyst</a>, the catalog for Johns Hopkins Libraries. '
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.node.islandora_object.field_linked_agent.yml b/config/export/field.field.node.islandora_object.field_linked_agent.yml
deleted file mode 100644
index 1570f4f89..000000000
--- a/config/export/field.field.node.islandora_object.field_linked_agent.yml
+++ /dev/null
@@ -1,309 +0,0 @@
-uuid: 63ee5952-e976-4133-ada9-b7c1d648ef1a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_linked_agent
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: mpy5AdN2p1VqqPIKinNNTimnPbnGr51QzjBj3YNUa_U
-id: node.islandora_object.field_linked_agent
-field_name: field_linked_agent
-entity_type: node
-bundle: islandora_object
-label: 'Linked Agent'
-description: 'Names of entities having some relationship to the resource, and, optionally, the relationship to the resource. If a relationship is not specified, it will be recorded as <a href="https://id.loc.gov/vocabulary/relators/asn.html">Associated Name</a> in the system''s linked data representation. <br /> <em>Publisher/manufacturer/distributor/etc. name is recorded here, with the appropriate relationship specified.</em>'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: person
-  rel_types:
-    'relators:asn': ''
-    'relators:abr': Abridger
-    'relators:act': Actor
-    'relators:adp': Adapter
-    'relators:rcp': Addressee
-    'relators:anl': Analyst
-    'relators:anm': Animator
-    'relators:ann': Annotator
-    'relators:apl': Appellant
-    'relators:ape': Appellee
-    'relators:app': Applicant
-    'relators:arc': Architect
-    'relators:arr': Arranger
-    'relators:acp': 'Art copyist'
-    'relators:adi': 'Art director'
-    'relators:art': Artist
-    'relators:ard': 'Artistic director'
-    'relators:asg': Assignee
-    'relators:att': 'Attributed name'
-    'relators:auc': Auctioneer
-    'relators:aut': Author
-    'relators:aqt': 'Author in quotations or text abstracts'
-    'relators:aft': 'Author of afterword, colophon, etc.'
-    'relators:aud': 'Author of dialog'
-    'relators:aui': 'Author of introduction, etc.'
-    'relators:ato': Autographer
-    'relators:ant': 'Bibliographic antecedent'
-    'relators:bnd': Binder
-    'relators:bdd': 'Binding designer'
-    'relators:blw': 'Blurb writer'
-    'relators:bkd': 'Book designer'
-    'relators:bkp': 'Book producer'
-    'relators:bjd': 'Bookjacket designer'
-    'relators:bpd': 'Bookplate designer'
-    'relators:bsl': Bookseller
-    'relators:brl': 'Braille embosser'
-    'relators:brd': Broadcaster
-    'relators:cll': Calligrapher
-    'relators:ctg': Cartographer
-    'relators:cas': Caster
-    'relators:cns': Censor
-    'relators:chr': Choreographer
-    'relators:clb': 'Collaborator (deprecated, use Contributor)'
-    'relators:cng': Cinematographer
-    'relators:cli': Client
-    'relators:cor': 'Collection registrar'
-    'relators:col': Collector
-    'relators:clt': Collotyper
-    'relators:clr': Colorist
-    'relators:cmm': Commentator
-    'relators:cwt': 'Commentator for written text'
-    'relators:com': Compiler
-    'relators:cpl': Complainant
-    'relators:cpt': Complainant-appellant
-    'relators:cpe': Complainant-appellee
-    'relators:cmp': Composer
-    'relators:cmt': Compositor
-    'relators:ccp': Conceptor
-    'relators:cnd': Conductor
-    'relators:con': Conservator
-    'relators:csl': Consultant
-    'relators:csp': 'Consultant to a project'
-    'relators:cos': Contestant
-    'relators:cot': Contestant-appellant
-    'relators:coe': Contestant-appellee
-    'relators:cts': Contestee
-    'relators:ctt': Contestee-appellant
-    'relators:cte': Contestee-appellee
-    'relators:ctr': Contractor
-    'relators:ctb': Contributor
-    'relators:cpc': 'Copyright claimant'
-    'relators:cph': 'Copyright holder'
-    'relators:crr': Corrector
-    'relators:crp': Correspondent
-    'relators:cst': 'Costume designer'
-    'relators:cou': 'Court governed'
-    'relators:crt': 'Court reporter'
-    'relators:cov': 'Cover designer'
-    'relators:cre': Creator
-    'relators:cur': Curator
-    'relators:dnc': Dancer
-    'relators:dtc': 'Data contributor'
-    'relators:dtm': 'Data manager'
-    'relators:dte': Dedicatee
-    'relators:dto': Dedicator
-    'relators:dfd': Defendant
-    'relators:dft': Defendant-appellant
-    'relators:dfe': Defendant-appellee
-    'relators:dgg': 'Degree granting institution'
-    'relators:dgs': 'Degree supervisor'
-    'relators:dln': Delineator
-    'relators:dpc': Depicted
-    'relators:dpt': Depositor
-    'relators:dsr': Designer
-    'relators:drt': Director
-    'relators:dis': Dissertant
-    'relators:dbp': 'Distribution place'
-    'relators:dst': Distributor
-    'relators:dnr': Donor
-    'relators:drm': Draftsman
-    'relators:dub': 'Dubious author'
-    'relators:edt': Editor
-    'relators:edc': 'Editor of compilation'
-    'relators:edm': 'Editor of moving image work'
-    'relators:elg': Electrician
-    'relators:elt': Electrotyper
-    'relators:enj': 'Enacting jurisdiction'
-    'relators:eng': Engineer
-    'relators:egr': Engraver
-    'relators:etr': Etcher
-    'relators:evp': 'Event place'
-    'relators:exp': Expert
-    'relators:fac': Facsimilist
-    'relators:fld': 'Field director'
-    'relators:fmd': 'Film director'
-    'relators:fds': 'Film distributor'
-    'relators:flm': 'Film editor'
-    'relators:fmp': 'Film producer'
-    'relators:fmk': Filmmaker
-    'relators:fpy': 'First party'
-    'relators:frg': Forger
-    'relators:fmo': 'Former owner'
-    'relators:fnd': Funder
-    'relators:gis': 'Geographic information specialist'
-    'relators:grt': 'Graphic technician (deprecated, use Artist)'
-    'relators:hnr': Honoree
-    'relators:hst': Host
-    'relators:his': 'Host institution'
-    'relators:ilu': Illuminator
-    'relators:ill': Illustrator
-    'relators:ins': Inscriber
-    'relators:itr': Instrumentalist
-    'relators:ive': Interviewee
-    'relators:ivr': Interviewer
-    'relators:inv': Inventor
-    'relators:isb': 'Issuing body'
-    'relators:jud': Judge
-    'relators:jug': 'Jurisdiction governed'
-    'relators:lbr': Laboratory
-    'relators:ldr': 'Laboratory director'
-    'relators:lsa': 'Landscape architect'
-    'relators:led': Lead
-    'relators:len': Lender
-    'relators:lil': Libelant
-    'relators:lit': Libelant-appellant
-    'relators:lie': Libelant-appellee
-    'relators:lel': Libelee
-    'relators:let': Libelee-appellant
-    'relators:lee': Libelee-appellee
-    'relators:lbt': Librettist
-    'relators:lse': Licensee
-    'relators:lso': Licensor
-    'relators:lgd': 'Lighting designer'
-    'relators:ltg': Lithographer
-    'relators:lyr': Lyricist
-    'relators:mfp': 'Manufacture place'
-    'relators:mfr': Manufacturer
-    'relators:mrb': Marbler
-    'relators:mrk': 'Markup editor'
-    'relators:med': Medium
-    'relators:mdc': 'Metadata contact'
-    'relators:mte': Metal-engraver
-    'relators:mtk': 'Minute taker'
-    'relators:mod': Moderator
-    'relators:mon': Monitor
-    'relators:mcp': 'Music copyist'
-    'relators:msd': 'Musical director'
-    'relators:mus': Musician
-    'relators:nrt': Narrator
-    'relators:osp': 'Onscreen presenter'
-    'relators:opn': Opponent
-    'relators:orm': Organizer
-    'relators:org': Originator
-    'relators:oth': Other
-    'relators:own': Owner
-    'relators:pan': Panelist
-    'relators:ppm': Papermaker
-    'relators:pta': 'Patent applicant'
-    'relators:pth': 'Patent holder'
-    'relators:pat': Patron
-    'relators:prf': Performer
-    'relators:pma': 'Permitting agency'
-    'relators:pht': Photographer
-    'relators:ptf': Plaintiff
-    'relators:ptt': Plaintiff-appellant
-    'relators:pte': Plaintiff-appellee
-    'relators:plt': Platemaker
-    'relators:pra': Praeses
-    'relators:pre': Presenter
-    'relators:prt': Printer
-    'relators:pop': 'Printer of plates'
-    'relators:prm': Printmaker
-    'relators:prc': 'Process contact'
-    'relators:pro': Producer
-    'relators:prn': 'Production company'
-    'relators:prs': 'Production designer'
-    'relators:pmn': 'Production manager'
-    'relators:prd': 'Production personnel'
-    'relators:prp': 'Production place'
-    'relators:prg': Programmer
-    'relators:pdr': 'Project director'
-    'relators:pfr': Proofreader
-    'relators:prv': Provider
-    'relators:pup': 'Publication place'
-    'relators:pbl': Publisher
-    'relators:pbd': 'Publishing director'
-    'relators:ppt': Puppeteer
-    'relators:rdd': 'Radio director'
-    'relators:rpc': 'Radio producer'
-    'relators:rce': 'Recording engineer'
-    'relators:rcd': Recordist
-    'relators:red': Redaktor
-    'relators:ren': Renderer
-    'relators:rpt': Reporter
-    'relators:rps': Repository
-    'relators:rth': 'Research team head'
-    'relators:rtm': 'Research team member'
-    'relators:res': Researcher
-    'relators:rsp': Respondent
-    'relators:rst': Respondent-appellant
-    'relators:rse': Respondent-appellee
-    'relators:rpy': 'Responsible party'
-    'relators:rsg': Restager
-    'relators:rsr': Restorationist
-    'relators:rev': Reviewer
-    'relators:rbr': Rubricator
-    'relators:sce': Scenarist
-    'relators:sad': 'Scientific advisor'
-    'relators:aus': Screenwriter
-    'relators:scr': Scribe
-    'relators:scl': Sculptor
-    'relators:spy': 'Second party'
-    'relators:sec': Secretary
-    'relators:sll': Seller
-    'relators:std': 'Set designer'
-    'relators:stg': Setting
-    'relators:sgn': Signer
-    'relators:sng': Singer
-    'relators:sds': 'Sound designer'
-    'relators:spk': Speaker
-    'relators:spn': Sponsor
-    'relators:sgd': 'Stage director'
-    'relators:stm': 'Stage manager'
-    'relators:stn': 'Standards body'
-    'relators:str': Stereotyper
-    'relators:stl': Storyteller
-    'relators:sht': 'Supporting host'
-    'relators:srv': Surveyor
-    'relators:tch': Teacher
-    'relators:tcd': 'Technical director'
-    'relators:tld': 'Television director'
-    'relators:tlp': 'Television producer'
-    'relators:ths': 'Thesis advisor'
-    'relators:trc': Transcriber
-    'relators:trl': Translator
-    'relators:tyd': 'Type designer'
-    'relators:tyg': Typographer
-    'relators:uvp': 'University place'
-    'relators:vdg': Videographer
-    'relators:voc': 'Vocalist (deprecated, use Singer)'
-    'relators:vac': 'Voice actor'
-    'relators:wit': Witness
-    'relators:wde': 'Wood engraver'
-    'relators:wdc': Woodcutter
-    'relators:wam': 'Writer of accompanying material'
-    'relators:wac': 'Writer of added commentary'
-    'relators:wal': 'Writer of added lyrics'
-    'relators:wat': 'Writer of added text'
-    'relators:win': 'Writer of introduction'
-    'relators:wpr': 'Writer of preface'
-    'relators:wst': 'Writer of supplementary textual content'
-field_type: typed_relation
diff --git a/config/export/field.field.node.islandora_object.field_local_identifier.yml b/config/export/field.field.node.islandora_object.field_local_identifier.yml
deleted file mode 100644
index 745239c10..000000000
--- a/config/export/field.field.node.islandora_object.field_local_identifier.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: acca2640-233e-4068-9d4c-2584344bc1a3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_local_identifier
-    - node.type.islandora_object
-_core:
-  default_config_hash: KF-ak1NqlIkf-WrwHp-1cwuTmR6eLVDBkTN4CLiokZQ
-id: node.islandora_object.field_local_identifier
-field_name: field_local_identifier
-entity_type: node
-bundle: islandora_object
-label: 'Local Identifier'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_member_of.yml b/config/export/field.field.node.islandora_object.field_member_of.yml
deleted file mode 100644
index 54334a45d..000000000
--- a/config/export/field.field.node.islandora_object.field_member_of.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: b4d00bc7-bfc4-4b93-a461-90b52c8bcb5f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_member_of
-    - node.type.collection_object
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: pZJl3qsYONb8CqMy4xwlCFhZxlo6FGXrNZfaEGI8vj8
-id: node.islandora_object.field_member_of
-field_name: field_member_of
-entity_type: node
-bundle: islandora_object
-label: 'Member of'
-description: 'This item''s parent item in Islandora. Usually this will be a collection or compound object.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:node'
-  handler_settings:
-    target_bundles:
-      collection_object: collection_object
-      islandora_object: islandora_object
-    sort:
-      field: _none
-      direction: ASC
-    auto_create: false
-    auto_create_bundle: collection_object
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_mode_of_issuance.yml b/config/export/field.field.node.islandora_object.field_mode_of_issuance.yml
deleted file mode 100644
index 8978d889d..000000000
--- a/config/export/field.field.node.islandora_object.field_mode_of_issuance.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 0768ef3d-36ef-4730-974f-c252d96254d6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_mode_of_issuance
-    - node.type.islandora_object
-    - taxonomy.vocabulary.issuance_modes
-_core:
-  default_config_hash: '-IKF02Xe_HhVSwFmmPlhBgX7uFetvQMcbpJR4zvpp2c'
-id: node.islandora_object.field_mode_of_issuance
-field_name: field_mode_of_issuance
-entity_type: node
-bundle: islandora_object
-label: 'Mode of Issuance'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      issuance_modes: issuance_modes
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_model.yml b/config/export/field.field.node.islandora_object.field_model.yml
deleted file mode 100644
index 08a718bed..000000000
--- a/config/export/field.field.node.islandora_object.field_model.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 088c2ee7-a3cd-4407-ab3c-ad8ca3ff0f25
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_model
-    - node.type.islandora_object
-    - taxonomy.vocabulary.islandora_models
-_core:
-  default_config_hash: Tqe4AiBzEnYEq7MLccObJrLZvb8AVjv0GLZlM1pcxpo
-id: node.islandora_object.field_model
-field_name: field_model
-entity_type: node
-bundle: islandora_object
-label: Model
-description: 'The internal-to-Islandora category of the resource. Affects how the item is displayed/viewed.'
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      islandora_models: islandora_models
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_note.yml b/config/export/field.field.node.islandora_object.field_note.yml
deleted file mode 100644
index ae1c71c36..000000000
--- a/config/export/field.field.node.islandora_object.field_note.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 23294f2f-2e15-4883-9ec0-f7e18ef18e1d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_note
-    - node.type.islandora_object
-  module:
-    - text
-_core:
-  default_config_hash: Aebshr3yHubH5IfL7kRp29DHbcOkh2yXDOouyvJWSSo
-id: node.islandora_object.field_note
-field_name: field_note
-entity_type: node
-bundle: islandora_object
-label: Note
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/config/export/field.field.node.islandora_object.field_oclc_number.yml b/config/export/field.field.node.islandora_object.field_oclc_number.yml
deleted file mode 100644
index 27faefe37..000000000
--- a/config/export/field.field.node.islandora_object.field_oclc_number.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 5876e985-65dd-46d2-b3ea-ba90665e7454
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_oclc_number
-    - node.type.islandora_object
-_core:
-  default_config_hash: L5TpERw6bv-Mi5pyVW6m0-RswP8tyeaOy4C2UXkuNEQ
-id: node.islandora_object.field_oclc_number
-field_name: field_oclc_number
-entity_type: node
-bundle: islandora_object
-label: 'OCLC Number'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_physical_form.yml b/config/export/field.field.node.islandora_object.field_physical_form.yml
deleted file mode 100644
index 52bc85956..000000000
--- a/config/export/field.field.node.islandora_object.field_physical_form.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 98d7bb6e-bac8-43f9-a029-f5725a3eb32c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_physical_form
-    - node.type.islandora_object
-    - taxonomy.vocabulary.physical_form
-_core:
-  default_config_hash: ilcgC7dzbD3x-ZH6rBl4hn00B8032vM0Cs2tvFmaq0A
-id: node.islandora_object.field_physical_form
-field_name: field_physical_form
-entity_type: node
-bundle: islandora_object
-label: Form
-description: 'The physical format of the original resource being described. If the resource is a physical object, the physical form is recorded here. If the resource is born-digital, the original digital form is recorded here. Details of the formats of resource representations stored in Islandora should be recorded on the relevant Media files. '
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      physical_form: physical_form
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_pid.yml b/config/export/field.field.node.islandora_object.field_pid.yml
deleted file mode 100644
index e3e673e49..000000000
--- a/config/export/field.field.node.islandora_object.field_pid.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 303b0c1e-a923-45ff-9361-6fe14621bfb2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_pid
-    - node.type.islandora_object
-_core:
-  default_config_hash: eeNrFc7RYXLAzcQwT2bKDRfdNDG8RSYmDOU9PZW4R2Q
-id: node.islandora_object.field_pid
-field_name: field_pid
-entity_type: node
-bundle: islandora_object
-label: PID
-description: 'PID of this object in Islandora 7.x (applies to migrated objects only)'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_place_published.yml b/config/export/field.field.node.islandora_object.field_place_published.yml
deleted file mode 100644
index 93df04459..000000000
--- a/config/export/field.field.node.islandora_object.field_place_published.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 2a26bdb0-0b59-40e4-8a51-e9cdc81b101d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_place_published
-    - node.type.islandora_object
-_core:
-  default_config_hash: pYmYPOxQhPt1sHME9s9bE1M7mNdA1oO26oA_gO5p0ck
-id: node.islandora_object.field_place_published
-field_name: field_place_published
-entity_type: node
-bundle: islandora_object
-label: 'Place Published'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_place_published_country.yml b/config/export/field.field.node.islandora_object.field_place_published_country.yml
deleted file mode 100644
index 4bccf0da6..000000000
--- a/config/export/field.field.node.islandora_object.field_place_published_country.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 5e66b731-de72-43ae-ad98-1ea3bfa2f3f1
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_place_published_country
-    - node.type.islandora_object
-    - taxonomy.vocabulary.country
-_core:
-  default_config_hash: NpwizIZgL-Ui19aqXM6UnOvfG8GtRGFdUP11fwUvxYM
-id: node.islandora_object.field_place_published_country
-field_name: field_place_published_country
-entity_type: node
-bundle: islandora_object
-label: 'Country of Publication'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      country: country
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_publisher.yml b/config/export/field.field.node.islandora_object.field_publisher.yml
deleted file mode 100644
index 4eb2d8071..000000000
--- a/config/export/field.field.node.islandora_object.field_publisher.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: ace4a958-5613-48c0-86fc-14bbad55f109
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_publisher
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_publisher
-field_name: field_publisher
-entity_type: node
-bundle: islandora_object
-label: Publisher
-description: '<b>Required if known</b>. Record the agent responsible for publishing, releasing, or issuing the resource.  Use terms from <a href="/admin/structure/taxonomy/manage/person/overview" target="_blank">Person</a>, <a href="/admin/structure/taxonomy/manage/corporate_body/overview" target="_blank">Corporate Body</a>, or <a href="/admin/structure/taxonomy/manage/family/overview" target="_blank">Family</a> taxonomies.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_publisher_country.yml b/config/export/field.field.node.islandora_object.field_publisher_country.yml
deleted file mode 100644
index c74417c45..000000000
--- a/config/export/field.field.node.islandora_object.field_publisher_country.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: d84471ed-0902-46bd-a553-df7712113d13
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_publisher_country
-    - node.type.islandora_object
-    - taxonomy.vocabulary.geo_location
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_publisher_country
-field_name: field_publisher_country
-entity_type: node
-bundle: islandora_object
-label: 'Publisher Country'
-description: '<b>Optional</b>. If available, record the country where the resource was published. Please use or add terms from the <a href="/admin/structure/taxonomy/manage/geo_location/overview" target="_blank">Geographic Location</a> taxonomy.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      geo_location: geo_location
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_resource_type.yml b/config/export/field.field.node.islandora_object.field_resource_type.yml
deleted file mode 100644
index d333e9e75..000000000
--- a/config/export/field.field.node.islandora_object.field_resource_type.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: d77b00f2-7a68-4292-b146-6aa203afd458
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_resource_type
-    - node.type.islandora_object
-    - taxonomy.vocabulary.resource_types
-_core:
-  default_config_hash: U3ctHIWpnakahZ6NcXFvfn_kRkcItqP3wz8MmICO2Ss
-id: node.islandora_object.field_resource_type
-field_name: field_resource_type
-entity_type: node
-bundle: islandora_object
-label: Type
-description: 'The general nature or genre of the content of the resource. To describe the digital or physical format of the resource, use Form instead.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      resource_types: resource_types
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_rights.yml b/config/export/field.field.node.islandora_object.field_rights.yml
deleted file mode 100644
index 0b6814351..000000000
--- a/config/export/field.field.node.islandora_object.field_rights.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 4cc2749c-e1fd-4ddc-b38f-2b5bbbfdc26f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_rights
-    - node.type.islandora_object
-_core:
-  default_config_hash: TcLlBpkyrOqvKlsv2FWofgGorwanfxuIAPmtNJbnDFw
-id: node.islandora_object.field_rights
-field_name: field_rights
-entity_type: node
-bundle: islandora_object
-label: Rights
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_spatial_coverage.yml b/config/export/field.field.node.islandora_object.field_spatial_coverage.yml
deleted file mode 100644
index 097a9ef93..000000000
--- a/config/export/field.field.node.islandora_object.field_spatial_coverage.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: c6d500ae-9447-4b73-8362-3ab603f3e061
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_spatial_coverage
-    - node.type.islandora_object
-    - taxonomy.vocabulary.geo_location
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: node.islandora_object.field_spatial_coverage
-field_name: field_spatial_coverage
-entity_type: node
-bundle: islandora_object
-label: 'Spatial Coverage'
-description: '<b>Optional</b>. If available, record the spatial (geographic) characteristics of the resource, including the spatial topic of the resource, spatial applicability of the resource, or jurisdiction under which the resource is relevant. Do not include publication location of the resource, which should go into the Publisher Country field.  Use term(s) from the <a href="/admin/structure/taxonomy/manage/geo_location/overview" target="_blank">Geographic Location</a> taxonomy.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      geo_location: geo_location
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_subject.yml b/config/export/field.field.node.islandora_object.field_subject.yml
deleted file mode 100644
index 67f0b735b..000000000
--- a/config/export/field.field.node.islandora_object.field_subject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: d9a9d68d-42af-4f8c-9461-b744f9bb660a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_subject
-    - node.type.islandora_object
-    - taxonomy.vocabulary.subject
-_core:
-  default_config_hash: msexA-d3hr6T5z1Q95J9fTbD4aRmlR87b9W3tXc8Hvo
-id: node.islandora_object.field_subject
-field_name: field_subject
-entity_type: node
-bundle: islandora_object
-label: 'Subject (Topical)'
-description: 'If using separate fields to record topical, geographic, name, and temporal subjects, record topical subjects here. If not splitting subjects into to different fields, all subjects can be recorded in this field.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      subject: subject
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: subject
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_subject_general.yml b/config/export/field.field.node.islandora_object.field_subject_general.yml
deleted file mode 100644
index 9956f291f..000000000
--- a/config/export/field.field.node.islandora_object.field_subject_general.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: f26314e3-da09-4b1a-a420-91dc26a0c3bf
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_subject_general
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.geo_location
-    - taxonomy.vocabulary.person
-    - taxonomy.vocabulary.subject
-_core:
-  default_config_hash: xBfBj7o8-HPHLm3YJK867Vtkw7H4rpa-6sNpSFglfu8
-id: node.islandora_object.field_subject_general
-field_name: field_subject_general
-entity_type: node
-bundle: islandora_object
-label: Subject
-description: 'General subjects which may include topical, geographic, temporal, and genre elements. If you wish to manage these types of subjects separately, use the more specific Subject fields.<br/><br/>Any new term added by typing it here will be added to the Subject taxonomy. If you need to create a new term in another taxonomy, do <i>Structure > Taxonomy > [the appropriate taxonomy] > Add terms</i> to add terms. You may need to save this form and reload it for your terms to be available here.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      geo_location: geo_location
-      person: person
-      subject: subject
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: subject
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_subjects_name.yml b/config/export/field.field.node.islandora_object.field_subjects_name.yml
deleted file mode 100644
index bd150dd6f..000000000
--- a/config/export/field.field.node.islandora_object.field_subjects_name.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: a294a190-0263-495a-ab20-bcdd30f7aabb
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_subjects_name
-    - node.type.islandora_object
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-_core:
-  default_config_hash: V-roMos0KYV0TJvFANJVrUxMdBjRJPVtnUUAXZySZ5U
-id: node.islandora_object.field_subjects_name
-field_name: field_subjects_name
-entity_type: node
-bundle: islandora_object
-label: 'Subject (Name)'
-description: 'Any new term added by typing it here will be added to the Person taxonomy. If you need to create a new Corporate Body or Family taxonomy term, do <i>Structure > Taxonomy > [the appropriate taxonomy] > Add terms</i> to add terms. You may need to save this form and reload it for your terms to be available here.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: person
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_table_of_contents.yml b/config/export/field.field.node.islandora_object.field_table_of_contents.yml
deleted file mode 100644
index 3c907fc22..000000000
--- a/config/export/field.field.node.islandora_object.field_table_of_contents.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 609190f1-ca3d-4684-bb0d-a39bf16cd016
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_table_of_contents
-    - node.type.islandora_object
-  module:
-    - text
-_core:
-  default_config_hash: SLvcLqYeZBMQjvibeCpySjFklAyrSJ8U7palcdCHwhM
-id: node.islandora_object.field_table_of_contents
-field_name: field_table_of_contents
-entity_type: node
-bundle: islandora_object
-label: 'Table of Contents'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: text_long
diff --git a/config/export/field.field.node.islandora_object.field_temporal_subject.yml b/config/export/field.field.node.islandora_object.field_temporal_subject.yml
deleted file mode 100644
index 1a96b2b46..000000000
--- a/config/export/field.field.node.islandora_object.field_temporal_subject.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 3e17d9c0-f2d2-4939-a377-3ac896a000f4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_temporal_subject
-    - node.type.islandora_object
-    - taxonomy.vocabulary.temporal_subjects
-_core:
-  default_config_hash: hRUtu-c54EddTc5YN6eYxW1wyLKQXU7OSn_xKC7r9qg
-id: node.islandora_object.field_temporal_subject
-field_name: field_temporal_subject
-entity_type: node
-bundle: islandora_object
-label: 'Subject (Temporal)'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      temporal_subjects: temporal_subjects
-    sort:
-      field: name
-      direction: asc
-    auto_create: true
-    auto_create_bundle: ''
-field_type: entity_reference
diff --git a/config/export/field.field.node.islandora_object.field_unique_id.yml b/config/export/field.field.node.islandora_object.field_unique_id.yml
deleted file mode 100644
index 55ac78294..000000000
--- a/config/export/field.field.node.islandora_object.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 70b8cd72-043e-4869-b4d2-dbd322e77683
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_unique_id
-    - node.type.islandora_object
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: node.islandora_object.field_unique_id
-field_name: field_unique_id
-entity_type: node
-bundle: islandora_object
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally this should not be edited. '
-required: true
-translatable: false
-default_value:
-  -
-    value: 999ae88d-7b22-4d9f-92b5-6f98f0ec8210
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.node.islandora_object.field_weight.yml b/config/export/field.field.node.islandora_object.field_weight.yml
deleted file mode 100644
index cdbff02b6..000000000
--- a/config/export/field.field.node.islandora_object.field_weight.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 339c9253-b234-4de3-8805-fa22d9e83a8f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_weight
-    - node.type.islandora_object
-_core:
-  default_config_hash: EHVVAcnmzOz1JErmRFH7tmz3iYey5O_FFj7VKGBXNOk
-id: node.islandora_object.field_weight
-field_name: field_weight
-entity_type: node
-bundle: islandora_object
-label: 'Custom Sort Value'
-description: 'Enter numeric values to force a custom sort order within a collection of resources. See <a href="https://www.drupal.org/node/307797">external documentation for the <i>Weight</i> module</a>. '
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: 1
-  max: null
-  prefix: ''
-  suffix: ''
-field_type: integer
diff --git a/config/export/field.field.node.islandora_object.field_years.yml b/config/export/field.field.node.islandora_object.field_years.yml
deleted file mode 100644
index 24f6b1262..000000000
--- a/config/export/field.field.node.islandora_object.field_years.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: e4e9a2d2-d8de-4df6-975a-7fa16695e5f2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_years
-    - node.type.islandora_object
-  module:
-    - controlled_access_terms
-id: node.islandora_object.field_years
-field_name: field_years
-entity_type: node
-bundle: islandora_object
-label: Years
-description: "<b>Required.</b> This field is only used for Solr indexing and will not show up to end-users. Enter one year (YYYY) only per field, repeating field if necessary. See full instructions at [link].\r\n"
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.node.page.body.yml b/config/export/field.field.node.page.body.yml
deleted file mode 100644
index 49fd90ea1..000000000
--- a/config/export/field.field.node.page.body.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: ce6da9eb-54e1-48db-9313-c3c55b390e6f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.body
-    - node.type.page
-  module:
-    - text
-_core:
-  default_config_hash: KgVkxLl_K3E3lvN6CEoWQIDT0V8J4Mv-fVYrAIc7-FE
-id: node.page.body
-field_name: body
-entity_type: node
-bundle: page
-label: Body
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  display_summary: true
-  required_summary: false
-field_type: text_with_summary
diff --git a/config/export/field.field.taxonomy_term.copyright_and_use.field_authority_link.yml b/config/export/field.field.taxonomy_term.copyright_and_use.field_authority_link.yml
deleted file mode 100644
index 27e2efbb3..000000000
--- a/config/export/field.field.taxonomy_term.copyright_and_use.field_authority_link.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 8f856984-04ec-484c-8c5e-9de4a93de50c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.copyright_and_use
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.copyright_and_use.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: copyright_and_use
-label: 'Authority Sources'
-description: 'Information about sources above can be found at <a href="https://rightsstatements.org/en/" target="_blank">RightsStatements.org</a>.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    rightsstatements: RightsStatements.org
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.copyright_and_use.field_unique_id.yml b/config/export/field.field.taxonomy_term.copyright_and_use.field_unique_id.yml
deleted file mode 100644
index 690245dec..000000000
--- a/config/export/field.field.taxonomy_term.copyright_and_use.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 66083a75-87ca-4e2d-9dff-edf697cced44
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.copyright_and_use
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.copyright_and_use.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: copyright_and_use
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally, this should not be edited.'
-required: false
-translatable: true
-default_value:
-  -
-    value: ad4ad3b8-7e85-4516-aa34-b1d8462f2924
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_authority_link.yml b/config/export/field.field.taxonomy_term.corporate_body.field_authority_link.yml
deleted file mode 100644
index 3f62bb0f4..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_authority_link.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: 08089024-6810-4485-a89f-950a6f27102d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: vzhiqtYF3W0dPgZRy1PcvJMQ92TABMhRMMuRJwUqcMQ
-id: taxonomy_term.corporate_body.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    cash: 'Canadian Subject Headings'
-    lcshac: 'Library of Congress Children''s Subject Headings'
-    naf: 'NACO Authority File'
-    nad: 'NAD / ARK II Name Authority Database'
-    nal: 'National Agricultural Library subject headings'
-    rvm: 'Répertoire de vedettes-matière'
-    ulan: 'Union List of Artist Names'
-    viaf: 'Virtual International Authority File'
-    wiki: Wikidata
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_cat_date_begin.yml b/config/export/field.field.taxonomy_term.corporate_body.field_cat_date_begin.yml
deleted file mode 100644
index 26f56cc72..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_cat_date_begin.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 54392728-e993-48c8-ac83-f7504e4f1578
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_cat_date_begin
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: QL_OmqVKJM-vmZmm5cRwnndUEJituX3oOhN_0Vx3YS4
-id: taxonomy_term.corporate_body.field_cat_date_begin
-field_name: field_cat_date_begin
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Founding Date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_cat_date_end.yml b/config/export/field.field.taxonomy_term.corporate_body.field_cat_date_end.yml
deleted file mode 100644
index 57dd6c8d8..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_cat_date_end.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 3832181f-a6da-4001-99bc-6f69adfbd3b2
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_cat_date_end
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: 0it-3tma5jMJ9Xrj2pNeqCBkcy3pwDPsLI5bvba5-h0
-id: taxonomy_term.corporate_body.field_cat_date_end
-field_name: field_cat_date_end
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Dissolution Date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_corporate_body_alt_name.yml b/config/export/field.field.taxonomy_term.corporate_body.field_corporate_body_alt_name.yml
deleted file mode 100644
index 94981f14c..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_corporate_body_alt_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 23dfb4d7-d8ef-4337-aa37-0819931ddf3a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_corporate_body_alt_name
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_corporate_body_alt_name
-field_name: field_corporate_body_alt_name
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Corporate Body Alternate Name'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_date.yml b/config/export/field.field.taxonomy_term.corporate_body.field_date.yml
deleted file mode 100644
index 75aced72b..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_date.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 78890245-b6ca-4be7-96ef-28b526305c75
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_date
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_date
-field_name: field_date
-entity_type: taxonomy_term
-bundle: corporate_body
-label: Date
-description: 'A date in <a href="https://www.loc.gov/standards/datetime/" target="_blank">EDTF</a>.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_date_of_meeting_or_treaty.yml b/config/export/field.field.taxonomy_term.corporate_body.field_date_of_meeting_or_treaty.yml
deleted file mode 100644
index 01aaae712..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_date_of_meeting_or_treaty.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: c5c1f80f-bafe-43ee-8f90-7a3645b61856
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_date_of_meeting_or_treaty
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_date_of_meeting_or_treaty
-field_name: field_date_of_meeting_or_treaty
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Corporate Name: Date of meeting or treaty signing'
-description: 'The date of the meeting or treaty typically given as a year. Corresponds to subfield d in MARC 110 field. Example: 1981'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_location_of_meeting.yml b/config/export/field.field.taxonomy_term.corporate_body.field_location_of_meeting.yml
deleted file mode 100644
index c40cf9566..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_location_of_meeting.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 43c6834b-a97c-4402-acc6-329f748c7a64
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_location_of_meeting
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_location_of_meeting
-field_name: field_location_of_meeting
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Corporate Name: Location Of Meeting'
-description: 'The location of the meeting or treaty, given as City, State or City, Country. Corresponds to subfield c in MARC 110 field.  Example: Baltimore, Md.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_num_of_section_or_meet.yml b/config/export/field.field.taxonomy_term.corporate_body.field_num_of_section_or_meet.yml
deleted file mode 100644
index 2358071ea..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_num_of_section_or_meet.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 3063fd73-5dda-4832-a635-480a4bfc0fff
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_num_of_section_or_meet
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_num_of_section_or_meet
-field_name: field_num_of_section_or_meet
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Corporate Name: Number of section or meeting'
-description: 'The number or section of the meeting. Corresponds to subfield n in MARC 110 field. Example: 8th'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_primary_name.yml b/config/export/field.field.taxonomy_term.corporate_body.field_primary_name.yml
deleted file mode 100644
index c8f5cfd3f..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_primary_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 972bec9f-4949-403c-8326-1901c9823596
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_primary_name
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_primary_name
-field_name: field_primary_name
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Corporate Name: Primary Corporate Name'
-description: 'The primary part of a name form. Corresponds to subfield a in MARC 110 field. Example: Johns Hopkins University'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_relationships.yml b/config/export/field.field.taxonomy_term.corporate_body.field_relationships.yml
deleted file mode 100644
index b209dd1fd..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_relationships.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 19b00d02-ba38-428a-9f9c-955389b253aa
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_relationships
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: P747iMcB3of4ZQOlVFRwhID75h70ffJxI_sj5ii_9Pw
-id: taxonomy_term.corporate_body.field_relationships
-field_name: field_relationships
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Related Entities'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-  rel_types:
-    'schema:alumni': Alumni
-    'schema:department': Department
-    'schema:employee': Employee
-    'schema:founder': Founder
-    'schema:funder': Funder
-    'schema:knowsAbout': 'Knows about'
-    'schema:member': Member
-    'schema:memberOf': 'Member of'
-    'schema:parentOrganization': 'Parent Organization'
-    'schema:sponsor': Sponsor
-    'schema:subOrganization': Sub-organization
-field_type: typed_relation
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_subordinate_name.yml b/config/export/field.field.taxonomy_term.corporate_body.field_subordinate_name.yml
deleted file mode 100644
index dcdd56118..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_subordinate_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: b52648fa-726a-4121-bc8d-9cc904dd0b46
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_subordinate_name
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.corporate_body.field_subordinate_name
-field_name: field_subordinate_name
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Corporate Name: Subordinate Name'
-description: 'A hierarchical unit within the corporate entity named in the Primary Corporate Name field. Corresponds to subfield b in MARC 110 field. Example: School of Medicine.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_type.yml b/config/export/field.field.taxonomy_term.corporate_body.field_type.yml
deleted file mode 100644
index 41dd3a272..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_type.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: ed8fc836-2d49-4982-82f8-d41e4edcdc20
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_type
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - options
-_core:
-  default_config_hash: 6H5r7FGpu2FlF-znVVkjuYDS2hjklsn2HM6TD7q78OE
-id: taxonomy_term.corporate_body.field_type
-field_name: field_type
-entity_type: taxonomy_term
-bundle: corporate_body
-label: Type
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: list_string
diff --git a/config/export/field.field.taxonomy_term.corporate_body.field_unique_id.yml b/config/export/field.field.taxonomy_term.corporate_body.field_unique_id.yml
deleted file mode 100644
index 73f70e289..000000000
--- a/config/export/field.field.taxonomy_term.corporate_body.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: b44ea572-657b-4577-852b-9664757f2a28
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: taxonomy_term.corporate_body.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: corporate_body
-label: 'Unique ID'
-description: ''
-required: true
-translatable: true
-default_value:
-  -
-    value: 451f43e0-5380-4a4d-936d-5740d1658d82
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.country.field_authority_link.yml b/config/export/field.field.taxonomy_term.country.field_authority_link.yml
deleted file mode 100644
index 38d9620dd..000000000
--- a/config/export/field.field.taxonomy_term.country.field_authority_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 33883436-2fee-42f8-bc3d-030b03994f8c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.country
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: Fa0emb84dajsMEIeJbguiNu-NJJMx5Lcip1IjUNqhGU
-id: taxonomy_term.country.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: country
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    MarcCountry: 'MARC Country Code List'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.family.field_authority_link.yml b/config/export/field.field.taxonomy_term.family.field_authority_link.yml
deleted file mode 100644
index ffe5dd4a8..000000000
--- a/config/export/field.field.taxonomy_term.family.field_authority_link.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: 37d40a15-b60e-4ea4-932b-e2e60d528f93
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.family
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-_core:
-  default_config_hash: TJ6kl_X18r2ooh3dSjYBMrpmGH6YW2ZTyPgkOLH0pIo
-id: taxonomy_term.family.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: family
-label: 'Authority Sources'
-description: "Select the authority source that contains the selected family term.\r\n\r\nFor URL: Enter the stable URI or URL that represents the selected family.\r\n\r\nSource information: <a href=\"https://id.loc.gov/authorities/names.html\" target=\"_blank\">Library of Congress Name Authority File (LCNAF)</a>, <a href=\"https://www.viaf.org\" target=\"_blank\"> The Virtual International Authority File (VIAF)</a>"
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    lcnaf: 'Library of Congress Name Authority File'
-    viaf: 'Virtual International Authority File'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.family.field_cat_date_begin.yml b/config/export/field.field.taxonomy_term.family.field_cat_date_begin.yml
deleted file mode 100644
index 1066723e1..000000000
--- a/config/export/field.field.taxonomy_term.family.field_cat_date_begin.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: e77a9735-dea4-4155-810f-07300c5e7dd3
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_cat_date_begin
-    - taxonomy.vocabulary.family
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: sZSkxS0pRICKTTxdP1K76igEoRk0jSE2TzOTUvkT-RA
-id: taxonomy_term.family.field_cat_date_begin
-field_name: field_cat_date_begin
-entity_type: taxonomy_term
-bundle: family
-label: 'Founding Date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.family.field_cat_date_end.yml b/config/export/field.field.taxonomy_term.family.field_cat_date_end.yml
deleted file mode 100644
index a0326cac6..000000000
--- a/config/export/field.field.taxonomy_term.family.field_cat_date_end.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 998447a3-778c-473a-92ab-7acbf5673e83
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_cat_date_end
-    - taxonomy.vocabulary.family
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: PO5hZdw7UuTVL9G0fmY3AGUiqFoeigwbKYT8K9CXQC8
-id: taxonomy_term.family.field_cat_date_end
-field_name: field_cat_date_end
-entity_type: taxonomy_term
-bundle: family
-label: 'Dissolution Date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.family.field_date.yml b/config/export/field.field.taxonomy_term.family.field_date.yml
deleted file mode 100644
index 7e82f725b..000000000
--- a/config/export/field.field.taxonomy_term.family.field_date.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: fd4a6aa8-1e7e-4f1e-8896-35ddf3c4bd29
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_date
-    - taxonomy.vocabulary.family
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.family.field_date
-field_name: field_date
-entity_type: taxonomy_term
-bundle: family
-label: Date
-description: 'A date in <a href="https://www.loc.gov/standards/datetime/">EDTF format</a>.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.family.field_family_name.yml b/config/export/field.field.taxonomy_term.family.field_family_name.yml
deleted file mode 100644
index f6798ffdf..000000000
--- a/config/export/field.field.taxonomy_term.family.field_family_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 43f2496a-18a9-4879-a035-13e7a7f90e60
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_family_name
-    - taxonomy.vocabulary.family
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.family.field_family_name
-field_name: field_family_name
-entity_type: taxonomy_term
-bundle: family
-label: 'Family Name'
-description: ''
-required: true
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.family.field_relationships.yml b/config/export/field.field.taxonomy_term.family.field_relationships.yml
deleted file mode 100644
index 191065729..000000000
--- a/config/export/field.field.taxonomy_term.family.field_relationships.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: 1559930e-4267-4a4f-8e98-69834e6683be
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_relationships
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: Hu2_dsbomzLoXnDloOO3Z4bwP-aFae4x470IVH5kefM
-id: taxonomy_term.family.field_relationships
-field_name: field_relationships
-entity_type: taxonomy_term
-bundle: family
-label: 'Related Entities'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-  rel_types:
-    'schema:member': Member
-    'schema:founder': Founder
-    'schema:funder': Funder
-    'schema:knowsAbout': 'Knows about'
-    'schema:memberOf': 'Member of'
-    'schema:sponsor': Sponsor
-field_type: typed_relation
diff --git a/config/export/field.field.taxonomy_term.family.field_title_and_other_words.yml b/config/export/field.field.taxonomy_term.family.field_title_and_other_words.yml
deleted file mode 100644
index 100c873d7..000000000
--- a/config/export/field.field.taxonomy_term.family.field_title_and_other_words.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 17f6a349-ef80-4825-9276-accef42a1264
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_title_and_other_words
-    - taxonomy.vocabulary.family
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.family.field_title_and_other_words
-field_name: field_title_and_other_words
-entity_type: taxonomy_term
-bundle: family
-label: 'Title and Other Words'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.family.field_unique_id.yml b/config/export/field.field.taxonomy_term.family.field_unique_id.yml
deleted file mode 100644
index 68963eaab..000000000
--- a/config/export/field.field.taxonomy_term.family.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 47f2856d-18d2-4e66-a2b1-a7042c5e56ed
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.family
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.family.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: family
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally this should not be edited.'
-required: false
-translatable: true
-default_value:
-  -
-    value: ede7bd7d-8793-43c6-8e2a-70fd8abe46c3
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.frequencies.field_authority_link.yml b/config/export/field.field.taxonomy_term.frequencies.field_authority_link.yml
deleted file mode 100644
index 6c743464c..000000000
--- a/config/export/field.field.taxonomy_term.frequencies.field_authority_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 8d40bd30-2c28-4c1f-9fe7-9f45a5a70146
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.frequencies
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: Z7Cwjb1ejsX8_XXa2oQhfAnxkVeVkNSBfreRybyQiRA
-id: taxonomy_term.frequencies.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: frequencies
-label: 'Authority Link'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    frequencies: 'Publication Frequencies Scheme (LC)'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.genre.field_authority_link.yml b/config/export/field.field.taxonomy_term.genre.field_authority_link.yml
deleted file mode 100644
index 1d6b03e93..000000000
--- a/config/export/field.field.taxonomy_term.genre.field_authority_link.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: fb40af93-f9c5-4fa7-9344-aad1f760dd00
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.genre
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: CuU0B68AIeW3-7eoepH8ywYZaHjKcym322TMMX3cn1k
-id: taxonomy_term.genre.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: genre
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    lcgft: 'Library of Congress Genre/Form Terms'
-    tgm: 'Thesaurus for Graphic Materials (TGM)'
-    mgt: 'MARC Genre/Terms Scheme'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.genre.field_unique_id.yml b/config/export/field.field.taxonomy_term.genre.field_unique_id.yml
deleted file mode 100644
index 5ecebd9bb..000000000
--- a/config/export/field.field.taxonomy_term.genre.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: d94282c2-8a61-4c0a-b12a-515d7e04c746
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.genre
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.genre.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: genre
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally this should not be edited.'
-required: true
-translatable: false
-default_value:
-  -
-    value: 1037b41f-a183-4fef-8e78-e57131962589
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.geo_location.field_authority_link.yml b/config/export/field.field.taxonomy_term.geo_location.field_authority_link.yml
deleted file mode 100644
index 65586240c..000000000
--- a/config/export/field.field.taxonomy_term.geo_location.field_authority_link.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 4f29f865-4c68-4aaf-a14e-867425872ea9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.geo_location
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: WQO81CrWZfvdpqoTchaAc2RP8vCWbFMPg72L-kQzwBE
-id: taxonomy_term.geo_location.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: geo_location
-label: 'Authority Link'
-description: 'A universal resource identifier representing a known place in a geographical database. For example, "http://www.geonames.org/5506956/" for "Las Vegas, Nevada".'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    geonames: GeoNames
-    wiki: Wikidata
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.geo_location.field_broader.yml b/config/export/field.field.taxonomy_term.geo_location.field_broader.yml
deleted file mode 100644
index e1515c556..000000000
--- a/config/export/field.field.taxonomy_term.geo_location.field_broader.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 0244f77e-6145-466f-bcba-9edc090532a9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_broader
-    - taxonomy.vocabulary.geo_location
-  module:
-    - epp
-    - link
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: taxonomy_term.geo_location.field_broader
-field_name: field_broader
-entity_type: taxonomy_term
-bundle: geo_location
-label: Broader
-description: 'Enter the stable URI or URL of the geographic place that contains your location. This should be a single administrative unit higher as indicated on <a href="GeoNames.org">GeoNames.org</a>.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 0
-  link_type: 16
-field_type: link
diff --git a/config/export/field.field.taxonomy_term.geo_location.field_geo_alt_name.yml b/config/export/field.field.taxonomy_term.geo_location.field_geo_alt_name.yml
deleted file mode 100644
index df9dff1a3..000000000
--- a/config/export/field.field.taxonomy_term.geo_location.field_geo_alt_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: cbc0055c-6558-4ff3-a2f8-70185d81722e
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_geo_alt_name
-    - taxonomy.vocabulary.geo_location
-_core:
-  default_config_hash: gWWWBQMbh08JC7CTWKnwKxTtXQvg2DW1UDPIMwPPxP8
-id: taxonomy_term.geo_location.field_geo_alt_name
-field_name: field_geo_alt_name
-entity_type: taxonomy_term
-bundle: geo_location
-label: 'Alternate Name'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.geo_location.field_geo_geolocation.yml b/config/export/field.field.taxonomy_term.geo_location.field_geo_geolocation.yml
deleted file mode 100644
index 503137153..000000000
--- a/config/export/field.field.taxonomy_term.geo_location.field_geo_geolocation.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 92378eca-ac85-49b3-bd66-d660ea9ca90d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_geo_geolocation
-    - taxonomy.vocabulary.geo_location
-  module:
-    - geolocation
-_core:
-  default_config_hash: z2AtMqnt0m7zfaP1JtbwCA5E-M4FFncCVO5TXmiXY0A
-id: taxonomy_term.geo_location.field_geo_geolocation
-field_name: field_geo_geolocation
-entity_type: taxonomy_term
-bundle: geo_location
-label: Latitude/Longitude
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: geolocation
diff --git a/config/export/field.field.taxonomy_term.geo_location.field_unique_id.yml b/config/export/field.field.taxonomy_term.geo_location.field_unique_id.yml
deleted file mode 100644
index 7cc87e34c..000000000
--- a/config/export/field.field.taxonomy_term.geo_location.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: d4bc1a49-b3e3-487c-ba62-f846b48ca63b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.geo_location
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: taxonomy_term.geo_location.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: geo_location
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally, this should not be edited.'
-required: true
-translatable: false
-default_value:
-  -
-    value: ae02257b-6290-42d3-9299-d7c0a1eef1c8
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.islandora_display.field_external_uri.yml b/config/export/field.field.taxonomy_term.islandora_display.field_external_uri.yml
deleted file mode 100644
index d98dc1c35..000000000
--- a/config/export/field.field.taxonomy_term.islandora_display.field_external_uri.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 8e973460-627a-4034-9d6d-8a9b72cc63fd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_external_uri
-    - taxonomy.vocabulary.islandora_display
-  module:
-    - link
-_core:
-  default_config_hash: QnlbsgVwNPwmDjTZ_RWteNoMGyHta0n_K0iM566mSyY
-id: taxonomy_term.islandora_display.field_external_uri
-field_name: field_external_uri
-entity_type: taxonomy_term
-bundle: islandora_display
-label: 'External URI'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 1
-  link_type: 17
-field_type: link
diff --git a/config/export/field.field.taxonomy_term.islandora_media_use.field_external_uri.yml b/config/export/field.field.taxonomy_term.islandora_media_use.field_external_uri.yml
deleted file mode 100644
index 94c40503c..000000000
--- a/config/export/field.field.taxonomy_term.islandora_media_use.field_external_uri.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 8f64e6aa-2088-44b2-9a99-5acafa1383c6
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_external_uri
-    - taxonomy.vocabulary.islandora_media_use
-  module:
-    - link
-_core:
-  default_config_hash: XzaVfBT5KKoeDT6qPnge848IcM1VBjH_BlXcPhnS2fU
-id: taxonomy_term.islandora_media_use.field_external_uri
-field_name: field_external_uri
-entity_type: taxonomy_term
-bundle: islandora_media_use
-label: 'External URI'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 1
-  link_type: 17
-field_type: link
diff --git a/config/export/field.field.taxonomy_term.islandora_models.field_external_uri.yml b/config/export/field.field.taxonomy_term.islandora_models.field_external_uri.yml
deleted file mode 100644
index 9999305b6..000000000
--- a/config/export/field.field.taxonomy_term.islandora_models.field_external_uri.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 9b5a8a86-3f00-43cc-a392-5390b9214005
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_external_uri
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - link
-_core:
-  default_config_hash: 7U-ySHLZEnQciUDJxVyLw9AOkEwHMLaRvBeHk4meAaU
-id: taxonomy_term.islandora_models.field_external_uri
-field_name: field_external_uri
-entity_type: taxonomy_term
-bundle: islandora_models
-label: 'External URI'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  title: 1
-  link_type: 17
-field_type: link
diff --git a/config/export/field.field.taxonomy_term.issuance_modes.field_authority_link.yml b/config/export/field.field.taxonomy_term.issuance_modes.field_authority_link.yml
deleted file mode 100644
index a1ded4535..000000000
--- a/config/export/field.field.taxonomy_term.issuance_modes.field_authority_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 252a842b-a335-468b-b3b6-0d5ad075e44a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.issuance_modes
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: _L6Iby5EKxhqCCfAggp9czWf8xVEFfUu3PihNyQAiQI
-id: taxonomy_term.issuance_modes.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: issuance_modes
-label: 'Authority Link'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    issuance: 'MARC Issuance List'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.language.field_authority_link.yml b/config/export/field.field.taxonomy_term.language.field_authority_link.yml
deleted file mode 100644
index e331f5f85..000000000
--- a/config/export/field.field.taxonomy_term.language.field_authority_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 35be59b7-0b13-4417-a75f-10d18b356849
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.language
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: Axb5S_qqJda3eb1ZSCOQQ8PBTGil7FYvWVjzz8kse3w
-id: taxonomy_term.language.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: language
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    iso639-2: 'ISO 639-2 Codes for the Representation of Names of Languages'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.person.field_authority_link.yml b/config/export/field.field.taxonomy_term.person.field_authority_link.yml
deleted file mode 100644
index 61eb32504..000000000
--- a/config/export/field.field.taxonomy_term.person.field_authority_link.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: 50536627-9ffc-4666-949e-62934a6f54b7
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: _GjER43-ftxvR2UClnjLddzSrWNlzc94xym-MKElUcw
-id: taxonomy_term.person.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: person
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    cash: 'Canadian Subject Headings'
-    lcshac: 'Library of Congress Children''s Subject Headings'
-    naf: 'NACO Authority File'
-    nad: 'NAD / ARK II Name Authority Database'
-    nal: 'National Agricultural Library subject headings'
-    rvm: 'Répertoire de vedettes-matière'
-    ulan: 'Union List of Artist Names'
-    viaf: 'Virtual International Authority File'
-    wiki: Wikidata
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.person.field_cat_date_begin.yml b/config/export/field.field.taxonomy_term.person.field_cat_date_begin.yml
deleted file mode 100644
index fc28532eb..000000000
--- a/config/export/field.field.taxonomy_term.person.field_cat_date_begin.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a02bf6de-e5a3-4525-aadb-8df2ba529cba
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_cat_date_begin
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: NSffS6bRr3LMgZZa6iioJC6VJ5rR8bPqJDAh7qBGFmM
-id: taxonomy_term.person.field_cat_date_begin
-field_name: field_cat_date_begin
-entity_type: taxonomy_term
-bundle: person
-label: 'Birth Date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.person.field_cat_date_end.yml b/config/export/field.field.taxonomy_term.person.field_cat_date_end.yml
deleted file mode 100644
index 75ab68d3f..000000000
--- a/config/export/field.field.taxonomy_term.person.field_cat_date_end.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 029ca050-fb59-4bbf-9b6a-2a6d0fae721c
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_cat_date_end
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: b33BuU6CdmwtK4RXbC_3lgQ0_xE8ig5F0shW_Hn1xos
-id: taxonomy_term.person.field_cat_date_end
-field_name: field_cat_date_end
-entity_type: taxonomy_term
-bundle: person
-label: 'Death Date'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.person.field_date.yml b/config/export/field.field.taxonomy_term.person.field_date.yml
deleted file mode 100644
index 80aa0c2f9..000000000
--- a/config/export/field.field.taxonomy_term.person.field_date.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 7a77b477-9716-4ce6-a766-9b93a528347d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_date
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_date
-field_name: field_date
-entity_type: taxonomy_term
-bundle: person
-label: Date
-description: 'A date in <a href="https://www.loc.gov/standards/datetime/" target="_blank">EDTF</a>.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: edtf
diff --git a/config/export/field.field.taxonomy_term.person.field_person_alternate_name.yml b/config/export/field.field.taxonomy_term.person.field_person_alternate_name.yml
deleted file mode 100644
index f54e7d1da..000000000
--- a/config/export/field.field.taxonomy_term.person.field_person_alternate_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c4ce8abe-49a3-4745-969b-8a63139b6004
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_person_alternate_name
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_person_alternate_name
-field_name: field_person_alternate_name
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Alternate Name'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_preferred_name_fuller_form.yml b/config/export/field.field.taxonomy_term.person.field_preferred_name_fuller_form.yml
deleted file mode 100644
index aa7b81349..000000000
--- a/config/export/field.field.taxonomy_term.person.field_preferred_name_fuller_form.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 652a31da-953a-4b6a-9280-474a0e080d14
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_preferred_name_fuller_form
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_preferred_name_fuller_form
-field_name: field_preferred_name_fuller_form
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Preferred Name: Fuller Form'
-description: 'The fuller form of first and middle names, when abbreviated in the Rest of Name field. Corresponds to the 100 $q subfield in MARC.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_preferred_name_number.yml b/config/export/field.field.taxonomy_term.person.field_preferred_name_number.yml
deleted file mode 100644
index 00b652ef7..000000000
--- a/config/export/field.field.taxonomy_term.person.field_preferred_name_number.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: b1d51710-cc12-48e8-a39f-6715de810b87
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_preferred_name_number
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_preferred_name_number
-field_name: field_preferred_name_number
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Preferred Name: Number'
-description: 'A number, sometimes with a term, that qualifies the name. Often a roman numeral or a roman numeral and a subsequent part of a forename. Corresponds to the 100 $b subfield in MARC.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_preferred_name_prefix.yml b/config/export/field.field.taxonomy_term.person.field_preferred_name_prefix.yml
deleted file mode 100644
index 7bc28bde7..000000000
--- a/config/export/field.field.taxonomy_term.person.field_preferred_name_prefix.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 77bc9b46-2e91-472b-bc24-6675c25319a5
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_preferred_name_prefix
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_preferred_name_prefix
-field_name: field_preferred_name_prefix
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Preferred Name: Prefix'
-description: 'Term(s) like prefixes and honorary titles that in normative use would precede the entire name. Found in the 100 $c subfield in MARC.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_preferred_name_rest.yml b/config/export/field.field.taxonomy_term.person.field_preferred_name_rest.yml
deleted file mode 100644
index bdb4bbc08..000000000
--- a/config/export/field.field.taxonomy_term.person.field_preferred_name_rest.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 078fc35a-b8b1-473e-8865-3437314a2b41
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_preferred_name_rest
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_preferred_name_rest
-field_name: field_preferred_name_rest
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Preferred Name: Rest of Name'
-description: 'The first name element or forename and additional names, e.g, middle names, for the person named in the record. Listed second in the 100 $a subfield in MARC.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_preferred_name_suffix.yml b/config/export/field.field.taxonomy_term.person.field_preferred_name_suffix.yml
deleted file mode 100644
index 5d02942e6..000000000
--- a/config/export/field.field.taxonomy_term.person.field_preferred_name_suffix.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 74c6c1a3-ac31-4468-83d5-f84fb1221f97
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_preferred_name_suffix
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_preferred_name_suffix
-field_name: field_preferred_name_suffix
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Preferred Name: Suffix'
-description: 'A term following a name that qualifies the name but is not a title. Examples: "Jr.", "fils". Found in the 100 $c subfield in MARC.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_primary_part_of_name.yml b/config/export/field.field.taxonomy_term.person.field_primary_part_of_name.yml
deleted file mode 100644
index 486afe177..000000000
--- a/config/export/field.field.taxonomy_term.person.field_primary_part_of_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 87d1c76c-c194-40bb-86db-8291caaf0ee9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_primary_part_of_name
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 0
-id: taxonomy_term.person.field_primary_part_of_name
-field_name: field_primary_part_of_name
-entity_type: taxonomy_term
-bundle: person
-label: 'Person Preferred Name: Primary Part of Name'
-description: 'The primary part of a name form (e.g. a last name or surname of a person). Listed first in the 100 $a subfield in MARC.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.person.field_relationships.yml b/config/export/field.field.taxonomy_term.person.field_relationships.yml
deleted file mode 100644
index bf8a9c88f..000000000
--- a/config/export/field.field.taxonomy_term.person.field_relationships.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: e1b073a9-63ee-450f-9acb-496f71cdaa6f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_relationships
-    - taxonomy.vocabulary.corporate_body
-    - taxonomy.vocabulary.family
-    - taxonomy.vocabulary.person
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: q68XTBiPrVV-NgiYkNEKC_3jTjPzmGkqUQzzIsWQLfc
-id: taxonomy_term.person.field_relationships
-field_name: field_relationships
-entity_type: taxonomy_term
-bundle: person
-label: Relationships
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:taxonomy_term'
-  handler_settings:
-    target_bundles:
-      corporate_body: corporate_body
-      family: family
-      person: person
-    sort:
-      field: name
-      direction: asc
-    auto_create: false
-    auto_create_bundle: corporate_body
-  rel_types:
-    'schema:knows': Knows
-    'schema:alumniOf': 'Alumni of'
-    'schema:children': Children
-    'schema:colleague': Colleague
-    'schema:follows': Follows
-    'schema:funder': Funder
-    'schema:knowsAbout': 'Knows about'
-    'schema:memberOf': 'Member of'
-    'schema:parent': Parent
-    'schema:relatedTo': 'Related to'
-    'schema:sibling': Sibling
-    'schema:sponsor': Sponsor
-    'schema:spouse': Spouse
-    'schema:worksFor': 'Works for'
-field_type: typed_relation
diff --git a/config/export/field.field.taxonomy_term.person.field_unique_id.yml b/config/export/field.field.taxonomy_term.person.field_unique_id.yml
deleted file mode 100644
index b2d8e96f3..000000000
--- a/config/export/field.field.taxonomy_term.person.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 8ec768da-6950-4175-9e6a-da4185699995
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.person
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: taxonomy_term.person.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: person
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally this should not be edited.'
-required: true
-translatable: false
-default_value:
-  -
-    value: d427df78-817c-4bc7-ba00-0ecc47644f16
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.physical_form.field_authority_link.yml b/config/export/field.field.taxonomy_term.physical_form.field_authority_link.yml
deleted file mode 100644
index 64cd55c08..000000000
--- a/config/export/field.field.taxonomy_term.physical_form.field_authority_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 524a7cc6-8a00-498d-a008-7a11b42d1975
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.physical_form
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: KVn0hSQgc6sXdaoN5jgjmPsOXcO7qINHsOBOeqHoXV0
-id: taxonomy_term.physical_form.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: physical_form
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    marcform: 'MARC form of item term list'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.resource_types.field_authority_link.yml b/config/export/field.field.taxonomy_term.resource_types.field_authority_link.yml
deleted file mode 100644
index f52296762..000000000
--- a/config/export/field.field.taxonomy_term.resource_types.field_authority_link.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: e99583b4-6e68-40e0-905d-59d5e9fbb91d
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.resource_types
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: fFgIbbfq71u98DtB8bkd9HOnh8b_Kzy_-tJV8jtpiCE
-id: taxonomy_term.resource_types.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: resource_types
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    dcmi_types: 'DCMI Type Vocabulary'
-    marc_resource_types: 'MARC Resource Types'
-    bibo: 'Bibliographic Ontology'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.subject.field_authority_link.yml b/config/export/field.field.taxonomy_term.subject.field_authority_link.yml
deleted file mode 100644
index 8fd861445..000000000
--- a/config/export/field.field.taxonomy_term.subject.field_authority_link.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-uuid: 305a94fe-ae70-42c2-8890-bb8d6376415a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.subject
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: VDYYY3_FwGKA5NirbBlaTMxL9a05FPxRiBv8LeuNteo
-id: taxonomy_term.subject.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: subject
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    aat: 'Art & Architecture Thesaurus'
-    cash: 'Canadian Subject Headings'
-    fast: 'FAST (Faceted Application of Subject Terminology)'
-    gmgpc: 'TGM II, Genre and physical characteristic terms'
-    lcsh: 'Library of Congress Subject Headings'
-    lcshac: 'Library of Congress Children''s Subject Headings'
-    mesh: 'Medical Subject Headings'
-    nal: 'National Agricultural Library subject headings'
-    rbgenr: 'Genre Terms: A Thesaurus for Use in Rare Book and Special Collections Cataloguing'
-    rvm: 'Répertoire de vedettes-matière'
-    tgn: 'Getty Thesaurus of Geographic Names'
-    tgm: 'Thesaurus for Graphic Materials'
-    lcgft: 'Library of Congress Genre/Form Terms'
-    wiki: Wikidata
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.taxonomy_term.subject.field_unique_id.yml b/config/export/field.field.taxonomy_term.subject.field_unique_id.yml
deleted file mode 100644
index 44af02bd8..000000000
--- a/config/export/field.field.taxonomy_term.subject.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: d26d0b4c-ed19-4cd2-ab6c-1ed6e5875512
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_unique_id
-    - taxonomy.vocabulary.subject
-  module:
-    - epp
-third_party_settings:
-  epp:
-    value: ''
-    on_update: 1
-id: taxonomy_term.subject.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-bundle: subject
-label: 'Unique ID'
-description: 'This is the system''s unique identifier for this field.  Generally this should not be edited.'
-required: true
-translatable: false
-default_value:
-  -
-    value: 42925465-a7a3-4e49-a992-56d90d5e4441
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/export/field.field.taxonomy_term.temporal_subjects.field_authority_link.yml b/config/export/field.field.taxonomy_term.temporal_subjects.field_authority_link.yml
deleted file mode 100644
index cd62c0c8c..000000000
--- a/config/export/field.field.taxonomy_term.temporal_subjects.field_authority_link.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 28a8d830-8559-4e06-8cc3-5dfd1d81e956
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - taxonomy.vocabulary.temporal_subjects
-  module:
-    - controlled_access_terms
-_core:
-  default_config_hash: w7jMx1KFgcy983Zm9iAMXKmG8dQly3c4fgXhkT1DB98
-id: taxonomy_term.temporal_subjects.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-bundle: temporal_subjects
-label: 'Authority Sources'
-description: ''
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  authority_sources:
-    lcsh: 'Library of Congress Subject Headings'
-    other: Other
-  title: 1
-  link_type: 16
-field_type: authority_link
diff --git a/config/export/field.field.user.user.user_picture.yml b/config/export/field.field.user.user.user_picture.yml
deleted file mode 100644
index d88e0af77..000000000
--- a/config/export/field.field.user.user.user_picture.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-uuid: c7a7a288-664e-4d19-a657-c61a6e215c05
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.user.user_picture
-  module:
-    - image
-    - user
-_core:
-  default_config_hash: twhm-ZOwSVkUjuLI_pQsaPo_pVLcqFfDmY-ojfqw0yk
-id: user.user.user_picture
-field_name: user_picture
-entity_type: user
-bundle: user
-label: Picture
-description: 'Your virtual face or picture.'
-required: false
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:file'
-  handler_settings: {  }
-  file_directory: 'pictures/[date:custom:Y]-[date:custom:m]'
-  file_extensions: 'png gif jpg jpeg'
-  max_filesize: ''
-  max_resolution: ''
-  min_resolution: ''
-  alt_field: false
-  alt_field_required: false
-  title_field: false
-  title_field_required: false
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-field_type: image
diff --git a/config/export/field.settings.yml b/config/export/field.settings.yml
deleted file mode 100644
index 2225b8ffd..000000000
--- a/config/export/field.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: nJk0TAQBzlNo52ehiHI7bIEPLGi0BYqZvPdEn7Chfu0
-purge_batch_size: 50
diff --git a/config/export/field.storage.block_content.body.yml b/config/export/field.storage.block_content.body.yml
deleted file mode 100644
index 6c17a10ed..000000000
--- a/config/export/field.storage.block_content.body.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 8753eecd-5cae-477d-95d7-9f8500fbc85e
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-    - text
-_core:
-  default_config_hash: eS0snV_L3dx9shtWRTzm5eblwOJ7qKWC9IE-4GMTDFc
-id: block_content.body
-field_name: body
-entity_type: block_content
-type: text_with_summary
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: true
-custom_storage: false
diff --git a/config/export/field.storage.comment.comment_body.yml b/config/export/field.storage.comment.comment_body.yml
deleted file mode 100644
index 62c2e04f9..000000000
--- a/config/export/field.storage.comment.comment_body.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: ce7d7580-553b-4b20-afb2-a5fc3d0f9046
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-    - text
-_core:
-  default_config_hash: swYoCch_hY8QO5uwr4FURplfnUCUlpPB4idF8WGVCpw
-id: comment.comment_body
-field_name: comment_body
-entity_type: comment
-type: text_long
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: true
-custom_storage: false
diff --git a/config/export/field.storage.group_content.group_roles.yml b/config/export/field.storage.group_content.group_roles.yml
deleted file mode 100644
index 696665176..000000000
--- a/config/export/field.storage.group_content.group_roles.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 4f2c095d-1f6e-47b5-a1ad-33f22b4d108e
-langcode: en
-status: true
-dependencies:
-  module:
-    - group
-_core:
-  default_config_hash: Sgrm2nHDx7xKvByuR5oGB77nLvI0LikTM8ff3e_YlWY
-id: group_content.group_roles
-field_name: group_roles
-entity_type: group_content
-type: entity_reference
-settings:
-  target_type: group_role
-module: core
-locked: true
-cardinality: -1
-translatable: false
-indexes: {  }
-persist_with_no_fields: true
-custom_storage: false
diff --git a/config/export/field.storage.media.field_complete.yml b/config/export/field.storage.media.field_complete.yml
deleted file mode 100644
index 8711dc86e..000000000
--- a/config/export/field.storage.media.field_complete.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 8971ccc1-e5ca-46e4-90c2-f18d18d7904f
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: uakxwyh3f8sU_8i61T6bfuC4skOUsbv_VRLdpParL6s
-id: media.field_complete
-field_name: field_complete
-entity_type: media
-type: boolean
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_display_mode_for_viewer.yml b/config/export/field.storage.media.field_display_mode_for_viewer.yml
deleted file mode 100644
index da8735f29..000000000
--- a/config/export/field.storage.media.field_display_mode_for_viewer.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 80f58b16-e664-4f8f-a1d2-54034f6c35dd
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - media
-    - view_mode_switch
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: media.field_display_mode_for_viewer
-field_name: field_display_mode_for_viewer
-entity_type: media
-type: view_mode_switch
-settings:
-  origin_view_modes:
-    source: source
-module: view_mode_switch
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_edited_text.yml b/config/export/field.storage.media.field_edited_text.yml
deleted file mode 100644
index 010e8a26c..000000000
--- a/config/export/field.storage.media.field_edited_text.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 9cd67360-4fed-43f9-96cb-4b6ccaf35a4b
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - text
-_core:
-  default_config_hash: O2bpHJiD0uvDdncdlOF30YuEzMQm7S-olk2ZPfZUl8c
-id: media.field_edited_text
-field_name: field_edited_text
-entity_type: media
-type: text_long
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_file_size.yml b/config/export/field.storage.media.field_file_size.yml
deleted file mode 100644
index 273604d95..000000000
--- a/config/export/field.storage.media.field_file_size.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 8c1869b8-5cf8-4dae-a145-28f813aef069
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: qqVtQ4fX8xta5ZofIYNka78oJuC4Ae7jXYvwu6lWev8
-id: media.field_file_size
-field_name: field_file_size
-entity_type: media
-type: integer
-settings:
-  unsigned: true
-  size: big
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_height.yml b/config/export/field.storage.media.field_height.yml
deleted file mode 100644
index 667200f42..000000000
--- a/config/export/field.storage.media.field_height.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 3799e553-1e97-418c-84ae-28121dc81fc4
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: Px3XXVJbHRnXONsekdr0c4_ZbfiwtElQTJbtR-zwsm8
-id: media.field_height
-field_name: field_height
-entity_type: media
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_audio_file.yml b/config/export/field.storage.media.field_media_audio_file.yml
deleted file mode 100644
index a463eb51a..000000000
--- a/config/export/field.storage.media.field_media_audio_file.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 315bacec-7c91-4faf-b9a7-56212ee48431
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - media
-_core:
-  default_config_hash: iTxgIfCzyDceYyI-KMmq2OFKyXpu6jVPZ_KCEykhHY4
-id: media.field_media_audio_file
-field_name: field_media_audio_file
-entity_type: media
-type: file
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: fedora
-module: file
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_document.yml b/config/export/field.storage.media.field_media_document.yml
deleted file mode 100644
index f215a63c9..000000000
--- a/config/export/field.storage.media.field_media_document.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 97d30ebe-aad2-45ac-ab21-b2e3a050498c
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - media
-_core:
-  default_config_hash: Weg74lAEfYe-o4dzVB8fVwxdv940hdFEYO3J-w_wGtE
-id: media.field_media_document
-field_name: field_media_document
-entity_type: media
-type: file
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: fedora
-module: file
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_file.yml b/config/export/field.storage.media.field_media_file.yml
deleted file mode 100644
index 650143045..000000000
--- a/config/export/field.storage.media.field_media_file.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 41f879c8-025f-4a17-b2b3-24b255b30bc4
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - file
-    - media
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: X61hPiynKLTSL_IoAHK-dAZo1knza1pkBAHCmJw4WtU
-id: media.field_media_file
-field_name: field_media_file
-entity_type: media
-type: file
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: fedora
-module: file
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_image.yml b/config/export/field.storage.media.field_media_image.yml
deleted file mode 100644
index 3b9f5f8d6..000000000
--- a/config/export/field.storage.media.field_media_image.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-uuid: 33707f6e-f0b6-4c22-b093-d4d9855565fb
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - image
-    - media
-_core:
-  default_config_hash: NslRY6r63iEhkDXbs8n7v_iOBxPqaKhstX1Sb0HA7x0
-id: media.field_media_image
-field_name: field_media_image
-entity_type: media
-type: image
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: public
-  default_image:
-    uuid: ''
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_oembed_video.yml b/config/export/field.storage.media.field_media_oembed_video.yml
deleted file mode 100644
index 26fa2eec4..000000000
--- a/config/export/field.storage.media.field_media_oembed_video.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 18ef1bca-8716-454e-abb4-d33e789c2249
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: cNf_852Dq-fNnSaMI4LxL-J6N7bLkHuDbD9EUqOn4_U
-id: media.field_media_oembed_video
-field_name: field_media_oembed_video
-entity_type: media
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_of.yml b/config/export/field.storage.media.field_media_of.yml
deleted file mode 100644
index f63e8214d..000000000
--- a/config/export/field.storage.media.field_media_of.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: dfd3b9fd-3f21-4866-b20f-b88d0348b1dd
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - node
-_core:
-  default_config_hash: VN6byCtafQaDCBbb4rpeh3YZPTHgir0ycHw6y-S-TYw
-id: media.field_media_of
-field_name: field_media_of
-entity_type: media
-type: entity_reference
-settings:
-  target_type: node
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_use.yml b/config/export/field.storage.media.field_media_use.yml
deleted file mode 100644
index cfc77af80..000000000
--- a/config/export/field.storage.media.field_media_use.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 47aad2d6-ddff-42bf-88af-230981e6db55
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - media
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: iI13bL8veuLh_hZI6FAqt5qGUXrfD6kS_F1S6NQEhbA
-id: media.field_media_use
-field_name: field_media_use
-entity_type: media
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_media_video_file.yml b/config/export/field.storage.media.field_media_video_file.yml
deleted file mode 100644
index 4f6c545b5..000000000
--- a/config/export/field.storage.media.field_media_video_file.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 2a924c63-3cd8-4221-9f43-b1a911fd1ef2
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - media
-_core:
-  default_config_hash: yR_E-Jhw3fMBrZ0CUXvQs-SO-wzQGFtpa0ELtS3J_U0
-id: media.field_media_video_file
-field_name: field_media_video_file
-entity_type: media
-type: file
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: fedora
-module: file
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_mime_type.yml b/config/export/field.storage.media.field_mime_type.yml
deleted file mode 100644
index cd3a35992..000000000
--- a/config/export/field.storage.media.field_mime_type.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 450727bf-d7a3-4fdf-b25d-cfb51a5ec1ab
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: jkyI5Z7ljFNPNQJzQZymOHcp88hB_I1qgshMSpVsAkM
-id: media.field_mime_type
-field_name: field_mime_type
-entity_type: media
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_original_name.yml b/config/export/field.storage.media.field_original_name.yml
deleted file mode 100644
index 2573da708..000000000
--- a/config/export/field.storage.media.field_original_name.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 699456cf-5980-4f56-84c8-14c856973727
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: j2VwM0pUj3LsFNENCXHYIx6IGP_63v8l9eUoz62m_yc
-id: media.field_original_name
-field_name: field_original_name
-entity_type: media
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_track.yml b/config/export/field.storage.media.field_track.yml
deleted file mode 100644
index 2ee72acf5..000000000
--- a/config/export/field.storage.media.field_track.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: bf44de36-18b7-426e-8c68-277c55dcbb5d
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - file
-    - islandora
-    - media
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 3zCHO53sVHFazBT8_1zNElOM-Yy1B0bL7gEF51rbgYk
-id: media.field_track
-field_name: field_track
-entity_type: media
-type: media_track
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: fedora
-module: islandora
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.field_width.yml b/config/export/field.storage.media.field_width.yml
deleted file mode 100644
index 920ad4a67..000000000
--- a/config/export/field.storage.media.field_width.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 8e06b5b8-feaf-4565-ae4d-77241604c90f
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: zL-l_IiMrXgUkI928ssjw2n77FjbeVqehzdJ9_koIYk
-id: media.field_width
-field_name: field_width
-entity_type: media
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.media.fits_ois_file_information_md5che.yml b/config/export/field.storage.media.fits_ois_file_information_md5che.yml
deleted file mode 100644
index b52f0f092..000000000
--- a/config/export/field.storage.media.fits_ois_file_information_md5che.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 147c3455-b048-4f2d-8d30-33c8f8cd46bf
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - text
-_core:
-  default_config_hash: ePdyTTrNGO3ZBZm4nG5bUXgaCnkSkCYFbxbri6MbU78
-id: media.fits_ois_file_information_md5che
-field_name: fits_ois_file_information_md5che
-entity_type: media
-type: text
-settings:
-  max_length: 255
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.body.yml b/config/export/field.storage.node.body.yml
deleted file mode 100644
index 502a911aa..000000000
--- a/config/export/field.storage.node.body.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 80bf1841-96e3-483f-ada5-391327bfbd12
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - text
-_core:
-  default_config_hash: EBUo7qOWqaiZaQ_RC9sLY5IoDKphS34v77VIHSACmVY
-id: node.body
-field_name: body
-entity_type: node
-type: text_with_summary
-settings: {  }
-module: text
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: true
-custom_storage: false
diff --git a/config/export/field.storage.node.comment.yml b/config/export/field.storage.node.comment.yml
deleted file mode 100644
index 2a05dd132..000000000
--- a/config/export/field.storage.node.comment.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: b9dc40aa-57c6-4905-9952-84ebcdcd4557
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-    - node
-_core:
-  default_config_hash: ktCna9xmWvYZIUfOCUyDQvedn5RtnS4CRmEIwNmvYjc
-id: node.comment
-field_name: comment
-entity_type: node
-type: comment
-settings:
-  comment_type: comment
-module: comment
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_abstract.yml b/config/export/field.storage.node.field_abstract.yml
deleted file mode 100644
index 880b70a3a..000000000
--- a/config/export/field.storage.node.field_abstract.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: e767fd03-691b-4a98-8d8e-7e70df454143
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: WuV2X-5c4wKQsu1THdMCZZvsf6XlShOOtgfAno5lyFc
-id: node.field_abstract
-field_name: field_abstract
-entity_type: node
-type: text_long
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_alt_title.yml b/config/export/field.storage.node.field_alt_title.yml
deleted file mode 100644
index b37639909..000000000
--- a/config/export/field.storage.node.field_alt_title.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: ad2812e0-aa17-4954-b5d1-a8e30f5707c2
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: _QSkTvZqTmeScP9AFdDX8w9CzCbZoOgG7vEEYReYOKw
-id: node.field_alt_title
-field_name: field_alt_title
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_alternative_title.yml b/config/export/field.storage.node.field_alternative_title.yml
deleted file mode 100644
index 264138148..000000000
--- a/config/export/field.storage.node.field_alternative_title.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 844dc4a0-740f-493a-9f31-28c13db415fe
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: mFxWELMdWU1M-KfE1fAdzhla2IpqPM0uyIzWeaT8mo4
-id: node.field_alternative_title
-field_name: field_alternative_title
-entity_type: node
-type: string
-settings:
-  max_length: 5000
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_citable_url.yml b/config/export/field.storage.node.field_citable_url.yml
deleted file mode 100644
index 766d1cf3e..000000000
--- a/config/export/field.storage.node.field_citable_url.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 804e0616-d1ca-45f5-9b97-aad316fdb829
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_citable_url
-field_name: field_citable_url
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_classification.yml b/config/export/field.storage.node.field_classification.yml
deleted file mode 100644
index cf3008929..000000000
--- a/config/export/field.storage.node.field_classification.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: d8c598bb-c5dd-4051-b9db-bde426e488b1
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: eGewpM58zUeolSrkz_Cyvy70QTOicBHpq4WZGbrunVk
-id: node.field_classification
-field_name: field_classification
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_collection_contact_email.yml b/config/export/field.storage.node.field_collection_contact_email.yml
deleted file mode 100644
index cb58dc1f6..000000000
--- a/config/export/field.storage.node.field_collection_contact_email.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 657afcfb-4ab5-44d1-be42-2ca1b0c59467
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: QRs54a5Ti6THJV8F4sPAeRp3wdV3NQFpZndCp_vC5NQ
-id: node.field_collection_contact_email
-field_name: field_collection_contact_email
-entity_type: node
-type: email
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_collection_contact_name.yml b/config/export/field.storage.node.field_collection_contact_name.yml
deleted file mode 100644
index b6cbe5297..000000000
--- a/config/export/field.storage.node.field_collection_contact_name.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 4a3ad531-a30f-45b7-9b66-ba36e84a5741
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 1gAalJ8Jvrk6MTiAvPVy5AtPRzg4paDkCUnthas21r0
-id: node.field_collection_contact_name
-field_name: field_collection_contact_name
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_collection_number.yml b/config/export/field.storage.node.field_collection_number.yml
deleted file mode 100644
index 8265ec19e..000000000
--- a/config/export/field.storage.node.field_collection_number.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 116f48c8-df9c-40fc-9d75-13458605caeb
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 4Ll_F8uhh6PS16H0KIbmlEFXAxFrX5lOq6BXuuoPX0g
-id: node.field_collection_number
-field_name: field_collection_number
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_contributor.yml b/config/export/field.storage.node.field_contributor.yml
deleted file mode 100644
index 03a3cbb42..000000000
--- a/config/export/field.storage.node.field_contributor.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 318bf7fb-ad16-4fad-982e-e064d7c672da
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_contributor
-field_name: field_contributor
-entity_type: node
-type: typed_relation
-settings:
-  target_type: taxonomy_term
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_coordinates.yml b/config/export/field.storage.node.field_coordinates.yml
deleted file mode 100644
index 4e63db773..000000000
--- a/config/export/field.storage.node.field_coordinates.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: f4d796e6-540a-4779-8079-8497471511a8
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - geolocation
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 5XdBssNUPq4ONNvQXZ6IG-vfngHIZKVopJLajV_RHuc
-id: node.field_coordinates
-field_name: field_coordinates
-entity_type: node
-type: geolocation
-settings: {  }
-module: geolocation
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_coordinates_text.yml b/config/export/field.storage.node.field_coordinates_text.yml
deleted file mode 100644
index 521f21262..000000000
--- a/config/export/field.storage.node.field_coordinates_text.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: fb77e0f8-e918-4bb7-b07b-242b26391855
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: GsxzRK62rW0v4QyzC_X8b0j9HSDelKaW5kvH9rk2eA0
-id: node.field_coordinates_text
-field_name: field_coordinates_text
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_copyright_and_use.yml b/config/export/field.storage.node.field_copyright_and_use.yml
deleted file mode 100644
index 473896bca..000000000
--- a/config/export/field.storage.node.field_copyright_and_use.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: fb844ecb-57ef-402d-a4df-c530e8eab779
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_copyright_and_use
-field_name: field_copyright_and_use
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_copyright_date.yml b/config/export/field.storage.node.field_copyright_date.yml
deleted file mode 100644
index 9c86b62a7..000000000
--- a/config/export/field.storage.node.field_copyright_date.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 1d59211b-7d55-4b80-b76c-1eff5833066d
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: FLTLpzIsQMk1kAEQuyyQrI2OgK-p_18YvxlUZv20qfM
-id: node.field_copyright_date
-field_name: field_copyright_date
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_copyright_holder.yml b/config/export/field.storage.node.field_copyright_holder.yml
deleted file mode 100644
index 23bef7339..000000000
--- a/config/export/field.storage.node.field_copyright_holder.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 78371190-9e69-403b-8428-270bbfa7823a
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_copyright_holder
-field_name: field_copyright_holder
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_creator.yml b/config/export/field.storage.node.field_creator.yml
deleted file mode 100644
index e3f766345..000000000
--- a/config/export/field.storage.node.field_creator.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: ac318973-6a87-40ec-bb0a-0f30e5a3ff15
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_creator
-field_name: field_creator
-entity_type: node
-type: typed_relation
-settings:
-  target_type: taxonomy_term
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_date_available.yml b/config/export/field.storage.node.field_date_available.yml
deleted file mode 100644
index 286388aac..000000000
--- a/config/export/field.storage.node.field_date_available.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 57c33695-8617-4890-94ca-a6f3fc22418d
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_date_available
-field_name: field_date_available
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_date_captured.yml b/config/export/field.storage.node.field_date_captured.yml
deleted file mode 100644
index 26a14aa5a..000000000
--- a/config/export/field.storage.node.field_date_captured.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 82d21ec3-5cd8-4303-afcd-5b35e99879be
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: K1SRJkAq4495TPAYpWjlcxI6sqvJ1n9uJV8kWG_aDxI
-id: node.field_date_captured
-field_name: field_date_captured
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_date_copyrighted.yml b/config/export/field.storage.node.field_date_copyrighted.yml
deleted file mode 100644
index 9c182f2ac..000000000
--- a/config/export/field.storage.node.field_date_copyrighted.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 26f2d895-1d1d-44b0-8688-079870023430
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_date_copyrighted
-field_name: field_date_copyrighted
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_date_modified.yml b/config/export/field.storage.node.field_date_modified.yml
deleted file mode 100644
index 50ee76147..000000000
--- a/config/export/field.storage.node.field_date_modified.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 535d128b-0ba3-433a-bcf4-9cb291a03575
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: XKIH5AXCXnHj8ACXsiOGe6mfIJk_NxPwVRLPNvkAoAs
-id: node.field_date_modified
-field_name: field_date_modified
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_date_published.yml b/config/export/field.storage.node.field_date_published.yml
deleted file mode 100644
index d51d197d2..000000000
--- a/config/export/field.storage.node.field_date_published.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 34c8b3c7-a241-46d7-8cb9-8c17a8f0e46c
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_date_published
-field_name: field_date_published
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_date_valid.yml b/config/export/field.storage.node.field_date_valid.yml
deleted file mode 100644
index f2806a321..000000000
--- a/config/export/field.storage.node.field_date_valid.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 77b9308f-47ab-4e3a-ab67-84624cbebe9f
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: ZcfS75kKhMpxKL5nkMfV7XNg2KfLlwlEjdIH9dvgxiQ
-id: node.field_date_valid
-field_name: field_date_valid
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_description.yml b/config/export/field.storage.node.field_description.yml
deleted file mode 100644
index cb4d66db0..000000000
--- a/config/export/field.storage.node.field_description.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 0ba71742-6f2d-4cb6-bb4f-7eb00dff2885
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: 8cYoje9ObIxX1k3ffRc-tWuu3hcddJzy3EHCPlq8JPI
-id: node.field_description
-field_name: field_description
-entity_type: node
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_dewey_classification.yml b/config/export/field.storage.node.field_dewey_classification.yml
deleted file mode 100644
index 286d6faca..000000000
--- a/config/export/field.storage.node.field_dewey_classification.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 1a027d9b-4bac-42fb-9db0-6747bfee2489
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: _BtkwgXrCMQJ8GHHyHU9a7DUsK-ymwgkZuzRmZ0r6QQ
-id: node.field_dewey_classification
-field_name: field_dewey_classification
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_digital_identifier.yml b/config/export/field.storage.node.field_digital_identifier.yml
deleted file mode 100644
index 69765ef6c..000000000
--- a/config/export/field.storage.node.field_digital_identifier.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: a1fc96ec-b586-4836-9087-22fa7f5d2788
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_digital_identifier
-field_name: field_digital_identifier
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_digital_publisher.yml b/config/export/field.storage.node.field_digital_publisher.yml
deleted file mode 100644
index a0972806a..000000000
--- a/config/export/field.storage.node.field_digital_publisher.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 9e0903a8-833f-4015-9ef4-27b075703499
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_digital_publisher
-field_name: field_digital_publisher
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_display_hints.yml b/config/export/field.storage.node.field_display_hints.yml
deleted file mode 100644
index 88e64e1bb..000000000
--- a/config/export/field.storage.node.field_display_hints.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: aa0d0cdc-3169-44c9-9777-52a59a67bf3c
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: C5zqulFutebKr1XH6W-C5O8HWV08zZ1FbnENQv_cISE
-id: node.field_display_hints
-field_name: field_display_hints
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_dspace_identifier.yml b/config/export/field.storage.node.field_dspace_identifier.yml
deleted file mode 100644
index 4b4a7c1c6..000000000
--- a/config/export/field.storage.node.field_dspace_identifier.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: c6f185f0-f047-47a7-a41d-4f143944ddbe
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_dspace_identifier
-field_name: field_dspace_identifier
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_dspace_item_id.yml b/config/export/field.storage.node.field_dspace_item_id.yml
deleted file mode 100644
index 4d65413da..000000000
--- a/config/export/field.storage.node.field_dspace_item_id.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 33910cb6-69ea-4290-b83b-ccdb367b79da
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_dspace_item_id
-field_name: field_dspace_item_id
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_edition.yml b/config/export/field.storage.node.field_edition.yml
deleted file mode 100644
index d97c4ed08..000000000
--- a/config/export/field.storage.node.field_edition.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: f0f6933d-6dca-4829-89aa-f6b50d914246
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: U8M5F369_6We3_kV7Ntdo-aIMRgXeTzOidIUkooQIkE
-id: node.field_edition
-field_name: field_edition
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_edtf_date.yml b/config/export/field.storage.node.field_edtf_date.yml
deleted file mode 100644
index 2893d5e7f..000000000
--- a/config/export/field.storage.node.field_edtf_date.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: d43db435-3e9e-45b7-995b-81f95233689b
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: C6RAaNDse3-eQaG8S7HMTKViyB3Q9A3G_h2GM4cwAwA
-id: node.field_edtf_date
-field_name: field_edtf_date
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_edtf_date_created.yml b/config/export/field.storage.node.field_edtf_date_created.yml
deleted file mode 100644
index aa664407b..000000000
--- a/config/export/field.storage.node.field_edtf_date_created.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 4a11f925-4db6-4cc1-842e-ce641f367302
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 4lu3idzfQkSc3z1e8zoRWjX4vB4lY0W5N1seCLE7l3g
-id: node.field_edtf_date_created
-field_name: field_edtf_date_created
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_edtf_date_issued.yml b/config/export/field.storage.node.field_edtf_date_issued.yml
deleted file mode 100644
index 75d5cce1c..000000000
--- a/config/export/field.storage.node.field_edtf_date_issued.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 86a89254-41fb-4508-ac8e-ebf23a85d615
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: ritH1OPE0hTgDD73edW6V2e7JjZ5bT5LMbwHQHqWfWs
-id: node.field_edtf_date_issued
-field_name: field_edtf_date_issued
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_extent.yml b/config/export/field.storage.node.field_extent.yml
deleted file mode 100644
index c670a716d..000000000
--- a/config/export/field.storage.node.field_extent.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: ef2334fa-2329-479b-86c7-ef7357aa1869
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: noZJ0WqBZpCIy5pez4AWHq-V3VIUIqpIkMcKghZk_Nc
-id: node.field_extent
-field_name: field_extent
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_featured_item.yml b/config/export/field.storage.node.field_featured_item.yml
deleted file mode 100644
index a69630ba0..000000000
--- a/config/export/field.storage.node.field_featured_item.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 8fe6ff06-d917-4f29-885c-50dc7c089c0b
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: _sZN30dOHg2LmqdUngQJK_p6UugpOzRjqdfsZ5h54bo
-id: node.field_featured_item
-field_name: field_featured_item
-entity_type: node
-type: boolean
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_finding_aid.yml b/config/export/field.storage.node.field_finding_aid.yml
deleted file mode 100644
index 54dd522e6..000000000
--- a/config/export/field.storage.node.field_finding_aid.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 46f6c68a-b989-40a4-b96d-9c69ae71ecbe
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: HuVgszrtv0a3VohK68nuoiwxwfvjS_Q9cUZxZiV4rmE
-id: node.field_finding_aid
-field_name: field_finding_aid
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_frequency.yml b/config/export/field.storage.node.field_frequency.yml
deleted file mode 100644
index 581407ad2..000000000
--- a/config/export/field.storage.node.field_frequency.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 810ba0f8-33f0-451c-b5d2-487b5b5f8a34
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: WBJOOto86ZFCTNarER1mP3B8JcSYXcdNsHz2E5IgEIA
-id: node.field_frequency
-field_name: field_frequency
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_full_title.yml b/config/export/field.storage.node.field_full_title.yml
deleted file mode 100644
index ba6794580..000000000
--- a/config/export/field.storage.node.field_full_title.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c9ae6952-0e57-44a7-9dd1-d374935c98ee
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: AR7ReVQ63zEGwapCC1QRJHddpTnwQDZedG3noioxb74
-id: node.field_full_title
-field_name: field_full_title
-entity_type: node
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_genre.yml b/config/export/field.storage.node.field_genre.yml
deleted file mode 100644
index 80752f608..000000000
--- a/config/export/field.storage.node.field_genre.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 26559e82-b7d3-44f8-896b-329fa164c5ac
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: InZzChM-oZp3SX3cJz9ECCYXhV_o5BPsheXyNdeFxAs
-id: node.field_genre
-field_name: field_genre
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_geographic_subject.yml b/config/export/field.storage.node.field_geographic_subject.yml
deleted file mode 100644
index fe4e199fb..000000000
--- a/config/export/field.storage.node.field_geographic_subject.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: c9568e9f-e4d5-44e7-b918-ee942e3318ec
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: qvtHmBbj-G2xVX7_jHrrsArxldix_8A06XTxJLVO_i8
-id: node.field_geographic_subject
-field_name: field_geographic_subject
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_geoportal_link.yml b/config/export/field.storage.node.field_geoportal_link.yml
deleted file mode 100644
index 8b1c8b58b..000000000
--- a/config/export/field.storage.node.field_geoportal_link.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: c87e19ec-1cbe-4365-9090-4c5341cc41e5
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_geoportal_link
-field_name: field_geoportal_link
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_identifier.yml b/config/export/field.storage.node.field_identifier.yml
deleted file mode 100644
index 5a93a2317..000000000
--- a/config/export/field.storage.node.field_identifier.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a02f784d-2930-4107-b453-a3fcad3dff1f
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: EDffp33LOir-UbRjFetIVnq02J_1ZBNmLxNg-o2NqtU
-id: node.field_identifier
-field_name: field_identifier
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_image.yml b/config/export/field.storage.node.field_image.yml
deleted file mode 100644
index 5510db0e4..000000000
--- a/config/export/field.storage.node.field_image.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: 68c4125e-bb3e-4d90-a149-88415041f220
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - image
-    - node
-_core:
-  default_config_hash: EymokncRIZ7SgQT2IdOQhQJicX4nNc0K89ik-LxmOHE
-id: node.field_image
-field_name: field_image
-entity_type: node
-type: image
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: public
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
-locked: false
-cardinality: 1
-translatable: true
-indexes:
-  target_id:
-    - target_id
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_is_part_of.yml b/config/export/field.storage.node.field_is_part_of.yml
deleted file mode 100644
index f76c8230a..000000000
--- a/config/export/field.storage.node.field_is_part_of.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: bb7fcf2d-3462-4ab5-bbf4-7601b083c124
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_is_part_of
-field_name: field_is_part_of
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_isbn.yml b/config/export/field.storage.node.field_isbn.yml
deleted file mode 100644
index 7321e750e..000000000
--- a/config/export/field.storage.node.field_isbn.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 2538a191-13eb-4eb1-be9c-f7923d64b21d
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: wmC83HoUyi_ISeigy9ee_Jy0I6vVJj0jW-J3ntXc2dU
-id: node.field_isbn
-field_name: field_isbn
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_issn.yml b/config/export/field.storage.node.field_issn.yml
deleted file mode 100644
index bef07bf86..000000000
--- a/config/export/field.storage.node.field_issn.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c8ce91c4-3f67-47e9-8c11-20ba066d265f
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_issn
-field_name: field_issn
-entity_type: node
-type: string
-settings:
-  max_length: 64
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_item_barcode.yml b/config/export/field.storage.node.field_item_barcode.yml
deleted file mode 100644
index c16edb3cf..000000000
--- a/config/export/field.storage.node.field_item_barcode.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: defd699c-b3d6-4436-99b3-68f676a7cccc
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_item_barcode
-field_name: field_item_barcode
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_jhir.yml b/config/export/field.storage.node.field_jhir.yml
deleted file mode 100644
index cc0e26715..000000000
--- a/config/export/field.storage.node.field_jhir.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 10868e9f-ee99-47a5-8fd1-799b76b91d50
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_jhir
-field_name: field_jhir
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_language.yml b/config/export/field.storage.node.field_language.yml
deleted file mode 100644
index edc82037b..000000000
--- a/config/export/field.storage.node.field_language.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 0d088697-8dd9-4ed7-ac88-0fede4fc04cc
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: DSrtkCpLQhBGc7eSZKxNOfX-ohEL2i0aYg0PKXi9QE8
-id: node.field_language
-field_name: field_language
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_lcc_classification.yml b/config/export/field.storage.node.field_lcc_classification.yml
deleted file mode 100644
index 2c41573d2..000000000
--- a/config/export/field.storage.node.field_lcc_classification.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 9da9d501-234b-4028-a535-74d45500d43e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: nauMEYSNYeWQTroKcTSImLbrQpJIYE9teJJhhNmEy4k
-id: node.field_lcc_classification
-field_name: field_lcc_classification
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_library_catalog_link.yml b/config/export/field.storage.node.field_library_catalog_link.yml
deleted file mode 100644
index 7acd10509..000000000
--- a/config/export/field.storage.node.field_library_catalog_link.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: d47c1f24-8650-4d7a-a17d-18558b86b3e4
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_library_catalog_link
-field_name: field_library_catalog_link
-entity_type: node
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_linked_agent.yml b/config/export/field.storage.node.field_linked_agent.yml
deleted file mode 100644
index e87f37149..000000000
--- a/config/export/field.storage.node.field_linked_agent.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 908d9ff6-c69b-4914-9d9a-c608db4bd823
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: MZEefPoBKkFfc6HueKsNBCOAt_-ECzdCP32NNW7oc5Y
-id: node.field_linked_agent
-field_name: field_linked_agent
-entity_type: node
-type: typed_relation
-settings:
-  target_type: taxonomy_term
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_local_identifier.yml b/config/export/field.storage.node.field_local_identifier.yml
deleted file mode 100644
index 034cc05af..000000000
--- a/config/export/field.storage.node.field_local_identifier.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 41747580-288e-48d1-9aa7-ab8144d8b601
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: I0D7yaVXDONaycVxbUrsCAd9nwWs4oQMuBhJrfm8qxs
-id: node.field_local_identifier
-field_name: field_local_identifier
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_member_of.yml b/config/export/field.storage.node.field_member_of.yml
deleted file mode 100644
index d834b08cf..000000000
--- a/config/export/field.storage.node.field_member_of.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 1e9cec6b-ff8c-4c79-b8a3-97155dc506ef
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 2W9gRiRM7-u3qnMJxyQZGSzPok-XrWXrgYJOqf8cEMQ
-id: node.field_member_of
-field_name: field_member_of
-entity_type: node
-type: entity_reference
-settings:
-  target_type: node
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_mode_of_issuance.yml b/config/export/field.storage.node.field_mode_of_issuance.yml
deleted file mode 100644
index b3d35e725..000000000
--- a/config/export/field.storage.node.field_mode_of_issuance.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: d49406d8-bc6f-4561-97e8-6687e2b101ba
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: ymS3bESsJ4-JBW1CdtVKCE_B9SK3WlQTcK1-4VrhP-g
-id: node.field_mode_of_issuance
-field_name: field_mode_of_issuance
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_model.yml b/config/export/field.storage.node.field_model.yml
deleted file mode 100644
index 1d299e109..000000000
--- a/config/export/field.storage.node.field_model.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 2b2ce8ba-9e50-4330-80dd-9615d62fbd94
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: custom
-_core:
-  default_config_hash: 37axRb7dNW5YPPzeVg2jJ2D22oi-uWcFefejtxFXOg0
-id: node.field_model
-field_name: field_model
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_note.yml b/config/export/field.storage.node.field_note.yml
deleted file mode 100644
index 36798c56b..000000000
--- a/config/export/field.storage.node.field_note.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 99ccfa14-cee9-4837-ac62-e45e77388dba
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: O1fMq5gqvE0o6fByIEjeMqkGfdvTy9_d2gSTf3gxdI8
-id: node.field_note
-field_name: field_note
-entity_type: node
-type: text_long
-settings: {  }
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_oclc_number.yml b/config/export/field.storage.node.field_oclc_number.yml
deleted file mode 100644
index 5307293e0..000000000
--- a/config/export/field.storage.node.field_oclc_number.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 94c5ca1e-29af-42bb-a113-3c027b6b0ec2
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: rZkN9MokTrdS5VAGWmX-K05TfdLI52WMYjfiAsbgM_0
-id: node.field_oclc_number
-field_name: field_oclc_number
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_physical_form.yml b/config/export/field.storage.node.field_physical_form.yml
deleted file mode 100644
index 7a5e0645c..000000000
--- a/config/export/field.storage.node.field_physical_form.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: e54c78f8-6905-43b4-b74b-6ee1a0a8561a
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: 6s9HdyhVAM6V27lg4z-WmQYJmpvCYQ6wQQU2-o5u4VU
-id: node.field_physical_form
-field_name: field_physical_form
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_pid.yml b/config/export/field.storage.node.field_pid.yml
deleted file mode 100644
index 47c976ffc..000000000
--- a/config/export/field.storage.node.field_pid.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 6976e002-eda3-4123-bd18-7fdda8ab2794
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: EdVCIhx8A7wmq4e8K7cyN8ZHI5Sf4Q6giIDR96wa9h4
-id: node.field_pid
-field_name: field_pid
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_place_published.yml b/config/export/field.storage.node.field_place_published.yml
deleted file mode 100644
index 1cb4e2b2c..000000000
--- a/config/export/field.storage.node.field_place_published.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: a461460a-5b3d-4d16-9467-3b5f5ecf82cb
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: vbJAVL_CeXyUj0YqZw4vHrAnNfR4NipwmLFkxXK6RBs
-id: node.field_place_published
-field_name: field_place_published
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_place_published_country.yml b/config/export/field.storage.node.field_place_published_country.yml
deleted file mode 100644
index c43e7f01d..000000000
--- a/config/export/field.storage.node.field_place_published_country.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 7dfac310-95b0-4bab-8527-d6973f6499eb
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: HXyedyVFqNfTXNm88iKQv8zAsTpXT_usrxYOYCwTinU
-id: node.field_place_published_country
-field_name: field_place_published_country
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_publisher.yml b/config/export/field.storage.node.field_publisher.yml
deleted file mode 100644
index 5523dc67e..000000000
--- a/config/export/field.storage.node.field_publisher.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: c285a3ec-956a-4eea-8ff0-fa361e68186f
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_publisher
-field_name: field_publisher
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_publisher_country.yml b/config/export/field.storage.node.field_publisher_country.yml
deleted file mode 100644
index cf5f08c05..000000000
--- a/config/export/field.storage.node.field_publisher_country.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 43025ee3-d77a-4fd6-948f-3e49f5b5ed49
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_publisher_country
-field_name: field_publisher_country
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_resource_type.yml b/config/export/field.storage.node.field_resource_type.yml
deleted file mode 100644
index e1211c424..000000000
--- a/config/export/field.storage.node.field_resource_type.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 9e635c3c-6bd9-45dd-b8b6-e4ff7e9f1b0d
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: RWkKOgKzwVcBqtObk_TwNuL6ZvrRJEMfEKDG9A0Bpi0
-id: node.field_resource_type
-field_name: field_resource_type
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_rights.yml b/config/export/field.storage.node.field_rights.yml
deleted file mode 100644
index a3a34d5fa..000000000
--- a/config/export/field.storage.node.field_rights.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: e8e0e132-853e-41f0-bc0d-6398ed849bf9
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: AxYVFhXak_aXJbnP3Jul57QR05OeP6rByH5DTxc4M3I
-id: node.field_rights
-field_name: field_rights
-entity_type: node
-type: string
-settings:
-  max_length: 1000
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_spatial_coverage.yml b/config/export/field.storage.node.field_spatial_coverage.yml
deleted file mode 100644
index c29ed58f9..000000000
--- a/config/export/field.storage.node.field_spatial_coverage.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 6a99bb08-3efc-42d1-a085-e2927a69a86e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: node.field_spatial_coverage
-field_name: field_spatial_coverage
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_subject.yml b/config/export/field.storage.node.field_subject.yml
deleted file mode 100644
index f959e5bac..000000000
--- a/config/export/field.storage.node.field_subject.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: a6c308b7-1523-45cd-a70e-7d1a3b8b258d
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - taxonomy
-_core:
-  default_config_hash: m2yDC-DCtXwmX_VGt2Esf15mD4oyTyOzr_vPAakOXus
-id: node.field_subject
-field_name: field_subject
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_subject_general.yml b/config/export/field.storage.node.field_subject_general.yml
deleted file mode 100644
index 405615a51..000000000
--- a/config/export/field.storage.node.field_subject_general.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 0172ef1d-0f85-4bdd-a08c-e49003a4ee1f
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: fXUhtVLF4KMt98foBWSxC9fxqIw7seWMjncKD7mf_rs
-id: node.field_subject_general
-field_name: field_subject_general
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_subjects_name.yml b/config/export/field.storage.node.field_subjects_name.yml
deleted file mode 100644
index 08d8b7b27..000000000
--- a/config/export/field.storage.node.field_subjects_name.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 0ab2a4c4-20c3-4418-83fc-9492ad6bb2c4
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: DKPIwfWhD6pAFQ5uCqtuy0JRdLTBY_QqVY6PgUroOS0
-id: node.field_subjects_name
-field_name: field_subjects_name
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_table_of_contents.yml b/config/export/field.storage.node.field_table_of_contents.yml
deleted file mode 100644
index 7d8e3eae6..000000000
--- a/config/export/field.storage.node.field_table_of_contents.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: 50a3c8ca-fc54-45cb-aa51-8f7a773cf471
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: hoClwTpH3aU9_p2qxDhuWZzVsKfDGpetedmTF74jC88
-id: node.field_table_of_contents
-field_name: field_table_of_contents
-entity_type: node
-type: text_long
-settings: {  }
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_tags.yml b/config/export/field.storage.node.field_tags.yml
deleted file mode 100644
index d76eb2282..000000000
--- a/config/export/field.storage.node.field_tags.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 82c4b64e-2a0a-4b98-9a26-1de21ca19549
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - taxonomy
-_core:
-  default_config_hash: WpOE_bs8Bs_HY2ns7n2r__de-xno0-Bxkqep5-MsHAs
-id: node.field_tags
-field_name: field_tags
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_temporal_subject.yml b/config/export/field.storage.node.field_temporal_subject.yml
deleted file mode 100644
index 59e606241..000000000
--- a/config/export/field.storage.node.field_temporal_subject.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 737826e7-0bcd-4d5e-a054-47dedb11d4ca
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: h2m1cqQHw-9OlCv82C9YDT0FAip41uDNgQ9iVPbv5wQ
-id: node.field_temporal_subject
-field_name: field_temporal_subject
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_unique_id.yml b/config/export/field.storage.node.field_unique_id.yml
deleted file mode 100644
index 8109a2cf3..000000000
--- a/config/export/field.storage.node.field_unique_id.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 4d945dc9-eef2-482c-9fd9-655af58a1485
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: T1b-yABpNXgUSc3h5uJTzathPmnAJo2Oy7Cp0CZDYWM
-id: node.field_unique_id
-field_name: field_unique_id
-entity_type: node
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_weight.yml b/config/export/field.storage.node.field_weight.yml
deleted file mode 100644
index 1a9f7c1ab..000000000
--- a/config/export/field.storage.node.field_weight.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 5dd794b8-ca85-445c-ab58-18870790797b
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: QoIpBeU5nucjrjauYwt_aQtMmHHbFjGrdiZ2gdi23BE
-id: node.field_weight
-field_name: field_weight
-entity_type: node
-type: integer
-settings:
-  unsigned: false
-  size: normal
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes:
-  value:
-    - value
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.node.field_years.yml b/config/export/field.storage.node.field_years.yml
deleted file mode 100644
index 8eacf185c..000000000
--- a/config/export/field.storage.node.field_years.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 0b3b53f7-47a1-4925-a6f1-3ba1d58af893
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - node
-third_party_settings:
-  field_permissions:
-    permission_type: private
-id: node.field_years
-field_name: field_years
-entity_type: node
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_authority_link.yml b/config/export/field.storage.taxonomy_term.field_authority_link.yml
deleted file mode 100644
index b4096a9b9..000000000
--- a/config/export/field.storage.taxonomy_term.field_authority_link.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 5fc8728c-e23d-48f4-b85e-c631550a888f
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-_core:
-  default_config_hash: nH5f6yNsGrvFxsGMbUje8suSzqppfVjgm9UlxdXKt7o
-id: taxonomy_term.field_authority_link
-field_name: field_authority_link
-entity_type: taxonomy_term
-type: authority_link
-settings: {  }
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_broader.yml b/config/export/field.storage.taxonomy_term.field_broader.yml
deleted file mode 100644
index a9ce5c3e7..000000000
--- a/config/export/field.storage.taxonomy_term.field_broader.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: a349740c-0a73-4288-a4ee-5544289b0552
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - link
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_broader
-field_name: field_broader
-entity_type: taxonomy_term
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_cat_date_begin.yml b/config/export/field.storage.taxonomy_term.field_cat_date_begin.yml
deleted file mode 100644
index 317636aa8..000000000
--- a/config/export/field.storage.taxonomy_term.field_cat_date_begin.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: d0901e50-94ae-406c-96e2-28de050d5f15
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - taxonomy
-_core:
-  default_config_hash: QCGvpHzgk8O9UZewTv1kU8_rU3eSsvL9HiRzgL4t6zc
-id: taxonomy_term.field_cat_date_begin
-field_name: field_cat_date_begin
-entity_type: taxonomy_term
-type: edtf
-settings:
-  max_length: 60
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_cat_date_end.yml b/config/export/field.storage.taxonomy_term.field_cat_date_end.yml
deleted file mode 100644
index 60ddc4771..000000000
--- a/config/export/field.storage.taxonomy_term.field_cat_date_end.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: bf78d25e-691c-4614-a5ba-ace6f17b4502
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - taxonomy
-_core:
-  default_config_hash: OqXJ4fGwvIHNhG4jUIwFIhPdQYNQy3Z7I4_hELZskZk
-id: taxonomy_term.field_cat_date_end
-field_name: field_cat_date_end
-entity_type: taxonomy_term
-type: edtf
-settings:
-  max_length: 60
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_corporate_body_alt_name.yml b/config/export/field.storage.taxonomy_term.field_corporate_body_alt_name.yml
deleted file mode 100644
index f9bc08362..000000000
--- a/config/export/field.storage.taxonomy_term.field_corporate_body_alt_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: ad50c731-5a6a-4def-8f39-223df36b7cfc
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_corporate_body_alt_name
-field_name: field_corporate_body_alt_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 1024
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_date.yml b/config/export/field.storage.taxonomy_term.field_date.yml
deleted file mode 100644
index 04d6d6f80..000000000
--- a/config/export/field.storage.taxonomy_term.field_date.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 0d9fdbdf-73c4-4c12-9c46-a90228bea90a
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_date
-field_name: field_date
-entity_type: taxonomy_term
-type: edtf
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_date_of_meeting_or_treaty.yml b/config/export/field.storage.taxonomy_term.field_date_of_meeting_or_treaty.yml
deleted file mode 100644
index 02c95395f..000000000
--- a/config/export/field.storage.taxonomy_term.field_date_of_meeting_or_treaty.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-uuid: 50426b38-975f-4211-b755-8080f9502d7b
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_date_of_meeting_or_treaty
-field_name: field_date_of_meeting_or_treaty
-entity_type: taxonomy_term
-type: edtf
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_external_uri.yml b/config/export/field.storage.taxonomy_term.field_external_uri.yml
deleted file mode 100644
index c183a36ed..000000000
--- a/config/export/field.storage.taxonomy_term.field_external_uri.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: 9a4f09d3-366a-475c-9e13-baa5e2bd76a5
-langcode: en
-status: true
-dependencies:
-  module:
-    - link
-    - taxonomy
-_core:
-  default_config_hash: bOWBQIQagYnQFn4C9S7lRfypHE3qud1D_JIvATUkN4U
-id: taxonomy_term.field_external_uri
-field_name: field_external_uri
-entity_type: taxonomy_term
-type: link
-settings: {  }
-module: link
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_family_name.yml b/config/export/field.storage.taxonomy_term.field_family_name.yml
deleted file mode 100644
index bbc595b66..000000000
--- a/config/export/field.storage.taxonomy_term.field_family_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: bf5329b3-75d8-45af-9c3e-b20ba7f079e2
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_family_name
-field_name: field_family_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_geo_alt_name.yml b/config/export/field.storage.taxonomy_term.field_geo_alt_name.yml
deleted file mode 100644
index 36d78b42d..000000000
--- a/config/export/field.storage.taxonomy_term.field_geo_alt_name.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 40626007-04aa-448c-a47e-c0a539e2753b
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-_core:
-  default_config_hash: WLcVET6eoKzETqgr8XoCY3WP6Jjb6sJECX_uV7Z12DQ
-id: taxonomy_term.field_geo_alt_name
-field_name: field_geo_alt_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_geo_geolocation.yml b/config/export/field.storage.taxonomy_term.field_geo_geolocation.yml
deleted file mode 100644
index 06dab10b2..000000000
--- a/config/export/field.storage.taxonomy_term.field_geo_geolocation.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-uuid: aeb63f6f-26e5-413e-aed2-6ee6566faf90
-langcode: en
-status: true
-dependencies:
-  module:
-    - geolocation
-    - taxonomy
-_core:
-  default_config_hash: 80nHZBgTwoDoX755-SW5qmg4fkeDa1QTpayKXQ4U02g
-id: taxonomy_term.field_geo_geolocation
-field_name: field_geo_geolocation
-entity_type: taxonomy_term
-type: geolocation
-settings: {  }
-module: geolocation
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_location_of_meeting.yml b/config/export/field.storage.taxonomy_term.field_location_of_meeting.yml
deleted file mode 100644
index 9d3133d63..000000000
--- a/config/export/field.storage.taxonomy_term.field_location_of_meeting.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: e71c5be2-2fc9-4c0e-a47d-45b9ee240d38
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_location_of_meeting
-field_name: field_location_of_meeting
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_num_of_section_or_meet.yml b/config/export/field.storage.taxonomy_term.field_num_of_section_or_meet.yml
deleted file mode 100644
index 769dde44c..000000000
--- a/config/export/field.storage.taxonomy_term.field_num_of_section_or_meet.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: c8e990dd-03d8-4240-8566-6904187dd44c
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_num_of_section_or_meet
-field_name: field_num_of_section_or_meet
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_person_alternate_name.yml b/config/export/field.storage.taxonomy_term.field_person_alternate_name.yml
deleted file mode 100644
index 69210d9c8..000000000
--- a/config/export/field.storage.taxonomy_term.field_person_alternate_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: f21a6f4b-970a-44d4-b6e9-f8d38d8871b4
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_person_alternate_name
-field_name: field_person_alternate_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 1024
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_preferred_name_fuller_form.yml b/config/export/field.storage.taxonomy_term.field_preferred_name_fuller_form.yml
deleted file mode 100644
index c2e5c8432..000000000
--- a/config/export/field.storage.taxonomy_term.field_preferred_name_fuller_form.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 9b8f61c6-f1fd-4e62-9521-c01dc00967b8
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_preferred_name_fuller_form
-field_name: field_preferred_name_fuller_form
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_preferred_name_number.yml b/config/export/field.storage.taxonomy_term.field_preferred_name_number.yml
deleted file mode 100644
index 283ca1919..000000000
--- a/config/export/field.storage.taxonomy_term.field_preferred_name_number.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: afb417cb-3574-45d4-9454-9e71637adb0e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_preferred_name_number
-field_name: field_preferred_name_number
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_preferred_name_prefix.yml b/config/export/field.storage.taxonomy_term.field_preferred_name_prefix.yml
deleted file mode 100644
index ace9345d2..000000000
--- a/config/export/field.storage.taxonomy_term.field_preferred_name_prefix.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 054533ad-0a80-4c93-bef3-c74fa9df6834
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_preferred_name_prefix
-field_name: field_preferred_name_prefix
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_preferred_name_rest.yml b/config/export/field.storage.taxonomy_term.field_preferred_name_rest.yml
deleted file mode 100644
index f21eeaa7b..000000000
--- a/config/export/field.storage.taxonomy_term.field_preferred_name_rest.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 901cd1fc-0344-486c-8fd6-cdcb6a4f1e1e
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_preferred_name_rest
-field_name: field_preferred_name_rest
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_preferred_name_suffix.yml b/config/export/field.storage.taxonomy_term.field_preferred_name_suffix.yml
deleted file mode 100644
index e03ecf7dd..000000000
--- a/config/export/field.storage.taxonomy_term.field_preferred_name_suffix.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: ad28b9c5-b9d7-46f2-a60e-1ae5cd097cfc
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_preferred_name_suffix
-field_name: field_preferred_name_suffix
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_primary_name.yml b/config/export/field.storage.taxonomy_term.field_primary_name.yml
deleted file mode 100644
index ade3e1aa2..000000000
--- a/config/export/field.storage.taxonomy_term.field_primary_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 0a1b40bb-93eb-445f-8652-1e7bddd8d94f
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_primary_name
-field_name: field_primary_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_primary_part_of_name.yml b/config/export/field.storage.taxonomy_term.field_primary_part_of_name.yml
deleted file mode 100644
index f4ea88e2f..000000000
--- a/config/export/field.storage.taxonomy_term.field_primary_part_of_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: ebf8e9a7-3016-4443-9050-8e578097b277
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_primary_part_of_name
-field_name: field_primary_part_of_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_relationships.yml b/config/export/field.storage.taxonomy_term.field_relationships.yml
deleted file mode 100644
index 3303c4af7..000000000
--- a/config/export/field.storage.taxonomy_term.field_relationships.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 3a143de5-7b99-492c-aa0f-b33ed74dbed1
-langcode: en
-status: true
-dependencies:
-  module:
-    - controlled_access_terms
-    - taxonomy
-_core:
-  default_config_hash: X-F2wZtHnhZOzc7xL38Rw-dzhZYMi4SQz2KcD77kXD4
-id: taxonomy_term.field_relationships
-field_name: field_relationships
-entity_type: taxonomy_term
-type: typed_relation
-settings:
-  target_type: taxonomy_term
-module: controlled_access_terms
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_subordinate_name.yml b/config/export/field.storage.taxonomy_term.field_subordinate_name.yml
deleted file mode 100644
index 248bf03b6..000000000
--- a/config/export/field.storage.taxonomy_term.field_subordinate_name.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: d08b0bad-1a7d-4044-830e-e3ad15460dad
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_subordinate_name
-field_name: field_subordinate_name
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_title_and_other_words.yml b/config/export/field.storage.taxonomy_term.field_title_and_other_words.yml
deleted file mode 100644
index 12d71c269..000000000
--- a/config/export/field.storage.taxonomy_term.field_title_and_other_words.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 6858043b-ef3a-4cdd-9e1c-a839c94ac57f
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_title_and_other_words
-field_name: field_title_and_other_words
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 255
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_type.yml b/config/export/field.storage.taxonomy_term.field_type.yml
deleted file mode 100644
index d062612bf..000000000
--- a/config/export/field.storage.taxonomy_term.field_type.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-uuid: 1f59eb31-e581-43ff-98cc-33610b2d8970
-langcode: en
-status: true
-dependencies:
-  module:
-    - options
-    - taxonomy
-_core:
-  default_config_hash: ArPIwR6VUNGAq52_61ggns1NWlrPWPTK1DIdIP_2HOI
-id: taxonomy_term.field_type
-field_name: field_type
-entity_type: taxonomy_term
-type: list_string
-settings:
-  allowed_values:
-    -
-      value: 'org:OrganizationalUnit'
-      label: 'Organizational Unit'
-    -
-      value: 'schema:Airline'
-      label: Airline
-    -
-      value: 'schema:Corporation'
-      label: Corporation
-    -
-      value: 'schema:EducationalOrganization'
-      label: 'Educational Organization'
-    -
-      value: 'schema:GovernmentOrganization'
-      label: 'Government Organization'
-    -
-      value: 'schema:LocalBusiness'
-      label: 'Local Business'
-    -
-      value: 'schema:MedicalOrganization'
-      label: 'Medical Organization'
-    -
-      value: 'schema:NGO'
-      label: 'Non-Governmental Organization'
-    -
-      value: 'schema:PerformingGroup'
-      label: 'Performing Group'
-    -
-      value: 'schema:SportsOrganization'
-      label: 'Sports Organization'
-    -
-      value: 'schema:SportsTeam'
-      label: 'Sports Team'
-  allowed_values_function: ''
-module: options
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.taxonomy_term.field_unique_id.yml b/config/export/field.storage.taxonomy_term.field_unique_id.yml
deleted file mode 100644
index c79b44dbc..000000000
--- a/config/export/field.storage.taxonomy_term.field_unique_id.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: b06fd9fb-9b41-4a8f-a9d0-ef59193c43f1
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - taxonomy
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: taxonomy_term.field_unique_id
-field_name: field_unique_id
-entity_type: taxonomy_term
-type: string
-settings:
-  max_length: 128
-  case_sensitive: false
-  is_ascii: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field.storage.user.user_picture.yml b/config/export/field.storage.user.user_picture.yml
deleted file mode 100644
index ea16a8b0b..000000000
--- a/config/export/field.storage.user.user_picture.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: 751eb2fe-4b3c-415c-9586-283795d56464
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - image
-    - user
-_core:
-  default_config_hash: 0q8-mw8y-Ls5I578sIPQFLp4ljpH7WvVYpzY-I9O-8E
-id: user.user_picture
-field_name: user_picture
-entity_type: user
-type: image
-settings:
-  target_type: file
-  display_field: false
-  display_default: false
-  uri_scheme: public
-  default_image:
-    uuid: null
-    alt: ''
-    title: ''
-    width: null
-    height: null
-module: image
-locked: false
-cardinality: 1
-translatable: true
-indexes:
-  target_id:
-    - target_id
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/export/field_ui.settings.yml b/config/export/field_ui.settings.yml
deleted file mode 100644
index 365450f25..000000000
--- a/config/export/field_ui.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: Q1nMi90W6YQxKzZAgJQw7Ag9U4JrsEUwkomF0lhvbIM
-field_prefix: field_
diff --git a/config/export/file.settings.yml b/config/export/file.settings.yml
deleted file mode 100644
index 1ca5bd99c..000000000
--- a/config/export/file.settings.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-_core:
-  default_config_hash: 0aMkoXYnax5_tHI9C9zHs-K48KJ6K75PHtD9x-0nbgM
-description:
-  type: textfield
-  length: 128
-icon:
-  directory: core/modules/file/icons
-make_unused_managed_files_temporary: false
diff --git a/config/export/filehash.settings.yml b/config/export/filehash.settings.yml
deleted file mode 100644
index eaa130638..000000000
--- a/config/export/filehash.settings.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-_core:
-  default_config_hash: IJ_2l62Z0ZwSAl-qPCs6tp0SqmZisIU_RrFPQf8slFg
-algos:
-  blake2b_128: '0'
-  blake2b_160: '0'
-  blake2b_224: '0'
-  blake2b_256: '0'
-  blake2b_384: '0'
-  blake2b_512: '0'
-  md5: '0'
-  sha1: sha1
-  sha224: '0'
-  sha256: '0'
-  sha384: '0'
-  sha512_224: '0'
-  sha512_256: '0'
-  sha512: '0'
-  sha3_224: '0'
-  sha3_256: '0'
-  sha3_384: '0'
-  sha3_512: '0'
-dedupe: 0
-rehash: true
-original: true
-dedupe_original: false
-mime_types: {  }
diff --git a/config/export/filter.format.basic_html.yml b/config/export/filter.format.basic_html.yml
deleted file mode 100644
index ea7bb6c90..000000000
--- a/config/export/filter.format.basic_html.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-uuid: f83fb93b-829d-474c-b092-74f5873643d9
-langcode: en
-status: true
-dependencies:
-  module:
-    - editor
-_core:
-  default_config_hash: P8ddpAIKtawJDi5SzOwCzVnnNYqONewSTJ6Xn0dW_aQ
-name: 'Basic HTML'
-format: basic_html
-weight: 0
-filters:
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: true
-    weight: -10
-    settings:
-      allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <span> <a hreflang href> <blockquote cite> <ul type> <ol type start> <strong> <em> <code> <li> <img src alt height width data-entity-uuid data-entity-type data-caption data-align>'
-      filter_html_help: false
-      filter_html_nofollow: false
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: true
-    weight: 7
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: true
-    weight: 8
-    settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
-  filter_htmlcorrector:
-    id: filter_htmlcorrector
-    provider: filter
-    status: true
-    weight: 10
-    settings: {  }
diff --git a/config/export/filter.format.full_html.yml b/config/export/filter.format.full_html.yml
deleted file mode 100644
index 7e48f8000..000000000
--- a/config/export/filter.format.full_html.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: cdc52974-fd79-4d94-b09a-0f7400162ba4
-langcode: en
-status: true
-dependencies:
-  module:
-    - editor
-_core:
-  default_config_hash: WNeK5FbcY8pXgEpbD_KgRzlF1-5PL3BJXwqaBctPTqw
-name: 'Full HTML'
-format: full_html
-weight: 2
-filters:
-  filter_align:
-    id: filter_align
-    provider: filter
-    status: true
-    weight: 8
-    settings: {  }
-  filter_caption:
-    id: filter_caption
-    provider: filter
-    status: true
-    weight: 9
-    settings: {  }
-  filter_htmlcorrector:
-    id: filter_htmlcorrector
-    provider: filter
-    status: true
-    weight: 10
-    settings: {  }
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 11
-    settings: {  }
-  filter_url:
-    id: filter_url
-    provider: filter
-    status: true
-    weight: 0
-    settings:
-      filter_url_length: 72
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: false
-    weight: -10
-    settings:
-      allowed_html: ''
-      filter_html_help: true
-      filter_html_nofollow: false
diff --git a/config/export/filter.format.plain_text.yml b/config/export/filter.format.plain_text.yml
deleted file mode 100644
index 1282e1266..000000000
--- a/config/export/filter.format.plain_text.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 714aa449-d565-4148-b3d9-e3da10284a95
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: NIKBt6kw_uPhNI0qtR2DnRf7mSOgAQdx7Q94SKMjXbQ
-name: 'Plain text'
-format: plain_text
-weight: 10
-filters:
-  filter_html_escape:
-    id: filter_html_escape
-    provider: filter
-    status: true
-    weight: -10
-    settings: {  }
-  filter_url:
-    id: filter_url
-    provider: filter
-    status: true
-    weight: 0
-    settings:
-      filter_url_length: 72
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: 0
-    settings: {  }
diff --git a/config/export/filter.format.restricted_html.yml b/config/export/filter.format.restricted_html.yml
deleted file mode 100644
index 99a0a10ba..000000000
--- a/config/export/filter.format.restricted_html.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-uuid: e0e0998a-c184-460d-a175-73999a0cbaef
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: oz6NyPDAB4HB6N9hgH2LwNVtCd-sXbMG1fbn5KsRIDI
-name: 'Restricted HTML'
-format: restricted_html
-weight: 1
-filters:
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: true
-    weight: -10
-    settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id>'
-      filter_html_help: true
-      filter_html_nofollow: false
-  filter_autop:
-    id: filter_autop
-    provider: filter
-    status: true
-    weight: 0
-    settings: {  }
-  filter_url:
-    id: filter_url
-    provider: filter
-    status: true
-    weight: 0
-    settings:
-      filter_url_length: 72
diff --git a/config/export/filter.settings.yml b/config/export/filter.settings.yml
deleted file mode 100644
index 9ce293937..000000000
--- a/config/export/filter.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: FiPjM3WdB__ruFA7B6TLwni_UcZbmek5G4b2dxQItxA
-fallback_format: plain_text
-always_show_fallback_choice: false
diff --git a/config/export/group.settings.yml b/config/export/group.settings.yml
deleted file mode 100644
index 911c9f08b..000000000
--- a/config/export/group.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: W0cgFPhPJ3gAdqm06-az48BLf5MVcoZVS0HdByoofi0
-use_admin_theme: true
diff --git a/config/export/hal.settings.yml b/config/export/hal.settings.yml
deleted file mode 100644
index d5156212b..000000000
--- a/config/export/hal.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: YD6v6hkrHtj51mcZHn6s2HulUJHWVZ_D7Y_SllXF6WE
-link_domain: null
diff --git a/config/export/idc_ui_theme_boots.settings.yml b/config/export/idc_ui_theme_boots.settings.yml
deleted file mode 100644
index c6c63cd50..000000000
--- a/config/export/idc_ui_theme_boots.settings.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-_core:
-  default_config_hash: XVyjqKNCH498_gwxI4iS26Liob1z90U28Oaw1CHOJzc
-favicon:
-  use_default: true
-features:
-  comment_user_picture: true
-  comment_user_verification: true
-  favicon: true
-  node_user_picture: true
-logo:
-  use_default: true
-bootstrap_barrio_library: production
-bootstrap_barrio_fluid_container: 1
-bootstrap_barrio_region_clean_top_header: '0'
-bootstrap_barrio_region_class_top_header: row
-bootstrap_barrio_region_clean_top_header_form: '0'
-bootstrap_barrio_region_class_top_header_form: row
-bootstrap_barrio_region_clean_header: '1'
-bootstrap_barrio_region_class_header: ''
-bootstrap_barrio_region_clean_header_form: '0'
-bootstrap_barrio_region_class_header_form: row
-bootstrap_barrio_region_clean_primary_menu: '1'
-bootstrap_barrio_region_class_primary_menu: container_navbar
-bootstrap_barrio_region_clean_secondary_menu: '0'
-bootstrap_barrio_region_class_secondary_menu: row
-bootstrap_barrio_region_clean_page_top: '0'
-bootstrap_barrio_region_class_page_top: row
-bootstrap_barrio_region_clean_page_bottom: '0'
-bootstrap_barrio_region_class_page_bottom: row
-bootstrap_barrio_region_clean_highlighted: '1'
-bootstrap_barrio_region_class_highlighted: ''
-bootstrap_barrio_region_clean_featured_top: '0'
-bootstrap_barrio_region_class_featured_top: featured-top
-bootstrap_barrio_region_clean_breadcrumb: '1'
-bootstrap_barrio_region_class_breadcrumb: ''
-bootstrap_barrio_region_clean_content: '1'
-bootstrap_barrio_region_class_content: content-region
-bootstrap_barrio_region_clean_sidebar_first: '1'
-bootstrap_barrio_region_class_sidebar_first: sidebar-first
-bootstrap_barrio_region_clean_sidebar_second: '1'
-bootstrap_barrio_region_class_sidebar_second: sidebar-second
-bootstrap_barrio_region_clean_featured_bottom_first: '0'
-bootstrap_barrio_region_class_featured_bottom_first: row
-bootstrap_barrio_region_clean_featured_bottom_second: '0'
-bootstrap_barrio_region_class_featured_bottom_second: row
-bootstrap_barrio_region_clean_featured_bottom_third: '0'
-bootstrap_barrio_region_class_featured_bottom_third: row
-bootstrap_barrio_region_clean_footer_first: '0'
-bootstrap_barrio_region_class_footer_first: first_row
-bootstrap_barrio_region_clean_footer_second: '0'
-bootstrap_barrio_region_class_footer_second: second_row
-bootstrap_barrio_region_clean_footer_third: '0'
-bootstrap_barrio_region_class_footer_third: third_row
-bootstrap_barrio_region_clean_footer_fourth: '0'
-bootstrap_barrio_region_class_footer_fourth: forth_row
-bootstrap_barrio_region_clean_footer_fifth: '0'
-bootstrap_barrio_region_class_footer_fifth: fifth_row
-bootstrap_barrio_sidebar_position: both
-bootstrap_barrio_content_offset: 0
-bootstrap_barrio_sidebar_collapse: 0
-bootstrap_barrio_sidebar_first_width: 4
-bootstrap_barrio_sidebar_first_offset: 0
-bootstrap_barrio_sidebar_second_width: 3
-bootstrap_barrio_sidebar_second_offset: 0
-bootstrap_barrio_button: 1
-bootstrap_barrio_button_size: btn-sm
-bootstrap_barrio_button_outline: 0
-bootstrap_barrio_navbar_container: '1'
-bootstrap_barrio_navbar_toggle: navbar-toggleable-md
-bootstrap_barrio_navbar_top_navbar: 1
-bootstrap_barrio_navbar_top_position: ''
-bootstrap_barrio_navbar_top_color: ''
-bootstrap_barrio_navbar_top_background: ''
-bootstrap_barrio_navbar_position: ''
-bootstrap_barrio_navbar_color: navbar-dark
-bootstrap_barrio_navbar_background: ''
-bootstrap_barrio_messages_widget: alerts
-bootstrap_barrio_radio: custom
-bootstrap_barrio_checkbox: switch
-bootstrap_barrio_select: custom
-bootstrap_barrio_file: custom
-bootstrap_barrio_navbar_top_affix: 1
-bootstrap_barrio_navbar_affix: 1
-bootstrap_barrio_sidebar_first_affix: 0
-bootstrap_barrio_sidebar_second_affix: 0
-bootstrap_barrio_scroll_spy: ''
-bootstrap_barrio_google_fonts: Arnhem-Blond
-bootstrap_barrio_icons: fontawesome
-bootstrap_barrio_system_messages: messages_white
-bootstrap_barrio_table_style: table-striped
-bootstrap_barrio_table_hover: 1
-bootstrap_barrio_table_head: ''
-bootstrap_barrio_navbar_top_class: justify-content-center
-bootstrap_barrio_navbar_class: align-items-center
-bootstrap_barrio_bootstrap_icons: 1
diff --git a/config/export/image.settings.yml b/config/export/image.settings.yml
deleted file mode 100644
index b75749097..000000000
--- a/config/export/image.settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: k-yDFHbqNfpe-Srg4sdCSqaosCl2D8uwyEY5esF8gEw
-preview_image: core/modules/image/sample.png
-allow_insecure_derivatives: false
-suppress_itok_output: false
diff --git a/config/export/image.style.large.yml b/config/export/image.style.large.yml
deleted file mode 100644
index 836839873..000000000
--- a/config/export/image.style.large.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: e7864abc-c5ee-4f96-a2cb-6e4cc38caa1a
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: J2n0RpFzS0-bgSyxjs6rSdgxB1rb-bTAgqywNx_964M
-name: large
-label: 'Large (480×480)'
-effects:
-  ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d:
-    uuid: ddd73aa7-4bd6-4c85-b600-bdf2b1628d1d
-    id: image_scale
-    weight: 0
-    data:
-      width: 480
-      height: 480
-      upscale: false
diff --git a/config/export/image.style.max_1300x1300.yml b/config/export/image.style.max_1300x1300.yml
deleted file mode 100644
index 5da9eade4..000000000
--- a/config/export/image.style.max_1300x1300.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 35e5e64d-44b5-4e83-b3ff-54bb2b306df7
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - responsive_image
-_core:
-  default_config_hash: TD595kkS8PAS0v5TKF6ylAqyG4uSO1y52SQqy7zdTIw
-name: max_1300x1300
-label: 'Max 1300x1300'
-effects:
-  04caae9a-fa3e-4ea6-ae09-9c26aec7d308:
-    uuid: 04caae9a-fa3e-4ea6-ae09-9c26aec7d308
-    id: image_scale
-    weight: 1
-    data:
-      width: 1300
-      height: 1300
-      upscale: false
diff --git a/config/export/image.style.max_2600x2600.yml b/config/export/image.style.max_2600x2600.yml
deleted file mode 100644
index 7392ec089..000000000
--- a/config/export/image.style.max_2600x2600.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 57fb5532-865c-4543-98b2-b2d9df1d1b81
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - responsive_image
-_core:
-  default_config_hash: H3gjFlhgZXCVkzP_u0Nzo3HGVu2JtYEEoD4U6fUO6D0
-name: max_2600x2600
-label: 'Max 2600x2600'
-effects:
-  9b311dd1-0351-45a1-9500-cd069e4670cb:
-    uuid: 9b311dd1-0351-45a1-9500-cd069e4670cb
-    id: image_scale
-    weight: 3
-    data:
-      width: 2600
-      height: 2600
-      upscale: false
diff --git a/config/export/image.style.max_325x325.yml b/config/export/image.style.max_325x325.yml
deleted file mode 100644
index 2e6108d70..000000000
--- a/config/export/image.style.max_325x325.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 4213babb-f5e4-4811-bdc0-31682a88bb0b
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - responsive_image
-_core:
-  default_config_hash: HAJh3VFnKZmYvJF2Rsnc2HETYtffmXFcQr2FhVPmnSU
-name: max_325x325
-label: 'Max 325x325'
-effects:
-  cb842cc8-682f-42a6-bd05-5a1ac726f0d8:
-    uuid: cb842cc8-682f-42a6-bd05-5a1ac726f0d8
-    id: image_scale
-    weight: 1
-    data:
-      width: 325
-      height: 325
-      upscale: false
diff --git a/config/export/image.style.max_650x650.yml b/config/export/image.style.max_650x650.yml
deleted file mode 100644
index 0a21d0d80..000000000
--- a/config/export/image.style.max_650x650.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 491e7efb-e257-446d-aae3-9c197c63a999
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - responsive_image
-_core:
-  default_config_hash: 5_u-TI6Qt78YQWl3DxbMBYKuCScEXKSeXTm8Jyl3eds
-name: max_650x650
-label: 'Max 650x650'
-effects:
-  949c201a-77f5-48f6-ba00-be91eb1aad47:
-    uuid: 949c201a-77f5-48f6-ba00-be91eb1aad47
-    id: image_scale
-    weight: 1
-    data:
-      width: 650
-      height: 650
-      upscale: false
diff --git a/config/export/image.style.medium.yml b/config/export/image.style.medium.yml
deleted file mode 100644
index af149f25a..000000000
--- a/config/export/image.style.medium.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: f2a3fed4-a2bb-44aa-8732-94ca6864944a
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Y9NmnZHQq20ASSyTNA6JnwtWrJJiSajOehGDtmUFdM0
-name: medium
-label: 'Medium (220×220)'
-effects:
-  bddf0d06-42f9-4c75-a700-a33cafa25ea0:
-    uuid: bddf0d06-42f9-4c75-a700-a33cafa25ea0
-    id: image_scale
-    weight: 0
-    data:
-      width: 220
-      height: 220
-      upscale: false
diff --git a/config/export/image.style.thumbnail.yml b/config/export/image.style.thumbnail.yml
deleted file mode 100644
index 89b1be24d..000000000
--- a/config/export/image.style.thumbnail.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: 1d31429b-2ab4-4bda-b754-131c6bc98f55
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: cCiWdBHgLwj5omG35lsKc4LkW4MBdmcctkVop4ol5x0
-name: thumbnail
-label: 'Thumbnail (100×100)'
-effects:
-  1cfec298-8620-4749-b100-ccb6c4500779:
-    uuid: 1cfec298-8620-4749-b100-ccb6c4500779
-    id: image_scale
-    weight: 0
-    data:
-      width: 100
-      height: 100
-      upscale: false
diff --git a/config/export/image.style.wide.yml b/config/export/image.style.wide.yml
deleted file mode 100644
index e9fa78abd..000000000
--- a/config/export/image.style.wide.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: 4fdbf0ab-3e09-43a5-b5ca-2db2534b7db3
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: LswCVLg8z4Zk1u6pV1Dpj1qUj5YY2CQ7_ojx7bJQ8qk
-name: wide
-label: 'Wide (1090)'
-effects:
-  09959c15-59ce-4f6d-90df-e2d7cf32bce5:
-    uuid: 09959c15-59ce-4f6d-90df-e2d7cf32bce5
-    id: image_scale
-    weight: 1
-    data:
-      width: 1090
-      height: null
-      upscale: false
diff --git a/config/export/islandora.settings.yml b/config/export/islandora.settings.yml
deleted file mode 100644
index 8f068bf42..000000000
--- a/config/export/islandora.settings.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-_core:
-  default_config_hash: XgeYJpPmZIOwE_nA73tYvFw-Rcj-HtlbNwfktqSVsaQ
-broker_url: 'tcp://activemq:61613'
-jwt_expiry: '+2 hour'
-delete_media_and_files: true
-upload_form_location: ''
-upload_form_allowed_mimetypes: ''
-gemini_url: ''
-gemini_pseudo_bundles:
-  'collection_object:node': 'collection_object:node'
-  'islandora_object:node': 'islandora_object:node'
-  'audio:media': 'audio:media'
-  'file:media': 'file:media'
-  'image:media': 'image:media'
-  'video:media': 'video:media'
diff --git a/config/export/islandora_advanced_search.settings.yml b/config/export/islandora_advanced_search.settings.yml
deleted file mode 100755
index 50cf62950..000000000
--- a/config/export/islandora_advanced_search.settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-search_query_parameter: a
-search_recursive_parameter: r
-search_add_operator: +
-search_remove_operator: '-'
-facet_truncate: '32'
diff --git a/config/export/islandora_breadcrumbs.breadcrumbs.yml b/config/export/islandora_breadcrumbs.breadcrumbs.yml
deleted file mode 100644
index 455041720..000000000
--- a/config/export/islandora_breadcrumbs.breadcrumbs.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-_core:
-  default_config_hash: p424-t2jPYKOLgjMqdWrVjbfAlvdkSGiSydbVfle7P8
-maxDepth: -1
-includeSelf: false
-referenceFields:
-  - field_member_of
-dependencies:
-  module:
-    - islandora
-  enforced:
-    module:
-      - islandora_breadcrumbs
diff --git a/config/export/islandora_iiif.settings.yml b/config/export/islandora_iiif.settings.yml
deleted file mode 100644
index c16ba69f3..000000000
--- a/config/export/islandora_iiif.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: NCzOnzkSw_H5SbPJb-EOzzJby1pQ8JI6IzZJckM7WOU
-iiif_server: 'https://islandora.traefik.me/cantaloupe/iiif/2'
diff --git a/config/export/jsonld.settings.yml b/config/export/jsonld.settings.yml
deleted file mode 100644
index 34f461065..000000000
--- a/config/export/jsonld.settings.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-_core:
-  default_config_hash: RV3MdVvGb7GuPc7Zp_1E-2SrX-dNWP4159T9SL5MXwA
-remove_jsonld_format: true
-rdf_namespaces:
-  -
-    prefix: ldp
-    namespace: 'http://www.w3.org/ns/ldp#'
-  -
-    prefix: dc11
-    namespace: 'http://purl.org/dc/elements/1.1/'
-  -
-    prefix: dcterms
-    namespace: 'http://purl.org/dc/terms/'
-  -
-    prefix: nfo
-    namespace: 'http://www.semanticdesktop.org/ontologies/2007/03/22/nfo/v1.1/'
-  -
-    prefix: ebucore
-    namespace: 'http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#'
-  -
-    prefix: fedora
-    namespace: 'http://fedora.info/definitions/v4/repository#'
-  -
-    prefix: owl
-    namespace: 'http://www.w3.org/2002/07/owl#'
-  -
-    prefix: ore
-    namespace: 'http://www.openarchives.org/ore/terms/'
-  -
-    prefix: rdf
-    namespace: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
-  -
-    prefix: rdau
-    namespace: 'http://rdaregistry.info/Elements/u/'
-  -
-    prefix: islandora
-    namespace: 'http://islandora.ca/'
-  -
-    prefix: pcdm
-    namespace: 'http://pcdm.org/models#'
-  -
-    prefix: use
-    namespace: 'http://pcdm.org/use#'
-  -
-    prefix: iana
-    namespace: 'http://www.iana.org/assignments/relation/'
-  -
-    prefix: premis
-    namespace: 'http://www.loc.gov/premis/rdf/v1#'
-  -
-    prefix: premis3
-    namespace: 'http://www.loc.gov/premis/rdf/v3/'
-  -
-    prefix: co
-    namespace: 'http://purl.org/co/'
-  -
-    prefix: relators
-    namespace: 'http://id.loc.gov/vocabulary/relators/'
diff --git a/config/export/jwt.config.yml b/config/export/jwt.config.yml
deleted file mode 100644
index 49199f09e..000000000
--- a/config/export/jwt.config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-algorithm: RS256
-key_id: islandora_rsa_key
diff --git a/config/export/key.key.islandora_rsa_key.yml b/config/export/key.key.islandora_rsa_key.yml
deleted file mode 100644
index 9e75e6f06..000000000
--- a/config/export/key.key.islandora_rsa_key.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: 7f805322-14df-4eac-bfa1-d2f800fccbe3
-langcode: en
-status: true
-dependencies:
-  module:
-    - jwt
-id: islandora_rsa_key
-label: 'Islandora RSA Key'
-description: ''
-key_type: jwt_rs
-key_type_settings:
-  algorithm: RS256
-key_provider: file
-key_provider_settings:
-  file_location: /opt/keys/jwt/private.key
-key_input: none
-key_input_settings: {  }
diff --git a/config/export/language.content_settings.media.audio.yml b/config/export/language.content_settings.media.audio.yml
deleted file mode 100644
index 0565123fd..000000000
--- a/config/export/language.content_settings.media.audio.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 907a616d-ba94-43d2-ae7a-3ab04bd47065
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: DZLni0SgBCXYdR_oKEAOCWRkz1dJKA_nE-hvjhT5cW4
-id: media.audio
-target_entity_type_id: media
-target_bundle: audio
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.media.extracted_text.yml b/config/export/language.content_settings.media.extracted_text.yml
deleted file mode 100644
index 750f911ad..000000000
--- a/config/export/language.content_settings.media.extracted_text.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: affe666e-745d-4ab5-80fa-4821209561ba
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.extracted_text
-_core:
-  default_config_hash: Sho24q3VnqeUBg62y66W5yjse20gWWa8_OO9xLUSmtI
-id: media.extracted_text
-target_entity_type_id: media
-target_bundle: extracted_text
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.media.file.yml b/config/export/language.content_settings.media.file.yml
deleted file mode 100644
index a6fff5526..000000000
--- a/config/export/language.content_settings.media.file.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 07c40f8c-81b6-43f6-8181-ff5ba32ea56c
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: aCkQI8ssVei8iyMPbCTGJPnZ2UgNS_xEFqH8VZaooXM
-id: media.file
-target_entity_type_id: media
-target_bundle: file
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.media.image.yml b/config/export/language.content_settings.media.image.yml
deleted file mode 100644
index e0725ab94..000000000
--- a/config/export/language.content_settings.media.image.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 32d67f0b-1247-4b93-abd8-d2afb4c45993
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: lGwuf1Aei2zu_IYIpC6QskVSbIkWO3Nb1NpIOqR6qrI
-id: media.image
-target_entity_type_id: media
-target_bundle: image
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.media.video.yml b/config/export/language.content_settings.media.video.yml
deleted file mode 100644
index e29cc849d..000000000
--- a/config/export/language.content_settings.media.video.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: a25fe1e6-db59-498b-adc0-33b9cd81f569
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: bjtAS1FFRImERWfi1Jdp1pyt2pkHj8jflHED_yLWZco
-id: media.video
-target_entity_type_id: media
-target_bundle: video
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.node.collection_object.yml b/config/export/language.content_settings.node.collection_object.yml
deleted file mode 100644
index 8f72dfb65..000000000
--- a/config/export/language.content_settings.node.collection_object.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: c3405d7a-f3ac-4e09-99c3-10d55e49ae95
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.collection_object
-id: node.collection_object
-target_entity_type_id: node
-target_bundle: collection_object
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.node.islandora_object.yml b/config/export/language.content_settings.node.islandora_object.yml
deleted file mode 100644
index 22fa26327..000000000
--- a/config/export/language.content_settings.node.islandora_object.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: ca0edac3-2af9-4ece-8646-417b0e2e7ca8
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: dlth0MnoDnOdmWSYGWXu2SO1wC_-JryE3tUYpw5TrWA
-id: node.islandora_object
-target_entity_type_id: node
-target_bundle: islandora_object
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.path_alias.path_alias.yml b/config/export/language.content_settings.path_alias.path_alias.yml
deleted file mode 100644
index 6632626c5..000000000
--- a/config/export/language.content_settings.path_alias.path_alias.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 7ef95fc7-a014-4896-a11b-ee26ac434748
-langcode: en
-status: true
-dependencies:
-  module:
-    - path_alias
-_core:
-  default_config_hash: dhjFABRzm52DkRXnYja5ZoHwjY0R3gEGic3KpDUXgRo
-id: path_alias.path_alias
-target_entity_type_id: path_alias
-target_bundle: path_alias
-default_langcode: und
-language_alterable: true
diff --git a/config/export/language.content_settings.taxonomy_term.copyright_and_use.yml b/config/export/language.content_settings.taxonomy_term.copyright_and_use.yml
deleted file mode 100644
index 25ab1ddef..000000000
--- a/config/export/language.content_settings.taxonomy_term.copyright_and_use.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: f2a1b73b-e4a1-463c-b839-b6c76789b2f8
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.copyright_and_use
-id: taxonomy_term.copyright_and_use
-target_entity_type_id: taxonomy_term
-target_bundle: copyright_and_use
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.corporate_body.yml b/config/export/language.content_settings.taxonomy_term.corporate_body.yml
deleted file mode 100644
index 1b8ad1dd8..000000000
--- a/config/export/language.content_settings.taxonomy_term.corporate_body.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 44770722-ab1b-4625-92d9-a738aacf18da
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: 1SOV1V5WQX0hepAsVvNtOpR2Ce1s4OxckNT3nYAEyks
-id: taxonomy_term.corporate_body
-target_entity_type_id: taxonomy_term
-target_bundle: corporate_body
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.country.yml b/config/export/language.content_settings.taxonomy_term.country.yml
deleted file mode 100644
index 3556cfc2f..000000000
--- a/config/export/language.content_settings.taxonomy_term.country.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 7b14c0c9-fd8e-4a7b-9de1-b0276a27e6b3
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.country
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: 86_PvmnjlIAH5ePzWzWLITBDctSQX5yr25xaDs9UUCw
-id: taxonomy_term.country
-target_entity_type_id: taxonomy_term
-target_bundle: country
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.taxonomy_term.family.yml b/config/export/language.content_settings.taxonomy_term.family.yml
deleted file mode 100644
index 74a9c3e90..000000000
--- a/config/export/language.content_settings.taxonomy_term.family.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: b9a8a1a2-d1dd-484b-8b6c-131b6843491f
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.family
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: d46aG1upnevhsHnX9C5ivYnn5AoZLcPlsc8m7tbBhdc
-id: taxonomy_term.family
-target_entity_type_id: taxonomy_term
-target_bundle: family
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.frequencies.yml b/config/export/language.content_settings.taxonomy_term.frequencies.yml
deleted file mode 100644
index 69e461d7d..000000000
--- a/config/export/language.content_settings.taxonomy_term.frequencies.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 0a7b4cb9-47fa-45c7-b181-c6af39e1be0a
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.frequencies
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: ovbXjB8Upa3S-JWM0CW3gpDcGbAf2xcG83puKTDkS7Q
-id: taxonomy_term.frequencies
-target_entity_type_id: taxonomy_term
-target_bundle: frequencies
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.genre.yml b/config/export/language.content_settings.taxonomy_term.genre.yml
deleted file mode 100644
index aafad8e13..000000000
--- a/config/export/language.content_settings.taxonomy_term.genre.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: e959f96a-ac3b-4d52-be5a-0360376aeefe
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.genre
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: VmdFEQO4U_VCnBRprfVgzug_lf2GaieXc9xp8iUR8eE
-id: taxonomy_term.genre
-target_entity_type_id: taxonomy_term
-target_bundle: genre
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.taxonomy_term.geo_location.yml b/config/export/language.content_settings.taxonomy_term.geo_location.yml
deleted file mode 100644
index 23909d568..000000000
--- a/config/export/language.content_settings.taxonomy_term.geo_location.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 8386c124-bd82-44e3-9442-4b5450ed7298
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.geo_location
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: 0_hEJhLmynz6bRW7K1PV9MYWxOpG7cPIQyAdYH-R_7Y
-id: taxonomy_term.geo_location
-target_entity_type_id: taxonomy_term
-target_bundle: geo_location
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.islandora_media_use.yml b/config/export/language.content_settings.taxonomy_term.islandora_media_use.yml
deleted file mode 100644
index fa4786c8e..000000000
--- a/config/export/language.content_settings.taxonomy_term.islandora_media_use.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 6e8fe75f-4773-4326-a08d-c9e585b35f6a
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.islandora_media_use
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: IcYqNobymhiOYqA31-VNlmGGX8qXXAn6LCIlPOzCGBs
-id: taxonomy_term.islandora_media_use
-target_entity_type_id: taxonomy_term
-target_bundle: islandora_media_use
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.islandora_models.yml b/config/export/language.content_settings.taxonomy_term.islandora_models.yml
deleted file mode 100644
index 8dd78cd3e..000000000
--- a/config/export/language.content_settings.taxonomy_term.islandora_models.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 444339f1-5387-4fef-8351-faad728573d3
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: YcNy7Z5RBapXnKgiaqJ7xiBiTJghE8ygbn1VpF2ywQE
-id: taxonomy_term.islandora_models
-target_entity_type_id: taxonomy_term
-target_bundle: islandora_models
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.issuance_modes.yml b/config/export/language.content_settings.taxonomy_term.issuance_modes.yml
deleted file mode 100644
index d05cda442..000000000
--- a/config/export/language.content_settings.taxonomy_term.issuance_modes.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 0fbe6e0b-7b45-44d2-acc9-89d6aae29399
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.issuance_modes
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: ZZp5R5GMUDvE_eoHBMhk3hNdShNxKk8K7MxI-fdsWJs
-id: taxonomy_term.issuance_modes
-target_entity_type_id: taxonomy_term
-target_bundle: issuance_modes
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.language.yml b/config/export/language.content_settings.taxonomy_term.language.yml
deleted file mode 100644
index aff28ae8e..000000000
--- a/config/export/language.content_settings.taxonomy_term.language.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 6469bb26-959f-4a7c-ae51-3bbfa88a62f8
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.language
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: ckktwu_FNxiRmdnvLsM_WaXP7AJjxiAAFoUYLx0HyhI
-id: taxonomy_term.language
-target_entity_type_id: taxonomy_term
-target_bundle: language
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.taxonomy_term.person.yml b/config/export/language.content_settings.taxonomy_term.person.yml
deleted file mode 100644
index 7d6e03b18..000000000
--- a/config/export/language.content_settings.taxonomy_term.person.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 54548014-de95-4533-bf3c-aecfa764d9bf
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.person
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: R7wsdiUn_Lk7ALc3lLrXwjgo649xSo1uWg3IpX55590
-id: taxonomy_term.person
-target_entity_type_id: taxonomy_term
-target_bundle: person
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.physical_form.yml b/config/export/language.content_settings.taxonomy_term.physical_form.yml
deleted file mode 100644
index 257c9ea75..000000000
--- a/config/export/language.content_settings.taxonomy_term.physical_form.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: d785065b-ea4c-40a1-9aed-3fec14293722
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.physical_form
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-    bundle_settings:
-      untranslatable_fields_hide: '0'
-_core:
-  default_config_hash: 0RHeG2Cn7KEJ6VRp4qz7A5gTLvPYOTMIHCeZXwZSpPM
-id: taxonomy_term.physical_form
-target_entity_type_id: taxonomy_term
-target_bundle: physical_form
-default_langcode: site_default
-language_alterable: true
diff --git a/config/export/language.content_settings.taxonomy_term.resource_types.yml b/config/export/language.content_settings.taxonomy_term.resource_types.yml
deleted file mode 100644
index 7372fe81e..000000000
--- a/config/export/language.content_settings.taxonomy_term.resource_types.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: db3601a6-db9c-44ad-ac7a-fd22b50963f3
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.resource_types
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: gy9shP9s9yiWw3M06HQAMxq3XFJGK1c8gzpKCjDD79M
-id: taxonomy_term.resource_types
-target_entity_type_id: taxonomy_term
-target_bundle: resource_types
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.subject.yml b/config/export/language.content_settings.taxonomy_term.subject.yml
deleted file mode 100644
index 2c13207d5..000000000
--- a/config/export/language.content_settings.taxonomy_term.subject.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 03815dc4-98e5-452c-bccc-1e6517a6ed21
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.subject
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: 4VkdRSmMXrSQeHdN9Gr8fgn0Pc15O0zqETCWmxK7qF0
-id: taxonomy_term.subject
-target_entity_type_id: taxonomy_term
-target_bundle: subject
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.content_settings.taxonomy_term.temporal_subjects.yml b/config/export/language.content_settings.taxonomy_term.temporal_subjects.yml
deleted file mode 100644
index 2c7ce6b93..000000000
--- a/config/export/language.content_settings.taxonomy_term.temporal_subjects.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 958ce406-eaf2-4049-bcec-8dbaba35eccb
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.temporal_subjects
-  module:
-    - content_translation
-third_party_settings:
-  content_translation:
-    enabled: true
-_core:
-  default_config_hash: dlg33d7K_CnBjAljzvxsN6z_URTCpFONnT7MlRyhUR8
-id: taxonomy_term.temporal_subjects
-target_entity_type_id: taxonomy_term
-target_bundle: temporal_subjects
-default_langcode: site_default
-language_alterable: false
diff --git a/config/export/language.entity.en.yml b/config/export/language.entity.en.yml
deleted file mode 100644
index daa5aa95f..000000000
--- a/config/export/language.entity.en.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: 6d1d3cd1-b270-4b6d-ab13-8a247466758b
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: lBXDpdDPXQtrfTJQhr6MjRJJEEyYSoRJ0acdvHLsWeA
-id: en
-label: English
-direction: ltr
-weight: 0
-locked: false
diff --git a/config/export/language.entity.und.yml b/config/export/language.entity.und.yml
deleted file mode 100644
index 157788032..000000000
--- a/config/export/language.entity.und.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: 2368a3b1-8898-4645-8356-0f8d87980fac
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: eNX6lLCKDaY83nCMh20My---y03KbiFlv802DKCCpvg
-id: und
-label: 'Not specified'
-direction: ltr
-weight: 2
-locked: true
diff --git a/config/export/language.entity.zxx.yml b/config/export/language.entity.zxx.yml
deleted file mode 100644
index c27b8bc56..000000000
--- a/config/export/language.entity.zxx.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: 9e17cdea-6ca2-41b1-8b3a-5e0bf93bf054
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 35CefWbnzaiytcg3acexxz_GTvuwIjYd_ZTcmmR-tXA
-id: zxx
-label: 'Not applicable'
-direction: ltr
-weight: 3
-locked: true
diff --git a/config/export/language.mappings.yml b/config/export/language.mappings.yml
deleted file mode 100644
index bdfaae28d..000000000
--- a/config/export/language.mappings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-_core:
-  default_config_hash: EMWe7Yu4Q5eD-NUfNuQAWGBvYUNZPIinztEtONSmsDc
-map:
-  'no': nb
-  pt: pt-pt
-  zh: zh-hans
-  zh-tw: zh-hant
-  zh-hk: zh-hant
-  zh-mo: zh-hant
-  zh-cht: zh-hant
-  zh-cn: zh-hans
-  zh-sg: zh-hans
-  zh-chs: zh-hans
diff --git a/config/export/language.negotiation.yml b/config/export/language.negotiation.yml
deleted file mode 100644
index eb24579fa..000000000
--- a/config/export/language.negotiation.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-_core:
-  default_config_hash: uEePITI9tV6WqzmsTb7MfPCi5yPWXSxAN1xeLcYFQbM
-session:
-  parameter: language
-url:
-  source: path_prefix
-  prefixes:
-    en: ''
-    '': null
-  domains:
-    en: ''
-selected_langcode: site_default
diff --git a/config/export/language.types.yml b/config/export/language.types.yml
deleted file mode 100644
index ae2c01c61..000000000
--- a/config/export/language.types.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-_core:
-  default_config_hash: dqouFqVseNJNvEjsoYKxbinFOITuCxYhi4y2OTNQP_8
-all:
-  - language_interface
-  - language_content
-  - language_url
-configurable:
-  - language_interface
-negotiation:
-  language_content:
-    enabled:
-      language-interface: 0
-    method_weights:
-      language-content-entity: -9
-      language-url: -8
-      language-session: -6
-      language-user: -4
-      language-browser: -2
-      language-interface: 9
-      language-selected: 12
-  language_url:
-    enabled:
-      language-url: 0
-      language-url-fallback: 1
-  language_interface:
-    enabled:
-      language-url: -8
-      language-selected: 12
-    method_weights:
-      language-user-admin: -10
-      language-url: -8
-      language-session: -6
-      language-user: -4
-      language-browser: -2
-      language-selected: 12
diff --git a/config/export/matomo.settings.yml b/config/export/matomo.settings.yml
deleted file mode 100644
index 351366fb4..000000000
--- a/config/export/matomo.settings.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-_core:
-  default_config_hash: mKwnhF-0ryfftZZP6jyqW8q9MEo9glyRkvRzSddrc0k
-site_id: '1'
-url_http: 'http://islandora.traefik.me/matomo/'
-url_https: 'https://islandora.traefik.me/matomo/'
-domain_mode: 0
-visibility:
-  request_path_mode: 0
-  request_path_pages: "/admin\r\n/admin/*\r\n/batch\r\n/node/add*\r\n/node/*/*\r\n/user/*/*"
-  user_role_mode: 0
-  user_role_roles: {  }
-  user_account_mode: 1
-track:
-  mailto: true
-  files: true
-  files_extensions: '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip'
-  colorbox: true
-  userid: false
-  messages: {  }
-  site_search: false
-privacy:
-  donottrack: true
-  disablecookies: false
-custom:
-  variable:
-    1:
-      slot: 1
-      name: ''
-      value: ''
-      scope: visit
-    2:
-      slot: 2
-      name: ''
-      value: ''
-      scope: visit
-    3:
-      slot: 3
-      name: ''
-      value: ''
-      scope: visit
-    4:
-      slot: 4
-      name: ''
-      value: ''
-      scope: visit
-    5:
-      slot: 5
-      name: ''
-      value: ''
-      scope: visit
-codesnippet:
-  before: ''
-  after: ''
-translation_set: false
-disable_tracking: true
-cache: false
-page_title_hierarchy: false
-page_title_hierarchy_exclude_home: true
-status_codes_disabled: {  }
diff --git a/config/export/media.settings.yml b/config/export/media.settings.yml
deleted file mode 100644
index bd043be82..000000000
--- a/config/export/media.settings.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-_core:
-  default_config_hash: PlWtVQXY5oKYZqCMPXh6SPamXagn5BoZqgAI8EY9WsY
-icon_base_uri: 'public://media-icons/generic'
-iframe_domain: ''
-oembed_providers_url: 'https://oembed.com/providers.json'
-standalone_url: true
diff --git a/config/export/media.type.audio.yml b/config/export/media.type.audio.yml
deleted file mode 100644
index 377d61655..000000000
--- a/config/export/media.type.audio.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 8603fb90-4c4e-4961-8b2f-c6921ab79f6e
-langcode: en
-status: true
-dependencies: null
-_core:
-  default_config_hash: Y7QeW6smKPA0t7mYNd7aMGeNUxRMWD4b6P1pQVdZco0
-id: audio
-label: Audio
-description: 'An audio file.'
-source: audio_file
-queue_thumbnail_downloads: false
-new_revision: true
-source_configuration:
-  source_field: field_media_audio_file
-field_map:
-  name: name
-  mimetype: field_mime_type
-  filesize: field_file_size
diff --git a/config/export/media.type.document.yml b/config/export/media.type.document.yml
deleted file mode 100644
index e13b938c2..000000000
--- a/config/export/media.type.document.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: f3a7bd28-2d40-4456-bbd9-e5634e5da0ef
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: wpcgALGAQfGhCw7pgdQSZxjlBOoRFL_RDDYQhy7djFk
-id: document
-label: Document
-description: 'PDF and other document files.'
-source: file
-queue_thumbnail_downloads: false
-new_revision: true
-source_configuration:
-  source_field: field_media_document
-field_map:
-  name: name
-  mimetype: field_mime_type
-  filesize: field_file_size
diff --git a/config/export/media.type.extracted_text.yml b/config/export/media.type.extracted_text.yml
deleted file mode 100644
index cc5401767..000000000
--- a/config/export/media.type.extracted_text.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 1955bf52-9e79-44be-9f96-3c294a61f0bf
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 7edmyTt1PdM_GSgH8qEVWCMgJcZj2T8RhJ0gTXI7h90
-id: extracted_text
-label: 'Extracted Text'
-description: 'Text extracted from Images or PDFs'
-source: file
-queue_thumbnail_downloads: false
-new_revision: false
-source_configuration:
-  source_field: field_media_file
-field_map: {  }
diff --git a/config/export/media.type.file.yml b/config/export/media.type.file.yml
deleted file mode 100644
index 214f7fc82..000000000
--- a/config/export/media.type.file.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 5735b9e3-9516-4d98-9b30-66ee575a242c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: KrUBOHEWbkoHy55uCMBHYp9jvZ1PZ6xlmeLnp54NXOk
-id: file
-label: File
-description: 'Files that do not fit into other types listed here. Also use for TIFFs and JP2s.'
-source: file
-queue_thumbnail_downloads: false
-new_revision: true
-source_configuration:
-  source_field: field_media_file
-field_map:
-  name: name
-  mimetype: field_mime_type
-  filesize: field_file_size
diff --git a/config/export/media.type.fits_technical_metadata.yml b/config/export/media.type.fits_technical_metadata.yml
deleted file mode 100644
index 8c9bbeff7..000000000
--- a/config/export/media.type.fits_technical_metadata.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 7bbafffd-2d3f-46f4-9f5b-fc24964ed0d7
-langcode: en
-status: true
-dependencies: null
-_core:
-  default_config_hash: Xf1Sv8e4LYwnDJEyZXzwfkPkiCUno_c1oDIaz1KeNjc
-id: fits_technical_metadata
-label: 'FITS Technical metadata'
-description: 'Display of transformed FITS xml'
-source: file
-queue_thumbnail_downloads: false
-new_revision: false
-source_configuration:
-  source_field: field_media_file
-field_map:
-  name: name
-  mimetype: field_mime_type
-  filesize: field_file_size
diff --git a/config/export/media.type.image.yml b/config/export/media.type.image.yml
deleted file mode 100644
index 945f2ee60..000000000
--- a/config/export/media.type.image.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 1c1a986f-845e-40d9-ac3c-7478fc633ea0
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: mZCXfSxFVxcMkVMRAc7OwCRefT2wN1x-o4zNPvPg_64
-id: image
-label: Image
-description: 'An image file (other than TIFF and JP2 formats). Use "File" for TIFF or JP2 files.'
-source: image
-queue_thumbnail_downloads: true
-new_revision: true
-source_configuration:
-  source_field: field_media_image
-field_map:
-  name: name
-  mimetype: field_mime_type
-  filesize: field_file_size
-  width: field_width
-  height: field_height
diff --git a/config/export/media.type.remote_video.yml b/config/export/media.type.remote_video.yml
deleted file mode 100644
index df1248aa2..000000000
--- a/config/export/media.type.remote_video.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 2f83f240-f01f-436c-a0de-ecbaa0a4d65c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: hIBTnDGgDKnCiP6HUZm1m7600DHUEpC6FN3LQ4sUgZ4
-id: remote_video
-label: 'Remote video'
-description: 'A remotely hosted video from YouTube or Vimeo.'
-source: 'oembed:video'
-queue_thumbnail_downloads: false
-new_revision: true
-source_configuration:
-  source_field: field_media_oembed_video
-  thumbnails_directory: 'public://oembed_thumbnails/[date:custom:Y-m]'
-  providers:
-    - YouTube
-    - Vimeo
-field_map:
-  title: name
diff --git a/config/export/media.type.video.yml b/config/export/media.type.video.yml
deleted file mode 100644
index b2f6f05ec..000000000
--- a/config/export/media.type.video.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: c8afa8cb-8157-4a64-88a4-52061036d04d
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: iChqZUHWKZPuvvQVJ4Wqfq6EcS_nGnNYR0NpF0amKtE
-id: video
-label: Video
-description: 'A video file.'
-source: video_file
-queue_thumbnail_downloads: false
-new_revision: true
-source_configuration:
-  source_field: field_media_video_file
-field_map:
-  name: name
-  mimetype: field_mime_type
-  filesize: field_file_size
diff --git a/config/export/menu_ui.settings.yml b/config/export/menu_ui.settings.yml
deleted file mode 100644
index 0b987fa3b..000000000
--- a/config/export/menu_ui.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: SqMarzIjxC3F8dZo9FEOxfqDKD_sdW1tbcFTV1BA2zU
-override_parent_selector: false
diff --git a/config/export/migrate_plus.migration.idc_default_migration_menu_link_main.yml b/config/export/migrate_plus.migration.idc_default_migration_menu_link_main.yml
deleted file mode 100644
index 2af1a9c3f..000000000
--- a/config/export/migrate_plus.migration.idc_default_migration_menu_link_main.yml
+++ /dev/null
@@ -1,99 +0,0 @@
-uuid: b1f80daf-542a-40ae-8e55-8c5e56d59974
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: rUm7Y2oQpBEgPZqFpJrq84N-qXhWddKZNKulluOtosQ
-id: idc_default_migration_menu_link_main
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags: null
-migration_group: idc_initial_setup
-label: 'Create main menu links'
-source:
-  plugin: embedded_data
-  data_rows:
-    -
-      id: 2
-      title: 'Sheridan Libraries'
-      menu_name: main
-      link: 'http://library.jhu.edu'
-      description: 'Search for books, music, films, and more from JHU and other libraries. Catalyst. Catalyst. WorldCat. Search Catalyst Advanced Search - Catalyst.'
-      weight: 2
-      expanded: 0
-    -
-      id: 3
-      title: 'Welch Medical Library'
-      menu_name: main
-      link: 'http://welch.jhmi.edu'
-      description: 'Welch Medical Library serves the information needs of the faculty, staff, and students of Johns Hopkins Medicine, Nursing and Public Health.'
-      weight: 3
-      expanded: 1
-    -
-      id: 4
-      title: 'SAIS Library'
-      menu_name: main
-      link: 'http://www.sais-jhu.edu/atoz/mason-library-washington-dc'
-      description: 'Mason Library provides services, collections, and technologies that support the Johns Hopkins SAIS community.'
-      weight: 4
-      expanded: 1
-    -
-      id: 5
-      title: 'Friedheim Music Library'
-      menu_name: main
-      link: 'https://musiclibrary.peabody.jhu.edu'
-      description: 'The Arthur Friedheim Music Library serves the faculty, staff, and students of the two divisions of the Peabody Institute (the Conservatory and the Preparatory) and Johns Hopkins University, as well as the general public.'
-      weight: 5
-      expanded: 1
-    -
-      id: 6
-      title: 'APL Library'
-      menu_name: main
-      link: 'https://www.jhuapl.edu/Library/'
-      description: 'Johns Hopkins Applied Physics Laboratory Information and Research Services are available only to APL staff members via APLs intranet.'
-      weight: 6
-      expanded: 1
-    -
-      id: 7
-      title: 'Help Support'
-      menu_name: footer
-      link: 'https://www.library.jhu.edu/support/'
-      description: 'JHU Sheridan Library Help Support'
-      weight: 1
-      expanded: 1
-    -
-      id: 8
-      title: 'Librarians Staff Directory'
-      menu_name: footer
-      link: 'https://www.library.jhu.edu/directory/'
-      description: 'Librarians Staff Directory'
-      weight: 2
-      expanded: 1
-    -
-      id: 9
-      title: 'Libraries Hours'
-      menu_name: footer
-      link: 'https://www.library.jhu.edu/library-hours/'
-      description: 'Libraries Hours'
-      weight: 3
-      expanded: 1
-  ids:
-    id:
-      type: integer
-process:
-  bundle:
-    plugin: default_value
-    default_value: menu_link_content
-  title: title
-  menu_name: menu_name
-  link/uri:
-    plugin: default_value
-    source: link
-  weight: weight
-  expanded: expanded
-  link/options: '@opts'
-  description: description
-destination:
-  plugin: 'entity:menu_link_content'
-migration_dependencies: null
diff --git a/config/export/migrate_plus.migration.islandora_defaults_tags.yml b/config/export/migrate_plus.migration.islandora_defaults_tags.yml
deleted file mode 100644
index f04b95c48..000000000
--- a/config/export/migrate_plus.migration.islandora_defaults_tags.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: bb27baaa-0ede-46ee-9cdb-60358f6b60b6
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: TSmzvdb0Ez0oyUVnrGfjmvCBZvKiddOpLiHJjJyvmYE
-id: islandora_defaults_tags
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - islandora_defaults_tags
-migration_group: islandora
-label: 'Tags migration for islandora_defaults feature'
-source:
-  plugin: csv
-  path: ../assets/migrate/tags.csv
-  header_row_count: 1
-  ids:
-    - external_uri
-process:
-  name: name
-  vid: vid
-  description: description
-  field_external_uri:
-    plugin: urlencode
-    source: external_uri
-  field_authority_link/uri:
-    plugin: urlencode
-    source: external_uri
-  field_authority_link/title:
-    plugin: urlencode
-    source: external_uri
-  field_authority_link/source: authority_link_source
-destination:
-  plugin: 'entity:taxonomy_term'
-migration_dependencies:
-  required: {  }
-  optional: {  }
diff --git a/config/export/migrate_plus.migration.islandora_tags.yml b/config/export/migrate_plus.migration.islandora_tags.yml
deleted file mode 100644
index 836c2ec1c..000000000
--- a/config/export/migrate_plus.migration.islandora_tags.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: cf4abe1e-d60d-4407-b4ad-0833fa8b1e87
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - islandora_core_feature
-_core:
-  default_config_hash: yZv_uq0keKLQ-7vf3ngJIA00vS7I-CZAbPh7J-pBL5o
-id: islandora_tags
-class: null
-field_plugin_method: null
-cck_plugin_method: null
-migration_tags:
-  - islandora_tags
-migration_group: islandora
-label: 'Tags migration from CSV'
-source:
-  plugin: csv
-  path: modules/contrib/islandora/migrate/tags.csv
-  header_row_count: 1
-  ids:
-    - external_uri
-process:
-  name: name
-  vid: vid
-  description: description
-  field_external_uri:
-    plugin: urlencode
-    source: external_uri
-destination:
-  plugin: 'entity:taxonomy_term'
-migration_dependencies:
-  required: {  }
-  optional: {  }
diff --git a/config/export/migrate_plus.migration_group.idc_initial_setup.yml b/config/export/migrate_plus.migration_group.idc_initial_setup.yml
deleted file mode 100644
index ec7e402f2..000000000
--- a/config/export/migrate_plus.migration_group.idc_initial_setup.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: de5bf89b-27fc-4b09-ad45-73d6b11baa9d
-langcode: en
-status: true
-dependencies: {  }
-id: idc_initial_setup
-label: idc_initial_setup
-description: ''
-source_type: null
-module: null
-shared_configuration: null
diff --git a/config/export/migrate_plus.migration_group.islandora.yml b/config/export/migrate_plus.migration_group.islandora.yml
deleted file mode 100644
index 07be704ea..000000000
--- a/config/export/migrate_plus.migration_group.islandora.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-uuid: 2d3264c8-f9d2-4158-844d-07429de09c61
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Kwa413G8vt72_OIgvVEDhnmTCX-KnjCVPnowVOwSnwc
-id: islandora
-label: Islandora
-description: 'Migrations into Islandora'
-source_type: Anything
-module: null
-shared_configuration: null
diff --git a/config/export/node.settings.yml b/config/export/node.settings.yml
deleted file mode 100644
index 911c9f08b..000000000
--- a/config/export/node.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: W0cgFPhPJ3gAdqm06-az48BLf5MVcoZVS0HdByoofi0
-use_admin_theme: true
diff --git a/config/export/node.type.article.yml b/config/export/node.type.article.yml
deleted file mode 100644
index 10d97c730..000000000
--- a/config/export/node.type.article.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 0ed6f523-3b4c-48ec-81ce-d079bdd2c34b
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: AeW1SEDgb1OTQACAWGhzvMknMYAJlcZu0jljfeU3oso
-name: Article
-type: article
-description: 'Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.'
-help: ''
-new_revision: true
-preview_mode: 1
-display_submitted: true
diff --git a/config/export/node.type.collection_object.yml b/config/export/node.type.collection_object.yml
deleted file mode 100644
index 88bf8c107..000000000
--- a/config/export/node.type.collection_object.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: a3ed2650-3b7d-4810-a1bb-25c6bb4ba964
-langcode: en
-status: true
-dependencies:
-  module:
-    - menu_ui
-third_party_settings:
-  menu_ui:
-    available_menus:
-      - main
-    parent: 'main:'
-_core:
-  default_config_hash: KRhOZR8Dq0frQ8cxuMpgTaPBog6f25ZWUdChquyq55Q
-name: 'Collection Object'
-type: collection_object
-description: 'This creates a new Content Type Collection Object'
-help: ''
-new_revision: false
-preview_mode: 1
-display_submitted: true
diff --git a/config/export/node.type.islandora_object.yml b/config/export/node.type.islandora_object.yml
deleted file mode 100644
index 0aaf34fde..000000000
--- a/config/export/node.type.islandora_object.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 6399fba1-f0d8-4c8a-8162-9c8dd4d357ff
-langcode: en
-status: true
-dependencies:
-  module:
-    - menu_ui
-third_party_settings:
-  menu_ui:
-    available_menus:
-      - main
-    parent: 'main:'
-_core:
-  default_config_hash: u0KwLd2DlcMVtwtwvSZSK3QmyYCLW2Qr7JKUeL51Mnc
-name: 'Repository Item'
-type: islandora_object
-description: 'An item in your Islandora repository.'
-help: ''
-new_revision: true
-preview_mode: 1
-display_submitted: false
diff --git a/config/export/node.type.page.yml b/config/export/node.type.page.yml
deleted file mode 100644
index 6dbb83393..000000000
--- a/config/export/node.type.page.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: cf4259d7-d697-4dcc-8d6a-248be5cca96a
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: KuyA4NHPXcmKAjRtwa0vQc2ZcyrUJy6IlS2TAyMNRbc
-name: 'Basic page'
-type: page
-description: 'Use <em>basic pages</em> for your static content, such as an ''About us'' page.'
-help: ''
-new_revision: true
-preview_mode: 1
-display_submitted: false
diff --git a/config/export/openseadragon.settings.yml b/config/export/openseadragon.settings.yml
deleted file mode 100644
index 4f4d9f52a..000000000
--- a/config/export/openseadragon.settings.yml
+++ /dev/null
@@ -1,126 +0,0 @@
-_core:
-  default_config_hash: SodgIAY6XQHkm493PQ-sLrnBtM2PoP9g8agJU-HM-U8
-default_options:
-  fit_to_aspect_ratio: false
-  tabIndex: 0
-  debugMode: false
-  debugGridColor: '#437AB2'
-  blendTime: 0
-  alwaysBlend: false
-  autoHideControls: true
-  immediateRender: false
-  defaultZoomLevel: 0
-  opacity: 1
-  compositeOperation: ''
-  placeholderFillStyle: ''
-  degrees: 0
-  minZoomLevel: ''
-  maxZoomLevel: ''
-  homeFillsViewer: false
-  panHorizontal: true
-  panVertical: true
-  constrainDuringPan: false
-  wrapHorizontal: false
-  wrapVertical: false
-  minZoomImageRatio: 0.9
-  maxZoomPixelRatio: 1.1
-  smoothTileEdgesMinZoom: 1.1
-  autoResize: true
-  preserveImageSizeOnResize: false
-  minScrollDeltaTime: 50
-  pixelsPerWheelLine: 40
-  visibilityRatio: 0.5
-  imageLoaderLimit: 0
-  clickTimeThreshold: 300
-  clickDistThreshold: 5
-  dblClickTimeThreshold: 300
-  dblClickDistThreshold: 20
-  springStiffness: 6.5
-  animationTime: 1.2
-  gestureSettingsMouse:
-    scrollToZoom: true
-    clickToZoom: true
-    dblClickToZoom: false
-    pinchToZoom: false
-    flickEnabled: false
-    flickMinSpeed: 120
-    flickMomentum: 0.25
-    pinchRotate: false
-  gestureSettingsTouch:
-    scrollToZoom: false
-    clickToZoom: false
-    dblClickToZoom: true
-    pinchToZoom: true
-    flickEnabled: true
-    flickMinSpeed: 120
-    flickMomentum: 0.25
-    pinchRotate: false
-  gestureSettingsPen:
-    scrollToZoom: false
-    clickToZoom: true
-    dblClickToZoom: false
-    pinchToZoom: false
-    flickEnabled: false
-    flickMinSpeed: 120
-    flickMomentum: 0.25
-    pinchRotate: false
-  gestureSettingsUnknown:
-    scrollToZoom: true
-    clickToZoom: false
-    dblClickToZoom: true
-    pinchToZoom: true
-    flickEnabled: true
-    flickMinSpeed: 120
-    flickMomentum: 0.25
-    pinchRotate: false
-  zoomPerClick: !!float 2
-  zoomPerScroll: 1.2
-  zoomPerSecond: !!float 1
-  showNavigator: false
-  navigatorPosition: TOP_RIGHT
-  navigatorSizeRatio: 0.2
-  navigatorMaintainSizeRatio: false
-  navigatorTop: ''
-  navigatorLeft: ''
-  navigatorHeight: ''
-  navigatorWidth: ''
-  navigatorAutoResize: true
-  navigatorAutoFade: true
-  navigatorRotate: true
-  controlsFadeDelay: 2000
-  controlsFadeLength: 1500
-  maxImageCacheCount: 200
-  timeout: 30000
-  useCanvas: true
-  minPixelRatio: 0.5
-  mouseNavEnabled: true
-  showNavigationControl: true
-  navigationControlAnchor: TOP_LEFT
-  showZoomControl: true
-  showHomeControl: true
-  showFullPageControl: true
-  showRotationControl: false
-  showSequenceControl: true
-  sequenceControlAnchor: TOP_LEFT
-  navPrevNextWrap: false
-  sequenceMode: false
-  initialPage: 0
-  preserveViewport: false
-  preserveOverlays: false
-  showReferenceStrip: false
-  referenceStripScroll: horizontal
-  referenceStripHeight: ''
-  referenceStripWidth: ''
-  referenceStripPosition: BOTTOM_LEFT
-  referenceStripSizeRatio: 0.2
-  collectionMode: false
-  collectionRows: 3
-  collectionColumns: 0
-  collectionLayout: horizontal
-  collectionTileSize: 800
-  collectionTileMargin: 80
-  crossOriginPolicy: false
-  ajaxWithCredentials: false
-  tileSize: 256
-iiif_server: 'https://islandora.traefik.me/cantaloupe/iiif/2'
-manifest_view: iiif_manifest
diff --git a/config/export/pathauto.pattern.basic_page.yml b/config/export/pathauto.pattern.basic_page.yml
deleted file mode 100644
index 423d2f0e4..000000000
--- a/config/export/pathauto.pattern.basic_page.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 37488aec-8fe0-4ecb-8308-b4de65a421ff
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: basic_page
-label: 'Basic Page'
-type: 'canonical_entities:node'
-pattern: '[node:title]'
-selection_criteria:
-  19a3a389-999c-46d8-a57d-5d81706c34d5:
-    id: 'entity_bundle:node'
-    negate: false
-    uuid: 19a3a389-999c-46d8-a57d-5d81706c34d5
-    context_mapping:
-      node: node
-    bundles:
-      page: page
-selection_logic: and
-weight: -5
-relationships: {  }
diff --git a/config/export/pathauto.pattern.group_content.yml b/config/export/pathauto.pattern.group_content.yml
deleted file mode 100644
index 1dd564d33..000000000
--- a/config/export/pathauto.pattern.group_content.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 2cb1c5bb-5890-431c-8199-1281963eb36b
-langcode: en
-status: true
-dependencies:
-  module:
-    - group
-_core:
-  default_config_hash: rk2G0ozgUlKP7ic1RRjMcXUmeZxXUKPV-q-brekIKMc
-id: group_content
-label: 'Group content'
-type: 'canonical_entities:group_content'
-pattern: 'group/[group_content:group:id]/[group_content:pretty-path-key]/[group_content:id]'
-selection_criteria: {  }
-selection_logic: and
-weight: -5
-relationships:
-  'group_content:langcode:language':
-    label: Language
diff --git a/config/export/pathauto.pattern.islandora_content.yml b/config/export/pathauto.pattern.islandora_content.yml
deleted file mode 100644
index 7bb2bf6c9..000000000
--- a/config/export/pathauto.pattern.islandora_content.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-uuid: 9967d8a2-d30c-4502-bb7c-a4d266bee271
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: islandora_content
-label: 'Islandora Content'
-type: 'canonical_entities:node'
-pattern: 'islandora/[node:title]'
-selection_criteria:
-  ecacb2bf-e5b2-4b3e-80e2-d487efd6c788:
-    id: 'entity_bundle:node'
-    negate: false
-    uuid: ecacb2bf-e5b2-4b3e-80e2-d487efd6c788
-    context_mapping:
-      node: node
-    bundles:
-      collection_object: collection_object
-      islandora_object: islandora_object
-selection_logic: and
-weight: -5
-relationships: {  }
diff --git a/config/export/pathauto.pattern.taxonomy_terms.yml b/config/export/pathauto.pattern.taxonomy_terms.yml
deleted file mode 100644
index a03c1cac3..000000000
--- a/config/export/pathauto.pattern.taxonomy_terms.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-uuid: 9d69ab87-66e9-4a97-999b-981e445d209d
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-id: taxonomy_terms
-label: 'Taxonomy Terms'
-type: 'canonical_entities:taxonomy_term'
-pattern: 'term/[term:vocabulary]/[term:name]'
-selection_criteria:
-  7efdf784-8f26-4c24-ba6e-f76eeb800b60:
-    id: 'entity_bundle:taxonomy_term'
-    negate: false
-    uuid: 7efdf784-8f26-4c24-ba6e-f76eeb800b60
-    context_mapping:
-      taxonomy_term: taxonomy_term
-    bundles:
-      corporate_body: corporate_body
-      country: country
-      family: family
-      frequencies: frequencies
-      genre: genre
-      geo_location: geo_location
-      islandora_display: islandora_display
-      islandora_media_use: islandora_media_use
-      islandora_models: islandora_models
-      issuance_modes: issuance_modes
-      language: language
-      person: person
-      physical_form: physical_form
-      resource_types: resource_types
-      subject: subject
-      tags: tags
-      temporal_subjects: temporal_subjects
-selection_logic: and
-weight: -5
-relationships: {  }
diff --git a/config/export/pathauto.settings.yml b/config/export/pathauto.settings.yml
deleted file mode 100644
index cc7eabb6e..000000000
--- a/config/export/pathauto.settings.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-_core:
-  default_config_hash: SwvLp8snyPEExF41CaJJYdPUVomofLqtXvwciHc4cPg
-enabled_entity_types:
-  - user
-punctuation:
-  double_quotes: 0
-  quotes: 0
-  backtick: 0
-  comma: 0
-  period: 0
-  hyphen: 1
-  underscore: 0
-  colon: 0
-  semicolon: 0
-  pipe: 0
-  left_curly: 0
-  left_square: 0
-  right_curly: 0
-  right_square: 0
-  plus: 0
-  equal: 0
-  asterisk: 0
-  ampersand: 0
-  percent: 0
-  caret: 0
-  dollar: 0
-  hash: 0
-  at: 0
-  exclamation: 0
-  tilde: 0
-  left_parenthesis: 0
-  right_parenthesis: 0
-  question_mark: 0
-  less_than: 0
-  greater_than: 0
-  slash: 0
-  back_slash: 0
-verbose: false
-separator: '-'
-max_length: 100
-max_component_length: 100
-transliterate: true
-reduce_ascii: false
-case: true
-ignore_words: 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with'
-update_action: 2
-safe_tokens:
-  - alias
-  - path
-  - join-path
-  - login-url
-  - url
-  - url-brief
diff --git a/config/export/rdf.mapping.comment.comment.yml b/config/export/rdf.mapping.comment.comment.yml
deleted file mode 100644
index 7236924ca..000000000
--- a/config/export/rdf.mapping.comment.comment.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: cf7549ae-d183-4a58-a821-aa2a51dcc930
-langcode: en
-status: true
-dependencies:
-  config:
-    - comment.type.comment
-  module:
-    - comment
-_core:
-  default_config_hash: uETe6XupRGKDForx2MpY0pMOEu6CzGgdCAZZOKkbgmk
-id: comment.comment
-targetEntityType: comment
-bundle: comment
-types:
-  - 'schema:Comment'
-fieldMappings:
-  subject:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  comment_body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
diff --git a/config/export/rdf.mapping.media.audio.yml b/config/export/rdf.mapping.media.audio.yml
deleted file mode 100644
index 2eb5f846f..000000000
--- a/config/export/rdf.mapping.media.audio.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: f696d37a-ee06-476f-8566-17ed24518578
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.audio
-  module:
-    - media
-_core:
-  default_config_hash: jS-dB72uZM9RcqTn4FPW_TLJ3f3emDl17v_3TS3loqE
-id: media.audio
-targetEntityType: media
-bundle: audio
-types:
-  - 'pcdm:File'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-      - 'rdf:label'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  field_mime_type:
-    properties:
-      - 'ebucore:hasMimeType'
-  field_media_of:
-    properties:
-      - 'pcdm:fileOf'
-    mapping_type: rel
-  field_original_name:
-    properties:
-      - 'premis3:originalName'
-  field_tags:
-    properties:
-      - 'schema:additionalType'
-    mapping_type: rel
-  field_file_size:
-    properties:
-      - 'premis:hasSize'
diff --git a/config/export/rdf.mapping.media.document.yml b/config/export/rdf.mapping.media.document.yml
deleted file mode 100644
index 123380827..000000000
--- a/config/export/rdf.mapping.media.document.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 7d70ba60-50f0-40c4-ad91-05ac76c4b680
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.document
-  module:
-    - media
-_core:
-  default_config_hash: qRAVuCEff49i3-EnfTLObQFU_aGAFbdOPpBXZwdGYvk
-id: media.document
-targetEntityType: media
-bundle: document
-types:
-  - 'pcdm:File'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-      - 'rdf:label'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  field_mime_type:
-    properties:
-      - 'ebucore:hasMimeType'
-  field_media_of:
-    properties:
-      - 'pcdm:fileOf'
-    mapping_type: rel
-  field_original_name:
-    properties:
-      - 'premis3:originalName'
-  field_tags:
-    properties:
-      - 'schema:additionalType'
-    mapping_type: rel
-  field_file_size:
-    properties:
-      - 'premis:hasSize'
diff --git a/config/export/rdf.mapping.media.extracted_text.yml b/config/export/rdf.mapping.media.extracted_text.yml
deleted file mode 100644
index c9009ebf9..000000000
--- a/config/export/rdf.mapping.media.extracted_text.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 01766aed-a9c3-4e84-a221-2dfbc3e632d5
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.extracted_text
-  module:
-    - media
-_core:
-  default_config_hash: 4mPQTsBciWc5I_yUCT0dfBin57cCsNIzStVSemt2tPA
-id: media.extracted_text
-targetEntityType: media
-bundle: extracted_text
-types:
-  - 'pcdm:File'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-      - 'rdf:label'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  field_mime_type:
-    properties:
-      - 'ebucore:hasMimeType'
-  field_media_of:
-    properties:
-      - 'pcdm:fileOf'
-    mapping_type: rel
-  field_original_name:
-    properties:
-      - 'premis3:originalName'
-  field_tags:
-    properties:
-      - 'schema:additionalType'
-    mapping_type: rel
-  field_file_size:
-    properties:
-      - 'premis:hasSize'
diff --git a/config/export/rdf.mapping.media.file.yml b/config/export/rdf.mapping.media.file.yml
deleted file mode 100644
index f6229a5f5..000000000
--- a/config/export/rdf.mapping.media.file.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 492564bb-a65d-4503-ba1e-64b2cc704161
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.file
-  module:
-    - media
-_core:
-  default_config_hash: n7qJeyv424_VOyk_EeG-ITh6SCiGLgKhUOcwDXIv3H0
-id: media.file
-targetEntityType: media
-bundle: file
-types:
-  - 'pcdm:File'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-      - 'rdf:label'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  field_mime_type:
-    properties:
-      - 'ebucore:hasMimeType'
-  field_media_of:
-    properties:
-      - 'pcdm:fileOf'
-    mapping_type: rel
-  field_original_name:
-    properties:
-      - 'premis3:originalName'
-  field_tags:
-    properties:
-      - 'schema:additionalType'
-    mapping_type: rel
-  field_file_size:
-    properties:
-      - 'premis:hasSize'
diff --git a/config/export/rdf.mapping.media.image.yml b/config/export/rdf.mapping.media.image.yml
deleted file mode 100644
index 3dd148b73..000000000
--- a/config/export/rdf.mapping.media.image.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-uuid: 4dbce03e-acb9-450e-bf5d-b50b8ff0f4f8
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.image
-  module:
-    - media
-_core:
-  default_config_hash: 4Tl_qytyaduLYtyvEHMOnnJG-dVhdMUzkjiFFWrXnnA
-id: media.image
-targetEntityType: media
-bundle: image
-types:
-  - 'pcdm:File'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-      - 'rdf:label'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  field_mime_type:
-    properties:
-      - 'ebucore:hasMimeType'
-  field_media_of:
-    properties:
-      - 'pcdm:fileOf'
-    mapping_type: rel
-  field_original_name:
-    properties:
-      - 'premis3:originalName'
-  field_tags:
-    properties:
-      - 'schema:additionalType'
-    mapping_type: rel
-  field_width:
-    properties:
-      - 'ebucore:width'
-  field_height:
-    properties:
-      - 'ebucore:height'
-  field_file_size:
-    properties:
-      - 'premis:hasSize'
diff --git a/config/export/rdf.mapping.media.video.yml b/config/export/rdf.mapping.media.video.yml
deleted file mode 100644
index fd06f5f36..000000000
--- a/config/export/rdf.mapping.media.video.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-uuid: 2163d2ca-9284-4f73-92f4-d6e122317a3e
-langcode: en
-status: true
-dependencies:
-  config:
-    - media.type.video
-  module:
-    - media
-_core:
-  default_config_hash: 515HB3jhDCZuv_0K14VGKI6hiHebbV4angQpAFr2rl4
-id: media.video
-targetEntityType: media
-bundle: video
-types:
-  - 'pcdm:File'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-      - 'rdf:label'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  field_mime_type:
-    properties:
-      - 'ebucore:hasMimeType'
-  field_media_of:
-    properties:
-      - 'pcdm:fileOf'
-    mapping_type: rel
-  field_original_name:
-    properties:
-      - 'premis3:originalName'
-  field_tags:
-    properties:
-      - 'schema:additionalType'
-    mapping_type: rel
-  field_file_size:
-    properties:
-      - 'premis:hasSize'
diff --git a/config/export/rdf.mapping.node.article.yml b/config/export/rdf.mapping.node.article.yml
deleted file mode 100644
index ff56491ed..000000000
--- a/config/export/rdf.mapping.node.article.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-uuid: 641a1c0b-f46b-4727-93c5-7473117a6a23
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.article
-  module:
-    - node
-_core:
-  default_config_hash: IdobJe379eDudt7-bXFfJjF7pDqFl-kYxVFtpWrgkro
-id: node.article
-targetEntityType: node
-bundle: article
-types:
-  - 'schema:Article'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-  comment:
-    properties:
-      - 'schema:comment'
-    mapping_type: rel
-  comment_count:
-    properties:
-      - 'schema:interactionCount'
-    datatype_callback:
-      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
-      arguments:
-        interaction_type: UserComments
-  field_image:
-    properties:
-      - 'schema:image'
-  field_tags:
-    properties:
-      - 'schema:about'
diff --git a/config/export/rdf.mapping.node.islandora_object.yml b/config/export/rdf.mapping.node.islandora_object.yml
deleted file mode 100644
index c9455ca93..000000000
--- a/config/export/rdf.mapping.node.islandora_object.yml
+++ /dev/null
@@ -1,171 +0,0 @@
-uuid: d99a5fbb-433d-435b-981e-b24b506ab9bd
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-  module:
-    - node
-_core:
-  default_config_hash: n81NhKrT4b0VmaCadxopeFtLeGA_lb-Nu4cWADb4zV4
-id: node.islandora_object
-targetEntityType: node
-bundle: islandora_object
-types:
-  - 'pcdm:Object'
-fieldMappings:
-  field_full_title:
-    properties:
-      - 'rdau:P60515'
-  field_alt_title:
-    properties:
-      - 'dcterms:alternative'
-  field_edtf_date:
-    properties:
-      - 'dcterms:date'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_edtf_date_created:
-    properties:
-      - 'dcterms:created'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_edtf_date_issued:
-    properties:
-      - 'dcterms:issued'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_copyright_date:
-    properties:
-      - 'dcterms:dateCopyrighted'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_date_captured:
-    properties:
-      - 'premis:creation'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_date_modified:
-    properties:
-      - 'dcterms:modified'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_date_valid:
-    properties:
-      - 'dcterms:valid'
-    datatype_callback:
-      callable: 'Drupal\controlled_access_terms\EDTFConverter::dateIso8601Value'
-  field_frequency:
-    properties:
-      - 'rdau:P60538'
-  field_mode_of_issuance:
-    properties:
-      - 'rdau:P60051'
-  field_description:
-    properties:
-      - 'dcterms:description'
-  field_abstract:
-    properties:
-      - 'dcterms:abstract'
-  field_extent:
-    properties:
-      - 'dcterms:extent'
-  field_identifier:
-    properties:
-      - 'dcterms:identifier'
-  field_member_of:
-    properties:
-      - 'pcdm:memberOf'
-    mapping_type: rel
-  field_resource_type:
-    properties:
-      - 'dcterms:type'
-    mapping_type: rel
-  field_rights:
-    properties:
-      - 'dc11:rights'
-  field_subject_general:
-    properties:
-      - 'dcterms:subject'
-    mapping_type: rel
-  field_subject:
-    properties:
-      - 'dcterms:subject'
-    mapping_type: rel
-  field_language:
-    properties:
-      - 'dcterms:language'
-  field_genre:
-    properties:
-      - 'dcterms:type'
-  field_physical_form:
-    properties:
-      - 'dcterms:format'
-  field_edition:
-    properties:
-      - 'rdau:P60329'
-  field_place_published:
-    properties:
-      - 'relators:pup'
-  field_place_published_country:
-    properties:
-      - 'relators:pup'
-  field_table_of_contents:
-    properties:
-      - 'dcterms:tableOfContents'
-  field_coordinates:
-    properties:
-      - 'dcterms:spatial'
-  field_coordinates_text:
-    properties:
-      - 'dcterms:spatial'
-  field_classification:
-    properties:
-      - 'dc11:subject'
-  field_dewey_classification:
-    properties:
-      - 'dc11:subject'
-  field_lcc_classification:
-    properties:
-      - 'dc11:subject'
-  field_subjects_name:
-    properties:
-      - 'dcterms:subject'
-  field_temporal_subject:
-    properties:
-      - 'dcterms:temporal'
-  field_geographic_subject:
-    properties:
-      - 'dcterms:spatial'
-  field_isbn:
-    properties:
-      - 'dbpedia:isbn'
-  field_oclc_number:
-    properties:
-      - 'dbpedia:oclc'
-  field_local_identifier:
-    properties:
-      - 'dcterms:identifier'
-  field_note:
-    properties:
-      - 'skos:note'
-  field_weight:
-    properties:
-      - 'co:index'
-  title:
-    properties:
-      - 'dcterms:title'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
diff --git a/config/export/rdf.mapping.node.page.yml b/config/export/rdf.mapping.node.page.yml
deleted file mode 100644
index eb23dbca0..000000000
--- a/config/export/rdf.mapping.node.page.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: 782dd278-5e8f-4cc6-839c-2e36831dcdac
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.page
-  module:
-    - node
-_core:
-  default_config_hash: 32LxRnl4Wesvzqyfp7HnD0-U9-wxrLBn76pqY5XGNAE
-id: node.page
-targetEntityType: node
-bundle: page
-types:
-  - 'schema:WebPage'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  comment_count:
-    properties:
-      - 'schema:interactionCount'
-    datatype_callback:
-      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
-      arguments:
-        interaction_type: UserComments
diff --git a/config/export/rdf.mapping.taxonomy_term.corporate_body.yml b/config/export/rdf.mapping.taxonomy_term.corporate_body.yml
deleted file mode 100644
index b2d6bb448..000000000
--- a/config/export/rdf.mapping.taxonomy_term.corporate_body.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-uuid: 304c28a5-01cf-4fb2-9c2e-a9625e2b967e
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.corporate_body
-  module:
-    - taxonomy
-_core:
-  default_config_hash: njgC_jyjnGQYRmyWTTZAXS6oL6f4mWI6RymRQ7tIm0E
-id: taxonomy_term.corporate_body
-targetEntityType: taxonomy_term
-bundle: corporate_body
-types:
-  - 'schema:Organization'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_corp_alt_name:
-    properties:
-      - 'schema:alternateName'
-  field_cat_date_end:
-    properties:
-      - 'schema:dissolutionDate'
-  field_cat_date_begin:
-    properties:
-      - 'schema:foundingDate'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.country.yml b/config/export/rdf.mapping.taxonomy_term.country.yml
deleted file mode 100644
index cb69e547a..000000000
--- a/config/export/rdf.mapping.taxonomy_term.country.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 474f4de4-e00c-42f0-bc77-b3b1ba85e56d
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.country
-  module:
-    - taxonomy
-_core:
-  default_config_hash: f4Oezg2wdsDVJVSpx7oWJNFS1I3od4WYJ4ib9NIdlE0
-id: taxonomy_term.country
-targetEntityType: taxonomy_term
-bundle: country
-types:
-  - 'schema:Country'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
diff --git a/config/export/rdf.mapping.taxonomy_term.family.yml b/config/export/rdf.mapping.taxonomy_term.family.yml
deleted file mode 100644
index c336bdabe..000000000
--- a/config/export/rdf.mapping.taxonomy_term.family.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: 84d081fc-102f-4250-b9b0-491981e3aec8
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.family
-  module:
-    - taxonomy
-_core:
-  default_config_hash: 53GoJnRZR6upUctj5_gv1KI6v-z0bvV-ZewqQ3KaUhQ
-id: taxonomy_term.family
-targetEntityType: taxonomy_term
-bundle: family
-types:
-  - 'schema:Organization'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  field_cat_date_end:
-    properties:
-      - 'schema:dissolutionDate'
-  field_cat_date_begin:
-    properties:
-      - 'schema:foundingDate'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.genre.yml b/config/export/rdf.mapping.taxonomy_term.genre.yml
deleted file mode 100644
index 6d10c31ad..000000000
--- a/config/export/rdf.mapping.taxonomy_term.genre.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: ba4adc36-e704-4bad-b3f6-114383c28102
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.genre
-  module:
-    - taxonomy
-_core:
-  default_config_hash: h_dG9wdbT4CT0HRr05ADMGyDZAg4JwnFIe8PjZ2jxLA
-id: taxonomy_term.genre
-targetEntityType: taxonomy_term
-bundle: genre
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.geo_location.yml b/config/export/rdf.mapping.taxonomy_term.geo_location.yml
deleted file mode 100644
index 3835fabea..000000000
--- a/config/export/rdf.mapping.taxonomy_term.geo_location.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-uuid: e022d60e-64b1-4a42-9cd6-e43ecce994ba
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.geo_location
-  module:
-    - taxonomy
-_core:
-  default_config_hash: h5TsW1n-2MIijEHXZ8K8Zz2YocfcFQh4z1xTOKZc66M
-id: taxonomy_term.geo_location
-targetEntityType: taxonomy_term
-bundle: geo_location
-types:
-  - 'dc:Location'
-  - 'schema:Place'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  field_geo_geolocation:
-    properties:
-      - 'wgs84_pos:lat_long'
-  field_geo_broader:
-    properties:
-      - 'schema:containedInPlace'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.islandora_display.yml b/config/export/rdf.mapping.taxonomy_term.islandora_display.yml
deleted file mode 100644
index a7023463f..000000000
--- a/config/export/rdf.mapping.taxonomy_term.islandora_display.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-uuid: 70405edb-2523-4ee0-9151-56520a3682a1
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.islandora_display
-  module:
-    - taxonomy
-  enforced:
-    module:
-      - islandora_core_feature
-_core:
-  default_config_hash: toERhmrBEP2WP-7fgnHD2wy5z_3REqyrN1M-KygCtxA
-id: taxonomy_term.islandora_display
-targetEntityType: taxonomy_term
-bundle: islandora_display
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-  description:
-    properties:
-      - 'dcterms:description'
-  field_external_uri:
-    properties:
-      - 'owl:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.islandora_media_use.yml b/config/export/rdf.mapping.taxonomy_term.islandora_media_use.yml
deleted file mode 100644
index 0313740cf..000000000
--- a/config/export/rdf.mapping.taxonomy_term.islandora_media_use.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 334c14dd-f740-41c7-b240-3a3b66e1a55a
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.islandora_media_use
-  module:
-    - taxonomy
-_core:
-  default_config_hash: xUM39UBClrdpA0_0LFr0V9sW5M7YAbb2iT0ji5P6fhU
-id: taxonomy_term.islandora_media_use
-targetEntityType: taxonomy_term
-bundle: islandora_media_use
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-  description:
-    properties:
-      - 'dcterms:description'
-  field_external_uri:
-    properties:
-      - 'owl:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.islandora_models.yml b/config/export/rdf.mapping.taxonomy_term.islandora_models.yml
deleted file mode 100644
index 0353030b6..000000000
--- a/config/export/rdf.mapping.taxonomy_term.islandora_models.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: b4fe45f9-a908-4ca2-8197-8830311f3823
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - taxonomy
-_core:
-  default_config_hash: sz38N7I8V9U-qonlIxwosaKWzpLKCtT7cdHXcFDfMQU
-id: taxonomy_term.islandora_models
-targetEntityType: taxonomy_term
-bundle: islandora_models
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'dcterms:title'
-  description:
-    properties:
-      - 'dcterms:description'
-  field_external_uri:
-    properties:
-      - 'owl:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.language.yml b/config/export/rdf.mapping.taxonomy_term.language.yml
deleted file mode 100644
index e401d03a7..000000000
--- a/config/export/rdf.mapping.taxonomy_term.language.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 56e31034-3ae2-4972-a856-15cbc6312e78
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.language
-  module:
-    - taxonomy
-_core:
-  default_config_hash: zwm58nuhsLT1dzytsxnFEl94rzfxfvf0jW_1F5HYNio
-id: taxonomy_term.language
-targetEntityType: taxonomy_term
-bundle: language
-types:
-  - 'schema:Language'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.person.yml b/config/export/rdf.mapping.taxonomy_term.person.yml
deleted file mode 100644
index 6cadf90e6..000000000
--- a/config/export/rdf.mapping.taxonomy_term.person.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: f58d8e33-7fd9-4788-8a18-884be2fdfa00
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.person
-  module:
-    - taxonomy
-_core:
-  default_config_hash: Ho8imt84_uHqV26OJ5CBtyWf_OvyGS8q0bC5X8HuO1o
-id: taxonomy_term.person
-targetEntityType: taxonomy_term
-bundle: person
-types:
-  - 'schema:Person'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_alternate_name:
-    properties:
-      - 'schema:alternateName'
-  field_person_alternate_names:
-    properties:
-      - 'schema:alternateName'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  field_cat_date_begin:
-    properties:
-      - 'schema:birthDate'
-  field_cat_date_end:
-    properties:
-      - 'schema:deathDate'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.physical_form.yml b/config/export/rdf.mapping.taxonomy_term.physical_form.yml
deleted file mode 100644
index bab70b9ec..000000000
--- a/config/export/rdf.mapping.taxonomy_term.physical_form.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: a8a562d1-8fda-4b3f-ba49-8ef740132bec
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.physical_form
-  module:
-    - taxonomy
-_core:
-  default_config_hash: g3SOISIg_JWU_C6n93IJOq4y1b4s_v0SfEAPIQjip_0
-id: taxonomy_term.physical_form
-targetEntityType: taxonomy_term
-bundle: physical_form
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.resource_types.yml b/config/export/rdf.mapping.taxonomy_term.resource_types.yml
deleted file mode 100644
index 293f66f88..000000000
--- a/config/export/rdf.mapping.taxonomy_term.resource_types.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 1cfc0ea0-cc03-4ffe-a9c2-2a08d0a955ca
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.resource_types
-  module:
-    - taxonomy
-_core:
-  default_config_hash: 9YdFrLtrIqqP52kDzBPtdXh3GBmKZUo1ZkATqePeAzU
-id: taxonomy_term.resource_types
-targetEntityType: taxonomy_term
-bundle: resource_types
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.subject.yml b/config/export/rdf.mapping.taxonomy_term.subject.yml
deleted file mode 100644
index 62ad19b5c..000000000
--- a/config/export/rdf.mapping.taxonomy_term.subject.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 5560ee1c-0380-4385-9c35-911a68890ee5
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.subject
-  module:
-    - taxonomy
-_core:
-  default_config_hash: 3WGvlX2CdD-Ul3QsGMJ1X9gbKrSeQIbaPYOZpuyKiF8
-id: taxonomy_term.subject
-targetEntityType: taxonomy_term
-bundle: subject
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.taxonomy_term.tags.yml b/config/export/rdf.mapping.taxonomy_term.tags.yml
deleted file mode 100644
index cfeefcc09..000000000
--- a/config/export/rdf.mapping.taxonomy_term.tags.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 31f30b70-394c-4cd4-a6b8-4495bf92a5c0
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.tags
-  module:
-    - taxonomy
-_core:
-  default_config_hash: o5duwyS1CTHx3tYOZhuu91kspe8VQjQsnwZjAJv9njk
-id: taxonomy_term.tags
-targetEntityType: taxonomy_term
-bundle: tags
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
diff --git a/config/export/rdf.mapping.taxonomy_term.temporal_subjects.yml b/config/export/rdf.mapping.taxonomy_term.temporal_subjects.yml
deleted file mode 100644
index 4955e3fb7..000000000
--- a/config/export/rdf.mapping.taxonomy_term.temporal_subjects.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: 4a94371e-3218-4ac3-98c8-1b0450b013cf
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.temporal_subjects
-  module:
-    - taxonomy
-_core:
-  default_config_hash: nshQbtfQ9bsJROMb4hvPsxQexCN-8Trdf8Q8bvXYBUI
-id: taxonomy_term.temporal_subjects
-targetEntityType: taxonomy_term
-bundle: temporal_subjects
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
-  field_authority_link:
-    properties:
-      - 'schema:sameAs'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
diff --git a/config/export/rdf.mapping.user.user.yml b/config/export/rdf.mapping.user.user.yml
deleted file mode 100644
index eec9a9cc3..000000000
--- a/config/export/rdf.mapping.user.user.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: 8ec6c58d-47e4-43da-bb4f-842348bd323d
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: TGTlmpYAtXxjtYMFA_A0vosE2c4R5MCQwLviIA5HUM0
-id: user.user
-targetEntityType: user
-bundle: user
-types:
-  - 'schema:Person'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
diff --git a/config/export/responsive_image.styles.narrow.yml b/config/export/responsive_image.styles.narrow.yml
deleted file mode 100644
index 601a5db9f..000000000
--- a/config/export/responsive_image.styles.narrow.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-uuid: 8eb79e19-da57-4bd3-8304-4e0b5a147276
-langcode: en
-status: true
-dependencies:
-  config:
-    - image.style.max_1300x1300
-    - image.style.max_325x325
-    - image.style.max_650x650
-_core:
-  default_config_hash: E9Pvy75e7AcNQi7TBRvoG0DU2FI8mjFcLARqfB-rlIU
-id: narrow
-label: Narrow
-image_style_mappings:
-  -
-    image_mapping_type: sizes
-    image_mapping:
-      sizes: '(min-width: 1290px) 325px, (min-width: 851px) 25vw, (min-width: 560px) 50vw, 100vw'
-      sizes_image_styles:
-        - max_1300x1300
-        - max_650x650
-        - max_325x325
-    breakpoint_id: responsive_image.viewport_sizing
-    multiplier: 1x
-breakpoint_group: responsive_image
-fallback_image_style: max_325x325
diff --git a/config/export/responsive_image.styles.wide.yml b/config/export/responsive_image.styles.wide.yml
deleted file mode 100644
index 81907e5d5..000000000
--- a/config/export/responsive_image.styles.wide.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-uuid: 5cffd3ef-5656-4446-b200-b771d8076568
-langcode: en
-status: true
-dependencies:
-  config:
-    - image.style.max_1300x1300
-    - image.style.max_2600x2600
-    - image.style.max_325x325
-    - image.style.max_650x650
-_core:
-  default_config_hash: Pvik9YqtjA9ALn5ccla1mwTIE4gN5fQ-dK1B0zX0b1o
-id: wide
-label: Wide
-image_style_mappings:
-  -
-    image_mapping_type: sizes
-    image_mapping:
-      sizes: '(min-width: 1290px) 1290px, 100vw'
-      sizes_image_styles:
-        - max_2600x2600
-        - max_1300x1300
-        - max_650x650
-        - max_325x325
-    breakpoint_id: responsive_image.viewport_sizing
-    multiplier: 1x
-breakpoint_group: responsive_image
-fallback_image_style: max_325x325
diff --git a/config/export/rest.resource.entity.entity_form_display.yml b/config/export/rest.resource.entity.entity_form_display.yml
deleted file mode 100644
index 8e7b3ac08..000000000
--- a/config/export/rest.resource.entity.entity_form_display.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: d800dc40-0741-4ccb-b29d-822e25c50bf9
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - serialization
-_core:
-  default_config_hash: _oiysdMeYbeeMg2XCY5t_y6WWx4LJYCycX53eFSEBCo
-id: entity.entity_form_display
-plugin_id: 'entity:entity_form_display'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.entity.field_config.yml b/config/export/rest.resource.entity.field_config.yml
deleted file mode 100644
index cf34ba47d..000000000
--- a/config/export/rest.resource.entity.field_config.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 81738c3d-7217-4f14-a10a-64551b98d44f
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - field
-    - serialization
-_core:
-  default_config_hash: Wxi0BRjvbaJhUaWjogRzBsVwM3hNlcy5uSbQYq7-Bzg
-id: entity.field_config
-plugin_id: 'entity:field_config'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.entity.field_storage_config.yml b/config/export/rest.resource.entity.field_storage_config.yml
deleted file mode 100644
index da8bc2190..000000000
--- a/config/export/rest.resource.entity.field_storage_config.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 83e1c200-136d-472e-989d-0fcbac97085d
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - field
-    - serialization
-_core:
-  default_config_hash: qsoK5HymO7sZOeYV8TBPHZk3xMyye6eAg8Jd8D_p79U
-id: entity.field_storage_config
-plugin_id: 'entity:field_storage_config'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.entity.file.yml b/config/export/rest.resource.entity.file.yml
deleted file mode 100644
index 72bb76042..000000000
--- a/config/export/rest.resource.entity.file.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 11c4e25e-6b06-4270-b934-243e4f4aade1
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - file
-    - jsonld
-    - jwt
-    - serialization
-    - user
-_core:
-  default_config_hash: adSrXptX_NpPQC5cFGgYUjjSDncSDxha3towAq-mVzU
-id: entity.file
-plugin_id: 'entity:file'
-granularity: method
-configuration:
-  GET:
-    supported_formats:
-      - jsonld
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  POST:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  DELETE:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  PATCH:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
diff --git a/config/export/rest.resource.entity.media.yml b/config/export/rest.resource.entity.media.yml
deleted file mode 100644
index d61c74c44..000000000
--- a/config/export/rest.resource.entity.media.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 9a5633b1-6a1a-40b2-8482-c24cf44122ff
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - jsonld
-    - jwt
-    - media
-    - serialization
-    - user
-_core:
-  default_config_hash: t5fUWKfF1wCsP_kc8DZwfoPHS-Vo8tK8nBZ33aQdFlA
-id: entity.media
-plugin_id: 'entity:media'
-granularity: method
-configuration:
-  GET:
-    supported_formats:
-      - jsonld
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  POST:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  DELETE:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  PATCH:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
diff --git a/config/export/rest.resource.entity.media_type.yml b/config/export/rest.resource.entity.media_type.yml
deleted file mode 100644
index a2245b06b..000000000
--- a/config/export/rest.resource.entity.media_type.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 9d79cda6-c03b-441d-8383-0afa74ae1c63
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - media
-    - serialization
-_core:
-  default_config_hash: _yAs-A1tYKRPxRfoIB5J7pNkrM9hNyb_BJUA3_z1Jok
-id: entity.media_type
-plugin_id: 'entity:media_type'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.entity.node.yml b/config/export/rest.resource.entity.node.yml
deleted file mode 100644
index 83f1ff0c9..000000000
--- a/config/export/rest.resource.entity.node.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 08a90469-0355-4b41-a4d6-cb6b53072b8c
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - jsonld
-    - jwt
-    - node
-    - serialization
-    - user
-_core:
-  default_config_hash: Bs7fv0SCvDv2xd3Mk5Yn62onxQ3VhKK2s-3obhAeGFE
-id: entity.node
-plugin_id: 'entity:node'
-granularity: method
-configuration:
-  GET:
-    supported_formats:
-      - jsonld
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  POST:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  DELETE:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  PATCH:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
diff --git a/config/export/rest.resource.entity.path_alias.yml b/config/export/rest.resource.entity.path_alias.yml
deleted file mode 100644
index 18e611d10..000000000
--- a/config/export/rest.resource.entity.path_alias.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 21cb40f3-8f99-4c39-96d6-c135359c3ae5
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - path_alias
-    - serialization
-_core:
-  default_config_hash: 0r-35iLVN2FLQRixblPlVQ4an7iqytlPBB8Knp7ly8Q
-id: entity.path_alias
-plugin_id: 'entity:path_alias'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.entity.taxonomy_term.yml b/config/export/rest.resource.entity.taxonomy_term.yml
deleted file mode 100644
index 2454b3c3f..000000000
--- a/config/export/rest.resource.entity.taxonomy_term.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-uuid: 7534e393-12a7-498c-a4a3-a7bbe4ff9a5d
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - jsonld
-    - jwt
-    - serialization
-    - taxonomy
-    - user
-_core:
-  default_config_hash: G3Adl8KEMsW0Y2f3ZXb1DDDRci7206hfMWMUGCG2KQQ
-id: entity.taxonomy_term
-plugin_id: 'entity:taxonomy_term'
-granularity: method
-configuration:
-  GET:
-    supported_formats:
-      - jsonld
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  POST:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  DELETE:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
-  PATCH:
-    supported_formats:
-      - json
-    supported_auth:
-      - basic_auth
-      - jwt_auth
-      - cookie
diff --git a/config/export/rest.resource.entity.taxonomy_vocabulary.yml b/config/export/rest.resource.entity.taxonomy_vocabulary.yml
deleted file mode 100644
index e9fcb3645..000000000
--- a/config/export/rest.resource.entity.taxonomy_vocabulary.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 2b953ea6-2a42-40c9-9a3e-810ea1328597
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - serialization
-    - taxonomy
-_core:
-  default_config_hash: fgn6TDMdvmVVdjg7rZYU8IH9jfVEIeD75UuxjjikalM
-id: entity.taxonomy_vocabulary
-plugin_id: 'entity:taxonomy_vocabulary'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.entity.user.yml b/config/export/rest.resource.entity.user.yml
deleted file mode 100644
index 8031cbd66..000000000
--- a/config/export/rest.resource.entity.user.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 59b49800-0d49-4c2b-8eea-752577ce5919
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - serialization
-    - user
-_core:
-  default_config_hash: 7l1NBsFqG818aOmd_bqTDa_oWi3EpV75Vf4wpkoxppo
-id: entity.user
-plugin_id: 'entity:user'
-granularity: resource
-configuration:
-  methods:
-    - GET
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.file.upload.yml b/config/export/rest.resource.file.upload.yml
deleted file mode 100644
index e6fa210e4..000000000
--- a/config/export/rest.resource.file.upload.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 53787065-fa19-4b04-b16e-1e85c1a4c1ac
-langcode: en
-status: true
-dependencies:
-  module:
-    - basic_auth
-    - file
-    - serialization
-_core:
-  default_config_hash: 1XJH1i9ehP19MNp-8H4Br0slZS0D_J3uC2XIoOg7Oc8
-id: file.upload
-plugin_id: 'file:upload'
-granularity: resource
-configuration:
-  methods:
-    - POST
-  formats:
-    - json
-  authentication:
-    - basic_auth
diff --git a/config/export/rest.resource.oai_pmh.yml b/config/export/rest.resource.oai_pmh.yml
deleted file mode 100644
index 8058954be..000000000
--- a/config/export/rest.resource.oai_pmh.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: baaab2fd-abb6-46ec-bdd2-9a90c6170e88
-langcode: en
-status: true
-dependencies:
-  module:
-    - rest_oai_pmh
-    - user
-_core:
-  default_config_hash: UJ3cyGntgA2ROifjz9irCpqjdJenMb_2rt8a_IUNk2c
-id: oai_pmh
-plugin_id: oai_pmh
-granularity: resource
-configuration:
-  methods:
-    - GET
-    - POST
-  formats:
-    - oai_dc
-  authentication:
-    - cookie
diff --git a/config/export/rest_oai_pmh.settings.yml b/config/export/rest_oai_pmh.settings.yml
deleted file mode 100644
index 1cd975434..000000000
--- a/config/export/rest_oai_pmh.settings.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-_core:
-  default_config_hash: ZdPdgeYPxAPoTIlcCxW_tRoExm87onUdOjF3ZY2gfto
-rest_oai_pmh:
-  entity_type: node
-view_displays:
-  'collection_object_models:entity_reference_1': 'collection_object_models:entity_reference_1'
-  'oai_pmh:all_repository_items': 'oai_pmh:all_repository_items'
-  'oai_pmh:collection_sets': 'oai_pmh:collection_sets'
-  'oai_pmh:collectionless_set': 'oai_pmh:collectionless_set'
-support_sets: 1
-mapping_source: rdf
-repository_name: 'JHU Digital Collections'
-repository_email: digital-library@mail395.jh.edu
-expiration: '3600'
-metadata_map_plugins:
-  -
-    label: mods
-    value: ''
-  -
-    label: oai_raw
-    value: ''
-  -
-    label: oai_dc
-    value: dublin_core_rdf
-cache_technique: liberal_cache
-mods_view:
-  view_machine_name: ''
-  view_display_name: ''
diff --git a/config/export/search_api.index.default_solr_index.yml b/config/export/search_api.index.default_solr_index.yml
deleted file mode 100644
index bf09a984e..000000000
--- a/config/export/search_api.index.default_solr_index.yml
+++ /dev/null
@@ -1,492 +0,0 @@
-uuid: 2aaf0b31-2628-4b44-9ce3-73b3d4d7c7c4
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_alt_title
-    - field.storage.node.field_member_of
-    - field.storage.node.field_description
-    - field.storage.node.field_dewey_classification
-    - field.storage.node.field_edition
-    - field.storage.node.field_edtf_date_created
-    - field.storage.node.field_extent
-    - field.storage.node.field_full_title
-    - field.storage.node.field_isbn
-    - field.storage.node.field_lcc_classification
-    - field.storage.node.field_linked_agent
-    - field.storage.node.field_oclc_number
-    - field.storage.node.field_physical_form
-    - field.storage.node.field_resource_type
-    - field.storage.node.field_rights
-    - field.storage.node.field_tags
-    - field.storage.node.field_subject_general
-    - field.storage.node.field_geographic_subject
-    - field.storage.node.field_subjects_name
-    - field.storage.node.field_temporal_subject
-    - field.storage.node.field_subject
-    - search_api.server.default_solr_server
-    - core.entity_view_mode.node.search_index
-  module:
-    - search_api_solr
-    - node
-    - user
-    - taxonomy
-    - search_api
-    - controlled_access_terms
-third_party_settings:
-  search_api_solr:
-    finalize: false
-    commit_before_finalize: false
-    commit_after_finalize: false
-    debug_finalize: false
-    highlighter:
-      maxAnalyzedChars: 51200
-      fragmenter: regex
-      usePhraseHighlighter: true
-      highlightMultiTerm: true
-      preserveMulti: false
-      regex:
-        slop: 0.5
-        pattern: blank
-        maxAnalyzedChars: 10000
-      highlight:
-        mergeContiguous: false
-        requireFieldMatch: false
-        snippets: 3
-        fragsize: 0
-    mlt:
-      mintf: 1
-      mindf: 1
-      maxdf: 0
-      maxdfpct: 0
-      minwl: 0
-      maxwl: 0
-      maxqt: 100
-      maxntp: 2000
-      boost: false
-      interestingTerms: none
-    term_modifiers:
-      slop: 3
-      fuzzy: 1
-    advanced:
-      index_prefix: ''
-      collection: ''
-      timezone: ''
-    multilingual:
-      limit_to_content_language: false
-      include_language_independent: true
-      use_language_undefined_as_fallback_language: false
-      specific_languages:
-        en: '0'
-      use_universal_collation: false
-_core:
-  default_config_hash: 3HSYR81fyYsY--a93ZG1VSN3PEHVN_o78qIhDfsxzs4
-id: default_solr_index
-name: 'Default Solr content index'
-description: 'Default content index created by the Solr Search Defaults module'
-read_only: false
-field_settings:
-  author:
-    label: 'Author name'
-    datasource_id: 'entity:node'
-    property_path: 'uid:entity:name'
-    type: string
-    dependencies:
-      module:
-        - node
-        - user
-  changed:
-    label: Changed
-    datasource_id: 'entity:node'
-    property_path: changed
-    type: date
-    dependencies:
-      module:
-        - node
-  created:
-    label: 'Authored on'
-    datasource_id: 'entity:node'
-    property_path: created
-    type: date
-    dependencies:
-      module:
-        - node
-  edtf_year:
-    label: 'EDTF Creation Date Year'
-    property_path: edtf_year
-    type: integer
-  field_alt_title:
-    label: 'Alternative Title'
-    datasource_id: 'entity:node'
-    property_path: field_alt_title
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_alt_title
-  field_descendant_of:
-    label: 'Descendant of'
-    datasource_id: 'entity:node'
-    property_path: field_member_of
-    type: integer
-    dependencies:
-      config:
-        - field.storage.node.field_member_of
-  field_description:
-    label: Description
-    datasource_id: 'entity:node'
-    property_path: field_description
-    type: text
-    dependencies:
-      config:
-        - field.storage.node.field_description
-  field_dewey_classification:
-    label: 'Dewey Classification'
-    datasource_id: 'entity:node'
-    property_path: field_dewey_classification
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_dewey_classification
-  field_edited_text:
-    label: 'Reverse reference: <em class="placeholder">Media</em> using <em class="placeholder">Media of</em> » Edited Text'
-    datasource_id: 'entity:node'
-    property_path: 'search_api_reverse_entity_references_media__field_media_of:field_edited_text'
-    type: text
-  field_edition:
-    label: Edition
-    datasource_id: 'entity:node'
-    property_path: field_edition
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_edition
-  field_edtf_date_created:
-    label: 'Date Created'
-    datasource_id: 'entity:node'
-    property_path: field_edtf_date_created
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_edtf_date_created
-  field_extent:
-    label: Extent
-    datasource_id: 'entity:node'
-    property_path: field_extent
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_extent
-  field_full_title:
-    label: 'Full Title'
-    datasource_id: 'entity:node'
-    property_path: field_full_title
-    type: text
-    dependencies:
-      config:
-        - field.storage.node.field_full_title
-  field_isbn:
-    label: ISBN
-    datasource_id: 'entity:node'
-    property_path: field_isbn
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_isbn
-  field_lcc_classification:
-    label: 'Library of Congress Classification'
-    datasource_id: 'entity:node'
-    property_path: field_lcc_classification
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_lcc_classification
-  field_linked_agent_name:
-    label: 'Linked Agent'
-    datasource_id: 'entity:node'
-    property_path: 'field_linked_agent:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_linked_agent
-      module:
-        - taxonomy
-  field_oclc_number:
-    label: 'OCLC Number'
-    datasource_id: 'entity:node'
-    property_path: field_oclc_number
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_oclc_number
-  field_physical_form:
-    label: 'Physical Form'
-    datasource_id: 'entity:node'
-    property_path: 'field_physical_form:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_physical_form
-      module:
-        - taxonomy
-  field_resource_type:
-    label: 'Resource Type'
-    datasource_id: 'entity:node'
-    property_path: 'field_resource_type:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_resource_type
-      module:
-        - taxonomy
-  field_rights:
-    label: Rights
-    datasource_id: 'entity:node'
-    property_path: field_rights
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_rights
-  field_tags:
-    label: Tags
-    datasource_id: 'entity:node'
-    property_path: field_tags
-    type: integer
-    dependencies:
-      config:
-        - field.storage.node.field_tags
-  member_of_title:
-    label: 'Member of » Content » Title'
-    datasource_id: 'entity:node'
-    property_path: 'field_member_of:entity:title'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_member_of
-      module:
-        - node
-  node_grants:
-    label: 'Node access information'
-    property_path: search_api_node_grants
-    type: string
-    indexed_locked: true
-    type_locked: true
-    hidden: true
-  rendered_item:
-    label: 'Rendered item'
-    property_path: rendered_item
-    type: text
-    configuration:
-      roles:
-        - anonymous
-      view_mode:
-        'entity:node':
-          article: search_index
-          collection_object: ''
-          islandora_object: search_index
-          page: search_index
-  status:
-    label: 'Publishing status'
-    datasource_id: 'entity:node'
-    property_path: status
-    type: boolean
-    indexed_locked: true
-    type_locked: true
-    dependencies:
-      module:
-        - node
-  sticky:
-    label: 'Sticky at top of lists'
-    datasource_id: 'entity:node'
-    property_path: sticky
-    type: boolean
-    dependencies:
-      module:
-        - node
-  subject_aggregated:
-    label: 'Subjects (All)'
-    property_path: aggregated_field
-    type: string
-    configuration:
-      type: union
-      fields:
-        - 'entity:node/field_geographic_subject'
-        - 'entity:node/field_subject'
-        - 'entity:node/field_subject_general'
-        - 'entity:node/field_subjects_name'
-        - 'entity:node/field_temporal_subject'
-  subject_general_name:
-    label: Subject
-    datasource_id: 'entity:node'
-    property_path: 'field_subject_general:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_subject_general
-      module:
-        - taxonomy
-  subject_geographic_name:
-    label: 'Subject (Geographic)'
-    datasource_id: 'entity:node'
-    property_path: 'field_geographic_subject:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_geographic_subject
-      module:
-        - taxonomy
-  subject_names_name:
-    label: 'Subject (Names)'
-    datasource_id: 'entity:node'
-    property_path: 'field_subjects_name:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_subjects_name
-      module:
-        - taxonomy
-  subject_temporal_name:
-    label: 'Subject (Temporal)'
-    datasource_id: 'entity:node'
-    property_path: 'field_temporal_subject:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_temporal_subject
-      module:
-        - taxonomy
-  subject_topical_name:
-    label: 'Subject (Topical)'
-    datasource_id: 'entity:node'
-    property_path: 'field_subject:entity:name'
-    type: string
-    dependencies:
-      config:
-        - field.storage.node.field_subject
-      module:
-        - taxonomy
-  title:
-    label: Title
-    datasource_id: 'entity:node'
-    property_path: title
-    type: text
-    boost: !!float 8
-    dependencies:
-      module:
-        - node
-  title_aggregated:
-    label: 'Title (All)'
-    property_path: aggregated_field
-    type: string
-    configuration:
-      type: union
-      fields:
-        - 'entity:node/field_alt_title'
-        - 'entity:node/field_full_title'
-        - 'entity:node/title'
-  type:
-    label: 'Content type'
-    datasource_id: 'entity:node'
-    property_path: type
-    type: string
-    dependencies:
-      module:
-        - node
-  uid:
-    label: 'Author ID'
-    datasource_id: 'entity:node'
-    property_path: uid
-    type: integer
-    indexed_locked: true
-    type_locked: true
-    dependencies:
-      module:
-        - node
-datasource_settings:
-  'entity:node':
-    bundles:
-      default: true
-      selected: {  }
-    languages:
-      default: true
-      selected: {  }
-processor_settings:
-  add_url:
-    weights:
-      preprocess_index: -30
-  aggregated_field:
-    weights:
-      add_properties: 20
-  auto_aggregated_fulltext_field: {  }
-  content_access:
-    weights:
-      preprocess_index: -6
-      preprocess_query: -4
-  edtf_year_only:
-    fields:
-      collection_object|field_edtf_date: collection_object|field_edtf_date
-      collection_object|field_edtf_date_created: collection_object|field_edtf_date_created
-      collection_object|field_edtf_date_issued: collection_object|field_edtf_date_issued
-      islandora_object|field_copyright_date: islandora_object|field_copyright_date
-      islandora_object|field_edtf_date: islandora_object|field_edtf_date
-      islandora_object|field_edtf_date_created: islandora_object|field_edtf_date_created
-      islandora_object|field_edtf_date_issued: islandora_object|field_edtf_date_issued
-    ignore_undated: 1
-    ignore_open_start: 1
-    open_start_year: '0'
-    ignore_open_end: 1
-    open_end_year: ''
-  entity_status:
-    weights:
-      preprocess_index: -10
-  entity_type: {  }
-  hierarchy:
-    weights:
-      preprocess_index: -45
-    fields:
-      field_descendant_of: node-field_member_of
-  highlight:
-    weights:
-      postprocess_query: 0
-    prefix: '<strong>'
-    suffix: '</strong>'
-    excerpt: true
-    excerpt_always: true
-    excerpt_length: 256
-    exclude_fields:
-      - field_description
-      - field_full_title
-      - title
-    highlight: always
-    highlight_partial: true
-  html_filter:
-    weights:
-      preprocess_index: -3
-      preprocess_query: -6
-    all_fields: false
-    fields:
-      - rendered_item
-    title: true
-    alt: true
-    tags:
-      b: 2
-      h1: 5
-      h2: 3
-      h3: 2
-      string: 2
-  language_with_fallback: {  }
-  rendered_item:
-    weights:
-      add_properties: 0
-      pre_index_save: -10
-  reverse_entity_references: {  }
-  solr_date_range:
-    weights:
-      preprocess_index: 0
-tracker_settings:
-  default:
-    indexing_order: fifo
-options:
-  cron_limit: 50
-  index_directly: true
-  track_changes_in_references: true
-server: default_solr_server
diff --git a/config/export/search_api.server.default_solr_server.yml b/config/export/search_api.server.default_solr_server.yml
deleted file mode 100644
index 6d7666142..000000000
--- a/config/export/search_api.server.default_solr_server.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: 33666c22-dca2-45a7-90a9-2557c235aa5e
-langcode: en
-status: true
-dependencies:
-  config:
-    - search_api_solr.solr_cache.cache_document_default_7_0_0
-    - search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0
-    - search_api_solr.solr_cache.cache_filter_default_7_0_0
-    - search_api_solr.solr_cache.cache_persegfilter_default_7_0_0
-    - search_api_solr.solr_cache.cache_queryresult_default_7_0_0
-    - search_api_solr.solr_field_type.text_edge_und_7_0_0
-    - search_api_solr.solr_field_type.text_edgestring_und_6_0_0
-    - search_api_solr.solr_field_type.text_en_7_0_0
-    - search_api_solr.solr_field_type.text_ngram_und_7_0_0
-    - search_api_solr.solr_field_type.text_ngramstring_und_6_0_0
-    - search_api_solr.solr_field_type.text_phonetic_en_7_0_0
-    - search_api_solr.solr_field_type.text_phonetic_und_7_0_0
-    - search_api_solr.solr_field_type.text_string_und_6_0_0
-    - search_api_solr.solr_field_type.text_und_7_0_0
-    - search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_select_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0
-    - search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0
-  module:
-    - search_api_solr
-_core:
-  default_config_hash: 7g-Ov7BH3Gy5xFKKyyjAmYpXOFHeZV0TP3IBRqJLUwA
-id: default_solr_server
-name: 'Solr Server'
-description: 'Default Solr server created by the Solr Search Defaults module'
-backend: search_api_solr
-backend_config:
-  retrieve_data: false
-  highlight_data: false
-  site_hash: true
-  server_prefix: ''
-  domain: generic
-  environment: default
-  connector: standard
-  connector_config:
-    scheme: http
-    host: solr
-    port: 8983
-    path: /
-    core: ISLANDORA
-    timeout: 5
-    index_timeout: 10
-    optimize_timeout: 15
-    finalize_timeout: 30
-    skip_schema_check: false
-    solr_version: ''
-    http_method: AUTO
-    commit_within: 1000
-    jmx: false
-    jts: false
-    solr_install_dir: ''
-  optimize: false
-  fallback_multiple: false
-  disabled_field_types: {  }
-  disabled_caches: {  }
-  disabled_request_handlers:
-    - request_handler_elevate_default_7_0_0
-    - request_handler_replicationmaster_default_7_0_0
-    - request_handler_replicationslave_default_7_0_0
-  disabled_request_dispatchers:
-    - request_dispatcher_httpcaching_default_7_0_0
-  rows: 10
-  index_single_documents_fallback_count: 10
-  index_empty_text_fields: false
-  suppress_missing_languages: false
diff --git a/config/export/search_api.settings.yml b/config/export/search_api.settings.yml
deleted file mode 100644
index b98d42b14..000000000
--- a/config/export/search_api.settings.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-_core:
-  default_config_hash: GUwISmLpTDUc6j8BdPRKp3fke8HsVe_IL1jar4Bbuq4
-default_cron_limit: 50
-cron_worker_runtime: 15
-default_tracker: default
-tracking_page_size: 100
-boost_factors:
-  - !!float 0
-  - 0.1
-  - 0.2
-  - 0.3
-  - 0.5
-  - 0.6
-  - 0.7
-  - 0.8
-  - 0.9
-  - !!float 1
-  - 1.1
-  - 1.2
-  - 1.3
-  - 1.4
-  - 1.5
-  - !!float 2
-  - !!float 3
-  - !!float 5
-  - !!float 8
-  - !!float 13
-  - !!float 21
diff --git a/config/export/search_api_solr.solr_cache.cache_document_default_7_0_0.yml b/config/export/search_api_solr.solr_cache.cache_document_default_7_0_0.yml
deleted file mode 100644
index 7979fabd9..000000000
--- a/config/export/search_api_solr.solr_cache.cache_document_default_7_0_0.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-uuid: af62edf3-d78e-4593-bf73-92b163cadbd6
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ClPoYNWUET68N1rNueZg_5KeyC2sNona4FTbDF-j1ZE
-id: cache_document_default_7_0_0
-label: 'Document Cache'
-minimum_solr_version: 7.0.0
-environments: {  }
-cache:
-  name: document
-  class: solr.LRUCache
-  size: 512
-  initialSize: 512
-  autowarmCount: 0
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml b/config/export/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
deleted file mode 100644
index a23c396ad..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-uuid: 318dd200-bfbc-4f70-bb88-d7e6bd0f53a7
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: rmXBDw9q8-d3l14J15rsrBh9eQSlXrZ5otRzXahfhd4
-id: text_edge_und_3_6_0
-label: 'Edge NGram Text Field'
-minimum_solr_version: 3.6.0
-custom_code: edge
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edge
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml b/config/export/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
deleted file mode 100644
index 324882d09..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: 0d401aa5-cbe1-4760-9973-848d692393e5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ExJRKCKW0fEBJ3Pa7iYiFnxeBF5550eEL6ZoLQsIS2s
-id: text_edge_und_4_5_0
-label: 'Edge NGram Text Field'
-minimum_solr_version: 4.5.0
-custom_code: edge
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edge
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
deleted file mode 100644
index d9f287b0d..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: f5b9e920-761d-4ada-95de-b15296619d7d
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: yW20VJKElb-oT85z7mW5B-hMiAUsl4B-UDLZzCZPats
-id: text_edge_und_6_0_0
-label: 'Edge NGram Text Field'
-minimum_solr_version: 6.0.0
-custom_code: edge
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edge
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml b/config/export/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
deleted file mode 100644
index 3c812237e..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-uuid: ba71792f-7dde-4cfe-821a-419560c57675
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: bMILcxf9yC5nDLZGe83FDm8YT9wRMyEczHD12Hkcc78
-id: text_edge_und_7_0_0
-label: 'Edge NGram Text Field'
-minimum_solr_version: 7.0.0
-custom_code: edge
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edge
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml b/config/export/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
deleted file mode 100644
index 3139581e5..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 4ff5966d-8de8-4882-8166-6630007041ec
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: LvpfYUzHvp2cxgB6AXmm3C_LIMG7cbz7sQlmKdm8Yp8
-id: text_edgestring_und_3_6_0
-label: 'Edge NGram String Field'
-minimum_solr_version: 3.6.0
-custom_code: edgestring
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edgenstring
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml b/config/export/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
deleted file mode 100644
index 03504e3b3..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: b564ebc6-6e3b-4ab7-9c8d-a279156fd82a
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Pden9pJlLDBl2oiY9Hwg_O18mtFXjFYfOtYhQo1KZTc
-id: text_edgestring_und_4_5_0
-label: 'Edge NGram String Field'
-minimum_solr_version: 4.5.0
-custom_code: edgestring
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edgenstring
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
deleted file mode 100644
index 588439254..000000000
--- a/config/export/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 170c26d7-b8a7-4006-8e6b-f8410451e7a8
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: iifw_DxebhUOezFaJM3sD9m2rvzGXWkwxPC_g_58nag
-id: text_edgestring_und_6_0_0
-label: 'Edge NGram String Field'
-minimum_solr_version: 6.0.0
-custom_code: edgestring
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_edgenstring
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.EdgeNGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_en_3_6_0.yml b/config/export/search_api_solr.solr_field_type.text_en_3_6_0.yml
deleted file mode 100644
index 4dbc20670..000000000
--- a/config/export/search_api_solr.solr_field_type.text_en_3_6_0.yml
+++ /dev/null
@@ -1,400 +0,0 @@
-uuid: 9f632385-ff70-41a0-90a6-f4b196e8ba4b
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Jylj6Up7gG0H1KBXBePH_Jl4VpeT3Tnl-09XYd-e8uE
-id: text_en_3_6_0
-label: 'English Text Field'
-minimum_solr_version: 3.6.0
-custom_code: ''
-field_type_language_code: en
-domains: {  }
-field_type:
-  name: text_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type:
-  name: text_unstemmed_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-spellcheck_field_type: null
-collated_field_type: {  }
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: en
-            -
-              name: field
-              VALUE: spellcheck_en
-            -
-              name: spellcheckIndexDir
-              VALUE: spellchecker_en
-            -
-              name: buildOnOptimize
-              VALUE: 'true'
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-text_files:
-  stopwords: |
-    a
-    an
-    and
-    are
-    as
-    at
-    be
-    but
-    by
-    for
-    if
-    in
-    into
-    is
-    it
-    no
-    not
-    of
-    on
-    or
-    s
-    such
-    t
-    that
-    the
-    their
-    then
-    there
-    these
-    they
-    this
-    to
-    was
-    will
-    with
-  protwords: |
-
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Ą => A
-    "\u0104" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # Ć => C
-    "\U0106" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ę => E
-    "\u0118" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ł => L
-    "\u0141" => "L"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ń => N
-    "\u0143" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # Ś => S
-    "\u015a" => "S"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # Ź => Z
-    "\u0179" => "Z"
-    # Ż => Z
-    "\u017b" => "Z"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
-  synonyms: |
-    drupal, durpal
diff --git a/config/export/search_api_solr.solr_field_type.text_en_4_5_0.yml b/config/export/search_api_solr.solr_field_type.text_en_4_5_0.yml
deleted file mode 100644
index 4be799292..000000000
--- a/config/export/search_api_solr.solr_field_type.text_en_4_5_0.yml
+++ /dev/null
@@ -1,425 +0,0 @@
-uuid: 6fdf2d59-9324-4939-8ce1-a01b7feb883b
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 8aw98NQJhd0-EdqkGux0txUx2EWzj2liPRNFWqd8Rfo
-id: text_en_4_5_0
-label: 'English Text Field'
-minimum_solr_version: 4.5.0
-custom_code: ''
-field_type_language_code: en
-domains: {  }
-field_type:
-  name: text_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type:
-  name: text_unstemmed_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-spellcheck_field_type: null
-collated_field_type:
-  name: collated_en
-  class: solr.ICUCollationField
-  locale: en
-  strength: primary
-  caseLevel: false
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: en
-            -
-              name: field
-              VALUE: spellcheck_en
-            -
-              name: classname
-              VALUE: solr.DirectSolrSpellChecker
-            -
-              name: distanceMeasure
-              VALUE: internal
-          int:
-            -
-              name: maxEdits
-              VALUE: '2'
-            -
-              name: minPrefix
-              VALUE: '1'
-            -
-              name: maxInspections
-              VALUE: '5'
-            -
-              name: minQueryLength
-              VALUE: '4'
-          float:
-            -
-              name: accuracy
-              VALUE: '0.5'
-            -
-              name: maxQueryFrequency
-              VALUE: '0.01'
-            -
-              name: thresholdTokenFrequency
-              VALUE: '0.01'
-          bool:
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-text_files:
-  stopwords: |
-    a
-    an
-    and
-    are
-    as
-    at
-    be
-    but
-    by
-    for
-    if
-    in
-    into
-    is
-    it
-    no
-    not
-    of
-    on
-    or
-    s
-    such
-    t
-    that
-    the
-    their
-    then
-    there
-    these
-    they
-    this
-    to
-    was
-    will
-    with
-  protwords: |
-
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Ą => A
-    "\u0104" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # Ć => C
-    "\U0106" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ę => E
-    "\u0118" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ł => L
-    "\u0141" => "L"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ń => N
-    "\u0143" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # Ś => S
-    "\u015a" => "S"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # Ź => Z
-    "\u0179" => "Z"
-    # Ż => Z
-    "\u017b" => "Z"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
-  synonyms: |
-    drupal, durpal
diff --git a/config/export/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_en_6_0_0.yml
deleted file mode 100644
index b5a7c80da..000000000
--- a/config/export/search_api_solr.solr_field_type.text_en_6_0_0.yml
+++ /dev/null
@@ -1,17949 +0,0 @@
-uuid: 87d94651-c8ab-45ae-803d-0d3f6c744e6f
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 1P0r93Bgtc9IICtvTSWNxLpEIjOOthAsmJlivY51apU
-id: text_en_6_0_0
-label: 'English Text Field'
-minimum_solr_version: 6.0.0
-custom_code: ''
-field_type_language_code: en
-domains: {  }
-field_type:
-  name: text_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type:
-  name: text_unstemmed_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-spellcheck_field_type: null
-collated_field_type:
-  name: collated_en
-  class: solr.ICUCollationField
-  locale: en
-  strength: primary
-  caseLevel: false
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: en
-            -
-              name: field
-              VALUE: spellcheck_en
-            -
-              name: classname
-              VALUE: solr.DirectSolrSpellChecker
-            -
-              name: distanceMeasure
-              VALUE: internal
-            -
-              name: accuracy
-              VALUE: '0.5'
-            -
-              name: maxEdits
-              VALUE: '2'
-            -
-              name: minPrefix
-              VALUE: '1'
-            -
-              name: maxInspections
-              VALUE: '5'
-            -
-              name: minQueryLength
-              VALUE: '4'
-            -
-              name: maxQueryFrequency
-              VALUE: '0.01'
-            -
-              name: thresholdTokenFrequency
-              VALUE: '.01'
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-    -
-      name: suggest
-      class: solr.SuggestComponent
-      lst:
-        -
-          name: suggester
-          str:
-            -
-              name: name
-              VALUE: en
-            -
-              name: lookupImpl
-              VALUE: AnalyzingInfixLookupFactory
-            -
-              name: dictionaryImpl
-              VALUE: DocumentDictionaryFactory
-            -
-              name: field
-              VALUE: twm_suggest
-            -
-              name: suggestAnalyzerFieldType
-              VALUE: text_en
-            -
-              name: contextField
-              VALUE: sm_context_tags
-            -
-              name: buildOnCommit
-              VALUE: 'true'
-            -
-              name: buildOnStartup
-              VALUE: 'false'
-text_files:
-  stopwords: |
-    a
-    an
-    and
-    are
-    as
-    at
-    be
-    but
-    by
-    for
-    if
-    in
-    into
-    is
-    it
-    no
-    not
-    of
-    on
-    or
-    s
-    such
-    t
-    that
-    the
-    their
-    then
-    there
-    these
-    they
-    this
-    to
-    was
-    will
-    with
-  protwords: ''
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Ą => A
-    "\u0104" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # Ć => C
-    "\U0106" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ę => E
-    "\u0118" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ł => L
-    "\u0141" => "L"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ń => N
-    "\u0143" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # Ś => S
-    "\u015a" => "S"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # Ź => Z
-    "\u0179" => "Z"
-    # Ż => Z
-    "\u017b" => "Z"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
-    # Māori macrons.
-    # Ā => A
-    "\u0100" => "A"
-    # Ē => E
-    "\u0112" => "E"
-    # Ī => I
-    "\u012A" => "I"
-    # Ō => O
-    "\u014C" => "O"
-    # Ū => U
-    "\u016A" => "U"
-    # ā => a
-    "\u0101" => "a"
-    # ē => e
-    "\u0113" => "e"
-    # ī => i
-    "\u012B" => "i"
-    # ō => o
-    "\u014D" => "o"
-    # ū => u
-    "\u016B" => "u"
-  synonyms: |
-    drupal, durpal
-    abettor's, abetter's
-    abettor, abetter
-    abettors, abetters
-    abnormalize, abnormalise
-    abnormalized, abnormalised
-    abnormalizing, abnormalising
-    abolitionize, abolitionise
-    abolitionized, abolitionised
-    abolitionizing, abolitionising
-    abridgment's, abridgement's
-    abridgment, abridgement
-    abridgments, abridgements
-    absinthe's, absinth's
-    absinthe, absinth
-    absinthes, absinths
-    academize, academise
-    academized, academised
-    academizing, academising
-    acalephe, acalephae
-    accessorize, accessorise
-    accessorized, accessorised
-    accessorizes, accessorises
-    accessorizing, accessorising
-    acclimatizable, acclimatisable
-    acclimatization's, acclimatisation's
-    acclimatization, acclimatisation
-    acclimatize, acclimatise
-    acclimatized, acclimatised
-    acclimatizer, acclimatiser
-    acclimatizers, acclimatisers
-    acclimatizes, acclimatises
-    acclimatizing, acclimatising
-    accorage, accourage
-    accoraged, accouraged
-    accorages, accourages
-    accoraging, accouraging
-    accouter, accoutre
-    accoutered, accoutred
-    accoutering, accoutring
-    accouterment's, accoutrement's
-    accouterment, accoutrement
-    accouterments, accoutrements
-    accouters, accoutres
-    Acemetae's, Acoemetae's
-    Acemetae, Acoemetae
-    Acemetic's, Acoemetic's
-    Acemetic, Acoemetic
-    Acer's, Acre's
-    Acer, Acre
-    acetonemia, acetonaemia
-    acetonemic, acetonaemic
-    achenia, achaenia
-    achenium, achaenium
-    acheniums, achaeniums
-    achenocarp, achaenocarp
-    achroiocythemia, achroiocythaemia
-    achromatization's, achromatisation's
-    achromatization, achromatisation
-    achromatizations, achromatisations
-    achromatize, achromatise
-    achromatized, achromatised
-    achromatizes, achromatises
-    achromatizing, achromatising
-    acidemia, acidaemia
-    acknowledgment's, acknowledgement's
-    acknowledgment, acknowledgement
-    acknowledgments, acknowledgements
-    acmesthesia, acmaesthesia
-    acroanesthesia, acroanaesthesia
-    acroesthesia, acroaesthesia
-    actualization's, actualisation's
-    actualization, actualisation
-    actualizations, actualisations
-    actualize, actualise
-    actualized, actualised
-    actualizes, actualises
-    actualizing, actualising
-    acuesthesia, acuaesthesia
-    adapter's, adaptor's
-    adapter, adaptor
-    adapters, adaptors
-    addable, addible
-    addenda, addendums
-    adjuster's, adjustor's
-    adjuster, adjustor
-    adjusters, adjustors
-    adonize, adonise
-    adonized, adonised
-    adonizes, adonises
-    adonizing, adonising
-    adrenalin's, adrenalin's
-    adrenaline, adrenalin
-    adulterize, adulterise
-    adulterized, adulterised
-    adulterizes, adulterises
-    adulterizing, adulterising
-    advene, advenae
-    adverbialize, adverbialise
-    adverbialized, adverbialised
-    adverbializes, adverbialises
-    adverbializing, adverbialising
-    advertise, advertize
-    advertised, advertized
-    advertisement's, advertizement's
-    advertisement, advertizement
-    advertisements, advertizements
-    advertises, advertizes
-    advertising, advertizing
-    advertizable, advertisable
-    adviser's, advisor's
-    adviser, advisor
-    advisers, advisors
-    adze's, adz's
-    adze, adz
-    aedile's, edile's
-    aedile, edile
-    aediles, ediles
-    Aedon's, Aaedon's
-    Aedon, Aaedon
-    Aeetes's, Aeaetes's
-    Aeetes, Aeaetes
-    aegis's, egis's
-    aegis, egis
-    aegises, egises
-    aerialness's, aaerialness's
-    aerialness, aaerialness
-    aeric, areic
-    aerogram, aerogramme
-    aerograms, aerogrammes
-    aerographer, areographer
-    aerographic, areographic
-    aerographical, areographical
-    aerographies, areographies
-    aerography's, areography's
-    aerography, areography
-    aerologic, areologic
-    aerological, areological
-    aerologies, areologies
-    aerologist's, areologist's
-    aerologist, areologist
-    aerology's, areology's
-    aerology, areology
-    aerometer, areometer
-    aerometers, areometers
-    aerometric, areometric
-    Aerope's, Aaerope's
-    Aerope, Aaerope
-    aesthete's, esthete's
-    aesthete, esthete
-    aesthetes, esthetes
-    aesthetic's, esthetic's
-    aesthetic, esthetic
-    aesthetically, esthetically
-    aestheticize, aestheticise
-    aestheticized, aestheticised
-    aestheticizes, aestheticises
-    aestheticizing, aestheticising
-    aesthetics, esthetics
-    affeer, affere
-    Africanization's, Africanisation's
-    Africanization, Africanisation
-    Africanizations, Africanisations
-    Africanize, Africanise
-    Africanized, Africanised
-    Africanizes, Africanises
-    Africanizing, Africanising
-    Afrikanerization, Afrikanerisation
-    Afrikanerize, Afrikanerise
-    Afrikanerized, Afrikanerised
-    Afrikanerizes, Afrikanerises
-    Afrikanerizing, Afrikanerising
-    agathodemon, agathodaemon
-    agatize, agatise
-    agatizes, agatises
-    ageism, agism
-    agenize, agenise
-    ager, agre
-    aggrandizable's, aggrandisable's
-    aggrandizable, aggrandisable
-    aggrandizables, aggrandisables
-    aggrandization, aggrandisation
-    aggrandize, aggrandise
-    aggrandized, aggrandised
-    aggrandizement's, aggrandisement's
-    aggrandizement, aggrandisement
-    aggrandizements, aggrandisements
-    aggrandizer's, aggrandiser's
-    aggrandizer, aggrandiser
-    aggrandizers, aggrandisers
-    aggrandizes, aggrandises
-    aggrandizing, aggrandising
-    aging's, ageing's
-    aging, ageing
-    agings, ageings
-    agnize, agnise
-    agnized, agnised
-    agnizes, agnises
-    agnizing, agnising
-    agonize, agonise
-    agonized, agonised
-    agonizedlies, agonisedlies
-    agonizedly, agonisedly
-    agonizer, agoniser
-    agonizers, agonisers
-    agonizes, agonises
-    agonizing, agonising
-    agonizinglier, agonisinglier
-    agonizingliest, agonisingliest
-    agonizingly, agonisingly
-    agrarianize, agrarianise
-    agrarianizes, agrarianises
-    agrize, agrise
-    agrized, agrised
-    agrizes, agrises
-    agrizing, agrising
-    aguize, aguise
-    aguized, aguised
-    aguizes, aguises
-    aguizing, aguising
-    aiger, aigre
-    air_gun, airgun
-    air_letter, airletter
-    airfoil's, aerofoil's
-    airfoil, aerofoil
-    airfoils, aerofoils
-    airgel, aerogel
-    airplane's, aeroplane's
-    airplane, aeroplane
-    airplanes, aeroplanes
-    airstrike's, air_strike's
-    airstrike, air_strike
-    airstrikes, air_strikes
-    aker, akre
-    Aktistete's, Aktistetae's
-    Aktistete, Aktistetae
-    albitize, albitise
-    albitized, albitised
-    albitizes, albitises
-    albitizing, albitising
-    albumenizer, albumeniser
-    albuminisation's, albuminization's
-    albuminisation, albuminization
-    albuminisations, albuminizations
-    albuminise, albuminize
-    albuminised, albuminized
-    albuminises, albuminizes
-    albuminising, albuminizing
-    alchemize, alchemise
-    alchemized, alchemised
-    alchemizes, alchemises
-    alchemizing, alchemising
-    Alcide's, Alcidae's
-    Alcide, Alcidae
-    Alcithoe's, Alcithoae's
-    Alcithoe, Alcithoae
-    alcoholizable's, alcoholisable's
-    alcoholizable, alcoholisable
-    alcoholizables, alcoholisables
-    alcoholization's, alcoholisation's
-    alcoholization, alcoholisation
-    alcoholizations, alcoholisations
-    alcoholize, alcoholise
-    alcoholized, alcoholised
-    alcoholizes, alcoholises
-    alcoholizing, alcoholising
-    aleucemic, aleucaemic
-    aleukemic, aleukaemic
-    Aleus's, Aloeus's
-    Aleus, Aloeus
-    algebraization's, algebraisation's
-    algebraization, algebraisation
-    algebraizations, algebraisations
-    algebraize, algebraise
-    algebraizes, algebraises
-    algesthesis, algaesthesis
-    alienize, alienise
-    alienizes, alienises
-    align, aline
-    aligned, alined
-    aligning, alining
-    alignment's, alinement's
-    alignment, alinement
-    alignments, alinements
-    aligns, alines
-    alkalinization's, alkalinisation's
-    alkalinization, alkalinisation
-    alkalinizations, alkalinisations
-    alkalinize, alkalinise
-    alkalinized, alkalinised
-    alkalinizes, alkalinises
-    alkalinizing, alkalinising
-    alkalizable, alkalisable
-    alkalization's, alkalisation's
-    alkalization, alkalisation
-    alkalizations, alkalisations
-    alkalize, alkalise
-    alkalized, alkalised
-    alkalizer's, alkaliser's
-    alkalizer, alkaliser
-    alkalizes, alkalises
-    alkalizing, alkalising
-    allegorization's, allegorisation's
-    allegorization, allegorisation
-    allegorizations, allegorisations
-    allegorize, allegorise
-    allegorized, allegorised
-    allegorizer's, allegoriser's
-    allegorizer, allegoriser
-    allegorizers, allegorisers
-    allegorizes, allegorises
-    allegorizing, allegorising
-    alleluia's, halleluiah's
-    alleluia, halleluiah
-    alleluias, halleluiahs
-    alloxuremia, alloxuraemia
-    almanac, almanack
-    almanacs, almanacks
-    alphabetization's, alphabetisation's
-    alphabetization, alphabetisation
-    alphabetizations, alphabetisations
-    alphabetize, alphabetise
-    alphabetized, alphabetised
-    alphabetizer's, alphabetiser's
-    alphabetizer, alphabetiser
-    alphabetizers, alphabetisers
-    alphabetizes, alphabetises
-    alphabetizing, alphabetising
-    alternize, alternise
-    alternizes, alternises
-    althea's, althaea's
-    althea, althaea
-    altheas, althaeas
-    althein, althaein
-    although, altho
-    aluminization, aluminisation
-    aluminize, aluminise
-    aluminized, aluminised
-    aluminizes, aluminises
-    aluminizing, aluminising
-    aluminum's, aluminium's
-    aluminum, aluminium
-    aluminums, aluminiums
-    alumni, alumnuses
-    alveole, alveolae
-    amalgamatize, amalgamatise
-    amalgamatizes, amalgamatises
-    amalgamization's, amalgamisation's
-    amalgamization, amalgamisation
-    amalgamizations, amalgamisations
-    amalgamize, amalgamise
-    amalgamizes, amalgamises
-    Amalthea's, Amalthaea's
-    Amalthea, Amalthaea
-    ambiance's, ambience's
-    ambiance, ambience
-    ambiances, ambiences
-    ambicolorate, ambicolourate
-    ambicoloration, ambicolouration
-    ambilevous, ambilaevous
-    ameban, amoeban
-    amebas, amebae
-    amebean, amoebean
-    amebian, amoebian
-    amebiases, amoebiases
-    amebiasis, amoebiasis
-    amebicidal, amoebicidal
-    amebicide, amoebicide
-    amebid, amoebid
-    amebiform, amoebiform
-    amebiosis, amoebiosis
-    amebocyte's, amoebocyte's
-    amebocyte, amoebocyte
-    amebocytes, amoebocytes
-    ameboidism's, amoeboidism's
-    ameboidism, amoeboidism
-    amebous, amoebous
-    amebula, amoebula
-    amenorrhea's, amenorrhoea's
-    amenorrhea, amenorrhoea
-    amenorrheal, amenorrhoeal
-    amenorrheas, amenorrhoeas
-    amenorrheic, amenorrhoeic
-    Americanization's, Americanisation's
-    Americanization, Americanisation
-    americanization, americanisation
-    Americanizations, Americanisations
-    Americanize, Americanise
-    Americanized, Americanised
-    americanized, americanised
-    Americanizer's, Americaniser's
-    Americanizer, Americaniser
-    Americanizers, Americanisers
-    Americanizes, Americanises
-    Americanizing, Americanising
-    amid, amidst
-    amir's, ameer's
-    amir, ameer
-    amirs, ameers
-    ammocete's, ammocoete's
-    ammocete, ammocoete
-    ammocetes, ammocoetes
-    ammoniemia, ammoniaemia
-    amoeba's, ameba's
-    amoeba, ameba
-    amoebic, amebic
-    amoeboid, ameboid
-    amok's, amuck's
-    amok, amuck
-    amoks, amucks
-    among, amongst
-    amoralize, amoralise
-    amoralizes, amoralises
-    amoret, amouret
-    amorism's, amourism's
-    amorism, amourism
-    amorisms, amourisms
-    amorist's, amourist's
-    amorist, amourist
-    amoristic, amouristic
-    amoristics, amouristics
-    amorists, amourists
-    amorphization, amorphisation
-    amorphize, amorphise
-    amortizable's, amortisable's
-    amortizable, amortisable
-    amortizabler, amortisabler
-    amortizables, amortisables
-    amortizablest, amortisablest
-    amortization's, amortisation's
-    amortization, amortisation
-    amortizations, amortisations
-    amortize, amortise
-    amortized, amortised
-    amortizement's, amortisement's
-    amortizement, amortisement
-    amortizements, amortisements
-    amortizes, amortises
-    amortizing, amortising
-    amphigean, amphigaean
-    amphitheater's, amphitheatre's
-    amphitheater, amphitheatre
-    amphitheaters, amphitheatres
-    ampoule's, ampul's
-    ampoule, ampul
-    ampoules, ampuls
-    amygdale, amygdalae
-    amyxorrhea, amyxorrhoea
-    anabaptize, anabaptise
-    anabaptized, anabaptised
-    anabaptizes, anabaptises
-    anabaptizing, anabaptising
-    anaesthetization's, anesthetisation's
-    anaesthetization, anesthetisation
-    anaesthetizations, anesthetisations
-    anaesthetize, anesthetise
-    anaesthetized, anesthetised
-    anaesthetizer, anesthetiser
-    anaesthetizers, anesthetisers
-    anaesthetizes, anesthetises
-    anaesthetizing, anesthetising
-    anagrammatize, anagrammatise
-    anagrammatized, anagrammatised
-    anagrammatizes, anagrammatises
-    anagrammatizing, anagrammatising
-    analogize, analogise
-    analogized, analogised
-    analogizes, analogises
-    analogizing, analogising
-    analytical, analytic
-    analytically, analyticalally
-    analyticiti, analyticaliti
-    analyticitis, analyticalitis
-    analyticity, analyticality
-    analyzability's, analysability's
-    analyzability, analysability
-    analyzable, analysable
-    analyzabler, analysabler
-    analyzablest, analysablest
-    analyzation's, analysation's
-    analyzation, analysation
-    analyzations, analysations
-    analyze, analyse
-    analyzed, analysed
-    analyzer's, analyser's
-    analyzer, analyser
-    analyzers, analysers
-    analyzes, analyses
-    analyzing, analysing
-    anapestically, anapaestically
-    anapneic, anapnoeic
-    anarchize, anarchise
-    anarchized, anarchised
-    anarchizes, anarchises
-    anarchizing, anarchising
-    anathematization's, anathematisation's
-    anathematization, anathematisation
-    anathematizations, anathematisations
-    anathematize, anathematise
-    anathematized, anathematised
-    anathematizer's, anathematiser's
-    anathematizer, anathematiser
-    anathematizes, anathematises
-    anathematizing, anathematising
-    anatomizable, anatomisable
-    anatomization's, anatomisation's
-    anatomization, anatomisation
-    anatomize, anatomise
-    anatomized, anatomised
-    anatomizer's, anatomiser's
-    anatomizer, anatomiser
-    anatomizes, anatomises
-    anatomizing, anatomising
-    Anchinoe's, Anchinoae's
-    Anchinoe, Anchinoae
-    ancille, ancillae
-    anematosis, anaematosis
-    anemia's, anaemia's
-    anemia, anaemia
-    anemias, anaemias
-    anemic, anaemic
-    anemically, anaemically
-    anemicer, anaemicer
-    anemicest, anaemicest
-    anemics, anaemics
-    aneretic, anaeretic
-    anesis, anoesis
-    anesthesia's, anaesthesia's
-    anesthesia, anaesthesia
-    anesthesiant, anaesthesiant
-    anesthesias, anaesthesias
-    anesthesiologies, anaesthesiologies
-    anesthesiologist's, anaesthesiologist's
-    anesthesiologist, anaesthesiologist
-    anesthesiologists, anaesthesiologists
-    anesthesiology's, anaesthesiology's
-    anesthesiology, anaesthesiology
-    anesthesis, anaesthesis
-    anesthetic's, anaesthetic's
-    anesthetic, anaesthetic
-    anesthetically, anaesthetically
-    anestheticer, anaestheticer
-    anestheticest, anaestheticest
-    anesthetics, anaesthetics
-    anesthetist's, anaesthetist's
-    anesthetist, anaesthetist
-    anesthetists, anaesthetists
-    anesthyl, anaesthyl
-    anestra, anoestra
-    anestri, anoestri
-    anestrous, anoestrous
-    anestrum, anoestrum
-    anestrus's, anoestrus's
-    anestrus, anoestrus
-    anestruses, anoestruses
-    anetic, anoetic
-    anetiological, anaetiological
-    aneurysm's, aneurism's
-    aneurysm, aneurism
-    aneurysms, aneurisms
-    angelicize, angelicise
-    angelicizes, angelicises
-    angelize, angelise
-    angelizes, angelises
-    Anglicanize's, Anglicanise's
-    Anglicanize, Anglicanise
-    Anglicanizes, Anglicanises
-    anglicization's, anglicisation's
-    anglicization, anglicisation
-    anglicizations, anglicisations
-    anglicize, anglicise
-    anglicized, anglicised
-    anglicizes, anglicises
-    anglicizing, anglicising
-    angrecum, angraecum
-    angularization's, angularisation's
-    angularization, angularisation
-    angularizations, angularisations
-    angularize, angularise
-    angularizes, angularises
-    anhematopoiesis's, anhaematopoiesis's
-    anhematopoiesis, anhaematopoiesis
-    anhematosis, anhaematosis
-    anhemolytic, anhaemolytic
-    anhydremia, anhydraemia
-    anhydremic, anhydraemic
-    anhydridization's, anhydridisation's
-    anhydridization, anhydridisation
-    anhydridizations, anhydridisations
-    anhydridize, anhydridise
-    anhydridizes, anhydridises
-    animalization's, animalisation's
-    animalization, animalisation
-    animalizations, animalisations
-    animalize, animalise
-    animalized, animalised
-    animalizes, animalises
-    animalizing, animalising
-    animized, animised
-    annalize, annalise
-    annalized, annalised
-    annalizes, annalises
-    annalizing, annalising
-    annualization, annualisation
-    annualize, annualise
-    annualized, annualised
-    annualizes, annualises
-    annualizing, annualising
-    anodization, anodisation
-    anodize, anodise
-    anodized, anodised
-    anodizes, anodises
-    anodizing, anodising
-    anonymize, anonymise
-    anonymized, anonymised
-    anonymizes, anonymises
-    anonymizing, anonymising
-    Anora's, Anoura's
-    Anora, Anoura
-    anoxemia's, anoxaemia's
-    anoxemia, anoxaemia
-    anoxemic, anoxaemic
-    anserine, anserinae
-    antagonizable, antagonisable
-    antagonization's, antagonisation's
-    antagonization, antagonisation
-    antagonizations, antagonisations
-    antagonize, antagonise
-    antagonized, antagonised
-    antagonizer, antagoniser
-    antagonizers, antagonisers
-    antagonizes, antagonises
-    antagonizing, antagonising
-    antennae, antenna
-    antennas, antenna
-    anthecological, anthoecological
-    anthecologist, anthoecologist
-    anthecology, anthoecology
-    anthologization, anthologisation
-    anthologize, anthologise
-    anthologized, anthologised
-    anthologizer, anthologiser
-    anthologizes, anthologises
-    anthologizing, anthologising
-    anthracemia, anthracaemia
-    anthracitization's, anthracitisation's
-    anthracitization, anthracitisation
-    anthracitizations, anthracitisations
-    anthropomorphization's, anthropomorphisation's
-    anthropomorphization, anthropomorphisation
-    anthropomorphizations, anthropomorphisations
-    anthropomorphize, anthropomorphise
-    anthropomorphized, anthropomorphised
-    anthropomorphizes, anthropomorphises
-    anthropomorphizing, anthropomorphising
-    anticatalyzer's, anticatalyser's
-    anticatalyzer, anticatalyser
-    anticatalyzers, anticatalysers
-    anticentralization's, anticentralisation's
-    anticentralization, anticentralisation
-    anticentralizations, anticentralisations
-    anticize, anticise
-    anticizes, anticises
-    antiepicenter's, antiepicentre's
-    antiepicenter, antiepicentre
-    antiepicenters, antiepicentres
-    antifertilizer's, antifertiliser's
-    antifertilizer, antifertiliser
-    antifertilizers, antifertilisers
-    antilabor's, antilabour's
-    antilabor, antilabour
-    antilabors, antilabours
-    antilemic, antiloemic
-    antimedieval, antimediaeval
-    antimedievalism's, antimediaevalism's
-    antimedievalism, antimediaevalism
-    antimedievalist's, antimediaevalist's
-    antimedievalist, antimediaevalist
-    antimedievally, antimediaevally
-    antioxidizer's, antioxidiser's
-    antioxidizer, antioxidiser
-    antioxidizers, antioxidisers
-    antioxidizing's, antioxidising's
-    antioxidizing, antioxidising
-    antioxidizings, antioxidisings
-    antipathize, antipathise
-    antipathizes, antipathises
-    antiquarianize, antiquarianise
-    antiquarianizes, antiquarianises
-    antirumor's, antirumour's
-    antirumor, antirumour
-    antirumors, antirumours
-    antisensitize, antisensitise
-    antisensitizer's, antisensitiser's
-    antisensitizer, antisensitiser
-    antisensitizers, antisensitisers
-    antisensitizes, antisensitises
-    antisepticize, antisepticise
-    antisepticized, antisepticised
-    antisepticizes, antisepticises
-    antisepticizing, antisepticising
-    antiseptize, antiseptise
-    antiseptizes, antiseptises
-    antisiphon's, antisyphon's
-    antisiphon, antisyphon
-    antisiphons, antisyphons
-    antithesize, antithesise
-    antithesizes, antithesises
-    anviled, anvilled
-    anviling, anvilling
-    apesthesia, apaesthesia
-    apesthetic, apaesthetic
-    aphereses, aphaereses
-    apheresis's, aphaeresis's
-    apheresis, aphaeresis
-    apheretic, aphaeretic
-    aphetize, aphetise
-    aphetized, aphetised
-    aphetizes, aphetises
-    aphetizing, aphetising
-    aphorize, aphorise
-    aphorized, aphorised
-    aphorizer's, aphoriser's
-    aphorizer, aphoriser
-    aphorizers, aphorisers
-    aphorizes, aphorises
-    aphorizing, aphorising
-    apnea's, apnoea's
-    apnea, apnoea
-    apneal, apnoeal
-    apneas, apnoeas
-    apneic, apnoeic
-    apocenter, apocentre
-    apogeic, apogaeic
-    apologize, apologise
-    apologized, apologised
-    apologizer's, apologiser's
-    apologizer, apologiser
-    apologizers, apologisers
-    apologizes, apologises
-    apologizing, apologising
-    apophthegmatize, apophthegmatise
-    apophthegmatized, apophthegmatised
-    apophthegmatizes, apophthegmatises
-    apophthegmatizing, apophthegmatising
-    aporrhea, aporrhoea
-    apostatization, apostatisation
-    apostatize, apostatise
-    apostatized, apostatised
-    apostatizes, apostatises
-    apostatizing, apostatising
-    apostolize, apostolise
-    apostolized, apostolised
-    apostolizes, apostolises
-    apostolizing, apostolising
-    apostrophize, apostrophise
-    apostrophized, apostrophised
-    apostrophizes, apostrophises
-    apostrophizing, apostrophising
-    apothegmatize, apothegmatise
-    apothegmatized, apothegmatised
-    apothegmatizes, apothegmatises
-    apothegmatizing, apothegmatising
-    apotheosize, apotheosise
-    apotheosized, apotheosised
-    apotheosizes, apotheosises
-    apotheosizing, apotheosising
-    appall, appal
-    appalls, appals
-    appareled, apparelled
-    appareling, apparelling
-    appendices, appendix
-    appendixes, appendix
-    appetize, appetise
-    appetized, appetised
-    appetizement's, appetisement's
-    appetizement, appetisement
-    appetizements, appetisements
-    appetizer's, appetiser's
-    appetizer, appetiser
-    appetizers, appetisers
-    appetizes, appetises
-    appetizing, appetising
-    appetizingly, appetisingly
-    apprizal, apprisal
-    apprizer, appriser
-    apprizers, apprisers
-    apprizings, apprisings
-    aquaculture's, aquiculture's
-    aquaculture, aquiculture
-    Arabianize's, Arabianise's
-    Arabianize, Arabianise
-    Arabianizes, Arabianises
-    Arabicize, Arabicise
-    Arabicizes, Arabicises
-    arabization's, arabisation's
-    arabization, arabisation
-    arabizations, arabisations
-    Arabize, Arabise
-    arabize, arabise
-    Arabized, Arabised
-    arabized, arabised
-    Arabizes, Arabises
-    arabizes, arabises
-    Arabizing, Arabising
-    arabizing, arabising
-    Aramean, Aramaean
-    Arameans, Aramaeans
-    arbalester, arbalestre
-    arbor's, arbour's
-    arbor, arbour
-    arbored, arboured
-    arbores, arboures
-    arborization's, arborisation's
-    arborization, arborisation
-    arborizations, arborisations
-    arborize, arborise
-    arborized, arborised
-    arborizes, arborises
-    arborizing, arborising
-    arbors, arbours
-    archaeologic, archeologic
-    archaeological, archeological
-    archaeologically, archeologically
-    archaeologies, archeologies
-    archaeologist's, archeologist's
-    archaeologist, archeologist
-    archaeologists, archeologists
-    archaeology's, archeology's
-    archaeology, archeology
-    archaize, archaise
-    archaized, archaised
-    archaizer's, archaiser's
-    archaizer, archaiser
-    archaizers, archaisers
-    archaizes, archaises
-    archaizing, archaising
-    arche, archae
-    archeal, archaeal
-    archean, archaean
-    archei, archaei
-    archeoastronomies, archaeoastronomies
-    archeoastronomy, archaeoastronomy
-    archeocyte's, archaeocyte's
-    archeocyte, archaeocyte
-    archeol, archaeol
-    archeolithic, archaeolithic
-    archeologian, archaeologian
-    archeometries, archaeometries
-    archeometry, archaeometry
-    Archeozic, Archaeozic
-    Archeozoic, Archaeozoic
-    archeozoic, archaeozoic
-    archetypal, archetypical
-    archetypally, archetypically
-    archeus, archaeus
-    arcticize, arcticise
-    arcticizes, arcticises
-    Arctogea's, Arctogaea's
-    Arctogea, Arctogaea
-    Arctogean's, Arctogaean's
-    Arctogean, Arctogaean
-    Arctogeic's, Arctogaeic's
-    Arctogeic, Arctogaeic
-    ardor's, ardour's
-    ardor, ardour
-    ardors, ardours
-    arenicolor, arenicolour
-    areole, areolae
-    areometric, araeometric
-    areometrical, araeometrical
-    areostyle, araeostyle
-    areostyles, araeostyles
-    areosystyle, araeosystyle
-    Arianize's, Arianise's
-    Arianize, Arianise
-    Arianized's, Arianised's
-    Arianized, Arianised
-    Arianizes, Arianises
-    Arianizing's, Arianising's
-    Arianizing, Arianising
-    Arimathea's, Arimathaea's
-    Arimathea, Arimathaea
-    Arimathean's, Arimathaean's
-    Arimathean, Arimathaean
-    ariste, aristae
-    arithmetization's, arithmetisation's
-    arithmetization, arithmetisation
-    arithmetizations, arithmetisations
-    arithmetize, arithmetise
-    arithmetized, arithmetised
-    arithmetizes, arithmetises
-    armor's, armour's
-    armor, armour
-    armorbearer's, armourbearer's
-    armorbearer, armourbearer
-    armored, armoured
-    armorer's, armourer's
-    armorer, armourer
-    armorers, armourers
-    armoried, armouried
-    armoring, armouring
-    armorless, armourless
-    armors, armours
-    armory's, armoury's
-    armory, armoury
-    aromatite, aromatitae
-    aromatization's, aromatisation's
-    aromatization, aromatisation
-    aromatize, aromatise
-    aromatized, aromatised
-    aromatizer's, aromatiser's
-    aromatizer, aromatiser
-    aromatizes, aromatises
-    aromatizing, aromatising
-    arsenicize, arsenicise
-    arsenicizes, arsenicises
-    Arsinoe's, Arsinoae's
-    Arsinoe, Arsinoae
-    arterialization's, arterialisation's
-    arterialization, arterialisation
-    arterializations, arterialisations
-    arterialize, arterialise
-    arterialized, arterialised
-    arterializes, arterialises
-    arterializing, arterialising
-    arthrempyesis, arthroempyesis
-    artifact's, artefact's
-    artifact, artefact
-    artifacts, artefacts
-    artificialize, artificialise
-    artificialized, artificialised
-    artificializes, artificialises
-    artificializing, artificialising
-    Aryanization, Aryanisation
-    Aryanize, Aryanise
-    Aryanized's, Aryanised's
-    Aryanized, Aryanised
-    Aryanizes, Aryanises
-    Aryanizing's, Aryanising's
-    Aryanizing, Aryanising
-    arytenoid, arytaenoid
-    arytenoids, arytaenoids
-    asafetida's, asafoetida's
-    asafetida, asafoetida
-    asafetidas, asafoetidas
-    ascendance's, ascendence's
-    ascendance, ascendence
-    ascendancy's, ascendency's
-    ascendancy, ascendency
-    ascendant's, ascendent's
-    ascendant, ascendent
-    ascendants, ascendents
-    Asclepiade's, Asclepiadae's
-    Asclepiade, Asclepiadae
-    Asel's, Asael's
-    Asel, Asael
-    asepticize, asepticise
-    asepticized, asepticised
-    asepticizes, asepticises
-    asepticizing, asepticising
-    asexualization's, asexualisation's
-    asexualization, asexualisation
-    asexualize, asexualise
-    asexualized, asexualised
-    asexualizing, asexualising
-    Asiaticization's, Asiaticisation's
-    Asiaticization, Asiaticisation
-    Asiaticizations, Asiaticisations
-    Asiaticize's, Asiaticise's
-    Asiaticize, Asiaticise
-    Asiaticizes, Asiaticises
-    Asmonean's, Asmonaean's
-    Asmonean, Asmonaean
-    aspheterize, aspheterise
-    aspheterized, aspheterised
-    aspheterizes, aspheterises
-    aspheterizing, aspheterising
-    assafetida, assafoetida
-    assafetidas, assafoetidas
-    asshole's, arsehole's
-    asshole, arsehole
-    assholes, arseholes
-    Assidean's, Assidaean's
-    Assidean, Assidaean
-    Assyrianize's, Assyrianise's
-    Assyrianize, Assyrianise
-    Assyrianizes, Assyrianises
-    Astera's, Astrea's
-    Astera, Astrea
-    astigmatizer's, astigmatiser's
-    astigmatizer, astigmatiser
-    astigmatizers, astigmatisers
-    Astrea's, Astraea's
-    Astrea, Astraea
-    astrean, astraean
-    astronomize, astronomise
-    astronomized, astronomised
-    astronomizes, astronomises
-    astronomizing, astronomising
-    asynchronize, asynchronise
-    asynchronized, asynchronised
-    asynchronizes, asynchronises
-    asynchronizing, asynchronising
-    atheize, atheise
-    atheized, atheised
-    atheizes, atheises
-    atheizing, atheising
-    athetize, athetise
-    athetized, athetised
-    athetizes, athetises
-    athetizing, athetising
-    atmolyze, atmolyse
-    atmolyzed, atmolysed
-    atmolyzes, atmolyses
-    atmolyzing, atmolysing
-    atomizability, atomisability
-    atomizable, atomisable
-    atomization's, atomisation's
-    atomization, atomisation
-    atomizations, atomisations
-    atomize, atomise
-    atomized, atomised
-    atomizer's, atomiser's
-    atomizer, atomiser
-    atomizers, atomisers
-    atomizes, atomises
-    atomizing, atomising
-    atroceruleus, atrocoeruleus
-    attemper, attempre
-    Atticize, Atticise
-    atticize, atticise
-    Atticized, Atticised
-    Atticizes, Atticises
-    atticizes, atticises
-    Atticizing, Atticising
-    attitudinization, attitudinisation
-    attitudinize, attitudinise
-    attitudinized, attitudinised
-    attitudinizer's, attitudiniser's
-    attitudinizer, attitudiniser
-    attitudinizers, attitudinisers
-    attitudinizes, attitudinises
-    attitudinizing, attitudinising
-    attitudinizings, attitudinisings
-    aunter, auntre
-    auntie's, aunty's
-    auntie, aunty
-    aureole's, aureola's
-    aureole, aureola
-    Australianize's, Australianise's
-    Australianize, Australianise
-    Australianizes, Australianises
-    Australopithecine's, Australopithecinae's
-    Australopithecine, Australopithecinae
-    Austrianize's, Austrianise's
-    Austrianize, Austrianise
-    Austrianizes, Austrianises
-    autecious, autoecious
-    auteciously, autoeciously
-    auteciousness's, autoeciousness's
-    auteciousness, autoeciousness
-    autecism's, autoecism's
-    autecism, autoecism
-    autecisms, autoecisms
-    autecy, autoecy
-    authorizable, authorisable
-    authorization's, authorisation's
-    authorization, authorisation
-    authorizations, authorisations
-    authorize, authorise
-    authorized, authorised
-    authorizer's, authoriser's
-    authorizer, authoriser
-    authorizers, authorisers
-    authorizes, authorises
-    authorizing, authorising
-    autocatalyze, autocatalyse
-    autocatalyzed, autocatalysed
-    autocatalyzes, autocatalyses
-    autocatalyzing, autocatalysing
-    autodialer, autodialler
-    autoimmunization, autoimmunisation
-    autoionization's, autoionisation's
-    autoionization, autoionisation
-    autolyzate, autolysate
-    autolyzates, autolysates
-    autolyze, autolyse
-    autolyzed, autolysed
-    autolyzes, autolyses
-    autolyzing, autolysing
-    automatization's, automatisation's
-    automatization, automatisation
-    automatizations, automatisations
-    automatize, automatise
-    automatized, automatised
-    automatizes, automatises
-    automatizing, automatising
-    Autonoe's, Autonoae's
-    Autonoe, Autonoae
-    autotomize, autotomise
-    autotomized, autotomised
-    autotomizes, autotomises
-    autotomizing, autotomising
-    autotoxemia's, autotoxaemia's
-    autotoxemia, autotoxaemia
-    autotoxemias, autotoxaemias
-    avianize, avianise
-    avianized, avianised
-    avianizes, avianises
-    avianizing, avianising
-    avizandum, avisandum
-    avizandums, avisandums
-    avize, avise
-    avized, avised
-    avizes, avises
-    avizing, avising
-    awestruck, awestricken
-    AWOL, awol
-    ax's, axe's
-    ax, axe
-    axiomatization's, axiomatisation's
-    axiomatization, axiomatisation
-    axiomatizations, axiomatisations
-    axiomatize, axiomatise
-    axiomatized, axiomatised
-    axiomatizes, axiomatises
-    axiomatizing, axiomatising
-    aye's, ay's
-    aye, ay
-    azotemia, azotaemia
-    azotization, azotisation
-    azotize, azotise
-    azotized, azotised
-    azotizes, azotises
-    azotizing, azotising
-    azotorrhea, azotorrhoea
-    Babelization's, Babelisation's
-    Babelization, Babelisation
-    Babelize's, Babelise's
-    Babelize, Babelise
-    Babelized's, Babelised's
-    Babelized, Babelised
-    Babelizing's, Babelising's
-    Babelizing, Babelising
-    Babylonize's, Babylonise's
-    Babylonize, Babylonise
-    Babylonizes, Babylonises
-    bachelorize, bachelorise
-    bachelorizes, bachelorises
-    bacillemia, bacillaemia
-    bacillemias, bacillaemias
-    bacilli, bacilluses
-    backpedaled, backpedalled
-    backpedaling, backpedalling
-    baconize, baconise
-    baconizes, baconises
-    bacteremia's, bacteraemia's
-    bacteremia, bacteraemia
-    bacteremias, bacteraemias
-    bacteria, bacteria
-    bacteriemia, bacteriaemia
-    bacterize, bacterise
-    bacterized, bacterised
-    bacterizes, bacterises
-    bacterizing, bacterising
-    baddie's, baddy's
-    baddie, baddy
-    Baer's, Bare's
-    Baer, Bare
-    balk's, baulk's
-    balk, baulk
-    Balkanization's, Balkanisation's
-    balkanization's, balkanisation's
-    Balkanization, Balkanisation
-    balkanization, balkanisation
-    Balkanizations, Balkanisations
-    balkanizations, balkanisations
-    Balkanize, Balkanise
-    balkanize, balkanise
-    Balkanized, Balkanised
-    balkanized, balkanised
-    Balkanizes, Balkanises
-    balkanizes, balkanises
-    Balkanizing, Balkanising
-    balkanizing, balkanising
-    balked, baulked
-    balking, baulking
-    balks, baulks
-    balladize, balladise
-    balladized, balladised
-    balladizes, balladises
-    balladizing, balladising
-    baloney's, boloney's
-    baloney, boloney
-    balsamize, balsamise
-    balsamizes, balsamises
-    banalization, banalisation
-    banalizations, banalisations
-    banalize, banalise
-    banalized, banalised
-    banalizes, banalises
-    banalizing, banalising
-    bandanna's, bandana's
-    bandanna, bandana
-    bandannas, bandanas
-    bandoleer's, bandolier's
-    bandoleer, bandolier
-    bandoleers, bandoliers
-    banister's, bannister's
-    banister, bannister
-    banisters, bannisters
-    banshee's, banshie's
-    banshee, banshie
-    banshees, banshies
-    bantamize, bantamise
-    bantamizes, bantamises
-    baptisteries, baptistries
-    baptistery's, baptistry's
-    baptistery, baptistry
-    baptizable's, baptisable's
-    baptizable, baptisable
-    baptizables, baptisables
-    baptize, baptise
-    baptized, baptised
-    baptizement's, baptisement's
-    baptizement, baptisement
-    baptizements, baptisements
-    baptizer's, baptiser's
-    baptizer, baptiser
-    baptizers, baptisers
-    baptizes, baptises
-    baptizing, baptising
-    barbarianize, barbarianise
-    barbarianizes, barbarianises
-    barbarization's, barbarisation's
-    barbarization, barbarisation
-    barbarizations, barbarisations
-    barbarize, barbarise
-    barbarized, barbarised
-    barbarizes, barbarises
-    barbarizing, barbarising
-    barbecue's, barbeque's
-    barbecue, barbeque
-    barbecued, barbequed
-    barbecues, barbeques
-    barbecuing, barbequing
-    barcarole's, barcarolle's
-    barcarole, barcarolle
-    barcaroles, barcarolles
-    baronetize, baronetise
-    baronetized, baronetised
-    baronetizing, baronetising
-    baronize, baronise
-    baronizes, baronises
-    barreled, barrelled
-    barreling, barrelling
-    bartizan, bartisan
-    bartizaned, bartisaned
-    bartizans, bartisans
-    barycenter, barycentre
-    bastardization's, bastardisation's
-    bastardization, bastardisation
-    bastardizations, bastardisations
-    bastardize, bastardise
-    bastardized, bastardised
-    bastardizes, bastardises
-    bastardizing, bastardising
-    bastinaded, bastinadoed
-    bastinades, bastinadoes
-    bathyscaphe's, bathyscaph's
-    bathyscaphe, bathyscaph
-    bathyscaphes, bathyscaphs
-    battleaxe's, battleax's
-    battleaxe, battleax
-    battologize, battologise
-    battologized, battologised
-    battologizing, battologising
-    beaverize, beaverise
-    beaverizes, beaverises
-    beclamor, beclamour
-    beclamored, beclamoured
-    beclamoring, beclamouring
-    beclamors, beclamours
-    becolor, becolour
-    becudgeled, becudgelled
-    becudgeling, becudgelling
-    bedeviled, bedevilled
-    bedeviling, bedevilling
-    bedlamize, bedlamise
-    bedlamized, bedlamised
-    bedlamizes, bedlamises
-    bedlamizing, bedlamising
-    bedriveled, bedrivelled
-    bedriveling, bedrivelling
-    Beera's, Berea's
-    Beera, Berea
-    beeves, beef
-    befavor, befavour
-    beglamor, beglamour
-    beglamored, beglamoured
-    beglamoring, beglamouring
-    beglamors, beglamours
-    behavior's, behaviour's
-    behavior, behaviour
-    behavioral, behavioural
-    behavioraler, behaviouraler
-    behavioralest, behaviouralest
-    behaviorally, behaviourally
-    behaviored, behavioured
-    behaviorism's, behaviourism's
-    behaviorism, behaviourism
-    behaviorisms, behaviourisms
-    behaviorist's, behaviourist's
-    behaviorist, behaviourist
-    behavioristic, behaviouristic
-    behavioristicer, behaviouristicer
-    behavioristicest, behaviouristicest
-    behavioristics, behaviouristics
-    behaviorists, behaviourists
-    behaviors, behaviours
-    Behmenism's, Boehmenism's
-    Behmenism, Boehmenism
-    behmenism, boehmenism
-    Behmenist's, Boehmenist's
-    Behmenist, Boehmenist
-    Behmenite's, Boehmenite's
-    Behmenite, Boehmenite
-    behoove's, behove's
-    behoove, behove
-    behooved, behoved
-    behooves, behoves
-    behooving's, behoving's
-    behooving, behoving
-    behoovingly, behovingly
-    behoovings, behovings
-    bejeweled, bejewelled
-    bejeweling, bejewelling
-    bel's, bael's
-    bel, bael
-    belabor's, belabour's
-    belabor, belabour
-    belabored, belaboured
-    belaboring, belabouring
-    belabors, belabours
-    bels, baels
-    Belter's, Boelter's
-    Belter, Boelter
-    Belus's, Boelus's
-    Belus, Boelus
-    bemedaled, bemedalled
-    Beria's, Baeria's
-    Beria, Baeria
-    berk, burk
-    berks, burks
-    Berl's, Baerl's
-    Berl, Baerl
-    Berlinize's, Berlinise's
-    Berlinize, Berlinise
-    Berlinizes, Berlinises
-    berloque, breloque
-    berme, breme
-    bern, bren
-    Bessemerize's, Bessemerise's
-    Bessemerize, Bessemerise
-    Bessemerizes, Bessemerises
-    bestialize, bestialise
-    bestialized, bestialised
-    bestializes, bestialises
-    bestializing, bestialising
-    beveled, bevelled
-    beveler's, beveller's
-    beveler, beveller
-    bevelers, bevellers
-    beveling, bevelling
-    bevelings, bevellings
-    Beyer's, Baeyer's
-    Beyer, Baeyer
-    biased, biassed
-    biasing, biassing
-    bichromatize, bichromatise
-    bichromatizes, bichromatises
-    bicolor's, bicolour's
-    bicolor, bicolour
-    bicolored, bicoloured
-    bicoloredder, bicolouredder
-    bicoloreddest, bicoloureddest
-    bicolorous, bicolourous
-    bicolorrer, bicolourer
-    bicolorrest, bicolourest
-    bicolors, bicolours
-    bimetalist, bimetallist
-    bimetalistic, bimetallistic
-    bingeing, binging
-    biocenology, biocoenology
-    biocenose, biocoenose
-    biocenoses, biocoenoses
-    biocenosis, biocoenosis
-    biocenotic, biocoenotic
-    biographize, biographise
-    biographizes, biographises
-    biologize, biologise
-    biologizes, biologises
-    biosynthesized, biosynthesised
-    bipolarization, bipolarisation
-    bipolarize, bipolarise
-    bipolarizes, bipolarises
-    Birminghamize's, Birminghamise's
-    Birminghamize, Birminghamise
-    Birminghamizes, Birminghamises
-    bister's, bistre's
-    bister, bistre
-    bistered, bistred
-    bisteredder, bistredder
-    bistereddest, bistreddest
-    bisters, bistres
-    bittor, bittour
-    bittors, bittours
-    bituminization's, bituminisation's
-    bituminization, bituminisation
-    bituminizations, bituminisations
-    bituminize, bituminise
-    bituminized, bituminised
-    bituminizes, bituminises
-    bituminizing, bituminising
-    bize's, bise's
-    bize, bise
-    bizet, biset
-    blaize, blaise
-    blamable, blameable
-    blastocele, blastocoele
-    blastule, blastulae
-    blennemesis, blennoemesis
-    blennorrhea, blennorrhoea
-    blowzier, blowsier
-    blowziest, blowsiest
-    blowzy, blowsy
-    bluing's, blueing's
-    bluing, blueing
-    bo's'n's, bos'n's
-    bo'suns, bos'ns
-    bocce's, bocci's
-    bocce, bocci
-    Boedromius's, Boaedromius's
-    Boedromius, Boaedromius
-    bogeyed, bogied
-    bogeying, bogieing
-    bogeys, bogies
-    bogie's, bogey's
-    bogie, bogey
-    bogies, bogeys
-    bogy's, bogie's
-    bogy, bogie
-    boled, boloed
-    Bolshevize, Bolshevise
-    bolshevize, bolshevise
-    Bolshevized, Bolshevised
-    bolshevized, bolshevised
-    bolshevizes, bolshevises
-    Bolshevizing, Bolshevising
-    bolshevizing, bolshevising
-    bolshie, bolshy
-    bonderize, bonderise
-    bonny, bonnie
-    bony, boney
-    boogeyman's, boogerman's
-    boogeyman, boogerman
-    boogeymen, boogermans
-    boombox's, boom_box's
-    boombox, boom_box
-    boomboxes, boom_boxes
-    bor, bour
-    borage, bourage
-    borasque, bourasque
-    bord, bourd
-    bords, bourds
-    borg, bourg
-    borize, borise
-    borizes, borises
-    borscht's, borsch's
-    borscht, borsch
-    bos'n, bo's'n
-    Boswellize, Boswellise
-    Boswellized, Boswellised
-    Boswellizes, Boswellises
-    Boswellizing, Boswellising
-    botanize, botanise
-    botanized, botanised
-    botanizer's, botaniser's
-    botanizer, botaniser
-    botanizes, botanises
-    botanizing, botanising
-    boulder's, bowlder's
-    boulder, bowlder
-    boulders, bowlders
-    boulevardize, boulevardise
-    boulevardizes, boulevardises
-    bourbonize, bourbonise
-    bourbonizes, bourbonises
-    bowdlerization's, bowdlerisation's
-    bowdlerization, bowdlerisation
-    bowdlerizations, bowdlerisations
-    bowdlerize, bowdlerise
-    bowdlerized, bowdlerised
-    bowdlerizer's, bowdleriser's
-    bowdlerizer, bowdleriser
-    bowdlerizers, bowdlerisers
-    bowdlerizes, bowdlerises
-    bowdlerizing, bowdlerising
-    boweled, bowelled
-    boweling, bowelling
-    bradypnea, bradypnoea
-    breathalyze, breathalyse
-    breathalyzed, breathalysed
-    breathalyzer's, breathalyser's
-    breathalyzer, breathalyser
-    breathalyzers, breathalysers
-    breathalyzes, breathalyses
-    breathalyzing, breathalysing
-    brier's, briar's
-    brier, briar
-    briers, briars
-    brimful, brimfull
-    brinkmanship's, brinksmanship's
-    brinkmanship, brinksmanship
-    briquette's, briquet's
-    briquette, briquet
-    briquettes, briquets
-    briza's, brisa's
-    briza, brisa
-    bromethylene, bromoethylene
-    brominize, brominise
-    brominizes, brominises
-    bromization's, bromisation's
-    bromization, bromisation
-    bromize, bromise
-    bromized, bromised
-    bromizing, bromising
-    bronco's, broncho's
-    bronco, broncho
-    broncos, bronchos
-    brusque, brusk
-    brusquely, bruskly
-    brusqueness's, bruskness's
-    brusqueness, bruskness
-    brusquenesses, brusknesses
-    brusquer, brusker
-    brusquest, bruskest
-    brutalization's, brutalisation's
-    brutalization, brutalisation
-    brutalizations, brutalisations
-    brutalize, brutalise
-    brutalized, brutalised
-    brutalizes, brutalises
-    brutalizing, brutalising
-    Budenny's, Budaenny's
-    Budenny, Budaenny
-    bunco's, bunko's
-    bunco, bunko
-    buncoed, bunkoed
-    buncoing, bunkoing
-    buncos, bunkos
-    bunkum's, buncombe's
-    bunkum, buncombe
-    bunkums, buncombes
-    bureaucratization's, bureaucratisation's
-    bureaucratization, bureaucratisation
-    bureaucratizations, bureaucratisations
-    bureaucratize, bureaucratise
-    bureaucratized, bureaucratised
-    bureaucratizes, bureaucratises
-    bureaucratizing, bureaucratising
-    burglarize, burglarise
-    burglarized, burglarised
-    burglarizes, burglarises
-    burglarizing, burglarising
-    burnettize, burnettise
-    burnettized, burnettised
-    burnettizes, burnettises
-    burnettizing, burnettising
-    burnoose's, burnous's
-    burnoose, burnous
-    burnooses, burnouses
-    burqa's, burkha's
-    burqa, burkha
-    burqas, burkhas
-    busheled, bushelled
-    busheler's, busheller's
-    busheler, busheller
-    bushelers, bushellers
-    busheling, bushelling
-    bushelings, bushellings
-    bylaw's, byelaw's
-    bylaw, byelaw
-    bylaws, byelaws
-    Byronize's, Byronise's
-    Byronize, Byronise
-    Byronizes, Byronises
-    Byzantinize's, Byzantinise's
-    Byzantinize, Byzantinise
-    Byzantinizes, Byzantinises
-    cabbala, cabbalah
-    cabby's, cabbie's
-    cabby, cabbie
-    cacesthesia, cacaesthesia
-    cachemia, cachaemia
-    cachemic, cachaemic
-    cacodemon, cacodaemon
-    cacodemoniac, cacodaemoniac
-    cacodemonial, cacodaemonial
-    cacodemonic, cacodaemonic
-    cacodemons, cacodaemons
-    cacoethes's, cacoaethes's
-    cacoethes, cacoaethes
-    cadaster's, cadastre's
-    cadaster, cadastre
-    cadasters, cadastres
-    cadaverize, cadaverise
-    cadaverizes, cadaverises
-    cadmiumize, cadmiumise
-    cadmiumizes, cadmiumises
-    caesarian's, cesarian's
-    caesarian, cesarian
-    caesarians, cesarians
-    Caesarize's, Caesarise's
-    Caesarize, Caesarise
-    Caesarizes, Caesarises
-    caffer, caffre
-    caftan's, kaftan's
-    caftan, kaftan
-    caftans, kaftans
-    cagey, cagy
-    caginess's, cageyness's
-    caginess, cageyness
-    caginesses, cageynesses
-    caiman's, cayman's
-    caiman, cayman
-    caimans, caymans
-    calander, calandre
-    calcemia, calcaemia
-    calendarization, calendarisation
-    calendarizations, calendarisations
-    calendarize, calendarise
-    calendarized, calendarised
-    calendarizes, calendarises
-    calendarizing, calendarising
-    Calender's, Calendre's
-    Calender, Calendre
-    caliber's, calibre's
-    caliber, calibre
-    calibers, calibres
-    calif's, khalif's
-    calif, khalif
-    califs, khalifs
-    caliper's, calliper's
-    caliper, calliper
-    calipered, callipered
-    calipering, callipering
-    calipers, callipers
-    calisthenic, callisthenic
-    calisthenics, callisthenics
-    calk's, caulk's
-    calk, caulk
-    calked, caulked
-    calking, caulking
-    calks, caulks
-    Callirrhoe's, Callirrhoae's
-    Callirrhoe, Callirrhoae
-    calodemon, calodaemon
-    Calvinize's, Calvinise's
-    Calvinize, Calvinise
-    Calvinizes, Calvinises
-    camisades, camisadoes
-    camize, camise
-    Canadianization's, Canadianisation's
-    Canadianization, Canadianisation
-    Canadianizations, Canadianisations
-    Canadianize's, Canadianise's
-    Canadianize, Canadianise
-    Canadianizes, Canadianises
-    canaled, canalled
-    canaler, canaller
-    canalers, canallers
-    canaling, canalling
-    canalization's, canalisation's
-    canalization, canalisation
-    canalizations, canalisations
-    canalize, canalise
-    canalized, canalised
-    canalizes, canalises
-    canalizing, canalising
-    Cananean's, Cananaean's
-    Cananean, Cananaean
-    cancelable, cancellable
-    cancelate, cancellate
-    cancelated, cancellated
-    canceled, cancelled
-    canceler's, canceller's
-    canceler, canceller
-    cancelers, cancellers
-    canceling, cancelling
-    cancellation, cancelation
-    cancelous, cancellous
-    candor's, candour's
-    candor, candour
-    candors, candours
-    canephore, canephorae
-    canephore, canephoroe
-    canisterization, canisterisation
-    canisterizations, canisterisations
-    canisterize, canisterise
-    canisterized, canisterised
-    canisterizes, canisterises
-    canisterizing, canisterising
-    cannibalization's, cannibalisation's
-    cannibalization, cannibalisation
-    cannibalizations, cannibalisations
-    cannibalize, cannibalise
-    cannibalized, cannibalised
-    cannibalizes, cannibalises
-    cannibalizing, cannibalising
-    canonicalization, canonicalisation
-    canonicalize, canonicalise
-    canonicalized, canonicalised
-    canonicalizes, canonicalises
-    canonicalizing, canonicalising
-    canonization's, canonisation's
-    canonization, canonisation
-    canonizations, canonisations
-    canonize, canonise
-    canonized, canonised
-    canonizer's, canoniser's
-    canonizer, canoniser
-    canonizers, canonisers
-    canonizes, canonises
-    canonizing, canonising
-    cantaloupe's, cantaloup's
-    cantaloupe, cantaloup
-    cantaloupes, cantaloups
-    cantonization, cantonisation
-    cantonizations, cantonisations
-    cantonize, cantonise
-    cantonized, cantonised
-    cantonizes, cantonises
-    cantonizing, cantonising
-    capitalizable's, capitalisable's
-    capitalizable, capitalisable
-    capitalizabler, capitalisabler
-    capitalizables, capitalisables
-    capitalizablest, capitalisablest
-    capitalization's, capitalisation's
-    capitalization, capitalisation
-    capitalizations, capitalisations
-    capitalize, capitalise
-    capitalized, capitalised
-    capitalizer's, capitaliser's
-    capitalizer, capitaliser
-    capitalizers, capitalisers
-    capitalizes, capitalises
-    capitalizing, capitalising
-    caponization's, caponisation's
-    Caponization, Caponisation
-    caponization, caponisation
-    caponize, caponise
-    caponized, caponised
-    caponizer's, caponiser's
-    caponizer, caponiser
-    caponizes, caponises
-    caponizing, caponising
-    capsulization, capsulisation
-    capsulize, capsulise
-    capsulized, capsulised
-    capsulizes, capsulises
-    capsulizing, capsulising
-    caracoled, caracolled
-    caracoling, caracolling
-    caramelization's, caramelisation's
-    caramelization, caramelisation
-    caramelizations, caramelisations
-    caramelize, caramelise
-    caramelized, caramelised
-    caramelizes, caramelises
-    caramelizing, caramelising
-    caravansarais, caravansarai
-    caravansary's, caravanserai's
-    caravansary, caravanserai
-    carbolization, carbolisation
-    carbolize, carbolise
-    carbolized, carbolised
-    carbolizes, carbolises
-    carbolizing, carbolising
-    carbonades, carbonadoes
-    carbonatization's, carbonatisation's
-    carbonatization, carbonatisation
-    carbonatizations, carbonatisations
-    carbonizable's, carbonisable's
-    carbonizable, carbonisable
-    carbonizabler, carbonisabler
-    carbonizables, carbonisables
-    carbonizablest, carbonisablest
-    carbonization's, carbonisation's
-    carbonization, carbonisation
-    carbonizations, carbonisations
-    carbonize, carbonise
-    carbonized, carbonised
-    carbonizer's, carboniser's
-    carbonizer, carboniser
-    carbonizers, carbonisers
-    carbonizes, carbonises
-    carbonizing, carbonising
-    carburettor's, carburetter's
-    carburettor, carburetter
-    carburettors, carburetters
-    carburization's, carburisation's
-    carburization, carburisation
-    carburizations, carburisations
-    carburize, carburise
-    carburized, carburised
-    carburizer's, carburiser's
-    carburizer, carburiser
-    carburizes, carburises
-    carburizing, carburising
-    cardie, cardiae
-    cardueline, carduelinae
-    carnalize, carnalise
-    carnalized, carnalised
-    carnalizes, carnalises
-    carnalizing, carnalising
-    carney's, carnie's
-    carney, carnie
-    carnies, carneys
-    caroled, carolled
-    caroler's, caroller's
-    caroler, caroller
-    carolers, carollers
-    caroling, carolling
-    carotinemia, carotinaemia
-    carousel's, carrousel's
-    carousel, carrousel
-    carousels, carrousels
-    cartelization's, cartelisation's
-    cartelization, cartelisation
-    cartelizations, cartelisations
-    cartelize, cartelise
-    cartelized, cartelised
-    cartelizes, cartelises
-    cartelizing, cartelising
-    caster's, castor's
-    caster's, castor's
-    caster, castor
-    caster, castor
-    casters, castors
-    casters, castors
-    castorized's, castorised's
-    castorized, castorised
-    castorizeds, castoriseds
-    casualization, casualisation
-    casualizations, casualisations
-    casualize, casualise
-    casualized, casualised
-    casualizes, casualises
-    casualizing, casualising
-    catabolize, catabolise
-    catalog's, catalogue's
-    catalog, catalogue
-    cataloged, catalogued
-    cataloger's, cataloguer's
-    cataloger, cataloguer
-    catalogers, cataloguers
-    cataloging, cataloguing
-    catalogs, catalogues
-    cataloguize, cataloguise
-    cataloguized, cataloguised
-    cataloguizes, cataloguises
-    cataloguizing, cataloguising
-    catalyze, catalyse
-    catalyzed, catalysed
-    catalyzer's, catalyser's
-    catalyzer, catalyser
-    catalyzers, catalysers
-    catalyzes, catalyses
-    catalyzing, catalysing
-    catechizable's, catechisable's
-    catechizable, catechisable
-    catechizabler, catechisabler
-    catechizables, catechisables
-    catechizablest, catechisablest
-    catechization's, catechisation's
-    catechization, catechisation
-    catechizations, catechisations
-    catechize, catechise
-    catechized, catechised
-    catechizer's, catechiser's
-    catechizer, catechiser
-    catechizers, catechisers
-    catechizes, catechises
-    catechizing, catechising
-    catechizings, catechisings
-    categorization's, categorisation's
-    categorization, categorisation
-    categorizations, categorisations
-    categorize, categorise
-    categorized, categorised
-    categorizer, categoriser
-    categorizers, categorisers
-    categorizes, categorises
-    categorizing, categorising
-    catharize, catharise
-    catharized, catharised
-    catharizes, catharises
-    catharizing, catharising
-    catheterization's, catheterisation's
-    catheterization, catheterisation
-    catheterizations, catheterisations
-    catheterize, catheterise
-    catheterized, catheterised
-    catheterizes, catheterises
-    catheterizing, catheterising
-    catholicization's, catholicisation's
-    Catholicization, Catholicisation
-    catholicization, catholicisation
-    catholicizations, catholicisations
-    catholicize, catholicise
-    Catholicized, Catholicised
-    catholicized, catholicised
-    catholicizer's, catholiciser's
-    catholicizer, catholiciser
-    catholicizers, catholicisers
-    catholicizes, catholicises
-    Catholicizing, Catholicising
-    catholicizing, catholicising
-    catsup's, catchup's
-    catsup, catchup
-    catsups, catchups
-    cauldron's, caldron's
-    cauldron, caldron
-    cauldrons, caldrons
-    caulk, calk
-    caulked, calked
-    caulking, calking
-    caulks, calks
-    causticization's, causticisation's
-    causticization, causticisation
-    causticizations, causticisations
-    causticize, causticise
-    causticizer, causticiser
-    causticizers, causticisers
-    causticizes, causticises
-    cauterization's, cauterisation's
-    cauterization, cauterisation
-    cauterizations, cauterisations
-    cauterize, cauterise
-    cauterized, cauterised
-    cauterizes, cauterises
-    cauterizing, cauterising
-    caviar's, caviare's
-    caviar, caviare
-    caviars, caviares
-    cavilation, cavillation
-    caviled, cavilled
-    caviler's, caviller's
-    caviler, caviller
-    cavilers, cavillers
-    caviling, cavilling
-    cavilings, cavillings
-    ce, coe
-    cecally, caecally
-    cecitis, caecitis
-    cecitises, caecitises
-    cecity, caecity
-    cecostomy, caecostomy
-    cecotomy, caecotomy
-    Celastraceae's, Coelastraceae's
-    Celastraceae, Coelastraceae
-    celastraceous, coelastraceous
-    celestialize, celestialise
-    celestializes, celestialises
-    celestine, coelestine
-    celiac, coeliac
-    celiacs, coeliacs
-    celialgia, coelialgia
-    celiomyalgia, coeliomyalgia
-    celiorrhea, coeliorrhea
-    celioscopy, coelioscopy
-    celiotomy, coeliotomy
-    celom's, coelom's
-    celom, coelom
-    celoma, coeloma
-    celomata, coelomata
-    celoscope's, coeloscope's
-    celoscope, coeloscope
-    Celticize's, Celticise's
-    Celticize, Celticise
-    Celticizes, Celticises
-    cenacle's, coenacle's
-    cenacle, coenacle
-    cenaculum, coenaculum
-    cenesthesia's, coenesthesia's
-    cenesthesia, coenesthesia
-    cenesthesias, coenesthesias
-    cenesthesis, coenesthesis
-    Cenis's, Caenis's
-    Cenis, Caenis
-    cenobe, coenobe
-    cenobite's, coenobite's
-    cenobite, coenobite
-    cenobites, coenobites
-    cenobitic, coenobitic
-    cenobitical, coenobitical
-    cenobitism's, coenobitism's
-    cenobitism, coenobitism
-    cenobium, coenobium
-    cenoby, coenoby
-    cenogenetic, caenogenetic
-    cenogenetic, coenogenetic
-    cenogenetically, caenogenetically
-    cenosite, coenosite
-    cenospecies, coenospecies
-    cenospecific, coenospecific
-    cenospecifically, coenospecifically
-    cenozoic, caenozoic
-    center's, centre's
-    center, centre
-    centerable's, centreable's
-    centerable, centreable
-    centerables, centreables
-    centerboard's, centreboard's
-    centerboard, centreboard
-    centerboards, centreboards
-    centered, centred
-    centerer, centrer
-    centerers, centrers
-    centerfold's, centrefold's
-    centerfold, centrefold
-    centerfolds, centrefolds
-    centering's, centring's
-    centering, centring
-    centerings, centrings
-    centerless, centreless
-    centerlesser, centrelesser
-    centerlessest, centrelessest
-    centerline's, centreline's
-    centerline, centreline
-    centerlines, centrelines
-    centermost, centremost
-    centerpiece's, centrepiece's
-    centerpiece, centrepiece
-    centerpieces, centrepieces
-    centers, centres
-    Centerville's, Centreville's
-    Centerville, Centreville
-    centigram's, centigramme's
-    centigram, centigramme
-    centigrams, centigrammes
-    centiliter's, centilitre's
-    centiliter, centilitre
-    centiliters, centilitres
-    centimeter's, centimetre's
-    centimeter, centimetre
-    centimeters, centimetres
-    centralization's, centralisation's
-    centralization, centralisation
-    centralizations, centralisations
-    centralize, centralise
-    centralized, centralised
-    centralizer's, centraliser's
-    centralizer, centraliser
-    centralizers, centralisers
-    centralizes, centralises
-    centralizing, centralising
-    centrifugalization's, centrifugalisation's
-    centrifugalization, centrifugalisation
-    centrifugalizations, centrifugalisations
-    centrifugalize, centrifugalise
-    centrifugalized, centrifugalised
-    centrifugalizes, centrifugalises
-    centrifugalizing, centrifugalising
-    cephalization's, cephalisation's
-    cephalization, cephalisation
-    cephalizations, cephalisations
-    cer, cre
-    cera, crea
-    cerat, creat
-    ceratin, creatin
-    ceratins, creatins
-    cere's, cree's
-    cere, cree
-    cerebralization's, cerebralisation's
-    cerebralization, cerebralisation
-    cerebralizations, cerebralisations
-    cerebralize, cerebralise
-    cerebralizes, cerebralises
-    ceremonialize, ceremonialise
-    ceremonializes, ceremonialises
-    ceres, crees
-    cerolite, creolite
-    cerule, caerule
-    ceruleolactite, coeruleolactite
-    cesar, caesar
-    Cesaria's, Caesaria's
-    Cesaria, Caesaria
-    cesious, caesious
-    cesium's, caesium's
-    cesium, caesium
-    cesiums, caesiums
-    cespitose, caespitose
-    cespitosely, caespitosely
-    cestus, caestus
-    cestuses, caestuses
-    cesural, caesural
-    cetus, coetus
-    chaces, chacoes
-    chalaze, chalazae
-    Chaldeans, Chaldaeans
-    chameleonize, chameleonise
-    chameleonizes, chameleonises
-    Chamizal's, Chamisal's
-    Chamizal, Chamisal
-    chamomile's, camomile's
-    chamomile, camomile
-    chamomiles, camomiles
-    championize, championise
-    championizes, championises
-    channeled, channelled
-    channeler's, channeller's
-    channeler, channeller
-    channelers, channellers
-    channeling, channelling
-    channelization's, channelisation's
-    channelization, channelisation
-    channelizations, channelisations
-    channelize, channelise
-    channelized, channelised
-    channelizes, channelises
-    channelizing, channelising
-    chaperon's, chaperone's
-    chaperon, chaperone
-    chaperons, chaperones
-    chaptalization, chaptalisation
-    chaptalizations, chaptalisations
-    chaptalize, chaptalise
-    chaptalized, chaptalised
-    chaptalizes, chaptalises
-    chaptalizing, chaptalising
-    characterizable's, characterisable's
-    characterizable, characterisable
-    characterizabler, characterisabler
-    characterizables, characterisables
-    characterizablest, characterisablest
-    characterization's, characterisation's
-    characterization, characterisation
-    characterizations, characterisations
-    characterize, characterise
-    characterized, characterised
-    characterizer's, characteriser's
-    characterizer, characteriser
-    characterizers, characterisers
-    characterizes, characterises
-    characterizing, characterising
-    charer, charre
-    chattelization's, chattelisation's
-    chattelization, chattelisation
-    chattelizations, chattelisations
-    chattelize, chattelise
-    chattelizes, chattelises
-    checkbook's, chequebook's
-    checkbook, chequebook
-    checkbooks, chequebooks
-    checkerboard's, chequerboard's
-    checkerboard, chequerboard
-    checkerboards, chequerboards
-    cheerfulize, cheerfulise
-    cheerfulizes, cheerfulises
-    cheerly, cherely
-    chelicere, chelicerae
-    chemicalization's, chemicalisation's
-    chemicalization, chemicalisation
-    chemicalizations, chemicalisations
-    chemicalize, chemicalise
-    chemicalizes, chemicalises
-    chenix, choenix
-    chenixes, choenixes
-    chetopod, chaetopod
-    chiffer, chiffre
-    childer, childre
-    chile's, chilli's
-    chile, chilli
-    chilis, chillies
-    chimera's, chimaera's
-    chimera, chimaera
-    chimeras, chimaeras
-    chimerid, chimaerid
-    chimerids, chimaerids
-    chimerism, chimaerism
-    chimerisms, chimaerisms
-    chiseled, chiselled
-    chiseler's, chiseller's
-    chiseler, chiseller
-    chiselers, chisellers
-    chiseling, chiselling
-    chitlins's, chitlings's
-    chitlins, chitlings
-    chivied, chivvied
-    chivies, chivvies
-    chivy, chivvy
-    chivying, chivvying
-    chloranemia, chloranaemia
-    chloremia, chloraemia
-    chloridize, chloridise
-    chloridized, chloridised
-    chloridizes, chloridises
-    chloridizing, chloridising
-    chlorinize, chlorinise
-    chlorinized, chlorinised
-    chlorinizes, chlorinises
-    chlorinizing, chlorinising
-    chloritization, chloritisation
-    chloritizations, chloritisations
-    chloroanemia, chloroanaemia
-    chloroformization's, chloroformisation's
-    chloroformization, chloroformisation
-    chloroformizations, chloroformisations
-    chloroformize, chloroformise
-    chloroformizes, chloroformises
-    chlorophyll's, chlorophyl's
-    chlorophyll, chlorophyl
-    chlorophylls, chlorophyls
-    chocoholic's, chocaholic's
-    chocoholic, chocaholic
-    chocoholics, chocaholics
-    chocolaty, chocolatey
-    Choephori's, Choaephori's
-    Choephori, Choaephori
-    cholemia, cholaemia
-    cholemias, cholaemias
-    cholophein, cholophaein
-    choosy, choosey
-    chorization's, chorisation's
-    chorization, chorisation
-    chorizations, chorisations
-    Christianization's, Christianisation's
-    Christianization, Christianisation
-    christianization, christianisation
-    Christianizations, Christianisations
-    christianizations, christianisations
-    Christianize, Christianise
-    christianize, christianise
-    Christianized, Christianised
-    christianized, christianised
-    Christianizer's, Christianiser's
-    Christianizer, Christianiser
-    christianizer, christianiser
-    Christianizers, Christianisers
-    christianizers, christianisers
-    Christianizes, Christianises
-    christianizes, christianises
-    Christianizing, Christianising
-    christianizing, christianising
-    chromatize, chromatise
-    chromatizes, chromatises
-    chromesthesia, chromaesthesia
-    chromicize, chromicise
-    chromicizes, chromicises
-    chromize, chromise
-    chromized, chromised
-    chromizes, chromises
-    chromizing, chromising
-    chronologize, chronologise
-    chronologized, chronologised
-    chronologizes, chronologises
-    chronologizing, chronologising
-    chutzpa's, hutzpah's
-    chutzpa, hutzpah
-    chutzpas, hutzpahes
-    cicatrices, cicatrixes
-    cicatricule, cicatriculae
-    cicatrix's, cicatrice's
-    cicatrix, cicatrice
-    cicatrizant, cicatrisant
-    cicatrizate, cicatrisate
-    cicatrization's, cicatrisation's
-    cicatrization, cicatrisation
-    cicatrizations, cicatrisations
-    cicatrize, cicatrise
-    cicatrized, cicatrised
-    cicatrizer's, cicatriser's
-    cicatrizer, cicatriser
-    cicatrizes, cicatrises
-    cicatrizing, cicatrising
-    Ciceronianize's, Ciceronianise's
-    Ciceronianize, Ciceronianise
-    Ciceronianizes, Ciceronianises
-    cigarette's, cigaret's
-    cigarette, cigaret
-    cigarettes, cigarets
-    cimicide, cimicidae
-    cinchonization's, cinchonisation's
-    cinchonization, cinchonisation
-    cinchonizations, cinchonisations
-    cinchonize, cinchonise
-    cinchonized, cinchonised
-    cinchonizes, cinchonises
-    cinchonizing, cinchonising
-    cinematize, cinematise
-    cinter, cintre
-    cipher's, cypher's
-    cipher, cypher
-    ciphered, cyphered
-    ciphering, cyphering
-    ciphers, cyphers
-    Circean, Circaean
-    circularization's, circularisation's
-    circularization, circularisation
-    circularizations, circularisations
-    circularize, circularise
-    circularized, circularised
-    circularizer's, circulariser's
-    circularizer, circulariser
-    circularizers, circularisers
-    circularizes, circularises
-    circularizing, circularising
-    circumcenter, circumcentre
-    circumcenters, circumcentres
-    circumesophagal, circumoesophagal
-    cithern, cithren
-    citherns, cithrens
-    citizenize, citizenise
-    citizenized, citizenised
-    citizenizes, citizenises
-    citizenizing, citizenising
-    civilianization, civilianisation
-    civilianizations, civilianisations
-    civilianize, civilianise
-    civilianized, civilianised
-    civilianizes, civilianises
-    civilianizing, civilianising
-    civilizable's, civilisable's
-    civilizable, civilisable
-    civilizabler, civilisabler
-    civilizables, civilisables
-    civilizablest, civilisablest
-    civilization's, civilisation's
-    civilization, civilisation
-    civilizational's, civilisational's
-    civilizational, civilisational
-    civilizationaler, civilisationaler
-    civilizationalest, civilisationalest
-    civilizationals, civilisationals
-    civilizations, civilisations
-    civilizatory, civilisatory
-    civilize, civilise
-    civilized, civilised
-    civilizedness's, civilisedness's
-    civilizedness, civilisedness
-    civilizednesses, civilisednesses
-    civilizer's, civiliser's
-    civilizer, civiliser
-    civilizers, civilisers
-    civilizes, civilises
-    civilizing, civilising
-    civvies, civies
-    civvy's, civie's
-    civvy, civie
-    cize, cise
-    clamor's, clamour's
-    clamor, clamour
-    clamored, clamoured
-    clamorer's, clamourer's
-    clamorer, clamourer
-    clamorers, clamourers
-    clamoring, clamouring
-    clamorist's, clamourist's
-    clamorist, clamourist
-    clamors, clamours
-    clamorsome, clamoursome
-    clangor's, clangour's
-    clangor, clangour
-    clangored, clangoured
-    clangoring, clangouring
-    clangors, clangours
-    clares, claroes
-    clarinetist's, clarinettist's
-    clarinetist, clarinettist
-    clarinetists, clarinettists
-    classicalize, classicalise
-    classicalizes, classicalises
-    classicization, classicisation
-    classicize, classicise
-    classicized, classicised
-    classicizes, classicises
-    classicizing, classicising
-    clausule, clausulae
-    clericalize, clericalise
-    clericalizes, clericalises
-    Clete's, Cloete's
-    Clete, Cloete
-    climatize, climatise
-    climatized, climatised
-    climatizes, climatises
-    climatizing, climatising
-    clower, clowre
-    Clytie's, Clytiae's
-    Clytie, Clytiae
-    coalize, coalise
-    coalized, coalised
-    coalizer, coaliser
-    coalizers, coalisers
-    coalizes, coalises
-    coalizing, coalising
-    cocaine's, cocain's
-    cocaine, cocain
-    cocainization's, cocainisation's
-    cocainization, cocainisation
-    cocainizations, cocainisations
-    cocainize, cocainise
-    cocainized, cocainised
-    cocainizes, cocainises
-    cocainizing, cocainising
-    coconut's, cocoanut's
-    coconut, cocoanut
-    coconuts, cocoanuts
-    cocuiza, cocuisa
-    Coe's, Cooe's
-    Coe, Cooe
-    coeducationalize, coeducationalise
-    coeducationalizes, coeducationalises
-    coeloms, coelomata
-    coenamor, coenamour
-    coenamored, coenamoured
-    coenamoring, coenamouring
-    coenamorment, coenamourment
-    coenamors, coenamours
-    coequalize, coequalise
-    coequalizes, coequalises
-    cognizability's, cognisability's
-    cognizability, cognisability
-    cognizable, cognisable
-    cognizableness's, cognisableness's
-    cognizableness, cognisableness
-    cognizabler, cognisabler
-    cognizablest, cognisablest
-    cognizablier, cognisablier
-    cognizabliest, cognisabliest
-    cognizably, cognisably
-    cognizance's, cognisance's
-    cognizance, cognisance
-    cognizances, cognisances
-    cognizant, cognisant
-    cognizanter, cognisanter
-    cognizantest, cognisantest
-    cognize, cognise
-    cognized, cognised
-    cognizer's, cogniser's
-    cognizer, cogniser
-    cognizers, cognisers
-    cognizes, cognises
-    cognizing, cognising
-    colander's, cullender's
-    colander, cullender
-    colanders, cullenders
-    collateralize, collateralise
-    collectibilities, collectabilities
-    collectibility's, collectability's
-    collectibility, collectability
-    collectible's, collectable's
-    collectible, collectable
-    collectibles, collectables
-    collectivization's, collectivisation's
-    collectivization, collectivisation
-    collectivizations, collectivisations
-    collectivize, collectivise
-    collectivized, collectivised
-    collectivizes, collectivises
-    collectivizing, collectivising
-    colloquialize, colloquialise
-    colloquializes, colloquialises
-    colloquize, colloquise
-    colloquized, colloquised
-    colloquizes, colloquises
-    colloquizing, colloquising
-    colonialize, colonialise
-    colonialized, colonialised
-    colonializes, colonialises
-    colonializing, colonialising
-    colonizabilities, colonisabilities
-    colonizability's, colonisability's
-    colonizability, colonisability
-    colonizable's, colonisable's
-    colonizable, colonisable
-    colonizabler, colonisabler
-    colonizables, colonisables
-    colonizablest, colonisablest
-    colonization's, colonisation's
-    colonization, colonisation
-    colonizationist's, colonisationist's
-    colonizationist, colonisationist
-    colonizationists, colonisationists
-    colonizations, colonisations
-    colonize, colonise
-    colonized, colonised
-    colonizer's, coloniser's
-    colonizer, coloniser
-    colonizers, colonisers
-    colonizes, colonises
-    colonizing, colonising
-    color's, colour's
-    color, colour
-    colorabilities, colourabilities
-    colorability's, colourability's
-    colorability, colourability
-    colorable's, colourable's
-    colorable, colourable
-    colorableness's, colourableness's
-    colorableness, colourableness
-    colorablenesses, colourablenesses
-    colorabler, colourabler
-    colorables, colourables
-    colorablest, colourablest
-    colorablier, colourablier
-    colorablies, colourablies
-    colorabliest, colourabliest
-    colorably, colourably
-    coloradoite's, colouradoite's
-    coloradoite, colouradoite
-    colorama, colourama
-    colorant's, colourant's
-    colorant, colourant
-    colorants, colourants
-    colorate, colourate
-    coloration's, colouration's
-    coloration, colouration
-    colorational, colourational
-    colorationaler, colourationaler
-    colorationalest, colourationalest
-    colorationallier, colourationallier
-    colorationalliest, colourationalliest
-    colorationally, colourationally
-    colorations, colourations
-    colorative, colourative
-    colorbearer's, colourbearer's
-    colorbearer, colourbearer
-    colorblind, colourblind
-    colorblindness's, colourblindness's
-    colorblindness, colourblindness
-    colorblindnesses, colourblindnesses
-    colorbred, colourbred
-    colorbreed, colourbreed
-    colorbreeding, colourbreeding
-    colorbreeds, colourbreeds
-    colorcast's, colourcast's
-    colorcast, colourcast
-    colorcasted, colourcasted
-    colorcaster, colourcaster
-    colorcasters, colourcasters
-    colorcasting, colourcasting
-    colorcasts, colourcasts
-    colorectal, colourectal
-    colorectitis, colourectitis
-    colorectostomy, colourectostomy
-    colored's, coloured's
-    colored, coloured
-    coloreds, coloureds
-    colorer's, colourer's
-    colorer, colourer
-    colorers, colourers
-    colorfast, colourfast
-    colorfastness's, colourfastness's
-    colorfastness, colourfastness
-    colorfastnesses, colourfastnesses
-    colorful, colourful
-    colorfuler, colourfuler
-    colorfulest, colourfulest
-    colorfullier, colourfullier
-    colorfulliest, colourfulliest
-    colorfully, colourfully
-    colorfulness's, colourfulness's
-    colorfulness, colourfulness
-    colorfulnesses, colourfulnesses
-    colorific's, colourific's
-    colorific, colourific
-    colorifics, colourifics
-    colorimeter's, colourimeter's
-    colorimeter, colourimeter
-    colorimeters, colourimeters
-    colorimetric, colourimetric
-    colorimetrical, colourimetrical
-    colorimetrically, colourimetrically
-    colorimetrics, colourimetrics
-    colorimetries, colourimetries
-    colorimetrist's, colourimetrist's
-    colorimetrist, colourimetrist
-    colorimetry, colourimetry
-    coloring's, colouring's
-    coloring, colouring
-    colorings, colourings
-    colorism, colourism
-    colorisms, colourisms
-    colorist's, colourist's
-    colorist, colourist
-    coloristic, colouristic
-    coloristically, colouristically
-    coloristicer, colouristicer
-    coloristicest, colouristicest
-    coloristics, colouristics
-    colorists, colourists
-    colorless, colourless
-    colorlesser, colourlesser
-    colorlessest, colourlessest
-    colorlesslier, colourlesslier
-    colorlessliest, colourlessliest
-    colorlessly, colourlessly
-    colorlessness's, colourlessness's
-    colorlessness, colourlessness
-    colorlessnesses, colourlessnesses
-    colormaker, colourmaker
-    colormaking, colourmaking
-    colorman's, colourman's
-    colorman, colourman
-    colormap's, colourmap's
-    colormap, colourmap
-    colormaps, colourmaps
-    colormen, colourmen
-    coloroto, colouroto
-    colorpoint, colourpoint
-    colorpoints, colourpoints
-    colorrest, colourest
-    colorrhaphy, colourrhaphy
-    colors, colours
-    colortype, colourtype
-    colorway, colourway
-    colorways, colourways
-    colory, coloury
-    colourisation's, colourization's
-    colourisation, colourization
-    colourisations, colourizations
-    colourise, colourize
-    colourised, colourized
-    colourises, colourizes
-    colourising, colourizing
-    columnization's, columnisation's
-    columnization, columnisation
-    columnizations, columnisations
-    columnize, columnise
-    columnized, columnised
-    columnizes, columnises
-    columnizing, columnising
-    comedia, comoedia
-    commercialization's, commercialisation's
-    commercialization, commercialisation
-    commercializations, commercialisations
-    commercialize, commercialise
-    commercialized, commercialised
-    commercializes, commercialises
-    commercializing, commercialising
-    commonize, commonise
-    commonizes, commonises
-    communalization's, communalisation's
-    communalization, communalisation
-    communalizations, communalisations
-    communalize, communalise
-    communalized, communalised
-    communalizer's, communaliser's
-    communalizer, communaliser
-    communalizers, communalisers
-    communalizes, communalises
-    communalizing, communalising
-    communization's, communisation's
-    communization, communisation
-    communizations, communisations
-    communize, communise
-    communized, communised
-    communizes, communises
-    communizing, communising
-    companionize, companionise
-    companionizes, companionises
-    compartmentalization's, compartmentalisation's
-    compartmentalization, compartmentalisation
-    compartmentalizations, compartmentalisations
-    compartmentalize, compartmentalise
-    compartmentalized, compartmentalised
-    compartmentalizes, compartmentalises
-    compartmentalizing, compartmentalising
-    compartmentize, compartmentise
-    compartmentizes, compartmentises
-    comper, compoer
-    complementizer's, complementiser's
-    complementizer, complementiser
-    Composite, Compositae
-    comprehensivization, comprehensivisation
-    comprehensivizations, comprehensivisations
-    comprehensivize, comprehensivise
-    comprehensivized, comprehensivised
-    comprehensivizes, comprehensivises
-    comprehensivizing, comprehensivising
-    comprizable, comprisable
-    comprizal's, comprisal's
-    comprizal, comprisal
-    computerizable, computerisable
-    computerization's, computerisation's
-    computerization, computerisation
-    computerizations, computerisations
-    computerize, computerise
-    computerized, computerised
-    computerizes, computerises
-    computerizing, computerising
-    concenter, concentre
-    concentered, concentred
-    concentering, concentring
-    concenters, concentres
-    conceptualization's, conceptualisation's
-    conceptualization, conceptualisation
-    conceptualizations, conceptualisations
-    conceptualize, conceptualise
-    conceptualized, conceptualised
-    conceptualizer, conceptualiser
-    conceptualizes, conceptualises
-    conceptualizing, conceptualising
-    concertist, concretist
-    concertize, concertise
-    concertized, concertised
-    concertizer's, concertiser's
-    concertizer, concertiser
-    concertizers, concertisers
-    concertizes, concertises
-    concertizing, concertising
-    conche, conchae
-    concolor, concolour
-    concolorous, concolourous
-    concretization's, concretisation's
-    concretization, concretisation
-    concretizations, concretisations
-    concretize, concretise
-    concretized, concretised
-    concretizes, concretises
-    concretizing, concretising
-    conditionalize, conditionalise
-    conditionalizes, conditionalises
-    coneys, conies
-    confederatize, confederatise
-    confederatizes, confederatises
-    congenialize, congenialise
-    congenializes, congenialises
-    conges, congoes
-    congregationalize, congregationalise
-    congregationalizes, congregationalises
-    conjurer's, conjuror's
-    conjurer, conjuror
-    conjurers, conjurors
-    connectable, connectible
-    connection's, connexion's
-    connection, connexion
-    connections, connexions
-    connector's, connecter's
-    connector, connecter
-    connectors, connecters
-    conservatize, conservatise
-    conservatized, conservatised
-    conservatizes, conservatises
-    conservatizing, conservatising
-    consonantize, consonantise
-    consonantized, consonantised
-    consonantizes, consonantises
-    consonantizing, consonantising
-    constitutionalization's, constitutionalisation's
-    constitutionalization, constitutionalisation
-    constitutionalizations, constitutionalisations
-    constitutionalize, constitutionalise
-    constitutionalized, constitutionalised
-    constitutionalizes, constitutionalises
-    constitutionalizing, constitutionalising
-    containerization's, containerisation's
-    containerization, containerisation
-    containerizations, containerisations
-    containerize, containerise
-    containerized, containerised
-    containerizes, containerises
-    containerizing, containerising
-    contemporization, contemporisation
-    contemporize, contemporise
-    contemporized, contemporised
-    contemporizes, contemporises
-    contemporizing, contemporising
-    contextualization, contextualisation
-    contextualizations, contextualisations
-    contextualize, contextualise
-    contextualized, contextualised
-    contextualizes, contextualises
-    contextualizing, contextualising
-    Continentalize, Continentalise
-    Continentalizes, Continentalises
-    controversialize, controversialise
-    controversializes, controversialises
-    conundrumize, conundrumise
-    conundrumizes, conundrumises
-    convener's, convenor's
-    convener, convenor
-    conveners, convenors
-    conventionalization's, conventionalisation's
-    conventionalization, conventionalisation
-    conventionalizations, conventionalisations
-    conventionalize, conventionalise
-    conventionalized, conventionalised
-    conventionalizes, conventionalises
-    conventionalizing, conventionalising
-    conventionize, conventionise
-    conventionizes, conventionises
-    conversationize, conversationise
-    conversationizes, conversationises
-    converter's, convertor's
-    converter's, convertor's
-    converter, convertor
-    converter, convertor
-    converters, convertors
-    converters, convertors
-    conveyor's, conveyer's
-    conveyor, conveyer
-    conveyorize, conveyorise
-    conveyorized, conveyorised
-    conveyorizes, conveyorises
-    conveyorizing, conveyorising
-    conveyors, conveyers
-    convivialize, convivialise
-    convivializes, convivialises
-    cony's, coney's
-    cony, coney
-    cookie's, cooky's
-    cookie, cooky
-    copolymerization's, copolymerisation's
-    copolymerization, copolymerisation
-    copolymerizations, copolymerisations
-    copolymerize, copolymerise
-    copolymerized, copolymerised
-    copolymerizes, copolymerises
-    copolymerizing, copolymerising
-    copperization's, copperisation's
-    copperization, copperisation
-    copperizations, copperisations
-    copperize, copperise
-    copperizes, copperises
-    copremia, copraemia
-    copremic, copraemic
-    coraled, coralled
-    coranto, couranto
-    corantoes, courantoes
-    corantos, courantos
-    corbe, courbe
-    corbed, courbed
-    corbeled, corbelled
-    corbeling's, corbelling's
-    corbeling, corbelling
-    corbelings, corbellings
-    cordialize, cordialise
-    cordialized, cordialised
-    cordializes, cordialises
-    cordializing, cordialising
-    corge, courge
-    Corinthianize's, Corinthianise's
-    Corinthianize, Corinthianise
-    corinthianize, corinthianise
-    corinthianized, corinthianised
-    Corinthianizes, Corinthianises
-    corinthianizes, corinthianises
-    corinthianizing, corinthianising
-    corporealization's, corporealisation's
-    corporealization, corporealisation
-    corporealizations, corporealisations
-    corporealize, corporealise
-    corporealized, corporealised
-    corporealizes, corporealises
-    corporealizing, corporealising
-    corsy, coursy
-    cortage, courtage
-    cortin, courtin
-    cortine, cortinae
-    corve, corvae
-    coryphe, coryphae
-    coryphes, coryphaes
-    cosmeticize, cosmeticise
-    cosmeticized, cosmeticised
-    cosmeticizes, cosmeticises
-    cosmeticizing, cosmeticising
-    cosmopolitanization's, cosmopolitanisation's
-    cosmopolitanization, cosmopolitanisation
-    cosmopolitanizations, cosmopolitanisations
-    cosmopolitanize, cosmopolitanise
-    cosmopolitanized, cosmopolitanised
-    cosmopolitanizes, cosmopolitanises
-    cosmopolitanizing, cosmopolitanising
-    cosplendor, cosplendour
-    coste, costae
-    costumier, costumire
-    cottar's, cotter's
-    cottar, cotter
-    cottars, cotters
-    cotte, cottae
-    cottonization's, cottonisation's
-    cottonization, cottonisation
-    cottonizations, cottonisations
-    cottonize, cottonise
-    cottonizes, cottonises
-    cotyle, cotylae
-    councilor's, councillor's
-    councilor, councillor
-    councilors, councillors
-    councilorship's, councillorship's
-    councilorship, councillorship
-    councilorships, councillorships
-    counseled, counselled
-    counselee, counsellee
-    counseling, counselling
-    counselor's, counsellor's
-    counselor, counsellor
-    counselors, counsellors
-    counselorship's, counsellorship's
-    counselorship, counsellorship
-    counselorships, counsellorships
-    countercolored, countercoloured
-    countor, countour
-    cozied, cosied
-    cozier, cosier
-    cozies, cosies
-    coziest, cosiest
-    cozily, cosily
-    coziness's, cosiness's
-    coziness, cosiness
-    cozy's, cosy's
-    cozy, cosy
-    cozying, cosying
-    craizey, craisey
-    crambes, cramboes
-    crawlerize, crawlerise
-    crawlerizes, crawlerises
-    creaturize, creaturise
-    creaturizes, creaturises
-    crenelate, crenellate
-    crenelated, crenellated
-    crenelater, crenellater
-    crenelates, crenellates
-    crenelatest, crenellatest
-    crenelating, crenellating
-    crenelation's, crenellation's
-    crenelation, crenellation
-    crenelations, crenellations
-    creneled, crenelled
-    creneling, crenelling
-    Creolization, Creolisation
-    creolization, creolisation
-    creolizations, creolisations
-    Creolize, Creolise
-    creolize, creolise
-    Creolized, Creolised
-    creolized, creolised
-    Creolizes, Creolises
-    creolizes, creolises
-    Creolizing, Creolising
-    creolizing, creolising
-    cretinization's, cretinisation's
-    cretinization, cretinisation
-    cretinizations, cretinisations
-    cretinize, cretinise
-    cretinized, cretinised
-    cretinizes, cretinises
-    cretinizing, cretinising
-    criminalization's, criminalisation's
-    criminalization, criminalisation
-    criminalizations, criminalisations
-    criminalize, criminalise
-    criminalized, criminalised
-    criminalizes, criminalises
-    criminalizing, criminalising
-    criticizable's, criticisable's
-    criticizable, criticisable
-    criticizabler, criticisabler
-    criticizables, criticisables
-    criticizablest, criticisablest
-    criticize, criticise
-    criticized, criticised
-    criticizer's, criticiser's
-    criticizer, criticiser
-    criticizers, criticisers
-    criticizes, criticises
-    criticizing, criticising
-    criticizinglier, criticisinglier
-    criticizinglies, criticisinglies
-    criticizingliest, criticisingliest
-    criticizingly, criticisingly
-    crofterization's, crofterisation's
-    crofterization, crofterisation
-    crofterizations, crofterisations
-    crofterize, crofterise
-    crofterizes, crofterises
-    crosier's, crozier's
-    crosier, crozier
-    crosiers, croziers
-    crueler, crueller
-    cruelest, cruellest
-    cruelize, cruelise
-    cruelizes, cruelises
-    cryesthesia, cryaesthesia
-    cryoanesthesia, cryoanaesthesia
-    cryptanalyzes, cryptanalyses
-    cryptesthesia, cryptaesthesia
-    cryptesthesias, cryptaesthesias
-    cryptesthetic, cryptaesthetic
-    crystalize, crystallise
-    crystalized, crystallised
-    crystalizes, crystallises
-    crystalizing, crystallising
-    crystallizabilities, crystallisabilities
-    crystallizability's, crystallisability's
-    crystallizability, crystallisability
-    crystallizable's, crystallisable's
-    crystallizable, crystallisable
-    crystallizabler, crystallisabler
-    crystallizables, crystallisables
-    crystallizablest, crystallisablest
-    crystallization's, crystallisation's
-    crystallization, crystallisation
-    crystallizations, crystallisations
-    crystallizer, crystalliser
-    crystallizers, crystallisers
-    Cubanize's, Cubanise's
-    Cubanize, Cubanise
-    Cubanizes, Cubanises
-    cuckoldize, cuckoldise
-    cuckoldized, cuckoldised
-    cuckoldizes, cuckoldises
-    cuckoldizing, cuckoldising
-    cudgeled, cudgelled
-    cudgeler's, cudgeller's
-    cudgeler, cudgeller
-    cudgelers, cudgellers
-    cudgeling, cudgelling
-    cudgelings, cudgellings
-    culicide, culicidae
-    culturization's, culturisation's
-    culturization, culturisation
-    culturizations, culturisations
-    culturize, culturise
-    culturizes, culturises
-    cupelation, cupellation
-    cupeled, cupelled
-    cupeler's, cupeller's
-    cupeler, cupeller
-    cupelers, cupellers
-    cupeling, cupelling
-    cupule, cupulae
-    curarize, curarise
-    curarized, curarised
-    curarizes, curarises
-    curarizing, curarising
-    curatize, curatise
-    curatizes, curatises
-    curricularization's, curricularisation's
-    curricularization, curricularisation
-    curricularizations, curricularisations
-    curricularize, curricularise
-    curricularizes, curricularises
-    curtsied, curtseyed
-    curtsies, curtseys
-    curtsy's, curtsey's
-    curtsy, curtsey
-    curtsying, curtseying
-    curvaceous, curvacious
-    customizable, customisable
-    customization's, customisation's
-    customization, customisation
-    customizations, customisations
-    customize, customise
-    customized, customised
-    customizer, customiser
-    customizers, customisers
-    customizes, customises
-    customizing, customising
-    cutesy, cutesie
-    cuticolor, cuticolour
-    cutinization's, cutinisation's
-    cutinization, cutinisation
-    cutinizations, cutinisations
-    cutinize, cutinise
-    cutinized, cutinised
-    cutinizes, cutinises
-    cutinizing, cutinising
-    cutization's, cutisation's
-    cutization, cutisation
-    cutizations, cutisations
-    cutlass's, cutlas's
-    cutlass, cutlas
-    cutlasses, cutlases
-    cuve, cuvae
-    Cyanee's, Cyaneae's
-    Cyanee, Cyaneae
-    cyanize, cyanise
-    cyanized, cyanised
-    cyanizes, cyanises
-    cyanizing, cyanising
-    cyanomethemoglobin, cyanomethaemoglobin
-    cyclization's, cyclisation's
-    cyclization, cyclisation
-    cyclizations, cyclisations
-    cyclize, cyclise
-    cyclized, cyclised
-    cyclizes, cyclises
-    cyclizing, cyclising
-    cyclopedia's, cyclopaedia's
-    cyclopedia, cyclopaedia
-    cyclopedias, cyclopaedias
-    cyclopedic, cyclopaedic
-    cyclopedically, cyclopaedically
-    cyclopedist's, cyclopaedist's
-    cyclopedist, cyclopaedist
-    cyme, cymae
-    Czechization's, Czechisation's
-    Czechization, Czechisation
-    Czechizations, Czechisations
-    d'oh's, doh's
-    d'oh, doh
-    d'ohs, dohs
-    danaide, danaidae
-    dandizette, dandisette
-    dandyize, dandyise
-    dandyizes, dandyises
-    dane, danae
-    Danization's, Danisation's
-    Danization, Danisation
-    Danizations, Danisations
-    Danize's, Danise's
-    Danize, Danise
-    Danizes, Danises
-    Darwinize's, Darwinise's
-    Darwinize, Darwinise
-    Darwinizes, Darwinises
-    dastardize, dastardise
-    dastardizes, dastardises
-    deaconize, deaconise
-    deaconizes, deaconises
-    deadrize, deadrise
-    dealcoholize, dealcoholise
-    dealcoholized, dealcoholised
-    dealcoholizes, dealcoholises
-    dealcoholizing, dealcoholising
-    deaminize, deaminise
-    deary's, dearie's
-    deary, dearie
-    decagram's, decagramme's
-    decagram, decagramme
-    decagrams, decagrammes
-    decaliter, decalitre
-    decaliter, decalitre's
-    decaliter, decalitres
-    decameter, decametre
-    decameter, decametre's
-    decameter, decametres
-    decapitalization, decapitalisation
-    decapitalizations, decapitalisations
-    decapitalize, decapitalise
-    decapitalized, decapitalised
-    decapitalizes, decapitalises
-    decapitalizing, decapitalising
-    decarbonization's, decarbonisation's
-    decarbonization, decarbonisation
-    decarbonizations, decarbonisations
-    decarbonize, decarbonise
-    decarbonized, decarbonised
-    decarbonizer's, decarboniser's
-    decarbonizer, decarboniser
-    decarbonizers, decarbonisers
-    decarbonizes, decarbonises
-    decarbonizing, decarbonising
-    decarburization's, decarburisation's
-    decarburization, decarburisation
-    decarburizations, decarburisations
-    decarburize, decarburise
-    decarburized, decarburised
-    decarburizes, decarburises
-    decarburizing, decarburising
-    decasualization's, decasualisation's
-    decasualization, decasualisation
-    decasualizations, decasualisations
-    decasualize, decasualise
-    decasualized, decasualised
-    decasualizing, decasualising
-    decenters, decentres
-    decentralization's, decentralisation's
-    decentralization, decentralisation
-    decentralizationist, decentralisationist
-    decentralizations, decentralisations
-    decentralize, decentralise
-    decentralized, decentralised
-    decentralizes, decentralises
-    decentralizing, decentralising
-    decerebrize, decerebrise
-    decerebrized, decerebrised
-    decerebrizes, decerebrises
-    decerebrizing, decerebrising
-    dechristianization, dechristianisation
-    dechristianizations, dechristianisations
-    dechristianize, dechristianise
-    dechristianized, dechristianised
-    dechristianizes, dechristianises
-    dechristianizing, dechristianising
-    decigram's, decigramme's
-    decigram, decigramme
-    decigrams, decigrammes
-    deciliter's, decilitre's
-    deciliter, decilitre
-    deciliters, decilitres
-    decimalization's, decimalisation's
-    decimalization, decimalisation
-    decimalizations, decimalisations
-    decimalize, decimalise
-    decimalized, decimalised
-    decimalizes, decimalises
-    decimalizing, decimalising
-    decimeter's, decimetre's
-    decimeter, decimetre
-    decimeters, decimetres
-    decivilize, decivilise
-    decivilized, decivilised
-    decivilizes, decivilises
-    decivilizing, decivilising
-    decolonization's, decolonisation's
-    decolonization, decolonisation
-    decolonizations, decolonisations
-    decolonize, decolonise
-    decolonized, decolonised
-    decolonizes, decolonises
-    decolonizing, decolonising
-    decolor, decolour
-    decolorant, decolourant
-    decolorants, decolourants
-    decolorate, decolourate
-    decolorated, decolourated
-    decolorates, decolourates
-    decoloration's, decolouration's
-    decoloration, decolouration
-    decolorations, decolourations
-    decolored, decoloured
-    decolorimeter, decolourimeter
-    decoloring, decolouring
-    decolors, decolours
-    decolourisation's, decolourization's
-    decolourisation, decolourization
-    decolourisations, decolourizations
-    decolourise, decolourize
-    decolourised, decolourized
-    decolouriser's, decolourizer's
-    decolouriser, decolourizer
-    decolourisers, decolourizers
-    decolourises, decolourizes
-    decolourising, decolourizing
-    decriminalization's, decriminalisation's
-    decriminalization, decriminalisation
-    decriminalizations, decriminalisations
-    decriminalize, decriminalise
-    decriminalized, decriminalised
-    decriminalizes, decriminalises
-    decriminalizing, decriminalising
-    dedal, daedal
-    dedalian, daedalian
-    dedramatize, dedramatise
-    dedramatized, dedramatised
-    dedramatizes, dedramatises
-    dedramatizing, dedramatising
-    deemphasization's, deemphasisation's
-    deemphasization, deemphasisation
-    deemphasize, deemphasise
-    deemphasized, deemphasised
-    deemphasizer, deemphasiser
-    deemphasizers, deemphasisers
-    deemphasizes, deemphasises
-    deemphasizing, deemphasising
-    deenergize, deenergise
-    deenergized, deenergised
-    deenergizer, deenergiser
-    deenergizes, deenergises
-    deenergizing, deenergising
-    defedation, defoedation
-    defeminization's, defeminisation's
-    defeminization, defeminisation
-    defeminize, defeminise
-    defeminized, defeminised
-    defeminizes, defeminises
-    defeminizing, defeminising
-    defense's, defence's
-    defense, defence
-    defensed, defenced
-    defenseless, defenceless
-    defenselesser, defencelesser
-    defenselessest, defencelessest
-    defenselesslier, defencelesslier
-    defenselessliest, defencelessliest
-    defenselessly, defencelessly
-    defenselessness's, defencelessness's
-    defenselessness, defencelessness
-    defenselessnesses, defencelessnesses
-    defenseman's, defenceman's
-    defenseman, defenceman
-    defensemen, defencemen
-    defenses, defences
-    defensing, defencing
-    defeudalize, defeudalise
-    defeudalized, defeudalised
-    defeudalizes, defeudalises
-    defeudalizing, defeudalising
-    defibrinize, defibrinise
-    defibrinized, defibrinised
-    defibrinizes, defibrinises
-    defibrinizing, defibrinising
-    definitization's, definitisation's
-    definitization, definitisation
-    definitizations, definitisations
-    definitize, definitise
-    definitized, definitised
-    definitizes, definitises
-    definitizing, definitising
-    deflectionization's, deflectionisation's
-    deflectionization, deflectionisation
-    deflectionizations, deflectionisations
-    deflectionize, deflectionise
-    deflectionizes, deflectionises
-    deformalize, deformalise
-    defunctionalization's, defunctionalisation's
-    defunctionalization, defunctionalisation
-    defunctionalizations, defunctionalisations
-    defunctionalize, defunctionalise
-    defunctionalizes, defunctionalises
-    deglycerolized, deglycerolised
-    dehumanization's, dehumanisation's
-    dehumanization, dehumanisation
-    dehumanizations, dehumanisations
-    dehumanize, dehumanise
-    dehumanized, dehumanised
-    dehumanizes, dehumanises
-    dehumanizing, dehumanising
-    dehydrogenization's, dehydrogenisation's
-    dehydrogenization, dehydrogenisation
-    dehydrogenize, dehydrogenise
-    dehydrogenized, dehydrogenised
-    dehydrogenizer's, dehydrogeniser's
-    dehydrogenizer, dehydrogeniser
-    dehydrogenizing, dehydrogenising
-    dehypnotization's, dehypnotisation's
-    dehypnotization, dehypnotisation
-    dehypnotizations, dehypnotisations
-    dehypnotize, dehypnotise
-    dehypnotized, dehypnotised
-    dehypnotizes, dehypnotises
-    dehypnotizing, dehypnotising
-    deindustrialization's, deindustrialisation's
-    deindustrialization, deindustrialisation
-    deindustrializations, deindustrialisations
-    deindustrialize, deindustrialise
-    deindustrialized, deindustrialised
-    deindustrializes, deindustrialises
-    deindustrializing, deindustrialising
-    deionization's, deionisation's
-    deionization, deionisation
-    deionize, deionise
-    deionized, deionised
-    deionizes, deionises
-    deionizing, deionising
-    delimitize, delimitise
-    delimitizes, delimitises
-    delocalization's, delocalisation's
-    delocalization, delocalisation
-    delocalizations, delocalisations
-    delocalize, delocalise
-    delocalized, delocalised
-    delocalizes, delocalises
-    delocalizing, delocalising
-    deluster, delustre
-    demagnetizable's, demagnetisable's
-    demagnetizable, demagnetisable
-    demagnetizabler, demagnetisabler
-    demagnetizables, demagnetisables
-    demagnetizablest, demagnetisablest
-    demagnetization's, demagnetisation's
-    demagnetization, demagnetisation
-    demagnetizations, demagnetisations
-    demagnetize, demagnetise
-    demagnetized, demagnetised
-    demagnetizer's, demagnetiser's
-    demagnetizer, demagnetiser
-    demagnetizers, demagnetisers
-    demagnetizes, demagnetises
-    demagnetizing, demagnetising
-    demagogue's, demagog's
-    demagogue, demagog
-    demagogued, demagoged
-    demagogueri, demagogri
-    demagogueris, demagogris
-    demagoguery, demagogry
-    demagogues, demagogs
-    demagoguing, demagoging
-    demasculinization's, demasculinisation's
-    demasculinization, demasculinisation
-    demasculinize, demasculinise
-    demasculinized, demasculinised
-    demasculinizing, demasculinising
-    dematerialization's, dematerialisation's
-    dematerialization, dematerialisation
-    dematerializations, dematerialisations
-    dematerialize, dematerialise
-    dematerialized, dematerialised
-    dematerializes, dematerialises
-    dematerializing, dematerialising
-    demeanor's, demeanour's
-    demeanor, demeanour
-    demeanors, demeanours
-    demilitarization's, demilitarisation's
-    demilitarization, demilitarisation
-    demilitarizations, demilitarisations
-    demilitarize, demilitarise
-    demilitarized, demilitarised
-    demilitarizes, demilitarises
-    demilitarizing, demilitarising
-    demiluster, demilustre
-    demineralization's, demineralisation's
-    demineralization, demineralisation
-    demineralizations, demineralisations
-    demineralize, demineralise
-    demineralized, demineralised
-    demineralizer, demineraliser
-    demineralizes, demineralises
-    demineralizing, demineralising
-    demobilization's, demobilisation's
-    demobilization, demobilisation
-    demobilizations, demobilisations
-    demobilize, demobilise
-    demobilized, demobilised
-    demobilizes, demobilises
-    demobilizing, demobilising
-    democratization's, democratisation's
-    democratization, democratisation
-    democratizations, democratisations
-    democratize, democratise
-    democratized, democratised
-    democratizer, democratiser
-    democratizes, democratises
-    democratizing, democratising
-    demonetization's, demonetisation's
-    demonetization, demonetisation
-    demonetizations, demonetisations
-    demonetize, demonetise
-    demonetized, demonetised
-    demonetizes, demonetises
-    demonetizing, demonetising
-    demonian, daemonian
-    demonization, demonisation
-    demonize, demonise
-    demonized, demonised
-    demonizes, demonises
-    demonizing, demonising
-    demoralization's, demoralisation's
-    demoralization, demoralisation
-    demoralizations, demoralisations
-    demoralize, demoralise
-    demoralized, demoralised
-    demoralizer's, demoraliser's
-    demoralizer, demoraliser
-    demoralizers, demoralisers
-    demoralizes, demoralises
-    demoralizing, demoralising
-    demoralizingly, demoralisingly
-    demutualization, demutualisation
-    demutualizations, demutualisations
-    demutualize, demutualise
-    demutualized, demutualised
-    demutualizes, demutualises
-    demutualizing, demutualising
-    demythologization's, demythologisation's
-    demythologization, demythologisation
-    demythologizations, demythologisations
-    demythologize, demythologise
-    demythologized, demythologised
-    demythologizer, demythologiser
-    demythologizes, demythologises
-    demythologizing, demythologising
-    denationalization's, denationalisation's
-    denationalization, denationalisation
-    denationalizations, denationalisations
-    denationalize, denationalise
-    denationalized, denationalised
-    denationalizes, denationalises
-    denationalizing, denationalising
-    denaturalization's, denaturalisation's
-    denaturalization, denaturalisation
-    denaturalizations, denaturalisations
-    denaturalize, denaturalise
-    denaturalized, denaturalised
-    denaturalizes, denaturalises
-    denaturalizing, denaturalising
-    denaturization's, denaturisation's
-    denaturization, denaturisation
-    denaturizations, denaturisations
-    denaturize, denaturise
-    denaturized, denaturised
-    denaturizer's, denaturiser's
-    denaturizer, denaturiser
-    denaturizers, denaturisers
-    denaturizes, denaturises
-    denaturizing, denaturising
-    denicotinize, denicotinise
-    denizenize, denizenise
-    denizenizes, denizenises
-    denominationalize, denominationalise
-    denominationalizes, denominationalises
-    denormalize, denormalise
-    dentalization's, dentalisation's
-    dentalization, dentalisation
-    dentalizations, dentalisations
-    dentalize, dentalise
-    dentalized, dentalised
-    dentalizes, dentalises
-    dentalizing, dentalising
-    dentin's, dentine's
-    dentin, dentine
-    dentins, dentines
-    denuclearization's, denuclearisation's
-    denuclearization, denuclearisation
-    denuclearizations, denuclearisations
-    denuclearize, denuclearise
-    denuclearized, denuclearised
-    denuclearizes, denuclearises
-    denuclearizing, denuclearising
-    deodorization's, deodorisation's
-    deodorization, deodorisation
-    deodorizations, deodorisations
-    deodorize, deodorise
-    deodorized, deodorised
-    deodorizer's, deodoriser's
-    deodorizer, deodoriser
-    deodorizers, deodorisers
-    deodorizes, deodorises
-    deodorizing, deodorising
-    deoxidization's, deoxidisation's
-    deoxidization, deoxidisation
-    deoxidizations, deoxidisations
-    deoxidize, deoxidise
-    deoxidized, deoxidised
-    deoxidizer's, deoxidiser's
-    deoxidizer, deoxidiser
-    deoxidizers, deoxidisers
-    deoxidizes, deoxidises
-    deoxidizing, deoxidising
-    deoxygenize, deoxygenise
-    deoxygenized, deoxygenised
-    deoxygenizes, deoxygenises
-    deoxygenizing, deoxygenising
-    departmentalization's, departmentalisation's
-    departmentalization, departmentalisation
-    departmentalizations, departmentalisations
-    departmentalize, departmentalise
-    departmentalized, departmentalised
-    departmentalizes, departmentalises
-    departmentalizing, departmentalising
-    departmentization's, departmentisation's
-    departmentization, departmentisation
-    departmentizations, departmentisations
-    departmentize, departmentise
-    departmentizes, departmentises
-    depauperization, depauperisation
-    depauperize, depauperise
-    depauperized, depauperised
-    depauperizes, depauperises
-    depauperizing, depauperising
-    dependence's, dependance's
-    dependence, dependance
-    dependences, dependances
-    depersonalization's, depersonalisation's
-    depersonalization, depersonalisation
-    depersonalizations, depersonalisations
-    depersonalize, depersonalise
-    depersonalized, depersonalised
-    depersonalizes, depersonalises
-    depersonalizing, depersonalising
-    depolarization's, depolarisation's
-    depolarization, depolarisation
-    depolarizations, depolarisations
-    depolarize, depolarise
-    depolarized, depolarised
-    depolarizer's, depolariser's
-    depolarizer, depolariser
-    depolarizers, depolarisers
-    depolarizes, depolarises
-    depolarizing, depolarising
-    depoliticization, depoliticisation
-    depoliticize, depoliticise
-    depoliticized, depoliticised
-    depoliticizes, depoliticises
-    depoliticizing, depoliticising
-    depolymerization's, depolymerisation's
-    depolymerization, depolymerisation
-    depolymerizations, depolymerisations
-    depolymerize, depolymerise
-    depolymerized, depolymerised
-    depolymerizes, depolymerises
-    depolymerizing, depolymerising
-    depressurization's, depressurisation's
-    depressurization, depressurisation
-    depressurizations, depressurisations
-    depressurize, depressurise
-    depressurized, depressurised
-    depressurizes, depressurises
-    depressurizing, depressurising
-    deputationize, deputationise
-    deputationizes, deputationises
-    deputization, deputisation
-    deputize, deputise
-    deputized, deputised
-    deputizes, deputises
-    deputizing, deputising
-    deracialize, deracialise
-    deracialized, deracialised
-    deracializes, deracialises
-    deracializing, deracialising
-    derationalization's, derationalisation's
-    derationalization, derationalisation
-    derationalizations, derationalisations
-    derationalize, derationalise
-    derationalizes, derationalises
-    deratization's, deratisation's
-    deratization, deratisation
-    deratizations, deratisations
-    derealization, derealisation
-    derecognize, derecognise
-    derecognized, derecognised
-    derecognizes, derecognises
-    derecognizing, derecognising
-    deregulationize, deregulationise
-    deregulationizes, deregulationises
-    dereligionize, dereligionise
-    dereligionized, dereligionised
-    dereligionizes, dereligionises
-    dereligionizing, dereligionising
-    derk, drek
-    dermatorrhea, dermatorrhoea
-    Derr's, Drer's
-    Derr, Drer
-    desacralization, desacralisation
-    desacralizations, desacralisations
-    desacralize, desacralise
-    desacralized, desacralised
-    desacralizes, desacralises
-    desacralizing, desacralising
-    desalinization's, desalinisation's
-    desalinization, desalinisation
-    desalinizations, desalinisations
-    desalinize, desalinise
-    desalinized, desalinised
-    desalinizes, desalinises
-    desalinizing, desalinising
-    desensitization's, desensitisation's
-    desensitization, desensitisation
-    desensitizations, desensitisations
-    desensitize, desensitise
-    desensitized, desensitised
-    desensitizer's, desensitiser's
-    desensitizer, desensitiser
-    desensitizers, desensitisers
-    desensitizes, desensitises
-    desensitizing, desensitising
-    desertization, desertisation
-    desertizations, desertisations
-    desexualization's, desexualisation's
-    desexualization, desexualisation
-    desexualizations, desexualisations
-    desexualize, desexualise
-    desexualized, desexualised
-    desexualizes, desexualises
-    desexualizing, desexualising
-    desilverization, desilverisation
-    desilverizations, desilverisations
-    desilverize, desilverise
-    desilverized, desilverised
-    desilverizes, desilverises
-    desilverizing, desilverising
-    despiritualization, despiritualisation
-    despiritualize, despiritualise
-    despotize, despotise
-    despotizes, despotises
-    destabilization, destabilisation
-    destabilize, destabilise
-    destabilized, destabilised
-    destabilizer, destabiliser
-    destabilizers, destabilisers
-    destabilizes, destabilises
-    destabilizing, destabilising
-    destalinize, destalinise
-    destalinized, destalinised
-    destalinizes, destalinises
-    destalinizing, destalinising
-    desterilize, desterilise
-    destigmatization, destigmatisation
-    desulfurizer's, desulfuriser's
-    desulfurizer, desulfuriser
-    desulphurisation's, desulphurization's
-    desulphurisation, desulphurization
-    desulphurisations, desulphurizations
-    desulphurise, desulphurize
-    desulphurised, desulphurized
-    desulphurises, desulphurizes
-    desulphurising, desulphurizing
-    desulphurizer, desulphuriser
-    desulphurizers, desulphurisers
-    desynchronization's, desynchronisation's
-    desynchronization, desynchronisation
-    desynchronizations, desynchronisations
-    desynchronize, desynchronise
-    desynchronized, desynchronised
-    desynchronizes, desynchronises
-    desynchronizing, desynchronising
-    detribalization's, detribalisation's
-    detribalization, detribalisation
-    detribalizations, detribalisations
-    detribalize, detribalise
-    detribalized, detribalised
-    detribalizes, detribalises
-    detribalizing, detribalising
-    deva, daeva
-    devalorization, devalorisation
-    devalorizations, devalorisations
-    devalorize, devalorise
-    devalorized, devalorised
-    devalorizes, devalorises
-    devalorizing, devalorising
-    develed, develled
-    develing, develling
-    deviled, devilled
-    deviling, devilling
-    devilize, devilise
-    devilizes, devilises
-    devitalization's, devitalisation's
-    devitalization, devitalisation
-    devitalizations, devitalisations
-    devitalize, devitalise
-    devitalized, devitalised
-    devitalizes, devitalises
-    devitalizing, devitalising
-    devocalization's, devocalisation's
-    devocalization, devocalisation
-    devocalize, devocalise
-    devocalized, devocalised
-    devocalizes, devocalises
-    devocalizing, devocalising
-    devolatilization's, devolatilisation's
-    devolatilization, devolatilisation
-    devolatilizations, devolatilisations
-    devolatilize, devolatilise
-    devolatilized, devolatilised
-    devolatilizes, devolatilises
-    devolatilizing, devolatilising
-    dexterous, dextrous
-    dexterously, dextrously
-    dexterousness, dextrousness
-    diabolization's, diabolisation's
-    diabolization, diabolisation
-    diabolizations, diabolisations
-    diabolize, diabolise
-    diabolized, diabolised
-    diabolizes, diabolises
-    diabolizing, diabolising
-    diagonalizable, diagonalisable
-    diagonalization, diagonalisation
-    diagonalize, diagonalise
-    diagonalized, diagonalised
-    diagonalizes, diagonalises
-    diagonalizing, diagonalising
-    dialecticize, dialecticise
-    dialecticizes, dialecticises
-    dialed, dialled
-    dialer's, dialler's
-    dialer, dialler
-    dialers, diallers
-    dialing's, dialling's
-    dialing, dialling
-    dialings, diallings
-    dialist's, diallist's
-    dialist, diallist
-    dialists, diallists
-    dialogize, dialogise
-    dialogized, dialogised
-    dialogizes, dialogises
-    dialogizing, dialogising
-    dialogue's, dialog's
-    dialogue, dialog
-    dialogued, dialogged
-    dialogues, dialogs
-    dialoguing, dialogging
-    dialyzabilities, dialysabilities
-    dialyzability's, dialysability's
-    dialyzability, dialysability
-    dialyzable's, dialysable's
-    dialyzable, dialysable
-    dialyzabler, dialysabler
-    dialyzables, dialysables
-    dialyzablest, dialysablest
-    dialyzate's, dialysate's
-    dialyzate, dialysate
-    dialyzates, dialysates
-    dialyzation's, dialysation's
-    dialyzation, dialysation
-    dialyze, dialyse
-    dialyzed, dialysed
-    dialyzer's, dialyser's
-    dialyzer, dialyser
-    dialyzers, dialysers
-    dialyzes, dialyses
-    dialyzing, dialysing
-    diamondize, diamondise
-    diamondizes, diamondises
-    diarize, diarise
-    diarized, diarised
-    diarizes, diarises
-    diarizing, diarising
-    diarrhea's, diarrhoea's
-    diarrhea, diarrhoea
-    diarrheal, diarrhoeal
-    diarrhealer, diarrhoealer
-    diarrhealest, diarrhoealest
-    diarrheas, diarrhoeas
-    diarrheic, diarrhoeic
-    diarrheicer, diarrhoeicer
-    diarrheicest, diarrhoeicest
-    diarrhetic, diarrhoetic
-    diarrheticer, diarrhoeticer
-    diarrheticest, diarrhoeticest
-    dichotomization's, dichotomisation's
-    dichotomization, dichotomisation
-    dichotomizations, dichotomisations
-    dichotomize, dichotomise
-    dichotomized, dichotomised
-    dichotomizes, dichotomises
-    dichotomizing, dichotomising
-    dickeys, dickies
-    dicky's, dickie's
-    dicky, dickie
-    diene, diaene
-    dieretic, diaeretic
-    dieselization's, dieselisation's
-    dieselization, dieselisation
-    dieselizations, dieselisations
-    dieselize, dieselise
-    dieselized, dieselised
-    dieselizes, dieselises
-    dieselizing, dieselising
-    diestrous, dioestrous
-    diestrual, dioestrual
-    diestrum, dioestrum
-    diestrus's, dioestrus's
-    diestrus, dioestrus
-    diestruses, dioestruses
-    diethylstilbestrol's, diethylstilboestrol's
-    diethylstilbestrol, diethylstilboestrol
-    dietitian's, dietician's
-    dietitian, dietician
-    dietitians, dieticians
-    differentialize, differentialise
-    differentializes, differentialises
-    digitalization's, digitalisation's
-    digitalization, digitalisation
-    digitalizations, digitalisations
-    digitalize, digitalise
-    digitalized, digitalised
-    digitalizes, digitalises
-    digitalizing, digitalising
-    digitization's, digitisation's
-    digitization, digitisation
-    digitizations, digitisations
-    digitize, digitise
-    digitized, digitised
-    digitizer's, digitiser's
-    digitizer, digitiser
-    digitizers, digitisers
-    digitizes, digitises
-    digitizing, digitising
-    dike's, dyke's
-    dike, dyke
-    diked, dyked
-    dikes, dykes
-    diking, dyking
-    dimensionalization, dimensionalisation
-    dimensionalize, dimensionalise
-    dimensionalized, dimensionalised
-    dimensionalizes, dimensionalises
-    dimensionalizing, dimensionalising
-    dimerization's, dimerisation's
-    dimerization, dimerisation
-    dimerizations, dimerisations
-    dimerize, dimerise
-    dimerized, dimerised
-    dimerizes, dimerises
-    dimerizing, dimerising
-    diminutivize, diminutivise
-    diminutivizes, diminutivises
-    dingoes, dingos
-    dioecious, diecious
-    dioeciously, dieciously
-    dionize, dionise
-    diopter's, dioptre's
-    diopter, dioptre
-    diopters, dioptres
-    diphthongization's, diphthongisation's
-    diphthongization, diphthongisation
-    diphthongizations, diphthongisations
-    diphthongize, diphthongise
-    diphthongized, diphthongised
-    diphthongizes, diphthongises
-    diphthongizing, diphthongising
-    diple, diploe
-    diploe's, diploae's
-    diploe, diploae
-    diplomatize, diplomatise
-    diplomatized, diplomatised
-    diplomatizes, diplomatises
-    diplomatizing, diplomatising
-    dis's, diss's
-    dis, diss
-    disangularize, disangularise
-    disangularizes, disangularises
-    disauthorize, disauthorise
-    disauthorized, disauthorised
-    disauthorizes, disauthorises
-    disauthorizing, disauthorising
-    disboweled, disbowelled
-    disboweling, disbowelling
-    discanonization's, discanonisation's
-    discanonization, discanonisation
-    discanonizations, discanonisations
-    discanonize, discanonise
-    discanonizes, discanonises
-    discolor's, discolour's
-    discolor, discolour
-    discolorate, discolourate
-    discolorated, discolourated
-    discoloration's, discolouration's
-    discoloration, discolouration
-    discolorations, discolourations
-    discolored's, discoloured's
-    discolored, discoloured
-    discoloredness, discolouredness
-    discoloreds, discoloureds
-    discoloring, discolouring
-    discolorment's, discolourment's
-    discolorment, discolourment
-    discolorments, discolourments
-    discolors, discolours
-    discolourisation's, discolourization's
-    discolourisation, discolourization
-    discolourisations, discolourizations
-    discretization, discretisation
-    discretize, discretise
-    disdenominationalize, disdenominationalise
-    disdenominationalizes, disdenominationalises
-    disdiplomatize, disdiplomatise
-    disdiplomatizes, disdiplomatises
-    disemboweled, disembowelled
-    disemboweling, disembowelling
-    disequalize's, disequalise's
-    disequalize, disequalise
-    disequalizer, disequaliser
-    disequalizers, disequalisers
-    disequalizes, disequalises
-    disfavor's, disfavour's
-    disfavor, disfavour
-    disfavored, disfavoured
-    disfavorer's, disfavourer's
-    disfavorer, disfavourer
-    disfavorers, disfavourers
-    disfavoring, disfavouring
-    disfavors, disfavours
-    dishabille's, deshabille's
-    dishabille, deshabille
-    dishabilles, deshabilles
-    disharmonize, disharmonise
-    disharmonized, disharmonised
-    disharmonizes, disharmonises
-    disharmonizing, disharmonising
-    disheveled, dishevelled
-    disheveler, disheveller
-    disheveling, dishevelling
-    dishonor's, dishonour's
-    dishonor, dishonour
-    dishonorable's, dishonourable's
-    dishonorable, dishonourable
-    dishonorableness's, dishonourableness's
-    dishonorableness, dishonourableness
-    dishonorablenesses, dishonourablenesses
-    dishonorabler, dishonourabler
-    dishonorables, dishonourables
-    dishonorablest, dishonourablest
-    dishonorablier, dishonourablier
-    dishonorablies, dishonourablies
-    dishonorabliest, dishonourabliest
-    dishonorably, dishonourably
-    dishonorary, dishonourary
-    dishonored, dishonoured
-    dishonorer's, dishonourer's
-    dishonorer, dishonourer
-    dishonorers, dishonourers
-    dishonoring, dishonouring
-    dishonors, dishonours
-    dishumanize, dishumanise
-    dishumanizes, dishumanises
-    dishumor, dishumour
-    dishumored, dishumoured
-    dishumors, dishumours
-    disillusionize, disillusionise
-    disillusionized, disillusionised
-    disillusionizer's, disillusioniser's
-    disillusionizer, disillusioniser
-    disillusionizers, disillusionisers
-    disillusionizes, disillusionises
-    disillusionizing, disillusionising
-    disindividualize, disindividualise
-    disindividualized, disindividualised
-    disindividualizes, disindividualises
-    disindividualizing, disindividualising
-    disindustrialization, disindustrialisation
-    disindustrializations, disindustrialisations
-    disindustrialize, disindustrialise
-    disindustrialized, disindustrialised
-    disindustrializes, disindustrialises
-    disindustrializing, disindustrialising
-    disluster, dislustre
-    dismalize, dismalise
-    dismalizes, dismalises
-    disnaturalization's, disnaturalisation's
-    disnaturalization, disnaturalisation
-    disnaturalizations, disnaturalisations
-    disnaturalize, disnaturalise
-    disnaturalized, disnaturalised
-    disnaturalizes, disnaturalises
-    disnaturalizing, disnaturalising
-    disorganization's, disorganisation's
-    disorganization, disorganisation
-    disorganizations, disorganisations
-    disorganize, disorganise
-    disorganized, disorganised
-    disorganizer's, disorganiser's
-    disorganizer, disorganiser
-    disorganizers, disorganisers
-    disorganizes, disorganises
-    disorganizing, disorganising
-    disozonize, disozonise
-    disozonizes, disozonises
-    dispapalize, dispapalise
-    dispapalizes, dispapalises
-    dispatch's, despatch's
-    dispatch, despatch
-    dispatched, despatched
-    dispatches, despatches
-    dispatching, despatching
-    dispauperize, dispauperise
-    dispauperized, dispauperised
-    dispauperizes, dispauperises
-    dispauperizing, dispauperising
-    dispersonalize, dispersonalise
-    dispersonalizes, dispersonalises
-    dispopularize, dispopularise
-    dispopularizes, dispopularises
-    disrealize, disrealise
-    disrealizes, disrealises
-    disscepter's, dissceptre's
-    disscepter, dissceptre
-    disscepters, dissceptres
-    disseize, disseise
-    disseized, disseised
-    disseizee, disseisee
-    disseizes, disseises
-    disseizin's, disseisin's
-    disseizin, disseisin
-    disseizing, disseising
-    disseizins, disseisins
-    disseizor's, disseisor's
-    disseizor, disseisor
-    disseizors, disseisors
-    dissensualize, dissensualise
-    dissensualizes, dissensualises
-    disses, dises
-    dissocialize, dissocialise
-    dissocialized, dissocialised
-    dissocializes, dissocialises
-    dissocializing, dissocialising
-    dissyllabize, dissyllabise
-    dissyllabized, dissyllabised
-    dissyllabizing, dissyllabising
-    dissympathize, dissympathise
-    dissympathizes, dissympathises
-    distill, distil
-    distills, distils
-    disutilize, disutilise
-    disutilizes, disutilises
-    ditsier, ditzier
-    ditsy, ditzy
-    ditziness's, ditsiness's
-    ditziness, ditsiness
-    ditzinesses, ditsinesses
-    diversicolored, diversicoloured
-    divinister, divinistre
-    divinization's, divinisation's
-    divinization, divinisation
-    divinizations, divinisations
-    divinize, divinise
-    divinized, divinised
-    divinizes, divinises
-    divinizing, divinising
-    divisionalization, divisionalisation
-    divisionalizations, divisionalisations
-    djellaba's, djellabah's
-    djellaba, djellabah
-    djellabas, djellabahes
-    djinni's, djinn's
-    djinni, djinn
-    Docete's, Docetae's
-    Docete, Docetae
-    dockization's, dockisation's
-    dockization, dockisation
-    dockizations, dockisations
-    dockize, dockise
-    dockized, dockised
-    dockizes, dockises
-    dockizing, dockising
-    doctorization's, doctorisation's
-    doctorization, doctorisation
-    doctorizations, doctorisations
-    doctorize, doctorise
-    doctorizes, doctorises
-    doctrinization's, doctrinisation's
-    doctrinization, doctrinisation
-    doctrinizations, doctrinisations
-    doctrinize, doctrinise
-    doctrinizes, doctrinises
-    documentarization, documentarisation
-    documentarizations, documentarisations
-    documentarize, documentarise
-    documentarized, documentarised
-    documentarizes, documentarises
-    documentarizing, documentarising
-    documentize, documentise
-    documentizes, documentises
-    Dodonean's, Dodonaean's
-    Dodonean, Dodonaean
-    doggy's, doggie's
-    doggy, doggie
-    dogie's, dogy's
-    dogie, dogy
-    dogmatization's, dogmatisation's
-    dogmatization, dogmatisation
-    dogmatizations, dogmatisations
-    dogmatize, dogmatise
-    dogmatized, dogmatised
-    dogmatizer's, dogmatiser's
-    dogmatizer, dogmatiser
-    dogmatizers, dogmatisers
-    dogmatizes, dogmatises
-    dogmatizing, dogmatising
-    dognaped, dognapped
-    dognaping, dognapping
-    dollarization, dollarisation
-    dollarizations, dollarisations
-    dolomitization's, dolomitisation's
-    dolomitization, dolomitisation
-    dolomitizations, dolomitisations
-    dolomitize, dolomitise
-    dolomitized, dolomitised
-    dolomitizes, dolomitises
-    dolomitizing, dolomitising
-    dolor's, dolour's
-    dolor, dolour
-    dolors, dolours
-    domesticize, domesticise
-    domesticized, domesticised
-    domesticizes, domesticises
-    domesticizing, domesticising
-    domine, dominae
-    dopey, dopy
-    dora, doura
-    Doricize's, Doricise's
-    Doricize, Doricise
-    Doricizes, Doricises
-    dorize, dorise
-    dorized, dorised
-    dorizes, dorises
-    dorizing, dorising
-    doryline, dorylinae
-    doughnut's, donut's
-    doughnut, donut
-    doughnuts, donuts
-    doweled, dowelled
-    doweler, doweller
-    doweling, dowelling
-    downdraft's, downdraught's
-    downdraft, downdraught
-    dracena, dracaena
-    dracenaceae, dracaenaceae
-    dracenas, dracaenas
-    draftier, draughtier
-    draftiest, draughtiest
-    draftilier, draughtilier
-    draftiliest, draughtiliest
-    draftily, draughtily
-    draftiness's, draughtiness's
-    draftiness, draughtiness
-    draftinesses, draughtinesses
-    draftsman's, draughtsman's
-    draftsman, draughtsman
-    draftsmanship's, draughtsmanship's
-    draftsmanship, draughtsmanship
-    draftsmanships, draughtsmanships
-    draftsmen, draughtsmen
-    draftsperson, draughtsperson
-    draftswoman's, draughtswoman's
-    draftswoman, draughtswoman
-    draftswomen, draughtswomen
-    drafty, draughty
-    dragonize, dragonise
-    dragonized, dragonised
-    dragonizes, dragonises
-    dragonizing, dragonising
-    dramatizable's, dramatisable's
-    dramatizable, dramatisable
-    dramatizabler, dramatisabler
-    dramatizables, dramatisables
-    dramatizablest, dramatisablest
-    dramatization's, dramatisation's
-    dramatization, dramatisation
-    dramatizations, dramatisations
-    dramatize, dramatise
-    dramatized, dramatised
-    dramatizer's, dramatiser's
-    dramatizer, dramatiser
-    dramatizers, dramatisers
-    dramatizes, dramatises
-    dramatizing, dramatising
-    dreamed, dreamt
-    driveled, drivelled
-    driveler's, driveller's
-    driveler, driveller
-    drivelers, drivellers
-    driveling, drivelling
-    drought's, drouth's
-    drought, drouth
-    droughtiness, drouthiness
-    droughts, drouthes
-    droughty, drouthy
-    dryly, drily
-    dualization's, dualisation's
-    dualization, dualisation
-    dualizations, dualisations
-    dualize, dualise
-    dualizes, dualises
-    ductilize, ductilise
-    ductilizes, ductilises
-    dueled, duelled
-    dueler's, dueller's
-    dueler, dueller
-    duelers, duellers
-    dueling, duelling
-    duelings, duellings
-    duelist's, duellist's
-    duelist, duellist
-    duelists, duellists
-    duer, dure
-    dullness's, dulness's
-    dullness, dulness
-    dullnesses, dulnesses
-    dumbfound, dumfound
-    dumbfounded, dumfounded
-    dumbfounding, dumfounding
-    dumbfoundingly, dumfoundingly
-    dumbfounds, dumfounds
-    dumpster's, Dumpster's
-    dumpster, Dumpster
-    dumpsters, Dumpsters
-    dynamize, dynamise
-    dynamized, dynamised
-    dynamizes, dynamises
-    dynamizing, dynamising
-    dysesthesia, dysaesthesia
-    dysesthetic, dysaesthetic
-    dysmenorrhea's, dysmenorrhoea's
-    dysmenorrhea, dysmenorrhoea
-    dysmenorrheal, dysmenorrhoeal
-    dysmenorrheas, dysmenorrhoeas
-    dysmenorrheic, dysmenorrhoeic
-    dyspnea's, dyspnoea's
-    dyspnea, dyspnoea
-    dyspneal, dyspnoeal
-    dyspneas, dyspnoeas
-    dyspneic, dyspnoeic
-    earlierize, earlierise
-    earlierized, earlierised
-    earlierizes, earlierises
-    earlierizing, earlierising
-    easternize, easternise
-    ebionize, ebionise
-    ebionized, ebionised
-    ebionizes, ebionises
-    ebionizing, ebionising
-    ebonization, ebonisation
-    ebonize, ebonise
-    ebonized, ebonised
-    ebonizes, ebonises
-    ebonizing, ebonising
-    ec, aec
-    ecclesiasticize, ecclesiasticise
-    ecclesiasticizes, ecclesiasticises
-    echoize, echoise
-    echoized, echoised
-    echoizes, echoises
-    echoizing, echoising
-    eclecticize, eclecticise
-    eclecticizes, eclecticises
-    ecoid, oecoid
-    economization's, economisation's
-    economization, economisation
-    economizations, economisations
-    economize, economise
-    economized, economised
-    economizer's, economiser's
-    economizer, economiser
-    economizers, economisers
-    economizes, economises
-    economizing, economising
-    ecophobia, oecophobia
-    ecstasize, ecstasise
-    ecstasized, ecstasised
-    ecstasizes, ecstasises
-    ecstasizing, ecstasising
-    ecstaticize, ecstaticise
-    ecstaticizes, ecstaticises
-    ectethmoid, ectoethmoid
-    ectocelic, ectocoelic
-    ecumenic, oecumenic
-    ecumenicalism, oecumenicalism
-    ecumenicity, oecumenicity
-    ecumenism, oecumenism
-    ecus, oecus
-    edema's, oedema's
-    edema, oedema
-    edemas, oedemas
-    edematose, oedematose
-    edematous, oedematous
-    Edenization's, Edenisation's
-    Edenization, Edenisation
-    Edenizations, Edenisations
-    Edenize's, Edenise's
-    Edenize, Edenise
-    Edenizes, Edenises
-    edicule's, aedicule's
-    edicule, aedicule
-    edility, aedility
-    editorialization's, editorialisation's
-    editorialization, editorialisation
-    editorializations, editorialisations
-    editorialize, editorialise
-    editorialized, editorialised
-    editorializer's, editorialiser's
-    editorializer, editorialiser
-    editorializes, editorialises
-    editorializing, editorialising
-    eerie, eery
-    Eetion's, Eaetion's
-    Eetion, Eaetion
-    effectualize, effectualise
-    effectualizes, effectualises
-    effeminatize, effeminatise
-    effeminatizes, effeminatises
-    effeminization's, effeminisation's
-    effeminization, effeminisation
-    effeminize, effeminise
-    effeminized, effeminised
-    effeminizes, effeminises
-    effeminizing, effeminising
-    eger, aeger
-    eger, egre
-    egilops, aegilops
-    eglogue, aeglogue
-    egoize, egoise
-    egoizer, egoiser
-    egoizers, egoisers
-    egoizes, egoises
-    egophony, aegophony
-    egotize, egotise
-    egotized, egotised
-    egotizes, egotises
-    egotizing, egotising
-    egritude, aegritude
-    Egyptianization's, Egyptianisation's
-    Egyptianization, Egyptianisation
-    Egyptianizations, Egyptianisations
-    Egyptianize's, Egyptianise's
-    Egyptianize, Egyptianise
-    Egyptianized's, Egyptianised's
-    Egyptianized, Egyptianised
-    Egyptianizes, Egyptianises
-    Egyptianizing's, Egyptianising's
-    Egyptianizing, Egyptianising
-    Egyptize's, Egyptise's
-    Egyptize, Egyptise
-    Egyptizes, Egyptises
-    elasticization, elasticisation
-    elasticize, elasticise
-    elasticized, elasticised
-    elasticizer, elasticiser
-    elasticizers, elasticisers
-    elasticizes, elasticises
-    elasticizing, elasticising
-    electricalize, electricalise
-    electricalizes, electricalises
-    electricize, electricise
-    electricizes, electricises
-    electrization, electrisation
-    electrizations, electrisations
-    electrize, electrise
-    electrized, electrised
-    electrizes, electrises
-    electrizing, electrising
-    electroanesthesia's, electroanaesthesia's
-    electroanesthesia, electroanaesthesia
-    electroanesthesias, electroanaesthesias
-    electrocauterization's, electrocauterisation's
-    electrocauterization, electrocauterisation
-    electrocauterizations, electrocauterisations
-    electrodialyze, electrodialyse
-    electrodialyzer's, electrodialyser's
-    electrodialyzer, electrodialyser
-    electrodialyzers, electrodialysers
-    electrodialyzes, electrodialyses
-    electrogalvanize, electrogalvanise
-    electrogalvanizes, electrogalvanises
-    electrohomeopathies, electrohomoeopathies
-    electrohomeopathy's, electrohomoeopathy's
-    electrohomeopathy, electrohomoeopathy
-    electrolyzation's, electrolysation's
-    electrolyzation, electrolysation
-    electrolyze, electrolyse
-    electrolyzed, electrolysed
-    electrolyzer's, electrolyser's
-    electrolyzer, electrolyser
-    electrolyzes, electrolyses
-    electrolyzing, electrolysing
-    electromagnetizable, electromagnetisable
-    electrotonize, electrotonise
-    electrotonizes, electrotonises
-    elegize, elegise
-    elegized, elegised
-    elegizes, elegises
-    elegizing, elegising
-    elementalize, elementalise
-    elementalizes, elementalises
-    eleoblast, elaeoblast
-    eleolite, elaeolite
-    eleomargaric, elaeomargaric
-    eleometer, elaeometer
-    eleoptene's, elaeoptene's
-    eleoptene, elaeoptene
-    Elizabethanize's, Elizabethanise's
-    Elizabethanize, Elizabethanise
-    Elizabethanizes, Elizabethanises
-    Elizabethville's, Elisabethville's
-    Elizabethville, Elisabethville
-    embedment, imbedment
-    embedments, imbedments
-    emblematicize, emblematicise
-    emblematicizes, emblematicises
-    emblematization, emblematisation
-    emblematize, emblematise
-    emblematized, emblematised
-    emblematizes, emblematises
-    emblematizing, emblematising
-    emblemize, emblemise
-    emblemized, emblemised
-    emblemizes, emblemises
-    emblemizing, emblemising
-    embolization, embolisation
-    emboweled, embowelled
-    emboweling, embowelling
-    emotionalization's, emotionalisation's
-    emotionalization, emotionalisation
-    emotionalizations, emotionalisations
-    emotionalize, emotionalise
-    emotionalized, emotionalised
-    emotionalizes, emotionalises
-    emotionalizing, emotionalising
-    emotionize, emotionise
-    emotionizes, emotionises
-    empathize, empathise
-    empathized, empathised
-    empathizes, empathises
-    empathizing, empathising
-    emperize, emperise
-    emperized, emperised
-    emperizes, emperises
-    emperizing, emperising
-    empestic, empaestic
-    emphasize, emphasise
-    emphasized, emphasised
-    emphasizer, emphasiser
-    emphasizers, emphasisers
-    emphasizes, emphasises
-    emphasizing, emphasising
-    employee's, employe's
-    employee, employe
-    employees, employes
-    emprise, emprize
-    emprises, emprizes
-    empyreumatize, empyreumatise
-    empyreumatized, empyreumatised
-    empyreumatizes, empyreumatises
-    empyreumatizing, empyreumatising
-    emule, aemule
-    emuled, aemuled
-    emules, aemules
-    emuling, aemuling
-    emulsionize, emulsionise
-    emulsionized, emulsionised
-    emulsionizes, emulsionises
-    emulsionizing, emulsionising
-    enameled, enamelled
-    enameler's, enameller's
-    enameler, enameller
-    enamelers, enamellers
-    enameling, enamelling
-    enamelings, enamellings
-    enamelist's, enamellist's
-    enamelist, enamellist
-    enamelists, enamellists
-    enamor's, enamour's
-    enamor, enamour
-    enamored's, enamoured's
-    enamored, enamoured
-    enamoredness's, enamouredness's
-    enamoredness, enamouredness
-    enamorednesses, enamourednesses
-    enamoreds, enamoureds
-    enamoring, enamouring
-    enamorment's, enamourment's
-    enamorment, enamourment
-    enamorments, enamourments
-    enamors, enamours
-    enarbor's, enarbour's
-    enarbor, enarbour
-    enarbors, enarbours
-    encarnalization, encarnalisation
-    encarnalize, encarnalise
-    encarnalized, encarnalised
-    encarnalizes, encarnalises
-    encarnalizing, encarnalising
-    encephalocele, encephalocoele
-    enclose, inclose
-    enclosed, inclosed
-    encloses, incloses
-    enclosing, inclosing
-    enclosure's, inclosure's
-    enclosure, inclosure
-    enclosures, inclosures
-    encolor's, encolour's
-    encolor, encolour
-    encolored, encoloured
-    encoloring, encolouring
-    encolors, encolours
-    encrust, incrust
-    encrusted, incrusted
-    encrusting, incrusting
-    encrusts, incrusts
-    encumber, incumber
-    encumbered, incumbered
-    encumbering, incumbering
-    encumbers, incumbers
-    encyclopedia's, encyclopaedia's
-    encyclopedia, encyclopaedia
-    encyclopediac, encyclopaediac
-    encyclopedial, encyclopaedial
-    encyclopedian, encyclopaedian
-    encyclopedias, encyclopaedias
-    encyclopedic, encyclopaedic
-    encyclopedical, encyclopaedical
-    encyclopedically, encyclopaedically
-    encyclopedism, encyclopaedism
-    encyclopedisms, encyclopaedisms
-    encyclopedist, encyclopaedist
-    encyclopedists, encyclopaedists
-    endameba, endamoeba
-    endamebae, endamoebae
-    endamebas, endamoebas
-    endamebiasis, endamoebiasis
-    endamebic, endamoebic
-    endeavor's, endeavour's
-    endeavor, endeavour
-    endeavored, endeavoured
-    endeavorer's, endeavourer's
-    endeavorer, endeavourer
-    endeavorers, endeavourers
-    endeavoring, endeavouring
-    endeavors, endeavours
-    Enders, Endres
-    endorse, indorse
-    endorsed, indorsed
-    endorsement's, indorsement's
-    endorsement, indorsement
-    endorsements, indorsements
-    endorses, indorses
-    endorsing, indorsing
-    endue, indue
-    endued, indued
-    endues, indues
-    enduing, induing
-    eneid, aeneid
-    energization, energisation
-    energize, energise
-    energized, energised
-    energizer's, energiser's
-    energizer, energiser
-    energizers, energisers
-    energizes, energises
-    energizing, energising
-    Englishize's, Englishise's
-    Englishize, Englishise
-    Englishizes, Englishises
-    engrandize, engrandise
-    engrandizement's, engrandisement's
-    engrandizement, engrandisement
-    engrandizements, engrandisements
-    engrandizes, engrandises
-    enharbor, enharbour
-    enhemospore, enhaemospore
-    enhypostatize, enhypostatise
-    enhypostatized, enhypostatised
-    enhypostatizes, enhypostatises
-    enhypostatizing, enhypostatising
-    enigmatize, enigmatise
-    enigmatized, enigmatised
-    enigmatizes, enigmatises
-    enigmatizing, enigmatising
-    enjambment's, enjambement's
-    enjambment, enjambement
-    enjambments, enjambements
-    enocyte, oenocyte
-    enolic, oenolic
-    enolization's, enolisation's
-    enolization, enolisation
-    enolizations, enolisations
-    enolize, enolise
-    enolizes, enolises
-    enological, oenological
-    enologist, oenologist
-    enologists, oenologists
-    enomania, oenomania
-    enroll, enrol
-    enrollment's, enrolment's
-    enrollment, enrolment
-    enrollments, enrolments
-    enrolls, enrols
-    ensepulcher's, ensepulchre's
-    ensepulcher, ensepulchre
-    ensepulcherred, ensepulchred
-    ensepulcherring, ensepulchring
-    ensepulchers, ensepulchres
-    ensorceled, ensorcelled
-    ensorcels, ensorcells
-    entameba, entamoeba
-    entamebae, entamoebae
-    entamebas, entamoebas
-    entamebic, entamoebic
-    entender, entendre
-    entenders, entendres
-    enterocele, enterocoele
-    enteroceles, enterocoeles
-    enthrall, enthral
-    enthrallment's, enthralment's
-    enthrallment, enthralment
-    enthrallments, enthralments
-    enthralls, enthrals
-    enthronization's, enthronisation's
-    enthronization, enthronisation
-    enthronizations, enthronisations
-    enthronize, enthronise
-    enthronized, enthronised
-    enthronizes, enthronises
-    enthronizing, enthronising
-    entocele, entocoele
-    entomologize, entomologise
-    entomologized, entomologised
-    entomologizes, entomologises
-    entomologizing, entomologising
-    entre, entrae
-    entrench, intrench
-    entrenched, intrenched
-    entrenches, intrenches
-    entrenching, intrenching
-    entrenchment's, intrenchment's
-    entrenchment, intrenchment
-    entrenchments, intrenchments
-    entrust, intrust
-    entrusted, intrusted
-    entrusting, intrusting
-    entrustment, intrustment
-    entrustments, intrustments
-    entrusts, intrusts
-    envapor's, envapour's
-    envapor, envapour
-    envapors, envapours
-    envenomization, envenomisation
-    eolic, aeolic
-    eolipile's, aeolipile's
-    eolipile, aeolipile
-    eolipiles, aeolipiles
-    eolotropic, aeolotropic
-    eon's, aeon's
-    eon, aeon
-    eonian, aeonian
-    eonism's, aeonism's
-    eonism, aeonism
-    eonisms, aeonisms
-    eons, aeons
-    Eopaleozoic's, Eopalaeozoic's
-    Eopaleozoic, Eopalaeozoic
-    epaulet's, epaulette's
-    epaulet, epaulette
-    epaulets, epaulettes
-    epenetic, epaenetic
-    ephete, ephetae
-    epicele, epicoele
-    epicenter's, epicentre's
-    epicenter, epicentre
-    epicenters, epicentres
-    Epicurize's, Epicurise's
-    Epicurize, Epicurise
-    epicurize, epicurise
-    epicurized, epicurised
-    Epicurizes, Epicurises
-    epicurizes, epicurises
-    epicurizing, epicurising
-    epidotization, epidotisation
-    epidotizations, epidotisations
-    epidotized, epidotised
-    epigeal, epigaeal
-    epigean, epigaean
-    epigeous, epigaeous
-    epigrammatization, epigrammatisation
-    epigrammatize, epigrammatise
-    epigrammatized, epigrammatised
-    epigrammatizer, epigrammatiser
-    epigrammatizes, epigrammatises
-    epigrammatizing, epigrammatising
-    epilogize, epilogise
-    epilogized, epilogised
-    epilogizes, epilogises
-    epilogizing, epilogising
-    epilogue's, epilog's
-    epilogue, epilog
-    epilogues, epilogs
-    epiloguize, epiloguise
-    epiloguized, epiloguised
-    epiloguizes, epiloguises
-    epiloguizing, epiloguising
-    epimerize, epimerise
-    epimerized, epimerised
-    epimerizing, epimerising
-    epinephrine's, epinephrin's
-    epinephrine, epinephrin
-    epinephrines, epinephrins
-    epiphanize, epiphanise
-    epiphanized, epiphanised
-    epiphanizing, epiphanising
-    Episcopalianize's, Episcopalianise's
-    Episcopalianize, Episcopalianise
-    Episcopalianizes, Episcopalianises
-    episcopize, episcopise
-    episcopized, episcopised
-    episcopizes, episcopises
-    episcopizing, episcopising
-    epistolize, epistolise
-    epistolized, epistolised
-    epistolizes, epistolises
-    epistolizing, epistolising
-    epitaphize, epitaphise
-    epitaphizes, epitaphises
-    epithetize, epithetise
-    epithetizes, epithetises
-    epitomization's, epitomisation's
-    epitomization, epitomisation
-    epitomizations, epitomisations
-    epitomize, epitomise
-    epitomized, epitomised
-    epitomizer's, epitomiser's
-    epitomizer, epitomiser
-    epitomizers, epitomisers
-    epitomizes, epitomises
-    epitomizing, epitomising
-    eq, aeq
-    equaled, equalled
-    equaling, equalling
-    equalization's, equalisation's
-    equalization, equalisation
-    equalizations, equalisations
-    equalize, equalise
-    equalized, equalised
-    equalizer's, equaliser's
-    equalizer, equaliser
-    equalizers, equalisers
-    equalizes, equalises
-    equalizing, equalising
-    equalizings, equalisings
-    equestrianize, equestrianise
-    equestrianizes, equestrianises
-    erbia, rebia
-    erbias, rebias
-    ergotize, ergotise
-    ergotized, ergotised
-    ergotizes, ergotises
-    ergotizing, ergotising
-    eric, aeric
-    erical, aerical
-    erke, reke
-    ern, ren
-    ernes, renes
-    ernest, renest
-    erns, rens
-    erogenesis, aerogenesis
-    erogenic, aerogenic
-    eros, aeros
-    erose, aerose
-    eroticization, eroticisation
-    eroticize, eroticise
-    eroticized, eroticised
-    eroticizes, eroticises
-    eroticizing, eroticising
-    erses, reses
-    ersh, resh
-    ert, ret
-    eruginous, aeruginous
-    erugo, aerugo
-    erugos, aerugos
-    ervalenta, revalenta
-    ervalentas, revalentas
-    erythrean, erythraean
-    erythremia, erythraemia
-    esc, aesc
-    escalades, escaladoes
-    eschynite, aeschynite
-    escollope's, escalop's
-    escollope, escalop
-    escollopes, escalops
-    esculapian, aesculapian
-    esculetin, aesculetin
-    esculin's, aesculin's
-    esculin, aesculin
-    Eskimoized's, Eskimoised's
-    Eskimoized, Eskimoised
-    Eskimoizeds, Eskimoiseds
-    esop, aesop
-    esophagal, oesophagal
-    esophagean, oesophagean
-    esophagism, oesophagism
-    esophagismus, oesophagismus
-    esophagitis, oesophagitis
-    esophagus, oesophagus
-    Essenize's, Essenise's
-    Essenize, Essenise
-    Essenizes, Essenises
-    essentialize, essentialise
-    essentializes, essentialises
-    esterization's, esterisation's
-    esterization, esterisation
-    esterizations, esterisations
-    esterize, esterise
-    esterizes, esterises
-    estheses, aestheses
-    esthesia's, aesthesia's
-    esthesia, aesthesia
-    esthesias, aesthesias
-    esthesiogen, aesthesiogen
-    esthesiogenic, aesthesiogenic
-    esthesiogens, aesthesiogens
-    esthesis, aesthesis
-    esthetical, aesthetical
-    esthetician's, aesthetician's
-    esthetician, aesthetician
-    estheticians, aestheticians
-    estival, aestival
-    estivate, aestivate
-    estivated, aestivated
-    estivates, aestivates
-    estivating, aestivating
-    estivation's, aestivation's
-    estivation, aestivation
-    estivations, aestivations
-    estivator's, aestivator's
-    estivator, aestivator
-    estive, aestive
-    estradiol's, oestradiol's
-    estradiol, oestradiol
-    estradiols, oestradiols
-    estral, oestral
-    estrin's, oestrin's
-    estrin, oestrin
-    estrins, oestrins
-    estriol's, oestriol's
-    estriol, oestriol
-    estriols, oestriols
-    estrogen's, oestrogen's
-    estrogen, oestrogen
-    estrogenic, oestrogenic
-    estrogens, oestrogens
-    estrone's, oestrone's
-    estrone, oestrone
-    estrones, oestrones
-    estrous, oestrous
-    estrual, oestrual
-    estruate, oestruate
-    estruation, oestruation
-    estrum, oestrum
-    estrums, oestrums
-    estrus's, oestrus's
-    estrus, oestrus
-    estruses, oestruses
-    estuate, aestuate
-    estuous, aestuous
-    esture, aesture
-    estus, aestus
-    et, aet
-    eternalization's, eternalisation's
-    eternalization, eternalisation
-    eternalizations, eternalisations
-    eternalize, eternalise
-    eternalized, eternalised
-    eternalizes, eternalises
-    eternalizing, eternalising
-    eternization's, eternisation's
-    eternization, eternisation
-    eternizations, eternisations
-    eternize, eternise
-    eternized, eternised
-    eternizes, eternises
-    eternizing, eternising
-    etheling, aetheling
-    etherealization's, etherealisation's
-    etherealization, etherealisation
-    etherealizations, etherealisations
-    etherealize, etherealise
-    etherealized, etherealised
-    etherealizes, etherealises
-    etherealizing, etherealising
-    ethered, aethered
-    etherialization's, etherialisation's
-    etherialization, etherialisation
-    etherialize, etherialise
-    etherialized, etherialised
-    etherializing, etherialising
-    etheric, aetheric
-    etherization's, etherisation's
-    etherization, etherisation
-    etherizations, etherisations
-    etherize, etherise
-    etherized, etherised
-    etherizer's, etheriser's
-    etherizer, etheriser
-    etherizers, etherisers
-    etherizes, etherises
-    etherizing, etherising
-    ethicization, ethicisation
-    ethicize, ethicise
-    ethicized, ethicised
-    ethicizes, ethicises
-    ethicizing, ethicising
-    ethnicize, ethnicise
-    ethnicizes, ethnicises
-    etiogenic, aetiogenic
-    etiologically, aetiologically
-    etiologist's, aetiologist's
-    etiologist, aetiologist
-    etiologue, aetiologue
-    etiology's, aetiology's
-    etiology, aetiology
-    etiophyllin, aetiophyllin
-    etiotropic, aetiotropic
-    etiotropically, aetiotropically
-    etymologizable, etymologisable
-    etymologization, etymologisation
-    etymologize, etymologise
-    etymologized, etymologised
-    etymologizes, etymologises
-    etymologizing, etymologising
-    eudemon, eudaemon
-    eudemonia, eudaemonia
-    eudemonic, eudaemonic
-    eudemonics, eudaemonics
-    eudemonism, eudaemonism
-    eudemonisms, eudaemonisms
-    eudemonist's, eudaemonist's
-    eudemonist, eudaemonist
-    eudemonistic, eudaemonistic
-    eudemonistical, eudaemonistical
-    eudemonistically, eudaemonistically
-    eudemonists, eudaemonists
-    eudemons, eudaemons
-    eudemony, eudaemony
-    euhemerize, euhemerise
-    euhemerized, euhemerised
-    euhemerizes, euhemerises
-    euhemerizing, euhemerising
-    eukaryote's, eucaryote's
-    eukaryote, eucaryote
-    eukaryotes, eucaryotes
-    eukaryotic, eucaryotic
-    eulogization's, eulogisation's
-    eulogization, eulogisation
-    eulogizations, eulogisations
-    eulogize, eulogise
-    eulogized, eulogised
-    eulogizer's, eulogiser's
-    eulogizer, eulogiser
-    eulogizers, eulogisers
-    eulogizes, eulogises
-    eulogizing, eulogising
-    eunuchize, eunuchise
-    eunuchized, eunuchised
-    eunuchizes, eunuchises
-    eunuchizing, eunuchising
-    euphemization's, euphemisation's
-    euphemization, euphemisation
-    euphemize, euphemise
-    euphemized, euphemised
-    euphemizer's, euphemiser's
-    euphemizer, euphemiser
-    euphemizers, euphemisers
-    euphemizes, euphemises
-    euphemizing, euphemising
-    euphonization, euphonisation
-    euphonize, euphonise
-    euphonized, euphonised
-    euphonizes, euphonises
-    euphonizing, euphonising
-    euphuize, euphuise
-    euphuized, euphuised
-    euphuizes, euphuises
-    euphuizing, euphuising
-    eupnea's, eupnoea's
-    eupnea, eupnoea
-    eupneas, eupnoeas
-    eupneic, eupnoeic
-    Europeanization's, Europeanisation's
-    Europeanization, Europeanisation
-    Europeanizations, Europeanisations
-    Europeanize, Europeanise
-    europeanize, europeanise
-    Europeanized, Europeanised
-    europeanized, europeanised
-    Europeanizes, Europeanises
-    europeanizes, europeanises
-    Europeanizing, Europeanising
-    europeanizing, europeanising
-    Euryale's, Euryalae's
-    Euryale, Euryalae
-    evangelization's, evangelisation's
-    evangelization, evangelisation
-    evangelizations, evangelisations
-    evangelize, evangelise
-    evangelized, evangelised
-    evangelizer's, evangeliser's
-    evangelizer, evangeliser
-    evangelizers, evangelisers
-    evangelizes, evangelises
-    evangelizing, evangelising
-    eventualize, eventualise
-    eventualized, eventualised
-    eventualizes, eventualises
-    eventualizing, eventualising
-    eviler, eviller
-    evilest, evillest
-    eviternal, aeviternal
-    evolutionize, evolutionise
-    evolutionizes, evolutionises
-    excursionize, excursionise
-    excursionized, excursionised
-    excursionizes, excursionises
-    excursionizing, excursionising
-    exestuate, exaestuate
-    exhibitionize, exhibitionise
-    exhibitionizes, exhibitionises
-    existentialize, existentialise
-    existentializes, existentialises
-    exorcise, exorcize
-    exorcised, exorcized
-    exorcises, exorcizes
-    exorcising, exorcizing
-    exorcization, exorcisation
-    exorcizement, exorcisement
-    exorcizer's, exorciser's
-    exorcizer, exorciser
-    exorcizers, exorcisers
-    expediter's, expeditor's
-    expediter, expeditor
-    expediters, expeditors
-    experimentalize, experimentalise
-    experimentalized, experimentalised
-    experimentalizes, experimentalises
-    experimentalizing, experimentalising
-    experimentize, experimentise
-    experimentizes, experimentises
-    expertized, expertised
-    expertizing, expertising
-    exsiccate, exsiccatae
-    extemporization's, extemporisation's
-    extemporization, extemporisation
-    extemporizations, extemporisations
-    extemporize, extemporise
-    extemporized, extemporised
-    extemporizer's, extemporiser's
-    extemporizer, extemporiser
-    extemporizers, extemporisers
-    extemporizes, extemporises
-    extemporizing, extemporising
-    extendable, extendible
-    exteriorization's, exteriorisation's
-    exteriorization, exteriorisation
-    exteriorizations, exteriorisations
-    exteriorize, exteriorise
-    exteriorized, exteriorised
-    exteriorizes, exteriorises
-    exteriorizing, exteriorising
-    externalization's, externalisation's
-    externalization, externalisation
-    externalizations, externalisations
-    externalize, externalise
-    externalized, externalised
-    externalizes, externalises
-    externalizing, externalising
-    extol, extoll
-    extols, extolls
-    extrovert's, extravert's
-    extrovert, extravert
-    extroverted, extraverted
-    extroverts, extraverts
-    eyeing, eying
-    fabulize, fabulise
-    fabulized, fabulised
-    fabulizes, fabulises
-    fabulizing, fabulising
-    facsimilize, facsimilise
-    facsimilizes, facsimilises
-    factorization's, factorisation's
-    factorization, factorisation
-    factorizations, factorisations
-    factorize, factorise
-    factorized, factorised
-    factorizes, factorises
-    factorizing, factorising
-    faence's, faoence's
-    faence, faoence
-    faerie's, faery's
-    faerie, faery
-    faitor, faitour
-    faitors, faitours
-    falafel's, felafel's
-    falafel, felafel
-    familiarization's, familiarisation's
-    familiarization, familiarisation
-    familiarizations, familiarisations
-    familiarize, familiarise
-    familiarized, familiarised
-    familiarizer's, familiariser's
-    familiarizer, familiariser
-    familiarizers, familiarisers
-    familiarizes, familiarises
-    familiarizing, familiarising
-    familiarizingly, familiarisingly
-    fanaticize, fanaticise
-    fanaticized, fanaticised
-    fanaticizes, fanaticises
-    fanaticizing, fanaticising
-    fantasied, phantasied
-    fantasies, phantasies
-    fantasize, fantasise
-    fantasized, fantasised
-    fantasizer, fantasiser
-    fantasizes, fantasises
-    fantasizing, fantasising
-    fantasy's, phantasy's
-    fantasy, phantasy
-    fantasying, phantasying
-    faradization's, faradisation's
-    faradization, faradisation
-    faradizations, faradisations
-    faradize, faradise
-    faradized, faradised
-    faradizer's, faradiser's
-    faradizer, faradiser
-    faradizers, faradisers
-    faradizes, faradises
-    faradizing, faradising
-    fasciole, fasciolae
-    fascisticization's, fascisticisation's
-    fascisticization, fascisticisation
-    fascisticizations, fascisticisations
-    fascisticize, fascisticise
-    fascisticizes, fascisticises
-    fascistization's, fascistisation's
-    fascistization, fascistisation
-    fascistizations, fascistisations
-    fascistize, fascistise
-    fascistized, fascistised
-    fascistizes, fascistises
-    fascistizing, fascistising
-    fashionize, fashionise
-    fashionizes, fashionises
-    fatalize, fatalise
-    fatalizes, fatalises
-    favor's, favour's
-    favor, favour
-    favorable's, favourable's
-    favorable, favourable
-    favorableness's, favourableness's
-    favorableness, favourableness
-    favorablenesses, favourablenesses
-    favorabler, favourabler
-    favorables, favourables
-    favorablest, favourablest
-    favorablier, favourablier
-    favorabliest, favourabliest
-    favorably, favourably
-    favored's, favoured's
-    favored, favoured
-    favoredlier, favouredlier
-    favoredliest, favouredliest
-    favoredly, favouredly
-    favoredness's, favouredness's
-    favoredness, favouredness
-    favorednesses, favourednesses
-    favoreds, favoureds
-    favorer's, favourer's
-    favorer, favourer
-    favorers, favourers
-    favoress, favouress
-    favoring's, favouring's
-    favoring, favouring
-    favoringlier, favouringlier
-    favoringliest, favouringliest
-    favoringly, favouringly
-    favorings, favourings
-    favorite's, favourite's
-    favorite, favourite
-    favoriter, favouriter
-    favorites, favourites
-    favoritest, favouritest
-    favoritism's, favouritism's
-    favoritism, favouritism
-    favoritisms, favouritisms
-    favorless, favourless
-    favorlesser, favourlesser
-    favorlesses, favourlesses
-    favorlessest, favourlessest
-    favors, favours
-    fayer, fayre
-    fe, fae
-    fecal, faecal
-    fecalith, faecalith
-    feces's, faeces's
-    feces, faeces
-    fecula, faecula
-    feculence, faeculence
-    Fecunditatis's, Foecunditatis's
-    Fecunditatis, Foecunditatis
-    fecundize, fecundise
-    fecundizes, fecundises
-    fedarie, foedarie
-    fedaries, foedaries
-    federalization's, federalisation's
-    federalization, federalisation
-    federalizations, federalisations
-    federalize, federalise
-    federalized, federalised
-    federalizes, federalises
-    federalizing, federalising
-    Fedor's, Faedor's
-    Fedor, Faedor
-    feer, fere
-    feers, feres
-    femalize, femalise
-    femalizes, femalises
-    feminization's, feminisation's
-    feminization, feminisation
-    feminizations, feminisations
-    feminize, feminise
-    feminized, feminised
-    feminizes, feminises
-    feminizing, feminising
-    femtometer, femtometre
-    femtometers, femtometres
-    feralized, feralised
-    ferd, fred
-    ferie, feriae
-    ferity, freity
-    Ferneau's, Freneau's
-    Ferneau, Freneau
-    ferreled, ferrelled
-    ferreling, ferrelling
-    ferritization's, ferritisation's
-    ferritization, ferritisation
-    ferritizations, ferritisations
-    fertilizability's, fertilisability's
-    fertilizability, fertilisability
-    fertilizable's, fertilisable's
-    fertilizable, fertilisable
-    fertilizabler, fertilisabler
-    fertilizables, fertilisables
-    fertilizablest, fertilisablest
-    fertilization's, fertilisation's
-    fertilization, fertilisation
-    fertilizational's, fertilisational's
-    fertilizational, fertilisational
-    fertilizationaler, fertilisationaler
-    fertilizationalest, fertilisationalest
-    fertilizationals, fertilisationals
-    fertilizations, fertilisations
-    fertilize, fertilise
-    fertilized, fertilised
-    fertilizer's, fertiliser's
-    fertilizer, fertiliser
-    fertilizers, fertilisers
-    fertilizes, fertilises
-    fertilizing, fertilising
-    fervor's, fervour's
-    fervor, fervour
-    fervorless, fervourless
-    fervorlesses, fervourlesses
-    fervors, fervours
-    fetal, foetal
-    fetalism, foetalism
-    fetation's, foetation's
-    fetation, foetation
-    fetichize, fetichise
-    fetichized, fetichised
-    fetichizes, fetichises
-    fetichizing, fetichising
-    feticidal, foeticidal
-    feticide's, foeticide's
-    feticide, foeticide
-    feticides, foeticides
-    fetid, foetid
-    fetiferous, foetiferous
-    fetiparous, foetiparous
-    fetish's, fetich's
-    fetish, fetich
-    fetishes, fetiches
-    fetishization's, fetishisation's
-    fetishization, fetishisation
-    fetishizations, fetishisations
-    fetishize, fetishise
-    fetishized, fetishised
-    fetishizes, fetishises
-    fetishizing, fetishising
-    fetor's, foetor's
-    fetor, foetor
-    fetors, foetors
-    fetoscopies, foetoscopies
-    fetoscopy, foetoscopy
-    feture, foeture
-    fetus's, foetus's
-    fetus, foetus
-    fetuses, foetuses
-    feudalizable's, feudalisable's
-    feudalizable, feudalisable
-    feudalizables, feudalisables
-    feudalization's, feudalisation's
-    feudalization, feudalisation
-    feudalizations, feudalisations
-    feudalize, feudalise
-    feudalized, feudalised
-    feudalizes, feudalises
-    feudalizing, feudalising
-    feuter, feutre
-    fiber's, fibre's
-    fiber, fibre
-    fiberboard's, fibreboard's
-    fiberboard, fibreboard
-    fiberboards, fibreboards
-    fibered, fibred
-    fiberfill's, fibrefill's
-    fiberfill, fibrefill
-    fiberfills, fibrefills
-    fiberglass's, fibreglass's
-    fiberglass, fibreglass
-    fiberglasses, fibreglasses
-    fiberless, fibreless
-    fiberlesser, fibrelesser
-    fiberlesses, fibrelesses
-    fiberlessest, fibrelessest
-    fibers, fibres
-    fiberscope, fibrescope
-    fiberscopes, fibrescopes
-    fiberware, fibreware
-    fibrisation, fibrization
-    fibrise, fibrize
-    fibrised, fibrized
-    fibriser, fibrizer
-    fibrisers, fibrizers
-    fibrises, fibrizes
-    fibrising, fibrizing
-    fictionalization's, fictionalisation's
-    fictionalization, fictionalisation
-    fictionalizations, fictionalisations
-    fictionalize, fictionalise
-    fictionalized, fictionalised
-    fictionalizes, fictionalises
-    fictionalizing, fictionalising
-    fictionization's, fictionisation's
-    fictionization, fictionisation
-    fictionizations, fictionisations
-    fictionize, fictionise
-    fictionized, fictionised
-    fictionizes, fictionises
-    fictionizing, fictionising
-    figurize, figurise
-    figurizes, figurises
-    filmize, filmise
-    filmizes, filmises
-    filterable, filtrable
-    finalization's, finalisation's
-    finalization, finalisation
-    finalizations, finalisations
-    finalize, finalise
-    finalized, finalised
-    finalizes, finalises
-    finalizing, finalising
-    Finlandization, Finlandisation
-    Finlandizations, Finlandisations
-    fiscalization's, fiscalisation's
-    fiscalization, fiscalisation
-    fiscalizations, fiscalisations
-    fiscalize, fiscalise
-    fiscalizes, fiscalises
-    fjord's, fiord's
-    fjord, fiord
-    fjords, fiords
-    flamboyantize, flamboyantise
-    flamboyantizes, flamboyantises
-    flanneled, flannelled
-    flannelette's, flannelet's
-    flannelette, flannelet
-    flanneling, flannelling
-    flavor's, flavour's
-    flavor, flavour
-    flavored, flavoured
-    flavorer's, flavourer's
-    flavorer, flavourer
-    flavorers, flavourers
-    flavorful, flavourful
-    flavorfuler, flavourfuler
-    flavorfulest, flavourfulest
-    flavorfullier, flavourfullier
-    flavorfulliest, flavourfulliest
-    flavorfully, flavourfully
-    flavorier, flavourier
-    flavoriest, flavouriest
-    flavoring's, flavouring's
-    flavoring, flavouring
-    flavorings, flavourings
-    flavorless, flavourless
-    flavorlesser, flavourlesser
-    flavorlesses, flavourlesses
-    flavorlessest, flavourlessest
-    flavorous, flavourous
-    flavors, flavours
-    flavorsome, flavoursome
-    flavorsomer, flavoursomer
-    flavorsomest, flavoursomest
-    flavory, flavoury
-    fledgling's, fledgeling's
-    fledgling, fledgeling
-    fledglings, fledgelings
-    Fletcherize's, Fletcherise's
-    Fletcherize, Fletcherise
-    Fletcherized's, Fletcherised's
-    Fletcherized, Fletcherised
-    Fletcherizes, Fletcherises
-    Fletcherizing's, Fletcherising's
-    Fletcherizing, Fletcherising
-    flextime's, flexitime's
-    flextime, flexitime
-    flextimes, flexitimes
-    floozy's, floozie's
-    floozy, floozie
-    floralize, floralise
-    floralizes, floralises
-    floramor, floramour
-    flotation's, floatation's
-    flotation, floatation
-    flotations, floatations
-    fluidization's, fluidisation's
-    fluidization, fluidisation
-    fluidizations, fluidisations
-    fluidize, fluidise
-    fluidized, fluidised
-    fluidizer's, fluidiser's
-    fluidizer, fluidiser
-    fluidizers, fluidisers
-    fluidizes, fluidises
-    fluidizing, fluidising
-    fluky, flukey
-    flunkey's, flunkie's
-    flunkie, flunkey
-    flunkies, flunkeys
-    fluoridization's, fluoridisation's
-    fluoridization, fluoridisation
-    fluoridizations, fluoridisations
-    fluoridize, fluoridise
-    fluoridized, fluoridised
-    fluoridizes, fluoridises
-    fluoridizing, fluoridising
-    flutist's, flautist's
-    flutist, flautist
-    flutists, flautists
-    fo'c'sle's, fo'c's'le's
-    fo'c'sle, fo'c's'le
-    fo'c'sles, fo'c's'les
-    focalization's, focalisation's
-    focalization, focalisation
-    focalizations, focalisations
-    focalize, focalise
-    focalized, focalised
-    focalizes, focalises
-    focalizing, focalising
-    focused, focussed
-    focusing, focussing
-    fogies, fogeys
-    fogy's, fogey's
-    fogy, fogey
-    fondue's, fondu's
-    fondue, fondu
-    fondues, fondus
-    fontanel's, fontanelle's
-    fontanel, fontanelle
-    fontanels, fontanelles
-    foolhardize, foolhardise
-    foolhardized, foolhardised
-    foolhardizes, foolhardises
-    foolhardizing, foolhardising
-    forb, fourb
-    forche, fourche
-    foreignization's, foreignisation's
-    foreignization, foreignisation
-    foreignizations, foreignisations
-    foreignize, foreignise
-    foreignizes, foreignises
-    forejudgment's, forejudgement's
-    forejudgment, forejudgement
-    forejudgments, forejudgements
-    foreprize, foreprise
-    forgather, foregather
-    forgathered, foregathered
-    forgathering, foregathering
-    forgathers, foregathers
-    forgo, forego
-    forgoes, foregoes
-    forgoing, foregoing
-    forgone, foregone
-    formalizable, formalisable
-    formalization's, formalisation's
-    formalization, formalisation
-    formalizations, formalisations
-    formalize, formalise
-    formalized, formalised
-    formalizer's, formaliser's
-    formalizer, formaliser
-    formalizers, formalisers
-    formalizes, formalises
-    formalizing, formalising
-    forme, formae
-    formicide, formicidae
-    formularization's, formularisation's
-    formularization, formularisation
-    formularizations, formularisations
-    formularize, formularise
-    formularized, formularised
-    formularizer's, formulariser's
-    formularizer, formulariser
-    formularizers, formularisers
-    formularizes, formularises
-    formularizing's, formularising's
-    formularizing, formularising
-    formulization's, formulisation's
-    formulization, formulisation
-    formulizations, formulisations
-    formulize, formulise
-    formulized, formulised
-    formulizer's, formuliser's
-    formulizer, formuliser
-    formulizes, formulises
-    formulizing, formulising
-    forswear, foreswear
-    forswearing, foreswearing
-    forswears, foreswears
-    forswore, foreswore
-    forsworn, foresworn
-    forsworn, foresworn
-    forumize, forumise
-    forumizes, forumises
-    forwent, forewent
-    fosse, fossae
-    fossiled, fossilled
-    fossilizable's, fossilisable's
-    fossilizable, fossilisable
-    fossilizabler, fossilisabler
-    fossilizables, fossilisables
-    fossilizablest, fossilisablest
-    fossilization's, fossilisation's
-    fossilization, fossilisation
-    fossilizations, fossilisations
-    fossilize, fossilise
-    fossilized, fossilised
-    fossilizes, fossilises
-    fossilizing, fossilising
-    fossule, fossulae
-    foulder, fouldre
-    fouter, foutre
-    fouters, foutres
-    foveole, foveolae
-    fractionalization's, fractionalisation's
-    fractionalization, fractionalisation
-    fractionalizations, fractionalisations
-    fractionalize, fractionalise
-    fractionalized, fractionalised
-    fractionalizes, fractionalises
-    fractionalizing, fractionalising
-    fractionization's, fractionisation's
-    fractionization, fractionisation
-    fractionizations, fractionisations
-    fractionize, fractionise
-    fractionized, fractionised
-    fractionizes, fractionises
-    fractionizing, fractionising
-    fragmentization's, fragmentisation's
-    fragmentization, fragmentisation
-    fragmentize, fragmentise
-    fragmentized, fragmentised
-    fragmentizer, fragmentiser
-    fragmentizes, fragmentises
-    fragmentizing, fragmentising
-    frambesia's, framboesia's
-    frambesia, framboesia
-    frambesias, framboesias
-    Francize's, Francise's
-    Francize, Francise
-    Francizes, Francises
-    Franklinization's, Franklinisation's
-    Franklinization, Franklinisation
-    Franklinizations, Franklinisations
-    fraternization's, fraternisation's
-    fraternization, fraternisation
-    fraternizations, fraternisations
-    fraternize, fraternise
-    fraternized, fraternised
-    fraternizer's, fraterniser's
-    fraternizer, fraterniser
-    fraternizers, fraternisers
-    fraternizes, fraternises
-    fraternizing, fraternising
-    freebie's, freebee's
-    freebie, freebee
-    freebies, freebees
-    frena, fraena
-    Frenchize's, Frenchise's
-    Frenchize, Frenchise
-    Frenchizes, Frenchises
-    frenetic, phrenetic
-    frenula, fraenula
-    frenular, fraenular
-    frenulum's, fraenulum's
-    frenulum, fraenulum
-    frenum's, fraenum's
-    frenum, fraenum
-    frenums, fraenums
-    friborg, fribourg
-    frictionize, frictionise
-    frictionizes, frictionises
-    frivoled, frivolled
-    frivoler's, frivoller's
-    frivoler, frivoller
-    frivolers, frivollers
-    frivoling, frivolling
-    frizado, frisado
-    frize, frise
-    frizette's, frisette's
-    frizette, frisette
-    frizettes, frisettes
-    frizz's, friz's
-    frizz, friz
-    frowzier, frowsier
-    frowziest, frowsiest
-    frowzy, frowsy
-    fryer's, frier's
-    fryer, frier
-    fryers, friers
-    fuehrer's, f¸hrer's
-    fuehrer, f¸hrer
-    fuehrers, f¸hrers
-    fueled, fuelled
-    fueler's, fueller's
-    fueler, fueller
-    fuelers, fuellers
-    fueling, fuelling
-    fuelizer's, fueliser's
-    fuelizer, fueliser
-    fuelizers, fuelisers
-    fulfill, fulfil
-    fulfillment's, fulfilment's
-    fulfillment, fulfilment
-    fulfillments, fulfilments
-    fulfills, fulfils
-    fulgor, fulgour
-    fulgorous, fulgourous
-    fulgors, fulgours
-    fullness's, fulness's
-    fullness, fulness
-    fullnesses, fulnesses
-    functionalize, functionalise
-    functionalizes, functionalises
-    functionize, functionise
-    functionizes, functionises
-    funeralize, funeralise
-    funeralizes, funeralises
-    funneled, funnelled
-    funneler, funneller
-    funneling, funnelling
-    furcule, furculae
-    Furie's, Furiae's
-    Furie, Furiae
-    furor's, furore's
-    furor, furore
-    furors, furores
-    fusilier's, fusileer's
-    fusilier, fusileer
-    fusiliers, fusileers
-    fustianize, fustianise
-    fustianized, fustianised
-    fustianizes, fustianises
-    fustianizing, fustianising
-    futilize, futilise
-    futilizes, futilises
-    futurize, futurise
-    futurizes, futurises
-    gaberdine's, gabardine's
-    gaberdine, gabardine
-    gaberdines, gabardines
-    Gaelicization's, Gaelicisation's
-    Gaelicization, Gaelicisation
-    Gaelicizations, Gaelicisations
-    Gaelicize's, Gaelicise's
-    Gaelicize, Gaelicise
-    gaelicize, gaelicise
-    gaelicized, gaelicised
-    Gaelicizes, Gaelicises
-    gaelicizes, gaelicises
-    gaelicizing, gaelicising
-    gaiety's, gayety's
-    gaiety, gayety
-    gaily, gayly
-    galactorrhea, galactorrhoea
-    galactorrheas, galactorrhoeas
-    galactosemia, galactosaemia
-    galactosemias, galactosaemias
-    galee, galeae
-    gallantize, gallantise
-    gallantizes, gallantises
-    galliardize, galliardise
-    Gallicization's, Gallicisation's
-    Gallicization, Gallicisation
-    Gallicizations, Gallicisations
-    Gallicize, Gallicise
-    gallicize, gallicise
-    Gallicized, Gallicised
-    gallicized, gallicised
-    Gallicizer's, Galliciser's
-    Gallicizer, Galliciser
-    Gallicizes, Gallicises
-    gallicizes, gallicises
-    Gallicizing, Gallicising
-    gallicizing, gallicising
-    gallisize, gallisise
-    gallisized, gallisised
-    gallisizes, gallisises
-    gallisizing, gallisising
-    gallize, gallise
-    gallized, gallised
-    gallizes, gallises
-    gallizing, gallising
-    galosh's, galoshe's
-    galosh, galoshe
-    galvanization's, galvanisation's
-    galvanization, galvanisation
-    galvanizations, galvanisations
-    galvanize, galvanise
-    galvanized, galvanised
-    galvanizer's, galvaniser's
-    galvanizer, galvaniser
-    galvanizers, galvanisers
-    galvanizes, galvanises
-    galvanizing, galvanising
-    gambades, gambadoes
-    gamboled, gambolled
-    gamboling, gambolling
-    gamy, gamey
-    gargarize, gargarise
-    gargarized, gargarised
-    gargarizes, gargarises
-    gargarizing, gargarising
-    garotting, garoting
-    garrotte's, garote's
-    garrotte, garote
-    garrotted, garoted
-    garrottes, garotes
-    garruline, garrulinae
-    gases, gasses
-    gasoline's, gasolene's
-    gasoline, gasolene
-    gasolines, gasolenes
-    gastrea, gastraea
-    gastreas, gastraeas
-    gastrocele, gastrocoele
-    gaufer, gaufre
-    gaufers, gaufres
-    gauffer, gauffre
-    gauge's, gage's
-    gauge, gage
-    gauged, gaged
-    gauges, gages
-    gauging, gaging
-    gaveled, gavelled
-    gaveler, gaveller
-    gaveling, gavelling
-    ge, gae
-    ge, goe
-    ged, gaed
-    gelatin's, gelatine's
-    gelatin, gelatine
-    gelatinizabilities, gelatinisabilities
-    gelatinizability's, gelatinisability's
-    gelatinizability, gelatinisability
-    gelatinizable's, gelatinisable's
-    gelatinizable, gelatinisable
-    gelatinizables, gelatinisables
-    gelatinization's, gelatinisation's
-    gelatinization, gelatinisation
-    gelatinizations, gelatinisations
-    gelatinize, gelatinise
-    gelatinized, gelatinised
-    gelatinizer's, gelatiniser's
-    gelatinizer, gelatiniser
-    gelatinizers, gelatinisers
-    gelatinizes, gelatinises
-    gelatinizing, gelatinising
-    gelatins, gelatines
-    gelofer, gelofre
-    gemologies, gemmologies
-    gemology's, gemmology's
-    gemology, gemmology
-    genealogize, genealogise
-    genealogized, genealogised
-    genealogizes, genealogises
-    genealogizing, genealogising
-    generalizability, generalisability
-    generalizable's, generalisable's
-    generalizable, generalisable
-    generalizabler, generalisabler
-    generalizables, generalisables
-    generalizablest, generalisablest
-    generalization's, generalisation's
-    generalization, generalisation
-    generalizational, generalisational
-    generalizations, generalisations
-    generalize, generalise
-    generalized, generalised
-    generalizer's, generaliser's
-    generalizer, generaliser
-    generalizers, generalisers
-    generalizes, generalises
-    generalizing, generalising
-    genialize, genialise
-    genialized, genialised
-    genializes, genialises
-    genializing, genialising
-    genteelize, genteelise
-    genteelized, genteelised
-    genteelizes, genteelises
-    genteelizing, genteelising
-    gentilization's, gentilisation's
-    gentilization, gentilisation
-    gentilizations, gentilisations
-    gentilize, gentilise
-    gentilized, gentilised
-    gentilizes, gentilises
-    gentilizing, gentilising
-    gentlemanize, gentlemanise
-    gentlemanizes, gentlemanises
-    geodesia, geodaesia
-    geologize, geologise
-    geologized, geologised
-    geologizes, geologises
-    geologizing, geologising
-    geometricize, geometricise
-    geometricizes, geometricises
-    geometrization, geometrisation
-    geometrizations, geometrisations
-    geometrize, geometrise
-    geometrized, geometrised
-    geometrizes, geometrises
-    geometrizing, geometrising
-    ger, gre
-    gerenuk, greenuk
-    Germanization's, Germanisation's
-    germanization's, germanisation's
-    Germanization, Germanisation
-    germanization, germanisation
-    germanizations, germanisations
-    Germanize, Germanise
-    germanize, germanise
-    Germanized, Germanised
-    germanized, germanised
-    Germanizer's, Germaniser's
-    Germanizer, Germaniser
-    germanizer, germaniser
-    germanizers, germanisers
-    Germanizes, Germanises
-    germanizes, germanises
-    Germanizing, Germanising
-    germanizing, germanising
-    gerne, grene
-    gers, gres
-    Ges, Goes
-    gessed, gessoed
-    gesses, gessoes
-    geste, gestae
-    Getae's, Goetae's
-    Getae, Goetae
-    Getz's, Goetz's
-    Getz, Goetz
-    Getzville's, Goetzville's
-    Getzville, Goetzville
-    gewgaw's, geegaw's
-    gewgaw, geegaw
-    gewgaws, geegaws
-    gey, goey
-    Gheber's, Ghebre's
-    Gheber, Ghebre
-    Ghebers, Ghebres
-    ghettoization's, ghettoisation's
-    ghettoization, ghettoisation
-    ghettoizations, ghettoisations
-    ghettoize, ghettoise
-    ghettoized, ghettoised
-    ghettoizes, ghettoises
-    ghettoizing, ghettoising
-    giantize, giantise
-    giantizes, giantises
-    gigagram, gigagramme
-    gigagrams, gigagrammes
-    gigameter, gigametre
-    gigameters, gigametres
-    gimbaled, gimballed
-    gimbaling, gimballing
-    gingkos, gingkoes
-    ginkgo's, gingko's
-    ginkgo, gingko
-    girly, girlie
-    gizmo's, gismo's
-    gizmo, gismo
-    gizmos, gismos
-    glacialize, glacialise
-    glacializes, glacialises
-    glamorization's, glamorisation's
-    glamorizations, glamorisations
-    glamorless, glamourless
-    glamorous, glamourous
-    glamorousness's, glamourousness's
-    glamorousness, glamourousness
-    glamour's, glamor's
-    glamour, glamor
-    glamoured, glamored
-    glamouring, glamoring
-    glamourization, glamorisation
-    glamourize, glamorise
-    glamourized, glamorised
-    glamourizer's, glamoriser's
-    glamourizer, glamoriser
-    glamourizers, glamorisers
-    glamourizes, glamorises
-    glamourizing, glamorising
-    glamours, glamors
-    glauconitization, glauconitisation
-    glauconitizations, glauconitisations
-    glebe, glebae
-    globalization's, globalisation's
-    globalization, globalisation
-    globalizations, globalisations
-    globalize, globalise
-    globalized, globalised
-    globalizes, globalises
-    globalizing, globalising
-    globigerine, globigerinae
-    glottalization's, glottalisation's
-    glottalization, glottalisation
-    glottalize, glottalise
-    glottalizes, glottalises
-    glucemia, glucaemia
-    glucosemia, glucosaemia
-    gluing, glueing
-    gluteal, glutaeal
-    glutei, glutaei
-    gluteus, glutaeus
-    gluttonize, gluttonise
-    gluttonized, gluttonised
-    gluttonizes, gluttonises
-    gluttonizing, gluttonising
-    glycemia, glycaemia
-    glycemic, glycaemic
-    glycerin's, glycerine's
-    glycerin, glycerine
-    glycerinize, glycerinise
-    glycerinizes, glycerinises
-    glycerins, glycerines
-    glycerolize, glycerolise
-    glycerolized, glycerolised
-    glycerolizes, glycerolises
-    glycogenize, glycogenise
-    glycogenizes, glycogenises
-    glycohemia, glycohaemia
-    glycosemia, glycosaemia
-    Gnosticize, Gnosticise
-    gnosticize, gnosticise
-    Gnosticized's, Gnosticised's
-    Gnosticized, Gnosticised
-    Gnosticizer's, Gnosticiser's
-    Gnosticizer, Gnosticiser
-    gnosticizer, gnosticiser
-    gnosticizers, gnosticisers
-    Gnosticizes, Gnosticises
-    gnosticizes, gnosticises
-    Gnosticizing's, Gnosticising's
-    Gnosticizing, Gnosticising
-    gobbledygook's, gobbledegook's
-    gobbledygook, gobbledegook
-    gobbledygooks, gobbledegooks
-    goddamn's, goddam's
-    goddamn, goddam
-    goddamned, goddamed
-    goddamning, goddaming
-    goddamns, goddams
-    goddize, goddise
-    goddizes, goddises
-    goiter's, goitre's
-    goiter, goitre
-    goiters, goitres
-    gole, goloe
-    goliathize, goliathise
-    goliathized, goliathised
-    goliathizes, goliathises
-    goliathizing, goliathising
-    goloshes, goloshoes
-    gonorrhea's, gonorrhoea's
-    gonorrhea, gonorrhoea
-    gonorrheal, gonorrhoeal
-    gonorrhealer, gonorrhoealer
-    gonorrhealest, gonorrhoealest
-    gonorrheas, gonorrhoeas
-    gonorrheic, gonorrhoeic
-    goodbye's, goodby's
-    goodbye, goodby
-    goodbyes, goodbys
-    goody's, goodie's
-    goody, goodie
-    gor, gour
-    Gora's, Goura's
-    Gora, Goura
-    gora, goura
-    goramies, gouramies
-    gorgonize, gorgonise
-    gorgonized, gorgonised
-    gorgonizes, gorgonises
-    gorgonizing, gorgonising
-    gormandism's, gourmandism's
-    gormandism, gourmandism
-    gormandisms, gourmandisms
-    gormandize's, gormandise's
-    gormandize, gormandise
-    gormandized, gormandised
-    gormandizer's, gormandiser's
-    gormandizer, gormandiser
-    gormandizers, gormandisers
-    gormandizes, gormandises
-    gormandizing, gormandising
-    gormandizings, gormandisings
-    gospeler's, gospeller's
-    gospeler, gospeller
-    gospelers, gospellers
-    gospelize, gospelise
-    gospelized, gospelised
-    gospelizes, gospelises
-    gospelizing, gospelising
-    gospellize, gospellise
-    gospellized, gospellised
-    gospellizes, gospellises
-    gospellizing, gospellising
-    Gothicize, Gothicise
-    gothicize, gothicise
-    Gothicized, Gothicised
-    gothicized, gothicised
-    Gothicizer's, Gothiciser's
-    Gothicizer, Gothiciser
-    Gothicizers, Gothicisers
-    Gothicizes, Gothicises
-    gothicizes, gothicises
-    Gothicizing, Gothicising
-    gothicizing, gothicising
-    gourmandize, gourmandise
-    gourmandized, gourmandised
-    gourmandizes, gourmandises
-    gourmandizing, gourmandising
-    governmentalize, governmentalise
-    governmentalized, governmentalised
-    governmentalizes, governmentalises
-    governmentalizing, governmentalising
-    Goyesque, Goyaesque
-    Graecize, Graecise
-    Graecized, Graecised
-    Graecizes, Graecises
-    grammaticize, grammaticise
-    grammaticized, grammaticised
-    grammaticizes, grammaticises
-    grammaticizing, grammaticising
-    granddad's, grandad's
-    granddad, grandad
-    granddads, grandads
-    grangerization's, grangerisation's
-    grangerization, grangerisation
-    grangerizations, grangerisations
-    grangerize, grangerise
-    grangerized, grangerised
-    grangerizer's, grangeriser's
-    grangerizer, grangeriser
-    grangerizers, grangerisers
-    grangerizes, grangerises
-    grangerizing, grangerising
-    granitization's, granitisation's
-    granitization, granitisation
-    granitizations, granitisations
-    granitize, granitise
-    granitized, granitised
-    granitizes, granitises
-    granitizing, granitising
-    granny's, grannie's
-    granny, grannie
-    granulitization, granulitisation
-    granulitizations, granulitisations
-    granulize, granulise
-    granulizes, granulises
-    graphitizable, graphitisable
-    graphitization's, graphitisation's
-    graphitization, graphitisation
-    graphitizations, graphitisations
-    graphitize, graphitise
-    graphitized, graphitised
-    graphitizes, graphitises
-    graphitizing, graphitising
-    graveled, gravelled
-    graveling, gravelling
-    gray's, grey's
-    gray, grey
-    grayed, greyed
-    grayer, greyer
-    grayest, greyest
-    graying, greying
-    grayish, greyish
-    grayness's, greyness's
-    grayness, greyness
-    grays, greys
-    grecian, graecian
-    Grecianize, Grecianise
-    Grecianizes, Grecianises
-    Grecise's, Graecise's
-    Grecise, Graecise
-    Grecised's, Graecised's
-    Grecised, Graecised
-    Grecising's, Graecising's
-    Grecising, Graecising
-    Grecism's, Graecism's
-    Grecism, Graecism
-    grecism, graecism
-    Grecisms, Graecisms
-    Grecize, Grecise
-    grecize, grecise
-    Grecized, Grecised
-    grecized, grecised
-    grecizes, grecises
-    Grecizing, Grecising
-    grecizing, grecising
-    Greekize's, Greekise's
-    Greekize, Greekise
-    Greekizes, Greekises
-    greisenization, greisenisation
-    greisenizations, greisenisations
-    greisenize, greisenise
-    greisenized, greisenised
-    greisenizes, greisenises
-    greisenizing, greisenising
-    grizard, grisard
-    grize, grise
-    grizes, grises
-    groveled, grovelled
-    groveler's, groveller's
-    groveler, groveller
-    grovelers, grovellers
-    groveling, grovelling
-    grovelinglier, grovellinglier
-    grovelingliest, grovellingliest
-    grovelingly, grovellingly
-    grueled, gruelled
-    grueler's, grueller's
-    grueler, grueller
-    gruelers, gruellers
-    grueling's, gruelling's
-    grueling, gruelling
-    gruelingly, gruellingly
-    gruelings, gruellings
-    Gueber's, Guebre's
-    Gueber, Guebre
-    Guebers, Guebres
-    guerrilla's, guerilla's
-    guerrilla, guerilla
-    guerrillas, guerillas
-    guizer, guiser
-    guizers, guisers
-    gule, gulae
-    gunwale's, gunnel's
-    gunwale, gunnel
-    gunwales, gunnels
-    gutte, guttae
-    guttule, guttulae
-    gutturalization's, gutturalisation's
-    gutturalization, gutturalisation
-    gutturalizations, gutturalisations
-    gutturalize, gutturalise
-    gutturalized, gutturalised
-    gutturalizes, gutturalises
-    gutturalizing, gutturalising
-    gyne, gynae
-    gynecic, gynaecic
-    gynecocracies, gynaecocracies
-    gynecocracy's, gynaecocracy's
-    gynecocracy, gynaecocracy
-    gynecocrat's, gynaecocrat's
-    gynecocrat, gynaecocrat
-    gynecocratic, gynaecocratic
-    gynecocraticer, gynaecocraticer
-    gynecocraticest, gynaecocraticest
-    gynecocrats, gynaecocrats
-    gynecoid, gynaecoid
-    gynecol, gynaecol
-    gynecologic, gynaecologic
-    gynecological's, gynaecological's
-    gynecological, gynaecological
-    gynecologicaler, gynaecologicaler
-    gynecologicalest, gynaecologicalest
-    gynecologicals, gynaecologicals
-    gynecologicer, gynaecologicer
-    gynecologicest, gynaecologicest
-    gynecologics, gynaecologics
-    gynecologies, gynaecologies
-    gynecologist's, gynaecologist's
-    gynecologist, gynaecologist
-    gynecologists, gynaecologists
-    gynecology's, gynaecology's
-    gynecology, gynaecology
-    gynecomastia's, gynaecomastia's
-    gynecomastia, gynaecomastia
-    gynecomastias, gynaecomastias
-    gynecomasty's, gynaecomasty's
-    gynecomasty, gynaecomasty
-    gynecomorphous, gynaecomorphous
-    gyneconitis, gynaeconitis
-    gyneocracy, gynaeocracy
-    gyneolater, gynaeolater
-    gyneolatry, gynaeolatry
-    gynomonecious, gynomonoecious
-    gypsies, gipsies
-    gypsy's, gipsy's
-    gypsy, gipsy
-    gyrostabilization, gyrostabilisation
-    gyrostabilizations, gyrostabilisations
-    gyrostabilizer's, gyrostabiliser's
-    gyrostabilizer, gyrostabiliser
-    gyrostabilizers, gyrostabilisers
-    ha, hah
-    habitualize, habitualise
-    habitualizes, habitualises
-    hairdryer's, hairdrier's
-    hairdryer, hairdrier
-    hairdryers, hairdriers
-    hajj's, hadj's
-    hajj, hadj
-    hajji's, hadji's
-    hajji, hadji
-    hajjis, hadjis
-    hajjs, hadjs
-    hallo's, hollo's
-    hallo, hollo
-    halloing, holloing
-    hamletization's, hamletisation's
-    hamletization, hamletisation
-    hamletizations, hamletisations
-    hamletize, hamletise
-    hamletizes, hamletises
-    handseled, handselled
-    handseling, handselling
-    hankie's, hanky's
-    hankie, hanky
-    Hanoverianize's, Hanoverianise's
-    Hanoverianize, Hanoverianise
-    Hanoverianizes, Hanoverianises
-    Hanoverize's, Hanoverise's
-    Hanoverize, Hanoverise
-    Hanoverizes, Hanoverises
-    hansardize, hansardise
-    hansardized, hansardised
-    hansardizes, hansardises
-    hansardizing, hansardising
-    hanseled, hanselled
-    hanseling, hanselling
-    harbor's, harbour's
-    harbor, harbour
-    harborage's, harbourage's
-    harborage, harbourage
-    harborages, harbourages
-    harbored, harboured
-    harborer's, harbourer's
-    harborer, harbourer
-    harborers, harbourers
-    harborful, harbourful
-    harboring, harbouring
-    harborless, harbourless
-    harborlesser, harbourlesser
-    harborlesses, harbourlesses
-    harborlessest, harbourlessest
-    harborous, harbourous
-    harbors, harbours
-    harborside, harbourside
-    harborward, harbourward
-    harmonizable's, harmonisable's
-    harmonizable, harmonisable
-    harmonizabler, harmonisabler
-    harmonizables, harmonisables
-    harmonizablest, harmonisablest
-    harmonization's, harmonisation's
-    harmonization, harmonisation
-    harmonizations, harmonisations
-    harmonize, harmonise
-    harmonized, harmonised
-    harmonizer's, harmoniser's
-    harmonizer, harmoniser
-    harmonizers, harmonisers
-    harmonizes, harmonises
-    harmonizing, harmonising
-    Harmothoe's, Harmothoae's
-    Harmothoe, Harmothoae
-    Harvardize's, Harvardise's
-    Harvardize, Harvardise
-    Harvardizes, Harvardises
-    Harveyize's, Harveyise's
-    Harveyize, Harveyise
-    Harveyizes, Harveyises
-    hasheesh's, haschisch's
-    hasheesh, haschisch
-    Hasidean's, Hasidaean's
-    Hasidean, Hasidaean
-    Hasmonean, Hasmonaean
-    Hasmoneans, Hasmonaeans
-    hatcheled, hatchelled
-    hatcheling, hatchelling
-    Hattize's, Hattise's
-    Hattize, Hattise
-    Hattizes, Hattises
-    haussmannization, haussmannisation
-    haussmannizations, haussmannisations
-    haussmannize, haussmannise
-    haussmannized, haussmannised
-    haussmannizes, haussmannises
-    haussmannizing, haussmannising
-    havior, haviour
-    haviored, havioured
-    haviors, haviours
-    hazardize, hazardise
-    hazardizes, hazardises
-    heathenization, heathenisation
-    heathenize, heathenise
-    heathenized, heathenised
-    heathenizes, heathenises
-    heathenizing, heathenising
-    heavenize, heavenise
-    heavenizes, heavenises
-    Hebraicize's, Hebraicise's
-    Hebraicize, Hebraicise
-    Hebraicizes, Hebraicises
-    Hebraization's, Hebraisation's
-    Hebraization, Hebraisation
-    hebraization, hebraisation
-    hebraizations, hebraisations
-    Hebraize, Hebraise
-    hebraize, hebraise
-    Hebraized, Hebraised
-    hebraized, hebraised
-    Hebraizer's, Hebraiser's
-    Hebraizer, Hebraiser
-    Hebraizes, Hebraises
-    hebraizes, hebraises
-    Hebraizing, Hebraising
-    hebraizing, hebraising
-    Hecatean's, Hecataean's
-    Hecatean, Hecataean
-    hectogram's, hectogramme's
-    hectogram, hectogramme
-    hectograms, hectogrammes
-    hectoliter's, hectolitre's
-    hectoliter, hectolitre
-    hectoliters, hectolitres
-    hectometer's, hectometre's
-    hectometer, hectometre
-    hectometers, hectometres
-    hed, haed
-    Hegelianize's, Hegelianise's
-    Hegelianize, Hegelianise
-    Hegelianizes, Hegelianises
-    Hekatean's, Hekataean's
-    Hekatean, Hekataean
-    hele, heloe
-    helled, helloed
-    Hellenization's, Hellenisation's
-    Hellenization, Hellenisation
-    Hellenizations, Hellenisations
-    Hellenize, Hellenise
-    hellenize, hellenise
-    Hellenized, Hellenised
-    hellenized, hellenised
-    Hellenizer's, Helleniser's
-    Hellenizer, Helleniser
-    Hellenizes, Hellenises
-    hellenizes, hellenises
-    Hellenizing, Hellenising
-    hellenizing, hellenising
-    hemachrome's, haemachrome's
-    hemachrome, haemachrome
-    hemacytometer's, haemacytometer's
-    hemacytometer, haemacytometer
-    hemad, haemad
-    hemagglutinate, haemagglutinate
-    hemagglutinated, haemagglutinated
-    hemagglutinating, haemagglutinating
-    hemagglutination's, haemagglutination's
-    hemagglutination, haemagglutination
-    hemagglutinative, haemagglutinative
-    hemagglutinin, haemagglutinin
-    hemagogue, haemagogue
-    hemal, haemal
-    hemameba, hemamoeba
-    hemangioma's, haemangioma's
-    hemangioma, haemangioma
-    hemangiomas, haemangiomas
-    hemangiomata, haemangiomata
-    hemangiomatosis, haemangiomatosis
-    hemapophysis, haemapophysis
-    hemaspectroscope, haemaspectroscope
-    hematal, haematal
-    hematein's, haematein's
-    hematein, haematein
-    hematemesis, haematemesis
-    hematherm, haematherm
-    hemathermal, haemathermal
-    hemathermous, haemathermous
-    hematic, haematic
-    hematics, haematics
-    hematid, haematid
-    hematin's, haematin's
-    hematin, haematin
-    hematinic's, haematinic's
-    hematinic, haematinic
-    hematinics, haematinics
-    hematins, haematins
-    hematite's, haematite's
-    hematite, haematite
-    hematites, haematites
-    hematitic, haematitic
-    hematoblast's, haematoblast's
-    hematoblast, haematoblast
-    hematoblasts, haematoblasts
-    hematobranchiate, haematobranchiate
-    hematocele's, haematocele's
-    hematocele, haematocele
-    hematocrit's, haematocrit's
-    hematocrit, haematocrit
-    hematocrits, haematocrits
-    hematocryal, haematocryal
-    hematocyst's, haematocyst's
-    hematocyst, haematocyst
-    hematocystis, haematocystis
-    hematocyte's, haematocyte's
-    hematocyte, haematocyte
-    hematogeneses, haematogeneses
-    hematogenesis's, haematogenesis's
-    hematogenesis, haematogenesis
-    hematogenous, haematogenous
-    hematoid, haematoid
-    hematoidin, haematoidin
-    hematologic, haematologic
-    hematological, haematological
-    hematologies, haematologies
-    hematologist's, haematologist's
-    hematologist, haematologist
-    hematologists, haematologists
-    hematology's, haematology's
-    hematology, haematology
-    hematolysis, haematolysis
-    hematoma's, haematoma's
-    hematoma, haematoma
-    hematomas, haematomas
-    hematomata, haematomata
-    hematometer, haematometer
-    hematophyte's, haematophyte's
-    hematophyte, haematophyte
-    hematopoieses, haematopoieses
-    hematopoiesis, haematopoiesis
-    hematopoietic, haematopoietic
-    hematorrhachis, haematorrhachis
-    hematosepsis, haematosepsis
-    hematosin, haematosin
-    hematosis's, haematosis's
-    hematosis, haematosis
-    hematothermal, haematothermal
-    hematoxylic, haematoxylic
-    hematoxylin's, haematoxylin's
-    hematoxylin, haematoxylin
-    hematoxylins, haematoxylins
-    hematozoa, haematozoa
-    hematozoal, haematozoal
-    hematozoic, haematozoic
-    hematozoon's, haematozoon's
-    hematozoon, haematozoon
-    hematozzoa, haematozzoa
-    hematuria's, haematuria's
-    hematuria, haematuria
-    hematurias, haematurias
-    heme, haem
-    hemerythrin, hemoerythrin
-    hemic, haemic
-    hemihypesthesia, hemihypoesthesia
-    hemin's, haemin's
-    hemin, haemin
-    hemins, haemins
-    hemoblast's, haemoblast's
-    hemoblast, haemoblast
-    hemochromatoses, haemochromatoses
-    hemochromatosis, haemochromatosis
-    hemochrome, haemochrome
-    hemocoel, haemocoel
-    hemocoels, haemocoels
-    hemoconcentration's, haemoconcentration's
-    hemoconcentration, haemoconcentration
-    hemoconia, haemoconia
-    hemocyanin, haemocyanin
-    hemocyanins, haemocyanins
-    hemocyte's, haemocyte's
-    hemocyte, haemocyte
-    hemocytes, haemocytes
-    hemocytoblast's, haemocytoblast's
-    hemocytoblast, haemocytoblast
-    hemocytoblastic, haemocytoblastic
-    hemocytometer, haemocytometer
-    hemodialyses, haemodialyses
-    hemodialysis's, haemodialysis's
-    hemodialysis, haemodialysis
-    hemodilution, haemodilution
-    hemodynamic, haemodynamic
-    hemodynamics's, haemodynamics's
-    hemodynamics, haemodynamics
-    hemoflagellate's, haemoflagellate's
-    hemoflagellate, haemoflagellate
-    hemoglobic, haemoglobic
-    hemoglobin's, haemoglobin's
-    hemoglobin, haemoglobin
-    hemoglobinopathies, haemoglobinopathies
-    hemoglobinopathy, haemoglobinopathy
-    hemoglobinous, haemoglobinous
-    hemoglobinuria's, haemoglobinuria's
-    hemoglobinuria, haemoglobinuria
-    hemogram, haemogram
-    hemoid, haemoid
-    hemolysin's, haemolysin's
-    hemolysin, haemolysin
-    hemolysis, haemolysis
-    hemolytic, haemolytic
-    hemometer, haemometer
-    Hemon's, Haemon's
-    Hemon, Haemon
-    hemophile's, haemophile's
-    hemophile, haemophile
-    hemophilia's, haemophilia's
-    hemophilia, haemophilia
-    hemophiliac's, haemophiliac's
-    hemophiliac, haemophiliac
-    hemophiliacs, haemophiliacs
-    hemophilic, haemophilic
-    hemopod, haemopod
-    hemopoiesis, haemopoiesis
-    hemoptyses, haemoptyses
-    hemoptysis's, haemoptysis's
-    hemoptysis, haemoptysis
-    hemorrhage's, haemorrhage's
-    hemorrhage, haemorrhage
-    hemorrhaged, haemorrhaged
-    hemorrhages, haemorrhages
-    hemorrhaging, haemorrhaging
-    hemorrhoid, haemorrhoid
-    hemorrhoidal, haemorrhoidal
-    hemorrhoidectomy's, haemorrhoidectomy's
-    hemorrhoidectomy, haemorrhoidectomy
-    hemorrhoids, haemorrhoids
-    hemosporid, haemosporid
-    hemosporidian, haemosporidian
-    hemostases, haemostases
-    hemostasia, haemostasia
-    hemostasis's, haemostasis's
-    hemostasis, haemostasis
-    hemostatic, haemostatic
-    hemothorax's, haemothorax's
-    hemothorax, haemothorax
-    hemotoxic, haemotoxic
-    hemotoxin's, haemotoxin's
-    hemotoxin, haemotoxin
-    heparinize, heparinise
-    hepatization's, hepatisation's
-    hepatization, hepatisation
-    hepatizations, hepatisations
-    hepatize, hepatise
-    hepatized, hepatised
-    hepatizes, hepatises
-    hepatizing, hepatising
-    hepatorrhea, hepatorrhoea
-    heraldize, heraldise
-    heraldizes, heraldises
-    herborization, herborisation
-    herborizations, herborisations
-    herborize, herborise
-    herborized, herborised
-    herborizes, herborises
-    herborizing, herborising
-    heredes, haeredes
-    hereticize, hereticise
-    hereticizes, hereticises
-    heroinize, heroinise
-    heroinizes, heroinises
-    heroization's, heroisation's
-    heroization, heroisation
-    heroizations, heroisations
-    heroize, heroise
-    heroized, heroised
-    heroizes, heroises
-    heroizing, heroising
-    het, haet
-    heterecious, heteroecious
-    heteric, hetaeric
-    heterism, hetaerism
-    hets, haets
-    hexachlorethane, hexachloroethane
-    hexachlorethanes, hexachloroethanes
-    hexametrize, hexametrise
-    hexametrized, hexametrised
-    hexametrizes, hexametrises
-    hexametrizing, hexametrising
-    hexestrol, hexoestrol
-    Hibernicize's, Hibernicise's
-    Hibernicize, Hibernicise
-    hibernicize, hibernicise
-    Hibernicized's, Hibernicised's
-    Hibernicized, Hibernicised
-    hibernicized, hibernicised
-    hibernicizes, hibernicises
-    Hibernicizing's, Hibernicising's
-    Hibernicizing, Hibernicising
-    hibernicizing, hibernicising
-    hibernization, hibernisation
-    hibernizations, hibernisations
-    hibernize, hibernise
-    hibernized, hibernised
-    hibernizes, hibernises
-    hibernizing, hibernising
-    hiccuped, hiccupped
-    hiccuping, hiccupping
-    hierarchize, hierarchise
-    hierarchized, hierarchised
-    hierarchizing, hierarchising
-    hifalutin, highfaluting
-    high_jinks, hijinks
-    hijack's, highjack's
-    hijack, highjack
-    hijacked, highjacked
-    hijacker's, highjacker's
-    hijacker, highjacker
-    hijackers, highjackers
-    hijacking, highjacking
-    hijacks, highjacks
-    hilloed, hilloaed
-    Hinduize's, Hinduise's
-    Hinduize, Hinduise
-    Hinduized's, Hinduised's
-    Hinduized, Hinduised
-    Hinduizes, Hinduises
-    Hinduizing's, Hinduising's
-    Hinduizing, Hinduising
-    hippieness's, hippiness's
-    hippieness, hippiness
-    hippienesses, hippinesses
-    hirseled, hirselled
-    hirseling, hirselling
-    Hispanicization's, Hispanicisation's
-    Hispanicization, Hispanicisation
-    Hispanicizations, Hispanicisations
-    Hispanicize, Hispanicise
-    hispanicize, hispanicise
-    Hispanicized, Hispanicised
-    hispanicized, hispanicised
-    Hispanicizes, Hispanicises
-    hispanicizes, hispanicises
-    Hispanicizing, Hispanicising
-    hispanicizing, hispanicising
-    Hispaniolize's, Hispaniolise's
-    Hispaniolize, Hispaniolise
-    hispaniolize, hispaniolise
-    Hispaniolized's, Hispaniolised's
-    Hispaniolized, Hispaniolised
-    hispaniolized, hispaniolised
-    Hispaniolizes, Hispaniolises
-    hispaniolizes, hispaniolises
-    Hispaniolizing's, Hispaniolising's
-    Hispaniolizing, Hispaniolising
-    hispaniolizing, hispaniolising
-    historicize, historicise
-    historicized, historicised
-    historicizes, historicises
-    historicizing, historicising
-    hmm, hm
-    hoagie's, hoagy's
-    hoagie, hoagy
-    hollos, hallos
-    Hollywoodize's, Hollywoodise's
-    Hollywoodize, Hollywoodise
-    Hollywoodized's, Hollywoodised's
-    Hollywoodized, Hollywoodised
-    Hollywoodizes, Hollywoodises
-    Hollywoodizing's, Hollywoodising's
-    Hollywoodizing, Hollywoodising
-    homeoblastic, homoeoblastic
-    homeobox, homoeobox
-    homeochromatic, homoeochromatic
-    homeochronous, homoeochronous
-    homeocrystalline, homoeocrystalline
-    homeogenic, homoeogenic
-    homeogenous, homoeogenous
-    homeoid, homoeoid
-    homeokinesis, homoeokinesis
-    homeomeric, homoeomeric
-    homeomeries, homoeomeries
-    homeomerous, homoeomerous
-    homeomery, homoeomery
-    homeomorph's, homoeomorph's
-    homeomorph, homoeomorph
-    homeomorphic, homoeomorphic
-    homeomorphies, homoeomorphies
-    homeomorphous, homoeomorphous
-    homeomorphs, homoeomorphs
-    homeomorphy, homoeomorphy
-    homeopath's, homoeopath's
-    homeopath, homoeopath
-    homeopathic, homoeopathic
-    homeopathicallier, homoeopathicallier
-    homeopathicalliest, homoeopathicalliest
-    homeopathically, homoeopathically
-    homeopathicer, homoeopathicer
-    homeopathicest, homoeopathicest
-    homeopathician, homoeopathician
-    homeopathicity, homoeopathicity
-    homeopathies, homoeopathies
-    homeopathist's, homoeopathist's
-    homeopathist, homoeopathist
-    homeopathists, homoeopathists
-    homeopaths, homoeopaths
-    homeopathy's, homoeopathy's
-    homeopathy, homoeopathy
-    homeophony, homoeophony
-    homeoplasia, homoeoplasia
-    homeoplastic, homoeoplastic
-    homeoplasy, homoeoplasy
-    homeopolar, homoeopolar
-    homeoses, homoeoses
-    homeosis, homoeosis
-    homeostases, homoeostases
-    homeostasis's, homoeostasis's
-    homeostasis, homoeostasis
-    homeostatic, homoeostatic
-    homeoteleuton, homoeoteleuton
-    homeoteleutons, homoeoteleutons
-    homeothermal, homoeothermal
-    homeothermic, homoeothermic
-    homeothermous, homoeothermous
-    homeotic, homoeotic
-    homeotype, homoeotype
-    homeotypic, homoeotypic
-    homeotypical, homoeotypical
-    homeozoic, homoeozoic
-    homeyness's, hominess's
-    homeyness, hominess
-    homeynesses, hominesses
-    hominization, hominisation
-    hominized, hominised
-    homogenization's, homogenisation's
-    homogenization, homogenisation
-    homogenizations, homogenisations
-    homogenize, homogenise
-    homogenized, homogenised
-    homogenizer's, homogeniser's
-    homogenizer, homogeniser
-    homogenizers, homogenisers
-    homogenizes, homogenises
-    homogenizing, homogenising
-    homologization, homologisation
-    homologize, homologise
-    homologized, homologised
-    homologizer's, homologiser's
-    homologizer, homologiser
-    homologizers, homologisers
-    homologizes, homologises
-    homologizing, homologising
-    homologue's, homolog's
-    homologue, homolog
-    homologues, homologs
-    honkie's, honkey's
-    honkie, honkey
-    honkies, honkeys
-    honor's, honour's
-    honor, honour
-    honorabilities, honourabilities
-    honorability's, honourability's
-    honorability, honourability
-    honorable's, honourable's
-    honorable, honourable
-    honorableness's, honourableness's
-    honorableness, honourableness
-    honorablenesses, honourablenesses
-    honorabler, honourabler
-    honorables, honourables
-    honorableship's, honourableship's
-    honorableship, honourableship
-    honorableships, honourableships
-    honorablest, honourablest
-    honorablier, honourablier
-    honorablies, honourablies
-    honorabliest, honourabliest
-    honorably, honourably
-    honored, honoured
-    honoree's, honouree's
-    honoree, honouree
-    honorees, honourees
-    honorer's, honourer's
-    honorer, honourer
-    honorers, honourers
-    honoring, honouring
-    honorless, honourless
-    honorlesser, honourlesser
-    honorlesses, honourlesses
-    honorlessest, honourlessest
-    honors, honours
-    hooch, hootch
-    hoodlumize, hoodlumise
-    hoodlumizes, hoodlumises
-    hookies, hookeys
-    hooky's, hookey's
-    hooky, hookey
-    hooliganize, hooliganise
-    hooliganizes, hooliganises
-    hoorah's, hurray's
-    hoorah, hurray
-    hoorayed, hurrayed
-    hooraying, hurraying
-    Hoosierize's, Hoosierise's
-    Hoosierize, Hoosierise
-    Hoosierizes, Hoosierises
-    Hooverize's, Hooverise's
-    Hooverize, Hooverise
-    Hooverizes, Hooverises
-    hore, horae
-    horizontalization's, horizontalisation's
-    horizontalization, horizontalisation
-    horizontalizations, horizontalisations
-    horizontalize, horizontalise
-    horizontalizes, horizontalises
-    hormonize, hormonise
-    hormonizes, hormonises
-    horrorize, horrorise
-    horrorizes, horrorises
-    horsey, horsy
-    hospitalization's, hospitalisation's
-    hospitalization, hospitalisation
-    hospitalizations, hospitalisations
-    hospitalize, hospitalise
-    hospitalized, hospitalised
-    hospitalizes, hospitalises
-    hospitalizing, hospitalising
-    hostilize, hostilise
-    hostilizes, hostilises
-    hotelization's, hotelisation's
-    hotelization, hotelisation
-    hotelizations, hotelisations
-    hotelize, hotelise
-    hotelizes, hotelises
-    houseled, houselled
-    houseling, houselling
-    houselings, housellings
-    hoveled, hovelled
-    hoveler, hoveller
-    hovelers, hovellers
-    hoveling, hovelling
-    hucksterize, hucksterise
-    hucksterizes, hucksterises
-    huer, hure
-    humanitarianize, humanitarianise
-    humanitarianizes, humanitarianises
-    humanization's, humanisation's
-    humanization, humanisation
-    humanizations, humanisations
-    humanize, humanise
-    humanized, humanised
-    humanizer's, humaniser's
-    humanizer, humaniser
-    humanizers, humanisers
-    humanizes, humanises
-    humanizing, humanising
-    humongous, humungous
-    humor's, humour's
-    humor, humour
-    humoral, humoural
-    humored, humoured
-    humorer, humourer
-    humorers, humourers
-    humorful, humourful
-    humoring, humouring
-    humorize, humorise
-    humorizes, humorises
-    humorless, humourless
-    humorlesser, humourlesser
-    humorlesses, humourlesses
-    humorlessest, humourlessest
-    humorlessness's, humourlessness's
-    humorlessness, humourlessness
-    humorlessnesses, humourlessnesses
-    humors, humours
-    humorsome, humoursome
-    humorsomeness, humoursomeness
-    hurrays, hurrahes
-    hurricanize, hurricanise
-    hurricanizes, hurricanises
-    huzzah's, huzza's
-    huzzah, huzza
-    huzzahed, huzzaed
-    huzzahing, huzzaing
-    huzzahs, huzzas
-    hyalinization's, hyalinisation's
-    hyalinization, hyalinisation
-    hyalinizations, hyalinisations
-    hyalinize, hyalinise
-    hyalinized, hyalinised
-    hyalinizes, hyalinises
-    hyalinizing, hyalinising
-    hybridizable's, hybridisable's
-    hybridizable, hybridisable
-    hybridizabler, hybridisabler
-    hybridizables, hybridisables
-    hybridizablest, hybridisablest
-    hybridization's, hybridisation's
-    hybridization, hybridisation
-    hybridizations, hybridisations
-    hybridize, hybridise
-    hybridized, hybridised
-    hybridizer's, hybridiser's
-    hybridizer, hybridiser
-    hybridizers, hybridisers
-    hybridizes, hybridises
-    hybridizing, hybridising
-    hydremia's, hydraemia's
-    hydremia, hydraemia
-    hydremias, hydraemias
-    hydremic, hydraemic
-    hydrocele, hydrocoele
-    hydrocephalus's, hydrocephaly's
-    hydrocephalus, hydrocephaly
-    hydrocephaluses, hydrocephalies
-    hydrogenization's, hydrogenisation's
-    hydrogenization, hydrogenisation
-    hydrogenizations, hydrogenisations
-    hydrogenize, hydrogenise
-    hydrogenized, hydrogenised
-    hydrogenizes, hydrogenises
-    hydrogenizing, hydrogenising
-    hydrolize, hydrolise
-    hydrolyzable's, hydrolysable's
-    hydrolyzable, hydrolysable
-    hydrolyzabler, hydrolysabler
-    hydrolyzables, hydrolysables
-    hydrolyzablest, hydrolysablest
-    hydrolyzate, hydrolysate
-    hydrolyzates, hydrolysates
-    hydrolyzation's, hydrolysation's
-    hydrolyzation, hydrolysation
-    hydrolyze, hydrolyse
-    hydrolyzed, hydrolysed
-    hydrolyzer's, hydrolyser's
-    hydrolyzer, hydrolyser
-    hydrolyzes, hydrolyses
-    hydrolyzing, hydrolysing
-    hydrorrhea, hydrorrhoea
-    hydroxylization's, hydroxylisation's
-    hydroxylization, hydroxylisation
-    hydroxylizations, hydroxylisations
-    hydroxylize, hydroxylise
-    hydroxylizes, hydroxylises
-    hyena's, hyaena's
-    hyena, hyaena
-    hyenic, hyaenic
-    hygienization's, hygienisation's
-    hygienization, hygienisation
-    hygienizations, hygienisations
-    hygienize, hygienise
-    hygienizes, hygienises
-    hymenean, hymenaean
-    hyperbolize, hyperbolise
-    hyperbolized, hyperbolised
-    hyperbolizes, hyperbolises
-    hyperbolizing, hyperbolising
-    hypercalcemia, hypercalcaemia
-    hypercalcemias, hypercalcaemias
-    hypercalcinemia, hypercalcinaemia
-    hypercatharsises, hypercatharses
-    hyperchloremia, hyperchloraemia
-    hypercholesterolemia, hypercholesterolaemia
-    hypercholesterolemias, hypercholesterolaemias
-    hypercivilization's, hypercivilisation's
-    hypercivilization, hypercivilisation
-    hypercivilizations, hypercivilisations
-    hypercivilized's, hypercivilised's
-    hypercivilized, hypercivilised
-    hypercivilizeds, hyperciviliseds
-    hypercriticize, hypercriticise
-    hypercriticized, hypercriticised
-    hypercriticizes, hypercriticises
-    hypercriticizing, hypercriticising
-    hypercryesthesia, hypercryaesthesia
-    hyperemia's, hyperaemia's
-    hyperemia, hyperaemia
-    hyperemias, hyperaemias
-    hyperemic, hyperaemic
-    hyperemphasize, hyperemphasise
-    hyperemphasizes, hyperemphasises
-    hyperesthesia's, hyperaesthesia's
-    hyperesthesia, hyperaesthesia
-    hyperesthesias, hyperaesthesias
-    hyperesthete's, hyperaesthete's
-    hyperesthete, hyperaesthete
-    hyperesthetic, hyperaesthetic
-    hyperestheticer, hyperaestheticer
-    hyperestheticest, hyperaestheticest
-    hyperglycemic, hyperglycaemic
-    hyperimmunization's, hyperimmunisation's
-    hyperimmunization, hyperimmunisation
-    hyperimmunizations, hyperimmunisations
-    hyperimmunize, hyperimmunise
-    hyperimmunizes, hyperimmunises
-    hyperinsulinization's, hyperinsulinisation's
-    hyperinsulinization, hyperinsulinisation
-    hyperinsulinizations, hyperinsulinisations
-    hyperinsulinize, hyperinsulinise
-    hyperinsulinizes, hyperinsulinises
-    hyperlipemia, hyperlipaemia
-    hyperlipemic, hyperlipaemic
-    hyperlipidemia, hyperlipidaemia
-    hypernatremia, hypernatraemia
-    hyperoxygenize, hyperoxygenise
-    hyperoxygenizes, hyperoxygenises
-    hyperparasitize, hyperparasitise
-    hyperparasitizes, hyperparasitises
-    hyperpnea's, hyperpnoea's
-    hyperpnea, hyperpnoea
-    hyperrealize, hyperrealise
-    hyperrealizes, hyperrealises
-    hypersensitization's, hypersensitisation's
-    hypersensitization, hypersensitisation
-    hypersensitizations, hypersensitisations
-    hypersensitize, hypersensitise
-    hypersensitized, hypersensitised
-    hypersensitizes, hypersensitises
-    hypersensitizing, hypersensitising
-    hyperspiritualizing's, hyperspiritualising's
-    hyperspiritualizing, hyperspiritualising
-    hyperspiritualizings, hyperspiritualisings
-    hyperthyroidization's, hyperthyroidisation's
-    hyperthyroidization, hyperthyroidisation
-    hyperthyroidizations, hyperthyroidisations
-    hyperthyroidize, hyperthyroidise
-    hyperthyroidizes, hyperthyroidises
-    hypervitalization's, hypervitalisation's
-    hypervitalization, hypervitalisation
-    hypervitalizations, hypervitalisations
-    hypervitalize, hypervitalise
-    hypervitalizes, hypervitalises
-    hypesthesia's, hypaesthesia's
-    hypesthesia, hypaesthesia
-    hypesthesias, hypaesthesias
-    hypesthesic, hypaesthesic
-    hypethral, hypaethral
-    hyphenization's, hyphenisation's
-    hyphenization, hyphenisation
-    hyphenizations, hyphenisations
-    hyphenize, hyphenise
-    hyphenized, hyphenised
-    hyphenizes, hyphenises
-    hyphenizing, hyphenising
-    hypnoidize, hypnoidise
-    hypnoidized, hypnoidised
-    hypnoidizes, hypnoidises
-    hypnoidizing, hypnoidising
-    hypnopedia, hypnopaedia
-    hypnopedias, hypnopaedias
-    hypnotizabilities, hypnotisabilities
-    hypnotizability's, hypnotisability's
-    hypnotizability, hypnotisability
-    hypnotizable's, hypnotisable's
-    hypnotizable, hypnotisable
-    hypnotizabler, hypnotisabler
-    hypnotizables, hypnotisables
-    hypnotizablest, hypnotisablest
-    hypnotization's, hypnotisation's
-    hypnotization, hypnotisation
-    hypnotizations, hypnotisations
-    hypnotize, hypnotise
-    hypnotized, hypnotised
-    hypnotizer's, hypnotiser's
-    hypnotizer, hypnotiser
-    hypnotizers, hypnotisers
-    hypnotizes, hypnotises
-    hypnotizing, hypnotising
-    hypocenter's, hypocentre's
-    hypocenter, hypocentre
-    hypocenters, hypocentres
-    hypogea, hypogaea
-    hypogeal, hypogaeal
-    hypogean, hypogaean
-    hypogeic, hypogaeic
-    hypogeous, hypogaeous
-    hypogeum, hypogaeum
-    hypomagnesemia, hypomagnesaemia
-    hypomagnesemias, hypomagnesaemias
-    hypomenorrhea, hypomenorrhoea
-    hypomenorrheas, hypomenorrhoeas
-    hypophysectomize, hypophysectomise
-    hypophysectomized, hypophysectomised
-    hypopnea's, hypopnoea's
-    hypopnea, hypopnoea
-    hyposensitization's, hyposensitisation's
-    hyposensitization, hyposensitisation
-    hyposensitize, hyposensitise
-    hypostasize, hypostasise
-    hypostasized, hypostasised
-    hypostasizes, hypostasises
-    hypostasizing, hypostasising
-    hypostatization's, hypostatisation's
-    hypostatization, hypostatisation
-    hypostatizations, hypostatisations
-    hypostatize, hypostatise
-    hypostatized, hypostatised
-    hypostatizes, hypostatises
-    hypostatizing, hypostatising
-    hypothesize, hypothesise
-    hypothesized, hypothesised
-    hypothesizer's, hypothesiser's
-    hypothesizer, hypothesiser
-    hypothesizers, hypothesisers
-    hypothesizes, hypothesises
-    hypothesizing, hypothesising
-    hypothetize, hypothetise
-    hypothetized, hypothetised
-    hypothetizes, hypothetises
-    hypothetizing, hypothetising
-    hypoxemia, hypoxaemia
-    hypoxemias, hypoxaemias
-    hypoxemic, hypoxaemic
-    hysterectomize, hysterectomise
-    hysterectomized, hysterectomised
-    hysterectomizes, hysterectomises
-    hysterectomizing, hysterectomising
-    ichneumonized's, ichneumonised's
-    ichneumonized, ichneumonised
-    ichneumonizeds, ichneumoniseds
-    ichorrhea, ichorrhoea
-    ichorrhemia, ichorrhaemia
-    icon's, ikon's
-    icon's, ikon's
-    icon, ikon
-    icon, ikon
-    iconic, ikonic
-    iconically, ikonically
-    iconize, iconise
-    iconized, iconised
-    iconizes, iconises
-    iconizing, iconising
-    icons, ikons
-    icons, ikons
-    Idea's, Idaea's
-    Idea, Idaea
-    idealization's, idealisation's
-    idealization, idealisation
-    idealizations, idealisations
-    idealize, idealise
-    idealized, idealised
-    idealizer's, idealiser's
-    idealizer, idealiser
-    idealizers, idealisers
-    idealizes, idealises
-    idealizing, idealising
-    Idean's, Idaean's
-    Idean, Idaean
-    ideologize, ideologise
-    ideologized, ideologised
-    ideologizing, ideologising
-    idiotize, idiotise
-    idiotized, idiotised
-    idiotizes, idiotises
-    idiotizing, idiotising
-    idolaster, idolastre
-    idolatrize, idolatrise
-    idolatrized, idolatrised
-    idolatrizer's, idolatriser's
-    idolatrizer, idolatriser
-    idolatrizes, idolatrises
-    idolatrizing, idolatrising
-    idolization's, idolisation's
-    idolization, idolisation
-    idolizations, idolisations
-    idolize, idolise
-    idolized, idolised
-    idolizer's, idoliser's
-    idolizer, idoliser
-    idolizers, idolisers
-    idolizes, idolises
-    idolizing, idolising
-    Idumea's, Idumaea's
-    Idumea, Idumaea
-    Idumean, Idumaean
-    Idumeans, Idumaeans
-    idyll's, idyl's
-    idyll, idyl
-    idylls, idyls
-    Ier's, Ire's
-    Ier, Ire
-    ignitable, ignitible
-    igniter's, ignitor's
-    igniter, ignitor
-    igniters, ignitors
-    ileocecal, ileocaecal
-    Iliadize's, Iliadise's
-    Iliadize, Iliadise
-    Iliadizes, Iliadises
-    illegalization's, illegalisation's
-    illegalization, illegalisation
-    illegalizations, illegalisations
-    illegalize, illegalise
-    illegalized, illegalised
-    illegalizes, illegalises
-    illegalizing, illegalising
-    illegitimatize, illegitimatise
-    illegitimatized, illegitimatised
-    illegitimatizes, illegitimatises
-    illegitimatizing, illegitimatising
-    illiberalize, illiberalise
-    illiberalized, illiberalised
-    illiberalizes, illiberalises
-    illiberalizing, illiberalising
-    Illuminize, Illuminise
-    Illuminizes, Illuminises
-    Imer's, Imre's
-    Imer, Imre
-    immaterialization, immaterialisation
-    immaterialize, immaterialise
-    immaterialized, immaterialised
-    immaterializes, immaterialises
-    immaterializing, immaterialising
-    immiserization, immiserisation
-    immiserizations, immiserisations
-    immiserize, immiserise
-    immiserized, immiserised
-    immiserizes, immiserises
-    immiserizing, immiserising
-    immobilization's, immobilisation's
-    immobilization, immobilisation
-    immobilizations, immobilisations
-    immobilize, immobilise
-    immobilized, immobilised
-    immobilizer, immobiliser
-    immobilizers, immobilisers
-    immobilizes, immobilises
-    immobilizing, immobilising
-    immoralize, immoralise
-    immoralized, immoralised
-    immoralizes, immoralises
-    immoralizing, immoralising
-    immortalizable's, immortalisable's
-    immortalizable, immortalisable
-    immortalizabler, immortalisabler
-    immortalizables, immortalisables
-    immortalizablest, immortalisablest
-    immortalization's, immortalisation's
-    immortalization, immortalisation
-    immortalizations, immortalisations
-    immortalize, immortalise
-    immortalized, immortalised
-    immortalizer's, immortaliser's
-    immortalizer, immortaliser
-    immortalizers, immortalisers
-    immortalizes, immortalises
-    immortalizing, immortalising
-    immunization's, immunisation's
-    immunization, immunisation
-    immunizations, immunisations
-    immunize, immunise
-    immunized, immunised
-    immunizer's, immuniser's
-    immunizer, immuniser
-    immunizes, immunises
-    immunizing, immunising
-    impactionize, impactionise
-    impactionizes, impactionises
-    impanel, empanel
-    impanelled, empanelled
-    impanelling, empanelling
-    impanelment, empanelment
-    impanels, empanels
-    impasted, impastoed
-    imperialization's, imperialisation's
-    imperialization, imperialisation
-    imperializations, imperialisations
-    imperialize, imperialise
-    imperialized, imperialised
-    imperializes, imperialises
-    imperializing, imperialising
-    imperiled, imperilled
-    imperiling, imperilling
-    imperscriptible, imprescriptible
-    impersonalization's, impersonalisation's
-    impersonalization, impersonalisation
-    impersonalizations, impersonalisations
-    impersonalize, impersonalise
-    impersonalized, impersonalised
-    impersonalizes, impersonalises
-    impersonalizing, impersonalising
-    impostor's, imposter's
-    impostor, imposter
-    impostors, imposters
-    improvisatorise, improvisatorize
-    improvisatorises, improvisatorizes
-    improviser's, improvisor's
-    improviser, improvisor
-    improvisers, improvisors
-    incarnalize, incarnalise
-    incarnalized, incarnalised
-    incarnalizing, incarnalising
-    incenter, incentre
-    incenters, incentres
-    incentivization, incentivisation
-    incentivizations, incentivisations
-    incentivize, incentivise
-    incentivized, incentivised
-    incentivizes, incentivises
-    incentivizing, incentivising
-    incerate, increate
-    incognizable, incognisable
-    incognizance's, incognisance's
-    incognizance, incognisance
-    incognizances, incognisances
-    incognizant, incognisant
-    Indianization's, Indianisation's
-    Indianization, Indianisation
-    Indianize, Indianise
-    Indianized, Indianised
-    Indianizes, Indianises
-    Indianizing, Indianising
-    indigene, indigenae
-    indigenization, indigenisation
-    indigenizations, indigenisations
-    indigenize, indigenise
-    indigenized, indigenised
-    indigenizes, indigenises
-    indigenizing, indigenising
-    individualization's, individualisation's
-    individualization, individualisation
-    individualizations, individualisations
-    individualize, individualise
-    individualized, individualised
-    individualizer's, individualiser's
-    individualizer, individualiser
-    individualizers, individualisers
-    individualizes, individualises
-    individualizing, individualising
-    individualizingly, individualisingly
-    indraft's, indraught's
-    indraft, indraught
-    indrafts, indraughts
-    industrialization's, industrialisation's
-    industrialization, industrialisation
-    industrializations, industrialisations
-    industrialize, industrialise
-    industrialized, industrialised
-    industrializes, industrialises
-    industrializing, industrialising
-    inesthetic, inaesthetic
-    infamize, infamise
-    infamized, infamised
-    infamizes, infamises
-    infamizing, infamising
-    infamonize, infamonise
-    infamonized, infamonised
-    infamonizes, infamonises
-    infamonizing, infamonising
-    infere, infree
-    inferiorize, inferiorise
-    inferiorizes, inferiorises
-    infernalize, infernalise
-    infernalizes, infernalises
-    infidelize, infidelise
-    infidelizes, infidelises
-    infinitize, infinitise
-    infinitizes, infinitises
-    inflection's, inflexion's
-    inflection, inflexion
-    inflections, inflexions
-    informalize, informalise
-    informalizes, informalises
-    Ingveonic's, Ingvaeonic's
-    Ingveonic, Ingvaeonic
-    Ingweonic's, Ingwaeonic's
-    Ingweonic, Ingwaeonic
-    inhumanize, inhumanise
-    inhumanizes, inhumanises
-    initialed, initialled
-    initialer's, initialler's
-    initialer, initialler
-    initialers, initiallers
-    initialing, initialling
-    initializable, initialisable
-    initialization's, initialisation's
-    initialization, initialisation
-    initializations, initialisations
-    initialize, initialise
-    initialized, initialised
-    initializer, initialiser
-    initializers, initialisers
-    initializes, initialises
-    initializing, initialising
-    inorganization, inorganisation
-    inorganizations, inorganisations
-    inorganized, inorganised
-    inquire, enquire
-    inquired, enquired
-    inquires, enquires
-    inquiries, enquiries
-    inquiring, enquiring
-    inquiry's, enquiry's
-    inquiry, enquiry
-    insignia's, insigne's
-    insignia, insigne
-    insolubilization's, insolubilisation's
-    insolubilization, insolubilisation
-    insolubilize, insolubilise
-    insolubilized, insolubilised
-    insolubilizes, insolubilises
-    insolubilizing, insolubilising
-    install, instal
-    installment's, instalment's
-    installment, instalment
-    installments, instalments
-    installs, instals
-    instill, instil
-    instills, instils
-    instituter's, institutor's
-    instituter, institutor
-    instituters, institutors
-    institutionalization's, institutionalisation's
-    institutionalization, institutionalisation
-    institutionalizations, institutionalisations
-    institutionalize, institutionalise
-    institutionalized, institutionalised
-    institutionalizes, institutionalises
-    institutionalizing, institutionalising
-    institutionize, institutionise
-    institutionizes, institutionises
-    instrumentalize, instrumentalise
-    instrumentalizes, instrumentalises
-    insularize, insularise
-    insularizes, insularises
-    insurrectionize, insurrectionise
-    insurrectionized, insurrectionised
-    insurrectionizes, insurrectionises
-    insurrectionizing, insurrectionising
-    integralization's, integralisation's
-    integralization, integralisation
-    integralizations, integralisations
-    integralize, integralise
-    integralizes, integralises
-    intellectualization's, intellectualisation's
-    intellectualization, intellectualisation
-    intellectualizations, intellectualisations
-    intellectualize, intellectualise
-    intellectualized, intellectualised
-    intellectualizer's, intellectualiser's
-    intellectualizer, intellectualiser
-    intellectualizers, intellectualisers
-    intellectualizes, intellectualises
-    intellectualizing, intellectualising
-    intercivilization's, intercivilisation's
-    intercivilization, intercivilisation
-    intercivilizations, intercivilisations
-    intercolonization's, intercolonisation's
-    intercolonization, intercolonisation
-    intercolonizations, intercolonisations
-    intercrystallization's, intercrystallisation's
-    intercrystallization, intercrystallisation
-    intercrystallizations, intercrystallisations
-    intercrystallize, intercrystallise
-    intercrystallizes, intercrystallises
-    interhemal, interhaemal
-    interhybridize, interhybridise
-    interhybridizes, interhybridises
-    interiorization, interiorisation
-    interiorize, interiorise
-    interiorized, interiorised
-    interiorizes, interiorises
-    interiorizing, interiorising
-    interjectionalize, interjectionalise
-    interjectionalized, interjectionalised
-    interjectionalizes, interjectionalises
-    interjectionalizing, interjectionalising
-    interjectionize, interjectionise
-    interjectionizes, interjectionises
-    interjudgment's, interjudgement's
-    interjudgment, interjudgement
-    interjudgments, interjudgements
-    internalization's, internalisation's
-    internalization, internalisation
-    internalizations, internalisations
-    internalize, internalise
-    internalized, internalised
-    internalizes, internalises
-    internalizing, internalising
-    internationalization's, internationalisation's
-    internationalization, internationalisation
-    internationalizations, internationalisations
-    internationalize, internationalise
-    internationalized, internationalised
-    internationalizes, internationalises
-    internationalizing, internationalising
-    internment, internement
-    internments, internements
-    internship, interneship
-    internships, interneships
-    interorganizational, interorganisational
-    intime, intimae
-    intraorganization's, intraorganisation's
-    intraorganization, intraorganisation
-    intraorganizations, intraorganisations
-    inure, enure
-    inured, enured
-    inures, enures
-    inuring, enuring
-    invigor, invigour
-    iodization's, iodisation's
-    iodization, iodisation
-    iodize, iodise
-    iodized, iodised
-    iodizer's, iodiser's
-    iodizer, iodiser
-    iodizers, iodisers
-    iodizes, iodises
-    iodizing, iodising
-    Ionicization's, Ionicisation's
-    Ionicization, Ionicisation
-    Ionicizations, Ionicisations
-    Ionicize's, Ionicise's
-    Ionicize, Ionicise
-    Ionicized's, Ionicised's
-    Ionicized, Ionicised
-    Ionicizes, Ionicises
-    Ionicizing's, Ionicising's
-    Ionicizing, Ionicising
-    ionizable's, ionisable's
-    ionizable, ionisable
-    ionizabler, ionisabler
-    ionizables, ionisables
-    ionizablest, ionisablest
-    ionization's, ionisation's
-    ionization, ionisation
-    ionizations, ionisations
-    ionize, ionise
-    ionized, ionised
-    ionizer's, ioniser's
-    ionizer, ioniser
-    ionizers, ionisers
-    ionizes, ionises
-    ionizing, ionising
-    ionizings, ionisings
-    ionizion, ionision
-    ionizions, ionisions
-    Iphinoe's, Iphinoae's
-    Iphinoe, Iphinoae
-    ipomea, ipomoea
-    Iranize's, Iranise's
-    Iranize, Iranise
-    Iranizes, Iranises
-    Iricize's, Iricise's
-    Iricize, Iricise
-    Iricized's, Iricised's
-    Iricized, Iricised
-    Iricizing's, Iricising's
-    Iricizing, Iricising
-    iridectomize, iridectomise
-    iridectomized, iridectomised
-    iridectomizing, iridectomising
-    iridization, iridisation
-    iridizations, iridisations
-    iridize, iridise
-    iridized, iridised
-    iridizes, iridises
-    iridizing, iridising
-    Irishize's, Irishise's
-    Irishize, Irishise
-    Irishized's, Irishised's
-    Irishized, Irishised
-    Irishizes, Irishises
-    Irishizing's, Irishising's
-    Irishizing, Irishising
-    ironize, ironise
-    ironized, ironised
-    ironizes, ironises
-    ironizing, ironising
-    irrationalize, irrationalise
-    irrationalized, irrationalised
-    irrationalizes, irrationalises
-    irrationalizing, irrationalising
-    irrealizable, irrealisable
-    irrecognizable, irrecognisable
-    irregularize, irregularise
-    irregularizes, irregularises
-    ischemia's, ischaemia's
-    ischemia, ischaemia
-    ischemias, ischaemias
-    ischemic, ischaemic
-    Islamicize's, Islamicise's
-    Islamicize, Islamicise
-    Islamicized's, Islamicised's
-    Islamicized, Islamicised
-    Islamicizes, Islamicises
-    Islamicizing's, Islamicising's
-    Islamicizing, Islamicising
-    Islamization's, Islamisation's
-    Islamization, Islamisation
-    Islamizations, Islamisations
-    Islamize, Islamise
-    Islamized, Islamised
-    Islamizes, Islamises
-    Islamizing, Islamising
-    isochronization, isochronisation
-    isochronize, isochronise
-    isochronized, isochronised
-    isochronizes, isochronises
-    isochronizing, isochronising
-    isoimmunization's, isoimmunisation's
-    isoimmunization, isoimmunisation
-    isoimmunizations, isoimmunisations
-    isoimmunize, isoimmunise
-    isoimmunizes, isoimmunises
-    isomerization's, isomerisation's
-    isomerization, isomerisation
-    isomerizations, isomerisations
-    isomerize, isomerise
-    isomerized, isomerised
-    isomerizes, isomerises
-    isomerizing, isomerising
-    Israelitize's, Israelitise's
-    Israelitize, Israelitise
-    Israelitizes, Israelitises
-    Italianization's, Italianisation's
-    Italianization, Italianisation
-    Italianizations, Italianisations
-    Italianize, Italianise
-    italianize, italianise
-    Italianized, Italianised
-    italianized, italianised
-    Italianizer's, Italianiser's
-    Italianizer, Italianiser
-    Italianizers, Italianisers
-    Italianizes, Italianises
-    italianizes, italianises
-    Italianizing, Italianising
-    italianizing, italianising
-    italicization's, italicisation's
-    italicization, italicisation
-    italicizations, italicisations
-    italicize, italicise
-    italicized, italicised
-    italicizes, italicises
-    italicizing, italicising
-    itemization's, itemisation's
-    itemization, itemisation
-    itemizations, itemisations
-    itemize, itemise
-    itemized, itemised
-    itemizer's, itemiser's
-    itemizer, itemiser
-    itemizers, itemisers
-    itemizes, itemises
-    itemizing, itemising
-    Iturean, Ituraean
-    Itureans, Ituraeans
-    izing, ising
-    jacobean, jacobaean
-    Jacobinization's, Jacobinisation's
-    Jacobinization, Jacobinisation
-    Jacobinize's, Jacobinise's
-    Jacobinize, Jacobinise
-    Jacobinized's, Jacobinised's
-    Jacobinized, Jacobinised
-    Jacobinizes, Jacobinises
-    Jacobinizing's, Jacobinising's
-    Jacobinizing, Jacobinising
-    jail's, gaol's
-    jail, gaol
-    jailbird's, gaolbird's
-    jailbird, gaolbird
-    jailbirds, gaolbirds
-    jailbreak's, gaolbreak's
-    jailbreak, gaolbreak
-    jailbreaks, gaolbreaks
-    jailed, gaoled
-    jailing, gaoling
-    jailor's, gaoler's
-    jailor, gaoler
-    jailors, gaolers
-    jails, gaols
-    janizaries, janisaries
-    janizary, janisary
-    Japanization's, Japanisation's
-    Japanization, Japanisation
-    Japanizations, Japanisations
-    Japanize, Japanise
-    Japanized, Japanised
-    Japanizes, Japanises
-    Japanizing, Japanising
-    jargonization's, jargonisation's
-    jargonization, jargonisation
-    jargonizations, jargonisations
-    jargonize, jargonise
-    jargonized, jargonised
-    jargonizes, jargonises
-    jargonizing, jargonising
-    jasmine's, jessamine's
-    jasmine, jessamine
-    jasmines, jessamines
-    jasperize, jasperise
-    jasperized, jasperised
-    jasperizes, jasperises
-    jasperizing, jasperising
-    jeez, geez
-    jeopardization, jeopardisation
-    jeopardize, jeopardise
-    jeopardized, jeopardised
-    jeopardizes, jeopardises
-    jeopardizing, jeopardising
-    jerrican's, jerry_can's
-    jerrican, jerry_can
-    jerricans, jerry_cans
-    Jesuitization's, Jesuitisation's
-    Jesuitization, Jesuitisation
-    Jesuitize, Jesuitise
-    Jesuitized, Jesuitised
-    Jesuitizes, Jesuitises
-    Jesuitizing, Jesuitising
-    jeweled, jewelled
-    jeweler's, jeweller's
-    jeweler, jeweller
-    jewelers, jewellers
-    jeweling, jewelling
-    jewelry's, jewellery's
-    jewelry, jewellery
-    jihad's, jehad's
-    jihad, jehad
-    jihads, jehads
-    jinricksha's, jinriksha's
-    jinricksha, jinriksha
-    jinrickshas, jinrikshas
-    jiujitsu's, jujutsu's
-    jokey, joky
-    Jonathanization's, Jonathanisation's
-    Jonathanization, Jonathanisation
-    Jonathanizations, Jonathanisations
-    jor, jour
-    jors, jours
-    journalization's, journalisation's
-    journalization, journalisation
-    journalizations, journalisations
-    journalize, journalise
-    journalized, journalised
-    journalizer's, journaliser's
-    journalizer, journaliser
-    journalizers, journalisers
-    journalizes, journalises
-    journalizing, journalising
-    jovialize, jovialise
-    jovializes, jovialises
-    Judaization's, Judaisation's
-    Judaization, Judaisation
-    Judaize, Judaise
-    Judaized, Judaised
-    Judaizer's, Judaiser's
-    Judaizer, Judaiser
-    judaizer, judaiser
-    Judaizing, Judaising
-    Judean, Judaean
-    Judeans, Judaeans
-    Judeophobia's, Judaeophobia's
-    Judeophobia, Judaeophobia
-    judgment's, judgement's
-    judgment, judgement
-    judgmental, judgemental
-    judgmentaler, judgementaler
-    judgmentalest, judgementalest
-    judgments, judgements
-    judicialize, judicialise
-    judicializes, judicialises
-    jujutsu, jiujitsu
-    jujutsus, jiujitsus
-    Julide's, Julidae's
-    Julide, Julidae
-    jumboize, jumboise
-    jumboized, jumboised
-    jumboizes, jumboises
-    jumboizing, jumboising
-    junketeer's, junketer's
-    junketeer, junketer
-    junketeers, junketers
-    juvenilize, juvenilise
-    juvenilizes, juvenilises
-    kabob, kebob
-    kabobs, kebobs
-    kane, kanae
-    kaolinization's, kaolinisation's
-    kaolinization, kaolinisation
-    kaolinizations, kaolinisations
-    kaolinize, kaolinise
-    kaolinized, kaolinised
-    kaolinizes, kaolinises
-    kaolinizing, kaolinising
-    kebob's, kabob's
-    ked, kaed
-    Keizer's, Keiser's
-    Keizer, Keiser
-    kellia, koellia
-    kembed, kemboed
-    kenneled, kennelled
-    kenneling, kennelling
-    Keppel's, Koeppel's
-    Keppel, Koeppel
-    keratinization's, keratinisation's
-    keratinization, keratinisation
-    keratinizations, keratinisations
-    keratinize, keratinise
-    keratinized, keratinised
-    keratinizes, keratinises
-    keratinizing, keratinising
-    Kerin's, Krein's
-    Kerin, Krein
-    kerneled, kernelled
-    kerneling, kernelling
-    kerosene's, kerosine's
-    kerosene, kerosine
-    kerosenes, kerosines
-    ketonemia, ketonaemia
-    ketonization's, ketonisation's
-    ketonization, ketonisation
-    ketonizations, ketonisations
-    ketonize, ketonise
-    ketonizes, ketonises
-    kiddie's, kiddy's
-    kiddie, kiddy
-    kidnapped, kidnaped
-    kidnappee's, kidnapee's
-    kidnappee, kidnapee
-    kidnappees, kidnapees
-    kidnapper's, kidnaper's
-    kidnapper, kidnaper
-    kidnappers, kidnapers
-    kidnapping, kidnaping
-    kilogram's, kilogramme's
-    kilogram, kilogramme
-    kilograms, kilogrammes
-    kiloliter's, kilolitre's
-    kiloliter, kilolitre
-    kiloliters, kilolitres
-    kilometer's, kilometre's
-    kilometer, kilometre
-    kilometers, kilometres
-    kindergartner's, kindergartener's
-    kindergartner, kindergartener
-    kindergartners, kindergarteners
-    kinestheses, kinaestheses
-    kinesthesia's, kinaesthesia's
-    kinesthesia, kinaesthesia
-    kinesthesias, kinaesthesias
-    kinesthesis's, kinaesthesis's
-    kinesthesis, kinaesthesis
-    kinesthetic, kinaesthetic
-    kinestheticallier, kinaestheticallier
-    kinestheticalliest, kinaestheticalliest
-    kinesthetically, kinaesthetically
-    kinestheticer, kinaestheticer
-    kinestheticest, kinaestheticest
-    kinesthetics, kinaesthetics
-    kissogram's, kissagram's
-    kissogram, kissagram
-    kissograms, kissagrams
-    knickknack's, nicknack's
-    knickknack, nicknack
-    knickknacks, nicknacks
-    knockwurst's, knackwurst's
-    knockwurst, knackwurst
-    knockwursts, knackwursts
-    kooky, kookie
-    kopek's, copeck's
-    kopek, copeck
-    kopeks, copecks
-    Kossean's, Kossaean's
-    Kossean, Kossaean
-    kumquat's, cumquat's
-    kumquat, cumquat
-    kumquats, cumquats
-    kyanize, kyanise
-    kyanized, kyanised
-    kyanizes, kyanises
-    kyanizing, kyanising
-    kyles, kyloes
-    labelable, labellable
-    labeled, labelled
-    labeler's, labeller's
-    labeler, labeller
-    labelers, labellers
-    labeling, labelling
-    labialization's, labialisation's
-    labialization, labialisation
-    labializations, labialisations
-    labialize, labialise
-    labialized, labialised
-    labializes, labialises
-    labializing, labialising
-    labiate, labiatae
-    labilization's, labilisation's
-    labilization, labilisation
-    labilizations, labilisations
-    labilize, labilise
-    labilizes, labilises
-    labiovelarization's, labiovelarisation's
-    labiovelarization, labiovelarisation
-    labiovelarize, labiovelarise
-    labiovelarized, labiovelarised
-    labiovelarizing, labiovelarising
-    labor's, labour's
-    labor, labour
-    laborabilities, labourabilities
-    laborability's, labourability's
-    laborability, labourability
-    laborable's, labourable's
-    laborable, labourable
-    laborables, labourables
-    laborage, labourage
-    labored, laboured
-    laboredlier, labouredlier
-    laboredliest, labouredliest
-    laboredly, labouredly
-    laboredness's, labouredness's
-    laboredness, labouredness
-    laborednesses, labourednesses
-    laborer's, labourer's
-    laborer, labourer
-    laborers, labourers
-    laboress, labouress
-    laborhood's, labourhood's
-    laborhood, labourhood
-    laborhoods, labourhoods
-    laboring's, labouring's
-    laboring, labouring
-    laboringlier, labouringlier
-    laboringliest, labouringliest
-    laboringly, labouringly
-    laborings, labourings
-    Laborism's, Labourism's
-    laborism's, labourism's
-    Laborism, Labourism
-    laborism, labourism
-    laborisms, labourisms
-    laborist's, labourist's
-    laborist, labourist
-    laborists, labourists
-    Laborite's, Labourite's
-    laborite's, labourite's
-    Laborite, Labourite
-    laborite, labourite
-    Laborites, Labourites
-    laborites, labourites
-    laborless, labourless
-    laborlesser, labourlesser
-    laborlesses, labourlesses
-    laborlessest, labourlessest
-    labors, labours
-    laborsaving, laboursaving
-    laborsome, laboursome
-    laborsomely, laboursomely
-    lachrymal, lacrimal
-    lackluster's, lacklustre's
-    lackluster, lacklustre
-    lacklusterrer, lacklustrer
-    lacklusterrest, lacklustrest
-    lacklusters, lacklustres
-    laconize, laconise
-    laconized, laconised
-    laconizes, laconises
-    laconizing, laconising
-    lactonized, lactonised
-    lagniappe's, lagnappe's
-    lagniappe, lagnappe
-    lagniappes, lagnappes
-    laicization's, laicisation's
-    laicization, laicisation
-    laicizations, laicisations
-    laicize, laicise
-    laicized, laicised
-    laicizes, laicises
-    laicizing, laicising
-    lairize, lairise
-    lairized, lairised
-    lairizes, lairises
-    lairizing, lairising
-    lambaste, lambast
-    lambastes, lambasts
-    laminarize, laminarise
-    laminarized, laminarised
-    laminarizes, laminarises
-    laminarizing, laminarising
-    Lander's, Landre's
-    Lander, Landre
-    Laothoe's, Laothoae's
-    Laothoe, Laothoae
-    lapeled, lapelled
-    lasagna's, lasagne's
-    lasagna, lasagne
-    lasagnas, lasagnes
-    laster, lastre
-    latentize, latentise
-    latentizes, latentises
-    lateralization's, lateralisation's
-    lateralization, lateralisation
-    lateralizations, lateralisations
-    lateralize, lateralise
-    lateralizes, lateralises
-    laterization's, laterisation's
-    laterization, laterisation
-    laterizations, laterisations
-    Latinization's, Latinisation's
-    Latinization, Latinisation
-    Latinizations, Latinisations
-    Latinize, Latinise
-    latinize, latinise
-    Latinized, Latinised
-    Latinizer, Latiniser
-    Latinizers, Latinisers
-    Latinizes, Latinises
-    Latinizing, Latinising
-    launderette's, laundrette's
-    launderette, laundrette
-    launderettes, laundrettes
-    laure, laurae
-    laureled, laurelled
-    laureling, laurelling
-    lavalier_microphone's, lavaliere_microphone's
-    lavalier_microphone, lavaliere_microphone
-    lavalier_microphones, lavaliere_microphones
-    lavolted, lavoltaed
-    leaped, leapt
-    learned, learnt
-    leatherize, leatherise
-    leatherizes, leatherises
-    lefty's, leftie's
-    lefty, leftie
-    legalization's, legalisation's
-    legalization, legalisation
-    legalizations, legalisations
-    legalize, legalise
-    legalized, legalised
-    legalizes, legalises
-    legalizing, legalising
-    legitimatize, legitimatise
-    legitimatized, legitimatised
-    legitimatizes, legitimatises
-    legitimatizing, legitimatising
-    legitimization's, legitimisation's
-    legitimization, legitimisation
-    legitimizations, legitimisations
-    legitimize, legitimise
-    legitimized, legitimised
-    legitimizer, legitimiser
-    legitimizes, legitimises
-    legitimizing, legitimising
-    leguminose, leguminosae
-    lemmatize, lemmatise
-    lemmatized, lemmatised
-    lemmatizes, lemmatises
-    lemmatizing, lemmatising
-    leporide, leporidae
-    leptospire, leptospirae
-    Lernean's, Lernaean's
-    Lernean, Lernaean
-    lernean, lernaean
-    lesses, loesses
-    lethalize, lethalise
-    lethalizes, lethalises
-    lethargize, lethargise
-    lethargized, lethargised
-    lethargizes, lethargises
-    lethargizing, lethargising
-    leucemia, leucaemia
-    leucemias, leucaemias
-    leucemic, leucaemic
-    leuchemia, leuchaemia
-    leucocythemia, leucocythaemia
-    leucocythemic, leucocythaemic
-    leucorrhea's, leucorrhoea's
-    leucorrhea, leucorrhoea
-    leucorrheal, leucorrhoeal
-    leucorrheas, leucorrhoeas
-    Leucothoe's, Leucothoae's
-    Leucothoe, Leucothoae
-    leukemia's, leukaemia's
-    leukemia, leukaemia
-    leukemias, leukaemias
-    leukemogeneses, leukaemogeneses
-    leukemogenesis, leukaemogenesis
-    leukorrhea, leukorrhoea
-    leukorrheal, leukorrhoeal
-    leveled, levelled
-    leveler's, leveller's
-    leveler, leveller
-    levelers, levellers
-    levelest, levellest
-    leveling's, levelling's
-    leveling, levelling
-    levigate, laevigate
-    levigated, laevigated
-    levigates, laevigates
-    levigating, laevigating
-    levo, laevo
-    levoduction, laevoduction
-    levogyrate, laevogyrate
-    levogyre, laevogyre
-    levogyrous, laevogyrous
-    levolactic, laevolactic
-    levorotation's, laevorotation's
-    levorotation, laevorotation
-    levorotations, laevorotations
-    levorotatory, laevorotatory
-    levotartaric, laevotartaric
-    levoversion, laevoversion
-    levulin, laevulin
-    levulose's, laevulose's
-    levulose, laevulose
-    levuloses, laevuloses
-    lexicalization, lexicalisation
-    lexicalizations, lexicalisations
-    lexiconize, lexiconise
-    lexiconizes, lexiconises
-    libelant's, libellant's
-    libelant, libellant
-    libelants, libellants
-    libeled, libelled
-    libelee's, libellee's
-    libelee, libellee
-    libelees, libellees
-    libeler's, libeller's
-    libeler, libeller
-    libelers, libellers
-    libeling, libelling
-    libelous, libellous
-    libelouser, libellouser
-    libelousest, libellousest
-    libelouslier, libellouslier
-    libelousliest, libellousliest
-    libelously, libellously
-    liberalization's, liberalisation's
-    liberalization, liberalisation
-    liberalizations, liberalisations
-    liberalize, liberalise
-    liberalized, liberalised
-    liberalizer's, liberaliser's
-    liberalizer, liberaliser
-    liberalizers, liberalisers
-    liberalizes, liberalises
-    liberalizing, liberalising
-    licenseless, licenceless
-    licenselesses, licencelesses
-    lichenization's, lichenisation's
-    lichenization, lichenisation
-    lichenizations, lichenisations
-    lichenize, lichenise
-    lichenized, lichenised
-    lichenizes, lichenises
-    lichenizing, lichenising
-    licorice's, liquorice's
-    licorice, liquorice
-    lignitize, lignitise
-    lignitizes, lignitises
-    lignose, lignosae
-    ligule, ligulae
-    likabilities, likeabilities
-    likability's, likeability's
-    likability, likeability
-    likable, likeable
-    likableness's, likeableness's
-    likableness, likeableness
-    likablenesses, likeablenesses
-    Lilliputianize's, Lilliputianise's
-    Lilliputianize, Lilliputianise
-    Lilliputianizes, Lilliputianises
-    linchpin's, lynchpin's
-    linchpin, lynchpin
-    linchpins, lynchpins
-    linearizable, linearisable
-    linearization's, linearisation's
-    linearization, linearisation
-    linearizations, linearisations
-    linearize, linearise
-    linearized, linearised
-    linearizes, linearises
-    linearizing, linearising
-    linearizion, linearision
-    linenize, linenise
-    linenizer, lineniser
-    linenizers, linenisers
-    linenizes, linenises
-    linge, lingoe
-    lingualize, lingualise
-    lingualizes, lingualises
-    linguine's, linguini's
-    linguine, linguini
-    linguines, linguinis
-    lionizable's, lionisable's
-    lionizable, lionisable
-    lionizables, lionisables
-    lionization's, lionisation's
-    lionization, lionisation
-    lionizations, lionisations
-    lionize, lionise
-    lionized, lionised
-    lionizer's, lioniser's
-    lionizer, lioniser
-    lionizers, lionisers
-    lionizes, lionises
-    lionizing, lionising
-    lipemia, lipaemia
-    lipemic, lipaemic
-    lipoidemia, lipoidaemia
-    liquefied, liquified
-    liquefier, liquifier
-    liquefiers, liquifiers
-    liquefies, liquifies
-    liquefy, liquify
-    liquefying, liquifying
-    liquidization, liquidisation
-    liquidize, liquidise
-    liquidized, liquidised
-    liquidizer's, liquidiser's
-    liquidizer, liquidiser
-    liquidizers, liquidisers
-    liquidizes, liquidises
-    liquidizing, liquidising
-    lissome, lissom
-    lissomely, lissomly
-    lissomeness, lissomness
-    lissomenesses, lissomnesses
-    Listerize's, Listerise's
-    Listerize, Listerise
-    Listerized's, Listerised's
-    Listerized, Listerised
-    Listerizes, Listerises
-    Listerizing's, Listerising's
-    Listerizing, Listerising
-    liter's, litre's
-    liter, litre
-    literalization's, literalisation's
-    literalization, literalisation
-    literalizations, literalisations
-    literalize, literalise
-    literalized, literalised
-    literalizer's, literaliser's
-    literalizer, literaliser
-    literalizers, literalisers
-    literalizes, literalises
-    literalizing, literalising
-    liters, litres
-    lithed, lithoed
-    lithemia, lithaemia
-    lithemic, lithaemic
-    lithographize, lithographise
-    lithographizes, lithographises
-    lithopedion, lithopaedion
-    lithopedium, lithopaedium
-    lithophyse, lithophysae
-    lithotritize, lithotritise
-    lithotritized, lithotritised
-    lithotritizes, lithotritises
-    lithotritizing, lithotritising
-    livable, liveable
-    livableness, liveableness
-    lobotomize, lobotomise
-    lobotomized, lobotomised
-    lobotomizes, lobotomises
-    lobotomizing, lobotomising
-    localizable's, localisable's
-    localizable, localisable
-    localizabler, localisabler
-    localizables, localisables
-    localizablest, localisablest
-    localization's, localisation's
-    localization, localisation
-    localizations, localisations
-    localize, localise
-    localized, localised
-    localizer's, localiser's
-    localizer, localiser
-    localizers, localisers
-    localizes, localises
-    localizing, localising
-    locator's, locater's
-    locator, locater
-    locators, locaters
-    lodestar's, loadstar's
-    lodestar, loadstar
-    lodestars, loadstars
-    lodestone's, loadstone's
-    lodestone, loadstone
-    lodestones, loadstones
-    lodgment's, lodgement's
-    lodgment, lodgement
-    lodgments, lodgements
-    lodicule, lodiculae
-    loed, looed
-    logicalization's, logicalisation's
-    logicalization, logicalisation
-    logicalizations, logicalisations
-    logicalize, logicalise
-    logicalizes, logicalises
-    logicize, logicise
-    logicized, logicised
-    logicizes, logicises
-    logicizing, logicising
-    logopedic, logopaedic
-    logopedics's, logopaedics's
-    logopedics, logopaedics
-    logorrhea's, logorrhoea's
-    logorrhea, logorrhoea
-    logorrheas, logorrhoeas
-    lollipop's, lollypop's
-    lollipop, lollypop
-    lollipops, lollypops
-    lollygag, lallygag
-    lollygagged, lallygagged
-    lollygagging, lallygagging
-    lollygags, lallygags
-    Londonization's, Londonisation's
-    Londonization, Londonisation
-    Londonizations, Londonisations
-    Londonize's, Londonise's
-    Londonize, Londonise
-    Londonized's, Londonised's
-    Londonized, Londonised
-    Londonizes, Londonises
-    Londonizing's, Londonising's
-    Londonizing, Londonising
-    longeval, longaeval
-    longevous, longaevous
-    looneyies, looneys
-    loonier, looneyier
-    loony's, looney's
-    loony, looney
-    lordy, lourdy
-    lorings, lourings
-    lory, loury
-    louter, loutre
-    louver's, louvre's
-    louver, louvre
-    louvered, louvred
-    louvers, louvres
-    lovability, lovaebility
-    lovable, loveable
-    lovableness, loveableness
-    lovably, loveably
-    love, luv
-    loves, luvs
-    lovey, luvvie
-    loveys, luvvies
-    loyalize, loyalise
-    loyalizes, loyalises
-    lumbarization's, lumbarisation's
-    lumbarization, lumbarisation
-    lumbarizations, lumbarisations
-    lunatize, lunatise
-    lunatizes, lunatises
-    lunule, lunulae
-    luster's, lustre's
-    luster, lustre
-    lustered, lustred
-    lustering's, lustring's
-    lustering, lustring
-    lusterless, lustreless
-    lusterlesser, lustrelesser
-    lusterlessest, lustrelessest
-    lusters, lustres
-    lusterware's, lustreware's
-    lusterware, lustreware
-    lusterwares, lustrewares
-    luteinization's, luteinisation's
-    luteinization, luteinisation
-    luteinizations, luteinisations
-    luteinize, luteinise
-    luteinized, luteinised
-    luteinizes, luteinises
-    luteinizing, luteinising
-    Lutheranize's, Lutheranise's
-    Lutheranize, Lutheranise
-    Lutheranizer's, Lutheraniser's
-    Lutheranizer, Lutheraniser
-    Lutheranizers, Lutheranisers
-    Lutheranizes, Lutheranises
-    lutrine, lutrinae
-    luvvy, luvvie
-    lychee's, lichee's
-    lychee, lichee
-    lychees, lichees
-    lymphedema, lymphoedema
-    lymphemia, lymphaemia
-    lyophilization's, lyophilisation's
-    lyophilization, lyophilisation
-    lyophilizations, lyophilisations
-    lyophilize, lyophilise
-    lyophilized, lyophilised
-    lyophilizer, lyophiliser
-    lyophilizes, lyophilises
-    lyophilizing, lyophilising
-    lyricization's, lyricisation's
-    lyricization, lyricisation
-    lyricize, lyricise
-    lyricized, lyricised
-    lyricizes, lyricises
-    lyricizing, lyricising
-    lysogenization, lysogenisation
-    lysogenize, lysogenise
-    lysogenized, lysogenised
-    lysogenizes, lysogenises
-    lysogenizing, lysogenising
-    mac's, mack's
-    mac, mack
-    macadamization's, macadamisation's
-    macadamization, macadamisation
-    macadamizations, macadamisations
-    macadamize, macadamise
-    macadamized, macadamised
-    macadamizes, macadamises
-    macadamizing, macadamising
-    macarize, macarise
-    macarized, macarised
-    macarizes, macarises
-    macarizing, macarising
-    Maccabean, Maccabaean
-    machinization's, machinisation's
-    machinization, machinisation
-    machinizations, machinisations
-    machinize, machinise
-    machinizes, machinises
-    mackintosh's, macintosh's
-    mackintosh, macintosh
-    mackintoshes, macintoshes
-    macrander, macrandre
-    macs, macks
-    macule, maculae
-    Madera's, Madoera's
-    Madera, Madoera
-    maderization, maderisation
-    maderizations, maderisations
-    maderize, maderise
-    maderized, maderised
-    maderizes, maderises
-    maderizing, maderising
-    maed, maaed
-    maenad's, menad's
-    maenad, menad
-    maenadic, menadic
-    maenads, menads
-    magicalize, magicalise
-    magicalizes, magicalises
-    magnetizabilities, magnetisabilities
-    magnetizability's, magnetisability's
-    magnetizability, magnetisability
-    magnetizable's, magnetisable's
-    magnetizable, magnetisable
-    magnetizables, magnetisables
-    magnetization's, magnetisation's
-    magnetization, magnetisation
-    magnetizations, magnetisations
-    magnetize, magnetise
-    magnetized, magnetised
-    magnetizer's, magnetiser's
-    magnetizer, magnetiser
-    magnetizers, magnetisers
-    magnetizes, magnetises
-    magnetizing, magnetising
-    maharajah's, maharaja's
-    maharajah, maharaja
-    maharajahs, maharajas
-    maharani's, maharanee's
-    maharani, maharanee
-    maharanis, maharanees
-    mahoganize, mahoganise
-    mahoganized, mahoganised
-    mahoganizes, mahoganises
-    mahoganizing, mahoganising
-    maiger, maigre
-    mainor, mainour
-    mainors, mainours
-    mainprize, mainprise
-    maisters, maistres
-    Maize's, Maise's
-    Maize, Maise
-    majolica's, maiolica's
-    majolica, maiolica
-    majolicas, maiolicas
-    majorize, majorise
-    majorizes, majorises
-    majuscule, majusculae
-    Malayize's, Malayise's
-    Malayize, Malayise
-    Malayizes, Malayises
-    malleablize, malleablise
-    malleablizes, malleablises
-    malodor's, malodour's
-    malodor, malodour
-    malodorousness, malodourousness
-    malodors, malodours
-    mandarinize, mandarinise
-    mandarinizes, mandarinises
-    Mandean's, Mandaean's
-    Mandean, Mandaean
-    Mandeans, Mandaeans
-    mandoer, mandore
-    mandrel's, mandril's
-    mandrel, mandril
-    mandrels, mandrils
-    maneuverabilities, manoeuvrabilities
-    maneuverability's, manoeuvrability's
-    maneuverability, manoeuvrability
-    maneuverable, manoeuvrable
-    maneuverabler, manoeuvrabler
-    maneuverablest, manoeuvrablest
-    maneuverer's, manoeuvrer's
-    maneuverer, manoeuvrer
-    maneuverers, manoeuvrers
-    Manhattanize, Manhattanise
-    Manhattanizes, Manhattanises
-    Manicheanism's, Manichaeanism's
-    Manicheanism, Manichaeanism
-    Manicheans, Manichaeans
-    Manicheism's, Manichaeism's
-    Manicheism, Manichaeism
-    Manicheisms, Manichaeisms
-    Manicheus's, Manichaeus's
-    Manicheus, Manichaeus
-    manikin's, mannikin's
-    manikin, mannikin
-    manikins, mannikins
-    mannerize, mannerise
-    mannerizes, mannerises
-    manoeuvre's, manoeuver's
-    manoeuvre, manoeuver
-    manoeuvred, manoeuvered
-    manoeuvres, manoeuvers
-    manoeuvring, manoeuvering
-    manoeuvrings, manoeuverings
-    mantelpiece, mantlepiece
-    mantelpieces, mantlepieces
-    mantes, mantoes
-    marabou's, marabout's
-    marabou, marabout
-    marabous, marabouts
-    marbleize, marbleise
-    marbleized, marbleised
-    marbleizes, marbleises
-    marbleizing, marbleising
-    margarite, margaritae
-    marginalization, marginalisation
-    marginalize, marginalise
-    marginalized, marginalised
-    marginalizes, marginalises
-    marginalizing, marginalising
-    marijuana's, marihuana's
-    marijuana, marihuana
-    marijuanas, marihuanas
-    marlinespike's, marlinspike's
-    marlinespike, marlinspike
-    marlinespikes, marlinspikes
-    marmarize, marmarise
-    marmarized, marmarised
-    marmarizes, marmarises
-    marmarizing, marmarising
-    marmelize, marmelise
-    marmelized, marmelised
-    marmelizes, marmelises
-    marmelizing, marmelising
-    marshaled, marshalled
-    marshaling, marshalling
-    marsupialization's, marsupialisation's
-    marsupialization, marsupialisation
-    marsupializations, marsupialisations
-    marsupialize, marsupialise
-    marsupialized, marsupialised
-    marsupializes, marsupialises
-    marsupializing, marsupialising
-    Marte's, Martae's
-    Marte, Martae
-    martialization's, martialisation's
-    martialization, martialisation
-    martializations, martialisations
-    martialize, martialise
-    martializes, martialises
-    martyrization's, martyrisation's
-    martyrization, martyrisation
-    martyrizations, martyrisations
-    martyrize, martyrise
-    martyrized, martyrised
-    martyrizer, martyriser
-    martyrizers, martyrisers
-    martyrizes, martyrises
-    martyrizing, martyrising
-    marveled, marvelled
-    marveler, marveller
-    marveling, marvelling
-    marvelous, marvellous
-    marvelouser, marvellouser
-    marvelousest, marvellousest
-    marvelouslier, marvellouslier
-    marvelousliest, marvellousliest
-    marvelously, marvellously
-    marvelousness's, marvellousness's
-    marvelousness, marvellousness
-    marvelousnesses, marvellousnesses
-    masculinization's, masculinisation's
-    masculinization, masculinisation
-    masculinizations, masculinisations
-    masculinize, masculinise
-    masculinized, masculinised
-    masculinizes, masculinises
-    masculinizing, masculinising
-    materialization's, materialisation's
-    materialization, materialisation
-    materializations, materialisations
-    materialize, materialise
-    materialized, materialised
-    materializer's, materialiser's
-    materializer, materialiser
-    materializers, materialisers
-    materializes, materialises
-    materializing, materialising
-    maternalize, maternalise
-    maternalized, maternalised
-    maternalizes, maternalises
-    maternalizing, maternalising
-    maters, matres
-    mathematicize, mathematicise
-    mathematicized, mathematicised
-    mathematicizes, mathematicises
-    mathematicizing, mathematicising
-    mathematization's, mathematisation's
-    mathematization, mathematisation
-    mathematizations, mathematisations
-    mathematize, mathematise
-    mathematized, mathematised
-    mathematizes, mathematises
-    mathematizing, mathematising
-    matronize, matronise
-    matronized, matronised
-    matronizes, matronises
-    matronizing, matronising
-    matte, mat
-    Matthean, Matthaean
-    maudlinize, maudlinise
-    maudlinizes, maudlinises
-    mauger, maugre
-    maven's, mavin's
-    maven, mavin
-    mavens, mavins
-    maximization's, maximisation's
-    maximization, maximisation
-    maximizations, maximisations
-    maximize, maximise
-    maximized, maximised
-    maximizer's, maximiser's
-    maximizer, maximiser
-    maximizers, maximisers
-    maximizes, maximises
-    maximizing, maximising
-    mazurka's, mazourka's
-    mazurka, mazourka
-    mazurkas, mazourkas
-    meager, meagre
-    meagerly, meagrely
-    meagerness's, meagreness's
-    meagerness, meagreness
-    meagernesses, meagrenesses
-    meagerrer, meagrer
-    meagerrest, meagrest
-    meandrine, maeandrine
-    meandriniform, maeandriniform
-    meanie's, meany's
-    meanie, meany
-    mechanicalization's, mechanicalisation's
-    mechanicalization, mechanicalisation
-    mechanicalizations, mechanicalisations
-    mechanicalize, mechanicalise
-    mechanicalizes, mechanicalises
-    mechanizable, mechanisable
-    mechanization's, mechanisation's
-    mechanization, mechanisation
-    mechanizations, mechanisations
-    mechanize, mechanise
-    mechanized, mechanised
-    mechanizer's, mechaniser's
-    mechanizer, mechaniser
-    mechanizers, mechanisers
-    mechanizes, mechanises
-    mechanizing, mechanising
-    meck, moeck
-    Med's, Moed's
-    Med, Moed
-    medaled, medalled
-    medaling, medalling
-    medalist's, medallist's
-    medalist, medallist
-    medalists, medallists
-    medalize, medalise
-    medalizes, medalises
-    medialization's, medialisation's
-    medialization, medialisation
-    medializations, medialisations
-    medialize, medialise
-    medializes, medialises
-    mediatization's, mediatisation's
-    mediatization, mediatisation
-    mediatizations, mediatisations
-    mediatize, mediatise
-    mediatized, mediatised
-    mediatizes, mediatises
-    mediatizing, mediatising
-    medicalization, medicalisation
-    medicalizations, medicalisations
-    medicalize, medicalise
-    medicalized, medicalised
-    medicalizes, medicalises
-    medicalizing, medicalising
-    medieval's, mediaeval's
-    medieval, mediaeval
-    medievalism's, mediaevalism's
-    medievalism, mediaevalism
-    medievalisms, mediaevalisms
-    medievally, mediaevally
-    medievals, mediaevals
-    Mediterraneanization's, Mediterraneanisation's
-    Mediterraneanization, Mediterraneanisation
-    Mediterraneanizations, Mediterraneanisations
-    Mediterraneanize's, Mediterraneanise's
-    Mediterraneanize, Mediterraneanise
-    Mediterraneanizes, Mediterraneanises
-    mediumization's, mediumisation's
-    mediumization, mediumisation
-    mediumizations, mediumisations
-    mediumize, mediumise
-    mediumizes, mediumises
-    megagram, megagramme
-    megagrams, megagrammes
-    megameter, megametre
-    megameters, megametres
-    megbote, maegbote
-    megerg, megaerg
-    melanemia, melanaemia
-    melanemic, melanaemic
-    melanization, melanisation
-    melanize, melanise
-    melanized, melanised
-    melanizes, melanises
-    melanizing, melanising
-    mele, meloe
-    melena, melaena
-    melenic, melaenic
-    Melie's, Meliae's
-    Melie, Meliae
-    meline, melinae
-    melitemia, melitaemia
-    melithemia, melithaemia
-    mellon, moellon
-    melodization, melodisation
-    melodize, melodise
-    melodized, melodised
-    melodizer's, melodiser's
-    melodizer, melodiser
-    melodizes, melodises
-    melodizing, melodising
-    melodramatization, melodramatisation
-    melodramatize, melodramatise
-    melodramatized, melodramatised
-    melodramatizes, melodramatises
-    melodramatizing, melodramatising
-    memorialization's, memorialisation's
-    memorialization, memorialisation
-    memorializations, memorialisations
-    memorialize, memorialise
-    memorialized, memorialised
-    memorializer's, memorialiser's
-    memorializer, memorialiser
-    memorializers, memorialisers
-    memorializes, memorialises
-    memorializing, memorialising
-    memorizable's, memorisable's
-    memorizable, memorisable
-    memorizables, memorisables
-    memorization's, memorisation's
-    memorization, memorisation
-    memorizations, memorisations
-    memorize, memorise
-    memorized, memorised
-    memorizer's, memoriser's
-    memorizer, memoriser
-    memorizers, memorisers
-    memorizes, memorises
-    memorizing, memorising
-    Mendelize's, Mendelise's
-    Mendelize, Mendelise
-    Mendelizes, Mendelises
-    meningorrhea, meningorrhoea
-    menorrhea, menorrhoea
-    menorrheas, menorrhoeas
-    menorrheic, menorrhoeic
-    mense, mensae
-    mentalization's, mentalisation's
-    mentalization, mentalisation
-    mentalizations, mentalisations
-    mentalize, mentalise
-    mentalizes, mentalises
-    meow's, miaow's
-    meow, miaow
-    meowed, miaowed
-    meowing, miaowing
-    meows, miaows
-    mephitine, mephitinae
-    Mera's, Maera's
-    Mera, Maera
-    mercerization's, mercerisation's
-    mercerization, mercerisation
-    mercerizations, mercerisations
-    mercerize, mercerise
-    mercerized, mercerised
-    mercerizer's, merceriser's
-    mercerizer, merceriser
-    mercerizers, mercerisers
-    mercerizes, mercerises
-    mercerizing, mercerising
-    merchandiser's, merchandizer's
-    merchandiser, merchandizer
-    merchandisers, merchandizers
-    mercurialization's, mercurialisation's
-    mercurialization, mercurialisation
-    mercurializations, mercurialisations
-    mercurialize, mercurialise
-    mercurialized, mercurialised
-    mercurializes, mercurialises
-    mercurializing, mercurialising
-    mercurize, mercurise
-    mercurized, mercurised
-    mercurizes, mercurises
-    mercurizing, mercurising
-    Meroe's, Meroae's
-    Meroe, Meroae
-    mesmerizabilities, mesmerisabilities
-    mesmerizability's, mesmerisability's
-    mesmerizability, mesmerisability
-    mesmerizable's, mesmerisable's
-    mesmerizable, mesmerisable
-    mesmerizables, mesmerisables
-    mesmerization's, mesmerisation's
-    mesmerization, mesmerisation
-    mesmerizations, mesmerisations
-    mesmerize, mesmerise
-    mesmerized, mesmerised
-    mesmerizer's, mesmeriser's
-    mesmerizer, mesmeriser
-    mesmerizers, mesmerisers
-    mesmerizes, mesmerises
-    mesmerizing, mesmerising
-    mesoglea, mesogloea
-    mesogleal, mesogloeal
-    mesogleas, mesogloeas
-    mesprize, mesprise
-    mesprizes, mesprises
-    mesquite's, mesquit's
-    mesquite, mesquit
-    mesquites, mesquits
-    metabolizable's, metabolisable's
-    metabolizable, metabolisable
-    metabolizables, metabolisables
-    metabolize, metabolise
-    metabolized, metabolised
-    metabolizes, metabolises
-    metabolizing, metabolising
-    metacenter's, metacentre's
-    metacenter, metacentre
-    metacenters, metacentres
-    metagrabolize, metagrabolise
-    metagrabolized, metagrabolised
-    metagrabolizes, metagrabolises
-    metagrabolizing, metagrabolising
-    metagrobolize, metagrobolise
-    metagrobolized, metagrobolised
-    metagrobolizes, metagrobolises
-    metagrobolizing, metagrobolising
-    metaled, metalled
-    metaling, metalling
-    metallisation's, metallization's
-    metallisation, metallization
-    metallisations, metallizations
-    metallise, metallize
-    metallised, metallized
-    metallises, metallizes
-    metallising, metallizing
-    metamerization's, metamerisation's
-    metamerization, metamerisation
-    metamerizations, metamerisations
-    metamerized's, metamerised's
-    metamerized, metamerised
-    metamerizeds, metameriseds
-    metaphonize, metaphonise
-    metaphonizes, metaphonises
-    metaphorize, metaphorise
-    metaphorizes, metaphorises
-    metaphysicize, metaphysicise
-    metaphysicizes, metaphysicises
-    metastasize, metastasise
-    metastasized, metastasised
-    metastasizes, metastasises
-    metastasizing, metastasising
-    metathesize, metathesise
-    metathesized, metathesised
-    metathesizes, metathesises
-    metathesizing, metathesising
-    meteorization's, meteorisation's
-    meteorization, meteorisation
-    meteorizations, meteorisations
-    meteorize, meteorise
-    meteorizes, meteorises
-    metergram, metregram
-    meterless, metreless
-    metership, metreship
-    metestrus's, metoestrus's
-    metestrus, metoestrus
-    methadone's, methadon's
-    methadone, methadon
-    methadones, methadons
-    methemoglobin, methaemoglobin
-    methodization's, methodisation's
-    methodization, methodisation
-    methodizations, methodisations
-    methodize, methodise
-    methodized, methodised
-    methodizer's, methodiser's
-    methodizer, methodiser
-    methodizers, methodisers
-    methodizes, methodises
-    methodizing, methodising
-    metope, metopae
-    metricize, metricise
-    metricized, metricised
-    metricizes, metricises
-    metricizing, metricising
-    metrize, metrise
-    metropolitanization, metropolitanisation
-    metropolitanize, metropolitanise
-    metropolitanized, metropolitanised
-    metropolitanizes, metropolitanises
-    metropolitanizing, metropolitanising
-    Mexicanize's, Mexicanise's
-    Mexicanize, Mexicanise
-    Mexicanizes, Mexicanises
-    micelle, micellae
-    micresthete, micraesthete
-    microcolorimeter, microcolourimeter
-    microcolorimetric, microcolourimetric
-    microcolorimetrically, microcolourimetrically
-    microcolorimetry, microcolourimetry
-    microgram, microgramme
-    micrograms, nanogrammes
-    microliter's, microlitre's
-    microliter, microlitre
-    microliters, microlitres
-    micromillimeter's, micromillimetre's
-    micromillimeter, micromillimetre
-    micromillimeters, micromillimetres
-    microminiaturization's, microminiaturisation's
-    microminiaturization, microminiaturisation
-    microminiaturizations, microminiaturisations
-    microminiaturize, microminiaturise
-    microminiaturized, microminiaturised
-    microminiaturizer, microminiaturiser
-    microminiaturizers, microminiaturisers
-    microminiaturizes, microminiaturises
-    microminiaturizing, microminiaturising
-    micronization's, micronisation's
-    micronization, micronisation
-    micronizations, micronisations
-    micronize, micronise
-    micronizes, micronises
-    micropaleontologies, micropalaeontologies
-    micropaleontologist, micropalaeontologist
-    micropaleontologists, micropalaeontologists
-    micropaleontology's, micropalaeontology's
-    micropaleontology, micropalaeontology
-    micropolarization's, micropolarisation's
-    micropolarization, micropolarisation
-    micropolarizations, micropolarisations
-    microscopize, microscopise
-    microscopizes, microscopises
-    microspheric, microsphaeric
-    Midlandize's, Midlandise's
-    Midlandize, Midlandise
-    Midlandizes, Midlandises
-    midsize, midsized
-    midwifed, midwived
-    midwifing, midwiving
-    migniardize, migniardise
-    militarization's, militarisation's
-    militarization, militarisation
-    militarizations, militarisations
-    militarize, militarise
-    militarized, militarised
-    militarizes, militarises
-    militarizing, militarising
-    milligram's, milligramme's
-    milligram, milligramme
-    milligrams, milligrammes
-    milliliter's, millilitre's
-    milliliter, millilitre
-    milliliters, millilitres
-    millimeter's, millimetre's
-    millimeter, millimetre
-    millimeters, millimetres
-    millionaire's, millionnaire's
-    millionaire, millionnaire
-    millionaires, millionnaires
-    millionize, millionise
-    millionizes, millionises
-    millipede's, millepede's
-    millipede, millepede
-    millipedes, millepedes
-    milometer's, mileometer's
-    milometer, mileometer
-    milometers, mileometers
-    Miltonize's, Miltonise's
-    Miltonize, Miltonise
-    Miltonized's, Miltonised's
-    Miltonized, Miltonised
-    Miltonizes, Miltonises
-    Miltonizing's, Miltonising's
-    Miltonizing, Miltonising
-    mineralizable's, mineralisable's
-    mineralizable, mineralisable
-    mineralizables, mineralisables
-    mineralization's, mineralisation's
-    mineralization, mineralisation
-    mineralizations, mineralisations
-    mineralize, mineralise
-    mineralized, mineralised
-    mineralizer's, mineraliser's
-    mineralizer, mineraliser
-    mineralizers, mineralisers
-    mineralizes, mineralises
-    mineralizing, mineralising
-    mineralogize, mineralogise
-    mineralogized, mineralogised
-    mineralogizes, mineralogises
-    mineralogizing, mineralogising
-    miniaturization's, miniaturisation's
-    miniaturization, miniaturisation
-    miniaturizations, miniaturisations
-    miniaturize, miniaturise
-    miniaturized, miniaturised
-    miniaturizes, miniaturises
-    miniaturizing, miniaturising
-    minibuses, minibusses
-    minimization's, minimisation's
-    minimization, minimisation
-    minimizations, minimisations
-    minimize, minimise
-    minimized, minimised
-    minimizer's, minimiser's
-    minimizer, minimiser
-    minimizers, minimisers
-    minimizes, minimises
-    minimizing, minimising
-    minuscule's, miniscule's
-    minuscule, miniscule
-    minuscules, miniscules
-    miraculize, miraculise
-    miraculized, miraculised
-    miraculizes, miraculises
-    miraculizing, miraculising
-    mirrorize, mirrorise
-    mirrorizes, mirrorises
-    misadvize, misadvise
-    misalphabetize, misalphabetise
-    misalphabetizes, misalphabetises
-    misanthropize, misanthropise
-    misanthropized, misanthropised
-    misanthropizes, misanthropises
-    misanthropizing, misanthropising
-    misauthorization's, misauthorisation's
-    misauthorization, misauthorisation
-    misauthorizations, misauthorisations
-    misauthorize, misauthorise
-    misauthorizes, misauthorises
-    misbaptize, misbaptise
-    misbaptizes, misbaptises
-    misbehavior's, misbehaviour's
-    misbehavior, misbehaviour
-    misbehaviors, misbehaviours
-    miscanonize, miscanonise
-    miscanonizes, miscanonises
-    mischaracterization's, mischaracterisation's
-    mischaracterization, mischaracterisation
-    mischaracterizations, mischaracterisations
-    mischaracterize, mischaracterise
-    mischaracterizes, mischaracterises
-    miscolor's, miscolour's
-    miscolor, miscolour
-    miscoloration, miscolouration
-    miscolored, miscoloured
-    miscoloring, miscolouring
-    miscolors, miscolours
-    misdemeanor's, misdemeanour's
-    misdemeanor, misdemeanour
-    misdemeanors, misdemeanours
-    misemphasize, misemphasise
-    misemphasizes, misemphasises
-    misjudgment's, misjudgement's
-    misjudgment, misjudgement
-    misjudgments, misjudgements
-    mislabeled, mislabelled
-    mislabeling, mislabelling
-    mislabor's, mislabour's
-    mislabor, mislabour
-    mislabored, mislaboured
-    mislaboring, mislabouring
-    mislabors, mislabours
-    misopedia, misopaedia
-    misopedism, misopaedism
-    misopedist's, misopaedist's
-    misopedist, misopaedist
-    misorganization's, misorganisation's
-    misorganization, misorganisation
-    misorganizations, misorganisations
-    misorganize, misorganise
-    misorganizes, misorganises
-    misprizal, misprisal
-    misprize, misprise
-    misprized, misprised
-    misprizer, mispriser
-    misprizes, misprises
-    misprizing, misprising
-    misrealize, misrealise
-    misrealizes, misrealises
-    misrecognize, misrecognise
-    misrecognizes, misrecognises
-    misrouting, misrouteing
-    missilery's, missilry's
-    missilery, missilry
-    missionarize, missionarise
-    missionarized, missionarised
-    missionarizes, missionarises
-    missionarizing, missionarising
-    missionization, missionisation
-    missionize, missionise
-    missionized, missionised
-    missionizer, missioniser
-    missionizers, missionisers
-    missionizes, missionises
-    missionizing, missionising
-    missus's, missis's
-    missus, missis
-    missuses, missises
-    miter's, mitre's
-    miter, mitre
-    mitered, mitred
-    miterer's, mitrer's
-    miterer, mitrer
-    miterflower, mitreflower
-    mitering, mitring
-    miters, mitres
-    miterwort's, mitrewort's
-    miterwort, mitrewort
-    miterworts, mitreworts
-    mithridatize, mithridatise
-    mithridatized, mithridatised
-    mithridatizes, mithridatises
-    mithridatizing, mithridatising
-    mize, mise
-    mobilizable's, mobilisable's
-    mobilizable, mobilisable
-    mobilizabler, mobilisabler
-    mobilizables, mobilisables
-    mobilizablest, mobilisablest
-    mobilization's, mobilisation's
-    mobilization, mobilisation
-    mobilizations, mobilisations
-    mobilize, mobilise
-    mobilized, mobilised
-    mobilizer's, mobiliser's
-    mobilizer, mobiliser
-    mobilizers, mobilisers
-    mobilizes, mobilises
-    mobilizing, mobilising
-    modalize, modalise
-    modalizes, modalises
-    modeled, modelled
-    modeler's, modeller's
-    modeler, modeller
-    modelers, modellers
-    modeling's, modelling's
-    modeling, modelling
-    modelings, modellings
-    modernizable's, modernisable's
-    modernizable, modernisable
-    modernizables, modernisables
-    modernization's, modernisation's
-    modernization, modernisation
-    modernizations, modernisations
-    modernize, modernise
-    modernized, modernised
-    modernizer's, moderniser's
-    modernizer, moderniser
-    modernizers, modernisers
-    modernizes, modernises
-    modernizing, modernising
-    modularization, modularisation
-    modularize, modularise
-    modularized, modularised
-    modularizes, modularises
-    modularizing, modularising
-    moggy's, moggie's
-    moggy, moggie
-    Mohammedanization's, Mohammedanisation's
-    Mohammedanization, Mohammedanisation
-    Mohammedanizations, Mohammedanisations
-    Mohammedanize's, Mohammedanise's
-    Mohammedanize, Mohammedanise
-    Mohammedanized's, Mohammedanised's
-    Mohammedanized, Mohammedanised
-    Mohammedanizes, Mohammedanises
-    Mohammedanizing's, Mohammedanising's
-    Mohammedanizing, Mohammedanising
-    moisturization, moisturisation
-    moisturize, moisturise
-    moisturized, moisturised
-    moisturizer's, moisturiser's
-    moisturizer, moisturiser
-    moisturizers, moisturisers
-    moisturizes, moisturises
-    moisturizing, moisturising
-    molarization, molarisation
-    molarizations, molarisations
-    mold's, mould's
-    mold, mould
-    molded, moulded
-    molder's, moulder's
-    molder, moulder
-    moldered, mouldered
-    moldering, mouldering
-    molders, moulders
-    moldier, mouldier
-    moldiest, mouldiest
-    molding's, moulding's
-    molding, moulding
-    moldings, mouldings
-    molds, moulds
-    moldy, mouldy
-    molluscan, molluskan
-    mollusk's, mollusc's
-    mollusk, mollusc
-    mollusks, molluscs
-    Molochize's, Molochise's
-    Molochize, Molochise
-    molochize, molochise
-    molochized, molochised
-    Molochizes, Molochises
-    molochizes, molochises
-    molochizing, molochising
-    molt's, moult's
-    molt, moult
-    molted, moulted
-    molting, moulting
-    molts, moults
-    mommy's, mommie's
-    mommy, mommie
-    monarchize, monarchise
-    monarchized, monarchised
-    monarchizer, monarchiser
-    monarchizers, monarchisers
-    monarchizes, monarchises
-    monarchizing, monarchising
-    monasticize, monasticise
-    monasticizes, monasticises
-    monecian, monoecian
-    monestrous, monoestrous
-    monetization's, monetisation's
-    monetization, monetisation
-    monetizations, monetisations
-    monetize, monetise
-    monetized, monetised
-    monetizes, monetises
-    monetizing, monetising
-    moneyed, monied
-    Mongolize's, Mongolise's
-    Mongolize, Mongolise
-    Mongolized's, Mongolised's
-    Mongolized, Mongolised
-    Mongolizes, Mongolises
-    Mongolizing's, Mongolising's
-    Mongolizing, Mongolising
-    mongrelization's, mongrelisation's
-    mongrelization, mongrelisation
-    mongrelizations, mongrelisations
-    mongrelize, mongrelise
-    mongrelized, mongrelised
-    mongrelizer, mongreliser
-    mongrelizes, mongrelises
-    mongrelizing, mongrelising
-    moniker's, monicker's
-    moniker, monicker
-    monikers, monickers
-    monochordize, monochordise
-    monochordizes, monochordises
-    monoecious, monecious
-    monologist's, monologuist's
-    monologist, monologuist
-    monologists, monologuists
-    monologize, monologise
-    monologized, monologised
-    monologizes, monologises
-    monologizing, monologising
-    monologue's, monolog's
-    monologue, monolog
-    monologues, monologs
-    monologuize, monologuise
-    monologuized, monologuised
-    monologuizes, monologuises
-    monologuizing, monologuising
-    monometalism, monometallism
-    monometalist, monometallist
-    monophthongize, monophthongise
-    monophthongized, monophthongised
-    monophthongizes, monophthongises
-    monophthongizing, monophthongising
-    monopolizable's, monopolisable's
-    monopolizable, monopolisable
-    monopolizables, monopolisables
-    monopolization's, monopolisation's
-    monopolization, monopolisation
-    monopolizations, monopolisations
-    monopolize, monopolise
-    monopolized, monopolised
-    monopolizer's, monopoliser's
-    monopolizer, monopoliser
-    monopolizers, monopolisers
-    monopolizes, monopolises
-    monopolizing, monopolising
-    monotonize, monotonise
-    monotonizes, monotonises
-    monumentalization's, monumentalisation's
-    monumentalization, monumentalisation
-    monumentalizations, monumentalisations
-    monumentalize, monumentalise
-    monumentalized, monumentalised
-    monumentalizes, monumentalises
-    monumentalizing, monumentalising
-    moralization's, moralisation's
-    moralization, moralisation
-    moralizations, moralisations
-    moralize, moralise
-    moralized, moralised
-    moralizer's, moraliser's
-    moralizer, moraliser
-    moralizers, moralisers
-    moralizes, moralises
-    moralizing, moralising
-    moralizinglies, moralisinglies
-    moralizingly, moralisingly
-    Moravianized's, Moravianised's
-    Moravianized, Moravianised
-    Moravianizeds, Moravianiseds
-    morbidize, morbidise
-    morbidizes, morbidises
-    Morea's, Moraea's
-    Morea, Moraea
-    morne, mourne
-    morningly, mourningly
-    morphinization's, morphinisation's
-    morphinization, morphinisation
-    morphinizations, morphinisations
-    morphinize, morphinise
-    morphinizes, morphinises
-    morseled, morselled
-    morseling, morselling
-    morselization's, morselisation's
-    morselization, morselisation
-    morselizations, morselisations
-    morselize, morselise
-    morselizes, morselises
-    mortalize, mortalise
-    mortalized, mortalised
-    mortalizes, mortalises
-    mortalizing, mortalising
-    mortarize, mortarise
-    mortarizes, mortarises
-    mortgagor's, mortgager's
-    mortgagor, mortgager
-    mortgagors, mortgagers
-    mortise's, mortice's
-    mortise, mortice
-    mortised, morticed
-    mortises, mortices
-    mortising, morticing
-    morule, morulae
-    Moslemize's, Moslemise's
-    Moslemize, Moslemise
-    Moslemizes, Moslemises
-    motorization's, motorisation's
-    motorization, motorisation
-    motorizations, motorisations
-    motorize, motorise
-    motorized, motorised
-    motorizes, motorises
-    motorizing, motorising
-    mousy, mousey
-    movability, moveability
-    movable's, moveable's
-    movable, moveable
-    movableness, moveableness
-    movablenesses, moveablenesses
-    movables, moveables
-    movably, moveably
-    mucorrhea, mucorrhoea
-    mucose, mucosae
-    mujahedin's, mujahedeen's
-    mujahedin, mujahedeen
-    multicolor's, multicolour's
-    multicolor, multicolour
-    multicolored, multicoloured
-    multicoloredder, multicolouredder
-    multicoloreddest, multicoloureddest
-    multicolorous, multicolourous
-    multicolors, multicolours
-    multifibered's, multifibred's
-    multifibered, multifibred
-    multifibereds, multifibreds
-    multileveled, multilevelled
-    multiplexer's, multiplexor's
-    multiplexer, multiplexor
-    multiplexers, multiplexors
-    municipalization's, municipalisation's
-    municipalization, municipalisation
-    municipalizations, municipalisations
-    municipalize, municipalise
-    municipalized, municipalised
-    municipalizer, municipaliser
-    municipalizers, municipalisers
-    municipalizes, municipalises
-    municipalizing, municipalising
-    murena, muraena
-    murenas, muraenas
-    muscularize, muscularise
-    muscularizes, muscularises
-    museumize, museumise
-    museumizes, museumises
-    musicalization's, musicalisation's
-    musicalization, musicalisation
-    musicalizations, musicalisations
-    musicalize, musicalise
-    musicalized, musicalised
-    musicalizes, musicalises
-    musicalizing, musicalising
-    Muslim's, Moslem's
-    Muslim, Moslem
-    mustache's, moustache's
-    mustache, moustache
-    mustached, moustached
-    mustaches, moustaches
-    mustachio's, moustachio's
-    mustachio, moustachio
-    mustachioed, moustachioed
-    mutagenize, mutagenise
-    mutagenized, mutagenised
-    mutagenizes, mutagenises
-    mutagenizing, mutagenising
-    mutualization's, mutualisation's
-    mutualization, mutualisation
-    mutualizations, mutualisations
-    mutualize, mutualise
-    mutualized, mutualised
-    mutualizes, mutualises
-    mutualizing, mutualising
-    mycohemia, mycohaemia
-    myelinization's, myelinisation's
-    myelinization, myelinisation
-    myelinizations, myelinisations
-    myelocele, myelocoele
-    myelocythemia, myelocythaemia
-    mylonitization, mylonitisation
-    mylonitizations, mylonitisations
-    mylonitize, mylonitise
-    mylonitized, mylonitised
-    mylonitizes, mylonitises
-    mylonitizing, mylonitising
-    myna's, mynah's
-    myna, mynah
-    mynas, mynahes
-    myocele, myocoele
-    myohematin, myohaematin
-    myrialiter, myrialitre
-    myriameter, myriametre
-    mysticize, mysticise
-    mysticizes, mysticises
-    mythicization, mythicisation
-    mythicize, mythicise
-    mythicized, mythicised
-    mythicizer's, mythiciser's
-    mythicizer, mythiciser
-    mythicizers, mythicisers
-    mythicizes, mythicises
-    mythicizing, mythicising
-    mythize, mythise
-    mythized, mythised
-    mythizes, mythises
-    mythizing, mythising
-    mythologization's, mythologisation's
-    mythologization, mythologisation
-    mythologizations, mythologisations
-    mythologize, mythologise
-    mythologized, mythologised
-    mythologizer's, mythologiser's
-    mythologizer, mythologiser
-    mythologizers, mythologisers
-    mythologizes, mythologises
-    mythologizing, mythologising
-    mythopeic, mythopoeic
-    mythopeist, mythopoeist
-    mythopoetize, mythopoetise
-    mythopoetized, mythopoetised
-    mythopoetizing, mythopoetising
-    myxameba, myxamoeba
-    myxedema's, myxoedema's
-    myxedema, myxoedema
-    myxedemas, myxoedemas
-    myxedematous, myxoedematous
-    myxedemic, myxoedemic
-    myxemia, myxaemia
-    naan's, nan's
-    naan, nan
-    naans, nans
-    Nabateans, Nabataeans
-    Nabathean's, Nabathaean's
-    Nabathean, Nabathaean
-    nakedize, nakedise
-    nakedizes, nakedises
-    nanization, nanisation
-    nanizations, nanisations
-    nanogram, nanogramme
-    nanograms, nanogrammes
-    nanometer's, nanometre's
-    nanometer, nanometre
-    nanometers, nanometres
-    napea, napaea
-    naphthalize, naphthalise
-    naphthalized, naphthalised
-    naphthalizes, naphthalises
-    naphthalizing, naphthalising
-    Napoleonize's, Napoleonise's
-    Napoleonize, Napoleonise
-    Napoleonizes, Napoleonises
-    narc's, nark's
-    narc, nark
-    narcotization's, narcotisation's
-    narcotization, narcotisation
-    narcotizations, narcotisations
-    narcotize, narcotise
-    narcotized, narcotised
-    narcotizes, narcotises
-    narcotizing, narcotising
-    narcs, narks
-    nasalization's, nasalisation's
-    nasalization, nasalisation
-    nasalizations, nasalisations
-    nasalize, nasalise
-    nasalized, nasalised
-    nasalizes, nasalises
-    nasalizing, nasalising
-    nationalization's, nationalisation's
-    nationalization, nationalisation
-    nationalizations, nationalisations
-    nationalize, nationalise
-    nationalized, nationalised
-    nationalizer's, nationaliser's
-    nationalizer, nationaliser
-    nationalizers, nationalisers
-    nationalizes, nationalises
-    nationalizing, nationalising
-    naturalization's, naturalisation's
-    naturalization, naturalisation
-    naturalizations, naturalisations
-    naturalize, naturalise
-    naturalized, naturalised
-    naturalizer's, naturaliser's
-    naturalizer, naturaliser
-    naturalizers, naturalisers
-    naturalizes, naturalises
-    naturalizing, naturalising
-    naturize, naturise
-    naturizes, naturises
-    nebularization's, nebularisation's
-    nebularization, nebularisation
-    nebularizations, nebularisations
-    nebularize, nebularise
-    nebularizes, nebularises
-    nebulization's, nebulisation's
-    nebulization, nebulisation
-    nebulizations, nebulisations
-    nebulize, nebulise
-    nebulized, nebulised
-    nebulizer's, nebuliser's
-    nebulizer, nebuliser
-    nebulizers, nebulisers
-    nebulizes, nebulises
-    nebulizing, nebulising
-    necremia, necraemia
-    necrotize, necrotise
-    necrotized, necrotised
-    necrotizes, necrotises
-    necrotizing, necrotising
-    nectarize, nectarise
-    nectarized, nectarised
-    nectarizes, nectarises
-    nectarizing, nectarising
-    neebor, neebour
-    neencephalon, neoencephalon
-    neer, nere
-    negligee's, neglig's
-    negligee, neglig
-    negligees, negligs
-    Negritize's, Negritise's
-    Negritize, Negritise
-    Negritized's, Negritised's
-    Negritized, Negritised
-    Negritizing's, Negritising's
-    Negritizing, Negritising
-    Negroization's, Negroisation's
-    Negroization, Negroisation
-    Negroizations, Negroisations
-    Negroize's, Negroise's
-    Negroize, Negroise
-    Negroized's, Negroised's
-    Negroized, Negroised
-    Negroizes, Negroises
-    Negroizing's, Negroising's
-    Negroizing, Negroising
-    neighbor's, neighbour's
-    neighbor, neighbour
-    neighbored, neighboured
-    neighborer's, neighbourer's
-    neighborer, neighbourer
-    neighborers, neighbourers
-    neighboress, neighbouress
-    neighborhood's, neighbourhood's
-    neighborhood, neighbourhood
-    neighborhoods, neighbourhoods
-    neighboring, neighbouring
-    neighborings, neighbourings
-    neighborless, neighbourless
-    neighborlesser, neighbourlesser
-    neighborlesses, neighbourlesses
-    neighborlessest, neighbourlessest
-    neighborlier, neighbourlier
-    neighborliest, neighbourliest
-    neighborlike's, neighbourlike's
-    neighborlike, neighbourlike
-    neighborlikes, neighbourlikes
-    neighborliness's, neighbourliness's
-    neighborliness, neighbourliness
-    neighborlinesses, neighbourlinesses
-    neighborly, neighbourly
-    neighbors, neighbours
-    neighborship's, neighbourship's
-    neighborship, neighbourship
-    neighborships, neighbourships
-    Neogea's, Neogaea's
-    Neogea, Neogaea
-    Neogeal's, Neogaeal's
-    Neogeal, Neogaeal
-    Neogean, Neogaean
-    Neogeic's, Neogaeic's
-    Neogeic, Neogaeic
-    neologization, neologisation
-    neologize, neologise
-    neologized, neologised
-    neologizes, neologises
-    neologizing, neologising
-    neopaganize, neopaganise
-    neopaganized, neopaganised
-    neopaganizes, neopaganises
-    neopaganizing, neopaganising
-    neoterize, neoterise
-    neoterized, neoterised
-    neoterizes, neoterises
-    neoterizing, neoterising
-    nephrectomize, nephrectomise
-    nephrectomized, nephrectomised
-    nephrectomizing, nephrectomising
-    nephrocele, nephrocoele
-    nephrotomize, nephrotomise
-    nesslerize, nesslerise
-    nesslerized, nesslerised
-    nesslerizing, nesslerising
-    net's, nett's
-    net, nett
-    nets, netts
-    neurepithelium, neuroepithelium
-    neurocele, neurocoele
-    neurocelian, neurocoelian
-    neuronal, neuronic
-    neuroticize, neuroticise
-    neuroticizes, neuroticises
-    neutralization's, neutralisation's
-    neutralization, neutralisation
-    neutralizations, neutralisations
-    neutralize, neutralise
-    neutralized, neutralised
-    neutralizer's, neutraliser's
-    neutralizer, neutraliser
-    neutralizers, neutralisers
-    neutralizes, neutralises
-    neutralizing, neutralising
-    neves, naeves
-    nevoid, naevoid
-    Newmanize's, Newmanise's
-    Newmanize, Newmanise
-    Newmanized's, Newmanised's
-    Newmanized, Newmanised
-    Newmanizes, Newmanises
-    Newmanizing's, Newmanising's
-    Newmanizing, Newmanising
-    newspaperized's, newspaperised's
-    newspaperized, newspaperised
-    newspaperizeds, newspaperiseds
-    nickeled, nickelled
-    nickeling, nickelling
-    nickelization's, nickelisation's
-    nickelization, nickelisation
-    nickelizations, nickelisations
-    nickelize, nickelise
-    nickelized, nickelised
-    nickelizes, nickelises
-    nickelizing, nickelising
-    nicotinize, nicotinise
-    nicotinized, nicotinised
-    nicotinizes, nicotinises
-    nicotinizing, nicotinising
-    nielled, nielloed
-    niger, nigre
-    niggardize, niggardise
-    niggardized, niggardised
-    niggardizes, niggardises
-    niggardizing, niggardising
-    night's, nite's
-    night, nite
-    nightie's, nighty's
-    nightie, nighty
-    nightingalize, nightingalise
-    nightingalizes, nightingalises
-    nights, nites
-    Nipponize's, Nipponise's
-    Nipponize, Nipponise
-    Nipponizes, Nipponises
-    niter's, nitre's
-    niter, nitre
-    niters, nitres
-    nitridization's, nitridisation's
-    nitridization, nitridisation
-    nitridizations, nitridisations
-    nitridize, nitridise
-    nitridizes, nitridises
-    nitrogenization's, nitrogenisation's
-    nitrogenization, nitrogenisation
-    nitrogenizations, nitrogenisations
-    nitrogenize, nitrogenise
-    nitrogenized, nitrogenised
-    nitrogenizes, nitrogenises
-    nitrogenizing, nitrogenising
-    nitroglycerin's, nitroglycerine's
-    nitroglycerin, nitroglycerine
-    nitroglycerins, nitroglycerines
-    nodalize, nodalise
-    nodalized, nodalised
-    nodalizes, nodalises
-    nodalizing, nodalising
-    nodulize, nodulise
-    nodulizes, nodulises
-    Noemon's, Noaemon's
-    Noemon, Noaemon
-    nomadization's, nomadisation's
-    nomadization, nomadisation
-    nomadizations, nomadisations
-    nomadize, nomadise
-    nomadized, nomadised
-    nomadizes, nomadises
-    nomadizing, nomadising
-    nominalization, nominalisation
-    nominalizations, nominalisations
-    nominalize, nominalise
-    nominalized, nominalised
-    nominalizes, nominalises
-    nominalizing, nominalising
-    nonacknowledgment's, nonacknowledgement's
-    nonacknowledgment, nonacknowledgement
-    nonacknowledgments, nonacknowledgements
-    nonanaesthetised, nonanaesthetized
-    nonanemic, nonanaemic
-    nonapostatizing's, nonapostatising's
-    nonapostatizing, nonapostatising
-    nonapostatizings, nonapostatisings
-    noncanonization's, noncanonisation's
-    noncanonization, noncanonisation
-    noncanonizations, noncanonisations
-    noncartelized's, noncartelised's
-    noncartelized, noncartelised
-    noncartelizeds, noncarteliseds
-    noncatechizable's, noncatechisable's
-    noncatechizable, noncatechisable
-    noncatechizables, noncatechisables
-    noncivilized's, noncivilised's
-    noncivilized, noncivilised
-    noncivilizeds, nonciviliseds
-    noncolor's, noncolour's
-    noncolor, noncolour
-    noncolorabilities, noncolourabilities
-    noncolorability's, noncolourability's
-    noncolorability, noncolourability
-    noncolorable's, noncolourable's
-    noncolorable, noncolourable
-    noncolorableness's, noncolourableness's
-    noncolorableness, noncolourableness
-    noncolorables, noncolourables
-    noncolorablies, noncolourablies
-    noncolorably, noncolourably
-    noncolored, noncoloured
-    noncolorer, noncolourer
-    noncolorers, noncolourers
-    noncolorfast, noncolourfast
-    noncoloring, noncolouring
-    noncolorings, noncolourings
-    noncolors, noncolours
-    noncrystallizable's, noncrystallisable's
-    noncrystallizable, noncrystallisable
-    noncrystallizables, noncrystallisables
-    noncrystallized's, noncrystallised's
-    noncrystallized, noncrystallised
-    noncrystallizeds, noncrystalliseds
-    noncrystallizing's, noncrystallising's
-    noncrystallizing, noncrystallising
-    noncrystallizings, noncrystallisings
-    nondemobilization's, nondemobilisation's
-    nondemobilization, nondemobilisation
-    nondemobilizations, nondemobilisations
-    nondialyzing's, nondialysing's
-    nondialyzing, nondialysing
-    nondialyzings, nondialysings
-    nondimensionalize, nondimensionalise
-    nondimensionalized, nondimensionalised
-    nonecumenic, nonoecumenic
-    nonecumenical, nonoecumenical
-    nonencyclopedic, nonencyclopaedic
-    nonesthetic, nonaesthetic
-    nonesthetical, nonaesthetical
-    nonesthetically, nonaesthetically
-    nonfavorite's, nonfavourite's
-    nonfavorite, nonfavourite
-    nonfavorites, nonfavourites
-    nonflavored, nonflavoured
-    nonfulfillment's, nonfulfilment's
-    nonfulfillment, nonfulfilment
-    nonfulfillments, nonfulfilments
-    nongalvanized's, nongalvanised's
-    nongalvanized, nongalvanised
-    nongalvanizeds, nongalvaniseds
-    nongelatinizing's, nongelatinising's
-    nongelatinizing, nongelatinising
-    nongelatinizings, nongelatinisings
-    nonhydrolyzable's, nonhydrolysable's
-    nonhydrolyzable, nonhydrolysable
-    nonhydrolyzables, nonhydrolysables
-    nonimmunized's, nonimmunised's
-    nonimmunized, nonimmunised
-    nonimmunizeds, nonimmuniseds
-    nonionized's, nonionised's
-    nonionized, nonionised
-    nonionizeds, nonioniseds
-    nonionizing's, nonionising's
-    nonionizing, nonionising
-    nonionizings, nonionisings
-    nonlocalized's, nonlocalised's
-    nonlocalized, nonlocalised
-    nonlocalizeds, nonlocaliseds
-    nonmagnetizable's, nonmagnetisable's
-    nonmagnetizable, nonmagnetisable
-    nonmagnetizables, nonmagnetisables
-    nonnitrogenized's, nonnitrogenised's
-    nonnitrogenized, nonnitrogenised
-    nonnitrogenizeds, nonnitrogeniseds
-    nonorganization's, nonorganisation's
-    nonorganization, nonorganisation
-    nonorganizations, nonorganisations
-    nonoxidizable's, nonoxidisable's
-    nonoxidizable, nonoxidisable
-    nonoxidizables, nonoxidisables
-    nonoxidizing's, nonoxidising's
-    nonoxidizing, nonoxidising
-    nonoxidizings, nonoxidisings
-    nonparlor's, nonparlour's
-    nonparlor, nonparlour
-    nonparlors, nonparlours
-    nonpenalized's, nonpenalised's
-    nonpenalized, nonpenalised
-    nonpenalizeds, nonpenaliseds
-    nonphosphorized's, nonphosphorised's
-    nonphosphorized, nonphosphorised
-    nonphosphorizeds, nonphosphoriseds
-    nonpolarizable's, nonpolarisable's
-    nonpolarizable, nonpolarisable
-    nonpolarizables, nonpolarisables
-    nonpolarized, nonpolarised
-    nonpolarizing's, nonpolarising's
-    nonpolarizing, nonpolarising
-    nonpolarizings, nonpolarisings
-    nonrationalized's, nonrationalised's
-    nonrationalized, nonrationalised
-    nonrationalizeds, nonrationaliseds
-    nonrealization's, nonrealisation's
-    nonrealization, nonrealisation
-    nonrealizations, nonrealisations
-    nonrecognized's, nonrecognised's
-    nonrecognized, nonrecognised
-    nonrecognizeds, nonrecogniseds
-    nonschematized's, nonschematised's
-    nonschematized, nonschematised
-    nonschematizeds, nonschematiseds
-    nonsensitized's, nonsensitised's
-    nonsensitized, nonsensitised
-    nonsensitizeds, nonsensitiseds
-    nonspecialized's, nonspecialised's
-    nonspecialized, nonspecialised
-    nonspecializeds, nonspecialiseds
-    nonstandardized's, nonstandardised's
-    nonstandardized, nonstandardised
-    nonstandardizeds, nonstandardiseds
-    nonstylized's, nonstylised's
-    nonstylized, nonstylised
-    nonstylizeds, nonstyliseds
-    nonsuccor, nonsuccour
-    nonsympathizer's, nonsympathiser's
-    nonsympathizer, nonsympathiser
-    nonsympathizers, nonsympathisers
-    nonsynthesized's, nonsynthesised's
-    nonsynthesized, nonsynthesised
-    nonsynthesizeds, nonsynthesiseds
-    nontemporizing's, nontemporising's
-    nontemporizing, nontemporising
-    nontemporizings, nontemporisings
-    nonutilized's, nonutilised's
-    nonutilized, nonutilised
-    nonutilizeds, nonutiliseds
-    nonvisualized's, nonvisualised's
-    nonvisualized, nonvisualised
-    nonvisualizeds, nonvisualiseds
-    nonvolatilized's, nonvolatilised's
-    nonvolatilized, nonvolatilised
-    nonvolatilizeds, nonvolatiliseds
-    nonvulcanizable's, nonvulcanisable's
-    nonvulcanizable, nonvulcanisable
-    nonvulcanizables, nonvulcanisables
-    norice, nourice
-    normalizable, normalisable
-    normalization's, normalisation's
-    normalization, normalisation
-    normalizations, normalisations
-    normalize, normalise
-    normalized, normalised
-    normalizer's, normaliser's
-    normalizer, normaliser
-    normalizers, normalisers
-    normalizes, normalises
-    normalizing, normalising
-    Normanization's, Normanisation's
-    Normanization, Normanisation
-    Normanizations, Normanisations
-    Normanize, Normanise
-    normanize, normanise
-    Normanized, Normanised
-    normanized, normanised
-    Normanizer's, Normaniser's
-    Normanizer, Normaniser
-    Normanizers, Normanisers
-    Normanizes, Normanises
-    normanizes, normanises
-    Normanizing, Normanising
-    normanizing, normanising
-    Northernize's, Northernise's
-    Northernize, Northernise
-    northernize, northernise
-    northernized, northernised
-    northernizes, northernises
-    northernizing, northernising
-    nosies, noseys
-    nosize, nosise
-    nosohemia, nosohaemia
-    nosy's, nosey's
-    nosy, nosey
-    notarization, notarisation
-    notarizations, notarisations
-    notarize, notarise
-    notarized, notarised
-    notarizes, notarises
-    notarizing, notarising
-    noter, notre
-    nothingize, nothingise
-    nothingizes, nothingises
-    Notogea's, Notogaea's
-    Notogea, Notogaea
-    nounize, nounise
-    nounizes, nounises
-    novelization's, novelisation's
-    novelization, novelisation
-    novelizations, novelisations
-    novelize, novelise
-    novelized, novelised
-    novelizer's, noveliser's
-    novelizer, noveliser
-    novelizers, novelisers
-    novelizes, novelises
-    novelizing, novelising
-    novene, novenae
-    nuclearization, nuclearisation
-    nuclearizations, nuclearisations
-    nuclearize, nuclearise
-    nuclearized, nuclearised
-    nuclearizes, nuclearises
-    nuclearizing, nuclearising
-    numskull's, numbskull's
-    numskull, numbskull
-    numskulls, numbskulls
-    nuptialize, nuptialise
-    nuptializes, nuptialises
-    nympheum, nymphaeum
-    Obe's, Oboe's
-    Obe, Oboe
-    obelize, obelise
-    obelized, obelised
-    obelizes, obelises
-    obelizing, obelising
-    objectivize, objectivise
-    objectivized, objectivised
-    objectivizes, objectivises
-    objectivizing, objectivising
-    objectization's, objectisation's
-    objectization, objectisation
-    objectizations, objectisations
-    objectize, objectise
-    objectizes, objectises
-    oblivionize, oblivionise
-    oblivionizes, oblivionises
-    Occidentalization's, Occidentalisation's
-    Occidentalization, Occidentalisation
-    Occidentalizations, Occidentalisations
-    Occidentalize, Occidentalise
-    occidentalize, occidentalise
-    Occidentalized, Occidentalised
-    occidentalized, occidentalised
-    Occidentalizes, Occidentalises
-    occidentalizes, occidentalises
-    Occidentalizing, Occidentalising
-    occidentalizing, occidentalising
-    ocher's, ochre's
-    ocher, ochre
-    ochered, ochred
-    ochering, ochring
-    ocherish, ochreish
-    ocherous, ochreous
-    ocherouser, ochreouser
-    ocherousest, ochreousest
-    ocherrer, ochrer
-    ocherrest, ochrest
-    ochers, ochres
-    ochery, ochrey
-    octet's, octette's
-    octet, octette
-    octets, octettes
-    Ocyrrhoe's, Ocyrrhoae's
-    Ocyrrhoe, Ocyrrhoae
-    odor's, odour's
-    odor, odour
-    odored, odoured
-    odorful, odourful
-    odorfuller, odourfuller
-    odorfullest, odourfullest
-    odorize, odorise
-    odorized, odorised
-    odorizer, odoriser
-    odorizes, odorises
-    odorizing, odorising
-    odorless, odourless
-    odorlesser, odourlesser
-    odorlesses, odourlesses
-    odorlessest, odourlessest
-    odors, odours
-    oesophagi, oesophaguses
-    offense's, offence's
-    offense, offence
-    offenseless, offenceless
-    offenselesser, offencelesser
-    offenselesses, offencelesses
-    offenselessest, offencelessest
-    offenselessly, offencelessly
-    offenses, offences
-    officialization's, officialisation's
-    officialization, officialisation
-    officializations, officialisations
-    officialize, officialise
-    officializes, officialises
-    OK's, okay's
-    OK, okay
-    OKed, okayed
-    OKing, okaying
-    OKs, okays
-    oleomargarine's, oleomargarin's
-    oleomargarine, oleomargarin
-    oleomargarines, oleomargarins
-    oligemia, oligaemia
-    oligocythemia, oligocythaemia
-    olpe, olpae
-    Olympianize's, Olympianise's
-    Olympianize, Olympianise
-    Olympianizes, Olympianises
-    omber's, ombre's
-    omber, ombre
-    ombers, ombres
-    omelet's, omelette's
-    omelet, omelette
-    omelets, omelettes
-    oneyer, oneyre
-    oneyers, oneyres
-    onionized's, onionised's
-    onionized, onionised
-    onionizeds, onioniseds
-    ontologize, ontologise
-    ooglea, oogloea
-    oophorectomize, oophorectomise
-    oophorectomized, oophorectomised
-    oophorectomizes, oophorectomises
-    oophorectomizing, oophorectomising
-    opaled, opalled
-    opalize, opalise
-    opalized, opalised
-    opalizes, opalises
-    operationalization, operationalisation
-    operationalizations, operationalisations
-    operationalize, operationalise
-    operationalized, operationalised
-    operatize, operatise
-    operatized, operatised
-    operatizes, operatises
-    operatizing, operatising
-    opiniaster, opiniastre
-    opiniater, opiniatre
-    optimalization, optimalisation
-    optimalizations, optimalisations
-    optimalize, optimalise
-    optimalized, optimalised
-    optimalizes, optimalises
-    optimalizing, optimalising
-    optimization's, optimisation's
-    optimization, optimisation
-    optimizations, optimisations
-    optimize, optimise
-    optimized, optimised
-    optimizer's, optimiser's
-    optimizer, optimiser
-    optimizers, optimisers
-    optimizes, optimises
-    optimizing, optimising
-    optionalize, optionalise
-    optionalizes, optionalises
-    oralization's, oralisation's
-    oralization, oralisation
-    oralizations, oralisations
-    oralize, oralise
-    oralizes, oralises
-    orang, ourang
-    orangize, orangise
-    orangizes, orangises
-    orangs, ourangs
-    orangutan's, orangutang's
-    orangutan, orangutang
-    orangutans, orangutangs
-    oratorize, oratorise
-    oratorizes, oratorises
-    orchester, orchestre
-    organdy's, organdie's
-    organdy, organdie
-    organizabilities, organisabilities
-    organizability's, organisability's
-    organizability, organisability
-    organizable's, organisable's
-    organizable, organisable
-    organizabler, organisabler
-    organizables, organisables
-    organizablest, organisablest
-    organization's, organisation's
-    organization, organisation
-    organizational's, organisational's
-    organizational, organisational
-    organizationaler, organisationaler
-    organizationalest, organisationalest
-    organizationallier, organisationallier
-    organizationalliest, organisationalliest
-    organizationally, organisationally
-    organizationals, organisationals
-    organizationist's, organisationist's
-    organizationist, organisationist
-    organizationists, organisationists
-    organizations, organisations
-    organize, organise
-    organized, organised
-    organizer's, organiser's
-    organizer, organiser
-    organizers, organisers
-    organizes, organises
-    organizing, organising
-    orientalization's, orientalisation's
-    orientalization, orientalisation
-    orientalizations, orientalisations
-    Orientalize, Orientalise
-    orientalize, orientalise
-    Orientalized, Orientalised
-    orientalized, orientalised
-    orientalizes, orientalises
-    Orientalizing, Orientalising
-    orientalizing, orientalising
-    orientization's, orientisation's
-    orientization, orientisation
-    orientizations, orientisations
-    orientize, orientise
-    orientizes, orientises
-    ornamentalize, ornamentalise
-    ornamentalizes, ornamentalises
-    orologies, ourologies
-    orology, ourology
-    orphanize, orphanise
-    orphanizes, orphanises
-    orsel, oursel
-    orthocenter's, orthocentre's
-    orthocenter, orthocentre
-    orthocenters, orthocentres
-    orthogonalization's, orthogonalisation's
-    orthogonalization, orthogonalisation
-    orthogonalize, orthogonalise
-    orthogonalized, orthogonalised
-    orthogonalizes, orthogonalises
-    orthogonalizing, orthogonalising
-    orthographize, orthographise
-    orthographized, orthographised
-    orthographizing, orthographising
-    orthopedia, orthopaedia
-    orthopedic's, orthopaedic's
-    orthopedic, orthopaedic
-    orthopedical, orthopaedical
-    orthopedicallier, orthopaedicallier
-    orthopedicalliest, orthopaedicalliest
-    orthopedically, orthopaedically
-    orthopedicer, orthopaedicer
-    orthopedicest, orthopaedicest
-    orthopedics's, orthopaedics's
-    orthopedics, orthopaedics
-    orthopedies, orthopaedies
-    orthopedist's, orthopaedist's
-    orthopedist, orthopaedist
-    orthopedists, orthopaedists
-    orthopedy, orthopaedy
-    orthopnea, orthopnoea
-    orthopneic, orthopnoeic
-    osteopedion, osteopaedion
-    ostracizable's, ostracisable's
-    ostracizable, ostracisable
-    ostracizables, ostracisables
-    ostracization's, ostracisation's
-    ostracization, ostracisation
-    ostracizations, ostracisations
-    ostracize, ostracise
-    ostracized, ostracised
-    ostracizer's, ostraciser's
-    ostracizer, ostraciser
-    ostracizers, ostracisers
-    ostracizes, ostracises
-    ostracizing, ostracising
-    othematoma, othaematoma
-    otorrhea, otorrhoea
-    Ottomanization's, Ottomanisation's
-    Ottomanization, Ottomanisation
-    Ottomanizations, Ottomanisations
-    Ottomanize's, Ottomanise's
-    Ottomanize, Ottomanise
-    Ottomanizes, Ottomanises
-    outcaviled, outcavilled
-    outcaviling, outcavilling
-    outclamor's, outclamour's
-    outclamor, outclamour
-    outclamors, outclamours
-    outerness, outreness
-    outhumor's, outhumour's
-    outhumor, outhumour
-    outhumored, outhumoured
-    outhumoring, outhumouring
-    outhumors, outhumours
-    outhyperbolize, outhyperbolise
-    outhyperbolizes, outhyperbolises
-    outlabor's, outlabour's
-    outlabor, outlabour
-    outlabors, outlabours
-    outluster, outlustre
-    outmaneuver, outmanoeuvre
-    outmaneuvered, outmanoeuvred
-    outmaneuvering, outmanoeuvring
-    outmaneuvers, outmanoeuvres
-    outrivaled, outrivalled
-    outrivaling, outrivalling
-    outsavor's, outsavour's
-    outsavor, outsavour
-    outsavoring, outsavouring
-    outsavors, outsavours
-    outsplendor's, outsplendour's
-    outsplendor, outsplendour
-    outsplendors, outsplendours
-    outtyrannize, outtyrannise
-    outtyrannizes, outtyrannises
-    ovalization's, ovalisation's
-    ovalization, ovalisation
-    ovalizations, ovalisations
-    ovalize, ovalise
-    ovalizes, ovalises
-    ovariectomized, ovariectomised
-    overagonize, overagonise
-    overagonizes, overagonises
-    overanalyze, overanalyse
-    overanalyzes, overanalyses
-    overbrutalize, overbrutalise
-    overbrutalizes, overbrutalises
-    overcapitalization's, overcapitalisation's
-    overcapitalization, overcapitalisation
-    overcapitalizations, overcapitalisations
-    overcapitalize, overcapitalise
-    overcapitalized, overcapitalised
-    overcapitalizes, overcapitalises
-    overcapitalizing, overcapitalising
-    overcentralization's, overcentralisation's
-    overcentralization, overcentralisation
-    overcentralizations, overcentralisations
-    overcentralize, overcentralise
-    overcentralizes, overcentralises
-    overcivilization's, overcivilisation's
-    overcivilization, overcivilisation
-    overcivilizations, overcivilisations
-    overcivilize, overcivilise
-    overcivilizes, overcivilises
-    overclamor's, overclamour's
-    overclamor, overclamour
-    overclamors, overclamours
-    overcolor's, overcolour's
-    overcolor, overcolour
-    overcoloration's, overcolouration's
-    overcoloration, overcolouration
-    overcoloring, overcolouring
-    overcolors, overcolours
-    overcriticize, overcriticise
-    overcriticizes, overcriticises
-    overdoctrinize, overdoctrinise
-    overdoctrinizes, overdoctrinises
-    overdramatize, overdramatise
-    overdramatized, overdramatised
-    overdramatizes, overdramatises
-    overdramatizing, overdramatising
-    overemotionalize, overemotionalise
-    overemotionalizes, overemotionalises
-    overemphasize, overemphasise
-    overemphasized, overemphasised
-    overemphasizer, overemphasiser
-    overemphasizers, overemphasisers
-    overemphasizes, overemphasises
-    overemphasizing, overemphasising
-    overfavor's, overfavour's
-    overfavor, overfavour
-    overfavorable's, overfavourable's
-    overfavorable, overfavourable
-    overfavorables, overfavourables
-    overfavorablies, overfavourablies
-    overfavorably, overfavourably
-    overfavors, overfavours
-    overfertilization, overfertilisation
-    overgeneralize, overgeneralise
-    overgeneralized, overgeneralised
-    overgeneralizes, overgeneralises
-    overgeneralizing, overgeneralising
-    overhonor's, overhonour's
-    overhonor, overhonour
-    overhonors, overhonours
-    overhumanize, overhumanise
-    overhumanizes, overhumanises
-    overindustrialization's, overindustrialisation's
-    overindustrialization, overindustrialisation
-    overindustrializations, overindustrialisations
-    overindustrialize, overindustrialise
-    overindustrializes, overindustrialises
-    overjudgment's, overjudgement's
-    overjudgment, overjudgement
-    overjudgments, overjudgements
-    overlabor's, overlabour's
-    overlabor, overlabour
-    overlabored, overlaboured
-    overlaboring, overlabouring
-    overlabors, overlabours
-    overnationalization's, overnationalisation's
-    overnationalization, overnationalisation
-    overnationalizations, overnationalisations
-    overrapturize, overrapturise
-    overrapturizes, overrapturises
-    overrationalize, overrationalise
-    overrationalizes, overrationalises
-    oversentimentalize, oversentimentalise
-    oversentimentalizes, oversentimentalises
-    oversize, oversized
-    overspecialization's, overspecialisation's
-    overspecialization, overspecialisation
-    overspecializations, overspecialisations
-    overspecialize, overspecialise
-    overspecialized, overspecialised
-    overspecializes, overspecialises
-    overspecializing, overspecialising
-    oversystematize, oversystematise
-    oversystematizes, oversystematises
-    overunionized's, overunionised's
-    overunionized, overunionised
-    overunionizeds, overunioniseds
-    overurbanization's, overurbanisation's
-    overurbanization, overurbanisation
-    overurbanizations, overurbanisations
-    overutilization, overutilisation
-    overwomanize, overwomanise
-    overwomanizes, overwomanises
-    ower, owre
-    owercome, owrecome
-    owerword, owreword
-    oxalemia, oxalaemia
-    oxidizabilities, oxidisabilities
-    oxidizability's, oxidisability's
-    oxidizability, oxidisability
-    oxidizable's, oxidisable's
-    oxidizable, oxidisable
-    oxidizables, oxidisables
-    oxidization's, oxidisation's
-    oxidization, oxidisation
-    oxidizations, oxidisations
-    oxidize, oxidise
-    oxidized, oxidised
-    oxidizement's, oxidisement's
-    oxidizement, oxidisement
-    oxidizements, oxidisements
-    oxidizer's, oxidiser's
-    oxidizer, oxidiser
-    oxidizers, oxidisers
-    oxidizes, oxidises
-    oxidizing, oxidising
-    oxidizings, oxidisings
-    oxygenizable's, oxygenisable's
-    oxygenizable, oxygenisable
-    oxygenizables, oxygenisables
-    oxygenize, oxygenise
-    oxygenized, oxygenised
-    oxygenizement's, oxygenisement's
-    oxygenizement, oxygenisement
-    oxygenizements, oxygenisements
-    oxygenizer's, oxygeniser's
-    oxygenizer, oxygeniser
-    oxygenizers, oxygenisers
-    oxygenizes, oxygenises
-    oxygenizing, oxygenising
-    oxyhematin, oxyhaematin
-    oxyhemoglobin, oxyhaemoglobin
-    oxyhemoglobins, oxyhaemoglobins
-    ozena, ozaena
-    ozena, ozoena
-    ozonization's, ozonisation's
-    ozonization, ozonisation
-    ozonizations, ozonisations
-    ozonize, ozonise
-    ozonized, ozonised
-    ozonizer's, ozoniser's
-    ozonizer, ozoniser
-    ozonizers, ozonisers
-    ozonizes, ozonises
-    ozonizing, ozonising
-    pachyemia, pachyaemia
-    pachyhemia, pachyhaemia
-    packetization, packetisation
-    packetize, packetise
-    packetized, packetised
-    packetizer's, packetiser's
-    packetizer, packetiser
-    packetizers, packetisers
-    packetizes, packetises
-    packetizing, packetising
-    paeanize, paeanise
-    paeanizes, paeanises
-    paganization's, paganisation's
-    paganization, paganisation
-    paganizations, paganisations
-    paganize, paganise
-    paganized, paganised
-    paganizer's, paganiser's
-    paganizer, paganiser
-    paganizers, paganisers
-    paganizes, paganises
-    paganizing, paganising
-    pagine, paginae
-    pajama's, pyjama's
-    pajama, pyjama
-    pajamaed, pyjamased
-    pajamas's, pyjamas's
-    pajamas, pyjamas
-    palame, palamae
-    palatalization's, palatalisation's
-    palatalization, palatalisation
-    palatalizations, palatalisations
-    palatalize, palatalise
-    palatalized, palatalised
-    palatalizes, palatalises
-    palatalizing, palatalising
-    palatization's, palatisation's
-    palatization, palatisation
-    palatizations, palatisations
-    palatize, palatise
-    palatizes, palatises
-    paleanthropic, palaeanthropic
-    Palearctic, Palaearctic
-    paleencephalon's, palaeencephalon's
-    paleencephalon, palaeencephalon
-    paleentomology, palaeentomology
-    paleethnologic, palaeethnologic
-    paleethnological, palaeethnological
-    paleethnologist, palaeethnologist
-    paleethnology, palaeethnology
-    paleichthyologist, palaeichthyologist
-    paleichthyology, palaeichthyology
-    paleoalchemical, palaeoalchemical
-    paleoanthropic, palaeoanthropic
-    paleoanthropography, palaeoanthropography
-    paleoanthropological, palaeoanthropological
-    paleoanthropologies, palaeoanthropologies
-    paleoanthropologist, palaeoanthropologist
-    paleoanthropologists, palaeoanthropologists
-    paleoanthropology, palaeoanthropology
-    Paleoanthropus's, Palaeoanthropus's
-    Paleoanthropus, Palaeoanthropus
-    paleoatavism, palaeoatavism
-    paleoatavistic, palaeoatavistic
-    paleobiogeography, palaeobiogeography
-    paleobiologic, palaeobiologic
-    paleobiological, palaeobiological
-    paleobiologies, palaeobiologies
-    paleobiologist's, palaeobiologist's
-    paleobiologist, palaeobiologist
-    paleobiologists, palaeobiologists
-    paleobiology's, palaeobiology's
-    paleobiology, palaeobiology
-    paleobotanic, palaeobotanic
-    paleobotanical, palaeobotanical
-    paleobotanically, palaeobotanically
-    paleobotanies, palaeobotanies
-    paleobotanist, palaeobotanist
-    paleobotanists, palaeobotanists
-    paleobotany's, palaeobotany's
-    paleobotany, palaeobotany
-    paleoceanography, palaeoceanography
-    paleochorology, palaeochorology
-    paleoclimatic, palaeoclimatic
-    paleoclimatologic, palaeoclimatologic
-    paleoclimatological, palaeoclimatological
-    paleoclimatologies, palaeoclimatologies
-    paleoclimatologist's, palaeoclimatologist's
-    paleoclimatologist, palaeoclimatologist
-    paleoclimatologists, palaeoclimatologists
-    paleoclimatology's, palaeoclimatology's
-    paleoclimatology, palaeoclimatology
-    Paleoconcha's, Palaeoconcha's
-    Paleoconcha, Palaeoconcha
-    paleocosmic, palaeocosmic
-    paleocosmology, palaeocosmology
-    paleocrystal, palaeocrystal
-    paleocrystallic, palaeocrystallic
-    paleocrystalline, palaeocrystalline
-    paleocrystic, palaeocrystic
-    paleocyclic, palaeocyclic
-    paleodendrologic, palaeodendrologic
-    paleodendrological, palaeodendrological
-    paleodendrologically, palaeodendrologically
-    paleodendrologist, palaeodendrologist
-    paleodendrology, palaeodendrology
-    paleoecologic, palaeoecologic
-    paleoecological, palaeoecological
-    paleoecologies, palaeoecologies
-    paleoecologist's, palaeoecologist's
-    paleoecologist, palaeoecologist
-    paleoecologists, palaeoecologists
-    paleoecology's, palaeoecology's
-    paleoecology, palaeoecology
-    paleoencephalon's, palaeoencephalon's
-    paleoencephalon, palaeoencephalon
-    paleoentomologic, palaeoentomologic
-    paleoentomological, palaeoentomological
-    paleoentomologist's, palaeoentomologist's
-    paleoentomologist, palaeoentomologist
-    paleoeremology, palaeoeremology
-    paleoethnic, palaeoethnic
-    paleoethnography, palaeoethnography
-    paleoethnologic, palaeoethnologic
-    paleoethnological, palaeoethnological
-    paleoethnologist, palaeoethnologist
-    paleoethnology, palaeoethnology
-    paleofauna, palaeofauna
-    paleogenesis's, palaeogenesis's
-    paleogenesis, palaeogenesis
-    paleogenetic, palaeogenetic
-    paleogeographer, palaeogeographer
-    paleogeographers, palaeogeographers
-    paleogeographic, palaeogeographic
-    paleogeographical, palaeogeographical
-    paleogeographically, palaeogeographically
-    paleogeographies, palaeogeographies
-    paleogeography, palaeogeography
-    paleogeology, palaeogeology
-    paleoglaciology, palaeoglaciology
-    paleoglyph, palaeoglyph
-    paleograph, palaeograph
-    paleographic, palaeographic
-    paleographical, palaeographical
-    paleographically, palaeographically
-    paleographist, palaeographist
-    paleoherpetologist, palaeoherpetologist
-    paleoherpetology, palaeoherpetology
-    paleohistology, palaeohistology
-    paleohydrography, palaeohydrography
-    paleoichthyology, palaeoichthyology
-    paleolatry, palaeolatry
-    paleolimnology, palaeolimnology
-    paleolith's, palaeolith's
-    paleolith, palaeolith
-    paleolithic, palaeolithic
-    Paleolithic, Palaeolithic
-    paleolithical, palaeolithical
-    paleolithist, palaeolithist
-    paleolithoid, palaeolithoid
-    paleoliths, palaeoliths
-    paleolithy, palaeolithy
-    paleological, palaeological
-    paleologist's, palaeologist's
-    paleologist, palaeologist
-    paleology, palaeology
-    paleomagnetism's, palaeomagnetism's
-    paleomagnetism, palaeomagnetism
-    paleomagnetisms, palaeomagnetisms
-    paleometallic, palaeometallic
-    paleometeorological, palaeometeorological
-    paleometeorology, palaeometeorology
-    paleontographic, palaeontographic
-    paleontographical, palaeontographical
-    paleontographies, palaeontographies
-    paleontography's, palaeontography's
-    paleontography, palaeontography
-    paleontol, palaeontol
-    paleontologic, palaeontologic
-    paleontological, palaeontological
-    paleontologically, palaeontologically
-    paleontologist's, palaeontologist's
-    paleontologist, palaeontologist
-    paleontologists, palaeontologists
-    paleontology's, palaeontology's
-    paleontology, palaeontology
-    paleopathologic, palaeopathologic
-    paleopathological, palaeopathological
-    paleopathologies, palaeopathologies
-    paleopathologist, palaeopathologist
-    paleopathologists, palaeopathologists
-    paleopathology, palaeopathology
-    paleopedology, palaeopedology
-    paleophysiography, palaeophysiography
-    paleophysiology, palaeophysiology
-    paleophytic, palaeophytic
-    paleophytological, palaeophytological
-    paleophytologist, palaeophytologist
-    paleophytology, palaeophytology
-    paleoplain, palaeoplain
-    paleopotamology, palaeopotamology
-    paleopsychic, palaeopsychic
-    paleopsychological, palaeopsychological
-    paleopsychology, palaeopsychology
-    paleornithological, palaeornithological
-    paleornithology, palaeornithology
-    paleostriatal, palaeostriatal
-    paleostriatum, palaeostriatum
-    paleostylic, palaeostylic
-    paleostyly, palaeostyly
-    paleotechnic, palaeotechnic
-    paleothalamus, palaeothalamus
-    Paleotropical's, Palaeotropical's
-    Paleotropical, Palaeotropical
-    paleovolcanic, palaeovolcanic
-    paleozoic, palaeozoic
-    paleozoologic, palaeozoologic
-    paleozoological, palaeozoological
-    paleozoologies, palaeozoologies
-    paleozoologist's, palaeozoologist's
-    paleozoologist, palaeozoologist
-    paleozoologists, palaeozoologists
-    paleozoology's, palaeozoology's
-    paleozoology, palaeozoology
-    palestra's, palaestra's
-    palestra, palaestra
-    palestrae, palaestrae
-    palestral, palaestral
-    palestras, palaestras
-    palestrian, palaestrian
-    palestric, palaestric
-    paletiology, palaetiology
-    palladiumize, palladiumise
-    palladiumizes, palladiumises
-    palletization's, palletisation's
-    palletization, palletisation
-    palletizations, palletisations
-    palletize, palletise
-    palletized, palletised
-    palletizer's, palletiser's
-    palletizer, palletiser
-    palletizers, palletisers
-    palletizes, palletises
-    palletizing, palletising
-    pamperize, pamperise
-    pamperizes, pamperises
-    pamphletize, pamphletise
-    pamphletizes, pamphletises
-    panderize, panderise
-    panderizes, panderises
-    pandora, pandoura
-    panegyrize, panegyrise
-    panegyrized, panegyrised
-    panegyrizes, panegyrises
-    panegyrizing, panegyrising
-    paneled, panelled
-    paneling's, panelling's
-    paneling, panelling
-    panelings, panellings
-    panelist's, panellist's
-    panelist, panellist
-    panelists, panellists
-    panelized, panelised
-    panellisation, panellization
-    panesthesia, panaesthesia
-    panesthesias, panaesthesias
-    panesthetic, panaesthetic
-    pangea, pangaea
-    pannier's, panier's
-    pannier, panier
-    panniers, paniers
-    panomphean, panomphaean
-    pantheonization's, pantheonisation's
-    pantheonization, pantheonisation
-    pantheonizations, pantheonisations
-    pantheonize, pantheonise
-    pantheonizes, pantheonises
-    pantie's, panty's
-    pantie, panty
-    papalization's, papalisation's
-    papalization, papalisation
-    papalizations, papalisations
-    papalize, papalise
-    papalized, papalised
-    papalizer, papaliser
-    papalizers, papalisers
-    papalizes, papalises
-    papalizing, papalising
-    papilledema, papilloedema
-    papule, papulae
-    parabolization's, parabolisation's
-    parabolization, parabolisation
-    parabolize, parabolise
-    parabolized, parabolised
-    parabolizes, parabolises
-    parabolizing, parabolising
-    paraffinize, paraffinise
-    paraffinizes, paraffinises
-    paragraphize, paragraphise
-    paragraphizes, paragraphises
-    parakeet's, parrakeet's
-    parakeet, parrakeet
-    parakeets, parrakeets
-    parallelization's, parallelisation's
-    parallelization, parallelisation
-    parallelizations, parallelisations
-    parallelize, parallelise
-    parallelized, parallelised
-    parallelizer, paralleliser
-    parallelizers, parallelisers
-    parallelizes, parallelises
-    parallelizing, parallelising
-    paralogize, paralogise
-    paralogized, paralogised
-    paralogizes, paralogises
-    paralogizing, paralogising
-    paralyzation's, paralysation's
-    paralyzation, paralysation
-    paralyzations, paralysations
-    paralyze, paralyse
-    paralyzed, paralysed
-    paralyzedlies, paralysedlies
-    paralyzedly, paralysedly
-    paralyzer's, paralyser's
-    paralyzer, paralyser
-    paralyzers, paralysers
-    paralyzes, paralyses
-    paralyzing, paralysing
-    paralyzinglies, paralysinglies
-    paralyzingly, paralysingly
-    Paramecium's, Paramoecium's
-    Paramecium, Paramoecium
-    parameterizable, parameterisable
-    parameterization's, parameterisation's
-    parameterization, parameterisation
-    parameterizations, parameterisations
-    parameterize, parameterise
-    parameterized, parameterised
-    parameterizes, parameterises
-    parameterizing, parameterising
-    parametrizable, parametrisable
-    parametrization's, parametrisation's
-    parametrization, parametrisation
-    parametrizations, parametrisations
-    parametrize, parametrise
-    parametrized, parametrised
-    parametrizes, parametrises
-    parametrizing, parametrising
-    paraselene, paraselenae
-    parasitemia, parasitaemia
-    parasitization, parasitisation
-    parasitize, parasitise
-    parasitized, parasitised
-    parasitizes, parasitises
-    parasitizing, parasitising
-    parathyroidectomize, parathyroidectomise
-    parathyroidectomized, parathyroidectomised
-    parathyroidectomizes, parathyroidectomises
-    parathyroidectomizing, parathyroidectomising
-    paratragedia, paratragoedia
-    parceled, parcelled
-    parceler, parceller
-    parceling's, parcelling's
-    parceling, parcelling
-    parchmentize, parchmentise
-    parchmentized, parchmentised
-    parchmentizes, parchmentises
-    parchmentizing, parchmentising
-    parecious, paroecious
-    pareciously, paroeciously
-    pareciousness, paroeciousness
-    parecism, paroecism
-    parecy, paroecy
-    pareneses, paraeneses
-    parenesis, paraenesis
-    parenetic, paraenetic
-    parenetical, paraenetical
-    parenthesization, parenthesisation
-    parenthesize, parenthesise
-    parenthesized, parenthesised
-    parenthesizes, parenthesises
-    parenthesizing, parenthesising
-    paresthesia's, paraesthesia's
-    paresthesia, paraesthesia
-    paresthesias, paraesthesias
-    paresthetic, paraesthetic
-    parfocalization, parfocalisation
-    parfocalize, parfocalise
-    Parisianization's, Parisianisation's
-    Parisianization, Parisianisation
-    Parisianizations, Parisianisations
-    Parisianize's, Parisianise's
-    Parisianize, Parisianise
-    Parisianizes, Parisianises
-    parlor's, parlour's
-    parlor, parlour
-    parlorish, parlourish
-    parlormaid, parlourmaid
-    parlors, parlours
-    parmigiana, parmigiano
-    parochialization's, parochialisation's
-    parochialization, parochialisation
-    parochializations, parochialisations
-    parochialize, parochialise
-    parochialized, parochialised
-    parochializes, parochialises
-    parochializing, parochialising
-    parrotize, parrotise
-    parrotizes, parrotises
-    parsonize, parsonise
-    parsonizes, parsonises
-    partialize, partialise
-    partialized, partialised
-    partializes, partialises
-    partializing, partialising
-    particolored, particoloured
-    particoloredder, particolouredder
-    particoloreddest, particoloureddest
-    particularization's, particularisation's
-    particularization, particularisation
-    particularizations, particularisations
-    particularize, particularise
-    particularized, particularised
-    particularizer's, particulariser's
-    particularizer, particulariser
-    particularizes, particularises
-    particularizing, particularising
-    partisan's, partizan's
-    partisan's, partizan's
-    partisan, partizan
-    partisan, partizan
-    partisanize, partisanise
-    partisanizes, partisanises
-    partisans, partizans
-    partisans, partizans
-    Pasiphae's, Pasiphaae's
-    Pasiphae, Pasiphaae
-    passades, passadoes
-    passivization, passivisation
-    passivize, passivise
-    passivized, passivised
-    passivizes, passivises
-    passivizing, passivising
-    pasteurization's, pasteurisation's
-    pasteurization, pasteurisation
-    pasteurizations, pasteurisations
-    pasteurize, pasteurise
-    pasteurized, pasteurised
-    pasteurizer's, pasteuriser's
-    pasteurizer, pasteuriser
-    Pasteurizers, Pasteurisers
-    pasteurizers, pasteurisers
-    pasteurizes, pasteurises
-    pasteurizing, pasteurising
-    pastoralize, pastoralise
-    pastoralizes, pastoralises
-    pastorize, pastorise
-    pastorizes, pastorises
-    paternalize, paternalise
-    paternalizes, paternalises
-    patine, patinae
-    patined, patinaed
-    patrialization, patrialisation
-    patrializations, patrialisations
-    patrialize, patrialise
-    patrialized, patrialised
-    patrializes, patrialises
-    patrializing, patrialising
-    patrices, patricoes
-    patronizable's, patronisable's
-    patronizable, patronisable
-    patronizabler, patronisabler
-    patronizables, patronisables
-    patronizablest, patronisablest
-    patronization's, patronisation's
-    patronization, patronisation
-    patronizations, patronisations
-    patronize, patronise
-    patronized, patronised
-    patronizer's, patroniser's
-    patronizer, patroniser
-    patronizers, patronisers
-    patronizes, patronises
-    patronizing's, patronising's
-    patronizing, patronising
-    patronizinglier, patronisinglier
-    patronizingliest, patronisingliest
-    patronizingly, patronisingly
-    patronizings, patronisings
-    patte, pattae
-    patternize, patternise
-    patternizes, patternises
-    Paulinize's, Paulinise's
-    Paulinize, Paulinise
-    Paulinizes, Paulinises
-    pauperization's, pauperisation's
-    pauperization, pauperisation
-    pauperizations, pauperisations
-    pauperize, pauperise
-    pauperized, pauperised
-    pauperizer's, pauperiser's
-    pauperizer, pauperiser
-    pauperizers, pauperisers
-    pauperizes, pauperises
-    pauperizing, pauperising
-    Pavior's, Paviour's
-    pavior's, paviour's
-    Pavior, Paviour
-    pavior, paviour
-    paviors, paviours
-    pawpaw's, papaw's
-    pawpaw, papaw
-    pawpaws, papaws
-    Paynize's, Paynise's
-    Paynize, Paynise
-    Paynizes, Paynises
-    pe, poe
-    pearlization, pearlisation
-    pearlize, pearlise
-    pearlized, pearlised
-    pearlizes, pearlises
-    pearlizing, pearlising
-    peasantize, peasantise
-    peasantizes, peasantises
-    pectization's, pectisation's
-    pectization, pectisation
-    pectizations, pectisations
-    pectize, pectise
-    pectized, pectised
-    pectizes, pectises
-    pectizing, pectising
-    peculiarize, peculiarise
-    peculiarized, peculiarised
-    peculiarizes, peculiarises
-    peculiarizing, peculiarising
-    pedagogism, paedagogism
-    pedagogue's, pedagog's
-    pedagogue, pedagog
-    pedagogues, pedagogs
-    pedaled, pedalled
-    pedaler's, pedaller's
-    pedaler, pedaller
-    pedalers, pedallers
-    pedaling, pedalling
-    pedanticize, pedanticise
-    pedanticized, pedanticised
-    pedanticizes, pedanticises
-    pedanticizing, pedanticising
-    pedantize, pedantise
-    pedantized, pedantised
-    pedantizes, pedantises
-    pedantizing, pedantising
-    pedatrophia, paedatrophia
-    pedatrophy, paedatrophy
-    peddler's, pedlar's
-    peddler, pedlar
-    peddlers, pedlars
-    pederast's, paederast's
-    pederast, paederast
-    pederastic, paederastic
-    pederastically, paederastically
-    pederasts, paederasts
-    pedestaled, pedestalled
-    pedestaling, pedestalling
-    pedestrianization's, pedestrianisation's
-    pedestrianization, pedestrianisation
-    pedestrianizations, pedestrianisations
-    pedestrianize, pedestrianise
-    pedestrianized, pedestrianised
-    pedestrianizes, pedestrianises
-    pedestrianizing, pedestrianising
-    pediatric, paediatric
-    pediatrics, paediatrics
-    pediatrist's, paediatrician's
-    pediatrist, paediatrician
-    pediatrists, paediatricians
-    pediatry, paediatry
-    pedobaptism's, paedobaptism's
-    pedobaptism, paedobaptism
-    pedobaptist's, paedobaptist's
-    pedobaptist, paedobaptist
-    pedodontic, paedodontic
-    pedodontics, paedodontics
-    pedogeneses, paedogeneses
-    pedogenesis, paedogenesis
-    pedogenetic, paedogenetic
-    pedogenic, paedogenic
-    pedological, paedological
-    pedologies, paedologies
-    pedologist, paedologist
-    pedologists, paedologists
-    pedology's, paedology's
-    pedology, paedology
-    pedometrical, paedometrical
-    pedomorphic, paedomorphic
-    pedomorphism, paedomorphism
-    pedomorphisms, paedomorphisms
-    pedomorphoses, paedomorphoses
-    pedomorphosis, paedomorphosis
-    pedophile, paedophile
-    pedophiles, paedophiles
-    pedophilia, paedophilia
-    pedophiliac, paedophiliac
-    pedophiliacs, paedophiliacs
-    pedophilias, paedophilias
-    pedophilic, paedophilic
-    pedotribe, paedotribe
-    pedotrophic, paedotrophic
-    pedotrophist, paedotrophist
-    pedotrophy, paedotrophy
-    peize, peise
-    peized, peised
-    peizes, peises
-    peizing, peising
-    Pekingese's, Pekinese's
-    Pekingese, Pekinese
-    pelletization's, pelletisation's
-    pelletization, pelletisation
-    pelletizations, pelletisations
-    pelletize, pelletise
-    pelletized, pelletised
-    pelletizer, pelletiser
-    pelletizes, pelletises
-    pelletizing, pelletising
-    pelorized, pelorised
-    pemmicanization's, pemmicanisation's
-    pemmicanization, pemmicanisation
-    pemmicanizations, pemmicanisations
-    pemmicanize's, pemmicanise's
-    pemmicanize, pemmicanise
-    pemmicanizes, pemmicanises
-    penalizable's, penalisable's
-    penalizable, penalisable
-    penalizabler, penalisabler
-    penalizables, penalisables
-    penalizablest, penalisablest
-    penalization's, penalisation's
-    penalization, penalisation
-    penalizations, penalisations
-    penalize, penalise
-    penalized, penalised
-    penalizes, penalises
-    penalizing, penalising
-    penciled, pencilled
-    penciler's, penciller's
-    penciler, penciller
-    pencilers, pencillers
-    penciling, pencilling
-    pencilings, pencillings
-    penelopize, penelopise
-    penelopized, penelopised
-    penelopizes, penelopises
-    penelopizing, penelopising
-    penlight's, penlite's
-    penlight, penlite
-    penlights, penlites
-    penne, pennae
-    pense, pensae
-    peptizable's, peptisable's
-    peptizable, peptisable
-    peptizables, peptisables
-    peptization's, peptisation's
-    peptization, peptisation
-    peptizations, peptisations
-    peptize, peptise
-    peptized, peptised
-    peptizer, peptiser
-    peptizers, peptisers
-    peptizes, peptises
-    peptizing, peptising
-    peptonemia, peptonaemia
-    peptonization's, peptonisation's
-    peptonization, peptonisation
-    peptonizations, peptonisations
-    peptonize, peptonise
-    peptonized, peptonised
-    peptonizer's, peptoniser's
-    peptonizer, peptoniser
-    peptonizes, peptonises
-    peptonizing, peptonising
-    peracid, preacid
-    peracidity, preacidity
-    peract, preact
-    peracute, preacute
-    perambulatory, preambulatory
-    perces, preces
-    perchlorethane, perchloroethane
-    perchlorethylene, perchloroethylene
-    perchloric, prechloric
-    perclose, preclose
-    percompound, precompound
-    percurrent, precurrent
-    percussionize, percussionise
-    percussionizes, percussionises
-    perdicine, perdicinae
-    perdiligent, prediligent
-    perdy, predy
-    perea, peraea
-    perennialize, perennialise
-    perennializes, perennialises
-    pereon, peraeon
-    pereopod, peraeopod
-    pereopods, peraeopods
-    perfectivize, perfectivise
-    perfectivizes, perfectivises
-    perfervor's, perfervour's
-    perfervor, perfervour
-    perfervors, perfervours
-    perfet, prefet
-    perfoliation, prefoliation
-    perfoliations, prefoliations
-    performant, preformant
-    performative, preformative
-    perhazard, prehazard
-    pericecal, pericaecal
-    pericecitis, pericaecitis
-    pericenter, pericentre
-    perichete, perichaete
-    pericope, pericopae
-    periesophageal, perioesophageal
-    periled, perilled
-    periling, perilling
-    periodicalize, periodicalise
-    periodicalizes, periodicalises
-    periodization's, periodisation's
-    periodization, periodisation
-    periodizations, periodisations
-    periodize, periodise
-    periodized, periodised
-    periodizes, periodises
-    periodizing, periodising
-    perjink, prejink
-    perlection, prelection
-    perlingual, prelingual
-    perlingually, prelingually
-    permissable, premissable
-    permixture, premixture
-    pernasal, prenasal
-    peroral, preoral
-    perorally, preorally
-    perotic, preotic
-    peroxidize, peroxidise
-    peroxidized, peroxidised
-    peroxidizement's, peroxidisement's
-    peroxidizement, peroxidisement
-    peroxidizements, peroxidisements
-    peroxidizes, peroxidises
-    peroxidizing, peroxidising
-    perperfect, preperfect
-    Perse's, Persae's
-    Perse, Persae
-    perse, prese
-    Persianization's, Persianisation's
-    Persianization, Persianisation
-    Persianizations, Persianisations
-    Persianize's, Persianise's
-    Persianize, Persianise
-    Persianized's, Persianised's
-    Persianized, Persianised
-    Persianizes, Persianises
-    Persianizing's, Persianising's
-    Persianizing, Persianising
-    Persicize's, Persicise's
-    Persicize, Persicise
-    Persicized's, Persicised's
-    Persicized, Persicised
-    Persicizes, Persicises
-    Persicizing's, Persicising's
-    Persicizing, Persicising
-    persolve, presolve
-    personalization's, personalisation's
-    personalization, personalisation
-    personalizations, personalisations
-    personalize, personalise
-    personalized, personalised
-    personalizes, personalises
-    personalizing, personalising
-    personization's, personisation's
-    personization, personisation
-    personizations, personisations
-    personize, personise
-    personized, personised
-    personizes, personises
-    personizing, personising
-    perst, prest
-    Peruvianize's, Peruvianise's
-    Peruvianize, Peruvianise
-    Peruvianizes, Peruvianises
-    perv, prev
-    perve, preve
-    perved, preved
-    perves, preves
-    perviable, previable
-    perving, preving
-    perviousness, previousness
-    perviousnesses, previousnesses
-    petaled, petalled
-    petling, poetling
-    Petrarchize's, Petrarchise's
-    Petrarchize, Petrarchise
-    Petrarchized's, Petrarchised's
-    Petrarchized, Petrarchised
-    Petrarchizes, Petrarchises
-    Petrarchizing's, Petrarchising's
-    Petrarchizing, Petrarchising
-    petrolization's, petrolisation's
-    petrolization, petrolisation
-    petrolizations, petrolisations
-    petrolize, petrolise
-    petrolizes, petrolises
-    phacochere, phacochoere
-    phacocherine, phacochoerine
-    Phaenna's, Phaaenna's
-    Phaenna, Phaaenna
-    phagedena, phagedaena
-    phagedenas, phagedaenas
-    phagedenic, phagedaenic
-    phagedenical, phagedaenical
-    phagedenous, phagedaenous
-    phagocytize, phagocytise
-    phagocytizes, phagocytises
-    phalanxes, phalanx
-    phantomize, phantomise
-    phantomizer, phantomiser
-    phantomizers, phantomisers
-    phantomizes, phantomises
-    Pharisean's, Pharisaean's
-    Pharisean, Pharisaean
-    pharmacopeian, pharmacopoeian
-    pharmacopoeia's, pharmacopeia's
-    pharmacopoeia, pharmacopeia
-    pharmacopoeial, pharmacopeial
-    pharmacopoeias, pharmacopeias
-    phelonion, phaelonion
-    phelonions, phaelonions
-    phenicia, phoenicia
-    phenicopter, phoenicopter
-    phenogam, phaenogam
-    phenogams, phaenogams
-    phenogenesis, phaenogenesis
-    phenogenetic, phaenogenetic
-    phenolization's, phenolisation's
-    phenolization, phenolisation
-    phenolizations, phenolisations
-    phenolize, phenolise
-    phenolizes, phenolises
-    phenological, phaenological
-    phenologies, phaenologies
-    phenology, phaenology
-    phenomenalization's, phenomenalisation's
-    phenomenalization, phenomenalisation
-    phenomenalizations, phenomenalisations
-    phenomenalize, phenomenalise
-    phenomenalized, phenomenalised
-    phenomenalizes, phenomenalises
-    phenomenalizing, phenomenalising
-    phenomenism, phaenomenism
-    phenomenize, phenomenise
-    phenomenized, phenomenised
-    phenomenizes, phenomenises
-    phenomenizing, phenomenising
-    phenozygous, phaenozygous
-    pheophyl, phaeophyl
-    pheophyll, phaeophyll
-    pheophytin, phaeophytin
-    phiale, phialae
-    philanthropize, philanthropise
-    philanthropized, philanthropised
-    philanthropizes, philanthropises
-    philanthropizing, philanthropising
-    Philippize's, Philippise's
-    Philippize, Philippise
-    Philippized's, Philippised's
-    Philippized, Philippised
-    Philippizes, Philippises
-    Philippizing's, Philippising's
-    Philippizing, Philippising
-    Philistinize's, Philistinise's
-    Philistinize, Philistinise
-    Philistinized's, Philistinised's
-    Philistinized, Philistinised
-    Philistinizes, Philistinises
-    Philistinizing's, Philistinising's
-    Philistinizing, Philistinising
-    philopena, philopoena
-    philopenas, philopoenas
-    philosophization's, philosophisation's
-    philosophization, philosophisation
-    philosophizations, philosophisations
-    philosophize, philosophise
-    philosophized, philosophised
-    philosophizer's, philosophiser's
-    philosophizer, philosophiser
-    philosophizers, philosophisers
-    philosophizes, philosophises
-    philosophizing, philosophising
-    philter's, philtre's
-    philter, philtre
-    philters, philtres
-    phlebotomization's, phlebotomisation's
-    phlebotomization, phlebotomisation
-    phlebotomizations, phlebotomisations
-    phlebotomize, phlebotomise
-    phlebotomized, phlebotomised
-    phlebotomizes, phlebotomises
-    phlebotomizing, phlebotomising
-    phleum, phloeum
-    phlyctena's, phlyctaena's
-    phlyctena, phlyctaena
-    phlyctenae, phlyctaenae
-    phlyctenula, phlyctaenula
-    Phocean, Phocaean
-    phonemicization, phonemicisation
-    phonemicizations, phonemicisations
-    phonemicize, phonemicise
-    phonemicized, phonemicised
-    phonemicizes, phonemicises
-    phonemicizing, phonemicising
-    phoneticization's, phoneticisation's
-    phoneticization, phoneticisation
-    phoneticizations, phoneticisations
-    phoneticize, phoneticise
-    phoneticized, phoneticised
-    phoneticizes, phoneticises
-    phoneticizing, phoneticising
-    phonetization, phonetisation
-    phonetizations, phonetisations
-    phonetize, phonetise
-    phonetized, phonetised
-    phonetizes, phonetises
-    phonetizing, phonetising
-    phorrhea, phorrhoea
-    phosphatization's, phosphatisation's
-    phosphatization, phosphatisation
-    phosphatizations, phosphatisations
-    phosphatize, phosphatise
-    phosphatized, phosphatised
-    phosphatizes, phosphatises
-    phosphatizing, phosphatising
-    phosphorize, phosphorise
-    phosphorized, phosphorised
-    phosphorizes, phosphorises
-    phosphorizing, phosphorising
-    photesthesis, photaesthesis
-    photesthesis, photoesthesis
-    photocatalyzer's, photocatalyser's
-    photocatalyzer, photocatalyser
-    photocatalyzers, photocatalysers
-    photoesthetic, photoaesthetic
-    photographize, photographise
-    photographizes, photographises
-    photoionization's, photoionisation's
-    photoionization, photoionisation
-    photoionizations, photoionisations
-    photoisomerization's, photoisomerisation's
-    photoisomerization, photoisomerisation
-    photoisomerizations, photoisomerisations
-    photolabeled, photolabelled
-    photolabeler, photolabeller
-    photolabeling, photolabelling
-    photolyzable, photolysable
-    photolyze, photolyse
-    photolyzed, photolysed
-    photolyzes, photolyses
-    photolyzing, photolysing
-    photopolymerization's, photopolymerisation's
-    photopolymerization, photopolymerisation
-    photopolymerizations, photopolymerisations
-    photosensitization's, photosensitisation's
-    photosensitization, photosensitisation
-    photosensitizations, photosensitisations
-    photosensitize, photosensitise
-    photosensitized, photosensitised
-    photosensitizer's, photosensitiser's
-    photosensitizer, photosensitiser
-    photosensitizers, photosensitisers
-    photosensitizes, photosensitises
-    photosensitizing, photosensitising
-    photosynthesize, photosynthesise
-    photosynthesized, photosynthesised
-    photosynthesizes, photosynthesises
-    photosynthesizing, photosynthesising
-    phrenologize, phrenologise
-    phrenologized, phrenologised
-    phrenologizes, phrenologises
-    phrenologizing, phrenologising
-    Phylactolema's, Phylactolaema's
-    Phylactolema, Phylactolaema
-    Phylactolemata's, Phylactolaemata's
-    Phylactolemata, Phylactolaemata
-    phytoecology, phytooecology
-    phytohemagglutinin, phytohaemagglutinin
-    piarhemic, piarhaemic
-    piaster's, piastre's
-    piaster, piastre
-    piasters, piastres
-    picogram's, picogramme's
-    picogram, picogramme
-    picograms, picogrammes
-    picometer's, picometre's
-    picometer, picometre
-    picometers, picometres
-    pictorialization's, pictorialisation's
-    pictorialization, pictorialisation
-    pictorializations, pictorialisations
-    pictorialize, pictorialise
-    pictorialized, pictorialised
-    pictorializes, pictorialises
-    pictorializing, pictorialising
-    picturization's, picturisation's
-    picturization, picturisation
-    picturizations, picturisations
-    picturize, picturise
-    picturized, picturised
-    picturizes, picturises
-    picturizing, picturising
-    pidginization's, pidginisation's
-    pidginization, pidginisation
-    pidginizations, pidginisations
-    pidginize, pidginise
-    pidginized, pidginised
-    pidginizes, pidginises
-    pidginizing, pidginising
-    piggyback's, pickaback's
-    piggyback, pickaback
-    piggybacking, pickabacking
-    piggybacks, pickabacks
-    pigmean, pigmaean
-    pigmentize, pigmentise
-    pigmentizes, pigmentises
-    pilau's, pilaff's
-    pilau, pilaff
-    pilaus, pilaffs
-    pilgrimize, pilgrimise
-    pilgrimized, pilgrimised
-    pilgrimizes, pilgrimises
-    pilgrimizing, pilgrimising
-    pillarize, pillarise
-    pillarizes, pillarises
-    pillorize, pillorise
-    pillorized, pillorised
-    pillorizes, pillorises
-    pillorizing, pillorising
-    pillowbeer, pillowbere
-    Pindarize's, Pindarise's
-    Pindarize, Pindarise
-    Pindarized's, Pindarised's
-    Pindarized, Pindarised
-    Pindarizes, Pindarises
-    Pindarizing's, Pindarising's
-    Pindarizing, Pindarising
-    piney, piny
-    pinkie's, pinky's
-    pinkie, pinky
-    pinnule, pinnulae
-    pinochle's, pinocle's
-    pinochle, pinocle
-    pinyon's, piÒon's
-    pinyon, piÒon
-    pinyons, piÒons
-    piratize, piratise
-    piratizes, piratises
-    piroshki's, pirozhki's
-    piroshki, pirozhki
-    piscine, piscinae
-    pistoled, pistolled
-    pistoling, pistolling
-    pixie's, pixy's
-    pixie, pixy
-    pixieish, pixyish
-    pizes, pises
-    pizzazz's, pizazz's
-    pizzazz, pizazz
-    pizzazzes, pizazzes
-    Placean's, Placaean's
-    Placean, Placaean
-    placebos, placeboes
-    plage, plagae
-    plagiarization's, plagiarisation's
-    plagiarization, plagiarisation
-    plagiarizations, plagiarisations
-    plagiarize, plagiarise
-    plagiarized, plagiarised
-    plagiarizer's, plagiariser's
-    plagiarizer, plagiariser
-    plagiarizers, plagiarisers
-    plagiarizes, plagiarises
-    plagiarizing, plagiarising
-    Plante's, Plantae's
-    Plante, Plantae
-    plantule, plantulae
-    plasmapheresis, plasmaphaeresis
-    plasmolyze, plasmolyse
-    plasmolyzed, plasmolysed
-    plasmolyzes, plasmolyses
-    plasmolyzing, plasmolysing
-    plasticization's, plasticisation's
-    plasticization, plasticisation
-    plasticizations, plasticisations
-    plasticize, plasticise
-    plasticized, plasticised
-    plasticizer's, plasticiser's
-    plasticizer, plasticiser
-    plasticizers, plasticisers
-    plasticizes, plasticises
-    plasticizing, plasticising
-    platea, plataea
-    platinization's, platinisation's
-    platinization, platinisation
-    platinizations, platinisations
-    platinize, platinise
-    platinized, platinised
-    platinizes, platinises
-    platinizing, platinising
-    platitudinization's, platitudinisation's
-    platitudinization, platitudinisation
-    platitudinizations, platitudinisations
-    platitudinize, platitudinise
-    platitudinized, platitudinised
-    platitudinizer's, platitudiniser's
-    platitudinizer, platitudiniser
-    platitudinizes, platitudinises
-    platitudinizing, platitudinising
-    Platonization's, Platonisation's
-    Platonization, Platonisation
-    platonization, platonisation
-    Platonize, Platonise
-    platonize, platonise
-    Platonized, Platonised
-    platonized, platonised
-    Platonizer's, Platoniser's
-    Platonizer, Platoniser
-    Platonizes, Platonises
-    platonizes, platonises
-    Platonizing, Platonising
-    platonizing, platonising
-    platycelian, platycoelian
-    platycelous, platycoelous
-    plebeianization's, plebeianisation's
-    plebeianization, plebeianisation
-    plebeianize, plebeianise
-    plebeianized, plebeianised
-    plebeianizes, plebeianises
-    plebeianizing, plebeianising
-    pleuroperitoneal, pleuroperitonaeal
-    plow's, plough's
-    plow, plough
-    plowable, ploughable
-    plowboy's, ploughboy's
-    plowboy, ploughboy
-    plowboys, ploughboys
-    plowed, ploughed
-    plower's, plougher's
-    plower, plougher
-    plowers, ploughers
-    plowhead, ploughhead
-    plowing's, ploughing's
-    plowing, ploughing
-    plowman's, ploughman's
-    plowman, ploughman
-    plowmen, ploughmen
-    plows, ploughs
-    plowshare's, ploughshare's
-    plowshare, ploughshare
-    plowshares, ploughshares
-    plumule, plumulae
-    pluralization's, pluralisation's
-    pluralization, pluralisation
-    pluralizations, pluralisations
-    pluralize, pluralise
-    pluralized, pluralised
-    pluralizer's, pluraliser's
-    pluralizer, pluraliser
-    pluralizers, pluralisers
-    pluralizes, pluralises
-    pluralizing, pluralising
-    poeticization, poeticisation
-    poeticize, poeticise
-    poeticized, poeticised
-    poeticizes, poeticises
-    poeticizing, poeticising
-    poetization's, poetisation's
-    poetization, poetisation
-    poetizations, poetisations
-    poetize, poetise
-    poetized, poetised
-    poetizer's, poetiser's
-    poetizer, poetiser
-    poetizers, poetisers
-    poetizes, poetises
-    poetizing, poetising
-    pogromize, pogromise
-    pogromizes, pogromises
-    poky, pokey
-    polarizabilities, polarisabilities
-    polarizability's, polarisability's
-    polarizability, polarisability
-    polarizable's, polarisable's
-    polarizable, polarisable
-    polarizables, polarisables
-    polarization's, polarisation's
-    polarization, polarisation
-    polarizations, polarisations
-    polarize, polarise
-    polarized, polarised
-    polarizer's, polariser's
-    polarizer, polariser
-    polarizers, polarisers
-    polarizes, polarises
-    polarizing, polarising
-    polemicize, polemicise
-    polemicized, polemicised
-    polemicizes, polemicises
-    polemicizing, polemicising
-    polemize, polemise
-    polemized, polemised
-    polemizes, polemises
-    polemizing, polemising
-    policize, policise
-    policizer, policiser
-    policizers, policisers
-    policizes, policises
-    poliencephalitis's, polioencephalitis's
-    poliencephalitis, polioencephalitis
-    poliencephalomyelitis, polioencephalomyelitis
-    politicalize, politicalise
-    politicalizes, politicalises
-    politicization's, politicisation's
-    politicization, politicisation
-    politicizations, politicisations
-    politicize, politicise
-    politicized, politicised
-    politicizer, politiciser
-    politicizers, politicisers
-    politicizes, politicises
-    politicizing, politicising
-    politize, politise
-    politizes, politises
-    pollack's, pollock's
-    pollack, pollock
-    pollenizer, polleniser
-    pollinize, pollinise
-    pollinized, pollinised
-    pollinizer, polliniser
-    pollinizes, pollinises
-    pollinizing, pollinising
-    polliwog's, pollywog's
-    polliwog, pollywog
-    polliwogs, pollywogs
-    Polonization's, Polonisation's
-    Polonization, Polonisation
-    polonize, polonise
-    polonized, polonised
-    polonizes, polonises
-    polonizing, polonising
-    polychetous, polychaetous
-    polychromatize, polychromatise
-    polychromatizes, polychromatises
-    polychromize, polychromise
-    polychromizes, polychromises
-    polycythemia, polycythaemia
-    polycythemias, polycythaemias
-    polycythemic, polycythaemic
-    polydemonism, polydaemonism
-    polydemonisms, polydaemonisms
-    polydemonist's, polydaemonist's
-    polydemonist, polydaemonist
-    polyemia, polyaemia
-    polyemic, polyaemic
-    polyestrous, polyoestrous
-    polygamize, polygamise
-    polygamizes, polygamises
-    polyhemia, polyhaemia
-    polyhemic, polyhaemic
-    polymerization's, polymerisation's
-    polymerization, polymerisation
-    polymerizations, polymerisations
-    polymerize, polymerise
-    polymerized, polymerised
-    polymerizes, polymerises
-    polymerizing, polymerising
-    polypnea, polypnoea
-    polypneic, polypnoeic
-    polysulphurization's, polysulphurisation's
-    polysulphurization, polysulphurisation
-    polysulphurizations, polysulphurisations
-    polytetrafluorethylene, polytetrafluoroethylene
-    polytetrafluorethylenes, polytetrafluoroethylenes
-    pomerium, pomoerium
-    pomme, pommae
-    pommeled, pommelled
-    pommeling, pommelling
-    popliteal, poplitaeal
-    popularization's, popularisation's
-    popularization, popularisation
-    popularizations, popularisations
-    popularize, popularise
-    popularized, popularised
-    popularizer's, populariser's
-    popularizer, populariser
-    popularizers, popularisers
-    popularizes, popularises
-    popularizing, popularising
-    porcelainization's, porcelainisation's
-    porcelainization, porcelainisation
-    porcelainizations, porcelainisations
-    porcelainize, porcelainise
-    porcelainized, porcelainised
-    porcelainizes, porcelainises
-    porcelainizing, porcelainising
-    porcellanize, porcellanise
-    porcellanized, porcellanised
-    porcellanizes, porcellanises
-    porcellanizing, porcellanising
-    porer, pourer
-    porers, pourers
-    poringly, pouringly
-    porphyrization's, porphyrisation's
-    porphyrization, porphyrisation
-    porte, portae
-    portionize, portionise
-    portionizes, portionises
-    positivize, positivise
-    positivizes, positivises
-    postcecal, postcaecal
-    postcenal, postcoenal
-    posterize, posterise
-    posterizes, posterises
-    postfetal, postfoetal
-    postilion's, postillion's
-    postilion, postillion
-    postilions, postillions
-    postmedieval, postmediaeval
-    postsynchronization, postsynchronisation
-    posturize, posturise
-    posturized, posturised
-    posturizes, posturises
-    posturizing, posturising
-    potentialization's, potentialisation's
-    potentialization, potentialisation
-    potentializations, potentialisations
-    potentialize, potentialise
-    potentializes, potentialises
-    potentize, potentise
-    potentized, potentised
-    potentizes, potentises
-    potentizing, potentising
-    pouder, poudre
-    pouders, poudres
-    pouffe's, pouf's
-    pouffe, pouf
-    pouffes, poufs
-    poulder, pouldre
-    poulders, pouldres
-    powderization's, powderisation's
-    powderization, powderisation
-    powderizations, powderisations
-    powderize, powderise
-    powderizer, powderiser
-    powderizers, powderisers
-    powderizes, powderises
-    powellize, powellise
-    powellized, powellised
-    powellizes, powellises
-    powellizing, powellising
-    practicer's, practiser's
-    practicer, practiser
-    practicers, practisers
-    praenomen's, prenomen's
-    praenomen, prenomen
-    praenomens, prenomens
-    pragmatization, pragmatisation
-    pragmatizations, pragmatisations
-    pragmatize, pragmatise
-    pragmatized, pragmatised
-    pragmatizer, pragmatiser
-    pragmatizers, pragmatisers
-    pragmatizes, pragmatises
-    pragmatizing, pragmatising
-    preabdomen, praeabdomen
-    preacetabular, praeacetabular
-    preacherize, preacherise
-    preacherizes, preacherises
-    preacknowledgment's, preacknowledgement's
-    preacknowledgment, preacknowledgement
-    preacknowledgments, preacknowledgements
-    preanal, praeanal
-    preanesthetic's, preanaesthetic's
-    preanesthetic, preanaesthetic
-    preanesthetics, preanaesthetics
-    preapprize, preapprise
-    preapprized, preapprised
-    preapprizing, preapprising
-    preauthorize, preauthorise
-    prebaptize, prebaptise
-    prebaptizes, prebaptises
-    precancelation, precancellation
-    precava, praecava
-    precavae, praecavae
-    precipe, praecipe
-    precipes, praecipes
-    precisionize, precisionise
-    precisionizes, precisionises
-    precivilization's, precivilisation's
-    precivilization, precivilisation
-    precivilizations, precivilisations
-    precocial, praecocial
-    precolor's, precolour's
-    precolor, precolour
-    precolorable's, precolourable's
-    precolorable, precolourable
-    precolorabler, precolourabler
-    precolorables, precolourables
-    precolorablest, precolourablest
-    precoloration's, precolouration's
-    precoloration, precolouration
-    precolorations, precolourations
-    precolored, precoloured
-    precoloring, precolouring
-    precolorings, precolourings
-    precolors, precolours
-    preconization's, preconisation's
-    preconization, preconisation
-    preconizations, preconisations
-    preconize, preconise
-    preconized, preconised
-    preconizer's, preconiser's
-    preconizer, preconiser
-    preconizers, preconisers
-    preconizes, preconises
-    preconizing, preconising
-    precoracoid, praecoracoid
-    precordia, praecordia
-    precordial, praecordial
-    precordium, praecordium
-    precornu, praecornu
-    precox, praecox
-    precriticize, precriticise
-    precriticizes, precriticises
-    precuneus, praecuneus
-    predial, praedial
-    predialist, praedialist
-    prediality, praediality
-    predials, praedials
-    preemptor's, preaemptor's
-    preemptor, preaemptor
-    preesophageal, praeesophageal
-    preesophageal, preoesophageal
-    preestival, preaestival
-    preexistent, preaexistent
-    prefavor's, prefavour's
-    prefavor, prefavour
-    prefavorable's, prefavourable's
-    prefavorable, prefavourable
-    prefavorables, prefavourables
-    prefavorablies, prefavourablies
-    prefavorably, prefavourably
-    prefavorite's, prefavourite's
-    prefavorite, prefavourite
-    prefavorites, prefavourites
-    prefavors, prefavours
-    prefectorial, praefectorial
-    prefertilization's, prefertilisation's
-    prefertilization, prefertilisation
-    prefertilizations, prefertilisations
-    prefertilize, prefertilise
-    prefertilizes, prefertilises
-    preflavor's, preflavour's
-    preflavor, preflavour
-    preflavoring, preflavouring
-    preflavorings, preflavourings
-    preflavors, preflavours
-    prefloration, praefloration
-    prefoliation, praefoliation
-    pregalvanize, pregalvanise
-    pregalvanizes, pregalvanises
-    prehallux, praehallux
-    prehumor's, prehumour's
-    prehumor, prehumour
-    prehumors, prehumours
-    preinitialize, preinitialise
-    preinitialized, preinitialised
-    preinitializes, preinitialises
-    preinitializing, preinitialising
-    prejudgment's, prejudgement's
-    prejudgment, prejudgement
-    prejudgments, prejudgements
-    prelabor's, prelabour's
-    prelabor, prelabour
-    prelabors, prelabours
-    prelabrum, praelabrum
-    prelatize, prelatise
-    prelatized, prelatised
-    prelatizes, prelatises
-    prelatizing, prelatising
-    prelect, praelect
-    prelected, praelected
-    prelecting, praelecting
-    prelection's, praelection's
-    prelection, praelection
-    prelector, praelector
-    prelectorship, praelectorship
-    prelectress, praelectress
-    prelects, praelects
-    prelocalization's, prelocalisation's
-    prelocalization, prelocalisation
-    prelocalizations, prelocalisations
-    preludium, praeludium
-    preludize, preludise
-    preludizes, preludises
-    premaxilla, praemaxilla
-    premial, proemial
-    premillennialize, premillennialise
-    premillennialized, premillennialised
-    premillennializing, premillennialising
-    premonopolize, premonopolise
-    premonopolizes, premonopolises
-    premunire, praemunire
-    prenarial, praenarial
-    preneural, praeneural
-    prenomina, praenomina
-    prenominal, praenominal
-    preoffense's, preoffence's
-    preoffense, preoffence
-    preoffenses, preoffences
-    preoperculum, praeoperculum
-    preorganization's, preorganisation's
-    preorganization, preorganisation
-    preorganizations, preorganisations
-    preorganize, preorganise
-    preorganizes, preorganises
-    preoxidize, preoxidise
-    preoxidized, preoxidised
-    preoxidizes, preoxidises
-    preoxidizing, preoxidising
-    prepaleolithic, prepalaeolithic
-    prepositor, praepositor
-    prepositure, praepositure
-    preposter, praeposter
-    prepostor's, praepostor's
-    prepostor, praepostor
-    prepostors, praepostors
-    preppy's, preppie's
-    preppy, preppie
-    preprogram, preprogramme
-    prepubis, praepubis
-    prerealization's, prerealisation's
-    prerealization, prerealisation
-    prerealizations, prerealisations
-    prerealize, prerealise
-    prerealizes, prerealises
-    prerecognize, prerecognise
-    prerecognizes, prerecognises
-    Presbyterianize's, Presbyterianise's
-    Presbyterianize, Presbyterianise
-    Presbyterianized's, Presbyterianised's
-    Presbyterianized, Presbyterianised
-    Presbyterianizes, Presbyterianises
-    Presbyterianizing's, Presbyterianising's
-    Presbyterianizing, Presbyterianising
-    prescutum, praescutum
-    presidium's, praesidium's
-    presidium, praesidium
-    prespecialize, prespecialise
-    prespecializes, prespecialises
-    presphenoid, praesphenoid
-    presplendor's, presplendour's
-    presplendor, presplendour
-    presplendors, presplendours
-    pressurization's, pressurisation's
-    pressurization, pressurisation
-    pressurizations, pressurisations
-    pressurize, pressurise
-    pressurized, pressurised
-    pressurizer, pressuriser
-    pressurizers, pressurisers
-    pressurizes, pressurises
-    pressurizing, pressurising
-    prestandardization's, prestandardisation's
-    prestandardization, prestandardisation
-    prestandardizations, prestandardisations
-    prestandardize, prestandardise
-    prestandardizes, prestandardises
-    presternal, praesternal
-    presternum, praesternum
-    prestomium, praestomium
-    presympathize, presympathise
-    presympathizes, presympathises
-    presystolic, praesystolic
-    pretaxation, praetaxation
-    pretense's, pretence's
-    pretense, pretence
-    pretenses, pretences
-    pretensive, pretencive
-    preterit's, preterite's
-    preterit, preterite
-    preterits, preterites
-    pretexta's, praetexta's
-    pretexta, praetexta
-    pretextae, praetextae
-    pretorial, praetorial
-    Pretorians, Praetorians
-    pretorium, praetorium
-    Pretorius's, Praetorius's
-    Pretorius, Praetorius
-    pretorship, praetorship
-    preutilizable's, preutilisable's
-    preutilizable, preutilisable
-    preutilizables, preutilisables
-    preutilization's, preutilisation's
-    preutilization, preutilisation
-    preutilizations, preutilisations
-    preutilize, preutilise
-    preutilizes, preutilises
-    preventable, preventible
-    previze, previse
-    prezygapophysis, praezygapophysis
-    pricey, pricy
-    primeval, primaeval
-    primevally, primaevally
-    prioritization's, prioritisation's
-    prioritization, prioritisation
-    prioritizations, prioritisations
-    prioritize, prioritise
-    prioritized, prioritised
-    prioritizer, prioritiser
-    prioritizers, prioritisers
-    prioritizes, prioritises
-    prioritizing, prioritising
-    prioritizings, prioritisings
-    priorization, priorisation
-    priorizations, priorisations
-    priorize, priorise
-    priorized, priorised
-    priorizes, priorises
-    priorizing, priorising
-    privatization's, privatisation's
-    privatization, privatisation
-    privatizations, privatisations
-    privatize, privatise
-    privatized, privatised
-    privatizer, privatiser
-    privatizers, privatisers
-    privatizes, privatises
-    privatizing, privatising
-    prizable, prisable
-    proadvertizing, proadvertising
-    problemize, problemise
-    problemizes, problemises
-    processionize, processionise
-    processionizes, processionises
-    Procrusteanize's, Procrusteanise's
-    Procrusteanize, Procrusteanise
-    Procrusteanizes, Procrusteanises
-    proctodea, proctodaea
-    proctodeal, proctodaeal
-    proctodeum's, proctodaeum's
-    proctodeum, proctodaeum
-    proctodeums, proctodaeums
-    proctorization's, proctorisation's
-    proctorization, proctorisation
-    proctorizations, proctorisations
-    proctorize, proctorise
-    proctorized, proctorised
-    proctorizes, proctorises
-    proctorizing, proctorising
-    prodigalize, prodigalise
-    prodigalized, prodigalised
-    prodigalizes, prodigalises
-    prodigalizing, prodigalising
-    productize, productise
-    productized, productised
-    productizer, productiser
-    productizers, productisers
-    productizes, productises
-    productizing, productising
-    proemium, prooemium
-    profanize, profanise
-    profanizes, profanises
-    profer, profre
-    professionalization's, professionalisation's
-    professionalization, professionalisation
-    professionalizations, professionalisations
-    professionalize, professionalise
-    professionalized, professionalised
-    professionalizes, professionalises
-    professionalizing, professionalising
-    professionize, professionise
-    professionizes, professionises
-    programmer's, programer's
-    programmer, programer
-    programmers, programers
-    proindustrialization, proindustrialisation
-    projectization, projectisation
-    projectizations, projectisations
-    prokaryote's, procaryote's
-    prokaryote, procaryote
-    prokaryotes, procaryotes
-    prokaryotic, procaryotic
-    proletarianization's, proletarianisation's
-    proletarianization, proletarianisation
-    proletarianizations, proletarianisations
-    proletarianize, proletarianise
-    proletarianized, proletarianised
-    proletarianizes, proletarianises
-    proletarianizing, proletarianising
-    proletarize, proletarise
-    proletarized, proletarised
-    proletarizing, proletarising
-    prologize, prologise
-    prologized, prologised
-    prologizes, prologises
-    prologizing, prologising
-    prologue's, prolog's
-    prologue, prolog
-    prologues, prologs
-    prologuize, prologuise
-    prologuized, prologuised
-    prologuizer's, prologuiser's
-    prologuizer, prologuiser
-    prologuizers, prologuisers
-    prologuizes, prologuises
-    prologuizing, prologuising
-    prolusionize, prolusionise
-    prolusionizes, prolusionises
-    pronominalization, pronominalisation
-    pronominalize, pronominalise
-    propagandize, propagandise
-    propagandized, propagandised
-    propagandizes, propagandises
-    propagandizing, propagandising
-    propellant's, propellent's
-    propellant, propellent
-    propellants, propellents
-    prophetize, prophetise
-    prophetizes, prophetises
-    propositionize, propositionise
-    propositionizes, propositionises
-    propretor's, propraetor's
-    propretor, propraetor
-    propretorial, propraetorial
-    propretorian, propraetorian
-    propretors, propraetors
-    propylitization, propylitisation
-    propylitizations, propylitisations
-    propylitize, propylitise
-    propylitized, propylitised
-    propylitizes, propylitises
-    propylitizing, propylitising
-    proselytization's, proselytisation's
-    proselytization, proselytisation
-    proselytizations, proselytisations
-    proselytize, proselytise
-    proselytized, proselytised
-    proselytizer's, proselytiser's
-    proselytizer, proselytiser
-    proselytizers, proselytisers
-    proselytizes, proselytises
-    proselytizing, proselytising
-    proseuche, proseuchae
-    prosocele, prosocoele
-    prosopopeial, prosopopoeial
-    prosopopoeia, prosopopeia
-    prosopopoeias, prosopopeias
-    prostatorrhea, prostatorrhoea
-    protectionize, protectionise
-    protectionizes, protectionises
-    proteide, proteidae
-    Protestantize's, Protestantise's
-    Protestantize, Protestantise
-    Protestantized's, Protestantised's
-    Protestantized, Protestantised
-    Protestantizes, Protestantises
-    Protestantizing's, Protestantising's
-    Protestantizing, Protestantising
-    protester's, protestor's
-    protester, protestor
-    protesters, protestors
-    Prothoenor's, Prothoaenor's
-    Prothoenor, Prothoaenor
-    protoarcheology, protoarchaeology
-    protocoled, protocolled
-    protocoling, protocolling
-    protocolization's, protocolisation's
-    protocolization, protocolisation
-    protocolizations, protocolisations
-    protocolize, protocolise
-    protocolized, protocolised
-    protocolizes, protocolises
-    protocolizing, protocolising
-    proverbialize, proverbialise
-    proverbialized, proverbialised
-    proverbializes, proverbialises
-    proverbializing, proverbialising
-    proverbize, proverbise
-    proverbizes, proverbises
-    provincialization's, provincialisation's
-    provincialization, provincialisation
-    provincializations, provincialisations
-    provincialize, provincialise
-    provincialized, provincialised
-    provincializes, provincialises
-    provincializing, provincialising
-    Prussianization's, Prussianisation's
-    prussianization's, prussianisation's
-    Prussianization, Prussianisation
-    prussianization, prussianisation
-    Prussianizations, Prussianisations
-    Prussianize, Prussianise
-    prussianize, prussianise
-    Prussianized, Prussianised
-    prussianized, prussianised
-    Prussianizer's, Prussianiser's
-    prussianizer's, prussianiser's
-    Prussianizer, Prussianiser
-    prussianizer, prussianiser
-    Prussianizers, Prussianisers
-    Prussianizes, Prussianises
-    prussianizes, prussianises
-    Prussianizing, Prussianising
-    prussianizing, prussianising
-    psalmodize, psalmodise
-    psalmodized, psalmodised
-    psalmodizes, psalmodises
-    psalmodizing, psalmodising
-    pseudelephant, pseudoelephant
-    pseudembryo, pseudoembryo
-    pseudembryonic, pseudoembryonic
-    pseudesthesia, pseudaesthesia
-    pseudhemal, pseudhaemal
-    pseudoanemia's, pseudoanaemia's
-    pseudoanemia, pseudoanaemia
-    pseudoanemias, pseudoanaemias
-    pseudoanemic, pseudoanaemic
-    pseudoanemics, pseudoanaemics
-    pseudocele, pseudocoele
-    pseudocelom, pseudocoelom
-    pseudoedema's, pseudooedema's
-    pseudoedema, pseudooedema
-    pseudoedemas, pseudooedemas
-    pseudographize, pseudographise
-    pseudographizes, pseudographises
-    pseudolunule, pseudolunulae
-    psychoanalyze, psychoanalyse
-    psychoanalyzed, psychoanalysed
-    psychoanalyzer's, psychoanalyser's
-    psychoanalyzer, psychoanalyser
-    psychoanalyzers, psychoanalysers
-    psychoanalyzes, psychoanalyses
-    psychoanalyzing, psychoanalysing
-    psychologization, psychologisation
-    psychologize, psychologise
-    psychologized, psychologised
-    psychologizes, psychologises
-    psychologizing, psychologising
-    Ptolemean's, Ptolemaean's
-    Ptolemean, Ptolemaean
-    ptyalize, ptyalise
-    ptyalized, ptyalised
-    ptyalizes, ptyalises
-    ptyalizing, ptyalising
-    publice, publicae
-    publicize, publicise
-    publicized, publicised
-    publicizes, publicises
-    publicizing, publicising
-    puebloization's, puebloisation's
-    puebloization, puebloisation
-    puebloizations, puebloisations
-    puebloize, puebloise
-    puebloizes, puebloises
-    puers, pures
-    pulicide, pulicidae
-    Pullmanize's, Pullmanise's
-    Pullmanize, Pullmanise
-    Pullmanizes, Pullmanises
-    pulpitize, pulpitise
-    pulpitizes, pulpitises
-    pulverizable's, pulverisable's
-    pulverizable, pulverisable
-    pulverizabler, pulverisabler
-    pulverizables, pulverisables
-    pulverizablest, pulverisablest
-    pulverization's, pulverisation's
-    pulverization, pulverisation
-    pulverizations, pulverisations
-    pulverize, pulverise
-    pulverized, pulverised
-    pulverizer's, pulveriser's
-    pulverizer, pulveriser
-    pulverizers, pulverisers
-    pulverizes, pulverises
-    pulverizing, pulverising
-    pulvilized, pulvilised
-    pummeled, pummelled
-    pummeler, pummeller
-    pummeling, pummelling
-    pumpkin's, punkin's
-    pumpkin, punkin
-    pumpkins, punkins
-    pupilize, pupilise
-    pupilizes, pupilises
-    puppetize, puppetise
-    puppetizes, puppetises
-    Puritanize's, Puritanise's
-    Puritanize, Puritanise
-    puritanize, puritanise
-    puritanized, puritanised
-    Puritanizer's, Puritaniser's
-    Puritanizer, Puritaniser
-    Puritanizers, Puritanisers
-    Puritanizes, Puritanises
-    puritanizes, puritanises
-    puritanizing, puritanising
-    pyemia's, pyaemia's
-    pyemia, pyaemia
-    pyemias, pyaemias
-    pyemic, pyaemic
-    pygmean, pygmaean
-    pygmies, pigmies
-    pygmy's, pigmy's
-    pygmy, pigmy
-    pyorrhea's, pyorrhoea's
-    pyorrhea, pyorrhoea
-    pyorrheal, pyorrhoeal
-    pyorrhealer, pyorrhoealer
-    pyorrhealest, pyorrhoealest
-    pyorrheas, pyorrhoeas
-    pyorrheic, pyorrhoeic
-    pyramidize, pyramidise
-    pyramidizes, pyramidises
-    Pyrenean, Pyrenaean
-    Pyreneus's, Pyrenaeus's
-    Pyreneus, Pyrenaeus
-    pyridinize, pyridinise
-    pyridinizes, pyridinises
-    pyritization's, pyritisation's
-    pyritization, pyritisation
-    pyritizations, pyritisations
-    pyritize, pyritise
-    pyritized, pyritised
-    pyritizes, pyritises
-    pyritizing, pyritising
-    pyrolyzable, pyrolysable
-    pyrolyzate's, pyrolysate's
-    pyrolyzate, pyrolysate
-    pyrolyzates, pyrolysates
-    pyrolyze's, pyrolyse's
-    pyrolyze, pyrolyse
-    pyrolyzed, pyrolysed
-    pyrolyzer, pyrolyser
-    pyrolyzes, pyrolyses
-    pyrolyzing, pyrolysing
-    Pythagoreanize's, Pythagoreanise's
-    Pythagoreanize, Pythagoreanise
-    Pythagoreanizes, Pythagoreanises
-    pythonine, pythoninae
-    pythonize, pythonise
-    pythonizes, pythonises
-    quadriphonic, quadrophonic
-    quadriphonics, quadrophonics
-    quaestor's, questor's
-    quaestor, questor
-    quaestors, questors
-    quahog's, quahaug's
-    quahog, quahaug
-    quahogs, quahaugs
-    Quakerization's, Quakerisation's
-    Quakerization, Quakerisation
-    Quakerizations, Quakerisations
-    Quakerize's, Quakerise's
-    Quakerize, Quakerise
-    Quakerizes, Quakerises
-    quantization's, quantisation's
-    quantization, quantisation
-    quantizations, quantisations
-    quantize, quantise
-    quantized, quantised
-    quantizer's, quantiser's
-    quantizer, quantiser
-    quantizers, quantisers
-    quantizes, quantises
-    quantizing, quantising
-    quarreled, quarrelled
-    quarreler's, quarreller's
-    quarreler, quarreller
-    quarrelers, quarrellers
-    quarreling, quarrelling
-    quarrelous, quarrellous
-    quarterization's, quarterisation's
-    quarterization, quarterisation
-    quarterizations, quarterisations
-    quartet's, quartette's
-    quartet, quartette
-    quartets, quartettes
-    quaters, quatres
-    que, quae
-    querele, querelae
-    questionaries, quaestionaries
-    questionary, quaestionary
-    questorial, quaestorial
-    questorship's, quaestorship's
-    questorship, quaestorship
-    queuing, queueing
-    quininize, quininise
-    quininizes, quininises
-    quintessentialize, quintessentialise
-    quintessentialized, quintessentialised
-    quintessentializes, quintessentialises
-    quintessentializing, quintessentialising
-    quintet's, quintette's
-    quintet, quintette
-    quintets, quintettes
-    Quran's, Qur'an's
-    Quran, Qur'an
-    Quranic, Qur'anic
-    Qurans, Qur'ans
-    raccoon's, racoon's
-    raccoon, racoon
-    raccoons, racoons
-    racemization's, racemisation's
-    racemization, racemisation
-    racemizations, racemisations
-    racemize, racemise
-    racemized, racemised
-    racemizes, racemises
-    racemizing, racemising
-    racialization's, racialisation's
-    racialization, racialisation
-    racializations, racialisations
-    racialize, racialise
-    racializes, racialises
-    Radborne's, Radbourne's
-    Radborne, Radbourne
-    radialization's, radialisation's
-    radialization, radialisation
-    radializations, radialisations
-    radialize, radialise
-    radialized, radialised
-    radializes, radialises
-    radializing, radialising
-    radicalization's, radicalisation's
-    radicalization, radicalisation
-    radicalizations, radicalisations
-    radicalize, radicalise
-    radicalized, radicalised
-    radicalizes, radicalises
-    radicalizing, radicalising
-    radiopasteurization, radiopasteurisation
-    radiosensitize, radiosensitise
-    radiosensitized, radiosensitised
-    radiosensitizes, radiosensitises
-    radiosensitizing, radiosensitising
-    radiosterilization, radiosterilisation
-    radiosterilize, radiosterilise
-    radiosterilized, radiosterilised
-    radiosterilizes, radiosterilises
-    radiosterilizing, radiosterilising
-    radiumization's, radiumisation's
-    radiumization, radiumisation
-    radiumizations, radiumisations
-    radiumize, radiumise
-    radiumizes, radiumises
-    rajah's, raja's
-    rajah, raja
-    rajahs, rajas
-    Rame's, Ramae's
-    Rame, Ramae
-    ramekin's, ramequin's
-    ramekin, ramequin
-    ramekins, ramequins
-    rampier, rampire
-    rancor's, rancour's
-    rancor, rancour
-    rancors, rancours
-    randomization's, randomisation's
-    randomization, randomisation
-    randomizations, randomisations
-    randomize, randomise
-    randomized, randomised
-    randomizer's, randomiser's
-    randomizer, randomiser
-    randomizers, randomisers
-    randomizes, randomises
-    randomizing, randomising
-    ranee's, rani's
-    ranee, rani
-    ranees, ranis
-    raphe, raphae
-    raphide, raphidae
-    rapturize, rapturise
-    rapturized, rapturised
-    rapturizes, rapturises
-    rapturizing, rapturising
-    rascalize, rascalise
-    rascalizes, rascalises
-    rationalizable's, rationalisable's
-    rationalizable, rationalisable
-    rationalizables, rationalisables
-    rationalization's, rationalisation's
-    rationalization, rationalisation
-    rationalizations, rationalisations
-    rationalize, rationalise
-    rationalized, rationalised
-    rationalizer's, rationaliser's
-    rationalizer, rationaliser
-    rationalizers, rationalisers
-    rationalizes, rationalises
-    rationalizing, rationalising
-    ratite, ratitae
-    ratline's, ratlin's
-    ratlines, ratlins
-    raveler's, raveller's
-    raveler, raveller
-    ravelers, ravellers
-    reacclimatization's, reacclimatisation's
-    reacclimatization, reacclimatisation
-    reacclimatizations, reacclimatisations
-    reacclimatize, reacclimatise
-    reacclimatized, reacclimatised
-    reacclimatizes, reacclimatises
-    reacclimatizing, reacclimatising
-    reactualize, reactualise
-    reactualizes, reactualises
-    readvertize, readvertise
-    readvertized, readvertised
-    readvertizing, readvertising
-    realisticize, realisticise
-    realisticizes, realisticises
-    realizabilities, realisabilities
-    realizability's, realisability's
-    realizability, realisability
-    realizable, realisable
-    realizableness's, realisableness's
-    realizableness, realisableness
-    realizabler, realisabler
-    realizables, realisables
-    realizablest, realisablest
-    realizablies, realisablies
-    realizably, realisably
-    realization's, realisation's
-    realization, realisation
-    realizations, realisations
-    realize, realise
-    realized, realised
-    realizer's, realiser's
-    realizer, realiser
-    realizers, realisers
-    realizes, realises
-    realizing's, realising's
-    realizing, realising
-    realizingly, realisingly
-    realizings, realisings
-    reanalyze, reanalyse
-    reanalyzed, reanalysed
-    reanalyzer, reanalyser
-    reanalyzers, reanalysers
-    reanalyzes, reanalyses
-    reanalyzing, reanalysing
-    reanimalize, reanimalise
-    reanimalizes, reanimalises
-    reapologize, reapologise
-    reapologizes, reapologises
-    reauthorization's, reauthorisation's
-    reauthorization, reauthorisation
-    reauthorizations, reauthorisations
-    reauthorize, reauthorise
-    reauthorizes, reauthorises
-    rebaptization's, rebaptisation's
-    rebaptization, rebaptisation
-    rebaptizations, rebaptisations
-    rebaptize, rebaptise
-    rebaptized, rebaptised
-    rebaptizes, rebaptises
-    rebaptizing, rebaptising
-    rebourbonize, rebourbonise
-    rebourbonizes, rebourbonises
-    rebrutalize, rebrutalise
-    rebrutalizes, rebrutalises
-    recanalization, recanalisation
-    recapitalization's, recapitalisation's
-    recapitalization, recapitalisation
-    recapitalizations, recapitalisations
-    recapitalize, recapitalise
-    recapitalized, recapitalised
-    recapitalizes, recapitalises
-    recapitalizing, recapitalising
-    recarbonization's, recarbonisation's
-    recarbonization, recarbonisation
-    recarbonizations, recarbonisations
-    recarbonize, recarbonise
-    recarbonizer, recarboniser
-    recarbonizers, recarbonisers
-    recarbonizes, recarbonises
-    recategorized, recategorised
-    recausticize, recausticise
-    recausticizes, recausticises
-    recentralization's, recentralisation's
-    recentralization, recentralisation
-    recentralizations, recentralisations
-    recentralize, recentralise
-    recentralizes, recentralises
-    recercele, recercelae
-    reciprocalize, reciprocalise
-    reciprocalizes, reciprocalises
-    recivilization's, recivilisation's
-    recivilization, recivilisation
-    recivilizations, recivilisations
-    recivilize, recivilise
-    recivilizes, recivilises
-    recognizability, recognisability
-    recognizable, recognisable
-    recognizabler, recognisabler
-    recognizablest, recognisablest
-    recognizably, recognisably
-    recognizance's, recognisance's
-    recognizance, recognisance
-    recognizances, recognisances
-    recognize, recognise
-    recognized, recognised
-    recognizedlies, recognisedlies
-    recognizedly, recognisedly
-    recognizer's, recogniser's
-    recognizer, recogniser
-    recognizers, recognisers
-    recognizes, recognises
-    recognizing, recognising
-    recognizinglies, recognisinglies
-    recognizingly, recognisingly
-    recolonization's, recolonisation's
-    recolonization, recolonisation
-    recolonizations, recolonisations
-    recolonize, recolonise
-    recolonized, recolonised
-    recolonizes, recolonises
-    recolonizing, recolonising
-    recolor's, recolour's
-    recolor, recolour
-    recoloration's, recolouration's
-    recoloration, recolouration
-    recolorations, recolourations
-    recolored, recoloured
-    recoloring, recolouring
-    recolors, recolours
-    reconceptualization, reconceptualisation
-    reconceptualizing, reconceptualising
-    reconnoiter's, reconnoitre's
-    reconnoiter, reconnoitre
-    reconnoitered, reconnoitred
-    reconnoiterer's, reconnoitrer's
-    reconnoiterer, reconnoitrer
-    reconnoiterers, reconnoitrers
-    reconnoitering, reconnoitring
-    reconnoiters, reconnoitres
-    recriticize, recriticise
-    recriticizes, recriticises
-    recrystallization's, recrystallisation's
-    recrystallization, recrystallisation
-    recrystallizations, recrystallisations
-    recrystallize, recrystallise
-    recrystallized, recrystallised
-    recrystallizes, recrystallises
-    recrystallizing, recrystallising
-    redialed, redialled
-    redialer, redialler
-    redialing, redialling
-    redisseize, redisseise
-    redisseizin, redisseisin
-    reedified, reaedified
-    reedifies, reaedifies
-    reedify, reaedify
-    reedifying, reaedifying
-    reemphasize, reemphasise
-    reemphasized, reemphasised
-    reemphasizer, reemphasiser
-    reemphasizers, reemphasisers
-    reemphasizes, reemphasises
-    reemphasizing, reemphasising
-    reentrance's, reaentrance's
-    reentrance, reaentrance
-    reexportation's, reaexportation's
-    reexportation, reaexportation
-    reexporter's, reaexporter's
-    reexporter, reaexporter
-    refavor's, refavour's
-    refavor, refavour
-    refavors, refavours
-    refertilization's, refertilisation's
-    refertilization, refertilisation
-    refertilizations, refertilisations
-    refertilize, refertilise
-    refertilizes, refertilises
-    reflectorize's, reflectorise's
-    reflectorize, reflectorise
-    reflectorized, reflectorised
-    reflectorizes, reflectorises
-    reflectorizing, reflectorising
-    reforestization's, reforestisation's
-    reforestization, reforestisation
-    reforestize, reforestise
-    reforestizes, reforestises
-    reformades, reformadoes
-    refueled, refuelled
-    refueling, refuelling
-    regalize, regalise
-    regalizes, regalises
-    regalvanization's, regalvanisation's
-    regalvanization, regalvanisation
-    regalvanizations, regalvanisations
-    regalvanize, regalvanise
-    regalvanizes, regalvanises
-    reges, regoes
-    regionalization's, regionalisation's
-    regionalization, regionalisation
-    regionalizations, regionalisations
-    regionalize, regionalise
-    regionalized, regionalised
-    regionalizes, regionalises
-    regionalizing, regionalising
-    regularization's, regularisation's
-    regularization, regularisation
-    regularizations, regularisations
-    regularize, regularise
-    regularized, regularised
-    regularizer's, regulariser's
-    regularizer, regulariser
-    regularizers, regularisers
-    regularizes, regularises
-    regularizing, regularising
-    regulize, regulise
-    regulized, regulised
-    regulizes, regulises
-    regulizing, regulising
-    reharmonization, reharmonisation
-    reharmonize, reharmonise
-    reharmonizes, reharmonises
-    Rehm's, Roehm's
-    Rehm, Roehm
-    rehonor's, rehonour's
-    rehonor, rehonour
-    rehonors, rehonours
-    rehumanization's, rehumanisation's
-    rehumanization, rehumanisation
-    rehumanize, rehumanise
-    rehumanizes, rehumanises
-    rehybridize, rehybridise
-    rehybridizes, rehybridises
-    reindustrialization, reindustrialisation
-    reindustrializations, reindustrialisations
-    reindustrialize, reindustrialise
-    reindustrialized, reindustrialised
-    reindustrializes, reindustrialises
-    reindustrializing, reindustrialising
-    reinforce, reenforce
-    reinforceable, reenforceable
-    reinforced, reenforced
-    reinforces, reenforces
-    reinforcing, reenforcing
-    reinitialization, reinitialisation
-    reinitialize, reinitialise
-    reinitialized, reinitialised
-    reinitializes, reinitialises
-    reinitializing, reinitialising
-    reitemize, reitemise
-    reitemizes, reitemises
-    rejuvenize, rejuvenise
-    rejuvenized, rejuvenised
-    rejuvenizes, rejuvenises
-    rejuvenizing, rejuvenising
-    relabeled, relabelled
-    relabeler, relabeller
-    relabelers, relabellers
-    relabeling, relabelling
-    relativization's, relativisation's
-    relativization, relativisation
-    relativizations, relativisations
-    relativize, relativise
-    relativized, relativised
-    relativizes, relativises
-    relativizing, relativising
-    religionize, religionise
-    religionized, religionised
-    religionizes, religionises
-    religionizing, religionising
-    remagnetization's, remagnetisation's
-    remagnetization, remagnetisation
-    remagnetizations, remagnetisations
-    remagnetize, remagnetise
-    remagnetizes, remagnetises
-    rematerialize, rematerialise
-    rematerialized, rematerialised
-    rematerializes, rematerialises
-    rememorize, rememorise
-    rememorizes, rememorises
-    remilitarization's, remilitarisation's
-    remilitarization, remilitarisation
-    remilitarizations, remilitarisations
-    remilitarize, remilitarise
-    remilitarized, remilitarised
-    remilitarizes, remilitarises
-    remilitarizing, remilitarising
-    remineralization's, remineralisation's
-    remineralization, remineralisation
-    remineralizations, remineralisations
-    remineralize, remineralise
-    remineralized, remineralised
-    remineralizes, remineralises
-    remineralizing, remineralising
-    remobilization's, remobilisation's
-    remobilization, remobilisation
-    remobilizations, remobilisations
-    remobilize, remobilise
-    remobilizes, remobilises
-    remodeled, remodelled
-    remodeling, remodelling
-    remold, remould
-    remolded, remoulded
-    remolding, remoulding
-    remolds, remoulds
-    remonetization's, remonetisation's
-    remonetization, remonetisation
-    remonetizations, remonetisations
-    remonetize, remonetise
-    remonetized, remonetised
-    remonetizes, remonetises
-    remonetizing, remonetising
-    remoralization, remoralisation
-    remoralizations, remoralisations
-    remoralize, remoralise
-    remoralized, remoralised
-    remoralizes, remoralises
-    remoralizing, remoralising
-    renationalize, renationalise
-    renationalized, renationalised
-    renationalizes, renationalises
-    renationalizing, renationalising
-    rencounter, rencontre
-    Renferd's, Renfred's
-    Renferd, Renfred
-    renormalization's, renormalisation's
-    renormalization, renormalisation
-    renormalizations, renormalisations
-    renormalize, renormalise
-    renormalized, renormalised
-    renormalizes, renormalises
-    renormalizing, renormalising
-    reobjectivization's, reobjectivisation's
-    reobjectivization, reobjectivisation
-    reobjectivizations, reobjectivisations
-    reobjectivize, reobjectivise
-    reobjectivizes, reobjectivises
-    reorganization's, reorganisation's
-    reorganization, reorganisation
-    reorganizational, reorganisational
-    reorganizationist's, reorganisationist's
-    reorganizationist, reorganisationist
-    reorganizationists, reorganisationists
-    reorganizations, reorganisations
-    reorganize, reorganise
-    reorganized, reorganised
-    reorganizer's, reorganiser's
-    reorganizer, reorganiser
-    reorganizers, reorganisers
-    reorganizes, reorganises
-    reorganizing, reorganising
-    reoxidize, reoxidise
-    reoxidized, reoxidised
-    reoxidizes, reoxidises
-    reoxidizing, reoxidising
-    reoxygenize, reoxygenise
-    reoxygenizes, reoxygenises
-    repaganization's, repaganisation's
-    repaganization, repaganisation
-    repaganizations, repaganisations
-    repaganize, repaganise
-    repaganizer, repaganiser
-    repaganizers, repaganisers
-    repaganizes, repaganises
-    repatronize, repatronise
-    repatronizes, repatronises
-    repellent's, repellant's
-    repellent, repellant
-    repellents, repellants
-    repersonalize, repersonalise
-    rephosphorization's, rephosphorisation's
-    rephosphorization, rephosphorisation
-    rephosphorizations, rephosphorisations
-    rephosphorize, rephosphorise
-    rephosphorizes, rephosphorises
-    repolymerization's, repolymerisation's
-    repolymerization, repolymerisation
-    repolymerizations, repolymerisations
-    repolymerize, repolymerise
-    repolymerizes, repolymerises
-    repopularize, repopularise
-    reprivatization's, reprivatisation's
-    reprivatization, reprivatisation
-    reprivatizations, reprivatisations
-    reprivatize, reprivatise
-    reprivatized, reprivatised
-    reprivatizes, reprivatises
-    reprivatizing, reprivatising
-    reprized, reprised
-    reprogram, reprogramme
-    reprograms, reprogrammes
-    republicanization's, republicanisation's
-    republicanization, republicanisation
-    republicanizations, republicanisations
-    republicanize, republicanise
-    republicanized, republicanised
-    republicanizer's, republicaniser's
-    republicanizer, republicaniser
-    republicanizers, republicanisers
-    republicanizes, republicanises
-    republicanizing, republicanising
-    repulverize, repulverise
-    repulverizes, repulverises
-    reroyalize, reroyalise
-    reroyalizes, reroyalises
-    reseize, reseise
-    reseizer, reseiser
-    resensitization's, resensitisation's
-    resensitization, resensitisation
-    resensitizations, resensitisations
-    resensitize, resensitise
-    resensitizes, resensitises
-    resepulcher, resepulchre
-    resepulchers, resepulchres
-    reshes, reshoes
-    resinize, resinise
-    resinized, resinised
-    resinizes, resinises
-    resinizing, resinising
-    resolemnize, resolemnise
-    resolemnizes, resolemnises
-    respectabilize, respectabilise
-    respectabilized, respectabilised
-    respectabilizes, respectabilises
-    respectabilizing, respectabilising
-    restandardization's, restandardisation's
-    restandardization, restandardisation
-    restandardizations, restandardisations
-    restandardize, restandardise
-    restandardizes, restandardises
-    restaurateur's, restauranteur's
-    restaurateur, restauranteur
-    restaurateurs, restauranteurs
-    resterilize, resterilise
-    resterilizes, resterilises
-    restigmatize, restigmatise
-    restigmatizes, restigmatises
-    resurrectionize, resurrectionise
-    resurrectionized, resurrectionised
-    resurrectionizes, resurrectionises
-    resurrectionizing, resurrectionising
-    resymbolization's, resymbolisation's
-    resymbolization, resymbolisation
-    resymbolizations, resymbolisations
-    resymbolize, resymbolise
-    resymbolizes, resymbolises
-    resynchronization's, resynchronisation's
-    resynchronization, resynchronisation
-    resynchronizations, resynchronisations
-    resynchronize, resynchronise
-    resynchronized, resynchronised
-    resynchronizes, resynchronises
-    resynchronizing, resynchronising
-    resynthesize, resynthesise
-    resynthesizes, resynthesises
-    retinize, retinise
-    retinizes, retinises
-    retinule, retinulae
-    retranquilize, retranquilise
-    retranquilizes, retranquilises
-    retrocecal, retrocaecal
-    reutilization's, reutilisation's
-    reutilization, reutilisation
-    reutilize, reutilise
-    reutilized, reutilised
-    reutilizes, reutilises
-    reutilizing, reutilising
-    revalorization's, revalorisation's
-    revalorization, revalorisation
-    revalorizations, revalorisations
-    revalorize, revalorise
-    revalorized, revalorised
-    revalorizes, revalorises
-    revalorizing, revalorising
-    revaporization's, revapourisation's
-    revaporization, revapourisation
-    revaporizations, revapourisations
-    revaporize, revaporise
-    revaporizes, revaporises
-    revelationize, revelationise
-    revelationizes, revelationises
-    reveled, revelled
-    reveler's, reveller's
-    reveler, reveller
-    revelers, revellers
-    reveling, revelling
-    revelings, revellings
-    reverie's, revery's
-    reverie, revery
-    revigor, revigour
-    revisualization's, revisualisation's
-    revisualization, revisualisation
-    revisualizations, revisualisations
-    revisualize, revisualise
-    revisualizes, revisualises
-    revitalization's, revitalisation's
-    revitalization, revitalisation
-    revitalizations, revitalisations
-    revitalize, revitalise
-    revitalized, revitalised
-    revitalizer, revitaliser
-    revitalizers, revitalisers
-    revitalizes, revitalises
-    revitalizing, revitalising
-    revivalize, revivalise
-    revivalizes, revivalises
-    revocable, revokable
-    revolatilize, revolatilise
-    revolatilizes, revolatilises
-    revolutionize, revolutionise
-    revolutionized, revolutionised
-    revolutionizement's, revolutionisement's
-    revolutionizement, revolutionisement
-    revolutionizements, revolutionisements
-    revolutionizer's, revolutioniser's
-    revolutionizer, revolutioniser
-    revolutionizers, revolutionisers
-    revolutionizes, revolutionises
-    revolutionizing, revolutionising
-    Rexford's, Rexfourd's
-    Rexford, Rexfourd
-    rhaphe, rhaphae
-    rhapsodize, rhapsodise
-    rhapsodized, rhapsodised
-    rhapsodizes, rhapsodises
-    rhapsodizing, rhapsodising
-    rheadine, rhoeadine
-    rhebosis, rhaebosis
-    Rhetian's, Rhaetian's
-    Rhetian, Rhaetian
-    Rhetic, Rhaetic
-    rhetorize, rhetorise
-    rhetorized, rhetorised
-    rhetorizes, rhetorises
-    rhetorizing, rhetorising
-    rheumatize, rheumatise
-    rheumatized, rheumatised
-    rheumatizes, rheumatises
-    rheumatizing, rheumatising
-    rhinocele, rhinocoele
-    rhinocelian, rhinocoelian
-    rhinorrhea, rhinorrhoea
-    rhinorrheal, rhinorrhoeal
-    rhodanize, rhodanise
-    rhodanized, rhodanised
-    rhodanizes, rhodanises
-    rhodanizing, rhodanising
-    rhotacize, rhotacise
-    rhotacized, rhotacised
-    rhotacizes, rhotacises
-    rhotacizing, rhotacising
-    rhythmicize, rhythmicise
-    rhythmicizes, rhythmicises
-    rhythmizable's, rhythmisable's
-    rhythmizable, rhythmisable
-    rhythmizables, rhythmisables
-    rhythmization's, rhythmisation's
-    rhythmization, rhythmisation
-    rhythmizations, rhythmisations
-    rhythmize, rhythmise
-    rhythmized, rhythmised
-    rhythmizes, rhythmises
-    rhythmizing, rhythmising
-    rickshaw's, ricksha's
-    rickshaw, ricksha
-    rickshaws, rickshas
-    ridiculize, ridiculise
-    ridiculizes, ridiculises
-    rigidize, rigidise
-    rigidized, rigidised
-    rigidizes, rigidises
-    rigidizing, rigidising
-    rigmarole's, rigamarole's
-    rigmarole, rigamarole
-    rigmaroles, rigamaroles
-    rigor's, rigour's
-    rigor, rigour
-    rigorism's, rigourism's
-    rigorism, rigourism
-    rigorist's, rigourist's
-    rigorist, rigourist
-    rigoristic, rigouristic
-    rigors, rigours
-    riotize, riotise
-    riotizes, riotises
-    riposte's, ripost's
-    riposte, ripost
-    ripostes, riposts
-    ritornelle, ritournelle
-    ritornelles, ritournelles
-    ritualization's, ritualisation's
-    ritualization, ritualisation
-    ritualizations, ritualisations
-    ritualize, ritualise
-    ritualized, ritualised
-    ritualizes, ritualises
-    ritualizing, ritualising
-    rivaled, rivalled
-    rivaless's, rivalless's
-    rivaless, rivalless
-    rivalesses, rivallesses
-    rivaling, rivalling
-    rivalize, rivalise
-    rivalized, rivalised
-    rivalizes, rivalises
-    rivalizing, rivalising
-    robotization's, robotisation's
-    robotization, robotisation
-    robotizations, robotisations
-    robotize, robotise
-    robotized, robotised
-    robotizes, robotises
-    robotizing, robotising
-    roed, rooed
-    Roentgen, Rˆntgen
-    roentgenize, roentgenise
-    roer, rore
-    Romania's, Roumania's
-    Romania, Roumania
-    Romanias, Roumanias
-    Romanization's, Romanisation's
-    Romanization, Romanisation
-    Romanizations, Romanisations
-    Romanize, Romanise
-    romanize, romanise
-    Romanized, Romanised
-    romanized, romanised
-    Romanizer's, Romaniser's
-    Romanizer, Romaniser
-    Romanizers, Romanisers
-    Romanizes, Romanises
-    romanizes, romanises
-    Romanizing, Romanising
-    romanizing, romanising
-    romanticization's, romanticisation's
-    romanticization, romanticisation
-    romanticizations, romanticisations
-    romanticize, romanticise
-    romanticized, romanticised
-    romanticizes, romanticises
-    romanticizing, romanticising
-    ropy, ropey
-    routinization's, routinisation's
-    routinization, routinisation
-    routinizations, routinisations
-    routinize, routinise
-    routinized, routinised
-    routinizes, routinises
-    routinizing, routinising
-    roweled, rowelled
-    roweling, rowelling
-    royalization's, royalisation's
-    royalization, royalisation
-    royalizations, royalisations
-    royalize, royalise
-    royalized, royalised
-    royalizes, royalises
-    royalizing, royalising
-    rubberization, rubberisation
-    rubberize, rubberise
-    rubberized, rubberised
-    rubberizes, rubberises
-    rubberizing, rubberising
-    ruble's, rouble's
-    ruble, rouble
-    rubles, roubles
-    rubricize, rubricise
-    rubricizes, rubricises
-    ruffianize, ruffianise
-    ruffianizes, ruffianises
-    ruggedization's, ruggedisation's
-    ruggedization, ruggedisation
-    ruggedizations, ruggedisations
-    ruggedize, ruggedise
-    ruggedized, ruggedised
-    ruggedizes, ruggedises
-    ruggedizing, ruggedising
-    rumor's, rumour's
-    rumor, rumour
-    rumored, rumoured
-    rumorer's, rumourer's
-    rumorer, rumourer
-    rumorers, rumourers
-    rumoring, rumouring
-    rumormonger's, rumourmonger's
-    rumormonger, rumourmonger
-    rumormongers, rumourmongers
-    rumors, rumours
-    ruralization's, ruralisation's
-    ruralization, ruralisation
-    ruralizations, ruralisations
-    ruralize, ruralise
-    ruralized, ruralised
-    ruralizes, ruralises
-    ruralizing, ruralising
-    Russianization's, Russianisation's
-    Russianization, Russianisation
-    russianization, russianisation
-    Russianizations, Russianisations
-    Russianize, Russianise
-    russianize, russianise
-    Russianized, Russianised
-    Russianizes, Russianises
-    Russianizing, Russianising
-    rusticize, rusticise
-    rusticized, rusticised
-    rusticizes, rusticises
-    rusticizing, rusticising
-    Sabbathize's, Sabbathise's
-    Sabbathize, Sabbathise
-    Sabbathizes, Sabbathises
-    sabbatize, sabbatise
-    sabbatized, sabbatised
-    sabbatizes, sabbatises
-    sabbatizing, sabbatising
-    Sabean, Sabaean
-    Sabeans, Sabaeans
-    saber's, sabre's
-    saber, sabre
-    saberbill, sabrebill
-    sabered, sabred
-    sabering, sabring
-    saberlike's, sabrelike's
-    saberlike, sabrelike
-    saberlikes, sabrelikes
-    sabers, sabres
-    sabertooth, sabretooth
-    saccharization, saccharisation
-    saccharizations, saccharisations
-    saccharize, saccharise
-    saccharized, saccharised
-    saccharizes, saccharises
-    saccharizing, saccharising
-    sacerdotalize, sacerdotalise
-    sacerdotalized, sacerdotalised
-    sacerdotalizes, sacerdotalises
-    sacerdotalizing, sacerdotalising
-    sacralization's, sacralisation's
-    sacralization, sacralisation
-    sacralizations, sacralisations
-    sacralize, sacralise
-    sacralized, sacralised
-    sacralizes, sacralises
-    sacralizing, sacralising
-    sacramentize, sacramentise
-    sacramentizes, sacramentises
-    Safier's, Safire's
-    Safier, Safire
-    sailorizing's, sailorising's
-    sailorizing, sailorising
-    sailorizings, sailorisings
-    sake's, saki's
-    sake, saki
-    sakes, sakis
-    salable, saleable
-    salabler, saleabler
-    salablest, saleablest
-    salinization, salinisation
-    salinize, salinise
-    salinizes, salinises
-    saltiers, saltires
-    saltierwise, saltirewise
-    saltpeter's, saltpetre's
-    saltpeter, saltpetre
-    saltpeters, saltpetres
-    sanctuarize, sanctuarise
-    sanctuarized, sanctuarised
-    sanctuarizes, sanctuarises
-    sanctuarizing, sanctuarising
-    sandaled, sandalled
-    sandaling, sandalling
-    Sanferd's, Sanfred's
-    Sanferd, Sanfred
-    Sanforize, Sanforise
-    Sanforizes, Sanforises
-    Sanforizing, Sanforising
-    sanitization's, sanitisation's
-    sanitization, sanitisation
-    sanitizations, sanitisations
-    sanitize, sanitise
-    sanitized, sanitised
-    sanitizer's, sanitiser's
-    sanitizer, sanitiser
-    sanitizers, sanitisers
-    sanitizes, sanitises
-    sanitizing, sanitising
-    Sanskritize's, Sanskritise's
-    Sanskritize, Sanskritise
-    sapientize, sapientise
-    sapientizes, sapientises
-    sapor, sapour
-    sapors, sapours
-    sapremia's, sapraemia's
-    sapremia, sapraemia
-    sapremias, sapraemias
-    sapremic, sapraemic
-    sarcine, sarcinae
-    sari's, saree's
-    sari, saree
-    saris, sarees
-    Sassanide, Sassanidae
-    satanize, satanise
-    satanizes, satanises
-    satellitize, satellitise
-    satellitized, satellitised
-    satellitizes, satellitises
-    satellitizing, satellitising
-    satinize, satinise
-    satinizes, satinises
-    satirizable's, satirisable's
-    satirizable, satirisable
-    satirizables, satirisables
-    satirization, satirisation
-    satirize, satirise
-    satirized, satirised
-    satirizer's, satiriser's
-    satirizer, satiriser
-    satirizers, satirisers
-    satirizes, satirises
-    satirizing, satirising
-    sative, sativae
-    savable, saveable
-    savagize, savagise
-    savagizes, savagises
-    savanna's, savannah's
-    savanna, savannah
-    savannas, savannahes
-    savior's, saviour's
-    savior, saviour
-    savioress, saviouress
-    saviorhood's, saviourhood's
-    saviorhood, saviourhood
-    saviorhoods, saviourhoods
-    saviors, saviours
-    saviorship's, saviourship's
-    saviorship, saviourship
-    saviorships, saviourships
-    savor's, savour's
-    savor, savour
-    savored, savoured
-    savorer's, savourer's
-    savorer, savourer
-    savorers, savourers
-    savorier, savourier
-    savories, savouries
-    savoriest, savouriest
-    savorilies, savourilies
-    savorily, savourily
-    savoriness's, savouriness's
-    savoriness, savouriness
-    savorinesses, savourinesses
-    savoring, savouring
-    savoringlier, savouringlier
-    savoringlies, savouringlies
-    savoringliest, savouringliest
-    savoringly, savouringly
-    savorless, savourless
-    savorlesser, savourlesser
-    savorlesses, savourlesses
-    savorlessest, savourlessest
-    savorly, savourly
-    savorous, savourous
-    savorouser, savourouser
-    savorousest, savourousest
-    savors, savours
-    savory's, savoury's
-    savory, savoury
-    Saxonization's, Saxonisation's
-    Saxonization, Saxonisation
-    Saxonizations, Saxonisations
-    Saxonize's, Saxonise's
-    Saxonize, Saxonise
-    Saxonized's, Saxonised's
-    Saxonized, Saxonised
-    Saxonizes, Saxonises
-    Saxonizing's, Saxonising's
-    Saxonizing, Saxonising
-    scalawag's, scallywag's
-    scalawag, scallywag
-    scalawags, scallywags
-    scallop's, scollop's
-    scallop, scollop
-    scalloped, scolloped
-    scalloping, scolloping
-    scallops, scollops
-    scandaled, scandalled
-    scandaling, scandalling
-    scandalization's, scandalisation's
-    scandalization, scandalisation
-    scandalizations, scandalisations
-    scandalize, scandalise
-    scandalized, scandalised
-    scandalizer's, scandaliser's
-    scandalizer, scandaliser
-    scandalizers, scandalisers
-    scandalizes, scandalises
-    scandalizing, scandalising
-    scaped, scapaed
-    scary, scarey
-    scena, scaena
-    scenarioization's, scenarioisation's
-    scenarioization, scenarioisation
-    scenarioizations, scenarioisations
-    scenarioize, scenarioise
-    scenarioizes, scenarioises
-    scenarization's, scenarisation's
-    scenarization, scenarisation
-    scenarizations, scenarisations
-    scenarize, scenarise
-    scenarized, scenarised
-    scenarizes, scenarises
-    scenarizing, scenarising
-    scepter's, sceptre's
-    scepter, sceptre
-    scepterdom, sceptredom
-    sceptered, sceptred
-    sceptering, sceptring
-    scepterless, sceptreless
-    scepterlesses, sceptrelesses
-    scepters, sceptres
-    Scevor's, Scevour's
-    Scevor, Scevour
-    schedulize, schedulise
-    schedulizes, schedulises
-    schemata, schemas
-    schematization's, schematisation's
-    schematization, schematisation
-    schematizations, schematisations
-    schematize, schematise
-    schematized, schematised
-    schematizer, schematiser
-    schematizers, schematisers
-    schematizes, schematises
-    schematizing, schematising
-    schillerization, schillerisation
-    schillerizations, schillerisations
-    schillerize, schillerise
-    schillerized, schillerised
-    schillerizes, schillerises
-    schillerizing, schillerising
-    schismatize, schismatise
-    schismatized, schismatised
-    schismatizes, schismatises
-    schismatizing, schismatising
-    schistocelia, schistocoelia
-    schlemiel's, shlemiel's
-    schlemiel, shlemiel
-    schlemiels, shlemiels
-    schlepped, shlepped
-    schlepping, shlepping
-    schmaltzy, schmalzy
-    schmalz's, shmaltz's
-    schmalz, shmaltz
-    schmalzes, shmaltzes
-    schmo's, schmoe's
-    schmo, schmoe
-    schnapps's, schnaps's
-    schnapps, schnaps
-    schtick's, shtik's
-    scientize, scientise
-    scientized, scientised
-    scientizes, scientises
-    scientizing, scientising
-    sclere, sclerae
-    sclerotization's, sclerotisation's
-    sclerotization, sclerotisation
-    sclerotize, sclerotise
-    sclerotized, sclerotised
-    sclerotizes, sclerotises
-    sclerotizing, sclerotising
-    scorse, scourse
-    scorsed, scoursed
-    scorses, scourses
-    scorsing, scoursing
-    Scotticize's, Scotticise's
-    Scotticize, Scotticise
-    Scotticized's, Scotticised's
-    Scotticized, Scotticised
-    Scotticizes, Scotticises
-    Scotticizing's, Scotticising's
-    Scotticizing, Scotticising
-    scripturalize, scripturalise
-    scripturalizes, scripturalises
-    scrod's, schrod's
-    scrod, schrod
-    scrods, schrods
-    scrunchy's, scrunchie's
-    scrunchy, scrunchie
-    scrutinization's, scrutinisation's
-    scrutinization, scrutinisation
-    scrutinizations, scrutinisations
-    scrutinize, scrutinise
-    scrutinized, scrutinised
-    scrutinizer's, scrutiniser's
-    scrutinizer, scrutiniser
-    scrutinizers, scrutinisers
-    scrutinizes, scrutinises
-    scrutinizing, scrutinising
-    scrutinizinglies, scrutinisinglies
-    scrutinizingly, scrutinisingly
-    se, sae
-    se, soe
-    seborrhea's, seborrhoea's
-    seborrhea, seborrhoea
-    seborrheas, seborrhoeas
-    seborrheic, seborrhoeic
-    sectarianization, sectarianisation
-    sectarianize, sectarianise
-    sectarianized, sectarianised
-    sectarianizes, sectarianises
-    sectarianizing, sectarianising
-    sectionalization's, sectionalisation's
-    sectionalization, sectionalisation
-    sectionalizations, sectionalisations
-    sectionalize, sectionalise
-    sectionalized, sectionalised
-    sectionalizes, sectionalises
-    sectionalizing, sectionalising
-    sectionization, sectionisation
-    sectionizations, sectionisations
-    sectionize, sectionise
-    sectionized, sectionised
-    sectionizes, sectionises
-    sectionizing, sectionising
-    sectorization, sectorisation
-    sectorizations, sectorisations
-    sectorize, sectorise
-    sectorized, sectorised
-    sectorizes, sectorises
-    sectorizing, sectorising
-    secularization's, secularisation's
-    secularization, secularisation
-    secularizations, secularisations
-    secularize, secularise
-    secularized, secularised
-    secularizer's, seculariser's
-    secularizer, seculariser
-    secularizers, secularisers
-    secularizes, secularises
-    secularizing, secularising
-    seculum, saeculum
-    seculums, saeculums
-    securitization, securitisation
-    securitizations, securitisations
-    securitize, securitise
-    securitized, securitised
-    securitizes, securitises
-    securitizing, securitising
-    Seed's, Saeed's
-    Seed, Saeed
-    seizable, seisable
-    seizer's, seiser's
-    seizer, seiser
-    seizers, seisers
-    seizin's, seisin's
-    seizin, seisin
-    seizings, seisings
-    seizins, seisins
-    selle, sellae
-    selvage's, selvedge's
-    selvage, selvedge
-    selvages, selvedges
-    Semenov's, Semaenov's
-    Semenov, Semaenov
-    semianesthetic, semianaesthetic
-    semicarbonize, semicarbonise
-    semicarbonizes, semicarbonises
-    semicivilization's, semicivilisation's
-    semicivilization, semicivilisation
-    semicivilizations, semicivilisations
-    semicivilized's, semicivilised's
-    semicivilized, semicivilised
-    semicivilizeds, semiciviliseds
-    semifossilized's, semifossilised's
-    semifossilized, semifossilised
-    semifossilizeds, semifossiliseds
-    semihonor's, semihonour's
-    semihonor, semihonour
-    semihonors, semihonours
-    semihumanized's, semihumanised's
-    semihumanized, semihumanised
-    semihumanizeds, semihumaniseds
-    semimercerized's, semimercerised's
-    semimercerized, semimercerised
-    semimercerizeds, semimerceriseds
-    semimineralized's, semimineralised's
-    semimineralized, semimineralised
-    semimineralizeds, semimineraliseds
-    seminarize, seminarise
-    seminarizes, seminarises
-    seminationalization's, seminationalisation's
-    seminationalization, seminationalisation
-    seminationalizations, seminationalisations
-    semiorganized's, semiorganised's
-    semiorganized, semiorganised
-    semiorganizeds, semiorganiseds
-    semioxidized's, semioxidised's
-    semioxidized, semioxidised
-    semioxidizeds, semioxidiseds
-    semioxygenized's, semioxygenised's
-    semioxygenized, semioxygenised
-    semioxygenizeds, semioxygeniseds
-    semiprofessionalized's, semiprofessionalised's
-    semiprofessionalized, semiprofessionalised
-    semiprofessionalizeds, semiprofessionaliseds
-    semite, semitae
-    Semiticize's, Semiticise's
-    Semiticize, Semiticise
-    Semiticizes, Semiticises
-    Semitization's, Semitisation's
-    Semitization, Semitisation
-    Semitizations, Semitisations
-    Semitize's, Semitise's
-    Semitize, Semitise
-    Semitized's, Semitised's
-    Semitized, Semitised
-    Semitizes, Semitises
-    Semitizing's, Semitising's
-    Semitizing, Semitising
-    semivulcanized's, semivulcanised's
-    semivulcanized, semivulcanised
-    semivulcanizeds, semivulcaniseds
-    semper, sempre
-    senilize, senilise
-    senilizes, senilises
-    sensationalize, sensationalise
-    sensationalized, sensationalised
-    sensationalizes, sensationalises
-    sensationalizing, sensationalising
-    sensitization's, sensitisation's
-    sensitization, sensitisation
-    sensitizations, sensitisations
-    sensitize, sensitise
-    sensitized, sensitised
-    sensitizer's, sensitiser's
-    sensitizer, sensitiser
-    sensitizers, sensitisers
-    sensitizes, sensitises
-    sensitizing, sensitising
-    sensize, sensise
-    sensizes, sensises
-    sensualization's, sensualisation's
-    sensualization, sensualisation
-    sensualizations, sensualisations
-    sensualize, sensualise
-    sensualized, sensualised
-    sensualizes, sensualises
-    sensualizing, sensualising
-    sentimentalization's, sentimentalisation's
-    sentimentalization, sentimentalisation
-    sentimentalizations, sentimentalisations
-    sentimentalize, sentimentalise
-    sentimentalized, sentimentalised
-    sentimentalizer, sentimentaliser
-    sentimentalizers, sentimentalisers
-    sentimentalizes, sentimentalises
-    sentimentalizing, sentimentalising
-    sentineled, sentinelled
-    sentineling, sentinelling
-    sepaled, sepalled
-    sepaledder, sepalledder
-    sepaleddest, sepalleddest
-    Septembrizer's, Septembriser's
-    Septembrizer, Septembriser
-    Septembrizers, Septembrisers
-    septemia, septaemia
-    septet's, septette's
-    septet, septette
-    septets, septettes
-    septicemia's, septicaemia's
-    septicemia, septicaemia
-    septicemias, septicaemias
-    septicemic, septicaemic
-    septicization's, septicisation's
-    septicization, septicisation
-    septicizations, septicisations
-    septicolored, septicoloured
-    sepulcher's, sepulchre's
-    sepulcher, sepulchre
-    sepulchered, sepulchred
-    sepulchering, sepulchring
-    sepulchers, sepulchres
-    sepulchralize, sepulchralise
-    sepulchralizes, sepulchralises
-    sequentialize, sequentialise
-    sequentialized, sequentialised
-    sequentializes, sequentialises
-    sequentializing, sequentialising
-    serape's, sarape's
-    serape, sarape
-    serapes, sarapes
-    serenize, serenise
-    serenizes, serenises
-    serializability, serialisability
-    serializable, serialisable
-    serialization's, serialisation's
-    serialization, serialisation
-    serializations, serialisations
-    serialize, serialise
-    serialized, serialised
-    serializes, serialises
-    serializing, serialising
-    sericitization, sericitisation
-    sericitizations, sericitisations
-    sermonize, sermonise
-    sermonized, sermonised
-    sermonizer's, sermoniser's
-    sermonizer, sermoniser
-    sermonizers, sermonisers
-    sermonizes, sermonises
-    sermonizing, sermonising
-    serose, serosae
-    serpentinization's, serpentinisation's
-    serpentinization, serpentinisation
-    serpentinizations, serpentinisations
-    serpentinize, serpentinise
-    serpentinized, serpentinised
-    serpentinizes, serpentinises
-    serpentinizing, serpentinising
-    serpentize, serpentise
-    serpentized, serpentised
-    serpentizes, serpentises
-    serpentizing, serpentising
-    serre, serrae
-    servilize, servilise
-    servilizes, servilises
-    seta, saeta
-    setule, setulae
-    severalize, severalise
-    severalizes, severalises
-    severization's, severisation's
-    severization, severisation
-    severizations, severisations
-    severize, severise
-    severizes, severises
-    sextet's, sextette's
-    sextet, sextette
-    sextets, sextettes
-    sexualization's, sexualisation's
-    sexualization, sexualisation
-    sexualizations, sexualisations
-    sexualize, sexualise
-    sexualized, sexualised
-    sexualizes, sexualises
-    sexualizing, sexualising
-    Shakespearize's, Shakespearise's
-    Shakespearize, Shakespearise
-    Shakespearizes, Shakespearises
-    shammy's, chammy's
-    shammy, chammy
-    shareable, sharable
-    sharpie's, sharpy's
-    sharpie, sharpy
-    sheikdom's, sheikhdom's
-    sheikdom, sheikhdom
-    sheikdoms, sheikhdoms
-    shellac's, shellack's
-    shellac, shellack
-    shellacs, shellacks
-    shepherdize, shepherdise
-    shepherdizes, shepherdises
-    sher, shoer
-    sherardize, sherardise
-    sherardized, sherardised
-    sherardizes, sherardises
-    sherardizing, sherardising
-    sherbet's, sherbert's
-    sherbet, sherbert
-    sherbets, sherberts
-    Shere's, Shree's
-    Shere, Shree
-    shere, shree
-    shillelagh's, shillalah's
-    shillelagh, shillalah
-    shillelaghes, shillalahes
-    Shintoize's, Shintoise's
-    Shintoize, Shintoise
-    Shintoizes, Shintoises
-    Shkoder's, Shkodaer's
-    Shkoder, Shkodaer
-    shlep, shlepp
-    shlepp's, shlep's
-    shleps, shlepps
-    shlock, shlocky
-    shorty's, shortie's
-    shorty, shortie
-    shoveled, shovelled
-    shoveler's, shoveller's
-    shoveler, shoveller
-    shovelers, shovellers
-    shoveling, shovelling
-    shriveled, shrivelled
-    shriveling, shrivelling
-    shtik, schtick
-    shtiks, schticks
-    sialorrhea, sialorrhoea
-    siderealize, siderealise
-    siderealizes, siderealises
-    signaled, signalled
-    signaler's, signaller's
-    signaler, signaller
-    signalers, signallers
-    signaling, signalling
-    signalization, signalisation
-    signalize, signalise
-    signalized, signalised
-    signalizes, signalises
-    signalizing, signalising
-    siled, siloed
-    silicatization's, silicatisation's
-    silicatization, silicatisation
-    silicatizations, silicatisations
-    siliceous, silicious
-    silicidize, silicidise
-    silicidizes, silicidises
-    siliconize, siliconise
-    siliconizes, siliconises
-    silicule, siliculae
-    silique, siliquae
-    silverize, silverise
-    silverized, silverised
-    silverizer's, silveriser's
-    silverizer, silveriser
-    silverizers, silverisers
-    silverizes, silverises
-    silverizing, silverising
-    similarize, similarise
-    similarizes, similarises
-    similize, similise
-    similized, similised
-    similizes, similises
-    similizing, similising
-    simonize, simonise
-    Sine's, Sinae's
-    Sine, Sinae
-    singularization's, singularisation's
-    singularization, singularisation
-    singularizations, singularisations
-    singularize, singularise
-    singularized, singularised
-    singularizes, singularises
-    singularizing, singularising
-    sinicize, sinicise
-    sinicized, sinicised
-    sinicizes, sinicises
-    sinicizing, sinicising
-    siphon's, syphon's
-    siphon, syphon
-    siphoned, syphoned
-    siphoning, syphoning
-    siphonless, syphonless
-    siphonlesses, syphonlesses
-    siphonlike's, syphonlike's
-    siphonlike, syphonlike
-    siphonlikes, syphonlikes
-    siphonophore's, syphonophore's
-    siphonophore, syphonophore
-    siphonostele's, syphonostele's
-    siphonostele, syphonostele
-    siphonostelic, syphonostelic
-    siphonostely, syphonostely
-    siphons, syphons
-    sirenize, sirenise
-    sirenized, sirenised
-    sirenizes, sirenises
-    sirenizing, sirenising
-    sirree's, siree's
-    sirree, siree
-    sirrees, sirees
-    sisterize, sisterise
-    sisterizes, sisterises
-    sistern, sistren
-    sizable, sizeable
-    sizableness, sizeableness
-    sizably, sizeably
-    sizel, sisel
-    skeer, skere
-    skeletonization's, skeletonisation's
-    skeletonization, skeletonisation
-    skeletonizations, skeletonisations
-    skeletonize, skeletonise
-    skeletonized, skeletonised
-    skeletonizer's, skeletoniser's
-    skeletonizer, skeletoniser
-    skeletonizers, skeletonisers
-    skeletonizes, skeletonises
-    skeletonizing, skeletonising
-    skeptic's, sceptic's
-    skeptic, sceptic
-    skeptical, sceptical
-    skepticaler, scepticaler
-    skepticalest, scepticalest
-    skeptically, sceptically
-    skepticer, scepticer
-    skepticest, scepticest
-    skepticism's, scepticism's
-    skepticism, scepticism
-    skepticisms, scepticisms
-    skepticize, skepticise
-    skepticizes, skepticises
-    skeptics, sceptics
-    skillful, skilful
-    skillfully, skilfully
-    skillfulness's, skilfulness's
-    skillfulness, skilfulness
-    skulduggery's, skullduggery's
-    skulduggery, skullduggery
-    skyer, skyre
-    skyers, skyres
-    Slavicize's, Slavicise's
-    Slavicize, Slavicise
-    Slavicizes, Slavicises
-    Slavization's, Slavisation's
-    Slavization, Slavisation
-    Slavizations, Slavisations
-    Slavize's, Slavise's
-    Slavize, Slavise
-    Slavizes, Slavises
-    Slavonicize's, Slavonicise's
-    Slavonicize, Slavonicise
-    Slavonicized's, Slavonicised's
-    Slavonicized, Slavonicised
-    Slavonicizes, Slavonicises
-    Slavonicizing's, Slavonicising's
-    Slavonicizing, Slavonicising
-    Slavonize's, Slavonise's
-    Slavonize, Slavonise
-    Slavonized's, Slavonised's
-    Slavonized, Slavonised
-    Slavonizes, Slavonises
-    Slavonizing's, Slavonising's
-    Slavonizing, Slavonising
-    sle, slae
-    slenderize, slenderise
-    slenderized, slenderised
-    slenderizes, slenderises
-    slenderizing, slenderising
-    slier, slyer
-    sliest, slyest
-    sloganize, sloganise
-    sloganized, sloganised
-    sloganizes, sloganises
-    sloganizing, sloganising
-    sloganizings, sloganisings
-    sluggardize, sluggardise
-    sluggardized, sluggardised
-    sluggardizes, sluggardises
-    sluggardizing, sluggardising
-    slumberous, slumbrous
-    slyly, slily
-    smidge's, smidgin's
-    smidge, smidgin
-    smidges, smidgins
-    smolder's, smoulder's
-    smolder, smoulder
-    smoldered, smouldered
-    smoldering, smouldering
-    smolders, smoulders
-    smoothie's, smoothy's
-    smoothie, smoothy
-    sniveled, snivelled
-    sniveler's, sniveller's
-    sniveler, sniveller
-    snivelers, snivellers
-    sniveling, snivelling
-    snivelings, snivellings
-    snobsniveling, snobsnivelling
-    snorkeled, snorkelled
-    snorkeling, snorkelling
-    snowplow's, snowplough's
-    snowplow, snowplough
-    snowplows, snowploughs
-    snowshed, snowshoed
-    snuffcolored, snuffcoloured
-    soberize, soberise
-    soberized, soberised
-    soberizes, soberises
-    soberizing, soberising
-    sobriquet's, soubriquet's
-    sobriquet, soubriquet
-    sobriquets, soubriquets
-    socialization's, socialisation's
-    socialization, socialisation
-    socializations, socialisations
-    socialize, socialise
-    socialized, socialised
-    socializer's, socialiser's
-    socializer, socialiser
-    socializes, socialises
-    socializing, socialising
-    sockdologizing, sockdologising
-    Socratize's, Socratise's
-    Socratize, Socratise
-    Socratized's, Socratised's
-    Socratized, Socratised
-    Socratizes, Socratises
-    Socratizing's, Socratising's
-    Socratizing, Socratising
-    sodomize, sodomise
-    sodomized, sodomised
-    sodomizes, sodomises
-    sodomizing, sodomising
-    softy's, softie's
-    softy, softie
-    sol's, so's
-    sol, so
-    solarization's, solarisation's
-    solarization, solarisation
-    solarizations, solarisations
-    solarize, solarise
-    solarized, solarised
-    solarizes, solarises
-    solarizing, solarising
-    soldierize, soldierise
-    soldierizes, soldierises
-    solecize, solecise
-    solecized, solecised
-    solecizes, solecises
-    solecizing, solecising
-    solemnization's, solemnisation's
-    solemnization, solemnisation
-    solemnizations, solemnisations
-    solemnize, solemnise
-    solemnized, solemnised
-    solemnizer's, solemniser's
-    solemnizer, solemniser
-    solemnizers, solemnisers
-    solemnizes, solemnises
-    solemnizing, solemnising
-    soliloquization, soliloquisation
-    soliloquize, soliloquise
-    soliloquized, soliloquised
-    soliloquizer's, soliloquiser's
-    soliloquizer, soliloquiser
-    soliloquizers, soliloquisers
-    soliloquizes, soliloquises
-    soliloquizing's, soliloquising's
-    soliloquizing, soliloquising
-    soliloquizingly, soliloquisingly
-    soliloquizings, soliloquisings
-    solmization's, solmisation's
-    solmization, solmisation
-    solmizations, solmisations
-    solonization, solonisation
-    solonizations, solonisations
-    sols, sos
-    solubilization's, solubilisation's
-    solubilization, solubilisation
-    solubilizations, solubilisations
-    solubilize, solubilise
-    solubilized, solubilised
-    solubilizes, solubilises
-    solubilizing, solubilising
-    solutize, solutise
-    solutizer's, solutiser's
-    solutizer, solutiser
-    solutizers, solutisers
-    solutizes, solutises
-    somber, sombre
-    somberer, sombrer
-    somberest, sombrest
-    somberish, sombreish
-    somberly, sombrely
-    somberness's, sombreness's
-    somberness, sombreness
-    sombernesses, sombrenesses
-    somesthesia, somaesthesia
-    somesthesis, somaesthesis
-    somniloquize, somniloquise
-    somniloquized, somniloquised
-    somniloquizes, somniloquises
-    somniloquizing, somniloquising
-    sonantized's, sonantised's
-    sonantized, sonantised
-    sonantizeds, sonantiseds
-    sonnetization's, sonnetisation's
-    sonnetization, sonnetisation
-    sonnetize, sonnetise
-    sonnetized, sonnetised
-    sonnetizes, sonnetises
-    sonnetizing, sonnetising
-    sorbitization, sorbitisation
-    sorbitizations, sorbitisations
-    sorbitize, sorbitise
-    sorbitized, sorbitised
-    sorbitizes, sorbitises
-    sorbitizing, sorbitising
-    sord, sourd
-    sordine, sourdine
-    sordines, sourdines
-    sororize, sororise
-    sororized, sororised
-    sororizes, sororises
-    sororizing, sororising
-    sory, soury
-    souffled, soufflaed
-    soulter, soultre
-    southernize, southernise
-    southernized, southernised
-    southernizes, southernises
-    southernizing, southernising
-    Sovietization's, Sovietisation's
-    sovietization's, sovietisation's
-    Sovietization, Sovietisation
-    sovietization, sovietisation
-    sovietizations, sovietisations
-    Sovietize, Sovietise
-    sovietize, sovietise
-    Sovietized, Sovietised
-    sovietized, sovietised
-    sovietizes, sovietises
-    Sovietizing, Sovietising
-    sovietizing, sovietising
-    spacey, spacy
-    spanemia, spanaemia
-    spanemic, spanaemic
-    Spaniardization's, Spaniardisation's
-    Spaniardization, Spaniardisation
-    Spaniardizations, Spaniardisations
-    Spaniardize's, Spaniardise's
-    Spaniardize, Spaniardise
-    Spaniardizes, Spaniardises
-    spaniolize, spaniolise
-    spaniolized, spaniolised
-    spaniolizes, spaniolises
-    spaniolizing, spaniolising
-    Spanishize's, Spanishise's
-    Spanishize, Spanishise
-    Spanishizes, Spanishises
-    spanopnea, spanopnoea
-    sparers, sparres
-    Spartanize's, Spartanise's
-    Spartanize, Spartanise
-    Spartanizes, Spartanises
-    spatialization's, spatialisation's
-    spatialization, spatialisation
-    spatializations, spatialisations
-    spatialize, spatialise
-    spatializes, spatialises
-    specialization's, specialisation's
-    specialization, specialisation
-    specializations, specialisations
-    specialize, specialise
-    specialized, specialised
-    specializer's, specialiser's
-    specializer, specialiser
-    specializers, specialisers
-    specializes, specialises
-    specializing, specialising
-    specialties, specialities
-    specialty's, speciality's
-    specialty, speciality
-    specificize, specificise
-    specificizes, specificises
-    specimenize, specimenise
-    specimenizes, specimenises
-    specter's, spectre's
-    specter, spectre
-    spectered, spectred
-    specterlike's, spectrelike's
-    specterlike, spectrelike
-    specterlikes, spectrelikes
-    specters, spectres
-    spectrocolorimetry's, spectrocolourimetry's
-    spectrocolorimetry, spectrocolourimetry
-    speer's, spere's
-    speer, spere
-    spelean, spelaean
-    speleological, spelaeological
-    speleothem, spelaeothem
-    speleothems, spelaeothems
-    spermatorrhea, spermatorrhoea
-    spermatorrheas, spermatorrhoeas
-    speronares, speronaroes
-    sphenethmoid, sphenoethmoid
-    sphenethmoidal, sphenoethmoidal
-    spherocrystal, sphaerocrystal
-    spheroidization, spheroidisation
-    spheroidizations, spheroidisations
-    spheroidize, spheroidise
-    spheroidized, spheroidised
-    spheroidizes, spheroidises
-    spheroidizing, spheroidising
-    spherosome, sphaerosome
-    spick's, spik's
-    spick, spik
-    spicks, spiks
-    Spiers's, Spires's
-    Spiers, Spires
-    spilled, spilt
-    spinule, spinulae
-    spiraled, spiralled
-    spiraling, spiralling
-    spiralization's, spiralisation's
-    spiralization, spiralisation
-    spiralizations, spiralisations
-    spiralize, spiralise
-    spiralizes, spiralises
-    spirea's, spiraea's
-    spirea, spiraea
-    spireas, spiraeas
-    spiritize, spiritise
-    spiritizes, spiritises
-    spiritualization's, spiritualisation's
-    spiritualization, spiritualisation
-    spiritualizations, spiritualisations
-    spiritualize, spiritualise
-    spiritualized, spiritualised
-    spiritualizer's, spiritualiser's
-    spiritualizer, spiritualiser
-    spiritualizers, spiritualisers
-    spiritualizes, spiritualises
-    spiritualizing, spiritualising
-    spirochetal, spirochaetal
-    spirochete's, spirochaete's
-    spirochete, spirochaete
-    spirochetes, spirochaetes
-    spirochetoses, spirochaetoses
-    spirochetosis's, spirochaetosis's
-    spirochetosis, spirochaetosis
-    spirochetotic, spirochaetotic
-    splanchnocele, splanchnocoele
-    splendor's, splendour's
-    splendor, splendour
-    splendorproof, splendourproof
-    splendors, splendours
-    splenectomized, splenectomised
-    splenization, splenisation
-    splenizations, splenisations
-    spoiled, spoilt
-    sponge_cake's, spongecake's
-    sponge_cake, spongecake
-    sponge_cakes, spongecakes
-    spumoni's, spumone's
-    spumoni, spumone
-    spumonis, spumones
-    spyer, spyre
-    squame, squamae
-    squamule, squamulae
-    Squier's, Squire's
-    Squier, Squire
-    squirreled, squirrelled
-    squirreling, squirrelling
-    stabilizable, stabilisable
-    stabilization's, stabilisation's
-    stabilization, stabilisation
-    stabilizations, stabilisations
-    stabilizator, stabilisator
-    stabilizators, stabilisators
-    stabilize, stabilise
-    stabilized, stabilised
-    stabilizer's, stabiliser's
-    stabilizer, stabiliser
-    stabilizers, stabilisers
-    stabilizes, stabilises
-    stabilizing, stabilising
-    stagy, stagey
-    stallionize, stallionise
-    stallionizes, stallionises
-    stalwartize, stalwartise
-    stalwartizes, stalwartises
-    stammelcolor, stammelcolour
-    standardizable's, standardisable's
-    standardizable, standardisable
-    standardizables, standardisables
-    standardization's, standardisation's
-    standardization, standardisation
-    standardizations, standardisations
-    standardize, standardise
-    standardized, standardised
-    standardizer's, standardiser's
-    standardizer, standardiser
-    standardizers, standardisers
-    standardizes, standardises
-    standardizing, standardising
-    stanzes, stanzoes
-    stapedectomized, stapedectomised
-    staphyledema, staphyloedema
-    statisticize, statisticise
-    statisticizes, statisticises
-    stearrhea, stearrhoea
-    steatorrhea, steatorrhoea
-    steatorrheas, steatorrhoeas
-    stele, stelae
-    stenciled, stencilled
-    stenciler's, stenciller's
-    stenciler, stenciller
-    stencilers, stencillers
-    stenciling, stencilling
-    stencilize, stencilise
-    stenopeic, stenopaeic
-    stentor, stentour
-    stentors, stentours
-    stercoremia, stercoraemia
-    stere, stree
-    sterilizabilities, sterilisabilities
-    sterilizability's, sterilisability's
-    sterilizability, sterilisability
-    sterilizable's, sterilisable's
-    sterilizable, sterilisable
-    sterilizabler, sterilisabler
-    sterilizables, sterilisables
-    sterilizablest, sterilisablest
-    sterilization's, sterilisation's
-    sterilization, sterilisation
-    sterilizations, sterilisations
-    sterilize, sterilise
-    sterilized, sterilised
-    sterilizer's, steriliser's
-    sterilizer, steriliser
-    sterilizers, sterilisers
-    sterilizes, sterilises
-    sterilizing, sterilising
-    stert, stret
-    sties, styes
-    stigmatization's, stigmatisation's
-    stigmatization, stigmatisation
-    stigmatizations, stigmatisations
-    stigmatize, stigmatise
-    stigmatized, stigmatised
-    stigmatizer's, stigmatiser's
-    stigmatizer, stigmatiser
-    stigmatizers, stigmatisers
-    stigmatizes, stigmatises
-    stigmatizing, stigmatising
-    stilbestrol's, stilboestrol's
-    stilbestrol, stilboestrol
-    stilbestrols, stilboestrols
-    stimuli, stimuluses
-    stipule, stipulae
-    stockinette's, stockinet's
-    stockinette, stockinet
-    stockinettes, stockinets
-    stogie's, stogy's
-    stogie, stogy
-    stomatodeum, stomatodaeum
-    stomodea, stomodaea
-    stomodeal, stomodaeal
-    stomodeum's, stomodaeum's
-    stomodeum, stomodaeum
-    stomodeums, stomodaeums
-    stony, stoney
-    storier, stourier
-    stour, stoor
-    stower, stowre
-    stowers, stowres
-    straitjacket's, straightjacket's
-    straitjacket, straightjacket
-    straitjacketed, straightjacketed
-    straitjacketing, straightjacketing
-    straitjackets, straightjackets
-    strata, stratums
-    strobile, strobilae
-    strobilization's, strobilisation's
-    strobilization, strobilisation
-    strobilizations, strobilisations
-    structuralization's, structuralisation's
-    structuralization, structuralisation
-    structuralizations, structuralisations
-    structuralize, structuralise
-    structuralizes, structuralises
-    strychninization's, strychninisation's
-    strychninization, strychninisation
-    strychninizations, strychninisations
-    strychninize, strychninise
-    strychninizes, strychninises
-    stumor, stumour
-    sty's, stye's
-    sty, stye
-    stylization's, stylisation's
-    stylization, stylisation
-    stylizations, stylisations
-    stylize, stylise
-    stylized, stylised
-    stylizer's, styliser's
-    stylizer, styliser
-    stylizers, stylisers
-    stylizes, stylises
-    stylizing, stylising
-    stylopized, stylopised
-    stymie's, stymy's
-    stymie, stymy
-    stymied, stymyed
-    subarmor's, subarmour's
-    subarmor, subarmour
-    subarmors, subarmours
-    subcaliber, subcalibre
-    subcategorizing, subcategorising
-    subcenter, subcentre
-    subduer, subdure
-    suberate, subaerate
-    suberization's, suberisation's
-    suberization, suberisation
-    suberizations, suberisations
-    suberize, suberise
-    suberized, suberised
-    suberizes, suberises
-    suberizing, suberising
-    subesophageal, suboesophageal
-    subetheric, subaetheric
-    subflavor's, subflavour's
-    subflavor, subflavour
-    subflavors, subflavours
-    subitize, subitise
-    subitized, subitised
-    subitizes, subitises
-    subitizing, subitising
-    subjectivization's, subjectivisation's
-    subjectivization, subjectivisation
-    subjectivizations, subjectivisations
-    subjectivize, subjectivise
-    subjectivized, subjectivised
-    subjectivizes, subjectivises
-    subjectivizing, subjectivising
-    sublimize, sublimise
-    sublimized, sublimised
-    sublimizes, sublimises
-    sublimizing, sublimising
-    subminiaturization's, subminiaturisation's
-    subminiaturization, subminiaturisation
-    subminiaturize, subminiaturise
-    subminiaturized, subminiaturised
-    subminiaturizes, subminiaturises
-    subminiaturizing, subminiaturising
-    subpoena's, subpena's
-    subpoena, subpena
-    subpoenaed, subpenaed
-    subpoenaing, subpenaing
-    subpoenas, subpenas
-    subpulverizer's, subpulveriser's
-    subpulverizer, subpulveriser
-    subpulverizers, subpulverisers
-    subsidizable's, subsidisable's
-    subsidizable, subsidisable
-    subsidizables, subsidisables
-    subsidization's, subsidisation's
-    subsidization, subsidisation
-    subsidizations, subsidisations
-    subsidize, subsidise
-    subsidized, subsidised
-    subsidizer's, subsidiser's
-    subsidizer, subsidiser
-    subsidizers, subsidisers
-    subsidizes, subsidises
-    subsidizing, subsidising
-    subspecialize's, subspecialise's
-    subspecialize, subspecialise
-    subspecializes, subspecialises
-    subspecialties, subspecialities
-    subspecialty's, subspeciality's
-    subspecialty, subspeciality
-    substandardize, substandardise
-    substandardizes, substandardises
-    substantialize, substantialise
-    substantialized, substantialised
-    substantializes, substantialises
-    substantializing, substantialising
-    substantivize, substantivise
-    substantivized, substantivised
-    substantivizes, substantivises
-    substantivizing, substantivising
-    substerilization, substerilisation
-    subterraneanize, subterraneanise
-    subterraneanizes, subterraneanises
-    subtilization's, subtilisation's
-    subtilization, subtilisation
-    subtilizations, subtilisations
-    subtilize, subtilise
-    subtilized, subtilised
-    subtilizer, subtiliser
-    subtilizers, subtilisers
-    subtilizes, subtilises
-    subtilizing, subtilising
-    subtotaled, subtotalled
-    subtotaling, subtotalling
-    suburbanization's, suburbanisation's
-    suburbanization, suburbanisation
-    suburbanizations, suburbanisations
-    suburbanize, suburbanise
-    suburbanized, suburbanised
-    suburbanizes, suburbanises
-    suburbanizing, suburbanising
-    subvitalization's, subvitalisation's
-    subvitalization, subvitalisation
-    subvitalized's, subvitalised's
-    subvitalized, subvitalised
-    subvitalizedder, subvitalisedder
-    subvitalizeddest, subvitaliseddest
-    subvitalizeds, subvitaliseds
-    succor's, succour's
-    succor, succour
-    succorable's, succourable's
-    succorable, succourable
-    succorables, succourables
-    succored, succoured
-    succorer's, succourer's
-    succorer, succourer
-    succorers, succourers
-    succorful, succourful
-    succoring, succouring
-    succorless, succourless
-    succorlesses, succourlesses
-    succorrhea, succorrhoea
-    succors, succours
-    succube, succubae
-    suers, sures
-    suggestionize, suggestionise
-    suggestionizes, suggestionises
-    sulcalize, sulcalise
-    sulcalized, sulcalised
-    sulcalizes, sulcalises
-    sulcalizing, sulcalising
-    sulfate's, sulphate's
-    sulfate, sulphate
-    sulfates, sulphates
-    sulfatize, sulfatise
-    sulfatizes, sulfatises
-    sulfide's, sulphide's
-    sulfide, sulphide
-    sulfides, sulphides
-    sulfur's, sulphur's
-    sulfur, sulphur
-    sulfured, sulphured
-    sulfuric, sulphuric
-    sulfuring, sulphuring
-    sulfurous, sulphurous
-    sulfurs, sulphurs
-    sulphurisation's, sulphurization's
-    sulphurisation, sulphurization
-    sulphurisations, sulphurizations
-    sulphurise, sulphurize
-    sulphurised, sulphurized
-    sulphurises, sulphurizes
-    sulphurising, sulphurizing
-    sultanize, sultanise
-    sultanizes, sultanises
-    sumac's, sumach's
-    sumac, sumach
-    sumacs, sumaches
-    summarizable, summarisable
-    summarization's, summarisation's
-    summarization, summarisation
-    summarizations, summarisations
-    summarize, summarise
-    summarized, summarised
-    summarizer's, summariser's
-    summarizer, summariser
-    summarizers, summarisers
-    summarizes, summarises
-    summarizing, summarising
-    summerize, summerise
-    summerizes, summerises
-    superacknowledgment's, superacknowledgement's
-    superacknowledgment, superacknowledgement
-    superacknowledgments, superacknowledgements
-    supercanonization's, supercanonisation's
-    supercanonization, supercanonisation
-    supercanonizations, supercanonisations
-    supercarbonization's, supercarbonisation's
-    supercarbonization, supercarbonisation
-    supercarbonizations, supercarbonisations
-    supercarbonize, supercarbonise
-    supercarbonizes, supercarbonises
-    supercivilization's, supercivilisation's
-    supercivilization, supercivilisation
-    supercivilizations, supercivilisations
-    supercivilized's, supercivilised's
-    supercivilized, supercivilised
-    supercivilizeds, superciviliseds
-    superemphasize, superemphasise
-    superemphasizes, superemphasises
-    superfetation, superfoetation
-    superfetations, superfoetations
-    superficialize, superficialise
-    superficialized, superficialised
-    superficializes, superficialises
-    superficializing, superficialising
-    superhumanize, superhumanise
-    superhumanized, superhumanised
-    superhumanizes, superhumanises
-    superhumanizing, superhumanising
-    supernaturalize, supernaturalise
-    supernaturalized, supernaturalised
-    supernaturalizes, supernaturalises
-    supernaturalizing, supernaturalising
-    superorganization's, superorganisation's
-    superorganization, superorganisation
-    superorganizations, superorganisations
-    superorganize, superorganise
-    superorganizes, superorganises
-    supersensitization's, supersensitisation's
-    supersensitization, supersensitisation
-    supersensitizations, supersensitisations
-    supersensitize, supersensitise
-    supersensitized, supersensitised
-    supersensitizing, supersensitising
-    superspecialize, superspecialise
-    superspecializes, superspecialises
-    supersubtilized's, supersubtilised's
-    supersubtilized, supersubtilised
-    supersubtilizeds, supersubtiliseds
-    supersulphurize, supersulphurise
-    supersulphurizes, supersulphurises
-    surgerize, surgerise
-    surgerizes, surgerises
-    surprizal, surprisal
-    sursize, sursise
-    surveil, surveille
-    swab's, swob's
-    swab, swob
-    swabbed, swobbed
-    swabbing, swobbing
-    swabs, swobs
-    sweetbrier's, sweetbriar's
-    sweetbrier, sweetbriar
-    sweetbriers, sweetbriars
-    swiveled, swivelled
-    swiveling, swivelling
-    sycophantize, sycophantise
-    sycophantized, sycophantised
-    sycophantizes, sycophantises
-    sycophantizing, sycophantising
-    syllabize, syllabise
-    syllabized, syllabised
-    syllabizes, syllabises
-    syllabizing, syllabising
-    syllogization, syllogisation
-    syllogizations, syllogisations
-    syllogize, syllogise
-    syllogized, syllogised
-    syllogizer, syllogiser
-    syllogizers, syllogisers
-    syllogizes, syllogises
-    syllogizing, syllogising
-    sylvan, silvan
-    sylvanize, sylvanise
-    sylvanizes, sylvanises
-    sylviine, sylviinae
-    symboled, symbolled
-    symboling, symbolling
-    symbolization's, symbolisation's
-    symbolization, symbolisation
-    symbolizations, symbolisations
-    symbolize, symbolise
-    symbolized, symbolised
-    symbolizer's, symboliser's
-    symbolizer, symboliser
-    symbolizers, symbolisers
-    symbolizes, symbolises
-    symbolizing, symbolising
-    symmetrically, symmetricly
-    symmetricalness, symmetricness
-    symmetricalnesses, symmetricnesses
-    symmetrization's, symmetrisation's
-    symmetrization, symmetrisation
-    symmetrizations, symmetrisations
-    symmetrize, symmetrise
-    symmetrized, symmetrised
-    symmetrizes, symmetrises
-    symmetrizing, symmetrising
-    sympathize, sympathise
-    sympathized, sympathised
-    sympathizer's, sympathiser's
-    sympathizer, sympathiser
-    sympathizers, sympathisers
-    sympathizes, sympathises
-    sympathizing's, sympathising's
-    sympathizing, sympathising
-    sympathizinglier, sympathisinglier
-    sympathizingliest, sympathisingliest
-    sympathizingly, sympathisingly
-    sympathizings, sympathisings
-    symphonization's, symphonisation's
-    symphonization, symphonisation
-    symphonize, symphonise
-    symphonized, symphonised
-    symphonizing, symphonising
-    symptomatize, symptomatise
-    symptomatized, symptomatised
-    symptomatizes, symptomatises
-    symptomatizing, symptomatising
-    symptomize, symptomise
-    symptomizes, symptomises
-    synagogue's, synagog's
-    synagogue, synagog
-    synagogues, synagogs
-    synalepha, synaloepha
-    synalephas, synaloephas
-    synalephe, synaloephe
-    sync's, synch's
-    sync, synch
-    synced, synched
-    synchronizable's, synchronisable's
-    synchronizable, synchronisable
-    synchronizables, synchronisables
-    synchronization's, synchronisation's
-    synchronization, synchronisation
-    synchronizations, synchronisations
-    synchronize, synchronise
-    synchronized, synchronised
-    synchronizer's, synchroniser's
-    synchronizer, synchroniser
-    synchronizers, synchronisers
-    synchronizes, synchronises
-    synchronizing, synchronising
-    syncing, synching
-    syncretize, syncretise
-    syncretized, syncretised
-    syncretizes, syncretises
-    syncretizing, syncretising
-    syncs, synches
-    syndicalize, syndicalise
-    syndicalizes, syndicalises
-    synecious, synoecious
-    synecologies, synoecologies
-    synecology, synoecology
-    synereses, synaereses
-    syneresis's, synaeresis's
-    syneresis, synaeresis
-    synergize, synergise
-    synergized, synergised
-    synergizes, synergises
-    synergizing, synergising
-    synesthesia's, synaesthesia's
-    synesthesia, synaesthesia
-    synesthesias, synaesthesias
-    synesthetic, synaesthetic
-    synestheticer, synaestheticer
-    synestheticest, synaestheticest
-    synetic, synoetic
-    synoecize, synoecise
-    synoecized, synoecised
-    synoecizes, synoecises
-    synoecizing, synoecising
-    synonymize, synonymise
-    synonymized, synonymised
-    synonymizes, synonymises
-    synonymizing, synonymising
-    synopsize, synopsise
-    synopsized, synopsised
-    synopsizes, synopsises
-    synopsizing, synopsising
-    synthesise, synthetize
-    synthesised, synthetized
-    synthesises, synthetizes
-    synthesising, synthetizing
-    synthesization's, synthesisation's
-    synthesization, synthesisation
-    synthesizations, synthesisations
-    synthesizer's, synthesiser's
-    synthesizer, synthesiser
-    synthesizers, synthesisers
-    synthetization, synthetisation
-    synthetizer's, synthetiser's
-    synthetizer, synthetiser
-    synthetizers, synthetisers
-    syntonization's, syntonisation's
-    syntonization, syntonisation
-    syntonize, syntonise
-    syntonized, syntonised
-    syntonizes, syntonises
-    syntonizing, syntonising
-    syphilization's, syphilisation's
-    syphilization, syphilisation
-    syphilizations, syphilisations
-    syphilize, syphilise
-    syphilized, syphilised
-    syphilizing, syphilising
-    Syrianize's, Syrianise's
-    Syrianize, Syrianise
-    Syrianizes, Syrianises
-    syringocele, syringocoele
-    syrup's, sirup's
-    syrup, sirup
-    syrups, sirups
-    systematization's, systematisation's
-    systematization, systematisation
-    systematizations, systematisations
-    systematize, systematise
-    systematized, systematised
-    systematizer's, systematiser's
-    systematizer, systematiser
-    systematizers, systematisers
-    systematizes, systematises
-    systematizing, systematising
-    systemizable's, systemisable's
-    systemizable, systemisable
-    systemizabler, systemisabler
-    systemizables, systemisables
-    systemizablest, systemisablest
-    systemization's, systemisation's
-    systemization, systemisation
-    systemizations, systemisations
-    systemize, systemise
-    systemized, systemised
-    systemizer's, systemiser's
-    systemizer, systemiser
-    systemizers, systemisers
-    systemizes, systemises
-    systemizing, systemising
-    taboo's, tabu's
-    taboo, tabu
-    tabooed, tabued
-    tabooing, tabuing
-    taboos, tabus
-    tabored, taboured
-    taborer's, tabourer's
-    taborer, tabourer
-    taborers, tabourers
-    taboret's, tabouret's
-    taboret, tabouret
-    taborets, tabourets
-    taborin, tabourin
-    taborine, tabourine
-    taboring, tabouring
-    taborins, tabourins
-    tabularization's, tabularisation's
-    tabularization, tabularisation
-    tabularizations, tabularisations
-    tabularize, tabularise
-    tabularized, tabularised
-    tabularizes, tabularises
-    tabularizing, tabularising
-    tabule, tabulae
-    tachypnea, tachypnoea
-    tachypneas, tachypnoeas
-    tachypneic, tachypnoeic
-    taffetized, taffetised
-    tailorization's, tailorisation's
-    tailorization, tailorisation
-    tailorizations, tailorisations
-    tailorize, tailorise
-    tailorizes, tailorises
-    Talmudization's, Talmudisation's
-    Talmudization, Talmudisation
-    Talmudizations, Talmudisations
-    Talmudize's, Talmudise's
-    Talmudize, Talmudise
-    Talmudizes, Talmudises
-    tamable, tameable
-    tambura's, tamboura's
-    tambura, tamboura
-    tamburas, tambouras
-    Tammanyize's, Tammanyise's
-    Tammanyize, Tammanyise
-    Tammanyizes, Tammanyises
-    tanalized, tanalised
-    tandemize, tandemise
-    tandemizes, tandemises
-    tantalization's, tantalisation's
-    tantalization, tantalisation
-    tantalizations, tantalisations
-    tantalize, tantalise
-    tantalized, tantalised
-    tantalizer's, tantaliser's
-    tantalizer, tantaliser
-    tantalizers, tantalisers
-    tantalizes, tantalises
-    tantalizing, tantalising
-    tantalizinglier, tantalisinglier
-    tantalizinglies, tantalisinglies
-    tantalizingliest, tantalisingliest
-    tantalizingly, tantalisingly
-    tantalizingness, tantalisingness
-    tantalizingnesses, tantalisingnesses
-    tantalizings, tantalisings
-    tariffize, tariffise
-    tariffizes, tariffises
-    tartarization's, tartarisation's
-    tartarization, tartarisation
-    tartarizations, tartarisations
-    tartarize, tartarise
-    tartarized, tartarised
-    tartarizes, tartarises
-    tartarizing, tartarising
-    tasseled, tasselled
-    tasseling, tasselling
-    tassels, tassells
-    tautologize, tautologise
-    tautologized, tautologised
-    tautologizes, tautologises
-    tautologizing, tautologising
-    tavernize, tavernise
-    tavernizes, tavernises
-    taxidermize, taxidermise
-    taxidermized, taxidermised
-    taxidermizes, taxidermises
-    taxidermizing, taxidermising
-    Taylorize's, Taylorise's
-    Taylorize, Taylorise
-    Taylorizes, Taylorises
-    te, tae
-    teaseler's, teaseller's
-    teaseler, teaseller
-    teaselers, teasellers
-    Tebilize's, Tebilise's
-    Tebilize, Tebilise
-    Tebilized's, Tebilised's
-    Tebilized, Tebilised
-    Tebilizes, Tebilises
-    Tebilizing's, Tebilising's
-    Tebilizing, Tebilising
-    technicalization, technicalisation
-    technicalize, technicalise
-    technicalizes, technicalises
-    technicize, technicise
-    technicized, technicised
-    technicizes, technicises
-    technicizing, technicising
-    technicolor, technicolour
-    technicolored, technicoloured
-    technologize, technologise
-    teepee's, tipi's
-    teepee, tipi
-    teepees, tipis
-    teer, teaer
-    teers, teres
-    teetotaled, teetotalled
-    teetotaler's, teetotaller's
-    teetotaler, teetotaller
-    teetotalers, teetotallers
-    teetotaling, teetotalling
-    tegu, taegu
-    tele, telae
-    telepathize, telepathise
-    telepathized, telepathised
-    telepathizes, telepathises
-    telepathizing, telepathising
-    telesthesia's, telaesthesia's
-    telesthesia, telaesthesia
-    telesthesias, telaesthesias
-    telesthetic, telaesthetic
-    telestheticer, telaestheticer
-    telestheticest, telaestheticest
-    tellurize, tellurise
-    tellurized, tellurised
-    tellurizes, tellurises
-    tellurizing, tellurising
-    tels, taels
-    templize, templise
-    templizes, templises
-    temporalize, temporalise
-    temporalized, temporalised
-    temporalizes, temporalises
-    temporalizing, temporalising
-    temporization's, temporisation's
-    temporization, temporisation
-    temporizations, temporisations
-    temporize, temporise
-    temporized, temporised
-    temporizer's, temporiser's
-    temporizer, temporiser
-    temporizers, temporisers
-    temporizes, temporises
-    temporizing's, temporising's
-    temporizing, temporising
-    temporizinglier, temporisinglier
-    temporizingliest, temporisingliest
-    temporizingly, temporisingly
-    temporizings, temporisings
-    tempos, tempi
-    tenderization's, tenderisation's
-    tenderization, tenderisation
-    tenderizations, tenderisations
-    tenderize, tenderise
-    tenderized, tenderised
-    tenderizer's, tenderiser's
-    tenderizer, tenderiser
-    tenderizers, tenderisers
-    tenderizes, tenderises
-    tenderizing, tenderising
-    tendinitis's, tendonitis's
-    tendinitis, tendonitis
-    tendinitises, tendonitises
-    tendriled, tendrilled
-    tenementization's, tenementisation's
-    tenementization, tenementisation
-    tenementizations, tenementisations
-    tenementize, tenementise
-    tenementizes, tenementises
-    tenia's, taenia's
-    tenia, taenia
-    teniacidal, taeniacidal
-    teniacide's, taeniacide's
-    teniacide, taeniacide
-    teniacides, taeniacides
-    teniae, taeniae
-    teniafuge's, taeniafuge's
-    teniafuge, taeniafuge
-    teniafuges, taeniafuges
-    tenias, taenias
-    teniases, taeniases
-    teniasis's, taeniasis's
-    teniasis, taeniasis
-    tenioid, taenioid
-    tenthmeter, tenthmetre
-    terf, tref
-    terma, trema
-    termatic, trematic
-    terminalization's, terminalisation's
-    terminalization, terminalisation
-    terminalizations, terminalisations
-    terminalized's, terminalised's
-    terminalized, terminalised
-    terminalizeds, terminaliseds
-    ternize, ternise
-    ternizes, ternises
-    terre, terrae
-    terrestrialize, terrestrialise
-    terrestrializes, terrestrialises
-    territorialization's, territorialisation's
-    territorialization, territorialisation
-    territorializations, territorialisations
-    territorialize, territorialise
-    territorialized, territorialised
-    territorializes, territorialises
-    territorializing, territorialising
-    terrorization's, terrorisation's
-    terrorization, terrorisation
-    terrorizations, terrorisations
-    terrorize, terrorise
-    terrorized, terrorised
-    terrorizer's, terroriser's
-    terrorizer, terroriser
-    terrorizers, terrorisers
-    terrorizes, terrorises
-    terrorizing, terrorising
-    terts, trets
-    tes, taes
-    teste, testae
-    testimonialization's, testimonialisation's
-    testimonialization, testimonialisation
-    testimonializations, testimonialisations
-    testimonialize, testimonialise
-    testimonialized, testimonialised
-    testimonializer, testimonialiser
-    testimonializers, testimonialisers
-    testimonializes, testimonialises
-    testimonializing, testimonialising
-    tetanization's, tetanisation's
-    tetanization, tetanisation
-    tetanizations, tetanisations
-    tetanize, tetanise
-    tetanized, tetanised
-    tetanizes, tetanises
-    tetanizing, tetanising
-    tetrachlorethylene, tetrachloroethylene
-    tetrachlorethylenes, tetrachloroethylenes
-    Teutonization's, Teutonisation's
-    Teutonization, Teutonisation
-    Teutonize, Teutonise
-    teutonize, teutonise
-    Teutonized, Teutonised
-    Teutonizes, Teutonises
-    Teutonizing, Teutonising
-    texturize, texturise
-    texturized, texturised
-    texturizes, texturises
-    texturizing, texturising
-    thalamocele, thalamocoele
-    thalassemia, thalassaemia
-    thalassemias, thalassaemias
-    thalassemic, thalassaemic
-    theater's, theatre's
-    theater, theatre
-    theatergoer's, theatregoer's
-    theatergoer, theatregoer
-    theatergoers, theatregoers
-    theatergoing's, theatregoing's
-    theatergoing, theatregoing
-    theatergoings, theatregoings
-    theaterless, theatreless
-    theaterlesses, theatrelesses
-    theaterlike's, theatrelike's
-    theaterlike, theatrelike
-    theaterlikes, theatrelikes
-    theaters, theatres
-    theatricalization's, theatricalisation's
-    theatricalization, theatricalisation
-    theatricalizations, theatricalisations
-    theatricalize, theatricalise
-    theatricalized, theatricalised
-    theatricalizes, theatricalises
-    theatricalizing, theatricalising
-    theatricize, theatricise
-    theatricized, theatricised
-    theatricizes, theatricises
-    theatricizing, theatricising
-    theologization's, theologisation's
-    theologization, theologisation
-    theologizations, theologisations
-    theologize, theologise
-    theologized, theologised
-    theologizer's, theologiser's
-    theologizer, theologiser
-    theologizers, theologisers
-    theologizes, theologises
-    theologizing, theologising
-    Theone's, Theonoe's
-    Theone, Theonoe
-    theorization's, theorisation's
-    theorization, theorisation
-    theorizations, theorisations
-    theorize, theorise
-    theorized, theorised
-    theorizer's, theoriser's
-    theorizer, theoriser
-    theorizers, theorisers
-    theorizes, theorises
-    theorizing, theorising
-    theosophize, theosophise
-    theosophized, theosophised
-    theosophizes, theosophises
-    theosophizing, theosophising
-    therap, threap
-    thereness, threeness
-    therenesses, threenesses
-    thermalization, thermalisation
-    thermalizations, thermalisations
-    thermalize, thermalise
-    thermalized, thermalised
-    thermalizes, thermalises
-    thermalizing, thermalising
-    therme, thermae
-    thermesthesia's, thermaesthesia's
-    thermesthesia, thermaesthesia
-    thermoanesthesia's, thermoanaesthesia's
-    thermoanesthesia, thermoanaesthesia
-    thermoanesthesias, thermoanaesthesias
-    thermometerize, thermometerise
-    thermometerizes, thermometerises
-    thermopolymerization's, thermopolymerisation's
-    thermopolymerization, thermopolymerisation
-    thermopolymerizations, thermopolymerisations
-    thermosiphon's, thermosyphon's
-    thermosiphon, thermosyphon
-    thermosiphons, thermosyphons
-    thesmothete, thesmothetae
-    thiamine's, thiamin's
-    thiamine, thiamin
-    thiamines, thiamins
-    thralldom's, thraldom's
-    thralldom, thraldom
-    thralldoms, thraldoms
-    thronize, thronise
-    thronizes, thronises
-    through, thru
-    thruway's, throughway's
-    thruway, throughway
-    thruways, throughways
-    thymectomize, thymectomise
-    thyroidectomized, thyroidectomised
-    thyroidization's, thyroidisation's
-    thyroidization, thyroidisation
-    thyroidizations, thyroidisations
-    tidbit's, titbit's
-    tidbit, titbit
-    tidbits, titbits
-    Tillford's, Tillfourd's
-    Tillford, Tillfourd
-    Timonize's, Timonise's
-    Timonize, Timonise
-    Timonized's, Timonised's
-    Timonized, Timonised
-    Timonizes, Timonises
-    Timonizing's, Timonising's
-    Timonizing, Timonising
-    Timor's, Timour's
-    Timor, Timour
-    tinseled, tinselled
-    tinselier, tinsellier
-    tinseliest, tinselliest
-    tinseling, tinselling
-    tiro's, tyreo's
-    tiro, tyreo
-    tiros, tyreos
-    titer's, titre's
-    titer, titre
-    titers, titres
-    titivate, tittivate
-    titivated, tittivated
-    titivates, tittivates
-    titivating, tittivating
-    titivation's, tittivation's
-    titivation, tittivation
-    titivations, tittivations
-    tittuped, tittupped
-    tittuping, tittupping
-    tittupy, tittuppy
-    toffee's, toffy's
-    toffee, toffy
-    toffees, toffies
-    togged, toged
-    togging, toging
-    tonicize, tonicise
-    tonicizes, tonicises
-    topesthesia, topaesthesia
-    topi, topi
-    toret, touret
-    tormentor's, tormenter's
-    tormentor, tormenter
-    tormentors, tormenters
-    torporize, torporise
-    torporizes, torporises
-    Toryize's, Toryise's
-    Toryize, Toryise
-    Toryizes, Toryises
-    totaled, totalled
-    totaler's, totaller's
-    totaler, totaller
-    totalers, totallers
-    totaling, totalling
-    totalitarianize, totalitarianise
-    totalization's, totalisation's
-    totalization, totalisation
-    totalizations, totalisations
-    totalizator's, totalisator's
-    totalizator, totalisator
-    totalizators, totalisators
-    totalize, totalise
-    totalized, totalised
-    totalizer's, totaliser's
-    totalizer, totaliser
-    totalizers, totalisers
-    totalizes, totalises
-    totalizing, totalising
-    totemization's, totemisation's
-    totemization, totemisation
-    totemizations, totemisations
-    tourize, tourise
-    tourizes, tourises
-    toweled, towelled
-    toweling's, towelling's
-    toweling, towelling
-    towelings, towellings
-    toxanemia, toxanaemia
-    toxemia's, toxaemia's
-    toxemia, toxaemia
-    toxemias, toxaemias
-    toxemic, toxaemic
-    toxicemia, toxicaemia
-    toxicohemia, toxicohaemia
-    toxihemia, toxihaemia
-    toxinemia, toxinaemia
-    trabeate, trabeatae
-    trabecule, trabeculae
-    tractorization's, tractorisation's
-    tractorization, tractorisation
-    tractorizations, tractorisations
-    tractorize, tractorise
-    tractorizes, tractorises
-    traditionalize, traditionalise
-    traditionalized, traditionalised
-    traditionalizes, traditionalises
-    traditionize, traditionise
-    traditionizes, traditionises
-    tragicize, tragicise
-    tragicizes, tragicises
-    tragicolored, tragicoloured
-    traitorize, traitorise
-    traitorizes, traitorises
-    trammeled, trammelled
-    trammeler's, trammeller's
-    trammeler, trammeller
-    trammelers, trammellers
-    trammeling, trammelling
-    tranquilities, tranquillities
-    tranquility's, tranquillity's
-    tranquility, tranquillity
-    tranquilization's, tranquilisation's
-    tranquilization, tranquilisation
-    tranquilizations, tranquilisations
-    tranquilizingly, tranquilisingly
-    tranquillization's, tranquillisation's
-    tranquillization, tranquillisation
-    tranquillizations, tranquillisations
-    tranquillize, tranquillise
-    tranquillized, tranquillised
-    tranquillizer's, tranquilliser's
-    tranquillizer, tranquilliser
-    tranquillizers, tranquillisers
-    tranquillizes, tranquillises
-    tranquillizing, tranquillising
-    tranquillizingly, tranquillisingly
-    transcendentalization's, transcendentalisation's
-    transcendentalization, transcendentalisation
-    transcendentalize, transcendentalise
-    transcendentalized, transcendentalised
-    transcendentalizes, transcendentalises
-    transcendentalizing, transcendentalising
-    transcolor, transcolour
-    transcoloration's, transcolouration's
-    transcoloration, transcolouration
-    transcolorations, transcolourations
-    transcolorrer, transcolourer
-    transcolorrest, transcolourest
-    transgender, transgendered
-    transistorization's, transistorisation's
-    transistorization, transistorisation
-    transistorizations, transistorisations
-    transistorize, transistorise
-    transistorized, transistorised
-    transistorizes, transistorises
-    transistorizing, transistorising
-    transparentize, transparentise
-    transparentizes, transparentises
-    traumatization's, traumatisation's
-    traumatization, traumatisation
-    traumatizations, traumatisations
-    traumatize, traumatise
-    traumatized, traumatised
-    traumatizes, traumatises
-    traumatizing, traumatising
-    traveled, travelled
-    traveler's, traveller's
-    traveler, traveller
-    travelers, travellers
-    traveling's, travelling's
-    traveling, travelling
-    travelings, travellings
-    travelogue's, travelog's
-    travelogue, travelog
-    travelogues, travelogs
-    trialed, trialled
-    trialing, trialling
-    trialization, trialisation
-    triangularization, triangularisation
-    triangularizations, triangularisations
-    triangularize, triangularise
-    triangularized, triangularised
-    triangularizes, triangularises
-    triangularizing, triangularising
-    trichinization's, trichinisation's
-    trichinization, trichinisation
-    trichinizations, trichinisations
-    trichinize, trichinise
-    trichinized, trichinised
-    trichinizes, trichinises
-    trichinizing, trichinising
-    trichlorethylene, trichloroethylene
-    trichlorethylenes, trichloroethylenes
-    trichotomize, trichotomise
-    trichotomized, trichotomised
-    trichotomizes, trichotomises
-    trichotomizing, trichotomising
-    tricolor's, tricolour's
-    tricolor, tricolour
-    tricolored, tricoloured
-    tricolors, tricolours
-    triecious, trioecious
-    trieciously, trioeciously
-    triene, triaene
-    trifluoride, trifluouride
-    trillionize, trillionise
-    trillionizes, trillionises
-    trimerization's, trimerisation's
-    trimerization, trimerisation
-    trimerizations, trimerisations
-    tripylean, tripylaean
-    trivialization's, trivialisation's
-    trivialization, trivialisation
-    trivializations, trivialisations
-    trivialize, trivialise
-    trivialized, trivialised
-    trivializes, trivialises
-    trivializing, trivialising
-    trolley's, trolly's
-    trolley, trolly
-    trolleyed, trollied
-    trolleying, trollying
-    trolleys, trollies
-    tropeolin's, tropaeolin's
-    tropeolin, tropaeolin
-    tropicalization's, tropicalisation's
-    tropicalization, tropicalisation
-    tropicalizations, tropicalisations
-    tropicalize, tropicalise
-    tropicalized, tropicalised
-    tropicalizes, tropicalises
-    tropicalizing, tropicalising
-    troweled, trowelled
-    troweler's, troweller's
-    troweler, troweller
-    trowelers, trowellers
-    troweling, trowelling
-    Trubenize's, Trubenise's
-    Trubenize, Trubenise
-    Trubenized's, Trubenised's
-    Trubenized, Trubenised
-    Trubenizes, Trubenises
-    Trubenizing's, Trubenising's
-    Trubenizing, Trubenising
-    trypsinize's, trypsinise's
-    trypsinize, trypsinise
-    trypsinizes, trypsinises
-    tsarinas, tzarinas
-    tsarism, tzarism
-    tsarisms, tzarisms
-    tsoris, tsouris
-    tubercularization's, tubercularisation's
-    tubercularization, tubercularisation
-    tubercularize, tubercularise
-    tubercularized, tubercularised
-    tubercularizing, tubercularising
-    tuberculinization's, tuberculinisation's
-    tuberculinization, tuberculinisation
-    tuberculinizations, tuberculinisations
-    tuberculinize, tuberculinise
-    tuberculinized, tuberculinised
-    tuberculinizes, tuberculinises
-    tuberculinizing, tuberculinising
-    tuberculization, tuberculisation
-    tuberculizations, tuberculisations
-    tuberculize, tuberculise
-    tuberculized, tuberculised
-    tuberculizes, tuberculises
-    tuberculizing, tuberculising
-    tuberization's, tuberisation's
-    tuberization, tuberisation
-    tuberizations, tuberisations
-    tuberize, tuberise
-    tuberizes, tuberises
-    tubulization's, tubulisation's
-    tubulization, tubulisation
-    tubulizations, tubulisations
-    tularemia, tularaemia
-    tularemias, tularaemias
-    tularemic, tularaemic
-    tumbrel's, tumbril's
-    tumbrel, tumbril
-    tumbrels, tumbrils
-    tumor's, tumour's
-    tumor, tumour
-    tumored, tumoured
-    tumors, tumours
-    tunneled, tunnelled
-    tunneler's, tunneller's
-    tunneler, tunneller
-    tunnelers, tunnellers
-    tunneling, tunnelling
-    tunnelings, tunnellings
-    turdine, turdinae
-    Turkicize's, Turkicise's
-    Turkicize, Turkicise
-    Turkicized's, Turkicised's
-    Turkicized, Turkicised
-    Turkicizes, Turkicises
-    Turkicizing's, Turkicising's
-    Turkicizing, Turkicising
-    Turkize's, Turkise's
-    Turkize, Turkise
-    Turkizes, Turkises
-    Tuscanize's, Tuscanise's
-    Tuscanize, Tuscanise
-    Tuscanizes, Tuscanises
-    tutele, tutelae
-    tutorization's, tutorisation's
-    tutorization, tutorisation
-    tutorizations, tutorisations
-    tutorize, tutorise
-    tutorized, tutorised
-    tutorizes, tutorises
-    tutorizing, tutorising
-    twier, twire
-    twiers, twires
-    tyke's, tike's
-    tyke, tike
-    tykes, tikes
-    Tylerize's, Tylerise's
-    Tylerize, Tylerise
-    Tylerizes, Tylerises
-    typhemia, typhaemia
-    typhemia, typhoemia
-    typhlenteritis, typhloenteritis
-    typhoemia, typhoaemia
-    tyrannize, tyrannise
-    tyrannized, tyrannised
-    tyrannizer's, tyranniser's
-    tyrannizer, tyranniser
-    tyrannizers, tyrannisers
-    tyrannizes, tyrannises
-    tyrannizing's, tyrannising's
-    tyrannizing, tyrannising
-    tyrannizinglier, tyrannisinglier
-    tyrannizingliest, tyrannisingliest
-    tyrannizingly, tyrannisingly
-    tyrannizings, tyrannisings
-    tzar's, tsar's
-    tzar, tsar
-    tzardom's, tsardom's
-    tzardom, tsardom
-    tzardoms, tsardoms
-    tzarina's, tsarina's
-    tzarina, tsarina
-    tzarism's, tsarism's
-    tzarist, tsarist
-    tzars, tsars
-    ukulele's, ukelele's
-    ukulele, ukelele
-    ukuleles, ukeleles
-    ultracentralizer's, ultracentraliser's
-    ultracentralizer, ultracentraliser
-    ultracentralizers, ultracentralisers
-    ultrahonorable's, ultrahonourable's
-    ultrahonorable, ultrahonourable
-    ultrahonorables, ultrahonourables
-    ultraspecialization's, ultraspecialisation's
-    ultraspecialization, ultraspecialisation
-    ultraspecializations, ultraspecialisations
-    ultrastandardization's, ultrastandardisation's
-    ultrastandardization, ultrastandardisation
-    ultrastandardizations, ultrastandardisations
-    unacclimatized, unacclimatised
-    unagonize, unagonise
-    unalcoholized's, unalcoholised's
-    unalcoholized, unalcoholised
-    unalcoholizedder, unalcoholisedder
-    unalcoholizeddest, unalcoholiseddest
-    unalcoholizeds, unalcoholiseds
-    unalphabetized, unalphabetised
-    unamortization's, unamortisation's
-    unamortization, unamortisation
-    unamortizations, unamortisations
-    unamortized, unamortised
-    unanalyzable, unanalysable
-    unanalyzed, unanalysed
-    unanatomizable, unanatomisable
-    unanatomized, unanatomised
-    unanemic, unanaemic
-    unanimalized's, unanimalised's
-    unanimalized, unanimalised
-    unanimalizeds, unanimaliseds
-    unantagonizable's, unantagonisable's
-    unantagonizable, unantagonisable
-    unantagonizabler, unantagonisabler
-    unantagonizables, unantagonisables
-    unantagonizablest, unantagonisablest
-    unantagonized, unantagonised
-    unantagonizedder, unantagonisedder
-    unantagonizeddest, unantagoniseddest
-    unantagonizing, unantagonising
-    unantagonizinger, unantagonisinger
-    unantagonizingest, unantagonisingest
-    unapologizing's, unapologising's
-    unapologizing, unapologising
-    unapostatized's, unapostatised's
-    unapostatized, unapostatised
-    unapostatizeds, unapostatiseds
-    unappetizing, unappetising
-    unappetizinger, unappetisinger
-    unappetizingest, unappetisingest
-    unappetizinglier, unappetisinglier
-    unappetizingliest, unappetisingliest
-    unappetizingly, unappetisingly
-    unapprized, unapprised
-    unarbored, unarboured
-    unarmored, unarmoured
-    unarmoredder, unarmouredder
-    unarmoreddest, unarmoureddest
-    unauthorize, unauthorise
-    unauthorized, unauthorised
-    unauthorizedder, unauthorisedder
-    unauthorizeddest, unauthoriseddest
-    unauthorizedly, unauthorisedly
-    unauthorizedness, unauthorisedness
-    unauthorizes, unauthorises
-    unbaptize, unbaptise
-    unbaptized, unbaptised
-    unbaptizes, unbaptises
-    unbaptizing, unbaptising
-    unbarbarize, unbarbarise
-    unbarbarized, unbarbarised
-    unbarbarizing, unbarbarising
-    unbarricaded, unbarricadoed
-    unbastardized, unbastardised
-    unbastardizedder, unbastardisedder
-    unbastardizeddest, unbastardiseddest
-    unbeknownst, unbeknown
-    unbrutalize, unbrutalise
-    unbrutalized, unbrutalised
-    unbrutalizes, unbrutalises
-    unbrutalizing, unbrutalising
-    unbrutize, unbrutise
-    unbrutized, unbrutised
-    unbrutizes, unbrutises
-    unbrutizing, unbrutising
-    uncanceled, uncancelled
-    uncanceledder, uncancelledder
-    uncanceleddest, uncancelleddest
-    uncandor, uncandour
-    uncanonization's, uncanonisation's
-    uncanonization, uncanonisation
-    uncanonize, uncanonise
-    uncanonized, uncanonised
-    uncanonizes, uncanonises
-    uncanonizing, uncanonising
-    uncantonized's, uncantonised's
-    uncantonized, uncantonised
-    uncantonizeds, uncantoniseds
-    uncapitalized, uncapitalised
-    uncapitalizedder, uncapitalisedder
-    uncapitalizeddest, uncapitaliseddest
-    uncaramelized, uncaramelised
-    uncatechized's, uncatechised's
-    uncatechized, uncatechised
-    uncatechizedness, uncatechisedness
-    uncatechizeds, uncatechiseds
-    uncategorized, uncategorised
-    uncategorizedder, uncategorisedder
-    uncategorizeddest, uncategoriseddest
-    uncatholicize, uncatholicise
-    uncatholicized, uncatholicised
-    uncatholicizes, uncatholicises
-    uncatholicizing, uncatholicising
-    uncauterized's, uncauterised's
-    uncauterized, uncauterised
-    uncauterizeds, uncauteriseds
-    uncelestialized's, uncelestialised's
-    uncelestialized, uncelestialised
-    uncelestializeds, uncelestialiseds
-    uncenter, uncentre
-    uncentralized, uncentralised
-    uncharacterized, uncharacterised
-    uncharacterizedder, uncharacterisedder
-    uncharacterizeddest, uncharacteriseddest
-    unchastizable, unchastisable
-    unchastized, unchastised
-    unchloridized's, unchloridised's
-    unchloridized, unchloridised
-    unchloridizeds, unchloridiseds
-    unchristianize, unchristianise
-    unchristianized, unchristianised
-    unchristianizes, unchristianises
-    unchristianizing, unchristianising
-    uncircularized's, uncircularised's
-    uncircularized, uncircularised
-    uncircularizedder, uncircularisedder
-    uncircularizeddest, uncirculariseddest
-    uncircularizeds, uncirculariseds
-    uncivilizable's, uncivilisable's
-    uncivilizable, uncivilisable
-    uncivilizabler, uncivilisabler
-    uncivilizables, uncivilisables
-    uncivilizablest, uncivilisablest
-    uncivilize, uncivilise
-    uncivilized, uncivilised
-    uncivilizedly, uncivilisedly
-    uncivilizedness, uncivilisedness
-    uncivilizes, uncivilises
-    unclericalize, unclericalise
-    unclericalizes, unclericalises
-    uncognizable, uncognisable
-    uncolonize, uncolonise
-    uncolonized, uncolonised
-    uncolonizes, uncolonises
-    uncolonizing, uncolonising
-    uncolorable's, uncolourable's
-    uncolorable, uncolourable
-    uncolorabler, uncolourabler
-    uncolorables, uncolourables
-    uncolorablest, uncolourablest
-    uncolorablier, uncolourablier
-    uncolorablies, uncolourablies
-    uncolorabliest, uncolourabliest
-    uncolorably, uncolourably
-    uncolored, uncoloured
-    uncoloredder, uncolouredder
-    uncoloreddest, uncoloureddest
-    uncoloredlier, uncolouredlier
-    uncoloredliest, uncolouredliest
-    uncoloredly, uncolouredly
-    uncoloredness's, uncolouredness's
-    uncoloredness, uncolouredness
-    uncolorednesses, uncolourednesses
-    uncoloreds, uncoloureds
-    unconcerted, unconcreted
-    unconventionalize, unconventionalise
-    unconventionalizes, unconventionalises
-    uncriticizable's, uncriticisable's
-    uncriticizable, uncriticisable
-    uncriticizabler, uncriticisabler
-    uncriticizables, uncriticisables
-    uncriticizablest, uncriticisablest
-    uncriticizably, uncriticisably
-    uncriticized, uncriticised
-    uncriticizing, uncriticising
-    uncriticizingly, uncriticisingly
-    uncrystallizabilities, uncrystallisabilities
-    uncrystallizability's, uncrystallisability's
-    uncrystallizability, uncrystallisability
-    uncrystallizable's, uncrystallisable's
-    uncrystallizable, uncrystallisable
-    uncrystallizabler, uncrystallisabler
-    uncrystallizables, uncrystallisables
-    uncrystallizablest, uncrystallisablest
-    uncrystallized, uncrystallised
-    uncurricularized's, uncurricularised's
-    uncurricularized, uncurricularised
-    uncurricularizeds, uncurriculariseds
-    undefense's, undefence's
-    undefense, undefence
-    undefenses, undefences
-    undemagnetizable's, undemagnetisable's
-    undemagnetizable, undemagnetisable
-    undemagnetizables, undemagnetisables
-    undemocratization's, undemocratisation's
-    undemocratization, undemocratisation
-    undemocratize, undemocratise
-    undemocratized, undemocratised
-    undemocratizes, undemocratises
-    undemocratizing, undemocratising
-    undenominationalize, undenominationalise
-    undenominationalizes, undenominationalises
-    undercapitalization's, undercapitalisation's
-    undercapitalization, undercapitalisation
-    undercapitalizations, undercapitalisations
-    undercapitalize, undercapitalise
-    undercapitalized, undercapitalised
-    undercapitalizes, undercapitalises
-    undercapitalizing, undercapitalising
-    undercolor's, undercolour's
-    undercolor, undercolour
-    undercolored, undercoloured
-    undercoloring, undercolouring
-    undercolorings, undercolourings
-    undercolors, undercolours
-    underemphasize, underemphasise
-    underemphasized, underemphasised
-    underemphasizes, underemphasises
-    underemphasizing, underemphasising
-    undergoer, undergore
-    underlaborer's, underlabourer's
-    underlaborer, underlabourer
-    underlaborers, underlabourers
-    underorganization's, underorganisation's
-    underorganization, underorganisation
-    underorganizations, underorganisations
-    underoxidize, underoxidise
-    underoxidized, underoxidised
-    underoxidizes, underoxidises
-    underoxidizing, underoxidising
-    underprize, underprise
-    underprized, underprised
-    underprizes, underprises
-    underprizing, underprising
-    underrealize, underrealise
-    underrealized, underrealised
-    underrealizes, underrealises
-    underrealizing, underrealising
-    undersavior's, undersaviour's
-    undersavior, undersaviour
-    undersaviors, undersaviours
-    undersized, undersize
-    underutilization's, underutilisation's
-    underutilization, underutilisation
-    underutilizations, underutilisations
-    underutilize, underutilise
-    underutilized, underutilised
-    underutilizes, underutilises
-    underutilizing, underutilising
-    undervitalized's, undervitalised's
-    undervitalized, undervitalised
-    undervitalizeds, undervitaliseds
-    undialyzed's, undialysed's
-    undialyzed, undialysed
-    undialyzeds, undialyseds
-    undiphthongize, undiphthongise
-    undiphthongizes, undiphthongises
-    undiscolored's, undiscoloured's
-    undiscolored, undiscoloured
-    undiscoloredder, undiscolouredder
-    undiscoloreddest, undiscoloureddest
-    undiscoloreds, undiscoloureds
-    undishonored, undishonoured
-    undisorganized, undisorganised
-    undramatizable's, undramatisable's
-    undramatizable, undramatisable
-    undramatizabler, undramatisabler
-    undramatizables, undramatisables
-    undramatizablest, undramatisablest
-    undramatized's, undramatised's
-    undramatized, undramatised
-    undramatizeds, undramatiseds
-    undreamed, undreamt
-    undualize, undualise
-    undualizes, undualises
-    uneconomizing, uneconomising
-    unenamored's, unenamoured's
-    unenamored, unenamoured
-    unenamoredder, unenamouredder
-    unenamoreddest, unenamoureddest
-    unenamoreds, unenamoureds
-    unendeavored, unendeavoured
-    unenergized's, unenergised's
-    unenergized, unenergised
-    unenergizeds, unenergiseds
-    unepitomized, unepitomised
-    unepitomizedder, unepitomisedder
-    unepitomizeddest, unepitomiseddest
-    unequaled, unequalled
-    unequaledder, unequalledder
-    unequaleddest, unequalleddest
-    unequalize, unequalise
-    unequalized, unequalised
-    unequalizes, unequalises
-    unequalizing, unequalising
-    uneulogized's, uneulogised's
-    uneulogized, uneulogised
-    uneulogizedder, uneulogisedder
-    uneulogizeddest, uneulogiseddest
-    uneulogizeds, uneulogiseds
-    unevangelized's, unevangelised's
-    unevangelized, unevangelised
-    unevangelizedder, unevangelisedder
-    unevangelizeddest, unevangeliseddest
-    unevangelizeds, unevangeliseds
-    unfamiliarized, unfamiliarised
-    unfamiliarizedder, unfamiliarisedder
-    unfamiliarizeddest, unfamiliariseddest
-    unfavorable's, unfavourable's
-    unfavorable, unfavourable
-    unfavorableness's, unfavourableness's
-    unfavorableness, unfavourableness
-    unfavorablenesses, unfavourablenesses
-    unfavorabler, unfavourabler
-    unfavorables, unfavourables
-    unfavorablest, unfavourablest
-    unfavorablier, unfavourablier
-    unfavorabliest, unfavourabliest
-    unfavorably, unfavourably
-    unfavored's, unfavoured's
-    unfavored, unfavoured
-    unfavoredder, unfavouredder
-    unfavoreddest, unfavoureddest
-    unfavoring's, unfavouring's
-    unfavoring, unfavouring
-    unfavoringer, unfavouringer
-    unfavoringest, unfavouringest
-    unfavorings, unfavourings
-    unfavorite's, unfavourite's
-    unfavorite, unfavourite
-    unfavoriter, unfavouriter
-    unfavorites, unfavourites
-    unfavoritest, unfavouritest
-    unfeminize, unfeminise
-    unfeminized, unfeminised
-    unfeminizing, unfeminising
-    unfertilizable's, unfertilisable's
-    unfertilizable, unfertilisable
-    unfertilizabler, unfertilisabler
-    unfertilizables, unfertilisables
-    unfertilizablest, unfertilisablest
-    unfertilized, unfertilised
-    unfertilizedder, unfertilisedder
-    unfertilizeddest, unfertiliseddest
-    unfertilizing, unfertilising
-    unfeudalize, unfeudalise
-    unfeudalized, unfeudalised
-    unfeudalizes, unfeudalises
-    unfeudalizing, unfeudalising
-    unflavored, unflavoured
-    unflavoredder, unflavouredder
-    unflavoreddest, unflavoureddest
-    unflavorous, unflavourous
-    unfocused, unfocussed
-    unformalized, unformalised
-    unformalizedder, unformalisedder
-    unformalizeddest, unformaliseddest
-    unfossilized's, unfossilised's
-    unfossilized, unfossilised
-    unfossilizedder, unfossilisedder
-    unfossilizeddest, unfossiliseddest
-    unfossilizeds, unfossiliseds
-    unfraternized, unfraternised
-    unfraternizing's, unfraternising's
-    unfraternizing, unfraternising
-    unfraternizings, unfraternisings
-    ungalvanized's, ungalvanised's
-    ungalvanized, ungalvanised
-    ungalvanizeds, ungalvaniseds
-    ungelatinizable's, ungelatinisable's
-    ungelatinizable, ungelatinisable
-    ungelatinizables, ungelatinisables
-    ungelatinized's, ungelatinised's
-    ungelatinized, ungelatinised
-    ungelatinizeds, ungelatiniseds
-    ungeneralized, ungeneralised
-    ungeneralizedder, ungeneralisedder
-    ungeneralizeddest, ungeneraliseddest
-    ungeneralizing, ungeneralising
-    ungentilize, ungentilise
-    ungentilizes, ungentilises
-    ungentlemanize, ungentlemanise
-    ungentlemanizes, ungentlemanises
-    unglamorous, unglamourous
-    unglamorously, unglamourously
-    ungospelized's, ungospelised's
-    ungospelized, ungospelised
-    ungospelizeds, ungospeliseds
-    ungraphitized's, ungraphitised's
-    ungraphitized, ungraphitised
-    ungraphitizeds, ungraphitiseds
-    unharbor's, unharbour's
-    unharbor, unharbour
-    unharbored, unharboured
-    unharmonize, unharmonise
-    unharmonized, unharmonised
-    unharmonizes, unharmonises
-    unharmonizing, unharmonising
-    unheroize, unheroise
-    unheroizes, unheroises
-    unhonorable's, unhonourable's
-    unhonorable, unhonourable
-    unhonorables, unhonourables
-    unhonorablies, unhonourablies
-    unhonorably, unhonourably
-    unhonored, unhonoured
-    unhonoredder, unhonouredder
-    unhonoreddest, unhonoureddest
-    unhouseled, unhouselled
-    unhumanize, unhumanise
-    unhumanized, unhumanised
-    unhumanizes, unhumanises
-    unhumanizing, unhumanising
-    unhumored, unhumoured
-    unhumoredder, unhumouredder
-    unhumoreddest, unhumoureddest
-    unhumorous, unhumourous
-    unhumorously, unhumourously
-    unhydrolyzed's, unhydrolysed's
-    unhydrolyzed, unhydrolysed
-    unhydrolyzeds, unhydrolyseds
-    unhypnotizable's, unhypnotisable's
-    unhypnotizable, unhypnotisable
-    unhypnotizabler, unhypnotisabler
-    unhypnotizables, unhypnotisables
-    unhypnotizablest, unhypnotisablest
-    unhypnotize, unhypnotise
-    unhypnotized, unhypnotised
-    unhypnotizes, unhypnotises
-    unhypnotizing, unhypnotising
-    unicolor, unicolour
-    unicolorate, unicolourate
-    unicolored, unicoloured
-    unicolorous, unicolourous
-    unidealized, unidealised
-    unidealizedder, unidealisedder
-    unidealizeddest, unidealiseddest
-    unidolized's, unidolised's
-    unidolized, unidolised
-    unidolizedder, unidolisedder
-    unidolizeddest, unidoliseddest
-    unidolizeds, unidoliseds
-    uniformization's, uniformisation's
-    uniformization, uniformisation
-    uniformizations, uniformisations
-    uniformize, uniformise
-    uniformized, uniformised
-    uniformizes, uniformises
-    uniformizing, uniformising
-    unilateralization's, unilateralisation's
-    unilateralization, unilateralisation
-    unilateralizations, unilateralisations
-    unilateralize, unilateralise
-    unilateralizes, unilateralises
-    unimmortalize, unimmortalise
-    unimmortalized, unimmortalised
-    unimmortalizes, unimmortalises
-    unimmunized, unimmunised
-    unindividualize, unindividualise
-    unindividualized, unindividualised
-    unindividualizes, unindividualises
-    unindustrialized's, unindustrialised's
-    unindustrialized, unindustrialised
-    unindustrializeds, unindustrialiseds
-    uninitializable, uninitialisable
-    uninitialized, uninitialised
-    unionization's, unionisation's
-    unionization, unionisation
-    unionizations, unionisations
-    unionize, unionise
-    unionized, unionised
-    unionizer, unioniser
-    unionizers, unionisers
-    unionizes, unionises
-    unionizing, unionising
-    unitalicized, unitalicised
-    Unitarianize's, Unitarianise's
-    Unitarianize, Unitarianise
-    Unitarianizes, Unitarianises
-    unitemized, unitemised
-    unitization's, unitisation's
-    unitization, unitisation
-    unitizations, unitisations
-    unitize, unitise
-    unitized, unitised
-    unitizes, unitises
-    unitizing, unitising
-    universalization's, universalisation's
-    universalization, universalisation
-    universalizations, universalisations
-    universalize, universalise
-    universalized, universalised
-    universalizer's, universaliser's
-    universalizer, universaliser
-    universalizers, universalisers
-    universalizes, universalises
-    universalizing, universalising
-    unjeopardized, unjeopardised
-    unjournalized, unjournalised
-    unkenneled, unkennelled
-    unkenneling, unkennelling
-    unlabeled, unlabelled
-    unlabeledder, unlabelledder
-    unlabeleddest, unlabelleddest
-    unlabialize, unlabialise
-    unlabialized, unlabialised
-    unlabializes, unlabialises
-    unlabializing, unlabialising
-    unlaborable's, unlabourable's
-    unlaborable, unlabourable
-    unlaborables, unlabourables
-    unlabored's, unlaboured's
-    unlabored, unlaboured
-    unlaboredder, unlabouredder
-    unlaboreddest, unlaboureddest
-    unlaboring's, unlabouring's
-    unlaboring, unlabouring
-    unlaboringer, unlabouringer
-    unlaboringest, unlabouringest
-    unlaborings, unlabourings
-    unlegalized, unlegalised
-    unlegalizedder, unlegalisedder
-    unlegalizeddest, unlegaliseddest
-    unleveled, unlevelled
-    unleveling, unlevelling
-    unliberalized, unliberalised
-    unliberalizedder, unliberalisedder
-    unliberalizeddest, unliberaliseddest
-    unlionized, unlionised
-    unliteralized, unliteralised
-    unlocalizable's, unlocalisable's
-    unlocalizable, unlocalisable
-    unlocalizabler, unlocalisabler
-    unlocalizables, unlocalisables
-    unlocalizablest, unlocalisablest
-    unlocalize, unlocalise
-    unlocalized, unlocalised
-    unlocalizes, unlocalises
-    unlocalizing, unlocalising
-    unmacadamized, unmacadamised
-    unmagnetized's, unmagnetised's
-    unmagnetized, unmagnetised
-    unmagnetizedder, unmagnetisedder
-    unmagnetizeddest, unmagnetiseddest
-    unmagnetizeds, unmagnetiseds
-    unmaterialized, unmaterialised
-    unmechanize, unmechanise
-    unmechanized, unmechanised
-    unmechanizes, unmechanises
-    unmechanizing, unmechanising
-    unmediatized's, unmediatised's
-    unmediatized, unmediatised
-    unmediatizeds, unmediatiseds
-    unmedieval, unmediaeval
-    unmelodized, unmelodised
-    unmemorialized's, unmemorialised's
-    unmemorialized, unmemorialised
-    unmemorializedder, unmemorialisedder
-    unmemorializeddest, unmemorialiseddest
-    unmemorializeds, unmemorialiseds
-    unmemorized, unmemorised
-    unmercerized's, unmercerised's
-    unmercerized, unmercerised
-    unmercerizeds, unmerceriseds
-    unmesmerize, unmesmerise
-    unmesmerized, unmesmerised
-    unmesmerizedder, unmesmerisedder
-    unmesmerizeddest, unmesmeriseddest
-    unmesmerizes, unmesmerises
-    unmetallised's, unmetallized's
-    unmetallised, unmetallized
-    unmetalliseds, unmetallizeds
-    unmethodized's, unmethodised's
-    unmethodized, unmethodised
-    unmethodizedder, unmethodisedder
-    unmethodizeddest, unmethodiseddest
-    unmethodizeds, unmethodiseds
-    unmethodizing's, unmethodising's
-    unmethodizing, unmethodising
-    unmethodizinger, unmethodisinger
-    unmethodizingest, unmethodisingest
-    unmethodizings, unmethodisings
-    unmilitarized, unmilitarised
-    unmineralized's, unmineralised's
-    unmineralized, unmineralised
-    unmineralizedder, unmineralisedder
-    unmineralizeddest, unmineraliseddest
-    unmineralizeds, unmineraliseds
-    unminimized, unminimised
-    unminimizedder, unminimisedder
-    unminimizeddest, unminimiseddest
-    unminimizing, unminimising
-    unmissionized's, unmissionised's
-    unmissionized, unmissionised
-    unmissionizeds, unmissioniseds
-    unmiter, unmitre
-    unmiters, unmitres
-    unmobilized's, unmobilised's
-    unmobilized, unmobilised
-    unmobilizedder, unmobilisedder
-    unmobilizeddest, unmobiliseddest
-    unmobilizeds, unmobiliseds
-    unmodernize, unmodernise
-    unmodernized, unmodernised
-    unmodernizedder, unmodernisedder
-    unmodernizeddest, unmoderniseddest
-    unmodernizes, unmodernises
-    unmonopolize, unmonopolise
-    unmonopolized, unmonopolised
-    unmonopolizedder, unmonopolisedder
-    unmonopolizeddest, unmonopoliseddest
-    unmonopolizes, unmonopolises
-    unmonopolizing, unmonopolising
-    unmonopolizinger, unmonopolisinger
-    unmonopolizingest, unmonopolisingest
-    unmonopolizings, unmonopolisings
-    unmoralize, unmoralise
-    unmoralized, unmoralised
-    unmoralizes, unmoralises
-    unmoralizing, unmoralising
-    unmoralizinger, unmoralisinger
-    unmoralizingest, unmoralisingest
-    unmoralizings, unmoralisings
-    unmotorized, unmotorised
-    unmotorizedder, unmotorisedder
-    unmotorizeddest, unmotoriseddest
-    unmunicipalized's, unmunicipalised's
-    unmunicipalized, unmunicipalised
-    unmunicipalizedder, unmunicipalisedder
-    unmunicipalizeddest, unmunicipaliseddest
-    unmunicipalizeds, unmunicipaliseds
-    unmutualized's, unmutualised's
-    unmutualized, unmutualised
-    unmutualizedder, unmutualisedder
-    unmutualizeddest, unmutualiseddest
-    unmutualizeds, unmutualiseds
-    unmysticize, unmysticise
-    unmysticized, unmysticised
-    unmysticizes, unmysticises
-    unmysticizing, unmysticising
-    unnationalized, unnationalised
-    unnationalizedder, unnationalisedder
-    unnationalizeddest, unnationaliseddest
-    unnaturalizable's, unnaturalisable's
-    unnaturalizable, unnaturalisable
-    unnaturalizables, unnaturalisables
-    unnaturalize, unnaturalise
-    unnaturalized, unnaturalised
-    unnaturalizes, unnaturalises
-    unnaturalizing, unnaturalising
-    unneighbored, unneighboured
-    unneighborlier, unneighbourlier
-    unneighborliest, unneighbourliest
-    unneighborlike's, unneighbourlike's
-    unneighborlike, unneighbourlike
-    unneighborlikes, unneighbourlikes
-    unneighborliness's, unneighbourliness's
-    unneighborliness, unneighbourliness
-    unneighborlinesses, unneighbourlinesses
-    unneighborly, unneighbourly
-    unneutralize, unneutralise
-    unneutralized, unneutralised
-    unneutralizing, unneutralising
-    unnitrogenized's, unnitrogenised's
-    unnitrogenized, unnitrogenised
-    unnitrogenizedder, unnitrogenisedder
-    unnitrogenizeddest, unnitrogeniseddest
-    unnitrogenizeds, unnitrogeniseds
-    unnoncolorables, unnoncolourables
-    unnoncolorablies, unnoncolourablies
-    unnoncolorably, unnoncolourably
-    unnormalize, unnormalise
-    unnormalized, unnormalised
-    unnormalizedder, unnormalisedder
-    unnormalizeddest, unnormaliseddest
-    unnormalizes, unnormalises
-    unnormalizing, unnormalising
-    unnormalizinger, unnormalisinger
-    unnormalizingest, unnormalisingest
-    unoptimize, unoptimise
-    unoptimized, unoptimised
-    unoptimizes, unoptimises
-    unoptimizing, unoptimising
-    unorganizable's, unorganisable's
-    unorganizable, unorganisable
-    unorganizabler, unorganisabler
-    unorganizables, unorganisables
-    unorganizablest, unorganisablest
-    unorganize, unorganise
-    unorganized, unorganised
-    unorganizedly, unorganisedly
-    unorganizedness, unorganisedness
-    unoxidizable's, unoxidisable's
-    unoxidizable, unoxidisable
-    unoxidizabler, unoxidisabler
-    unoxidizables, unoxidisables
-    unoxidizablest, unoxidisablest
-    unoxidized, unoxidised
-    unoxidizedder, unoxidisedder
-    unoxidizeddest, unoxidiseddest
-    unoxygenized's, unoxygenised's
-    unoxygenized, unoxygenised
-    unoxygenizeds, unoxygeniseds
-    unpaganize, unpaganise
-    unpaganizes, unpaganises
-    unpalisaded, unpalisadoed
-    unpanegyrized, unpanegyrised
-    unparagonized's, unparagonised's
-    unparagonized, unparagonised
-    unparagonizeds, unparagoniseds
-    unparalleled, unparallelled
-    unparalyzed's, unparalysed's
-    unparalyzed, unparalysed
-    unparalyzedder, unparalysedder
-    unparalyzeddest, unparalyseddest
-    unparalyzeds, unparalyseds
-    unparameterized, unparameterised
-    unparametrized, unparametrised
-    unparceled, unparcelled
-    unparceledder, unparcelledder
-    unparceleddest, unparcelleddest
-    unparenthesized, unparenthesised
-    unparticularized's, unparticularised's
-    unparticularized, unparticularised
-    unparticularizedder, unparticularisedder
-    unparticularizeddest, unparticulariseddest
-    unparticularizeds, unparticulariseds
-    unparticularizing's, unparticularising's
-    unparticularizing, unparticularising
-    unparticularizinger, unparticularisinger
-    unparticularizingest, unparticularisingest
-    unparticularizings, unparticularisings
-    unpartizan, unpartisan
-    unpasteurized, unpasteurised
-    unpatronizable's, unpatronisable's
-    unpatronizable, unpatronisable
-    unpatronizabler, unpatronisabler
-    unpatronizables, unpatronisables
-    unpatronizablest, unpatronisablest
-    unpatronized, unpatronised
-    unpatronizing's, unpatronising's
-    unpatronizing, unpatronising
-    unpauperized's, unpauperised's
-    unpauperized, unpauperised
-    unpauperizeds, unpauperiseds
-    unpenalized, unpenalised
-    unpenalizedder, unpenalisedder
-    unpenalizeddest, unpenaliseddest
-    unperceptively, unpreceptively
-    unpersonalized, unpersonalised
-    unpersonalizing, unpersonalising
-    unphilosophize, unphilosophise
-    unphilosophized, unphilosophised
-    unphilosophizes, unphilosophises
-    unphosphatized's, unphosphatised's
-    unphosphatized, unphosphatised
-    unphosphatizedder, unphosphatisedder
-    unphosphatizeddest, unphosphatiseddest
-    unphosphatizeds, unphosphatiseds
-    unpictorialize, unpictorialise
-    unpictorialized, unpictorialised
-    unpictorializing, unpictorialising
-    unplagiarized's, unplagiarised's
-    unplagiarized, unplagiarised
-    unplagiarizedder, unplagiarisedder
-    unplagiarizeddest, unplagiariseddest
-    unplagiarizeds, unplagiariseds
-    unpluralized, unpluralised
-    unpoeticized's, unpoeticised's
-    unpoeticized, unpoeticised
-    unpoeticizedder, unpoeticisedder
-    unpoeticizeddest, unpoeticiseddest
-    unpoeticizeds, unpoeticiseds
-    unpoetize, unpoetise
-    unpoetized, unpoetised
-    unpoetizes, unpoetises
-    unpolarizable's, unpolarisable's
-    unpolarizable, unpolarisable
-    unpolarizables, unpolarisables
-    unpolarized's, unpolarised's
-    unpolarized, unpolarised
-    unpolarizedder, unpolarisedder
-    unpolarizeddest, unpolariseddest
-    unpolarizeds, unpolariseds
-    unpolymerized's, unpolymerised's
-    unpolymerized, unpolymerised
-    unpolymerizedder, unpolymerisedder
-    unpolymerizeddest, unpolymeriseddest
-    unpolymerizeds, unpolymeriseds
-    unpopularize, unpopularise
-    unpopularized, unpopularised
-    unpopularizes, unpopularises
-    unpracticed, unpractised
-    unpracticedder, unpractisedder
-    unpracticeddest, unpractiseddest
-    unpressurized, unpressurised
-    unprotestantize, unprotestantise
-    unprotestantized, unprotestantised
-    unprotestantizes, unprotestantises
-    unprotestantizing, unprotestantising
-    unpublicized, unpublicised
-    unpulverize, unpulverise
-    unpulverized, unpulverised
-    unpulverizedder, unpulverisedder
-    unpulverizeddest, unpulveriseddest
-    unpulverizes, unpulverises
-    unquantized, unquantised
-    unradicalize, unradicalise
-    unradicalizes, unradicalises
-    unrancored's, unrancoured's
-    unrancored, unrancoured
-    unrancoredder, unrancouredder
-    unrancoreddest, unrancoureddest
-    unrancoreds, unrancoureds
-    unrancorous, unrancourous
-    unrationalized, unrationalised
-    unrationalizing, unrationalising
-    unraveled, unravelled
-    unraveler's, unraveller's
-    unraveler, unraveller
-    unravelers, unravellers
-    unraveling, unravelling
-    unrealizable's, unrealisable's
-    unrealizable, unrealisable
-    unrealizables, unrealisables
-    unrealize, unrealise
-    unrealized, unrealised
-    unrealizes, unrealises
-    unrealizing, unrealising
-    unrealizings, unrealisings
-    unrecognizable, unrecognisable
-    unrecognizabler, unrecognisabler
-    unrecognizablest, unrecognisablest
-    unrecognizably, unrecognisably
-    unrecognized, unrecognised
-    unrecognizing, unrecognising
-    unrecognizingly, unrecognisingly
-    unreconnoitered's, unreconnoitred's
-    unreconnoitered, unreconnoitred
-    unreconnoiteredder, unreconnoitredder
-    unreconnoitereddest, unreconnoitreddest
-    unreconnoitereds, unreconnoitreds
-    unregularized, unregularised
-    unreorganized, unreorganised
-    unreorganizedder, unreorganisedder
-    unreorganizeddest, unreorganiseddest
-    unrevelationize, unrevelationise
-    unrevelationizes, unrevelationises
-    unrivaled, unrivalled
-    unrivaledder, unrivalledder
-    unrivaleddest, unrivalleddest
-    unromanized, unromanised
-    unromanticized's, unromanticised's
-    unromanticized, unromanticised
-    unromanticizedder, unromanticisedder
-    unromanticizeddest, unromanticiseddest
-    unromanticizeds, unromanticiseds
-    unroyalized's, unroyalised's
-    unroyalized, unroyalised
-    unroyalizeds, unroyaliseds
-    unrumored, unrumoured
-    unrumoredder, unrumouredder
-    unrumoreddest, unrumoureddest
-    unsabered, unsabred
-    unsaberedder, unsabredder
-    unsabereddest, unsabreddest
-    unsatirizable, unsatirisable
-    unsatirize, unsatirise
-    unsatirized, unsatirised
-    unsatirizedder, unsatirisedder
-    unsatirizeddest, unsatiriseddest
-    unsatirizes, unsatirises
-    unsavored, unsavoured
-    unsavoredder, unsavouredder
-    unsavoreddest, unsavoureddest
-    unsavoredly, unsavouredly
-    unsavoredness, unsavouredness
-    unsavorier, unsavourier
-    unsavories, unsavouries
-    unsavoriest, unsavouriest
-    unsavorilier, unsavourilier
-    unsavorilies, unsavourilies
-    unsavoriliest, unsavouriliest
-    unsavorily, unsavourily
-    unsavoriness's, unsavouriness's
-    unsavoriness, unsavouriness
-    unsavorinesses, unsavourinesses
-    unsavory's, unsavoury's
-    unsavory, unsavoury
-    unscandalize, unscandalise
-    unscandalized, unscandalised
-    unscandalizedder, unscandalisedder
-    unscandalizeddest, unscandaliseddest
-    unscandalizes, unscandalises
-    unscepter's, unsceptre's
-    unscepter, unsceptre
-    unsceptered, unsceptred
-    unscepteredder, unsceptredder
-    unsceptereddest, unsceptreddest
-    unscepters, unsceptres
-    unschematized's, unschematised's
-    unschematized, unschematised
-    unschematizedder, unschematisedder
-    unschematizeddest, unschematiseddest
-    unschematizeds, unschematiseds
-    unscored, unscoured
-    unscoring, unscouring
-    unscrutinized, unscrutinised
-    unscrutinizedder, unscrutinisedder
-    unscrutinizeddest, unscrutiniseddest
-    unscrutinizing, unscrutinising
-    unscrutinizinger, unscrutinisinger
-    unscrutinizingest, unscrutinisingest
-    unscrutinizinglier, unscrutinisinglier
-    unscrutinizingliest, unscrutinisingliest
-    unscrutinizingly, unscrutinisingly
-    unsectarianize, unsectarianise
-    unsectarianizes, unsectarianises
-    unsectionalized, unsectionalised
-    unsecularize, unsecularise
-    unsecularized, unsecularised
-    unsecularizedder, unsecularisedder
-    unsecularizeddest, unseculariseddest
-    unsecularizes, unsecularises
-    unsensitize, unsensitise
-    unsensitized, unsensitised
-    unsensitizes, unsensitises
-    unsensitizing, unsensitising
-    unsensualize, unsensualise
-    unsensualized, unsensualised
-    unsensualizes, unsensualises
-    unsensualizing, unsensualising
-    unsentimentalize, unsentimentalise
-    unsentimentalized, unsentimentalised
-    unsentimentalizes, unsentimentalises
-    unsepulcher, unsepulchre
-    unsepulchered, unsepulchred
-    unsepulchers, unsepulchres
-    unserialized, unserialised
-    unshakable, unshakeable
-    unshed, unshoed
-    unsignalized's, unsignalised's
-    unsignalized, unsignalised
-    unsignalizedder, unsignalisedder
-    unsignalizeddest, unsignaliseddest
-    unsignalizeds, unsignaliseds
-    unsiphon's, unsyphon's
-    unsiphon, unsyphon
-    unsiphons, unsyphons
-    unsocialized, unsocialised
-    unsocializedder, unsocialisedder
-    unsocializeddest, unsocialiseddest
-    unsocializing, unsocialising
-    unsolemnize, unsolemnise
-    unsolemnized, unsolemnised
-    unsolemnizedder, unsolemnisedder
-    unsolemnizeddest, unsolemniseddest
-    unsolemnizes, unsolemnises
-    unsomber, unsombre
-    unsomberly, unsombrely
-    unsomberness's, unsombreness's
-    unsomberness, unsombreness
-    unspecialized, unspecialised
-    unspecializedder, unspecialisedder
-    unspecializeddest, unspecialiseddest
-    unspecializing, unspecialising
-    unspecializinger, unspecialisinger
-    unspecializingest, unspecialisingest
-    unspecterlike's, unspectrelike's
-    unspecterlike, unspectrelike
-    unspecterlikes, unspectrelikes
-    unspiritualize, unspiritualise
-    unspiritualized, unspiritualised
-    unspiritualizes, unspiritualises
-    unspiritualizing, unspiritualising
-    unsplendorous, unsplendourous
-    unsplendorously, unsplendourously
-    unspoiled, unspoilt
-    unstabilized, unstabilised
-    unstabilizing, unstabilising
-    unstandardizable, unstandardisable
-    unstandardized, unstandardised
-    unstandardizedder, unstandardisedder
-    unstandardizeddest, unstandardiseddest
-    unsterilized, unsterilised
-    unstigmatized's, unstigmatised's
-    unstigmatized, unstigmatised
-    unstigmatizedder, unstigmatisedder
-    unstigmatizeddest, unstigmatiseddest
-    unstigmatizeds, unstigmatiseds
-    unstoicize, unstoicise
-    unstoicizes, unstoicises
-    unsubsidized, unsubsidised
-    unsubstantialize, unsubstantialise
-    unsubstantialized, unsubstantialised
-    unsubstantializes, unsubstantialises
-    unsubstantializing, unsubstantialising
-    unsuccorable's, unsuccourable's
-    unsuccorable, unsuccourable
-    unsuccorables, unsuccourables
-    unsuccored, unsuccoured
-    unsulphurized's, unsulphurised's
-    unsulphurized, unsulphurised
-    unsulphurizeds, unsulphuriseds
-    unsummarizable, unsummarisable
-    unsummarized, unsummarised
-    unsummarizedder, unsummarisedder
-    unsummarizeddest, unsummariseddest
-    unsupernaturalize, unsupernaturalise
-    unsupernaturalized, unsupernaturalised
-    unsupernaturalizes, unsupernaturalises
-    unsymbolized, unsymbolised
-    unsymbolizedder, unsymbolisedder
-    unsymbolizeddest, unsymboliseddest
-    unsymmetrized's, unsymmetrised's
-    unsymmetrized, unsymmetrised
-    unsymmetrizeds, unsymmetriseds
-    unsympathizabilities, unsympathisabilities
-    unsympathizability's, unsympathisability's
-    unsympathizability, unsympathisability
-    unsympathizable's, unsympathisable's
-    unsympathizable, unsympathisable
-    unsympathizables, unsympathisables
-    unsympathized, unsympathised
-    unsympathizedder, unsympathisedder
-    unsympathizeddest, unsympathiseddest
-    unsympathizing's, unsympathising's
-    unsympathizing, unsympathising
-    unsympathizinger, unsympathisinger
-    unsympathizingest, unsympathisingest
-    unsympathizinglier, unsympathisinglier
-    unsympathizingliest, unsympathisingliest
-    unsympathizingly, unsympathisingly
-    unsympathizings, unsympathisings
-    unsynchronized, unsynchronised
-    unsynchronizedder, unsynchronisedder
-    unsynchronizeddest, unsynchroniseddest
-    unsynthesized, unsynthesised
-    unsynthesizedder, unsynthesisedder
-    unsynthesizeddest, unsynthesiseddest
-    unsystematized, unsystematised
-    unsystematizedder, unsystematisedder
-    unsystematizeddest, unsystematiseddest
-    unsystematizedly, unsystematisedly
-    unsystematizing, unsystematising
-    unsystematizinger, unsystematisinger
-    unsystematizingest, unsystematisingest
-    unsystemizable's, unsystemisable's
-    unsystemizable, unsystemisable
-    unsystemizables, unsystemisables
-    untantalized, untantalised
-    untantalizedder, untantalisedder
-    untantalizeddest, untantaliseddest
-    untantalizing's, untantalising's
-    untantalizing, untantalising
-    untantalizinger, untantalisinger
-    untantalizingest, untantalisingest
-    untantalizings, untantalisings
-    untartarized's, untartarised's
-    untartarized, untartarised
-    untartarizeds, untartariseds
-    untechnicalize, untechnicalise
-    untechnicalizes, untechnicalises
-    untemporizing's, untemporising's
-    untemporizing, untemporising
-    untemporizings, untemporisings
-    unterrorized, unterrorised
-    untheorizable's, untheorisable's
-    untheorizable, untheorisable
-    untheorizables, untheorisables
-    untrammeled, untrammelled
-    untrammeledder, untrammelledder
-    untrammeleddest, untrammelleddest
-    untranquilized, untranquilised
-    untranquillize, untranquillise
-    untranquillized, untranquillised
-    untyrannized, untyrannised
-    unutilizable's, unutilisable's
-    unutilizable, unutilisable
-    unutilizables, unutilisables
-    unutilized, unutilised
-    unvaporized's, unvaporised's
-    unvaporized, unvaporised
-    unvaporizeds, unvaporiseds
-    unvectorizable, unvectorisable
-    unverbalized, unverbalised
-    unvictimized, unvictimised
-    unvisualized, unvisualised
-    unvisualizedder, unvisualisedder
-    unvisualizeddest, unvisualiseddest
-    unvitalized's, unvitalised's
-    unvitalized, unvitalised
-    unvitalizeds, unvitaliseds
-    unvitriolized's, unvitriolised's
-    unvitriolized, unvitriolised
-    unvitriolizeds, unvitrioliseds
-    unvocalized's, unvocalised's
-    unvocalized, unvocalised
-    unvocalizedder, unvocalisedder
-    unvocalizeddest, unvocaliseddest
-    unvocalizeds, unvocaliseds
-    unvolatilize, unvolatilise
-    unvolatilized, unvolatilised
-    unvolatilizedder, unvolatilisedder
-    unvolatilizeddest, unvolatiliseddest
-    unvolatilizes, unvolatilises
-    unvulcanized's, unvulcanised's
-    unvulcanized, unvulcanised
-    unvulcanizedder, unvulcanisedder
-    unvulcanizeddest, unvulcaniseddest
-    unvulcanizeds, unvulcaniseds
-    unvulgarize, unvulgarise
-    unvulgarized, unvulgarised
-    unvulgarizes, unvulgarises
-    unvulgarizing, unvulgarising
-    unwesternized's, unwesternised's
-    unwesternized, unwesternised
-    unwesternizeds, unwesterniseds
-    unwomanize, unwomanise
-    unwomanized, unwomanised
-    unwomanizes, unwomanises
-    updraft's, updraught's
-    updraft, updraught
-    updrafts, updraughts
-    uralitization, uralitisation
-    uralitizations, uralitisations
-    uralitize, uralitise
-    uralitized, uralitised
-    uralitizes, uralitises
-    uralitizing, uralitising
-    uratemia, urataemia
-    urbanization's, urbanisation's
-    urbanization, urbanisation
-    urbanizations, urbanisations
-    urbanize, urbanise
-    urbanized, urbanised
-    urbanizes, urbanises
-    urbanizing, urbanising
-    uredema, uroedema
-    uremia's, uraemia's
-    uremia, uraemia
-    uremias, uraemias
-    uremic, uraemic
-    urethrorrhea, urethrorrhoea
-    uricemia, uricaemia
-    uricemic, uricaemic
-    urinemia, urinaemia
-    urinemic, urinaemic
-    urohematin, urohaematin
-    urophein, urophaein
-    usability's, useability's
-    usability, useability
-    usable, useable
-    utilitarianize, utilitarianise
-    utilitarianized, utilitarianised
-    utilitarianizes, utilitarianises
-    utilitarianizing, utilitarianising
-    utilizabilities, utilisabilities
-    utilizability, utilisability
-    utilizable's, utilisable's
-    utilizable, utilisable
-    utilizables, utilisables
-    utilization's, utilisation's
-    utilization, utilisation
-    utilizations, utilisations
-    utilize, utilise
-    utilized, utilised
-    utilizer's, utiliser's
-    utilizer, utiliser
-    utilizers, utilisers
-    utilizes, utilises
-    utilizing, utilising
-    Utopianize's, Utopianise's
-    Utopianize, Utopianise
-    utopianize, utopianise
-    utopianized, utopianised
-    utopianizer's, utopianiser's
-    utopianizer, utopianiser
-    utopianizers, utopianisers
-    Utopianizes, Utopianises
-    utopianizes, utopianises
-    utopianizing, utopianising
-    vaagmer, vaagmaer
-    vaccinization's, vaccinisation's
-    vaccinization, vaccinisation
-    vaccinizations, vaccinisations
-    vacuolization's, vacuolisation's
-    vacuolization, vacuolisation
-    vacuolizations, vacuolisations
-    vacuumize, vacuumise
-    vacuumized, vacuumised
-    vacuumizes, vacuumises
-    vacuumizing, vacuumising
-    vagabondize, vagabondise
-    vagabondized, vagabondised
-    vagabondizer, vagabondiser
-    vagabondizers, vagabondisers
-    vagabondizes, vagabondises
-    vagabondizing, vagabondising
-    vaginule, vaginulae
-    vagrantize, vagrantise
-    vagrantizes, vagrantises
-    valor's, valour's
-    valor, valour
-    valorization's, valorisation's
-    valorization, valorisation
-    valorizations, valorisations
-    valorize, valorise
-    valorized, valorised
-    valorizes, valorises
-    valorizing, valorising
-    valorousness, valourousness
-    valors, valours
-    valvule, valvulae
-    vampirize, vampirise
-    vampirized, vampirised
-    vampirizes, vampirises
-    vampirizing, vampirising
-    vandalization's, vandalisation's
-    vandalization, vandalisation
-    vandalizations, vandalisations
-    vandalize, vandalise
-    vandalized, vandalised
-    vandalizes, vandalises
-    vandalizing, vandalising
-    vapor's, vapour's
-    vapor, vapour
-    vaporabilities, vapourabilities
-    vaporability's, vapourability's
-    vaporability, vapourability
-    vaporable's, vapourable's
-    vaporable, vapourable
-    vaporables, vapourables
-    vapored, vapoured
-    vaporer's, vapourer's
-    vaporer, vapourer
-    vaporers, vapourers
-    vaporescent, vapourescent
-    vaporier, vapourier
-    vaporiest, vapouriest
-    vaporific, vapourific
-    vaporimeter's, vapourimeter's
-    vaporimeter, vapourimeter
-    vaporing's, vapouring's
-    vaporing, vapouring
-    vaporingly, vapouringly
-    vaporings, vapourings
-    vaporish, vapourish
-    vaporisher, vapourisher
-    vaporishest, vapourishest
-    vaporishness's, vapourishness's
-    vaporishness, vapourishness
-    vaporishnesses, vapourishnesses
-    vaporizable's, vaporisable's
-    vaporizable, vaporisable
-    vaporizabler, vaporisabler
-    vaporizables, vaporisables
-    vaporizablest, vaporisablest
-    vaporization's, vaporisation's
-    vaporization, vaporisation
-    vaporizations, vaporisations
-    vaporize, vaporise
-    vaporized, vaporised
-    vaporizer's, vaporiser's
-    vaporizer, vaporiser
-    vaporizers, vaporisers
-    vaporizes, vaporises
-    vaporizing, vaporising
-    vaporless, vapourless
-    vaporlesses, vapourlesses
-    vaporlike's, vapourlike's
-    vaporlike, vapourlike
-    vaporlikes, vapourlikes
-    vaporose, vapourose
-    vaporously, vapourously
-    vapors, vapours
-    vaporware, vapourware
-    vapory, vapoury
-    varicolored's, varicoloured's
-    varicolored, varicoloured
-    varicoloredder, varicolouredder
-    varicoloreddest, varicoloureddest
-    varicoloreds, varicoloureds
-    varicolorous, varicolourous
-    vascularization's, vascularisation's
-    vascularization, vascularisation
-    vascularizations, vascularisations
-    vascularize, vascularise
-    vascularized, vascularised
-    vascularizes, vascularises
-    vascularizing, vascularising
-    vasectomize, vasectomise
-    vasectomized, vasectomised
-    vasectomizing, vasectomising
-    vassalization, vassalisation
-    vassalize, vassalise
-    vassalized, vassalised
-    vassalizes, vassalises
-    vassalizing, vassalising
-    Vaticanization's, Vaticanisation's
-    Vaticanization, Vaticanisation
-    Vaticanizations, Vaticanisations
-    Vaticanize's, Vaticanise's
-    Vaticanize, Vaticanise
-    Vaticanizes, Vaticanises
-    vavasor, vavasour
-    vavasors, vavasours
-    Ve's, Voe's
-    Ve, Voe
-    vectorizable, vectorisable
-    vectorization's, vectorisation's
-    vectorization, vectorisation
-    vectorizations, vectorisations
-    vectorize, vectorise
-    vectorized, vectorised
-    vectorizer, vectoriser
-    vectorizered, vectorisered
-    vectorizering, vectorisering
-    vectorizers, vectorisers
-    vectorizes, vectorises
-    vectorizing, vectorising
-    veery, verey
-    vegetablize, vegetablise
-    vegetablizes, vegetablises
-    velarization's, velarisation's
-    velarization, velarisation
-    velarizations, velarisations
-    velarize, velarise
-    velarized, velarised
-    velarizes, velarises
-    velarizing, velarising
-    veld's, veldt's
-    veld, veldt
-    velds, veldts
-    venalization's, venalisation's
-    venalization, venalisation
-    venalizations, venalisations
-    venalize, venalise
-    venalizes, venalises
-    vendor's, vender's
-    vendor, vender
-    vendors, venders
-    venomization's, venomisation's
-    venomization, venomisation
-    venomizations, venomisations
-    venomize, venomise
-    venomizes, venomises
-    venter, ventre
-    venters, ventres
-    ventriloquize, ventriloquise
-    ventriloquized, ventriloquised
-    ventriloquizes, ventriloquises
-    ventriloquizing, ventriloquising
-    venule, venulae
-    veranda's, verandah's
-    veranda, verandah
-    verandas, verandahs
-    verbalization's, verbalisation's
-    verbalization, verbalisation
-    verbalizations, verbalisations
-    verbalize, verbalise
-    verbalized, verbalised
-    verbalizer's, verbaliser's
-    verbalizer, verbaliser
-    verbalizers, verbalisers
-    verbalizes, verbalises
-    verbalizing, verbalising
-    vermeiled, vermeilled
-    vermeiles, vermeilles
-    vermeiling, vermeilling
-    vermilion's, vermillion's
-    vermilion, vermillion
-    vermilionize, vermilionise
-    vermilionizes, vermilionises
-    vernacularization's, vernacularisation's
-    vernacularization, vernacularisation
-    vernacularizations, vernacularisations
-    vernacularize, vernacularise
-    vernacularized, vernacularised
-    vernacularizes, vernacularises
-    vernacularizing, vernacularising
-    vernalization's, vernalisation's
-    vernalization, vernalisation
-    vernalizations, vernalisations
-    vernalize, vernalise
-    vernalized, vernalised
-    vernalizes, vernalises
-    vernalizing, vernalising
-    versicolor, versicolour
-    versicolorate, versicolourate
-    versicolored, versicoloured
-    versicolorous, versicolourous
-    versionize, versionise
-    versionizes, versionises
-    vesicule, vesiculae
-    vestryize, vestryise
-    vestryizes, vestryises
-    veter's, vetoer's
-    veter, vetoer
-    veteranize, veteranise
-    veteranizes, veteranises
-    vialed, vialled
-    vialing, vialling
-    victimizable's, victimisable's
-    victimizable, victimisable
-    victimizables, victimisables
-    victimization's, victimisation's
-    victimization, victimisation
-    victimizations, victimisations
-    victimize, victimise
-    victimized, victimised
-    victimizer's, victimiser's
-    victimizer, victimiser
-    victimizers, victimisers
-    victimizes, victimises
-    victimizing, victimising
-    Victorianize's, Victorianise's
-    Victorianize, Victorianise
-    Victorianizes, Victorianises
-    victualage's, victuallage's
-    victualage, victuallage
-    victualages, victuallages
-    victualed, victualled
-    victualer's, victualler's
-    victualer, victualler
-    victualers, victuallers
-    victualess, victualless
-    victualing, victualling
-    videodisc's, videodisk's
-    videodisc, videodisk
-    videodiscs, videodisks
-    vier, vire
-    viers, vires
-    Vietnamization's, Vietnamisation's
-    Vietnamization, Vietnamisation
-    Vietnamize, Vietnamise
-    Vietnamized, Vietnamised
-    Vietnamizes, Vietnamises
-    Vietnamizing, Vietnamising
-    vigor's, vigour's
-    vigor, vigour
-    vigorless, vigourless
-    vigors, vigours
-    villagization, villagisation
-    villagizations, villagisations
-    viremia, viraemia
-    viremias, viraemias
-    viremic, viraemic
-    virilization, virilisation
-    virilizations, virilisations
-    virilized, virilised
-    virilizing, virilising
-    virtualization, virtualisation
-    virtualize, virtualise
-    virtualizes, virtualises
-    virtuosos, virtuosoes
-    visionize, visionise
-    visionizes, visionises
-    visor's, vizor's
-    visor, vizor
-    visors, vizors
-    visualizable, visualisable
-    visualization's, visualisation's
-    visualization, visualisation
-    visualizations, visualisations
-    visualize, visualise
-    visualized, visualised
-    visualizer's, visualiser's
-    visualizer, visualiser
-    visualizers, visualisers
-    visualizes, visualises
-    visualizing, visualising
-    vitalization's, vitalisation's
-    vitalization, vitalisation
-    vitalizations, vitalisations
-    vitalize, vitalise
-    vitalized, vitalised
-    vitalizer's, vitaliser's
-    vitalizer, vitaliser
-    vitalizers, vitalisers
-    vitalizes, vitalises
-    vitalizing's, vitalising's
-    vitalizing, vitalising
-    vitalizingly, vitalisingly
-    vitalizings, vitalisings
-    vitaminization, vitaminisation
-    vitaminize, vitaminise
-    vitaminized, vitaminised
-    vitaminizes, vitaminises
-    vitaminizing, vitaminising
-    vitriolizable's, vitriolisable's
-    vitriolizable, vitriolisable
-    vitriolizables, vitriolisables
-    vitriolization's, vitriolisation's
-    vitriolization, vitriolisation
-    vitriolizations, vitriolisations
-    vitriolize, vitriolise
-    vitriolized, vitriolised
-    vitriolizer, vitrioliser
-    vitriolizers, vitriolisers
-    vitriolizes, vitriolises
-    vitriolizing, vitriolising
-    vivandier, vivandire
-    viver, vivre
-    viverrine, viverrinae
-    vivers, vivres
-    vizard, visard
-    vizards, visards
-    vizied, visied
-    vizies, visies
-    vocalization's, vocalisation's
-    vocalization, vocalisation
-    vocalizations, vocalisations
-    vocalize, vocalise
-    vocalized, vocalised
-    vocalizer's, vocaliser's
-    vocalizer, vocaliser
-    vocalizers, vocalisers
-    vocalizes, vocalises
-    vocalizing, vocalising
-    vocationalization's, vocationalisation's
-    vocationalization, vocationalisation
-    vocationalizations, vocationalisations
-    vocationalize, vocationalise
-    vocationalizes, vocationalises
-    volatilizable's, volatilisable's
-    volatilizable, volatilisable
-    volatilizabler, volatilisabler
-    volatilizables, volatilisables
-    volatilizablest, volatilisablest
-    volatilization's, volatilisation's
-    volatilization, volatilisation
-    volatilizations, volatilisations
-    volatilize, volatilise
-    volatilized, volatilised
-    volatilizer's, volatiliser's
-    volatilizer, volatiliser
-    volatilizers, volatilisers
-    volatilizes, volatilises
-    volatilizing, volatilising
-    volcanism's, vulcanism's
-    volcanism, vulcanism
-    volcanisms, vulcanisms
-    volcanization, volcanisation
-    volcanizations, volcanisations
-    volcanize, volcanise
-    volcanized, volcanised
-    volcanizes, volcanises
-    volcanizing, volcanising
-    voltize, voltise
-    voltizes, voltises
-    vowelization's, vowelisation's
-    vowelization, vowelisation
-    vowelizations, vowelisations
-    vowelize, vowelise
-    vowelized, vowelised
-    vowelizes, vowelises
-    vowelizing, vowelising
-    vulcanizable's, vulcanisable's
-    vulcanizable, vulcanisable
-    vulcanizabler, vulcanisabler
-    vulcanizables, vulcanisables
-    vulcanizablest, vulcanisablest
-    vulcanizate's, vulcanisate's
-    vulcanizate, vulcanisate
-    vulcanizates, vulcanisates
-    vulcanization's, vulcanisation's
-    vulcanization, vulcanisation
-    vulcanizations, vulcanisations
-    vulcanize, vulcanise
-    vulcanized, vulcanised
-    vulcanizer's, vulcaniser's
-    vulcanizer, vulcaniser
-    vulcanizers, vulcanisers
-    vulcanizes, vulcanises
-    vulcanizing, vulcanising
-    vulgarization's, vulgarisation's
-    vulgarization, vulgarisation
-    vulgarizations, vulgarisations
-    vulgarize, vulgarise
-    vulgarized, vulgarised
-    vulgarizer's, vulgariser's
-    vulgarizer, vulgariser
-    vulgarizers, vulgarisers
-    vulgarizes, vulgarises
-    vulgarizing, vulgarising
-    wackes, wackoes
-    wackier, whackier
-    wackiest, whackiest
-    wacky, whacky
-    Wagnerize's, Wagnerise's
-    Wagnerize, Wagnerise
-    Wagnerizes, Wagnerises
-    wagon's, waggon's
-    wagon, waggon
-    wagoned, waggoned
-    wagoneer, waggoneer
-    wagoner's, waggoner's
-    wagoner, waggoner
-    wagoners, waggoners
-    wagonette's, waggonette's
-    wagonette, waggonette
-    wagonettes, waggonettes
-    wagoning, waggoning
-    wagons, waggons
-    wainscoted, wainscotted
-    wainscoting's, wainscotting's
-    wainscoting, wainscotting
-    wainscotings, wainscottings
-    wallah, walla
-    wallahs, wallas
-    wantonize, wantonise
-    wantonized, wantonised
-    wantonizes, wantonises
-    wantonizing, wantonising
-    warer, warre
-    Warford's, Warfourd's
-    Warford, Warfourd
-    warrantize, warrantise
-    waterbed's, water_bed's
-    waterbed, water_bed
-    waterbeds, water_beds
-    watercolor's, watercolour's
-    watercolor, watercolour
-    watercolored, watercoloured
-    watercoloring, watercolouring
-    watercolorist's, watercolourist's
-    watercolorist, watercolourist
-    watercolorists, watercolourists
-    watercolors, watercolours
-    weaseled, weaselled
-    weaseling, weaselling
-    weatherize, weatherise
-    weatherized, weatherised
-    weatherizes, weatherises
-    weatherizing, weatherising
-    weeviled, weevilled
-    weftwize, weftwise
-    weize, weise
-    weized, weised
-    weizes, weises
-    weizing, weising
-    welsh, welch
-    welshed, welched
-    welshes, welches
-    welshing, welching
-    wer, waer
-    werewolf's, werwolf's
-    werewolf, werwolf
-    werewolves, werwolves
-    westernization's, westernisation's
-    westernization, westernisation
-    westernizations, westernisations
-    westernize, westernise
-    westernized, westernised
-    westernizes, westernises
-    westernizing, westernising
-    whimsies, whimseys
-    whimsy's, whimsey's
-    whimsy, whimsey
-    whir's, whirr's
-    whir, whirr
-    whirs, whirrs
-    Whitmanize's, Whitmanise's
-    Whitmanize, Whitmanise
-    Whitmanizes, Whitmanises
-    whiz's, whizz's
-    whiz, whizz
-    whizz's, wiz's
-    whizz, wiz
-    whizzes, wizzes
-    whodunit's, whodunnit's
-    whodunit, whodunnit
-    whodunits, whodunnits
-    wigeon's, widgeon's
-    wigeon, widgeon
-    willful, wilful
-    willfuler, wilfuler
-    willfulest, wilfulest
-    willfullier, wilfullier
-    willfulliest, wilfulliest
-    willfully, wilfully
-    willfulness's, wilfulness's
-    willfulness, wilfulness
-    willy, willie
-    winterization's, winterisation's
-    winterization, winterisation
-    winterizations, winterisations
-    winterize, winterise
-    winterized, winterised
-    winterizes, winterises
-    winterizing, winterising
-    wintrier, winterier
-    wintriest, winteriest
-    wintry, wintery
-    wisteria's, wistaria's
-    wisteria, wistaria
-    wisterias, wistarias
-    wizen, wisen
-    womanization's, womanisation's
-    womanization, womanisation
-    womanizations, womanisations
-    womanize, womanise
-    womanized, womanised
-    womanizer's, womaniser's
-    womanizer, womaniser
-    womanizers, womanisers
-    womanizes, womanises
-    womanizing, womanising
-    woodcockize, woodcockise
-    woodcockizes, woodcockises
-    woolen's, woollen's
-    woolen, woollen
-    woolenner, woollenner
-    woolennest, woollennest
-    woolens, woollens
-    woollenisation's, woollenization's
-    woollenisation, woollenization
-    woollenisations, woollenizations
-    woollenise, woollenize
-    woollenises, woollenizes
-    wornil, wournil
-    worshiped, worshipped
-    worshiper's, worshipper's
-    worshiper, worshipper
-    worshipers, worshippers
-    worshiping, worshipping
-    yak's, yack's
-    yak, yack
-    yak, yack
-    yak, yock
-    yakked, yacked
-    yakking, yacking
-    yaks, yacks
-    yaks, yacks
-    yeshiva's, yeshivah's
-    yeshiva, yeshivah
-    yeshivot, yeshivahs
-    yock's, yak's
-    yocks, yaks
-    yodeled, yodelled
-    yodeler's, yodeller's
-    yodeler, yodeller
-    yodelers, yodellers
-    yodeling, yodelling
-    yoghourt's, yogourt's
-    yoghourt, yogourt
-    yoghourts, yogourts
-    yogi's, yogin's
-    yogi, yogin
-    yogis, yogins
-    yuck, yuk
-    yuk, yuck
-    yukked, yucked
-    yukking, yucking
-    yuks, yucks
-    zaffer, zaffre
-    zaffers, zaffres
-    zea, zoea
-    zeas, zoeas
-    zeroize, zeroise
-    zeroized, zeroised
-    zeroizes, zeroises
-    zeroizing, zeroising
-    zipper's, Zipper's
-    zipper, Zipper
-    zippers, Zippers
-    zoea's, zoaea's
-    zoea, zoaea
-    zoea, zooea
-    zoeae, zooeae
-    zoeal, zooeal
-    zoeas, zooeas
-    zoecia, zooecia
-    zoecium, zooecium
-    zombie's, zombi's
-    zombie, zombi
-    zombies, zombis
-    zonesthesia, zonaesthesia
-    zonule, zonulae
-    zooglea, zoogloea
-    zoogleae, zoogloeae
-    zoogleal, zoogloeal
-    zoogleas, zoogloeas
-    zygenid, zygaenid
diff --git a/config/export/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/export/search_api_solr.solr_field_type.text_en_7_0_0.yml
deleted file mode 100644
index 606578ad6..000000000
--- a/config/export/search_api_solr.solr_field_type.text_en_7_0_0.yml
+++ /dev/null
@@ -1,17949 +0,0 @@
-uuid: 3528ae29-9615-4918-a76d-b00a655d623f
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 6ys8AHKnrour41EVz_tuMhV40copWQwOwI_5yziiKlc
-id: text_en_7_0_0
-label: 'English Text Field'
-minimum_solr_version: 7.0.0
-custom_code: ''
-field_type_language_code: en
-domains: {  }
-field_type:
-  name: text_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymGraphFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.SnowballPorterFilterFactory
-          protected: protwords_en.txt
-          language: English
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type:
-  name: text_unstemmed_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_en.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymGraphFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_en.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-spellcheck_field_type: null
-collated_field_type:
-  name: collated_en
-  class: solr.ICUCollationField
-  locale: en
-  strength: primary
-  caseLevel: false
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: en
-            -
-              name: field
-              VALUE: spellcheck_en
-            -
-              name: classname
-              VALUE: solr.DirectSolrSpellChecker
-            -
-              name: distanceMeasure
-              VALUE: internal
-            -
-              name: accuracy
-              VALUE: '0.5'
-            -
-              name: maxEdits
-              VALUE: '2'
-            -
-              name: minPrefix
-              VALUE: '1'
-            -
-              name: maxInspections
-              VALUE: '5'
-            -
-              name: minQueryLength
-              VALUE: '4'
-            -
-              name: maxQueryFrequency
-              VALUE: '0.01'
-            -
-              name: thresholdTokenFrequency
-              VALUE: '.01'
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-    -
-      name: suggest
-      class: solr.SuggestComponent
-      lst:
-        -
-          name: suggester
-          str:
-            -
-              name: name
-              VALUE: en
-            -
-              name: lookupImpl
-              VALUE: AnalyzingInfixLookupFactory
-            -
-              name: dictionaryImpl
-              VALUE: DocumentDictionaryFactory
-            -
-              name: field
-              VALUE: twm_suggest
-            -
-              name: suggestAnalyzerFieldType
-              VALUE: text_en
-            -
-              name: contextField
-              VALUE: sm_context_tags
-            -
-              name: buildOnCommit
-              VALUE: 'true'
-            -
-              name: buildOnStartup
-              VALUE: 'false'
-text_files:
-  stopwords: |
-    a
-    an
-    and
-    are
-    as
-    at
-    be
-    but
-    by
-    for
-    if
-    in
-    into
-    is
-    it
-    no
-    not
-    of
-    on
-    or
-    s
-    such
-    t
-    that
-    the
-    their
-    then
-    there
-    these
-    they
-    this
-    to
-    was
-    will
-    with
-  protwords: ''
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Ą => A
-    "\u0104" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # Ć => C
-    "\U0106" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ę => E
-    "\u0118" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ł => L
-    "\u0141" => "L"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ń => N
-    "\u0143" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # Ś => S
-    "\u015a" => "S"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # Ź => Z
-    "\u0179" => "Z"
-    # Ż => Z
-    "\u017b" => "Z"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
-    # Māori macrons.
-    # Ā => A
-    "\u0100" => "A"
-    # Ē => E
-    "\u0112" => "E"
-    # Ī => I
-    "\u012A" => "I"
-    # Ō => O
-    "\u014C" => "O"
-    # Ū => U
-    "\u016A" => "U"
-    # ā => a
-    "\u0101" => "a"
-    # ē => e
-    "\u0113" => "e"
-    # ī => i
-    "\u012B" => "i"
-    # ō => o
-    "\u014D" => "o"
-    # ū => u
-    "\u016B" => "u"
-  synonyms: |
-    drupal, durpal
-    abettor's, abetter's
-    abettor, abetter
-    abettors, abetters
-    abnormalize, abnormalise
-    abnormalized, abnormalised
-    abnormalizing, abnormalising
-    abolitionize, abolitionise
-    abolitionized, abolitionised
-    abolitionizing, abolitionising
-    abridgment's, abridgement's
-    abridgment, abridgement
-    abridgments, abridgements
-    absinthe's, absinth's
-    absinthe, absinth
-    absinthes, absinths
-    academize, academise
-    academized, academised
-    academizing, academising
-    acalephe, acalephae
-    accessorize, accessorise
-    accessorized, accessorised
-    accessorizes, accessorises
-    accessorizing, accessorising
-    acclimatizable, acclimatisable
-    acclimatization's, acclimatisation's
-    acclimatization, acclimatisation
-    acclimatize, acclimatise
-    acclimatized, acclimatised
-    acclimatizer, acclimatiser
-    acclimatizers, acclimatisers
-    acclimatizes, acclimatises
-    acclimatizing, acclimatising
-    accorage, accourage
-    accoraged, accouraged
-    accorages, accourages
-    accoraging, accouraging
-    accouter, accoutre
-    accoutered, accoutred
-    accoutering, accoutring
-    accouterment's, accoutrement's
-    accouterment, accoutrement
-    accouterments, accoutrements
-    accouters, accoutres
-    Acemetae's, Acoemetae's
-    Acemetae, Acoemetae
-    Acemetic's, Acoemetic's
-    Acemetic, Acoemetic
-    Acer's, Acre's
-    Acer, Acre
-    acetonemia, acetonaemia
-    acetonemic, acetonaemic
-    achenia, achaenia
-    achenium, achaenium
-    acheniums, achaeniums
-    achenocarp, achaenocarp
-    achroiocythemia, achroiocythaemia
-    achromatization's, achromatisation's
-    achromatization, achromatisation
-    achromatizations, achromatisations
-    achromatize, achromatise
-    achromatized, achromatised
-    achromatizes, achromatises
-    achromatizing, achromatising
-    acidemia, acidaemia
-    acknowledgment's, acknowledgement's
-    acknowledgment, acknowledgement
-    acknowledgments, acknowledgements
-    acmesthesia, acmaesthesia
-    acroanesthesia, acroanaesthesia
-    acroesthesia, acroaesthesia
-    actualization's, actualisation's
-    actualization, actualisation
-    actualizations, actualisations
-    actualize, actualise
-    actualized, actualised
-    actualizes, actualises
-    actualizing, actualising
-    acuesthesia, acuaesthesia
-    adapter's, adaptor's
-    adapter, adaptor
-    adapters, adaptors
-    addable, addible
-    addenda, addendums
-    adjuster's, adjustor's
-    adjuster, adjustor
-    adjusters, adjustors
-    adonize, adonise
-    adonized, adonised
-    adonizes, adonises
-    adonizing, adonising
-    adrenalin's, adrenalin's
-    adrenaline, adrenalin
-    adulterize, adulterise
-    adulterized, adulterised
-    adulterizes, adulterises
-    adulterizing, adulterising
-    advene, advenae
-    adverbialize, adverbialise
-    adverbialized, adverbialised
-    adverbializes, adverbialises
-    adverbializing, adverbialising
-    advertise, advertize
-    advertised, advertized
-    advertisement's, advertizement's
-    advertisement, advertizement
-    advertisements, advertizements
-    advertises, advertizes
-    advertising, advertizing
-    advertizable, advertisable
-    adviser's, advisor's
-    adviser, advisor
-    advisers, advisors
-    adze's, adz's
-    adze, adz
-    aedile's, edile's
-    aedile, edile
-    aediles, ediles
-    Aedon's, Aaedon's
-    Aedon, Aaedon
-    Aeetes's, Aeaetes's
-    Aeetes, Aeaetes
-    aegis's, egis's
-    aegis, egis
-    aegises, egises
-    aerialness's, aaerialness's
-    aerialness, aaerialness
-    aeric, areic
-    aerogram, aerogramme
-    aerograms, aerogrammes
-    aerographer, areographer
-    aerographic, areographic
-    aerographical, areographical
-    aerographies, areographies
-    aerography's, areography's
-    aerography, areography
-    aerologic, areologic
-    aerological, areological
-    aerologies, areologies
-    aerologist's, areologist's
-    aerologist, areologist
-    aerology's, areology's
-    aerology, areology
-    aerometer, areometer
-    aerometers, areometers
-    aerometric, areometric
-    Aerope's, Aaerope's
-    Aerope, Aaerope
-    aesthete's, esthete's
-    aesthete, esthete
-    aesthetes, esthetes
-    aesthetic's, esthetic's
-    aesthetic, esthetic
-    aesthetically, esthetically
-    aestheticize, aestheticise
-    aestheticized, aestheticised
-    aestheticizes, aestheticises
-    aestheticizing, aestheticising
-    aesthetics, esthetics
-    affeer, affere
-    Africanization's, Africanisation's
-    Africanization, Africanisation
-    Africanizations, Africanisations
-    Africanize, Africanise
-    Africanized, Africanised
-    Africanizes, Africanises
-    Africanizing, Africanising
-    Afrikanerization, Afrikanerisation
-    Afrikanerize, Afrikanerise
-    Afrikanerized, Afrikanerised
-    Afrikanerizes, Afrikanerises
-    Afrikanerizing, Afrikanerising
-    agathodemon, agathodaemon
-    agatize, agatise
-    agatizes, agatises
-    ageism, agism
-    agenize, agenise
-    ager, agre
-    aggrandizable's, aggrandisable's
-    aggrandizable, aggrandisable
-    aggrandizables, aggrandisables
-    aggrandization, aggrandisation
-    aggrandize, aggrandise
-    aggrandized, aggrandised
-    aggrandizement's, aggrandisement's
-    aggrandizement, aggrandisement
-    aggrandizements, aggrandisements
-    aggrandizer's, aggrandiser's
-    aggrandizer, aggrandiser
-    aggrandizers, aggrandisers
-    aggrandizes, aggrandises
-    aggrandizing, aggrandising
-    aging's, ageing's
-    aging, ageing
-    agings, ageings
-    agnize, agnise
-    agnized, agnised
-    agnizes, agnises
-    agnizing, agnising
-    agonize, agonise
-    agonized, agonised
-    agonizedlies, agonisedlies
-    agonizedly, agonisedly
-    agonizer, agoniser
-    agonizers, agonisers
-    agonizes, agonises
-    agonizing, agonising
-    agonizinglier, agonisinglier
-    agonizingliest, agonisingliest
-    agonizingly, agonisingly
-    agrarianize, agrarianise
-    agrarianizes, agrarianises
-    agrize, agrise
-    agrized, agrised
-    agrizes, agrises
-    agrizing, agrising
-    aguize, aguise
-    aguized, aguised
-    aguizes, aguises
-    aguizing, aguising
-    aiger, aigre
-    air_gun, airgun
-    air_letter, airletter
-    airfoil's, aerofoil's
-    airfoil, aerofoil
-    airfoils, aerofoils
-    airgel, aerogel
-    airplane's, aeroplane's
-    airplane, aeroplane
-    airplanes, aeroplanes
-    airstrike's, air_strike's
-    airstrike, air_strike
-    airstrikes, air_strikes
-    aker, akre
-    Aktistete's, Aktistetae's
-    Aktistete, Aktistetae
-    albitize, albitise
-    albitized, albitised
-    albitizes, albitises
-    albitizing, albitising
-    albumenizer, albumeniser
-    albuminisation's, albuminization's
-    albuminisation, albuminization
-    albuminisations, albuminizations
-    albuminise, albuminize
-    albuminised, albuminized
-    albuminises, albuminizes
-    albuminising, albuminizing
-    alchemize, alchemise
-    alchemized, alchemised
-    alchemizes, alchemises
-    alchemizing, alchemising
-    Alcide's, Alcidae's
-    Alcide, Alcidae
-    Alcithoe's, Alcithoae's
-    Alcithoe, Alcithoae
-    alcoholizable's, alcoholisable's
-    alcoholizable, alcoholisable
-    alcoholizables, alcoholisables
-    alcoholization's, alcoholisation's
-    alcoholization, alcoholisation
-    alcoholizations, alcoholisations
-    alcoholize, alcoholise
-    alcoholized, alcoholised
-    alcoholizes, alcoholises
-    alcoholizing, alcoholising
-    aleucemic, aleucaemic
-    aleukemic, aleukaemic
-    Aleus's, Aloeus's
-    Aleus, Aloeus
-    algebraization's, algebraisation's
-    algebraization, algebraisation
-    algebraizations, algebraisations
-    algebraize, algebraise
-    algebraizes, algebraises
-    algesthesis, algaesthesis
-    alienize, alienise
-    alienizes, alienises
-    align, aline
-    aligned, alined
-    aligning, alining
-    alignment's, alinement's
-    alignment, alinement
-    alignments, alinements
-    aligns, alines
-    alkalinization's, alkalinisation's
-    alkalinization, alkalinisation
-    alkalinizations, alkalinisations
-    alkalinize, alkalinise
-    alkalinized, alkalinised
-    alkalinizes, alkalinises
-    alkalinizing, alkalinising
-    alkalizable, alkalisable
-    alkalization's, alkalisation's
-    alkalization, alkalisation
-    alkalizations, alkalisations
-    alkalize, alkalise
-    alkalized, alkalised
-    alkalizer's, alkaliser's
-    alkalizer, alkaliser
-    alkalizes, alkalises
-    alkalizing, alkalising
-    allegorization's, allegorisation's
-    allegorization, allegorisation
-    allegorizations, allegorisations
-    allegorize, allegorise
-    allegorized, allegorised
-    allegorizer's, allegoriser's
-    allegorizer, allegoriser
-    allegorizers, allegorisers
-    allegorizes, allegorises
-    allegorizing, allegorising
-    alleluia's, halleluiah's
-    alleluia, halleluiah
-    alleluias, halleluiahs
-    alloxuremia, alloxuraemia
-    almanac, almanack
-    almanacs, almanacks
-    alphabetization's, alphabetisation's
-    alphabetization, alphabetisation
-    alphabetizations, alphabetisations
-    alphabetize, alphabetise
-    alphabetized, alphabetised
-    alphabetizer's, alphabetiser's
-    alphabetizer, alphabetiser
-    alphabetizers, alphabetisers
-    alphabetizes, alphabetises
-    alphabetizing, alphabetising
-    alternize, alternise
-    alternizes, alternises
-    althea's, althaea's
-    althea, althaea
-    altheas, althaeas
-    althein, althaein
-    although, altho
-    aluminization, aluminisation
-    aluminize, aluminise
-    aluminized, aluminised
-    aluminizes, aluminises
-    aluminizing, aluminising
-    aluminum's, aluminium's
-    aluminum, aluminium
-    aluminums, aluminiums
-    alumni, alumnuses
-    alveole, alveolae
-    amalgamatize, amalgamatise
-    amalgamatizes, amalgamatises
-    amalgamization's, amalgamisation's
-    amalgamization, amalgamisation
-    amalgamizations, amalgamisations
-    amalgamize, amalgamise
-    amalgamizes, amalgamises
-    Amalthea's, Amalthaea's
-    Amalthea, Amalthaea
-    ambiance's, ambience's
-    ambiance, ambience
-    ambiances, ambiences
-    ambicolorate, ambicolourate
-    ambicoloration, ambicolouration
-    ambilevous, ambilaevous
-    ameban, amoeban
-    amebas, amebae
-    amebean, amoebean
-    amebian, amoebian
-    amebiases, amoebiases
-    amebiasis, amoebiasis
-    amebicidal, amoebicidal
-    amebicide, amoebicide
-    amebid, amoebid
-    amebiform, amoebiform
-    amebiosis, amoebiosis
-    amebocyte's, amoebocyte's
-    amebocyte, amoebocyte
-    amebocytes, amoebocytes
-    ameboidism's, amoeboidism's
-    ameboidism, amoeboidism
-    amebous, amoebous
-    amebula, amoebula
-    amenorrhea's, amenorrhoea's
-    amenorrhea, amenorrhoea
-    amenorrheal, amenorrhoeal
-    amenorrheas, amenorrhoeas
-    amenorrheic, amenorrhoeic
-    Americanization's, Americanisation's
-    Americanization, Americanisation
-    americanization, americanisation
-    Americanizations, Americanisations
-    Americanize, Americanise
-    Americanized, Americanised
-    americanized, americanised
-    Americanizer's, Americaniser's
-    Americanizer, Americaniser
-    Americanizers, Americanisers
-    Americanizes, Americanises
-    Americanizing, Americanising
-    amid, amidst
-    amir's, ameer's
-    amir, ameer
-    amirs, ameers
-    ammocete's, ammocoete's
-    ammocete, ammocoete
-    ammocetes, ammocoetes
-    ammoniemia, ammoniaemia
-    amoeba's, ameba's
-    amoeba, ameba
-    amoebic, amebic
-    amoeboid, ameboid
-    amok's, amuck's
-    amok, amuck
-    amoks, amucks
-    among, amongst
-    amoralize, amoralise
-    amoralizes, amoralises
-    amoret, amouret
-    amorism's, amourism's
-    amorism, amourism
-    amorisms, amourisms
-    amorist's, amourist's
-    amorist, amourist
-    amoristic, amouristic
-    amoristics, amouristics
-    amorists, amourists
-    amorphization, amorphisation
-    amorphize, amorphise
-    amortizable's, amortisable's
-    amortizable, amortisable
-    amortizabler, amortisabler
-    amortizables, amortisables
-    amortizablest, amortisablest
-    amortization's, amortisation's
-    amortization, amortisation
-    amortizations, amortisations
-    amortize, amortise
-    amortized, amortised
-    amortizement's, amortisement's
-    amortizement, amortisement
-    amortizements, amortisements
-    amortizes, amortises
-    amortizing, amortising
-    amphigean, amphigaean
-    amphitheater's, amphitheatre's
-    amphitheater, amphitheatre
-    amphitheaters, amphitheatres
-    ampoule's, ampul's
-    ampoule, ampul
-    ampoules, ampuls
-    amygdale, amygdalae
-    amyxorrhea, amyxorrhoea
-    anabaptize, anabaptise
-    anabaptized, anabaptised
-    anabaptizes, anabaptises
-    anabaptizing, anabaptising
-    anaesthetization's, anesthetisation's
-    anaesthetization, anesthetisation
-    anaesthetizations, anesthetisations
-    anaesthetize, anesthetise
-    anaesthetized, anesthetised
-    anaesthetizer, anesthetiser
-    anaesthetizers, anesthetisers
-    anaesthetizes, anesthetises
-    anaesthetizing, anesthetising
-    anagrammatize, anagrammatise
-    anagrammatized, anagrammatised
-    anagrammatizes, anagrammatises
-    anagrammatizing, anagrammatising
-    analogize, analogise
-    analogized, analogised
-    analogizes, analogises
-    analogizing, analogising
-    analytical, analytic
-    analytically, analyticalally
-    analyticiti, analyticaliti
-    analyticitis, analyticalitis
-    analyticity, analyticality
-    analyzability's, analysability's
-    analyzability, analysability
-    analyzable, analysable
-    analyzabler, analysabler
-    analyzablest, analysablest
-    analyzation's, analysation's
-    analyzation, analysation
-    analyzations, analysations
-    analyze, analyse
-    analyzed, analysed
-    analyzer's, analyser's
-    analyzer, analyser
-    analyzers, analysers
-    analyzes, analyses
-    analyzing, analysing
-    anapestically, anapaestically
-    anapneic, anapnoeic
-    anarchize, anarchise
-    anarchized, anarchised
-    anarchizes, anarchises
-    anarchizing, anarchising
-    anathematization's, anathematisation's
-    anathematization, anathematisation
-    anathematizations, anathematisations
-    anathematize, anathematise
-    anathematized, anathematised
-    anathematizer's, anathematiser's
-    anathematizer, anathematiser
-    anathematizes, anathematises
-    anathematizing, anathematising
-    anatomizable, anatomisable
-    anatomization's, anatomisation's
-    anatomization, anatomisation
-    anatomize, anatomise
-    anatomized, anatomised
-    anatomizer's, anatomiser's
-    anatomizer, anatomiser
-    anatomizes, anatomises
-    anatomizing, anatomising
-    Anchinoe's, Anchinoae's
-    Anchinoe, Anchinoae
-    ancille, ancillae
-    anematosis, anaematosis
-    anemia's, anaemia's
-    anemia, anaemia
-    anemias, anaemias
-    anemic, anaemic
-    anemically, anaemically
-    anemicer, anaemicer
-    anemicest, anaemicest
-    anemics, anaemics
-    aneretic, anaeretic
-    anesis, anoesis
-    anesthesia's, anaesthesia's
-    anesthesia, anaesthesia
-    anesthesiant, anaesthesiant
-    anesthesias, anaesthesias
-    anesthesiologies, anaesthesiologies
-    anesthesiologist's, anaesthesiologist's
-    anesthesiologist, anaesthesiologist
-    anesthesiologists, anaesthesiologists
-    anesthesiology's, anaesthesiology's
-    anesthesiology, anaesthesiology
-    anesthesis, anaesthesis
-    anesthetic's, anaesthetic's
-    anesthetic, anaesthetic
-    anesthetically, anaesthetically
-    anestheticer, anaestheticer
-    anestheticest, anaestheticest
-    anesthetics, anaesthetics
-    anesthetist's, anaesthetist's
-    anesthetist, anaesthetist
-    anesthetists, anaesthetists
-    anesthyl, anaesthyl
-    anestra, anoestra
-    anestri, anoestri
-    anestrous, anoestrous
-    anestrum, anoestrum
-    anestrus's, anoestrus's
-    anestrus, anoestrus
-    anestruses, anoestruses
-    anetic, anoetic
-    anetiological, anaetiological
-    aneurysm's, aneurism's
-    aneurysm, aneurism
-    aneurysms, aneurisms
-    angelicize, angelicise
-    angelicizes, angelicises
-    angelize, angelise
-    angelizes, angelises
-    Anglicanize's, Anglicanise's
-    Anglicanize, Anglicanise
-    Anglicanizes, Anglicanises
-    anglicization's, anglicisation's
-    anglicization, anglicisation
-    anglicizations, anglicisations
-    anglicize, anglicise
-    anglicized, anglicised
-    anglicizes, anglicises
-    anglicizing, anglicising
-    angrecum, angraecum
-    angularization's, angularisation's
-    angularization, angularisation
-    angularizations, angularisations
-    angularize, angularise
-    angularizes, angularises
-    anhematopoiesis's, anhaematopoiesis's
-    anhematopoiesis, anhaematopoiesis
-    anhematosis, anhaematosis
-    anhemolytic, anhaemolytic
-    anhydremia, anhydraemia
-    anhydremic, anhydraemic
-    anhydridization's, anhydridisation's
-    anhydridization, anhydridisation
-    anhydridizations, anhydridisations
-    anhydridize, anhydridise
-    anhydridizes, anhydridises
-    animalization's, animalisation's
-    animalization, animalisation
-    animalizations, animalisations
-    animalize, animalise
-    animalized, animalised
-    animalizes, animalises
-    animalizing, animalising
-    animized, animised
-    annalize, annalise
-    annalized, annalised
-    annalizes, annalises
-    annalizing, annalising
-    annualization, annualisation
-    annualize, annualise
-    annualized, annualised
-    annualizes, annualises
-    annualizing, annualising
-    anodization, anodisation
-    anodize, anodise
-    anodized, anodised
-    anodizes, anodises
-    anodizing, anodising
-    anonymize, anonymise
-    anonymized, anonymised
-    anonymizes, anonymises
-    anonymizing, anonymising
-    Anora's, Anoura's
-    Anora, Anoura
-    anoxemia's, anoxaemia's
-    anoxemia, anoxaemia
-    anoxemic, anoxaemic
-    anserine, anserinae
-    antagonizable, antagonisable
-    antagonization's, antagonisation's
-    antagonization, antagonisation
-    antagonizations, antagonisations
-    antagonize, antagonise
-    antagonized, antagonised
-    antagonizer, antagoniser
-    antagonizers, antagonisers
-    antagonizes, antagonises
-    antagonizing, antagonising
-    antennae, antenna
-    antennas, antenna
-    anthecological, anthoecological
-    anthecologist, anthoecologist
-    anthecology, anthoecology
-    anthologization, anthologisation
-    anthologize, anthologise
-    anthologized, anthologised
-    anthologizer, anthologiser
-    anthologizes, anthologises
-    anthologizing, anthologising
-    anthracemia, anthracaemia
-    anthracitization's, anthracitisation's
-    anthracitization, anthracitisation
-    anthracitizations, anthracitisations
-    anthropomorphization's, anthropomorphisation's
-    anthropomorphization, anthropomorphisation
-    anthropomorphizations, anthropomorphisations
-    anthropomorphize, anthropomorphise
-    anthropomorphized, anthropomorphised
-    anthropomorphizes, anthropomorphises
-    anthropomorphizing, anthropomorphising
-    anticatalyzer's, anticatalyser's
-    anticatalyzer, anticatalyser
-    anticatalyzers, anticatalysers
-    anticentralization's, anticentralisation's
-    anticentralization, anticentralisation
-    anticentralizations, anticentralisations
-    anticize, anticise
-    anticizes, anticises
-    antiepicenter's, antiepicentre's
-    antiepicenter, antiepicentre
-    antiepicenters, antiepicentres
-    antifertilizer's, antifertiliser's
-    antifertilizer, antifertiliser
-    antifertilizers, antifertilisers
-    antilabor's, antilabour's
-    antilabor, antilabour
-    antilabors, antilabours
-    antilemic, antiloemic
-    antimedieval, antimediaeval
-    antimedievalism's, antimediaevalism's
-    antimedievalism, antimediaevalism
-    antimedievalist's, antimediaevalist's
-    antimedievalist, antimediaevalist
-    antimedievally, antimediaevally
-    antioxidizer's, antioxidiser's
-    antioxidizer, antioxidiser
-    antioxidizers, antioxidisers
-    antioxidizing's, antioxidising's
-    antioxidizing, antioxidising
-    antioxidizings, antioxidisings
-    antipathize, antipathise
-    antipathizes, antipathises
-    antiquarianize, antiquarianise
-    antiquarianizes, antiquarianises
-    antirumor's, antirumour's
-    antirumor, antirumour
-    antirumors, antirumours
-    antisensitize, antisensitise
-    antisensitizer's, antisensitiser's
-    antisensitizer, antisensitiser
-    antisensitizers, antisensitisers
-    antisensitizes, antisensitises
-    antisepticize, antisepticise
-    antisepticized, antisepticised
-    antisepticizes, antisepticises
-    antisepticizing, antisepticising
-    antiseptize, antiseptise
-    antiseptizes, antiseptises
-    antisiphon's, antisyphon's
-    antisiphon, antisyphon
-    antisiphons, antisyphons
-    antithesize, antithesise
-    antithesizes, antithesises
-    anviled, anvilled
-    anviling, anvilling
-    apesthesia, apaesthesia
-    apesthetic, apaesthetic
-    aphereses, aphaereses
-    apheresis's, aphaeresis's
-    apheresis, aphaeresis
-    apheretic, aphaeretic
-    aphetize, aphetise
-    aphetized, aphetised
-    aphetizes, aphetises
-    aphetizing, aphetising
-    aphorize, aphorise
-    aphorized, aphorised
-    aphorizer's, aphoriser's
-    aphorizer, aphoriser
-    aphorizers, aphorisers
-    aphorizes, aphorises
-    aphorizing, aphorising
-    apnea's, apnoea's
-    apnea, apnoea
-    apneal, apnoeal
-    apneas, apnoeas
-    apneic, apnoeic
-    apocenter, apocentre
-    apogeic, apogaeic
-    apologize, apologise
-    apologized, apologised
-    apologizer's, apologiser's
-    apologizer, apologiser
-    apologizers, apologisers
-    apologizes, apologises
-    apologizing, apologising
-    apophthegmatize, apophthegmatise
-    apophthegmatized, apophthegmatised
-    apophthegmatizes, apophthegmatises
-    apophthegmatizing, apophthegmatising
-    aporrhea, aporrhoea
-    apostatization, apostatisation
-    apostatize, apostatise
-    apostatized, apostatised
-    apostatizes, apostatises
-    apostatizing, apostatising
-    apostolize, apostolise
-    apostolized, apostolised
-    apostolizes, apostolises
-    apostolizing, apostolising
-    apostrophize, apostrophise
-    apostrophized, apostrophised
-    apostrophizes, apostrophises
-    apostrophizing, apostrophising
-    apothegmatize, apothegmatise
-    apothegmatized, apothegmatised
-    apothegmatizes, apothegmatises
-    apothegmatizing, apothegmatising
-    apotheosize, apotheosise
-    apotheosized, apotheosised
-    apotheosizes, apotheosises
-    apotheosizing, apotheosising
-    appall, appal
-    appalls, appals
-    appareled, apparelled
-    appareling, apparelling
-    appendices, appendix
-    appendixes, appendix
-    appetize, appetise
-    appetized, appetised
-    appetizement's, appetisement's
-    appetizement, appetisement
-    appetizements, appetisements
-    appetizer's, appetiser's
-    appetizer, appetiser
-    appetizers, appetisers
-    appetizes, appetises
-    appetizing, appetising
-    appetizingly, appetisingly
-    apprizal, apprisal
-    apprizer, appriser
-    apprizers, apprisers
-    apprizings, apprisings
-    aquaculture's, aquiculture's
-    aquaculture, aquiculture
-    Arabianize's, Arabianise's
-    Arabianize, Arabianise
-    Arabianizes, Arabianises
-    Arabicize, Arabicise
-    Arabicizes, Arabicises
-    arabization's, arabisation's
-    arabization, arabisation
-    arabizations, arabisations
-    Arabize, Arabise
-    arabize, arabise
-    Arabized, Arabised
-    arabized, arabised
-    Arabizes, Arabises
-    arabizes, arabises
-    Arabizing, Arabising
-    arabizing, arabising
-    Aramean, Aramaean
-    Arameans, Aramaeans
-    arbalester, arbalestre
-    arbor's, arbour's
-    arbor, arbour
-    arbored, arboured
-    arbores, arboures
-    arborization's, arborisation's
-    arborization, arborisation
-    arborizations, arborisations
-    arborize, arborise
-    arborized, arborised
-    arborizes, arborises
-    arborizing, arborising
-    arbors, arbours
-    archaeologic, archeologic
-    archaeological, archeological
-    archaeologically, archeologically
-    archaeologies, archeologies
-    archaeologist's, archeologist's
-    archaeologist, archeologist
-    archaeologists, archeologists
-    archaeology's, archeology's
-    archaeology, archeology
-    archaize, archaise
-    archaized, archaised
-    archaizer's, archaiser's
-    archaizer, archaiser
-    archaizers, archaisers
-    archaizes, archaises
-    archaizing, archaising
-    arche, archae
-    archeal, archaeal
-    archean, archaean
-    archei, archaei
-    archeoastronomies, archaeoastronomies
-    archeoastronomy, archaeoastronomy
-    archeocyte's, archaeocyte's
-    archeocyte, archaeocyte
-    archeol, archaeol
-    archeolithic, archaeolithic
-    archeologian, archaeologian
-    archeometries, archaeometries
-    archeometry, archaeometry
-    Archeozic, Archaeozic
-    Archeozoic, Archaeozoic
-    archeozoic, archaeozoic
-    archetypal, archetypical
-    archetypally, archetypically
-    archeus, archaeus
-    arcticize, arcticise
-    arcticizes, arcticises
-    Arctogea's, Arctogaea's
-    Arctogea, Arctogaea
-    Arctogean's, Arctogaean's
-    Arctogean, Arctogaean
-    Arctogeic's, Arctogaeic's
-    Arctogeic, Arctogaeic
-    ardor's, ardour's
-    ardor, ardour
-    ardors, ardours
-    arenicolor, arenicolour
-    areole, areolae
-    areometric, araeometric
-    areometrical, araeometrical
-    areostyle, araeostyle
-    areostyles, araeostyles
-    areosystyle, araeosystyle
-    Arianize's, Arianise's
-    Arianize, Arianise
-    Arianized's, Arianised's
-    Arianized, Arianised
-    Arianizes, Arianises
-    Arianizing's, Arianising's
-    Arianizing, Arianising
-    Arimathea's, Arimathaea's
-    Arimathea, Arimathaea
-    Arimathean's, Arimathaean's
-    Arimathean, Arimathaean
-    ariste, aristae
-    arithmetization's, arithmetisation's
-    arithmetization, arithmetisation
-    arithmetizations, arithmetisations
-    arithmetize, arithmetise
-    arithmetized, arithmetised
-    arithmetizes, arithmetises
-    armor's, armour's
-    armor, armour
-    armorbearer's, armourbearer's
-    armorbearer, armourbearer
-    armored, armoured
-    armorer's, armourer's
-    armorer, armourer
-    armorers, armourers
-    armoried, armouried
-    armoring, armouring
-    armorless, armourless
-    armors, armours
-    armory's, armoury's
-    armory, armoury
-    aromatite, aromatitae
-    aromatization's, aromatisation's
-    aromatization, aromatisation
-    aromatize, aromatise
-    aromatized, aromatised
-    aromatizer's, aromatiser's
-    aromatizer, aromatiser
-    aromatizes, aromatises
-    aromatizing, aromatising
-    arsenicize, arsenicise
-    arsenicizes, arsenicises
-    Arsinoe's, Arsinoae's
-    Arsinoe, Arsinoae
-    arterialization's, arterialisation's
-    arterialization, arterialisation
-    arterializations, arterialisations
-    arterialize, arterialise
-    arterialized, arterialised
-    arterializes, arterialises
-    arterializing, arterialising
-    arthrempyesis, arthroempyesis
-    artifact's, artefact's
-    artifact, artefact
-    artifacts, artefacts
-    artificialize, artificialise
-    artificialized, artificialised
-    artificializes, artificialises
-    artificializing, artificialising
-    Aryanization, Aryanisation
-    Aryanize, Aryanise
-    Aryanized's, Aryanised's
-    Aryanized, Aryanised
-    Aryanizes, Aryanises
-    Aryanizing's, Aryanising's
-    Aryanizing, Aryanising
-    arytenoid, arytaenoid
-    arytenoids, arytaenoids
-    asafetida's, asafoetida's
-    asafetida, asafoetida
-    asafetidas, asafoetidas
-    ascendance's, ascendence's
-    ascendance, ascendence
-    ascendancy's, ascendency's
-    ascendancy, ascendency
-    ascendant's, ascendent's
-    ascendant, ascendent
-    ascendants, ascendents
-    Asclepiade's, Asclepiadae's
-    Asclepiade, Asclepiadae
-    Asel's, Asael's
-    Asel, Asael
-    asepticize, asepticise
-    asepticized, asepticised
-    asepticizes, asepticises
-    asepticizing, asepticising
-    asexualization's, asexualisation's
-    asexualization, asexualisation
-    asexualize, asexualise
-    asexualized, asexualised
-    asexualizing, asexualising
-    Asiaticization's, Asiaticisation's
-    Asiaticization, Asiaticisation
-    Asiaticizations, Asiaticisations
-    Asiaticize's, Asiaticise's
-    Asiaticize, Asiaticise
-    Asiaticizes, Asiaticises
-    Asmonean's, Asmonaean's
-    Asmonean, Asmonaean
-    aspheterize, aspheterise
-    aspheterized, aspheterised
-    aspheterizes, aspheterises
-    aspheterizing, aspheterising
-    assafetida, assafoetida
-    assafetidas, assafoetidas
-    asshole's, arsehole's
-    asshole, arsehole
-    assholes, arseholes
-    Assidean's, Assidaean's
-    Assidean, Assidaean
-    Assyrianize's, Assyrianise's
-    Assyrianize, Assyrianise
-    Assyrianizes, Assyrianises
-    Astera's, Astrea's
-    Astera, Astrea
-    astigmatizer's, astigmatiser's
-    astigmatizer, astigmatiser
-    astigmatizers, astigmatisers
-    Astrea's, Astraea's
-    Astrea, Astraea
-    astrean, astraean
-    astronomize, astronomise
-    astronomized, astronomised
-    astronomizes, astronomises
-    astronomizing, astronomising
-    asynchronize, asynchronise
-    asynchronized, asynchronised
-    asynchronizes, asynchronises
-    asynchronizing, asynchronising
-    atheize, atheise
-    atheized, atheised
-    atheizes, atheises
-    atheizing, atheising
-    athetize, athetise
-    athetized, athetised
-    athetizes, athetises
-    athetizing, athetising
-    atmolyze, atmolyse
-    atmolyzed, atmolysed
-    atmolyzes, atmolyses
-    atmolyzing, atmolysing
-    atomizability, atomisability
-    atomizable, atomisable
-    atomization's, atomisation's
-    atomization, atomisation
-    atomizations, atomisations
-    atomize, atomise
-    atomized, atomised
-    atomizer's, atomiser's
-    atomizer, atomiser
-    atomizers, atomisers
-    atomizes, atomises
-    atomizing, atomising
-    atroceruleus, atrocoeruleus
-    attemper, attempre
-    Atticize, Atticise
-    atticize, atticise
-    Atticized, Atticised
-    Atticizes, Atticises
-    atticizes, atticises
-    Atticizing, Atticising
-    attitudinization, attitudinisation
-    attitudinize, attitudinise
-    attitudinized, attitudinised
-    attitudinizer's, attitudiniser's
-    attitudinizer, attitudiniser
-    attitudinizers, attitudinisers
-    attitudinizes, attitudinises
-    attitudinizing, attitudinising
-    attitudinizings, attitudinisings
-    aunter, auntre
-    auntie's, aunty's
-    auntie, aunty
-    aureole's, aureola's
-    aureole, aureola
-    Australianize's, Australianise's
-    Australianize, Australianise
-    Australianizes, Australianises
-    Australopithecine's, Australopithecinae's
-    Australopithecine, Australopithecinae
-    Austrianize's, Austrianise's
-    Austrianize, Austrianise
-    Austrianizes, Austrianises
-    autecious, autoecious
-    auteciously, autoeciously
-    auteciousness's, autoeciousness's
-    auteciousness, autoeciousness
-    autecism's, autoecism's
-    autecism, autoecism
-    autecisms, autoecisms
-    autecy, autoecy
-    authorizable, authorisable
-    authorization's, authorisation's
-    authorization, authorisation
-    authorizations, authorisations
-    authorize, authorise
-    authorized, authorised
-    authorizer's, authoriser's
-    authorizer, authoriser
-    authorizers, authorisers
-    authorizes, authorises
-    authorizing, authorising
-    autocatalyze, autocatalyse
-    autocatalyzed, autocatalysed
-    autocatalyzes, autocatalyses
-    autocatalyzing, autocatalysing
-    autodialer, autodialler
-    autoimmunization, autoimmunisation
-    autoionization's, autoionisation's
-    autoionization, autoionisation
-    autolyzate, autolysate
-    autolyzates, autolysates
-    autolyze, autolyse
-    autolyzed, autolysed
-    autolyzes, autolyses
-    autolyzing, autolysing
-    automatization's, automatisation's
-    automatization, automatisation
-    automatizations, automatisations
-    automatize, automatise
-    automatized, automatised
-    automatizes, automatises
-    automatizing, automatising
-    Autonoe's, Autonoae's
-    Autonoe, Autonoae
-    autotomize, autotomise
-    autotomized, autotomised
-    autotomizes, autotomises
-    autotomizing, autotomising
-    autotoxemia's, autotoxaemia's
-    autotoxemia, autotoxaemia
-    autotoxemias, autotoxaemias
-    avianize, avianise
-    avianized, avianised
-    avianizes, avianises
-    avianizing, avianising
-    avizandum, avisandum
-    avizandums, avisandums
-    avize, avise
-    avized, avised
-    avizes, avises
-    avizing, avising
-    awestruck, awestricken
-    AWOL, awol
-    ax's, axe's
-    ax, axe
-    axiomatization's, axiomatisation's
-    axiomatization, axiomatisation
-    axiomatizations, axiomatisations
-    axiomatize, axiomatise
-    axiomatized, axiomatised
-    axiomatizes, axiomatises
-    axiomatizing, axiomatising
-    aye's, ay's
-    aye, ay
-    azotemia, azotaemia
-    azotization, azotisation
-    azotize, azotise
-    azotized, azotised
-    azotizes, azotises
-    azotizing, azotising
-    azotorrhea, azotorrhoea
-    Babelization's, Babelisation's
-    Babelization, Babelisation
-    Babelize's, Babelise's
-    Babelize, Babelise
-    Babelized's, Babelised's
-    Babelized, Babelised
-    Babelizing's, Babelising's
-    Babelizing, Babelising
-    Babylonize's, Babylonise's
-    Babylonize, Babylonise
-    Babylonizes, Babylonises
-    bachelorize, bachelorise
-    bachelorizes, bachelorises
-    bacillemia, bacillaemia
-    bacillemias, bacillaemias
-    bacilli, bacilluses
-    backpedaled, backpedalled
-    backpedaling, backpedalling
-    baconize, baconise
-    baconizes, baconises
-    bacteremia's, bacteraemia's
-    bacteremia, bacteraemia
-    bacteremias, bacteraemias
-    bacteria, bacteria
-    bacteriemia, bacteriaemia
-    bacterize, bacterise
-    bacterized, bacterised
-    bacterizes, bacterises
-    bacterizing, bacterising
-    baddie's, baddy's
-    baddie, baddy
-    Baer's, Bare's
-    Baer, Bare
-    balk's, baulk's
-    balk, baulk
-    Balkanization's, Balkanisation's
-    balkanization's, balkanisation's
-    Balkanization, Balkanisation
-    balkanization, balkanisation
-    Balkanizations, Balkanisations
-    balkanizations, balkanisations
-    Balkanize, Balkanise
-    balkanize, balkanise
-    Balkanized, Balkanised
-    balkanized, balkanised
-    Balkanizes, Balkanises
-    balkanizes, balkanises
-    Balkanizing, Balkanising
-    balkanizing, balkanising
-    balked, baulked
-    balking, baulking
-    balks, baulks
-    balladize, balladise
-    balladized, balladised
-    balladizes, balladises
-    balladizing, balladising
-    baloney's, boloney's
-    baloney, boloney
-    balsamize, balsamise
-    balsamizes, balsamises
-    banalization, banalisation
-    banalizations, banalisations
-    banalize, banalise
-    banalized, banalised
-    banalizes, banalises
-    banalizing, banalising
-    bandanna's, bandana's
-    bandanna, bandana
-    bandannas, bandanas
-    bandoleer's, bandolier's
-    bandoleer, bandolier
-    bandoleers, bandoliers
-    banister's, bannister's
-    banister, bannister
-    banisters, bannisters
-    banshee's, banshie's
-    banshee, banshie
-    banshees, banshies
-    bantamize, bantamise
-    bantamizes, bantamises
-    baptisteries, baptistries
-    baptistery's, baptistry's
-    baptistery, baptistry
-    baptizable's, baptisable's
-    baptizable, baptisable
-    baptizables, baptisables
-    baptize, baptise
-    baptized, baptised
-    baptizement's, baptisement's
-    baptizement, baptisement
-    baptizements, baptisements
-    baptizer's, baptiser's
-    baptizer, baptiser
-    baptizers, baptisers
-    baptizes, baptises
-    baptizing, baptising
-    barbarianize, barbarianise
-    barbarianizes, barbarianises
-    barbarization's, barbarisation's
-    barbarization, barbarisation
-    barbarizations, barbarisations
-    barbarize, barbarise
-    barbarized, barbarised
-    barbarizes, barbarises
-    barbarizing, barbarising
-    barbecue's, barbeque's
-    barbecue, barbeque
-    barbecued, barbequed
-    barbecues, barbeques
-    barbecuing, barbequing
-    barcarole's, barcarolle's
-    barcarole, barcarolle
-    barcaroles, barcarolles
-    baronetize, baronetise
-    baronetized, baronetised
-    baronetizing, baronetising
-    baronize, baronise
-    baronizes, baronises
-    barreled, barrelled
-    barreling, barrelling
-    bartizan, bartisan
-    bartizaned, bartisaned
-    bartizans, bartisans
-    barycenter, barycentre
-    bastardization's, bastardisation's
-    bastardization, bastardisation
-    bastardizations, bastardisations
-    bastardize, bastardise
-    bastardized, bastardised
-    bastardizes, bastardises
-    bastardizing, bastardising
-    bastinaded, bastinadoed
-    bastinades, bastinadoes
-    bathyscaphe's, bathyscaph's
-    bathyscaphe, bathyscaph
-    bathyscaphes, bathyscaphs
-    battleaxe's, battleax's
-    battleaxe, battleax
-    battologize, battologise
-    battologized, battologised
-    battologizing, battologising
-    beaverize, beaverise
-    beaverizes, beaverises
-    beclamor, beclamour
-    beclamored, beclamoured
-    beclamoring, beclamouring
-    beclamors, beclamours
-    becolor, becolour
-    becudgeled, becudgelled
-    becudgeling, becudgelling
-    bedeviled, bedevilled
-    bedeviling, bedevilling
-    bedlamize, bedlamise
-    bedlamized, bedlamised
-    bedlamizes, bedlamises
-    bedlamizing, bedlamising
-    bedriveled, bedrivelled
-    bedriveling, bedrivelling
-    Beera's, Berea's
-    Beera, Berea
-    beeves, beef
-    befavor, befavour
-    beglamor, beglamour
-    beglamored, beglamoured
-    beglamoring, beglamouring
-    beglamors, beglamours
-    behavior's, behaviour's
-    behavior, behaviour
-    behavioral, behavioural
-    behavioraler, behaviouraler
-    behavioralest, behaviouralest
-    behaviorally, behaviourally
-    behaviored, behavioured
-    behaviorism's, behaviourism's
-    behaviorism, behaviourism
-    behaviorisms, behaviourisms
-    behaviorist's, behaviourist's
-    behaviorist, behaviourist
-    behavioristic, behaviouristic
-    behavioristicer, behaviouristicer
-    behavioristicest, behaviouristicest
-    behavioristics, behaviouristics
-    behaviorists, behaviourists
-    behaviors, behaviours
-    Behmenism's, Boehmenism's
-    Behmenism, Boehmenism
-    behmenism, boehmenism
-    Behmenist's, Boehmenist's
-    Behmenist, Boehmenist
-    Behmenite's, Boehmenite's
-    Behmenite, Boehmenite
-    behoove's, behove's
-    behoove, behove
-    behooved, behoved
-    behooves, behoves
-    behooving's, behoving's
-    behooving, behoving
-    behoovingly, behovingly
-    behoovings, behovings
-    bejeweled, bejewelled
-    bejeweling, bejewelling
-    bel's, bael's
-    bel, bael
-    belabor's, belabour's
-    belabor, belabour
-    belabored, belaboured
-    belaboring, belabouring
-    belabors, belabours
-    bels, baels
-    Belter's, Boelter's
-    Belter, Boelter
-    Belus's, Boelus's
-    Belus, Boelus
-    bemedaled, bemedalled
-    Beria's, Baeria's
-    Beria, Baeria
-    berk, burk
-    berks, burks
-    Berl's, Baerl's
-    Berl, Baerl
-    Berlinize's, Berlinise's
-    Berlinize, Berlinise
-    Berlinizes, Berlinises
-    berloque, breloque
-    berme, breme
-    bern, bren
-    Bessemerize's, Bessemerise's
-    Bessemerize, Bessemerise
-    Bessemerizes, Bessemerises
-    bestialize, bestialise
-    bestialized, bestialised
-    bestializes, bestialises
-    bestializing, bestialising
-    beveled, bevelled
-    beveler's, beveller's
-    beveler, beveller
-    bevelers, bevellers
-    beveling, bevelling
-    bevelings, bevellings
-    Beyer's, Baeyer's
-    Beyer, Baeyer
-    biased, biassed
-    biasing, biassing
-    bichromatize, bichromatise
-    bichromatizes, bichromatises
-    bicolor's, bicolour's
-    bicolor, bicolour
-    bicolored, bicoloured
-    bicoloredder, bicolouredder
-    bicoloreddest, bicoloureddest
-    bicolorous, bicolourous
-    bicolorrer, bicolourer
-    bicolorrest, bicolourest
-    bicolors, bicolours
-    bimetalist, bimetallist
-    bimetalistic, bimetallistic
-    bingeing, binging
-    biocenology, biocoenology
-    biocenose, biocoenose
-    biocenoses, biocoenoses
-    biocenosis, biocoenosis
-    biocenotic, biocoenotic
-    biographize, biographise
-    biographizes, biographises
-    biologize, biologise
-    biologizes, biologises
-    biosynthesized, biosynthesised
-    bipolarization, bipolarisation
-    bipolarize, bipolarise
-    bipolarizes, bipolarises
-    Birminghamize's, Birminghamise's
-    Birminghamize, Birminghamise
-    Birminghamizes, Birminghamises
-    bister's, bistre's
-    bister, bistre
-    bistered, bistred
-    bisteredder, bistredder
-    bistereddest, bistreddest
-    bisters, bistres
-    bittor, bittour
-    bittors, bittours
-    bituminization's, bituminisation's
-    bituminization, bituminisation
-    bituminizations, bituminisations
-    bituminize, bituminise
-    bituminized, bituminised
-    bituminizes, bituminises
-    bituminizing, bituminising
-    bize's, bise's
-    bize, bise
-    bizet, biset
-    blaize, blaise
-    blamable, blameable
-    blastocele, blastocoele
-    blastule, blastulae
-    blennemesis, blennoemesis
-    blennorrhea, blennorrhoea
-    blowzier, blowsier
-    blowziest, blowsiest
-    blowzy, blowsy
-    bluing's, blueing's
-    bluing, blueing
-    bo's'n's, bos'n's
-    bo'suns, bos'ns
-    bocce's, bocci's
-    bocce, bocci
-    Boedromius's, Boaedromius's
-    Boedromius, Boaedromius
-    bogeyed, bogied
-    bogeying, bogieing
-    bogeys, bogies
-    bogie's, bogey's
-    bogie, bogey
-    bogies, bogeys
-    bogy's, bogie's
-    bogy, bogie
-    boled, boloed
-    Bolshevize, Bolshevise
-    bolshevize, bolshevise
-    Bolshevized, Bolshevised
-    bolshevized, bolshevised
-    bolshevizes, bolshevises
-    Bolshevizing, Bolshevising
-    bolshevizing, bolshevising
-    bolshie, bolshy
-    bonderize, bonderise
-    bonny, bonnie
-    bony, boney
-    boogeyman's, boogerman's
-    boogeyman, boogerman
-    boogeymen, boogermans
-    boombox's, boom_box's
-    boombox, boom_box
-    boomboxes, boom_boxes
-    bor, bour
-    borage, bourage
-    borasque, bourasque
-    bord, bourd
-    bords, bourds
-    borg, bourg
-    borize, borise
-    borizes, borises
-    borscht's, borsch's
-    borscht, borsch
-    bos'n, bo's'n
-    Boswellize, Boswellise
-    Boswellized, Boswellised
-    Boswellizes, Boswellises
-    Boswellizing, Boswellising
-    botanize, botanise
-    botanized, botanised
-    botanizer's, botaniser's
-    botanizer, botaniser
-    botanizes, botanises
-    botanizing, botanising
-    boulder's, bowlder's
-    boulder, bowlder
-    boulders, bowlders
-    boulevardize, boulevardise
-    boulevardizes, boulevardises
-    bourbonize, bourbonise
-    bourbonizes, bourbonises
-    bowdlerization's, bowdlerisation's
-    bowdlerization, bowdlerisation
-    bowdlerizations, bowdlerisations
-    bowdlerize, bowdlerise
-    bowdlerized, bowdlerised
-    bowdlerizer's, bowdleriser's
-    bowdlerizer, bowdleriser
-    bowdlerizers, bowdlerisers
-    bowdlerizes, bowdlerises
-    bowdlerizing, bowdlerising
-    boweled, bowelled
-    boweling, bowelling
-    bradypnea, bradypnoea
-    breathalyze, breathalyse
-    breathalyzed, breathalysed
-    breathalyzer's, breathalyser's
-    breathalyzer, breathalyser
-    breathalyzers, breathalysers
-    breathalyzes, breathalyses
-    breathalyzing, breathalysing
-    brier's, briar's
-    brier, briar
-    briers, briars
-    brimful, brimfull
-    brinkmanship's, brinksmanship's
-    brinkmanship, brinksmanship
-    briquette's, briquet's
-    briquette, briquet
-    briquettes, briquets
-    briza's, brisa's
-    briza, brisa
-    bromethylene, bromoethylene
-    brominize, brominise
-    brominizes, brominises
-    bromization's, bromisation's
-    bromization, bromisation
-    bromize, bromise
-    bromized, bromised
-    bromizing, bromising
-    bronco's, broncho's
-    bronco, broncho
-    broncos, bronchos
-    brusque, brusk
-    brusquely, bruskly
-    brusqueness's, bruskness's
-    brusqueness, bruskness
-    brusquenesses, brusknesses
-    brusquer, brusker
-    brusquest, bruskest
-    brutalization's, brutalisation's
-    brutalization, brutalisation
-    brutalizations, brutalisations
-    brutalize, brutalise
-    brutalized, brutalised
-    brutalizes, brutalises
-    brutalizing, brutalising
-    Budenny's, Budaenny's
-    Budenny, Budaenny
-    bunco's, bunko's
-    bunco, bunko
-    buncoed, bunkoed
-    buncoing, bunkoing
-    buncos, bunkos
-    bunkum's, buncombe's
-    bunkum, buncombe
-    bunkums, buncombes
-    bureaucratization's, bureaucratisation's
-    bureaucratization, bureaucratisation
-    bureaucratizations, bureaucratisations
-    bureaucratize, bureaucratise
-    bureaucratized, bureaucratised
-    bureaucratizes, bureaucratises
-    bureaucratizing, bureaucratising
-    burglarize, burglarise
-    burglarized, burglarised
-    burglarizes, burglarises
-    burglarizing, burglarising
-    burnettize, burnettise
-    burnettized, burnettised
-    burnettizes, burnettises
-    burnettizing, burnettising
-    burnoose's, burnous's
-    burnoose, burnous
-    burnooses, burnouses
-    burqa's, burkha's
-    burqa, burkha
-    burqas, burkhas
-    busheled, bushelled
-    busheler's, busheller's
-    busheler, busheller
-    bushelers, bushellers
-    busheling, bushelling
-    bushelings, bushellings
-    bylaw's, byelaw's
-    bylaw, byelaw
-    bylaws, byelaws
-    Byronize's, Byronise's
-    Byronize, Byronise
-    Byronizes, Byronises
-    Byzantinize's, Byzantinise's
-    Byzantinize, Byzantinise
-    Byzantinizes, Byzantinises
-    cabbala, cabbalah
-    cabby's, cabbie's
-    cabby, cabbie
-    cacesthesia, cacaesthesia
-    cachemia, cachaemia
-    cachemic, cachaemic
-    cacodemon, cacodaemon
-    cacodemoniac, cacodaemoniac
-    cacodemonial, cacodaemonial
-    cacodemonic, cacodaemonic
-    cacodemons, cacodaemons
-    cacoethes's, cacoaethes's
-    cacoethes, cacoaethes
-    cadaster's, cadastre's
-    cadaster, cadastre
-    cadasters, cadastres
-    cadaverize, cadaverise
-    cadaverizes, cadaverises
-    cadmiumize, cadmiumise
-    cadmiumizes, cadmiumises
-    caesarian's, cesarian's
-    caesarian, cesarian
-    caesarians, cesarians
-    Caesarize's, Caesarise's
-    Caesarize, Caesarise
-    Caesarizes, Caesarises
-    caffer, caffre
-    caftan's, kaftan's
-    caftan, kaftan
-    caftans, kaftans
-    cagey, cagy
-    caginess's, cageyness's
-    caginess, cageyness
-    caginesses, cageynesses
-    caiman's, cayman's
-    caiman, cayman
-    caimans, caymans
-    calander, calandre
-    calcemia, calcaemia
-    calendarization, calendarisation
-    calendarizations, calendarisations
-    calendarize, calendarise
-    calendarized, calendarised
-    calendarizes, calendarises
-    calendarizing, calendarising
-    Calender's, Calendre's
-    Calender, Calendre
-    caliber's, calibre's
-    caliber, calibre
-    calibers, calibres
-    calif's, khalif's
-    calif, khalif
-    califs, khalifs
-    caliper's, calliper's
-    caliper, calliper
-    calipered, callipered
-    calipering, callipering
-    calipers, callipers
-    calisthenic, callisthenic
-    calisthenics, callisthenics
-    calk's, caulk's
-    calk, caulk
-    calked, caulked
-    calking, caulking
-    calks, caulks
-    Callirrhoe's, Callirrhoae's
-    Callirrhoe, Callirrhoae
-    calodemon, calodaemon
-    Calvinize's, Calvinise's
-    Calvinize, Calvinise
-    Calvinizes, Calvinises
-    camisades, camisadoes
-    camize, camise
-    Canadianization's, Canadianisation's
-    Canadianization, Canadianisation
-    Canadianizations, Canadianisations
-    Canadianize's, Canadianise's
-    Canadianize, Canadianise
-    Canadianizes, Canadianises
-    canaled, canalled
-    canaler, canaller
-    canalers, canallers
-    canaling, canalling
-    canalization's, canalisation's
-    canalization, canalisation
-    canalizations, canalisations
-    canalize, canalise
-    canalized, canalised
-    canalizes, canalises
-    canalizing, canalising
-    Cananean's, Cananaean's
-    Cananean, Cananaean
-    cancelable, cancellable
-    cancelate, cancellate
-    cancelated, cancellated
-    canceled, cancelled
-    canceler's, canceller's
-    canceler, canceller
-    cancelers, cancellers
-    canceling, cancelling
-    cancellation, cancelation
-    cancelous, cancellous
-    candor's, candour's
-    candor, candour
-    candors, candours
-    canephore, canephorae
-    canephore, canephoroe
-    canisterization, canisterisation
-    canisterizations, canisterisations
-    canisterize, canisterise
-    canisterized, canisterised
-    canisterizes, canisterises
-    canisterizing, canisterising
-    cannibalization's, cannibalisation's
-    cannibalization, cannibalisation
-    cannibalizations, cannibalisations
-    cannibalize, cannibalise
-    cannibalized, cannibalised
-    cannibalizes, cannibalises
-    cannibalizing, cannibalising
-    canonicalization, canonicalisation
-    canonicalize, canonicalise
-    canonicalized, canonicalised
-    canonicalizes, canonicalises
-    canonicalizing, canonicalising
-    canonization's, canonisation's
-    canonization, canonisation
-    canonizations, canonisations
-    canonize, canonise
-    canonized, canonised
-    canonizer's, canoniser's
-    canonizer, canoniser
-    canonizers, canonisers
-    canonizes, canonises
-    canonizing, canonising
-    cantaloupe's, cantaloup's
-    cantaloupe, cantaloup
-    cantaloupes, cantaloups
-    cantonization, cantonisation
-    cantonizations, cantonisations
-    cantonize, cantonise
-    cantonized, cantonised
-    cantonizes, cantonises
-    cantonizing, cantonising
-    capitalizable's, capitalisable's
-    capitalizable, capitalisable
-    capitalizabler, capitalisabler
-    capitalizables, capitalisables
-    capitalizablest, capitalisablest
-    capitalization's, capitalisation's
-    capitalization, capitalisation
-    capitalizations, capitalisations
-    capitalize, capitalise
-    capitalized, capitalised
-    capitalizer's, capitaliser's
-    capitalizer, capitaliser
-    capitalizers, capitalisers
-    capitalizes, capitalises
-    capitalizing, capitalising
-    caponization's, caponisation's
-    Caponization, Caponisation
-    caponization, caponisation
-    caponize, caponise
-    caponized, caponised
-    caponizer's, caponiser's
-    caponizer, caponiser
-    caponizes, caponises
-    caponizing, caponising
-    capsulization, capsulisation
-    capsulize, capsulise
-    capsulized, capsulised
-    capsulizes, capsulises
-    capsulizing, capsulising
-    caracoled, caracolled
-    caracoling, caracolling
-    caramelization's, caramelisation's
-    caramelization, caramelisation
-    caramelizations, caramelisations
-    caramelize, caramelise
-    caramelized, caramelised
-    caramelizes, caramelises
-    caramelizing, caramelising
-    caravansarais, caravansarai
-    caravansary's, caravanserai's
-    caravansary, caravanserai
-    carbolization, carbolisation
-    carbolize, carbolise
-    carbolized, carbolised
-    carbolizes, carbolises
-    carbolizing, carbolising
-    carbonades, carbonadoes
-    carbonatization's, carbonatisation's
-    carbonatization, carbonatisation
-    carbonatizations, carbonatisations
-    carbonizable's, carbonisable's
-    carbonizable, carbonisable
-    carbonizabler, carbonisabler
-    carbonizables, carbonisables
-    carbonizablest, carbonisablest
-    carbonization's, carbonisation's
-    carbonization, carbonisation
-    carbonizations, carbonisations
-    carbonize, carbonise
-    carbonized, carbonised
-    carbonizer's, carboniser's
-    carbonizer, carboniser
-    carbonizers, carbonisers
-    carbonizes, carbonises
-    carbonizing, carbonising
-    carburettor's, carburetter's
-    carburettor, carburetter
-    carburettors, carburetters
-    carburization's, carburisation's
-    carburization, carburisation
-    carburizations, carburisations
-    carburize, carburise
-    carburized, carburised
-    carburizer's, carburiser's
-    carburizer, carburiser
-    carburizes, carburises
-    carburizing, carburising
-    cardie, cardiae
-    cardueline, carduelinae
-    carnalize, carnalise
-    carnalized, carnalised
-    carnalizes, carnalises
-    carnalizing, carnalising
-    carney's, carnie's
-    carney, carnie
-    carnies, carneys
-    caroled, carolled
-    caroler's, caroller's
-    caroler, caroller
-    carolers, carollers
-    caroling, carolling
-    carotinemia, carotinaemia
-    carousel's, carrousel's
-    carousel, carrousel
-    carousels, carrousels
-    cartelization's, cartelisation's
-    cartelization, cartelisation
-    cartelizations, cartelisations
-    cartelize, cartelise
-    cartelized, cartelised
-    cartelizes, cartelises
-    cartelizing, cartelising
-    caster's, castor's
-    caster's, castor's
-    caster, castor
-    caster, castor
-    casters, castors
-    casters, castors
-    castorized's, castorised's
-    castorized, castorised
-    castorizeds, castoriseds
-    casualization, casualisation
-    casualizations, casualisations
-    casualize, casualise
-    casualized, casualised
-    casualizes, casualises
-    casualizing, casualising
-    catabolize, catabolise
-    catalog's, catalogue's
-    catalog, catalogue
-    cataloged, catalogued
-    cataloger's, cataloguer's
-    cataloger, cataloguer
-    catalogers, cataloguers
-    cataloging, cataloguing
-    catalogs, catalogues
-    cataloguize, cataloguise
-    cataloguized, cataloguised
-    cataloguizes, cataloguises
-    cataloguizing, cataloguising
-    catalyze, catalyse
-    catalyzed, catalysed
-    catalyzer's, catalyser's
-    catalyzer, catalyser
-    catalyzers, catalysers
-    catalyzes, catalyses
-    catalyzing, catalysing
-    catechizable's, catechisable's
-    catechizable, catechisable
-    catechizabler, catechisabler
-    catechizables, catechisables
-    catechizablest, catechisablest
-    catechization's, catechisation's
-    catechization, catechisation
-    catechizations, catechisations
-    catechize, catechise
-    catechized, catechised
-    catechizer's, catechiser's
-    catechizer, catechiser
-    catechizers, catechisers
-    catechizes, catechises
-    catechizing, catechising
-    catechizings, catechisings
-    categorization's, categorisation's
-    categorization, categorisation
-    categorizations, categorisations
-    categorize, categorise
-    categorized, categorised
-    categorizer, categoriser
-    categorizers, categorisers
-    categorizes, categorises
-    categorizing, categorising
-    catharize, catharise
-    catharized, catharised
-    catharizes, catharises
-    catharizing, catharising
-    catheterization's, catheterisation's
-    catheterization, catheterisation
-    catheterizations, catheterisations
-    catheterize, catheterise
-    catheterized, catheterised
-    catheterizes, catheterises
-    catheterizing, catheterising
-    catholicization's, catholicisation's
-    Catholicization, Catholicisation
-    catholicization, catholicisation
-    catholicizations, catholicisations
-    catholicize, catholicise
-    Catholicized, Catholicised
-    catholicized, catholicised
-    catholicizer's, catholiciser's
-    catholicizer, catholiciser
-    catholicizers, catholicisers
-    catholicizes, catholicises
-    Catholicizing, Catholicising
-    catholicizing, catholicising
-    catsup's, catchup's
-    catsup, catchup
-    catsups, catchups
-    cauldron's, caldron's
-    cauldron, caldron
-    cauldrons, caldrons
-    caulk, calk
-    caulked, calked
-    caulking, calking
-    caulks, calks
-    causticization's, causticisation's
-    causticization, causticisation
-    causticizations, causticisations
-    causticize, causticise
-    causticizer, causticiser
-    causticizers, causticisers
-    causticizes, causticises
-    cauterization's, cauterisation's
-    cauterization, cauterisation
-    cauterizations, cauterisations
-    cauterize, cauterise
-    cauterized, cauterised
-    cauterizes, cauterises
-    cauterizing, cauterising
-    caviar's, caviare's
-    caviar, caviare
-    caviars, caviares
-    cavilation, cavillation
-    caviled, cavilled
-    caviler's, caviller's
-    caviler, caviller
-    cavilers, cavillers
-    caviling, cavilling
-    cavilings, cavillings
-    ce, coe
-    cecally, caecally
-    cecitis, caecitis
-    cecitises, caecitises
-    cecity, caecity
-    cecostomy, caecostomy
-    cecotomy, caecotomy
-    Celastraceae's, Coelastraceae's
-    Celastraceae, Coelastraceae
-    celastraceous, coelastraceous
-    celestialize, celestialise
-    celestializes, celestialises
-    celestine, coelestine
-    celiac, coeliac
-    celiacs, coeliacs
-    celialgia, coelialgia
-    celiomyalgia, coeliomyalgia
-    celiorrhea, coeliorrhea
-    celioscopy, coelioscopy
-    celiotomy, coeliotomy
-    celom's, coelom's
-    celom, coelom
-    celoma, coeloma
-    celomata, coelomata
-    celoscope's, coeloscope's
-    celoscope, coeloscope
-    Celticize's, Celticise's
-    Celticize, Celticise
-    Celticizes, Celticises
-    cenacle's, coenacle's
-    cenacle, coenacle
-    cenaculum, coenaculum
-    cenesthesia's, coenesthesia's
-    cenesthesia, coenesthesia
-    cenesthesias, coenesthesias
-    cenesthesis, coenesthesis
-    Cenis's, Caenis's
-    Cenis, Caenis
-    cenobe, coenobe
-    cenobite's, coenobite's
-    cenobite, coenobite
-    cenobites, coenobites
-    cenobitic, coenobitic
-    cenobitical, coenobitical
-    cenobitism's, coenobitism's
-    cenobitism, coenobitism
-    cenobium, coenobium
-    cenoby, coenoby
-    cenogenetic, caenogenetic
-    cenogenetic, coenogenetic
-    cenogenetically, caenogenetically
-    cenosite, coenosite
-    cenospecies, coenospecies
-    cenospecific, coenospecific
-    cenospecifically, coenospecifically
-    cenozoic, caenozoic
-    center's, centre's
-    center, centre
-    centerable's, centreable's
-    centerable, centreable
-    centerables, centreables
-    centerboard's, centreboard's
-    centerboard, centreboard
-    centerboards, centreboards
-    centered, centred
-    centerer, centrer
-    centerers, centrers
-    centerfold's, centrefold's
-    centerfold, centrefold
-    centerfolds, centrefolds
-    centering's, centring's
-    centering, centring
-    centerings, centrings
-    centerless, centreless
-    centerlesser, centrelesser
-    centerlessest, centrelessest
-    centerline's, centreline's
-    centerline, centreline
-    centerlines, centrelines
-    centermost, centremost
-    centerpiece's, centrepiece's
-    centerpiece, centrepiece
-    centerpieces, centrepieces
-    centers, centres
-    Centerville's, Centreville's
-    Centerville, Centreville
-    centigram's, centigramme's
-    centigram, centigramme
-    centigrams, centigrammes
-    centiliter's, centilitre's
-    centiliter, centilitre
-    centiliters, centilitres
-    centimeter's, centimetre's
-    centimeter, centimetre
-    centimeters, centimetres
-    centralization's, centralisation's
-    centralization, centralisation
-    centralizations, centralisations
-    centralize, centralise
-    centralized, centralised
-    centralizer's, centraliser's
-    centralizer, centraliser
-    centralizers, centralisers
-    centralizes, centralises
-    centralizing, centralising
-    centrifugalization's, centrifugalisation's
-    centrifugalization, centrifugalisation
-    centrifugalizations, centrifugalisations
-    centrifugalize, centrifugalise
-    centrifugalized, centrifugalised
-    centrifugalizes, centrifugalises
-    centrifugalizing, centrifugalising
-    cephalization's, cephalisation's
-    cephalization, cephalisation
-    cephalizations, cephalisations
-    cer, cre
-    cera, crea
-    cerat, creat
-    ceratin, creatin
-    ceratins, creatins
-    cere's, cree's
-    cere, cree
-    cerebralization's, cerebralisation's
-    cerebralization, cerebralisation
-    cerebralizations, cerebralisations
-    cerebralize, cerebralise
-    cerebralizes, cerebralises
-    ceremonialize, ceremonialise
-    ceremonializes, ceremonialises
-    ceres, crees
-    cerolite, creolite
-    cerule, caerule
-    ceruleolactite, coeruleolactite
-    cesar, caesar
-    Cesaria's, Caesaria's
-    Cesaria, Caesaria
-    cesious, caesious
-    cesium's, caesium's
-    cesium, caesium
-    cesiums, caesiums
-    cespitose, caespitose
-    cespitosely, caespitosely
-    cestus, caestus
-    cestuses, caestuses
-    cesural, caesural
-    cetus, coetus
-    chaces, chacoes
-    chalaze, chalazae
-    Chaldeans, Chaldaeans
-    chameleonize, chameleonise
-    chameleonizes, chameleonises
-    Chamizal's, Chamisal's
-    Chamizal, Chamisal
-    chamomile's, camomile's
-    chamomile, camomile
-    chamomiles, camomiles
-    championize, championise
-    championizes, championises
-    channeled, channelled
-    channeler's, channeller's
-    channeler, channeller
-    channelers, channellers
-    channeling, channelling
-    channelization's, channelisation's
-    channelization, channelisation
-    channelizations, channelisations
-    channelize, channelise
-    channelized, channelised
-    channelizes, channelises
-    channelizing, channelising
-    chaperon's, chaperone's
-    chaperon, chaperone
-    chaperons, chaperones
-    chaptalization, chaptalisation
-    chaptalizations, chaptalisations
-    chaptalize, chaptalise
-    chaptalized, chaptalised
-    chaptalizes, chaptalises
-    chaptalizing, chaptalising
-    characterizable's, characterisable's
-    characterizable, characterisable
-    characterizabler, characterisabler
-    characterizables, characterisables
-    characterizablest, characterisablest
-    characterization's, characterisation's
-    characterization, characterisation
-    characterizations, characterisations
-    characterize, characterise
-    characterized, characterised
-    characterizer's, characteriser's
-    characterizer, characteriser
-    characterizers, characterisers
-    characterizes, characterises
-    characterizing, characterising
-    charer, charre
-    chattelization's, chattelisation's
-    chattelization, chattelisation
-    chattelizations, chattelisations
-    chattelize, chattelise
-    chattelizes, chattelises
-    checkbook's, chequebook's
-    checkbook, chequebook
-    checkbooks, chequebooks
-    checkerboard's, chequerboard's
-    checkerboard, chequerboard
-    checkerboards, chequerboards
-    cheerfulize, cheerfulise
-    cheerfulizes, cheerfulises
-    cheerly, cherely
-    chelicere, chelicerae
-    chemicalization's, chemicalisation's
-    chemicalization, chemicalisation
-    chemicalizations, chemicalisations
-    chemicalize, chemicalise
-    chemicalizes, chemicalises
-    chenix, choenix
-    chenixes, choenixes
-    chetopod, chaetopod
-    chiffer, chiffre
-    childer, childre
-    chile's, chilli's
-    chile, chilli
-    chilis, chillies
-    chimera's, chimaera's
-    chimera, chimaera
-    chimeras, chimaeras
-    chimerid, chimaerid
-    chimerids, chimaerids
-    chimerism, chimaerism
-    chimerisms, chimaerisms
-    chiseled, chiselled
-    chiseler's, chiseller's
-    chiseler, chiseller
-    chiselers, chisellers
-    chiseling, chiselling
-    chitlins's, chitlings's
-    chitlins, chitlings
-    chivied, chivvied
-    chivies, chivvies
-    chivy, chivvy
-    chivying, chivvying
-    chloranemia, chloranaemia
-    chloremia, chloraemia
-    chloridize, chloridise
-    chloridized, chloridised
-    chloridizes, chloridises
-    chloridizing, chloridising
-    chlorinize, chlorinise
-    chlorinized, chlorinised
-    chlorinizes, chlorinises
-    chlorinizing, chlorinising
-    chloritization, chloritisation
-    chloritizations, chloritisations
-    chloroanemia, chloroanaemia
-    chloroformization's, chloroformisation's
-    chloroformization, chloroformisation
-    chloroformizations, chloroformisations
-    chloroformize, chloroformise
-    chloroformizes, chloroformises
-    chlorophyll's, chlorophyl's
-    chlorophyll, chlorophyl
-    chlorophylls, chlorophyls
-    chocoholic's, chocaholic's
-    chocoholic, chocaholic
-    chocoholics, chocaholics
-    chocolaty, chocolatey
-    Choephori's, Choaephori's
-    Choephori, Choaephori
-    cholemia, cholaemia
-    cholemias, cholaemias
-    cholophein, cholophaein
-    choosy, choosey
-    chorization's, chorisation's
-    chorization, chorisation
-    chorizations, chorisations
-    Christianization's, Christianisation's
-    Christianization, Christianisation
-    christianization, christianisation
-    Christianizations, Christianisations
-    christianizations, christianisations
-    Christianize, Christianise
-    christianize, christianise
-    Christianized, Christianised
-    christianized, christianised
-    Christianizer's, Christianiser's
-    Christianizer, Christianiser
-    christianizer, christianiser
-    Christianizers, Christianisers
-    christianizers, christianisers
-    Christianizes, Christianises
-    christianizes, christianises
-    Christianizing, Christianising
-    christianizing, christianising
-    chromatize, chromatise
-    chromatizes, chromatises
-    chromesthesia, chromaesthesia
-    chromicize, chromicise
-    chromicizes, chromicises
-    chromize, chromise
-    chromized, chromised
-    chromizes, chromises
-    chromizing, chromising
-    chronologize, chronologise
-    chronologized, chronologised
-    chronologizes, chronologises
-    chronologizing, chronologising
-    chutzpa's, hutzpah's
-    chutzpa, hutzpah
-    chutzpas, hutzpahes
-    cicatrices, cicatrixes
-    cicatricule, cicatriculae
-    cicatrix's, cicatrice's
-    cicatrix, cicatrice
-    cicatrizant, cicatrisant
-    cicatrizate, cicatrisate
-    cicatrization's, cicatrisation's
-    cicatrization, cicatrisation
-    cicatrizations, cicatrisations
-    cicatrize, cicatrise
-    cicatrized, cicatrised
-    cicatrizer's, cicatriser's
-    cicatrizer, cicatriser
-    cicatrizes, cicatrises
-    cicatrizing, cicatrising
-    Ciceronianize's, Ciceronianise's
-    Ciceronianize, Ciceronianise
-    Ciceronianizes, Ciceronianises
-    cigarette's, cigaret's
-    cigarette, cigaret
-    cigarettes, cigarets
-    cimicide, cimicidae
-    cinchonization's, cinchonisation's
-    cinchonization, cinchonisation
-    cinchonizations, cinchonisations
-    cinchonize, cinchonise
-    cinchonized, cinchonised
-    cinchonizes, cinchonises
-    cinchonizing, cinchonising
-    cinematize, cinematise
-    cinter, cintre
-    cipher's, cypher's
-    cipher, cypher
-    ciphered, cyphered
-    ciphering, cyphering
-    ciphers, cyphers
-    Circean, Circaean
-    circularization's, circularisation's
-    circularization, circularisation
-    circularizations, circularisations
-    circularize, circularise
-    circularized, circularised
-    circularizer's, circulariser's
-    circularizer, circulariser
-    circularizers, circularisers
-    circularizes, circularises
-    circularizing, circularising
-    circumcenter, circumcentre
-    circumcenters, circumcentres
-    circumesophagal, circumoesophagal
-    cithern, cithren
-    citherns, cithrens
-    citizenize, citizenise
-    citizenized, citizenised
-    citizenizes, citizenises
-    citizenizing, citizenising
-    civilianization, civilianisation
-    civilianizations, civilianisations
-    civilianize, civilianise
-    civilianized, civilianised
-    civilianizes, civilianises
-    civilianizing, civilianising
-    civilizable's, civilisable's
-    civilizable, civilisable
-    civilizabler, civilisabler
-    civilizables, civilisables
-    civilizablest, civilisablest
-    civilization's, civilisation's
-    civilization, civilisation
-    civilizational's, civilisational's
-    civilizational, civilisational
-    civilizationaler, civilisationaler
-    civilizationalest, civilisationalest
-    civilizationals, civilisationals
-    civilizations, civilisations
-    civilizatory, civilisatory
-    civilize, civilise
-    civilized, civilised
-    civilizedness's, civilisedness's
-    civilizedness, civilisedness
-    civilizednesses, civilisednesses
-    civilizer's, civiliser's
-    civilizer, civiliser
-    civilizers, civilisers
-    civilizes, civilises
-    civilizing, civilising
-    civvies, civies
-    civvy's, civie's
-    civvy, civie
-    cize, cise
-    clamor's, clamour's
-    clamor, clamour
-    clamored, clamoured
-    clamorer's, clamourer's
-    clamorer, clamourer
-    clamorers, clamourers
-    clamoring, clamouring
-    clamorist's, clamourist's
-    clamorist, clamourist
-    clamors, clamours
-    clamorsome, clamoursome
-    clangor's, clangour's
-    clangor, clangour
-    clangored, clangoured
-    clangoring, clangouring
-    clangors, clangours
-    clares, claroes
-    clarinetist's, clarinettist's
-    clarinetist, clarinettist
-    clarinetists, clarinettists
-    classicalize, classicalise
-    classicalizes, classicalises
-    classicization, classicisation
-    classicize, classicise
-    classicized, classicised
-    classicizes, classicises
-    classicizing, classicising
-    clausule, clausulae
-    clericalize, clericalise
-    clericalizes, clericalises
-    Clete's, Cloete's
-    Clete, Cloete
-    climatize, climatise
-    climatized, climatised
-    climatizes, climatises
-    climatizing, climatising
-    clower, clowre
-    Clytie's, Clytiae's
-    Clytie, Clytiae
-    coalize, coalise
-    coalized, coalised
-    coalizer, coaliser
-    coalizers, coalisers
-    coalizes, coalises
-    coalizing, coalising
-    cocaine's, cocain's
-    cocaine, cocain
-    cocainization's, cocainisation's
-    cocainization, cocainisation
-    cocainizations, cocainisations
-    cocainize, cocainise
-    cocainized, cocainised
-    cocainizes, cocainises
-    cocainizing, cocainising
-    coconut's, cocoanut's
-    coconut, cocoanut
-    coconuts, cocoanuts
-    cocuiza, cocuisa
-    Coe's, Cooe's
-    Coe, Cooe
-    coeducationalize, coeducationalise
-    coeducationalizes, coeducationalises
-    coeloms, coelomata
-    coenamor, coenamour
-    coenamored, coenamoured
-    coenamoring, coenamouring
-    coenamorment, coenamourment
-    coenamors, coenamours
-    coequalize, coequalise
-    coequalizes, coequalises
-    cognizability's, cognisability's
-    cognizability, cognisability
-    cognizable, cognisable
-    cognizableness's, cognisableness's
-    cognizableness, cognisableness
-    cognizabler, cognisabler
-    cognizablest, cognisablest
-    cognizablier, cognisablier
-    cognizabliest, cognisabliest
-    cognizably, cognisably
-    cognizance's, cognisance's
-    cognizance, cognisance
-    cognizances, cognisances
-    cognizant, cognisant
-    cognizanter, cognisanter
-    cognizantest, cognisantest
-    cognize, cognise
-    cognized, cognised
-    cognizer's, cogniser's
-    cognizer, cogniser
-    cognizers, cognisers
-    cognizes, cognises
-    cognizing, cognising
-    colander's, cullender's
-    colander, cullender
-    colanders, cullenders
-    collateralize, collateralise
-    collectibilities, collectabilities
-    collectibility's, collectability's
-    collectibility, collectability
-    collectible's, collectable's
-    collectible, collectable
-    collectibles, collectables
-    collectivization's, collectivisation's
-    collectivization, collectivisation
-    collectivizations, collectivisations
-    collectivize, collectivise
-    collectivized, collectivised
-    collectivizes, collectivises
-    collectivizing, collectivising
-    colloquialize, colloquialise
-    colloquializes, colloquialises
-    colloquize, colloquise
-    colloquized, colloquised
-    colloquizes, colloquises
-    colloquizing, colloquising
-    colonialize, colonialise
-    colonialized, colonialised
-    colonializes, colonialises
-    colonializing, colonialising
-    colonizabilities, colonisabilities
-    colonizability's, colonisability's
-    colonizability, colonisability
-    colonizable's, colonisable's
-    colonizable, colonisable
-    colonizabler, colonisabler
-    colonizables, colonisables
-    colonizablest, colonisablest
-    colonization's, colonisation's
-    colonization, colonisation
-    colonizationist's, colonisationist's
-    colonizationist, colonisationist
-    colonizationists, colonisationists
-    colonizations, colonisations
-    colonize, colonise
-    colonized, colonised
-    colonizer's, coloniser's
-    colonizer, coloniser
-    colonizers, colonisers
-    colonizes, colonises
-    colonizing, colonising
-    color's, colour's
-    color, colour
-    colorabilities, colourabilities
-    colorability's, colourability's
-    colorability, colourability
-    colorable's, colourable's
-    colorable, colourable
-    colorableness's, colourableness's
-    colorableness, colourableness
-    colorablenesses, colourablenesses
-    colorabler, colourabler
-    colorables, colourables
-    colorablest, colourablest
-    colorablier, colourablier
-    colorablies, colourablies
-    colorabliest, colourabliest
-    colorably, colourably
-    coloradoite's, colouradoite's
-    coloradoite, colouradoite
-    colorama, colourama
-    colorant's, colourant's
-    colorant, colourant
-    colorants, colourants
-    colorate, colourate
-    coloration's, colouration's
-    coloration, colouration
-    colorational, colourational
-    colorationaler, colourationaler
-    colorationalest, colourationalest
-    colorationallier, colourationallier
-    colorationalliest, colourationalliest
-    colorationally, colourationally
-    colorations, colourations
-    colorative, colourative
-    colorbearer's, colourbearer's
-    colorbearer, colourbearer
-    colorblind, colourblind
-    colorblindness's, colourblindness's
-    colorblindness, colourblindness
-    colorblindnesses, colourblindnesses
-    colorbred, colourbred
-    colorbreed, colourbreed
-    colorbreeding, colourbreeding
-    colorbreeds, colourbreeds
-    colorcast's, colourcast's
-    colorcast, colourcast
-    colorcasted, colourcasted
-    colorcaster, colourcaster
-    colorcasters, colourcasters
-    colorcasting, colourcasting
-    colorcasts, colourcasts
-    colorectal, colourectal
-    colorectitis, colourectitis
-    colorectostomy, colourectostomy
-    colored's, coloured's
-    colored, coloured
-    coloreds, coloureds
-    colorer's, colourer's
-    colorer, colourer
-    colorers, colourers
-    colorfast, colourfast
-    colorfastness's, colourfastness's
-    colorfastness, colourfastness
-    colorfastnesses, colourfastnesses
-    colorful, colourful
-    colorfuler, colourfuler
-    colorfulest, colourfulest
-    colorfullier, colourfullier
-    colorfulliest, colourfulliest
-    colorfully, colourfully
-    colorfulness's, colourfulness's
-    colorfulness, colourfulness
-    colorfulnesses, colourfulnesses
-    colorific's, colourific's
-    colorific, colourific
-    colorifics, colourifics
-    colorimeter's, colourimeter's
-    colorimeter, colourimeter
-    colorimeters, colourimeters
-    colorimetric, colourimetric
-    colorimetrical, colourimetrical
-    colorimetrically, colourimetrically
-    colorimetrics, colourimetrics
-    colorimetries, colourimetries
-    colorimetrist's, colourimetrist's
-    colorimetrist, colourimetrist
-    colorimetry, colourimetry
-    coloring's, colouring's
-    coloring, colouring
-    colorings, colourings
-    colorism, colourism
-    colorisms, colourisms
-    colorist's, colourist's
-    colorist, colourist
-    coloristic, colouristic
-    coloristically, colouristically
-    coloristicer, colouristicer
-    coloristicest, colouristicest
-    coloristics, colouristics
-    colorists, colourists
-    colorless, colourless
-    colorlesser, colourlesser
-    colorlessest, colourlessest
-    colorlesslier, colourlesslier
-    colorlessliest, colourlessliest
-    colorlessly, colourlessly
-    colorlessness's, colourlessness's
-    colorlessness, colourlessness
-    colorlessnesses, colourlessnesses
-    colormaker, colourmaker
-    colormaking, colourmaking
-    colorman's, colourman's
-    colorman, colourman
-    colormap's, colourmap's
-    colormap, colourmap
-    colormaps, colourmaps
-    colormen, colourmen
-    coloroto, colouroto
-    colorpoint, colourpoint
-    colorpoints, colourpoints
-    colorrest, colourest
-    colorrhaphy, colourrhaphy
-    colors, colours
-    colortype, colourtype
-    colorway, colourway
-    colorways, colourways
-    colory, coloury
-    colourisation's, colourization's
-    colourisation, colourization
-    colourisations, colourizations
-    colourise, colourize
-    colourised, colourized
-    colourises, colourizes
-    colourising, colourizing
-    columnization's, columnisation's
-    columnization, columnisation
-    columnizations, columnisations
-    columnize, columnise
-    columnized, columnised
-    columnizes, columnises
-    columnizing, columnising
-    comedia, comoedia
-    commercialization's, commercialisation's
-    commercialization, commercialisation
-    commercializations, commercialisations
-    commercialize, commercialise
-    commercialized, commercialised
-    commercializes, commercialises
-    commercializing, commercialising
-    commonize, commonise
-    commonizes, commonises
-    communalization's, communalisation's
-    communalization, communalisation
-    communalizations, communalisations
-    communalize, communalise
-    communalized, communalised
-    communalizer's, communaliser's
-    communalizer, communaliser
-    communalizers, communalisers
-    communalizes, communalises
-    communalizing, communalising
-    communization's, communisation's
-    communization, communisation
-    communizations, communisations
-    communize, communise
-    communized, communised
-    communizes, communises
-    communizing, communising
-    companionize, companionise
-    companionizes, companionises
-    compartmentalization's, compartmentalisation's
-    compartmentalization, compartmentalisation
-    compartmentalizations, compartmentalisations
-    compartmentalize, compartmentalise
-    compartmentalized, compartmentalised
-    compartmentalizes, compartmentalises
-    compartmentalizing, compartmentalising
-    compartmentize, compartmentise
-    compartmentizes, compartmentises
-    comper, compoer
-    complementizer's, complementiser's
-    complementizer, complementiser
-    Composite, Compositae
-    comprehensivization, comprehensivisation
-    comprehensivizations, comprehensivisations
-    comprehensivize, comprehensivise
-    comprehensivized, comprehensivised
-    comprehensivizes, comprehensivises
-    comprehensivizing, comprehensivising
-    comprizable, comprisable
-    comprizal's, comprisal's
-    comprizal, comprisal
-    computerizable, computerisable
-    computerization's, computerisation's
-    computerization, computerisation
-    computerizations, computerisations
-    computerize, computerise
-    computerized, computerised
-    computerizes, computerises
-    computerizing, computerising
-    concenter, concentre
-    concentered, concentred
-    concentering, concentring
-    concenters, concentres
-    conceptualization's, conceptualisation's
-    conceptualization, conceptualisation
-    conceptualizations, conceptualisations
-    conceptualize, conceptualise
-    conceptualized, conceptualised
-    conceptualizer, conceptualiser
-    conceptualizes, conceptualises
-    conceptualizing, conceptualising
-    concertist, concretist
-    concertize, concertise
-    concertized, concertised
-    concertizer's, concertiser's
-    concertizer, concertiser
-    concertizers, concertisers
-    concertizes, concertises
-    concertizing, concertising
-    conche, conchae
-    concolor, concolour
-    concolorous, concolourous
-    concretization's, concretisation's
-    concretization, concretisation
-    concretizations, concretisations
-    concretize, concretise
-    concretized, concretised
-    concretizes, concretises
-    concretizing, concretising
-    conditionalize, conditionalise
-    conditionalizes, conditionalises
-    coneys, conies
-    confederatize, confederatise
-    confederatizes, confederatises
-    congenialize, congenialise
-    congenializes, congenialises
-    conges, congoes
-    congregationalize, congregationalise
-    congregationalizes, congregationalises
-    conjurer's, conjuror's
-    conjurer, conjuror
-    conjurers, conjurors
-    connectable, connectible
-    connection's, connexion's
-    connection, connexion
-    connections, connexions
-    connector's, connecter's
-    connector, connecter
-    connectors, connecters
-    conservatize, conservatise
-    conservatized, conservatised
-    conservatizes, conservatises
-    conservatizing, conservatising
-    consonantize, consonantise
-    consonantized, consonantised
-    consonantizes, consonantises
-    consonantizing, consonantising
-    constitutionalization's, constitutionalisation's
-    constitutionalization, constitutionalisation
-    constitutionalizations, constitutionalisations
-    constitutionalize, constitutionalise
-    constitutionalized, constitutionalised
-    constitutionalizes, constitutionalises
-    constitutionalizing, constitutionalising
-    containerization's, containerisation's
-    containerization, containerisation
-    containerizations, containerisations
-    containerize, containerise
-    containerized, containerised
-    containerizes, containerises
-    containerizing, containerising
-    contemporization, contemporisation
-    contemporize, contemporise
-    contemporized, contemporised
-    contemporizes, contemporises
-    contemporizing, contemporising
-    contextualization, contextualisation
-    contextualizations, contextualisations
-    contextualize, contextualise
-    contextualized, contextualised
-    contextualizes, contextualises
-    contextualizing, contextualising
-    Continentalize, Continentalise
-    Continentalizes, Continentalises
-    controversialize, controversialise
-    controversializes, controversialises
-    conundrumize, conundrumise
-    conundrumizes, conundrumises
-    convener's, convenor's
-    convener, convenor
-    conveners, convenors
-    conventionalization's, conventionalisation's
-    conventionalization, conventionalisation
-    conventionalizations, conventionalisations
-    conventionalize, conventionalise
-    conventionalized, conventionalised
-    conventionalizes, conventionalises
-    conventionalizing, conventionalising
-    conventionize, conventionise
-    conventionizes, conventionises
-    conversationize, conversationise
-    conversationizes, conversationises
-    converter's, convertor's
-    converter's, convertor's
-    converter, convertor
-    converter, convertor
-    converters, convertors
-    converters, convertors
-    conveyor's, conveyer's
-    conveyor, conveyer
-    conveyorize, conveyorise
-    conveyorized, conveyorised
-    conveyorizes, conveyorises
-    conveyorizing, conveyorising
-    conveyors, conveyers
-    convivialize, convivialise
-    convivializes, convivialises
-    cony's, coney's
-    cony, coney
-    cookie's, cooky's
-    cookie, cooky
-    copolymerization's, copolymerisation's
-    copolymerization, copolymerisation
-    copolymerizations, copolymerisations
-    copolymerize, copolymerise
-    copolymerized, copolymerised
-    copolymerizes, copolymerises
-    copolymerizing, copolymerising
-    copperization's, copperisation's
-    copperization, copperisation
-    copperizations, copperisations
-    copperize, copperise
-    copperizes, copperises
-    copremia, copraemia
-    copremic, copraemic
-    coraled, coralled
-    coranto, couranto
-    corantoes, courantoes
-    corantos, courantos
-    corbe, courbe
-    corbed, courbed
-    corbeled, corbelled
-    corbeling's, corbelling's
-    corbeling, corbelling
-    corbelings, corbellings
-    cordialize, cordialise
-    cordialized, cordialised
-    cordializes, cordialises
-    cordializing, cordialising
-    corge, courge
-    Corinthianize's, Corinthianise's
-    Corinthianize, Corinthianise
-    corinthianize, corinthianise
-    corinthianized, corinthianised
-    Corinthianizes, Corinthianises
-    corinthianizes, corinthianises
-    corinthianizing, corinthianising
-    corporealization's, corporealisation's
-    corporealization, corporealisation
-    corporealizations, corporealisations
-    corporealize, corporealise
-    corporealized, corporealised
-    corporealizes, corporealises
-    corporealizing, corporealising
-    corsy, coursy
-    cortage, courtage
-    cortin, courtin
-    cortine, cortinae
-    corve, corvae
-    coryphe, coryphae
-    coryphes, coryphaes
-    cosmeticize, cosmeticise
-    cosmeticized, cosmeticised
-    cosmeticizes, cosmeticises
-    cosmeticizing, cosmeticising
-    cosmopolitanization's, cosmopolitanisation's
-    cosmopolitanization, cosmopolitanisation
-    cosmopolitanizations, cosmopolitanisations
-    cosmopolitanize, cosmopolitanise
-    cosmopolitanized, cosmopolitanised
-    cosmopolitanizes, cosmopolitanises
-    cosmopolitanizing, cosmopolitanising
-    cosplendor, cosplendour
-    coste, costae
-    costumier, costumire
-    cottar's, cotter's
-    cottar, cotter
-    cottars, cotters
-    cotte, cottae
-    cottonization's, cottonisation's
-    cottonization, cottonisation
-    cottonizations, cottonisations
-    cottonize, cottonise
-    cottonizes, cottonises
-    cotyle, cotylae
-    councilor's, councillor's
-    councilor, councillor
-    councilors, councillors
-    councilorship's, councillorship's
-    councilorship, councillorship
-    councilorships, councillorships
-    counseled, counselled
-    counselee, counsellee
-    counseling, counselling
-    counselor's, counsellor's
-    counselor, counsellor
-    counselors, counsellors
-    counselorship's, counsellorship's
-    counselorship, counsellorship
-    counselorships, counsellorships
-    countercolored, countercoloured
-    countor, countour
-    cozied, cosied
-    cozier, cosier
-    cozies, cosies
-    coziest, cosiest
-    cozily, cosily
-    coziness's, cosiness's
-    coziness, cosiness
-    cozy's, cosy's
-    cozy, cosy
-    cozying, cosying
-    craizey, craisey
-    crambes, cramboes
-    crawlerize, crawlerise
-    crawlerizes, crawlerises
-    creaturize, creaturise
-    creaturizes, creaturises
-    crenelate, crenellate
-    crenelated, crenellated
-    crenelater, crenellater
-    crenelates, crenellates
-    crenelatest, crenellatest
-    crenelating, crenellating
-    crenelation's, crenellation's
-    crenelation, crenellation
-    crenelations, crenellations
-    creneled, crenelled
-    creneling, crenelling
-    Creolization, Creolisation
-    creolization, creolisation
-    creolizations, creolisations
-    Creolize, Creolise
-    creolize, creolise
-    Creolized, Creolised
-    creolized, creolised
-    Creolizes, Creolises
-    creolizes, creolises
-    Creolizing, Creolising
-    creolizing, creolising
-    cretinization's, cretinisation's
-    cretinization, cretinisation
-    cretinizations, cretinisations
-    cretinize, cretinise
-    cretinized, cretinised
-    cretinizes, cretinises
-    cretinizing, cretinising
-    criminalization's, criminalisation's
-    criminalization, criminalisation
-    criminalizations, criminalisations
-    criminalize, criminalise
-    criminalized, criminalised
-    criminalizes, criminalises
-    criminalizing, criminalising
-    criticizable's, criticisable's
-    criticizable, criticisable
-    criticizabler, criticisabler
-    criticizables, criticisables
-    criticizablest, criticisablest
-    criticize, criticise
-    criticized, criticised
-    criticizer's, criticiser's
-    criticizer, criticiser
-    criticizers, criticisers
-    criticizes, criticises
-    criticizing, criticising
-    criticizinglier, criticisinglier
-    criticizinglies, criticisinglies
-    criticizingliest, criticisingliest
-    criticizingly, criticisingly
-    crofterization's, crofterisation's
-    crofterization, crofterisation
-    crofterizations, crofterisations
-    crofterize, crofterise
-    crofterizes, crofterises
-    crosier's, crozier's
-    crosier, crozier
-    crosiers, croziers
-    crueler, crueller
-    cruelest, cruellest
-    cruelize, cruelise
-    cruelizes, cruelises
-    cryesthesia, cryaesthesia
-    cryoanesthesia, cryoanaesthesia
-    cryptanalyzes, cryptanalyses
-    cryptesthesia, cryptaesthesia
-    cryptesthesias, cryptaesthesias
-    cryptesthetic, cryptaesthetic
-    crystalize, crystallise
-    crystalized, crystallised
-    crystalizes, crystallises
-    crystalizing, crystallising
-    crystallizabilities, crystallisabilities
-    crystallizability's, crystallisability's
-    crystallizability, crystallisability
-    crystallizable's, crystallisable's
-    crystallizable, crystallisable
-    crystallizabler, crystallisabler
-    crystallizables, crystallisables
-    crystallizablest, crystallisablest
-    crystallization's, crystallisation's
-    crystallization, crystallisation
-    crystallizations, crystallisations
-    crystallizer, crystalliser
-    crystallizers, crystallisers
-    Cubanize's, Cubanise's
-    Cubanize, Cubanise
-    Cubanizes, Cubanises
-    cuckoldize, cuckoldise
-    cuckoldized, cuckoldised
-    cuckoldizes, cuckoldises
-    cuckoldizing, cuckoldising
-    cudgeled, cudgelled
-    cudgeler's, cudgeller's
-    cudgeler, cudgeller
-    cudgelers, cudgellers
-    cudgeling, cudgelling
-    cudgelings, cudgellings
-    culicide, culicidae
-    culturization's, culturisation's
-    culturization, culturisation
-    culturizations, culturisations
-    culturize, culturise
-    culturizes, culturises
-    cupelation, cupellation
-    cupeled, cupelled
-    cupeler's, cupeller's
-    cupeler, cupeller
-    cupelers, cupellers
-    cupeling, cupelling
-    cupule, cupulae
-    curarize, curarise
-    curarized, curarised
-    curarizes, curarises
-    curarizing, curarising
-    curatize, curatise
-    curatizes, curatises
-    curricularization's, curricularisation's
-    curricularization, curricularisation
-    curricularizations, curricularisations
-    curricularize, curricularise
-    curricularizes, curricularises
-    curtsied, curtseyed
-    curtsies, curtseys
-    curtsy's, curtsey's
-    curtsy, curtsey
-    curtsying, curtseying
-    curvaceous, curvacious
-    customizable, customisable
-    customization's, customisation's
-    customization, customisation
-    customizations, customisations
-    customize, customise
-    customized, customised
-    customizer, customiser
-    customizers, customisers
-    customizes, customises
-    customizing, customising
-    cutesy, cutesie
-    cuticolor, cuticolour
-    cutinization's, cutinisation's
-    cutinization, cutinisation
-    cutinizations, cutinisations
-    cutinize, cutinise
-    cutinized, cutinised
-    cutinizes, cutinises
-    cutinizing, cutinising
-    cutization's, cutisation's
-    cutization, cutisation
-    cutizations, cutisations
-    cutlass's, cutlas's
-    cutlass, cutlas
-    cutlasses, cutlases
-    cuve, cuvae
-    Cyanee's, Cyaneae's
-    Cyanee, Cyaneae
-    cyanize, cyanise
-    cyanized, cyanised
-    cyanizes, cyanises
-    cyanizing, cyanising
-    cyanomethemoglobin, cyanomethaemoglobin
-    cyclization's, cyclisation's
-    cyclization, cyclisation
-    cyclizations, cyclisations
-    cyclize, cyclise
-    cyclized, cyclised
-    cyclizes, cyclises
-    cyclizing, cyclising
-    cyclopedia's, cyclopaedia's
-    cyclopedia, cyclopaedia
-    cyclopedias, cyclopaedias
-    cyclopedic, cyclopaedic
-    cyclopedically, cyclopaedically
-    cyclopedist's, cyclopaedist's
-    cyclopedist, cyclopaedist
-    cyme, cymae
-    Czechization's, Czechisation's
-    Czechization, Czechisation
-    Czechizations, Czechisations
-    d'oh's, doh's
-    d'oh, doh
-    d'ohs, dohs
-    danaide, danaidae
-    dandizette, dandisette
-    dandyize, dandyise
-    dandyizes, dandyises
-    dane, danae
-    Danization's, Danisation's
-    Danization, Danisation
-    Danizations, Danisations
-    Danize's, Danise's
-    Danize, Danise
-    Danizes, Danises
-    Darwinize's, Darwinise's
-    Darwinize, Darwinise
-    Darwinizes, Darwinises
-    dastardize, dastardise
-    dastardizes, dastardises
-    deaconize, deaconise
-    deaconizes, deaconises
-    deadrize, deadrise
-    dealcoholize, dealcoholise
-    dealcoholized, dealcoholised
-    dealcoholizes, dealcoholises
-    dealcoholizing, dealcoholising
-    deaminize, deaminise
-    deary's, dearie's
-    deary, dearie
-    decagram's, decagramme's
-    decagram, decagramme
-    decagrams, decagrammes
-    decaliter, decalitre
-    decaliter, decalitre's
-    decaliter, decalitres
-    decameter, decametre
-    decameter, decametre's
-    decameter, decametres
-    decapitalization, decapitalisation
-    decapitalizations, decapitalisations
-    decapitalize, decapitalise
-    decapitalized, decapitalised
-    decapitalizes, decapitalises
-    decapitalizing, decapitalising
-    decarbonization's, decarbonisation's
-    decarbonization, decarbonisation
-    decarbonizations, decarbonisations
-    decarbonize, decarbonise
-    decarbonized, decarbonised
-    decarbonizer's, decarboniser's
-    decarbonizer, decarboniser
-    decarbonizers, decarbonisers
-    decarbonizes, decarbonises
-    decarbonizing, decarbonising
-    decarburization's, decarburisation's
-    decarburization, decarburisation
-    decarburizations, decarburisations
-    decarburize, decarburise
-    decarburized, decarburised
-    decarburizes, decarburises
-    decarburizing, decarburising
-    decasualization's, decasualisation's
-    decasualization, decasualisation
-    decasualizations, decasualisations
-    decasualize, decasualise
-    decasualized, decasualised
-    decasualizing, decasualising
-    decenters, decentres
-    decentralization's, decentralisation's
-    decentralization, decentralisation
-    decentralizationist, decentralisationist
-    decentralizations, decentralisations
-    decentralize, decentralise
-    decentralized, decentralised
-    decentralizes, decentralises
-    decentralizing, decentralising
-    decerebrize, decerebrise
-    decerebrized, decerebrised
-    decerebrizes, decerebrises
-    decerebrizing, decerebrising
-    dechristianization, dechristianisation
-    dechristianizations, dechristianisations
-    dechristianize, dechristianise
-    dechristianized, dechristianised
-    dechristianizes, dechristianises
-    dechristianizing, dechristianising
-    decigram's, decigramme's
-    decigram, decigramme
-    decigrams, decigrammes
-    deciliter's, decilitre's
-    deciliter, decilitre
-    deciliters, decilitres
-    decimalization's, decimalisation's
-    decimalization, decimalisation
-    decimalizations, decimalisations
-    decimalize, decimalise
-    decimalized, decimalised
-    decimalizes, decimalises
-    decimalizing, decimalising
-    decimeter's, decimetre's
-    decimeter, decimetre
-    decimeters, decimetres
-    decivilize, decivilise
-    decivilized, decivilised
-    decivilizes, decivilises
-    decivilizing, decivilising
-    decolonization's, decolonisation's
-    decolonization, decolonisation
-    decolonizations, decolonisations
-    decolonize, decolonise
-    decolonized, decolonised
-    decolonizes, decolonises
-    decolonizing, decolonising
-    decolor, decolour
-    decolorant, decolourant
-    decolorants, decolourants
-    decolorate, decolourate
-    decolorated, decolourated
-    decolorates, decolourates
-    decoloration's, decolouration's
-    decoloration, decolouration
-    decolorations, decolourations
-    decolored, decoloured
-    decolorimeter, decolourimeter
-    decoloring, decolouring
-    decolors, decolours
-    decolourisation's, decolourization's
-    decolourisation, decolourization
-    decolourisations, decolourizations
-    decolourise, decolourize
-    decolourised, decolourized
-    decolouriser's, decolourizer's
-    decolouriser, decolourizer
-    decolourisers, decolourizers
-    decolourises, decolourizes
-    decolourising, decolourizing
-    decriminalization's, decriminalisation's
-    decriminalization, decriminalisation
-    decriminalizations, decriminalisations
-    decriminalize, decriminalise
-    decriminalized, decriminalised
-    decriminalizes, decriminalises
-    decriminalizing, decriminalising
-    dedal, daedal
-    dedalian, daedalian
-    dedramatize, dedramatise
-    dedramatized, dedramatised
-    dedramatizes, dedramatises
-    dedramatizing, dedramatising
-    deemphasization's, deemphasisation's
-    deemphasization, deemphasisation
-    deemphasize, deemphasise
-    deemphasized, deemphasised
-    deemphasizer, deemphasiser
-    deemphasizers, deemphasisers
-    deemphasizes, deemphasises
-    deemphasizing, deemphasising
-    deenergize, deenergise
-    deenergized, deenergised
-    deenergizer, deenergiser
-    deenergizes, deenergises
-    deenergizing, deenergising
-    defedation, defoedation
-    defeminization's, defeminisation's
-    defeminization, defeminisation
-    defeminize, defeminise
-    defeminized, defeminised
-    defeminizes, defeminises
-    defeminizing, defeminising
-    defense's, defence's
-    defense, defence
-    defensed, defenced
-    defenseless, defenceless
-    defenselesser, defencelesser
-    defenselessest, defencelessest
-    defenselesslier, defencelesslier
-    defenselessliest, defencelessliest
-    defenselessly, defencelessly
-    defenselessness's, defencelessness's
-    defenselessness, defencelessness
-    defenselessnesses, defencelessnesses
-    defenseman's, defenceman's
-    defenseman, defenceman
-    defensemen, defencemen
-    defenses, defences
-    defensing, defencing
-    defeudalize, defeudalise
-    defeudalized, defeudalised
-    defeudalizes, defeudalises
-    defeudalizing, defeudalising
-    defibrinize, defibrinise
-    defibrinized, defibrinised
-    defibrinizes, defibrinises
-    defibrinizing, defibrinising
-    definitization's, definitisation's
-    definitization, definitisation
-    definitizations, definitisations
-    definitize, definitise
-    definitized, definitised
-    definitizes, definitises
-    definitizing, definitising
-    deflectionization's, deflectionisation's
-    deflectionization, deflectionisation
-    deflectionizations, deflectionisations
-    deflectionize, deflectionise
-    deflectionizes, deflectionises
-    deformalize, deformalise
-    defunctionalization's, defunctionalisation's
-    defunctionalization, defunctionalisation
-    defunctionalizations, defunctionalisations
-    defunctionalize, defunctionalise
-    defunctionalizes, defunctionalises
-    deglycerolized, deglycerolised
-    dehumanization's, dehumanisation's
-    dehumanization, dehumanisation
-    dehumanizations, dehumanisations
-    dehumanize, dehumanise
-    dehumanized, dehumanised
-    dehumanizes, dehumanises
-    dehumanizing, dehumanising
-    dehydrogenization's, dehydrogenisation's
-    dehydrogenization, dehydrogenisation
-    dehydrogenize, dehydrogenise
-    dehydrogenized, dehydrogenised
-    dehydrogenizer's, dehydrogeniser's
-    dehydrogenizer, dehydrogeniser
-    dehydrogenizing, dehydrogenising
-    dehypnotization's, dehypnotisation's
-    dehypnotization, dehypnotisation
-    dehypnotizations, dehypnotisations
-    dehypnotize, dehypnotise
-    dehypnotized, dehypnotised
-    dehypnotizes, dehypnotises
-    dehypnotizing, dehypnotising
-    deindustrialization's, deindustrialisation's
-    deindustrialization, deindustrialisation
-    deindustrializations, deindustrialisations
-    deindustrialize, deindustrialise
-    deindustrialized, deindustrialised
-    deindustrializes, deindustrialises
-    deindustrializing, deindustrialising
-    deionization's, deionisation's
-    deionization, deionisation
-    deionize, deionise
-    deionized, deionised
-    deionizes, deionises
-    deionizing, deionising
-    delimitize, delimitise
-    delimitizes, delimitises
-    delocalization's, delocalisation's
-    delocalization, delocalisation
-    delocalizations, delocalisations
-    delocalize, delocalise
-    delocalized, delocalised
-    delocalizes, delocalises
-    delocalizing, delocalising
-    deluster, delustre
-    demagnetizable's, demagnetisable's
-    demagnetizable, demagnetisable
-    demagnetizabler, demagnetisabler
-    demagnetizables, demagnetisables
-    demagnetizablest, demagnetisablest
-    demagnetization's, demagnetisation's
-    demagnetization, demagnetisation
-    demagnetizations, demagnetisations
-    demagnetize, demagnetise
-    demagnetized, demagnetised
-    demagnetizer's, demagnetiser's
-    demagnetizer, demagnetiser
-    demagnetizers, demagnetisers
-    demagnetizes, demagnetises
-    demagnetizing, demagnetising
-    demagogue's, demagog's
-    demagogue, demagog
-    demagogued, demagoged
-    demagogueri, demagogri
-    demagogueris, demagogris
-    demagoguery, demagogry
-    demagogues, demagogs
-    demagoguing, demagoging
-    demasculinization's, demasculinisation's
-    demasculinization, demasculinisation
-    demasculinize, demasculinise
-    demasculinized, demasculinised
-    demasculinizing, demasculinising
-    dematerialization's, dematerialisation's
-    dematerialization, dematerialisation
-    dematerializations, dematerialisations
-    dematerialize, dematerialise
-    dematerialized, dematerialised
-    dematerializes, dematerialises
-    dematerializing, dematerialising
-    demeanor's, demeanour's
-    demeanor, demeanour
-    demeanors, demeanours
-    demilitarization's, demilitarisation's
-    demilitarization, demilitarisation
-    demilitarizations, demilitarisations
-    demilitarize, demilitarise
-    demilitarized, demilitarised
-    demilitarizes, demilitarises
-    demilitarizing, demilitarising
-    demiluster, demilustre
-    demineralization's, demineralisation's
-    demineralization, demineralisation
-    demineralizations, demineralisations
-    demineralize, demineralise
-    demineralized, demineralised
-    demineralizer, demineraliser
-    demineralizes, demineralises
-    demineralizing, demineralising
-    demobilization's, demobilisation's
-    demobilization, demobilisation
-    demobilizations, demobilisations
-    demobilize, demobilise
-    demobilized, demobilised
-    demobilizes, demobilises
-    demobilizing, demobilising
-    democratization's, democratisation's
-    democratization, democratisation
-    democratizations, democratisations
-    democratize, democratise
-    democratized, democratised
-    democratizer, democratiser
-    democratizes, democratises
-    democratizing, democratising
-    demonetization's, demonetisation's
-    demonetization, demonetisation
-    demonetizations, demonetisations
-    demonetize, demonetise
-    demonetized, demonetised
-    demonetizes, demonetises
-    demonetizing, demonetising
-    demonian, daemonian
-    demonization, demonisation
-    demonize, demonise
-    demonized, demonised
-    demonizes, demonises
-    demonizing, demonising
-    demoralization's, demoralisation's
-    demoralization, demoralisation
-    demoralizations, demoralisations
-    demoralize, demoralise
-    demoralized, demoralised
-    demoralizer's, demoraliser's
-    demoralizer, demoraliser
-    demoralizers, demoralisers
-    demoralizes, demoralises
-    demoralizing, demoralising
-    demoralizingly, demoralisingly
-    demutualization, demutualisation
-    demutualizations, demutualisations
-    demutualize, demutualise
-    demutualized, demutualised
-    demutualizes, demutualises
-    demutualizing, demutualising
-    demythologization's, demythologisation's
-    demythologization, demythologisation
-    demythologizations, demythologisations
-    demythologize, demythologise
-    demythologized, demythologised
-    demythologizer, demythologiser
-    demythologizes, demythologises
-    demythologizing, demythologising
-    denationalization's, denationalisation's
-    denationalization, denationalisation
-    denationalizations, denationalisations
-    denationalize, denationalise
-    denationalized, denationalised
-    denationalizes, denationalises
-    denationalizing, denationalising
-    denaturalization's, denaturalisation's
-    denaturalization, denaturalisation
-    denaturalizations, denaturalisations
-    denaturalize, denaturalise
-    denaturalized, denaturalised
-    denaturalizes, denaturalises
-    denaturalizing, denaturalising
-    denaturization's, denaturisation's
-    denaturization, denaturisation
-    denaturizations, denaturisations
-    denaturize, denaturise
-    denaturized, denaturised
-    denaturizer's, denaturiser's
-    denaturizer, denaturiser
-    denaturizers, denaturisers
-    denaturizes, denaturises
-    denaturizing, denaturising
-    denicotinize, denicotinise
-    denizenize, denizenise
-    denizenizes, denizenises
-    denominationalize, denominationalise
-    denominationalizes, denominationalises
-    denormalize, denormalise
-    dentalization's, dentalisation's
-    dentalization, dentalisation
-    dentalizations, dentalisations
-    dentalize, dentalise
-    dentalized, dentalised
-    dentalizes, dentalises
-    dentalizing, dentalising
-    dentin's, dentine's
-    dentin, dentine
-    dentins, dentines
-    denuclearization's, denuclearisation's
-    denuclearization, denuclearisation
-    denuclearizations, denuclearisations
-    denuclearize, denuclearise
-    denuclearized, denuclearised
-    denuclearizes, denuclearises
-    denuclearizing, denuclearising
-    deodorization's, deodorisation's
-    deodorization, deodorisation
-    deodorizations, deodorisations
-    deodorize, deodorise
-    deodorized, deodorised
-    deodorizer's, deodoriser's
-    deodorizer, deodoriser
-    deodorizers, deodorisers
-    deodorizes, deodorises
-    deodorizing, deodorising
-    deoxidization's, deoxidisation's
-    deoxidization, deoxidisation
-    deoxidizations, deoxidisations
-    deoxidize, deoxidise
-    deoxidized, deoxidised
-    deoxidizer's, deoxidiser's
-    deoxidizer, deoxidiser
-    deoxidizers, deoxidisers
-    deoxidizes, deoxidises
-    deoxidizing, deoxidising
-    deoxygenize, deoxygenise
-    deoxygenized, deoxygenised
-    deoxygenizes, deoxygenises
-    deoxygenizing, deoxygenising
-    departmentalization's, departmentalisation's
-    departmentalization, departmentalisation
-    departmentalizations, departmentalisations
-    departmentalize, departmentalise
-    departmentalized, departmentalised
-    departmentalizes, departmentalises
-    departmentalizing, departmentalising
-    departmentization's, departmentisation's
-    departmentization, departmentisation
-    departmentizations, departmentisations
-    departmentize, departmentise
-    departmentizes, departmentises
-    depauperization, depauperisation
-    depauperize, depauperise
-    depauperized, depauperised
-    depauperizes, depauperises
-    depauperizing, depauperising
-    dependence's, dependance's
-    dependence, dependance
-    dependences, dependances
-    depersonalization's, depersonalisation's
-    depersonalization, depersonalisation
-    depersonalizations, depersonalisations
-    depersonalize, depersonalise
-    depersonalized, depersonalised
-    depersonalizes, depersonalises
-    depersonalizing, depersonalising
-    depolarization's, depolarisation's
-    depolarization, depolarisation
-    depolarizations, depolarisations
-    depolarize, depolarise
-    depolarized, depolarised
-    depolarizer's, depolariser's
-    depolarizer, depolariser
-    depolarizers, depolarisers
-    depolarizes, depolarises
-    depolarizing, depolarising
-    depoliticization, depoliticisation
-    depoliticize, depoliticise
-    depoliticized, depoliticised
-    depoliticizes, depoliticises
-    depoliticizing, depoliticising
-    depolymerization's, depolymerisation's
-    depolymerization, depolymerisation
-    depolymerizations, depolymerisations
-    depolymerize, depolymerise
-    depolymerized, depolymerised
-    depolymerizes, depolymerises
-    depolymerizing, depolymerising
-    depressurization's, depressurisation's
-    depressurization, depressurisation
-    depressurizations, depressurisations
-    depressurize, depressurise
-    depressurized, depressurised
-    depressurizes, depressurises
-    depressurizing, depressurising
-    deputationize, deputationise
-    deputationizes, deputationises
-    deputization, deputisation
-    deputize, deputise
-    deputized, deputised
-    deputizes, deputises
-    deputizing, deputising
-    deracialize, deracialise
-    deracialized, deracialised
-    deracializes, deracialises
-    deracializing, deracialising
-    derationalization's, derationalisation's
-    derationalization, derationalisation
-    derationalizations, derationalisations
-    derationalize, derationalise
-    derationalizes, derationalises
-    deratization's, deratisation's
-    deratization, deratisation
-    deratizations, deratisations
-    derealization, derealisation
-    derecognize, derecognise
-    derecognized, derecognised
-    derecognizes, derecognises
-    derecognizing, derecognising
-    deregulationize, deregulationise
-    deregulationizes, deregulationises
-    dereligionize, dereligionise
-    dereligionized, dereligionised
-    dereligionizes, dereligionises
-    dereligionizing, dereligionising
-    derk, drek
-    dermatorrhea, dermatorrhoea
-    Derr's, Drer's
-    Derr, Drer
-    desacralization, desacralisation
-    desacralizations, desacralisations
-    desacralize, desacralise
-    desacralized, desacralised
-    desacralizes, desacralises
-    desacralizing, desacralising
-    desalinization's, desalinisation's
-    desalinization, desalinisation
-    desalinizations, desalinisations
-    desalinize, desalinise
-    desalinized, desalinised
-    desalinizes, desalinises
-    desalinizing, desalinising
-    desensitization's, desensitisation's
-    desensitization, desensitisation
-    desensitizations, desensitisations
-    desensitize, desensitise
-    desensitized, desensitised
-    desensitizer's, desensitiser's
-    desensitizer, desensitiser
-    desensitizers, desensitisers
-    desensitizes, desensitises
-    desensitizing, desensitising
-    desertization, desertisation
-    desertizations, desertisations
-    desexualization's, desexualisation's
-    desexualization, desexualisation
-    desexualizations, desexualisations
-    desexualize, desexualise
-    desexualized, desexualised
-    desexualizes, desexualises
-    desexualizing, desexualising
-    desilverization, desilverisation
-    desilverizations, desilverisations
-    desilverize, desilverise
-    desilverized, desilverised
-    desilverizes, desilverises
-    desilverizing, desilverising
-    despiritualization, despiritualisation
-    despiritualize, despiritualise
-    despotize, despotise
-    despotizes, despotises
-    destabilization, destabilisation
-    destabilize, destabilise
-    destabilized, destabilised
-    destabilizer, destabiliser
-    destabilizers, destabilisers
-    destabilizes, destabilises
-    destabilizing, destabilising
-    destalinize, destalinise
-    destalinized, destalinised
-    destalinizes, destalinises
-    destalinizing, destalinising
-    desterilize, desterilise
-    destigmatization, destigmatisation
-    desulfurizer's, desulfuriser's
-    desulfurizer, desulfuriser
-    desulphurisation's, desulphurization's
-    desulphurisation, desulphurization
-    desulphurisations, desulphurizations
-    desulphurise, desulphurize
-    desulphurised, desulphurized
-    desulphurises, desulphurizes
-    desulphurising, desulphurizing
-    desulphurizer, desulphuriser
-    desulphurizers, desulphurisers
-    desynchronization's, desynchronisation's
-    desynchronization, desynchronisation
-    desynchronizations, desynchronisations
-    desynchronize, desynchronise
-    desynchronized, desynchronised
-    desynchronizes, desynchronises
-    desynchronizing, desynchronising
-    detribalization's, detribalisation's
-    detribalization, detribalisation
-    detribalizations, detribalisations
-    detribalize, detribalise
-    detribalized, detribalised
-    detribalizes, detribalises
-    detribalizing, detribalising
-    deva, daeva
-    devalorization, devalorisation
-    devalorizations, devalorisations
-    devalorize, devalorise
-    devalorized, devalorised
-    devalorizes, devalorises
-    devalorizing, devalorising
-    develed, develled
-    develing, develling
-    deviled, devilled
-    deviling, devilling
-    devilize, devilise
-    devilizes, devilises
-    devitalization's, devitalisation's
-    devitalization, devitalisation
-    devitalizations, devitalisations
-    devitalize, devitalise
-    devitalized, devitalised
-    devitalizes, devitalises
-    devitalizing, devitalising
-    devocalization's, devocalisation's
-    devocalization, devocalisation
-    devocalize, devocalise
-    devocalized, devocalised
-    devocalizes, devocalises
-    devocalizing, devocalising
-    devolatilization's, devolatilisation's
-    devolatilization, devolatilisation
-    devolatilizations, devolatilisations
-    devolatilize, devolatilise
-    devolatilized, devolatilised
-    devolatilizes, devolatilises
-    devolatilizing, devolatilising
-    dexterous, dextrous
-    dexterously, dextrously
-    dexterousness, dextrousness
-    diabolization's, diabolisation's
-    diabolization, diabolisation
-    diabolizations, diabolisations
-    diabolize, diabolise
-    diabolized, diabolised
-    diabolizes, diabolises
-    diabolizing, diabolising
-    diagonalizable, diagonalisable
-    diagonalization, diagonalisation
-    diagonalize, diagonalise
-    diagonalized, diagonalised
-    diagonalizes, diagonalises
-    diagonalizing, diagonalising
-    dialecticize, dialecticise
-    dialecticizes, dialecticises
-    dialed, dialled
-    dialer's, dialler's
-    dialer, dialler
-    dialers, diallers
-    dialing's, dialling's
-    dialing, dialling
-    dialings, diallings
-    dialist's, diallist's
-    dialist, diallist
-    dialists, diallists
-    dialogize, dialogise
-    dialogized, dialogised
-    dialogizes, dialogises
-    dialogizing, dialogising
-    dialogue's, dialog's
-    dialogue, dialog
-    dialogued, dialogged
-    dialogues, dialogs
-    dialoguing, dialogging
-    dialyzabilities, dialysabilities
-    dialyzability's, dialysability's
-    dialyzability, dialysability
-    dialyzable's, dialysable's
-    dialyzable, dialysable
-    dialyzabler, dialysabler
-    dialyzables, dialysables
-    dialyzablest, dialysablest
-    dialyzate's, dialysate's
-    dialyzate, dialysate
-    dialyzates, dialysates
-    dialyzation's, dialysation's
-    dialyzation, dialysation
-    dialyze, dialyse
-    dialyzed, dialysed
-    dialyzer's, dialyser's
-    dialyzer, dialyser
-    dialyzers, dialysers
-    dialyzes, dialyses
-    dialyzing, dialysing
-    diamondize, diamondise
-    diamondizes, diamondises
-    diarize, diarise
-    diarized, diarised
-    diarizes, diarises
-    diarizing, diarising
-    diarrhea's, diarrhoea's
-    diarrhea, diarrhoea
-    diarrheal, diarrhoeal
-    diarrhealer, diarrhoealer
-    diarrhealest, diarrhoealest
-    diarrheas, diarrhoeas
-    diarrheic, diarrhoeic
-    diarrheicer, diarrhoeicer
-    diarrheicest, diarrhoeicest
-    diarrhetic, diarrhoetic
-    diarrheticer, diarrhoeticer
-    diarrheticest, diarrhoeticest
-    dichotomization's, dichotomisation's
-    dichotomization, dichotomisation
-    dichotomizations, dichotomisations
-    dichotomize, dichotomise
-    dichotomized, dichotomised
-    dichotomizes, dichotomises
-    dichotomizing, dichotomising
-    dickeys, dickies
-    dicky's, dickie's
-    dicky, dickie
-    diene, diaene
-    dieretic, diaeretic
-    dieselization's, dieselisation's
-    dieselization, dieselisation
-    dieselizations, dieselisations
-    dieselize, dieselise
-    dieselized, dieselised
-    dieselizes, dieselises
-    dieselizing, dieselising
-    diestrous, dioestrous
-    diestrual, dioestrual
-    diestrum, dioestrum
-    diestrus's, dioestrus's
-    diestrus, dioestrus
-    diestruses, dioestruses
-    diethylstilbestrol's, diethylstilboestrol's
-    diethylstilbestrol, diethylstilboestrol
-    dietitian's, dietician's
-    dietitian, dietician
-    dietitians, dieticians
-    differentialize, differentialise
-    differentializes, differentialises
-    digitalization's, digitalisation's
-    digitalization, digitalisation
-    digitalizations, digitalisations
-    digitalize, digitalise
-    digitalized, digitalised
-    digitalizes, digitalises
-    digitalizing, digitalising
-    digitization's, digitisation's
-    digitization, digitisation
-    digitizations, digitisations
-    digitize, digitise
-    digitized, digitised
-    digitizer's, digitiser's
-    digitizer, digitiser
-    digitizers, digitisers
-    digitizes, digitises
-    digitizing, digitising
-    dike's, dyke's
-    dike, dyke
-    diked, dyked
-    dikes, dykes
-    diking, dyking
-    dimensionalization, dimensionalisation
-    dimensionalize, dimensionalise
-    dimensionalized, dimensionalised
-    dimensionalizes, dimensionalises
-    dimensionalizing, dimensionalising
-    dimerization's, dimerisation's
-    dimerization, dimerisation
-    dimerizations, dimerisations
-    dimerize, dimerise
-    dimerized, dimerised
-    dimerizes, dimerises
-    dimerizing, dimerising
-    diminutivize, diminutivise
-    diminutivizes, diminutivises
-    dingoes, dingos
-    dioecious, diecious
-    dioeciously, dieciously
-    dionize, dionise
-    diopter's, dioptre's
-    diopter, dioptre
-    diopters, dioptres
-    diphthongization's, diphthongisation's
-    diphthongization, diphthongisation
-    diphthongizations, diphthongisations
-    diphthongize, diphthongise
-    diphthongized, diphthongised
-    diphthongizes, diphthongises
-    diphthongizing, diphthongising
-    diple, diploe
-    diploe's, diploae's
-    diploe, diploae
-    diplomatize, diplomatise
-    diplomatized, diplomatised
-    diplomatizes, diplomatises
-    diplomatizing, diplomatising
-    dis's, diss's
-    dis, diss
-    disangularize, disangularise
-    disangularizes, disangularises
-    disauthorize, disauthorise
-    disauthorized, disauthorised
-    disauthorizes, disauthorises
-    disauthorizing, disauthorising
-    disboweled, disbowelled
-    disboweling, disbowelling
-    discanonization's, discanonisation's
-    discanonization, discanonisation
-    discanonizations, discanonisations
-    discanonize, discanonise
-    discanonizes, discanonises
-    discolor's, discolour's
-    discolor, discolour
-    discolorate, discolourate
-    discolorated, discolourated
-    discoloration's, discolouration's
-    discoloration, discolouration
-    discolorations, discolourations
-    discolored's, discoloured's
-    discolored, discoloured
-    discoloredness, discolouredness
-    discoloreds, discoloureds
-    discoloring, discolouring
-    discolorment's, discolourment's
-    discolorment, discolourment
-    discolorments, discolourments
-    discolors, discolours
-    discolourisation's, discolourization's
-    discolourisation, discolourization
-    discolourisations, discolourizations
-    discretization, discretisation
-    discretize, discretise
-    disdenominationalize, disdenominationalise
-    disdenominationalizes, disdenominationalises
-    disdiplomatize, disdiplomatise
-    disdiplomatizes, disdiplomatises
-    disemboweled, disembowelled
-    disemboweling, disembowelling
-    disequalize's, disequalise's
-    disequalize, disequalise
-    disequalizer, disequaliser
-    disequalizers, disequalisers
-    disequalizes, disequalises
-    disfavor's, disfavour's
-    disfavor, disfavour
-    disfavored, disfavoured
-    disfavorer's, disfavourer's
-    disfavorer, disfavourer
-    disfavorers, disfavourers
-    disfavoring, disfavouring
-    disfavors, disfavours
-    dishabille's, deshabille's
-    dishabille, deshabille
-    dishabilles, deshabilles
-    disharmonize, disharmonise
-    disharmonized, disharmonised
-    disharmonizes, disharmonises
-    disharmonizing, disharmonising
-    disheveled, dishevelled
-    disheveler, disheveller
-    disheveling, dishevelling
-    dishonor's, dishonour's
-    dishonor, dishonour
-    dishonorable's, dishonourable's
-    dishonorable, dishonourable
-    dishonorableness's, dishonourableness's
-    dishonorableness, dishonourableness
-    dishonorablenesses, dishonourablenesses
-    dishonorabler, dishonourabler
-    dishonorables, dishonourables
-    dishonorablest, dishonourablest
-    dishonorablier, dishonourablier
-    dishonorablies, dishonourablies
-    dishonorabliest, dishonourabliest
-    dishonorably, dishonourably
-    dishonorary, dishonourary
-    dishonored, dishonoured
-    dishonorer's, dishonourer's
-    dishonorer, dishonourer
-    dishonorers, dishonourers
-    dishonoring, dishonouring
-    dishonors, dishonours
-    dishumanize, dishumanise
-    dishumanizes, dishumanises
-    dishumor, dishumour
-    dishumored, dishumoured
-    dishumors, dishumours
-    disillusionize, disillusionise
-    disillusionized, disillusionised
-    disillusionizer's, disillusioniser's
-    disillusionizer, disillusioniser
-    disillusionizers, disillusionisers
-    disillusionizes, disillusionises
-    disillusionizing, disillusionising
-    disindividualize, disindividualise
-    disindividualized, disindividualised
-    disindividualizes, disindividualises
-    disindividualizing, disindividualising
-    disindustrialization, disindustrialisation
-    disindustrializations, disindustrialisations
-    disindustrialize, disindustrialise
-    disindustrialized, disindustrialised
-    disindustrializes, disindustrialises
-    disindustrializing, disindustrialising
-    disluster, dislustre
-    dismalize, dismalise
-    dismalizes, dismalises
-    disnaturalization's, disnaturalisation's
-    disnaturalization, disnaturalisation
-    disnaturalizations, disnaturalisations
-    disnaturalize, disnaturalise
-    disnaturalized, disnaturalised
-    disnaturalizes, disnaturalises
-    disnaturalizing, disnaturalising
-    disorganization's, disorganisation's
-    disorganization, disorganisation
-    disorganizations, disorganisations
-    disorganize, disorganise
-    disorganized, disorganised
-    disorganizer's, disorganiser's
-    disorganizer, disorganiser
-    disorganizers, disorganisers
-    disorganizes, disorganises
-    disorganizing, disorganising
-    disozonize, disozonise
-    disozonizes, disozonises
-    dispapalize, dispapalise
-    dispapalizes, dispapalises
-    dispatch's, despatch's
-    dispatch, despatch
-    dispatched, despatched
-    dispatches, despatches
-    dispatching, despatching
-    dispauperize, dispauperise
-    dispauperized, dispauperised
-    dispauperizes, dispauperises
-    dispauperizing, dispauperising
-    dispersonalize, dispersonalise
-    dispersonalizes, dispersonalises
-    dispopularize, dispopularise
-    dispopularizes, dispopularises
-    disrealize, disrealise
-    disrealizes, disrealises
-    disscepter's, dissceptre's
-    disscepter, dissceptre
-    disscepters, dissceptres
-    disseize, disseise
-    disseized, disseised
-    disseizee, disseisee
-    disseizes, disseises
-    disseizin's, disseisin's
-    disseizin, disseisin
-    disseizing, disseising
-    disseizins, disseisins
-    disseizor's, disseisor's
-    disseizor, disseisor
-    disseizors, disseisors
-    dissensualize, dissensualise
-    dissensualizes, dissensualises
-    disses, dises
-    dissocialize, dissocialise
-    dissocialized, dissocialised
-    dissocializes, dissocialises
-    dissocializing, dissocialising
-    dissyllabize, dissyllabise
-    dissyllabized, dissyllabised
-    dissyllabizing, dissyllabising
-    dissympathize, dissympathise
-    dissympathizes, dissympathises
-    distill, distil
-    distills, distils
-    disutilize, disutilise
-    disutilizes, disutilises
-    ditsier, ditzier
-    ditsy, ditzy
-    ditziness's, ditsiness's
-    ditziness, ditsiness
-    ditzinesses, ditsinesses
-    diversicolored, diversicoloured
-    divinister, divinistre
-    divinization's, divinisation's
-    divinization, divinisation
-    divinizations, divinisations
-    divinize, divinise
-    divinized, divinised
-    divinizes, divinises
-    divinizing, divinising
-    divisionalization, divisionalisation
-    divisionalizations, divisionalisations
-    djellaba's, djellabah's
-    djellaba, djellabah
-    djellabas, djellabahes
-    djinni's, djinn's
-    djinni, djinn
-    Docete's, Docetae's
-    Docete, Docetae
-    dockization's, dockisation's
-    dockization, dockisation
-    dockizations, dockisations
-    dockize, dockise
-    dockized, dockised
-    dockizes, dockises
-    dockizing, dockising
-    doctorization's, doctorisation's
-    doctorization, doctorisation
-    doctorizations, doctorisations
-    doctorize, doctorise
-    doctorizes, doctorises
-    doctrinization's, doctrinisation's
-    doctrinization, doctrinisation
-    doctrinizations, doctrinisations
-    doctrinize, doctrinise
-    doctrinizes, doctrinises
-    documentarization, documentarisation
-    documentarizations, documentarisations
-    documentarize, documentarise
-    documentarized, documentarised
-    documentarizes, documentarises
-    documentarizing, documentarising
-    documentize, documentise
-    documentizes, documentises
-    Dodonean's, Dodonaean's
-    Dodonean, Dodonaean
-    doggy's, doggie's
-    doggy, doggie
-    dogie's, dogy's
-    dogie, dogy
-    dogmatization's, dogmatisation's
-    dogmatization, dogmatisation
-    dogmatizations, dogmatisations
-    dogmatize, dogmatise
-    dogmatized, dogmatised
-    dogmatizer's, dogmatiser's
-    dogmatizer, dogmatiser
-    dogmatizers, dogmatisers
-    dogmatizes, dogmatises
-    dogmatizing, dogmatising
-    dognaped, dognapped
-    dognaping, dognapping
-    dollarization, dollarisation
-    dollarizations, dollarisations
-    dolomitization's, dolomitisation's
-    dolomitization, dolomitisation
-    dolomitizations, dolomitisations
-    dolomitize, dolomitise
-    dolomitized, dolomitised
-    dolomitizes, dolomitises
-    dolomitizing, dolomitising
-    dolor's, dolour's
-    dolor, dolour
-    dolors, dolours
-    domesticize, domesticise
-    domesticized, domesticised
-    domesticizes, domesticises
-    domesticizing, domesticising
-    domine, dominae
-    dopey, dopy
-    dora, doura
-    Doricize's, Doricise's
-    Doricize, Doricise
-    Doricizes, Doricises
-    dorize, dorise
-    dorized, dorised
-    dorizes, dorises
-    dorizing, dorising
-    doryline, dorylinae
-    doughnut's, donut's
-    doughnut, donut
-    doughnuts, donuts
-    doweled, dowelled
-    doweler, doweller
-    doweling, dowelling
-    downdraft's, downdraught's
-    downdraft, downdraught
-    dracena, dracaena
-    dracenaceae, dracaenaceae
-    dracenas, dracaenas
-    draftier, draughtier
-    draftiest, draughtiest
-    draftilier, draughtilier
-    draftiliest, draughtiliest
-    draftily, draughtily
-    draftiness's, draughtiness's
-    draftiness, draughtiness
-    draftinesses, draughtinesses
-    draftsman's, draughtsman's
-    draftsman, draughtsman
-    draftsmanship's, draughtsmanship's
-    draftsmanship, draughtsmanship
-    draftsmanships, draughtsmanships
-    draftsmen, draughtsmen
-    draftsperson, draughtsperson
-    draftswoman's, draughtswoman's
-    draftswoman, draughtswoman
-    draftswomen, draughtswomen
-    drafty, draughty
-    dragonize, dragonise
-    dragonized, dragonised
-    dragonizes, dragonises
-    dragonizing, dragonising
-    dramatizable's, dramatisable's
-    dramatizable, dramatisable
-    dramatizabler, dramatisabler
-    dramatizables, dramatisables
-    dramatizablest, dramatisablest
-    dramatization's, dramatisation's
-    dramatization, dramatisation
-    dramatizations, dramatisations
-    dramatize, dramatise
-    dramatized, dramatised
-    dramatizer's, dramatiser's
-    dramatizer, dramatiser
-    dramatizers, dramatisers
-    dramatizes, dramatises
-    dramatizing, dramatising
-    dreamed, dreamt
-    driveled, drivelled
-    driveler's, driveller's
-    driveler, driveller
-    drivelers, drivellers
-    driveling, drivelling
-    drought's, drouth's
-    drought, drouth
-    droughtiness, drouthiness
-    droughts, drouthes
-    droughty, drouthy
-    dryly, drily
-    dualization's, dualisation's
-    dualization, dualisation
-    dualizations, dualisations
-    dualize, dualise
-    dualizes, dualises
-    ductilize, ductilise
-    ductilizes, ductilises
-    dueled, duelled
-    dueler's, dueller's
-    dueler, dueller
-    duelers, duellers
-    dueling, duelling
-    duelings, duellings
-    duelist's, duellist's
-    duelist, duellist
-    duelists, duellists
-    duer, dure
-    dullness's, dulness's
-    dullness, dulness
-    dullnesses, dulnesses
-    dumbfound, dumfound
-    dumbfounded, dumfounded
-    dumbfounding, dumfounding
-    dumbfoundingly, dumfoundingly
-    dumbfounds, dumfounds
-    dumpster's, Dumpster's
-    dumpster, Dumpster
-    dumpsters, Dumpsters
-    dynamize, dynamise
-    dynamized, dynamised
-    dynamizes, dynamises
-    dynamizing, dynamising
-    dysesthesia, dysaesthesia
-    dysesthetic, dysaesthetic
-    dysmenorrhea's, dysmenorrhoea's
-    dysmenorrhea, dysmenorrhoea
-    dysmenorrheal, dysmenorrhoeal
-    dysmenorrheas, dysmenorrhoeas
-    dysmenorrheic, dysmenorrhoeic
-    dyspnea's, dyspnoea's
-    dyspnea, dyspnoea
-    dyspneal, dyspnoeal
-    dyspneas, dyspnoeas
-    dyspneic, dyspnoeic
-    earlierize, earlierise
-    earlierized, earlierised
-    earlierizes, earlierises
-    earlierizing, earlierising
-    easternize, easternise
-    ebionize, ebionise
-    ebionized, ebionised
-    ebionizes, ebionises
-    ebionizing, ebionising
-    ebonization, ebonisation
-    ebonize, ebonise
-    ebonized, ebonised
-    ebonizes, ebonises
-    ebonizing, ebonising
-    ec, aec
-    ecclesiasticize, ecclesiasticise
-    ecclesiasticizes, ecclesiasticises
-    echoize, echoise
-    echoized, echoised
-    echoizes, echoises
-    echoizing, echoising
-    eclecticize, eclecticise
-    eclecticizes, eclecticises
-    ecoid, oecoid
-    economization's, economisation's
-    economization, economisation
-    economizations, economisations
-    economize, economise
-    economized, economised
-    economizer's, economiser's
-    economizer, economiser
-    economizers, economisers
-    economizes, economises
-    economizing, economising
-    ecophobia, oecophobia
-    ecstasize, ecstasise
-    ecstasized, ecstasised
-    ecstasizes, ecstasises
-    ecstasizing, ecstasising
-    ecstaticize, ecstaticise
-    ecstaticizes, ecstaticises
-    ectethmoid, ectoethmoid
-    ectocelic, ectocoelic
-    ecumenic, oecumenic
-    ecumenicalism, oecumenicalism
-    ecumenicity, oecumenicity
-    ecumenism, oecumenism
-    ecus, oecus
-    edema's, oedema's
-    edema, oedema
-    edemas, oedemas
-    edematose, oedematose
-    edematous, oedematous
-    Edenization's, Edenisation's
-    Edenization, Edenisation
-    Edenizations, Edenisations
-    Edenize's, Edenise's
-    Edenize, Edenise
-    Edenizes, Edenises
-    edicule's, aedicule's
-    edicule, aedicule
-    edility, aedility
-    editorialization's, editorialisation's
-    editorialization, editorialisation
-    editorializations, editorialisations
-    editorialize, editorialise
-    editorialized, editorialised
-    editorializer's, editorialiser's
-    editorializer, editorialiser
-    editorializes, editorialises
-    editorializing, editorialising
-    eerie, eery
-    Eetion's, Eaetion's
-    Eetion, Eaetion
-    effectualize, effectualise
-    effectualizes, effectualises
-    effeminatize, effeminatise
-    effeminatizes, effeminatises
-    effeminization's, effeminisation's
-    effeminization, effeminisation
-    effeminize, effeminise
-    effeminized, effeminised
-    effeminizes, effeminises
-    effeminizing, effeminising
-    eger, aeger
-    eger, egre
-    egilops, aegilops
-    eglogue, aeglogue
-    egoize, egoise
-    egoizer, egoiser
-    egoizers, egoisers
-    egoizes, egoises
-    egophony, aegophony
-    egotize, egotise
-    egotized, egotised
-    egotizes, egotises
-    egotizing, egotising
-    egritude, aegritude
-    Egyptianization's, Egyptianisation's
-    Egyptianization, Egyptianisation
-    Egyptianizations, Egyptianisations
-    Egyptianize's, Egyptianise's
-    Egyptianize, Egyptianise
-    Egyptianized's, Egyptianised's
-    Egyptianized, Egyptianised
-    Egyptianizes, Egyptianises
-    Egyptianizing's, Egyptianising's
-    Egyptianizing, Egyptianising
-    Egyptize's, Egyptise's
-    Egyptize, Egyptise
-    Egyptizes, Egyptises
-    elasticization, elasticisation
-    elasticize, elasticise
-    elasticized, elasticised
-    elasticizer, elasticiser
-    elasticizers, elasticisers
-    elasticizes, elasticises
-    elasticizing, elasticising
-    electricalize, electricalise
-    electricalizes, electricalises
-    electricize, electricise
-    electricizes, electricises
-    electrization, electrisation
-    electrizations, electrisations
-    electrize, electrise
-    electrized, electrised
-    electrizes, electrises
-    electrizing, electrising
-    electroanesthesia's, electroanaesthesia's
-    electroanesthesia, electroanaesthesia
-    electroanesthesias, electroanaesthesias
-    electrocauterization's, electrocauterisation's
-    electrocauterization, electrocauterisation
-    electrocauterizations, electrocauterisations
-    electrodialyze, electrodialyse
-    electrodialyzer's, electrodialyser's
-    electrodialyzer, electrodialyser
-    electrodialyzers, electrodialysers
-    electrodialyzes, electrodialyses
-    electrogalvanize, electrogalvanise
-    electrogalvanizes, electrogalvanises
-    electrohomeopathies, electrohomoeopathies
-    electrohomeopathy's, electrohomoeopathy's
-    electrohomeopathy, electrohomoeopathy
-    electrolyzation's, electrolysation's
-    electrolyzation, electrolysation
-    electrolyze, electrolyse
-    electrolyzed, electrolysed
-    electrolyzer's, electrolyser's
-    electrolyzer, electrolyser
-    electrolyzes, electrolyses
-    electrolyzing, electrolysing
-    electromagnetizable, electromagnetisable
-    electrotonize, electrotonise
-    electrotonizes, electrotonises
-    elegize, elegise
-    elegized, elegised
-    elegizes, elegises
-    elegizing, elegising
-    elementalize, elementalise
-    elementalizes, elementalises
-    eleoblast, elaeoblast
-    eleolite, elaeolite
-    eleomargaric, elaeomargaric
-    eleometer, elaeometer
-    eleoptene's, elaeoptene's
-    eleoptene, elaeoptene
-    Elizabethanize's, Elizabethanise's
-    Elizabethanize, Elizabethanise
-    Elizabethanizes, Elizabethanises
-    Elizabethville's, Elisabethville's
-    Elizabethville, Elisabethville
-    embedment, imbedment
-    embedments, imbedments
-    emblematicize, emblematicise
-    emblematicizes, emblematicises
-    emblematization, emblematisation
-    emblematize, emblematise
-    emblematized, emblematised
-    emblematizes, emblematises
-    emblematizing, emblematising
-    emblemize, emblemise
-    emblemized, emblemised
-    emblemizes, emblemises
-    emblemizing, emblemising
-    embolization, embolisation
-    emboweled, embowelled
-    emboweling, embowelling
-    emotionalization's, emotionalisation's
-    emotionalization, emotionalisation
-    emotionalizations, emotionalisations
-    emotionalize, emotionalise
-    emotionalized, emotionalised
-    emotionalizes, emotionalises
-    emotionalizing, emotionalising
-    emotionize, emotionise
-    emotionizes, emotionises
-    empathize, empathise
-    empathized, empathised
-    empathizes, empathises
-    empathizing, empathising
-    emperize, emperise
-    emperized, emperised
-    emperizes, emperises
-    emperizing, emperising
-    empestic, empaestic
-    emphasize, emphasise
-    emphasized, emphasised
-    emphasizer, emphasiser
-    emphasizers, emphasisers
-    emphasizes, emphasises
-    emphasizing, emphasising
-    employee's, employe's
-    employee, employe
-    employees, employes
-    emprise, emprize
-    emprises, emprizes
-    empyreumatize, empyreumatise
-    empyreumatized, empyreumatised
-    empyreumatizes, empyreumatises
-    empyreumatizing, empyreumatising
-    emule, aemule
-    emuled, aemuled
-    emules, aemules
-    emuling, aemuling
-    emulsionize, emulsionise
-    emulsionized, emulsionised
-    emulsionizes, emulsionises
-    emulsionizing, emulsionising
-    enameled, enamelled
-    enameler's, enameller's
-    enameler, enameller
-    enamelers, enamellers
-    enameling, enamelling
-    enamelings, enamellings
-    enamelist's, enamellist's
-    enamelist, enamellist
-    enamelists, enamellists
-    enamor's, enamour's
-    enamor, enamour
-    enamored's, enamoured's
-    enamored, enamoured
-    enamoredness's, enamouredness's
-    enamoredness, enamouredness
-    enamorednesses, enamourednesses
-    enamoreds, enamoureds
-    enamoring, enamouring
-    enamorment's, enamourment's
-    enamorment, enamourment
-    enamorments, enamourments
-    enamors, enamours
-    enarbor's, enarbour's
-    enarbor, enarbour
-    enarbors, enarbours
-    encarnalization, encarnalisation
-    encarnalize, encarnalise
-    encarnalized, encarnalised
-    encarnalizes, encarnalises
-    encarnalizing, encarnalising
-    encephalocele, encephalocoele
-    enclose, inclose
-    enclosed, inclosed
-    encloses, incloses
-    enclosing, inclosing
-    enclosure's, inclosure's
-    enclosure, inclosure
-    enclosures, inclosures
-    encolor's, encolour's
-    encolor, encolour
-    encolored, encoloured
-    encoloring, encolouring
-    encolors, encolours
-    encrust, incrust
-    encrusted, incrusted
-    encrusting, incrusting
-    encrusts, incrusts
-    encumber, incumber
-    encumbered, incumbered
-    encumbering, incumbering
-    encumbers, incumbers
-    encyclopedia's, encyclopaedia's
-    encyclopedia, encyclopaedia
-    encyclopediac, encyclopaediac
-    encyclopedial, encyclopaedial
-    encyclopedian, encyclopaedian
-    encyclopedias, encyclopaedias
-    encyclopedic, encyclopaedic
-    encyclopedical, encyclopaedical
-    encyclopedically, encyclopaedically
-    encyclopedism, encyclopaedism
-    encyclopedisms, encyclopaedisms
-    encyclopedist, encyclopaedist
-    encyclopedists, encyclopaedists
-    endameba, endamoeba
-    endamebae, endamoebae
-    endamebas, endamoebas
-    endamebiasis, endamoebiasis
-    endamebic, endamoebic
-    endeavor's, endeavour's
-    endeavor, endeavour
-    endeavored, endeavoured
-    endeavorer's, endeavourer's
-    endeavorer, endeavourer
-    endeavorers, endeavourers
-    endeavoring, endeavouring
-    endeavors, endeavours
-    Enders, Endres
-    endorse, indorse
-    endorsed, indorsed
-    endorsement's, indorsement's
-    endorsement, indorsement
-    endorsements, indorsements
-    endorses, indorses
-    endorsing, indorsing
-    endue, indue
-    endued, indued
-    endues, indues
-    enduing, induing
-    eneid, aeneid
-    energization, energisation
-    energize, energise
-    energized, energised
-    energizer's, energiser's
-    energizer, energiser
-    energizers, energisers
-    energizes, energises
-    energizing, energising
-    Englishize's, Englishise's
-    Englishize, Englishise
-    Englishizes, Englishises
-    engrandize, engrandise
-    engrandizement's, engrandisement's
-    engrandizement, engrandisement
-    engrandizements, engrandisements
-    engrandizes, engrandises
-    enharbor, enharbour
-    enhemospore, enhaemospore
-    enhypostatize, enhypostatise
-    enhypostatized, enhypostatised
-    enhypostatizes, enhypostatises
-    enhypostatizing, enhypostatising
-    enigmatize, enigmatise
-    enigmatized, enigmatised
-    enigmatizes, enigmatises
-    enigmatizing, enigmatising
-    enjambment's, enjambement's
-    enjambment, enjambement
-    enjambments, enjambements
-    enocyte, oenocyte
-    enolic, oenolic
-    enolization's, enolisation's
-    enolization, enolisation
-    enolizations, enolisations
-    enolize, enolise
-    enolizes, enolises
-    enological, oenological
-    enologist, oenologist
-    enologists, oenologists
-    enomania, oenomania
-    enroll, enrol
-    enrollment's, enrolment's
-    enrollment, enrolment
-    enrollments, enrolments
-    enrolls, enrols
-    ensepulcher's, ensepulchre's
-    ensepulcher, ensepulchre
-    ensepulcherred, ensepulchred
-    ensepulcherring, ensepulchring
-    ensepulchers, ensepulchres
-    ensorceled, ensorcelled
-    ensorcels, ensorcells
-    entameba, entamoeba
-    entamebae, entamoebae
-    entamebas, entamoebas
-    entamebic, entamoebic
-    entender, entendre
-    entenders, entendres
-    enterocele, enterocoele
-    enteroceles, enterocoeles
-    enthrall, enthral
-    enthrallment's, enthralment's
-    enthrallment, enthralment
-    enthrallments, enthralments
-    enthralls, enthrals
-    enthronization's, enthronisation's
-    enthronization, enthronisation
-    enthronizations, enthronisations
-    enthronize, enthronise
-    enthronized, enthronised
-    enthronizes, enthronises
-    enthronizing, enthronising
-    entocele, entocoele
-    entomologize, entomologise
-    entomologized, entomologised
-    entomologizes, entomologises
-    entomologizing, entomologising
-    entre, entrae
-    entrench, intrench
-    entrenched, intrenched
-    entrenches, intrenches
-    entrenching, intrenching
-    entrenchment's, intrenchment's
-    entrenchment, intrenchment
-    entrenchments, intrenchments
-    entrust, intrust
-    entrusted, intrusted
-    entrusting, intrusting
-    entrustment, intrustment
-    entrustments, intrustments
-    entrusts, intrusts
-    envapor's, envapour's
-    envapor, envapour
-    envapors, envapours
-    envenomization, envenomisation
-    eolic, aeolic
-    eolipile's, aeolipile's
-    eolipile, aeolipile
-    eolipiles, aeolipiles
-    eolotropic, aeolotropic
-    eon's, aeon's
-    eon, aeon
-    eonian, aeonian
-    eonism's, aeonism's
-    eonism, aeonism
-    eonisms, aeonisms
-    eons, aeons
-    Eopaleozoic's, Eopalaeozoic's
-    Eopaleozoic, Eopalaeozoic
-    epaulet's, epaulette's
-    epaulet, epaulette
-    epaulets, epaulettes
-    epenetic, epaenetic
-    ephete, ephetae
-    epicele, epicoele
-    epicenter's, epicentre's
-    epicenter, epicentre
-    epicenters, epicentres
-    Epicurize's, Epicurise's
-    Epicurize, Epicurise
-    epicurize, epicurise
-    epicurized, epicurised
-    Epicurizes, Epicurises
-    epicurizes, epicurises
-    epicurizing, epicurising
-    epidotization, epidotisation
-    epidotizations, epidotisations
-    epidotized, epidotised
-    epigeal, epigaeal
-    epigean, epigaean
-    epigeous, epigaeous
-    epigrammatization, epigrammatisation
-    epigrammatize, epigrammatise
-    epigrammatized, epigrammatised
-    epigrammatizer, epigrammatiser
-    epigrammatizes, epigrammatises
-    epigrammatizing, epigrammatising
-    epilogize, epilogise
-    epilogized, epilogised
-    epilogizes, epilogises
-    epilogizing, epilogising
-    epilogue's, epilog's
-    epilogue, epilog
-    epilogues, epilogs
-    epiloguize, epiloguise
-    epiloguized, epiloguised
-    epiloguizes, epiloguises
-    epiloguizing, epiloguising
-    epimerize, epimerise
-    epimerized, epimerised
-    epimerizing, epimerising
-    epinephrine's, epinephrin's
-    epinephrine, epinephrin
-    epinephrines, epinephrins
-    epiphanize, epiphanise
-    epiphanized, epiphanised
-    epiphanizing, epiphanising
-    Episcopalianize's, Episcopalianise's
-    Episcopalianize, Episcopalianise
-    Episcopalianizes, Episcopalianises
-    episcopize, episcopise
-    episcopized, episcopised
-    episcopizes, episcopises
-    episcopizing, episcopising
-    epistolize, epistolise
-    epistolized, epistolised
-    epistolizes, epistolises
-    epistolizing, epistolising
-    epitaphize, epitaphise
-    epitaphizes, epitaphises
-    epithetize, epithetise
-    epithetizes, epithetises
-    epitomization's, epitomisation's
-    epitomization, epitomisation
-    epitomizations, epitomisations
-    epitomize, epitomise
-    epitomized, epitomised
-    epitomizer's, epitomiser's
-    epitomizer, epitomiser
-    epitomizers, epitomisers
-    epitomizes, epitomises
-    epitomizing, epitomising
-    eq, aeq
-    equaled, equalled
-    equaling, equalling
-    equalization's, equalisation's
-    equalization, equalisation
-    equalizations, equalisations
-    equalize, equalise
-    equalized, equalised
-    equalizer's, equaliser's
-    equalizer, equaliser
-    equalizers, equalisers
-    equalizes, equalises
-    equalizing, equalising
-    equalizings, equalisings
-    equestrianize, equestrianise
-    equestrianizes, equestrianises
-    erbia, rebia
-    erbias, rebias
-    ergotize, ergotise
-    ergotized, ergotised
-    ergotizes, ergotises
-    ergotizing, ergotising
-    eric, aeric
-    erical, aerical
-    erke, reke
-    ern, ren
-    ernes, renes
-    ernest, renest
-    erns, rens
-    erogenesis, aerogenesis
-    erogenic, aerogenic
-    eros, aeros
-    erose, aerose
-    eroticization, eroticisation
-    eroticize, eroticise
-    eroticized, eroticised
-    eroticizes, eroticises
-    eroticizing, eroticising
-    erses, reses
-    ersh, resh
-    ert, ret
-    eruginous, aeruginous
-    erugo, aerugo
-    erugos, aerugos
-    ervalenta, revalenta
-    ervalentas, revalentas
-    erythrean, erythraean
-    erythremia, erythraemia
-    esc, aesc
-    escalades, escaladoes
-    eschynite, aeschynite
-    escollope's, escalop's
-    escollope, escalop
-    escollopes, escalops
-    esculapian, aesculapian
-    esculetin, aesculetin
-    esculin's, aesculin's
-    esculin, aesculin
-    Eskimoized's, Eskimoised's
-    Eskimoized, Eskimoised
-    Eskimoizeds, Eskimoiseds
-    esop, aesop
-    esophagal, oesophagal
-    esophagean, oesophagean
-    esophagism, oesophagism
-    esophagismus, oesophagismus
-    esophagitis, oesophagitis
-    esophagus, oesophagus
-    Essenize's, Essenise's
-    Essenize, Essenise
-    Essenizes, Essenises
-    essentialize, essentialise
-    essentializes, essentialises
-    esterization's, esterisation's
-    esterization, esterisation
-    esterizations, esterisations
-    esterize, esterise
-    esterizes, esterises
-    estheses, aestheses
-    esthesia's, aesthesia's
-    esthesia, aesthesia
-    esthesias, aesthesias
-    esthesiogen, aesthesiogen
-    esthesiogenic, aesthesiogenic
-    esthesiogens, aesthesiogens
-    esthesis, aesthesis
-    esthetical, aesthetical
-    esthetician's, aesthetician's
-    esthetician, aesthetician
-    estheticians, aestheticians
-    estival, aestival
-    estivate, aestivate
-    estivated, aestivated
-    estivates, aestivates
-    estivating, aestivating
-    estivation's, aestivation's
-    estivation, aestivation
-    estivations, aestivations
-    estivator's, aestivator's
-    estivator, aestivator
-    estive, aestive
-    estradiol's, oestradiol's
-    estradiol, oestradiol
-    estradiols, oestradiols
-    estral, oestral
-    estrin's, oestrin's
-    estrin, oestrin
-    estrins, oestrins
-    estriol's, oestriol's
-    estriol, oestriol
-    estriols, oestriols
-    estrogen's, oestrogen's
-    estrogen, oestrogen
-    estrogenic, oestrogenic
-    estrogens, oestrogens
-    estrone's, oestrone's
-    estrone, oestrone
-    estrones, oestrones
-    estrous, oestrous
-    estrual, oestrual
-    estruate, oestruate
-    estruation, oestruation
-    estrum, oestrum
-    estrums, oestrums
-    estrus's, oestrus's
-    estrus, oestrus
-    estruses, oestruses
-    estuate, aestuate
-    estuous, aestuous
-    esture, aesture
-    estus, aestus
-    et, aet
-    eternalization's, eternalisation's
-    eternalization, eternalisation
-    eternalizations, eternalisations
-    eternalize, eternalise
-    eternalized, eternalised
-    eternalizes, eternalises
-    eternalizing, eternalising
-    eternization's, eternisation's
-    eternization, eternisation
-    eternizations, eternisations
-    eternize, eternise
-    eternized, eternised
-    eternizes, eternises
-    eternizing, eternising
-    etheling, aetheling
-    etherealization's, etherealisation's
-    etherealization, etherealisation
-    etherealizations, etherealisations
-    etherealize, etherealise
-    etherealized, etherealised
-    etherealizes, etherealises
-    etherealizing, etherealising
-    ethered, aethered
-    etherialization's, etherialisation's
-    etherialization, etherialisation
-    etherialize, etherialise
-    etherialized, etherialised
-    etherializing, etherialising
-    etheric, aetheric
-    etherization's, etherisation's
-    etherization, etherisation
-    etherizations, etherisations
-    etherize, etherise
-    etherized, etherised
-    etherizer's, etheriser's
-    etherizer, etheriser
-    etherizers, etherisers
-    etherizes, etherises
-    etherizing, etherising
-    ethicization, ethicisation
-    ethicize, ethicise
-    ethicized, ethicised
-    ethicizes, ethicises
-    ethicizing, ethicising
-    ethnicize, ethnicise
-    ethnicizes, ethnicises
-    etiogenic, aetiogenic
-    etiologically, aetiologically
-    etiologist's, aetiologist's
-    etiologist, aetiologist
-    etiologue, aetiologue
-    etiology's, aetiology's
-    etiology, aetiology
-    etiophyllin, aetiophyllin
-    etiotropic, aetiotropic
-    etiotropically, aetiotropically
-    etymologizable, etymologisable
-    etymologization, etymologisation
-    etymologize, etymologise
-    etymologized, etymologised
-    etymologizes, etymologises
-    etymologizing, etymologising
-    eudemon, eudaemon
-    eudemonia, eudaemonia
-    eudemonic, eudaemonic
-    eudemonics, eudaemonics
-    eudemonism, eudaemonism
-    eudemonisms, eudaemonisms
-    eudemonist's, eudaemonist's
-    eudemonist, eudaemonist
-    eudemonistic, eudaemonistic
-    eudemonistical, eudaemonistical
-    eudemonistically, eudaemonistically
-    eudemonists, eudaemonists
-    eudemons, eudaemons
-    eudemony, eudaemony
-    euhemerize, euhemerise
-    euhemerized, euhemerised
-    euhemerizes, euhemerises
-    euhemerizing, euhemerising
-    eukaryote's, eucaryote's
-    eukaryote, eucaryote
-    eukaryotes, eucaryotes
-    eukaryotic, eucaryotic
-    eulogization's, eulogisation's
-    eulogization, eulogisation
-    eulogizations, eulogisations
-    eulogize, eulogise
-    eulogized, eulogised
-    eulogizer's, eulogiser's
-    eulogizer, eulogiser
-    eulogizers, eulogisers
-    eulogizes, eulogises
-    eulogizing, eulogising
-    eunuchize, eunuchise
-    eunuchized, eunuchised
-    eunuchizes, eunuchises
-    eunuchizing, eunuchising
-    euphemization's, euphemisation's
-    euphemization, euphemisation
-    euphemize, euphemise
-    euphemized, euphemised
-    euphemizer's, euphemiser's
-    euphemizer, euphemiser
-    euphemizers, euphemisers
-    euphemizes, euphemises
-    euphemizing, euphemising
-    euphonization, euphonisation
-    euphonize, euphonise
-    euphonized, euphonised
-    euphonizes, euphonises
-    euphonizing, euphonising
-    euphuize, euphuise
-    euphuized, euphuised
-    euphuizes, euphuises
-    euphuizing, euphuising
-    eupnea's, eupnoea's
-    eupnea, eupnoea
-    eupneas, eupnoeas
-    eupneic, eupnoeic
-    Europeanization's, Europeanisation's
-    Europeanization, Europeanisation
-    Europeanizations, Europeanisations
-    Europeanize, Europeanise
-    europeanize, europeanise
-    Europeanized, Europeanised
-    europeanized, europeanised
-    Europeanizes, Europeanises
-    europeanizes, europeanises
-    Europeanizing, Europeanising
-    europeanizing, europeanising
-    Euryale's, Euryalae's
-    Euryale, Euryalae
-    evangelization's, evangelisation's
-    evangelization, evangelisation
-    evangelizations, evangelisations
-    evangelize, evangelise
-    evangelized, evangelised
-    evangelizer's, evangeliser's
-    evangelizer, evangeliser
-    evangelizers, evangelisers
-    evangelizes, evangelises
-    evangelizing, evangelising
-    eventualize, eventualise
-    eventualized, eventualised
-    eventualizes, eventualises
-    eventualizing, eventualising
-    eviler, eviller
-    evilest, evillest
-    eviternal, aeviternal
-    evolutionize, evolutionise
-    evolutionizes, evolutionises
-    excursionize, excursionise
-    excursionized, excursionised
-    excursionizes, excursionises
-    excursionizing, excursionising
-    exestuate, exaestuate
-    exhibitionize, exhibitionise
-    exhibitionizes, exhibitionises
-    existentialize, existentialise
-    existentializes, existentialises
-    exorcise, exorcize
-    exorcised, exorcized
-    exorcises, exorcizes
-    exorcising, exorcizing
-    exorcization, exorcisation
-    exorcizement, exorcisement
-    exorcizer's, exorciser's
-    exorcizer, exorciser
-    exorcizers, exorcisers
-    expediter's, expeditor's
-    expediter, expeditor
-    expediters, expeditors
-    experimentalize, experimentalise
-    experimentalized, experimentalised
-    experimentalizes, experimentalises
-    experimentalizing, experimentalising
-    experimentize, experimentise
-    experimentizes, experimentises
-    expertized, expertised
-    expertizing, expertising
-    exsiccate, exsiccatae
-    extemporization's, extemporisation's
-    extemporization, extemporisation
-    extemporizations, extemporisations
-    extemporize, extemporise
-    extemporized, extemporised
-    extemporizer's, extemporiser's
-    extemporizer, extemporiser
-    extemporizers, extemporisers
-    extemporizes, extemporises
-    extemporizing, extemporising
-    extendable, extendible
-    exteriorization's, exteriorisation's
-    exteriorization, exteriorisation
-    exteriorizations, exteriorisations
-    exteriorize, exteriorise
-    exteriorized, exteriorised
-    exteriorizes, exteriorises
-    exteriorizing, exteriorising
-    externalization's, externalisation's
-    externalization, externalisation
-    externalizations, externalisations
-    externalize, externalise
-    externalized, externalised
-    externalizes, externalises
-    externalizing, externalising
-    extol, extoll
-    extols, extolls
-    extrovert's, extravert's
-    extrovert, extravert
-    extroverted, extraverted
-    extroverts, extraverts
-    eyeing, eying
-    fabulize, fabulise
-    fabulized, fabulised
-    fabulizes, fabulises
-    fabulizing, fabulising
-    facsimilize, facsimilise
-    facsimilizes, facsimilises
-    factorization's, factorisation's
-    factorization, factorisation
-    factorizations, factorisations
-    factorize, factorise
-    factorized, factorised
-    factorizes, factorises
-    factorizing, factorising
-    faence's, faoence's
-    faence, faoence
-    faerie's, faery's
-    faerie, faery
-    faitor, faitour
-    faitors, faitours
-    falafel's, felafel's
-    falafel, felafel
-    familiarization's, familiarisation's
-    familiarization, familiarisation
-    familiarizations, familiarisations
-    familiarize, familiarise
-    familiarized, familiarised
-    familiarizer's, familiariser's
-    familiarizer, familiariser
-    familiarizers, familiarisers
-    familiarizes, familiarises
-    familiarizing, familiarising
-    familiarizingly, familiarisingly
-    fanaticize, fanaticise
-    fanaticized, fanaticised
-    fanaticizes, fanaticises
-    fanaticizing, fanaticising
-    fantasied, phantasied
-    fantasies, phantasies
-    fantasize, fantasise
-    fantasized, fantasised
-    fantasizer, fantasiser
-    fantasizes, fantasises
-    fantasizing, fantasising
-    fantasy's, phantasy's
-    fantasy, phantasy
-    fantasying, phantasying
-    faradization's, faradisation's
-    faradization, faradisation
-    faradizations, faradisations
-    faradize, faradise
-    faradized, faradised
-    faradizer's, faradiser's
-    faradizer, faradiser
-    faradizers, faradisers
-    faradizes, faradises
-    faradizing, faradising
-    fasciole, fasciolae
-    fascisticization's, fascisticisation's
-    fascisticization, fascisticisation
-    fascisticizations, fascisticisations
-    fascisticize, fascisticise
-    fascisticizes, fascisticises
-    fascistization's, fascistisation's
-    fascistization, fascistisation
-    fascistizations, fascistisations
-    fascistize, fascistise
-    fascistized, fascistised
-    fascistizes, fascistises
-    fascistizing, fascistising
-    fashionize, fashionise
-    fashionizes, fashionises
-    fatalize, fatalise
-    fatalizes, fatalises
-    favor's, favour's
-    favor, favour
-    favorable's, favourable's
-    favorable, favourable
-    favorableness's, favourableness's
-    favorableness, favourableness
-    favorablenesses, favourablenesses
-    favorabler, favourabler
-    favorables, favourables
-    favorablest, favourablest
-    favorablier, favourablier
-    favorabliest, favourabliest
-    favorably, favourably
-    favored's, favoured's
-    favored, favoured
-    favoredlier, favouredlier
-    favoredliest, favouredliest
-    favoredly, favouredly
-    favoredness's, favouredness's
-    favoredness, favouredness
-    favorednesses, favourednesses
-    favoreds, favoureds
-    favorer's, favourer's
-    favorer, favourer
-    favorers, favourers
-    favoress, favouress
-    favoring's, favouring's
-    favoring, favouring
-    favoringlier, favouringlier
-    favoringliest, favouringliest
-    favoringly, favouringly
-    favorings, favourings
-    favorite's, favourite's
-    favorite, favourite
-    favoriter, favouriter
-    favorites, favourites
-    favoritest, favouritest
-    favoritism's, favouritism's
-    favoritism, favouritism
-    favoritisms, favouritisms
-    favorless, favourless
-    favorlesser, favourlesser
-    favorlesses, favourlesses
-    favorlessest, favourlessest
-    favors, favours
-    fayer, fayre
-    fe, fae
-    fecal, faecal
-    fecalith, faecalith
-    feces's, faeces's
-    feces, faeces
-    fecula, faecula
-    feculence, faeculence
-    Fecunditatis's, Foecunditatis's
-    Fecunditatis, Foecunditatis
-    fecundize, fecundise
-    fecundizes, fecundises
-    fedarie, foedarie
-    fedaries, foedaries
-    federalization's, federalisation's
-    federalization, federalisation
-    federalizations, federalisations
-    federalize, federalise
-    federalized, federalised
-    federalizes, federalises
-    federalizing, federalising
-    Fedor's, Faedor's
-    Fedor, Faedor
-    feer, fere
-    feers, feres
-    femalize, femalise
-    femalizes, femalises
-    feminization's, feminisation's
-    feminization, feminisation
-    feminizations, feminisations
-    feminize, feminise
-    feminized, feminised
-    feminizes, feminises
-    feminizing, feminising
-    femtometer, femtometre
-    femtometers, femtometres
-    feralized, feralised
-    ferd, fred
-    ferie, feriae
-    ferity, freity
-    Ferneau's, Freneau's
-    Ferneau, Freneau
-    ferreled, ferrelled
-    ferreling, ferrelling
-    ferritization's, ferritisation's
-    ferritization, ferritisation
-    ferritizations, ferritisations
-    fertilizability's, fertilisability's
-    fertilizability, fertilisability
-    fertilizable's, fertilisable's
-    fertilizable, fertilisable
-    fertilizabler, fertilisabler
-    fertilizables, fertilisables
-    fertilizablest, fertilisablest
-    fertilization's, fertilisation's
-    fertilization, fertilisation
-    fertilizational's, fertilisational's
-    fertilizational, fertilisational
-    fertilizationaler, fertilisationaler
-    fertilizationalest, fertilisationalest
-    fertilizationals, fertilisationals
-    fertilizations, fertilisations
-    fertilize, fertilise
-    fertilized, fertilised
-    fertilizer's, fertiliser's
-    fertilizer, fertiliser
-    fertilizers, fertilisers
-    fertilizes, fertilises
-    fertilizing, fertilising
-    fervor's, fervour's
-    fervor, fervour
-    fervorless, fervourless
-    fervorlesses, fervourlesses
-    fervors, fervours
-    fetal, foetal
-    fetalism, foetalism
-    fetation's, foetation's
-    fetation, foetation
-    fetichize, fetichise
-    fetichized, fetichised
-    fetichizes, fetichises
-    fetichizing, fetichising
-    feticidal, foeticidal
-    feticide's, foeticide's
-    feticide, foeticide
-    feticides, foeticides
-    fetid, foetid
-    fetiferous, foetiferous
-    fetiparous, foetiparous
-    fetish's, fetich's
-    fetish, fetich
-    fetishes, fetiches
-    fetishization's, fetishisation's
-    fetishization, fetishisation
-    fetishizations, fetishisations
-    fetishize, fetishise
-    fetishized, fetishised
-    fetishizes, fetishises
-    fetishizing, fetishising
-    fetor's, foetor's
-    fetor, foetor
-    fetors, foetors
-    fetoscopies, foetoscopies
-    fetoscopy, foetoscopy
-    feture, foeture
-    fetus's, foetus's
-    fetus, foetus
-    fetuses, foetuses
-    feudalizable's, feudalisable's
-    feudalizable, feudalisable
-    feudalizables, feudalisables
-    feudalization's, feudalisation's
-    feudalization, feudalisation
-    feudalizations, feudalisations
-    feudalize, feudalise
-    feudalized, feudalised
-    feudalizes, feudalises
-    feudalizing, feudalising
-    feuter, feutre
-    fiber's, fibre's
-    fiber, fibre
-    fiberboard's, fibreboard's
-    fiberboard, fibreboard
-    fiberboards, fibreboards
-    fibered, fibred
-    fiberfill's, fibrefill's
-    fiberfill, fibrefill
-    fiberfills, fibrefills
-    fiberglass's, fibreglass's
-    fiberglass, fibreglass
-    fiberglasses, fibreglasses
-    fiberless, fibreless
-    fiberlesser, fibrelesser
-    fiberlesses, fibrelesses
-    fiberlessest, fibrelessest
-    fibers, fibres
-    fiberscope, fibrescope
-    fiberscopes, fibrescopes
-    fiberware, fibreware
-    fibrisation, fibrization
-    fibrise, fibrize
-    fibrised, fibrized
-    fibriser, fibrizer
-    fibrisers, fibrizers
-    fibrises, fibrizes
-    fibrising, fibrizing
-    fictionalization's, fictionalisation's
-    fictionalization, fictionalisation
-    fictionalizations, fictionalisations
-    fictionalize, fictionalise
-    fictionalized, fictionalised
-    fictionalizes, fictionalises
-    fictionalizing, fictionalising
-    fictionization's, fictionisation's
-    fictionization, fictionisation
-    fictionizations, fictionisations
-    fictionize, fictionise
-    fictionized, fictionised
-    fictionizes, fictionises
-    fictionizing, fictionising
-    figurize, figurise
-    figurizes, figurises
-    filmize, filmise
-    filmizes, filmises
-    filterable, filtrable
-    finalization's, finalisation's
-    finalization, finalisation
-    finalizations, finalisations
-    finalize, finalise
-    finalized, finalised
-    finalizes, finalises
-    finalizing, finalising
-    Finlandization, Finlandisation
-    Finlandizations, Finlandisations
-    fiscalization's, fiscalisation's
-    fiscalization, fiscalisation
-    fiscalizations, fiscalisations
-    fiscalize, fiscalise
-    fiscalizes, fiscalises
-    fjord's, fiord's
-    fjord, fiord
-    fjords, fiords
-    flamboyantize, flamboyantise
-    flamboyantizes, flamboyantises
-    flanneled, flannelled
-    flannelette's, flannelet's
-    flannelette, flannelet
-    flanneling, flannelling
-    flavor's, flavour's
-    flavor, flavour
-    flavored, flavoured
-    flavorer's, flavourer's
-    flavorer, flavourer
-    flavorers, flavourers
-    flavorful, flavourful
-    flavorfuler, flavourfuler
-    flavorfulest, flavourfulest
-    flavorfullier, flavourfullier
-    flavorfulliest, flavourfulliest
-    flavorfully, flavourfully
-    flavorier, flavourier
-    flavoriest, flavouriest
-    flavoring's, flavouring's
-    flavoring, flavouring
-    flavorings, flavourings
-    flavorless, flavourless
-    flavorlesser, flavourlesser
-    flavorlesses, flavourlesses
-    flavorlessest, flavourlessest
-    flavorous, flavourous
-    flavors, flavours
-    flavorsome, flavoursome
-    flavorsomer, flavoursomer
-    flavorsomest, flavoursomest
-    flavory, flavoury
-    fledgling's, fledgeling's
-    fledgling, fledgeling
-    fledglings, fledgelings
-    Fletcherize's, Fletcherise's
-    Fletcherize, Fletcherise
-    Fletcherized's, Fletcherised's
-    Fletcherized, Fletcherised
-    Fletcherizes, Fletcherises
-    Fletcherizing's, Fletcherising's
-    Fletcherizing, Fletcherising
-    flextime's, flexitime's
-    flextime, flexitime
-    flextimes, flexitimes
-    floozy's, floozie's
-    floozy, floozie
-    floralize, floralise
-    floralizes, floralises
-    floramor, floramour
-    flotation's, floatation's
-    flotation, floatation
-    flotations, floatations
-    fluidization's, fluidisation's
-    fluidization, fluidisation
-    fluidizations, fluidisations
-    fluidize, fluidise
-    fluidized, fluidised
-    fluidizer's, fluidiser's
-    fluidizer, fluidiser
-    fluidizers, fluidisers
-    fluidizes, fluidises
-    fluidizing, fluidising
-    fluky, flukey
-    flunkey's, flunkie's
-    flunkie, flunkey
-    flunkies, flunkeys
-    fluoridization's, fluoridisation's
-    fluoridization, fluoridisation
-    fluoridizations, fluoridisations
-    fluoridize, fluoridise
-    fluoridized, fluoridised
-    fluoridizes, fluoridises
-    fluoridizing, fluoridising
-    flutist's, flautist's
-    flutist, flautist
-    flutists, flautists
-    fo'c'sle's, fo'c's'le's
-    fo'c'sle, fo'c's'le
-    fo'c'sles, fo'c's'les
-    focalization's, focalisation's
-    focalization, focalisation
-    focalizations, focalisations
-    focalize, focalise
-    focalized, focalised
-    focalizes, focalises
-    focalizing, focalising
-    focused, focussed
-    focusing, focussing
-    fogies, fogeys
-    fogy's, fogey's
-    fogy, fogey
-    fondue's, fondu's
-    fondue, fondu
-    fondues, fondus
-    fontanel's, fontanelle's
-    fontanel, fontanelle
-    fontanels, fontanelles
-    foolhardize, foolhardise
-    foolhardized, foolhardised
-    foolhardizes, foolhardises
-    foolhardizing, foolhardising
-    forb, fourb
-    forche, fourche
-    foreignization's, foreignisation's
-    foreignization, foreignisation
-    foreignizations, foreignisations
-    foreignize, foreignise
-    foreignizes, foreignises
-    forejudgment's, forejudgement's
-    forejudgment, forejudgement
-    forejudgments, forejudgements
-    foreprize, foreprise
-    forgather, foregather
-    forgathered, foregathered
-    forgathering, foregathering
-    forgathers, foregathers
-    forgo, forego
-    forgoes, foregoes
-    forgoing, foregoing
-    forgone, foregone
-    formalizable, formalisable
-    formalization's, formalisation's
-    formalization, formalisation
-    formalizations, formalisations
-    formalize, formalise
-    formalized, formalised
-    formalizer's, formaliser's
-    formalizer, formaliser
-    formalizers, formalisers
-    formalizes, formalises
-    formalizing, formalising
-    forme, formae
-    formicide, formicidae
-    formularization's, formularisation's
-    formularization, formularisation
-    formularizations, formularisations
-    formularize, formularise
-    formularized, formularised
-    formularizer's, formulariser's
-    formularizer, formulariser
-    formularizers, formularisers
-    formularizes, formularises
-    formularizing's, formularising's
-    formularizing, formularising
-    formulization's, formulisation's
-    formulization, formulisation
-    formulizations, formulisations
-    formulize, formulise
-    formulized, formulised
-    formulizer's, formuliser's
-    formulizer, formuliser
-    formulizes, formulises
-    formulizing, formulising
-    forswear, foreswear
-    forswearing, foreswearing
-    forswears, foreswears
-    forswore, foreswore
-    forsworn, foresworn
-    forsworn, foresworn
-    forumize, forumise
-    forumizes, forumises
-    forwent, forewent
-    fosse, fossae
-    fossiled, fossilled
-    fossilizable's, fossilisable's
-    fossilizable, fossilisable
-    fossilizabler, fossilisabler
-    fossilizables, fossilisables
-    fossilizablest, fossilisablest
-    fossilization's, fossilisation's
-    fossilization, fossilisation
-    fossilizations, fossilisations
-    fossilize, fossilise
-    fossilized, fossilised
-    fossilizes, fossilises
-    fossilizing, fossilising
-    fossule, fossulae
-    foulder, fouldre
-    fouter, foutre
-    fouters, foutres
-    foveole, foveolae
-    fractionalization's, fractionalisation's
-    fractionalization, fractionalisation
-    fractionalizations, fractionalisations
-    fractionalize, fractionalise
-    fractionalized, fractionalised
-    fractionalizes, fractionalises
-    fractionalizing, fractionalising
-    fractionization's, fractionisation's
-    fractionization, fractionisation
-    fractionizations, fractionisations
-    fractionize, fractionise
-    fractionized, fractionised
-    fractionizes, fractionises
-    fractionizing, fractionising
-    fragmentization's, fragmentisation's
-    fragmentization, fragmentisation
-    fragmentize, fragmentise
-    fragmentized, fragmentised
-    fragmentizer, fragmentiser
-    fragmentizes, fragmentises
-    fragmentizing, fragmentising
-    frambesia's, framboesia's
-    frambesia, framboesia
-    frambesias, framboesias
-    Francize's, Francise's
-    Francize, Francise
-    Francizes, Francises
-    Franklinization's, Franklinisation's
-    Franklinization, Franklinisation
-    Franklinizations, Franklinisations
-    fraternization's, fraternisation's
-    fraternization, fraternisation
-    fraternizations, fraternisations
-    fraternize, fraternise
-    fraternized, fraternised
-    fraternizer's, fraterniser's
-    fraternizer, fraterniser
-    fraternizers, fraternisers
-    fraternizes, fraternises
-    fraternizing, fraternising
-    freebie's, freebee's
-    freebie, freebee
-    freebies, freebees
-    frena, fraena
-    Frenchize's, Frenchise's
-    Frenchize, Frenchise
-    Frenchizes, Frenchises
-    frenetic, phrenetic
-    frenula, fraenula
-    frenular, fraenular
-    frenulum's, fraenulum's
-    frenulum, fraenulum
-    frenum's, fraenum's
-    frenum, fraenum
-    frenums, fraenums
-    friborg, fribourg
-    frictionize, frictionise
-    frictionizes, frictionises
-    frivoled, frivolled
-    frivoler's, frivoller's
-    frivoler, frivoller
-    frivolers, frivollers
-    frivoling, frivolling
-    frizado, frisado
-    frize, frise
-    frizette's, frisette's
-    frizette, frisette
-    frizettes, frisettes
-    frizz's, friz's
-    frizz, friz
-    frowzier, frowsier
-    frowziest, frowsiest
-    frowzy, frowsy
-    fryer's, frier's
-    fryer, frier
-    fryers, friers
-    fuehrer's, f¸hrer's
-    fuehrer, f¸hrer
-    fuehrers, f¸hrers
-    fueled, fuelled
-    fueler's, fueller's
-    fueler, fueller
-    fuelers, fuellers
-    fueling, fuelling
-    fuelizer's, fueliser's
-    fuelizer, fueliser
-    fuelizers, fuelisers
-    fulfill, fulfil
-    fulfillment's, fulfilment's
-    fulfillment, fulfilment
-    fulfillments, fulfilments
-    fulfills, fulfils
-    fulgor, fulgour
-    fulgorous, fulgourous
-    fulgors, fulgours
-    fullness's, fulness's
-    fullness, fulness
-    fullnesses, fulnesses
-    functionalize, functionalise
-    functionalizes, functionalises
-    functionize, functionise
-    functionizes, functionises
-    funeralize, funeralise
-    funeralizes, funeralises
-    funneled, funnelled
-    funneler, funneller
-    funneling, funnelling
-    furcule, furculae
-    Furie's, Furiae's
-    Furie, Furiae
-    furor's, furore's
-    furor, furore
-    furors, furores
-    fusilier's, fusileer's
-    fusilier, fusileer
-    fusiliers, fusileers
-    fustianize, fustianise
-    fustianized, fustianised
-    fustianizes, fustianises
-    fustianizing, fustianising
-    futilize, futilise
-    futilizes, futilises
-    futurize, futurise
-    futurizes, futurises
-    gaberdine's, gabardine's
-    gaberdine, gabardine
-    gaberdines, gabardines
-    Gaelicization's, Gaelicisation's
-    Gaelicization, Gaelicisation
-    Gaelicizations, Gaelicisations
-    Gaelicize's, Gaelicise's
-    Gaelicize, Gaelicise
-    gaelicize, gaelicise
-    gaelicized, gaelicised
-    Gaelicizes, Gaelicises
-    gaelicizes, gaelicises
-    gaelicizing, gaelicising
-    gaiety's, gayety's
-    gaiety, gayety
-    gaily, gayly
-    galactorrhea, galactorrhoea
-    galactorrheas, galactorrhoeas
-    galactosemia, galactosaemia
-    galactosemias, galactosaemias
-    galee, galeae
-    gallantize, gallantise
-    gallantizes, gallantises
-    galliardize, galliardise
-    Gallicization's, Gallicisation's
-    Gallicization, Gallicisation
-    Gallicizations, Gallicisations
-    Gallicize, Gallicise
-    gallicize, gallicise
-    Gallicized, Gallicised
-    gallicized, gallicised
-    Gallicizer's, Galliciser's
-    Gallicizer, Galliciser
-    Gallicizes, Gallicises
-    gallicizes, gallicises
-    Gallicizing, Gallicising
-    gallicizing, gallicising
-    gallisize, gallisise
-    gallisized, gallisised
-    gallisizes, gallisises
-    gallisizing, gallisising
-    gallize, gallise
-    gallized, gallised
-    gallizes, gallises
-    gallizing, gallising
-    galosh's, galoshe's
-    galosh, galoshe
-    galvanization's, galvanisation's
-    galvanization, galvanisation
-    galvanizations, galvanisations
-    galvanize, galvanise
-    galvanized, galvanised
-    galvanizer's, galvaniser's
-    galvanizer, galvaniser
-    galvanizers, galvanisers
-    galvanizes, galvanises
-    galvanizing, galvanising
-    gambades, gambadoes
-    gamboled, gambolled
-    gamboling, gambolling
-    gamy, gamey
-    gargarize, gargarise
-    gargarized, gargarised
-    gargarizes, gargarises
-    gargarizing, gargarising
-    garotting, garoting
-    garrotte's, garote's
-    garrotte, garote
-    garrotted, garoted
-    garrottes, garotes
-    garruline, garrulinae
-    gases, gasses
-    gasoline's, gasolene's
-    gasoline, gasolene
-    gasolines, gasolenes
-    gastrea, gastraea
-    gastreas, gastraeas
-    gastrocele, gastrocoele
-    gaufer, gaufre
-    gaufers, gaufres
-    gauffer, gauffre
-    gauge's, gage's
-    gauge, gage
-    gauged, gaged
-    gauges, gages
-    gauging, gaging
-    gaveled, gavelled
-    gaveler, gaveller
-    gaveling, gavelling
-    ge, gae
-    ge, goe
-    ged, gaed
-    gelatin's, gelatine's
-    gelatin, gelatine
-    gelatinizabilities, gelatinisabilities
-    gelatinizability's, gelatinisability's
-    gelatinizability, gelatinisability
-    gelatinizable's, gelatinisable's
-    gelatinizable, gelatinisable
-    gelatinizables, gelatinisables
-    gelatinization's, gelatinisation's
-    gelatinization, gelatinisation
-    gelatinizations, gelatinisations
-    gelatinize, gelatinise
-    gelatinized, gelatinised
-    gelatinizer's, gelatiniser's
-    gelatinizer, gelatiniser
-    gelatinizers, gelatinisers
-    gelatinizes, gelatinises
-    gelatinizing, gelatinising
-    gelatins, gelatines
-    gelofer, gelofre
-    gemologies, gemmologies
-    gemology's, gemmology's
-    gemology, gemmology
-    genealogize, genealogise
-    genealogized, genealogised
-    genealogizes, genealogises
-    genealogizing, genealogising
-    generalizability, generalisability
-    generalizable's, generalisable's
-    generalizable, generalisable
-    generalizabler, generalisabler
-    generalizables, generalisables
-    generalizablest, generalisablest
-    generalization's, generalisation's
-    generalization, generalisation
-    generalizational, generalisational
-    generalizations, generalisations
-    generalize, generalise
-    generalized, generalised
-    generalizer's, generaliser's
-    generalizer, generaliser
-    generalizers, generalisers
-    generalizes, generalises
-    generalizing, generalising
-    genialize, genialise
-    genialized, genialised
-    genializes, genialises
-    genializing, genialising
-    genteelize, genteelise
-    genteelized, genteelised
-    genteelizes, genteelises
-    genteelizing, genteelising
-    gentilization's, gentilisation's
-    gentilization, gentilisation
-    gentilizations, gentilisations
-    gentilize, gentilise
-    gentilized, gentilised
-    gentilizes, gentilises
-    gentilizing, gentilising
-    gentlemanize, gentlemanise
-    gentlemanizes, gentlemanises
-    geodesia, geodaesia
-    geologize, geologise
-    geologized, geologised
-    geologizes, geologises
-    geologizing, geologising
-    geometricize, geometricise
-    geometricizes, geometricises
-    geometrization, geometrisation
-    geometrizations, geometrisations
-    geometrize, geometrise
-    geometrized, geometrised
-    geometrizes, geometrises
-    geometrizing, geometrising
-    ger, gre
-    gerenuk, greenuk
-    Germanization's, Germanisation's
-    germanization's, germanisation's
-    Germanization, Germanisation
-    germanization, germanisation
-    germanizations, germanisations
-    Germanize, Germanise
-    germanize, germanise
-    Germanized, Germanised
-    germanized, germanised
-    Germanizer's, Germaniser's
-    Germanizer, Germaniser
-    germanizer, germaniser
-    germanizers, germanisers
-    Germanizes, Germanises
-    germanizes, germanises
-    Germanizing, Germanising
-    germanizing, germanising
-    gerne, grene
-    gers, gres
-    Ges, Goes
-    gessed, gessoed
-    gesses, gessoes
-    geste, gestae
-    Getae's, Goetae's
-    Getae, Goetae
-    Getz's, Goetz's
-    Getz, Goetz
-    Getzville's, Goetzville's
-    Getzville, Goetzville
-    gewgaw's, geegaw's
-    gewgaw, geegaw
-    gewgaws, geegaws
-    gey, goey
-    Gheber's, Ghebre's
-    Gheber, Ghebre
-    Ghebers, Ghebres
-    ghettoization's, ghettoisation's
-    ghettoization, ghettoisation
-    ghettoizations, ghettoisations
-    ghettoize, ghettoise
-    ghettoized, ghettoised
-    ghettoizes, ghettoises
-    ghettoizing, ghettoising
-    giantize, giantise
-    giantizes, giantises
-    gigagram, gigagramme
-    gigagrams, gigagrammes
-    gigameter, gigametre
-    gigameters, gigametres
-    gimbaled, gimballed
-    gimbaling, gimballing
-    gingkos, gingkoes
-    ginkgo's, gingko's
-    ginkgo, gingko
-    girly, girlie
-    gizmo's, gismo's
-    gizmo, gismo
-    gizmos, gismos
-    glacialize, glacialise
-    glacializes, glacialises
-    glamorization's, glamorisation's
-    glamorizations, glamorisations
-    glamorless, glamourless
-    glamorous, glamourous
-    glamorousness's, glamourousness's
-    glamorousness, glamourousness
-    glamour's, glamor's
-    glamour, glamor
-    glamoured, glamored
-    glamouring, glamoring
-    glamourization, glamorisation
-    glamourize, glamorise
-    glamourized, glamorised
-    glamourizer's, glamoriser's
-    glamourizer, glamoriser
-    glamourizers, glamorisers
-    glamourizes, glamorises
-    glamourizing, glamorising
-    glamours, glamors
-    glauconitization, glauconitisation
-    glauconitizations, glauconitisations
-    glebe, glebae
-    globalization's, globalisation's
-    globalization, globalisation
-    globalizations, globalisations
-    globalize, globalise
-    globalized, globalised
-    globalizes, globalises
-    globalizing, globalising
-    globigerine, globigerinae
-    glottalization's, glottalisation's
-    glottalization, glottalisation
-    glottalize, glottalise
-    glottalizes, glottalises
-    glucemia, glucaemia
-    glucosemia, glucosaemia
-    gluing, glueing
-    gluteal, glutaeal
-    glutei, glutaei
-    gluteus, glutaeus
-    gluttonize, gluttonise
-    gluttonized, gluttonised
-    gluttonizes, gluttonises
-    gluttonizing, gluttonising
-    glycemia, glycaemia
-    glycemic, glycaemic
-    glycerin's, glycerine's
-    glycerin, glycerine
-    glycerinize, glycerinise
-    glycerinizes, glycerinises
-    glycerins, glycerines
-    glycerolize, glycerolise
-    glycerolized, glycerolised
-    glycerolizes, glycerolises
-    glycogenize, glycogenise
-    glycogenizes, glycogenises
-    glycohemia, glycohaemia
-    glycosemia, glycosaemia
-    Gnosticize, Gnosticise
-    gnosticize, gnosticise
-    Gnosticized's, Gnosticised's
-    Gnosticized, Gnosticised
-    Gnosticizer's, Gnosticiser's
-    Gnosticizer, Gnosticiser
-    gnosticizer, gnosticiser
-    gnosticizers, gnosticisers
-    Gnosticizes, Gnosticises
-    gnosticizes, gnosticises
-    Gnosticizing's, Gnosticising's
-    Gnosticizing, Gnosticising
-    gobbledygook's, gobbledegook's
-    gobbledygook, gobbledegook
-    gobbledygooks, gobbledegooks
-    goddamn's, goddam's
-    goddamn, goddam
-    goddamned, goddamed
-    goddamning, goddaming
-    goddamns, goddams
-    goddize, goddise
-    goddizes, goddises
-    goiter's, goitre's
-    goiter, goitre
-    goiters, goitres
-    gole, goloe
-    goliathize, goliathise
-    goliathized, goliathised
-    goliathizes, goliathises
-    goliathizing, goliathising
-    goloshes, goloshoes
-    gonorrhea's, gonorrhoea's
-    gonorrhea, gonorrhoea
-    gonorrheal, gonorrhoeal
-    gonorrhealer, gonorrhoealer
-    gonorrhealest, gonorrhoealest
-    gonorrheas, gonorrhoeas
-    gonorrheic, gonorrhoeic
-    goodbye's, goodby's
-    goodbye, goodby
-    goodbyes, goodbys
-    goody's, goodie's
-    goody, goodie
-    gor, gour
-    Gora's, Goura's
-    Gora, Goura
-    gora, goura
-    goramies, gouramies
-    gorgonize, gorgonise
-    gorgonized, gorgonised
-    gorgonizes, gorgonises
-    gorgonizing, gorgonising
-    gormandism's, gourmandism's
-    gormandism, gourmandism
-    gormandisms, gourmandisms
-    gormandize's, gormandise's
-    gormandize, gormandise
-    gormandized, gormandised
-    gormandizer's, gormandiser's
-    gormandizer, gormandiser
-    gormandizers, gormandisers
-    gormandizes, gormandises
-    gormandizing, gormandising
-    gormandizings, gormandisings
-    gospeler's, gospeller's
-    gospeler, gospeller
-    gospelers, gospellers
-    gospelize, gospelise
-    gospelized, gospelised
-    gospelizes, gospelises
-    gospelizing, gospelising
-    gospellize, gospellise
-    gospellized, gospellised
-    gospellizes, gospellises
-    gospellizing, gospellising
-    Gothicize, Gothicise
-    gothicize, gothicise
-    Gothicized, Gothicised
-    gothicized, gothicised
-    Gothicizer's, Gothiciser's
-    Gothicizer, Gothiciser
-    Gothicizers, Gothicisers
-    Gothicizes, Gothicises
-    gothicizes, gothicises
-    Gothicizing, Gothicising
-    gothicizing, gothicising
-    gourmandize, gourmandise
-    gourmandized, gourmandised
-    gourmandizes, gourmandises
-    gourmandizing, gourmandising
-    governmentalize, governmentalise
-    governmentalized, governmentalised
-    governmentalizes, governmentalises
-    governmentalizing, governmentalising
-    Goyesque, Goyaesque
-    Graecize, Graecise
-    Graecized, Graecised
-    Graecizes, Graecises
-    grammaticize, grammaticise
-    grammaticized, grammaticised
-    grammaticizes, grammaticises
-    grammaticizing, grammaticising
-    granddad's, grandad's
-    granddad, grandad
-    granddads, grandads
-    grangerization's, grangerisation's
-    grangerization, grangerisation
-    grangerizations, grangerisations
-    grangerize, grangerise
-    grangerized, grangerised
-    grangerizer's, grangeriser's
-    grangerizer, grangeriser
-    grangerizers, grangerisers
-    grangerizes, grangerises
-    grangerizing, grangerising
-    granitization's, granitisation's
-    granitization, granitisation
-    granitizations, granitisations
-    granitize, granitise
-    granitized, granitised
-    granitizes, granitises
-    granitizing, granitising
-    granny's, grannie's
-    granny, grannie
-    granulitization, granulitisation
-    granulitizations, granulitisations
-    granulize, granulise
-    granulizes, granulises
-    graphitizable, graphitisable
-    graphitization's, graphitisation's
-    graphitization, graphitisation
-    graphitizations, graphitisations
-    graphitize, graphitise
-    graphitized, graphitised
-    graphitizes, graphitises
-    graphitizing, graphitising
-    graveled, gravelled
-    graveling, gravelling
-    gray's, grey's
-    gray, grey
-    grayed, greyed
-    grayer, greyer
-    grayest, greyest
-    graying, greying
-    grayish, greyish
-    grayness's, greyness's
-    grayness, greyness
-    grays, greys
-    grecian, graecian
-    Grecianize, Grecianise
-    Grecianizes, Grecianises
-    Grecise's, Graecise's
-    Grecise, Graecise
-    Grecised's, Graecised's
-    Grecised, Graecised
-    Grecising's, Graecising's
-    Grecising, Graecising
-    Grecism's, Graecism's
-    Grecism, Graecism
-    grecism, graecism
-    Grecisms, Graecisms
-    Grecize, Grecise
-    grecize, grecise
-    Grecized, Grecised
-    grecized, grecised
-    grecizes, grecises
-    Grecizing, Grecising
-    grecizing, grecising
-    Greekize's, Greekise's
-    Greekize, Greekise
-    Greekizes, Greekises
-    greisenization, greisenisation
-    greisenizations, greisenisations
-    greisenize, greisenise
-    greisenized, greisenised
-    greisenizes, greisenises
-    greisenizing, greisenising
-    grizard, grisard
-    grize, grise
-    grizes, grises
-    groveled, grovelled
-    groveler's, groveller's
-    groveler, groveller
-    grovelers, grovellers
-    groveling, grovelling
-    grovelinglier, grovellinglier
-    grovelingliest, grovellingliest
-    grovelingly, grovellingly
-    grueled, gruelled
-    grueler's, grueller's
-    grueler, grueller
-    gruelers, gruellers
-    grueling's, gruelling's
-    grueling, gruelling
-    gruelingly, gruellingly
-    gruelings, gruellings
-    Gueber's, Guebre's
-    Gueber, Guebre
-    Guebers, Guebres
-    guerrilla's, guerilla's
-    guerrilla, guerilla
-    guerrillas, guerillas
-    guizer, guiser
-    guizers, guisers
-    gule, gulae
-    gunwale's, gunnel's
-    gunwale, gunnel
-    gunwales, gunnels
-    gutte, guttae
-    guttule, guttulae
-    gutturalization's, gutturalisation's
-    gutturalization, gutturalisation
-    gutturalizations, gutturalisations
-    gutturalize, gutturalise
-    gutturalized, gutturalised
-    gutturalizes, gutturalises
-    gutturalizing, gutturalising
-    gyne, gynae
-    gynecic, gynaecic
-    gynecocracies, gynaecocracies
-    gynecocracy's, gynaecocracy's
-    gynecocracy, gynaecocracy
-    gynecocrat's, gynaecocrat's
-    gynecocrat, gynaecocrat
-    gynecocratic, gynaecocratic
-    gynecocraticer, gynaecocraticer
-    gynecocraticest, gynaecocraticest
-    gynecocrats, gynaecocrats
-    gynecoid, gynaecoid
-    gynecol, gynaecol
-    gynecologic, gynaecologic
-    gynecological's, gynaecological's
-    gynecological, gynaecological
-    gynecologicaler, gynaecologicaler
-    gynecologicalest, gynaecologicalest
-    gynecologicals, gynaecologicals
-    gynecologicer, gynaecologicer
-    gynecologicest, gynaecologicest
-    gynecologics, gynaecologics
-    gynecologies, gynaecologies
-    gynecologist's, gynaecologist's
-    gynecologist, gynaecologist
-    gynecologists, gynaecologists
-    gynecology's, gynaecology's
-    gynecology, gynaecology
-    gynecomastia's, gynaecomastia's
-    gynecomastia, gynaecomastia
-    gynecomastias, gynaecomastias
-    gynecomasty's, gynaecomasty's
-    gynecomasty, gynaecomasty
-    gynecomorphous, gynaecomorphous
-    gyneconitis, gynaeconitis
-    gyneocracy, gynaeocracy
-    gyneolater, gynaeolater
-    gyneolatry, gynaeolatry
-    gynomonecious, gynomonoecious
-    gypsies, gipsies
-    gypsy's, gipsy's
-    gypsy, gipsy
-    gyrostabilization, gyrostabilisation
-    gyrostabilizations, gyrostabilisations
-    gyrostabilizer's, gyrostabiliser's
-    gyrostabilizer, gyrostabiliser
-    gyrostabilizers, gyrostabilisers
-    ha, hah
-    habitualize, habitualise
-    habitualizes, habitualises
-    hairdryer's, hairdrier's
-    hairdryer, hairdrier
-    hairdryers, hairdriers
-    hajj's, hadj's
-    hajj, hadj
-    hajji's, hadji's
-    hajji, hadji
-    hajjis, hadjis
-    hajjs, hadjs
-    hallo's, hollo's
-    hallo, hollo
-    halloing, holloing
-    hamletization's, hamletisation's
-    hamletization, hamletisation
-    hamletizations, hamletisations
-    hamletize, hamletise
-    hamletizes, hamletises
-    handseled, handselled
-    handseling, handselling
-    hankie's, hanky's
-    hankie, hanky
-    Hanoverianize's, Hanoverianise's
-    Hanoverianize, Hanoverianise
-    Hanoverianizes, Hanoverianises
-    Hanoverize's, Hanoverise's
-    Hanoverize, Hanoverise
-    Hanoverizes, Hanoverises
-    hansardize, hansardise
-    hansardized, hansardised
-    hansardizes, hansardises
-    hansardizing, hansardising
-    hanseled, hanselled
-    hanseling, hanselling
-    harbor's, harbour's
-    harbor, harbour
-    harborage's, harbourage's
-    harborage, harbourage
-    harborages, harbourages
-    harbored, harboured
-    harborer's, harbourer's
-    harborer, harbourer
-    harborers, harbourers
-    harborful, harbourful
-    harboring, harbouring
-    harborless, harbourless
-    harborlesser, harbourlesser
-    harborlesses, harbourlesses
-    harborlessest, harbourlessest
-    harborous, harbourous
-    harbors, harbours
-    harborside, harbourside
-    harborward, harbourward
-    harmonizable's, harmonisable's
-    harmonizable, harmonisable
-    harmonizabler, harmonisabler
-    harmonizables, harmonisables
-    harmonizablest, harmonisablest
-    harmonization's, harmonisation's
-    harmonization, harmonisation
-    harmonizations, harmonisations
-    harmonize, harmonise
-    harmonized, harmonised
-    harmonizer's, harmoniser's
-    harmonizer, harmoniser
-    harmonizers, harmonisers
-    harmonizes, harmonises
-    harmonizing, harmonising
-    Harmothoe's, Harmothoae's
-    Harmothoe, Harmothoae
-    Harvardize's, Harvardise's
-    Harvardize, Harvardise
-    Harvardizes, Harvardises
-    Harveyize's, Harveyise's
-    Harveyize, Harveyise
-    Harveyizes, Harveyises
-    hasheesh's, haschisch's
-    hasheesh, haschisch
-    Hasidean's, Hasidaean's
-    Hasidean, Hasidaean
-    Hasmonean, Hasmonaean
-    Hasmoneans, Hasmonaeans
-    hatcheled, hatchelled
-    hatcheling, hatchelling
-    Hattize's, Hattise's
-    Hattize, Hattise
-    Hattizes, Hattises
-    haussmannization, haussmannisation
-    haussmannizations, haussmannisations
-    haussmannize, haussmannise
-    haussmannized, haussmannised
-    haussmannizes, haussmannises
-    haussmannizing, haussmannising
-    havior, haviour
-    haviored, havioured
-    haviors, haviours
-    hazardize, hazardise
-    hazardizes, hazardises
-    heathenization, heathenisation
-    heathenize, heathenise
-    heathenized, heathenised
-    heathenizes, heathenises
-    heathenizing, heathenising
-    heavenize, heavenise
-    heavenizes, heavenises
-    Hebraicize's, Hebraicise's
-    Hebraicize, Hebraicise
-    Hebraicizes, Hebraicises
-    Hebraization's, Hebraisation's
-    Hebraization, Hebraisation
-    hebraization, hebraisation
-    hebraizations, hebraisations
-    Hebraize, Hebraise
-    hebraize, hebraise
-    Hebraized, Hebraised
-    hebraized, hebraised
-    Hebraizer's, Hebraiser's
-    Hebraizer, Hebraiser
-    Hebraizes, Hebraises
-    hebraizes, hebraises
-    Hebraizing, Hebraising
-    hebraizing, hebraising
-    Hecatean's, Hecataean's
-    Hecatean, Hecataean
-    hectogram's, hectogramme's
-    hectogram, hectogramme
-    hectograms, hectogrammes
-    hectoliter's, hectolitre's
-    hectoliter, hectolitre
-    hectoliters, hectolitres
-    hectometer's, hectometre's
-    hectometer, hectometre
-    hectometers, hectometres
-    hed, haed
-    Hegelianize's, Hegelianise's
-    Hegelianize, Hegelianise
-    Hegelianizes, Hegelianises
-    Hekatean's, Hekataean's
-    Hekatean, Hekataean
-    hele, heloe
-    helled, helloed
-    Hellenization's, Hellenisation's
-    Hellenization, Hellenisation
-    Hellenizations, Hellenisations
-    Hellenize, Hellenise
-    hellenize, hellenise
-    Hellenized, Hellenised
-    hellenized, hellenised
-    Hellenizer's, Helleniser's
-    Hellenizer, Helleniser
-    Hellenizes, Hellenises
-    hellenizes, hellenises
-    Hellenizing, Hellenising
-    hellenizing, hellenising
-    hemachrome's, haemachrome's
-    hemachrome, haemachrome
-    hemacytometer's, haemacytometer's
-    hemacytometer, haemacytometer
-    hemad, haemad
-    hemagglutinate, haemagglutinate
-    hemagglutinated, haemagglutinated
-    hemagglutinating, haemagglutinating
-    hemagglutination's, haemagglutination's
-    hemagglutination, haemagglutination
-    hemagglutinative, haemagglutinative
-    hemagglutinin, haemagglutinin
-    hemagogue, haemagogue
-    hemal, haemal
-    hemameba, hemamoeba
-    hemangioma's, haemangioma's
-    hemangioma, haemangioma
-    hemangiomas, haemangiomas
-    hemangiomata, haemangiomata
-    hemangiomatosis, haemangiomatosis
-    hemapophysis, haemapophysis
-    hemaspectroscope, haemaspectroscope
-    hematal, haematal
-    hematein's, haematein's
-    hematein, haematein
-    hematemesis, haematemesis
-    hematherm, haematherm
-    hemathermal, haemathermal
-    hemathermous, haemathermous
-    hematic, haematic
-    hematics, haematics
-    hematid, haematid
-    hematin's, haematin's
-    hematin, haematin
-    hematinic's, haematinic's
-    hematinic, haematinic
-    hematinics, haematinics
-    hematins, haematins
-    hematite's, haematite's
-    hematite, haematite
-    hematites, haematites
-    hematitic, haematitic
-    hematoblast's, haematoblast's
-    hematoblast, haematoblast
-    hematoblasts, haematoblasts
-    hematobranchiate, haematobranchiate
-    hematocele's, haematocele's
-    hematocele, haematocele
-    hematocrit's, haematocrit's
-    hematocrit, haematocrit
-    hematocrits, haematocrits
-    hematocryal, haematocryal
-    hematocyst's, haematocyst's
-    hematocyst, haematocyst
-    hematocystis, haematocystis
-    hematocyte's, haematocyte's
-    hematocyte, haematocyte
-    hematogeneses, haematogeneses
-    hematogenesis's, haematogenesis's
-    hematogenesis, haematogenesis
-    hematogenous, haematogenous
-    hematoid, haematoid
-    hematoidin, haematoidin
-    hematologic, haematologic
-    hematological, haematological
-    hematologies, haematologies
-    hematologist's, haematologist's
-    hematologist, haematologist
-    hematologists, haematologists
-    hematology's, haematology's
-    hematology, haematology
-    hematolysis, haematolysis
-    hematoma's, haematoma's
-    hematoma, haematoma
-    hematomas, haematomas
-    hematomata, haematomata
-    hematometer, haematometer
-    hematophyte's, haematophyte's
-    hematophyte, haematophyte
-    hematopoieses, haematopoieses
-    hematopoiesis, haematopoiesis
-    hematopoietic, haematopoietic
-    hematorrhachis, haematorrhachis
-    hematosepsis, haematosepsis
-    hematosin, haematosin
-    hematosis's, haematosis's
-    hematosis, haematosis
-    hematothermal, haematothermal
-    hematoxylic, haematoxylic
-    hematoxylin's, haematoxylin's
-    hematoxylin, haematoxylin
-    hematoxylins, haematoxylins
-    hematozoa, haematozoa
-    hematozoal, haematozoal
-    hematozoic, haematozoic
-    hematozoon's, haematozoon's
-    hematozoon, haematozoon
-    hematozzoa, haematozzoa
-    hematuria's, haematuria's
-    hematuria, haematuria
-    hematurias, haematurias
-    heme, haem
-    hemerythrin, hemoerythrin
-    hemic, haemic
-    hemihypesthesia, hemihypoesthesia
-    hemin's, haemin's
-    hemin, haemin
-    hemins, haemins
-    hemoblast's, haemoblast's
-    hemoblast, haemoblast
-    hemochromatoses, haemochromatoses
-    hemochromatosis, haemochromatosis
-    hemochrome, haemochrome
-    hemocoel, haemocoel
-    hemocoels, haemocoels
-    hemoconcentration's, haemoconcentration's
-    hemoconcentration, haemoconcentration
-    hemoconia, haemoconia
-    hemocyanin, haemocyanin
-    hemocyanins, haemocyanins
-    hemocyte's, haemocyte's
-    hemocyte, haemocyte
-    hemocytes, haemocytes
-    hemocytoblast's, haemocytoblast's
-    hemocytoblast, haemocytoblast
-    hemocytoblastic, haemocytoblastic
-    hemocytometer, haemocytometer
-    hemodialyses, haemodialyses
-    hemodialysis's, haemodialysis's
-    hemodialysis, haemodialysis
-    hemodilution, haemodilution
-    hemodynamic, haemodynamic
-    hemodynamics's, haemodynamics's
-    hemodynamics, haemodynamics
-    hemoflagellate's, haemoflagellate's
-    hemoflagellate, haemoflagellate
-    hemoglobic, haemoglobic
-    hemoglobin's, haemoglobin's
-    hemoglobin, haemoglobin
-    hemoglobinopathies, haemoglobinopathies
-    hemoglobinopathy, haemoglobinopathy
-    hemoglobinous, haemoglobinous
-    hemoglobinuria's, haemoglobinuria's
-    hemoglobinuria, haemoglobinuria
-    hemogram, haemogram
-    hemoid, haemoid
-    hemolysin's, haemolysin's
-    hemolysin, haemolysin
-    hemolysis, haemolysis
-    hemolytic, haemolytic
-    hemometer, haemometer
-    Hemon's, Haemon's
-    Hemon, Haemon
-    hemophile's, haemophile's
-    hemophile, haemophile
-    hemophilia's, haemophilia's
-    hemophilia, haemophilia
-    hemophiliac's, haemophiliac's
-    hemophiliac, haemophiliac
-    hemophiliacs, haemophiliacs
-    hemophilic, haemophilic
-    hemopod, haemopod
-    hemopoiesis, haemopoiesis
-    hemoptyses, haemoptyses
-    hemoptysis's, haemoptysis's
-    hemoptysis, haemoptysis
-    hemorrhage's, haemorrhage's
-    hemorrhage, haemorrhage
-    hemorrhaged, haemorrhaged
-    hemorrhages, haemorrhages
-    hemorrhaging, haemorrhaging
-    hemorrhoid, haemorrhoid
-    hemorrhoidal, haemorrhoidal
-    hemorrhoidectomy's, haemorrhoidectomy's
-    hemorrhoidectomy, haemorrhoidectomy
-    hemorrhoids, haemorrhoids
-    hemosporid, haemosporid
-    hemosporidian, haemosporidian
-    hemostases, haemostases
-    hemostasia, haemostasia
-    hemostasis's, haemostasis's
-    hemostasis, haemostasis
-    hemostatic, haemostatic
-    hemothorax's, haemothorax's
-    hemothorax, haemothorax
-    hemotoxic, haemotoxic
-    hemotoxin's, haemotoxin's
-    hemotoxin, haemotoxin
-    heparinize, heparinise
-    hepatization's, hepatisation's
-    hepatization, hepatisation
-    hepatizations, hepatisations
-    hepatize, hepatise
-    hepatized, hepatised
-    hepatizes, hepatises
-    hepatizing, hepatising
-    hepatorrhea, hepatorrhoea
-    heraldize, heraldise
-    heraldizes, heraldises
-    herborization, herborisation
-    herborizations, herborisations
-    herborize, herborise
-    herborized, herborised
-    herborizes, herborises
-    herborizing, herborising
-    heredes, haeredes
-    hereticize, hereticise
-    hereticizes, hereticises
-    heroinize, heroinise
-    heroinizes, heroinises
-    heroization's, heroisation's
-    heroization, heroisation
-    heroizations, heroisations
-    heroize, heroise
-    heroized, heroised
-    heroizes, heroises
-    heroizing, heroising
-    het, haet
-    heterecious, heteroecious
-    heteric, hetaeric
-    heterism, hetaerism
-    hets, haets
-    hexachlorethane, hexachloroethane
-    hexachlorethanes, hexachloroethanes
-    hexametrize, hexametrise
-    hexametrized, hexametrised
-    hexametrizes, hexametrises
-    hexametrizing, hexametrising
-    hexestrol, hexoestrol
-    Hibernicize's, Hibernicise's
-    Hibernicize, Hibernicise
-    hibernicize, hibernicise
-    Hibernicized's, Hibernicised's
-    Hibernicized, Hibernicised
-    hibernicized, hibernicised
-    hibernicizes, hibernicises
-    Hibernicizing's, Hibernicising's
-    Hibernicizing, Hibernicising
-    hibernicizing, hibernicising
-    hibernization, hibernisation
-    hibernizations, hibernisations
-    hibernize, hibernise
-    hibernized, hibernised
-    hibernizes, hibernises
-    hibernizing, hibernising
-    hiccuped, hiccupped
-    hiccuping, hiccupping
-    hierarchize, hierarchise
-    hierarchized, hierarchised
-    hierarchizing, hierarchising
-    hifalutin, highfaluting
-    high_jinks, hijinks
-    hijack's, highjack's
-    hijack, highjack
-    hijacked, highjacked
-    hijacker's, highjacker's
-    hijacker, highjacker
-    hijackers, highjackers
-    hijacking, highjacking
-    hijacks, highjacks
-    hilloed, hilloaed
-    Hinduize's, Hinduise's
-    Hinduize, Hinduise
-    Hinduized's, Hinduised's
-    Hinduized, Hinduised
-    Hinduizes, Hinduises
-    Hinduizing's, Hinduising's
-    Hinduizing, Hinduising
-    hippieness's, hippiness's
-    hippieness, hippiness
-    hippienesses, hippinesses
-    hirseled, hirselled
-    hirseling, hirselling
-    Hispanicization's, Hispanicisation's
-    Hispanicization, Hispanicisation
-    Hispanicizations, Hispanicisations
-    Hispanicize, Hispanicise
-    hispanicize, hispanicise
-    Hispanicized, Hispanicised
-    hispanicized, hispanicised
-    Hispanicizes, Hispanicises
-    hispanicizes, hispanicises
-    Hispanicizing, Hispanicising
-    hispanicizing, hispanicising
-    Hispaniolize's, Hispaniolise's
-    Hispaniolize, Hispaniolise
-    hispaniolize, hispaniolise
-    Hispaniolized's, Hispaniolised's
-    Hispaniolized, Hispaniolised
-    hispaniolized, hispaniolised
-    Hispaniolizes, Hispaniolises
-    hispaniolizes, hispaniolises
-    Hispaniolizing's, Hispaniolising's
-    Hispaniolizing, Hispaniolising
-    hispaniolizing, hispaniolising
-    historicize, historicise
-    historicized, historicised
-    historicizes, historicises
-    historicizing, historicising
-    hmm, hm
-    hoagie's, hoagy's
-    hoagie, hoagy
-    hollos, hallos
-    Hollywoodize's, Hollywoodise's
-    Hollywoodize, Hollywoodise
-    Hollywoodized's, Hollywoodised's
-    Hollywoodized, Hollywoodised
-    Hollywoodizes, Hollywoodises
-    Hollywoodizing's, Hollywoodising's
-    Hollywoodizing, Hollywoodising
-    homeoblastic, homoeoblastic
-    homeobox, homoeobox
-    homeochromatic, homoeochromatic
-    homeochronous, homoeochronous
-    homeocrystalline, homoeocrystalline
-    homeogenic, homoeogenic
-    homeogenous, homoeogenous
-    homeoid, homoeoid
-    homeokinesis, homoeokinesis
-    homeomeric, homoeomeric
-    homeomeries, homoeomeries
-    homeomerous, homoeomerous
-    homeomery, homoeomery
-    homeomorph's, homoeomorph's
-    homeomorph, homoeomorph
-    homeomorphic, homoeomorphic
-    homeomorphies, homoeomorphies
-    homeomorphous, homoeomorphous
-    homeomorphs, homoeomorphs
-    homeomorphy, homoeomorphy
-    homeopath's, homoeopath's
-    homeopath, homoeopath
-    homeopathic, homoeopathic
-    homeopathicallier, homoeopathicallier
-    homeopathicalliest, homoeopathicalliest
-    homeopathically, homoeopathically
-    homeopathicer, homoeopathicer
-    homeopathicest, homoeopathicest
-    homeopathician, homoeopathician
-    homeopathicity, homoeopathicity
-    homeopathies, homoeopathies
-    homeopathist's, homoeopathist's
-    homeopathist, homoeopathist
-    homeopathists, homoeopathists
-    homeopaths, homoeopaths
-    homeopathy's, homoeopathy's
-    homeopathy, homoeopathy
-    homeophony, homoeophony
-    homeoplasia, homoeoplasia
-    homeoplastic, homoeoplastic
-    homeoplasy, homoeoplasy
-    homeopolar, homoeopolar
-    homeoses, homoeoses
-    homeosis, homoeosis
-    homeostases, homoeostases
-    homeostasis's, homoeostasis's
-    homeostasis, homoeostasis
-    homeostatic, homoeostatic
-    homeoteleuton, homoeoteleuton
-    homeoteleutons, homoeoteleutons
-    homeothermal, homoeothermal
-    homeothermic, homoeothermic
-    homeothermous, homoeothermous
-    homeotic, homoeotic
-    homeotype, homoeotype
-    homeotypic, homoeotypic
-    homeotypical, homoeotypical
-    homeozoic, homoeozoic
-    homeyness's, hominess's
-    homeyness, hominess
-    homeynesses, hominesses
-    hominization, hominisation
-    hominized, hominised
-    homogenization's, homogenisation's
-    homogenization, homogenisation
-    homogenizations, homogenisations
-    homogenize, homogenise
-    homogenized, homogenised
-    homogenizer's, homogeniser's
-    homogenizer, homogeniser
-    homogenizers, homogenisers
-    homogenizes, homogenises
-    homogenizing, homogenising
-    homologization, homologisation
-    homologize, homologise
-    homologized, homologised
-    homologizer's, homologiser's
-    homologizer, homologiser
-    homologizers, homologisers
-    homologizes, homologises
-    homologizing, homologising
-    homologue's, homolog's
-    homologue, homolog
-    homologues, homologs
-    honkie's, honkey's
-    honkie, honkey
-    honkies, honkeys
-    honor's, honour's
-    honor, honour
-    honorabilities, honourabilities
-    honorability's, honourability's
-    honorability, honourability
-    honorable's, honourable's
-    honorable, honourable
-    honorableness's, honourableness's
-    honorableness, honourableness
-    honorablenesses, honourablenesses
-    honorabler, honourabler
-    honorables, honourables
-    honorableship's, honourableship's
-    honorableship, honourableship
-    honorableships, honourableships
-    honorablest, honourablest
-    honorablier, honourablier
-    honorablies, honourablies
-    honorabliest, honourabliest
-    honorably, honourably
-    honored, honoured
-    honoree's, honouree's
-    honoree, honouree
-    honorees, honourees
-    honorer's, honourer's
-    honorer, honourer
-    honorers, honourers
-    honoring, honouring
-    honorless, honourless
-    honorlesser, honourlesser
-    honorlesses, honourlesses
-    honorlessest, honourlessest
-    honors, honours
-    hooch, hootch
-    hoodlumize, hoodlumise
-    hoodlumizes, hoodlumises
-    hookies, hookeys
-    hooky's, hookey's
-    hooky, hookey
-    hooliganize, hooliganise
-    hooliganizes, hooliganises
-    hoorah's, hurray's
-    hoorah, hurray
-    hoorayed, hurrayed
-    hooraying, hurraying
-    Hoosierize's, Hoosierise's
-    Hoosierize, Hoosierise
-    Hoosierizes, Hoosierises
-    Hooverize's, Hooverise's
-    Hooverize, Hooverise
-    Hooverizes, Hooverises
-    hore, horae
-    horizontalization's, horizontalisation's
-    horizontalization, horizontalisation
-    horizontalizations, horizontalisations
-    horizontalize, horizontalise
-    horizontalizes, horizontalises
-    hormonize, hormonise
-    hormonizes, hormonises
-    horrorize, horrorise
-    horrorizes, horrorises
-    horsey, horsy
-    hospitalization's, hospitalisation's
-    hospitalization, hospitalisation
-    hospitalizations, hospitalisations
-    hospitalize, hospitalise
-    hospitalized, hospitalised
-    hospitalizes, hospitalises
-    hospitalizing, hospitalising
-    hostilize, hostilise
-    hostilizes, hostilises
-    hotelization's, hotelisation's
-    hotelization, hotelisation
-    hotelizations, hotelisations
-    hotelize, hotelise
-    hotelizes, hotelises
-    houseled, houselled
-    houseling, houselling
-    houselings, housellings
-    hoveled, hovelled
-    hoveler, hoveller
-    hovelers, hovellers
-    hoveling, hovelling
-    hucksterize, hucksterise
-    hucksterizes, hucksterises
-    huer, hure
-    humanitarianize, humanitarianise
-    humanitarianizes, humanitarianises
-    humanization's, humanisation's
-    humanization, humanisation
-    humanizations, humanisations
-    humanize, humanise
-    humanized, humanised
-    humanizer's, humaniser's
-    humanizer, humaniser
-    humanizers, humanisers
-    humanizes, humanises
-    humanizing, humanising
-    humongous, humungous
-    humor's, humour's
-    humor, humour
-    humoral, humoural
-    humored, humoured
-    humorer, humourer
-    humorers, humourers
-    humorful, humourful
-    humoring, humouring
-    humorize, humorise
-    humorizes, humorises
-    humorless, humourless
-    humorlesser, humourlesser
-    humorlesses, humourlesses
-    humorlessest, humourlessest
-    humorlessness's, humourlessness's
-    humorlessness, humourlessness
-    humorlessnesses, humourlessnesses
-    humors, humours
-    humorsome, humoursome
-    humorsomeness, humoursomeness
-    hurrays, hurrahes
-    hurricanize, hurricanise
-    hurricanizes, hurricanises
-    huzzah's, huzza's
-    huzzah, huzza
-    huzzahed, huzzaed
-    huzzahing, huzzaing
-    huzzahs, huzzas
-    hyalinization's, hyalinisation's
-    hyalinization, hyalinisation
-    hyalinizations, hyalinisations
-    hyalinize, hyalinise
-    hyalinized, hyalinised
-    hyalinizes, hyalinises
-    hyalinizing, hyalinising
-    hybridizable's, hybridisable's
-    hybridizable, hybridisable
-    hybridizabler, hybridisabler
-    hybridizables, hybridisables
-    hybridizablest, hybridisablest
-    hybridization's, hybridisation's
-    hybridization, hybridisation
-    hybridizations, hybridisations
-    hybridize, hybridise
-    hybridized, hybridised
-    hybridizer's, hybridiser's
-    hybridizer, hybridiser
-    hybridizers, hybridisers
-    hybridizes, hybridises
-    hybridizing, hybridising
-    hydremia's, hydraemia's
-    hydremia, hydraemia
-    hydremias, hydraemias
-    hydremic, hydraemic
-    hydrocele, hydrocoele
-    hydrocephalus's, hydrocephaly's
-    hydrocephalus, hydrocephaly
-    hydrocephaluses, hydrocephalies
-    hydrogenization's, hydrogenisation's
-    hydrogenization, hydrogenisation
-    hydrogenizations, hydrogenisations
-    hydrogenize, hydrogenise
-    hydrogenized, hydrogenised
-    hydrogenizes, hydrogenises
-    hydrogenizing, hydrogenising
-    hydrolize, hydrolise
-    hydrolyzable's, hydrolysable's
-    hydrolyzable, hydrolysable
-    hydrolyzabler, hydrolysabler
-    hydrolyzables, hydrolysables
-    hydrolyzablest, hydrolysablest
-    hydrolyzate, hydrolysate
-    hydrolyzates, hydrolysates
-    hydrolyzation's, hydrolysation's
-    hydrolyzation, hydrolysation
-    hydrolyze, hydrolyse
-    hydrolyzed, hydrolysed
-    hydrolyzer's, hydrolyser's
-    hydrolyzer, hydrolyser
-    hydrolyzes, hydrolyses
-    hydrolyzing, hydrolysing
-    hydrorrhea, hydrorrhoea
-    hydroxylization's, hydroxylisation's
-    hydroxylization, hydroxylisation
-    hydroxylizations, hydroxylisations
-    hydroxylize, hydroxylise
-    hydroxylizes, hydroxylises
-    hyena's, hyaena's
-    hyena, hyaena
-    hyenic, hyaenic
-    hygienization's, hygienisation's
-    hygienization, hygienisation
-    hygienizations, hygienisations
-    hygienize, hygienise
-    hygienizes, hygienises
-    hymenean, hymenaean
-    hyperbolize, hyperbolise
-    hyperbolized, hyperbolised
-    hyperbolizes, hyperbolises
-    hyperbolizing, hyperbolising
-    hypercalcemia, hypercalcaemia
-    hypercalcemias, hypercalcaemias
-    hypercalcinemia, hypercalcinaemia
-    hypercatharsises, hypercatharses
-    hyperchloremia, hyperchloraemia
-    hypercholesterolemia, hypercholesterolaemia
-    hypercholesterolemias, hypercholesterolaemias
-    hypercivilization's, hypercivilisation's
-    hypercivilization, hypercivilisation
-    hypercivilizations, hypercivilisations
-    hypercivilized's, hypercivilised's
-    hypercivilized, hypercivilised
-    hypercivilizeds, hyperciviliseds
-    hypercriticize, hypercriticise
-    hypercriticized, hypercriticised
-    hypercriticizes, hypercriticises
-    hypercriticizing, hypercriticising
-    hypercryesthesia, hypercryaesthesia
-    hyperemia's, hyperaemia's
-    hyperemia, hyperaemia
-    hyperemias, hyperaemias
-    hyperemic, hyperaemic
-    hyperemphasize, hyperemphasise
-    hyperemphasizes, hyperemphasises
-    hyperesthesia's, hyperaesthesia's
-    hyperesthesia, hyperaesthesia
-    hyperesthesias, hyperaesthesias
-    hyperesthete's, hyperaesthete's
-    hyperesthete, hyperaesthete
-    hyperesthetic, hyperaesthetic
-    hyperestheticer, hyperaestheticer
-    hyperestheticest, hyperaestheticest
-    hyperglycemic, hyperglycaemic
-    hyperimmunization's, hyperimmunisation's
-    hyperimmunization, hyperimmunisation
-    hyperimmunizations, hyperimmunisations
-    hyperimmunize, hyperimmunise
-    hyperimmunizes, hyperimmunises
-    hyperinsulinization's, hyperinsulinisation's
-    hyperinsulinization, hyperinsulinisation
-    hyperinsulinizations, hyperinsulinisations
-    hyperinsulinize, hyperinsulinise
-    hyperinsulinizes, hyperinsulinises
-    hyperlipemia, hyperlipaemia
-    hyperlipemic, hyperlipaemic
-    hyperlipidemia, hyperlipidaemia
-    hypernatremia, hypernatraemia
-    hyperoxygenize, hyperoxygenise
-    hyperoxygenizes, hyperoxygenises
-    hyperparasitize, hyperparasitise
-    hyperparasitizes, hyperparasitises
-    hyperpnea's, hyperpnoea's
-    hyperpnea, hyperpnoea
-    hyperrealize, hyperrealise
-    hyperrealizes, hyperrealises
-    hypersensitization's, hypersensitisation's
-    hypersensitization, hypersensitisation
-    hypersensitizations, hypersensitisations
-    hypersensitize, hypersensitise
-    hypersensitized, hypersensitised
-    hypersensitizes, hypersensitises
-    hypersensitizing, hypersensitising
-    hyperspiritualizing's, hyperspiritualising's
-    hyperspiritualizing, hyperspiritualising
-    hyperspiritualizings, hyperspiritualisings
-    hyperthyroidization's, hyperthyroidisation's
-    hyperthyroidization, hyperthyroidisation
-    hyperthyroidizations, hyperthyroidisations
-    hyperthyroidize, hyperthyroidise
-    hyperthyroidizes, hyperthyroidises
-    hypervitalization's, hypervitalisation's
-    hypervitalization, hypervitalisation
-    hypervitalizations, hypervitalisations
-    hypervitalize, hypervitalise
-    hypervitalizes, hypervitalises
-    hypesthesia's, hypaesthesia's
-    hypesthesia, hypaesthesia
-    hypesthesias, hypaesthesias
-    hypesthesic, hypaesthesic
-    hypethral, hypaethral
-    hyphenization's, hyphenisation's
-    hyphenization, hyphenisation
-    hyphenizations, hyphenisations
-    hyphenize, hyphenise
-    hyphenized, hyphenised
-    hyphenizes, hyphenises
-    hyphenizing, hyphenising
-    hypnoidize, hypnoidise
-    hypnoidized, hypnoidised
-    hypnoidizes, hypnoidises
-    hypnoidizing, hypnoidising
-    hypnopedia, hypnopaedia
-    hypnopedias, hypnopaedias
-    hypnotizabilities, hypnotisabilities
-    hypnotizability's, hypnotisability's
-    hypnotizability, hypnotisability
-    hypnotizable's, hypnotisable's
-    hypnotizable, hypnotisable
-    hypnotizabler, hypnotisabler
-    hypnotizables, hypnotisables
-    hypnotizablest, hypnotisablest
-    hypnotization's, hypnotisation's
-    hypnotization, hypnotisation
-    hypnotizations, hypnotisations
-    hypnotize, hypnotise
-    hypnotized, hypnotised
-    hypnotizer's, hypnotiser's
-    hypnotizer, hypnotiser
-    hypnotizers, hypnotisers
-    hypnotizes, hypnotises
-    hypnotizing, hypnotising
-    hypocenter's, hypocentre's
-    hypocenter, hypocentre
-    hypocenters, hypocentres
-    hypogea, hypogaea
-    hypogeal, hypogaeal
-    hypogean, hypogaean
-    hypogeic, hypogaeic
-    hypogeous, hypogaeous
-    hypogeum, hypogaeum
-    hypomagnesemia, hypomagnesaemia
-    hypomagnesemias, hypomagnesaemias
-    hypomenorrhea, hypomenorrhoea
-    hypomenorrheas, hypomenorrhoeas
-    hypophysectomize, hypophysectomise
-    hypophysectomized, hypophysectomised
-    hypopnea's, hypopnoea's
-    hypopnea, hypopnoea
-    hyposensitization's, hyposensitisation's
-    hyposensitization, hyposensitisation
-    hyposensitize, hyposensitise
-    hypostasize, hypostasise
-    hypostasized, hypostasised
-    hypostasizes, hypostasises
-    hypostasizing, hypostasising
-    hypostatization's, hypostatisation's
-    hypostatization, hypostatisation
-    hypostatizations, hypostatisations
-    hypostatize, hypostatise
-    hypostatized, hypostatised
-    hypostatizes, hypostatises
-    hypostatizing, hypostatising
-    hypothesize, hypothesise
-    hypothesized, hypothesised
-    hypothesizer's, hypothesiser's
-    hypothesizer, hypothesiser
-    hypothesizers, hypothesisers
-    hypothesizes, hypothesises
-    hypothesizing, hypothesising
-    hypothetize, hypothetise
-    hypothetized, hypothetised
-    hypothetizes, hypothetises
-    hypothetizing, hypothetising
-    hypoxemia, hypoxaemia
-    hypoxemias, hypoxaemias
-    hypoxemic, hypoxaemic
-    hysterectomize, hysterectomise
-    hysterectomized, hysterectomised
-    hysterectomizes, hysterectomises
-    hysterectomizing, hysterectomising
-    ichneumonized's, ichneumonised's
-    ichneumonized, ichneumonised
-    ichneumonizeds, ichneumoniseds
-    ichorrhea, ichorrhoea
-    ichorrhemia, ichorrhaemia
-    icon's, ikon's
-    icon's, ikon's
-    icon, ikon
-    icon, ikon
-    iconic, ikonic
-    iconically, ikonically
-    iconize, iconise
-    iconized, iconised
-    iconizes, iconises
-    iconizing, iconising
-    icons, ikons
-    icons, ikons
-    Idea's, Idaea's
-    Idea, Idaea
-    idealization's, idealisation's
-    idealization, idealisation
-    idealizations, idealisations
-    idealize, idealise
-    idealized, idealised
-    idealizer's, idealiser's
-    idealizer, idealiser
-    idealizers, idealisers
-    idealizes, idealises
-    idealizing, idealising
-    Idean's, Idaean's
-    Idean, Idaean
-    ideologize, ideologise
-    ideologized, ideologised
-    ideologizing, ideologising
-    idiotize, idiotise
-    idiotized, idiotised
-    idiotizes, idiotises
-    idiotizing, idiotising
-    idolaster, idolastre
-    idolatrize, idolatrise
-    idolatrized, idolatrised
-    idolatrizer's, idolatriser's
-    idolatrizer, idolatriser
-    idolatrizes, idolatrises
-    idolatrizing, idolatrising
-    idolization's, idolisation's
-    idolization, idolisation
-    idolizations, idolisations
-    idolize, idolise
-    idolized, idolised
-    idolizer's, idoliser's
-    idolizer, idoliser
-    idolizers, idolisers
-    idolizes, idolises
-    idolizing, idolising
-    Idumea's, Idumaea's
-    Idumea, Idumaea
-    Idumean, Idumaean
-    Idumeans, Idumaeans
-    idyll's, idyl's
-    idyll, idyl
-    idylls, idyls
-    Ier's, Ire's
-    Ier, Ire
-    ignitable, ignitible
-    igniter's, ignitor's
-    igniter, ignitor
-    igniters, ignitors
-    ileocecal, ileocaecal
-    Iliadize's, Iliadise's
-    Iliadize, Iliadise
-    Iliadizes, Iliadises
-    illegalization's, illegalisation's
-    illegalization, illegalisation
-    illegalizations, illegalisations
-    illegalize, illegalise
-    illegalized, illegalised
-    illegalizes, illegalises
-    illegalizing, illegalising
-    illegitimatize, illegitimatise
-    illegitimatized, illegitimatised
-    illegitimatizes, illegitimatises
-    illegitimatizing, illegitimatising
-    illiberalize, illiberalise
-    illiberalized, illiberalised
-    illiberalizes, illiberalises
-    illiberalizing, illiberalising
-    Illuminize, Illuminise
-    Illuminizes, Illuminises
-    Imer's, Imre's
-    Imer, Imre
-    immaterialization, immaterialisation
-    immaterialize, immaterialise
-    immaterialized, immaterialised
-    immaterializes, immaterialises
-    immaterializing, immaterialising
-    immiserization, immiserisation
-    immiserizations, immiserisations
-    immiserize, immiserise
-    immiserized, immiserised
-    immiserizes, immiserises
-    immiserizing, immiserising
-    immobilization's, immobilisation's
-    immobilization, immobilisation
-    immobilizations, immobilisations
-    immobilize, immobilise
-    immobilized, immobilised
-    immobilizer, immobiliser
-    immobilizers, immobilisers
-    immobilizes, immobilises
-    immobilizing, immobilising
-    immoralize, immoralise
-    immoralized, immoralised
-    immoralizes, immoralises
-    immoralizing, immoralising
-    immortalizable's, immortalisable's
-    immortalizable, immortalisable
-    immortalizabler, immortalisabler
-    immortalizables, immortalisables
-    immortalizablest, immortalisablest
-    immortalization's, immortalisation's
-    immortalization, immortalisation
-    immortalizations, immortalisations
-    immortalize, immortalise
-    immortalized, immortalised
-    immortalizer's, immortaliser's
-    immortalizer, immortaliser
-    immortalizers, immortalisers
-    immortalizes, immortalises
-    immortalizing, immortalising
-    immunization's, immunisation's
-    immunization, immunisation
-    immunizations, immunisations
-    immunize, immunise
-    immunized, immunised
-    immunizer's, immuniser's
-    immunizer, immuniser
-    immunizes, immunises
-    immunizing, immunising
-    impactionize, impactionise
-    impactionizes, impactionises
-    impanel, empanel
-    impanelled, empanelled
-    impanelling, empanelling
-    impanelment, empanelment
-    impanels, empanels
-    impasted, impastoed
-    imperialization's, imperialisation's
-    imperialization, imperialisation
-    imperializations, imperialisations
-    imperialize, imperialise
-    imperialized, imperialised
-    imperializes, imperialises
-    imperializing, imperialising
-    imperiled, imperilled
-    imperiling, imperilling
-    imperscriptible, imprescriptible
-    impersonalization's, impersonalisation's
-    impersonalization, impersonalisation
-    impersonalizations, impersonalisations
-    impersonalize, impersonalise
-    impersonalized, impersonalised
-    impersonalizes, impersonalises
-    impersonalizing, impersonalising
-    impostor's, imposter's
-    impostor, imposter
-    impostors, imposters
-    improvisatorise, improvisatorize
-    improvisatorises, improvisatorizes
-    improviser's, improvisor's
-    improviser, improvisor
-    improvisers, improvisors
-    incarnalize, incarnalise
-    incarnalized, incarnalised
-    incarnalizing, incarnalising
-    incenter, incentre
-    incenters, incentres
-    incentivization, incentivisation
-    incentivizations, incentivisations
-    incentivize, incentivise
-    incentivized, incentivised
-    incentivizes, incentivises
-    incentivizing, incentivising
-    incerate, increate
-    incognizable, incognisable
-    incognizance's, incognisance's
-    incognizance, incognisance
-    incognizances, incognisances
-    incognizant, incognisant
-    Indianization's, Indianisation's
-    Indianization, Indianisation
-    Indianize, Indianise
-    Indianized, Indianised
-    Indianizes, Indianises
-    Indianizing, Indianising
-    indigene, indigenae
-    indigenization, indigenisation
-    indigenizations, indigenisations
-    indigenize, indigenise
-    indigenized, indigenised
-    indigenizes, indigenises
-    indigenizing, indigenising
-    individualization's, individualisation's
-    individualization, individualisation
-    individualizations, individualisations
-    individualize, individualise
-    individualized, individualised
-    individualizer's, individualiser's
-    individualizer, individualiser
-    individualizers, individualisers
-    individualizes, individualises
-    individualizing, individualising
-    individualizingly, individualisingly
-    indraft's, indraught's
-    indraft, indraught
-    indrafts, indraughts
-    industrialization's, industrialisation's
-    industrialization, industrialisation
-    industrializations, industrialisations
-    industrialize, industrialise
-    industrialized, industrialised
-    industrializes, industrialises
-    industrializing, industrialising
-    inesthetic, inaesthetic
-    infamize, infamise
-    infamized, infamised
-    infamizes, infamises
-    infamizing, infamising
-    infamonize, infamonise
-    infamonized, infamonised
-    infamonizes, infamonises
-    infamonizing, infamonising
-    infere, infree
-    inferiorize, inferiorise
-    inferiorizes, inferiorises
-    infernalize, infernalise
-    infernalizes, infernalises
-    infidelize, infidelise
-    infidelizes, infidelises
-    infinitize, infinitise
-    infinitizes, infinitises
-    inflection's, inflexion's
-    inflection, inflexion
-    inflections, inflexions
-    informalize, informalise
-    informalizes, informalises
-    Ingveonic's, Ingvaeonic's
-    Ingveonic, Ingvaeonic
-    Ingweonic's, Ingwaeonic's
-    Ingweonic, Ingwaeonic
-    inhumanize, inhumanise
-    inhumanizes, inhumanises
-    initialed, initialled
-    initialer's, initialler's
-    initialer, initialler
-    initialers, initiallers
-    initialing, initialling
-    initializable, initialisable
-    initialization's, initialisation's
-    initialization, initialisation
-    initializations, initialisations
-    initialize, initialise
-    initialized, initialised
-    initializer, initialiser
-    initializers, initialisers
-    initializes, initialises
-    initializing, initialising
-    inorganization, inorganisation
-    inorganizations, inorganisations
-    inorganized, inorganised
-    inquire, enquire
-    inquired, enquired
-    inquires, enquires
-    inquiries, enquiries
-    inquiring, enquiring
-    inquiry's, enquiry's
-    inquiry, enquiry
-    insignia's, insigne's
-    insignia, insigne
-    insolubilization's, insolubilisation's
-    insolubilization, insolubilisation
-    insolubilize, insolubilise
-    insolubilized, insolubilised
-    insolubilizes, insolubilises
-    insolubilizing, insolubilising
-    install, instal
-    installment's, instalment's
-    installment, instalment
-    installments, instalments
-    installs, instals
-    instill, instil
-    instills, instils
-    instituter's, institutor's
-    instituter, institutor
-    instituters, institutors
-    institutionalization's, institutionalisation's
-    institutionalization, institutionalisation
-    institutionalizations, institutionalisations
-    institutionalize, institutionalise
-    institutionalized, institutionalised
-    institutionalizes, institutionalises
-    institutionalizing, institutionalising
-    institutionize, institutionise
-    institutionizes, institutionises
-    instrumentalize, instrumentalise
-    instrumentalizes, instrumentalises
-    insularize, insularise
-    insularizes, insularises
-    insurrectionize, insurrectionise
-    insurrectionized, insurrectionised
-    insurrectionizes, insurrectionises
-    insurrectionizing, insurrectionising
-    integralization's, integralisation's
-    integralization, integralisation
-    integralizations, integralisations
-    integralize, integralise
-    integralizes, integralises
-    intellectualization's, intellectualisation's
-    intellectualization, intellectualisation
-    intellectualizations, intellectualisations
-    intellectualize, intellectualise
-    intellectualized, intellectualised
-    intellectualizer's, intellectualiser's
-    intellectualizer, intellectualiser
-    intellectualizers, intellectualisers
-    intellectualizes, intellectualises
-    intellectualizing, intellectualising
-    intercivilization's, intercivilisation's
-    intercivilization, intercivilisation
-    intercivilizations, intercivilisations
-    intercolonization's, intercolonisation's
-    intercolonization, intercolonisation
-    intercolonizations, intercolonisations
-    intercrystallization's, intercrystallisation's
-    intercrystallization, intercrystallisation
-    intercrystallizations, intercrystallisations
-    intercrystallize, intercrystallise
-    intercrystallizes, intercrystallises
-    interhemal, interhaemal
-    interhybridize, interhybridise
-    interhybridizes, interhybridises
-    interiorization, interiorisation
-    interiorize, interiorise
-    interiorized, interiorised
-    interiorizes, interiorises
-    interiorizing, interiorising
-    interjectionalize, interjectionalise
-    interjectionalized, interjectionalised
-    interjectionalizes, interjectionalises
-    interjectionalizing, interjectionalising
-    interjectionize, interjectionise
-    interjectionizes, interjectionises
-    interjudgment's, interjudgement's
-    interjudgment, interjudgement
-    interjudgments, interjudgements
-    internalization's, internalisation's
-    internalization, internalisation
-    internalizations, internalisations
-    internalize, internalise
-    internalized, internalised
-    internalizes, internalises
-    internalizing, internalising
-    internationalization's, internationalisation's
-    internationalization, internationalisation
-    internationalizations, internationalisations
-    internationalize, internationalise
-    internationalized, internationalised
-    internationalizes, internationalises
-    internationalizing, internationalising
-    internment, internement
-    internments, internements
-    internship, interneship
-    internships, interneships
-    interorganizational, interorganisational
-    intime, intimae
-    intraorganization's, intraorganisation's
-    intraorganization, intraorganisation
-    intraorganizations, intraorganisations
-    inure, enure
-    inured, enured
-    inures, enures
-    inuring, enuring
-    invigor, invigour
-    iodization's, iodisation's
-    iodization, iodisation
-    iodize, iodise
-    iodized, iodised
-    iodizer's, iodiser's
-    iodizer, iodiser
-    iodizers, iodisers
-    iodizes, iodises
-    iodizing, iodising
-    Ionicization's, Ionicisation's
-    Ionicization, Ionicisation
-    Ionicizations, Ionicisations
-    Ionicize's, Ionicise's
-    Ionicize, Ionicise
-    Ionicized's, Ionicised's
-    Ionicized, Ionicised
-    Ionicizes, Ionicises
-    Ionicizing's, Ionicising's
-    Ionicizing, Ionicising
-    ionizable's, ionisable's
-    ionizable, ionisable
-    ionizabler, ionisabler
-    ionizables, ionisables
-    ionizablest, ionisablest
-    ionization's, ionisation's
-    ionization, ionisation
-    ionizations, ionisations
-    ionize, ionise
-    ionized, ionised
-    ionizer's, ioniser's
-    ionizer, ioniser
-    ionizers, ionisers
-    ionizes, ionises
-    ionizing, ionising
-    ionizings, ionisings
-    ionizion, ionision
-    ionizions, ionisions
-    Iphinoe's, Iphinoae's
-    Iphinoe, Iphinoae
-    ipomea, ipomoea
-    Iranize's, Iranise's
-    Iranize, Iranise
-    Iranizes, Iranises
-    Iricize's, Iricise's
-    Iricize, Iricise
-    Iricized's, Iricised's
-    Iricized, Iricised
-    Iricizing's, Iricising's
-    Iricizing, Iricising
-    iridectomize, iridectomise
-    iridectomized, iridectomised
-    iridectomizing, iridectomising
-    iridization, iridisation
-    iridizations, iridisations
-    iridize, iridise
-    iridized, iridised
-    iridizes, iridises
-    iridizing, iridising
-    Irishize's, Irishise's
-    Irishize, Irishise
-    Irishized's, Irishised's
-    Irishized, Irishised
-    Irishizes, Irishises
-    Irishizing's, Irishising's
-    Irishizing, Irishising
-    ironize, ironise
-    ironized, ironised
-    ironizes, ironises
-    ironizing, ironising
-    irrationalize, irrationalise
-    irrationalized, irrationalised
-    irrationalizes, irrationalises
-    irrationalizing, irrationalising
-    irrealizable, irrealisable
-    irrecognizable, irrecognisable
-    irregularize, irregularise
-    irregularizes, irregularises
-    ischemia's, ischaemia's
-    ischemia, ischaemia
-    ischemias, ischaemias
-    ischemic, ischaemic
-    Islamicize's, Islamicise's
-    Islamicize, Islamicise
-    Islamicized's, Islamicised's
-    Islamicized, Islamicised
-    Islamicizes, Islamicises
-    Islamicizing's, Islamicising's
-    Islamicizing, Islamicising
-    Islamization's, Islamisation's
-    Islamization, Islamisation
-    Islamizations, Islamisations
-    Islamize, Islamise
-    Islamized, Islamised
-    Islamizes, Islamises
-    Islamizing, Islamising
-    isochronization, isochronisation
-    isochronize, isochronise
-    isochronized, isochronised
-    isochronizes, isochronises
-    isochronizing, isochronising
-    isoimmunization's, isoimmunisation's
-    isoimmunization, isoimmunisation
-    isoimmunizations, isoimmunisations
-    isoimmunize, isoimmunise
-    isoimmunizes, isoimmunises
-    isomerization's, isomerisation's
-    isomerization, isomerisation
-    isomerizations, isomerisations
-    isomerize, isomerise
-    isomerized, isomerised
-    isomerizes, isomerises
-    isomerizing, isomerising
-    Israelitize's, Israelitise's
-    Israelitize, Israelitise
-    Israelitizes, Israelitises
-    Italianization's, Italianisation's
-    Italianization, Italianisation
-    Italianizations, Italianisations
-    Italianize, Italianise
-    italianize, italianise
-    Italianized, Italianised
-    italianized, italianised
-    Italianizer's, Italianiser's
-    Italianizer, Italianiser
-    Italianizers, Italianisers
-    Italianizes, Italianises
-    italianizes, italianises
-    Italianizing, Italianising
-    italianizing, italianising
-    italicization's, italicisation's
-    italicization, italicisation
-    italicizations, italicisations
-    italicize, italicise
-    italicized, italicised
-    italicizes, italicises
-    italicizing, italicising
-    itemization's, itemisation's
-    itemization, itemisation
-    itemizations, itemisations
-    itemize, itemise
-    itemized, itemised
-    itemizer's, itemiser's
-    itemizer, itemiser
-    itemizers, itemisers
-    itemizes, itemises
-    itemizing, itemising
-    Iturean, Ituraean
-    Itureans, Ituraeans
-    izing, ising
-    jacobean, jacobaean
-    Jacobinization's, Jacobinisation's
-    Jacobinization, Jacobinisation
-    Jacobinize's, Jacobinise's
-    Jacobinize, Jacobinise
-    Jacobinized's, Jacobinised's
-    Jacobinized, Jacobinised
-    Jacobinizes, Jacobinises
-    Jacobinizing's, Jacobinising's
-    Jacobinizing, Jacobinising
-    jail's, gaol's
-    jail, gaol
-    jailbird's, gaolbird's
-    jailbird, gaolbird
-    jailbirds, gaolbirds
-    jailbreak's, gaolbreak's
-    jailbreak, gaolbreak
-    jailbreaks, gaolbreaks
-    jailed, gaoled
-    jailing, gaoling
-    jailor's, gaoler's
-    jailor, gaoler
-    jailors, gaolers
-    jails, gaols
-    janizaries, janisaries
-    janizary, janisary
-    Japanization's, Japanisation's
-    Japanization, Japanisation
-    Japanizations, Japanisations
-    Japanize, Japanise
-    Japanized, Japanised
-    Japanizes, Japanises
-    Japanizing, Japanising
-    jargonization's, jargonisation's
-    jargonization, jargonisation
-    jargonizations, jargonisations
-    jargonize, jargonise
-    jargonized, jargonised
-    jargonizes, jargonises
-    jargonizing, jargonising
-    jasmine's, jessamine's
-    jasmine, jessamine
-    jasmines, jessamines
-    jasperize, jasperise
-    jasperized, jasperised
-    jasperizes, jasperises
-    jasperizing, jasperising
-    jeez, geez
-    jeopardization, jeopardisation
-    jeopardize, jeopardise
-    jeopardized, jeopardised
-    jeopardizes, jeopardises
-    jeopardizing, jeopardising
-    jerrican's, jerry_can's
-    jerrican, jerry_can
-    jerricans, jerry_cans
-    Jesuitization's, Jesuitisation's
-    Jesuitization, Jesuitisation
-    Jesuitize, Jesuitise
-    Jesuitized, Jesuitised
-    Jesuitizes, Jesuitises
-    Jesuitizing, Jesuitising
-    jeweled, jewelled
-    jeweler's, jeweller's
-    jeweler, jeweller
-    jewelers, jewellers
-    jeweling, jewelling
-    jewelry's, jewellery's
-    jewelry, jewellery
-    jihad's, jehad's
-    jihad, jehad
-    jihads, jehads
-    jinricksha's, jinriksha's
-    jinricksha, jinriksha
-    jinrickshas, jinrikshas
-    jiujitsu's, jujutsu's
-    jokey, joky
-    Jonathanization's, Jonathanisation's
-    Jonathanization, Jonathanisation
-    Jonathanizations, Jonathanisations
-    jor, jour
-    jors, jours
-    journalization's, journalisation's
-    journalization, journalisation
-    journalizations, journalisations
-    journalize, journalise
-    journalized, journalised
-    journalizer's, journaliser's
-    journalizer, journaliser
-    journalizers, journalisers
-    journalizes, journalises
-    journalizing, journalising
-    jovialize, jovialise
-    jovializes, jovialises
-    Judaization's, Judaisation's
-    Judaization, Judaisation
-    Judaize, Judaise
-    Judaized, Judaised
-    Judaizer's, Judaiser's
-    Judaizer, Judaiser
-    judaizer, judaiser
-    Judaizing, Judaising
-    Judean, Judaean
-    Judeans, Judaeans
-    Judeophobia's, Judaeophobia's
-    Judeophobia, Judaeophobia
-    judgment's, judgement's
-    judgment, judgement
-    judgmental, judgemental
-    judgmentaler, judgementaler
-    judgmentalest, judgementalest
-    judgments, judgements
-    judicialize, judicialise
-    judicializes, judicialises
-    jujutsu, jiujitsu
-    jujutsus, jiujitsus
-    Julide's, Julidae's
-    Julide, Julidae
-    jumboize, jumboise
-    jumboized, jumboised
-    jumboizes, jumboises
-    jumboizing, jumboising
-    junketeer's, junketer's
-    junketeer, junketer
-    junketeers, junketers
-    juvenilize, juvenilise
-    juvenilizes, juvenilises
-    kabob, kebob
-    kabobs, kebobs
-    kane, kanae
-    kaolinization's, kaolinisation's
-    kaolinization, kaolinisation
-    kaolinizations, kaolinisations
-    kaolinize, kaolinise
-    kaolinized, kaolinised
-    kaolinizes, kaolinises
-    kaolinizing, kaolinising
-    kebob's, kabob's
-    ked, kaed
-    Keizer's, Keiser's
-    Keizer, Keiser
-    kellia, koellia
-    kembed, kemboed
-    kenneled, kennelled
-    kenneling, kennelling
-    Keppel's, Koeppel's
-    Keppel, Koeppel
-    keratinization's, keratinisation's
-    keratinization, keratinisation
-    keratinizations, keratinisations
-    keratinize, keratinise
-    keratinized, keratinised
-    keratinizes, keratinises
-    keratinizing, keratinising
-    Kerin's, Krein's
-    Kerin, Krein
-    kerneled, kernelled
-    kerneling, kernelling
-    kerosene's, kerosine's
-    kerosene, kerosine
-    kerosenes, kerosines
-    ketonemia, ketonaemia
-    ketonization's, ketonisation's
-    ketonization, ketonisation
-    ketonizations, ketonisations
-    ketonize, ketonise
-    ketonizes, ketonises
-    kiddie's, kiddy's
-    kiddie, kiddy
-    kidnapped, kidnaped
-    kidnappee's, kidnapee's
-    kidnappee, kidnapee
-    kidnappees, kidnapees
-    kidnapper's, kidnaper's
-    kidnapper, kidnaper
-    kidnappers, kidnapers
-    kidnapping, kidnaping
-    kilogram's, kilogramme's
-    kilogram, kilogramme
-    kilograms, kilogrammes
-    kiloliter's, kilolitre's
-    kiloliter, kilolitre
-    kiloliters, kilolitres
-    kilometer's, kilometre's
-    kilometer, kilometre
-    kilometers, kilometres
-    kindergartner's, kindergartener's
-    kindergartner, kindergartener
-    kindergartners, kindergarteners
-    kinestheses, kinaestheses
-    kinesthesia's, kinaesthesia's
-    kinesthesia, kinaesthesia
-    kinesthesias, kinaesthesias
-    kinesthesis's, kinaesthesis's
-    kinesthesis, kinaesthesis
-    kinesthetic, kinaesthetic
-    kinestheticallier, kinaestheticallier
-    kinestheticalliest, kinaestheticalliest
-    kinesthetically, kinaesthetically
-    kinestheticer, kinaestheticer
-    kinestheticest, kinaestheticest
-    kinesthetics, kinaesthetics
-    kissogram's, kissagram's
-    kissogram, kissagram
-    kissograms, kissagrams
-    knickknack's, nicknack's
-    knickknack, nicknack
-    knickknacks, nicknacks
-    knockwurst's, knackwurst's
-    knockwurst, knackwurst
-    knockwursts, knackwursts
-    kooky, kookie
-    kopek's, copeck's
-    kopek, copeck
-    kopeks, copecks
-    Kossean's, Kossaean's
-    Kossean, Kossaean
-    kumquat's, cumquat's
-    kumquat, cumquat
-    kumquats, cumquats
-    kyanize, kyanise
-    kyanized, kyanised
-    kyanizes, kyanises
-    kyanizing, kyanising
-    kyles, kyloes
-    labelable, labellable
-    labeled, labelled
-    labeler's, labeller's
-    labeler, labeller
-    labelers, labellers
-    labeling, labelling
-    labialization's, labialisation's
-    labialization, labialisation
-    labializations, labialisations
-    labialize, labialise
-    labialized, labialised
-    labializes, labialises
-    labializing, labialising
-    labiate, labiatae
-    labilization's, labilisation's
-    labilization, labilisation
-    labilizations, labilisations
-    labilize, labilise
-    labilizes, labilises
-    labiovelarization's, labiovelarisation's
-    labiovelarization, labiovelarisation
-    labiovelarize, labiovelarise
-    labiovelarized, labiovelarised
-    labiovelarizing, labiovelarising
-    labor's, labour's
-    labor, labour
-    laborabilities, labourabilities
-    laborability's, labourability's
-    laborability, labourability
-    laborable's, labourable's
-    laborable, labourable
-    laborables, labourables
-    laborage, labourage
-    labored, laboured
-    laboredlier, labouredlier
-    laboredliest, labouredliest
-    laboredly, labouredly
-    laboredness's, labouredness's
-    laboredness, labouredness
-    laborednesses, labourednesses
-    laborer's, labourer's
-    laborer, labourer
-    laborers, labourers
-    laboress, labouress
-    laborhood's, labourhood's
-    laborhood, labourhood
-    laborhoods, labourhoods
-    laboring's, labouring's
-    laboring, labouring
-    laboringlier, labouringlier
-    laboringliest, labouringliest
-    laboringly, labouringly
-    laborings, labourings
-    Laborism's, Labourism's
-    laborism's, labourism's
-    Laborism, Labourism
-    laborism, labourism
-    laborisms, labourisms
-    laborist's, labourist's
-    laborist, labourist
-    laborists, labourists
-    Laborite's, Labourite's
-    laborite's, labourite's
-    Laborite, Labourite
-    laborite, labourite
-    Laborites, Labourites
-    laborites, labourites
-    laborless, labourless
-    laborlesser, labourlesser
-    laborlesses, labourlesses
-    laborlessest, labourlessest
-    labors, labours
-    laborsaving, laboursaving
-    laborsome, laboursome
-    laborsomely, laboursomely
-    lachrymal, lacrimal
-    lackluster's, lacklustre's
-    lackluster, lacklustre
-    lacklusterrer, lacklustrer
-    lacklusterrest, lacklustrest
-    lacklusters, lacklustres
-    laconize, laconise
-    laconized, laconised
-    laconizes, laconises
-    laconizing, laconising
-    lactonized, lactonised
-    lagniappe's, lagnappe's
-    lagniappe, lagnappe
-    lagniappes, lagnappes
-    laicization's, laicisation's
-    laicization, laicisation
-    laicizations, laicisations
-    laicize, laicise
-    laicized, laicised
-    laicizes, laicises
-    laicizing, laicising
-    lairize, lairise
-    lairized, lairised
-    lairizes, lairises
-    lairizing, lairising
-    lambaste, lambast
-    lambastes, lambasts
-    laminarize, laminarise
-    laminarized, laminarised
-    laminarizes, laminarises
-    laminarizing, laminarising
-    Lander's, Landre's
-    Lander, Landre
-    Laothoe's, Laothoae's
-    Laothoe, Laothoae
-    lapeled, lapelled
-    lasagna's, lasagne's
-    lasagna, lasagne
-    lasagnas, lasagnes
-    laster, lastre
-    latentize, latentise
-    latentizes, latentises
-    lateralization's, lateralisation's
-    lateralization, lateralisation
-    lateralizations, lateralisations
-    lateralize, lateralise
-    lateralizes, lateralises
-    laterization's, laterisation's
-    laterization, laterisation
-    laterizations, laterisations
-    Latinization's, Latinisation's
-    Latinization, Latinisation
-    Latinizations, Latinisations
-    Latinize, Latinise
-    latinize, latinise
-    Latinized, Latinised
-    Latinizer, Latiniser
-    Latinizers, Latinisers
-    Latinizes, Latinises
-    Latinizing, Latinising
-    launderette's, laundrette's
-    launderette, laundrette
-    launderettes, laundrettes
-    laure, laurae
-    laureled, laurelled
-    laureling, laurelling
-    lavalier_microphone's, lavaliere_microphone's
-    lavalier_microphone, lavaliere_microphone
-    lavalier_microphones, lavaliere_microphones
-    lavolted, lavoltaed
-    leaped, leapt
-    learned, learnt
-    leatherize, leatherise
-    leatherizes, leatherises
-    lefty's, leftie's
-    lefty, leftie
-    legalization's, legalisation's
-    legalization, legalisation
-    legalizations, legalisations
-    legalize, legalise
-    legalized, legalised
-    legalizes, legalises
-    legalizing, legalising
-    legitimatize, legitimatise
-    legitimatized, legitimatised
-    legitimatizes, legitimatises
-    legitimatizing, legitimatising
-    legitimization's, legitimisation's
-    legitimization, legitimisation
-    legitimizations, legitimisations
-    legitimize, legitimise
-    legitimized, legitimised
-    legitimizer, legitimiser
-    legitimizes, legitimises
-    legitimizing, legitimising
-    leguminose, leguminosae
-    lemmatize, lemmatise
-    lemmatized, lemmatised
-    lemmatizes, lemmatises
-    lemmatizing, lemmatising
-    leporide, leporidae
-    leptospire, leptospirae
-    Lernean's, Lernaean's
-    Lernean, Lernaean
-    lernean, lernaean
-    lesses, loesses
-    lethalize, lethalise
-    lethalizes, lethalises
-    lethargize, lethargise
-    lethargized, lethargised
-    lethargizes, lethargises
-    lethargizing, lethargising
-    leucemia, leucaemia
-    leucemias, leucaemias
-    leucemic, leucaemic
-    leuchemia, leuchaemia
-    leucocythemia, leucocythaemia
-    leucocythemic, leucocythaemic
-    leucorrhea's, leucorrhoea's
-    leucorrhea, leucorrhoea
-    leucorrheal, leucorrhoeal
-    leucorrheas, leucorrhoeas
-    Leucothoe's, Leucothoae's
-    Leucothoe, Leucothoae
-    leukemia's, leukaemia's
-    leukemia, leukaemia
-    leukemias, leukaemias
-    leukemogeneses, leukaemogeneses
-    leukemogenesis, leukaemogenesis
-    leukorrhea, leukorrhoea
-    leukorrheal, leukorrhoeal
-    leveled, levelled
-    leveler's, leveller's
-    leveler, leveller
-    levelers, levellers
-    levelest, levellest
-    leveling's, levelling's
-    leveling, levelling
-    levigate, laevigate
-    levigated, laevigated
-    levigates, laevigates
-    levigating, laevigating
-    levo, laevo
-    levoduction, laevoduction
-    levogyrate, laevogyrate
-    levogyre, laevogyre
-    levogyrous, laevogyrous
-    levolactic, laevolactic
-    levorotation's, laevorotation's
-    levorotation, laevorotation
-    levorotations, laevorotations
-    levorotatory, laevorotatory
-    levotartaric, laevotartaric
-    levoversion, laevoversion
-    levulin, laevulin
-    levulose's, laevulose's
-    levulose, laevulose
-    levuloses, laevuloses
-    lexicalization, lexicalisation
-    lexicalizations, lexicalisations
-    lexiconize, lexiconise
-    lexiconizes, lexiconises
-    libelant's, libellant's
-    libelant, libellant
-    libelants, libellants
-    libeled, libelled
-    libelee's, libellee's
-    libelee, libellee
-    libelees, libellees
-    libeler's, libeller's
-    libeler, libeller
-    libelers, libellers
-    libeling, libelling
-    libelous, libellous
-    libelouser, libellouser
-    libelousest, libellousest
-    libelouslier, libellouslier
-    libelousliest, libellousliest
-    libelously, libellously
-    liberalization's, liberalisation's
-    liberalization, liberalisation
-    liberalizations, liberalisations
-    liberalize, liberalise
-    liberalized, liberalised
-    liberalizer's, liberaliser's
-    liberalizer, liberaliser
-    liberalizers, liberalisers
-    liberalizes, liberalises
-    liberalizing, liberalising
-    licenseless, licenceless
-    licenselesses, licencelesses
-    lichenization's, lichenisation's
-    lichenization, lichenisation
-    lichenizations, lichenisations
-    lichenize, lichenise
-    lichenized, lichenised
-    lichenizes, lichenises
-    lichenizing, lichenising
-    licorice's, liquorice's
-    licorice, liquorice
-    lignitize, lignitise
-    lignitizes, lignitises
-    lignose, lignosae
-    ligule, ligulae
-    likabilities, likeabilities
-    likability's, likeability's
-    likability, likeability
-    likable, likeable
-    likableness's, likeableness's
-    likableness, likeableness
-    likablenesses, likeablenesses
-    Lilliputianize's, Lilliputianise's
-    Lilliputianize, Lilliputianise
-    Lilliputianizes, Lilliputianises
-    linchpin's, lynchpin's
-    linchpin, lynchpin
-    linchpins, lynchpins
-    linearizable, linearisable
-    linearization's, linearisation's
-    linearization, linearisation
-    linearizations, linearisations
-    linearize, linearise
-    linearized, linearised
-    linearizes, linearises
-    linearizing, linearising
-    linearizion, linearision
-    linenize, linenise
-    linenizer, lineniser
-    linenizers, linenisers
-    linenizes, linenises
-    linge, lingoe
-    lingualize, lingualise
-    lingualizes, lingualises
-    linguine's, linguini's
-    linguine, linguini
-    linguines, linguinis
-    lionizable's, lionisable's
-    lionizable, lionisable
-    lionizables, lionisables
-    lionization's, lionisation's
-    lionization, lionisation
-    lionizations, lionisations
-    lionize, lionise
-    lionized, lionised
-    lionizer's, lioniser's
-    lionizer, lioniser
-    lionizers, lionisers
-    lionizes, lionises
-    lionizing, lionising
-    lipemia, lipaemia
-    lipemic, lipaemic
-    lipoidemia, lipoidaemia
-    liquefied, liquified
-    liquefier, liquifier
-    liquefiers, liquifiers
-    liquefies, liquifies
-    liquefy, liquify
-    liquefying, liquifying
-    liquidization, liquidisation
-    liquidize, liquidise
-    liquidized, liquidised
-    liquidizer's, liquidiser's
-    liquidizer, liquidiser
-    liquidizers, liquidisers
-    liquidizes, liquidises
-    liquidizing, liquidising
-    lissome, lissom
-    lissomely, lissomly
-    lissomeness, lissomness
-    lissomenesses, lissomnesses
-    Listerize's, Listerise's
-    Listerize, Listerise
-    Listerized's, Listerised's
-    Listerized, Listerised
-    Listerizes, Listerises
-    Listerizing's, Listerising's
-    Listerizing, Listerising
-    liter's, litre's
-    liter, litre
-    literalization's, literalisation's
-    literalization, literalisation
-    literalizations, literalisations
-    literalize, literalise
-    literalized, literalised
-    literalizer's, literaliser's
-    literalizer, literaliser
-    literalizers, literalisers
-    literalizes, literalises
-    literalizing, literalising
-    liters, litres
-    lithed, lithoed
-    lithemia, lithaemia
-    lithemic, lithaemic
-    lithographize, lithographise
-    lithographizes, lithographises
-    lithopedion, lithopaedion
-    lithopedium, lithopaedium
-    lithophyse, lithophysae
-    lithotritize, lithotritise
-    lithotritized, lithotritised
-    lithotritizes, lithotritises
-    lithotritizing, lithotritising
-    livable, liveable
-    livableness, liveableness
-    lobotomize, lobotomise
-    lobotomized, lobotomised
-    lobotomizes, lobotomises
-    lobotomizing, lobotomising
-    localizable's, localisable's
-    localizable, localisable
-    localizabler, localisabler
-    localizables, localisables
-    localizablest, localisablest
-    localization's, localisation's
-    localization, localisation
-    localizations, localisations
-    localize, localise
-    localized, localised
-    localizer's, localiser's
-    localizer, localiser
-    localizers, localisers
-    localizes, localises
-    localizing, localising
-    locator's, locater's
-    locator, locater
-    locators, locaters
-    lodestar's, loadstar's
-    lodestar, loadstar
-    lodestars, loadstars
-    lodestone's, loadstone's
-    lodestone, loadstone
-    lodestones, loadstones
-    lodgment's, lodgement's
-    lodgment, lodgement
-    lodgments, lodgements
-    lodicule, lodiculae
-    loed, looed
-    logicalization's, logicalisation's
-    logicalization, logicalisation
-    logicalizations, logicalisations
-    logicalize, logicalise
-    logicalizes, logicalises
-    logicize, logicise
-    logicized, logicised
-    logicizes, logicises
-    logicizing, logicising
-    logopedic, logopaedic
-    logopedics's, logopaedics's
-    logopedics, logopaedics
-    logorrhea's, logorrhoea's
-    logorrhea, logorrhoea
-    logorrheas, logorrhoeas
-    lollipop's, lollypop's
-    lollipop, lollypop
-    lollipops, lollypops
-    lollygag, lallygag
-    lollygagged, lallygagged
-    lollygagging, lallygagging
-    lollygags, lallygags
-    Londonization's, Londonisation's
-    Londonization, Londonisation
-    Londonizations, Londonisations
-    Londonize's, Londonise's
-    Londonize, Londonise
-    Londonized's, Londonised's
-    Londonized, Londonised
-    Londonizes, Londonises
-    Londonizing's, Londonising's
-    Londonizing, Londonising
-    longeval, longaeval
-    longevous, longaevous
-    looneyies, looneys
-    loonier, looneyier
-    loony's, looney's
-    loony, looney
-    lordy, lourdy
-    lorings, lourings
-    lory, loury
-    louter, loutre
-    louver's, louvre's
-    louver, louvre
-    louvered, louvred
-    louvers, louvres
-    lovability, lovaebility
-    lovable, loveable
-    lovableness, loveableness
-    lovably, loveably
-    love, luv
-    loves, luvs
-    lovey, luvvie
-    loveys, luvvies
-    loyalize, loyalise
-    loyalizes, loyalises
-    lumbarization's, lumbarisation's
-    lumbarization, lumbarisation
-    lumbarizations, lumbarisations
-    lunatize, lunatise
-    lunatizes, lunatises
-    lunule, lunulae
-    luster's, lustre's
-    luster, lustre
-    lustered, lustred
-    lustering's, lustring's
-    lustering, lustring
-    lusterless, lustreless
-    lusterlesser, lustrelesser
-    lusterlessest, lustrelessest
-    lusters, lustres
-    lusterware's, lustreware's
-    lusterware, lustreware
-    lusterwares, lustrewares
-    luteinization's, luteinisation's
-    luteinization, luteinisation
-    luteinizations, luteinisations
-    luteinize, luteinise
-    luteinized, luteinised
-    luteinizes, luteinises
-    luteinizing, luteinising
-    Lutheranize's, Lutheranise's
-    Lutheranize, Lutheranise
-    Lutheranizer's, Lutheraniser's
-    Lutheranizer, Lutheraniser
-    Lutheranizers, Lutheranisers
-    Lutheranizes, Lutheranises
-    lutrine, lutrinae
-    luvvy, luvvie
-    lychee's, lichee's
-    lychee, lichee
-    lychees, lichees
-    lymphedema, lymphoedema
-    lymphemia, lymphaemia
-    lyophilization's, lyophilisation's
-    lyophilization, lyophilisation
-    lyophilizations, lyophilisations
-    lyophilize, lyophilise
-    lyophilized, lyophilised
-    lyophilizer, lyophiliser
-    lyophilizes, lyophilises
-    lyophilizing, lyophilising
-    lyricization's, lyricisation's
-    lyricization, lyricisation
-    lyricize, lyricise
-    lyricized, lyricised
-    lyricizes, lyricises
-    lyricizing, lyricising
-    lysogenization, lysogenisation
-    lysogenize, lysogenise
-    lysogenized, lysogenised
-    lysogenizes, lysogenises
-    lysogenizing, lysogenising
-    mac's, mack's
-    mac, mack
-    macadamization's, macadamisation's
-    macadamization, macadamisation
-    macadamizations, macadamisations
-    macadamize, macadamise
-    macadamized, macadamised
-    macadamizes, macadamises
-    macadamizing, macadamising
-    macarize, macarise
-    macarized, macarised
-    macarizes, macarises
-    macarizing, macarising
-    Maccabean, Maccabaean
-    machinization's, machinisation's
-    machinization, machinisation
-    machinizations, machinisations
-    machinize, machinise
-    machinizes, machinises
-    mackintosh's, macintosh's
-    mackintosh, macintosh
-    mackintoshes, macintoshes
-    macrander, macrandre
-    macs, macks
-    macule, maculae
-    Madera's, Madoera's
-    Madera, Madoera
-    maderization, maderisation
-    maderizations, maderisations
-    maderize, maderise
-    maderized, maderised
-    maderizes, maderises
-    maderizing, maderising
-    maed, maaed
-    maenad's, menad's
-    maenad, menad
-    maenadic, menadic
-    maenads, menads
-    magicalize, magicalise
-    magicalizes, magicalises
-    magnetizabilities, magnetisabilities
-    magnetizability's, magnetisability's
-    magnetizability, magnetisability
-    magnetizable's, magnetisable's
-    magnetizable, magnetisable
-    magnetizables, magnetisables
-    magnetization's, magnetisation's
-    magnetization, magnetisation
-    magnetizations, magnetisations
-    magnetize, magnetise
-    magnetized, magnetised
-    magnetizer's, magnetiser's
-    magnetizer, magnetiser
-    magnetizers, magnetisers
-    magnetizes, magnetises
-    magnetizing, magnetising
-    maharajah's, maharaja's
-    maharajah, maharaja
-    maharajahs, maharajas
-    maharani's, maharanee's
-    maharani, maharanee
-    maharanis, maharanees
-    mahoganize, mahoganise
-    mahoganized, mahoganised
-    mahoganizes, mahoganises
-    mahoganizing, mahoganising
-    maiger, maigre
-    mainor, mainour
-    mainors, mainours
-    mainprize, mainprise
-    maisters, maistres
-    Maize's, Maise's
-    Maize, Maise
-    majolica's, maiolica's
-    majolica, maiolica
-    majolicas, maiolicas
-    majorize, majorise
-    majorizes, majorises
-    majuscule, majusculae
-    Malayize's, Malayise's
-    Malayize, Malayise
-    Malayizes, Malayises
-    malleablize, malleablise
-    malleablizes, malleablises
-    malodor's, malodour's
-    malodor, malodour
-    malodorousness, malodourousness
-    malodors, malodours
-    mandarinize, mandarinise
-    mandarinizes, mandarinises
-    Mandean's, Mandaean's
-    Mandean, Mandaean
-    Mandeans, Mandaeans
-    mandoer, mandore
-    mandrel's, mandril's
-    mandrel, mandril
-    mandrels, mandrils
-    maneuverabilities, manoeuvrabilities
-    maneuverability's, manoeuvrability's
-    maneuverability, manoeuvrability
-    maneuverable, manoeuvrable
-    maneuverabler, manoeuvrabler
-    maneuverablest, manoeuvrablest
-    maneuverer's, manoeuvrer's
-    maneuverer, manoeuvrer
-    maneuverers, manoeuvrers
-    Manhattanize, Manhattanise
-    Manhattanizes, Manhattanises
-    Manicheanism's, Manichaeanism's
-    Manicheanism, Manichaeanism
-    Manicheans, Manichaeans
-    Manicheism's, Manichaeism's
-    Manicheism, Manichaeism
-    Manicheisms, Manichaeisms
-    Manicheus's, Manichaeus's
-    Manicheus, Manichaeus
-    manikin's, mannikin's
-    manikin, mannikin
-    manikins, mannikins
-    mannerize, mannerise
-    mannerizes, mannerises
-    manoeuvre's, manoeuver's
-    manoeuvre, manoeuver
-    manoeuvred, manoeuvered
-    manoeuvres, manoeuvers
-    manoeuvring, manoeuvering
-    manoeuvrings, manoeuverings
-    mantelpiece, mantlepiece
-    mantelpieces, mantlepieces
-    mantes, mantoes
-    marabou's, marabout's
-    marabou, marabout
-    marabous, marabouts
-    marbleize, marbleise
-    marbleized, marbleised
-    marbleizes, marbleises
-    marbleizing, marbleising
-    margarite, margaritae
-    marginalization, marginalisation
-    marginalize, marginalise
-    marginalized, marginalised
-    marginalizes, marginalises
-    marginalizing, marginalising
-    marijuana's, marihuana's
-    marijuana, marihuana
-    marijuanas, marihuanas
-    marlinespike's, marlinspike's
-    marlinespike, marlinspike
-    marlinespikes, marlinspikes
-    marmarize, marmarise
-    marmarized, marmarised
-    marmarizes, marmarises
-    marmarizing, marmarising
-    marmelize, marmelise
-    marmelized, marmelised
-    marmelizes, marmelises
-    marmelizing, marmelising
-    marshaled, marshalled
-    marshaling, marshalling
-    marsupialization's, marsupialisation's
-    marsupialization, marsupialisation
-    marsupializations, marsupialisations
-    marsupialize, marsupialise
-    marsupialized, marsupialised
-    marsupializes, marsupialises
-    marsupializing, marsupialising
-    Marte's, Martae's
-    Marte, Martae
-    martialization's, martialisation's
-    martialization, martialisation
-    martializations, martialisations
-    martialize, martialise
-    martializes, martialises
-    martyrization's, martyrisation's
-    martyrization, martyrisation
-    martyrizations, martyrisations
-    martyrize, martyrise
-    martyrized, martyrised
-    martyrizer, martyriser
-    martyrizers, martyrisers
-    martyrizes, martyrises
-    martyrizing, martyrising
-    marveled, marvelled
-    marveler, marveller
-    marveling, marvelling
-    marvelous, marvellous
-    marvelouser, marvellouser
-    marvelousest, marvellousest
-    marvelouslier, marvellouslier
-    marvelousliest, marvellousliest
-    marvelously, marvellously
-    marvelousness's, marvellousness's
-    marvelousness, marvellousness
-    marvelousnesses, marvellousnesses
-    masculinization's, masculinisation's
-    masculinization, masculinisation
-    masculinizations, masculinisations
-    masculinize, masculinise
-    masculinized, masculinised
-    masculinizes, masculinises
-    masculinizing, masculinising
-    materialization's, materialisation's
-    materialization, materialisation
-    materializations, materialisations
-    materialize, materialise
-    materialized, materialised
-    materializer's, materialiser's
-    materializer, materialiser
-    materializers, materialisers
-    materializes, materialises
-    materializing, materialising
-    maternalize, maternalise
-    maternalized, maternalised
-    maternalizes, maternalises
-    maternalizing, maternalising
-    maters, matres
-    mathematicize, mathematicise
-    mathematicized, mathematicised
-    mathematicizes, mathematicises
-    mathematicizing, mathematicising
-    mathematization's, mathematisation's
-    mathematization, mathematisation
-    mathematizations, mathematisations
-    mathematize, mathematise
-    mathematized, mathematised
-    mathematizes, mathematises
-    mathematizing, mathematising
-    matronize, matronise
-    matronized, matronised
-    matronizes, matronises
-    matronizing, matronising
-    matte, mat
-    Matthean, Matthaean
-    maudlinize, maudlinise
-    maudlinizes, maudlinises
-    mauger, maugre
-    maven's, mavin's
-    maven, mavin
-    mavens, mavins
-    maximization's, maximisation's
-    maximization, maximisation
-    maximizations, maximisations
-    maximize, maximise
-    maximized, maximised
-    maximizer's, maximiser's
-    maximizer, maximiser
-    maximizers, maximisers
-    maximizes, maximises
-    maximizing, maximising
-    mazurka's, mazourka's
-    mazurka, mazourka
-    mazurkas, mazourkas
-    meager, meagre
-    meagerly, meagrely
-    meagerness's, meagreness's
-    meagerness, meagreness
-    meagernesses, meagrenesses
-    meagerrer, meagrer
-    meagerrest, meagrest
-    meandrine, maeandrine
-    meandriniform, maeandriniform
-    meanie's, meany's
-    meanie, meany
-    mechanicalization's, mechanicalisation's
-    mechanicalization, mechanicalisation
-    mechanicalizations, mechanicalisations
-    mechanicalize, mechanicalise
-    mechanicalizes, mechanicalises
-    mechanizable, mechanisable
-    mechanization's, mechanisation's
-    mechanization, mechanisation
-    mechanizations, mechanisations
-    mechanize, mechanise
-    mechanized, mechanised
-    mechanizer's, mechaniser's
-    mechanizer, mechaniser
-    mechanizers, mechanisers
-    mechanizes, mechanises
-    mechanizing, mechanising
-    meck, moeck
-    Med's, Moed's
-    Med, Moed
-    medaled, medalled
-    medaling, medalling
-    medalist's, medallist's
-    medalist, medallist
-    medalists, medallists
-    medalize, medalise
-    medalizes, medalises
-    medialization's, medialisation's
-    medialization, medialisation
-    medializations, medialisations
-    medialize, medialise
-    medializes, medialises
-    mediatization's, mediatisation's
-    mediatization, mediatisation
-    mediatizations, mediatisations
-    mediatize, mediatise
-    mediatized, mediatised
-    mediatizes, mediatises
-    mediatizing, mediatising
-    medicalization, medicalisation
-    medicalizations, medicalisations
-    medicalize, medicalise
-    medicalized, medicalised
-    medicalizes, medicalises
-    medicalizing, medicalising
-    medieval's, mediaeval's
-    medieval, mediaeval
-    medievalism's, mediaevalism's
-    medievalism, mediaevalism
-    medievalisms, mediaevalisms
-    medievally, mediaevally
-    medievals, mediaevals
-    Mediterraneanization's, Mediterraneanisation's
-    Mediterraneanization, Mediterraneanisation
-    Mediterraneanizations, Mediterraneanisations
-    Mediterraneanize's, Mediterraneanise's
-    Mediterraneanize, Mediterraneanise
-    Mediterraneanizes, Mediterraneanises
-    mediumization's, mediumisation's
-    mediumization, mediumisation
-    mediumizations, mediumisations
-    mediumize, mediumise
-    mediumizes, mediumises
-    megagram, megagramme
-    megagrams, megagrammes
-    megameter, megametre
-    megameters, megametres
-    megbote, maegbote
-    megerg, megaerg
-    melanemia, melanaemia
-    melanemic, melanaemic
-    melanization, melanisation
-    melanize, melanise
-    melanized, melanised
-    melanizes, melanises
-    melanizing, melanising
-    mele, meloe
-    melena, melaena
-    melenic, melaenic
-    Melie's, Meliae's
-    Melie, Meliae
-    meline, melinae
-    melitemia, melitaemia
-    melithemia, melithaemia
-    mellon, moellon
-    melodization, melodisation
-    melodize, melodise
-    melodized, melodised
-    melodizer's, melodiser's
-    melodizer, melodiser
-    melodizes, melodises
-    melodizing, melodising
-    melodramatization, melodramatisation
-    melodramatize, melodramatise
-    melodramatized, melodramatised
-    melodramatizes, melodramatises
-    melodramatizing, melodramatising
-    memorialization's, memorialisation's
-    memorialization, memorialisation
-    memorializations, memorialisations
-    memorialize, memorialise
-    memorialized, memorialised
-    memorializer's, memorialiser's
-    memorializer, memorialiser
-    memorializers, memorialisers
-    memorializes, memorialises
-    memorializing, memorialising
-    memorizable's, memorisable's
-    memorizable, memorisable
-    memorizables, memorisables
-    memorization's, memorisation's
-    memorization, memorisation
-    memorizations, memorisations
-    memorize, memorise
-    memorized, memorised
-    memorizer's, memoriser's
-    memorizer, memoriser
-    memorizers, memorisers
-    memorizes, memorises
-    memorizing, memorising
-    Mendelize's, Mendelise's
-    Mendelize, Mendelise
-    Mendelizes, Mendelises
-    meningorrhea, meningorrhoea
-    menorrhea, menorrhoea
-    menorrheas, menorrhoeas
-    menorrheic, menorrhoeic
-    mense, mensae
-    mentalization's, mentalisation's
-    mentalization, mentalisation
-    mentalizations, mentalisations
-    mentalize, mentalise
-    mentalizes, mentalises
-    meow's, miaow's
-    meow, miaow
-    meowed, miaowed
-    meowing, miaowing
-    meows, miaows
-    mephitine, mephitinae
-    Mera's, Maera's
-    Mera, Maera
-    mercerization's, mercerisation's
-    mercerization, mercerisation
-    mercerizations, mercerisations
-    mercerize, mercerise
-    mercerized, mercerised
-    mercerizer's, merceriser's
-    mercerizer, merceriser
-    mercerizers, mercerisers
-    mercerizes, mercerises
-    mercerizing, mercerising
-    merchandiser's, merchandizer's
-    merchandiser, merchandizer
-    merchandisers, merchandizers
-    mercurialization's, mercurialisation's
-    mercurialization, mercurialisation
-    mercurializations, mercurialisations
-    mercurialize, mercurialise
-    mercurialized, mercurialised
-    mercurializes, mercurialises
-    mercurializing, mercurialising
-    mercurize, mercurise
-    mercurized, mercurised
-    mercurizes, mercurises
-    mercurizing, mercurising
-    Meroe's, Meroae's
-    Meroe, Meroae
-    mesmerizabilities, mesmerisabilities
-    mesmerizability's, mesmerisability's
-    mesmerizability, mesmerisability
-    mesmerizable's, mesmerisable's
-    mesmerizable, mesmerisable
-    mesmerizables, mesmerisables
-    mesmerization's, mesmerisation's
-    mesmerization, mesmerisation
-    mesmerizations, mesmerisations
-    mesmerize, mesmerise
-    mesmerized, mesmerised
-    mesmerizer's, mesmeriser's
-    mesmerizer, mesmeriser
-    mesmerizers, mesmerisers
-    mesmerizes, mesmerises
-    mesmerizing, mesmerising
-    mesoglea, mesogloea
-    mesogleal, mesogloeal
-    mesogleas, mesogloeas
-    mesprize, mesprise
-    mesprizes, mesprises
-    mesquite's, mesquit's
-    mesquite, mesquit
-    mesquites, mesquits
-    metabolizable's, metabolisable's
-    metabolizable, metabolisable
-    metabolizables, metabolisables
-    metabolize, metabolise
-    metabolized, metabolised
-    metabolizes, metabolises
-    metabolizing, metabolising
-    metacenter's, metacentre's
-    metacenter, metacentre
-    metacenters, metacentres
-    metagrabolize, metagrabolise
-    metagrabolized, metagrabolised
-    metagrabolizes, metagrabolises
-    metagrabolizing, metagrabolising
-    metagrobolize, metagrobolise
-    metagrobolized, metagrobolised
-    metagrobolizes, metagrobolises
-    metagrobolizing, metagrobolising
-    metaled, metalled
-    metaling, metalling
-    metallisation's, metallization's
-    metallisation, metallization
-    metallisations, metallizations
-    metallise, metallize
-    metallised, metallized
-    metallises, metallizes
-    metallising, metallizing
-    metamerization's, metamerisation's
-    metamerization, metamerisation
-    metamerizations, metamerisations
-    metamerized's, metamerised's
-    metamerized, metamerised
-    metamerizeds, metameriseds
-    metaphonize, metaphonise
-    metaphonizes, metaphonises
-    metaphorize, metaphorise
-    metaphorizes, metaphorises
-    metaphysicize, metaphysicise
-    metaphysicizes, metaphysicises
-    metastasize, metastasise
-    metastasized, metastasised
-    metastasizes, metastasises
-    metastasizing, metastasising
-    metathesize, metathesise
-    metathesized, metathesised
-    metathesizes, metathesises
-    metathesizing, metathesising
-    meteorization's, meteorisation's
-    meteorization, meteorisation
-    meteorizations, meteorisations
-    meteorize, meteorise
-    meteorizes, meteorises
-    metergram, metregram
-    meterless, metreless
-    metership, metreship
-    metestrus's, metoestrus's
-    metestrus, metoestrus
-    methadone's, methadon's
-    methadone, methadon
-    methadones, methadons
-    methemoglobin, methaemoglobin
-    methodization's, methodisation's
-    methodization, methodisation
-    methodizations, methodisations
-    methodize, methodise
-    methodized, methodised
-    methodizer's, methodiser's
-    methodizer, methodiser
-    methodizers, methodisers
-    methodizes, methodises
-    methodizing, methodising
-    metope, metopae
-    metricize, metricise
-    metricized, metricised
-    metricizes, metricises
-    metricizing, metricising
-    metrize, metrise
-    metropolitanization, metropolitanisation
-    metropolitanize, metropolitanise
-    metropolitanized, metropolitanised
-    metropolitanizes, metropolitanises
-    metropolitanizing, metropolitanising
-    Mexicanize's, Mexicanise's
-    Mexicanize, Mexicanise
-    Mexicanizes, Mexicanises
-    micelle, micellae
-    micresthete, micraesthete
-    microcolorimeter, microcolourimeter
-    microcolorimetric, microcolourimetric
-    microcolorimetrically, microcolourimetrically
-    microcolorimetry, microcolourimetry
-    microgram, microgramme
-    micrograms, nanogrammes
-    microliter's, microlitre's
-    microliter, microlitre
-    microliters, microlitres
-    micromillimeter's, micromillimetre's
-    micromillimeter, micromillimetre
-    micromillimeters, micromillimetres
-    microminiaturization's, microminiaturisation's
-    microminiaturization, microminiaturisation
-    microminiaturizations, microminiaturisations
-    microminiaturize, microminiaturise
-    microminiaturized, microminiaturised
-    microminiaturizer, microminiaturiser
-    microminiaturizers, microminiaturisers
-    microminiaturizes, microminiaturises
-    microminiaturizing, microminiaturising
-    micronization's, micronisation's
-    micronization, micronisation
-    micronizations, micronisations
-    micronize, micronise
-    micronizes, micronises
-    micropaleontologies, micropalaeontologies
-    micropaleontologist, micropalaeontologist
-    micropaleontologists, micropalaeontologists
-    micropaleontology's, micropalaeontology's
-    micropaleontology, micropalaeontology
-    micropolarization's, micropolarisation's
-    micropolarization, micropolarisation
-    micropolarizations, micropolarisations
-    microscopize, microscopise
-    microscopizes, microscopises
-    microspheric, microsphaeric
-    Midlandize's, Midlandise's
-    Midlandize, Midlandise
-    Midlandizes, Midlandises
-    midsize, midsized
-    midwifed, midwived
-    midwifing, midwiving
-    migniardize, migniardise
-    militarization's, militarisation's
-    militarization, militarisation
-    militarizations, militarisations
-    militarize, militarise
-    militarized, militarised
-    militarizes, militarises
-    militarizing, militarising
-    milligram's, milligramme's
-    milligram, milligramme
-    milligrams, milligrammes
-    milliliter's, millilitre's
-    milliliter, millilitre
-    milliliters, millilitres
-    millimeter's, millimetre's
-    millimeter, millimetre
-    millimeters, millimetres
-    millionaire's, millionnaire's
-    millionaire, millionnaire
-    millionaires, millionnaires
-    millionize, millionise
-    millionizes, millionises
-    millipede's, millepede's
-    millipede, millepede
-    millipedes, millepedes
-    milometer's, mileometer's
-    milometer, mileometer
-    milometers, mileometers
-    Miltonize's, Miltonise's
-    Miltonize, Miltonise
-    Miltonized's, Miltonised's
-    Miltonized, Miltonised
-    Miltonizes, Miltonises
-    Miltonizing's, Miltonising's
-    Miltonizing, Miltonising
-    mineralizable's, mineralisable's
-    mineralizable, mineralisable
-    mineralizables, mineralisables
-    mineralization's, mineralisation's
-    mineralization, mineralisation
-    mineralizations, mineralisations
-    mineralize, mineralise
-    mineralized, mineralised
-    mineralizer's, mineraliser's
-    mineralizer, mineraliser
-    mineralizers, mineralisers
-    mineralizes, mineralises
-    mineralizing, mineralising
-    mineralogize, mineralogise
-    mineralogized, mineralogised
-    mineralogizes, mineralogises
-    mineralogizing, mineralogising
-    miniaturization's, miniaturisation's
-    miniaturization, miniaturisation
-    miniaturizations, miniaturisations
-    miniaturize, miniaturise
-    miniaturized, miniaturised
-    miniaturizes, miniaturises
-    miniaturizing, miniaturising
-    minibuses, minibusses
-    minimization's, minimisation's
-    minimization, minimisation
-    minimizations, minimisations
-    minimize, minimise
-    minimized, minimised
-    minimizer's, minimiser's
-    minimizer, minimiser
-    minimizers, minimisers
-    minimizes, minimises
-    minimizing, minimising
-    minuscule's, miniscule's
-    minuscule, miniscule
-    minuscules, miniscules
-    miraculize, miraculise
-    miraculized, miraculised
-    miraculizes, miraculises
-    miraculizing, miraculising
-    mirrorize, mirrorise
-    mirrorizes, mirrorises
-    misadvize, misadvise
-    misalphabetize, misalphabetise
-    misalphabetizes, misalphabetises
-    misanthropize, misanthropise
-    misanthropized, misanthropised
-    misanthropizes, misanthropises
-    misanthropizing, misanthropising
-    misauthorization's, misauthorisation's
-    misauthorization, misauthorisation
-    misauthorizations, misauthorisations
-    misauthorize, misauthorise
-    misauthorizes, misauthorises
-    misbaptize, misbaptise
-    misbaptizes, misbaptises
-    misbehavior's, misbehaviour's
-    misbehavior, misbehaviour
-    misbehaviors, misbehaviours
-    miscanonize, miscanonise
-    miscanonizes, miscanonises
-    mischaracterization's, mischaracterisation's
-    mischaracterization, mischaracterisation
-    mischaracterizations, mischaracterisations
-    mischaracterize, mischaracterise
-    mischaracterizes, mischaracterises
-    miscolor's, miscolour's
-    miscolor, miscolour
-    miscoloration, miscolouration
-    miscolored, miscoloured
-    miscoloring, miscolouring
-    miscolors, miscolours
-    misdemeanor's, misdemeanour's
-    misdemeanor, misdemeanour
-    misdemeanors, misdemeanours
-    misemphasize, misemphasise
-    misemphasizes, misemphasises
-    misjudgment's, misjudgement's
-    misjudgment, misjudgement
-    misjudgments, misjudgements
-    mislabeled, mislabelled
-    mislabeling, mislabelling
-    mislabor's, mislabour's
-    mislabor, mislabour
-    mislabored, mislaboured
-    mislaboring, mislabouring
-    mislabors, mislabours
-    misopedia, misopaedia
-    misopedism, misopaedism
-    misopedist's, misopaedist's
-    misopedist, misopaedist
-    misorganization's, misorganisation's
-    misorganization, misorganisation
-    misorganizations, misorganisations
-    misorganize, misorganise
-    misorganizes, misorganises
-    misprizal, misprisal
-    misprize, misprise
-    misprized, misprised
-    misprizer, mispriser
-    misprizes, misprises
-    misprizing, misprising
-    misrealize, misrealise
-    misrealizes, misrealises
-    misrecognize, misrecognise
-    misrecognizes, misrecognises
-    misrouting, misrouteing
-    missilery's, missilry's
-    missilery, missilry
-    missionarize, missionarise
-    missionarized, missionarised
-    missionarizes, missionarises
-    missionarizing, missionarising
-    missionization, missionisation
-    missionize, missionise
-    missionized, missionised
-    missionizer, missioniser
-    missionizers, missionisers
-    missionizes, missionises
-    missionizing, missionising
-    missus's, missis's
-    missus, missis
-    missuses, missises
-    miter's, mitre's
-    miter, mitre
-    mitered, mitred
-    miterer's, mitrer's
-    miterer, mitrer
-    miterflower, mitreflower
-    mitering, mitring
-    miters, mitres
-    miterwort's, mitrewort's
-    miterwort, mitrewort
-    miterworts, mitreworts
-    mithridatize, mithridatise
-    mithridatized, mithridatised
-    mithridatizes, mithridatises
-    mithridatizing, mithridatising
-    mize, mise
-    mobilizable's, mobilisable's
-    mobilizable, mobilisable
-    mobilizabler, mobilisabler
-    mobilizables, mobilisables
-    mobilizablest, mobilisablest
-    mobilization's, mobilisation's
-    mobilization, mobilisation
-    mobilizations, mobilisations
-    mobilize, mobilise
-    mobilized, mobilised
-    mobilizer's, mobiliser's
-    mobilizer, mobiliser
-    mobilizers, mobilisers
-    mobilizes, mobilises
-    mobilizing, mobilising
-    modalize, modalise
-    modalizes, modalises
-    modeled, modelled
-    modeler's, modeller's
-    modeler, modeller
-    modelers, modellers
-    modeling's, modelling's
-    modeling, modelling
-    modelings, modellings
-    modernizable's, modernisable's
-    modernizable, modernisable
-    modernizables, modernisables
-    modernization's, modernisation's
-    modernization, modernisation
-    modernizations, modernisations
-    modernize, modernise
-    modernized, modernised
-    modernizer's, moderniser's
-    modernizer, moderniser
-    modernizers, modernisers
-    modernizes, modernises
-    modernizing, modernising
-    modularization, modularisation
-    modularize, modularise
-    modularized, modularised
-    modularizes, modularises
-    modularizing, modularising
-    moggy's, moggie's
-    moggy, moggie
-    Mohammedanization's, Mohammedanisation's
-    Mohammedanization, Mohammedanisation
-    Mohammedanizations, Mohammedanisations
-    Mohammedanize's, Mohammedanise's
-    Mohammedanize, Mohammedanise
-    Mohammedanized's, Mohammedanised's
-    Mohammedanized, Mohammedanised
-    Mohammedanizes, Mohammedanises
-    Mohammedanizing's, Mohammedanising's
-    Mohammedanizing, Mohammedanising
-    moisturization, moisturisation
-    moisturize, moisturise
-    moisturized, moisturised
-    moisturizer's, moisturiser's
-    moisturizer, moisturiser
-    moisturizers, moisturisers
-    moisturizes, moisturises
-    moisturizing, moisturising
-    molarization, molarisation
-    molarizations, molarisations
-    mold's, mould's
-    mold, mould
-    molded, moulded
-    molder's, moulder's
-    molder, moulder
-    moldered, mouldered
-    moldering, mouldering
-    molders, moulders
-    moldier, mouldier
-    moldiest, mouldiest
-    molding's, moulding's
-    molding, moulding
-    moldings, mouldings
-    molds, moulds
-    moldy, mouldy
-    molluscan, molluskan
-    mollusk's, mollusc's
-    mollusk, mollusc
-    mollusks, molluscs
-    Molochize's, Molochise's
-    Molochize, Molochise
-    molochize, molochise
-    molochized, molochised
-    Molochizes, Molochises
-    molochizes, molochises
-    molochizing, molochising
-    molt's, moult's
-    molt, moult
-    molted, moulted
-    molting, moulting
-    molts, moults
-    mommy's, mommie's
-    mommy, mommie
-    monarchize, monarchise
-    monarchized, monarchised
-    monarchizer, monarchiser
-    monarchizers, monarchisers
-    monarchizes, monarchises
-    monarchizing, monarchising
-    monasticize, monasticise
-    monasticizes, monasticises
-    monecian, monoecian
-    monestrous, monoestrous
-    monetization's, monetisation's
-    monetization, monetisation
-    monetizations, monetisations
-    monetize, monetise
-    monetized, monetised
-    monetizes, monetises
-    monetizing, monetising
-    moneyed, monied
-    Mongolize's, Mongolise's
-    Mongolize, Mongolise
-    Mongolized's, Mongolised's
-    Mongolized, Mongolised
-    Mongolizes, Mongolises
-    Mongolizing's, Mongolising's
-    Mongolizing, Mongolising
-    mongrelization's, mongrelisation's
-    mongrelization, mongrelisation
-    mongrelizations, mongrelisations
-    mongrelize, mongrelise
-    mongrelized, mongrelised
-    mongrelizer, mongreliser
-    mongrelizes, mongrelises
-    mongrelizing, mongrelising
-    moniker's, monicker's
-    moniker, monicker
-    monikers, monickers
-    monochordize, monochordise
-    monochordizes, monochordises
-    monoecious, monecious
-    monologist's, monologuist's
-    monologist, monologuist
-    monologists, monologuists
-    monologize, monologise
-    monologized, monologised
-    monologizes, monologises
-    monologizing, monologising
-    monologue's, monolog's
-    monologue, monolog
-    monologues, monologs
-    monologuize, monologuise
-    monologuized, monologuised
-    monologuizes, monologuises
-    monologuizing, monologuising
-    monometalism, monometallism
-    monometalist, monometallist
-    monophthongize, monophthongise
-    monophthongized, monophthongised
-    monophthongizes, monophthongises
-    monophthongizing, monophthongising
-    monopolizable's, monopolisable's
-    monopolizable, monopolisable
-    monopolizables, monopolisables
-    monopolization's, monopolisation's
-    monopolization, monopolisation
-    monopolizations, monopolisations
-    monopolize, monopolise
-    monopolized, monopolised
-    monopolizer's, monopoliser's
-    monopolizer, monopoliser
-    monopolizers, monopolisers
-    monopolizes, monopolises
-    monopolizing, monopolising
-    monotonize, monotonise
-    monotonizes, monotonises
-    monumentalization's, monumentalisation's
-    monumentalization, monumentalisation
-    monumentalizations, monumentalisations
-    monumentalize, monumentalise
-    monumentalized, monumentalised
-    monumentalizes, monumentalises
-    monumentalizing, monumentalising
-    moralization's, moralisation's
-    moralization, moralisation
-    moralizations, moralisations
-    moralize, moralise
-    moralized, moralised
-    moralizer's, moraliser's
-    moralizer, moraliser
-    moralizers, moralisers
-    moralizes, moralises
-    moralizing, moralising
-    moralizinglies, moralisinglies
-    moralizingly, moralisingly
-    Moravianized's, Moravianised's
-    Moravianized, Moravianised
-    Moravianizeds, Moravianiseds
-    morbidize, morbidise
-    morbidizes, morbidises
-    Morea's, Moraea's
-    Morea, Moraea
-    morne, mourne
-    morningly, mourningly
-    morphinization's, morphinisation's
-    morphinization, morphinisation
-    morphinizations, morphinisations
-    morphinize, morphinise
-    morphinizes, morphinises
-    morseled, morselled
-    morseling, morselling
-    morselization's, morselisation's
-    morselization, morselisation
-    morselizations, morselisations
-    morselize, morselise
-    morselizes, morselises
-    mortalize, mortalise
-    mortalized, mortalised
-    mortalizes, mortalises
-    mortalizing, mortalising
-    mortarize, mortarise
-    mortarizes, mortarises
-    mortgagor's, mortgager's
-    mortgagor, mortgager
-    mortgagors, mortgagers
-    mortise's, mortice's
-    mortise, mortice
-    mortised, morticed
-    mortises, mortices
-    mortising, morticing
-    morule, morulae
-    Moslemize's, Moslemise's
-    Moslemize, Moslemise
-    Moslemizes, Moslemises
-    motorization's, motorisation's
-    motorization, motorisation
-    motorizations, motorisations
-    motorize, motorise
-    motorized, motorised
-    motorizes, motorises
-    motorizing, motorising
-    mousy, mousey
-    movability, moveability
-    movable's, moveable's
-    movable, moveable
-    movableness, moveableness
-    movablenesses, moveablenesses
-    movables, moveables
-    movably, moveably
-    mucorrhea, mucorrhoea
-    mucose, mucosae
-    mujahedin's, mujahedeen's
-    mujahedin, mujahedeen
-    multicolor's, multicolour's
-    multicolor, multicolour
-    multicolored, multicoloured
-    multicoloredder, multicolouredder
-    multicoloreddest, multicoloureddest
-    multicolorous, multicolourous
-    multicolors, multicolours
-    multifibered's, multifibred's
-    multifibered, multifibred
-    multifibereds, multifibreds
-    multileveled, multilevelled
-    multiplexer's, multiplexor's
-    multiplexer, multiplexor
-    multiplexers, multiplexors
-    municipalization's, municipalisation's
-    municipalization, municipalisation
-    municipalizations, municipalisations
-    municipalize, municipalise
-    municipalized, municipalised
-    municipalizer, municipaliser
-    municipalizers, municipalisers
-    municipalizes, municipalises
-    municipalizing, municipalising
-    murena, muraena
-    murenas, muraenas
-    muscularize, muscularise
-    muscularizes, muscularises
-    museumize, museumise
-    museumizes, museumises
-    musicalization's, musicalisation's
-    musicalization, musicalisation
-    musicalizations, musicalisations
-    musicalize, musicalise
-    musicalized, musicalised
-    musicalizes, musicalises
-    musicalizing, musicalising
-    Muslim's, Moslem's
-    Muslim, Moslem
-    mustache's, moustache's
-    mustache, moustache
-    mustached, moustached
-    mustaches, moustaches
-    mustachio's, moustachio's
-    mustachio, moustachio
-    mustachioed, moustachioed
-    mutagenize, mutagenise
-    mutagenized, mutagenised
-    mutagenizes, mutagenises
-    mutagenizing, mutagenising
-    mutualization's, mutualisation's
-    mutualization, mutualisation
-    mutualizations, mutualisations
-    mutualize, mutualise
-    mutualized, mutualised
-    mutualizes, mutualises
-    mutualizing, mutualising
-    mycohemia, mycohaemia
-    myelinization's, myelinisation's
-    myelinization, myelinisation
-    myelinizations, myelinisations
-    myelocele, myelocoele
-    myelocythemia, myelocythaemia
-    mylonitization, mylonitisation
-    mylonitizations, mylonitisations
-    mylonitize, mylonitise
-    mylonitized, mylonitised
-    mylonitizes, mylonitises
-    mylonitizing, mylonitising
-    myna's, mynah's
-    myna, mynah
-    mynas, mynahes
-    myocele, myocoele
-    myohematin, myohaematin
-    myrialiter, myrialitre
-    myriameter, myriametre
-    mysticize, mysticise
-    mysticizes, mysticises
-    mythicization, mythicisation
-    mythicize, mythicise
-    mythicized, mythicised
-    mythicizer's, mythiciser's
-    mythicizer, mythiciser
-    mythicizers, mythicisers
-    mythicizes, mythicises
-    mythicizing, mythicising
-    mythize, mythise
-    mythized, mythised
-    mythizes, mythises
-    mythizing, mythising
-    mythologization's, mythologisation's
-    mythologization, mythologisation
-    mythologizations, mythologisations
-    mythologize, mythologise
-    mythologized, mythologised
-    mythologizer's, mythologiser's
-    mythologizer, mythologiser
-    mythologizers, mythologisers
-    mythologizes, mythologises
-    mythologizing, mythologising
-    mythopeic, mythopoeic
-    mythopeist, mythopoeist
-    mythopoetize, mythopoetise
-    mythopoetized, mythopoetised
-    mythopoetizing, mythopoetising
-    myxameba, myxamoeba
-    myxedema's, myxoedema's
-    myxedema, myxoedema
-    myxedemas, myxoedemas
-    myxedematous, myxoedematous
-    myxedemic, myxoedemic
-    myxemia, myxaemia
-    naan's, nan's
-    naan, nan
-    naans, nans
-    Nabateans, Nabataeans
-    Nabathean's, Nabathaean's
-    Nabathean, Nabathaean
-    nakedize, nakedise
-    nakedizes, nakedises
-    nanization, nanisation
-    nanizations, nanisations
-    nanogram, nanogramme
-    nanograms, nanogrammes
-    nanometer's, nanometre's
-    nanometer, nanometre
-    nanometers, nanometres
-    napea, napaea
-    naphthalize, naphthalise
-    naphthalized, naphthalised
-    naphthalizes, naphthalises
-    naphthalizing, naphthalising
-    Napoleonize's, Napoleonise's
-    Napoleonize, Napoleonise
-    Napoleonizes, Napoleonises
-    narc's, nark's
-    narc, nark
-    narcotization's, narcotisation's
-    narcotization, narcotisation
-    narcotizations, narcotisations
-    narcotize, narcotise
-    narcotized, narcotised
-    narcotizes, narcotises
-    narcotizing, narcotising
-    narcs, narks
-    nasalization's, nasalisation's
-    nasalization, nasalisation
-    nasalizations, nasalisations
-    nasalize, nasalise
-    nasalized, nasalised
-    nasalizes, nasalises
-    nasalizing, nasalising
-    nationalization's, nationalisation's
-    nationalization, nationalisation
-    nationalizations, nationalisations
-    nationalize, nationalise
-    nationalized, nationalised
-    nationalizer's, nationaliser's
-    nationalizer, nationaliser
-    nationalizers, nationalisers
-    nationalizes, nationalises
-    nationalizing, nationalising
-    naturalization's, naturalisation's
-    naturalization, naturalisation
-    naturalizations, naturalisations
-    naturalize, naturalise
-    naturalized, naturalised
-    naturalizer's, naturaliser's
-    naturalizer, naturaliser
-    naturalizers, naturalisers
-    naturalizes, naturalises
-    naturalizing, naturalising
-    naturize, naturise
-    naturizes, naturises
-    nebularization's, nebularisation's
-    nebularization, nebularisation
-    nebularizations, nebularisations
-    nebularize, nebularise
-    nebularizes, nebularises
-    nebulization's, nebulisation's
-    nebulization, nebulisation
-    nebulizations, nebulisations
-    nebulize, nebulise
-    nebulized, nebulised
-    nebulizer's, nebuliser's
-    nebulizer, nebuliser
-    nebulizers, nebulisers
-    nebulizes, nebulises
-    nebulizing, nebulising
-    necremia, necraemia
-    necrotize, necrotise
-    necrotized, necrotised
-    necrotizes, necrotises
-    necrotizing, necrotising
-    nectarize, nectarise
-    nectarized, nectarised
-    nectarizes, nectarises
-    nectarizing, nectarising
-    neebor, neebour
-    neencephalon, neoencephalon
-    neer, nere
-    negligee's, neglig's
-    negligee, neglig
-    negligees, negligs
-    Negritize's, Negritise's
-    Negritize, Negritise
-    Negritized's, Negritised's
-    Negritized, Negritised
-    Negritizing's, Negritising's
-    Negritizing, Negritising
-    Negroization's, Negroisation's
-    Negroization, Negroisation
-    Negroizations, Negroisations
-    Negroize's, Negroise's
-    Negroize, Negroise
-    Negroized's, Negroised's
-    Negroized, Negroised
-    Negroizes, Negroises
-    Negroizing's, Negroising's
-    Negroizing, Negroising
-    neighbor's, neighbour's
-    neighbor, neighbour
-    neighbored, neighboured
-    neighborer's, neighbourer's
-    neighborer, neighbourer
-    neighborers, neighbourers
-    neighboress, neighbouress
-    neighborhood's, neighbourhood's
-    neighborhood, neighbourhood
-    neighborhoods, neighbourhoods
-    neighboring, neighbouring
-    neighborings, neighbourings
-    neighborless, neighbourless
-    neighborlesser, neighbourlesser
-    neighborlesses, neighbourlesses
-    neighborlessest, neighbourlessest
-    neighborlier, neighbourlier
-    neighborliest, neighbourliest
-    neighborlike's, neighbourlike's
-    neighborlike, neighbourlike
-    neighborlikes, neighbourlikes
-    neighborliness's, neighbourliness's
-    neighborliness, neighbourliness
-    neighborlinesses, neighbourlinesses
-    neighborly, neighbourly
-    neighbors, neighbours
-    neighborship's, neighbourship's
-    neighborship, neighbourship
-    neighborships, neighbourships
-    Neogea's, Neogaea's
-    Neogea, Neogaea
-    Neogeal's, Neogaeal's
-    Neogeal, Neogaeal
-    Neogean, Neogaean
-    Neogeic's, Neogaeic's
-    Neogeic, Neogaeic
-    neologization, neologisation
-    neologize, neologise
-    neologized, neologised
-    neologizes, neologises
-    neologizing, neologising
-    neopaganize, neopaganise
-    neopaganized, neopaganised
-    neopaganizes, neopaganises
-    neopaganizing, neopaganising
-    neoterize, neoterise
-    neoterized, neoterised
-    neoterizes, neoterises
-    neoterizing, neoterising
-    nephrectomize, nephrectomise
-    nephrectomized, nephrectomised
-    nephrectomizing, nephrectomising
-    nephrocele, nephrocoele
-    nephrotomize, nephrotomise
-    nesslerize, nesslerise
-    nesslerized, nesslerised
-    nesslerizing, nesslerising
-    net's, nett's
-    net, nett
-    nets, netts
-    neurepithelium, neuroepithelium
-    neurocele, neurocoele
-    neurocelian, neurocoelian
-    neuronal, neuronic
-    neuroticize, neuroticise
-    neuroticizes, neuroticises
-    neutralization's, neutralisation's
-    neutralization, neutralisation
-    neutralizations, neutralisations
-    neutralize, neutralise
-    neutralized, neutralised
-    neutralizer's, neutraliser's
-    neutralizer, neutraliser
-    neutralizers, neutralisers
-    neutralizes, neutralises
-    neutralizing, neutralising
-    neves, naeves
-    nevoid, naevoid
-    Newmanize's, Newmanise's
-    Newmanize, Newmanise
-    Newmanized's, Newmanised's
-    Newmanized, Newmanised
-    Newmanizes, Newmanises
-    Newmanizing's, Newmanising's
-    Newmanizing, Newmanising
-    newspaperized's, newspaperised's
-    newspaperized, newspaperised
-    newspaperizeds, newspaperiseds
-    nickeled, nickelled
-    nickeling, nickelling
-    nickelization's, nickelisation's
-    nickelization, nickelisation
-    nickelizations, nickelisations
-    nickelize, nickelise
-    nickelized, nickelised
-    nickelizes, nickelises
-    nickelizing, nickelising
-    nicotinize, nicotinise
-    nicotinized, nicotinised
-    nicotinizes, nicotinises
-    nicotinizing, nicotinising
-    nielled, nielloed
-    niger, nigre
-    niggardize, niggardise
-    niggardized, niggardised
-    niggardizes, niggardises
-    niggardizing, niggardising
-    night's, nite's
-    night, nite
-    nightie's, nighty's
-    nightie, nighty
-    nightingalize, nightingalise
-    nightingalizes, nightingalises
-    nights, nites
-    Nipponize's, Nipponise's
-    Nipponize, Nipponise
-    Nipponizes, Nipponises
-    niter's, nitre's
-    niter, nitre
-    niters, nitres
-    nitridization's, nitridisation's
-    nitridization, nitridisation
-    nitridizations, nitridisations
-    nitridize, nitridise
-    nitridizes, nitridises
-    nitrogenization's, nitrogenisation's
-    nitrogenization, nitrogenisation
-    nitrogenizations, nitrogenisations
-    nitrogenize, nitrogenise
-    nitrogenized, nitrogenised
-    nitrogenizes, nitrogenises
-    nitrogenizing, nitrogenising
-    nitroglycerin's, nitroglycerine's
-    nitroglycerin, nitroglycerine
-    nitroglycerins, nitroglycerines
-    nodalize, nodalise
-    nodalized, nodalised
-    nodalizes, nodalises
-    nodalizing, nodalising
-    nodulize, nodulise
-    nodulizes, nodulises
-    Noemon's, Noaemon's
-    Noemon, Noaemon
-    nomadization's, nomadisation's
-    nomadization, nomadisation
-    nomadizations, nomadisations
-    nomadize, nomadise
-    nomadized, nomadised
-    nomadizes, nomadises
-    nomadizing, nomadising
-    nominalization, nominalisation
-    nominalizations, nominalisations
-    nominalize, nominalise
-    nominalized, nominalised
-    nominalizes, nominalises
-    nominalizing, nominalising
-    nonacknowledgment's, nonacknowledgement's
-    nonacknowledgment, nonacknowledgement
-    nonacknowledgments, nonacknowledgements
-    nonanaesthetised, nonanaesthetized
-    nonanemic, nonanaemic
-    nonapostatizing's, nonapostatising's
-    nonapostatizing, nonapostatising
-    nonapostatizings, nonapostatisings
-    noncanonization's, noncanonisation's
-    noncanonization, noncanonisation
-    noncanonizations, noncanonisations
-    noncartelized's, noncartelised's
-    noncartelized, noncartelised
-    noncartelizeds, noncarteliseds
-    noncatechizable's, noncatechisable's
-    noncatechizable, noncatechisable
-    noncatechizables, noncatechisables
-    noncivilized's, noncivilised's
-    noncivilized, noncivilised
-    noncivilizeds, nonciviliseds
-    noncolor's, noncolour's
-    noncolor, noncolour
-    noncolorabilities, noncolourabilities
-    noncolorability's, noncolourability's
-    noncolorability, noncolourability
-    noncolorable's, noncolourable's
-    noncolorable, noncolourable
-    noncolorableness's, noncolourableness's
-    noncolorableness, noncolourableness
-    noncolorables, noncolourables
-    noncolorablies, noncolourablies
-    noncolorably, noncolourably
-    noncolored, noncoloured
-    noncolorer, noncolourer
-    noncolorers, noncolourers
-    noncolorfast, noncolourfast
-    noncoloring, noncolouring
-    noncolorings, noncolourings
-    noncolors, noncolours
-    noncrystallizable's, noncrystallisable's
-    noncrystallizable, noncrystallisable
-    noncrystallizables, noncrystallisables
-    noncrystallized's, noncrystallised's
-    noncrystallized, noncrystallised
-    noncrystallizeds, noncrystalliseds
-    noncrystallizing's, noncrystallising's
-    noncrystallizing, noncrystallising
-    noncrystallizings, noncrystallisings
-    nondemobilization's, nondemobilisation's
-    nondemobilization, nondemobilisation
-    nondemobilizations, nondemobilisations
-    nondialyzing's, nondialysing's
-    nondialyzing, nondialysing
-    nondialyzings, nondialysings
-    nondimensionalize, nondimensionalise
-    nondimensionalized, nondimensionalised
-    nonecumenic, nonoecumenic
-    nonecumenical, nonoecumenical
-    nonencyclopedic, nonencyclopaedic
-    nonesthetic, nonaesthetic
-    nonesthetical, nonaesthetical
-    nonesthetically, nonaesthetically
-    nonfavorite's, nonfavourite's
-    nonfavorite, nonfavourite
-    nonfavorites, nonfavourites
-    nonflavored, nonflavoured
-    nonfulfillment's, nonfulfilment's
-    nonfulfillment, nonfulfilment
-    nonfulfillments, nonfulfilments
-    nongalvanized's, nongalvanised's
-    nongalvanized, nongalvanised
-    nongalvanizeds, nongalvaniseds
-    nongelatinizing's, nongelatinising's
-    nongelatinizing, nongelatinising
-    nongelatinizings, nongelatinisings
-    nonhydrolyzable's, nonhydrolysable's
-    nonhydrolyzable, nonhydrolysable
-    nonhydrolyzables, nonhydrolysables
-    nonimmunized's, nonimmunised's
-    nonimmunized, nonimmunised
-    nonimmunizeds, nonimmuniseds
-    nonionized's, nonionised's
-    nonionized, nonionised
-    nonionizeds, nonioniseds
-    nonionizing's, nonionising's
-    nonionizing, nonionising
-    nonionizings, nonionisings
-    nonlocalized's, nonlocalised's
-    nonlocalized, nonlocalised
-    nonlocalizeds, nonlocaliseds
-    nonmagnetizable's, nonmagnetisable's
-    nonmagnetizable, nonmagnetisable
-    nonmagnetizables, nonmagnetisables
-    nonnitrogenized's, nonnitrogenised's
-    nonnitrogenized, nonnitrogenised
-    nonnitrogenizeds, nonnitrogeniseds
-    nonorganization's, nonorganisation's
-    nonorganization, nonorganisation
-    nonorganizations, nonorganisations
-    nonoxidizable's, nonoxidisable's
-    nonoxidizable, nonoxidisable
-    nonoxidizables, nonoxidisables
-    nonoxidizing's, nonoxidising's
-    nonoxidizing, nonoxidising
-    nonoxidizings, nonoxidisings
-    nonparlor's, nonparlour's
-    nonparlor, nonparlour
-    nonparlors, nonparlours
-    nonpenalized's, nonpenalised's
-    nonpenalized, nonpenalised
-    nonpenalizeds, nonpenaliseds
-    nonphosphorized's, nonphosphorised's
-    nonphosphorized, nonphosphorised
-    nonphosphorizeds, nonphosphoriseds
-    nonpolarizable's, nonpolarisable's
-    nonpolarizable, nonpolarisable
-    nonpolarizables, nonpolarisables
-    nonpolarized, nonpolarised
-    nonpolarizing's, nonpolarising's
-    nonpolarizing, nonpolarising
-    nonpolarizings, nonpolarisings
-    nonrationalized's, nonrationalised's
-    nonrationalized, nonrationalised
-    nonrationalizeds, nonrationaliseds
-    nonrealization's, nonrealisation's
-    nonrealization, nonrealisation
-    nonrealizations, nonrealisations
-    nonrecognized's, nonrecognised's
-    nonrecognized, nonrecognised
-    nonrecognizeds, nonrecogniseds
-    nonschematized's, nonschematised's
-    nonschematized, nonschematised
-    nonschematizeds, nonschematiseds
-    nonsensitized's, nonsensitised's
-    nonsensitized, nonsensitised
-    nonsensitizeds, nonsensitiseds
-    nonspecialized's, nonspecialised's
-    nonspecialized, nonspecialised
-    nonspecializeds, nonspecialiseds
-    nonstandardized's, nonstandardised's
-    nonstandardized, nonstandardised
-    nonstandardizeds, nonstandardiseds
-    nonstylized's, nonstylised's
-    nonstylized, nonstylised
-    nonstylizeds, nonstyliseds
-    nonsuccor, nonsuccour
-    nonsympathizer's, nonsympathiser's
-    nonsympathizer, nonsympathiser
-    nonsympathizers, nonsympathisers
-    nonsynthesized's, nonsynthesised's
-    nonsynthesized, nonsynthesised
-    nonsynthesizeds, nonsynthesiseds
-    nontemporizing's, nontemporising's
-    nontemporizing, nontemporising
-    nontemporizings, nontemporisings
-    nonutilized's, nonutilised's
-    nonutilized, nonutilised
-    nonutilizeds, nonutiliseds
-    nonvisualized's, nonvisualised's
-    nonvisualized, nonvisualised
-    nonvisualizeds, nonvisualiseds
-    nonvolatilized's, nonvolatilised's
-    nonvolatilized, nonvolatilised
-    nonvolatilizeds, nonvolatiliseds
-    nonvulcanizable's, nonvulcanisable's
-    nonvulcanizable, nonvulcanisable
-    nonvulcanizables, nonvulcanisables
-    norice, nourice
-    normalizable, normalisable
-    normalization's, normalisation's
-    normalization, normalisation
-    normalizations, normalisations
-    normalize, normalise
-    normalized, normalised
-    normalizer's, normaliser's
-    normalizer, normaliser
-    normalizers, normalisers
-    normalizes, normalises
-    normalizing, normalising
-    Normanization's, Normanisation's
-    Normanization, Normanisation
-    Normanizations, Normanisations
-    Normanize, Normanise
-    normanize, normanise
-    Normanized, Normanised
-    normanized, normanised
-    Normanizer's, Normaniser's
-    Normanizer, Normaniser
-    Normanizers, Normanisers
-    Normanizes, Normanises
-    normanizes, normanises
-    Normanizing, Normanising
-    normanizing, normanising
-    Northernize's, Northernise's
-    Northernize, Northernise
-    northernize, northernise
-    northernized, northernised
-    northernizes, northernises
-    northernizing, northernising
-    nosies, noseys
-    nosize, nosise
-    nosohemia, nosohaemia
-    nosy's, nosey's
-    nosy, nosey
-    notarization, notarisation
-    notarizations, notarisations
-    notarize, notarise
-    notarized, notarised
-    notarizes, notarises
-    notarizing, notarising
-    noter, notre
-    nothingize, nothingise
-    nothingizes, nothingises
-    Notogea's, Notogaea's
-    Notogea, Notogaea
-    nounize, nounise
-    nounizes, nounises
-    novelization's, novelisation's
-    novelization, novelisation
-    novelizations, novelisations
-    novelize, novelise
-    novelized, novelised
-    novelizer's, noveliser's
-    novelizer, noveliser
-    novelizers, novelisers
-    novelizes, novelises
-    novelizing, novelising
-    novene, novenae
-    nuclearization, nuclearisation
-    nuclearizations, nuclearisations
-    nuclearize, nuclearise
-    nuclearized, nuclearised
-    nuclearizes, nuclearises
-    nuclearizing, nuclearising
-    numskull's, numbskull's
-    numskull, numbskull
-    numskulls, numbskulls
-    nuptialize, nuptialise
-    nuptializes, nuptialises
-    nympheum, nymphaeum
-    Obe's, Oboe's
-    Obe, Oboe
-    obelize, obelise
-    obelized, obelised
-    obelizes, obelises
-    obelizing, obelising
-    objectivize, objectivise
-    objectivized, objectivised
-    objectivizes, objectivises
-    objectivizing, objectivising
-    objectization's, objectisation's
-    objectization, objectisation
-    objectizations, objectisations
-    objectize, objectise
-    objectizes, objectises
-    oblivionize, oblivionise
-    oblivionizes, oblivionises
-    Occidentalization's, Occidentalisation's
-    Occidentalization, Occidentalisation
-    Occidentalizations, Occidentalisations
-    Occidentalize, Occidentalise
-    occidentalize, occidentalise
-    Occidentalized, Occidentalised
-    occidentalized, occidentalised
-    Occidentalizes, Occidentalises
-    occidentalizes, occidentalises
-    Occidentalizing, Occidentalising
-    occidentalizing, occidentalising
-    ocher's, ochre's
-    ocher, ochre
-    ochered, ochred
-    ochering, ochring
-    ocherish, ochreish
-    ocherous, ochreous
-    ocherouser, ochreouser
-    ocherousest, ochreousest
-    ocherrer, ochrer
-    ocherrest, ochrest
-    ochers, ochres
-    ochery, ochrey
-    octet's, octette's
-    octet, octette
-    octets, octettes
-    Ocyrrhoe's, Ocyrrhoae's
-    Ocyrrhoe, Ocyrrhoae
-    odor's, odour's
-    odor, odour
-    odored, odoured
-    odorful, odourful
-    odorfuller, odourfuller
-    odorfullest, odourfullest
-    odorize, odorise
-    odorized, odorised
-    odorizer, odoriser
-    odorizes, odorises
-    odorizing, odorising
-    odorless, odourless
-    odorlesser, odourlesser
-    odorlesses, odourlesses
-    odorlessest, odourlessest
-    odors, odours
-    oesophagi, oesophaguses
-    offense's, offence's
-    offense, offence
-    offenseless, offenceless
-    offenselesser, offencelesser
-    offenselesses, offencelesses
-    offenselessest, offencelessest
-    offenselessly, offencelessly
-    offenses, offences
-    officialization's, officialisation's
-    officialization, officialisation
-    officializations, officialisations
-    officialize, officialise
-    officializes, officialises
-    OK's, okay's
-    OK, okay
-    OKed, okayed
-    OKing, okaying
-    OKs, okays
-    oleomargarine's, oleomargarin's
-    oleomargarine, oleomargarin
-    oleomargarines, oleomargarins
-    oligemia, oligaemia
-    oligocythemia, oligocythaemia
-    olpe, olpae
-    Olympianize's, Olympianise's
-    Olympianize, Olympianise
-    Olympianizes, Olympianises
-    omber's, ombre's
-    omber, ombre
-    ombers, ombres
-    omelet's, omelette's
-    omelet, omelette
-    omelets, omelettes
-    oneyer, oneyre
-    oneyers, oneyres
-    onionized's, onionised's
-    onionized, onionised
-    onionizeds, onioniseds
-    ontologize, ontologise
-    ooglea, oogloea
-    oophorectomize, oophorectomise
-    oophorectomized, oophorectomised
-    oophorectomizes, oophorectomises
-    oophorectomizing, oophorectomising
-    opaled, opalled
-    opalize, opalise
-    opalized, opalised
-    opalizes, opalises
-    operationalization, operationalisation
-    operationalizations, operationalisations
-    operationalize, operationalise
-    operationalized, operationalised
-    operatize, operatise
-    operatized, operatised
-    operatizes, operatises
-    operatizing, operatising
-    opiniaster, opiniastre
-    opiniater, opiniatre
-    optimalization, optimalisation
-    optimalizations, optimalisations
-    optimalize, optimalise
-    optimalized, optimalised
-    optimalizes, optimalises
-    optimalizing, optimalising
-    optimization's, optimisation's
-    optimization, optimisation
-    optimizations, optimisations
-    optimize, optimise
-    optimized, optimised
-    optimizer's, optimiser's
-    optimizer, optimiser
-    optimizers, optimisers
-    optimizes, optimises
-    optimizing, optimising
-    optionalize, optionalise
-    optionalizes, optionalises
-    oralization's, oralisation's
-    oralization, oralisation
-    oralizations, oralisations
-    oralize, oralise
-    oralizes, oralises
-    orang, ourang
-    orangize, orangise
-    orangizes, orangises
-    orangs, ourangs
-    orangutan's, orangutang's
-    orangutan, orangutang
-    orangutans, orangutangs
-    oratorize, oratorise
-    oratorizes, oratorises
-    orchester, orchestre
-    organdy's, organdie's
-    organdy, organdie
-    organizabilities, organisabilities
-    organizability's, organisability's
-    organizability, organisability
-    organizable's, organisable's
-    organizable, organisable
-    organizabler, organisabler
-    organizables, organisables
-    organizablest, organisablest
-    organization's, organisation's
-    organization, organisation
-    organizational's, organisational's
-    organizational, organisational
-    organizationaler, organisationaler
-    organizationalest, organisationalest
-    organizationallier, organisationallier
-    organizationalliest, organisationalliest
-    organizationally, organisationally
-    organizationals, organisationals
-    organizationist's, organisationist's
-    organizationist, organisationist
-    organizationists, organisationists
-    organizations, organisations
-    organize, organise
-    organized, organised
-    organizer's, organiser's
-    organizer, organiser
-    organizers, organisers
-    organizes, organises
-    organizing, organising
-    orientalization's, orientalisation's
-    orientalization, orientalisation
-    orientalizations, orientalisations
-    Orientalize, Orientalise
-    orientalize, orientalise
-    Orientalized, Orientalised
-    orientalized, orientalised
-    orientalizes, orientalises
-    Orientalizing, Orientalising
-    orientalizing, orientalising
-    orientization's, orientisation's
-    orientization, orientisation
-    orientizations, orientisations
-    orientize, orientise
-    orientizes, orientises
-    ornamentalize, ornamentalise
-    ornamentalizes, ornamentalises
-    orologies, ourologies
-    orology, ourology
-    orphanize, orphanise
-    orphanizes, orphanises
-    orsel, oursel
-    orthocenter's, orthocentre's
-    orthocenter, orthocentre
-    orthocenters, orthocentres
-    orthogonalization's, orthogonalisation's
-    orthogonalization, orthogonalisation
-    orthogonalize, orthogonalise
-    orthogonalized, orthogonalised
-    orthogonalizes, orthogonalises
-    orthogonalizing, orthogonalising
-    orthographize, orthographise
-    orthographized, orthographised
-    orthographizing, orthographising
-    orthopedia, orthopaedia
-    orthopedic's, orthopaedic's
-    orthopedic, orthopaedic
-    orthopedical, orthopaedical
-    orthopedicallier, orthopaedicallier
-    orthopedicalliest, orthopaedicalliest
-    orthopedically, orthopaedically
-    orthopedicer, orthopaedicer
-    orthopedicest, orthopaedicest
-    orthopedics's, orthopaedics's
-    orthopedics, orthopaedics
-    orthopedies, orthopaedies
-    orthopedist's, orthopaedist's
-    orthopedist, orthopaedist
-    orthopedists, orthopaedists
-    orthopedy, orthopaedy
-    orthopnea, orthopnoea
-    orthopneic, orthopnoeic
-    osteopedion, osteopaedion
-    ostracizable's, ostracisable's
-    ostracizable, ostracisable
-    ostracizables, ostracisables
-    ostracization's, ostracisation's
-    ostracization, ostracisation
-    ostracizations, ostracisations
-    ostracize, ostracise
-    ostracized, ostracised
-    ostracizer's, ostraciser's
-    ostracizer, ostraciser
-    ostracizers, ostracisers
-    ostracizes, ostracises
-    ostracizing, ostracising
-    othematoma, othaematoma
-    otorrhea, otorrhoea
-    Ottomanization's, Ottomanisation's
-    Ottomanization, Ottomanisation
-    Ottomanizations, Ottomanisations
-    Ottomanize's, Ottomanise's
-    Ottomanize, Ottomanise
-    Ottomanizes, Ottomanises
-    outcaviled, outcavilled
-    outcaviling, outcavilling
-    outclamor's, outclamour's
-    outclamor, outclamour
-    outclamors, outclamours
-    outerness, outreness
-    outhumor's, outhumour's
-    outhumor, outhumour
-    outhumored, outhumoured
-    outhumoring, outhumouring
-    outhumors, outhumours
-    outhyperbolize, outhyperbolise
-    outhyperbolizes, outhyperbolises
-    outlabor's, outlabour's
-    outlabor, outlabour
-    outlabors, outlabours
-    outluster, outlustre
-    outmaneuver, outmanoeuvre
-    outmaneuvered, outmanoeuvred
-    outmaneuvering, outmanoeuvring
-    outmaneuvers, outmanoeuvres
-    outrivaled, outrivalled
-    outrivaling, outrivalling
-    outsavor's, outsavour's
-    outsavor, outsavour
-    outsavoring, outsavouring
-    outsavors, outsavours
-    outsplendor's, outsplendour's
-    outsplendor, outsplendour
-    outsplendors, outsplendours
-    outtyrannize, outtyrannise
-    outtyrannizes, outtyrannises
-    ovalization's, ovalisation's
-    ovalization, ovalisation
-    ovalizations, ovalisations
-    ovalize, ovalise
-    ovalizes, ovalises
-    ovariectomized, ovariectomised
-    overagonize, overagonise
-    overagonizes, overagonises
-    overanalyze, overanalyse
-    overanalyzes, overanalyses
-    overbrutalize, overbrutalise
-    overbrutalizes, overbrutalises
-    overcapitalization's, overcapitalisation's
-    overcapitalization, overcapitalisation
-    overcapitalizations, overcapitalisations
-    overcapitalize, overcapitalise
-    overcapitalized, overcapitalised
-    overcapitalizes, overcapitalises
-    overcapitalizing, overcapitalising
-    overcentralization's, overcentralisation's
-    overcentralization, overcentralisation
-    overcentralizations, overcentralisations
-    overcentralize, overcentralise
-    overcentralizes, overcentralises
-    overcivilization's, overcivilisation's
-    overcivilization, overcivilisation
-    overcivilizations, overcivilisations
-    overcivilize, overcivilise
-    overcivilizes, overcivilises
-    overclamor's, overclamour's
-    overclamor, overclamour
-    overclamors, overclamours
-    overcolor's, overcolour's
-    overcolor, overcolour
-    overcoloration's, overcolouration's
-    overcoloration, overcolouration
-    overcoloring, overcolouring
-    overcolors, overcolours
-    overcriticize, overcriticise
-    overcriticizes, overcriticises
-    overdoctrinize, overdoctrinise
-    overdoctrinizes, overdoctrinises
-    overdramatize, overdramatise
-    overdramatized, overdramatised
-    overdramatizes, overdramatises
-    overdramatizing, overdramatising
-    overemotionalize, overemotionalise
-    overemotionalizes, overemotionalises
-    overemphasize, overemphasise
-    overemphasized, overemphasised
-    overemphasizer, overemphasiser
-    overemphasizers, overemphasisers
-    overemphasizes, overemphasises
-    overemphasizing, overemphasising
-    overfavor's, overfavour's
-    overfavor, overfavour
-    overfavorable's, overfavourable's
-    overfavorable, overfavourable
-    overfavorables, overfavourables
-    overfavorablies, overfavourablies
-    overfavorably, overfavourably
-    overfavors, overfavours
-    overfertilization, overfertilisation
-    overgeneralize, overgeneralise
-    overgeneralized, overgeneralised
-    overgeneralizes, overgeneralises
-    overgeneralizing, overgeneralising
-    overhonor's, overhonour's
-    overhonor, overhonour
-    overhonors, overhonours
-    overhumanize, overhumanise
-    overhumanizes, overhumanises
-    overindustrialization's, overindustrialisation's
-    overindustrialization, overindustrialisation
-    overindustrializations, overindustrialisations
-    overindustrialize, overindustrialise
-    overindustrializes, overindustrialises
-    overjudgment's, overjudgement's
-    overjudgment, overjudgement
-    overjudgments, overjudgements
-    overlabor's, overlabour's
-    overlabor, overlabour
-    overlabored, overlaboured
-    overlaboring, overlabouring
-    overlabors, overlabours
-    overnationalization's, overnationalisation's
-    overnationalization, overnationalisation
-    overnationalizations, overnationalisations
-    overrapturize, overrapturise
-    overrapturizes, overrapturises
-    overrationalize, overrationalise
-    overrationalizes, overrationalises
-    oversentimentalize, oversentimentalise
-    oversentimentalizes, oversentimentalises
-    oversize, oversized
-    overspecialization's, overspecialisation's
-    overspecialization, overspecialisation
-    overspecializations, overspecialisations
-    overspecialize, overspecialise
-    overspecialized, overspecialised
-    overspecializes, overspecialises
-    overspecializing, overspecialising
-    oversystematize, oversystematise
-    oversystematizes, oversystematises
-    overunionized's, overunionised's
-    overunionized, overunionised
-    overunionizeds, overunioniseds
-    overurbanization's, overurbanisation's
-    overurbanization, overurbanisation
-    overurbanizations, overurbanisations
-    overutilization, overutilisation
-    overwomanize, overwomanise
-    overwomanizes, overwomanises
-    ower, owre
-    owercome, owrecome
-    owerword, owreword
-    oxalemia, oxalaemia
-    oxidizabilities, oxidisabilities
-    oxidizability's, oxidisability's
-    oxidizability, oxidisability
-    oxidizable's, oxidisable's
-    oxidizable, oxidisable
-    oxidizables, oxidisables
-    oxidization's, oxidisation's
-    oxidization, oxidisation
-    oxidizations, oxidisations
-    oxidize, oxidise
-    oxidized, oxidised
-    oxidizement's, oxidisement's
-    oxidizement, oxidisement
-    oxidizements, oxidisements
-    oxidizer's, oxidiser's
-    oxidizer, oxidiser
-    oxidizers, oxidisers
-    oxidizes, oxidises
-    oxidizing, oxidising
-    oxidizings, oxidisings
-    oxygenizable's, oxygenisable's
-    oxygenizable, oxygenisable
-    oxygenizables, oxygenisables
-    oxygenize, oxygenise
-    oxygenized, oxygenised
-    oxygenizement's, oxygenisement's
-    oxygenizement, oxygenisement
-    oxygenizements, oxygenisements
-    oxygenizer's, oxygeniser's
-    oxygenizer, oxygeniser
-    oxygenizers, oxygenisers
-    oxygenizes, oxygenises
-    oxygenizing, oxygenising
-    oxyhematin, oxyhaematin
-    oxyhemoglobin, oxyhaemoglobin
-    oxyhemoglobins, oxyhaemoglobins
-    ozena, ozaena
-    ozena, ozoena
-    ozonization's, ozonisation's
-    ozonization, ozonisation
-    ozonizations, ozonisations
-    ozonize, ozonise
-    ozonized, ozonised
-    ozonizer's, ozoniser's
-    ozonizer, ozoniser
-    ozonizers, ozonisers
-    ozonizes, ozonises
-    ozonizing, ozonising
-    pachyemia, pachyaemia
-    pachyhemia, pachyhaemia
-    packetization, packetisation
-    packetize, packetise
-    packetized, packetised
-    packetizer's, packetiser's
-    packetizer, packetiser
-    packetizers, packetisers
-    packetizes, packetises
-    packetizing, packetising
-    paeanize, paeanise
-    paeanizes, paeanises
-    paganization's, paganisation's
-    paganization, paganisation
-    paganizations, paganisations
-    paganize, paganise
-    paganized, paganised
-    paganizer's, paganiser's
-    paganizer, paganiser
-    paganizers, paganisers
-    paganizes, paganises
-    paganizing, paganising
-    pagine, paginae
-    pajama's, pyjama's
-    pajama, pyjama
-    pajamaed, pyjamased
-    pajamas's, pyjamas's
-    pajamas, pyjamas
-    palame, palamae
-    palatalization's, palatalisation's
-    palatalization, palatalisation
-    palatalizations, palatalisations
-    palatalize, palatalise
-    palatalized, palatalised
-    palatalizes, palatalises
-    palatalizing, palatalising
-    palatization's, palatisation's
-    palatization, palatisation
-    palatizations, palatisations
-    palatize, palatise
-    palatizes, palatises
-    paleanthropic, palaeanthropic
-    Palearctic, Palaearctic
-    paleencephalon's, palaeencephalon's
-    paleencephalon, palaeencephalon
-    paleentomology, palaeentomology
-    paleethnologic, palaeethnologic
-    paleethnological, palaeethnological
-    paleethnologist, palaeethnologist
-    paleethnology, palaeethnology
-    paleichthyologist, palaeichthyologist
-    paleichthyology, palaeichthyology
-    paleoalchemical, palaeoalchemical
-    paleoanthropic, palaeoanthropic
-    paleoanthropography, palaeoanthropography
-    paleoanthropological, palaeoanthropological
-    paleoanthropologies, palaeoanthropologies
-    paleoanthropologist, palaeoanthropologist
-    paleoanthropologists, palaeoanthropologists
-    paleoanthropology, palaeoanthropology
-    Paleoanthropus's, Palaeoanthropus's
-    Paleoanthropus, Palaeoanthropus
-    paleoatavism, palaeoatavism
-    paleoatavistic, palaeoatavistic
-    paleobiogeography, palaeobiogeography
-    paleobiologic, palaeobiologic
-    paleobiological, palaeobiological
-    paleobiologies, palaeobiologies
-    paleobiologist's, palaeobiologist's
-    paleobiologist, palaeobiologist
-    paleobiologists, palaeobiologists
-    paleobiology's, palaeobiology's
-    paleobiology, palaeobiology
-    paleobotanic, palaeobotanic
-    paleobotanical, palaeobotanical
-    paleobotanically, palaeobotanically
-    paleobotanies, palaeobotanies
-    paleobotanist, palaeobotanist
-    paleobotanists, palaeobotanists
-    paleobotany's, palaeobotany's
-    paleobotany, palaeobotany
-    paleoceanography, palaeoceanography
-    paleochorology, palaeochorology
-    paleoclimatic, palaeoclimatic
-    paleoclimatologic, palaeoclimatologic
-    paleoclimatological, palaeoclimatological
-    paleoclimatologies, palaeoclimatologies
-    paleoclimatologist's, palaeoclimatologist's
-    paleoclimatologist, palaeoclimatologist
-    paleoclimatologists, palaeoclimatologists
-    paleoclimatology's, palaeoclimatology's
-    paleoclimatology, palaeoclimatology
-    Paleoconcha's, Palaeoconcha's
-    Paleoconcha, Palaeoconcha
-    paleocosmic, palaeocosmic
-    paleocosmology, palaeocosmology
-    paleocrystal, palaeocrystal
-    paleocrystallic, palaeocrystallic
-    paleocrystalline, palaeocrystalline
-    paleocrystic, palaeocrystic
-    paleocyclic, palaeocyclic
-    paleodendrologic, palaeodendrologic
-    paleodendrological, palaeodendrological
-    paleodendrologically, palaeodendrologically
-    paleodendrologist, palaeodendrologist
-    paleodendrology, palaeodendrology
-    paleoecologic, palaeoecologic
-    paleoecological, palaeoecological
-    paleoecologies, palaeoecologies
-    paleoecologist's, palaeoecologist's
-    paleoecologist, palaeoecologist
-    paleoecologists, palaeoecologists
-    paleoecology's, palaeoecology's
-    paleoecology, palaeoecology
-    paleoencephalon's, palaeoencephalon's
-    paleoencephalon, palaeoencephalon
-    paleoentomologic, palaeoentomologic
-    paleoentomological, palaeoentomological
-    paleoentomologist's, palaeoentomologist's
-    paleoentomologist, palaeoentomologist
-    paleoeremology, palaeoeremology
-    paleoethnic, palaeoethnic
-    paleoethnography, palaeoethnography
-    paleoethnologic, palaeoethnologic
-    paleoethnological, palaeoethnological
-    paleoethnologist, palaeoethnologist
-    paleoethnology, palaeoethnology
-    paleofauna, palaeofauna
-    paleogenesis's, palaeogenesis's
-    paleogenesis, palaeogenesis
-    paleogenetic, palaeogenetic
-    paleogeographer, palaeogeographer
-    paleogeographers, palaeogeographers
-    paleogeographic, palaeogeographic
-    paleogeographical, palaeogeographical
-    paleogeographically, palaeogeographically
-    paleogeographies, palaeogeographies
-    paleogeography, palaeogeography
-    paleogeology, palaeogeology
-    paleoglaciology, palaeoglaciology
-    paleoglyph, palaeoglyph
-    paleograph, palaeograph
-    paleographic, palaeographic
-    paleographical, palaeographical
-    paleographically, palaeographically
-    paleographist, palaeographist
-    paleoherpetologist, palaeoherpetologist
-    paleoherpetology, palaeoherpetology
-    paleohistology, palaeohistology
-    paleohydrography, palaeohydrography
-    paleoichthyology, palaeoichthyology
-    paleolatry, palaeolatry
-    paleolimnology, palaeolimnology
-    paleolith's, palaeolith's
-    paleolith, palaeolith
-    paleolithic, palaeolithic
-    Paleolithic, Palaeolithic
-    paleolithical, palaeolithical
-    paleolithist, palaeolithist
-    paleolithoid, palaeolithoid
-    paleoliths, palaeoliths
-    paleolithy, palaeolithy
-    paleological, palaeological
-    paleologist's, palaeologist's
-    paleologist, palaeologist
-    paleology, palaeology
-    paleomagnetism's, palaeomagnetism's
-    paleomagnetism, palaeomagnetism
-    paleomagnetisms, palaeomagnetisms
-    paleometallic, palaeometallic
-    paleometeorological, palaeometeorological
-    paleometeorology, palaeometeorology
-    paleontographic, palaeontographic
-    paleontographical, palaeontographical
-    paleontographies, palaeontographies
-    paleontography's, palaeontography's
-    paleontography, palaeontography
-    paleontol, palaeontol
-    paleontologic, palaeontologic
-    paleontological, palaeontological
-    paleontologically, palaeontologically
-    paleontologist's, palaeontologist's
-    paleontologist, palaeontologist
-    paleontologists, palaeontologists
-    paleontology's, palaeontology's
-    paleontology, palaeontology
-    paleopathologic, palaeopathologic
-    paleopathological, palaeopathological
-    paleopathologies, palaeopathologies
-    paleopathologist, palaeopathologist
-    paleopathologists, palaeopathologists
-    paleopathology, palaeopathology
-    paleopedology, palaeopedology
-    paleophysiography, palaeophysiography
-    paleophysiology, palaeophysiology
-    paleophytic, palaeophytic
-    paleophytological, palaeophytological
-    paleophytologist, palaeophytologist
-    paleophytology, palaeophytology
-    paleoplain, palaeoplain
-    paleopotamology, palaeopotamology
-    paleopsychic, palaeopsychic
-    paleopsychological, palaeopsychological
-    paleopsychology, palaeopsychology
-    paleornithological, palaeornithological
-    paleornithology, palaeornithology
-    paleostriatal, palaeostriatal
-    paleostriatum, palaeostriatum
-    paleostylic, palaeostylic
-    paleostyly, palaeostyly
-    paleotechnic, palaeotechnic
-    paleothalamus, palaeothalamus
-    Paleotropical's, Palaeotropical's
-    Paleotropical, Palaeotropical
-    paleovolcanic, palaeovolcanic
-    paleozoic, palaeozoic
-    paleozoologic, palaeozoologic
-    paleozoological, palaeozoological
-    paleozoologies, palaeozoologies
-    paleozoologist's, palaeozoologist's
-    paleozoologist, palaeozoologist
-    paleozoologists, palaeozoologists
-    paleozoology's, palaeozoology's
-    paleozoology, palaeozoology
-    palestra's, palaestra's
-    palestra, palaestra
-    palestrae, palaestrae
-    palestral, palaestral
-    palestras, palaestras
-    palestrian, palaestrian
-    palestric, palaestric
-    paletiology, palaetiology
-    palladiumize, palladiumise
-    palladiumizes, palladiumises
-    palletization's, palletisation's
-    palletization, palletisation
-    palletizations, palletisations
-    palletize, palletise
-    palletized, palletised
-    palletizer's, palletiser's
-    palletizer, palletiser
-    palletizers, palletisers
-    palletizes, palletises
-    palletizing, palletising
-    pamperize, pamperise
-    pamperizes, pamperises
-    pamphletize, pamphletise
-    pamphletizes, pamphletises
-    panderize, panderise
-    panderizes, panderises
-    pandora, pandoura
-    panegyrize, panegyrise
-    panegyrized, panegyrised
-    panegyrizes, panegyrises
-    panegyrizing, panegyrising
-    paneled, panelled
-    paneling's, panelling's
-    paneling, panelling
-    panelings, panellings
-    panelist's, panellist's
-    panelist, panellist
-    panelists, panellists
-    panelized, panelised
-    panellisation, panellization
-    panesthesia, panaesthesia
-    panesthesias, panaesthesias
-    panesthetic, panaesthetic
-    pangea, pangaea
-    pannier's, panier's
-    pannier, panier
-    panniers, paniers
-    panomphean, panomphaean
-    pantheonization's, pantheonisation's
-    pantheonization, pantheonisation
-    pantheonizations, pantheonisations
-    pantheonize, pantheonise
-    pantheonizes, pantheonises
-    pantie's, panty's
-    pantie, panty
-    papalization's, papalisation's
-    papalization, papalisation
-    papalizations, papalisations
-    papalize, papalise
-    papalized, papalised
-    papalizer, papaliser
-    papalizers, papalisers
-    papalizes, papalises
-    papalizing, papalising
-    papilledema, papilloedema
-    papule, papulae
-    parabolization's, parabolisation's
-    parabolization, parabolisation
-    parabolize, parabolise
-    parabolized, parabolised
-    parabolizes, parabolises
-    parabolizing, parabolising
-    paraffinize, paraffinise
-    paraffinizes, paraffinises
-    paragraphize, paragraphise
-    paragraphizes, paragraphises
-    parakeet's, parrakeet's
-    parakeet, parrakeet
-    parakeets, parrakeets
-    parallelization's, parallelisation's
-    parallelization, parallelisation
-    parallelizations, parallelisations
-    parallelize, parallelise
-    parallelized, parallelised
-    parallelizer, paralleliser
-    parallelizers, parallelisers
-    parallelizes, parallelises
-    parallelizing, parallelising
-    paralogize, paralogise
-    paralogized, paralogised
-    paralogizes, paralogises
-    paralogizing, paralogising
-    paralyzation's, paralysation's
-    paralyzation, paralysation
-    paralyzations, paralysations
-    paralyze, paralyse
-    paralyzed, paralysed
-    paralyzedlies, paralysedlies
-    paralyzedly, paralysedly
-    paralyzer's, paralyser's
-    paralyzer, paralyser
-    paralyzers, paralysers
-    paralyzes, paralyses
-    paralyzing, paralysing
-    paralyzinglies, paralysinglies
-    paralyzingly, paralysingly
-    Paramecium's, Paramoecium's
-    Paramecium, Paramoecium
-    parameterizable, parameterisable
-    parameterization's, parameterisation's
-    parameterization, parameterisation
-    parameterizations, parameterisations
-    parameterize, parameterise
-    parameterized, parameterised
-    parameterizes, parameterises
-    parameterizing, parameterising
-    parametrizable, parametrisable
-    parametrization's, parametrisation's
-    parametrization, parametrisation
-    parametrizations, parametrisations
-    parametrize, parametrise
-    parametrized, parametrised
-    parametrizes, parametrises
-    parametrizing, parametrising
-    paraselene, paraselenae
-    parasitemia, parasitaemia
-    parasitization, parasitisation
-    parasitize, parasitise
-    parasitized, parasitised
-    parasitizes, parasitises
-    parasitizing, parasitising
-    parathyroidectomize, parathyroidectomise
-    parathyroidectomized, parathyroidectomised
-    parathyroidectomizes, parathyroidectomises
-    parathyroidectomizing, parathyroidectomising
-    paratragedia, paratragoedia
-    parceled, parcelled
-    parceler, parceller
-    parceling's, parcelling's
-    parceling, parcelling
-    parchmentize, parchmentise
-    parchmentized, parchmentised
-    parchmentizes, parchmentises
-    parchmentizing, parchmentising
-    parecious, paroecious
-    pareciously, paroeciously
-    pareciousness, paroeciousness
-    parecism, paroecism
-    parecy, paroecy
-    pareneses, paraeneses
-    parenesis, paraenesis
-    parenetic, paraenetic
-    parenetical, paraenetical
-    parenthesization, parenthesisation
-    parenthesize, parenthesise
-    parenthesized, parenthesised
-    parenthesizes, parenthesises
-    parenthesizing, parenthesising
-    paresthesia's, paraesthesia's
-    paresthesia, paraesthesia
-    paresthesias, paraesthesias
-    paresthetic, paraesthetic
-    parfocalization, parfocalisation
-    parfocalize, parfocalise
-    Parisianization's, Parisianisation's
-    Parisianization, Parisianisation
-    Parisianizations, Parisianisations
-    Parisianize's, Parisianise's
-    Parisianize, Parisianise
-    Parisianizes, Parisianises
-    parlor's, parlour's
-    parlor, parlour
-    parlorish, parlourish
-    parlormaid, parlourmaid
-    parlors, parlours
-    parmigiana, parmigiano
-    parochialization's, parochialisation's
-    parochialization, parochialisation
-    parochializations, parochialisations
-    parochialize, parochialise
-    parochialized, parochialised
-    parochializes, parochialises
-    parochializing, parochialising
-    parrotize, parrotise
-    parrotizes, parrotises
-    parsonize, parsonise
-    parsonizes, parsonises
-    partialize, partialise
-    partialized, partialised
-    partializes, partialises
-    partializing, partialising
-    particolored, particoloured
-    particoloredder, particolouredder
-    particoloreddest, particoloureddest
-    particularization's, particularisation's
-    particularization, particularisation
-    particularizations, particularisations
-    particularize, particularise
-    particularized, particularised
-    particularizer's, particulariser's
-    particularizer, particulariser
-    particularizes, particularises
-    particularizing, particularising
-    partisan's, partizan's
-    partisan's, partizan's
-    partisan, partizan
-    partisan, partizan
-    partisanize, partisanise
-    partisanizes, partisanises
-    partisans, partizans
-    partisans, partizans
-    Pasiphae's, Pasiphaae's
-    Pasiphae, Pasiphaae
-    passades, passadoes
-    passivization, passivisation
-    passivize, passivise
-    passivized, passivised
-    passivizes, passivises
-    passivizing, passivising
-    pasteurization's, pasteurisation's
-    pasteurization, pasteurisation
-    pasteurizations, pasteurisations
-    pasteurize, pasteurise
-    pasteurized, pasteurised
-    pasteurizer's, pasteuriser's
-    pasteurizer, pasteuriser
-    Pasteurizers, Pasteurisers
-    pasteurizers, pasteurisers
-    pasteurizes, pasteurises
-    pasteurizing, pasteurising
-    pastoralize, pastoralise
-    pastoralizes, pastoralises
-    pastorize, pastorise
-    pastorizes, pastorises
-    paternalize, paternalise
-    paternalizes, paternalises
-    patine, patinae
-    patined, patinaed
-    patrialization, patrialisation
-    patrializations, patrialisations
-    patrialize, patrialise
-    patrialized, patrialised
-    patrializes, patrialises
-    patrializing, patrialising
-    patrices, patricoes
-    patronizable's, patronisable's
-    patronizable, patronisable
-    patronizabler, patronisabler
-    patronizables, patronisables
-    patronizablest, patronisablest
-    patronization's, patronisation's
-    patronization, patronisation
-    patronizations, patronisations
-    patronize, patronise
-    patronized, patronised
-    patronizer's, patroniser's
-    patronizer, patroniser
-    patronizers, patronisers
-    patronizes, patronises
-    patronizing's, patronising's
-    patronizing, patronising
-    patronizinglier, patronisinglier
-    patronizingliest, patronisingliest
-    patronizingly, patronisingly
-    patronizings, patronisings
-    patte, pattae
-    patternize, patternise
-    patternizes, patternises
-    Paulinize's, Paulinise's
-    Paulinize, Paulinise
-    Paulinizes, Paulinises
-    pauperization's, pauperisation's
-    pauperization, pauperisation
-    pauperizations, pauperisations
-    pauperize, pauperise
-    pauperized, pauperised
-    pauperizer's, pauperiser's
-    pauperizer, pauperiser
-    pauperizers, pauperisers
-    pauperizes, pauperises
-    pauperizing, pauperising
-    Pavior's, Paviour's
-    pavior's, paviour's
-    Pavior, Paviour
-    pavior, paviour
-    paviors, paviours
-    pawpaw's, papaw's
-    pawpaw, papaw
-    pawpaws, papaws
-    Paynize's, Paynise's
-    Paynize, Paynise
-    Paynizes, Paynises
-    pe, poe
-    pearlization, pearlisation
-    pearlize, pearlise
-    pearlized, pearlised
-    pearlizes, pearlises
-    pearlizing, pearlising
-    peasantize, peasantise
-    peasantizes, peasantises
-    pectization's, pectisation's
-    pectization, pectisation
-    pectizations, pectisations
-    pectize, pectise
-    pectized, pectised
-    pectizes, pectises
-    pectizing, pectising
-    peculiarize, peculiarise
-    peculiarized, peculiarised
-    peculiarizes, peculiarises
-    peculiarizing, peculiarising
-    pedagogism, paedagogism
-    pedagogue's, pedagog's
-    pedagogue, pedagog
-    pedagogues, pedagogs
-    pedaled, pedalled
-    pedaler's, pedaller's
-    pedaler, pedaller
-    pedalers, pedallers
-    pedaling, pedalling
-    pedanticize, pedanticise
-    pedanticized, pedanticised
-    pedanticizes, pedanticises
-    pedanticizing, pedanticising
-    pedantize, pedantise
-    pedantized, pedantised
-    pedantizes, pedantises
-    pedantizing, pedantising
-    pedatrophia, paedatrophia
-    pedatrophy, paedatrophy
-    peddler's, pedlar's
-    peddler, pedlar
-    peddlers, pedlars
-    pederast's, paederast's
-    pederast, paederast
-    pederastic, paederastic
-    pederastically, paederastically
-    pederasts, paederasts
-    pedestaled, pedestalled
-    pedestaling, pedestalling
-    pedestrianization's, pedestrianisation's
-    pedestrianization, pedestrianisation
-    pedestrianizations, pedestrianisations
-    pedestrianize, pedestrianise
-    pedestrianized, pedestrianised
-    pedestrianizes, pedestrianises
-    pedestrianizing, pedestrianising
-    pediatric, paediatric
-    pediatrics, paediatrics
-    pediatrist's, paediatrician's
-    pediatrist, paediatrician
-    pediatrists, paediatricians
-    pediatry, paediatry
-    pedobaptism's, paedobaptism's
-    pedobaptism, paedobaptism
-    pedobaptist's, paedobaptist's
-    pedobaptist, paedobaptist
-    pedodontic, paedodontic
-    pedodontics, paedodontics
-    pedogeneses, paedogeneses
-    pedogenesis, paedogenesis
-    pedogenetic, paedogenetic
-    pedogenic, paedogenic
-    pedological, paedological
-    pedologies, paedologies
-    pedologist, paedologist
-    pedologists, paedologists
-    pedology's, paedology's
-    pedology, paedology
-    pedometrical, paedometrical
-    pedomorphic, paedomorphic
-    pedomorphism, paedomorphism
-    pedomorphisms, paedomorphisms
-    pedomorphoses, paedomorphoses
-    pedomorphosis, paedomorphosis
-    pedophile, paedophile
-    pedophiles, paedophiles
-    pedophilia, paedophilia
-    pedophiliac, paedophiliac
-    pedophiliacs, paedophiliacs
-    pedophilias, paedophilias
-    pedophilic, paedophilic
-    pedotribe, paedotribe
-    pedotrophic, paedotrophic
-    pedotrophist, paedotrophist
-    pedotrophy, paedotrophy
-    peize, peise
-    peized, peised
-    peizes, peises
-    peizing, peising
-    Pekingese's, Pekinese's
-    Pekingese, Pekinese
-    pelletization's, pelletisation's
-    pelletization, pelletisation
-    pelletizations, pelletisations
-    pelletize, pelletise
-    pelletized, pelletised
-    pelletizer, pelletiser
-    pelletizes, pelletises
-    pelletizing, pelletising
-    pelorized, pelorised
-    pemmicanization's, pemmicanisation's
-    pemmicanization, pemmicanisation
-    pemmicanizations, pemmicanisations
-    pemmicanize's, pemmicanise's
-    pemmicanize, pemmicanise
-    pemmicanizes, pemmicanises
-    penalizable's, penalisable's
-    penalizable, penalisable
-    penalizabler, penalisabler
-    penalizables, penalisables
-    penalizablest, penalisablest
-    penalization's, penalisation's
-    penalization, penalisation
-    penalizations, penalisations
-    penalize, penalise
-    penalized, penalised
-    penalizes, penalises
-    penalizing, penalising
-    penciled, pencilled
-    penciler's, penciller's
-    penciler, penciller
-    pencilers, pencillers
-    penciling, pencilling
-    pencilings, pencillings
-    penelopize, penelopise
-    penelopized, penelopised
-    penelopizes, penelopises
-    penelopizing, penelopising
-    penlight's, penlite's
-    penlight, penlite
-    penlights, penlites
-    penne, pennae
-    pense, pensae
-    peptizable's, peptisable's
-    peptizable, peptisable
-    peptizables, peptisables
-    peptization's, peptisation's
-    peptization, peptisation
-    peptizations, peptisations
-    peptize, peptise
-    peptized, peptised
-    peptizer, peptiser
-    peptizers, peptisers
-    peptizes, peptises
-    peptizing, peptising
-    peptonemia, peptonaemia
-    peptonization's, peptonisation's
-    peptonization, peptonisation
-    peptonizations, peptonisations
-    peptonize, peptonise
-    peptonized, peptonised
-    peptonizer's, peptoniser's
-    peptonizer, peptoniser
-    peptonizes, peptonises
-    peptonizing, peptonising
-    peracid, preacid
-    peracidity, preacidity
-    peract, preact
-    peracute, preacute
-    perambulatory, preambulatory
-    perces, preces
-    perchlorethane, perchloroethane
-    perchlorethylene, perchloroethylene
-    perchloric, prechloric
-    perclose, preclose
-    percompound, precompound
-    percurrent, precurrent
-    percussionize, percussionise
-    percussionizes, percussionises
-    perdicine, perdicinae
-    perdiligent, prediligent
-    perdy, predy
-    perea, peraea
-    perennialize, perennialise
-    perennializes, perennialises
-    pereon, peraeon
-    pereopod, peraeopod
-    pereopods, peraeopods
-    perfectivize, perfectivise
-    perfectivizes, perfectivises
-    perfervor's, perfervour's
-    perfervor, perfervour
-    perfervors, perfervours
-    perfet, prefet
-    perfoliation, prefoliation
-    perfoliations, prefoliations
-    performant, preformant
-    performative, preformative
-    perhazard, prehazard
-    pericecal, pericaecal
-    pericecitis, pericaecitis
-    pericenter, pericentre
-    perichete, perichaete
-    pericope, pericopae
-    periesophageal, perioesophageal
-    periled, perilled
-    periling, perilling
-    periodicalize, periodicalise
-    periodicalizes, periodicalises
-    periodization's, periodisation's
-    periodization, periodisation
-    periodizations, periodisations
-    periodize, periodise
-    periodized, periodised
-    periodizes, periodises
-    periodizing, periodising
-    perjink, prejink
-    perlection, prelection
-    perlingual, prelingual
-    perlingually, prelingually
-    permissable, premissable
-    permixture, premixture
-    pernasal, prenasal
-    peroral, preoral
-    perorally, preorally
-    perotic, preotic
-    peroxidize, peroxidise
-    peroxidized, peroxidised
-    peroxidizement's, peroxidisement's
-    peroxidizement, peroxidisement
-    peroxidizements, peroxidisements
-    peroxidizes, peroxidises
-    peroxidizing, peroxidising
-    perperfect, preperfect
-    Perse's, Persae's
-    Perse, Persae
-    perse, prese
-    Persianization's, Persianisation's
-    Persianization, Persianisation
-    Persianizations, Persianisations
-    Persianize's, Persianise's
-    Persianize, Persianise
-    Persianized's, Persianised's
-    Persianized, Persianised
-    Persianizes, Persianises
-    Persianizing's, Persianising's
-    Persianizing, Persianising
-    Persicize's, Persicise's
-    Persicize, Persicise
-    Persicized's, Persicised's
-    Persicized, Persicised
-    Persicizes, Persicises
-    Persicizing's, Persicising's
-    Persicizing, Persicising
-    persolve, presolve
-    personalization's, personalisation's
-    personalization, personalisation
-    personalizations, personalisations
-    personalize, personalise
-    personalized, personalised
-    personalizes, personalises
-    personalizing, personalising
-    personization's, personisation's
-    personization, personisation
-    personizations, personisations
-    personize, personise
-    personized, personised
-    personizes, personises
-    personizing, personising
-    perst, prest
-    Peruvianize's, Peruvianise's
-    Peruvianize, Peruvianise
-    Peruvianizes, Peruvianises
-    perv, prev
-    perve, preve
-    perved, preved
-    perves, preves
-    perviable, previable
-    perving, preving
-    perviousness, previousness
-    perviousnesses, previousnesses
-    petaled, petalled
-    petling, poetling
-    Petrarchize's, Petrarchise's
-    Petrarchize, Petrarchise
-    Petrarchized's, Petrarchised's
-    Petrarchized, Petrarchised
-    Petrarchizes, Petrarchises
-    Petrarchizing's, Petrarchising's
-    Petrarchizing, Petrarchising
-    petrolization's, petrolisation's
-    petrolization, petrolisation
-    petrolizations, petrolisations
-    petrolize, petrolise
-    petrolizes, petrolises
-    phacochere, phacochoere
-    phacocherine, phacochoerine
-    Phaenna's, Phaaenna's
-    Phaenna, Phaaenna
-    phagedena, phagedaena
-    phagedenas, phagedaenas
-    phagedenic, phagedaenic
-    phagedenical, phagedaenical
-    phagedenous, phagedaenous
-    phagocytize, phagocytise
-    phagocytizes, phagocytises
-    phalanxes, phalanx
-    phantomize, phantomise
-    phantomizer, phantomiser
-    phantomizers, phantomisers
-    phantomizes, phantomises
-    Pharisean's, Pharisaean's
-    Pharisean, Pharisaean
-    pharmacopeian, pharmacopoeian
-    pharmacopoeia's, pharmacopeia's
-    pharmacopoeia, pharmacopeia
-    pharmacopoeial, pharmacopeial
-    pharmacopoeias, pharmacopeias
-    phelonion, phaelonion
-    phelonions, phaelonions
-    phenicia, phoenicia
-    phenicopter, phoenicopter
-    phenogam, phaenogam
-    phenogams, phaenogams
-    phenogenesis, phaenogenesis
-    phenogenetic, phaenogenetic
-    phenolization's, phenolisation's
-    phenolization, phenolisation
-    phenolizations, phenolisations
-    phenolize, phenolise
-    phenolizes, phenolises
-    phenological, phaenological
-    phenologies, phaenologies
-    phenology, phaenology
-    phenomenalization's, phenomenalisation's
-    phenomenalization, phenomenalisation
-    phenomenalizations, phenomenalisations
-    phenomenalize, phenomenalise
-    phenomenalized, phenomenalised
-    phenomenalizes, phenomenalises
-    phenomenalizing, phenomenalising
-    phenomenism, phaenomenism
-    phenomenize, phenomenise
-    phenomenized, phenomenised
-    phenomenizes, phenomenises
-    phenomenizing, phenomenising
-    phenozygous, phaenozygous
-    pheophyl, phaeophyl
-    pheophyll, phaeophyll
-    pheophytin, phaeophytin
-    phiale, phialae
-    philanthropize, philanthropise
-    philanthropized, philanthropised
-    philanthropizes, philanthropises
-    philanthropizing, philanthropising
-    Philippize's, Philippise's
-    Philippize, Philippise
-    Philippized's, Philippised's
-    Philippized, Philippised
-    Philippizes, Philippises
-    Philippizing's, Philippising's
-    Philippizing, Philippising
-    Philistinize's, Philistinise's
-    Philistinize, Philistinise
-    Philistinized's, Philistinised's
-    Philistinized, Philistinised
-    Philistinizes, Philistinises
-    Philistinizing's, Philistinising's
-    Philistinizing, Philistinising
-    philopena, philopoena
-    philopenas, philopoenas
-    philosophization's, philosophisation's
-    philosophization, philosophisation
-    philosophizations, philosophisations
-    philosophize, philosophise
-    philosophized, philosophised
-    philosophizer's, philosophiser's
-    philosophizer, philosophiser
-    philosophizers, philosophisers
-    philosophizes, philosophises
-    philosophizing, philosophising
-    philter's, philtre's
-    philter, philtre
-    philters, philtres
-    phlebotomization's, phlebotomisation's
-    phlebotomization, phlebotomisation
-    phlebotomizations, phlebotomisations
-    phlebotomize, phlebotomise
-    phlebotomized, phlebotomised
-    phlebotomizes, phlebotomises
-    phlebotomizing, phlebotomising
-    phleum, phloeum
-    phlyctena's, phlyctaena's
-    phlyctena, phlyctaena
-    phlyctenae, phlyctaenae
-    phlyctenula, phlyctaenula
-    Phocean, Phocaean
-    phonemicization, phonemicisation
-    phonemicizations, phonemicisations
-    phonemicize, phonemicise
-    phonemicized, phonemicised
-    phonemicizes, phonemicises
-    phonemicizing, phonemicising
-    phoneticization's, phoneticisation's
-    phoneticization, phoneticisation
-    phoneticizations, phoneticisations
-    phoneticize, phoneticise
-    phoneticized, phoneticised
-    phoneticizes, phoneticises
-    phoneticizing, phoneticising
-    phonetization, phonetisation
-    phonetizations, phonetisations
-    phonetize, phonetise
-    phonetized, phonetised
-    phonetizes, phonetises
-    phonetizing, phonetising
-    phorrhea, phorrhoea
-    phosphatization's, phosphatisation's
-    phosphatization, phosphatisation
-    phosphatizations, phosphatisations
-    phosphatize, phosphatise
-    phosphatized, phosphatised
-    phosphatizes, phosphatises
-    phosphatizing, phosphatising
-    phosphorize, phosphorise
-    phosphorized, phosphorised
-    phosphorizes, phosphorises
-    phosphorizing, phosphorising
-    photesthesis, photaesthesis
-    photesthesis, photoesthesis
-    photocatalyzer's, photocatalyser's
-    photocatalyzer, photocatalyser
-    photocatalyzers, photocatalysers
-    photoesthetic, photoaesthetic
-    photographize, photographise
-    photographizes, photographises
-    photoionization's, photoionisation's
-    photoionization, photoionisation
-    photoionizations, photoionisations
-    photoisomerization's, photoisomerisation's
-    photoisomerization, photoisomerisation
-    photoisomerizations, photoisomerisations
-    photolabeled, photolabelled
-    photolabeler, photolabeller
-    photolabeling, photolabelling
-    photolyzable, photolysable
-    photolyze, photolyse
-    photolyzed, photolysed
-    photolyzes, photolyses
-    photolyzing, photolysing
-    photopolymerization's, photopolymerisation's
-    photopolymerization, photopolymerisation
-    photopolymerizations, photopolymerisations
-    photosensitization's, photosensitisation's
-    photosensitization, photosensitisation
-    photosensitizations, photosensitisations
-    photosensitize, photosensitise
-    photosensitized, photosensitised
-    photosensitizer's, photosensitiser's
-    photosensitizer, photosensitiser
-    photosensitizers, photosensitisers
-    photosensitizes, photosensitises
-    photosensitizing, photosensitising
-    photosynthesize, photosynthesise
-    photosynthesized, photosynthesised
-    photosynthesizes, photosynthesises
-    photosynthesizing, photosynthesising
-    phrenologize, phrenologise
-    phrenologized, phrenologised
-    phrenologizes, phrenologises
-    phrenologizing, phrenologising
-    Phylactolema's, Phylactolaema's
-    Phylactolema, Phylactolaema
-    Phylactolemata's, Phylactolaemata's
-    Phylactolemata, Phylactolaemata
-    phytoecology, phytooecology
-    phytohemagglutinin, phytohaemagglutinin
-    piarhemic, piarhaemic
-    piaster's, piastre's
-    piaster, piastre
-    piasters, piastres
-    picogram's, picogramme's
-    picogram, picogramme
-    picograms, picogrammes
-    picometer's, picometre's
-    picometer, picometre
-    picometers, picometres
-    pictorialization's, pictorialisation's
-    pictorialization, pictorialisation
-    pictorializations, pictorialisations
-    pictorialize, pictorialise
-    pictorialized, pictorialised
-    pictorializes, pictorialises
-    pictorializing, pictorialising
-    picturization's, picturisation's
-    picturization, picturisation
-    picturizations, picturisations
-    picturize, picturise
-    picturized, picturised
-    picturizes, picturises
-    picturizing, picturising
-    pidginization's, pidginisation's
-    pidginization, pidginisation
-    pidginizations, pidginisations
-    pidginize, pidginise
-    pidginized, pidginised
-    pidginizes, pidginises
-    pidginizing, pidginising
-    piggyback's, pickaback's
-    piggyback, pickaback
-    piggybacking, pickabacking
-    piggybacks, pickabacks
-    pigmean, pigmaean
-    pigmentize, pigmentise
-    pigmentizes, pigmentises
-    pilau's, pilaff's
-    pilau, pilaff
-    pilaus, pilaffs
-    pilgrimize, pilgrimise
-    pilgrimized, pilgrimised
-    pilgrimizes, pilgrimises
-    pilgrimizing, pilgrimising
-    pillarize, pillarise
-    pillarizes, pillarises
-    pillorize, pillorise
-    pillorized, pillorised
-    pillorizes, pillorises
-    pillorizing, pillorising
-    pillowbeer, pillowbere
-    Pindarize's, Pindarise's
-    Pindarize, Pindarise
-    Pindarized's, Pindarised's
-    Pindarized, Pindarised
-    Pindarizes, Pindarises
-    Pindarizing's, Pindarising's
-    Pindarizing, Pindarising
-    piney, piny
-    pinkie's, pinky's
-    pinkie, pinky
-    pinnule, pinnulae
-    pinochle's, pinocle's
-    pinochle, pinocle
-    pinyon's, piÒon's
-    pinyon, piÒon
-    pinyons, piÒons
-    piratize, piratise
-    piratizes, piratises
-    piroshki's, pirozhki's
-    piroshki, pirozhki
-    piscine, piscinae
-    pistoled, pistolled
-    pistoling, pistolling
-    pixie's, pixy's
-    pixie, pixy
-    pixieish, pixyish
-    pizes, pises
-    pizzazz's, pizazz's
-    pizzazz, pizazz
-    pizzazzes, pizazzes
-    Placean's, Placaean's
-    Placean, Placaean
-    placebos, placeboes
-    plage, plagae
-    plagiarization's, plagiarisation's
-    plagiarization, plagiarisation
-    plagiarizations, plagiarisations
-    plagiarize, plagiarise
-    plagiarized, plagiarised
-    plagiarizer's, plagiariser's
-    plagiarizer, plagiariser
-    plagiarizers, plagiarisers
-    plagiarizes, plagiarises
-    plagiarizing, plagiarising
-    Plante's, Plantae's
-    Plante, Plantae
-    plantule, plantulae
-    plasmapheresis, plasmaphaeresis
-    plasmolyze, plasmolyse
-    plasmolyzed, plasmolysed
-    plasmolyzes, plasmolyses
-    plasmolyzing, plasmolysing
-    plasticization's, plasticisation's
-    plasticization, plasticisation
-    plasticizations, plasticisations
-    plasticize, plasticise
-    plasticized, plasticised
-    plasticizer's, plasticiser's
-    plasticizer, plasticiser
-    plasticizers, plasticisers
-    plasticizes, plasticises
-    plasticizing, plasticising
-    platea, plataea
-    platinization's, platinisation's
-    platinization, platinisation
-    platinizations, platinisations
-    platinize, platinise
-    platinized, platinised
-    platinizes, platinises
-    platinizing, platinising
-    platitudinization's, platitudinisation's
-    platitudinization, platitudinisation
-    platitudinizations, platitudinisations
-    platitudinize, platitudinise
-    platitudinized, platitudinised
-    platitudinizer's, platitudiniser's
-    platitudinizer, platitudiniser
-    platitudinizes, platitudinises
-    platitudinizing, platitudinising
-    Platonization's, Platonisation's
-    Platonization, Platonisation
-    platonization, platonisation
-    Platonize, Platonise
-    platonize, platonise
-    Platonized, Platonised
-    platonized, platonised
-    Platonizer's, Platoniser's
-    Platonizer, Platoniser
-    Platonizes, Platonises
-    platonizes, platonises
-    Platonizing, Platonising
-    platonizing, platonising
-    platycelian, platycoelian
-    platycelous, platycoelous
-    plebeianization's, plebeianisation's
-    plebeianization, plebeianisation
-    plebeianize, plebeianise
-    plebeianized, plebeianised
-    plebeianizes, plebeianises
-    plebeianizing, plebeianising
-    pleuroperitoneal, pleuroperitonaeal
-    plow's, plough's
-    plow, plough
-    plowable, ploughable
-    plowboy's, ploughboy's
-    plowboy, ploughboy
-    plowboys, ploughboys
-    plowed, ploughed
-    plower's, plougher's
-    plower, plougher
-    plowers, ploughers
-    plowhead, ploughhead
-    plowing's, ploughing's
-    plowing, ploughing
-    plowman's, ploughman's
-    plowman, ploughman
-    plowmen, ploughmen
-    plows, ploughs
-    plowshare's, ploughshare's
-    plowshare, ploughshare
-    plowshares, ploughshares
-    plumule, plumulae
-    pluralization's, pluralisation's
-    pluralization, pluralisation
-    pluralizations, pluralisations
-    pluralize, pluralise
-    pluralized, pluralised
-    pluralizer's, pluraliser's
-    pluralizer, pluraliser
-    pluralizers, pluralisers
-    pluralizes, pluralises
-    pluralizing, pluralising
-    poeticization, poeticisation
-    poeticize, poeticise
-    poeticized, poeticised
-    poeticizes, poeticises
-    poeticizing, poeticising
-    poetization's, poetisation's
-    poetization, poetisation
-    poetizations, poetisations
-    poetize, poetise
-    poetized, poetised
-    poetizer's, poetiser's
-    poetizer, poetiser
-    poetizers, poetisers
-    poetizes, poetises
-    poetizing, poetising
-    pogromize, pogromise
-    pogromizes, pogromises
-    poky, pokey
-    polarizabilities, polarisabilities
-    polarizability's, polarisability's
-    polarizability, polarisability
-    polarizable's, polarisable's
-    polarizable, polarisable
-    polarizables, polarisables
-    polarization's, polarisation's
-    polarization, polarisation
-    polarizations, polarisations
-    polarize, polarise
-    polarized, polarised
-    polarizer's, polariser's
-    polarizer, polariser
-    polarizers, polarisers
-    polarizes, polarises
-    polarizing, polarising
-    polemicize, polemicise
-    polemicized, polemicised
-    polemicizes, polemicises
-    polemicizing, polemicising
-    polemize, polemise
-    polemized, polemised
-    polemizes, polemises
-    polemizing, polemising
-    policize, policise
-    policizer, policiser
-    policizers, policisers
-    policizes, policises
-    poliencephalitis's, polioencephalitis's
-    poliencephalitis, polioencephalitis
-    poliencephalomyelitis, polioencephalomyelitis
-    politicalize, politicalise
-    politicalizes, politicalises
-    politicization's, politicisation's
-    politicization, politicisation
-    politicizations, politicisations
-    politicize, politicise
-    politicized, politicised
-    politicizer, politiciser
-    politicizers, politicisers
-    politicizes, politicises
-    politicizing, politicising
-    politize, politise
-    politizes, politises
-    pollack's, pollock's
-    pollack, pollock
-    pollenizer, polleniser
-    pollinize, pollinise
-    pollinized, pollinised
-    pollinizer, polliniser
-    pollinizes, pollinises
-    pollinizing, pollinising
-    polliwog's, pollywog's
-    polliwog, pollywog
-    polliwogs, pollywogs
-    Polonization's, Polonisation's
-    Polonization, Polonisation
-    polonize, polonise
-    polonized, polonised
-    polonizes, polonises
-    polonizing, polonising
-    polychetous, polychaetous
-    polychromatize, polychromatise
-    polychromatizes, polychromatises
-    polychromize, polychromise
-    polychromizes, polychromises
-    polycythemia, polycythaemia
-    polycythemias, polycythaemias
-    polycythemic, polycythaemic
-    polydemonism, polydaemonism
-    polydemonisms, polydaemonisms
-    polydemonist's, polydaemonist's
-    polydemonist, polydaemonist
-    polyemia, polyaemia
-    polyemic, polyaemic
-    polyestrous, polyoestrous
-    polygamize, polygamise
-    polygamizes, polygamises
-    polyhemia, polyhaemia
-    polyhemic, polyhaemic
-    polymerization's, polymerisation's
-    polymerization, polymerisation
-    polymerizations, polymerisations
-    polymerize, polymerise
-    polymerized, polymerised
-    polymerizes, polymerises
-    polymerizing, polymerising
-    polypnea, polypnoea
-    polypneic, polypnoeic
-    polysulphurization's, polysulphurisation's
-    polysulphurization, polysulphurisation
-    polysulphurizations, polysulphurisations
-    polytetrafluorethylene, polytetrafluoroethylene
-    polytetrafluorethylenes, polytetrafluoroethylenes
-    pomerium, pomoerium
-    pomme, pommae
-    pommeled, pommelled
-    pommeling, pommelling
-    popliteal, poplitaeal
-    popularization's, popularisation's
-    popularization, popularisation
-    popularizations, popularisations
-    popularize, popularise
-    popularized, popularised
-    popularizer's, populariser's
-    popularizer, populariser
-    popularizers, popularisers
-    popularizes, popularises
-    popularizing, popularising
-    porcelainization's, porcelainisation's
-    porcelainization, porcelainisation
-    porcelainizations, porcelainisations
-    porcelainize, porcelainise
-    porcelainized, porcelainised
-    porcelainizes, porcelainises
-    porcelainizing, porcelainising
-    porcellanize, porcellanise
-    porcellanized, porcellanised
-    porcellanizes, porcellanises
-    porcellanizing, porcellanising
-    porer, pourer
-    porers, pourers
-    poringly, pouringly
-    porphyrization's, porphyrisation's
-    porphyrization, porphyrisation
-    porte, portae
-    portionize, portionise
-    portionizes, portionises
-    positivize, positivise
-    positivizes, positivises
-    postcecal, postcaecal
-    postcenal, postcoenal
-    posterize, posterise
-    posterizes, posterises
-    postfetal, postfoetal
-    postilion's, postillion's
-    postilion, postillion
-    postilions, postillions
-    postmedieval, postmediaeval
-    postsynchronization, postsynchronisation
-    posturize, posturise
-    posturized, posturised
-    posturizes, posturises
-    posturizing, posturising
-    potentialization's, potentialisation's
-    potentialization, potentialisation
-    potentializations, potentialisations
-    potentialize, potentialise
-    potentializes, potentialises
-    potentize, potentise
-    potentized, potentised
-    potentizes, potentises
-    potentizing, potentising
-    pouder, poudre
-    pouders, poudres
-    pouffe's, pouf's
-    pouffe, pouf
-    pouffes, poufs
-    poulder, pouldre
-    poulders, pouldres
-    powderization's, powderisation's
-    powderization, powderisation
-    powderizations, powderisations
-    powderize, powderise
-    powderizer, powderiser
-    powderizers, powderisers
-    powderizes, powderises
-    powellize, powellise
-    powellized, powellised
-    powellizes, powellises
-    powellizing, powellising
-    practicer's, practiser's
-    practicer, practiser
-    practicers, practisers
-    praenomen's, prenomen's
-    praenomen, prenomen
-    praenomens, prenomens
-    pragmatization, pragmatisation
-    pragmatizations, pragmatisations
-    pragmatize, pragmatise
-    pragmatized, pragmatised
-    pragmatizer, pragmatiser
-    pragmatizers, pragmatisers
-    pragmatizes, pragmatises
-    pragmatizing, pragmatising
-    preabdomen, praeabdomen
-    preacetabular, praeacetabular
-    preacherize, preacherise
-    preacherizes, preacherises
-    preacknowledgment's, preacknowledgement's
-    preacknowledgment, preacknowledgement
-    preacknowledgments, preacknowledgements
-    preanal, praeanal
-    preanesthetic's, preanaesthetic's
-    preanesthetic, preanaesthetic
-    preanesthetics, preanaesthetics
-    preapprize, preapprise
-    preapprized, preapprised
-    preapprizing, preapprising
-    preauthorize, preauthorise
-    prebaptize, prebaptise
-    prebaptizes, prebaptises
-    precancelation, precancellation
-    precava, praecava
-    precavae, praecavae
-    precipe, praecipe
-    precipes, praecipes
-    precisionize, precisionise
-    precisionizes, precisionises
-    precivilization's, precivilisation's
-    precivilization, precivilisation
-    precivilizations, precivilisations
-    precocial, praecocial
-    precolor's, precolour's
-    precolor, precolour
-    precolorable's, precolourable's
-    precolorable, precolourable
-    precolorabler, precolourabler
-    precolorables, precolourables
-    precolorablest, precolourablest
-    precoloration's, precolouration's
-    precoloration, precolouration
-    precolorations, precolourations
-    precolored, precoloured
-    precoloring, precolouring
-    precolorings, precolourings
-    precolors, precolours
-    preconization's, preconisation's
-    preconization, preconisation
-    preconizations, preconisations
-    preconize, preconise
-    preconized, preconised
-    preconizer's, preconiser's
-    preconizer, preconiser
-    preconizers, preconisers
-    preconizes, preconises
-    preconizing, preconising
-    precoracoid, praecoracoid
-    precordia, praecordia
-    precordial, praecordial
-    precordium, praecordium
-    precornu, praecornu
-    precox, praecox
-    precriticize, precriticise
-    precriticizes, precriticises
-    precuneus, praecuneus
-    predial, praedial
-    predialist, praedialist
-    prediality, praediality
-    predials, praedials
-    preemptor's, preaemptor's
-    preemptor, preaemptor
-    preesophageal, praeesophageal
-    preesophageal, preoesophageal
-    preestival, preaestival
-    preexistent, preaexistent
-    prefavor's, prefavour's
-    prefavor, prefavour
-    prefavorable's, prefavourable's
-    prefavorable, prefavourable
-    prefavorables, prefavourables
-    prefavorablies, prefavourablies
-    prefavorably, prefavourably
-    prefavorite's, prefavourite's
-    prefavorite, prefavourite
-    prefavorites, prefavourites
-    prefavors, prefavours
-    prefectorial, praefectorial
-    prefertilization's, prefertilisation's
-    prefertilization, prefertilisation
-    prefertilizations, prefertilisations
-    prefertilize, prefertilise
-    prefertilizes, prefertilises
-    preflavor's, preflavour's
-    preflavor, preflavour
-    preflavoring, preflavouring
-    preflavorings, preflavourings
-    preflavors, preflavours
-    prefloration, praefloration
-    prefoliation, praefoliation
-    pregalvanize, pregalvanise
-    pregalvanizes, pregalvanises
-    prehallux, praehallux
-    prehumor's, prehumour's
-    prehumor, prehumour
-    prehumors, prehumours
-    preinitialize, preinitialise
-    preinitialized, preinitialised
-    preinitializes, preinitialises
-    preinitializing, preinitialising
-    prejudgment's, prejudgement's
-    prejudgment, prejudgement
-    prejudgments, prejudgements
-    prelabor's, prelabour's
-    prelabor, prelabour
-    prelabors, prelabours
-    prelabrum, praelabrum
-    prelatize, prelatise
-    prelatized, prelatised
-    prelatizes, prelatises
-    prelatizing, prelatising
-    prelect, praelect
-    prelected, praelected
-    prelecting, praelecting
-    prelection's, praelection's
-    prelection, praelection
-    prelector, praelector
-    prelectorship, praelectorship
-    prelectress, praelectress
-    prelects, praelects
-    prelocalization's, prelocalisation's
-    prelocalization, prelocalisation
-    prelocalizations, prelocalisations
-    preludium, praeludium
-    preludize, preludise
-    preludizes, preludises
-    premaxilla, praemaxilla
-    premial, proemial
-    premillennialize, premillennialise
-    premillennialized, premillennialised
-    premillennializing, premillennialising
-    premonopolize, premonopolise
-    premonopolizes, premonopolises
-    premunire, praemunire
-    prenarial, praenarial
-    preneural, praeneural
-    prenomina, praenomina
-    prenominal, praenominal
-    preoffense's, preoffence's
-    preoffense, preoffence
-    preoffenses, preoffences
-    preoperculum, praeoperculum
-    preorganization's, preorganisation's
-    preorganization, preorganisation
-    preorganizations, preorganisations
-    preorganize, preorganise
-    preorganizes, preorganises
-    preoxidize, preoxidise
-    preoxidized, preoxidised
-    preoxidizes, preoxidises
-    preoxidizing, preoxidising
-    prepaleolithic, prepalaeolithic
-    prepositor, praepositor
-    prepositure, praepositure
-    preposter, praeposter
-    prepostor's, praepostor's
-    prepostor, praepostor
-    prepostors, praepostors
-    preppy's, preppie's
-    preppy, preppie
-    preprogram, preprogramme
-    prepubis, praepubis
-    prerealization's, prerealisation's
-    prerealization, prerealisation
-    prerealizations, prerealisations
-    prerealize, prerealise
-    prerealizes, prerealises
-    prerecognize, prerecognise
-    prerecognizes, prerecognises
-    Presbyterianize's, Presbyterianise's
-    Presbyterianize, Presbyterianise
-    Presbyterianized's, Presbyterianised's
-    Presbyterianized, Presbyterianised
-    Presbyterianizes, Presbyterianises
-    Presbyterianizing's, Presbyterianising's
-    Presbyterianizing, Presbyterianising
-    prescutum, praescutum
-    presidium's, praesidium's
-    presidium, praesidium
-    prespecialize, prespecialise
-    prespecializes, prespecialises
-    presphenoid, praesphenoid
-    presplendor's, presplendour's
-    presplendor, presplendour
-    presplendors, presplendours
-    pressurization's, pressurisation's
-    pressurization, pressurisation
-    pressurizations, pressurisations
-    pressurize, pressurise
-    pressurized, pressurised
-    pressurizer, pressuriser
-    pressurizers, pressurisers
-    pressurizes, pressurises
-    pressurizing, pressurising
-    prestandardization's, prestandardisation's
-    prestandardization, prestandardisation
-    prestandardizations, prestandardisations
-    prestandardize, prestandardise
-    prestandardizes, prestandardises
-    presternal, praesternal
-    presternum, praesternum
-    prestomium, praestomium
-    presympathize, presympathise
-    presympathizes, presympathises
-    presystolic, praesystolic
-    pretaxation, praetaxation
-    pretense's, pretence's
-    pretense, pretence
-    pretenses, pretences
-    pretensive, pretencive
-    preterit's, preterite's
-    preterit, preterite
-    preterits, preterites
-    pretexta's, praetexta's
-    pretexta, praetexta
-    pretextae, praetextae
-    pretorial, praetorial
-    Pretorians, Praetorians
-    pretorium, praetorium
-    Pretorius's, Praetorius's
-    Pretorius, Praetorius
-    pretorship, praetorship
-    preutilizable's, preutilisable's
-    preutilizable, preutilisable
-    preutilizables, preutilisables
-    preutilization's, preutilisation's
-    preutilization, preutilisation
-    preutilizations, preutilisations
-    preutilize, preutilise
-    preutilizes, preutilises
-    preventable, preventible
-    previze, previse
-    prezygapophysis, praezygapophysis
-    pricey, pricy
-    primeval, primaeval
-    primevally, primaevally
-    prioritization's, prioritisation's
-    prioritization, prioritisation
-    prioritizations, prioritisations
-    prioritize, prioritise
-    prioritized, prioritised
-    prioritizer, prioritiser
-    prioritizers, prioritisers
-    prioritizes, prioritises
-    prioritizing, prioritising
-    prioritizings, prioritisings
-    priorization, priorisation
-    priorizations, priorisations
-    priorize, priorise
-    priorized, priorised
-    priorizes, priorises
-    priorizing, priorising
-    privatization's, privatisation's
-    privatization, privatisation
-    privatizations, privatisations
-    privatize, privatise
-    privatized, privatised
-    privatizer, privatiser
-    privatizers, privatisers
-    privatizes, privatises
-    privatizing, privatising
-    prizable, prisable
-    proadvertizing, proadvertising
-    problemize, problemise
-    problemizes, problemises
-    processionize, processionise
-    processionizes, processionises
-    Procrusteanize's, Procrusteanise's
-    Procrusteanize, Procrusteanise
-    Procrusteanizes, Procrusteanises
-    proctodea, proctodaea
-    proctodeal, proctodaeal
-    proctodeum's, proctodaeum's
-    proctodeum, proctodaeum
-    proctodeums, proctodaeums
-    proctorization's, proctorisation's
-    proctorization, proctorisation
-    proctorizations, proctorisations
-    proctorize, proctorise
-    proctorized, proctorised
-    proctorizes, proctorises
-    proctorizing, proctorising
-    prodigalize, prodigalise
-    prodigalized, prodigalised
-    prodigalizes, prodigalises
-    prodigalizing, prodigalising
-    productize, productise
-    productized, productised
-    productizer, productiser
-    productizers, productisers
-    productizes, productises
-    productizing, productising
-    proemium, prooemium
-    profanize, profanise
-    profanizes, profanises
-    profer, profre
-    professionalization's, professionalisation's
-    professionalization, professionalisation
-    professionalizations, professionalisations
-    professionalize, professionalise
-    professionalized, professionalised
-    professionalizes, professionalises
-    professionalizing, professionalising
-    professionize, professionise
-    professionizes, professionises
-    programmer's, programer's
-    programmer, programer
-    programmers, programers
-    proindustrialization, proindustrialisation
-    projectization, projectisation
-    projectizations, projectisations
-    prokaryote's, procaryote's
-    prokaryote, procaryote
-    prokaryotes, procaryotes
-    prokaryotic, procaryotic
-    proletarianization's, proletarianisation's
-    proletarianization, proletarianisation
-    proletarianizations, proletarianisations
-    proletarianize, proletarianise
-    proletarianized, proletarianised
-    proletarianizes, proletarianises
-    proletarianizing, proletarianising
-    proletarize, proletarise
-    proletarized, proletarised
-    proletarizing, proletarising
-    prologize, prologise
-    prologized, prologised
-    prologizes, prologises
-    prologizing, prologising
-    prologue's, prolog's
-    prologue, prolog
-    prologues, prologs
-    prologuize, prologuise
-    prologuized, prologuised
-    prologuizer's, prologuiser's
-    prologuizer, prologuiser
-    prologuizers, prologuisers
-    prologuizes, prologuises
-    prologuizing, prologuising
-    prolusionize, prolusionise
-    prolusionizes, prolusionises
-    pronominalization, pronominalisation
-    pronominalize, pronominalise
-    propagandize, propagandise
-    propagandized, propagandised
-    propagandizes, propagandises
-    propagandizing, propagandising
-    propellant's, propellent's
-    propellant, propellent
-    propellants, propellents
-    prophetize, prophetise
-    prophetizes, prophetises
-    propositionize, propositionise
-    propositionizes, propositionises
-    propretor's, propraetor's
-    propretor, propraetor
-    propretorial, propraetorial
-    propretorian, propraetorian
-    propretors, propraetors
-    propylitization, propylitisation
-    propylitizations, propylitisations
-    propylitize, propylitise
-    propylitized, propylitised
-    propylitizes, propylitises
-    propylitizing, propylitising
-    proselytization's, proselytisation's
-    proselytization, proselytisation
-    proselytizations, proselytisations
-    proselytize, proselytise
-    proselytized, proselytised
-    proselytizer's, proselytiser's
-    proselytizer, proselytiser
-    proselytizers, proselytisers
-    proselytizes, proselytises
-    proselytizing, proselytising
-    proseuche, proseuchae
-    prosocele, prosocoele
-    prosopopeial, prosopopoeial
-    prosopopoeia, prosopopeia
-    prosopopoeias, prosopopeias
-    prostatorrhea, prostatorrhoea
-    protectionize, protectionise
-    protectionizes, protectionises
-    proteide, proteidae
-    Protestantize's, Protestantise's
-    Protestantize, Protestantise
-    Protestantized's, Protestantised's
-    Protestantized, Protestantised
-    Protestantizes, Protestantises
-    Protestantizing's, Protestantising's
-    Protestantizing, Protestantising
-    protester's, protestor's
-    protester, protestor
-    protesters, protestors
-    Prothoenor's, Prothoaenor's
-    Prothoenor, Prothoaenor
-    protoarcheology, protoarchaeology
-    protocoled, protocolled
-    protocoling, protocolling
-    protocolization's, protocolisation's
-    protocolization, protocolisation
-    protocolizations, protocolisations
-    protocolize, protocolise
-    protocolized, protocolised
-    protocolizes, protocolises
-    protocolizing, protocolising
-    proverbialize, proverbialise
-    proverbialized, proverbialised
-    proverbializes, proverbialises
-    proverbializing, proverbialising
-    proverbize, proverbise
-    proverbizes, proverbises
-    provincialization's, provincialisation's
-    provincialization, provincialisation
-    provincializations, provincialisations
-    provincialize, provincialise
-    provincialized, provincialised
-    provincializes, provincialises
-    provincializing, provincialising
-    Prussianization's, Prussianisation's
-    prussianization's, prussianisation's
-    Prussianization, Prussianisation
-    prussianization, prussianisation
-    Prussianizations, Prussianisations
-    Prussianize, Prussianise
-    prussianize, prussianise
-    Prussianized, Prussianised
-    prussianized, prussianised
-    Prussianizer's, Prussianiser's
-    prussianizer's, prussianiser's
-    Prussianizer, Prussianiser
-    prussianizer, prussianiser
-    Prussianizers, Prussianisers
-    Prussianizes, Prussianises
-    prussianizes, prussianises
-    Prussianizing, Prussianising
-    prussianizing, prussianising
-    psalmodize, psalmodise
-    psalmodized, psalmodised
-    psalmodizes, psalmodises
-    psalmodizing, psalmodising
-    pseudelephant, pseudoelephant
-    pseudembryo, pseudoembryo
-    pseudembryonic, pseudoembryonic
-    pseudesthesia, pseudaesthesia
-    pseudhemal, pseudhaemal
-    pseudoanemia's, pseudoanaemia's
-    pseudoanemia, pseudoanaemia
-    pseudoanemias, pseudoanaemias
-    pseudoanemic, pseudoanaemic
-    pseudoanemics, pseudoanaemics
-    pseudocele, pseudocoele
-    pseudocelom, pseudocoelom
-    pseudoedema's, pseudooedema's
-    pseudoedema, pseudooedema
-    pseudoedemas, pseudooedemas
-    pseudographize, pseudographise
-    pseudographizes, pseudographises
-    pseudolunule, pseudolunulae
-    psychoanalyze, psychoanalyse
-    psychoanalyzed, psychoanalysed
-    psychoanalyzer's, psychoanalyser's
-    psychoanalyzer, psychoanalyser
-    psychoanalyzers, psychoanalysers
-    psychoanalyzes, psychoanalyses
-    psychoanalyzing, psychoanalysing
-    psychologization, psychologisation
-    psychologize, psychologise
-    psychologized, psychologised
-    psychologizes, psychologises
-    psychologizing, psychologising
-    Ptolemean's, Ptolemaean's
-    Ptolemean, Ptolemaean
-    ptyalize, ptyalise
-    ptyalized, ptyalised
-    ptyalizes, ptyalises
-    ptyalizing, ptyalising
-    publice, publicae
-    publicize, publicise
-    publicized, publicised
-    publicizes, publicises
-    publicizing, publicising
-    puebloization's, puebloisation's
-    puebloization, puebloisation
-    puebloizations, puebloisations
-    puebloize, puebloise
-    puebloizes, puebloises
-    puers, pures
-    pulicide, pulicidae
-    Pullmanize's, Pullmanise's
-    Pullmanize, Pullmanise
-    Pullmanizes, Pullmanises
-    pulpitize, pulpitise
-    pulpitizes, pulpitises
-    pulverizable's, pulverisable's
-    pulverizable, pulverisable
-    pulverizabler, pulverisabler
-    pulverizables, pulverisables
-    pulverizablest, pulverisablest
-    pulverization's, pulverisation's
-    pulverization, pulverisation
-    pulverizations, pulverisations
-    pulverize, pulverise
-    pulverized, pulverised
-    pulverizer's, pulveriser's
-    pulverizer, pulveriser
-    pulverizers, pulverisers
-    pulverizes, pulverises
-    pulverizing, pulverising
-    pulvilized, pulvilised
-    pummeled, pummelled
-    pummeler, pummeller
-    pummeling, pummelling
-    pumpkin's, punkin's
-    pumpkin, punkin
-    pumpkins, punkins
-    pupilize, pupilise
-    pupilizes, pupilises
-    puppetize, puppetise
-    puppetizes, puppetises
-    Puritanize's, Puritanise's
-    Puritanize, Puritanise
-    puritanize, puritanise
-    puritanized, puritanised
-    Puritanizer's, Puritaniser's
-    Puritanizer, Puritaniser
-    Puritanizers, Puritanisers
-    Puritanizes, Puritanises
-    puritanizes, puritanises
-    puritanizing, puritanising
-    pyemia's, pyaemia's
-    pyemia, pyaemia
-    pyemias, pyaemias
-    pyemic, pyaemic
-    pygmean, pygmaean
-    pygmies, pigmies
-    pygmy's, pigmy's
-    pygmy, pigmy
-    pyorrhea's, pyorrhoea's
-    pyorrhea, pyorrhoea
-    pyorrheal, pyorrhoeal
-    pyorrhealer, pyorrhoealer
-    pyorrhealest, pyorrhoealest
-    pyorrheas, pyorrhoeas
-    pyorrheic, pyorrhoeic
-    pyramidize, pyramidise
-    pyramidizes, pyramidises
-    Pyrenean, Pyrenaean
-    Pyreneus's, Pyrenaeus's
-    Pyreneus, Pyrenaeus
-    pyridinize, pyridinise
-    pyridinizes, pyridinises
-    pyritization's, pyritisation's
-    pyritization, pyritisation
-    pyritizations, pyritisations
-    pyritize, pyritise
-    pyritized, pyritised
-    pyritizes, pyritises
-    pyritizing, pyritising
-    pyrolyzable, pyrolysable
-    pyrolyzate's, pyrolysate's
-    pyrolyzate, pyrolysate
-    pyrolyzates, pyrolysates
-    pyrolyze's, pyrolyse's
-    pyrolyze, pyrolyse
-    pyrolyzed, pyrolysed
-    pyrolyzer, pyrolyser
-    pyrolyzes, pyrolyses
-    pyrolyzing, pyrolysing
-    Pythagoreanize's, Pythagoreanise's
-    Pythagoreanize, Pythagoreanise
-    Pythagoreanizes, Pythagoreanises
-    pythonine, pythoninae
-    pythonize, pythonise
-    pythonizes, pythonises
-    quadriphonic, quadrophonic
-    quadriphonics, quadrophonics
-    quaestor's, questor's
-    quaestor, questor
-    quaestors, questors
-    quahog's, quahaug's
-    quahog, quahaug
-    quahogs, quahaugs
-    Quakerization's, Quakerisation's
-    Quakerization, Quakerisation
-    Quakerizations, Quakerisations
-    Quakerize's, Quakerise's
-    Quakerize, Quakerise
-    Quakerizes, Quakerises
-    quantization's, quantisation's
-    quantization, quantisation
-    quantizations, quantisations
-    quantize, quantise
-    quantized, quantised
-    quantizer's, quantiser's
-    quantizer, quantiser
-    quantizers, quantisers
-    quantizes, quantises
-    quantizing, quantising
-    quarreled, quarrelled
-    quarreler's, quarreller's
-    quarreler, quarreller
-    quarrelers, quarrellers
-    quarreling, quarrelling
-    quarrelous, quarrellous
-    quarterization's, quarterisation's
-    quarterization, quarterisation
-    quarterizations, quarterisations
-    quartet's, quartette's
-    quartet, quartette
-    quartets, quartettes
-    quaters, quatres
-    que, quae
-    querele, querelae
-    questionaries, quaestionaries
-    questionary, quaestionary
-    questorial, quaestorial
-    questorship's, quaestorship's
-    questorship, quaestorship
-    queuing, queueing
-    quininize, quininise
-    quininizes, quininises
-    quintessentialize, quintessentialise
-    quintessentialized, quintessentialised
-    quintessentializes, quintessentialises
-    quintessentializing, quintessentialising
-    quintet's, quintette's
-    quintet, quintette
-    quintets, quintettes
-    Quran's, Qur'an's
-    Quran, Qur'an
-    Quranic, Qur'anic
-    Qurans, Qur'ans
-    raccoon's, racoon's
-    raccoon, racoon
-    raccoons, racoons
-    racemization's, racemisation's
-    racemization, racemisation
-    racemizations, racemisations
-    racemize, racemise
-    racemized, racemised
-    racemizes, racemises
-    racemizing, racemising
-    racialization's, racialisation's
-    racialization, racialisation
-    racializations, racialisations
-    racialize, racialise
-    racializes, racialises
-    Radborne's, Radbourne's
-    Radborne, Radbourne
-    radialization's, radialisation's
-    radialization, radialisation
-    radializations, radialisations
-    radialize, radialise
-    radialized, radialised
-    radializes, radialises
-    radializing, radialising
-    radicalization's, radicalisation's
-    radicalization, radicalisation
-    radicalizations, radicalisations
-    radicalize, radicalise
-    radicalized, radicalised
-    radicalizes, radicalises
-    radicalizing, radicalising
-    radiopasteurization, radiopasteurisation
-    radiosensitize, radiosensitise
-    radiosensitized, radiosensitised
-    radiosensitizes, radiosensitises
-    radiosensitizing, radiosensitising
-    radiosterilization, radiosterilisation
-    radiosterilize, radiosterilise
-    radiosterilized, radiosterilised
-    radiosterilizes, radiosterilises
-    radiosterilizing, radiosterilising
-    radiumization's, radiumisation's
-    radiumization, radiumisation
-    radiumizations, radiumisations
-    radiumize, radiumise
-    radiumizes, radiumises
-    rajah's, raja's
-    rajah, raja
-    rajahs, rajas
-    Rame's, Ramae's
-    Rame, Ramae
-    ramekin's, ramequin's
-    ramekin, ramequin
-    ramekins, ramequins
-    rampier, rampire
-    rancor's, rancour's
-    rancor, rancour
-    rancors, rancours
-    randomization's, randomisation's
-    randomization, randomisation
-    randomizations, randomisations
-    randomize, randomise
-    randomized, randomised
-    randomizer's, randomiser's
-    randomizer, randomiser
-    randomizers, randomisers
-    randomizes, randomises
-    randomizing, randomising
-    ranee's, rani's
-    ranee, rani
-    ranees, ranis
-    raphe, raphae
-    raphide, raphidae
-    rapturize, rapturise
-    rapturized, rapturised
-    rapturizes, rapturises
-    rapturizing, rapturising
-    rascalize, rascalise
-    rascalizes, rascalises
-    rationalizable's, rationalisable's
-    rationalizable, rationalisable
-    rationalizables, rationalisables
-    rationalization's, rationalisation's
-    rationalization, rationalisation
-    rationalizations, rationalisations
-    rationalize, rationalise
-    rationalized, rationalised
-    rationalizer's, rationaliser's
-    rationalizer, rationaliser
-    rationalizers, rationalisers
-    rationalizes, rationalises
-    rationalizing, rationalising
-    ratite, ratitae
-    ratline's, ratlin's
-    ratlines, ratlins
-    raveler's, raveller's
-    raveler, raveller
-    ravelers, ravellers
-    reacclimatization's, reacclimatisation's
-    reacclimatization, reacclimatisation
-    reacclimatizations, reacclimatisations
-    reacclimatize, reacclimatise
-    reacclimatized, reacclimatised
-    reacclimatizes, reacclimatises
-    reacclimatizing, reacclimatising
-    reactualize, reactualise
-    reactualizes, reactualises
-    readvertize, readvertise
-    readvertized, readvertised
-    readvertizing, readvertising
-    realisticize, realisticise
-    realisticizes, realisticises
-    realizabilities, realisabilities
-    realizability's, realisability's
-    realizability, realisability
-    realizable, realisable
-    realizableness's, realisableness's
-    realizableness, realisableness
-    realizabler, realisabler
-    realizables, realisables
-    realizablest, realisablest
-    realizablies, realisablies
-    realizably, realisably
-    realization's, realisation's
-    realization, realisation
-    realizations, realisations
-    realize, realise
-    realized, realised
-    realizer's, realiser's
-    realizer, realiser
-    realizers, realisers
-    realizes, realises
-    realizing's, realising's
-    realizing, realising
-    realizingly, realisingly
-    realizings, realisings
-    reanalyze, reanalyse
-    reanalyzed, reanalysed
-    reanalyzer, reanalyser
-    reanalyzers, reanalysers
-    reanalyzes, reanalyses
-    reanalyzing, reanalysing
-    reanimalize, reanimalise
-    reanimalizes, reanimalises
-    reapologize, reapologise
-    reapologizes, reapologises
-    reauthorization's, reauthorisation's
-    reauthorization, reauthorisation
-    reauthorizations, reauthorisations
-    reauthorize, reauthorise
-    reauthorizes, reauthorises
-    rebaptization's, rebaptisation's
-    rebaptization, rebaptisation
-    rebaptizations, rebaptisations
-    rebaptize, rebaptise
-    rebaptized, rebaptised
-    rebaptizes, rebaptises
-    rebaptizing, rebaptising
-    rebourbonize, rebourbonise
-    rebourbonizes, rebourbonises
-    rebrutalize, rebrutalise
-    rebrutalizes, rebrutalises
-    recanalization, recanalisation
-    recapitalization's, recapitalisation's
-    recapitalization, recapitalisation
-    recapitalizations, recapitalisations
-    recapitalize, recapitalise
-    recapitalized, recapitalised
-    recapitalizes, recapitalises
-    recapitalizing, recapitalising
-    recarbonization's, recarbonisation's
-    recarbonization, recarbonisation
-    recarbonizations, recarbonisations
-    recarbonize, recarbonise
-    recarbonizer, recarboniser
-    recarbonizers, recarbonisers
-    recarbonizes, recarbonises
-    recategorized, recategorised
-    recausticize, recausticise
-    recausticizes, recausticises
-    recentralization's, recentralisation's
-    recentralization, recentralisation
-    recentralizations, recentralisations
-    recentralize, recentralise
-    recentralizes, recentralises
-    recercele, recercelae
-    reciprocalize, reciprocalise
-    reciprocalizes, reciprocalises
-    recivilization's, recivilisation's
-    recivilization, recivilisation
-    recivilizations, recivilisations
-    recivilize, recivilise
-    recivilizes, recivilises
-    recognizability, recognisability
-    recognizable, recognisable
-    recognizabler, recognisabler
-    recognizablest, recognisablest
-    recognizably, recognisably
-    recognizance's, recognisance's
-    recognizance, recognisance
-    recognizances, recognisances
-    recognize, recognise
-    recognized, recognised
-    recognizedlies, recognisedlies
-    recognizedly, recognisedly
-    recognizer's, recogniser's
-    recognizer, recogniser
-    recognizers, recognisers
-    recognizes, recognises
-    recognizing, recognising
-    recognizinglies, recognisinglies
-    recognizingly, recognisingly
-    recolonization's, recolonisation's
-    recolonization, recolonisation
-    recolonizations, recolonisations
-    recolonize, recolonise
-    recolonized, recolonised
-    recolonizes, recolonises
-    recolonizing, recolonising
-    recolor's, recolour's
-    recolor, recolour
-    recoloration's, recolouration's
-    recoloration, recolouration
-    recolorations, recolourations
-    recolored, recoloured
-    recoloring, recolouring
-    recolors, recolours
-    reconceptualization, reconceptualisation
-    reconceptualizing, reconceptualising
-    reconnoiter's, reconnoitre's
-    reconnoiter, reconnoitre
-    reconnoitered, reconnoitred
-    reconnoiterer's, reconnoitrer's
-    reconnoiterer, reconnoitrer
-    reconnoiterers, reconnoitrers
-    reconnoitering, reconnoitring
-    reconnoiters, reconnoitres
-    recriticize, recriticise
-    recriticizes, recriticises
-    recrystallization's, recrystallisation's
-    recrystallization, recrystallisation
-    recrystallizations, recrystallisations
-    recrystallize, recrystallise
-    recrystallized, recrystallised
-    recrystallizes, recrystallises
-    recrystallizing, recrystallising
-    redialed, redialled
-    redialer, redialler
-    redialing, redialling
-    redisseize, redisseise
-    redisseizin, redisseisin
-    reedified, reaedified
-    reedifies, reaedifies
-    reedify, reaedify
-    reedifying, reaedifying
-    reemphasize, reemphasise
-    reemphasized, reemphasised
-    reemphasizer, reemphasiser
-    reemphasizers, reemphasisers
-    reemphasizes, reemphasises
-    reemphasizing, reemphasising
-    reentrance's, reaentrance's
-    reentrance, reaentrance
-    reexportation's, reaexportation's
-    reexportation, reaexportation
-    reexporter's, reaexporter's
-    reexporter, reaexporter
-    refavor's, refavour's
-    refavor, refavour
-    refavors, refavours
-    refertilization's, refertilisation's
-    refertilization, refertilisation
-    refertilizations, refertilisations
-    refertilize, refertilise
-    refertilizes, refertilises
-    reflectorize's, reflectorise's
-    reflectorize, reflectorise
-    reflectorized, reflectorised
-    reflectorizes, reflectorises
-    reflectorizing, reflectorising
-    reforestization's, reforestisation's
-    reforestization, reforestisation
-    reforestize, reforestise
-    reforestizes, reforestises
-    reformades, reformadoes
-    refueled, refuelled
-    refueling, refuelling
-    regalize, regalise
-    regalizes, regalises
-    regalvanization's, regalvanisation's
-    regalvanization, regalvanisation
-    regalvanizations, regalvanisations
-    regalvanize, regalvanise
-    regalvanizes, regalvanises
-    reges, regoes
-    regionalization's, regionalisation's
-    regionalization, regionalisation
-    regionalizations, regionalisations
-    regionalize, regionalise
-    regionalized, regionalised
-    regionalizes, regionalises
-    regionalizing, regionalising
-    regularization's, regularisation's
-    regularization, regularisation
-    regularizations, regularisations
-    regularize, regularise
-    regularized, regularised
-    regularizer's, regulariser's
-    regularizer, regulariser
-    regularizers, regularisers
-    regularizes, regularises
-    regularizing, regularising
-    regulize, regulise
-    regulized, regulised
-    regulizes, regulises
-    regulizing, regulising
-    reharmonization, reharmonisation
-    reharmonize, reharmonise
-    reharmonizes, reharmonises
-    Rehm's, Roehm's
-    Rehm, Roehm
-    rehonor's, rehonour's
-    rehonor, rehonour
-    rehonors, rehonours
-    rehumanization's, rehumanisation's
-    rehumanization, rehumanisation
-    rehumanize, rehumanise
-    rehumanizes, rehumanises
-    rehybridize, rehybridise
-    rehybridizes, rehybridises
-    reindustrialization, reindustrialisation
-    reindustrializations, reindustrialisations
-    reindustrialize, reindustrialise
-    reindustrialized, reindustrialised
-    reindustrializes, reindustrialises
-    reindustrializing, reindustrialising
-    reinforce, reenforce
-    reinforceable, reenforceable
-    reinforced, reenforced
-    reinforces, reenforces
-    reinforcing, reenforcing
-    reinitialization, reinitialisation
-    reinitialize, reinitialise
-    reinitialized, reinitialised
-    reinitializes, reinitialises
-    reinitializing, reinitialising
-    reitemize, reitemise
-    reitemizes, reitemises
-    rejuvenize, rejuvenise
-    rejuvenized, rejuvenised
-    rejuvenizes, rejuvenises
-    rejuvenizing, rejuvenising
-    relabeled, relabelled
-    relabeler, relabeller
-    relabelers, relabellers
-    relabeling, relabelling
-    relativization's, relativisation's
-    relativization, relativisation
-    relativizations, relativisations
-    relativize, relativise
-    relativized, relativised
-    relativizes, relativises
-    relativizing, relativising
-    religionize, religionise
-    religionized, religionised
-    religionizes, religionises
-    religionizing, religionising
-    remagnetization's, remagnetisation's
-    remagnetization, remagnetisation
-    remagnetizations, remagnetisations
-    remagnetize, remagnetise
-    remagnetizes, remagnetises
-    rematerialize, rematerialise
-    rematerialized, rematerialised
-    rematerializes, rematerialises
-    rememorize, rememorise
-    rememorizes, rememorises
-    remilitarization's, remilitarisation's
-    remilitarization, remilitarisation
-    remilitarizations, remilitarisations
-    remilitarize, remilitarise
-    remilitarized, remilitarised
-    remilitarizes, remilitarises
-    remilitarizing, remilitarising
-    remineralization's, remineralisation's
-    remineralization, remineralisation
-    remineralizations, remineralisations
-    remineralize, remineralise
-    remineralized, remineralised
-    remineralizes, remineralises
-    remineralizing, remineralising
-    remobilization's, remobilisation's
-    remobilization, remobilisation
-    remobilizations, remobilisations
-    remobilize, remobilise
-    remobilizes, remobilises
-    remodeled, remodelled
-    remodeling, remodelling
-    remold, remould
-    remolded, remoulded
-    remolding, remoulding
-    remolds, remoulds
-    remonetization's, remonetisation's
-    remonetization, remonetisation
-    remonetizations, remonetisations
-    remonetize, remonetise
-    remonetized, remonetised
-    remonetizes, remonetises
-    remonetizing, remonetising
-    remoralization, remoralisation
-    remoralizations, remoralisations
-    remoralize, remoralise
-    remoralized, remoralised
-    remoralizes, remoralises
-    remoralizing, remoralising
-    renationalize, renationalise
-    renationalized, renationalised
-    renationalizes, renationalises
-    renationalizing, renationalising
-    rencounter, rencontre
-    Renferd's, Renfred's
-    Renferd, Renfred
-    renormalization's, renormalisation's
-    renormalization, renormalisation
-    renormalizations, renormalisations
-    renormalize, renormalise
-    renormalized, renormalised
-    renormalizes, renormalises
-    renormalizing, renormalising
-    reobjectivization's, reobjectivisation's
-    reobjectivization, reobjectivisation
-    reobjectivizations, reobjectivisations
-    reobjectivize, reobjectivise
-    reobjectivizes, reobjectivises
-    reorganization's, reorganisation's
-    reorganization, reorganisation
-    reorganizational, reorganisational
-    reorganizationist's, reorganisationist's
-    reorganizationist, reorganisationist
-    reorganizationists, reorganisationists
-    reorganizations, reorganisations
-    reorganize, reorganise
-    reorganized, reorganised
-    reorganizer's, reorganiser's
-    reorganizer, reorganiser
-    reorganizers, reorganisers
-    reorganizes, reorganises
-    reorganizing, reorganising
-    reoxidize, reoxidise
-    reoxidized, reoxidised
-    reoxidizes, reoxidises
-    reoxidizing, reoxidising
-    reoxygenize, reoxygenise
-    reoxygenizes, reoxygenises
-    repaganization's, repaganisation's
-    repaganization, repaganisation
-    repaganizations, repaganisations
-    repaganize, repaganise
-    repaganizer, repaganiser
-    repaganizers, repaganisers
-    repaganizes, repaganises
-    repatronize, repatronise
-    repatronizes, repatronises
-    repellent's, repellant's
-    repellent, repellant
-    repellents, repellants
-    repersonalize, repersonalise
-    rephosphorization's, rephosphorisation's
-    rephosphorization, rephosphorisation
-    rephosphorizations, rephosphorisations
-    rephosphorize, rephosphorise
-    rephosphorizes, rephosphorises
-    repolymerization's, repolymerisation's
-    repolymerization, repolymerisation
-    repolymerizations, repolymerisations
-    repolymerize, repolymerise
-    repolymerizes, repolymerises
-    repopularize, repopularise
-    reprivatization's, reprivatisation's
-    reprivatization, reprivatisation
-    reprivatizations, reprivatisations
-    reprivatize, reprivatise
-    reprivatized, reprivatised
-    reprivatizes, reprivatises
-    reprivatizing, reprivatising
-    reprized, reprised
-    reprogram, reprogramme
-    reprograms, reprogrammes
-    republicanization's, republicanisation's
-    republicanization, republicanisation
-    republicanizations, republicanisations
-    republicanize, republicanise
-    republicanized, republicanised
-    republicanizer's, republicaniser's
-    republicanizer, republicaniser
-    republicanizers, republicanisers
-    republicanizes, republicanises
-    republicanizing, republicanising
-    repulverize, repulverise
-    repulverizes, repulverises
-    reroyalize, reroyalise
-    reroyalizes, reroyalises
-    reseize, reseise
-    reseizer, reseiser
-    resensitization's, resensitisation's
-    resensitization, resensitisation
-    resensitizations, resensitisations
-    resensitize, resensitise
-    resensitizes, resensitises
-    resepulcher, resepulchre
-    resepulchers, resepulchres
-    reshes, reshoes
-    resinize, resinise
-    resinized, resinised
-    resinizes, resinises
-    resinizing, resinising
-    resolemnize, resolemnise
-    resolemnizes, resolemnises
-    respectabilize, respectabilise
-    respectabilized, respectabilised
-    respectabilizes, respectabilises
-    respectabilizing, respectabilising
-    restandardization's, restandardisation's
-    restandardization, restandardisation
-    restandardizations, restandardisations
-    restandardize, restandardise
-    restandardizes, restandardises
-    restaurateur's, restauranteur's
-    restaurateur, restauranteur
-    restaurateurs, restauranteurs
-    resterilize, resterilise
-    resterilizes, resterilises
-    restigmatize, restigmatise
-    restigmatizes, restigmatises
-    resurrectionize, resurrectionise
-    resurrectionized, resurrectionised
-    resurrectionizes, resurrectionises
-    resurrectionizing, resurrectionising
-    resymbolization's, resymbolisation's
-    resymbolization, resymbolisation
-    resymbolizations, resymbolisations
-    resymbolize, resymbolise
-    resymbolizes, resymbolises
-    resynchronization's, resynchronisation's
-    resynchronization, resynchronisation
-    resynchronizations, resynchronisations
-    resynchronize, resynchronise
-    resynchronized, resynchronised
-    resynchronizes, resynchronises
-    resynchronizing, resynchronising
-    resynthesize, resynthesise
-    resynthesizes, resynthesises
-    retinize, retinise
-    retinizes, retinises
-    retinule, retinulae
-    retranquilize, retranquilise
-    retranquilizes, retranquilises
-    retrocecal, retrocaecal
-    reutilization's, reutilisation's
-    reutilization, reutilisation
-    reutilize, reutilise
-    reutilized, reutilised
-    reutilizes, reutilises
-    reutilizing, reutilising
-    revalorization's, revalorisation's
-    revalorization, revalorisation
-    revalorizations, revalorisations
-    revalorize, revalorise
-    revalorized, revalorised
-    revalorizes, revalorises
-    revalorizing, revalorising
-    revaporization's, revapourisation's
-    revaporization, revapourisation
-    revaporizations, revapourisations
-    revaporize, revaporise
-    revaporizes, revaporises
-    revelationize, revelationise
-    revelationizes, revelationises
-    reveled, revelled
-    reveler's, reveller's
-    reveler, reveller
-    revelers, revellers
-    reveling, revelling
-    revelings, revellings
-    reverie's, revery's
-    reverie, revery
-    revigor, revigour
-    revisualization's, revisualisation's
-    revisualization, revisualisation
-    revisualizations, revisualisations
-    revisualize, revisualise
-    revisualizes, revisualises
-    revitalization's, revitalisation's
-    revitalization, revitalisation
-    revitalizations, revitalisations
-    revitalize, revitalise
-    revitalized, revitalised
-    revitalizer, revitaliser
-    revitalizers, revitalisers
-    revitalizes, revitalises
-    revitalizing, revitalising
-    revivalize, revivalise
-    revivalizes, revivalises
-    revocable, revokable
-    revolatilize, revolatilise
-    revolatilizes, revolatilises
-    revolutionize, revolutionise
-    revolutionized, revolutionised
-    revolutionizement's, revolutionisement's
-    revolutionizement, revolutionisement
-    revolutionizements, revolutionisements
-    revolutionizer's, revolutioniser's
-    revolutionizer, revolutioniser
-    revolutionizers, revolutionisers
-    revolutionizes, revolutionises
-    revolutionizing, revolutionising
-    Rexford's, Rexfourd's
-    Rexford, Rexfourd
-    rhaphe, rhaphae
-    rhapsodize, rhapsodise
-    rhapsodized, rhapsodised
-    rhapsodizes, rhapsodises
-    rhapsodizing, rhapsodising
-    rheadine, rhoeadine
-    rhebosis, rhaebosis
-    Rhetian's, Rhaetian's
-    Rhetian, Rhaetian
-    Rhetic, Rhaetic
-    rhetorize, rhetorise
-    rhetorized, rhetorised
-    rhetorizes, rhetorises
-    rhetorizing, rhetorising
-    rheumatize, rheumatise
-    rheumatized, rheumatised
-    rheumatizes, rheumatises
-    rheumatizing, rheumatising
-    rhinocele, rhinocoele
-    rhinocelian, rhinocoelian
-    rhinorrhea, rhinorrhoea
-    rhinorrheal, rhinorrhoeal
-    rhodanize, rhodanise
-    rhodanized, rhodanised
-    rhodanizes, rhodanises
-    rhodanizing, rhodanising
-    rhotacize, rhotacise
-    rhotacized, rhotacised
-    rhotacizes, rhotacises
-    rhotacizing, rhotacising
-    rhythmicize, rhythmicise
-    rhythmicizes, rhythmicises
-    rhythmizable's, rhythmisable's
-    rhythmizable, rhythmisable
-    rhythmizables, rhythmisables
-    rhythmization's, rhythmisation's
-    rhythmization, rhythmisation
-    rhythmizations, rhythmisations
-    rhythmize, rhythmise
-    rhythmized, rhythmised
-    rhythmizes, rhythmises
-    rhythmizing, rhythmising
-    rickshaw's, ricksha's
-    rickshaw, ricksha
-    rickshaws, rickshas
-    ridiculize, ridiculise
-    ridiculizes, ridiculises
-    rigidize, rigidise
-    rigidized, rigidised
-    rigidizes, rigidises
-    rigidizing, rigidising
-    rigmarole's, rigamarole's
-    rigmarole, rigamarole
-    rigmaroles, rigamaroles
-    rigor's, rigour's
-    rigor, rigour
-    rigorism's, rigourism's
-    rigorism, rigourism
-    rigorist's, rigourist's
-    rigorist, rigourist
-    rigoristic, rigouristic
-    rigors, rigours
-    riotize, riotise
-    riotizes, riotises
-    riposte's, ripost's
-    riposte, ripost
-    ripostes, riposts
-    ritornelle, ritournelle
-    ritornelles, ritournelles
-    ritualization's, ritualisation's
-    ritualization, ritualisation
-    ritualizations, ritualisations
-    ritualize, ritualise
-    ritualized, ritualised
-    ritualizes, ritualises
-    ritualizing, ritualising
-    rivaled, rivalled
-    rivaless's, rivalless's
-    rivaless, rivalless
-    rivalesses, rivallesses
-    rivaling, rivalling
-    rivalize, rivalise
-    rivalized, rivalised
-    rivalizes, rivalises
-    rivalizing, rivalising
-    robotization's, robotisation's
-    robotization, robotisation
-    robotizations, robotisations
-    robotize, robotise
-    robotized, robotised
-    robotizes, robotises
-    robotizing, robotising
-    roed, rooed
-    Roentgen, Rˆntgen
-    roentgenize, roentgenise
-    roer, rore
-    Romania's, Roumania's
-    Romania, Roumania
-    Romanias, Roumanias
-    Romanization's, Romanisation's
-    Romanization, Romanisation
-    Romanizations, Romanisations
-    Romanize, Romanise
-    romanize, romanise
-    Romanized, Romanised
-    romanized, romanised
-    Romanizer's, Romaniser's
-    Romanizer, Romaniser
-    Romanizers, Romanisers
-    Romanizes, Romanises
-    romanizes, romanises
-    Romanizing, Romanising
-    romanizing, romanising
-    romanticization's, romanticisation's
-    romanticization, romanticisation
-    romanticizations, romanticisations
-    romanticize, romanticise
-    romanticized, romanticised
-    romanticizes, romanticises
-    romanticizing, romanticising
-    ropy, ropey
-    routinization's, routinisation's
-    routinization, routinisation
-    routinizations, routinisations
-    routinize, routinise
-    routinized, routinised
-    routinizes, routinises
-    routinizing, routinising
-    roweled, rowelled
-    roweling, rowelling
-    royalization's, royalisation's
-    royalization, royalisation
-    royalizations, royalisations
-    royalize, royalise
-    royalized, royalised
-    royalizes, royalises
-    royalizing, royalising
-    rubberization, rubberisation
-    rubberize, rubberise
-    rubberized, rubberised
-    rubberizes, rubberises
-    rubberizing, rubberising
-    ruble's, rouble's
-    ruble, rouble
-    rubles, roubles
-    rubricize, rubricise
-    rubricizes, rubricises
-    ruffianize, ruffianise
-    ruffianizes, ruffianises
-    ruggedization's, ruggedisation's
-    ruggedization, ruggedisation
-    ruggedizations, ruggedisations
-    ruggedize, ruggedise
-    ruggedized, ruggedised
-    ruggedizes, ruggedises
-    ruggedizing, ruggedising
-    rumor's, rumour's
-    rumor, rumour
-    rumored, rumoured
-    rumorer's, rumourer's
-    rumorer, rumourer
-    rumorers, rumourers
-    rumoring, rumouring
-    rumormonger's, rumourmonger's
-    rumormonger, rumourmonger
-    rumormongers, rumourmongers
-    rumors, rumours
-    ruralization's, ruralisation's
-    ruralization, ruralisation
-    ruralizations, ruralisations
-    ruralize, ruralise
-    ruralized, ruralised
-    ruralizes, ruralises
-    ruralizing, ruralising
-    Russianization's, Russianisation's
-    Russianization, Russianisation
-    russianization, russianisation
-    Russianizations, Russianisations
-    Russianize, Russianise
-    russianize, russianise
-    Russianized, Russianised
-    Russianizes, Russianises
-    Russianizing, Russianising
-    rusticize, rusticise
-    rusticized, rusticised
-    rusticizes, rusticises
-    rusticizing, rusticising
-    Sabbathize's, Sabbathise's
-    Sabbathize, Sabbathise
-    Sabbathizes, Sabbathises
-    sabbatize, sabbatise
-    sabbatized, sabbatised
-    sabbatizes, sabbatises
-    sabbatizing, sabbatising
-    Sabean, Sabaean
-    Sabeans, Sabaeans
-    saber's, sabre's
-    saber, sabre
-    saberbill, sabrebill
-    sabered, sabred
-    sabering, sabring
-    saberlike's, sabrelike's
-    saberlike, sabrelike
-    saberlikes, sabrelikes
-    sabers, sabres
-    sabertooth, sabretooth
-    saccharization, saccharisation
-    saccharizations, saccharisations
-    saccharize, saccharise
-    saccharized, saccharised
-    saccharizes, saccharises
-    saccharizing, saccharising
-    sacerdotalize, sacerdotalise
-    sacerdotalized, sacerdotalised
-    sacerdotalizes, sacerdotalises
-    sacerdotalizing, sacerdotalising
-    sacralization's, sacralisation's
-    sacralization, sacralisation
-    sacralizations, sacralisations
-    sacralize, sacralise
-    sacralized, sacralised
-    sacralizes, sacralises
-    sacralizing, sacralising
-    sacramentize, sacramentise
-    sacramentizes, sacramentises
-    Safier's, Safire's
-    Safier, Safire
-    sailorizing's, sailorising's
-    sailorizing, sailorising
-    sailorizings, sailorisings
-    sake's, saki's
-    sake, saki
-    sakes, sakis
-    salable, saleable
-    salabler, saleabler
-    salablest, saleablest
-    salinization, salinisation
-    salinize, salinise
-    salinizes, salinises
-    saltiers, saltires
-    saltierwise, saltirewise
-    saltpeter's, saltpetre's
-    saltpeter, saltpetre
-    saltpeters, saltpetres
-    sanctuarize, sanctuarise
-    sanctuarized, sanctuarised
-    sanctuarizes, sanctuarises
-    sanctuarizing, sanctuarising
-    sandaled, sandalled
-    sandaling, sandalling
-    Sanferd's, Sanfred's
-    Sanferd, Sanfred
-    Sanforize, Sanforise
-    Sanforizes, Sanforises
-    Sanforizing, Sanforising
-    sanitization's, sanitisation's
-    sanitization, sanitisation
-    sanitizations, sanitisations
-    sanitize, sanitise
-    sanitized, sanitised
-    sanitizer's, sanitiser's
-    sanitizer, sanitiser
-    sanitizers, sanitisers
-    sanitizes, sanitises
-    sanitizing, sanitising
-    Sanskritize's, Sanskritise's
-    Sanskritize, Sanskritise
-    sapientize, sapientise
-    sapientizes, sapientises
-    sapor, sapour
-    sapors, sapours
-    sapremia's, sapraemia's
-    sapremia, sapraemia
-    sapremias, sapraemias
-    sapremic, sapraemic
-    sarcine, sarcinae
-    sari's, saree's
-    sari, saree
-    saris, sarees
-    Sassanide, Sassanidae
-    satanize, satanise
-    satanizes, satanises
-    satellitize, satellitise
-    satellitized, satellitised
-    satellitizes, satellitises
-    satellitizing, satellitising
-    satinize, satinise
-    satinizes, satinises
-    satirizable's, satirisable's
-    satirizable, satirisable
-    satirizables, satirisables
-    satirization, satirisation
-    satirize, satirise
-    satirized, satirised
-    satirizer's, satiriser's
-    satirizer, satiriser
-    satirizers, satirisers
-    satirizes, satirises
-    satirizing, satirising
-    sative, sativae
-    savable, saveable
-    savagize, savagise
-    savagizes, savagises
-    savanna's, savannah's
-    savanna, savannah
-    savannas, savannahes
-    savior's, saviour's
-    savior, saviour
-    savioress, saviouress
-    saviorhood's, saviourhood's
-    saviorhood, saviourhood
-    saviorhoods, saviourhoods
-    saviors, saviours
-    saviorship's, saviourship's
-    saviorship, saviourship
-    saviorships, saviourships
-    savor's, savour's
-    savor, savour
-    savored, savoured
-    savorer's, savourer's
-    savorer, savourer
-    savorers, savourers
-    savorier, savourier
-    savories, savouries
-    savoriest, savouriest
-    savorilies, savourilies
-    savorily, savourily
-    savoriness's, savouriness's
-    savoriness, savouriness
-    savorinesses, savourinesses
-    savoring, savouring
-    savoringlier, savouringlier
-    savoringlies, savouringlies
-    savoringliest, savouringliest
-    savoringly, savouringly
-    savorless, savourless
-    savorlesser, savourlesser
-    savorlesses, savourlesses
-    savorlessest, savourlessest
-    savorly, savourly
-    savorous, savourous
-    savorouser, savourouser
-    savorousest, savourousest
-    savors, savours
-    savory's, savoury's
-    savory, savoury
-    Saxonization's, Saxonisation's
-    Saxonization, Saxonisation
-    Saxonizations, Saxonisations
-    Saxonize's, Saxonise's
-    Saxonize, Saxonise
-    Saxonized's, Saxonised's
-    Saxonized, Saxonised
-    Saxonizes, Saxonises
-    Saxonizing's, Saxonising's
-    Saxonizing, Saxonising
-    scalawag's, scallywag's
-    scalawag, scallywag
-    scalawags, scallywags
-    scallop's, scollop's
-    scallop, scollop
-    scalloped, scolloped
-    scalloping, scolloping
-    scallops, scollops
-    scandaled, scandalled
-    scandaling, scandalling
-    scandalization's, scandalisation's
-    scandalization, scandalisation
-    scandalizations, scandalisations
-    scandalize, scandalise
-    scandalized, scandalised
-    scandalizer's, scandaliser's
-    scandalizer, scandaliser
-    scandalizers, scandalisers
-    scandalizes, scandalises
-    scandalizing, scandalising
-    scaped, scapaed
-    scary, scarey
-    scena, scaena
-    scenarioization's, scenarioisation's
-    scenarioization, scenarioisation
-    scenarioizations, scenarioisations
-    scenarioize, scenarioise
-    scenarioizes, scenarioises
-    scenarization's, scenarisation's
-    scenarization, scenarisation
-    scenarizations, scenarisations
-    scenarize, scenarise
-    scenarized, scenarised
-    scenarizes, scenarises
-    scenarizing, scenarising
-    scepter's, sceptre's
-    scepter, sceptre
-    scepterdom, sceptredom
-    sceptered, sceptred
-    sceptering, sceptring
-    scepterless, sceptreless
-    scepterlesses, sceptrelesses
-    scepters, sceptres
-    Scevor's, Scevour's
-    Scevor, Scevour
-    schedulize, schedulise
-    schedulizes, schedulises
-    schemata, schemas
-    schematization's, schematisation's
-    schematization, schematisation
-    schematizations, schematisations
-    schematize, schematise
-    schematized, schematised
-    schematizer, schematiser
-    schematizers, schematisers
-    schematizes, schematises
-    schematizing, schematising
-    schillerization, schillerisation
-    schillerizations, schillerisations
-    schillerize, schillerise
-    schillerized, schillerised
-    schillerizes, schillerises
-    schillerizing, schillerising
-    schismatize, schismatise
-    schismatized, schismatised
-    schismatizes, schismatises
-    schismatizing, schismatising
-    schistocelia, schistocoelia
-    schlemiel's, shlemiel's
-    schlemiel, shlemiel
-    schlemiels, shlemiels
-    schlepped, shlepped
-    schlepping, shlepping
-    schmaltzy, schmalzy
-    schmalz's, shmaltz's
-    schmalz, shmaltz
-    schmalzes, shmaltzes
-    schmo's, schmoe's
-    schmo, schmoe
-    schnapps's, schnaps's
-    schnapps, schnaps
-    schtick's, shtik's
-    scientize, scientise
-    scientized, scientised
-    scientizes, scientises
-    scientizing, scientising
-    sclere, sclerae
-    sclerotization's, sclerotisation's
-    sclerotization, sclerotisation
-    sclerotize, sclerotise
-    sclerotized, sclerotised
-    sclerotizes, sclerotises
-    sclerotizing, sclerotising
-    scorse, scourse
-    scorsed, scoursed
-    scorses, scourses
-    scorsing, scoursing
-    Scotticize's, Scotticise's
-    Scotticize, Scotticise
-    Scotticized's, Scotticised's
-    Scotticized, Scotticised
-    Scotticizes, Scotticises
-    Scotticizing's, Scotticising's
-    Scotticizing, Scotticising
-    scripturalize, scripturalise
-    scripturalizes, scripturalises
-    scrod's, schrod's
-    scrod, schrod
-    scrods, schrods
-    scrunchy's, scrunchie's
-    scrunchy, scrunchie
-    scrutinization's, scrutinisation's
-    scrutinization, scrutinisation
-    scrutinizations, scrutinisations
-    scrutinize, scrutinise
-    scrutinized, scrutinised
-    scrutinizer's, scrutiniser's
-    scrutinizer, scrutiniser
-    scrutinizers, scrutinisers
-    scrutinizes, scrutinises
-    scrutinizing, scrutinising
-    scrutinizinglies, scrutinisinglies
-    scrutinizingly, scrutinisingly
-    se, sae
-    se, soe
-    seborrhea's, seborrhoea's
-    seborrhea, seborrhoea
-    seborrheas, seborrhoeas
-    seborrheic, seborrhoeic
-    sectarianization, sectarianisation
-    sectarianize, sectarianise
-    sectarianized, sectarianised
-    sectarianizes, sectarianises
-    sectarianizing, sectarianising
-    sectionalization's, sectionalisation's
-    sectionalization, sectionalisation
-    sectionalizations, sectionalisations
-    sectionalize, sectionalise
-    sectionalized, sectionalised
-    sectionalizes, sectionalises
-    sectionalizing, sectionalising
-    sectionization, sectionisation
-    sectionizations, sectionisations
-    sectionize, sectionise
-    sectionized, sectionised
-    sectionizes, sectionises
-    sectionizing, sectionising
-    sectorization, sectorisation
-    sectorizations, sectorisations
-    sectorize, sectorise
-    sectorized, sectorised
-    sectorizes, sectorises
-    sectorizing, sectorising
-    secularization's, secularisation's
-    secularization, secularisation
-    secularizations, secularisations
-    secularize, secularise
-    secularized, secularised
-    secularizer's, seculariser's
-    secularizer, seculariser
-    secularizers, secularisers
-    secularizes, secularises
-    secularizing, secularising
-    seculum, saeculum
-    seculums, saeculums
-    securitization, securitisation
-    securitizations, securitisations
-    securitize, securitise
-    securitized, securitised
-    securitizes, securitises
-    securitizing, securitising
-    Seed's, Saeed's
-    Seed, Saeed
-    seizable, seisable
-    seizer's, seiser's
-    seizer, seiser
-    seizers, seisers
-    seizin's, seisin's
-    seizin, seisin
-    seizings, seisings
-    seizins, seisins
-    selle, sellae
-    selvage's, selvedge's
-    selvage, selvedge
-    selvages, selvedges
-    Semenov's, Semaenov's
-    Semenov, Semaenov
-    semianesthetic, semianaesthetic
-    semicarbonize, semicarbonise
-    semicarbonizes, semicarbonises
-    semicivilization's, semicivilisation's
-    semicivilization, semicivilisation
-    semicivilizations, semicivilisations
-    semicivilized's, semicivilised's
-    semicivilized, semicivilised
-    semicivilizeds, semiciviliseds
-    semifossilized's, semifossilised's
-    semifossilized, semifossilised
-    semifossilizeds, semifossiliseds
-    semihonor's, semihonour's
-    semihonor, semihonour
-    semihonors, semihonours
-    semihumanized's, semihumanised's
-    semihumanized, semihumanised
-    semihumanizeds, semihumaniseds
-    semimercerized's, semimercerised's
-    semimercerized, semimercerised
-    semimercerizeds, semimerceriseds
-    semimineralized's, semimineralised's
-    semimineralized, semimineralised
-    semimineralizeds, semimineraliseds
-    seminarize, seminarise
-    seminarizes, seminarises
-    seminationalization's, seminationalisation's
-    seminationalization, seminationalisation
-    seminationalizations, seminationalisations
-    semiorganized's, semiorganised's
-    semiorganized, semiorganised
-    semiorganizeds, semiorganiseds
-    semioxidized's, semioxidised's
-    semioxidized, semioxidised
-    semioxidizeds, semioxidiseds
-    semioxygenized's, semioxygenised's
-    semioxygenized, semioxygenised
-    semioxygenizeds, semioxygeniseds
-    semiprofessionalized's, semiprofessionalised's
-    semiprofessionalized, semiprofessionalised
-    semiprofessionalizeds, semiprofessionaliseds
-    semite, semitae
-    Semiticize's, Semiticise's
-    Semiticize, Semiticise
-    Semiticizes, Semiticises
-    Semitization's, Semitisation's
-    Semitization, Semitisation
-    Semitizations, Semitisations
-    Semitize's, Semitise's
-    Semitize, Semitise
-    Semitized's, Semitised's
-    Semitized, Semitised
-    Semitizes, Semitises
-    Semitizing's, Semitising's
-    Semitizing, Semitising
-    semivulcanized's, semivulcanised's
-    semivulcanized, semivulcanised
-    semivulcanizeds, semivulcaniseds
-    semper, sempre
-    senilize, senilise
-    senilizes, senilises
-    sensationalize, sensationalise
-    sensationalized, sensationalised
-    sensationalizes, sensationalises
-    sensationalizing, sensationalising
-    sensitization's, sensitisation's
-    sensitization, sensitisation
-    sensitizations, sensitisations
-    sensitize, sensitise
-    sensitized, sensitised
-    sensitizer's, sensitiser's
-    sensitizer, sensitiser
-    sensitizers, sensitisers
-    sensitizes, sensitises
-    sensitizing, sensitising
-    sensize, sensise
-    sensizes, sensises
-    sensualization's, sensualisation's
-    sensualization, sensualisation
-    sensualizations, sensualisations
-    sensualize, sensualise
-    sensualized, sensualised
-    sensualizes, sensualises
-    sensualizing, sensualising
-    sentimentalization's, sentimentalisation's
-    sentimentalization, sentimentalisation
-    sentimentalizations, sentimentalisations
-    sentimentalize, sentimentalise
-    sentimentalized, sentimentalised
-    sentimentalizer, sentimentaliser
-    sentimentalizers, sentimentalisers
-    sentimentalizes, sentimentalises
-    sentimentalizing, sentimentalising
-    sentineled, sentinelled
-    sentineling, sentinelling
-    sepaled, sepalled
-    sepaledder, sepalledder
-    sepaleddest, sepalleddest
-    Septembrizer's, Septembriser's
-    Septembrizer, Septembriser
-    Septembrizers, Septembrisers
-    septemia, septaemia
-    septet's, septette's
-    septet, septette
-    septets, septettes
-    septicemia's, septicaemia's
-    septicemia, septicaemia
-    septicemias, septicaemias
-    septicemic, septicaemic
-    septicization's, septicisation's
-    septicization, septicisation
-    septicizations, septicisations
-    septicolored, septicoloured
-    sepulcher's, sepulchre's
-    sepulcher, sepulchre
-    sepulchered, sepulchred
-    sepulchering, sepulchring
-    sepulchers, sepulchres
-    sepulchralize, sepulchralise
-    sepulchralizes, sepulchralises
-    sequentialize, sequentialise
-    sequentialized, sequentialised
-    sequentializes, sequentialises
-    sequentializing, sequentialising
-    serape's, sarape's
-    serape, sarape
-    serapes, sarapes
-    serenize, serenise
-    serenizes, serenises
-    serializability, serialisability
-    serializable, serialisable
-    serialization's, serialisation's
-    serialization, serialisation
-    serializations, serialisations
-    serialize, serialise
-    serialized, serialised
-    serializes, serialises
-    serializing, serialising
-    sericitization, sericitisation
-    sericitizations, sericitisations
-    sermonize, sermonise
-    sermonized, sermonised
-    sermonizer's, sermoniser's
-    sermonizer, sermoniser
-    sermonizers, sermonisers
-    sermonizes, sermonises
-    sermonizing, sermonising
-    serose, serosae
-    serpentinization's, serpentinisation's
-    serpentinization, serpentinisation
-    serpentinizations, serpentinisations
-    serpentinize, serpentinise
-    serpentinized, serpentinised
-    serpentinizes, serpentinises
-    serpentinizing, serpentinising
-    serpentize, serpentise
-    serpentized, serpentised
-    serpentizes, serpentises
-    serpentizing, serpentising
-    serre, serrae
-    servilize, servilise
-    servilizes, servilises
-    seta, saeta
-    setule, setulae
-    severalize, severalise
-    severalizes, severalises
-    severization's, severisation's
-    severization, severisation
-    severizations, severisations
-    severize, severise
-    severizes, severises
-    sextet's, sextette's
-    sextet, sextette
-    sextets, sextettes
-    sexualization's, sexualisation's
-    sexualization, sexualisation
-    sexualizations, sexualisations
-    sexualize, sexualise
-    sexualized, sexualised
-    sexualizes, sexualises
-    sexualizing, sexualising
-    Shakespearize's, Shakespearise's
-    Shakespearize, Shakespearise
-    Shakespearizes, Shakespearises
-    shammy's, chammy's
-    shammy, chammy
-    shareable, sharable
-    sharpie's, sharpy's
-    sharpie, sharpy
-    sheikdom's, sheikhdom's
-    sheikdom, sheikhdom
-    sheikdoms, sheikhdoms
-    shellac's, shellack's
-    shellac, shellack
-    shellacs, shellacks
-    shepherdize, shepherdise
-    shepherdizes, shepherdises
-    sher, shoer
-    sherardize, sherardise
-    sherardized, sherardised
-    sherardizes, sherardises
-    sherardizing, sherardising
-    sherbet's, sherbert's
-    sherbet, sherbert
-    sherbets, sherberts
-    Shere's, Shree's
-    Shere, Shree
-    shere, shree
-    shillelagh's, shillalah's
-    shillelagh, shillalah
-    shillelaghes, shillalahes
-    Shintoize's, Shintoise's
-    Shintoize, Shintoise
-    Shintoizes, Shintoises
-    Shkoder's, Shkodaer's
-    Shkoder, Shkodaer
-    shlep, shlepp
-    shlepp's, shlep's
-    shleps, shlepps
-    shlock, shlocky
-    shorty's, shortie's
-    shorty, shortie
-    shoveled, shovelled
-    shoveler's, shoveller's
-    shoveler, shoveller
-    shovelers, shovellers
-    shoveling, shovelling
-    shriveled, shrivelled
-    shriveling, shrivelling
-    shtik, schtick
-    shtiks, schticks
-    sialorrhea, sialorrhoea
-    siderealize, siderealise
-    siderealizes, siderealises
-    signaled, signalled
-    signaler's, signaller's
-    signaler, signaller
-    signalers, signallers
-    signaling, signalling
-    signalization, signalisation
-    signalize, signalise
-    signalized, signalised
-    signalizes, signalises
-    signalizing, signalising
-    siled, siloed
-    silicatization's, silicatisation's
-    silicatization, silicatisation
-    silicatizations, silicatisations
-    siliceous, silicious
-    silicidize, silicidise
-    silicidizes, silicidises
-    siliconize, siliconise
-    siliconizes, siliconises
-    silicule, siliculae
-    silique, siliquae
-    silverize, silverise
-    silverized, silverised
-    silverizer's, silveriser's
-    silverizer, silveriser
-    silverizers, silverisers
-    silverizes, silverises
-    silverizing, silverising
-    similarize, similarise
-    similarizes, similarises
-    similize, similise
-    similized, similised
-    similizes, similises
-    similizing, similising
-    simonize, simonise
-    Sine's, Sinae's
-    Sine, Sinae
-    singularization's, singularisation's
-    singularization, singularisation
-    singularizations, singularisations
-    singularize, singularise
-    singularized, singularised
-    singularizes, singularises
-    singularizing, singularising
-    sinicize, sinicise
-    sinicized, sinicised
-    sinicizes, sinicises
-    sinicizing, sinicising
-    siphon's, syphon's
-    siphon, syphon
-    siphoned, syphoned
-    siphoning, syphoning
-    siphonless, syphonless
-    siphonlesses, syphonlesses
-    siphonlike's, syphonlike's
-    siphonlike, syphonlike
-    siphonlikes, syphonlikes
-    siphonophore's, syphonophore's
-    siphonophore, syphonophore
-    siphonostele's, syphonostele's
-    siphonostele, syphonostele
-    siphonostelic, syphonostelic
-    siphonostely, syphonostely
-    siphons, syphons
-    sirenize, sirenise
-    sirenized, sirenised
-    sirenizes, sirenises
-    sirenizing, sirenising
-    sirree's, siree's
-    sirree, siree
-    sirrees, sirees
-    sisterize, sisterise
-    sisterizes, sisterises
-    sistern, sistren
-    sizable, sizeable
-    sizableness, sizeableness
-    sizably, sizeably
-    sizel, sisel
-    skeer, skere
-    skeletonization's, skeletonisation's
-    skeletonization, skeletonisation
-    skeletonizations, skeletonisations
-    skeletonize, skeletonise
-    skeletonized, skeletonised
-    skeletonizer's, skeletoniser's
-    skeletonizer, skeletoniser
-    skeletonizers, skeletonisers
-    skeletonizes, skeletonises
-    skeletonizing, skeletonising
-    skeptic's, sceptic's
-    skeptic, sceptic
-    skeptical, sceptical
-    skepticaler, scepticaler
-    skepticalest, scepticalest
-    skeptically, sceptically
-    skepticer, scepticer
-    skepticest, scepticest
-    skepticism's, scepticism's
-    skepticism, scepticism
-    skepticisms, scepticisms
-    skepticize, skepticise
-    skepticizes, skepticises
-    skeptics, sceptics
-    skillful, skilful
-    skillfully, skilfully
-    skillfulness's, skilfulness's
-    skillfulness, skilfulness
-    skulduggery's, skullduggery's
-    skulduggery, skullduggery
-    skyer, skyre
-    skyers, skyres
-    Slavicize's, Slavicise's
-    Slavicize, Slavicise
-    Slavicizes, Slavicises
-    Slavization's, Slavisation's
-    Slavization, Slavisation
-    Slavizations, Slavisations
-    Slavize's, Slavise's
-    Slavize, Slavise
-    Slavizes, Slavises
-    Slavonicize's, Slavonicise's
-    Slavonicize, Slavonicise
-    Slavonicized's, Slavonicised's
-    Slavonicized, Slavonicised
-    Slavonicizes, Slavonicises
-    Slavonicizing's, Slavonicising's
-    Slavonicizing, Slavonicising
-    Slavonize's, Slavonise's
-    Slavonize, Slavonise
-    Slavonized's, Slavonised's
-    Slavonized, Slavonised
-    Slavonizes, Slavonises
-    Slavonizing's, Slavonising's
-    Slavonizing, Slavonising
-    sle, slae
-    slenderize, slenderise
-    slenderized, slenderised
-    slenderizes, slenderises
-    slenderizing, slenderising
-    slier, slyer
-    sliest, slyest
-    sloganize, sloganise
-    sloganized, sloganised
-    sloganizes, sloganises
-    sloganizing, sloganising
-    sloganizings, sloganisings
-    sluggardize, sluggardise
-    sluggardized, sluggardised
-    sluggardizes, sluggardises
-    sluggardizing, sluggardising
-    slumberous, slumbrous
-    slyly, slily
-    smidge's, smidgin's
-    smidge, smidgin
-    smidges, smidgins
-    smolder's, smoulder's
-    smolder, smoulder
-    smoldered, smouldered
-    smoldering, smouldering
-    smolders, smoulders
-    smoothie's, smoothy's
-    smoothie, smoothy
-    sniveled, snivelled
-    sniveler's, sniveller's
-    sniveler, sniveller
-    snivelers, snivellers
-    sniveling, snivelling
-    snivelings, snivellings
-    snobsniveling, snobsnivelling
-    snorkeled, snorkelled
-    snorkeling, snorkelling
-    snowplow's, snowplough's
-    snowplow, snowplough
-    snowplows, snowploughs
-    snowshed, snowshoed
-    snuffcolored, snuffcoloured
-    soberize, soberise
-    soberized, soberised
-    soberizes, soberises
-    soberizing, soberising
-    sobriquet's, soubriquet's
-    sobriquet, soubriquet
-    sobriquets, soubriquets
-    socialization's, socialisation's
-    socialization, socialisation
-    socializations, socialisations
-    socialize, socialise
-    socialized, socialised
-    socializer's, socialiser's
-    socializer, socialiser
-    socializes, socialises
-    socializing, socialising
-    sockdologizing, sockdologising
-    Socratize's, Socratise's
-    Socratize, Socratise
-    Socratized's, Socratised's
-    Socratized, Socratised
-    Socratizes, Socratises
-    Socratizing's, Socratising's
-    Socratizing, Socratising
-    sodomize, sodomise
-    sodomized, sodomised
-    sodomizes, sodomises
-    sodomizing, sodomising
-    softy's, softie's
-    softy, softie
-    sol's, so's
-    sol, so
-    solarization's, solarisation's
-    solarization, solarisation
-    solarizations, solarisations
-    solarize, solarise
-    solarized, solarised
-    solarizes, solarises
-    solarizing, solarising
-    soldierize, soldierise
-    soldierizes, soldierises
-    solecize, solecise
-    solecized, solecised
-    solecizes, solecises
-    solecizing, solecising
-    solemnization's, solemnisation's
-    solemnization, solemnisation
-    solemnizations, solemnisations
-    solemnize, solemnise
-    solemnized, solemnised
-    solemnizer's, solemniser's
-    solemnizer, solemniser
-    solemnizers, solemnisers
-    solemnizes, solemnises
-    solemnizing, solemnising
-    soliloquization, soliloquisation
-    soliloquize, soliloquise
-    soliloquized, soliloquised
-    soliloquizer's, soliloquiser's
-    soliloquizer, soliloquiser
-    soliloquizers, soliloquisers
-    soliloquizes, soliloquises
-    soliloquizing's, soliloquising's
-    soliloquizing, soliloquising
-    soliloquizingly, soliloquisingly
-    soliloquizings, soliloquisings
-    solmization's, solmisation's
-    solmization, solmisation
-    solmizations, solmisations
-    solonization, solonisation
-    solonizations, solonisations
-    sols, sos
-    solubilization's, solubilisation's
-    solubilization, solubilisation
-    solubilizations, solubilisations
-    solubilize, solubilise
-    solubilized, solubilised
-    solubilizes, solubilises
-    solubilizing, solubilising
-    solutize, solutise
-    solutizer's, solutiser's
-    solutizer, solutiser
-    solutizers, solutisers
-    solutizes, solutises
-    somber, sombre
-    somberer, sombrer
-    somberest, sombrest
-    somberish, sombreish
-    somberly, sombrely
-    somberness's, sombreness's
-    somberness, sombreness
-    sombernesses, sombrenesses
-    somesthesia, somaesthesia
-    somesthesis, somaesthesis
-    somniloquize, somniloquise
-    somniloquized, somniloquised
-    somniloquizes, somniloquises
-    somniloquizing, somniloquising
-    sonantized's, sonantised's
-    sonantized, sonantised
-    sonantizeds, sonantiseds
-    sonnetization's, sonnetisation's
-    sonnetization, sonnetisation
-    sonnetize, sonnetise
-    sonnetized, sonnetised
-    sonnetizes, sonnetises
-    sonnetizing, sonnetising
-    sorbitization, sorbitisation
-    sorbitizations, sorbitisations
-    sorbitize, sorbitise
-    sorbitized, sorbitised
-    sorbitizes, sorbitises
-    sorbitizing, sorbitising
-    sord, sourd
-    sordine, sourdine
-    sordines, sourdines
-    sororize, sororise
-    sororized, sororised
-    sororizes, sororises
-    sororizing, sororising
-    sory, soury
-    souffled, soufflaed
-    soulter, soultre
-    southernize, southernise
-    southernized, southernised
-    southernizes, southernises
-    southernizing, southernising
-    Sovietization's, Sovietisation's
-    sovietization's, sovietisation's
-    Sovietization, Sovietisation
-    sovietization, sovietisation
-    sovietizations, sovietisations
-    Sovietize, Sovietise
-    sovietize, sovietise
-    Sovietized, Sovietised
-    sovietized, sovietised
-    sovietizes, sovietises
-    Sovietizing, Sovietising
-    sovietizing, sovietising
-    spacey, spacy
-    spanemia, spanaemia
-    spanemic, spanaemic
-    Spaniardization's, Spaniardisation's
-    Spaniardization, Spaniardisation
-    Spaniardizations, Spaniardisations
-    Spaniardize's, Spaniardise's
-    Spaniardize, Spaniardise
-    Spaniardizes, Spaniardises
-    spaniolize, spaniolise
-    spaniolized, spaniolised
-    spaniolizes, spaniolises
-    spaniolizing, spaniolising
-    Spanishize's, Spanishise's
-    Spanishize, Spanishise
-    Spanishizes, Spanishises
-    spanopnea, spanopnoea
-    sparers, sparres
-    Spartanize's, Spartanise's
-    Spartanize, Spartanise
-    Spartanizes, Spartanises
-    spatialization's, spatialisation's
-    spatialization, spatialisation
-    spatializations, spatialisations
-    spatialize, spatialise
-    spatializes, spatialises
-    specialization's, specialisation's
-    specialization, specialisation
-    specializations, specialisations
-    specialize, specialise
-    specialized, specialised
-    specializer's, specialiser's
-    specializer, specialiser
-    specializers, specialisers
-    specializes, specialises
-    specializing, specialising
-    specialties, specialities
-    specialty's, speciality's
-    specialty, speciality
-    specificize, specificise
-    specificizes, specificises
-    specimenize, specimenise
-    specimenizes, specimenises
-    specter's, spectre's
-    specter, spectre
-    spectered, spectred
-    specterlike's, spectrelike's
-    specterlike, spectrelike
-    specterlikes, spectrelikes
-    specters, spectres
-    spectrocolorimetry's, spectrocolourimetry's
-    spectrocolorimetry, spectrocolourimetry
-    speer's, spere's
-    speer, spere
-    spelean, spelaean
-    speleological, spelaeological
-    speleothem, spelaeothem
-    speleothems, spelaeothems
-    spermatorrhea, spermatorrhoea
-    spermatorrheas, spermatorrhoeas
-    speronares, speronaroes
-    sphenethmoid, sphenoethmoid
-    sphenethmoidal, sphenoethmoidal
-    spherocrystal, sphaerocrystal
-    spheroidization, spheroidisation
-    spheroidizations, spheroidisations
-    spheroidize, spheroidise
-    spheroidized, spheroidised
-    spheroidizes, spheroidises
-    spheroidizing, spheroidising
-    spherosome, sphaerosome
-    spick's, spik's
-    spick, spik
-    spicks, spiks
-    Spiers's, Spires's
-    Spiers, Spires
-    spilled, spilt
-    spinule, spinulae
-    spiraled, spiralled
-    spiraling, spiralling
-    spiralization's, spiralisation's
-    spiralization, spiralisation
-    spiralizations, spiralisations
-    spiralize, spiralise
-    spiralizes, spiralises
-    spirea's, spiraea's
-    spirea, spiraea
-    spireas, spiraeas
-    spiritize, spiritise
-    spiritizes, spiritises
-    spiritualization's, spiritualisation's
-    spiritualization, spiritualisation
-    spiritualizations, spiritualisations
-    spiritualize, spiritualise
-    spiritualized, spiritualised
-    spiritualizer's, spiritualiser's
-    spiritualizer, spiritualiser
-    spiritualizers, spiritualisers
-    spiritualizes, spiritualises
-    spiritualizing, spiritualising
-    spirochetal, spirochaetal
-    spirochete's, spirochaete's
-    spirochete, spirochaete
-    spirochetes, spirochaetes
-    spirochetoses, spirochaetoses
-    spirochetosis's, spirochaetosis's
-    spirochetosis, spirochaetosis
-    spirochetotic, spirochaetotic
-    splanchnocele, splanchnocoele
-    splendor's, splendour's
-    splendor, splendour
-    splendorproof, splendourproof
-    splendors, splendours
-    splenectomized, splenectomised
-    splenization, splenisation
-    splenizations, splenisations
-    spoiled, spoilt
-    sponge_cake's, spongecake's
-    sponge_cake, spongecake
-    sponge_cakes, spongecakes
-    spumoni's, spumone's
-    spumoni, spumone
-    spumonis, spumones
-    spyer, spyre
-    squame, squamae
-    squamule, squamulae
-    Squier's, Squire's
-    Squier, Squire
-    squirreled, squirrelled
-    squirreling, squirrelling
-    stabilizable, stabilisable
-    stabilization's, stabilisation's
-    stabilization, stabilisation
-    stabilizations, stabilisations
-    stabilizator, stabilisator
-    stabilizators, stabilisators
-    stabilize, stabilise
-    stabilized, stabilised
-    stabilizer's, stabiliser's
-    stabilizer, stabiliser
-    stabilizers, stabilisers
-    stabilizes, stabilises
-    stabilizing, stabilising
-    stagy, stagey
-    stallionize, stallionise
-    stallionizes, stallionises
-    stalwartize, stalwartise
-    stalwartizes, stalwartises
-    stammelcolor, stammelcolour
-    standardizable's, standardisable's
-    standardizable, standardisable
-    standardizables, standardisables
-    standardization's, standardisation's
-    standardization, standardisation
-    standardizations, standardisations
-    standardize, standardise
-    standardized, standardised
-    standardizer's, standardiser's
-    standardizer, standardiser
-    standardizers, standardisers
-    standardizes, standardises
-    standardizing, standardising
-    stanzes, stanzoes
-    stapedectomized, stapedectomised
-    staphyledema, staphyloedema
-    statisticize, statisticise
-    statisticizes, statisticises
-    stearrhea, stearrhoea
-    steatorrhea, steatorrhoea
-    steatorrheas, steatorrhoeas
-    stele, stelae
-    stenciled, stencilled
-    stenciler's, stenciller's
-    stenciler, stenciller
-    stencilers, stencillers
-    stenciling, stencilling
-    stencilize, stencilise
-    stenopeic, stenopaeic
-    stentor, stentour
-    stentors, stentours
-    stercoremia, stercoraemia
-    stere, stree
-    sterilizabilities, sterilisabilities
-    sterilizability's, sterilisability's
-    sterilizability, sterilisability
-    sterilizable's, sterilisable's
-    sterilizable, sterilisable
-    sterilizabler, sterilisabler
-    sterilizables, sterilisables
-    sterilizablest, sterilisablest
-    sterilization's, sterilisation's
-    sterilization, sterilisation
-    sterilizations, sterilisations
-    sterilize, sterilise
-    sterilized, sterilised
-    sterilizer's, steriliser's
-    sterilizer, steriliser
-    sterilizers, sterilisers
-    sterilizes, sterilises
-    sterilizing, sterilising
-    stert, stret
-    sties, styes
-    stigmatization's, stigmatisation's
-    stigmatization, stigmatisation
-    stigmatizations, stigmatisations
-    stigmatize, stigmatise
-    stigmatized, stigmatised
-    stigmatizer's, stigmatiser's
-    stigmatizer, stigmatiser
-    stigmatizers, stigmatisers
-    stigmatizes, stigmatises
-    stigmatizing, stigmatising
-    stilbestrol's, stilboestrol's
-    stilbestrol, stilboestrol
-    stilbestrols, stilboestrols
-    stimuli, stimuluses
-    stipule, stipulae
-    stockinette's, stockinet's
-    stockinette, stockinet
-    stockinettes, stockinets
-    stogie's, stogy's
-    stogie, stogy
-    stomatodeum, stomatodaeum
-    stomodea, stomodaea
-    stomodeal, stomodaeal
-    stomodeum's, stomodaeum's
-    stomodeum, stomodaeum
-    stomodeums, stomodaeums
-    stony, stoney
-    storier, stourier
-    stour, stoor
-    stower, stowre
-    stowers, stowres
-    straitjacket's, straightjacket's
-    straitjacket, straightjacket
-    straitjacketed, straightjacketed
-    straitjacketing, straightjacketing
-    straitjackets, straightjackets
-    strata, stratums
-    strobile, strobilae
-    strobilization's, strobilisation's
-    strobilization, strobilisation
-    strobilizations, strobilisations
-    structuralization's, structuralisation's
-    structuralization, structuralisation
-    structuralizations, structuralisations
-    structuralize, structuralise
-    structuralizes, structuralises
-    strychninization's, strychninisation's
-    strychninization, strychninisation
-    strychninizations, strychninisations
-    strychninize, strychninise
-    strychninizes, strychninises
-    stumor, stumour
-    sty's, stye's
-    sty, stye
-    stylization's, stylisation's
-    stylization, stylisation
-    stylizations, stylisations
-    stylize, stylise
-    stylized, stylised
-    stylizer's, styliser's
-    stylizer, styliser
-    stylizers, stylisers
-    stylizes, stylises
-    stylizing, stylising
-    stylopized, stylopised
-    stymie's, stymy's
-    stymie, stymy
-    stymied, stymyed
-    subarmor's, subarmour's
-    subarmor, subarmour
-    subarmors, subarmours
-    subcaliber, subcalibre
-    subcategorizing, subcategorising
-    subcenter, subcentre
-    subduer, subdure
-    suberate, subaerate
-    suberization's, suberisation's
-    suberization, suberisation
-    suberizations, suberisations
-    suberize, suberise
-    suberized, suberised
-    suberizes, suberises
-    suberizing, suberising
-    subesophageal, suboesophageal
-    subetheric, subaetheric
-    subflavor's, subflavour's
-    subflavor, subflavour
-    subflavors, subflavours
-    subitize, subitise
-    subitized, subitised
-    subitizes, subitises
-    subitizing, subitising
-    subjectivization's, subjectivisation's
-    subjectivization, subjectivisation
-    subjectivizations, subjectivisations
-    subjectivize, subjectivise
-    subjectivized, subjectivised
-    subjectivizes, subjectivises
-    subjectivizing, subjectivising
-    sublimize, sublimise
-    sublimized, sublimised
-    sublimizes, sublimises
-    sublimizing, sublimising
-    subminiaturization's, subminiaturisation's
-    subminiaturization, subminiaturisation
-    subminiaturize, subminiaturise
-    subminiaturized, subminiaturised
-    subminiaturizes, subminiaturises
-    subminiaturizing, subminiaturising
-    subpoena's, subpena's
-    subpoena, subpena
-    subpoenaed, subpenaed
-    subpoenaing, subpenaing
-    subpoenas, subpenas
-    subpulverizer's, subpulveriser's
-    subpulverizer, subpulveriser
-    subpulverizers, subpulverisers
-    subsidizable's, subsidisable's
-    subsidizable, subsidisable
-    subsidizables, subsidisables
-    subsidization's, subsidisation's
-    subsidization, subsidisation
-    subsidizations, subsidisations
-    subsidize, subsidise
-    subsidized, subsidised
-    subsidizer's, subsidiser's
-    subsidizer, subsidiser
-    subsidizers, subsidisers
-    subsidizes, subsidises
-    subsidizing, subsidising
-    subspecialize's, subspecialise's
-    subspecialize, subspecialise
-    subspecializes, subspecialises
-    subspecialties, subspecialities
-    subspecialty's, subspeciality's
-    subspecialty, subspeciality
-    substandardize, substandardise
-    substandardizes, substandardises
-    substantialize, substantialise
-    substantialized, substantialised
-    substantializes, substantialises
-    substantializing, substantialising
-    substantivize, substantivise
-    substantivized, substantivised
-    substantivizes, substantivises
-    substantivizing, substantivising
-    substerilization, substerilisation
-    subterraneanize, subterraneanise
-    subterraneanizes, subterraneanises
-    subtilization's, subtilisation's
-    subtilization, subtilisation
-    subtilizations, subtilisations
-    subtilize, subtilise
-    subtilized, subtilised
-    subtilizer, subtiliser
-    subtilizers, subtilisers
-    subtilizes, subtilises
-    subtilizing, subtilising
-    subtotaled, subtotalled
-    subtotaling, subtotalling
-    suburbanization's, suburbanisation's
-    suburbanization, suburbanisation
-    suburbanizations, suburbanisations
-    suburbanize, suburbanise
-    suburbanized, suburbanised
-    suburbanizes, suburbanises
-    suburbanizing, suburbanising
-    subvitalization's, subvitalisation's
-    subvitalization, subvitalisation
-    subvitalized's, subvitalised's
-    subvitalized, subvitalised
-    subvitalizedder, subvitalisedder
-    subvitalizeddest, subvitaliseddest
-    subvitalizeds, subvitaliseds
-    succor's, succour's
-    succor, succour
-    succorable's, succourable's
-    succorable, succourable
-    succorables, succourables
-    succored, succoured
-    succorer's, succourer's
-    succorer, succourer
-    succorers, succourers
-    succorful, succourful
-    succoring, succouring
-    succorless, succourless
-    succorlesses, succourlesses
-    succorrhea, succorrhoea
-    succors, succours
-    succube, succubae
-    suers, sures
-    suggestionize, suggestionise
-    suggestionizes, suggestionises
-    sulcalize, sulcalise
-    sulcalized, sulcalised
-    sulcalizes, sulcalises
-    sulcalizing, sulcalising
-    sulfate's, sulphate's
-    sulfate, sulphate
-    sulfates, sulphates
-    sulfatize, sulfatise
-    sulfatizes, sulfatises
-    sulfide's, sulphide's
-    sulfide, sulphide
-    sulfides, sulphides
-    sulfur's, sulphur's
-    sulfur, sulphur
-    sulfured, sulphured
-    sulfuric, sulphuric
-    sulfuring, sulphuring
-    sulfurous, sulphurous
-    sulfurs, sulphurs
-    sulphurisation's, sulphurization's
-    sulphurisation, sulphurization
-    sulphurisations, sulphurizations
-    sulphurise, sulphurize
-    sulphurised, sulphurized
-    sulphurises, sulphurizes
-    sulphurising, sulphurizing
-    sultanize, sultanise
-    sultanizes, sultanises
-    sumac's, sumach's
-    sumac, sumach
-    sumacs, sumaches
-    summarizable, summarisable
-    summarization's, summarisation's
-    summarization, summarisation
-    summarizations, summarisations
-    summarize, summarise
-    summarized, summarised
-    summarizer's, summariser's
-    summarizer, summariser
-    summarizers, summarisers
-    summarizes, summarises
-    summarizing, summarising
-    summerize, summerise
-    summerizes, summerises
-    superacknowledgment's, superacknowledgement's
-    superacknowledgment, superacknowledgement
-    superacknowledgments, superacknowledgements
-    supercanonization's, supercanonisation's
-    supercanonization, supercanonisation
-    supercanonizations, supercanonisations
-    supercarbonization's, supercarbonisation's
-    supercarbonization, supercarbonisation
-    supercarbonizations, supercarbonisations
-    supercarbonize, supercarbonise
-    supercarbonizes, supercarbonises
-    supercivilization's, supercivilisation's
-    supercivilization, supercivilisation
-    supercivilizations, supercivilisations
-    supercivilized's, supercivilised's
-    supercivilized, supercivilised
-    supercivilizeds, superciviliseds
-    superemphasize, superemphasise
-    superemphasizes, superemphasises
-    superfetation, superfoetation
-    superfetations, superfoetations
-    superficialize, superficialise
-    superficialized, superficialised
-    superficializes, superficialises
-    superficializing, superficialising
-    superhumanize, superhumanise
-    superhumanized, superhumanised
-    superhumanizes, superhumanises
-    superhumanizing, superhumanising
-    supernaturalize, supernaturalise
-    supernaturalized, supernaturalised
-    supernaturalizes, supernaturalises
-    supernaturalizing, supernaturalising
-    superorganization's, superorganisation's
-    superorganization, superorganisation
-    superorganizations, superorganisations
-    superorganize, superorganise
-    superorganizes, superorganises
-    supersensitization's, supersensitisation's
-    supersensitization, supersensitisation
-    supersensitizations, supersensitisations
-    supersensitize, supersensitise
-    supersensitized, supersensitised
-    supersensitizing, supersensitising
-    superspecialize, superspecialise
-    superspecializes, superspecialises
-    supersubtilized's, supersubtilised's
-    supersubtilized, supersubtilised
-    supersubtilizeds, supersubtiliseds
-    supersulphurize, supersulphurise
-    supersulphurizes, supersulphurises
-    surgerize, surgerise
-    surgerizes, surgerises
-    surprizal, surprisal
-    sursize, sursise
-    surveil, surveille
-    swab's, swob's
-    swab, swob
-    swabbed, swobbed
-    swabbing, swobbing
-    swabs, swobs
-    sweetbrier's, sweetbriar's
-    sweetbrier, sweetbriar
-    sweetbriers, sweetbriars
-    swiveled, swivelled
-    swiveling, swivelling
-    sycophantize, sycophantise
-    sycophantized, sycophantised
-    sycophantizes, sycophantises
-    sycophantizing, sycophantising
-    syllabize, syllabise
-    syllabized, syllabised
-    syllabizes, syllabises
-    syllabizing, syllabising
-    syllogization, syllogisation
-    syllogizations, syllogisations
-    syllogize, syllogise
-    syllogized, syllogised
-    syllogizer, syllogiser
-    syllogizers, syllogisers
-    syllogizes, syllogises
-    syllogizing, syllogising
-    sylvan, silvan
-    sylvanize, sylvanise
-    sylvanizes, sylvanises
-    sylviine, sylviinae
-    symboled, symbolled
-    symboling, symbolling
-    symbolization's, symbolisation's
-    symbolization, symbolisation
-    symbolizations, symbolisations
-    symbolize, symbolise
-    symbolized, symbolised
-    symbolizer's, symboliser's
-    symbolizer, symboliser
-    symbolizers, symbolisers
-    symbolizes, symbolises
-    symbolizing, symbolising
-    symmetrically, symmetricly
-    symmetricalness, symmetricness
-    symmetricalnesses, symmetricnesses
-    symmetrization's, symmetrisation's
-    symmetrization, symmetrisation
-    symmetrizations, symmetrisations
-    symmetrize, symmetrise
-    symmetrized, symmetrised
-    symmetrizes, symmetrises
-    symmetrizing, symmetrising
-    sympathize, sympathise
-    sympathized, sympathised
-    sympathizer's, sympathiser's
-    sympathizer, sympathiser
-    sympathizers, sympathisers
-    sympathizes, sympathises
-    sympathizing's, sympathising's
-    sympathizing, sympathising
-    sympathizinglier, sympathisinglier
-    sympathizingliest, sympathisingliest
-    sympathizingly, sympathisingly
-    sympathizings, sympathisings
-    symphonization's, symphonisation's
-    symphonization, symphonisation
-    symphonize, symphonise
-    symphonized, symphonised
-    symphonizing, symphonising
-    symptomatize, symptomatise
-    symptomatized, symptomatised
-    symptomatizes, symptomatises
-    symptomatizing, symptomatising
-    symptomize, symptomise
-    symptomizes, symptomises
-    synagogue's, synagog's
-    synagogue, synagog
-    synagogues, synagogs
-    synalepha, synaloepha
-    synalephas, synaloephas
-    synalephe, synaloephe
-    sync's, synch's
-    sync, synch
-    synced, synched
-    synchronizable's, synchronisable's
-    synchronizable, synchronisable
-    synchronizables, synchronisables
-    synchronization's, synchronisation's
-    synchronization, synchronisation
-    synchronizations, synchronisations
-    synchronize, synchronise
-    synchronized, synchronised
-    synchronizer's, synchroniser's
-    synchronizer, synchroniser
-    synchronizers, synchronisers
-    synchronizes, synchronises
-    synchronizing, synchronising
-    syncing, synching
-    syncretize, syncretise
-    syncretized, syncretised
-    syncretizes, syncretises
-    syncretizing, syncretising
-    syncs, synches
-    syndicalize, syndicalise
-    syndicalizes, syndicalises
-    synecious, synoecious
-    synecologies, synoecologies
-    synecology, synoecology
-    synereses, synaereses
-    syneresis's, synaeresis's
-    syneresis, synaeresis
-    synergize, synergise
-    synergized, synergised
-    synergizes, synergises
-    synergizing, synergising
-    synesthesia's, synaesthesia's
-    synesthesia, synaesthesia
-    synesthesias, synaesthesias
-    synesthetic, synaesthetic
-    synestheticer, synaestheticer
-    synestheticest, synaestheticest
-    synetic, synoetic
-    synoecize, synoecise
-    synoecized, synoecised
-    synoecizes, synoecises
-    synoecizing, synoecising
-    synonymize, synonymise
-    synonymized, synonymised
-    synonymizes, synonymises
-    synonymizing, synonymising
-    synopsize, synopsise
-    synopsized, synopsised
-    synopsizes, synopsises
-    synopsizing, synopsising
-    synthesise, synthetize
-    synthesised, synthetized
-    synthesises, synthetizes
-    synthesising, synthetizing
-    synthesization's, synthesisation's
-    synthesization, synthesisation
-    synthesizations, synthesisations
-    synthesizer's, synthesiser's
-    synthesizer, synthesiser
-    synthesizers, synthesisers
-    synthetization, synthetisation
-    synthetizer's, synthetiser's
-    synthetizer, synthetiser
-    synthetizers, synthetisers
-    syntonization's, syntonisation's
-    syntonization, syntonisation
-    syntonize, syntonise
-    syntonized, syntonised
-    syntonizes, syntonises
-    syntonizing, syntonising
-    syphilization's, syphilisation's
-    syphilization, syphilisation
-    syphilizations, syphilisations
-    syphilize, syphilise
-    syphilized, syphilised
-    syphilizing, syphilising
-    Syrianize's, Syrianise's
-    Syrianize, Syrianise
-    Syrianizes, Syrianises
-    syringocele, syringocoele
-    syrup's, sirup's
-    syrup, sirup
-    syrups, sirups
-    systematization's, systematisation's
-    systematization, systematisation
-    systematizations, systematisations
-    systematize, systematise
-    systematized, systematised
-    systematizer's, systematiser's
-    systematizer, systematiser
-    systematizers, systematisers
-    systematizes, systematises
-    systematizing, systematising
-    systemizable's, systemisable's
-    systemizable, systemisable
-    systemizabler, systemisabler
-    systemizables, systemisables
-    systemizablest, systemisablest
-    systemization's, systemisation's
-    systemization, systemisation
-    systemizations, systemisations
-    systemize, systemise
-    systemized, systemised
-    systemizer's, systemiser's
-    systemizer, systemiser
-    systemizers, systemisers
-    systemizes, systemises
-    systemizing, systemising
-    taboo's, tabu's
-    taboo, tabu
-    tabooed, tabued
-    tabooing, tabuing
-    taboos, tabus
-    tabored, taboured
-    taborer's, tabourer's
-    taborer, tabourer
-    taborers, tabourers
-    taboret's, tabouret's
-    taboret, tabouret
-    taborets, tabourets
-    taborin, tabourin
-    taborine, tabourine
-    taboring, tabouring
-    taborins, tabourins
-    tabularization's, tabularisation's
-    tabularization, tabularisation
-    tabularizations, tabularisations
-    tabularize, tabularise
-    tabularized, tabularised
-    tabularizes, tabularises
-    tabularizing, tabularising
-    tabule, tabulae
-    tachypnea, tachypnoea
-    tachypneas, tachypnoeas
-    tachypneic, tachypnoeic
-    taffetized, taffetised
-    tailorization's, tailorisation's
-    tailorization, tailorisation
-    tailorizations, tailorisations
-    tailorize, tailorise
-    tailorizes, tailorises
-    Talmudization's, Talmudisation's
-    Talmudization, Talmudisation
-    Talmudizations, Talmudisations
-    Talmudize's, Talmudise's
-    Talmudize, Talmudise
-    Talmudizes, Talmudises
-    tamable, tameable
-    tambura's, tamboura's
-    tambura, tamboura
-    tamburas, tambouras
-    Tammanyize's, Tammanyise's
-    Tammanyize, Tammanyise
-    Tammanyizes, Tammanyises
-    tanalized, tanalised
-    tandemize, tandemise
-    tandemizes, tandemises
-    tantalization's, tantalisation's
-    tantalization, tantalisation
-    tantalizations, tantalisations
-    tantalize, tantalise
-    tantalized, tantalised
-    tantalizer's, tantaliser's
-    tantalizer, tantaliser
-    tantalizers, tantalisers
-    tantalizes, tantalises
-    tantalizing, tantalising
-    tantalizinglier, tantalisinglier
-    tantalizinglies, tantalisinglies
-    tantalizingliest, tantalisingliest
-    tantalizingly, tantalisingly
-    tantalizingness, tantalisingness
-    tantalizingnesses, tantalisingnesses
-    tantalizings, tantalisings
-    tariffize, tariffise
-    tariffizes, tariffises
-    tartarization's, tartarisation's
-    tartarization, tartarisation
-    tartarizations, tartarisations
-    tartarize, tartarise
-    tartarized, tartarised
-    tartarizes, tartarises
-    tartarizing, tartarising
-    tasseled, tasselled
-    tasseling, tasselling
-    tassels, tassells
-    tautologize, tautologise
-    tautologized, tautologised
-    tautologizes, tautologises
-    tautologizing, tautologising
-    tavernize, tavernise
-    tavernizes, tavernises
-    taxidermize, taxidermise
-    taxidermized, taxidermised
-    taxidermizes, taxidermises
-    taxidermizing, taxidermising
-    Taylorize's, Taylorise's
-    Taylorize, Taylorise
-    Taylorizes, Taylorises
-    te, tae
-    teaseler's, teaseller's
-    teaseler, teaseller
-    teaselers, teasellers
-    Tebilize's, Tebilise's
-    Tebilize, Tebilise
-    Tebilized's, Tebilised's
-    Tebilized, Tebilised
-    Tebilizes, Tebilises
-    Tebilizing's, Tebilising's
-    Tebilizing, Tebilising
-    technicalization, technicalisation
-    technicalize, technicalise
-    technicalizes, technicalises
-    technicize, technicise
-    technicized, technicised
-    technicizes, technicises
-    technicizing, technicising
-    technicolor, technicolour
-    technicolored, technicoloured
-    technologize, technologise
-    teepee's, tipi's
-    teepee, tipi
-    teepees, tipis
-    teer, teaer
-    teers, teres
-    teetotaled, teetotalled
-    teetotaler's, teetotaller's
-    teetotaler, teetotaller
-    teetotalers, teetotallers
-    teetotaling, teetotalling
-    tegu, taegu
-    tele, telae
-    telepathize, telepathise
-    telepathized, telepathised
-    telepathizes, telepathises
-    telepathizing, telepathising
-    telesthesia's, telaesthesia's
-    telesthesia, telaesthesia
-    telesthesias, telaesthesias
-    telesthetic, telaesthetic
-    telestheticer, telaestheticer
-    telestheticest, telaestheticest
-    tellurize, tellurise
-    tellurized, tellurised
-    tellurizes, tellurises
-    tellurizing, tellurising
-    tels, taels
-    templize, templise
-    templizes, templises
-    temporalize, temporalise
-    temporalized, temporalised
-    temporalizes, temporalises
-    temporalizing, temporalising
-    temporization's, temporisation's
-    temporization, temporisation
-    temporizations, temporisations
-    temporize, temporise
-    temporized, temporised
-    temporizer's, temporiser's
-    temporizer, temporiser
-    temporizers, temporisers
-    temporizes, temporises
-    temporizing's, temporising's
-    temporizing, temporising
-    temporizinglier, temporisinglier
-    temporizingliest, temporisingliest
-    temporizingly, temporisingly
-    temporizings, temporisings
-    tempos, tempi
-    tenderization's, tenderisation's
-    tenderization, tenderisation
-    tenderizations, tenderisations
-    tenderize, tenderise
-    tenderized, tenderised
-    tenderizer's, tenderiser's
-    tenderizer, tenderiser
-    tenderizers, tenderisers
-    tenderizes, tenderises
-    tenderizing, tenderising
-    tendinitis's, tendonitis's
-    tendinitis, tendonitis
-    tendinitises, tendonitises
-    tendriled, tendrilled
-    tenementization's, tenementisation's
-    tenementization, tenementisation
-    tenementizations, tenementisations
-    tenementize, tenementise
-    tenementizes, tenementises
-    tenia's, taenia's
-    tenia, taenia
-    teniacidal, taeniacidal
-    teniacide's, taeniacide's
-    teniacide, taeniacide
-    teniacides, taeniacides
-    teniae, taeniae
-    teniafuge's, taeniafuge's
-    teniafuge, taeniafuge
-    teniafuges, taeniafuges
-    tenias, taenias
-    teniases, taeniases
-    teniasis's, taeniasis's
-    teniasis, taeniasis
-    tenioid, taenioid
-    tenthmeter, tenthmetre
-    terf, tref
-    terma, trema
-    termatic, trematic
-    terminalization's, terminalisation's
-    terminalization, terminalisation
-    terminalizations, terminalisations
-    terminalized's, terminalised's
-    terminalized, terminalised
-    terminalizeds, terminaliseds
-    ternize, ternise
-    ternizes, ternises
-    terre, terrae
-    terrestrialize, terrestrialise
-    terrestrializes, terrestrialises
-    territorialization's, territorialisation's
-    territorialization, territorialisation
-    territorializations, territorialisations
-    territorialize, territorialise
-    territorialized, territorialised
-    territorializes, territorialises
-    territorializing, territorialising
-    terrorization's, terrorisation's
-    terrorization, terrorisation
-    terrorizations, terrorisations
-    terrorize, terrorise
-    terrorized, terrorised
-    terrorizer's, terroriser's
-    terrorizer, terroriser
-    terrorizers, terrorisers
-    terrorizes, terrorises
-    terrorizing, terrorising
-    terts, trets
-    tes, taes
-    teste, testae
-    testimonialization's, testimonialisation's
-    testimonialization, testimonialisation
-    testimonializations, testimonialisations
-    testimonialize, testimonialise
-    testimonialized, testimonialised
-    testimonializer, testimonialiser
-    testimonializers, testimonialisers
-    testimonializes, testimonialises
-    testimonializing, testimonialising
-    tetanization's, tetanisation's
-    tetanization, tetanisation
-    tetanizations, tetanisations
-    tetanize, tetanise
-    tetanized, tetanised
-    tetanizes, tetanises
-    tetanizing, tetanising
-    tetrachlorethylene, tetrachloroethylene
-    tetrachlorethylenes, tetrachloroethylenes
-    Teutonization's, Teutonisation's
-    Teutonization, Teutonisation
-    Teutonize, Teutonise
-    teutonize, teutonise
-    Teutonized, Teutonised
-    Teutonizes, Teutonises
-    Teutonizing, Teutonising
-    texturize, texturise
-    texturized, texturised
-    texturizes, texturises
-    texturizing, texturising
-    thalamocele, thalamocoele
-    thalassemia, thalassaemia
-    thalassemias, thalassaemias
-    thalassemic, thalassaemic
-    theater's, theatre's
-    theater, theatre
-    theatergoer's, theatregoer's
-    theatergoer, theatregoer
-    theatergoers, theatregoers
-    theatergoing's, theatregoing's
-    theatergoing, theatregoing
-    theatergoings, theatregoings
-    theaterless, theatreless
-    theaterlesses, theatrelesses
-    theaterlike's, theatrelike's
-    theaterlike, theatrelike
-    theaterlikes, theatrelikes
-    theaters, theatres
-    theatricalization's, theatricalisation's
-    theatricalization, theatricalisation
-    theatricalizations, theatricalisations
-    theatricalize, theatricalise
-    theatricalized, theatricalised
-    theatricalizes, theatricalises
-    theatricalizing, theatricalising
-    theatricize, theatricise
-    theatricized, theatricised
-    theatricizes, theatricises
-    theatricizing, theatricising
-    theologization's, theologisation's
-    theologization, theologisation
-    theologizations, theologisations
-    theologize, theologise
-    theologized, theologised
-    theologizer's, theologiser's
-    theologizer, theologiser
-    theologizers, theologisers
-    theologizes, theologises
-    theologizing, theologising
-    Theone's, Theonoe's
-    Theone, Theonoe
-    theorization's, theorisation's
-    theorization, theorisation
-    theorizations, theorisations
-    theorize, theorise
-    theorized, theorised
-    theorizer's, theoriser's
-    theorizer, theoriser
-    theorizers, theorisers
-    theorizes, theorises
-    theorizing, theorising
-    theosophize, theosophise
-    theosophized, theosophised
-    theosophizes, theosophises
-    theosophizing, theosophising
-    therap, threap
-    thereness, threeness
-    therenesses, threenesses
-    thermalization, thermalisation
-    thermalizations, thermalisations
-    thermalize, thermalise
-    thermalized, thermalised
-    thermalizes, thermalises
-    thermalizing, thermalising
-    therme, thermae
-    thermesthesia's, thermaesthesia's
-    thermesthesia, thermaesthesia
-    thermoanesthesia's, thermoanaesthesia's
-    thermoanesthesia, thermoanaesthesia
-    thermoanesthesias, thermoanaesthesias
-    thermometerize, thermometerise
-    thermometerizes, thermometerises
-    thermopolymerization's, thermopolymerisation's
-    thermopolymerization, thermopolymerisation
-    thermopolymerizations, thermopolymerisations
-    thermosiphon's, thermosyphon's
-    thermosiphon, thermosyphon
-    thermosiphons, thermosyphons
-    thesmothete, thesmothetae
-    thiamine's, thiamin's
-    thiamine, thiamin
-    thiamines, thiamins
-    thralldom's, thraldom's
-    thralldom, thraldom
-    thralldoms, thraldoms
-    thronize, thronise
-    thronizes, thronises
-    through, thru
-    thruway's, throughway's
-    thruway, throughway
-    thruways, throughways
-    thymectomize, thymectomise
-    thyroidectomized, thyroidectomised
-    thyroidization's, thyroidisation's
-    thyroidization, thyroidisation
-    thyroidizations, thyroidisations
-    tidbit's, titbit's
-    tidbit, titbit
-    tidbits, titbits
-    Tillford's, Tillfourd's
-    Tillford, Tillfourd
-    Timonize's, Timonise's
-    Timonize, Timonise
-    Timonized's, Timonised's
-    Timonized, Timonised
-    Timonizes, Timonises
-    Timonizing's, Timonising's
-    Timonizing, Timonising
-    Timor's, Timour's
-    Timor, Timour
-    tinseled, tinselled
-    tinselier, tinsellier
-    tinseliest, tinselliest
-    tinseling, tinselling
-    tiro's, tyreo's
-    tiro, tyreo
-    tiros, tyreos
-    titer's, titre's
-    titer, titre
-    titers, titres
-    titivate, tittivate
-    titivated, tittivated
-    titivates, tittivates
-    titivating, tittivating
-    titivation's, tittivation's
-    titivation, tittivation
-    titivations, tittivations
-    tittuped, tittupped
-    tittuping, tittupping
-    tittupy, tittuppy
-    toffee's, toffy's
-    toffee, toffy
-    toffees, toffies
-    togged, toged
-    togging, toging
-    tonicize, tonicise
-    tonicizes, tonicises
-    topesthesia, topaesthesia
-    topi, topi
-    toret, touret
-    tormentor's, tormenter's
-    tormentor, tormenter
-    tormentors, tormenters
-    torporize, torporise
-    torporizes, torporises
-    Toryize's, Toryise's
-    Toryize, Toryise
-    Toryizes, Toryises
-    totaled, totalled
-    totaler's, totaller's
-    totaler, totaller
-    totalers, totallers
-    totaling, totalling
-    totalitarianize, totalitarianise
-    totalization's, totalisation's
-    totalization, totalisation
-    totalizations, totalisations
-    totalizator's, totalisator's
-    totalizator, totalisator
-    totalizators, totalisators
-    totalize, totalise
-    totalized, totalised
-    totalizer's, totaliser's
-    totalizer, totaliser
-    totalizers, totalisers
-    totalizes, totalises
-    totalizing, totalising
-    totemization's, totemisation's
-    totemization, totemisation
-    totemizations, totemisations
-    tourize, tourise
-    tourizes, tourises
-    toweled, towelled
-    toweling's, towelling's
-    toweling, towelling
-    towelings, towellings
-    toxanemia, toxanaemia
-    toxemia's, toxaemia's
-    toxemia, toxaemia
-    toxemias, toxaemias
-    toxemic, toxaemic
-    toxicemia, toxicaemia
-    toxicohemia, toxicohaemia
-    toxihemia, toxihaemia
-    toxinemia, toxinaemia
-    trabeate, trabeatae
-    trabecule, trabeculae
-    tractorization's, tractorisation's
-    tractorization, tractorisation
-    tractorizations, tractorisations
-    tractorize, tractorise
-    tractorizes, tractorises
-    traditionalize, traditionalise
-    traditionalized, traditionalised
-    traditionalizes, traditionalises
-    traditionize, traditionise
-    traditionizes, traditionises
-    tragicize, tragicise
-    tragicizes, tragicises
-    tragicolored, tragicoloured
-    traitorize, traitorise
-    traitorizes, traitorises
-    trammeled, trammelled
-    trammeler's, trammeller's
-    trammeler, trammeller
-    trammelers, trammellers
-    trammeling, trammelling
-    tranquilities, tranquillities
-    tranquility's, tranquillity's
-    tranquility, tranquillity
-    tranquilization's, tranquilisation's
-    tranquilization, tranquilisation
-    tranquilizations, tranquilisations
-    tranquilizingly, tranquilisingly
-    tranquillization's, tranquillisation's
-    tranquillization, tranquillisation
-    tranquillizations, tranquillisations
-    tranquillize, tranquillise
-    tranquillized, tranquillised
-    tranquillizer's, tranquilliser's
-    tranquillizer, tranquilliser
-    tranquillizers, tranquillisers
-    tranquillizes, tranquillises
-    tranquillizing, tranquillising
-    tranquillizingly, tranquillisingly
-    transcendentalization's, transcendentalisation's
-    transcendentalization, transcendentalisation
-    transcendentalize, transcendentalise
-    transcendentalized, transcendentalised
-    transcendentalizes, transcendentalises
-    transcendentalizing, transcendentalising
-    transcolor, transcolour
-    transcoloration's, transcolouration's
-    transcoloration, transcolouration
-    transcolorations, transcolourations
-    transcolorrer, transcolourer
-    transcolorrest, transcolourest
-    transgender, transgendered
-    transistorization's, transistorisation's
-    transistorization, transistorisation
-    transistorizations, transistorisations
-    transistorize, transistorise
-    transistorized, transistorised
-    transistorizes, transistorises
-    transistorizing, transistorising
-    transparentize, transparentise
-    transparentizes, transparentises
-    traumatization's, traumatisation's
-    traumatization, traumatisation
-    traumatizations, traumatisations
-    traumatize, traumatise
-    traumatized, traumatised
-    traumatizes, traumatises
-    traumatizing, traumatising
-    traveled, travelled
-    traveler's, traveller's
-    traveler, traveller
-    travelers, travellers
-    traveling's, travelling's
-    traveling, travelling
-    travelings, travellings
-    travelogue's, travelog's
-    travelogue, travelog
-    travelogues, travelogs
-    trialed, trialled
-    trialing, trialling
-    trialization, trialisation
-    triangularization, triangularisation
-    triangularizations, triangularisations
-    triangularize, triangularise
-    triangularized, triangularised
-    triangularizes, triangularises
-    triangularizing, triangularising
-    trichinization's, trichinisation's
-    trichinization, trichinisation
-    trichinizations, trichinisations
-    trichinize, trichinise
-    trichinized, trichinised
-    trichinizes, trichinises
-    trichinizing, trichinising
-    trichlorethylene, trichloroethylene
-    trichlorethylenes, trichloroethylenes
-    trichotomize, trichotomise
-    trichotomized, trichotomised
-    trichotomizes, trichotomises
-    trichotomizing, trichotomising
-    tricolor's, tricolour's
-    tricolor, tricolour
-    tricolored, tricoloured
-    tricolors, tricolours
-    triecious, trioecious
-    trieciously, trioeciously
-    triene, triaene
-    trifluoride, trifluouride
-    trillionize, trillionise
-    trillionizes, trillionises
-    trimerization's, trimerisation's
-    trimerization, trimerisation
-    trimerizations, trimerisations
-    tripylean, tripylaean
-    trivialization's, trivialisation's
-    trivialization, trivialisation
-    trivializations, trivialisations
-    trivialize, trivialise
-    trivialized, trivialised
-    trivializes, trivialises
-    trivializing, trivialising
-    trolley's, trolly's
-    trolley, trolly
-    trolleyed, trollied
-    trolleying, trollying
-    trolleys, trollies
-    tropeolin's, tropaeolin's
-    tropeolin, tropaeolin
-    tropicalization's, tropicalisation's
-    tropicalization, tropicalisation
-    tropicalizations, tropicalisations
-    tropicalize, tropicalise
-    tropicalized, tropicalised
-    tropicalizes, tropicalises
-    tropicalizing, tropicalising
-    troweled, trowelled
-    troweler's, troweller's
-    troweler, troweller
-    trowelers, trowellers
-    troweling, trowelling
-    Trubenize's, Trubenise's
-    Trubenize, Trubenise
-    Trubenized's, Trubenised's
-    Trubenized, Trubenised
-    Trubenizes, Trubenises
-    Trubenizing's, Trubenising's
-    Trubenizing, Trubenising
-    trypsinize's, trypsinise's
-    trypsinize, trypsinise
-    trypsinizes, trypsinises
-    tsarinas, tzarinas
-    tsarism, tzarism
-    tsarisms, tzarisms
-    tsoris, tsouris
-    tubercularization's, tubercularisation's
-    tubercularization, tubercularisation
-    tubercularize, tubercularise
-    tubercularized, tubercularised
-    tubercularizing, tubercularising
-    tuberculinization's, tuberculinisation's
-    tuberculinization, tuberculinisation
-    tuberculinizations, tuberculinisations
-    tuberculinize, tuberculinise
-    tuberculinized, tuberculinised
-    tuberculinizes, tuberculinises
-    tuberculinizing, tuberculinising
-    tuberculization, tuberculisation
-    tuberculizations, tuberculisations
-    tuberculize, tuberculise
-    tuberculized, tuberculised
-    tuberculizes, tuberculises
-    tuberculizing, tuberculising
-    tuberization's, tuberisation's
-    tuberization, tuberisation
-    tuberizations, tuberisations
-    tuberize, tuberise
-    tuberizes, tuberises
-    tubulization's, tubulisation's
-    tubulization, tubulisation
-    tubulizations, tubulisations
-    tularemia, tularaemia
-    tularemias, tularaemias
-    tularemic, tularaemic
-    tumbrel's, tumbril's
-    tumbrel, tumbril
-    tumbrels, tumbrils
-    tumor's, tumour's
-    tumor, tumour
-    tumored, tumoured
-    tumors, tumours
-    tunneled, tunnelled
-    tunneler's, tunneller's
-    tunneler, tunneller
-    tunnelers, tunnellers
-    tunneling, tunnelling
-    tunnelings, tunnellings
-    turdine, turdinae
-    Turkicize's, Turkicise's
-    Turkicize, Turkicise
-    Turkicized's, Turkicised's
-    Turkicized, Turkicised
-    Turkicizes, Turkicises
-    Turkicizing's, Turkicising's
-    Turkicizing, Turkicising
-    Turkize's, Turkise's
-    Turkize, Turkise
-    Turkizes, Turkises
-    Tuscanize's, Tuscanise's
-    Tuscanize, Tuscanise
-    Tuscanizes, Tuscanises
-    tutele, tutelae
-    tutorization's, tutorisation's
-    tutorization, tutorisation
-    tutorizations, tutorisations
-    tutorize, tutorise
-    tutorized, tutorised
-    tutorizes, tutorises
-    tutorizing, tutorising
-    twier, twire
-    twiers, twires
-    tyke's, tike's
-    tyke, tike
-    tykes, tikes
-    Tylerize's, Tylerise's
-    Tylerize, Tylerise
-    Tylerizes, Tylerises
-    typhemia, typhaemia
-    typhemia, typhoemia
-    typhlenteritis, typhloenteritis
-    typhoemia, typhoaemia
-    tyrannize, tyrannise
-    tyrannized, tyrannised
-    tyrannizer's, tyranniser's
-    tyrannizer, tyranniser
-    tyrannizers, tyrannisers
-    tyrannizes, tyrannises
-    tyrannizing's, tyrannising's
-    tyrannizing, tyrannising
-    tyrannizinglier, tyrannisinglier
-    tyrannizingliest, tyrannisingliest
-    tyrannizingly, tyrannisingly
-    tyrannizings, tyrannisings
-    tzar's, tsar's
-    tzar, tsar
-    tzardom's, tsardom's
-    tzardom, tsardom
-    tzardoms, tsardoms
-    tzarina's, tsarina's
-    tzarina, tsarina
-    tzarism's, tsarism's
-    tzarist, tsarist
-    tzars, tsars
-    ukulele's, ukelele's
-    ukulele, ukelele
-    ukuleles, ukeleles
-    ultracentralizer's, ultracentraliser's
-    ultracentralizer, ultracentraliser
-    ultracentralizers, ultracentralisers
-    ultrahonorable's, ultrahonourable's
-    ultrahonorable, ultrahonourable
-    ultrahonorables, ultrahonourables
-    ultraspecialization's, ultraspecialisation's
-    ultraspecialization, ultraspecialisation
-    ultraspecializations, ultraspecialisations
-    ultrastandardization's, ultrastandardisation's
-    ultrastandardization, ultrastandardisation
-    ultrastandardizations, ultrastandardisations
-    unacclimatized, unacclimatised
-    unagonize, unagonise
-    unalcoholized's, unalcoholised's
-    unalcoholized, unalcoholised
-    unalcoholizedder, unalcoholisedder
-    unalcoholizeddest, unalcoholiseddest
-    unalcoholizeds, unalcoholiseds
-    unalphabetized, unalphabetised
-    unamortization's, unamortisation's
-    unamortization, unamortisation
-    unamortizations, unamortisations
-    unamortized, unamortised
-    unanalyzable, unanalysable
-    unanalyzed, unanalysed
-    unanatomizable, unanatomisable
-    unanatomized, unanatomised
-    unanemic, unanaemic
-    unanimalized's, unanimalised's
-    unanimalized, unanimalised
-    unanimalizeds, unanimaliseds
-    unantagonizable's, unantagonisable's
-    unantagonizable, unantagonisable
-    unantagonizabler, unantagonisabler
-    unantagonizables, unantagonisables
-    unantagonizablest, unantagonisablest
-    unantagonized, unantagonised
-    unantagonizedder, unantagonisedder
-    unantagonizeddest, unantagoniseddest
-    unantagonizing, unantagonising
-    unantagonizinger, unantagonisinger
-    unantagonizingest, unantagonisingest
-    unapologizing's, unapologising's
-    unapologizing, unapologising
-    unapostatized's, unapostatised's
-    unapostatized, unapostatised
-    unapostatizeds, unapostatiseds
-    unappetizing, unappetising
-    unappetizinger, unappetisinger
-    unappetizingest, unappetisingest
-    unappetizinglier, unappetisinglier
-    unappetizingliest, unappetisingliest
-    unappetizingly, unappetisingly
-    unapprized, unapprised
-    unarbored, unarboured
-    unarmored, unarmoured
-    unarmoredder, unarmouredder
-    unarmoreddest, unarmoureddest
-    unauthorize, unauthorise
-    unauthorized, unauthorised
-    unauthorizedder, unauthorisedder
-    unauthorizeddest, unauthoriseddest
-    unauthorizedly, unauthorisedly
-    unauthorizedness, unauthorisedness
-    unauthorizes, unauthorises
-    unbaptize, unbaptise
-    unbaptized, unbaptised
-    unbaptizes, unbaptises
-    unbaptizing, unbaptising
-    unbarbarize, unbarbarise
-    unbarbarized, unbarbarised
-    unbarbarizing, unbarbarising
-    unbarricaded, unbarricadoed
-    unbastardized, unbastardised
-    unbastardizedder, unbastardisedder
-    unbastardizeddest, unbastardiseddest
-    unbeknownst, unbeknown
-    unbrutalize, unbrutalise
-    unbrutalized, unbrutalised
-    unbrutalizes, unbrutalises
-    unbrutalizing, unbrutalising
-    unbrutize, unbrutise
-    unbrutized, unbrutised
-    unbrutizes, unbrutises
-    unbrutizing, unbrutising
-    uncanceled, uncancelled
-    uncanceledder, uncancelledder
-    uncanceleddest, uncancelleddest
-    uncandor, uncandour
-    uncanonization's, uncanonisation's
-    uncanonization, uncanonisation
-    uncanonize, uncanonise
-    uncanonized, uncanonised
-    uncanonizes, uncanonises
-    uncanonizing, uncanonising
-    uncantonized's, uncantonised's
-    uncantonized, uncantonised
-    uncantonizeds, uncantoniseds
-    uncapitalized, uncapitalised
-    uncapitalizedder, uncapitalisedder
-    uncapitalizeddest, uncapitaliseddest
-    uncaramelized, uncaramelised
-    uncatechized's, uncatechised's
-    uncatechized, uncatechised
-    uncatechizedness, uncatechisedness
-    uncatechizeds, uncatechiseds
-    uncategorized, uncategorised
-    uncategorizedder, uncategorisedder
-    uncategorizeddest, uncategoriseddest
-    uncatholicize, uncatholicise
-    uncatholicized, uncatholicised
-    uncatholicizes, uncatholicises
-    uncatholicizing, uncatholicising
-    uncauterized's, uncauterised's
-    uncauterized, uncauterised
-    uncauterizeds, uncauteriseds
-    uncelestialized's, uncelestialised's
-    uncelestialized, uncelestialised
-    uncelestializeds, uncelestialiseds
-    uncenter, uncentre
-    uncentralized, uncentralised
-    uncharacterized, uncharacterised
-    uncharacterizedder, uncharacterisedder
-    uncharacterizeddest, uncharacteriseddest
-    unchastizable, unchastisable
-    unchastized, unchastised
-    unchloridized's, unchloridised's
-    unchloridized, unchloridised
-    unchloridizeds, unchloridiseds
-    unchristianize, unchristianise
-    unchristianized, unchristianised
-    unchristianizes, unchristianises
-    unchristianizing, unchristianising
-    uncircularized's, uncircularised's
-    uncircularized, uncircularised
-    uncircularizedder, uncircularisedder
-    uncircularizeddest, uncirculariseddest
-    uncircularizeds, uncirculariseds
-    uncivilizable's, uncivilisable's
-    uncivilizable, uncivilisable
-    uncivilizabler, uncivilisabler
-    uncivilizables, uncivilisables
-    uncivilizablest, uncivilisablest
-    uncivilize, uncivilise
-    uncivilized, uncivilised
-    uncivilizedly, uncivilisedly
-    uncivilizedness, uncivilisedness
-    uncivilizes, uncivilises
-    unclericalize, unclericalise
-    unclericalizes, unclericalises
-    uncognizable, uncognisable
-    uncolonize, uncolonise
-    uncolonized, uncolonised
-    uncolonizes, uncolonises
-    uncolonizing, uncolonising
-    uncolorable's, uncolourable's
-    uncolorable, uncolourable
-    uncolorabler, uncolourabler
-    uncolorables, uncolourables
-    uncolorablest, uncolourablest
-    uncolorablier, uncolourablier
-    uncolorablies, uncolourablies
-    uncolorabliest, uncolourabliest
-    uncolorably, uncolourably
-    uncolored, uncoloured
-    uncoloredder, uncolouredder
-    uncoloreddest, uncoloureddest
-    uncoloredlier, uncolouredlier
-    uncoloredliest, uncolouredliest
-    uncoloredly, uncolouredly
-    uncoloredness's, uncolouredness's
-    uncoloredness, uncolouredness
-    uncolorednesses, uncolourednesses
-    uncoloreds, uncoloureds
-    unconcerted, unconcreted
-    unconventionalize, unconventionalise
-    unconventionalizes, unconventionalises
-    uncriticizable's, uncriticisable's
-    uncriticizable, uncriticisable
-    uncriticizabler, uncriticisabler
-    uncriticizables, uncriticisables
-    uncriticizablest, uncriticisablest
-    uncriticizably, uncriticisably
-    uncriticized, uncriticised
-    uncriticizing, uncriticising
-    uncriticizingly, uncriticisingly
-    uncrystallizabilities, uncrystallisabilities
-    uncrystallizability's, uncrystallisability's
-    uncrystallizability, uncrystallisability
-    uncrystallizable's, uncrystallisable's
-    uncrystallizable, uncrystallisable
-    uncrystallizabler, uncrystallisabler
-    uncrystallizables, uncrystallisables
-    uncrystallizablest, uncrystallisablest
-    uncrystallized, uncrystallised
-    uncurricularized's, uncurricularised's
-    uncurricularized, uncurricularised
-    uncurricularizeds, uncurriculariseds
-    undefense's, undefence's
-    undefense, undefence
-    undefenses, undefences
-    undemagnetizable's, undemagnetisable's
-    undemagnetizable, undemagnetisable
-    undemagnetizables, undemagnetisables
-    undemocratization's, undemocratisation's
-    undemocratization, undemocratisation
-    undemocratize, undemocratise
-    undemocratized, undemocratised
-    undemocratizes, undemocratises
-    undemocratizing, undemocratising
-    undenominationalize, undenominationalise
-    undenominationalizes, undenominationalises
-    undercapitalization's, undercapitalisation's
-    undercapitalization, undercapitalisation
-    undercapitalizations, undercapitalisations
-    undercapitalize, undercapitalise
-    undercapitalized, undercapitalised
-    undercapitalizes, undercapitalises
-    undercapitalizing, undercapitalising
-    undercolor's, undercolour's
-    undercolor, undercolour
-    undercolored, undercoloured
-    undercoloring, undercolouring
-    undercolorings, undercolourings
-    undercolors, undercolours
-    underemphasize, underemphasise
-    underemphasized, underemphasised
-    underemphasizes, underemphasises
-    underemphasizing, underemphasising
-    undergoer, undergore
-    underlaborer's, underlabourer's
-    underlaborer, underlabourer
-    underlaborers, underlabourers
-    underorganization's, underorganisation's
-    underorganization, underorganisation
-    underorganizations, underorganisations
-    underoxidize, underoxidise
-    underoxidized, underoxidised
-    underoxidizes, underoxidises
-    underoxidizing, underoxidising
-    underprize, underprise
-    underprized, underprised
-    underprizes, underprises
-    underprizing, underprising
-    underrealize, underrealise
-    underrealized, underrealised
-    underrealizes, underrealises
-    underrealizing, underrealising
-    undersavior's, undersaviour's
-    undersavior, undersaviour
-    undersaviors, undersaviours
-    undersized, undersize
-    underutilization's, underutilisation's
-    underutilization, underutilisation
-    underutilizations, underutilisations
-    underutilize, underutilise
-    underutilized, underutilised
-    underutilizes, underutilises
-    underutilizing, underutilising
-    undervitalized's, undervitalised's
-    undervitalized, undervitalised
-    undervitalizeds, undervitaliseds
-    undialyzed's, undialysed's
-    undialyzed, undialysed
-    undialyzeds, undialyseds
-    undiphthongize, undiphthongise
-    undiphthongizes, undiphthongises
-    undiscolored's, undiscoloured's
-    undiscolored, undiscoloured
-    undiscoloredder, undiscolouredder
-    undiscoloreddest, undiscoloureddest
-    undiscoloreds, undiscoloureds
-    undishonored, undishonoured
-    undisorganized, undisorganised
-    undramatizable's, undramatisable's
-    undramatizable, undramatisable
-    undramatizabler, undramatisabler
-    undramatizables, undramatisables
-    undramatizablest, undramatisablest
-    undramatized's, undramatised's
-    undramatized, undramatised
-    undramatizeds, undramatiseds
-    undreamed, undreamt
-    undualize, undualise
-    undualizes, undualises
-    uneconomizing, uneconomising
-    unenamored's, unenamoured's
-    unenamored, unenamoured
-    unenamoredder, unenamouredder
-    unenamoreddest, unenamoureddest
-    unenamoreds, unenamoureds
-    unendeavored, unendeavoured
-    unenergized's, unenergised's
-    unenergized, unenergised
-    unenergizeds, unenergiseds
-    unepitomized, unepitomised
-    unepitomizedder, unepitomisedder
-    unepitomizeddest, unepitomiseddest
-    unequaled, unequalled
-    unequaledder, unequalledder
-    unequaleddest, unequalleddest
-    unequalize, unequalise
-    unequalized, unequalised
-    unequalizes, unequalises
-    unequalizing, unequalising
-    uneulogized's, uneulogised's
-    uneulogized, uneulogised
-    uneulogizedder, uneulogisedder
-    uneulogizeddest, uneulogiseddest
-    uneulogizeds, uneulogiseds
-    unevangelized's, unevangelised's
-    unevangelized, unevangelised
-    unevangelizedder, unevangelisedder
-    unevangelizeddest, unevangeliseddest
-    unevangelizeds, unevangeliseds
-    unfamiliarized, unfamiliarised
-    unfamiliarizedder, unfamiliarisedder
-    unfamiliarizeddest, unfamiliariseddest
-    unfavorable's, unfavourable's
-    unfavorable, unfavourable
-    unfavorableness's, unfavourableness's
-    unfavorableness, unfavourableness
-    unfavorablenesses, unfavourablenesses
-    unfavorabler, unfavourabler
-    unfavorables, unfavourables
-    unfavorablest, unfavourablest
-    unfavorablier, unfavourablier
-    unfavorabliest, unfavourabliest
-    unfavorably, unfavourably
-    unfavored's, unfavoured's
-    unfavored, unfavoured
-    unfavoredder, unfavouredder
-    unfavoreddest, unfavoureddest
-    unfavoring's, unfavouring's
-    unfavoring, unfavouring
-    unfavoringer, unfavouringer
-    unfavoringest, unfavouringest
-    unfavorings, unfavourings
-    unfavorite's, unfavourite's
-    unfavorite, unfavourite
-    unfavoriter, unfavouriter
-    unfavorites, unfavourites
-    unfavoritest, unfavouritest
-    unfeminize, unfeminise
-    unfeminized, unfeminised
-    unfeminizing, unfeminising
-    unfertilizable's, unfertilisable's
-    unfertilizable, unfertilisable
-    unfertilizabler, unfertilisabler
-    unfertilizables, unfertilisables
-    unfertilizablest, unfertilisablest
-    unfertilized, unfertilised
-    unfertilizedder, unfertilisedder
-    unfertilizeddest, unfertiliseddest
-    unfertilizing, unfertilising
-    unfeudalize, unfeudalise
-    unfeudalized, unfeudalised
-    unfeudalizes, unfeudalises
-    unfeudalizing, unfeudalising
-    unflavored, unflavoured
-    unflavoredder, unflavouredder
-    unflavoreddest, unflavoureddest
-    unflavorous, unflavourous
-    unfocused, unfocussed
-    unformalized, unformalised
-    unformalizedder, unformalisedder
-    unformalizeddest, unformaliseddest
-    unfossilized's, unfossilised's
-    unfossilized, unfossilised
-    unfossilizedder, unfossilisedder
-    unfossilizeddest, unfossiliseddest
-    unfossilizeds, unfossiliseds
-    unfraternized, unfraternised
-    unfraternizing's, unfraternising's
-    unfraternizing, unfraternising
-    unfraternizings, unfraternisings
-    ungalvanized's, ungalvanised's
-    ungalvanized, ungalvanised
-    ungalvanizeds, ungalvaniseds
-    ungelatinizable's, ungelatinisable's
-    ungelatinizable, ungelatinisable
-    ungelatinizables, ungelatinisables
-    ungelatinized's, ungelatinised's
-    ungelatinized, ungelatinised
-    ungelatinizeds, ungelatiniseds
-    ungeneralized, ungeneralised
-    ungeneralizedder, ungeneralisedder
-    ungeneralizeddest, ungeneraliseddest
-    ungeneralizing, ungeneralising
-    ungentilize, ungentilise
-    ungentilizes, ungentilises
-    ungentlemanize, ungentlemanise
-    ungentlemanizes, ungentlemanises
-    unglamorous, unglamourous
-    unglamorously, unglamourously
-    ungospelized's, ungospelised's
-    ungospelized, ungospelised
-    ungospelizeds, ungospeliseds
-    ungraphitized's, ungraphitised's
-    ungraphitized, ungraphitised
-    ungraphitizeds, ungraphitiseds
-    unharbor's, unharbour's
-    unharbor, unharbour
-    unharbored, unharboured
-    unharmonize, unharmonise
-    unharmonized, unharmonised
-    unharmonizes, unharmonises
-    unharmonizing, unharmonising
-    unheroize, unheroise
-    unheroizes, unheroises
-    unhonorable's, unhonourable's
-    unhonorable, unhonourable
-    unhonorables, unhonourables
-    unhonorablies, unhonourablies
-    unhonorably, unhonourably
-    unhonored, unhonoured
-    unhonoredder, unhonouredder
-    unhonoreddest, unhonoureddest
-    unhouseled, unhouselled
-    unhumanize, unhumanise
-    unhumanized, unhumanised
-    unhumanizes, unhumanises
-    unhumanizing, unhumanising
-    unhumored, unhumoured
-    unhumoredder, unhumouredder
-    unhumoreddest, unhumoureddest
-    unhumorous, unhumourous
-    unhumorously, unhumourously
-    unhydrolyzed's, unhydrolysed's
-    unhydrolyzed, unhydrolysed
-    unhydrolyzeds, unhydrolyseds
-    unhypnotizable's, unhypnotisable's
-    unhypnotizable, unhypnotisable
-    unhypnotizabler, unhypnotisabler
-    unhypnotizables, unhypnotisables
-    unhypnotizablest, unhypnotisablest
-    unhypnotize, unhypnotise
-    unhypnotized, unhypnotised
-    unhypnotizes, unhypnotises
-    unhypnotizing, unhypnotising
-    unicolor, unicolour
-    unicolorate, unicolourate
-    unicolored, unicoloured
-    unicolorous, unicolourous
-    unidealized, unidealised
-    unidealizedder, unidealisedder
-    unidealizeddest, unidealiseddest
-    unidolized's, unidolised's
-    unidolized, unidolised
-    unidolizedder, unidolisedder
-    unidolizeddest, unidoliseddest
-    unidolizeds, unidoliseds
-    uniformization's, uniformisation's
-    uniformization, uniformisation
-    uniformizations, uniformisations
-    uniformize, uniformise
-    uniformized, uniformised
-    uniformizes, uniformises
-    uniformizing, uniformising
-    unilateralization's, unilateralisation's
-    unilateralization, unilateralisation
-    unilateralizations, unilateralisations
-    unilateralize, unilateralise
-    unilateralizes, unilateralises
-    unimmortalize, unimmortalise
-    unimmortalized, unimmortalised
-    unimmortalizes, unimmortalises
-    unimmunized, unimmunised
-    unindividualize, unindividualise
-    unindividualized, unindividualised
-    unindividualizes, unindividualises
-    unindustrialized's, unindustrialised's
-    unindustrialized, unindustrialised
-    unindustrializeds, unindustrialiseds
-    uninitializable, uninitialisable
-    uninitialized, uninitialised
-    unionization's, unionisation's
-    unionization, unionisation
-    unionizations, unionisations
-    unionize, unionise
-    unionized, unionised
-    unionizer, unioniser
-    unionizers, unionisers
-    unionizes, unionises
-    unionizing, unionising
-    unitalicized, unitalicised
-    Unitarianize's, Unitarianise's
-    Unitarianize, Unitarianise
-    Unitarianizes, Unitarianises
-    unitemized, unitemised
-    unitization's, unitisation's
-    unitization, unitisation
-    unitizations, unitisations
-    unitize, unitise
-    unitized, unitised
-    unitizes, unitises
-    unitizing, unitising
-    universalization's, universalisation's
-    universalization, universalisation
-    universalizations, universalisations
-    universalize, universalise
-    universalized, universalised
-    universalizer's, universaliser's
-    universalizer, universaliser
-    universalizers, universalisers
-    universalizes, universalises
-    universalizing, universalising
-    unjeopardized, unjeopardised
-    unjournalized, unjournalised
-    unkenneled, unkennelled
-    unkenneling, unkennelling
-    unlabeled, unlabelled
-    unlabeledder, unlabelledder
-    unlabeleddest, unlabelleddest
-    unlabialize, unlabialise
-    unlabialized, unlabialised
-    unlabializes, unlabialises
-    unlabializing, unlabialising
-    unlaborable's, unlabourable's
-    unlaborable, unlabourable
-    unlaborables, unlabourables
-    unlabored's, unlaboured's
-    unlabored, unlaboured
-    unlaboredder, unlabouredder
-    unlaboreddest, unlaboureddest
-    unlaboring's, unlabouring's
-    unlaboring, unlabouring
-    unlaboringer, unlabouringer
-    unlaboringest, unlabouringest
-    unlaborings, unlabourings
-    unlegalized, unlegalised
-    unlegalizedder, unlegalisedder
-    unlegalizeddest, unlegaliseddest
-    unleveled, unlevelled
-    unleveling, unlevelling
-    unliberalized, unliberalised
-    unliberalizedder, unliberalisedder
-    unliberalizeddest, unliberaliseddest
-    unlionized, unlionised
-    unliteralized, unliteralised
-    unlocalizable's, unlocalisable's
-    unlocalizable, unlocalisable
-    unlocalizabler, unlocalisabler
-    unlocalizables, unlocalisables
-    unlocalizablest, unlocalisablest
-    unlocalize, unlocalise
-    unlocalized, unlocalised
-    unlocalizes, unlocalises
-    unlocalizing, unlocalising
-    unmacadamized, unmacadamised
-    unmagnetized's, unmagnetised's
-    unmagnetized, unmagnetised
-    unmagnetizedder, unmagnetisedder
-    unmagnetizeddest, unmagnetiseddest
-    unmagnetizeds, unmagnetiseds
-    unmaterialized, unmaterialised
-    unmechanize, unmechanise
-    unmechanized, unmechanised
-    unmechanizes, unmechanises
-    unmechanizing, unmechanising
-    unmediatized's, unmediatised's
-    unmediatized, unmediatised
-    unmediatizeds, unmediatiseds
-    unmedieval, unmediaeval
-    unmelodized, unmelodised
-    unmemorialized's, unmemorialised's
-    unmemorialized, unmemorialised
-    unmemorializedder, unmemorialisedder
-    unmemorializeddest, unmemorialiseddest
-    unmemorializeds, unmemorialiseds
-    unmemorized, unmemorised
-    unmercerized's, unmercerised's
-    unmercerized, unmercerised
-    unmercerizeds, unmerceriseds
-    unmesmerize, unmesmerise
-    unmesmerized, unmesmerised
-    unmesmerizedder, unmesmerisedder
-    unmesmerizeddest, unmesmeriseddest
-    unmesmerizes, unmesmerises
-    unmetallised's, unmetallized's
-    unmetallised, unmetallized
-    unmetalliseds, unmetallizeds
-    unmethodized's, unmethodised's
-    unmethodized, unmethodised
-    unmethodizedder, unmethodisedder
-    unmethodizeddest, unmethodiseddest
-    unmethodizeds, unmethodiseds
-    unmethodizing's, unmethodising's
-    unmethodizing, unmethodising
-    unmethodizinger, unmethodisinger
-    unmethodizingest, unmethodisingest
-    unmethodizings, unmethodisings
-    unmilitarized, unmilitarised
-    unmineralized's, unmineralised's
-    unmineralized, unmineralised
-    unmineralizedder, unmineralisedder
-    unmineralizeddest, unmineraliseddest
-    unmineralizeds, unmineraliseds
-    unminimized, unminimised
-    unminimizedder, unminimisedder
-    unminimizeddest, unminimiseddest
-    unminimizing, unminimising
-    unmissionized's, unmissionised's
-    unmissionized, unmissionised
-    unmissionizeds, unmissioniseds
-    unmiter, unmitre
-    unmiters, unmitres
-    unmobilized's, unmobilised's
-    unmobilized, unmobilised
-    unmobilizedder, unmobilisedder
-    unmobilizeddest, unmobiliseddest
-    unmobilizeds, unmobiliseds
-    unmodernize, unmodernise
-    unmodernized, unmodernised
-    unmodernizedder, unmodernisedder
-    unmodernizeddest, unmoderniseddest
-    unmodernizes, unmodernises
-    unmonopolize, unmonopolise
-    unmonopolized, unmonopolised
-    unmonopolizedder, unmonopolisedder
-    unmonopolizeddest, unmonopoliseddest
-    unmonopolizes, unmonopolises
-    unmonopolizing, unmonopolising
-    unmonopolizinger, unmonopolisinger
-    unmonopolizingest, unmonopolisingest
-    unmonopolizings, unmonopolisings
-    unmoralize, unmoralise
-    unmoralized, unmoralised
-    unmoralizes, unmoralises
-    unmoralizing, unmoralising
-    unmoralizinger, unmoralisinger
-    unmoralizingest, unmoralisingest
-    unmoralizings, unmoralisings
-    unmotorized, unmotorised
-    unmotorizedder, unmotorisedder
-    unmotorizeddest, unmotoriseddest
-    unmunicipalized's, unmunicipalised's
-    unmunicipalized, unmunicipalised
-    unmunicipalizedder, unmunicipalisedder
-    unmunicipalizeddest, unmunicipaliseddest
-    unmunicipalizeds, unmunicipaliseds
-    unmutualized's, unmutualised's
-    unmutualized, unmutualised
-    unmutualizedder, unmutualisedder
-    unmutualizeddest, unmutualiseddest
-    unmutualizeds, unmutualiseds
-    unmysticize, unmysticise
-    unmysticized, unmysticised
-    unmysticizes, unmysticises
-    unmysticizing, unmysticising
-    unnationalized, unnationalised
-    unnationalizedder, unnationalisedder
-    unnationalizeddest, unnationaliseddest
-    unnaturalizable's, unnaturalisable's
-    unnaturalizable, unnaturalisable
-    unnaturalizables, unnaturalisables
-    unnaturalize, unnaturalise
-    unnaturalized, unnaturalised
-    unnaturalizes, unnaturalises
-    unnaturalizing, unnaturalising
-    unneighbored, unneighboured
-    unneighborlier, unneighbourlier
-    unneighborliest, unneighbourliest
-    unneighborlike's, unneighbourlike's
-    unneighborlike, unneighbourlike
-    unneighborlikes, unneighbourlikes
-    unneighborliness's, unneighbourliness's
-    unneighborliness, unneighbourliness
-    unneighborlinesses, unneighbourlinesses
-    unneighborly, unneighbourly
-    unneutralize, unneutralise
-    unneutralized, unneutralised
-    unneutralizing, unneutralising
-    unnitrogenized's, unnitrogenised's
-    unnitrogenized, unnitrogenised
-    unnitrogenizedder, unnitrogenisedder
-    unnitrogenizeddest, unnitrogeniseddest
-    unnitrogenizeds, unnitrogeniseds
-    unnoncolorables, unnoncolourables
-    unnoncolorablies, unnoncolourablies
-    unnoncolorably, unnoncolourably
-    unnormalize, unnormalise
-    unnormalized, unnormalised
-    unnormalizedder, unnormalisedder
-    unnormalizeddest, unnormaliseddest
-    unnormalizes, unnormalises
-    unnormalizing, unnormalising
-    unnormalizinger, unnormalisinger
-    unnormalizingest, unnormalisingest
-    unoptimize, unoptimise
-    unoptimized, unoptimised
-    unoptimizes, unoptimises
-    unoptimizing, unoptimising
-    unorganizable's, unorganisable's
-    unorganizable, unorganisable
-    unorganizabler, unorganisabler
-    unorganizables, unorganisables
-    unorganizablest, unorganisablest
-    unorganize, unorganise
-    unorganized, unorganised
-    unorganizedly, unorganisedly
-    unorganizedness, unorganisedness
-    unoxidizable's, unoxidisable's
-    unoxidizable, unoxidisable
-    unoxidizabler, unoxidisabler
-    unoxidizables, unoxidisables
-    unoxidizablest, unoxidisablest
-    unoxidized, unoxidised
-    unoxidizedder, unoxidisedder
-    unoxidizeddest, unoxidiseddest
-    unoxygenized's, unoxygenised's
-    unoxygenized, unoxygenised
-    unoxygenizeds, unoxygeniseds
-    unpaganize, unpaganise
-    unpaganizes, unpaganises
-    unpalisaded, unpalisadoed
-    unpanegyrized, unpanegyrised
-    unparagonized's, unparagonised's
-    unparagonized, unparagonised
-    unparagonizeds, unparagoniseds
-    unparalleled, unparallelled
-    unparalyzed's, unparalysed's
-    unparalyzed, unparalysed
-    unparalyzedder, unparalysedder
-    unparalyzeddest, unparalyseddest
-    unparalyzeds, unparalyseds
-    unparameterized, unparameterised
-    unparametrized, unparametrised
-    unparceled, unparcelled
-    unparceledder, unparcelledder
-    unparceleddest, unparcelleddest
-    unparenthesized, unparenthesised
-    unparticularized's, unparticularised's
-    unparticularized, unparticularised
-    unparticularizedder, unparticularisedder
-    unparticularizeddest, unparticulariseddest
-    unparticularizeds, unparticulariseds
-    unparticularizing's, unparticularising's
-    unparticularizing, unparticularising
-    unparticularizinger, unparticularisinger
-    unparticularizingest, unparticularisingest
-    unparticularizings, unparticularisings
-    unpartizan, unpartisan
-    unpasteurized, unpasteurised
-    unpatronizable's, unpatronisable's
-    unpatronizable, unpatronisable
-    unpatronizabler, unpatronisabler
-    unpatronizables, unpatronisables
-    unpatronizablest, unpatronisablest
-    unpatronized, unpatronised
-    unpatronizing's, unpatronising's
-    unpatronizing, unpatronising
-    unpauperized's, unpauperised's
-    unpauperized, unpauperised
-    unpauperizeds, unpauperiseds
-    unpenalized, unpenalised
-    unpenalizedder, unpenalisedder
-    unpenalizeddest, unpenaliseddest
-    unperceptively, unpreceptively
-    unpersonalized, unpersonalised
-    unpersonalizing, unpersonalising
-    unphilosophize, unphilosophise
-    unphilosophized, unphilosophised
-    unphilosophizes, unphilosophises
-    unphosphatized's, unphosphatised's
-    unphosphatized, unphosphatised
-    unphosphatizedder, unphosphatisedder
-    unphosphatizeddest, unphosphatiseddest
-    unphosphatizeds, unphosphatiseds
-    unpictorialize, unpictorialise
-    unpictorialized, unpictorialised
-    unpictorializing, unpictorialising
-    unplagiarized's, unplagiarised's
-    unplagiarized, unplagiarised
-    unplagiarizedder, unplagiarisedder
-    unplagiarizeddest, unplagiariseddest
-    unplagiarizeds, unplagiariseds
-    unpluralized, unpluralised
-    unpoeticized's, unpoeticised's
-    unpoeticized, unpoeticised
-    unpoeticizedder, unpoeticisedder
-    unpoeticizeddest, unpoeticiseddest
-    unpoeticizeds, unpoeticiseds
-    unpoetize, unpoetise
-    unpoetized, unpoetised
-    unpoetizes, unpoetises
-    unpolarizable's, unpolarisable's
-    unpolarizable, unpolarisable
-    unpolarizables, unpolarisables
-    unpolarized's, unpolarised's
-    unpolarized, unpolarised
-    unpolarizedder, unpolarisedder
-    unpolarizeddest, unpolariseddest
-    unpolarizeds, unpolariseds
-    unpolymerized's, unpolymerised's
-    unpolymerized, unpolymerised
-    unpolymerizedder, unpolymerisedder
-    unpolymerizeddest, unpolymeriseddest
-    unpolymerizeds, unpolymeriseds
-    unpopularize, unpopularise
-    unpopularized, unpopularised
-    unpopularizes, unpopularises
-    unpracticed, unpractised
-    unpracticedder, unpractisedder
-    unpracticeddest, unpractiseddest
-    unpressurized, unpressurised
-    unprotestantize, unprotestantise
-    unprotestantized, unprotestantised
-    unprotestantizes, unprotestantises
-    unprotestantizing, unprotestantising
-    unpublicized, unpublicised
-    unpulverize, unpulverise
-    unpulverized, unpulverised
-    unpulverizedder, unpulverisedder
-    unpulverizeddest, unpulveriseddest
-    unpulverizes, unpulverises
-    unquantized, unquantised
-    unradicalize, unradicalise
-    unradicalizes, unradicalises
-    unrancored's, unrancoured's
-    unrancored, unrancoured
-    unrancoredder, unrancouredder
-    unrancoreddest, unrancoureddest
-    unrancoreds, unrancoureds
-    unrancorous, unrancourous
-    unrationalized, unrationalised
-    unrationalizing, unrationalising
-    unraveled, unravelled
-    unraveler's, unraveller's
-    unraveler, unraveller
-    unravelers, unravellers
-    unraveling, unravelling
-    unrealizable's, unrealisable's
-    unrealizable, unrealisable
-    unrealizables, unrealisables
-    unrealize, unrealise
-    unrealized, unrealised
-    unrealizes, unrealises
-    unrealizing, unrealising
-    unrealizings, unrealisings
-    unrecognizable, unrecognisable
-    unrecognizabler, unrecognisabler
-    unrecognizablest, unrecognisablest
-    unrecognizably, unrecognisably
-    unrecognized, unrecognised
-    unrecognizing, unrecognising
-    unrecognizingly, unrecognisingly
-    unreconnoitered's, unreconnoitred's
-    unreconnoitered, unreconnoitred
-    unreconnoiteredder, unreconnoitredder
-    unreconnoitereddest, unreconnoitreddest
-    unreconnoitereds, unreconnoitreds
-    unregularized, unregularised
-    unreorganized, unreorganised
-    unreorganizedder, unreorganisedder
-    unreorganizeddest, unreorganiseddest
-    unrevelationize, unrevelationise
-    unrevelationizes, unrevelationises
-    unrivaled, unrivalled
-    unrivaledder, unrivalledder
-    unrivaleddest, unrivalleddest
-    unromanized, unromanised
-    unromanticized's, unromanticised's
-    unromanticized, unromanticised
-    unromanticizedder, unromanticisedder
-    unromanticizeddest, unromanticiseddest
-    unromanticizeds, unromanticiseds
-    unroyalized's, unroyalised's
-    unroyalized, unroyalised
-    unroyalizeds, unroyaliseds
-    unrumored, unrumoured
-    unrumoredder, unrumouredder
-    unrumoreddest, unrumoureddest
-    unsabered, unsabred
-    unsaberedder, unsabredder
-    unsabereddest, unsabreddest
-    unsatirizable, unsatirisable
-    unsatirize, unsatirise
-    unsatirized, unsatirised
-    unsatirizedder, unsatirisedder
-    unsatirizeddest, unsatiriseddest
-    unsatirizes, unsatirises
-    unsavored, unsavoured
-    unsavoredder, unsavouredder
-    unsavoreddest, unsavoureddest
-    unsavoredly, unsavouredly
-    unsavoredness, unsavouredness
-    unsavorier, unsavourier
-    unsavories, unsavouries
-    unsavoriest, unsavouriest
-    unsavorilier, unsavourilier
-    unsavorilies, unsavourilies
-    unsavoriliest, unsavouriliest
-    unsavorily, unsavourily
-    unsavoriness's, unsavouriness's
-    unsavoriness, unsavouriness
-    unsavorinesses, unsavourinesses
-    unsavory's, unsavoury's
-    unsavory, unsavoury
-    unscandalize, unscandalise
-    unscandalized, unscandalised
-    unscandalizedder, unscandalisedder
-    unscandalizeddest, unscandaliseddest
-    unscandalizes, unscandalises
-    unscepter's, unsceptre's
-    unscepter, unsceptre
-    unsceptered, unsceptred
-    unscepteredder, unsceptredder
-    unsceptereddest, unsceptreddest
-    unscepters, unsceptres
-    unschematized's, unschematised's
-    unschematized, unschematised
-    unschematizedder, unschematisedder
-    unschematizeddest, unschematiseddest
-    unschematizeds, unschematiseds
-    unscored, unscoured
-    unscoring, unscouring
-    unscrutinized, unscrutinised
-    unscrutinizedder, unscrutinisedder
-    unscrutinizeddest, unscrutiniseddest
-    unscrutinizing, unscrutinising
-    unscrutinizinger, unscrutinisinger
-    unscrutinizingest, unscrutinisingest
-    unscrutinizinglier, unscrutinisinglier
-    unscrutinizingliest, unscrutinisingliest
-    unscrutinizingly, unscrutinisingly
-    unsectarianize, unsectarianise
-    unsectarianizes, unsectarianises
-    unsectionalized, unsectionalised
-    unsecularize, unsecularise
-    unsecularized, unsecularised
-    unsecularizedder, unsecularisedder
-    unsecularizeddest, unseculariseddest
-    unsecularizes, unsecularises
-    unsensitize, unsensitise
-    unsensitized, unsensitised
-    unsensitizes, unsensitises
-    unsensitizing, unsensitising
-    unsensualize, unsensualise
-    unsensualized, unsensualised
-    unsensualizes, unsensualises
-    unsensualizing, unsensualising
-    unsentimentalize, unsentimentalise
-    unsentimentalized, unsentimentalised
-    unsentimentalizes, unsentimentalises
-    unsepulcher, unsepulchre
-    unsepulchered, unsepulchred
-    unsepulchers, unsepulchres
-    unserialized, unserialised
-    unshakable, unshakeable
-    unshed, unshoed
-    unsignalized's, unsignalised's
-    unsignalized, unsignalised
-    unsignalizedder, unsignalisedder
-    unsignalizeddest, unsignaliseddest
-    unsignalizeds, unsignaliseds
-    unsiphon's, unsyphon's
-    unsiphon, unsyphon
-    unsiphons, unsyphons
-    unsocialized, unsocialised
-    unsocializedder, unsocialisedder
-    unsocializeddest, unsocialiseddest
-    unsocializing, unsocialising
-    unsolemnize, unsolemnise
-    unsolemnized, unsolemnised
-    unsolemnizedder, unsolemnisedder
-    unsolemnizeddest, unsolemniseddest
-    unsolemnizes, unsolemnises
-    unsomber, unsombre
-    unsomberly, unsombrely
-    unsomberness's, unsombreness's
-    unsomberness, unsombreness
-    unspecialized, unspecialised
-    unspecializedder, unspecialisedder
-    unspecializeddest, unspecialiseddest
-    unspecializing, unspecialising
-    unspecializinger, unspecialisinger
-    unspecializingest, unspecialisingest
-    unspecterlike's, unspectrelike's
-    unspecterlike, unspectrelike
-    unspecterlikes, unspectrelikes
-    unspiritualize, unspiritualise
-    unspiritualized, unspiritualised
-    unspiritualizes, unspiritualises
-    unspiritualizing, unspiritualising
-    unsplendorous, unsplendourous
-    unsplendorously, unsplendourously
-    unspoiled, unspoilt
-    unstabilized, unstabilised
-    unstabilizing, unstabilising
-    unstandardizable, unstandardisable
-    unstandardized, unstandardised
-    unstandardizedder, unstandardisedder
-    unstandardizeddest, unstandardiseddest
-    unsterilized, unsterilised
-    unstigmatized's, unstigmatised's
-    unstigmatized, unstigmatised
-    unstigmatizedder, unstigmatisedder
-    unstigmatizeddest, unstigmatiseddest
-    unstigmatizeds, unstigmatiseds
-    unstoicize, unstoicise
-    unstoicizes, unstoicises
-    unsubsidized, unsubsidised
-    unsubstantialize, unsubstantialise
-    unsubstantialized, unsubstantialised
-    unsubstantializes, unsubstantialises
-    unsubstantializing, unsubstantialising
-    unsuccorable's, unsuccourable's
-    unsuccorable, unsuccourable
-    unsuccorables, unsuccourables
-    unsuccored, unsuccoured
-    unsulphurized's, unsulphurised's
-    unsulphurized, unsulphurised
-    unsulphurizeds, unsulphuriseds
-    unsummarizable, unsummarisable
-    unsummarized, unsummarised
-    unsummarizedder, unsummarisedder
-    unsummarizeddest, unsummariseddest
-    unsupernaturalize, unsupernaturalise
-    unsupernaturalized, unsupernaturalised
-    unsupernaturalizes, unsupernaturalises
-    unsymbolized, unsymbolised
-    unsymbolizedder, unsymbolisedder
-    unsymbolizeddest, unsymboliseddest
-    unsymmetrized's, unsymmetrised's
-    unsymmetrized, unsymmetrised
-    unsymmetrizeds, unsymmetriseds
-    unsympathizabilities, unsympathisabilities
-    unsympathizability's, unsympathisability's
-    unsympathizability, unsympathisability
-    unsympathizable's, unsympathisable's
-    unsympathizable, unsympathisable
-    unsympathizables, unsympathisables
-    unsympathized, unsympathised
-    unsympathizedder, unsympathisedder
-    unsympathizeddest, unsympathiseddest
-    unsympathizing's, unsympathising's
-    unsympathizing, unsympathising
-    unsympathizinger, unsympathisinger
-    unsympathizingest, unsympathisingest
-    unsympathizinglier, unsympathisinglier
-    unsympathizingliest, unsympathisingliest
-    unsympathizingly, unsympathisingly
-    unsympathizings, unsympathisings
-    unsynchronized, unsynchronised
-    unsynchronizedder, unsynchronisedder
-    unsynchronizeddest, unsynchroniseddest
-    unsynthesized, unsynthesised
-    unsynthesizedder, unsynthesisedder
-    unsynthesizeddest, unsynthesiseddest
-    unsystematized, unsystematised
-    unsystematizedder, unsystematisedder
-    unsystematizeddest, unsystematiseddest
-    unsystematizedly, unsystematisedly
-    unsystematizing, unsystematising
-    unsystematizinger, unsystematisinger
-    unsystematizingest, unsystematisingest
-    unsystemizable's, unsystemisable's
-    unsystemizable, unsystemisable
-    unsystemizables, unsystemisables
-    untantalized, untantalised
-    untantalizedder, untantalisedder
-    untantalizeddest, untantaliseddest
-    untantalizing's, untantalising's
-    untantalizing, untantalising
-    untantalizinger, untantalisinger
-    untantalizingest, untantalisingest
-    untantalizings, untantalisings
-    untartarized's, untartarised's
-    untartarized, untartarised
-    untartarizeds, untartariseds
-    untechnicalize, untechnicalise
-    untechnicalizes, untechnicalises
-    untemporizing's, untemporising's
-    untemporizing, untemporising
-    untemporizings, untemporisings
-    unterrorized, unterrorised
-    untheorizable's, untheorisable's
-    untheorizable, untheorisable
-    untheorizables, untheorisables
-    untrammeled, untrammelled
-    untrammeledder, untrammelledder
-    untrammeleddest, untrammelleddest
-    untranquilized, untranquilised
-    untranquillize, untranquillise
-    untranquillized, untranquillised
-    untyrannized, untyrannised
-    unutilizable's, unutilisable's
-    unutilizable, unutilisable
-    unutilizables, unutilisables
-    unutilized, unutilised
-    unvaporized's, unvaporised's
-    unvaporized, unvaporised
-    unvaporizeds, unvaporiseds
-    unvectorizable, unvectorisable
-    unverbalized, unverbalised
-    unvictimized, unvictimised
-    unvisualized, unvisualised
-    unvisualizedder, unvisualisedder
-    unvisualizeddest, unvisualiseddest
-    unvitalized's, unvitalised's
-    unvitalized, unvitalised
-    unvitalizeds, unvitaliseds
-    unvitriolized's, unvitriolised's
-    unvitriolized, unvitriolised
-    unvitriolizeds, unvitrioliseds
-    unvocalized's, unvocalised's
-    unvocalized, unvocalised
-    unvocalizedder, unvocalisedder
-    unvocalizeddest, unvocaliseddest
-    unvocalizeds, unvocaliseds
-    unvolatilize, unvolatilise
-    unvolatilized, unvolatilised
-    unvolatilizedder, unvolatilisedder
-    unvolatilizeddest, unvolatiliseddest
-    unvolatilizes, unvolatilises
-    unvulcanized's, unvulcanised's
-    unvulcanized, unvulcanised
-    unvulcanizedder, unvulcanisedder
-    unvulcanizeddest, unvulcaniseddest
-    unvulcanizeds, unvulcaniseds
-    unvulgarize, unvulgarise
-    unvulgarized, unvulgarised
-    unvulgarizes, unvulgarises
-    unvulgarizing, unvulgarising
-    unwesternized's, unwesternised's
-    unwesternized, unwesternised
-    unwesternizeds, unwesterniseds
-    unwomanize, unwomanise
-    unwomanized, unwomanised
-    unwomanizes, unwomanises
-    updraft's, updraught's
-    updraft, updraught
-    updrafts, updraughts
-    uralitization, uralitisation
-    uralitizations, uralitisations
-    uralitize, uralitise
-    uralitized, uralitised
-    uralitizes, uralitises
-    uralitizing, uralitising
-    uratemia, urataemia
-    urbanization's, urbanisation's
-    urbanization, urbanisation
-    urbanizations, urbanisations
-    urbanize, urbanise
-    urbanized, urbanised
-    urbanizes, urbanises
-    urbanizing, urbanising
-    uredema, uroedema
-    uremia's, uraemia's
-    uremia, uraemia
-    uremias, uraemias
-    uremic, uraemic
-    urethrorrhea, urethrorrhoea
-    uricemia, uricaemia
-    uricemic, uricaemic
-    urinemia, urinaemia
-    urinemic, urinaemic
-    urohematin, urohaematin
-    urophein, urophaein
-    usability's, useability's
-    usability, useability
-    usable, useable
-    utilitarianize, utilitarianise
-    utilitarianized, utilitarianised
-    utilitarianizes, utilitarianises
-    utilitarianizing, utilitarianising
-    utilizabilities, utilisabilities
-    utilizability, utilisability
-    utilizable's, utilisable's
-    utilizable, utilisable
-    utilizables, utilisables
-    utilization's, utilisation's
-    utilization, utilisation
-    utilizations, utilisations
-    utilize, utilise
-    utilized, utilised
-    utilizer's, utiliser's
-    utilizer, utiliser
-    utilizers, utilisers
-    utilizes, utilises
-    utilizing, utilising
-    Utopianize's, Utopianise's
-    Utopianize, Utopianise
-    utopianize, utopianise
-    utopianized, utopianised
-    utopianizer's, utopianiser's
-    utopianizer, utopianiser
-    utopianizers, utopianisers
-    Utopianizes, Utopianises
-    utopianizes, utopianises
-    utopianizing, utopianising
-    vaagmer, vaagmaer
-    vaccinization's, vaccinisation's
-    vaccinization, vaccinisation
-    vaccinizations, vaccinisations
-    vacuolization's, vacuolisation's
-    vacuolization, vacuolisation
-    vacuolizations, vacuolisations
-    vacuumize, vacuumise
-    vacuumized, vacuumised
-    vacuumizes, vacuumises
-    vacuumizing, vacuumising
-    vagabondize, vagabondise
-    vagabondized, vagabondised
-    vagabondizer, vagabondiser
-    vagabondizers, vagabondisers
-    vagabondizes, vagabondises
-    vagabondizing, vagabondising
-    vaginule, vaginulae
-    vagrantize, vagrantise
-    vagrantizes, vagrantises
-    valor's, valour's
-    valor, valour
-    valorization's, valorisation's
-    valorization, valorisation
-    valorizations, valorisations
-    valorize, valorise
-    valorized, valorised
-    valorizes, valorises
-    valorizing, valorising
-    valorousness, valourousness
-    valors, valours
-    valvule, valvulae
-    vampirize, vampirise
-    vampirized, vampirised
-    vampirizes, vampirises
-    vampirizing, vampirising
-    vandalization's, vandalisation's
-    vandalization, vandalisation
-    vandalizations, vandalisations
-    vandalize, vandalise
-    vandalized, vandalised
-    vandalizes, vandalises
-    vandalizing, vandalising
-    vapor's, vapour's
-    vapor, vapour
-    vaporabilities, vapourabilities
-    vaporability's, vapourability's
-    vaporability, vapourability
-    vaporable's, vapourable's
-    vaporable, vapourable
-    vaporables, vapourables
-    vapored, vapoured
-    vaporer's, vapourer's
-    vaporer, vapourer
-    vaporers, vapourers
-    vaporescent, vapourescent
-    vaporier, vapourier
-    vaporiest, vapouriest
-    vaporific, vapourific
-    vaporimeter's, vapourimeter's
-    vaporimeter, vapourimeter
-    vaporing's, vapouring's
-    vaporing, vapouring
-    vaporingly, vapouringly
-    vaporings, vapourings
-    vaporish, vapourish
-    vaporisher, vapourisher
-    vaporishest, vapourishest
-    vaporishness's, vapourishness's
-    vaporishness, vapourishness
-    vaporishnesses, vapourishnesses
-    vaporizable's, vaporisable's
-    vaporizable, vaporisable
-    vaporizabler, vaporisabler
-    vaporizables, vaporisables
-    vaporizablest, vaporisablest
-    vaporization's, vaporisation's
-    vaporization, vaporisation
-    vaporizations, vaporisations
-    vaporize, vaporise
-    vaporized, vaporised
-    vaporizer's, vaporiser's
-    vaporizer, vaporiser
-    vaporizers, vaporisers
-    vaporizes, vaporises
-    vaporizing, vaporising
-    vaporless, vapourless
-    vaporlesses, vapourlesses
-    vaporlike's, vapourlike's
-    vaporlike, vapourlike
-    vaporlikes, vapourlikes
-    vaporose, vapourose
-    vaporously, vapourously
-    vapors, vapours
-    vaporware, vapourware
-    vapory, vapoury
-    varicolored's, varicoloured's
-    varicolored, varicoloured
-    varicoloredder, varicolouredder
-    varicoloreddest, varicoloureddest
-    varicoloreds, varicoloureds
-    varicolorous, varicolourous
-    vascularization's, vascularisation's
-    vascularization, vascularisation
-    vascularizations, vascularisations
-    vascularize, vascularise
-    vascularized, vascularised
-    vascularizes, vascularises
-    vascularizing, vascularising
-    vasectomize, vasectomise
-    vasectomized, vasectomised
-    vasectomizing, vasectomising
-    vassalization, vassalisation
-    vassalize, vassalise
-    vassalized, vassalised
-    vassalizes, vassalises
-    vassalizing, vassalising
-    Vaticanization's, Vaticanisation's
-    Vaticanization, Vaticanisation
-    Vaticanizations, Vaticanisations
-    Vaticanize's, Vaticanise's
-    Vaticanize, Vaticanise
-    Vaticanizes, Vaticanises
-    vavasor, vavasour
-    vavasors, vavasours
-    Ve's, Voe's
-    Ve, Voe
-    vectorizable, vectorisable
-    vectorization's, vectorisation's
-    vectorization, vectorisation
-    vectorizations, vectorisations
-    vectorize, vectorise
-    vectorized, vectorised
-    vectorizer, vectoriser
-    vectorizered, vectorisered
-    vectorizering, vectorisering
-    vectorizers, vectorisers
-    vectorizes, vectorises
-    vectorizing, vectorising
-    veery, verey
-    vegetablize, vegetablise
-    vegetablizes, vegetablises
-    velarization's, velarisation's
-    velarization, velarisation
-    velarizations, velarisations
-    velarize, velarise
-    velarized, velarised
-    velarizes, velarises
-    velarizing, velarising
-    veld's, veldt's
-    veld, veldt
-    velds, veldts
-    venalization's, venalisation's
-    venalization, venalisation
-    venalizations, venalisations
-    venalize, venalise
-    venalizes, venalises
-    vendor's, vender's
-    vendor, vender
-    vendors, venders
-    venomization's, venomisation's
-    venomization, venomisation
-    venomizations, venomisations
-    venomize, venomise
-    venomizes, venomises
-    venter, ventre
-    venters, ventres
-    ventriloquize, ventriloquise
-    ventriloquized, ventriloquised
-    ventriloquizes, ventriloquises
-    ventriloquizing, ventriloquising
-    venule, venulae
-    veranda's, verandah's
-    veranda, verandah
-    verandas, verandahs
-    verbalization's, verbalisation's
-    verbalization, verbalisation
-    verbalizations, verbalisations
-    verbalize, verbalise
-    verbalized, verbalised
-    verbalizer's, verbaliser's
-    verbalizer, verbaliser
-    verbalizers, verbalisers
-    verbalizes, verbalises
-    verbalizing, verbalising
-    vermeiled, vermeilled
-    vermeiles, vermeilles
-    vermeiling, vermeilling
-    vermilion's, vermillion's
-    vermilion, vermillion
-    vermilionize, vermilionise
-    vermilionizes, vermilionises
-    vernacularization's, vernacularisation's
-    vernacularization, vernacularisation
-    vernacularizations, vernacularisations
-    vernacularize, vernacularise
-    vernacularized, vernacularised
-    vernacularizes, vernacularises
-    vernacularizing, vernacularising
-    vernalization's, vernalisation's
-    vernalization, vernalisation
-    vernalizations, vernalisations
-    vernalize, vernalise
-    vernalized, vernalised
-    vernalizes, vernalises
-    vernalizing, vernalising
-    versicolor, versicolour
-    versicolorate, versicolourate
-    versicolored, versicoloured
-    versicolorous, versicolourous
-    versionize, versionise
-    versionizes, versionises
-    vesicule, vesiculae
-    vestryize, vestryise
-    vestryizes, vestryises
-    veter's, vetoer's
-    veter, vetoer
-    veteranize, veteranise
-    veteranizes, veteranises
-    vialed, vialled
-    vialing, vialling
-    victimizable's, victimisable's
-    victimizable, victimisable
-    victimizables, victimisables
-    victimization's, victimisation's
-    victimization, victimisation
-    victimizations, victimisations
-    victimize, victimise
-    victimized, victimised
-    victimizer's, victimiser's
-    victimizer, victimiser
-    victimizers, victimisers
-    victimizes, victimises
-    victimizing, victimising
-    Victorianize's, Victorianise's
-    Victorianize, Victorianise
-    Victorianizes, Victorianises
-    victualage's, victuallage's
-    victualage, victuallage
-    victualages, victuallages
-    victualed, victualled
-    victualer's, victualler's
-    victualer, victualler
-    victualers, victuallers
-    victualess, victualless
-    victualing, victualling
-    videodisc's, videodisk's
-    videodisc, videodisk
-    videodiscs, videodisks
-    vier, vire
-    viers, vires
-    Vietnamization's, Vietnamisation's
-    Vietnamization, Vietnamisation
-    Vietnamize, Vietnamise
-    Vietnamized, Vietnamised
-    Vietnamizes, Vietnamises
-    Vietnamizing, Vietnamising
-    vigor's, vigour's
-    vigor, vigour
-    vigorless, vigourless
-    vigors, vigours
-    villagization, villagisation
-    villagizations, villagisations
-    viremia, viraemia
-    viremias, viraemias
-    viremic, viraemic
-    virilization, virilisation
-    virilizations, virilisations
-    virilized, virilised
-    virilizing, virilising
-    virtualization, virtualisation
-    virtualize, virtualise
-    virtualizes, virtualises
-    virtuosos, virtuosoes
-    visionize, visionise
-    visionizes, visionises
-    visor's, vizor's
-    visor, vizor
-    visors, vizors
-    visualizable, visualisable
-    visualization's, visualisation's
-    visualization, visualisation
-    visualizations, visualisations
-    visualize, visualise
-    visualized, visualised
-    visualizer's, visualiser's
-    visualizer, visualiser
-    visualizers, visualisers
-    visualizes, visualises
-    visualizing, visualising
-    vitalization's, vitalisation's
-    vitalization, vitalisation
-    vitalizations, vitalisations
-    vitalize, vitalise
-    vitalized, vitalised
-    vitalizer's, vitaliser's
-    vitalizer, vitaliser
-    vitalizers, vitalisers
-    vitalizes, vitalises
-    vitalizing's, vitalising's
-    vitalizing, vitalising
-    vitalizingly, vitalisingly
-    vitalizings, vitalisings
-    vitaminization, vitaminisation
-    vitaminize, vitaminise
-    vitaminized, vitaminised
-    vitaminizes, vitaminises
-    vitaminizing, vitaminising
-    vitriolizable's, vitriolisable's
-    vitriolizable, vitriolisable
-    vitriolizables, vitriolisables
-    vitriolization's, vitriolisation's
-    vitriolization, vitriolisation
-    vitriolizations, vitriolisations
-    vitriolize, vitriolise
-    vitriolized, vitriolised
-    vitriolizer, vitrioliser
-    vitriolizers, vitriolisers
-    vitriolizes, vitriolises
-    vitriolizing, vitriolising
-    vivandier, vivandire
-    viver, vivre
-    viverrine, viverrinae
-    vivers, vivres
-    vizard, visard
-    vizards, visards
-    vizied, visied
-    vizies, visies
-    vocalization's, vocalisation's
-    vocalization, vocalisation
-    vocalizations, vocalisations
-    vocalize, vocalise
-    vocalized, vocalised
-    vocalizer's, vocaliser's
-    vocalizer, vocaliser
-    vocalizers, vocalisers
-    vocalizes, vocalises
-    vocalizing, vocalising
-    vocationalization's, vocationalisation's
-    vocationalization, vocationalisation
-    vocationalizations, vocationalisations
-    vocationalize, vocationalise
-    vocationalizes, vocationalises
-    volatilizable's, volatilisable's
-    volatilizable, volatilisable
-    volatilizabler, volatilisabler
-    volatilizables, volatilisables
-    volatilizablest, volatilisablest
-    volatilization's, volatilisation's
-    volatilization, volatilisation
-    volatilizations, volatilisations
-    volatilize, volatilise
-    volatilized, volatilised
-    volatilizer's, volatiliser's
-    volatilizer, volatiliser
-    volatilizers, volatilisers
-    volatilizes, volatilises
-    volatilizing, volatilising
-    volcanism's, vulcanism's
-    volcanism, vulcanism
-    volcanisms, vulcanisms
-    volcanization, volcanisation
-    volcanizations, volcanisations
-    volcanize, volcanise
-    volcanized, volcanised
-    volcanizes, volcanises
-    volcanizing, volcanising
-    voltize, voltise
-    voltizes, voltises
-    vowelization's, vowelisation's
-    vowelization, vowelisation
-    vowelizations, vowelisations
-    vowelize, vowelise
-    vowelized, vowelised
-    vowelizes, vowelises
-    vowelizing, vowelising
-    vulcanizable's, vulcanisable's
-    vulcanizable, vulcanisable
-    vulcanizabler, vulcanisabler
-    vulcanizables, vulcanisables
-    vulcanizablest, vulcanisablest
-    vulcanizate's, vulcanisate's
-    vulcanizate, vulcanisate
-    vulcanizates, vulcanisates
-    vulcanization's, vulcanisation's
-    vulcanization, vulcanisation
-    vulcanizations, vulcanisations
-    vulcanize, vulcanise
-    vulcanized, vulcanised
-    vulcanizer's, vulcaniser's
-    vulcanizer, vulcaniser
-    vulcanizers, vulcanisers
-    vulcanizes, vulcanises
-    vulcanizing, vulcanising
-    vulgarization's, vulgarisation's
-    vulgarization, vulgarisation
-    vulgarizations, vulgarisations
-    vulgarize, vulgarise
-    vulgarized, vulgarised
-    vulgarizer's, vulgariser's
-    vulgarizer, vulgariser
-    vulgarizers, vulgarisers
-    vulgarizes, vulgarises
-    vulgarizing, vulgarising
-    wackes, wackoes
-    wackier, whackier
-    wackiest, whackiest
-    wacky, whacky
-    Wagnerize's, Wagnerise's
-    Wagnerize, Wagnerise
-    Wagnerizes, Wagnerises
-    wagon's, waggon's
-    wagon, waggon
-    wagoned, waggoned
-    wagoneer, waggoneer
-    wagoner's, waggoner's
-    wagoner, waggoner
-    wagoners, waggoners
-    wagonette's, waggonette's
-    wagonette, waggonette
-    wagonettes, waggonettes
-    wagoning, waggoning
-    wagons, waggons
-    wainscoted, wainscotted
-    wainscoting's, wainscotting's
-    wainscoting, wainscotting
-    wainscotings, wainscottings
-    wallah, walla
-    wallahs, wallas
-    wantonize, wantonise
-    wantonized, wantonised
-    wantonizes, wantonises
-    wantonizing, wantonising
-    warer, warre
-    Warford's, Warfourd's
-    Warford, Warfourd
-    warrantize, warrantise
-    waterbed's, water_bed's
-    waterbed, water_bed
-    waterbeds, water_beds
-    watercolor's, watercolour's
-    watercolor, watercolour
-    watercolored, watercoloured
-    watercoloring, watercolouring
-    watercolorist's, watercolourist's
-    watercolorist, watercolourist
-    watercolorists, watercolourists
-    watercolors, watercolours
-    weaseled, weaselled
-    weaseling, weaselling
-    weatherize, weatherise
-    weatherized, weatherised
-    weatherizes, weatherises
-    weatherizing, weatherising
-    weeviled, weevilled
-    weftwize, weftwise
-    weize, weise
-    weized, weised
-    weizes, weises
-    weizing, weising
-    welsh, welch
-    welshed, welched
-    welshes, welches
-    welshing, welching
-    wer, waer
-    werewolf's, werwolf's
-    werewolf, werwolf
-    werewolves, werwolves
-    westernization's, westernisation's
-    westernization, westernisation
-    westernizations, westernisations
-    westernize, westernise
-    westernized, westernised
-    westernizes, westernises
-    westernizing, westernising
-    whimsies, whimseys
-    whimsy's, whimsey's
-    whimsy, whimsey
-    whir's, whirr's
-    whir, whirr
-    whirs, whirrs
-    Whitmanize's, Whitmanise's
-    Whitmanize, Whitmanise
-    Whitmanizes, Whitmanises
-    whiz's, whizz's
-    whiz, whizz
-    whizz's, wiz's
-    whizz, wiz
-    whizzes, wizzes
-    whodunit's, whodunnit's
-    whodunit, whodunnit
-    whodunits, whodunnits
-    wigeon's, widgeon's
-    wigeon, widgeon
-    willful, wilful
-    willfuler, wilfuler
-    willfulest, wilfulest
-    willfullier, wilfullier
-    willfulliest, wilfulliest
-    willfully, wilfully
-    willfulness's, wilfulness's
-    willfulness, wilfulness
-    willy, willie
-    winterization's, winterisation's
-    winterization, winterisation
-    winterizations, winterisations
-    winterize, winterise
-    winterized, winterised
-    winterizes, winterises
-    winterizing, winterising
-    wintrier, winterier
-    wintriest, winteriest
-    wintry, wintery
-    wisteria's, wistaria's
-    wisteria, wistaria
-    wisterias, wistarias
-    wizen, wisen
-    womanization's, womanisation's
-    womanization, womanisation
-    womanizations, womanisations
-    womanize, womanise
-    womanized, womanised
-    womanizer's, womaniser's
-    womanizer, womaniser
-    womanizers, womanisers
-    womanizes, womanises
-    womanizing, womanising
-    woodcockize, woodcockise
-    woodcockizes, woodcockises
-    woolen's, woollen's
-    woolen, woollen
-    woolenner, woollenner
-    woolennest, woollennest
-    woolens, woollens
-    woollenisation's, woollenization's
-    woollenisation, woollenization
-    woollenisations, woollenizations
-    woollenise, woollenize
-    woollenises, woollenizes
-    wornil, wournil
-    worshiped, worshipped
-    worshiper's, worshipper's
-    worshiper, worshipper
-    worshipers, worshippers
-    worshiping, worshipping
-    yak's, yack's
-    yak, yack
-    yak, yack
-    yak, yock
-    yakked, yacked
-    yakking, yacking
-    yaks, yacks
-    yaks, yacks
-    yeshiva's, yeshivah's
-    yeshiva, yeshivah
-    yeshivot, yeshivahs
-    yock's, yak's
-    yocks, yaks
-    yodeled, yodelled
-    yodeler's, yodeller's
-    yodeler, yodeller
-    yodelers, yodellers
-    yodeling, yodelling
-    yoghourt's, yogourt's
-    yoghourt, yogourt
-    yoghourts, yogourts
-    yogi's, yogin's
-    yogi, yogin
-    yogis, yogins
-    yuck, yuk
-    yuk, yuck
-    yukked, yucked
-    yukking, yucking
-    yuks, yucks
-    zaffer, zaffre
-    zaffers, zaffres
-    zea, zoea
-    zeas, zoeas
-    zeroize, zeroise
-    zeroized, zeroised
-    zeroizes, zeroises
-    zeroizing, zeroising
-    zipper's, Zipper's
-    zipper, Zipper
-    zippers, Zippers
-    zoea's, zoaea's
-    zoea, zoaea
-    zoea, zooea
-    zoeae, zooeae
-    zoeal, zooeal
-    zoeas, zooeas
-    zoecia, zooecia
-    zoecium, zooecium
-    zombie's, zombi's
-    zombie, zombi
-    zombies, zombis
-    zonesthesia, zonaesthesia
-    zonule, zonulae
-    zooglea, zoogloea
-    zoogleae, zoogloeae
-    zoogleal, zoogloeal
-    zoogleas, zoogloeas
-    zygenid, zygaenid
diff --git a/config/export/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml b/config/export/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
deleted file mode 100644
index 7c7788042..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-uuid: 4f12739f-c3a4-446c-8e1e-24108530802f
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: TLZRS4S3jKg-d59NXw5zf0znQOZE_VZz8G9c2c3sKps
-id: text_ngram_und_3_6_0
-label: 'NGram Text Field'
-minimum_solr_version: 3.6.0
-custom_code: ngram
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngram
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml b/config/export/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
deleted file mode 100644
index 34d1b882b..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: b57fb92d-904b-467f-bb86-76c4bc45cb11
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Svsi2UeNw5vBJvKJloJCoGB7JSwE-odfuGLW_UT5Sv0
-id: text_ngram_und_4_5_0
-label: 'NGram Text Field'
-minimum_solr_version: 4.5.0
-custom_code: ngram
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngram
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
deleted file mode 100644
index 85da9d648..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-uuid: 54cb676c-22ca-4bc6-9d53-66fd352652e8
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: R-qv3m6WSi8tTmAcAyQK2adAXRPW4xLrmkIFbqIVmvc
-id: text_ngram_und_6_0_0
-label: 'NGram Text Field'
-minimum_solr_version: 6.0.0
-custom_code: ngram
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngram
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml b/config/export/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
deleted file mode 100644
index d9d3ad8d6..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-uuid: c0866a9f-6e81-496f-8508-abb66023dca0
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Tk2-RQHVATad5Ju6FBaPcEPoZ2NTeauJtNtpwg7WIcY
-id: text_ngram_und_7_0_0
-label: 'NGram Text Field'
-minimum_solr_version: 7.0.0
-custom_code: ngram
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngram
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml b/config/export/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
deleted file mode 100644
index d927716e6..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: e8998125-7501-40b2-ba8f-d2ff8cbc259e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Jj_Vc6YYEriSinc9qnYbIPy2CNHXp0MM2PwTdmpW-eM
-id: text_ngramstring_und_3_6_0
-label: 'NGram String Field'
-minimum_solr_version: 3.6.0
-custom_code: ngramstring
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngramstring
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml b/config/export/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
deleted file mode 100644
index 7a1f4db54..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 13b07e5b-8ee1-4259-a11d-6a2517acc886
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: C6usKJrZGraSvCmtKfX-LqCoFYxR5EtySNOkSz_cA8k
-id: text_ngramstring_und_4_5_0
-label: 'NGram String Field'
-minimum_solr_version: 4.5.0
-custom_code: ngramstring
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngramstring
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
deleted file mode 100644
index e67b6a06b..000000000
--- a/config/export/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 61de1a81-f7ab-41e7-94a6-08cf55dbff08
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: uSBOTyeTCtQQUTiAzoF9BQbK5H6RnvAFSII-DlIUcmQ
-id: text_ngramstring_und_6_0_0
-label: 'NGram String Field'
-minimum_solr_version: 6.0.0
-custom_code: ngramstring
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_ngramstring
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-        -
-          class: solr.NGramFilterFactory
-          minGramSize: 2
-          maxGramSize: 25
-    -
-      type: query
-      tokenizer:
-        class: solr.KeywordTokenizerFactory
-      filters:
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/config/export/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
deleted file mode 100644
index 7e825e96c..000000000
--- a/config/export/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-uuid: 8560b819-5512-4587-85c2-1f51e20c5678
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: TccTMuN3WaaCzGfvSE75VMpn_xTGnhBqVKwUSPMQBuU
-id: text_phonetic_en_7_0_0
-label: 'Fulltext Phonetic English'
-minimum_solr_version: 7.0.0
-custom_code: phonetic
-field_type_language_code: en
-domains: {  }
-field_type:
-  name: text_phonetic_en
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.BeiderMorseFilterFactory
-          languageSet: english
-          nameType: GENERIC
-          ruleType: APPROX
-          concat: true
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_en.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_en.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.BeiderMorseFilterFactory
-          languageSet: english
-          nameType: GENERIC
-          ruleType: APPROX
-          concat: true
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml b/config/export/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
deleted file mode 100644
index c2b2c304a..000000000
--- a/config/export/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-uuid: 9bfd4fd7-e942-4146-bfc8-eefe53ff17c6
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 9WSnPy-9jL_8vLU6vI-G5z3eAL7Dsk4dDT99rWHf-CI
-id: text_phonetic_und_7_0_0
-label: 'Fulltext Phonetic'
-minimum_solr_version: 7.0.0
-custom_code: phonetic
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_phonetic_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.BeiderMorseFilterFactory
-          languageSet: auto
-          nameType: GENERIC
-          ruleType: APPROX
-          concat: true
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.BeiderMorseFilterFactory
-          languageSet: auto
-          nameType: GENERIC
-          ruleType: APPROX
-          concat: true
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_string_und_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
deleted file mode 100644
index dc1c94e75..000000000
--- a/config/export/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: 7082cf6f-1de8-4a5f-a972-796323d7e1fc
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: FXULm2mt03ExX95R8L1xo0F9iEHVPEfogRZG8oj07Ec
-id: text_string_und_6_0_0
-label: 'Fulltext String Field'
-minimum_solr_version: 6.0.0
-custom_code: string
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_string
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      tokenizer:
-        class: solr.PatternTokenizerFactory
-        pattern: '[\t\r\n]'
-      filters: {  }
-    -
-      type: query
-      tokenizer:
-        class: solr.PatternTokenizerFactory
-        pattern: '[\t\r\n]'
-      filters: {  }
-unstemmed_field_type: null
-spellcheck_field_type: null
-collated_field_type: null
-solr_configs: {  }
-text_files: {  }
diff --git a/config/export/search_api_solr.solr_field_type.text_und_3_6_0.yml b/config/export/search_api_solr.solr_field_type.text_und_3_6_0.yml
deleted file mode 100644
index 366d1a65c..000000000
--- a/config/export/search_api_solr.solr_field_type.text_und_3_6_0.yml
+++ /dev/null
@@ -1,288 +0,0 @@
-uuid: 9401855b-63e4-47dd-8beb-a18b6ec0f112
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: GzQnbYvUXyw1EsdqhPOA6ozZ3A-4nei9XZNt5RIrM8g
-id: text_und_3_6_0
-label: 'Language Undefined Text Field'
-minimum_solr_version: 3.6.0
-custom_code: ''
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_und.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          enablePositionIncrements: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type:
-  name: text_spell_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzer:
-    charFilters:
-      -
-        class: solr.MappingCharFilterFactory
-        mapping: accents_und.txt
-    tokenizer:
-      class: solr.WhitespaceTokenizerFactory
-    filters:
-      -
-        class: solr.LengthFilterFactory
-        min: 2
-        max: 100
-      -
-        class: solr.LowerCaseFilterFactory
-      -
-        class: solr.RemoveDuplicatesTokenFilterFactory
-collated_field_type: {  }
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: und
-            -
-              name: field
-              VALUE: spellcheck_und
-            -
-              name: spellcheckIndexDir
-              VALUE: spellchecker_und
-            -
-              name: buildOnOptimize
-              VALUE: 'true'
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-text_files:
-  stopwords: |
-
-  protwords: |
-
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
-  synonyms: |
-    drupal, durpal
diff --git a/config/export/search_api_solr.solr_field_type.text_und_4_5_0.yml b/config/export/search_api_solr.solr_field_type.text_und_4_5_0.yml
deleted file mode 100644
index 8a02826aa..000000000
--- a/config/export/search_api_solr.solr_field_type.text_und_4_5_0.yml
+++ /dev/null
@@ -1,315 +0,0 @@
-uuid: f1737dd2-8f6a-45a6-ba45-1e9ce911712d
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: BdAIEjub9XNGhI9z8houV1CRlGotvF8qxuwXulFSQ60
-id: text_und_4_5_0
-label: 'Language Undefined Text Field'
-minimum_solr_version: 4.5.0
-custom_code: ''
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          ignoreCase: true
-          synonyms: synonyms_und.txt
-          expand: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type:
-  name: text_spell_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzer:
-    charFilters:
-      -
-        class: solr.MappingCharFilterFactory
-        mapping: accents_und.txt
-    tokenizer:
-      class: solr.WhitespaceTokenizerFactory
-    filters:
-      -
-        class: solr.LengthFilterFactory
-        min: 2
-        max: 100
-      -
-        class: solr.LowerCaseFilterFactory
-      -
-        class: solr.RemoveDuplicatesTokenFilterFactory
-collated_field_type:
-  name: collated_und
-  class: solr.ICUCollationField
-  locale: null
-  strength: primary
-  caseLevel: false
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: und
-            -
-              name: field
-              VALUE: spellcheck_und
-            -
-              name: classname
-              VALUE: solr.DirectSolrSpellChecker
-            -
-              name: distanceMeasure
-              VALUE: internal
-          int:
-            -
-              name: maxEdits
-              VALUE: '2'
-            -
-              name: minPrefix
-              VALUE: '1'
-            -
-              name: maxInspections
-              VALUE: '5'
-            -
-              name: minQueryLength
-              VALUE: '4'
-          float:
-            -
-              name: accuracy
-              VALUE: '0.5'
-            -
-              name: maxQueryFrequency
-              VALUE: '0.01'
-            -
-              name: thresholdTokenFrequency
-              VALUE: '0.01'
-          bool:
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-text_files:
-  stopwords: |
-
-  protwords: |
-
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
-  synonyms: |
-    drupal, durpal
diff --git a/config/export/search_api_solr.solr_field_type.text_und_6_0_0.yml b/config/export/search_api_solr.solr_field_type.text_und_6_0_0.yml
deleted file mode 100644
index 64740da53..000000000
--- a/config/export/search_api_solr.solr_field_type.text_und_6_0_0.yml
+++ /dev/null
@@ -1,343 +0,0 @@
-uuid: 2b2c0d93-79ee-4ef3-83a3-8d69f8e19185
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: F_CbvhXxhM5f_yw68hsRDX9ItpKw_4b-wtP8Vkk_gqc
-id: text_und_6_0_0
-label: 'Language Undefined Text Field'
-minimum_solr_version: 6.0.0
-custom_code: ''
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymFilterFactory
-          synonyms: synonyms_und.txt
-          expand: true
-          ignoreCase: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type:
-  name: text_spell_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzer:
-    charFilters:
-      -
-        class: solr.MappingCharFilterFactory
-        mapping: accents_und.txt
-    tokenizer:
-      class: solr.WhitespaceTokenizerFactory
-    filters:
-      -
-        class: solr.LengthFilterFactory
-        min: 2
-        max: 100
-      -
-        class: solr.LowerCaseFilterFactory
-      -
-        class: solr.RemoveDuplicatesTokenFilterFactory
-collated_field_type:
-  name: collated_und
-  class: solr.ICUCollationField
-  locale: null
-  strength: primary
-  caseLevel: false
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: und
-            -
-              name: field
-              VALUE: spellcheck_und
-            -
-              name: classname
-              VALUE: solr.DirectSolrSpellChecker
-            -
-              name: distanceMeasure
-              VALUE: internal
-            -
-              name: accuracy
-              VALUE: '0.5'
-            -
-              name: maxEdits
-              VALUE: '2'
-            -
-              name: minPrefix
-              VALUE: '1'
-            -
-              name: maxInspections
-              VALUE: '5'
-            -
-              name: minQueryLength
-              VALUE: '4'
-            -
-              name: maxQueryFrequency
-              VALUE: '0.01'
-            -
-              name: thresholdTokenFrequency
-              VALUE: '.01'
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-    -
-      name: suggest
-      class: solr.SuggestComponent
-      lst:
-        -
-          name: suggester
-          str:
-            -
-              name: name
-              VALUE: und
-            -
-              name: lookupImpl
-              VALUE: AnalyzingInfixLookupFactory
-            -
-              name: dictionaryImpl
-              VALUE: DocumentDictionaryFactory
-            -
-              name: field
-              VALUE: twm_suggest
-            -
-              name: suggestAnalyzerFieldType
-              VALUE: text_und
-            -
-              name: contextField
-              VALUE: sm_context_tags
-            -
-              name: buildOnCommit
-              VALUE: 'true'
-            -
-              name: buildOnStartup
-              VALUE: 'false'
-text_files:
-  stopwords: |
-
-  synonyms: |
-    drupal, durpal
-  protwords: |
-
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
diff --git a/config/export/search_api_solr.solr_field_type.text_und_7_0_0.yml b/config/export/search_api_solr.solr_field_type.text_und_7_0_0.yml
deleted file mode 100644
index 8b76c8b4c..000000000
--- a/config/export/search_api_solr.solr_field_type.text_und_7_0_0.yml
+++ /dev/null
@@ -1,345 +0,0 @@
-uuid: 2085e717-7a48-4ef0-9520-5ff2fb6ac983
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: LqGQkyoX0jUump3klnm_uia46SmYnvVB5O-0A4UO4mI
-id: text_und_7_0_0
-label: 'Language Undefined Text Field'
-minimum_solr_version: 7.0.0
-custom_code: ''
-field_type_language_code: und
-domains: {  }
-field_type:
-  name: text_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzers:
-    -
-      type: index
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 1
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 1
-        -
-          class: solr.FlattenGraphFilterFactory
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-    -
-      type: query
-      charFilters:
-        -
-          class: solr.MappingCharFilterFactory
-          mapping: accents_und.txt
-      tokenizer:
-        class: solr.WhitespaceTokenizerFactory
-      filters:
-        -
-          class: solr.SynonymGraphFilterFactory
-          synonyms: synonyms_und.txt
-          expand: true
-          ignoreCase: true
-        -
-          class: solr.StopFilterFactory
-          ignoreCase: true
-          words: stopwords_und.txt
-        -
-          class: solr.WordDelimiterGraphFilterFactory
-          catenateNumbers: 0
-          generateNumberParts: 1
-          protected: protwords_und.txt
-          splitOnCaseChange: 0
-          generateWordParts: 1
-          preserveOriginal: 1
-          catenateAll: 0
-          catenateWords: 0
-        -
-          class: solr.LengthFilterFactory
-          min: 2
-          max: 100
-        -
-          class: solr.LowerCaseFilterFactory
-        -
-          class: solr.RemoveDuplicatesTokenFilterFactory
-unstemmed_field_type: null
-spellcheck_field_type:
-  name: text_spell_und
-  class: solr.TextField
-  positionIncrementGap: 100
-  analyzer:
-    charFilters:
-      -
-        class: solr.MappingCharFilterFactory
-        mapping: accents_und.txt
-    tokenizer:
-      class: solr.WhitespaceTokenizerFactory
-    filters:
-      -
-        class: solr.LengthFilterFactory
-        min: 2
-        max: 100
-      -
-        class: solr.LowerCaseFilterFactory
-      -
-        class: solr.RemoveDuplicatesTokenFilterFactory
-collated_field_type:
-  name: collated_und
-  class: solr.ICUCollationField
-  locale: null
-  strength: primary
-  caseLevel: false
-solr_configs:
-  searchComponents:
-    -
-      name: spellcheck
-      class: solr.SpellCheckComponent
-      lst:
-        -
-          name: spellchecker
-          str:
-            -
-              name: name
-              VALUE: und
-            -
-              name: field
-              VALUE: spellcheck_und
-            -
-              name: classname
-              VALUE: solr.DirectSolrSpellChecker
-            -
-              name: distanceMeasure
-              VALUE: internal
-            -
-              name: accuracy
-              VALUE: '0.5'
-            -
-              name: maxEdits
-              VALUE: '2'
-            -
-              name: minPrefix
-              VALUE: '1'
-            -
-              name: maxInspections
-              VALUE: '5'
-            -
-              name: minQueryLength
-              VALUE: '4'
-            -
-              name: maxQueryFrequency
-              VALUE: '0.01'
-            -
-              name: thresholdTokenFrequency
-              VALUE: '.01'
-            -
-              name: onlyMorePopular
-              VALUE: 'true'
-    -
-      name: suggest
-      class: solr.SuggestComponent
-      lst:
-        -
-          name: suggester
-          str:
-            -
-              name: name
-              VALUE: und
-            -
-              name: lookupImpl
-              VALUE: AnalyzingInfixLookupFactory
-            -
-              name: dictionaryImpl
-              VALUE: DocumentDictionaryFactory
-            -
-              name: field
-              VALUE: twm_suggest
-            -
-              name: suggestAnalyzerFieldType
-              VALUE: text_und
-            -
-              name: contextField
-              VALUE: sm_context_tags
-            -
-              name: buildOnCommit
-              VALUE: 'true'
-            -
-              name: buildOnStartup
-              VALUE: 'false'
-text_files:
-  stopwords: |
-
-  synonyms: |
-    drupal, durpal
-  protwords: |
-
-  accents: |
-    # À => A
-    "\u00C0" => "A"
-    # Á => A
-    "\u00C1" => "A"
-    # Â => A
-    "\u00C2" => "A"
-    # Ã => A
-    "\u00C3" => "A"
-    # Ä => A
-    "\u00C4" => "A"
-    # Å => A
-    "\u00C5" => "A"
-    # Æ => AE
-    "\u00C6" => "AE"
-    # Ç => C
-    "\u00C7" => "C"
-    # È => E
-    "\u00C8" => "E"
-    # É => E
-    "\u00C9" => "E"
-    # Ê => E
-    "\u00CA" => "E"
-    # Ë => E
-    "\u00CB" => "E"
-    # Ì => I
-    "\u00CC" => "I"
-    # Í => I
-    "\u00CD" => "I"
-    # Î => I
-    "\u00CE" => "I"
-    # Ï => I
-    "\u00CF" => "I"
-    # IJ => IJ
-    "\u0132" => "IJ"
-    # Ð => D
-    "\u00D0" => "D"
-    # Ñ => N
-    "\u00D1" => "N"
-    # Ò => O
-    "\u00D2" => "O"
-    # Ó => O
-    "\u00D3" => "O"
-    # Ô => O
-    "\u00D4" => "O"
-    # Õ => O
-    "\u00D5" => "O"
-    # Ö => O
-    "\u00D6" => "O"
-    # Ø => O
-    "\u00D8" => "O"
-    # Π=> OE
-    "\u0152" => "OE"
-    # Þ
-    "\u00DE" => "TH"
-    # Ù => U
-    "\u00D9" => "U"
-    # Ú => U
-    "\u00DA" => "U"
-    # Û => U
-    "\u00DB" => "U"
-    # Ü => U
-    "\u00DC" => "U"
-    # Ý => Y
-    "\u00DD" => "Y"
-    # Ÿ => Y
-    "\u0178" => "Y"
-    # à => a
-    "\u00E0" => "a"
-    # á => a
-    "\u00E1" => "a"
-    # â => a
-    "\u00E2" => "a"
-    # ã => a
-    "\u00E3" => "a"
-    # ä => a
-    "\u00E4" => "a"
-    # å => a
-    "\u00E5" => "a"
-    # æ => ae
-    "\u00E6" => "ae"
-    # ç => c
-    "\u00E7" => "c"
-    # è => e
-    "\u00E8" => "e"
-    # é => e
-    "\u00E9" => "e"
-    # ê => e
-    "\u00EA" => "e"
-    # ë => e
-    "\u00EB" => "e"
-    # ì => i
-    "\u00EC" => "i"
-    # í => i
-    "\u00ED" => "i"
-    # î => i
-    "\u00EE" => "i"
-    # ï => i
-    "\u00EF" => "i"
-    # ij => ij
-    "\u0133" => "ij"
-    # ð => d
-    "\u00F0" => "d"
-    # ñ => n
-    "\u00F1" => "n"
-    # ò => o
-    "\u00F2" => "o"
-    # ó => o
-    "\u00F3" => "o"
-    # ô => o
-    "\u00F4" => "o"
-    # õ => o
-    "\u00F5" => "o"
-    # ö => o
-    "\u00F6" => "o"
-    # ø => o
-    "\u00F8" => "o"
-    # œ => oe
-    "\u0153" => "oe"
-    # ß => ss
-    "\u00DF" => "ss"
-    # þ => th
-    "\u00FE" => "th"
-    # ù => u
-    "\u00F9" => "u"
-    # ú => u
-    "\u00FA" => "u"
-    # û => u
-    "\u00FB" => "u"
-    # ü => u
-    "\u00FC" => "u"
-    # ý => y
-    "\u00FD" => "y"
-    # ÿ => y
-    "\u00FF" => "y"
-    # ff => ff
-    "\uFB00" => "ff"
-    # fi => fi
-    "\uFB01" => "fi"
-    # fl => fl
-    "\uFB02" => "fl"
-    # ffi => ffi
-    "\uFB03" => "ffi"
-    # ffl => ffl
-    "\uFB04" => "ffl"
-    # ſt => st
-    "\uFB05" => "st"
-    # st => st
-    "\uFB06" => "st"
diff --git a/config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml b/config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml
deleted file mode 100644
index 3db683ca8..000000000
--- a/config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcaching_default_7_0_0.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 93a40c30-2ca9-41db-b06e-e3e9948d06a2
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: bxAjXM_xls--jwh5HZqTat__y2_4nQJCFFLD69Wvr8A
-id: request_dispatcher_httpcaching_default_7_0_0
-label: 'HTTP Cache'
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: false
-request_dispatcher:
-  name: httpCaching
-  lastModFrom: openTime
-  etagSeed: Solr
-  cacheControl:
-    -
-      VALUE: 'max-age=30, public'
diff --git a/config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml b/config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml
deleted file mode 100644
index 467d36576..000000000
--- a/config/export/search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 9f8c747a-a84c-4c2a-a8ec-2d0fd428a64e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: UbxzckuoN-7-PLfjTgOkYEvrOC-6_1eVgrHSQvdvD74
-id: request_dispatcher_httpcachingnever_default_7_0_0
-label: 'HTTP Cache Never'
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_dispatcher:
-  name: httpCaching
-  never304: true
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml
deleted file mode 100644
index 4f41445ea..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-uuid: 38df93db-c482-45e7-9661-1f00c4642317
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: pYuahO9bLm6CkxAFR4fieJZxTfosiKyxUCMLG2rApeE
-id: request_handler_autocomplete_default_7_0_0
-label: Autocomplete
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /autocomplete
-  class: solr.SearchHandler
-  startup: lazy
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: terms
-          VALUE: 'false'
-        -
-          name: distrib
-          VALUE: 'false'
-        -
-          name: spellcheck
-          VALUE: 'false'
-        -
-          name: spellcheck.onlyMorePopular
-          VALUE: 'true'
-        -
-          name: spellcheck.extendedResults
-          VALUE: 'false'
-        -
-          name: spellcheck.count
-          VALUE: '1'
-        -
-          name: suggest
-          VALUE: 'false'
-        -
-          name: suggest.count
-          VALUE: '10'
-  arr:
-    -
-      name: components
-      str:
-        -
-          VALUE: terms
-        -
-          VALUE: spellcheck
-        -
-          VALUE: suggest
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml
deleted file mode 100644
index 99f75cd68..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_elevate_default_7_0_0.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-uuid: b56698f7-c364-4308-9cc2-62c90c1b2b3d
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: awRUNLvDsGIt-mG3F50XkazfyvWMPDLB-_cGe8c17pU
-id: request_handler_elevate_default_7_0_0
-label: Elevator
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: false
-request_handler:
-  name: /elevate
-  class: solr.SearchHandler
-  startup: lazy
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: echoParams
-          VALUE: explicit
-        -
-          name: df
-          VALUE: id
-  arr:
-    -
-      name: last-components
-      str:
-        -
-          VALUE: elevator
-solr_configs:
-  searchComponents:
-    -
-      name: elevator
-      class: solr.QueryElevationComponent
-      str:
-        -
-          name: queryFieldType
-          VALUE: string
-        -
-          name: config-file
-          VALUE: elevate.xml
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml
deleted file mode 100644
index 669614d3d..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 18ddafd4-cfdd-4a67-a556-f224ab92dccf
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 7vbCK-cOkMCZBmHr8iFW8A4oQx-k0svYhp52KHP9yEU
-id: request_handler_extract_default_7_0_0
-label: Extract
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /update/extract
-  class: solr.extraction.ExtractingRequestHandler
-  startup: lazy
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: lowernames
-          VALUE: 'true'
-        -
-          name: uprefix
-          VALUE: ignored_
-        -
-          name: captureAttr
-          VALUE: 'true'
-        -
-          name: fmap.a
-          VALUE: links
-        -
-          name: fmap.div
-          VALUE: ignored_
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml
deleted file mode 100644
index a6dcd14dc..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 3d72917d-c5b4-4a20-acdf-68e30d85df37
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: pUEvXftg5xCCVTHW_0W0A29nMsH8SkAFhwvONT-nB6g
-id: request_handler_mlt_default_7_0_0
-label: 'More Like This'
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /mlt
-  class: solr.MoreLikeThisHandler
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: mlt.mintf
-          VALUE: '1'
-        -
-          name: mlt.mindf
-          VALUE: '1'
-        -
-          name: mlt.match.include
-          VALUE: 'false'
-        -
-          name: timeAllowed
-          VALUE: '${solr.mlt.timeAllowed:2000}'
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml
deleted file mode 100644
index 6be94301d..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_query_default_7_0_0.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: 666f5df4-b944-4074-a9bd-2c19b6f2b20e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: mTtPKc0bQKmhHJjV1mFQ7yD806_uXWyXV8mmYirVY-c
-id: request_handler_query_default_7_0_0
-label: Query
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /select
-  class: solr.SearchHandler
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: echoParams
-          VALUE: explicit
-        -
-          name: wt
-          VALUE: json
-        -
-          name: indent
-          VALUE: 'true'
-        -
-          name: df
-          VALUE: id
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml
deleted file mode 100644
index 08751739d..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_replicationmaster_default_7_0_0.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-uuid: c9c8a99a-72d8-46b4-9559-19cc6e6c1140
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: VzQZqpoqX7DQfyyACH6rTXbtkI6UnKPUquWqNhtKsCY
-id: request_handler_replicationmaster_default_7_0_0
-label: 'Replication Master'
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: false
-request_handler:
-  name: /replication
-  class: solr.ReplicationHandler
-  lst:
-    -
-      name: master
-      str:
-        -
-          name: enable
-          VALUE: '${solr.replication.master:false}'
-        -
-          name: replicateAfter
-          VALUE: commit
-        -
-          name: replicateAfter
-          VALUE: startup
-        -
-          name: confFiles
-          VALUE: '${solr.replication.confFiles:schema.xml,schema_extra_types.xml,schema_extra_fields.xml,elevate.xml}'
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml
deleted file mode 100644
index 519578fd0..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_replicationslave_default_7_0_0.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-uuid: 92590612-af34-4cdc-8117-bb774707b0ac
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: oLasTi84mXSOPlrp23tFSpNlHyzB-AaxcR60G0idwDY
-id: request_handler_replicationslave_default_7_0_0
-label: 'Replication Slave'
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: false
-request_handler:
-  name: /replication
-  class: solr.ReplicationHandler
-  lst:
-    -
-      name: slave
-      str:
-        -
-          name: enable
-          VALUE: '${solr.replication.slave:false}'
-        -
-          name: masterUrl
-          VALUE: '${solr.replication.masterUrl:http://localhost:8983/solr}/replication'
-        -
-          name: pollInterval
-          VALUE: '${solr.replication.pollInterval:00:00:60}'
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml
deleted file mode 100644
index 7a19c8b7f..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_select_default_7_0_0.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-uuid: 110cdbcc-0c28-453c-ae5f-9d96c8cfe8a4
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: nx4cjhmOHhXQ6d5gnlM63v-zfbQmdeYi8pPV_4fiXf8
-id: request_handler_select_default_7_0_0
-label: Select
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /select
-  class: solr.SearchHandler
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: defType
-          VALUE: lucene
-        -
-          name: df
-          VALUE: id
-        -
-          name: echoParams
-          VALUE: explicit
-        -
-          name: omitHeader
-          VALUE: 'true'
-        -
-          name: timeAllowed
-          VALUE: '${solr.selectSearchHandler.timeAllowed:-1}'
-        -
-          name: spellcheck
-          VALUE: 'false'
-  arr:
-    -
-      name: last-components
-      str:
-        -
-          VALUE: spellcheck
-        -
-          VALUE: elevator
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml
deleted file mode 100644
index fe19ea3e4..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-uuid: 9e7c2b54-fe96-4074-a273-42c47238c745
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: K8FL_GAJEdbxEnnmGUmM69c7O38bwz66axaebjmsb4U
-id: request_handler_spell_default_7_0_0
-label: Spellcheck
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /spell
-  class: solr.SearchHandler
-  startup: lazy
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: df
-          VALUE: id
-        -
-          name: spellcheck.dictionary
-          VALUE: und
-        -
-          name: spellcheck
-          VALUE: 'on'
-        -
-          name: spellcheck.onlyMorePopular
-          VALUE: 'false'
-        -
-          name: spellcheck.extendedResults
-          VALUE: 'false'
-        -
-          name: spellcheck.count
-          VALUE: '1'
-        -
-          name: spellcheck.alternativeTermCount
-          VALUE: '5'
-        -
-          name: spellcheck.maxResultsForSuggest
-          VALUE: '5'
-        -
-          name: spellcheck.collate
-          VALUE: 'true'
-        -
-          name: spellcheck.collateExtendedResults
-          VALUE: 'true'
-        -
-          name: spellcheck.maxCollationTries
-          VALUE: '10'
-        -
-          name: spellcheck.maxCollations
-          VALUE: '5'
-  arr:
-    -
-      name: last-components
-      str:
-        -
-          VALUE: spellcheck
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml
deleted file mode 100644
index 8e215a19a..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-uuid: 8cad8244-bc87-4db8-adbb-196a6ca75d73
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ezZLQaU3x_dePTU7-Z_qfADhPOEXZ_nVYfp9wvYLIzI
-id: request_handler_suggest_default_7_0_0
-label: Suggester
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /suggest
-  class: solr.SearchHandler
-  startup: lazy
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: suggest
-          VALUE: 'true'
-        -
-          name: suggest.dictionary
-          VALUE: und
-        -
-          name: suggest.count
-          VALUE: '10'
-  arr:
-    -
-      name: components
-      str:
-        -
-          VALUE: suggest
-solr_configs: null
diff --git a/config/export/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml b/config/export/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml
deleted file mode 100644
index d4c6dd369..000000000
--- a/config/export/search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-uuid: 7355668c-7cc5-4715-93dc-426ba0497728
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: dMZTGHu6VZtj5ks5N-ndQwAAr6PwcCIbFhsR1vnYhyQ
-id: request_handler_tvrh_default_7_0_0
-label: 'Term Vector'
-minimum_solr_version: 7.0.0
-environments: {  }
-recommended: true
-request_handler:
-  name: /tvrh
-  class: solr.SearchHandler
-  startup: lazy
-  lst:
-    -
-      name: defaults
-      str:
-        -
-          name: df
-          VALUE: id
-        -
-          name: tv
-          VALUE: 'true'
-  arr:
-    -
-      name: last-components
-      str:
-        -
-          VALUE: tvComponent
-solr_configs:
-  searchComponents:
-    -
-      name: tvComponent
-      class: solr.TermVectorComponent
diff --git a/config/export/shortcut.set.default.yml b/config/export/shortcut.set.default.yml
deleted file mode 100644
index 512fc20f4..000000000
--- a/config/export/shortcut.set.default.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: 518027d0-40e5-4817-b7b5-e844985d46c4
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: U5VlGjd_SfV0Qm_EfnaynOfc549cNscFAx48JfYoMRI
-id: default
-label: Default
diff --git a/config/export/syslog.settings.yml b/config/export/syslog.settings.yml
deleted file mode 100644
index 655f2e8a2..000000000
--- a/config/export/syslog.settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: vdXLRPZRg35PBykBRRXr6RTql5EJR_fUi2kxyZ8c5m0
-identity: drupal
-facility: 128
-format: '!base_url|!timestamp|!type|!ip|!request_uri|!referer|!uid|!link|!message'
diff --git a/config/export/system.action.audio_generate_a_service_file_from_an_original_file.yml b/config/export/system.action.audio_generate_a_service_file_from_an_original_file.yml
deleted file mode 100644
index c46f8c692..000000000
--- a/config/export/system.action.audio_generate_a_service_file_from_an_original_file.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 88efdd45-668f-4e8c-bb83-af53a1e8b970
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_audio
-_core:
-  default_config_hash: W3X6j0tEV4Y9q5982YFXDxSH3uW73ElGwiMXUhlE43c
-id: audio_generate_a_service_file_from_an_original_file
-label: 'Audio - Generate a service file from an original file'
-type: node
-plugin: generate_audio_derivative
-configuration:
-  queue: islandora-connector-homarus
-  event: 'Generate Derivative'
-  destination_media_type: audio
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ServiceFile'
-  mimetype: audio/mpeg
-  args: '-codec:a libmp3lame -q:a 5'
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].mp3'
diff --git a/config/export/system.action.comment_delete_action.yml b/config/export/system.action.comment_delete_action.yml
deleted file mode 100644
index b49e383cd..000000000
--- a/config/export/system.action.comment_delete_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: cb95195c-4714-49da-a413-9f8d9495ac58
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-_core:
-  default_config_hash: vpBH8OmL4sdesCdeZLsW8KOutB5gkbreWJbfjhfFKaQ
-id: comment_delete_action
-label: 'Delete comment'
-type: comment
-plugin: 'entity:delete_action:comment'
-configuration: {  }
diff --git a/config/export/system.action.comment_publish_action.yml b/config/export/system.action.comment_publish_action.yml
deleted file mode 100644
index f3f167909..000000000
--- a/config/export/system.action.comment_publish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 69e8391a-e354-4530-af73-fb3e011d64fb
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-_core:
-  default_config_hash: C00dyL_W_5M0nFlgUB3lWUTUs96jn51Jw1MLHVEHZD0
-id: comment_publish_action
-label: 'Publish comment'
-type: comment
-plugin: 'entity:publish_action:comment'
-configuration: {  }
diff --git a/config/export/system.action.comment_save_action.yml b/config/export/system.action.comment_save_action.yml
deleted file mode 100644
index 18795947e..000000000
--- a/config/export/system.action.comment_save_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: b332f4a7-848b-4efe-8bdb-64fc4790c2a2
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-_core:
-  default_config_hash: lfyE_snmvfg_EQ3VDyhUtGAXgmqtEiqa46I3bTMg8DU
-id: comment_save_action
-label: 'Save comment'
-type: comment
-plugin: 'entity:save_action:comment'
-configuration: {  }
diff --git a/config/export/system.action.comment_unpublish_action.yml b/config/export/system.action.comment_unpublish_action.yml
deleted file mode 100644
index a99acb4ef..000000000
--- a/config/export/system.action.comment_unpublish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 48c17d1c-db0f-4a2f-916a-6a4687ddf58d
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-_core:
-  default_config_hash: tWOIjSMobEWOFZddMkNqb9JySbOVwE1diC6NRqcfLTk
-id: comment_unpublish_action
-label: 'Unpublish comment'
-type: comment
-plugin: 'entity:unpublish_action:comment'
-configuration: {  }
diff --git a/config/export/system.action.delete_file_as_fedora_external_content.yml b/config/export/system.action.delete_file_as_fedora_external_content.yml
deleted file mode 100644
index c39de2970..000000000
--- a/config/export/system.action.delete_file_as_fedora_external_content.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: ed170745-6778-4891-ae54-75c036d51271
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: mkXeO-0MzpCcCdc1TU7Zgj4KM9Bf_MxuKOikV8-qn6g
-id: delete_file_as_fedora_external_content
-label: 'Delete File as Fedora External Content'
-type: file
-plugin: emit_file_event
-configuration:
-  queue: islandora-indexing-fcrepo-delete
-  event: Delete
diff --git a/config/export/system.action.delete_media_and_file.yml b/config/export/system.action.delete_media_and_file.yml
deleted file mode 100644
index 708f316f4..000000000
--- a/config/export/system.action.delete_media_and_file.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 80ed8620-d43d-4d3f-9cb8-b3a165e890b1
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-    - media
-_core:
-  default_config_hash: EnxdDotQQOCl34Hxl--D5YLz7H8aINkSkVeQR14ooTQ
-id: delete_media_and_file
-label: 'Delete media and file(s)'
-type: media
-plugin: delete_media_and_file
-configuration: {  }
diff --git a/config/export/system.action.delete_media_from_triplestore.yml b/config/export/system.action.delete_media_from_triplestore.yml
deleted file mode 100644
index f41e92efc..000000000
--- a/config/export/system.action.delete_media_from_triplestore.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 1855c402-7e40-4768-a06f-19d248509ac0
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 4B5yB5BoxSDz1-8_I-WQko4sxNXwP4UyW2YCEEA5qxU
-id: delete_media_from_triplestore
-label: 'Delete Media from Triplestore'
-type: media
-plugin: emit_media_event
-configuration:
-  queue: islandora-indexing-triplestore-delete
-  event: Delete
diff --git a/config/export/system.action.delete_node_from_fedora.yml b/config/export/system.action.delete_node_from_fedora.yml
deleted file mode 100644
index d2d757103..000000000
--- a/config/export/system.action.delete_node_from_fedora.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 617cf706-2b26-4f44-87a2-a7cafe286430
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: B3K0fw7-qY2iqUx5mtZgzQecSdc_wRgbjP-BFzBvGsE
-id: delete_node_from_fedora
-label: 'Delete Node from Fedora'
-type: node
-plugin: emit_node_event
-configuration:
-  queue: islandora-indexing-fcrepo-delete
-  event: Delete
diff --git a/config/export/system.action.delete_node_from_triplestore.yml b/config/export/system.action.delete_node_from_triplestore.yml
deleted file mode 100644
index 5c1fbd9ed..000000000
--- a/config/export/system.action.delete_node_from_triplestore.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 03bc78d2-e3e6-4f2f-a112-d879ebd11cf5
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 5BLRdR-RanhNKAu8gdFGrgqjy3etFaQ1xMXYKH05W38
-id: delete_node_from_triplestore
-label: 'Delete Node from Triplestore'
-type: node
-plugin: emit_node_event
-configuration:
-  queue: islandora-indexing-triplestore-delete
-  event: Delete
diff --git a/config/export/system.action.delete_taxonomy_term_in_fedora.yml b/config/export/system.action.delete_taxonomy_term_in_fedora.yml
deleted file mode 100644
index 385b02525..000000000
--- a/config/export/system.action.delete_taxonomy_term_in_fedora.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: f1899a33-1e84-41a0-b0a5-341b641ec5cf
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: CiLaoHgKlvF6ak3al8DAOpYKEDKR0CAk6DMiCBamWd8
-id: delete_taxonomy_term_in_fedora
-label: 'Delete Taxonomy Term in Fedora'
-type: taxonomy_term
-plugin: emit_term_event
-configuration:
-  queue: islandora-indexing-fcrepo-delete
-  event: Delete
diff --git a/config/export/system.action.delete_taxonomy_term_in_triplestore.yml b/config/export/system.action.delete_taxonomy_term_in_triplestore.yml
deleted file mode 100644
index 0f23a75aa..000000000
--- a/config/export/system.action.delete_taxonomy_term_in_triplestore.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 14a9d670-33b3-4baa-93b1-e2e8dfdc58e1
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: pEkoKmhz52Kq8xEaF4QRvFgJuo178dYLq0OEtxmibtU
-id: delete_taxonomy_term_in_triplestore
-label: 'Delete Taxonomy Term in Triplestore'
-type: taxonomy_term
-plugin: emit_term_event
-configuration:
-  queue: islandora-indexing-triplestore-delete
-  event: Delete
diff --git a/config/export/system.action.digital_document_generate_a_thumbnail_from_an_original_file.yml b/config/export/system.action.digital_document_generate_a_thumbnail_from_an_original_file.yml
deleted file mode 100644
index 0f29db972..000000000
--- a/config/export/system.action.digital_document_generate_a_thumbnail_from_an_original_file.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: b8d5ea8f-6462-4f44-bcf6-d4e0fc226e11
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_image
-_core:
-  default_config_hash: _EcQ_pl-QIvf-gmsbgT1FovXKS2r42fVF5-II8MIUlM
-id: digital_document_generate_a_thumbnail_from_an_original_file
-label: 'Digital Document - Generate a thumbnail from an original file'
-type: node
-plugin: generate_image_derivative
-configuration:
-  queue: islandora-connector-houdini
-  event: 'Generate Derivative'
-  destination_media_type: image
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ThumbnailImage'
-  mimetype: image/png
-  args: '-thumbnail 400x400'
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].png'
diff --git a/config/export/system.action.generate_a_technical_metadata_derivative.yml b/config/export/system.action.generate_a_technical_metadata_derivative.yml
deleted file mode 100644
index 05e30e363..000000000
--- a/config/export/system.action.generate_a_technical_metadata_derivative.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: bcd7c485-5353-46c3-ac48-e58e6b95ca5e
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_fits
-_core:
-  default_config_hash: vW5Yn3Eli5_m4WJB28FERWOkPTXSgkVcjU6J54F15Kk
-id: generate_a_technical_metadata_derivative
-label: 'FITS - Generate a Technical metadata derivative'
-type: node
-plugin: generate_fits_derivative
-configuration:
-  queue: islandora-connector-fits
-  event: 'Generate Derivative'
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'https://projects.iq.harvard.edu/fits'
-  mimetype: application/xml
-  args: null
-  destination_media_type: fits_technical_metadata
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].xml'
diff --git a/config/export/system.action.get_ocr_from_image.yml b/config/export/system.action.get_ocr_from_image.yml
deleted file mode 100644
index 2ac78b056..000000000
--- a/config/export/system.action.get_ocr_from_image.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 2ef208a7-fbf7-4f6f-9d4a-69c2aadcbf63
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_text_extraction
-_core:
-  default_config_hash: DwigXfPdx532Jo8glTH2t_c4Q1ae_WED-fPpdaLuvAk
-id: get_ocr_from_image
-label: 'Extract Text from Image or PDF'
-type: node
-plugin: generate_ocr_derivative
-configuration:
-  queue: islandora-connector-ocr
-  event: 'Generate Derivative'
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ExtractedText'
-  mimetype: text/plain
-  args: null
-  destination_media_type: extracted_text
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].txt'
diff --git a/config/export/system.action.image_generate_a_service_file_from_an_original_file.yml b/config/export/system.action.image_generate_a_service_file_from_an_original_file.yml
deleted file mode 100644
index 5ba470139..000000000
--- a/config/export/system.action.image_generate_a_service_file_from_an_original_file.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 59c529e8-a254-4419-9eae-694f1e9ed4ba
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_image
-_core:
-  default_config_hash: svVytNXN4RMbjBZklNs0Zhpn-VuR_RsldgTo8AHKFYA
-id: image_generate_a_service_file_from_an_original_file
-label: 'Image - Generate a service file from an original file'
-type: node
-plugin: generate_image_derivative
-configuration:
-  queue: islandora-connector-houdini
-  event: 'Generate Derivative'
-  destination_media_type: image
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ServiceFile'
-  mimetype: image/jpeg
-  args: ''
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].jpg'
diff --git a/config/export/system.action.image_generate_a_thumbnail_from_an_original_file.yml b/config/export/system.action.image_generate_a_thumbnail_from_an_original_file.yml
deleted file mode 100644
index fb4c8054e..000000000
--- a/config/export/system.action.image_generate_a_thumbnail_from_an_original_file.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 279d506b-c84f-4137-b06b-dc18be75fd6b
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_image
-_core:
-  default_config_hash: fgpZXg7_qBYjBYobj4IlcsY7jI-V8gpxY-DDoAJi1yA
-id: image_generate_a_thumbnail_from_an_original_file
-label: 'Image - Generate a thumbnail from an original file'
-type: node
-plugin: generate_image_derivative
-configuration:
-  queue: islandora-connector-houdini
-  event: 'Generate Derivative'
-  destination_media_type: image
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ThumbnailImage'
-  mimetype: image/jpeg
-  args: '-thumbnail 400x400'
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].jpg'
diff --git a/config/export/system.action.index_file_as_fedora_external_content.yml b/config/export/system.action.index_file_as_fedora_external_content.yml
deleted file mode 100644
index 8b737217e..000000000
--- a/config/export/system.action.index_file_as_fedora_external_content.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 5fac5a14-1c52-411b-8fd2-ea0f0f6d324b
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: Ug973H3ch20MpS_o8Yz9TU4-dizDVtassI0-4sOg8GU
-id: index_file_as_fedora_external_content
-label: 'Index File as Fedora External Content'
-type: file
-plugin: emit_file_event
-configuration:
-  queue: islandora-indexing-fcrepo-file-external
-  event: Update
diff --git a/config/export/system.action.index_media_in_fedora.yml b/config/export/system.action.index_media_in_fedora.yml
deleted file mode 100644
index 817a73fff..000000000
--- a/config/export/system.action.index_media_in_fedora.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 4bb8a9fb-5912-4f08-9660-928e802e761a
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: mggprUkJ7WPux2lwvNaiJEp73bAvL9o-F7rw44wrguk
-id: index_media_in_fedora
-label: 'Index Media in Fedora'
-type: media
-plugin: emit_media_event
-configuration:
-  queue: islandora-indexing-fcrepo-media
-  event: Update
diff --git a/config/export/system.action.index_media_in_triplestore.yml b/config/export/system.action.index_media_in_triplestore.yml
deleted file mode 100644
index d1fbc8d56..000000000
--- a/config/export/system.action.index_media_in_triplestore.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: a89cfe24-d34b-4276-bbf0-59d6f1e7c505
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: Baw3Jc9LnpN1yTsFvNF-VMf3RsOI5Elda0qGVe5ZST4
-id: index_media_in_triplestore
-label: 'Index Media in Triplestore'
-type: media
-plugin: emit_media_event
-configuration:
-  queue: islandora-indexing-triplestore-index
-  event: Update
diff --git a/config/export/system.action.index_node_in_fedora.yml b/config/export/system.action.index_node_in_fedora.yml
deleted file mode 100644
index 9c4c8e3c1..000000000
--- a/config/export/system.action.index_node_in_fedora.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: e5f25b73-aa74-40ca-849b-815dc03a3c92
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: _S3JJNzS4L5nrHQbO9UACv7dcyihkgpYzgCIkfjFWuI
-id: index_node_in_fedora
-label: 'Index Node in Fedora'
-type: node
-plugin: emit_node_event
-configuration:
-  queue: islandora-indexing-fcrepo-content
-  event: Update
diff --git a/config/export/system.action.index_node_in_triplestore.yml b/config/export/system.action.index_node_in_triplestore.yml
deleted file mode 100644
index e0c7bfa2c..000000000
--- a/config/export/system.action.index_node_in_triplestore.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 1d47fa08-2571-4597-b32a-17f0eee643ae
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: CIHJp-1-hHxdMtn-OcBmmLslijtCoBs1Hj0c3MWjD2M
-id: index_node_in_triplestore
-label: 'Index Node in Triplestore'
-type: node
-plugin: emit_node_event
-configuration:
-  queue: islandora-indexing-triplestore-index
-  event: Update
diff --git a/config/export/system.action.index_taxonomy_term_in_fedora.yml b/config/export/system.action.index_taxonomy_term_in_fedora.yml
deleted file mode 100644
index 4956b43e0..000000000
--- a/config/export/system.action.index_taxonomy_term_in_fedora.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: fb21b341-d94f-4536-b2d0-8b79001d22b9
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: 0B7OiLQjFhZXcas_HOMqgt-3eSVv186aLAQCc3zEmXA
-id: index_taxonomy_term_in_fedora
-label: 'Index taxonomy term in Fedora'
-type: taxonomy_term
-plugin: emit_term_event
-configuration:
-  queue: islandora-indexing-fcrepo-content
-  event: Update
diff --git a/config/export/system.action.index_taxonomy_term_in_the_triplestore.yml b/config/export/system.action.index_taxonomy_term_in_the_triplestore.yml
deleted file mode 100644
index c3404435d..000000000
--- a/config/export/system.action.index_taxonomy_term_in_the_triplestore.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: 904e4421-cdc6-4124-bef5-bb7695f55901
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-_core:
-  default_config_hash: lVY7W4LHB6_HxBHjyDxbIxWYuErh94oFaN3yE9IgtKM
-id: index_taxonomy_term_in_the_triplestore
-label: 'Index Taxonomy Term in the Triplestore'
-type: taxonomy_term
-plugin: emit_term_event
-configuration:
-  queue: islandora-indexing-triplestore-index
-  event: Update
diff --git a/config/export/system.action.media_delete_action.yml b/config/export/system.action.media_delete_action.yml
deleted file mode 100644
index deeb6178c..000000000
--- a/config/export/system.action.media_delete_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: f158c2a4-f611-481c-b9fd-25f1449056db
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: FrZy1tmuXJcOxhXlBoI1Hsnen5TT-9OCC1iolWH84go
-id: media_delete_action
-label: 'Delete media'
-type: media
-plugin: 'entity:delete_action:media'
-configuration: {  }
diff --git a/config/export/system.action.media_publish_action.yml b/config/export/system.action.media_publish_action.yml
deleted file mode 100644
index c7e394606..000000000
--- a/config/export/system.action.media_publish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 9892ddc8-b2ab-4eb7-a9c8-42b2d1b11c3e
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: nh83qNNrmWE-CDdHz2MdFOAk60T9mzv3R-MaKfZR2jw
-id: media_publish_action
-label: 'Publish media'
-type: media
-plugin: 'entity:publish_action:media'
-configuration: {  }
diff --git a/config/export/system.action.media_save_action.yml b/config/export/system.action.media_save_action.yml
deleted file mode 100644
index 2f61b7096..000000000
--- a/config/export/system.action.media_save_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 56285147-b9ae-4af7-8fdc-a27cba68dced
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: VVyUA6PIaVeGtcIbgEWqJ6SYDiJdReBeojFswURFpKs
-id: media_save_action
-label: 'Save media'
-type: media
-plugin: 'entity:save_action:media'
-configuration: {  }
diff --git a/config/export/system.action.media_unpublish_action.yml b/config/export/system.action.media_unpublish_action.yml
deleted file mode 100644
index c96a417b3..000000000
--- a/config/export/system.action.media_unpublish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: a07bb825-a999-48ab-a281-1bedd8678fe7
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-_core:
-  default_config_hash: CsK6TseQ2DatEbZgbd30swOlZ28_HHwAESU2LvEnWq0
-id: media_unpublish_action
-label: 'Unpublish media'
-type: media
-plugin: 'entity:unpublish_action:media'
-configuration: {  }
diff --git a/config/export/system.action.node_delete_action.yml b/config/export/system.action.node_delete_action.yml
deleted file mode 100644
index 5d21477a7..000000000
--- a/config/export/system.action.node_delete_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: a6352cf3-7884-4183-8789-bed05d675536
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: t43OqwzP3CTbcAagSsWKNy6KwMm_zShXo3c4-So6rQg
-id: node_delete_action
-label: 'Delete content'
-type: node
-plugin: 'entity:delete_action:node'
-configuration: {  }
diff --git a/config/export/system.action.node_make_sticky_action.yml b/config/export/system.action.node_make_sticky_action.yml
deleted file mode 100644
index e70b16db2..000000000
--- a/config/export/system.action.node_make_sticky_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: a515ec76-0298-4eba-ac56-a1a4902c1b86
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: sOb26JSy3fGpWkvR0WYN6_hMqj_6d1rvbvrkzp1yya0
-id: node_make_sticky_action
-label: 'Make content sticky'
-type: node
-plugin: node_make_sticky_action
-configuration: {  }
diff --git a/config/export/system.action.node_make_unsticky_action.yml b/config/export/system.action.node_make_unsticky_action.yml
deleted file mode 100644
index 8e776a94f..000000000
--- a/config/export/system.action.node_make_unsticky_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 12444de2-6b6b-4b0d-85ad-49d1ac5a7ed3
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: lDM9mvIGAu8Sw8rt-uCO4Sr7yX5VPrDPxYcawkbKd6k
-id: node_make_unsticky_action
-label: 'Make content unsticky'
-type: node
-plugin: node_make_unsticky_action
-configuration: {  }
diff --git a/config/export/system.action.node_promote_action.yml b/config/export/system.action.node_promote_action.yml
deleted file mode 100644
index fa9fa77fa..000000000
--- a/config/export/system.action.node_promote_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 7902fa4f-4a75-4d84-a1cb-6fe041df7f4d
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: N0RDBTqiK4dKoN4p4oW2j0SGWycdHyALUe9M-Ofp89U
-id: node_promote_action
-label: 'Promote content to front page'
-type: node
-plugin: node_promote_action
-configuration: {  }
diff --git a/config/export/system.action.node_publish_action.yml b/config/export/system.action.node_publish_action.yml
deleted file mode 100644
index 240d67719..000000000
--- a/config/export/system.action.node_publish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 88f5b604-d5aa-4b20-bd27-366326380e0c
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: 2B9uF8NL5gutNKSdPRAhhAsDWFZZG1PJOBmx0aBGd_0
-id: node_publish_action
-label: 'Publish content'
-type: node
-plugin: 'entity:publish_action:node'
-configuration: {  }
diff --git a/config/export/system.action.node_save_action.yml b/config/export/system.action.node_save_action.yml
deleted file mode 100644
index 5786e38a6..000000000
--- a/config/export/system.action.node_save_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 2ccecf23-4020-459b-90f6-b8058a068380
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: LhdsoZPL_pFas2fjaAWue4zvrQ_tEVofLYtcNec-JGM
-id: node_save_action
-label: 'Save content'
-type: node
-plugin: 'entity:save_action:node'
-configuration: {  }
diff --git a/config/export/system.action.node_unpromote_action.yml b/config/export/system.action.node_unpromote_action.yml
deleted file mode 100644
index 0139799f6..000000000
--- a/config/export/system.action.node_unpromote_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 6508544d-c9c7-43ad-b042-60808af844f5
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: JBptjnfuOMtsdKygklXxoOgeOCTMtQxlkymjnnj-cC0
-id: node_unpromote_action
-label: 'Remove content from front page'
-type: node
-plugin: node_unpromote_action
-configuration: {  }
diff --git a/config/export/system.action.node_unpublish_action.yml b/config/export/system.action.node_unpublish_action.yml
deleted file mode 100644
index 99c2415ed..000000000
--- a/config/export/system.action.node_unpublish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 2836afa1-8950-480b-8b9d-f2e1cd7daee0
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-_core:
-  default_config_hash: C7X8h9FWlwkQ9y5mnU2JzgaZICAdc6HFbPVbhvjlAYE
-id: node_unpublish_action
-label: 'Unpublish content'
-type: node
-plugin: 'entity:unpublish_action:node'
-configuration: {  }
diff --git a/config/export/system.action.pathauto_update_alias_node.yml b/config/export/system.action.pathauto_update_alias_node.yml
deleted file mode 100644
index 00db9ea43..000000000
--- a/config/export/system.action.pathauto_update_alias_node.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-uuid: 25bf79e0-61f2-44ab-b26a-2f0298e85c27
-langcode: en
-status: true
-dependencies:
-  module:
-    - pathauto
-  enforced:
-    module:
-      - node
-_core:
-  default_config_hash: lno8QThS348UX-kaUsagJtCnuPHKLXYnTQiF_9HSDWA
-id: pathauto_update_alias_node
-label: 'Update URL alias'
-type: node
-plugin: pathauto_update_alias
-configuration: {  }
diff --git a/config/export/system.action.pathauto_update_alias_user.yml b/config/export/system.action.pathauto_update_alias_user.yml
deleted file mode 100644
index 14ea8a7bc..000000000
--- a/config/export/system.action.pathauto_update_alias_user.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-uuid: 70a17d75-6941-4ddf-a711-22b4c00d4d3c
-langcode: en
-status: true
-dependencies:
-  module:
-    - pathauto
-  enforced:
-    module:
-      - user
-_core:
-  default_config_hash: x_ok_ZsfA4Xk4B_hVW3O4-3PcNoK57nXLz_Dlletidg
-id: pathauto_update_alias_user
-label: 'Update URL alias'
-type: user
-plugin: pathauto_update_alias
-configuration: {  }
diff --git a/config/export/system.action.taxonomy_term_publish_action.yml b/config/export/system.action.taxonomy_term_publish_action.yml
deleted file mode 100644
index c3e460e56..000000000
--- a/config/export/system.action.taxonomy_term_publish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 247fdbdf-6e90-4912-9c97-7082e52cfe1b
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-_core:
-  default_config_hash: DoVt_VGgVLcDD4XmVbSFzr0K17SJy9imFiYusKkJBgY
-id: taxonomy_term_publish_action
-label: 'Publish taxonomy term'
-type: taxonomy_term
-plugin: 'entity:publish_action:taxonomy_term'
-configuration: {  }
diff --git a/config/export/system.action.taxonomy_term_unpublish_action.yml b/config/export/system.action.taxonomy_term_unpublish_action.yml
deleted file mode 100644
index db0ad0eb7..000000000
--- a/config/export/system.action.taxonomy_term_unpublish_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: e671b1b3-7c4b-432a-9b7f-2e5422284004
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-_core:
-  default_config_hash: z2sNRM3ECa7FPCGnSNje_9SmZJQgwhD_6fG_L4Mr8zI
-id: taxonomy_term_unpublish_action
-label: 'Unpublish taxonomy term'
-type: taxonomy_term
-plugin: 'entity:unpublish_action:taxonomy_term'
-configuration: {  }
diff --git a/config/export/system.action.user_add_role_action.administrator.yml b/config/export/system.action.user_add_role_action.administrator.yml
deleted file mode 100644
index 6d5bf4662..000000000
--- a/config/export/system.action.user_add_role_action.administrator.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 3f0480b6-b088-47ae-9675-d1e69c796ad3
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.administrator
-  module:
-    - user
-id: user_add_role_action.administrator
-label: 'Add the Administrator role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: administrator
diff --git a/config/export/system.action.user_add_role_action.content_editor.yml b/config/export/system.action.user_add_role_action.content_editor.yml
deleted file mode 100644
index 26c96b873..000000000
--- a/config/export/system.action.user_add_role_action.content_editor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: c61546bd-5446-47e6-bb6b-141088469bfd
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.content_editor
-  module:
-    - user
-id: user_add_role_action.content_editor
-label: 'Add the Content editor role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: content_editor
diff --git a/config/export/system.action.user_add_role_action.fedoraadmin.yml b/config/export/system.action.user_add_role_action.fedoraadmin.yml
deleted file mode 100644
index 464199ef1..000000000
--- a/config/export/system.action.user_add_role_action.fedoraadmin.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 1e5c1d1f-c2b3-4bd6-89b2-f7792f06a24c
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.fedoraadmin
-  module:
-    - user
-id: user_add_role_action.fedoraadmin
-label: 'Add the fedoraAdmin role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: fedoraadmin
diff --git a/config/export/system.action.user_block_user_action.yml b/config/export/system.action.user_block_user_action.yml
deleted file mode 100644
index b61434200..000000000
--- a/config/export/system.action.user_block_user_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: deda75aa-2477-4b21-b749-2469466b48e5
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: DyypzTfThX10FFQw-399qPfEbLLyrhXgQrKPVsmAoJ4
-id: user_block_user_action
-label: 'Block the selected user(s)'
-type: user
-plugin: user_block_user_action
-configuration: {  }
diff --git a/config/export/system.action.user_cancel_user_action.yml b/config/export/system.action.user_cancel_user_action.yml
deleted file mode 100644
index 81b9b69b8..000000000
--- a/config/export/system.action.user_cancel_user_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: ed4ff769-04af-46c0-a125-84c4638ac975
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: nvrL9bFilzBvm2bjO9rQnFDpBA7dBBUjShSSt6NS-DU
-id: user_cancel_user_action
-label: 'Cancel the selected user account(s)'
-type: user
-plugin: user_cancel_user_action
-configuration: {  }
diff --git a/config/export/system.action.user_remove_role_action.administrator.yml b/config/export/system.action.user_remove_role_action.administrator.yml
deleted file mode 100644
index 317e6e304..000000000
--- a/config/export/system.action.user_remove_role_action.administrator.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: f7d7eb67-8a4d-4ed0-bc38-18f5d3c4ee9d
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.administrator
-  module:
-    - user
-id: user_remove_role_action.administrator
-label: 'Remove the Administrator role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: administrator
diff --git a/config/export/system.action.user_remove_role_action.content_editor.yml b/config/export/system.action.user_remove_role_action.content_editor.yml
deleted file mode 100644
index 93332e78a..000000000
--- a/config/export/system.action.user_remove_role_action.content_editor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 60d2f582-b32a-4a19-9e1b-635ccd76f239
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.content_editor
-  module:
-    - user
-id: user_remove_role_action.content_editor
-label: 'Remove the Content editor role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: content_editor
diff --git a/config/export/system.action.user_remove_role_action.fedoraadmin.yml b/config/export/system.action.user_remove_role_action.fedoraadmin.yml
deleted file mode 100644
index c823b7eb6..000000000
--- a/config/export/system.action.user_remove_role_action.fedoraadmin.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 81a7d78a-07bc-4b80-81c3-8fd13bb76971
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.fedoraadmin
-  module:
-    - user
-id: user_remove_role_action.fedoraadmin
-label: 'Remove the fedoraAdmin role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: fedoraadmin
diff --git a/config/export/system.action.user_unblock_user_action.yml b/config/export/system.action.user_unblock_user_action.yml
deleted file mode 100644
index a451dbf48..000000000
--- a/config/export/system.action.user_unblock_user_action.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 9b08f2c7-0a94-47a0-8736-e79371c710a9
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: SPsUXsR3Rc8d1y3gewzaAKWa1ncea_ywXX3f7LTn7k0
-id: user_unblock_user_action
-label: 'Unblock the selected user(s)'
-type: user
-plugin: user_unblock_user_action
-configuration: {  }
diff --git a/config/export/system.action.video_generate_a_service_file_from_an_original_file.yml b/config/export/system.action.video_generate_a_service_file_from_an_original_file.yml
deleted file mode 100644
index fb8d4d025..000000000
--- a/config/export/system.action.video_generate_a_service_file_from_an_original_file.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 6f9b12af-7284-4483-ac83-3d1186725eef
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_video
-_core:
-  default_config_hash: fdxzPkMjk-KBCT4JczgzrEvCLzpApnpqGvAS4GSjPXA
-id: video_generate_a_service_file_from_an_original_file
-label: 'Video - Generate a service file from an original file'
-type: node
-plugin: generate_video_derivative
-configuration:
-  queue: islandora-connector-homarus
-  event: 'Generate Derivative'
-  destination_media_type: video
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ServiceFile'
-  mimetype: video/mp4
-  args: ''
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].mp4'
diff --git a/config/export/system.action.video_generate_a_thumbnail_at_0_00_03.yml b/config/export/system.action.video_generate_a_thumbnail_at_0_00_03.yml
deleted file mode 100644
index 7bf091f5c..000000000
--- a/config/export/system.action.video_generate_a_thumbnail_at_0_00_03.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: fcdd7fbb-0caf-44da-9a60-01e97b90226e
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_image
-id: video_generate_a_thumbnail_at_0_00_03
-label: 'Video - Generate a thumbnail at 0:00:03'
-type: node
-plugin: generate_image_derivative
-configuration:
-  queue: islandora-connector-homarus
-  event: 'Generate Derivative'
-  destination_media_type: image
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ThumbnailImage'
-  mimetype: image/jpeg
-  args: '-ss 00:00:03.000 -frames 1 -vf scale=100:-2'
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid].jpg'
diff --git a/config/export/system.action.video_generate_a_thumbnail_from_an_original_file.yml b/config/export/system.action.video_generate_a_thumbnail_from_an_original_file.yml
deleted file mode 100644
index 25e7fc0d5..000000000
--- a/config/export/system.action.video_generate_a_thumbnail_from_an_original_file.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-uuid: 268f456d-9c3f-40dd-bd5d-353091f510c0
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora_image
-_core:
-  default_config_hash: zJAB_kDZ0_QkGZXm1jiM3gqQX632DV3a9WQRCNVnQEA
-id: video_generate_a_thumbnail_from_an_original_file
-label: 'Video - Generate a thumbnail from an original file'
-type: node
-plugin: generate_image_derivative
-configuration:
-  queue: islandora-connector-homarus
-  event: 'Generate Derivative'
-  destination_media_type: image
-  source_term_uri: 'http://pcdm.org/use#OriginalFile'
-  derivative_term_uri: 'http://pcdm.org/use#ThumbnailImage'
-  mimetype: image/jpeg
-  args: '-ss 00:00:01.000 -frames 1 -vf scale=100:-2'
-  scheme: public
-  path: '[date:custom:Y]-[date:custom:m]/[node:nid]-[term:name].jpg'
diff --git a/config/export/system.advisories.yml b/config/export/system.advisories.yml
deleted file mode 100644
index 2ad53d6e5..000000000
--- a/config/export/system.advisories.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: x0FuQ_7Cg81mSDQwG028_Z0CjH3R9ib5IDlHeV2BbAo
-enabled: true
-interval_hours: 6
diff --git a/config/export/system.cron.yml b/config/export/system.cron.yml
deleted file mode 100644
index 49e58a00c..000000000
--- a/config/export/system.cron.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-_core:
-  default_config_hash: 5Pw921y1EPfFN98wykliBBLArm51pC-SmrXeYCe7d0Y
-threshold:
-  requirements_warning: 172800
-  requirements_error: 1209600
-logging: 1
diff --git a/config/export/system.date.yml b/config/export/system.date.yml
deleted file mode 100644
index 9fa466be6..000000000
--- a/config/export/system.date.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-_core:
-  default_config_hash: t7clj3mzmOGrXX0HuCH5usf0vEqRtnMTBFVBIEmZ5pc
-first_day: 0
-country:
-  default: ''
-timezone:
-  default: America/Chicago
-  user:
-    configurable: true
-    default: 0
-    warn: false
diff --git a/config/export/system.diff.yml b/config/export/system.diff.yml
deleted file mode 100644
index f2fff7b30..000000000
--- a/config/export/system.diff.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: 1WanmaEhxW_vM8_5Ktsdntj8MaO9UBHXg0lN603PsWM
-context:
-  lines_leading: 2
-  lines_trailing: 2
diff --git a/config/export/system.file.yml b/config/export/system.file.yml
deleted file mode 100644
index de4742464..000000000
--- a/config/export/system.file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: mguGHCYb9Dw5EcpfjwoShGV1Vjkbz3QuPRCLfxiye-g
-allow_insecure_uploads: false
-default_scheme: public
-temporary_maximum_age: 21600
diff --git a/config/export/system.image.gd.yml b/config/export/system.image.gd.yml
deleted file mode 100644
index 2d812667b..000000000
--- a/config/export/system.image.gd.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: eNXaHfkJJUThHeF0nvkoXyPLRrKYGxgHRjORvT4F5rQ
-jpeg_quality: 75
diff --git a/config/export/system.image.yml b/config/export/system.image.yml
deleted file mode 100644
index 2e18f7fc5..000000000
--- a/config/export/system.image.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: durWHaKeBaq4d9Wpi4RqwADj1OufDepcnJuhVLmKN24
-toolkit: gd
diff --git a/config/export/system.logging.yml b/config/export/system.logging.yml
deleted file mode 100644
index d6164de51..000000000
--- a/config/export/system.logging.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
-error_level: hide
diff --git a/config/export/system.mail.yml b/config/export/system.mail.yml
deleted file mode 100644
index 419e77e58..000000000
--- a/config/export/system.mail.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: rYgt7uhPafP2ngaN_ZUPFuyI4KdE0zU868zLNSlzKoE
-interface:
-  default: php_mail
diff --git a/config/export/system.maintenance.yml b/config/export/system.maintenance.yml
deleted file mode 100644
index 65a36d202..000000000
--- a/config/export/system.maintenance.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: 1SNdA25INsV5YjlgAJtfC-6AM8VcWe_00xneMLb2yFg
-langcode: en
-message: '@site is currently under maintenance. We should be back shortly. Thank you for your patience.'
diff --git a/config/export/system.menu.account.yml b/config/export/system.menu.account.yml
deleted file mode 100644
index 218a5a7f4..000000000
--- a/config/export/system.menu.account.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 8a057fb7-aab7-4903-9e6f-5dd0349dce80
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: M_Bh81osDyUQ4wV0GgU_NdBNqkzM87sLxjaCdFj9mnw
-id: account
-label: 'User account menu'
-description: 'Links related to the active user account'
-locked: true
diff --git a/config/export/system.menu.admin.yml b/config/export/system.menu.admin.yml
deleted file mode 100644
index 09c17ad8c..000000000
--- a/config/export/system.menu.admin.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 4b1b6d45-83bc-4dbc-a598-580a847e1cca
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: sapEi2YDGoI9yQIT_WgIV2vUdQ6DScH0V3fAyTadAL0
-id: admin
-label: Administration
-description: 'Administrative task links'
-locked: true
diff --git a/config/export/system.menu.devel.yml b/config/export/system.menu.devel.yml
deleted file mode 100644
index 26eb05903..000000000
--- a/config/export/system.menu.devel.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-uuid: 846b21c4-0739-4da6-906b-607d7d548da2
-langcode: en
-status: true
-dependencies:
-  enforced:
-    module:
-      - devel
-_core:
-  default_config_hash: 3V-l1uuTcyirYOGLPZV5HWaDfr02uEbWZJIwc8Byz-c
-id: devel
-label: Development
-description: 'Links related to Devel module.'
-locked: true
diff --git a/config/export/system.menu.footer.yml b/config/export/system.menu.footer.yml
deleted file mode 100644
index 00251a50c..000000000
--- a/config/export/system.menu.footer.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: f436710e-e25c-4ab2-ad63-27eb24794305
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 7yrlW5z9zdg2eBucB2GPqXKSMQfH9lSRSO4DbWF7AFc
-id: footer
-label: Footer
-description: 'Site information links'
-locked: true
diff --git a/config/export/system.menu.main.yml b/config/export/system.menu.main.yml
deleted file mode 100644
index 0b01dcc7c..000000000
--- a/config/export/system.menu.main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: ac707d23-45bf-4681-b382-19cd3c4cd29e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: Q2Ra3jfoIVk0f3SjxJX61byRQFVBAbpzYDQOiY-kno8
-id: main
-label: 'Main Library Navigation'
-description: 'Links to the different libraries.'
-locked: true
diff --git a/config/export/system.menu.tools.yml b/config/export/system.menu.tools.yml
deleted file mode 100644
index ade4e2cf4..000000000
--- a/config/export/system.menu.tools.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 97b4052a-18ae-4a64-aa72-28f009c43dfc
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: BCM-vV1zzRaLHN18dqAR_CuGOj8AFJvTx7BKl_8Gcxc
-id: tools
-label: Tools
-description: 'User tool links, often added by modules'
-locked: true
diff --git a/config/export/system.performance.yml b/config/export/system.performance.yml
deleted file mode 100644
index 6b57fb61b..000000000
--- a/config/export/system.performance.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-_core:
-  default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
-cache:
-  page:
-    max_age: 0
-css:
-  preprocess: false
-  gzip: true
-fast_404:
-  enabled: true
-  paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i'
-  exclude_paths: '/\/(?:styles|imagecache)\//'
-  html: '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>'
-js:
-  preprocess: false
-  gzip: true
-stale_file_threshold: 2592000
diff --git a/config/export/system.rss.yml b/config/export/system.rss.yml
deleted file mode 100644
index d8062089e..000000000
--- a/config/export/system.rss.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: MIpNzlG4gPunfS7vTCwUPum6QH3GUsEBMj-qS631Jw0
-items:
-  view_mode: rss
diff --git a/config/export/system.site.yml b/config/export/system.site.yml
deleted file mode 100644
index 0719da71a..000000000
--- a/config/export/system.site.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-_core:
-  default_config_hash: VDJxTZtQR21qB4lvOq8zszJZLvLKrSPQpdn2E3T71Ww
-langcode: en
-uuid: 86955ff9-1be3-40ad-84ae-414c65ae901c
-name: 'Johns Hopkins Sheridan Libraries digital collections'
-mail: digital-library@mail395.jh.edu
-slogan: 'A service of the Sheridan Libraries that uses digital technology to collect, preserve, and provide access to unique library research collections as well.'
-page:
-  403: '/user/login?destination=document.location.pathname'
-  404: ''
-  front: /front_page
-admin_compact_mode: false
-weight_select_max: 100
-default_langcode: en
diff --git a/config/export/system.theme.global.yml b/config/export/system.theme.global.yml
deleted file mode 100644
index 46ce63bee..000000000
--- a/config/export/system.theme.global.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-_core:
-  default_config_hash: 9rAU4Pku7eMBQxauQqAgjzlcicFZ2As6zEa6zvTlCB8
-favicon:
-  mimetype: image/vnd.microsoft.icon
-  path: ''
-  url: ''
-  use_default: true
-features:
-  comment_user_picture: true
-  comment_user_verification: true
-  favicon: true
-  node_user_picture: true
-logo:
-  path: ''
-  url: ''
-  use_default: true
diff --git a/config/export/system.theme.yml b/config/export/system.theme.yml
deleted file mode 100644
index 2d87187ee..000000000
--- a/config/export/system.theme.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-_core:
-  default_config_hash: eJ529VM1gSIA_vgTy2PdiDvJuG0xhSxfQjCyl5WKlv4
-admin: claro
-default: idc_ui_theme_boots
diff --git a/config/export/taxonomy.settings.yml b/config/export/taxonomy.settings.yml
deleted file mode 100644
index 0e3837de0..000000000
--- a/config/export/taxonomy.settings.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-_core:
-  default_config_hash: zKpaWT6cJc1tVQQaTqatGELaCqU_oyRym6zTl27Yias
-maintain_index_table: true
-override_selector: false
-terms_per_page_admin: 100
diff --git a/config/export/taxonomy.vocabulary.copyright_and_use.yml b/config/export/taxonomy.vocabulary.copyright_and_use.yml
deleted file mode 100644
index 229a674a4..000000000
--- a/config/export/taxonomy.vocabulary.copyright_and_use.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-uuid: fd3aaaf8-d4de-41aa-825f-af268acb71ba
-langcode: en
-status: true
-dependencies: {  }
-name: 'Copyright and Use'
-vid: copyright_and_use
-description: 'Copyright and Use uses RightsStatements.org to "communicate the copyright and re-use status of digital objects to the public."'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.corporate_body.yml b/config/export/taxonomy.vocabulary.corporate_body.yml
deleted file mode 100644
index 9a6a6c90d..000000000
--- a/config/export/taxonomy.vocabulary.corporate_body.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 1d41e6c1-659a-4118-8248-4e58813fdd7e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: yJCIaRn817xheJ5ZxlH81SsHrBpPBYZVVPUUV5Haza8
-name: 'Corporate Body'
-vid: corporate_body
-description: 'An organization or group of persons that is identified by a particular name and that acts, or may act, as an entity. Also includes an individual acting in a corporate capacity.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.country.yml b/config/export/taxonomy.vocabulary.country.yml
deleted file mode 100644
index d69d1e5ba..000000000
--- a/config/export/taxonomy.vocabulary.country.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: f10d5dfb-e0de-4992-be6d-f0bb55bb29c5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: ZmvFNlF7NGcdrtE5K7JR0KQtIt8wULJt1H47Ne_UaJM
-name: Country
-vid: country
-description: 'The MARC Code List for Countries contains a list of places and their associated two- or three-character lowercase alphabetic cod'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.family.yml b/config/export/taxonomy.vocabulary.family.yml
deleted file mode 100644
index c60fcd3e9..000000000
--- a/config/export/taxonomy.vocabulary.family.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 2dc95da2-e679-4492-b324-985cebfb2ea5
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: qvIxu5RfXdaq6t-KKeKlEKj18LAQCISdXIBGhJfs8sI
-name: Family
-vid: family
-description: 'Two or more people related through marriage, birth, adoption, or other legal manner, or who present themselves as a family.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.frequencies.yml b/config/export/taxonomy.vocabulary.frequencies.yml
deleted file mode 100644
index 8f13a6765..000000000
--- a/config/export/taxonomy.vocabulary.frequencies.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: b8c53deb-2c40-4b89-b202-c6c93dc6b251
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: pVJnB7MAcLfehjyrC7yJfLKSVlZylkQvpVoAsjuCxuE
-name: Frequency
-vid: frequencies
-description: 'Terms to express publication frequency'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.genre.yml b/config/export/taxonomy.vocabulary.genre.yml
deleted file mode 100644
index 2845a8fca..000000000
--- a/config/export/taxonomy.vocabulary.genre.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 17dfe564-96a9-433b-a29a-ec3ba7d4e56e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: GtwZmHfoUe9zdJe_uX6oD5CU40m-0jfjiDk5USbdHMc
-name: Genre
-vid: genre
-description: 'A term or terms that designate a category characterizing a particular style, form, or content, such as artistic, musical, literary composition, etc.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.geo_location.yml b/config/export/taxonomy.vocabulary.geo_location.yml
deleted file mode 100644
index 41c12f045..000000000
--- a/config/export/taxonomy.vocabulary.geo_location.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: c351aff9-e6a7-4ac1-a11b-87cf2054728d
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: DGBtA4Guj6o9TTftr2O379-c-FNIxOtbTMKn8qQAbrI
-name: 'Geographic Location'
-vid: geo_location
-description: 'Geographic area(s) and places to which the records pertain.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.islandora_display.yml b/config/export/taxonomy.vocabulary.islandora_display.yml
deleted file mode 100644
index 8cf5334b9..000000000
--- a/config/export/taxonomy.vocabulary.islandora_display.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 15c3d280-e244-4100-9c3d-7f3b525d3008
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: oZpIVf9joDsh79SE19vhkXbQfifQfaQB0xXT6ERj-IM
-name: 'Islandora Display'
-vid: islandora_display
-description: 'Terms used to alter how a repository item is viewed. ie. basic image vs large image'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.islandora_media_use.yml b/config/export/taxonomy.vocabulary.islandora_media_use.yml
deleted file mode 100644
index 916f28600..000000000
--- a/config/export/taxonomy.vocabulary.islandora_media_use.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: bde62948-7491-4cd0-890d-bcc92fb9d55c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: uxsQkswnjZpTqAtUqoqPpTwnJKSGFGx0jYPUjeGzeeY
-name: 'Islandora Media Use'
-vid: islandora_media_use
-description: 'Terms to define how a media object is to be used.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.islandora_models.yml b/config/export/taxonomy.vocabulary.islandora_models.yml
deleted file mode 100644
index 98b795ec5..000000000
--- a/config/export/taxonomy.vocabulary.islandora_models.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 742c4155-74ae-4b08-978e-2500fb0baa92
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: NqoIlPmdlM_yTGM0Ze7b8NuFkX-xF9m-YKgx4o3nmSQ
-name: 'Islandora Models'
-vid: islandora_models
-description: 'Types of repository objects'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.issuance_modes.yml b/config/export/taxonomy.vocabulary.issuance_modes.yml
deleted file mode 100644
index 9fd62225d..000000000
--- a/config/export/taxonomy.vocabulary.issuance_modes.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 025b4238-3fd8-481b-8702-cbb69bb7561a
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: 099O1E0OSvJplyaB3497n9JyKTZWwwpdhte_pJ73zYM
-name: 'Issuance Mode'
-vid: issuance_modes
-description: 'Terms from Library of Congress'' MARC Issuance List vocabulary'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.language.yml b/config/export/taxonomy.vocabulary.language.yml
deleted file mode 100644
index ec41324c6..000000000
--- a/config/export/taxonomy.vocabulary.language.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 1b264d3a-8784-4f4c-8d8c-38bfae15868e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: G4w8uzqFCblUQ6pFa1EBJtVxpBLKH9sWZX1VncabSkw
-name: Language
-vid: language
-description: 'Codes to describe language of resource content. Intended for use with ISO639-2'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.person.yml b/config/export/taxonomy.vocabulary.person.yml
deleted file mode 100644
index 3318a95d2..000000000
--- a/config/export/taxonomy.vocabulary.person.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 3084f5ff-19a1-49b4-9aa4-4e9e1cfdf978
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: GAHBiBARA1hdVQoJq1P1oyK47vGxwTr3vyiPsnwqD44
-name: Person
-vid: person
-description: 'An individual of the human species. '
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.physical_form.yml b/config/export/taxonomy.vocabulary.physical_form.yml
deleted file mode 100644
index 9c5fd3ebd..000000000
--- a/config/export/taxonomy.vocabulary.physical_form.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: e6000fe5-658a-42b7-a530-9763052fd3d9
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: JnLuasMMjQLVW639703WjVKY46ruA1KQDKfAwAITysg
-name: 'Physical Form'
-vid: physical_form
-description: 'A designation of a particular physical presentation of a resource, including the physical form or medium of material for a resou'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.resource_types.yml b/config/export/taxonomy.vocabulary.resource_types.yml
deleted file mode 100644
index 8f203218b..000000000
--- a/config/export/taxonomy.vocabulary.resource_types.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 003043b9-04ee-45d2-9c64-81548b78b55c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: tcyfAGtPfozbmd4cDt41tx83H_y01kzvHdFTD9CXHZk
-name: 'Resource Types'
-vid: resource_types
-description: 'See http://purl.org/dc/dcmitype/ and http://id.loc.gov/vocabulary/resourceTypes.html (a nested list of types).'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.subject.yml b/config/export/taxonomy.vocabulary.subject.yml
deleted file mode 100644
index 6611ffd2d..000000000
--- a/config/export/taxonomy.vocabulary.subject.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: b6a382ca-c03d-4ab4-a1b1-ed25b613556c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: FbKJCP8hHad8W3AR8WNWA56OJD--aW9qGrqTzyIMVDM
-name: Subject
-vid: subject
-description: 'Subject matter to which the records pertain, such as topics, events, people, and organizations.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.tags.yml b/config/export/taxonomy.vocabulary.tags.yml
deleted file mode 100644
index 4828f9a10..000000000
--- a/config/export/taxonomy.vocabulary.tags.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: 8d11923b-b865-42eb-a026-4332b037fe2b
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: yoNVreoTdTZTY7GuE8fI9Jmxqdz8vlo4ZJKixMNSosw
-name: Tags
-vid: tags
-description: 'Use tags to group articles on similar topics into categories.'
-weight: 0
diff --git a/config/export/taxonomy.vocabulary.temporal_subjects.yml b/config/export/taxonomy.vocabulary.temporal_subjects.yml
deleted file mode 100644
index 45ed18b1a..000000000
--- a/config/export/taxonomy.vocabulary.temporal_subjects.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-uuid: df21e62c-d2f1-4bce-bbbe-999ee683b82c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: IaNlO4qrmB2pECrwmlQdDhh7SOdOqVoO_QGwGXALAe0
-name: 'Temporal Subjects'
-vid: temporal_subjects
-description: 'Subject terms expressing periods of time'
-weight: 0
diff --git a/config/export/taxonomy_manager.settings.yml b/config/export/taxonomy_manager.settings.yml
deleted file mode 100644
index 023652973..000000000
--- a/config/export/taxonomy_manager.settings.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-taxonomy_manager_disable_mouseover: 0
-taxonomy_manager_pager_tree_page_size: 250
diff --git a/config/export/text.settings.yml b/config/export/text.settings.yml
deleted file mode 100644
index a295c7ea2..000000000
--- a/config/export/text.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: Bkewb77RBOK3_aXMPsp8p87gbc03NvmC5gBLzPl7hVA
-default_summary_length: 600
diff --git a/config/export/tour.tour.block-layout.yml b/config/export/tour.tour.block-layout.yml
deleted file mode 100644
index 7870e9755..000000000
--- a/config/export/tour.tour.block-layout.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 1871b024-d6e2-40ae-a391-9aaf2fc9deb7
-langcode: en
-status: true
-dependencies:
-  module:
-    - block
-_core:
-  default_config_hash: ructO0IOsghR3CIbNd-0QfLTDiUo8gIJ7mB_nxSil4o
-id: block-layout
-label: 'Block Layout Page'
-module: block
-routes:
-  -
-    route_name: block.admin_display
-tips:
-  block-layout:
-    id: block-layout
-    plugin: text
-    label: 'Block Layout'
-    weight: 1
-    body: 'Blocks are boxes of content rendered into an area, or region, of a web page that can be displayed in regions (such as footer or sidebar) on your page.'
-  place-block:
-    id: place-block
-    plugin: text
-    label: 'Place Blocks'
-    weight: 2
-    selector: .button--small
-    body: 'Any custom or contributed block can be added to a particular region by clicking on a button Place block. A new block can also be created by clicking on Place Block'
-  block-region:
-    id: block-region
-    plugin: text
-    label: 'Block Region'
-    weight: 3
-    selector: .block-region-select
-    body: 'Assign or change the region of a block by clicking here. A dropdown list with all the regions will appear. You can place one block in multiple regions.'
-  configure-block:
-    id: configure-block
-    plugin: text
-    label: 'Configure Block'
-    weight: 4
-    selector: .dropbutton-widget
-    body: 'By Clicking on "Configure" you can go ahead and edit the contents of the block, deal with the visibility settings and even change the placement of where it is on your theme.'
-  custom-block-library:
-    id: custom-block-library
-    plugin: text
-    label: 'Custom Block Library'
-    weight: 5
-    body: 'The block management screen also has an another tab on the top which is used to add Custom blocks. The name of the tab is "Custom block library". This tab ultimately provides a link to add custom blocks.'
diff --git a/config/export/tour.tour.language-add.yml b/config/export/tour.tour.language-add.yml
deleted file mode 100644
index d4e58c40b..000000000
--- a/config/export/tour.tour.language-add.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-uuid: aeefdb8d-9eb6-443a-811d-278d49bef53e
-langcode: en
-status: true
-dependencies:
-  module:
-    - language
-_core:
-  default_config_hash: vcDd9H0uIlyOQGoVAJuD3ADMnQeRR_X3B-ojyb8Cbnc
-id: language-add
-label: 'Adding languages'
-module: language
-routes:
-  -
-    route_name: language.add
-tips:
-  language-add-overview:
-    id: language-add-overview
-    plugin: text
-    label: 'Adding languages'
-    weight: 1
-    body: '<p>This page provides the ability to add common languages to your site.</p><p>If the desired language is not available, you can add a custom language.</p>'
-  language-add-choose:
-    id: language-add-choose
-    plugin: text
-    label: 'Select language'
-    weight: 2
-    selector: '#edit-predefined-langcode'
-    body: '<p>Choose a language from the list, or choose "Custom language..." at the end of the list.</p><p>Click the "Add language" button when you are done choosing your language.</p><p>When adding a custom language, you will get an additional form where you can provide the name, code, and direction of the language.</p>'
-  language-add-continue:
-    id: language-add-continue
-    plugin: text
-    label: 'Continuing on'
-    weight: 3
-    body: '<p>Now that you have an overview of the "Add languages" feature, you can continue by:<ul><li>Adding a language</li><li>Adding a custom language</li><li><a href="[site:url]admin/config/regional/language">Viewing configured languages</a></li></ul></p>'
diff --git a/config/export/tour.tour.language-edit.yml b/config/export/tour.tour.language-edit.yml
deleted file mode 100644
index 2b18022b2..000000000
--- a/config/export/tour.tour.language-edit.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: f1d57d8b-09e6-4e72-be15-eec1e288ebdf
-langcode: en
-status: true
-dependencies:
-  module:
-    - language
-_core:
-  default_config_hash: gjYvYwMqulNsq7VmScWKOqEUxar9AX0TvG8vfCCguUQ
-id: language-edit
-label: 'Editing languages'
-module: language
-routes:
-  -
-    route_name: entity.configurable_language.edit_form
-tips:
-  language-edit-overview:
-    id: language-edit-overview
-    plugin: text
-    label: 'Editing languages'
-    weight: 1
-    body: '<p>This page provides the ability to edit a language on your site, including custom languages.</p>'
-  language-edit-langcode:
-    id: language-edit-langcode
-    plugin: text
-    label: 'Language code'
-    weight: 2
-    selector: '#edit-langcode-view'
-    body: '<p>You cannot change the code of a language on the site, since it is used by the system to keep track of the language.</p>'
-  language-edit-label:
-    id: language-edit-label
-    plugin: text
-    label: 'Language name'
-    weight: 3
-    selector: '#edit-label'
-    body: '<p>The language name is used throughout the site for all users and is written in English. Names of built-in languages can be translated using the Interface Translation module, and names of both built-in and custom languages can be translated using the Configuration Translation module.</p>'
-  language-edit-direction:
-    id: language-edit-direction
-    plugin: text
-    label: 'Language direction'
-    weight: 4
-    selector: '#edit-direction--wrapper--description'
-    body: '<p>Choose if the language is a "Left to right" or "Right to left" language.</p><p>Note that not all themes support "Right to left" layouts, so test your theme if you are using "Right to left".</p>'
-  language-edit-continue:
-    id: language-edit-continue
-    plugin: text
-    label: 'Continuing on'
-    weight: 5
-    body: '<p>Now that you have an overview of the "Edit language" feature, you can continue by:<ul><li>Editing a language</li><li><a href="[site:url]admin/config/regional/language">Viewing configured languages</a></li></ul></p>'
diff --git a/config/export/tour.tour.language.yml b/config/export/tour.tour.language.yml
deleted file mode 100644
index 8b0d57348..000000000
--- a/config/export/tour.tour.language.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-uuid: 362b237c-1acb-4da3-abf3-dcc71e01523d
-langcode: en
-status: true
-dependencies:
-  module:
-    - language
-_core:
-  default_config_hash: Okz8QMYRGvq95nqLGYjp8gLiy93DKoMEzEVZVwEeg4M
-id: language
-label: Language
-module: language
-routes:
-  -
-    route_name: entity.configurable_language.collection
-tips:
-  language-overview:
-    id: language-overview
-    plugin: text
-    label: Languages
-    weight: 1
-    body: '<p>The "Languages" page allows you to add, edit, delete, and reorder languages for the site.</p>'
-  language-add:
-    id: language-add
-    plugin: text
-    label: 'Adding languages'
-    weight: 2
-    selector: .button-action
-    body: '<p>To add more languages to your site, click the "Add language" button.</p><p>Added languages will be displayed in the language list and can then be edited or deleted.</p>'
-  language-reorder:
-    id: language-reorder
-    plugin: text
-    label: 'Reordering languages'
-    weight: 3
-    selector: .draggable
-    body: '<p>To reorder the languages on your site, use the drag icons next to each language.</p><p>The order shown here is the display order for language lists on the site such as in the language switcher blocks provided by the Interface Translation and Content Translation modules.</p><p>When you are done with reordering the languages, click the "Save configuration" button for the changes to take effect.</p>'
-  language-default:
-    id: language-default
-    plugin: text
-    label: 'Set a language as default'
-    weight: 4
-    selector: .js-form-item-site-default-language
-    body: '<p>You can change the default language of the site by choosing one of your configured languages as default. The site will use the default language in situations where no choice is made but a language should be set, for example as the language of the displayed interface.</p>'
-  language-operations:
-    id: language-operations
-    plugin: text
-    label: 'Modifying languages'
-    weight: 5
-    selector: .dropbutton-wrapper
-    body: '<p>Operations are provided for editing and deleting your languages.</p><p>You can edit the name and the direction of the language.</p><p>Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.</p>'
-  language-continue:
-    id: language-continue
-    plugin: text
-    label: 'Continuing on'
-    weight: 6
-    body: '<p>Now that you have an overview of the "Languages" page, you can continue by:<ul><li><a href="[site:url]admin/config/regional/language/add">Adding a language</a></li><li>Reordering languages</li><li>Editing a language</li><li>Deleting a language</li></ul></p>'
diff --git a/config/export/tour.tour.search-api-index-fields.yml b/config/export/tour.tour.search-api-index-fields.yml
deleted file mode 100644
index 648d3975f..000000000
--- a/config/export/tour.tour.search-api-index-fields.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-uuid: 2308c8aa-da89-4554-b263-52500a430d18
-langcode: en
-status: true
-dependencies:
-  module:
-    - search_api
-_core:
-  default_config_hash: mP2RtTYiDo6dp1q8hXxx2Wgr_1ZvtN7AijjXrwFQV_k
-id: search-api-index-fields
-label: 'Fields indexed in this index'
-module: search_api
-routes:
-  -
-    route_name: entity.search_api_index.fields
-tips:
-  search-api-index-fields-introduction:
-    id: search-api-index-fields-introduction
-    plugin: text
-    label: 'Fields indexed in this index'
-    weight: 1
-    body: 'This page lists which fields are indexed in this index, grouped by datasource. (Datasource-independent fields are listed under "General".) Indexed fields can be used to add filters or sorting to views or other search displays based on the index. Fields with type "Fulltext" can also be used for fulltext searching.'
-  search-api-index-fields-add:
-    id: search-api-index-fields-add
-    plugin: text
-    label: 'Add fields'
-    weight: 2
-    selector: '.button-action[data-drupal-selector="edit-add-field"]'
-    body: 'With the "Add fields" button you can add additional fields to this index.'
-  search-api-index-fields-label:
-    id: search-api-index-fields-label
-    plugin: text
-    label: Label
-    weight: 3
-    selector: '.details-wrapper:nth(0) table thead th:nth(0)'
-    body: 'A label for the field that will be used to refer to the field in most places in the user interface.'
-  search-api-index-fields-machine-name:
-    id: search-api-index-fields-machine-name
-    plugin: text
-    label: 'Machine name'
-    weight: 4
-    selector: '.details-wrapper:nth(0) table thead th:nth(1)'
-    body: 'The internal ID to use for this field. Can safely be ignored by inexperienced users in most cases. Changing a field''s machine name requires reindexing of the index.'
-  search-api-index-fields-property-path:
-    id: search-api-index-fields-property-path
-    plugin: text
-    label: 'Property path'
-    weight: 5
-    selector: '.details-wrapper:nth(0) table thead th:nth(2)'
-    body: 'The internal relationship linking the indexed item to the field, with links being separated by colons (:). This can be useful information for advanced users, but can otherwise be ignored.'
-  search-api-index-fields-type:
-    id: search-api-index-fields-type
-    plugin: text
-    label: Type
-    weight: 6
-    selector: '.details-wrapper:nth(0) table thead th:nth(3)'
-    body: 'The data type to use when indexing the field. Determines how a field can be used in searches. For information on the available types, see the <a href="#search-api-data-types-table">"Data types" box</a> at the bottom of the page.'
-  search-api-index-fields-boost:
-    id: search-api-index-fields-boost
-    plugin: text
-    label: Boost
-    weight: 7
-    selector: '.details-wrapper:nth(0) table thead th:nth(4)'
-    body: 'Only applicable for fulltext fields. Determines how "important" the field is compared to other fulltext fields, to influence scoring of fulltext searches.'
-  search-api-index-fields-edit:
-    id: search-api-index-fields-edit
-    plugin: text
-    label: 'Edit field'
-    weight: 8
-    selector: '.details-wrapper:nth(0) table tbody td:nth(5) a'
-    body: 'Some fields have additional configuration available, in which case an "Edit" link is displayed in the "Operations" column.'
-  search-api-index-fields-remove:
-    id: search-api-index-fields-remove
-    plugin: text
-    label: 'Remove field'
-    weight: 9
-    selector: '.details-wrapper:nth(0) table tbody td:nth(6) a'
-    body: 'Removes a field from the index again. (Note: Sometimes, a field is required (for example, by a processor) and cannot be removed.)'
-  search-api-index-fields-submit:
-    id: search-api-index-fields-submit
-    plugin: text
-    label: 'Save changes'
-    weight: 10
-    selector: '#edit-actions-submit'
-    body: 'This saves all changes made to the fields for this index. Until this button is pressed, all added, changed or removed fields will only be stored temporarily and not effect the actual index used in the rest of the site.'
-  search-api-index-fields-cancel:
-    id: search-api-index-fields-cancel
-    plugin: text
-    label: 'Cancel changes'
-    weight: 10
-    selector: '#edit-actions-cancel'
-    body: 'If you have made changes to the index''s fields but not yet saved them, the "Cancel" link lets you discard those changes.'
diff --git a/config/export/tour.tour.search-api-index-form.yml b/config/export/tour.tour.search-api-index-form.yml
deleted file mode 100644
index 898889c3a..000000000
--- a/config/export/tour.tour.search-api-index-form.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-uuid: 4d072e61-7e4b-47d4-aa7b-bdd56035a854
-langcode: en
-status: true
-dependencies:
-  module:
-    - search_api
-_core:
-  default_config_hash: TK3PjpP4I6WFh5JDY_L_c5XCiTyAZBBA9z0M9pcGjzo
-id: search-api-index-form
-label: 'Add or edit a Search API index'
-module: search_api
-routes:
-  -
-    route_name: entity.search_api_index.add_form
-  -
-    route_name: entity.search_api_index.edit_form
-tips:
-  search-api-index-form-introduction:
-    id: search-api-index-form-introduction
-    plugin: text
-    label: 'Adding or editing an index'
-    weight: 1
-    body: 'This form can be used to edit an existing index or add a new index to your site. Indexes define a set of data that will be indexed and can then be searched.'
-  search-api-index-form-name:
-    id: search-api-index-form-name
-    plugin: text
-    label: 'Index name'
-    weight: 2
-    selector: '#edit-name'
-    body: 'Enter a name to identify this index. For example, "Content index". This will only be displayed in the admin user interface.'
-  search-api-index-form-datasources:
-    id: search-api-index-form-datasources
-    plugin: text
-    label: Datasources
-    weight: 3
-    selector: '#edit-datasources'
-    body: 'Datasources define the types of items that will be indexed in this index. By default, all content entities (like content, comments and taxonomy terms) will be available here, but modules can also add their own.'
-  search-api-index-form-tracker:
-    id: search-api-index-form-tracker
-    plugin: text
-    label: Tracker
-    weight: 4
-    selector: '#edit-tracker'
-    body: 'An index''s tracker is the system that keeps track of which items there are available for the index, and which of them still need to be indexed. Changing the tracker of an existing index will lead to reindexing of all items.'
-  search-api-index-form-server:
-    id: search-api-index-form-server
-    plugin: text
-    label: Server
-    weight: 5
-    selector: '#edit-server'
-    body: 'The search server that the index should use for indexing and searching. If no server is selected here, the index cannot be enabled. An index can only have one server, but a server can have any number of indexes.'
-  search-api-index-form-description:
-    id: search-api-index-form-description
-    plugin: text
-    label: 'Index description'
-    weight: 6
-    selector: '#edit-description'
-    body: 'Optionally, enter a description to explain the function of the index in more detail. This will only be displayed in the admin user interface.'
-  search-api-index-form-options:
-    id: search-api-index-form-options
-    plugin: text
-    label: 'Advanced options'
-    weight: 7
-    selector: '#edit-options'
-    body: 'These options allow more detailed configuration of index behavior, but can usually safely be ignored by inexperienced users.'
diff --git a/config/export/tour.tour.search-api-index-processors.yml b/config/export/tour.tour.search-api-index-processors.yml
deleted file mode 100644
index 89236b96e..000000000
--- a/config/export/tour.tour.search-api-index-processors.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-uuid: 92088203-577a-47cb-ab14-c0fa3ddf602b
-langcode: en
-status: true
-dependencies:
-  module:
-    - search_api
-_core:
-  default_config_hash: LqXAZO_yZPho3Pueh85e-NzQ3DmI5rNBf6_q8McKUqc
-id: search-api-index-processors
-label: 'Processors used for this index'
-module: search_api
-routes:
-  -
-    route_name: entity.search_api_index.processors
-tips:
-  search-api-index-processors-introduction:
-    id: search-api-index-processors-introduction
-    plugin: text
-    label: 'Processors used for this index'
-    weight: 1
-    body: 'Processors customize different aspects of an index''s functionality. They can keep items from being indexed, change how certain fields are indexed and influence searches.'
-  search-api-index-processors-enable:
-    id: search-api-index-processors-enable
-    plugin: text
-    label: 'Enable processors'
-    weight: 2
-    selector: '#edit-status'
-    body: 'This lists all processors available for this index and lets you choose the ones that should be active. (Note: Some processors cannot be disabled.)'
-  search-api-index-processors-weights:
-    id: search-api-index-processors-weights
-    plugin: text
-    label: 'Processor order'
-    weight: 3
-    selector: '#edit-weights'
-    body: 'This shows you which enabled processors will be active in the different parts of the indexing/searching workflow, and lets you re-arrange them. This should usually not be necessary, and only be used by advanced users as some processors will lead to unexpected results when used in the wrong order.'
-  search-api-index-processors-settings:
-    id: search-api-index-processors-settings
-    plugin: text
-    label: 'Processor settings'
-    weight: 4
-    selector: .form-type-vertical-tabs
-    body: 'Some processors have additional configuration available, which you are able to change here.'
diff --git a/config/export/tour.tour.search-api-index.yml b/config/export/tour.tour.search-api-index.yml
deleted file mode 100644
index 7c6b3fd9b..000000000
--- a/config/export/tour.tour.search-api-index.yml
+++ /dev/null
@@ -1,98 +0,0 @@
-uuid: 52606ba4-7c6d-4131-bfd5-28d6ac78e824
-langcode: en
-status: true
-dependencies:
-  module:
-    - search_api
-_core:
-  default_config_hash: vrJLX_BEpVcWa6OU7FvRAUfErBOxQBhPtzuKeNo4M2M
-id: search-api-index
-label: 'Information about an index'
-module: search_api
-routes:
-  -
-    route_name: entity.search_api_index.canonical
-tips:
-  search-api-index-introduction:
-    id: search-api-index-introduction
-    plugin: text
-    label: 'Information about an index'
-    weight: 1
-    body: 'This page shows a summary of a search index and its status.'
-  search-api-index-index-status:
-    id: search-api-index-index-status
-    plugin: text
-    label: 'Index status'
-    weight: 2
-    selector: .search-api-index-status
-    body: 'This gives a summary about how many items are known for this index, and how many have been indexed in their latest version. Items that are not indexed yet cannot be found by searches.'
-  search-api-index-status:
-    id: search-api-index-status
-    plugin: text
-    label: Status
-    weight: 3
-    selector: .search-api-index-summary--status
-    body: 'Shows whether the index is currently enabled or disabled.'
-  search-api-index-datasources:
-    id: search-api-index-datasources
-    plugin: text
-    label: Datasources
-    weight: 4
-    selector: .search-api-index-summary--datasource
-    body: 'Lists all datasources that are enabled for this index.'
-  search-api-index-tracker:
-    id: search-api-index-tracker
-    plugin: text
-    label: Tracker
-    weight: 5
-    selector: .search-api-index-summary--tracker
-    body: 'The tracker used by the index. Only one ("Default") is available by default.'
-  search-api-index-server:
-    id: search-api-index-server
-    plugin: text
-    label: Server
-    weight: 6
-    selector: .search-api-index-summary--server
-    body: 'If the index is attached to a server, this server is listed here.'
-  search-api-index-server-index-status:
-    id: search-api-index-server-index-status
-    plugin: text
-    label: 'Server index status'
-    weight: 7
-    selector: .search-api-index-summary--server-index-status
-    body: 'For enabled indexes, the number of items that can actually be retrieved from the server is listed here. For reasons why this number might differ from the number under "Index status", <a href="https://www.drupal.org/docs/8/modules/search-api/getting-started/frequently-asked-questions#server-index-status">see the module''s documentation</a>.'
-  search-api-index-cron-batch-size:
-    id: search-api-index-cron-batch-size
-    plugin: text
-    label: 'Cron batch size'
-    weight: 8
-    selector: .search-api-index-summary--cron-batch-size
-    body: 'The number of items that will be indexed at once during cron runs.'
-  search-api-index-index-now:
-    id: search-api-index-remove
-    plugin: text
-    label: 'Start indexing now'
-    weight: 9
-    selector: '#edit-index'
-    body: 'The "Start indexing now" form allows indexing items manually right away, with a batch process. Otherwise, items are only indexed during cron runs. The form might be disabled if indexing is currently not possible for some reason, or not necessary.'
-  search-api-index-tracking:
-    id: search-api-index-tracking
-    plugin: text
-    label: 'Track items for index'
-    weight: 10
-    selector: '#edit-tracking'
-    body: 'In certain situations, the index''s tracker doesn''t have the latest state of the items available for indexing. This will be automatically rectified during cron runs, but can also be manually triggered here, with the "Track now" button.'
-  search-api-index-reindex:
-    id: search-api-index-reindex
-    plugin: text
-    label: 'Queue all items for reindexing'
-    weight: 11
-    selector: '#edit-reindex'
-    body: 'This will queue all items on this index for reindexing. Previously indexed data will remain on the search server, so searches on this index will continue to yield results.'
-  search-api-index-clear:
-    id: search-api-index-clear
-    plugin: text
-    label: 'Clear all indexed data'
-    weight: 12
-    selector: '#edit-clear'
-    body: 'This will remove all indexed content for this index from the search server and queue it for reindexing. Searches on this index will not return any results until items are reindexed.'
diff --git a/config/export/tour.tour.search-api-server-form.yml b/config/export/tour.tour.search-api-server-form.yml
deleted file mode 100644
index e0ec8b258..000000000
--- a/config/export/tour.tour.search-api-server-form.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-uuid: 22dea7a2-5d39-4a0e-9e70-c7394fe46418
-langcode: en
-status: true
-dependencies:
-  module:
-    - search_api
-_core:
-  default_config_hash: wiTKND8Vi_2guGPCSCjciyClZs7LVIQ_ruTzlkE_Bg0
-id: search-api-server-form
-label: 'Add or edit a Search API server'
-module: search_api
-routes:
-  -
-    route_name: entity.search_api_server.add_form
-  -
-    route_name: entity.search_api_server.edit_form
-tips:
-  search-api-server-form-introduction:
-    id: search-api-server-form-introduction
-    plugin: text
-    label: 'Adding or editing a Server'
-    weight: 1
-    body: 'This form can be used to edit an existing server or add a new server to your site. Servers will hold your indexed data.'
-  search-api-server-form-name:
-    id: search-api-server-form-name
-    plugin: text
-    label: 'Server name'
-    weight: 2
-    selector: '#edit-name'
-    body: 'Enter a name to identify this server. For example, "Solr server". This will only be displayed in the admin user interface.'
-  search-api-server-form-description:
-    id: search-api-server-form-description
-    plugin: text
-    label: 'Server description'
-    weight: 3
-    selector: '#edit-description'
-    body: 'Optionally, enter a description to explain the function of the server in more detail. This will only be displayed in the admin user interface.'
-  search-api-server-form-backend:
-    id: search-api-server-form-backend
-    plugin: text
-    label: 'Server backend'
-    weight: 4
-    selector: '#edit-backend'
-    body: 'Servers can be based on different technologies. These are called "backends". A server uses exactly one backend and cannot change it later. You can make the "Database" backend available by enabling the "Database Search" module. Another very common backend is <a href="https://www.drupal.org/project/search_api_solr">"Solr"</a>, which requires to be set up separately.'
diff --git a/config/export/tour.tour.search-api-server.yml b/config/export/tour.tour.search-api-server.yml
deleted file mode 100644
index 7251ca4d3..000000000
--- a/config/export/tour.tour.search-api-server.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-uuid: 9deb74ea-6443-4fbc-a55c-04146bca4fb0
-langcode: en
-status: true
-dependencies:
-  module:
-    - search_api
-_core:
-  default_config_hash: j-YgGnx-C5I3OTFsDsNkTyPC8zH7ZQyBMvmZ6gUMH3Q
-id: search-api-server
-label: 'Information about a server'
-module: search_api
-routes:
-  -
-    route_name: entity.search_api_server.canonical
-tips:
-  search-api-server-introduction:
-    id: search-api-server-introduction
-    plugin: text
-    label: 'Information about a server'
-    weight: 1
-    body: 'This page shows a summary of a search server.'
-  search-api-server-status:
-    id: search-api-server-status
-    plugin: text
-    label: Status
-    weight: 2
-    selector: .search-api-server-summary--status
-    body: 'Shows whether the server is currently enabled or disabled.'
-  search-api-server-backend:
-    id: search-api-server-backend
-    plugin: text
-    label: 'Backend class'
-    weight: 3
-    selector: .search-api-server-summary--backend
-    body: 'The backend plugin used for this server. The backend plugin determines how items are indexed and searched – for example, using the database or an Apache Solr server.'
-  search-api-server-indexes:
-    id: search-api-server-indexes
-    plugin: text
-    label: 'Search indexes'
-    weight: 4
-    selector: .search-api-server-summary--indexes
-    body: 'Lists all search indexes that are attached to this server.'
-  search-api-server-clear:
-    id: search-api-server-clear
-    plugin: text
-    label: 'Delete all indexed data'
-    weight: 5
-    selector: '#edit-clear'
-    body: 'This will permanently remove all data currently indexed on this server for indexes that aren''t read-only. Items are queued for reindexing. Until reindexing occurs, searches for the affected indexes will not return any results.'
diff --git a/config/export/tour.tour.views-ui.yml b/config/export/tour.tour.views-ui.yml
deleted file mode 100644
index 145ac470a..000000000
--- a/config/export/tour.tour.views-ui.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-uuid: 75b0da91-50f9-4812-ab50-df98448fa350
-langcode: en
-status: true
-dependencies:
-  module:
-    - views_ui
-_core:
-  default_config_hash: XIYL1KF7ND2XQRa5AxvEcp8vgCN2kUGiuBNhCgxrPME
-id: views-ui
-label: 'View edit page'
-module: views_ui
-routes:
-  -
-    route_name: entity.view.edit_form
-  -
-    route_name: entity.view.edit_display_form
-tips:
-  views-main:
-    id: views-main
-    plugin: text
-    label: 'Manage view settings'
-    weight: 1
-    body: 'View or edit the configuration.'
-  views-ui-displays:
-    id: views-ui-displays
-    plugin: text
-    label: 'Displays in this view'
-    weight: 2
-    selector: '#views-display-top'
-    body: 'A display is a way of outputting the results, e.g., as a page or a block. A view can contain multiple displays, which are listed here. The active display is highlighted.'
-  views-ui-view-admin:
-    id: views-ui-view-admin
-    plugin: text
-    label: 'View administration'
-    weight: 3
-    position: right
-    selector: '#views-display-extra-actions'
-    body: 'Perform administrative tasks, including adding a description and creating a clone. Click the drop-down button to view the available options.'
-  views-ui-format:
-    id: views-ui-format
-    plugin: text
-    label: 'Output format'
-    weight: 4
-    selector: .views-ui-display-tab-bucket.format
-    body: 'Choose how to output results. E.g., choose <em>Content</em> to output each item completely, using your configured display settings. Or choose <em>Fields</em>, which allows you to output only specific fields for each result. Additional formats can be added by installing modules to <em>extend</em> Drupal''s base functionality.'
-  views-ui-fields:
-    id: views-ui-fields
-    plugin: text
-    label: Fields
-    weight: 5
-    selector: .views-ui-display-tab-bucket.field
-    body: 'If this view uses fields, they are listed here. You can click on a field to configure it.'
-  views-ui-filter:
-    id: views-ui-filter
-    plugin: text
-    label: 'Filter your view'
-    weight: 6
-    selector: .views-ui-display-tab-bucket.filter
-    body: 'Add filters to limit the results in the output. E.g., to only show content that is <em>published</em>, you would add a filter for <em>Published</em> and select <em>Yes</em>.'
-  views-ui-filter-operations:
-    id: views-ui-filter-operations
-    plugin: text
-    label: 'Filter actions'
-    weight: 7
-    selector: '.views-ui-display-tab-bucket.filter .dropbutton-widget'
-    body: 'Add, rearrange or remove filters.'
-  views-ui-sorts:
-    id: views-ui-sorts
-    plugin: text
-    label: 'Sort Criteria'
-    weight: 8
-    selector: .views-ui-display-tab-bucket.sort
-    body: 'Control the order in which the results are output. Click on an active sort rule to configure it.'
-  views-ui-sorts-operations:
-    id: views-ui-sorts-operations
-    plugin: text
-    label: 'Sort actions'
-    weight: 9
-    selector: '.views-ui-display-tab-bucket.sort .dropbutton-widget'
-    body: 'Add, rearrange or remove sorting rules.'
-  views-ui-preview:
-    id: views-ui-preview
-    plugin: text
-    label: Preview
-    weight: 10
-    position: right
-    selector: '#preview-submit'
-    body: 'Show a preview of the view output.'
diff --git a/config/export/update.settings.yml b/config/export/update.settings.yml
deleted file mode 100644
index 61c8912e4..000000000
--- a/config/export/update.settings.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-_core:
-  default_config_hash: 2QzULf0zovJQx3J06Y9rufzzfi-CY2CTTlEfJJh2Qyw
-check:
-  disabled_extensions: false
-  interval_days: 1
-fetch:
-  url: ''
-  max_attempts: 2
-  timeout: 30
-notification:
-  emails:
-    - admin@example.com
-  threshold: all
diff --git a/config/export/user.flood.yml b/config/export/user.flood.yml
deleted file mode 100644
index 4eb3644f2..000000000
--- a/config/export/user.flood.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-_core:
-  default_config_hash: UYfMzeP1S8jKm9PSvxf7nQNe8DsNS-3bc2WSNNXBQWs
-uid_only: false
-ip_limit: 50
-ip_window: 3600
-user_limit: 5
-user_window: 21600
diff --git a/config/export/user.mail.yml b/config/export/user.mail.yml
deleted file mode 100644
index bf425c0e9..000000000
--- a/config/export/user.mail.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-_core:
-  default_config_hash: 6CZIzFifRq3qbdq3n3nDpEOO4hWIQtKOAQNPvGNGKeM
-langcode: en
-cancel_confirm:
-  subject: 'Account cancellation request for [user:display-name] at [site:name]'
-  body: |-
-    [user:display-name]
-
-    A request to cancel your account has been made at [site:name].
-
-    You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser:
-
-    [user:cancel-url]
-
-    NOTE: The cancellation of your account is not reversible.
-
-    This link expires in one day and nothing will happen if it is not used.
-
-    --  [site:name] team
-password_reset:
-  subject: 'Replacement login information for [user:display-name] at [site:name]'
-  body: |-
-    [user:display-name],
-
-    A request to reset the password for your account has been made at [site:name].
-
-    You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used.
-
-    --  [site:name] team
-register_admin_created:
-  subject: 'An administrator created an account for you at [site:name]'
-  body: |-
-    [user:display-name],
-
-    A site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password.
-
-    After setting your password, you will be able to log in at [site:login-url] in the future using:
-
-    username: [user:name]
-    password: Your password
-
-    --  [site:name] team
-register_no_approval_required:
-  subject: 'Account details for [user:display-name] at [site:name]'
-  body: |-
-    [user:display-name],
-
-    Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password.
-
-    After setting your password, you will be able to log in at [site:login-url] in the future using:
-
-    username: [user:name]
-    password: Your password
-
-    --  [site:name] team
-register_pending_approval:
-  subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
-  body: |-
-    [user:display-name],
-
-    Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another email containing information about how to log in, set your password, and other details.
-
-    --  [site:name] team
-register_pending_approval_admin:
-  subject: 'Account details for [user:display-name] at [site:name] (pending admin approval)'
-  body: |-
-    [user:display-name] has applied for an account.
-
-    [user:edit-url]
-status_activated:
-  subject: 'Account details for [user:display-name] at [site:name] (approved)'
-  body: |-
-    [user:display-name],
-
-    Your account at [site:name] has been activated.
-
-    You may now log in by clicking this link or copying and pasting it into your browser:
-
-    [user:one-time-login-url]
-
-    This link can only be used once to log in and will lead you to a page where you can set your password.
-
-    After setting your password, you will be able to log in at [site:login-url] in the future using:
-
-    username: [user:account-name]
-    password: Your password
-
-    --  [site:name] team
-status_blocked:
-  subject: 'Account details for [user:display-name] at [site:name] (blocked)'
-  body: |-
-    [user:display-name],
-
-    Your account on [site:name] has been blocked.
-
-    --  [site:name] team
-status_canceled:
-  subject: 'Account details for [user:display-name] at [site:name] (canceled)'
-  body: |-
-    [user:display-name],
-
-    Your account on [site:name] has been canceled.
-
-    --  [site:name] team
\ No newline at end of file
diff --git a/config/export/user.role.administrator.yml b/config/export/user.role.administrator.yml
deleted file mode 100644
index 00a396606..000000000
--- a/config/export/user.role.administrator.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: 8d5aba43-6a48-4042-92e7-d02a9805f27c
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: OeKGIkmZA_c-t6QLH81WNQx8gDCc1MRmxaTuQgxBByU
-id: administrator
-label: Administrator
-weight: 3
-is_admin: true
-permissions: {  }
diff --git a/config/export/user.role.anonymous.yml b/config/export/user.role.anonymous.yml
deleted file mode 100644
index 5331c0f95..000000000
--- a/config/export/user.role.anonymous.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-uuid: ce58ac50-c550-4c0d-b832-67a91c600104
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.restricted_html
-  module:
-    - comment
-    - contact
-    - filter
-    - media
-    - system
-_core:
-  default_config_hash: 6WavjUYXIegP9AAg2zXGx54MWIVoomC3SZhNiqe-Dyk
-id: anonymous
-label: 'Anonymous user'
-weight: 0
-is_admin: false
-permissions:
-  - 'access comments'
-  - 'access content'
-  - 'access site-wide contact form'
-  - 'use text format restricted_html'
-  - 'view media'
diff --git a/config/export/user.role.authenticated.yml b/config/export/user.role.authenticated.yml
deleted file mode 100644
index f93aaa460..000000000
--- a/config/export/user.role.authenticated.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-uuid: f5555792-2d53-441a-b8ce-0d027735281b
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.basic_html
-  module:
-    - comment
-    - contact
-    - filter
-    - matomo
-    - media
-    - shortcut
-    - system
-_core:
-  default_config_hash: I44QAB4es39lNzMQWiJLq2dfjX7VRSOzT_5KzAcUq_M
-id: authenticated
-label: 'Authenticated user'
-weight: 1
-is_admin: false
-permissions:
-  - 'access comments'
-  - 'access content'
-  - 'access shortcuts'
-  - 'access site-wide contact form'
-  - 'opt-in or out of matomo tracking'
-  - 'post comments'
-  - 'skip comment approval'
-  - 'use text format basic_html'
-  - 'view media'
diff --git a/config/export/user.role.content_editor.yml b/config/export/user.role.content_editor.yml
deleted file mode 100644
index bf6a45782..000000000
--- a/config/export/user.role.content_editor.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-uuid: 2262c52c-b1b6-43ab-8ecc-a86fa9353b1f
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.article
-    - node.type.page
-    - taxonomy.vocabulary.tags
-  module:
-    - comment
-    - contextual
-    - file
-    - node
-    - path
-    - system
-    - taxonomy
-    - toolbar
-    - tour
-_core:
-  default_config_hash: Wur9kcEOwY1Jal81NssKnz3RhVJxAvBwyWQBGcA_1Go
-id: content_editor
-label: 'Content editor'
-weight: 2
-is_admin: false
-permissions:
-  - 'access administration pages'
-  - 'access content overview'
-  - 'access contextual links'
-  - 'access files overview'
-  - 'access toolbar'
-  - 'access tour'
-  - 'administer url aliases'
-  - 'create article content'
-  - 'create page content'
-  - 'create terms in tags'
-  - 'create url aliases'
-  - 'delete article revisions'
-  - 'delete own article content'
-  - 'delete own page content'
-  - 'delete page revisions'
-  - 'edit own article content'
-  - 'edit own comments'
-  - 'edit own page content'
-  - 'edit terms in tags'
-  - 'revert all revisions'
-  - 'view all revisions'
-  - 'view own unpublished content'
-  - 'view the administration theme'
diff --git a/config/export/user.role.fedoraadmin.yml b/config/export/user.role.fedoraadmin.yml
deleted file mode 100644
index 8c097d252..000000000
--- a/config/export/user.role.fedoraadmin.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-uuid: 562ed874-38cf-4a77-962a-2f21f755d96e
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: e6W733rBSNmewsIQsvWQ-8mIE5H-CIeArLBwIbN5vVQ
-id: fedoraadmin
-label: fedoraAdmin
-weight: 3
-is_admin: null
-permissions: {  }
diff --git a/config/export/user.settings.yml b/config/export/user.settings.yml
deleted file mode 100644
index 8f5526902..000000000
--- a/config/export/user.settings.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-_core:
-  default_config_hash: '-htDFWUv1S4OlJMzta2nhFl4QbhJvu0D9xsJ-clxo-M'
-langcode: en
-anonymous: Anonymous
-verify_mail: true
-notify:
-  cancel_confirm: true
-  password_reset: true
-  status_activated: true
-  status_blocked: false
-  status_canceled: false
-  register_admin_created: true
-  register_no_approval_required: true
-  register_pending_approval: true
-register: visitors_admin_approval
-cancel_method: user_cancel_block
-password_reset_timeout: 86400
-password_strength: true
diff --git a/config/export/views.settings.yml b/config/export/views.settings.yml
deleted file mode 100644
index d56d772dc..000000000
--- a/config/export/views.settings.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-_core:
-  default_config_hash: uZHsLrDp1ThO0RvupHKcPzLOyVvWexm58JTTHNDo7yc
-display_extenders:
-  matomo: matomo
-skip_cache: true
-sql_signature: false
-ui:
-  show:
-    additional_queries: false
-    advanced_column: false
-    default_display: false
-    performance_statistics: false
-    preview_information: true
-    sql_query:
-      enabled: false
-      where: above
-    display_embed: true
-  always_live_preview: true
-  exposed_filter_any_label: old_any
-field_rewrite_elements:
-  div: DIV
-  span: SPAN
-  h1: H1
-  h2: H2
-  h3: H3
-  h4: H4
-  h5: H5
-  h6: H6
-  p: P
-  header: HEADER
-  footer: FOOTER
-  article: ARTICLE
-  section: SECTION
-  aside: ASIDE
-  details: DETAILS
-  blockquote: BLOCKQUOTE
-  figure: FIGURE
-  address: ADDRESS
-  code: CODE
-  pre: PRE
-  var: VAR
-  samp: SAMP
-  kbd: KBD
-  strong: STRONG
-  em: EM
-  del: DEL
-  ins: INS
-  q: Q
-  s: S
diff --git a/config/export/views.view.all_taxonomy_terms.yml b/config/export/views.view.all_taxonomy_terms.yml
deleted file mode 100644
index af1f2f354..000000000
--- a/config/export/views.view.all_taxonomy_terms.yml
+++ /dev/null
@@ -1,173 +0,0 @@
-uuid: c2c46a2a-1c1f-4169-85de-891e5905e168
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-    - user
-_core:
-  default_config_hash: EMrY7V_KkNrRyfCQ585e6jFayYcmfEd3UXz0Oau_Sug
-id: all_taxonomy_terms
-label: 'All Taxonomy Terms'
-module: views
-description: 'Not sure if used? See new Taxonomy Terms view.'
-tag: ''
-base_table: taxonomy_term_field_data
-base_field: tid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          convert_spaces: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: taxonomy_term_field_data
-          field: status
-          entity_type: taxonomy_term
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.archive.yml b/config/export/views.view.archive.yml
deleted file mode 100644
index dce806de5..000000000
--- a/config/export/views.view.archive.yml
+++ /dev/null
@@ -1,247 +0,0 @@
-uuid: 65a81e4b-14de-4dae-b281-cc5ecc6c3c6c
-langcode: en
-status: false
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-  module:
-    - node
-    - user
-_core:
-  default_config_hash: ko9GznzNBXHkuz09OCaBQ1YOSJYYjTY0TBpNV3WKnog
-id: archive
-label: Archive
-module: node
-description: 'All content, by month.'
-tag: default
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Monthly archive'
-      fields: {  }
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: 0
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      arguments:
-        created_year_month:
-          id: created_year_month
-          table: node_field_data
-          field: created_year_month
-          entity_type: node
-          plugin_id: date_year_month
-          default_action: summary
-          exception:
-            title_enable: true
-          title_enable: true
-          title: '{{ arguments.created_year_month }}'
-          default_argument_type: fixed
-          summary_options:
-            override: true
-            items_per_page: 30
-          summary:
-            sort_order: desc
-            format: default_summary
-          specify_validation: true
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 0
-          expose:
-            operator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
-        langcode:
-          id: langcode
-          table: node_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value:
-            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:node'
-        options:
-          view_mode: teaser
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      arguments:
-        created_year_month:
-          id: created_year_month
-          table: node_field_data
-          field: created_year_month
-          entity_type: node
-          plugin_id: date_year_month
-          default_action: summary
-          exception:
-            title_enable: true
-          title_enable: true
-          title: '{{ arguments.created_year_month }}'
-          default_argument_type: fixed
-          summary_options:
-            items_per_page: 30
-          summary:
-            format: default_summary
-          specify_validation: true
-      query:
-        type: views_query
-        options: {  }
-      defaults:
-        arguments: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 2
-    display_options:
-      query:
-        type: views_query
-        options: {  }
-      display_extenders: {  }
-      path: archive
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.article_mods_mapping.yml b/config/export/views.view.article_mods_mapping.yml
deleted file mode 100644
index 99d97ef6f..000000000
--- a/config/export/views.view.article_mods_mapping.yml
+++ /dev/null
@@ -1,330 +0,0 @@
-uuid: 88c56bb4-6e85-4cc1-a94c-93dcb51f0cef
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.body
-    - field.storage.node.field_tags
-  module:
-    - node
-    - text
-    - user
-_core:
-  default_config_hash: 3lICW-NyvTeW1CQi6JJm0-GE1SA_Hm842iVVTxJMWWE
-id: article_mods_mapping
-label: 'Article MODS Mapping'
-module: views
-description: 'An example MODS mapping view for Articles.'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        body:
-          id: body
-          table: node__body
-          field: body
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: description
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: true
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: text_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_tags:
-          id: field_tags
-          table: node__field_tags
-          field: field_tags
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: subject_topic
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: node_nid
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.body'
-        - 'config:field.storage.node.field_tags'
diff --git a/config/export/views.view.block_content.yml b/config/export/views.view.block_content.yml
deleted file mode 100644
index 04af25009..000000000
--- a/config/export/views.view.block_content.yml
+++ /dev/null
@@ -1,543 +0,0 @@
-uuid: 9a1cb863-fa75-4612-a643-10c8ad39f5be
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-    - user
-_core:
-  default_config_hash: jvd5Pu6jy-lra4oMr-mR7zuY6CVDv9CaNeoj0Y70gV4
-id: block_content
-label: 'Custom block library'
-module: views
-description: 'Find and manage custom blocks.'
-tag: default
-base_table: block_content_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Custom block library'
-      fields:
-        info:
-          id: info
-          table: block_content_field_data
-          field: info
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: null
-          entity_field: info
-          plugin_id: field
-          label: 'Block description'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        type:
-          id: type
-          table: block_content_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          entity_field: type
-          plugin_id: field
-          label: 'Block type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: block_content_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-        operations:
-          id: operations
-          table: block_content
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer blocks'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'There are no custom blocks available.'
-          tokenize: false
-        block_content_listing_empty:
-          id: block_content_listing_empty
-          table: block_content
-          field: block_content_listing_empty
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          plugin_id: block_content_listing_empty
-          label: ''
-          empty: true
-      sorts: {  }
-      arguments: {  }
-      filters:
-        info:
-          id: info
-          table: block_content_field_data
-          field: info
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          entity_field: info
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: info_op
-            label: 'Block description'
-            description: ''
-            use_operator: false
-            operator: info_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: info
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        type:
-          id: type
-          table: block_content_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: 'Block type'
-            description: ''
-            use_operator: false
-            operator: type_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        reusable:
-          id: reusable
-          table: block_content_field_data
-          field: reusable
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: block_content
-          entity_field: reusable
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            info: info
-            type: type
-            changed: changed
-            operations: operations
-          default: changed
-          info:
-            info:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: admin/structure/block/block-content
-      menu:
-        type: tab
-        title: 'Custom block library'
-        description: ''
-        weight: 0
-        menu_name: admin
-        parent: block.admin_display
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.collection_children.yml b/config/export/views.view.collection_children.yml
deleted file mode 100644
index 4a3af3547..000000000
--- a/config/export/views.view.collection_children.yml
+++ /dev/null
@@ -1,810 +0,0 @@
-uuid: ad025eda-a751-4ca5-9eba-7488a287cf7a
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_image
-    - field.storage.node.field_description
-    - image.style.medium
-  module:
-    - image
-    - media
-    - node
-    - user
-id: collection_children
-label: Collection_Children
-module: views
-description: 'An alternative children collection view'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_media_image:
-          id: field_media_image
-          table: media__field_media_image
-          field: field_media_image
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: image
-          settings:
-            image_link: ''
-            image_style: medium
-            image_loading:
-              attribute: lazy
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: Title
-            field_identifier: title
-          exposed: true
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 1
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: node_nid
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            title: field_description
-            field_media_image: title
-            nid: nid
-            field_description: field_description
-          default: '-1'
-          info:
-            title:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_media_image:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            nid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_description:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        reverse__media__field_media_of:
-          id: reverse__media__field_media_of
-          table: node_field_data
-          field: reverse__media__field_media_of
-          relationship: none
-          group_type: group
-          admin_label: field_media_of
-          entity_type: node
-          plugin_id: entity_reverse
-          required: false
-      header:
-        view:
-          id: view
-          table: views
-          field: view
-          plugin_id: view
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_image'
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 2
-    display_options:
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: h2
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_media_image:
-          id: field_media_image
-          table: media__field_media_image
-          field: field_media_image
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: image
-          settings:
-            image_link: ''
-            image_style: medium
-            image_loading:
-              attribute: lazy
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: field
-          label: ID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_description:
-          id: field_description
-          table: node__field_description
-          field: field_description
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: true
-            text: '<h2>{{ title }} </h2><p>{{ field_description }}</p>'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: basic_string
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      arguments:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: node_nid
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 2
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        fields: false
-        arguments: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_image'
-        - 'config:field.storage.node.field_description'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 1
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        arguments: false
-        header: false
-      header:
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: view
-          empty: false
-          view_to_insert: 'collection_children:block_1'
-          inherit_arguments: true
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: collection
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_image'
diff --git a/config/export/views.view.collection_object_models.yml b/config/export/views.view.collection_object_models.yml
deleted file mode 100644
index 4e9ae2899..000000000
--- a/config/export/views.view.collection_object_models.yml
+++ /dev/null
@@ -1,252 +0,0 @@
-uuid: c6a325ab-1ec4-4f55-ad65-bf52d267502f
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - taxonomy
-    - user
-id: collection_object_models
-label: 'Collection Object Models'
-module: views
-description: 'These are the models in Islandora Models that are applicable to Repository Items.  View is used on the Repository Item Edit page'
-tag: ''
-base_table: taxonomy_term_field_data
-base_field: tid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          convert_spaces: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: taxonomy_term_field_data
-          field: status
-          entity_type: taxonomy_term
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        vid:
-          id: vid
-          table: taxonomy_term_field_data
-          field: vid
-          entity_type: taxonomy_term
-          entity_field: vid
-          plugin_id: bundle
-          value:
-            islandora_models: islandora_models
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: string
-          operator: '='
-          value: Collection
-          group: 1
-          exposed: false
-          expose:
-            operator_id: name_op
-            label: Name
-            description: ''
-            use_operator: false
-            operator: name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-              staff: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  entity_reference_1:
-    id: entity_reference_1
-    display_title: 'Entity Reference'
-    display_plugin: entity_reference
-    position: 1
-    display_options:
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            name: name
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.comment.yml b/config/export/views.view.comment.yml
deleted file mode 100644
index cb4e0d4c7..000000000
--- a/config/export/views.view.comment.yml
+++ /dev/null
@@ -1,1598 +0,0 @@
-uuid: 9ef3d340-d220-404f-9c22-b5712f16268b
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-    - user
-_core:
-  default_config_hash: CgXkKY33fd-yaHz89du2hSw6MJOoIeNUJ-VHE5BiSdQ
-id: comment
-label: Comments
-module: comment
-description: 'Find and manage comments.'
-tag: default
-base_table: comment_field_data
-base_field: cid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Comments
-      fields:
-        comment_bulk_form:
-          id: comment_bulk_form
-          table: comment
-          field: comment_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          plugin_id: comment_bulk_form
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: include
-          selected_actions:
-            - comment_delete_action
-            - comment_unpublish_action
-        subject:
-          id: subject
-          table: comment_field_data
-          field: subject
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: subject
-          plugin_id: field
-          label: Subject
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: comment_permalink
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        uid:
-          id: uid
-          table: comment_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: uid
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: comment_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: name
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '{{ uid }}'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: comment_username
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        entity_id:
-          id: entity_id
-          table: comment_field_data
-          field: entity_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: entity_id
-          plugin_id: commented_entity
-          label: 'Posted in'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: comment_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: comment
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-        name_1:
-          id: name_1
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: user_name
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: 'next ›'
-            previous: '‹ previous'
-            first: '« first'
-            last: 'last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer comments'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No comments available.'
-          tokenize: false
-      sorts:
-        changed:
-          id: changed
-          table: comment_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: changed
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: changed
-          exposed: false
-          granularity: second
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: comment_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        subject:
-          id: subject
-          table: comment_field_data
-          field: subject
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: subject
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: subject_op
-            label: Subject
-            description: ''
-            use_operator: false
-            operator: subject_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: subject
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        combine:
-          id: combine
-          table: views
-          field: combine
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: combine
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: combine_op
-            label: 'Author name'
-            description: ''
-            use_operator: false
-            operator: combine_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: author_name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          fields:
-            name: name
-            name_1: name_1
-        langcode:
-          id: langcode
-          table: comment_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: langcode_op
-            label: Language
-            description: ''
-            use_operator: false
-            operator: langcode_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: langcode
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            comment_bulk_form: comment_bulk_form
-            subject: subject
-            uid: uid
-            entity_id: entity_id
-            changed: changed
-            operations: operations
-          default: changed
-          info:
-            comment_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            subject:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            uid:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            entity_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            operations:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: true
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        uid:
-          id: uid
-          table: comment_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: author
-          entity_type: comment
-          entity_field: uid
-          plugin_id: standard
-          required: false
-      css_class: ''
-      use_ajax: false
-      group_by: false
-      show_admin_links: true
-      use_more: false
-      use_more_always: true
-      use_more_text: more
-      header: {  }
-      footer: {  }
-      hide_attachment_summary: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-      cacheable: false
-  page_published:
-    id: page_published
-    display_title: 'Published comments'
-    display_plugin: page
-    position: 1
-    display_options:
-      display_description: 'The approved comments listing.'
-      display_comment: ''
-      exposed_block: false
-      display_extenders: {  }
-      path: admin/content/comment
-      menu:
-        type: tab
-        title: Comments
-        description: 'Comments published'
-        weight: 0
-        menu_name: admin
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-      cacheable: false
-  page_unapproved:
-    id: page_unapproved
-    display_title: 'Unapproved comments'
-    display_plugin: page
-    position: 2
-    display_options:
-      fields:
-        comment_bulk_form:
-          id: comment_bulk_form
-          table: comment
-          field: comment_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          plugin_id: comment_bulk_form
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: include
-          selected_actions:
-            - comment_delete_action
-            - comment_publish_action
-        subject:
-          id: subject
-          table: comment_field_data
-          field: subject
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: subject
-          plugin_id: field
-          label: Subject
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: comment_permalink
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        uid:
-          id: uid
-          table: comment_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: uid
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: comment_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: name
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '{{ uid }}'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: comment_username
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        entity_id:
-          id: entity_id
-          table: comment_field_data
-          field: entity_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: entity_id
-          plugin_id: commented_entity
-          label: 'Posted in'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: comment_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: comment
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-        name_1:
-          id: name_1
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: user_name
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        status:
-          id: status
-          table: comment_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '0'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        subject:
-          id: subject
-          table: comment_field_data
-          field: subject
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: subject
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: subject_op
-            label: Subject
-            description: ''
-            use_operator: false
-            operator: subject_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: subject
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        combine:
-          id: combine
-          table: views
-          field: combine
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: combine
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: combine_op
-            label: 'Author Name'
-            description: ''
-            use_operator: false
-            operator: combine_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: author_name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          fields:
-            name: name
-            name_1: name_1
-        langcode:
-          id: langcode
-          table: comment_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: langcode_op
-            label: Language
-            description: ''
-            use_operator: false
-            operator: langcode_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: langcode
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: 'The unapproved comments listing.'
-      display_extenders: {  }
-      path: admin/content/comment/approval
-      menu:
-        type: tab
-        title: 'Unapproved comments'
-        description: 'Comments unapproved'
-        weight: 1
-        menu_name: admin
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-      cacheable: false
diff --git a/config/export/views.view.comments_recent.yml b/config/export/views.view.comments_recent.yml
deleted file mode 100644
index d80d8b5c1..000000000
--- a/config/export/views.view.comments_recent.yml
+++ /dev/null
@@ -1,270 +0,0 @@
-uuid: af8211c8-bff1-4f20-9bef-0d75284032be
-langcode: en
-status: true
-dependencies:
-  module:
-    - comment
-    - node
-    - user
-_core:
-  default_config_hash: S_NN2ubd_NovTfgzbHVlZMmIJJQS-3h9h3inzbaFUMY
-id: comments_recent
-label: 'Recent comments'
-module: views
-description: 'Recent comments.'
-tag: default
-base_table: comment_field_data
-base_field: cid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Recent comments'
-      fields:
-        subject:
-          id: subject
-          table: comment_field_data
-          field: subject
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: subject
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: string
-          settings:
-            link_to_entity: true
-        changed:
-          id: changed
-          table: comment_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: changed
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp_ago
-          settings:
-            future_format: '@interval hence'
-            past_format: '@interval ago'
-            granularity: 2
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 10
-      exposed_form:
-        type: basic
-      access:
-        type: perm
-        options:
-          perm: 'access comments'
-      cache:
-        type: tag
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          label: ''
-          empty: true
-          content: 'No comments available.'
-          tokenize: false
-      sorts:
-        created:
-          id: created
-          table: comment_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-        cid:
-          id: cid
-          table: comment_field_data
-          field: cid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: comment
-          entity_field: cid
-          plugin_id: field
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: cid
-          exposed: false
-      filters:
-        status:
-          id: status
-          table: comment_field_data
-          field: status
-          entity_type: comment
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        status_node:
-          id: status_node
-          table: node_field_data
-          field: status
-          relationship: node
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: html_list
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          type: ul
-          wrapper_class: item-list
-          class: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          hide_empty: false
-      query:
-        type: views_query
-      relationships:
-        node:
-          id: node
-          table: comment_field_data
-          field: node
-          plugin_id: standard
-          required: true
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-      block_description: 'Recent comments'
-      block_category: 'Lists (Views)'
-      allow:
-        items_per_page: true
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.content.yml b/config/export/views.view.content.yml
deleted file mode 100644
index 8fd19b7a4..000000000
--- a/config/export/views.view.content.yml
+++ /dev/null
@@ -1,1259 +0,0 @@
-uuid: 2f4c445e-64a6-478b-b6ef-9723e69947aa
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_member_of
-    - field.storage.node.field_model
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - media
-    - node
-    - taxonomy
-    - user
-_core:
-  default_config_hash: vBKWYGGDoAX-tFd1JErB8tZLSxx3lJ0foouVsgpcbB4
-id: content
-label: Content
-module: node
-description: 'Find and manage content.'
-tag: default
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Content
-      fields:
-        node_bulk_form:
-          id: node_bulk_form
-          table: node
-          field: node_bulk_form
-          entity_type: node
-          plugin_id: node_bulk_form
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: string
-          settings:
-            link_to_entity: true
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: field
-          label: 'Content type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Parents
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        nid_1:
-          id: nid_1
-          table: node_field_data
-          field: nid
-          relationship: reverse__node__field_member_of
-          group_type: count_distinct
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: field
-          label: Children
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: true
-            path: '/node/{{ nid }}/members'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        mid:
-          id: mid
-          table: media_field_data
-          field: mid
-          relationship: reverse__media__field_media_of
-          group_type: count_distinct
-          admin_label: ''
-          entity_type: media
-          entity_field: mid
-          plugin_id: field
-          label: Media
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: true
-            path: '/node/{{ nid }}/media'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          set_precision: false
-          precision: 0
-          decimal: .
-          format_plural: 0
-          format_plural_string: !!binary MQNAY291bnQ=
-          prefix: ''
-          suffix: ''
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: user_name
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: boolean
-          settings:
-            format: custom
-            format_custom_false: Unpublished
-            format_custom_true: Published
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-          element_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-        operations:
-          id: operations
-          table: node
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-      pager:
-        type: full
-        options:
-          items_per_page: 50
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content overview'
-      cache:
-        type: tag
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          plugin_id: text_custom
-          empty: true
-          content: 'No content available.'
-      sorts: {  }
-      arguments: {  }
-      filters:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_op
-            label: Title
-            description: ''
-            use_operator: false
-            operator: title_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: title
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: 'Content type'
-            description: ''
-            use_operator: false
-            operator: type_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: Model
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: Status
-            description: ''
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: true
-          group_info:
-            label: 'Published status'
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Published
-                operator: '='
-                value: '1'
-              2:
-                title: Unpublished
-                operator: '='
-                value: '0'
-        langcode:
-          id: langcode
-          table: node_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: langcode_op
-            label: Language
-            description: ''
-            use_operator: false
-            operator: langcode_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: langcode
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status_extra:
-          id: status_extra
-          table: node_field_data
-          field: status_extra
-          entity_type: node
-          plugin_id: node_status
-          operator: '='
-          value: false
-          group: 1
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: field_member_of
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_1_op
-            label: 'Parent (Member of) title contains'
-            description: ''
-            use_operator: false
-            operator: title_1_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: title_1
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_member_of_target_id_op
-            label: 'Member of (field_member_of)'
-            description: null
-            use_operator: false
-            operator: field_member_of_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_member_of_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: null
-            max_placeholder: null
-            placeholder: null
-          is_grouped: true
-          group_info:
-            label: Parents
-            description: ''
-            identifier: field_member_of_target_id
-            optional: true
-            widget: radios
-            multiple: true
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: 'No parent'
-                operator: empty
-                value:
-                  min: ''
-                  max: ''
-                  value: ''
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: reverse__node__field_member_of
-          group_type: count_distinct
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: nid_op
-            label: 'Number of Children'
-            description: ''
-            use_operator: true
-            operator: nid_op
-            operator_limit_selection: true
-            operator_list:
-              '<': '<'
-              '=': '='
-              '>': '>'
-            identifier: child_count
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        mid:
-          id: mid
-          table: media_field_data
-          field: mid
-          relationship: reverse__media__field_media_of
-          group_type: count_distinct
-          admin_label: ''
-          entity_type: media
-          entity_field: mid
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: mid_op
-            label: 'Number of attached media'
-            description: ''
-            use_operator: true
-            operator: mid_op
-            operator_limit_selection: true
-            operator_list:
-              '<': '<'
-              '=': '='
-              '>': '>'
-            identifier: mid_count
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            node_bulk_form: node_bulk_form
-            title: title
-            type: type
-            name: name
-            status: status
-            changed: changed
-            edit_node: edit_node
-            delete_node: delete_node
-            dropbutton: dropbutton
-            timestamp: title
-          default: changed
-          info:
-            node_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            edit_node:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_node:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            timestamp:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: true
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-      relationships:
-        uid:
-          id: uid
-          table: node_field_data
-          field: uid
-          admin_label: author
-          plugin_id: standard
-          required: true
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: 'Parent through field_member_of'
-          plugin_id: standard
-          required: false
-        reverse__node__field_member_of:
-          id: reverse__node__field_member_of
-          table: node_field_data
-          field: reverse__node__field_member_of
-          relationship: none
-          group_type: group
-          admin_label: 'Children through field_member_of'
-          entity_type: node
-          plugin_id: entity_reverse
-          required: false
-        reverse__media__field_media_of:
-          id: reverse__media__field_media_of
-          table: node_field_data
-          field: reverse__media__field_media_of
-          relationship: none
-          group_type: group
-          admin_label: 'Media attached through field_media_of'
-          entity_type: node
-          plugin_id: entity_reverse
-          required: false
-      group_by: true
-      show_admin_links: false
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: true
-          content: 'Displaying @start - @end of @total'
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/node
-      menu:
-        type: 'default tab'
-        title: Content
-        description: ''
-        weight: -10
-        menu_name: admin
-        context: ''
-      tab_options:
-        type: normal
-        title: Content
-        description: 'Find and manage content'
-        weight: -10
-        menu_name: admin
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
diff --git a/config/export/views.view.content_recent.yml b/config/export/views.view.content_recent.yml
deleted file mode 100644
index 855e15276..000000000
--- a/config/export/views.view.content_recent.yml
+++ /dev/null
@@ -1,323 +0,0 @@
-uuid: 7ca3caea-508b-47a4-b676-70f86d449745
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - user
-_core:
-  default_config_hash: YqZN5rc7XDQcFcInc8wkzuaHJmC5YvirhTmDcrarT6M
-id: content_recent
-label: 'Recent content'
-module: node
-description: 'Recent content.'
-tag: default
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Recent content'
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: string
-          settings:
-            link_to_entity: true
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp_ago
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 10
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No content available.'
-          tokenize: false
-      sorts:
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: changed
-          exposed: false
-          granularity: second
-      arguments: {  }
-      filters:
-        status_extra:
-          id: status_extra
-          table: node_field_data
-          field: status_extra
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: node_status
-          operator: '='
-          value: false
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        langcode:
-          id: langcode
-          table: node_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value:
-            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: html_list
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          type: ul
-          wrapper_class: item-list
-          class: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        uid:
-          id: uid
-          table: node_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: author
-          entity_type: node
-          entity_field: uid
-          plugin_id: standard
-          required: true
-      use_more: false
-      use_more_always: false
-      use_more_text: More
-      link_display: '0'
-      link_url: ''
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.display_media.yml b/config/export/views.view.display_media.yml
deleted file mode 100644
index 30ee89912..000000000
--- a/config/export/views.view.display_media.yml
+++ /dev/null
@@ -1,683 +0,0 @@
-uuid: 9aac45a9-5f0b-4fc0-850d-a82041758de5
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.file_download
-    - core.entity_view_mode.media.source
-    - core.entity_view_mode.media.thumbnail
-  module:
-    - eva
-    - media
-    - taxonomy
-    - user
-_core:
-  default_config_hash: Mzu_nG5xgemY4WYAkhXc6KeebGBvFbmXkM0v5nyK8sE
-id: display_media
-label: 'Media EVAs'
-module: views
-description: 'Displays media for content as EVA''s per model.'
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: ''
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'view media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: source
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  entity_view_1:
-    id: entity_view_1
-    display_title: 'Preservation Master - Download'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'Preservation Master'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#PreservationMasterFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: file_download
-      defaults:
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'Best quality representation of the Object appropriate for long-term preservation.'
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      entity_type: node
-      bundles: {  }
-      show_title: false
-      argument_mode: id
-      default_argument: null
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  entity_view_3:
-    id: entity_view_3
-    display_title: 'Thumbnail - Small'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: Thumbnail
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ThumbnailImage'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: thumbnail
-      defaults:
-        title: false
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'The thumbnail file, formatted small.'
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      entity_type: node
-      bundles: {  }
-      show_title: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  original_download:
-    id: original_download
-    display_title: 'Original File - Download'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'Original File'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#OriginalFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: file_download
-      defaults:
-        show_admin_links: false
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'The original creation format of a file'
-      show_admin_links: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      entity_type: node
-      bundles: {  }
-      show_title: false
-      argument_mode: id
-      default_argument: null
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  service_file:
-    id: service_file
-    display_title: 'Service File'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'Service File'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ServiceFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      display_description: 'A medium quality representation of the Object appropriate for serving to users.'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-      show_title: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  thumbnail:
-    id: thumbnail
-    display_title: Thumbnail
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: Thumbnail
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ThumbnailImage'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      display_description: 'A low resolution image representation of the Object appropriate for using as an icon.'
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      entity_type: node
-      bundles: {  }
-      show_title: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.file_checksum.yml b/config/export/views.view.file_checksum.yml
deleted file mode 100644
index 1124e5f21..000000000
--- a/config/export/views.view.file_checksum.yml
+++ /dev/null
@@ -1,209 +0,0 @@
-uuid: 8bb48976-0c83-4665-9ec8-eb5f2f44c4c2
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - rest
-    - serialization
-_core:
-  default_config_hash: S3AUYxL0a-o7SIH5qZNSJ-JEA7IcVMt29QyFeUWmxGs
-id: file_checksum
-label: 'File Checksum'
-module: views
-description: 'Exposes a REST endpoint for getting the checksum of a File'
-tag: ''
-base_table: file_managed
-base_field: fid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        sha1:
-          id: sha1
-          table: filehash
-          field: sha1
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: none
-        options: {  }
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        fid:
-          id: fid
-          table: file_managed
-          field: fid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: fid
-          plugin_id: file_fid
-          default_action: 'not found'
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters: {  }
-      style:
-        type: serializer
-      row:
-        type: 'entity:file'
-        options:
-          relationship: none
-          view_mode: default
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - url.query_args
-      tags: {  }
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 10
-      style:
-        type: serializer
-        options:
-          formats:
-            json: json
-      row:
-        type: data_field
-        options:
-          field_options: {  }
-      display_extenders: {  }
-      path: checksum/%file
-      auth:
-        - basic_auth
-        - jwt_auth
-        - cookie
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - request_format
-        - url
-      tags: {  }
diff --git a/config/export/views.view.files.yml b/config/export/views.view.files.yml
deleted file mode 100644
index 8600dfb24..000000000
--- a/config/export/views.view.files.yml
+++ /dev/null
@@ -1,1178 +0,0 @@
-uuid: 103a797e-dd1b-401e-b0a6-65576b0c71e6
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - user
-_core:
-  default_config_hash: DaGeEDJMcbbQtgV96AuPeZ-0irMc_Oa6Zzh2U3Kmul8
-id: files
-label: Files
-module: file
-description: 'Find and manage files.'
-tag: default
-base_table: file_managed
-base_field: fid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Files
-      fields:
-        fid:
-          id: fid
-          table: file_managed
-          field: fid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: fid
-          plugin_id: field
-          label: Fid
-          exclude: true
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        filename:
-          id: filename
-          table: file_managed
-          field: filename
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: filename
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: file_link
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        filemime:
-          id: filemime
-          table: file_managed
-          field: filemime
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: filemime
-          plugin_id: field
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: file_filemime
-        filesize:
-          id: filesize
-          table: file_managed
-          field: filesize
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: filesize
-          plugin_id: field
-          label: Size
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: file_size
-        status:
-          id: status
-          table: file_managed
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: boolean
-          settings:
-            format: custom
-            format_custom_false: Temporary
-            format_custom_true: Permanent
-        created:
-          id: created
-          table: file_managed
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: created
-          plugin_id: field
-          label: 'Upload date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-        changed:
-          id: changed
-          table: file_managed
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: changed
-          plugin_id: field
-          label: 'Changed date'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-        count:
-          id: count
-          table: file_usage
-          field: count
-          relationship: fid
-          group_type: sum
-          admin_label: ''
-          plugin_id: numeric
-          label: 'Used in'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: true
-            path: 'admin/content/files/usage/{{ fid }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ','
-          format_plural: true
-          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
-          prefix: ''
-          suffix: ''
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: 0
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access files overview'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          plugin_id: text_custom
-          empty: true
-          content: 'No files available.'
-      sorts: {  }
-      arguments: {  }
-      filters:
-        filename:
-          id: filename
-          table: file_managed
-          field: filename
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: filename
-          plugin_id: string
-          operator: word
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: filemime_op
-            label: Filename
-            description: ''
-            use_operator: false
-            operator: filename_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: filename
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        filemime:
-          id: filemime
-          table: file_managed
-          field: filemime
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: filemime
-          plugin_id: string
-          operator: word
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: filemime_op
-            label: 'MIME type'
-            description: ''
-            use_operator: false
-            operator: filemime_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: filemime
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status:
-          id: status
-          table: file_managed
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: status
-          plugin_id: file_status
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: status_op
-            label: Status
-            description: ''
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        uri:
-          id: uri
-          table: file_managed
-          field: uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: uri
-          plugin_id: string
-          operator: '='
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: uri_op
-            label: URI
-            description: null
-            use_operator: false
-            operator: uri_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: uri
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: null
-          is_grouped: true
-          group_info:
-            label: Filesystem
-            description: ''
-            identifier: uri_prefix
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Fedora
-                operator: starts
-                value: 'fedora://'
-              2:
-                title: Public
-                operator: starts
-                value: 'public://'
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            fid: fid
-            filename: filename
-            filemime: filemime
-            filesize: filesize
-            status: status
-            created: created
-            changed: changed
-            count: count
-          default: changed
-          info:
-            fid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            filename:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            filemime:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            filesize:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            created:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            count:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        fid:
-          id: fid
-          table: file_managed
-          field: fid
-          relationship: none
-          group_type: group
-          admin_label: 'File usage'
-          required: true
-      group_by: true
-      show_admin_links: true
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: 'Files overview'
-    display_plugin: page
-    position: 1
-    display_options:
-      defaults:
-        pager: true
-        relationships: false
-      relationships:
-        fid:
-          id: fid
-          table: file_managed
-          field: fid
-          relationship: none
-          group_type: group
-          admin_label: 'File usage'
-          required: false
-      display_description: ''
-      display_extenders: {  }
-      path: admin/content/files
-      menu:
-        type: tab
-        title: Files
-        description: ''
-        weight: 0
-        menu_name: admin
-        context: ''
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  page_2:
-    id: page_2
-    display_title: 'File usage'
-    display_plugin: page
-    position: 2
-    display_options:
-      title: 'File usage'
-      fields:
-        entity_label:
-          id: entity_label
-          table: file_usage
-          field: entity_label
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: entity_label
-          label: Entity
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          link_to_entity: true
-        type:
-          id: type
-          table: file_usage
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          label: 'Entity type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        module:
-          id: module
-          table: file_usage
-          field: module
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          label: 'Registering module'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        count:
-          id: count
-          table: file_usage
-          field: count
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          label: 'Use count'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ','
-          format_plural: false
-          format_plural_string: !!binary MQNAY291bnQ=
-          prefix: ''
-          suffix: ''
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: 0
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      empty: {  }
-      arguments:
-        fid:
-          id: fid
-          table: file_managed
-          field: fid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: fid
-          plugin_id: file_fid
-          default_action: 'not found'
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: true
-          title: 'File usage information for {{ arguments.fid }}'
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters: {  }
-      filter_groups:
-        operator: AND
-        groups: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            entity_label: entity_label
-            type: type
-            module: module
-            count: count
-          default: entity_label
-          info:
-            entity_label:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            module:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            count:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options: {  }
-      defaults:
-        empty: false
-        title: false
-        pager: false
-        group_by: false
-        style: false
-        row: false
-        relationships: false
-        fields: false
-        arguments: false
-        filters: false
-        filter_groups: false
-      relationships:
-        fid:
-          id: fid
-          table: file_managed
-          field: fid
-          relationship: none
-          group_type: group
-          admin_label: 'File usage'
-          required: true
-      group_by: false
-      display_description: ''
-      display_extenders: {  }
-      path: admin/content/files/usage/%
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.frontpage.yml b/config/export/views.view.frontpage.yml
deleted file mode 100644
index d0c99aca9..000000000
--- a/config/export/views.view.frontpage.yml
+++ /dev/null
@@ -1,252 +0,0 @@
-uuid: 9cd75bac-f165-4fc7-a82a-49157ade6186
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.rss
-    - core.entity_view_mode.node.teaser
-    - node.type.page
-  module:
-    - node
-    - user
-_core:
-  default_config_hash: 6eeliKIydPjqyv5V__QqTfahvJMWkHjOVUUuUIdB1ik
-id: frontpage
-label: Frontpage
-module: node
-description: 'All content promoted to the front page.'
-tag: default
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Front Page'
-      fields: {  }
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: 0
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: time
-        options:
-          results_lifespan: 518400
-          results_lifespan_custom: 0
-          output_lifespan: 518400
-          output_lifespan_custom: 0
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          label: ''
-          empty: true
-          content: "<div id=\"main-wrapper\" class=\"layout-main-wrapper clearfix\">\r\n  <div class=\"dialog-off-canvas-main-canvas\" data-off-canvas-main-canvas=\"\">\r\n    <div class=\"w-full bg-blue-spirit relative pb-10\">\r\n      <div class=\"container relative\">\r\n        <div class=\"row\">\r\n          <div class=\"col site-title\">\r\n            <h1 class=\"text-5xl font-titling-medium\">\r\n              HOPKINS DIGITAL LIBRARY\r\n            </h1>\r\n            <h2 class=\"text-2xl\">\r\n              Collections and scholarship from Johns Hopkins University\r\n            </h2>\r\n          </div>\r\n        </div>\r\n        <div class=\"row\">\r\n          <div class=\"col w-485\">\r\n            <a\r\n              class=\"flex flex-col sm:w-front-card m-auto w-auto hover:opacity-95 hover:shadow-xl\"\r\n              href=\"/collections\"\r\n              aria-label=\"Library collections\">\r\n              <div>\r\n                <img\r\n                  src=\"themes/contrib/idc_ui_theme_boots/images/chinese-gardens-14.jpg\"\r\n                  alt=\"\"\r\n                  data-entity-type=\"file\"\r\n                  class=\"front_page_images\" />\r\n              </div>\r\n              <div class=\"px-8 shadow-md bg-white h-auto fp_col_text\">\r\n                <h3 class=\"text-2xl font-bold\">Library Collections</h3>\r\n                <p class=\"text-gray-700\">\r\n                  Search digitized historic photographs, advertisements, texts,\r\n                  and more from JHU's unique library collections\r\n                </p>\r\n              </div>\r\n            </a>\r\n          </div>\r\n          <div class=\"col w-485\">\r\n            <a\r\n              class=\"flex flex-col sm:w-front-card m-auto w-auto hover:opacity-95 hover:shadow-xl\"\r\n              href=\"https://jscholarship.library.jhu.edu/\"\r\n              aria-label=\"JHU Scholarship\">\r\n              <div>\r\n                <img\r\n                  src=\"themes/contrib/idc_ui_theme_boots/images/student-writing-on-blc-window.jpg\"\r\n                  alt=\"\"\r\n                  class=\"front_page_images\" />\r\n              </div>\r\n              <div class=\"px-8 shadow-md bg-white h-auto fp_col_text\">\r\n                <h3 class=\"text-2xl font-bold\">JHU Scholarship</h3>\r\n                <p class=\"text-gray-700\">\r\n                  Find publications, theses, and dissertations by JHU faculty\r\n                  and students\r\n                </p>\r\n              </div>\r\n            </a>\r\n          </div>\r\n        </div>\r\n      </div>\r\n      <div id=\"grey_bar\" class=\"w-full\"></div>\r\n    </div>\r\n    <div class=\"container intro_description\">\r\n      <div class=\"row no-gutters\">\r\n        <div class=\"col-12 col-sm-6 col-md-8\">\r\n          <p class=\"mb-6\">\r\n            The Hopkins Digital Library is the institutional repository of Johns\r\n            Hopkins University. It is a service of the\r\n            <a href=\"https://www.library.jhu.edu/\">Sheridan Libraries</a> that\r\n            uses digital technology to collect, preserve, and provide access to\r\n            unique library research collections as well as the intellectual and\r\n            creative outputs of Hopkins faculty, students, and academic staff.\r\n          </p>\r\n          <p>\r\n            The digital materials are freely available to a worldwide audience\r\n            to advance discovery and innovation, and to support the research,\r\n            teaching, and public service missions of Johns Hopkins University\r\n          </p>\r\n        </div>\r\n        <div class=\"col-6 col-md-4\">\r\n          <div class=\"border shadow text-blue-heritage text-center\">\r\n            <h4 class=\"px-8 py-4 text-lg font-bold\">Need more information?</h4>\r\n            <div class=\"bg-gray-200 flex p-6\">\r\n              <a\r\n                class=\"btn btn-primary btn-lg active fa fa-envelope\"\r\n                aria-hidden=\"true\"\r\n                role=\"button\"\r\n                aria-pressed=\"true\"\r\n                href=\"/contact\">\r\n                Contact Us\r\n                <svg\r\n                  class=\"h-5 w-5 ml-1\"\r\n                  xmlns=\"http://www.w3.org/2000/svg\"\r\n                  fill=\"none\"\r\n                  viewBox=\"0 0 24 24\"\r\n                  stroke=\"currentColor\">\r\n                  <path\r\n                    stroke-linecap=\"round\"\r\n                    stroke-linejoin=\"round\"\r\n                    stroke-width=\"2\"\r\n                    d=\"M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z\"></path>\r\n                </svg>\r\n              </a>\r\n            </div>\r\n          </div>\r\n        </div>\r\n      </div>\r\n    </div>\r\n  </div>\r\n</div>"
-          tokenize: false
-        node_listing_empty:
-          id: node_listing_empty
-          table: node
-          field: node_listing_empty
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: node_listing_empty
-          label: ''
-          empty: true
-        title:
-          id: title
-          table: views
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: title
-          label: ''
-          empty: true
-          title: 'Sheridan Libraries'
-      sorts: {  }
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            page: page
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:node'
-        options:
-          relationship: none
-          view_mode: teaser
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      css_class: fontpage
-      group_by: false
-      show_admin_links: false
-      use_more: false
-      use_more_always: true
-      use_more_text: more
-      header: {  }
-      footer: {  }
-      hide_attachment_summary: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  feed_1:
-    id: feed_1
-    display_title: Feed
-    display_plugin: feed
-    position: 2
-    display_options:
-      enabled: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 10
-      style:
-        type: rss
-        options:
-          grouping: {  }
-          uses_fields: false
-          description: ''
-      row:
-        type: node_rss
-        options:
-          relationship: none
-          view_mode: rss
-      display_extenders: {  }
-      path: rss.xml
-      sitename_title: true
-      displays:
-        default: ''
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  front_page:
-    id: front_page
-    display_title: 'Front Page'
-    display_plugin: page
-    position: 3
-    display_options:
-      display_description: 'The main landing page'
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: front_page
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.glossary.yml b/config/export/views.view.glossary.yml
deleted file mode 100644
index 15f84fec3..000000000
--- a/config/export/views.view.glossary.yml
+++ /dev/null
@@ -1,473 +0,0 @@
-uuid: 84771bff-8706-4bc1-a4dc-4f38ec9fe954
-langcode: en
-status: false
-dependencies:
-  config:
-    - system.menu.main
-  module:
-    - node
-    - user
-_core:
-  default_config_hash: sz_FoMz5aClG4jFy4UDlkenXQtgTUXohEDjWVBuHaro
-id: glossary
-label: Glossary
-module: node
-description: 'All content, by letter.'
-tag: default
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: user_name
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: 'Last update'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp
-          settings:
-            date_format: long
-            custom_date_format: ''
-            timezone: ''
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 36
-          total_pages: 0
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: string
-          default_action: default
-          exception:
-            title_enable: true
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: a
-          default_argument_skip_url: false
-          summary_options: {  }
-          summary:
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: true
-          limit: 1
-          case: upper
-          path_case: lower
-          transform_dash: false
-          break_phrase: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        langcode:
-          id: langcode
-          table: node_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value:
-            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-          columns:
-            title: title
-            name: name
-            changed: changed
-          default: title
-          info:
-            title:
-              sortable: true
-              separator: ''
-            name:
-              sortable: true
-              separator: ''
-            changed:
-              sortable: true
-              separator: ''
-          override: true
-          sticky: false
-          summary: ''
-          order: asc
-          empty_table: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        uid:
-          id: uid
-          table: node_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: author
-          plugin_id: standard
-          required: false
-      use_ajax: true
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  attachment_1:
-    id: attachment_1
-    display_title: Attachment
-    display_plugin: attachment
-    position: 2
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-          items_per_page: 0
-      arguments:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: string
-          default_action: summary
-          exception:
-            title_enable: true
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: a
-          default_argument_skip_url: false
-          summary_options:
-            items_per_page: 25
-            inline: true
-            separator: ' | '
-          summary:
-            format: unformatted_summary
-          specify_validation: true
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: true
-          limit: 1
-          case: upper
-          path_case: lower
-          transform_dash: false
-          break_phrase: false
-      query:
-        type: views_query
-        options: {  }
-      defaults:
-        arguments: false
-      display_extenders: {  }
-      displays:
-        default: default
-        page_1: page_1
-      inherit_arguments: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      query:
-        type: views_query
-        options: {  }
-      display_extenders: {  }
-      path: glossary
-      menu:
-        type: normal
-        title: Glossary
-        weight: 0
-        menu_name: main
-        parent: ''
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.group_media.yml b/config/export/views.view.group_media.yml
deleted file mode 100644
index da57e3553..000000000
--- a/config/export/views.view.group_media.yml
+++ /dev/null
@@ -1,917 +0,0 @@
-uuid: f439f18e-f3bb-413b-89d3-3f5a46ac6591
-langcode: en
-status: true
-dependencies:
-  module:
-    - group
-    - media
-  enforced:
-    module:
-      - groupmedia
-_core:
-  default_config_hash: EHwbU77rWxN8VKFLmLexQH4fYbAr6b9AJBTe3_xRBk0
-id: group_media
-label: 'Group Media'
-module: views
-description: ''
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Group Media'
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: 'Media name'
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-          label: Bundle
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: yes-no
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        uid:
-          id: uid
-          table: media_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: uid
-          plugin_id: field
-          label: Publisher
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
-          relationship: group_content
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          plugin_id: entity_link
-          label: 'View relation link'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'View relation'
-          output_url_as_text: false
-          absolute: false
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
-          relationship: group_content
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          plugin_id: entity_link_edit
-          label: 'Edit relation link'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Edit relation'
-        delete_group_content:
-          id: delete_group_content
-          table: group_content
-          field: delete_group_content
-          relationship: group_content
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          plugin_id: entity_link_delete
-          label: 'Delete relation link'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Delete relation'
-        edit_media:
-          id: edit_media
-          table: media
-          field: edit_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: entity_link_edit
-          label: 'Edit media'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: Edit
-        delete_media:
-          id: delete_media
-          table: media
-          field: delete_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: entity_link_delete
-          label: 'Delete Media'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: Delete
-        dropbutton:
-          id: dropbutton
-          table: views
-          field: dropbutton
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: dropbutton
-          label: Dropbutton
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-          fields:
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
-            edit_media: edit_media
-            delete_media: delete_media
-            name: '0'
-            bundle: '0'
-            status: '0'
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: group_permission
-        options:
-          group_permission: 'access group_media overview'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        gid:
-          id: gid
-          table: group_content_field_data
-          field: gid
-          relationship: group_content
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          entity_field: gid
-          plugin_id: group_id
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: true
-          title: '{{ arguments.gid|placeholder }} media items'
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: Status
-            description: null
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: true
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: true
-          group_info:
-            label: Status
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Published
-                operator: '='
-                value: '1'
-              2:
-                title: Unpublished
-                operator: '='
-                value: '0'
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: bundle_op
-            label: 'Media type'
-            description: ''
-            use_operator: false
-            operator: bundle_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: bundle
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-            bundle: bundle
-            status: status
-            uid: uid
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
-            edit_media: edit_media
-            delete_media: delete_media
-            dropbutton: dropbutton
-          default: '-1'
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            bundle:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            uid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_media:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_media:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        group_content:
-          id: group_content
-          table: media_field_data
-          field: group_content
-          relationship: none
-          group_type: group
-          admin_label: 'Media group content'
-          entity_type: media
-          plugin_id: group_content_to_entity_reverse
-          required: false
-          group_content_plugins:
-            'group_media:audio': '0'
-            'group_media:file': '0'
-            'group_media:image': '0'
-            'group_media:remote_video': '0'
-            'group_media:video': '0'
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - route.group
-        - url
-        - url.query_args
-        - user.group_permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: group/%group/media
-      menu:
-        type: tab
-        title: Media
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - route.group
-        - url
-        - url.query_args
-        - user.group_permissions
-      tags: {  }
diff --git a/config/export/views.view.group_members.yml b/config/export/views.view.group_members.yml
deleted file mode 100644
index 70140529b..000000000
--- a/config/export/views.view.group_members.yml
+++ /dev/null
@@ -1,738 +0,0 @@
-uuid: b7e0decd-0eac-4ece-bb42-f466dc1d48d4
-langcode: en
-status: true
-dependencies:
-  module:
-    - group
-    - user
-_core:
-  default_config_hash: zIcnLmbW8inPRIQdPSVbKPuG2o5G5wHGJED4Jlgb2SY
-id: group_members
-label: 'Group members'
-module: group
-description: ''
-tag: ''
-base_table: group_content_field_data
-base_field: id
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Members
-      fields:
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: gc__user
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: User
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: user_name
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        group_roles:
-          id: group_roles
-          table: group_content__group_roles
-          field: group_roles
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Roles
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '<div class="item-list"><ul><li>&lt;none&gt;</li></ul></div>'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: ul
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: group_content_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        created:
-          id: created
-          table: group_content_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          entity_field: created
-          plugin_id: field
-          label: Joined
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
-          relationship: none
-          group_type: group
-          admin_label: 'View member link'
-          entity_type: group_content
-          plugin_id: entity_link
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'View member'
-          output_url_as_text: false
-          absolute: false
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
-          relationship: none
-          group_type: group
-          admin_label: 'Edit member link'
-          entity_type: group_content
-          plugin_id: entity_link_edit
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Edit member'
-        delete_group_content:
-          id: delete_group_content
-          table: group_content
-          field: delete_group_content
-          relationship: none
-          group_type: group
-          admin_label: 'Remove member link'
-          entity_type: group_content
-          plugin_id: entity_link_delete
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Remove member'
-        dropbutton:
-          id: dropbutton
-          table: views
-          field: dropbutton
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: dropbutton
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-          fields:
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
-            name: '0'
-            group_roles: '0'
-            changed: '0'
-            created: '0'
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: group_permission
-        options:
-          group_permission: 'administer members'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No members available.'
-          tokenize: false
-      sorts: {  }
-      arguments:
-        gid:
-          id: gid
-          table: group_content_field_data
-          field: gid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          entity_field: gid
-          plugin_id: numeric
-          default_action: 'access denied'
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: true
-          title: '{{ arguments.gid|placeholder }} members'
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-            group_roles: group_roles
-            changed: changed
-            created: created
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
-            dropbutton: dropbutton
-          default: '-1'
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            group_roles:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            created:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: true
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        gc__user:
-          id: gc__user
-          table: group_content_field_data
-          field: gc__user
-          relationship: none
-          group_type: group
-          admin_label: 'Member account'
-          entity_type: group_content
-          plugin_id: group_content_to_entity
-          required: true
-          group_content_plugins:
-            group_membership: group_membership
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - route.group
-        - url
-        - url.query_args
-        - user.group_permissions
-      tags:
-        - 'config:field.storage.group_content.group_roles'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: group/%group/members
-      menu:
-        type: tab
-        title: Members
-        description: ''
-        weight: 20
-        enabled: true
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - route.group
-        - url
-        - url.query_args
-        - user.group_permissions
-      tags:
-        - 'config:field.storage.group_content.group_roles'
diff --git a/config/export/views.view.group_nodes.yml b/config/export/views.view.group_nodes.yml
deleted file mode 100644
index cca5979a3..000000000
--- a/config/export/views.view.group_nodes.yml
+++ /dev/null
@@ -1,957 +0,0 @@
-uuid: ae302758-422c-4660-933a-8c0c67ac8455
-langcode: en
-status: true
-dependencies:
-  module:
-    - gnode
-    - group
-    - node
-_core:
-  default_config_hash: za6rNdVPn3HsOOwx2Yka3EmWEkXSdUIlaUpT8qOAxG0
-id: group_nodes
-label: 'Group nodes'
-module: gnode
-description: 'Lists all of the nodes that have been added to a group.'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Nodes
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: field
-          label: 'Content type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: custom
-            format_custom_false: Unpublished
-            format_custom_true: Published
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
-          relationship: group_content
-          group_type: group
-          admin_label: 'View relation link'
-          entity_type: group_content
-          plugin_id: entity_link
-          label: 'Link to Group content'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'View relation'
-          output_url_as_text: false
-          absolute: false
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
-          relationship: group_content
-          group_type: group
-          admin_label: 'Edit relation link'
-          entity_type: group_content
-          plugin_id: entity_link_edit
-          label: 'Link to edit Group content'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Edit relation'
-        delete_group_content:
-          id: delete_group_content
-          table: group_content
-          field: delete_group_content
-          relationship: group_content
-          group_type: group
-          admin_label: 'Delete relation link'
-          entity_type: group_content
-          plugin_id: entity_link_delete
-          label: 'Link to delete Group content'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Delete relation'
-        edit_node:
-          id: edit_node
-          table: node
-          field: edit_node
-          relationship: none
-          group_type: group
-          admin_label: 'Edit node link'
-          entity_type: node
-          plugin_id: entity_link_edit
-          label: 'Link to edit Content'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Edit node'
-        delete_node:
-          id: delete_node
-          table: node
-          field: delete_node
-          relationship: none
-          group_type: group
-          admin_label: 'Delete node link'
-          entity_type: node
-          plugin_id: entity_link_delete
-          label: 'Link to delete Content'
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          text: 'Delete node'
-        dropbutton:
-          id: dropbutton
-          table: views
-          field: dropbutton
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: dropbutton
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-          fields:
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
-            edit_node: edit_node
-            delete_node: delete_node
-            title: '0'
-            type: '0'
-            status: '0'
-            changed: '0'
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: group_permission
-        options:
-          group_permission: 'access group_node overview'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No content available.'
-          tokenize: false
-      sorts: {  }
-      arguments:
-        gid:
-          id: gid
-          table: group_content_field_data
-          field: gid
-          relationship: group_content
-          group_type: group
-          admin_label: ''
-          entity_type: group_content
-          entity_field: gid
-          plugin_id: numeric
-          default_action: 'access denied'
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: true
-          title: '{{ arguments.gid|placeholder }} nodes'
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: 'Published status'
-            description: ''
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: true
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              group_admin: '0'
-          is_grouped: true
-          group_info:
-            label: 'Published status'
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Published
-                operator: '='
-                value: '1'
-              2:
-                title: Unpublished
-                operator: '='
-                value: '0'
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: Type
-            description: ''
-            use_operator: false
-            operator: type_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              group_admin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            title: title
-            type: type
-            status: status
-            changed: changed
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
-            edit_node: edit_node
-            delete_node: delete_node
-            dropbutton: dropbutton
-          default: changed
-          info:
-            title:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            view_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_group_content:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            edit_node:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            delete_node:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: true
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        group_content:
-          id: group_content
-          table: node_field_data
-          field: group_content
-          relationship: none
-          group_type: group
-          admin_label: 'Content relation'
-          entity_type: node
-          plugin_id: group_content_to_entity_reverse
-          required: true
-          group_content_plugins: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - route.group
-        - url
-        - url.query_args
-        - user.group_permissions
-        - 'user.node_grants:view'
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: group/%group/nodes
-      menu:
-        type: tab
-        title: Nodes
-        description: ''
-        weight: 25
-        enabled: true
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - route.group
-        - url
-        - url.query_args
-        - user.group_permissions
-        - 'user.node_grants:view'
-      tags: {  }
diff --git a/config/export/views.view.home_page_featured_collections.yml b/config/export/views.view.home_page_featured_collections.yml
deleted file mode 100644
index 4bf1563bb..000000000
--- a/config/export/views.view.home_page_featured_collections.yml
+++ /dev/null
@@ -1,670 +0,0 @@
-uuid: 64c9b78d-f0d0-46e3-bfcf-b79fd59c5ea8
-langcode: en
-status: false
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-    - node.type.collection_object
-    - node.type.islandora_object
-  module:
-    - node
-    - taxonomy
-    - user
-id: home_page_featured_collections
-label: 'Featured Collections'
-module: views
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Home Page - Featured Collections'
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 20
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        field_weight_value:
-          id: field_weight_value
-          table: node__field_weight
-          field: field_weight_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: 'Collection Weight (field_weight)'
-            field_identifier: field_weight_value
-          exposed: false
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            collection_object: collection_object
-            islandora_object: islandora_object
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: empty
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-      row:
-        type: 'entity:node'
-        options:
-          view_mode: teaser
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: 'field_model: Taxonomy term'
-          plugin_id: standard
-          required: false
-        field_resource_type:
-          id: field_resource_type
-          table: node__field_resource_type
-          field: field_resource_type
-          relationship: none
-          group_type: group
-          admin_label: 'field_resource_type: Taxonomy term'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: "<a tabindex=\"0\"\r\n   role=\"button\"\r\n   id=\"toggle\"\r\n   aria-pressed=\"false\"\r\n  href=\"/solr-search/content?search_api_fulltext=&sort_by=search_api_relevance&sort_order=ASC&f%5B0%5D=resource_type_taxonomy_term_name%3ACollection\"  \r\n>\r\n  Browse All Collections\r\n</a>"
-          tokenize: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      enabled: false
-      title: 'Home Page'
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        promote:
-          id: promote
-          table: node_field_data
-          field: promote
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: promote
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_external_uri_uri_1:
-          id: field_external_uri_uri_1
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_model
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://purl.org/dc/dcmitype/Collection'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        relationships: false
-        filters: false
-        filter_groups: false
-        footer: false
-      relationships:
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: 'field_model: Taxonomy term'
-          plugin_id: standard
-          required: false
-        field_resource_type:
-          id: field_resource_type
-          table: node__field_resource_type
-          field: field_resource_type
-          relationship: none
-          group_type: group
-          admin_label: 'field_resource_type: Taxonomy term'
-          plugin_id: standard
-          required: false
-      footer:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: false
-          content: "<div class=\"node__links\">\r\n<ul class=\"links inline\"><li class=\"node-readmore\">\r\n<span class=\"node-readmore__link-wrapper\"><a  href=\"/browse-collections\"  aria-label=\"Browse all collections\"  rel=\"tag\" title=\"Browse our collections\" class=\"node-readmore__link\" hreflang=\"en\"> Browse All Collections<span class=\"visually-hidden\"> Browse All Collections</span></a></span>\r\n</li></ul>\r\n</div>"
-          tokenize: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_2:
-    id: block_2
-    display_title: 'Browse all Collections'
-    display_plugin: block
-    position: 2
-    display_options:
-      enabled: false
-      title: 'Browse Our Collections'
-      defaults:
-        title: false
-        filters: true
-        filter_groups: true
-        footer: false
-      display_description: ''
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 2
-    display_options:
-      enabled: false
-      title: 'Browse Our Collections'
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          operator: in
-          value:
-            collection_object: collection_object
-            islandora_object: islandora_object
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_model
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://purl.org/dc/dcmitype/Collection'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: empty
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        relationships: false
-        filters: false
-        filter_groups: false
-        footer: false
-      relationships:
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: 'field_model: Taxonomy term'
-          plugin_id: standard
-          required: true
-        field_resource_type:
-          id: field_resource_type
-          table: node__field_resource_type
-          field: field_resource_type
-          relationship: none
-          group_type: group
-          admin_label: 'field_resource_type: Taxonomy term'
-          plugin_id: standard
-          required: false
-      footer: {  }
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: browse-all-collections
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_2:
-    id: page_2
-    display_title: 'All Collections'
-    display_plugin: page
-    position: 2
-    display_options:
-      enabled: false
-      title: 'All Collections'
-      defaults:
-        title: false
-        footer: false
-      display_description: ''
-      footer: {  }
-      display_extenders: {  }
-      path: collections
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.iiif_manifest.yml b/config/export/views.view.iiif_manifest.yml
deleted file mode 100644
index 3710f62b0..000000000
--- a/config/export/views.view.iiif_manifest.yml
+++ /dev/null
@@ -1,686 +0,0 @@
-uuid: 97807e4c-6627-4a80-8120-215d3af1bb4b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_file
-    - field.storage.media.field_media_image
-  module:
-    - file
-    - image
-    - islandora_iiif
-    - media
-    - node
-    - rest
-    - serialization
-    - taxonomy
-    - user
-_core:
-  default_config_hash: AOLUIGOwfCNKC-el32SJhiOtxZeeXqRzPtbti-bbyX8
-id: iiif_manifest
-label: 'IIIF Manifest'
-module: views
-description: 'Generates IIIF manifests for paged content'
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Main
-    display_plugin: default
-    position: 0
-    display_options:
-      title: ''
-      fields:
-        field_media_file:
-          id: field_media_file
-          table: media__field_media_file
-          field: field_media_file
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: file_default
-          settings:
-            use_description_as_link_text: true
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_media_image:
-          id: field_media_image
-          table: media__field_media_image
-          field: field_media_image
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: image
-          settings:
-            image_link: ''
-            image_style: ''
-            image_loading:
-              attribute: lazy
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'view media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        field_weight_value:
-          id: field_weight_value
-          table: node__field_weight
-          field: field_weight_value
-          relationship: field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: field_weight_value
-          exposed: false
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: field_media_of
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:node'
-            fail: 'not found'
-          validate_options:
-            bundles: {  }
-            access: true
-            operation: view
-            multiple: 0
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#OriginalFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: serializer
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_of:
-          id: field_media_of
-          table: media__field_media_of
-          field: field_media_of
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_of: Content'
-          plugin_id: standard
-          required: true
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_file'
-        - 'config:field.storage.media.field_media_image'
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ServiceFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: iiif_manifest
-        options:
-          iiif_tile_field:
-            field_media_file: field_media_file
-            field_media_image: field_media_image
-      row:
-        type: data_field
-        options:
-          field_options:
-            name:
-              alias: ''
-              raw_output: false
-      defaults:
-        filters: false
-        filter_groups: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: node/%node/book-manifest
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_file'
-        - 'config:field.storage.media.field_media_image'
-  rest_export_2:
-    id: rest_export_2
-    display_title: 'REST export - single node'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ServiceFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: iiif_manifest
-        options:
-          iiif_tile_field:
-            field_media_file: field_media_file
-            field_media_image: field_media_image
-      row:
-        type: data_field
-        options:
-          field_options:
-            name:
-              alias: ''
-              raw_output: false
-      defaults:
-        relationships: false
-        arguments: false
-        filters: false
-        filter_groups: false
-      relationships:
-        field_media_of:
-          id: field_media_of
-          table: media__field_media_of
-          field: field_media_of
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_of: Content'
-          plugin_id: standard
-          required: true
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: false
-      display_description: ''
-      display_extenders: {  }
-      path: node/%node/manifest
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_file'
-        - 'config:field.storage.media.field_media_image'
-  rest_export_3:
-    id: rest_export_3
-    display_title: 'Book Manifest (Original File)'
-    display_plugin: rest_export
-    position: 3
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      style:
-        type: iiif_manifest
-        options:
-          uses_fields: false
-          iiif_tile_field:
-            field_media_file: field_media_file
-            field_media_image: field_media_image
-      row:
-        type: data_field
-        options:
-          field_options:
-            field_media_file:
-              alias: ''
-              raw_output: false
-            field_media_image:
-              alias: ''
-              raw_output: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: node/%node/book-manifest-original
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_file'
-        - 'config:field.storage.media.field_media_image'
diff --git a/config/export/views.view.manage_members.yml b/config/export/views.view.manage_members.yml
deleted file mode 100644
index 794c587bd..000000000
--- a/config/export/views.view.manage_members.yml
+++ /dev/null
@@ -1,354 +0,0 @@
-uuid: bb5310c8-6ab7-4d9f-9f79-0beac9555be3
-langcode: en
-status: true
-dependencies:
-  module:
-    - jsonld
-    - node
-    - rest
-    - serialization
-    - user
-_core:
-  default_config_hash: Zwu8JUsBiYaxPko_9DbJJhA-ZZSGOm81I9XtT9NH3M4
-id: manage_members
-label: 'Manage members'
-module: views
-description: 'Manage members belonging to a piece of content'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Manage members'
-      fields:
-        node_bulk_form:
-          id: node_bulk_form
-          table: node
-          field: node_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: node_bulk_form
-          label: 'Node operations bulk form'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: exclude
-          selected_actions: {  }
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: node
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: entity_operations
-          label: 'Operations links'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'manage members'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        field_weight_value:
-          id: field_weight_value
-          table: node__field_weight
-          field: field_weight_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:node'
-            fail: 'not found'
-          validate_options:
-            bundles: {  }
-            access: false
-            operation: view
-            multiple: 0
-          break_phrase: false
-          not: false
-      filters: {  }
-      filter_groups:
-        operator: AND
-        groups: {  }
-      style:
-        type: table
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: node/%node/members
-      menu:
-        type: tab
-        title: Children
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      style:
-        type: serializer
-        options:
-          uses_fields: false
-          formats:
-            jsonld: jsonld
-            json: json
-      display_extenders: {  }
-      path: node/%node/members
-      auth:
-        - basic_auth
-        - jwt_auth
-        - cookie
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.media.yml b/config/export/views.view.media.yml
deleted file mode 100644
index 9c9c3c21c..000000000
--- a/config/export/views.view.media.yml
+++ /dev/null
@@ -1,2089 +0,0 @@
-uuid: 7d285773-5440-4cd0-b283-7363b5cd2ccf
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_of
-    - field.storage.media.field_media_use
-    - field.storage.media.field_mime_type
-    - field.storage.node.field_member_of
-    - image.style.thumbnail
-    - taxonomy.vocabulary.islandora_media_use
-  module:
-    - csv_serialization
-    - image
-    - media
-    - node
-    - rest
-    - serialization
-    - taxonomy
-    - user
-    - views_data_export
-_core:
-  default_config_hash: diywn6VdMoQOlDA-xslKdKrDko3SsTKfaK3WBG45UAg
-id: media
-label: Media
-module: views
-description: 'Find and manage media.'
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Media
-      fields:
-        media_bulk_form:
-          id: media_bulk_form
-          table: media
-          field: media_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: bulk_form
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: exclude
-          selected_actions: {  }
-        thumbnail__target_id:
-          id: thumbnail__target_id
-          table: media_field_data
-          field: thumbnail__target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: thumbnail
-          plugin_id: field
-          label: Thumbnail
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: image
-          settings:
-            image_link: ''
-            image_style: thumbnail
-            image_loading:
-              attribute: lazy
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: 'Media name'
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        uid:
-          id: uid
-          table: media_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: uid
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: custom
-            format_custom_false: Unpublished
-            format_custom_true: Published
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: media
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-        field_media_of:
-          id: field_media_of
-          table: media__field_media_of
-          field: field_media_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Media of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Media Use'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access media overview'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No media available.'
-          tokenize: false
-      sorts:
-        created:
-          id: created
-          table: media_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      arguments: {  }
-      filters:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: name
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: name_op
-            label: 'Media name'
-            description: ''
-            use_operator: false
-            operator: name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: bundle_op
-            label: Type
-            description: ''
-            use_operator: false
-            operator: bundle_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: type
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: 'True'
-            description: null
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: true
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: true
-          group_info:
-            label: 'Published status'
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Published
-                operator: '='
-                value: '1'
-              2:
-                title: Unpublished
-                operator: '='
-                value: '0'
-        status_extra:
-          id: status_extra
-          table: media_field_data
-          field: status_extra
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: media_status
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        langcode:
-          id: langcode
-          table: media_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: langcode_op
-            label: Language
-            description: ''
-            use_operator: false
-            operator: langcode_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: langcode
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_mime_type_value:
-          id: field_mime_type_value
-          table: media__field_mime_type
-          field: field_mime_type_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_mime_type_value_op
-            label: 'MIME type Contains'
-            description: ''
-            use_operator: false
-            operator: field_mime_type_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_mime_type_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: field_media_of
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: title_op
-            label: 'Media Of'
-            description: ''
-            use_operator: false
-            operator: title_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: title
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_media_use_target_id:
-          id: field_media_use_target_id
-          table: media__field_media_use
-          field: field_media_use_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_media_use_target_id_op
-            label: 'Media Use'
-            description: ''
-            use_operator: false
-            operator: field_media_use_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_media_use_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_media_use
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_media_of_target_id_op
-            label: 'Media of (field_media_of)'
-            description: null
-            use_operator: false
-            operator: field_media_of_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_media_of_target_id
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: null
-            max_placeholder: null
-            placeholder: null
-          is_grouped: true
-          group_info:
-            label: 'Orphaned Media'
-            description: 'Select missing media of to find orphaned media'
-            identifier: field_media_of_target_id
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: 'Missing Media Of'
-                operator: empty
-                value:
-                  min: ''
-                  max: ''
-                  value: ''
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            name: name
-            bundle: bundle
-            changed: changed
-            uid: uid
-            status: status
-            thumbnail__target_id: thumbnail__target_id
-          default: changed
-          info:
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            bundle:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            uid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            thumbnail__target_id:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: true
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_of:
-          id: field_media_of
-          table: media__field_media_of
-          field: field_media_of
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_of: Content'
-          plugin_id: standard
-          required: false
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: true
-          content: 'Displaying @start - @end of @total'
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: false
-          content:
-            value: '<p>Export the results to a CSV by using the CSV button in the bottom left hand corner of the page.</p>'
-            format: basic_html
-          tokenize: false
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_of'
-        - 'config:field.storage.media.field_media_use'
-        - 'config:field.storage.media.field_mime_type'
-        - 'config:field.storage.node.field_member_of'
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 2
-    display_options:
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: 'Media name'
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: false
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        uid:
-          id: uid
-          table: media_field_data
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: uid
-          plugin_id: field
-          label: Author
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: custom
-            format_custom_false: Unpublished
-            format_custom_true: Published
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: short
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: media
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-        field_media_of:
-          id: field_media_of
-          table: media__field_media_of
-          field: field_media_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Media of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Media Use'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      defaults:
-        fields: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/media/csv
-      auth:
-        - basic_auth
-        - jwt_auth
-        - cookie
-      displays:
-        media_page_list: media_page_list
-        default: '0'
-      filename: ''
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_of'
-        - 'config:field.storage.media.field_media_use'
-        - 'config:field.storage.media.field_mime_type'
-        - 'config:field.storage.node.field_member_of'
-  media_page_list:
-    id: media_page_list
-    display_title: Media
-    display_plugin: page
-    position: 1
-    display_options:
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/media
-      menu:
-        type: tab
-        title: Media
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_of'
-        - 'config:field.storage.media.field_media_use'
-        - 'config:field.storage.media.field_mime_type'
-        - 'config:field.storage.node.field_member_of'
diff --git a/config/export/views.view.media_of.yml b/config/export/views.view.media_of.yml
deleted file mode 100644
index 56ec736df..000000000
--- a/config/export/views.view.media_of.yml
+++ /dev/null
@@ -1,1234 +0,0 @@
-uuid: 15816d2f-ebf5-4cc5-bf6c-f8035f0f0c09
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.media.field_media_use
-    - field.storage.media.field_mime_type
-  module:
-    - jsonld
-    - media
-    - rest
-    - serialization
-    - user
-_core:
-  default_config_hash: ulZTEi1E-dZLYvDO8Dz2WPOTVb-e3D4Qsl89px1PaSk
-id: media_of
-label: 'Manage media'
-module: views
-description: 'Manage media belonging to a piece of content'
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Manage Media'
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-          label: 'Media type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-          label: Changed
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        media_bulk_form:
-          id: media_bulk_form
-          table: media
-          field: media_bulk_form
-          entity_type: media
-          plugin_id: bulk_form
-        operations:
-          id: operations
-          table: media
-          field: operations
-          entity_type: media
-          plugin_id: entity_operations
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'manage media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:node'
-            fail: 'not found'
-          validate_options:
-            bundles: {  }
-            access: false
-            operation: view
-            multiple: 0
-          break_phrase: false
-          not: false
-      filters: {  }
-      filter_groups:
-        operator: AND
-        groups: {  }
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            media_bulk_form: media_bulk_form
-            name: name
-            bundle: bundle
-            field_media_model: field_media_model
-            field_mime_type: field_mime_type
-            changed: changed
-            operations: operations
-          default: field_media_model
-          info:
-            media_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            bundle:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_media_model:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_mime_type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_mime_type'
-        - extensions
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      fields:
-        media_bulk_form:
-          id: media_bulk_form
-          table: media
-          field: media_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: bulk_form
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: exclude
-          selected_actions: {  }
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-          label: 'Media type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Media Use'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-          label: Changed
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: media
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          plugin_id: entity_operations
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: false
-      defaults:
-        fields: false
-      display_extenders: {  }
-      path: node/%node/media
-      menu:
-        type: tab
-        title: Media
-        description: 'Lists all media belonging to this content'
-        weight: 0
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_media_use'
-        - 'config:field.storage.media.field_mime_type'
-        - extensions
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        bundle:
-          id: bundle
-          table: media_field_data
-          field: bundle
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: bundle
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_entity_id
-          settings: {  }
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_mime_type:
-          id: field_mime_type
-          table: media__field_mime_type
-          field: field_mime_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'MIME type'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: field
-          label: Changed
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      style:
-        type: serializer
-        options:
-          uses_fields: false
-          formats:
-            jsonld: jsonld
-            json: json
-      row:
-        type: data_entity
-        options: {  }
-      defaults:
-        fields: false
-      display_extenders: {  }
-      path: node/%node/media
-      auth:
-        - basic_auth
-        - jwt_auth
-        - cookie
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags:
-        - 'config:field.storage.media.field_mime_type'
-        - extensions
diff --git a/config/export/views.view.members.yml b/config/export/views.view.members.yml
deleted file mode 100644
index 45a0d1abf..000000000
--- a/config/export/views.view.members.yml
+++ /dev/null
@@ -1,305 +0,0 @@
-uuid: ba1eb9ee-9007-47bc-ada3-a3a10e3be8ad
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-  module:
-    - node
-    - user
-_core:
-  default_config_hash: ATR84UMbnx8nK3zGApyME_LIDQSYk2-WTjP3_iEfTM0
-id: members
-label: Members
-module: views
-description: 'Displays members for content.'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Main
-    display_plugin: default
-    position: 0
-    display_options:
-      title: ''
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        field_weight_value:
-          id: field_weight_value
-          table: node__field_weight
-          field: field_weight_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: 'Custom Sort Value (field_weight)'
-            field_identifier: field_weight_value
-          exposed: false
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:node'
-        options:
-          relationship: none
-          view_mode: teaser
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: true
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: ''
-            format: basic_html
-          tokenize: false
-      footer: {  }
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 2
-    display_options:
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.missing_media.yml b/config/export/views.view.missing_media.yml
deleted file mode 100644
index 85b10cf44..000000000
--- a/config/export/views.view.missing_media.yml
+++ /dev/null
@@ -1,4404 +0,0 @@
-uuid: b91582fb-251c-4dc6-b21f-43972f014fbd
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_member_of
-    - field.storage.node.field_model
-    - system.menu.admin
-    - taxonomy.vocabulary.islandora_models
-  module:
-    - csv_serialization
-    - islandora
-    - media
-    - node
-    - rest
-    - serialization
-    - taxonomy
-    - user
-    - views_data_export
-id: missing_media
-label: 'Missing Media'
-module: views
-description: 'Find missing media using the media use term. Filter results by model (can select multiple models.) Sort by the last updated date'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Extracted Text'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer media'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: 'No Missing [view:title]s For The Model(s) Selected'
-            format: basic_html
-          tokenize: false
-      sorts: {  }
-      arguments: {  }
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#ExtractedText'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Generate Extracted Text'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            title_1: title_1
-            field_member_of: field_member_of
-            changed: changed
-            field_model: field_model
-          default: changed
-          info:
-            title_1:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_member_of:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_model:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        reverse__media__field_media_of:
-          id: reverse__media__field_media_of
-          table: node_field_data
-          field: reverse__media__field_media_of
-          relationship: none
-          group_type: group
-          admin_label: field_media_of
-          entity_type: node
-          plugin_id: entity_reverse
-          required: false
-      group_by: true
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: "<p>Find missing media for [view:title]. Filter results by model (can select multiple models.) Sort by the last updated date.</p>\r\n<p> Export the results to a CSV by using the CSV button in the bottom left hand corner of the page.</p>"
-            format: basic_html
-          tokenize: false
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: false
-          content: 'Displaying @start - @end of @total'
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_model'
-  data_export_1:
-    id: data_export_1
-    display_title: 'Data export'
-    display_plugin: data_export
-    position: 9
-    display_options:
-      title: 'CSV of Missing Media'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      style:
-        type: data_export
-        options:
-          formats:
-            csv: csv
-          csv_settings:
-            delimiter: ','
-            enclosure: '"'
-            escape_char: \
-            strip_tags: true
-            trim: true
-            encoding: utf8
-            utf8_bom: '0'
-            use_serializer_encode_only: false
-      defaults:
-        title: false
-        fields: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/csv
-      auth:
-        - basic_auth
-        - jwt_auth
-        - cookie
-      displays:
-        page_1: page_1
-        page_2: page_2
-        page_3: page_3
-        page_4: page_4
-        page_5: page_5
-        page_6: page_6
-        page_7: page_7
-        page_8: page_8
-        default: '0'
-      filename: ''
-      automatic_download: false
-      store_in_public_file_directory: null
-      custom_redirect_path: false
-      redirect_to_display: none
-      include_query_params: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_1:
-    id: page_1
-    display_title: 'Extracted Text'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Extracted Text'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#ExtractedText'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Generate Extracted Text'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/extracted-text
-      menu:
-        type: normal
-        title: 'Missing Extracted Text '
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_2:
-    id: page_2
-    display_title: 'FITS File'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'FITS File'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'https://projects.iq.harvard.edu/fits'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Generate Fits File'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/fits-file
-      menu:
-        type: normal
-        title: 'Missing FITS'
-        description: ''
-        weight: 1
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_3:
-    id: page_3
-    display_title: 'Intermediate File'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Intermediate File'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#IntermediateFile'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Have Intermediate File'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/intermediate-file
-      menu:
-        type: normal
-        title: 'Missing Intermediate File'
-        description: ''
-        weight: 2
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_4:
-    id: page_4
-    display_title: 'Original File'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Original File'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#OriginalFile'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Have Original File'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/original-file
-      menu:
-        type: normal
-        title: 'Missing Original File'
-        description: ''
-        weight: 3
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_5:
-    id: page_5
-    display_title: 'Preservation Master File'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Preservation Master File'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#PreservationMasterFile'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Have Preservation Master File'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/preservation-master-file
-      menu:
-        type: normal
-        title: 'Missing Preservation File'
-        description: ''
-        weight: 4
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_6:
-    id: page_6
-    display_title: 'Service File'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Service File'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#ServiceFile'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Generate Service Files'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/service-file
-      menu:
-        type: normal
-        title: 'Missing Service File'
-        description: ''
-        weight: 6
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_7:
-    id: page_7
-    display_title: 'Thumbnail Image'
-    display_plugin: page
-    position: 1
-    display_options:
-      title: 'Thumbnail Image'
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#ThumbnailImage'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Generate a Thumbnail Image'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/thumbnail-image
-      menu:
-        type: normal
-        title: 'Missing Thumbnail Image'
-        description: ''
-        weight: 7
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
-  page_8:
-    id: page_8
-    display_title: Transcript
-    display_plugin: page
-    position: 1
-    display_options:
-      title: Transcript
-      fields:
-        title_1:
-          id: title_1
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: 'Media Of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_member_of:
-          id: field_member_of
-          table: node__field_member_of
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: node_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: changed
-          plugin_id: field
-          label: Updated
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: timestamp
-          settings:
-            date_format: medium
-            custom_date_format: ''
-            timezone: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: Model
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      filters:
-        islandora_has_media:
-          id: islandora_has_media
-          table: node_field_data
-          field: islandora_has_media
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          plugin_id: islandora_node_has_media_use
-          operator: '='
-          value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          use_uri: 'http://pcdm.org/use#Transcript'
-          negated: 1
-        delta:
-          id: delta
-          table: media__field_media_use
-          field: delta
-          relationship: reverse__media__field_media_of
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: '='
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_model_target_id:
-          id: field_model_target_id
-          table: node__field_model
-          field: field_model_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_model_target_id_op
-            label: 'Select Models that Have Transcript File'
-            description: ''
-            use_operator: false
-            operator: field_model_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_model_target_id
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-          vid: islandora_models
-          type: select
-          hierarchy: false
-          limit: true
-          error_message: true
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        fields: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/missing-media/transcript
-      menu:
-        type: normal
-        title: 'Missing Transcript'
-        description: ''
-        weight: 9
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_member_of'
-        - 'config:field.storage.node.field_model'
diff --git a/config/export/views.view.newspapers.yml b/config/export/views.view.newspapers.yml
deleted file mode 100644
index 1b7496318..000000000
--- a/config/export/views.view.newspapers.yml
+++ /dev/null
@@ -1,676 +0,0 @@
-uuid: 35ed259c-70a3-4ebb-974c-7c3ec932376f
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_edtf_date_issued
-  module:
-    - controlled_access_terms
-    - node
-    - user
-id: newspapers
-label: 'Newspaper Issues'
-module: views
-description: 'List the children of a node, by date issued.'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: Issues
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_edtf_date_issued:
-          id: field_edtf_date_issued
-          table: node__field_edtf_date_issued
-          field: field_edtf_date_issued
-          relationship: none
-          group_type: group
-          admin_label: 'Year (date issued)'
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: edtf_default
-          settings:
-            date_separator: dash
-            date_order: big_endian
-            month_format: nm
-            day_format: nd
-            year_format: 'y'
-            relationship: none
-            fieldsets:
-              - more
-              - admin_label
-            custom_label: 0
-            label: ''
-            element_label_colon: 0
-            exclude: 0
-            element_type_enable: 0
-            element_type: ''
-            element_class_enable: 0
-            element_class: ''
-            element_label_type_enable: 0
-            element_label_type: ''
-            element_label_class_enable: 0
-            element_label_class: ''
-            element_wrapper_type_enable: 0
-            element_wrapper_type: ''
-            element_wrapper_class_enable: 0
-            element_wrapper_class: ''
-            element_default_classes: 1
-            alter:
-              alter_text: 0
-              text: ''
-              make_link: 0
-              path: ''
-              absolute: 0
-              replace_spaces: 0
-              external: 0
-              path_case: none
-              link_class: ''
-              alt: ''
-              rel: ''
-              prefix: ''
-              suffix: ''
-              target: ''
-              trim: 0
-              max_length: '0'
-              word_boundary: 1
-              ellipsis: 1
-              more_link: 0
-              more_link_text: ''
-              more_link_path: ''
-              html: 0
-              strip_tags: 0
-              preserve_tags: ''
-              trim_whitespace: 0
-              nl2br: 0
-            empty: ''
-            empty_zero: 0
-            hide_empty: 0
-            hide_alter_empty: 1
-            group_rows: 1
-            multi_type: separator
-            separator: ', '
-            delta_limit: '0'
-            delta_offset: '0'
-            delta_reversed: 0
-            delta_first_last: 0
-            click_sort_column: value
-            type: edtf_default
-            field_api_classes: 0
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_edtf_date_issued_1:
-          id: field_edtf_date_issued_1
-          table: node__field_edtf_date_issued
-          field: field_edtf_date_issued
-          relationship: none
-          group_type: group
-          admin_label: 'Month (date issued)'
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: edtf_default
-          settings:
-            date_separator: space
-            date_order: big_endian
-            month_format: mmmm
-            day_format: nd
-            year_format: 'y'
-            relationship: none
-            fieldsets:
-              - more
-              - admin_label
-            custom_label: 0
-            label: ''
-            element_label_colon: 0
-            exclude: 1
-            element_type_enable: 0
-            element_type: ''
-            element_class_enable: 0
-            element_class: ''
-            element_label_type_enable: 0
-            element_label_type: ''
-            element_label_class_enable: 0
-            element_label_class: ''
-            element_wrapper_type_enable: 0
-            element_wrapper_type: ''
-            element_wrapper_class_enable: 0
-            element_wrapper_class: ''
-            element_default_classes: 1
-            alter:
-              alter_text: 0
-              text: ''
-              make_link: 0
-              path: ''
-              absolute: 0
-              replace_spaces: 0
-              external: 0
-              path_case: none
-              link_class: ''
-              alt: ''
-              rel: ''
-              prefix: ''
-              suffix: ''
-              target: ''
-              trim: 0
-              max_length: '0'
-              word_boundary: 1
-              ellipsis: 1
-              more_link: 0
-              more_link_text: ''
-              more_link_path: ''
-              html: 0
-              strip_tags: 0
-              preserve_tags: ''
-              trim_whitespace: 0
-              nl2br: 0
-            empty: ''
-            empty_zero: 0
-            hide_empty: 0
-            hide_alter_empty: 1
-            group_rows: 1
-            multi_type: separator
-            separator: ', '
-            delta_limit: '0'
-            delta_offset: '0'
-            delta_reversed: 0
-            delta_first_last: 0
-            click_sort_column: value
-            type: edtf_default
-            field_api_classes: 0
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_edtf_date_issued_2:
-          id: field_edtf_date_issued_2
-          table: node__field_edtf_date_issued
-          field: field_edtf_date_issued
-          relationship: none
-          group_type: group
-          admin_label: 'Full date issued '
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: true
-            text: '- <i>issued {{ field_edtf_date_issued_2 }}</i>'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: edtf_default
-          settings:
-            date_separator: dash
-            date_order: big_endian
-            month_format: mm
-            day_format: dd
-            year_format: 'y'
-            relationship: none
-            fieldsets:
-              - more
-              - admin_label
-            custom_label: 0
-            label: ''
-            element_label_colon: 0
-            exclude: 0
-            element_type_enable: 0
-            element_type: ''
-            element_class_enable: 0
-            element_class: ''
-            element_label_type_enable: 0
-            element_label_type: ''
-            element_label_class_enable: 0
-            element_label_class: ''
-            element_wrapper_type_enable: 0
-            element_wrapper_type: ''
-            element_wrapper_class_enable: 0
-            element_wrapper_class: ''
-            element_default_classes: 1
-            alter:
-              alter_text: 0
-              text: ''
-              make_link: 0
-              path: ''
-              absolute: 0
-              replace_spaces: 0
-              external: 0
-              path_case: none
-              link_class: ''
-              alt: ''
-              rel: ''
-              prefix: ''
-              suffix: ''
-              target: ''
-              trim: 0
-              max_length: '0'
-              word_boundary: 1
-              ellipsis: 1
-              more_link: 0
-              more_link_text: ''
-              more_link_path: ''
-              html: 0
-              strip_tags: 0
-              preserve_tags: ''
-              trim_whitespace: 0
-              nl2br: 0
-            empty: ''
-            empty_zero: 0
-            hide_empty: 0
-            hide_alter_empty: 1
-            group_rows: 1
-            multi_type: separator
-            separator: ', '
-            delta_limit: '0'
-            delta_offset: '0'
-            delta_reversed: 0
-            delta_first_last: 0
-            click_sort_column: value
-            type: edtf_default
-            field_api_classes: 0
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        field_edtf_date_issued_value:
-          id: field_edtf_date_issued_value
-          table: node__field_edtf_date_issued
-          field: field_edtf_date_issued_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_edtf_date_issued_value:
-          id: field_edtf_date_issued_value
-          table: node__field_edtf_date_issued
-          field: field_edtf_date_issued_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: starts
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_edtf_date_issued_value_op
-            label: 'Filter by date'
-            description: 'Enter a year (1970), a year-month (1970-01), or year-month-day (1970-01-05)'
-            use_operator: false
-            operator: field_edtf_date_issued_value_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_edtf_date_issued_value
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: html_list
-        options:
-          grouping:
-            -
-              field: field_edtf_date_issued_1
-              rendered: true
-              rendered_strip: false
-          row_class: ''
-          default_row_class: true
-          type: ul
-          wrapper_class: item-list
-          class: ''
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline:
-            title: title
-            field_edtf_date_issued_2: field_edtf_date_issued_2
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: '"Issues" header'
-          plugin_id: text
-          empty: true
-          content:
-            value: '<h2>Issues</h2>'
-            format: basic_html
-          tokenize: false
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_edtf_date_issued'
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      block_description: 'Newspaper Issues'
-      allow:
-        items_per_page: false
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags:
-        - 'config:field.storage.node.field_edtf_date_issued'
diff --git a/config/export/views.view.non_fedora_files.yml b/config/export/views.view.non_fedora_files.yml
deleted file mode 100644
index 674628df7..000000000
--- a/config/export/views.view.non_fedora_files.yml
+++ /dev/null
@@ -1,199 +0,0 @@
-uuid: 5718c63a-03a2-43d6-b1e8-8294d987853b
-langcode: en
-status: true
-dependencies:
-  module:
-    - file
-    - user
-_core:
-  default_config_hash: ALExt2wqqCRJhmOrccdW6TM-NL8Jb9QMknqsC2I8-HQ
-id: non_fedora_files
-label: 'Non-Fedora Files'
-module: views
-description: ''
-tag: ''
-base_table: file_managed
-base_field: fid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        filename:
-          id: filename
-          table: file_managed
-          field: filename
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: filename
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: file_link
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        uri:
-          id: uri
-          table: file_managed
-          field: uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: file
-          entity_field: uri
-          plugin_id: string
-          operator: not_starts
-          value: 'fedora://'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.oai_pmh.yml b/config/export/views.view.oai_pmh.yml
deleted file mode 100644
index aabfc3351..000000000
--- a/config/export/views.view.oai_pmh.yml
+++ /dev/null
@@ -1,461 +0,0 @@
-uuid: e1bd8dc7-9eb2-44f6-af75-a28bb8a535ec
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.islandora_object
-  module:
-    - node
-    - taxonomy
-    - user
-_core:
-  default_config_hash: gzRObt67V7wi2ravHPIkYNJBHwYdzeeo5MiJd3p5p14
-id: oai_pmh
-label: OAI-PMH
-module: views
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          value:
-            islandora_object: islandora_object
-          group: 1
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_model
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '!='
-          value: 'http://purl.org/dc/dcmitype/Collection'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: 'field_model: Taxonomy term'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  all_repository_items:
-    id: all_repository_items
-    display_title: 'All Repository Items'
-    display_plugin: entity_reference
-    position: 1
-    display_options:
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            title: title
-      display_description: ''
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  collection_sets:
-    id: collection_sets
-    display_title: 'Collection Sets'
-    display_plugin: entity_reference
-    position: 1
-    display_options:
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: ignore
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            title: title
-      defaults:
-        arguments: false
-      display_description: 'All items with collections grouped into a sets per collection they belong to.'
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  collectionless_set:
-    id: collectionless_set
-    display_title: 'Collectionless Set'
-    display_plugin: entity_reference
-    position: 1
-    display_options:
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        type:
-          id: type
-          table: node_field_data
-          field: type
-          entity_type: node
-          entity_field: type
-          plugin_id: bundle
-          value:
-            islandora_object: islandora_object
-          group: 1
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_model
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '!='
-          value: 'http://purl.org/dc/dcmitype/Collection'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: empty
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: entity_reference
-        options:
-          search_fields:
-            title: title
-      defaults:
-        filters: false
-        filter_groups: false
-      display_description: 'Set of items that do not belong to any Collection, to be used with Collection Sets.'
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.openseadragon_media_evas.yml b/config/export/views.view.openseadragon_media_evas.yml
deleted file mode 100644
index 9fc52cc28..000000000
--- a/config/export/views.view.openseadragon_media_evas.yml
+++ /dev/null
@@ -1,459 +0,0 @@
-uuid: f0dfabc4-f76e-4069-a614-39c1efb1da5d
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.open_seadragon
-  module:
-    - eva
-    - media
-    - taxonomy
-    - user
-_core:
-  default_config_hash: 6dcIYp8_I6h0fnEv2fCxmtimKI8NFbqhXwHXu79sPq4
-id: openseadragon_media_evas
-label: 'OpenSeadragon Media EVAs'
-module: views
-description: 'Displays media for content as EVA''s per model.'
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Main
-    display_plugin: default
-    position: 0
-    display_options:
-      title: ''
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'view media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: open_seadragon
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  entity_view_1:
-    id: entity_view_1
-    display_title: 'Original File'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'OpenSeadragon - Original File'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#OriginalFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: open_seadragon
-      defaults:
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'The original creation format of a file'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-      show_title: false
-      argument_mode: id
-      default_argument: null
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  entity_view_2:
-    id: entity_view_2
-    display_title: 'Preservation Master'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'OpenSeadragon - Preservation Master'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#PreservationMasterFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: open_seadragon
-      defaults:
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'Best quality representation of the Object appropriate for long-term preservation.'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-      show_title: false
-      argument_mode: id
-      default_argument: null
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  service_file:
-    id: service_file
-    display_title: 'Service File'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'OpenSeadragon - Service File'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ServiceFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      display_description: 'A medium quality representation of the Object appropriate for serving to users.'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.pdfjs_media_evas.yml b/config/export/views.view.pdfjs_media_evas.yml
deleted file mode 100644
index 182fdf60e..000000000
--- a/config/export/views.view.pdfjs_media_evas.yml
+++ /dev/null
@@ -1,459 +0,0 @@
-uuid: f55df748-dd03-4f16-9f15-1d7a469a60b1
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.pdfjs
-  module:
-    - eva
-    - media
-    - taxonomy
-    - user
-_core:
-  default_config_hash: wBeEoQFRFbqZtU07QYIr5OC5beMvPIe9GBuW9vjb_9s
-id: pdfjs_media_evas
-label: 'PDFjs Media EVAs'
-module: views
-description: 'Displays media for content as EVA''s per model.'
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Main
-    display_plugin: default
-    position: 0
-    display_options:
-      title: ''
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'view media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: pdfjs
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: false
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  entity_view_1:
-    id: entity_view_1
-    display_title: 'Original File'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'PDFjs - Original File'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#OriginalFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: pdfjs
-      defaults:
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'The original creation format of a file'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-      show_title: false
-      argument_mode: id
-      default_argument: null
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  entity_view_2:
-    id: entity_view_2
-    display_title: 'Preservation Master'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'PDFjs - Preservation Master'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#PreservationMasterFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: pdfjs
-      defaults:
-        style: false
-        row: false
-        filters: false
-        filter_groups: false
-      display_description: 'Best quality representation of the Object appropriate for long-term preservation.'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-      show_title: false
-      argument_mode: id
-      default_argument: null
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  service_file:
-    id: service_file
-    display_title: 'Service File'
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      title: 'PDFjs - Service File'
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ServiceFile'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        title: false
-        filters: false
-        filter_groups: false
-      display_description: 'A medium quality representation of the Object appropriate for serving to users.'
-      display_extenders: {  }
-      entity_type: node
-      bundles: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.reorder_children.yml b/config/export/views.view.reorder_children.yml
deleted file mode 100644
index 3f6a79011..000000000
--- a/config/export/views.view.reorder_children.yml
+++ /dev/null
@@ -1,271 +0,0 @@
-uuid: 7318f40f-b4a2-4960-89df-d009a6e2c4cc
-langcode: en
-status: true
-dependencies:
-  module:
-    - islandora
-    - node
-    - user
-_core:
-  default_config_hash: rX8-4_I2EYYasp7N827KzYgFxA3HkSgkb5SkktNC3XA
-id: reorder_children
-label: 'Reorder children'
-module: views
-description: 'Manage members belonging to a piece of content'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Reorder children'
-      fields:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: Title
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_weight:
-          id: field_weight
-          table: node__field_weight
-          field: field_weight
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: integer_weight_selector
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: true
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '10, 25, 50, 100'
-            items_per_page_options_all: true
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'manage members'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        field_weight_value:
-          id: field_weight_value
-          table: node__field_weight
-          field: field_weight_value
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: field_weight_value
-          exposed: false
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:node'
-            fail: 'not found'
-          validate_options:
-            bundles: {  }
-            access: false
-            operation: view
-            multiple: 0
-          break_phrase: false
-          not: false
-      filters: {  }
-      filter_groups:
-        operator: AND
-        groups: {  }
-      style:
-        type: table
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: node/%node/members/reorder
-      menu:
-        type: none
-        title: 'Reorder Children'
-        description: ''
-        weight: 0
-        expanded: false
-        menu_name: main
-        parent: ''
-        context: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.search_within_this_collection_link.yml b/config/export/views.view.search_within_this_collection_link.yml
deleted file mode 100644
index dd9387e48..000000000
--- a/config/export/views.view.search_within_this_collection_link.yml
+++ /dev/null
@@ -1,223 +0,0 @@
-uuid: c65bd76b-e99c-42f1-9c81-bd9b1c863ac6
-langcode: en
-status: true
-dependencies:
-  module:
-    - eva
-    - node
-    - user
-id: search_within_this_collection_link
-label: 'Search Within This Collection link'
-module: views
-description: 'hacky way to get a link to node/%node/search on a node''s page.'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        nothing:
-          id: nothing
-          table: views
-          field: nothing
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: custom
-          label: ''
-          exclude: false
-          alter:
-            alter_text: true
-            text: 'Search within {{ drupal_field(''title'', ''node'', arguments.field_member_of_target_id ) }}'
-            make_link: true
-            path: '/node/{{ raw_arguments.field_member_of_target_id }}/search'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  entity_view_1:
-    id: entity_view_1
-    display_title: EVA
-    display_plugin: entity_view
-    position: 1
-    display_options:
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      entity_type: node
-      bundles: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.solr_search_content.yml b/config/export/views.view.solr_search_content.yml
deleted file mode 100644
index 3598f06b4..000000000
--- a/config/export/views.view.solr_search_content.yml
+++ /dev/null
@@ -1,1059 +0,0 @@
-uuid: 017452fb-5475-4681-9136-99cc4f05c459
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.node.field_description
-    - field.storage.node.field_resource_type
-    - search_api.index.default_solr_index
-  module:
-    - search_api
-    - views_field_view
-id: solr_search_content
-label: 'Solr search content'
-module: views
-description: 'Search the repository content of your site'
-tag: ''
-base_table: search_api_index_default_solr_index
-base_field: search_api_id
-display:
-  default:
-    id: default
-    display_title: Main
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Search Content'
-      fields:
-        title:
-          id: title
-          table: search_api_index_default_solr_index
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: h3
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: true
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        nid:
-          id: nid
-          table: search_api_index_default_solr_index
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_unformatted
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api_numeric
-          fallback_options:
-            set_precision: false
-            precision: 0
-            decimal: .
-            separator: ''
-            format_plural: false
-            format_plural_string: !!binary MQNAY291bnQ=
-            prefix: ''
-            suffix: ''
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-            format_plural_values:
-              - '1'
-              - '@count'
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: view
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: align-right
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          view: thumbnail
-          display: block_2
-          arguments: '{{ raw_fields.nid }}'
-        field_resource_type:
-          id: field_resource_type
-          table: search_api_index_default_solr_index
-          field: field_resource_type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: false
-            multi_type: separator
-            multi_separator: ', '
-        edtf_year:
-          id: edtf_year
-          table: search_api_index_default_solr_index
-          field: edtf_year
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_numeric
-          label: Year
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          set_precision: false
-          precision: 0
-          decimal: .
-          separator: ''
-          format_plural: false
-          format_plural_string: !!binary Aw==
-          prefix: ''
-          suffix: ''
-          link_to_item: false
-          use_highlighting: true
-          multi_type: separator
-          multi_separator: ', '
-          format_plural_values: {  }
-        member_of_title:
-          id: member_of_title
-          table: search_api_index_default_solr_index
-          field: member_of_title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: 'Member of'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        field_linked_agent_name:
-          id: field_linked_agent_name
-          table: search_api_index_default_solr_index
-          field: field_linked_agent_name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: Names
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        field_description:
-          id: field_description
-          table: search_api_index_default_solr_index
-          field: field_description
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_field
-          label: Description
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 400
-            word_boundary: true
-            ellipsis: true
-            more_link: true
-            more_link_text: more
-            more_link_path: 'node/{{ nid }}'
-            strip_tags: false
-            trim: true
-            preserve_tags: ''
-            html: true
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: basic_string
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          field_rendering: false
-          fallback_handler: search_api
-          fallback_options:
-            link_to_item: false
-            use_highlighting: true
-            multi_type: separator
-            multi_separator: ', '
-        processed:
-          id: processed
-          table: search_api_index_default_solr_index
-          field: processed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          label: Abstract
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: true
-            max_length: 400
-            word_boundary: true
-            ellipsis: true
-            more_link: true
-            more_link_text: more
-            more_link_path: 'node/{{ nid }}'
-            strip_tags: false
-            trim: true
-            preserve_tags: ''
-            html: true
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          link_to_item: false
-          use_highlighting: true
-          multi_type: separator
-          multi_separator: ', '
-        search_api_excerpt:
-          id: search_api_excerpt
-          table: search_api_index_default_solr_index
-          field: search_api_excerpt
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          label: 'Full Text'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: field__item
-          element_label_type: ''
-          element_label_class: field__label
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: true
-          empty_zero: false
-          hide_alter_empty: true
-          link_to_item: false
-          use_highlighting: false
-          multi_type: separator
-          multi_separator: ', '
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 15
-          total_pages: null
-          id: 0
-          tags:
-            next: 'next ›'
-            previous: '‹ previous'
-          expose:
-            items_per_page: true
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '15,60,120'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Search
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: none
-        options: {  }
-      cache:
-        type: none
-        options: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: '<strong>No results found </strong>'
-            format: basic_html
-          tokenize: false
-      sorts:
-        search_api_relevance:
-          id: search_api_relevance
-          table: search_api_index_default_solr_index
-          field: search_api_relevance
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          order: DESC
-          expose:
-            label: Relevance
-            field_identifier: search_api_relevance
-          exposed: true
-        title:
-          id: title
-          table: search_api_index_default_solr_index
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          order: ASC
-          expose:
-            label: Title
-            field_identifier: title
-          exposed: true
-        edtf_year:
-          id: edtf_year
-          table: search_api_index_default_solr_index
-          field: edtf_year
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          order: DESC
-          expose:
-            label: Year
-            field_identifier: edtf_year
-          exposed: true
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: search_api_index_default_solr_index
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_options
-          operator: or
-          value:
-            islandora_object: islandora_object
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: clearfix
-          default_row_class: true
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: search_api_query
-        options: {  }
-      relationships: {  }
-      use_ajax: true
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: false
-          content: '<div id="ajax-page-summary" class="pager__summary">Displaying @start - @end of @total</div>'
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
-        - 'user.node_grants:view'
-      tags:
-        - 'config:field.storage.node.field_description'
-        - 'config:field.storage.node.field_resource_type'
-        - 'config:search_api.index.default_solr_index'
-        - 'search_api_list:default_solr_index'
-      cacheable: false
-  block_1:
-    id: block_1
-    display_title: 'Collection Members'
-    display_plugin: block
-    position: 2
-    display_options:
-      title: 'Search within Collection'
-      arguments:
-        field_member_of:
-          id: field_member_of
-          table: search_api_index_default_solr_index
-          field: field_member_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options: {  }
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-        field_descendant_of:
-          id: field_descendant_of
-          table: search_api_index_default_solr_index
-          field: field_descendant_of
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: raw
-          default_argument_options:
-            index: 1
-            use_alias: false
-          default_argument_skip_url: false
-          summary_options: {  }
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      defaults:
-        title: false
-        arguments: false
-      display_description: 'Searches and lists members of a collection.'
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      block_description: 'Solr Search Content: Collection Members'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
-        - 'user.node_grants:view'
-      tags:
-        - 'config:field.storage.node.field_description'
-        - 'config:field.storage.node.field_resource_type'
-        - 'config:search_api.index.default_solr_index'
-        - 'search_api_list:default_solr_index'
-  page_1:
-    id: page_1
-    display_title: 'Search Page'
-    display_plugin: page
-    position: 1
-    display_options:
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: '<strong>No results found </strong>'
-            format: basic_html
-          tokenize: false
-      filters:
-        type:
-          id: type
-          table: search_api_index_default_solr_index
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: search_api_options
-          operator: or
-          value:
-            islandora_object: islandora_object
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      defaults:
-        empty: false
-        filters: false
-        filter_groups: false
-      display_description: ''
-      exposed_block: true
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: search
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - 'url.query_args:sort_by'
-        - 'url.query_args:sort_order'
-        - 'user.node_grants:view'
-      tags:
-        - 'config:field.storage.node.field_description'
-        - 'config:field.storage.node.field_resource_type'
-        - 'config:search_api.index.default_solr_index'
-        - 'search_api_list:default_solr_index'
-      cacheable: false
diff --git a/config/export/views.view.taxonomy_term.yml b/config/export/views.view.taxonomy_term.yml
deleted file mode 100644
index f8df75358..000000000
--- a/config/export/views.view.taxonomy_term.yml
+++ /dev/null
@@ -1,319 +0,0 @@
-uuid: 9e7d1d72-b47c-4f98-9877-446d8efd4402
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-  module:
-    - node
-    - taxonomy
-    - user
-_core:
-  default_config_hash: YKgw0f77GEmCu6_6Om9Mbig0mON9JdfVuMxTtd0WQaI
-id: taxonomy_term
-label: 'Taxonomy term'
-module: taxonomy
-description: 'Content belonging to a certain taxonomy term.'
-tag: default
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      fields: {  }
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: 0
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        sticky:
-          id: sticky
-          table: taxonomy_index
-          field: sticky
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: sticky
-          exposed: false
-        created:
-          id: created
-          table: taxonomy_index
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      arguments:
-        tid:
-          id: tid
-          table: taxonomy_index
-          field: tid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: taxonomy_index_tid
-          default_action: 'not found'
-          exception:
-            value: ''
-            title_enable: false
-            title: All
-          title_enable: true
-          title: '{{ arguments.tid }}'
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: true
-          validate:
-            type: 'entity:taxonomy_term'
-            fail: 'not found'
-          validate_options:
-            bundles: {  }
-            access: true
-            operation: view
-            multiple: 0
-          break_phrase: false
-          add_table: false
-          require_value: false
-          reduce_duplicates: false
-      filters:
-        langcode:
-          id: langcode
-          table: node_field_data
-          field: langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: langcode
-          plugin_id: language
-          operator: in
-          value:
-            '***LANGUAGE_language_content***': '***LANGUAGE_language_content***'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status:
-          id: status
-          table: taxonomy_index
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: default
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          uses_fields: false
-      row:
-        type: 'entity:node'
-        options:
-          view_mode: teaser
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      link_display: page_1
-      link_url: ''
-      header:
-        entity_taxonomy_term:
-          id: entity_taxonomy_term
-          table: views
-          field: entity_taxonomy_term
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: entity
-          empty: true
-          target: '{{ raw_arguments.tid }}'
-          view_mode: full
-          tokenize: true
-          bypass_access: false
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  feed_1:
-    id: feed_1
-    display_title: Feed
-    display_plugin: feed
-    position: 2
-    display_options:
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 10
-      style:
-        type: rss
-        options:
-          grouping: {  }
-          uses_fields: false
-          description: ''
-      row:
-        type: node_rss
-        options:
-          relationship: none
-          view_mode: default
-      query:
-        type: views_query
-        options: {  }
-      display_extenders: {  }
-      path: taxonomy/term/%/feed
-      displays:
-        page_1: page_1
-        default: '0'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      query:
-        type: views_query
-        options: {  }
-      display_extenders: {  }
-      path: taxonomy/term/%
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.taxonomy_terms.yml b/config/export/views.view.taxonomy_terms.yml
deleted file mode 100644
index dbe43250b..000000000
--- a/config/export/views.view.taxonomy_terms.yml
+++ /dev/null
@@ -1,994 +0,0 @@
-uuid: d132066e-1a82-4685-94d0-a93a0a6ad376
-langcode: en
-status: false
-dependencies:
-  config:
-    - field.storage.taxonomy_term.field_authority_link
-    - field.storage.taxonomy_term.field_external_uri
-    - field.storage.taxonomy_term.field_geo_alt_name
-  module:
-    - controlled_access_terms
-    - link
-    - taxonomy
-    - user
-id: taxonomy_terms
-label: 'Taxonomy Terms'
-module: views
-description: 'Management view of all taxonomy terms.'
-tag: ''
-base_table: taxonomy_term_field_data
-base_field: tid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Taxonomy Terms'
-      fields:
-        taxonomy_term_bulk_form:
-          id: taxonomy_term_bulk_form
-          table: taxonomy_term_data
-          field: taxonomy_term_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          plugin_id: bulk_form
-          label: 'Bulk update'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          action_title: Action
-          include_exclude: exclude
-          selected_actions: {  }
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: Name
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          convert_spaces: false
-        field_geo_alt_name:
-          id: field_geo_alt_name
-          table: taxonomy_term__field_geo_alt_name
-          field: field_geo_alt_name
-          relationship: none
-          group_type: group
-          admin_label: field_geo_alt_name
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        nothing:
-          id: nothing
-          table: views
-          field: nothing
-          relationship: none
-          group_type: group
-          admin_label: 'Combined Alt Names'
-          plugin_id: custom
-          label: 'Alternate Names'
-          exclude: false
-          alter:
-            alter_text: true
-            text: '{{ field_geo_alt_name }} {{ field_corp_alt_name }} {{ field_alternate_name }}'
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: false
-        vid:
-          id: vid
-          table: taxonomy_term_field_data
-          field: vid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: vid
-          plugin_id: field
-          label: Vocabulary
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: target_id
-          type: entity_reference_label
-          settings:
-            link: true
-          group_column: target_id
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_authority_link:
-          id: field_authority_link
-          table: taxonomy_term__field_authority_link
-          field: field_authority_link
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'Authority Sources'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '--'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: uri
-          type: authority_formatter_default
-          settings:
-            trim_length: 80
-            url_only: false
-            url_plain: false
-            rel: '0'
-            target: _blank
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        field_external_uri:
-          id: field_external_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: field
-          label: 'External URI'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: '--'
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: uri
-          type: link
-          settings:
-            trim_length: 80
-            url_only: true
-            url_plain: true
-            rel: '0'
-            target: '0'
-          group_column: ''
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        changed:
-          id: changed
-          table: taxonomy_term_field_data
-          field: changed
-          entity_type: taxonomy_term
-          entity_field: changed
-          plugin_id: field
-        status:
-          id: status
-          table: taxonomy_term_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: status
-          plugin_id: field
-          label: Published
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: boolean
-          settings:
-            format: yes-no
-            format_custom_false: ''
-            format_custom_true: ''
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        operations:
-          id: operations
-          table: taxonomy_term_data
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          plugin_id: entity_operations
-          label: 'Operations links'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: false
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer taxonomy'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments: {  }
-      filters:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: name_op
-            label: 'Name (contains)'
-            description: ''
-            use_operator: false
-            operator: name_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: name
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        status:
-          id: status
-          table: taxonomy_term_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: All
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: Published
-            description: ''
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        vid:
-          id: vid
-          table: taxonomy_term_field_data
-          field: vid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: vid
-          plugin_id: bundle
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: vid_op
-            label: Vocabulary
-            description: ''
-            use_operator: false
-            operator: vid_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: vid
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_external_uri_uri_op
-            label: 'External URI  (contains)'
-            description: ''
-            use_operator: false
-            operator: field_external_uri_uri_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_external_uri_uri
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_authority_link_uri:
-          id: field_authority_link_uri
-          table: taxonomy_term__field_authority_link
-          field: field_authority_link_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: field_authority_link_uri_op
-            label: 'Authority Link uri (contains)'
-            description: ''
-            use_operator: false
-            operator: field_authority_link_uri_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: field_authority_link_uri
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        combine:
-          id: combine
-          table: views
-          field: combine
-          plugin_id: combine
-          group: 1
-          expose:
-            operator_limit_selection: false
-            operator_list: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            taxonomy_term_bulk_form: taxonomy_term_bulk_form
-            name: name
-            parent_target_id: parent_target_id
-            vid: vid
-            field_external_uri: field_external_uri
-            field_authority_link: field_authority_link
-            operations: operations
-            changed: changed
-            changed_1: changed_1
-          default: '-1'
-          info:
-            taxonomy_term_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            parent_target_id:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            vid:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_external_uri:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            field_authority_link:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            operations:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            changed_1:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: true
-          content: 'Displaying @start - @end of @total'
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.taxonomy_term.field_authority_link'
-        - 'config:field.storage.taxonomy_term.field_external_uri'
-        - 'config:field.storage.taxonomy_term.field_geo_alt_name'
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: admin/content/taxonomy-terms
-      menu:
-        type: tab
-        title: 'Taxonomy Terms'
-        description: ''
-        weight: 110
-        expanded: false
-        menu_name: admin
-        parent: system.admin_content
-        context: '0'
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags:
-        - 'config:field.storage.taxonomy_term.field_authority_link'
-        - 'config:field.storage.taxonomy_term.field_external_uri'
-        - 'config:field.storage.taxonomy_term.field_geo_alt_name'
diff --git a/config/export/views.view.term_from_term_name.yml b/config/export/views.view.term_from_term_name.yml
deleted file mode 100644
index 59abfb9cb..000000000
--- a/config/export/views.view.term_from_term_name.yml
+++ /dev/null
@@ -1,322 +0,0 @@
-uuid: bb9e2f3e-f255-4d63-bc31-92b27a9c7929
-langcode: en
-status: true
-dependencies:
-  module:
-    - rest
-    - serialization
-    - taxonomy
-    - user
-_core:
-  default_config_hash: 6S5Bt8qGqeGpHv2L9rc_3qXRZN1jwx9yyrsUd7TqLwY
-id: term_from_term_name
-label: 'Term from term name'
-module: views
-description: 'REST output of a term, from a request like /term_from_term_name?vocab=person&name=Jordan%2C%20Mark&_format=json. Used by Islandora Workbench.'
-tag: ''
-base_table: taxonomy_term_field_data
-base_field: tid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          convert_spaces: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer taxonomy'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: query_parameter
-          default_argument_options:
-            query_param: uri
-            fallback: ''
-            multiple: and
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-      filters:
-        status:
-          id: status
-          table: taxonomy_term_field_data
-          field: status
-          entity_type: taxonomy_term
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: serializer
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export (external URI)'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      cache:
-        type: none
-        options: {  }
-      arguments:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: string
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: query_parameter
-          default_argument_options:
-            query_param: name
-            fallback: ''
-            multiple: and
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-          add_table: false
-          require_value: false
-        vid:
-          id: vid
-          table: taxonomy_term_field_data
-          field: vid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: vid
-          plugin_id: vocabulary_vid
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: query_parameter
-          default_argument_options:
-            query_param: vocab
-            fallback: ''
-            multiple: and
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      style:
-        type: serializer
-        options:
-          uses_fields: false
-          formats:
-            json: json
-      row:
-        type: data_entity
-        options: {  }
-      defaults:
-        cache: false
-        arguments: false
-      display_description: ''
-      display_extenders: {  }
-      path: term_from_term_name
-      auth:
-        - basic_auth
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.term_from_uri.yml b/config/export/views.view.term_from_uri.yml
deleted file mode 100644
index c1904556d..000000000
--- a/config/export/views.view.term_from_uri.yml
+++ /dev/null
@@ -1,352 +0,0 @@
-uuid: fcdee38a-510c-47ed-8639-31a4836acfa0
-langcode: en
-status: true
-dependencies:
-  module:
-    - rest
-    - serialization
-    - taxonomy
-    - user
-_core:
-  default_config_hash: wu_5Q6qIdqz9vEym7oxgVNtt3HQBljdrq9yVDd0EMKw
-id: term_from_uri
-label: 'Term from URI'
-module: views
-description: 'REST output of a term, from a request like /term_from_uri?_format=json&uri=http://pcdm.org/use%23ThumbnailImage or "/term_from_authority_link?_format=json&authority_link=http://1234.org". Used by Islandora Workbench.'
-tag: ''
-base_table: taxonomy_term_field_data
-base_field: tid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          convert_spaces: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 10
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer taxonomy'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: query_parameter
-          default_argument_options:
-            query_param: uri
-            fallback: ''
-            multiple: and
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-      filters:
-        status:
-          id: status
-          table: taxonomy_term_field_data
-          field: status
-          entity_type: taxonomy_term
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: serializer
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export (external URI)'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      arguments:
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: query_parameter
-          default_argument_options:
-            query_param: uri
-            fallback: ''
-            multiple: and
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-      style:
-        type: serializer
-        options:
-          uses_fields: false
-          formats:
-            json: json
-      row:
-        type: data_entity
-        options: {  }
-      defaults:
-        arguments: false
-      display_description: ''
-      display_extenders: {  }
-      path: term_from_uri
-      auth:
-        - basic_auth
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags: {  }
-  rest_export_2:
-    id: rest_export_2
-    display_title: 'REST export (authority link)'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      arguments:
-        field_authority_link_uri:
-          id: field_authority_link_uri
-          table: taxonomy_term__field_authority_link
-          field: field_authority_link_uri
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: query_parameter
-          default_argument_options:
-            query_param: authority_link
-            fallback: ''
-            multiple: and
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          glossary: false
-          limit: 0
-          case: none
-          path_case: none
-          transform_dash: false
-          break_phrase: false
-      style:
-        type: serializer
-        options:
-          uses_fields: false
-          formats:
-            json: json
-      row:
-        type: data_entity
-        options: {  }
-      defaults:
-        arguments: false
-      display_description: ''
-      display_extenders: {  }
-      path: term_from_authority_link
-      auth:
-        - basic_auth
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.terms_in_vocabulary.yml b/config/export/views.view.terms_in_vocabulary.yml
deleted file mode 100644
index 55bd0330b..000000000
--- a/config/export/views.view.terms_in_vocabulary.yml
+++ /dev/null
@@ -1,242 +0,0 @@
-uuid: c0565241-ba17-4bbe-bfa7-f83660d6bf54
-langcode: en
-status: true
-dependencies:
-  module:
-    - rest
-    - serialization
-    - taxonomy
-    - user
-_core:
-  default_config_hash: nBd-o54HOet1jgPqgwmTkRTX646oTqOmAceWNGd4V6g
-id: terms_in_vocabulary
-label: 'Terms in vocabulary'
-module: views
-description: 'REST output of all the terms in a vocabulary, from a request like http://localhost:8000/vocabulary/{vid}?_format=json. Used by Islandora Workbench.'
-tag: ''
-base_table: taxonomy_term_field_data
-base_field: tid
-display:
-  default:
-    id: default
-    display_title: Master
-    display_plugin: default
-    position: 0
-    display_options:
-      fields:
-        name:
-          id: name
-          table: taxonomy_term_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: name
-          plugin_id: term_name
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-          convert_spaces: false
-      pager:
-        type: none
-        options:
-          offset: 0
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer taxonomy'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts: {  }
-      arguments:
-        vid:
-          id: vid
-          table: taxonomy_term_field_data
-          field: vid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: vid
-          plugin_id: vocabulary_vid
-          default_action: 'not found'
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: fixed
-          default_argument_options:
-            argument: ''
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        vid:
-          id: vid
-          table: taxonomy_term_field_data
-          field: vid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: taxonomy_term
-          entity_field: vid
-          plugin_id: bundle
-          operator: 'not in'
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: vid_op
-            label: Vocabulary
-            description: ''
-            use_operator: false
-            operator: vid_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: vid
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: serializer
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline: {  }
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags: {  }
-  rest_export_1:
-    id: rest_export_1
-    display_title: 'REST export'
-    display_plugin: rest_export
-    position: 1
-    display_options:
-      pager:
-        type: none
-        options:
-          offset: 0
-      style:
-        type: serializer
-        options:
-          grouping: {  }
-          uses_fields: false
-          formats: {  }
-      row:
-        type: data_entity
-        options: {  }
-      display_extenders: {  }
-      path: vocabulary
-      auth:
-        - basic_auth
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - request_format
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.thumbnail.yml b/config/export/views.view.thumbnail.yml
deleted file mode 100644
index a9c09f533..000000000
--- a/config/export/views.view.thumbnail.yml
+++ /dev/null
@@ -1,308 +0,0 @@
-uuid: be161815-2a33-4917-8c71-d07bf65bfc1a
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.media.thumbnail
-    - views.view.thumbnail_of_first_child
-  module:
-    - media
-    - taxonomy
-    - user
-id: thumbnail
-label: Thumbnail
-module: views
-description: ''
-tag: ''
-base_table: media_field_data
-base_field: mid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Thumbnail with fallback'
-      fields:
-        name:
-          id: name
-          table: media_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: media
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'view media'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        changed:
-          id: changed
-          table: media_field_data
-          field: changed
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: media
-          entity_field: changed
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-      arguments:
-        field_media_of_target_id:
-          id: field_media_of_target_id
-          table: media__field_media_of
-          field: field_media_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: media_field_data
-          field: status
-          entity_type: media
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_media_use
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://pcdm.org/use#ThumbnailImage'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: default
-      row:
-        type: 'entity:media'
-        options:
-          relationship: none
-          view_mode: thumbnail
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_media_use:
-          id: field_media_use
-          table: media__field_media_use
-          field: field_media_use
-          relationship: none
-          group_type: group
-          admin_label: 'field_media_use: Taxonomy term'
-          plugin_id: standard
-          required: true
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Thumbnail
-    display_plugin: block
-    position: 1
-    display_options:
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      block_description: Thumbnail
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
-  block_2:
-    id: block_2
-    display_title: 'Thumbnail with fallback'
-    display_plugin: block
-    position: 2
-    display_options:
-      empty:
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail of First Child'
-          plugin_id: view
-          empty: true
-          view_to_insert: 'thumbnail_of_first_child:block_1'
-          inherit_arguments: true
-      defaults:
-        empty: false
-      display_description: ''
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      block_description: 'Thumbnail with Fallback'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.thumbnail_of_first_child.yml b/config/export/views.view.thumbnail_of_first_child.yml
deleted file mode 100644
index e0901c147..000000000
--- a/config/export/views.view.thumbnail_of_first_child.yml
+++ /dev/null
@@ -1,272 +0,0 @@
-uuid: 01d2617f-0190-4afb-8078-0c3501403e37
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - user
-    - views_field_view
-id: thumbnail_of_first_child
-label: 'Thumbnail of First Child'
-module: views
-description: ''
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Thumbnail of First Child'
-      fields:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail (no fallback)'
-          plugin_id: view
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          view: thumbnail
-          display: block_1
-          arguments: '{{ raw_fields.nid }}'
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 1
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: node_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-          granularity: second
-      arguments:
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          default_action: default
-          exception:
-            value: all
-            title_enable: false
-            title: All
-          title_enable: false
-          title: ''
-          default_argument_type: node
-          default_argument_options: {  }
-          default_argument_skip_url: false
-          summary_options:
-            base_path: ''
-            count: true
-            override: false
-            items_per_page: 25
-          summary:
-            sort_order: asc
-            number_of_records: 0
-            format: default_summary
-          specify_validation: false
-          validate:
-            type: none
-            fail: 'not found'
-          validate_options: {  }
-          break_phrase: false
-          not: false
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-      style:
-        type: default
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 1
-    display_options:
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.top_level_collections.yml b/config/export/views.view.top_level_collections.yml
deleted file mode 100644
index d28e4bebb..000000000
--- a/config/export/views.view.top_level_collections.yml
+++ /dev/null
@@ -1,506 +0,0 @@
-uuid: 39576d48-0ed7-477f-be71-ad084084c19b
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - taxonomy
-    - user
-    - views_field_view
-id: top_level_collections
-label: 'Top Level Collections'
-module: views
-description: 'Islandora collections that aren''t members of other collections.'
-tag: ''
-base_table: node_field_data
-base_field: nid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Top Level Collections'
-      fields:
-        nid:
-          id: nid
-          table: node_field_data
-          field: nid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: nid
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: number_integer
-          settings:
-            thousand_separator: ''
-            prefix_suffix: false
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        view:
-          id: view
-          table: views
-          field: view
-          relationship: none
-          group_type: group
-          admin_label: 'Thumbnail Image'
-          plugin_id: view
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          view: thumbnail
-          display: block_2
-          arguments: '{{ raw_fields.nid }}'
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: false
-            ellipsis: false
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: h3
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: string
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 25
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: true
-          content:
-            value: 'No collections have been created.'
-            format: basic_html
-          tokenize: false
-      sorts:
-        title:
-          id: title
-          table: node_field_data
-          field: title
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: node
-          entity_field: title
-          plugin_id: standard
-          order: ASC
-          expose:
-            label: ''
-            field_identifier: ''
-          exposed: false
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: node_field_data
-          field: status
-          entity_type: node
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-        field_external_uri_uri:
-          id: field_external_uri_uri
-          table: taxonomy_term__field_external_uri
-          field: field_external_uri_uri
-          relationship: field_model
-          group_type: group
-          admin_label: ''
-          plugin_id: string
-          operator: '='
-          value: 'http://purl.org/dc/dcmitype/Collection'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        field_member_of_target_id:
-          id: field_member_of_target_id
-          table: node__field_member_of
-          field: field_member_of_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: numeric
-          operator: empty
-          value:
-            min: ''
-            max: ''
-            value: ''
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: html_list
-        options:
-          grouping: {  }
-          row_class: row
-          default_row_class: true
-          type: ul
-          wrapper_class: item-group
-          class: list-group-item
-      row:
-        type: fields
-        options:
-          default_field_elements: true
-          inline:
-            view: view
-            title: title
-          separator: ''
-          hide_empty: false
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        field_model:
-          id: field_model
-          table: node__field_model
-          field: field_model
-          relationship: none
-          group_type: group
-          admin_label: 'field_model: Taxonomy term'
-          plugin_id: standard
-          required: true
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: false
-          content:
-            value: ''
-            format: basic_html
-          tokenize: false
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: Block
-    display_plugin: block
-    position: 2
-    display_options:
-      defaults:
-        header: false
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text
-          empty: false
-          content:
-            value: "<h2>Top-Level Collections</h2>\r\n<p> Islandora provides you with tools to flexibly designate content into one or more collections. These collections can also be nested within each other, and items can belong to more than one collection. This view shows every collection that is not a member of another collection, which is why we are calling them \"top-level\" collections </p>"
-            format: basic_html
-          tokenize: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      title: '<blank>'
-      defaults:
-        title: false
-      display_extenders:
-        matomo:
-          enabled: false
-          keyword_gets: ''
-          keyword_behavior: first
-          keyword_concat_separator: ' '
-          category_behavior: none
-          category_gets: ''
-          category_concat_separator: ' '
-          category_fallback: ''
-          category_facets: {  }
-          category_facets_concat_separator: ', '
-      path: collections
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.user_admin_people.yml b/config/export/views.view.user_admin_people.yml
deleted file mode 100644
index 7180bbfb0..000000000
--- a/config/export/views.view.user_admin_people.yml
+++ /dev/null
@@ -1,927 +0,0 @@
-uuid: f0e92e31-b8c8-4d67-951a-b97eb7d1bb93
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: njaZigMvB4ap21Fg_tQcJhWgYJCGNi49Z5rRL_N6RI0
-id: user_admin_people
-label: People
-module: user
-description: 'Find and manage people interacting with your site.'
-tag: default
-base_table: users_field_data
-base_field: uid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: People
-      fields:
-        user_bulk_form:
-          id: user_bulk_form
-          table: users
-          field: user_bulk_form
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          plugin_id: user_bulk_form
-          label: 'Bulk update'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: Username
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: user_name
-        status:
-          id: status
-          table: users_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: boolean
-          settings:
-            format: custom
-            format_custom_false: Blocked
-            format_custom_true: Active
-        roles_target_id:
-          id: roles_target_id
-          table: user__roles
-          field: roles_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: user_roles
-          label: Roles
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: ul
-          separator: ', '
-        created:
-          id: created
-          table: users_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: created
-          plugin_id: field
-          label: 'Member for'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp_ago
-          settings:
-            future_format: '@interval'
-            past_format: '@interval'
-            granularity: 2
-        access:
-          id: access
-          table: users_field_data
-          field: access
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: access
-          plugin_id: field
-          label: 'Last access'
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: timestamp_ago
-          settings:
-            future_format: '@interval hence'
-            past_format: '@interval ago'
-            granularity: 2
-        operations:
-          id: operations
-          table: users
-          field: operations
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          plugin_id: entity_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          destination: true
-        mail:
-          id: mail
-          table: users_field_data
-          field: mail
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: mail
-          plugin_id: field
-          label: ''
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: basic_string
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-      pager:
-        type: full
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: 0
-          id: 0
-          tags:
-            next: 'Next ›'
-            previous: '‹ Previous'
-            first: '« First'
-            last: 'Last »'
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-          quantity: 9
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'administer users'
-      cache:
-        type: tag
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'No people available.'
-          tokenize: false
-      sorts:
-        created:
-          id: created
-          table: users_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      filters:
-        combine:
-          id: combine
-          table: views
-          field: combine
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: combine
-          operator: contains
-          value: ''
-          group: 1
-          exposed: true
-          expose:
-            operator_id: combine_op
-            label: 'Name or email contains'
-            description: ''
-            use_operator: false
-            operator: combine_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: user
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          fields:
-            name: name
-            mail: mail
-        status:
-          id: status
-          table: users_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: status
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: true
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: status
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: true
-          group_info:
-            label: Status
-            description: ''
-            identifier: status
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items:
-              1:
-                title: Active
-                operator: '='
-                value: '1'
-              2:
-                title: Blocked
-                operator: '='
-                value: '0'
-        roles_target_id:
-          id: roles_target_id
-          table: user__roles
-          field: roles_target_id
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: user_roles
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: roles_target_id_op
-            label: Role
-            description: ''
-            use_operator: false
-            operator: roles_target_id_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: role
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        permission:
-          id: permission
-          table: user__roles
-          field: permission
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: user_permissions
-          operator: or
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: permission_op
-            label: Permission
-            description: ''
-            use_operator: false
-            operator: permission_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: permission
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-          reduce_duplicates: false
-        default_langcode:
-          id: default_langcode
-          table: users_field_data
-          field: default_langcode
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: default_langcode
-          plugin_id: boolean
-          operator: '='
-          value: '1'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: ''
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        uid_raw:
-          id: uid_raw
-          table: users_field_data
-          field: uid_raw
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          plugin_id: numeric
-          operator: '!='
-          value:
-            min: ''
-            max: ''
-            value: '0'
-          group: 1
-          exposed: false
-          expose:
-            operator_id: '0'
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          columns:
-            user_bulk_form: user_bulk_form
-            name: name
-            status: status
-            rid: rid
-            created: created
-            access: access
-            edit_node: edit_node
-            dropbutton: dropbutton
-          default: created
-          info:
-            user_bulk_form:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            status:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            rid:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            created:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            access:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            edit_node:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            dropbutton:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: true
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      css_class: ''
-      use_ajax: false
-      group_by: false
-      show_admin_links: true
-      use_more: false
-      use_more_always: false
-      use_more_text: more
-      link_display: page_1
-      link_url: ''
-      display_comment: ''
-      hide_attachment_summary: false
-      display_extenders: {  }
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  page_1:
-    id: page_1
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      defaults:
-        show_admin_links: false
-      show_admin_links: false
-      display_extenders: {  }
-      path: admin/people/list
-      menu:
-        type: 'default tab'
-        title: List
-        description: 'Find and manage people interacting with your site.'
-        weight: -10
-        menu_name: admin
-        context: ''
-      tab_options:
-        type: normal
-        title: People
-        description: 'Manage user accounts, roles, and permissions.'
-        weight: 0
-        menu_name: admin
-    cache_metadata:
-      max-age: 0
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.watchdog.yml b/config/export/views.view.watchdog.yml
deleted file mode 100644
index b8c297394..000000000
--- a/config/export/views.view.watchdog.yml
+++ /dev/null
@@ -1,712 +0,0 @@
-uuid: b6961a19-ffd2-4860-ba33-3b5c9d14c6b8
-langcode: en
-status: true
-dependencies:
-  module:
-    - dblog
-    - user
-_core:
-  default_config_hash: j0txIxY4nkJT_dscmXckM-1vanygDkJAeHPawZKfyH0
-id: watchdog
-label: Watchdog
-module: views
-description: 'Recent log messages'
-tag: ''
-base_table: watchdog
-base_field: wid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Recent log messages'
-      fields:
-        nothing:
-          id: nothing
-          table: views
-          field: nothing
-          relationship: none
-          group_type: group
-          admin_label: Icon
-          plugin_id: custom
-          label: ''
-          exclude: false
-          alter:
-            alter_text: true
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: icon
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: false
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: false
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: false
-        wid:
-          id: wid
-          table: watchdog
-          field: wid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          label: WID
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        severity:
-          id: severity
-          table: watchdog
-          field: severity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: machine_name
-          label: Severity
-          exclude: true
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          machine_name: false
-        type:
-          id: type
-          table: watchdog
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          label: Type
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-        timestamp:
-          id: timestamp
-          table: watchdog
-          field: timestamp
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: date
-          label: Date
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          date_format: short
-          custom_date_format: ''
-          timezone: ''
-        message:
-          id: message
-          table: watchdog
-          field: message
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: dblog_message
-          label: Message
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: true
-            path: 'admin/reports/dblog/event/{{ wid }}'
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: '{{ message }}'
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 56
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: true
-            trim: true
-            preserve_tags: ''
-            html: true
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          replace_variables: true
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: uid
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: User
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: user_name
-          settings:
-            link_to_entity: true
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        link:
-          id: link
-          table: watchdog
-          field: link
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: dblog_operations
-          label: Operations
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-      pager:
-        type: mini
-        options:
-          offset: 0
-          items_per_page: 50
-          total_pages: null
-          id: 0
-          tags:
-            next: ››
-            previous: ‹‹
-          expose:
-            items_per_page: false
-            items_per_page_label: 'Items per page'
-            items_per_page_options: '5, 10, 25, 50'
-            items_per_page_options_all: false
-            items_per_page_options_all_label: '- All -'
-            offset: false
-            offset_label: Offset
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Filter
-          reset_button: true
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: false
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access site reports'
-      cache:
-        type: none
-        options: {  }
-      empty:
-        area:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: 'No log messages available.'
-          plugin_id: text_custom
-          empty: true
-          content: 'No log messages available.'
-          tokenize: false
-      sorts:
-        wid:
-          id: wid
-          table: watchdog
-          field: wid
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: standard
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: wid
-          exposed: false
-      arguments: {  }
-      filters:
-        type:
-          id: type
-          table: watchdog
-          field: type
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: dblog_types
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: type_op
-            label: Type
-            description: ''
-            use_operator: false
-            operator: type_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: type
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-        severity:
-          id: severity
-          table: watchdog
-          field: severity
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: in_operator
-          operator: in
-          value: {  }
-          group: 1
-          exposed: true
-          expose:
-            operator_id: severity_op
-            label: Severity
-            description: ''
-            use_operator: false
-            operator: severity_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: severity
-            required: false
-            remember: false
-            multiple: true
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-            reduce: false
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      filter_groups:
-        operator: AND
-        groups:
-          1: AND
-      style:
-        type: table
-        options:
-          grouping: {  }
-          row_class: '{{ type }} {{ severity }}'
-          default_row_class: true
-          columns:
-            nothing: nothing
-            wid: wid
-            severity: severity
-            type: type
-            timestamp: timestamp
-            message: message
-            name: name
-            link: link
-          default: wid
-          info:
-            nothing:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            wid:
-              sortable: false
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            severity:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            type:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            timestamp:
-              sortable: true
-              default_sort_order: desc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-            message:
-              sortable: false
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: ''
-            name:
-              sortable: true
-              default_sort_order: asc
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-medium
-            link:
-              align: ''
-              separator: ''
-              empty_column: false
-              responsive: priority-low
-          override: true
-          sticky: false
-          summary: ''
-          empty_table: false
-          caption: ''
-          description: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships:
-        uid:
-          id: uid
-          table: watchdog
-          field: uid
-          relationship: none
-          group_type: group
-          admin_label: User
-          plugin_id: standard
-          required: false
-      css_class: admin-dblog
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
-  page:
-    id: page
-    display_title: Page
-    display_plugin: page
-    position: 1
-    display_options:
-      display_extenders: {  }
-      path: admin/reports/dblog
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.who_s_new.yml b/config/export/views.view.who_s_new.yml
deleted file mode 100644
index 6ba27afde..000000000
--- a/config/export/views.view.who_s_new.yml
+++ /dev/null
@@ -1,197 +0,0 @@
-uuid: e06e979a-d29a-4683-b011-3ef8511c0793
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: zji0_13MyVGK7Bn1lUMDeZyyOIZedWvqpYUeM_SioPI
-id: who_s_new
-label: 'Who''s new'
-module: user
-description: 'Shows a list of the newest user accounts on the site.'
-tag: default
-base_table: users_field_data
-base_field: uid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Who''s new'
-      fields:
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: user_name
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 5
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access content'
-      cache:
-        type: tag
-        options: {  }
-      empty: {  }
-      sorts:
-        created:
-          id: created
-          table: users_field_data
-          field: created
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: created
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: created
-          exposed: false
-          granularity: second
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: users_field_data
-          field: status
-          entity_type: user
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
-        access:
-          id: access
-          table: users_field_data
-          field: access
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: access
-          plugin_id: date
-          operator: '>'
-          value:
-            min: ''
-            max: ''
-            value: '1970-01-01'
-            type: date
-          group: 1
-          exposed: false
-          expose:
-            operator_id: '0'
-            label: ''
-            description: ''
-            use_operator: false
-            operator: ''
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: ''
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: html_list
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header: {  }
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
-  block_1:
-    id: block_1
-    display_title: 'Who''s new'
-    display_plugin: block
-    position: 1
-    display_options:
-      display_description: 'A list of new users'
-      display_extenders: {  }
-      block_description: 'Who''s new'
-      block_category: User
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views.view.who_s_online.yml b/config/export/views.view.who_s_online.yml
deleted file mode 100644
index c729fb8c4..000000000
--- a/config/export/views.view.who_s_online.yml
+++ /dev/null
@@ -1,226 +0,0 @@
-uuid: df1ac30e-ad96-4776-832c-7a083aa1647b
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-_core:
-  default_config_hash: suDsVMgawXoQt4rfmdfpr05EVX3z3KyfDDTYgeSM898
-id: who_s_online
-label: 'Who''s online block'
-module: user
-description: 'Shows the user names of the most recently active users, and the total number of active users.'
-tag: default
-base_table: users_field_data
-base_field: uid
-display:
-  default:
-    id: default
-    display_title: Default
-    display_plugin: default
-    position: 0
-    display_options:
-      title: 'Who''s online'
-      fields:
-        name:
-          id: name
-          table: users_field_data
-          field: name
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: name
-          plugin_id: field
-          label: ''
-          exclude: false
-          alter:
-            alter_text: false
-            make_link: false
-            absolute: false
-            word_boundary: false
-            ellipsis: false
-            strip_tags: false
-            trim: false
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          type: user_name
-      pager:
-        type: some
-        options:
-          offset: 0
-          items_per_page: 10
-      exposed_form:
-        type: basic
-        options:
-          submit_button: Apply
-          reset_button: false
-          reset_button_label: Reset
-          exposed_sorts_label: 'Sort by'
-          expose_sort_order: true
-          sort_asc_label: Asc
-          sort_desc_label: Desc
-      access:
-        type: perm
-        options:
-          perm: 'access user profiles'
-      cache:
-        type: tag
-        options: {  }
-      empty:
-        area_text_custom:
-          id: area_text_custom
-          table: views
-          field: area_text_custom
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: text_custom
-          empty: true
-          content: 'There are currently 0 users online.'
-          tokenize: false
-      sorts:
-        access:
-          id: access
-          table: users_field_data
-          field: access
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: access
-          plugin_id: date
-          order: DESC
-          expose:
-            label: ''
-            field_identifier: access
-          exposed: false
-          granularity: second
-      arguments: {  }
-      filters:
-        status:
-          id: status
-          table: users_field_data
-          field: status
-          entity_type: user
-          entity_field: status
-          plugin_id: boolean
-          value: '1'
-          group: 1
-          expose:
-            operator: '0'
-            operator_limit_selection: false
-            operator_list: {  }
-        access:
-          id: access
-          table: users_field_data
-          field: access
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: user
-          entity_field: access
-          plugin_id: date
-          operator: '>='
-          value:
-            min: ''
-            max: ''
-            value: '-15 minutes'
-            type: offset
-          group: 1
-          exposed: false
-          expose:
-            operator_id: access_op
-            label: 'Last access'
-            description: 'A user is considered online for this long after they have last viewed a page.'
-            use_operator: false
-            operator: access_op
-            operator_limit_selection: false
-            operator_list: {  }
-            identifier: access
-            required: false
-            remember: false
-            multiple: false
-            remember_roles:
-              authenticated: authenticated
-              anonymous: '0'
-              administrator: '0'
-          is_grouped: false
-          group_info:
-            label: ''
-            description: ''
-            identifier: ''
-            optional: true
-            widget: select
-            multiple: false
-            remember: false
-            default_group: All
-            default_group_multiple: {  }
-            group_items: {  }
-      style:
-        type: html_list
-        options:
-          grouping: {  }
-          row_class: ''
-          default_row_class: true
-          type: ul
-          wrapper_class: item-list
-          class: ''
-      row:
-        type: fields
-      query:
-        type: views_query
-        options:
-          query_comment: ''
-          disable_sql_rewrite: false
-          distinct: false
-          replica: false
-          query_tags: {  }
-      relationships: {  }
-      header:
-        result:
-          id: result
-          table: views
-          field: result
-          relationship: none
-          group_type: group
-          admin_label: ''
-          plugin_id: result
-          empty: false
-          content: 'There are currently @total users online.'
-      footer: {  }
-      display_extenders: {  }
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
-  who_s_online_block:
-    id: who_s_online_block
-    display_title: 'Who''s online'
-    display_plugin: block
-    position: 1
-    display_options:
-      display_description: 'A list of users that are currently logged in.'
-      display_extenders: {  }
-      block_description: 'Who''s online'
-    cache_metadata:
-      max-age: -1
-      contexts:
-        - 'languages:language_content'
-        - 'languages:language_interface'
-        - user.permissions
-      tags: {  }
diff --git a/config/export/views_field_view.settings.yml b/config/export/views_field_view.settings.yml
deleted file mode 100644
index 25f0b1f2c..000000000
--- a/config/export/views_field_view.settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-_core:
-  default_config_hash: s3zJAHh3WGp6g2aV1-IhRrq--hHUWGT84i23gVHRi4Y
-evil: false
diff --git a/config/sync/block.block.idc_ui_theme_boots_content.yml b/config/sync/block.block.idc_ui_theme_boots_content.yml
index bdbe0280a..b864f4e88 100644
--- a/config/sync/block.block.idc_ui_theme_boots_content.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_content.yml
@@ -11,7 +11,7 @@ _core:
 id: idc_ui_theme_boots_content
 theme: idc_ui_theme_boots
 region: content
-weight: -10
+weight: -14
 provider: null
 plugin: system_main_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_creatorsandcontributors.yml b/config/sync/block.block.idc_ui_theme_boots_creatorsandcontributors.yml
index d70b20de4..a739cff15 100644
--- a/config/sync/block.block.idc_ui_theme_boots_creatorsandcontributors.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_creatorsandcontributors.yml
@@ -15,7 +15,7 @@ _core:
 id: idc_ui_theme_boots_creatorsandcontributors
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -16
+weight: -15
 provider: null
 plugin: 'facet_block:creators_and_contributors'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml b/config/sync/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml
index 64a3bb67e..1165f5598 100644
--- a/config/sync/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_exposedformsolr_search_contentpage_1.yml
@@ -1,6 +1,6 @@
 uuid: 0fd27c5d-2482-41a4-9e88-5efcf43c9788
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - views.view.solr_search_content
diff --git a/config/sync/block.block.idc_ui_theme_boots_help.yml b/config/sync/block.block.idc_ui_theme_boots_help.yml
index 8953f735a..f35cfe409 100644
--- a/config/sync/block.block.idc_ui_theme_boots_help.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_help.yml
@@ -10,8 +10,8 @@ _core:
   default_config_hash: VfPFqqxfkomud5CO8DUijw85QIl9GIxh_nIxLOYESxg
 id: idc_ui_theme_boots_help
 theme: idc_ui_theme_boots
-region: top_header
-weight: -6
+region: content
+weight: -17
 provider: null
 plugin: help_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_local_actions.yml b/config/sync/block.block.idc_ui_theme_boots_local_actions.yml
index 2e000372a..a8ce93899 100644
--- a/config/sync/block.block.idc_ui_theme_boots_local_actions.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_local_actions.yml
@@ -9,7 +9,7 @@ _core:
 id: idc_ui_theme_boots_local_actions
 theme: idc_ui_theme_boots
 region: content
-weight: -5
+weight: -16
 provider: null
 plugin: local_actions_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml b/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml
index 8b793f6cd..f26216b04 100644
--- a/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_local_tasks.yml
@@ -9,7 +9,7 @@ _core:
 id: idc_ui_theme_boots_local_tasks
 theme: idc_ui_theme_boots
 region: content
-weight: -7
+weight: -10
 provider: null
 plugin: local_tasks_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_memberof.yml b/config/sync/block.block.idc_ui_theme_boots_memberof.yml
index 0a129e799..bdadf453f 100644
--- a/config/sync/block.block.idc_ui_theme_boots_memberof.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_memberof.yml
@@ -1,6 +1,6 @@
 uuid: 1ba6cb69-c81c-4c9d-b955-b57256008603
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - facets.facet.member_of
@@ -13,8 +13,8 @@ dependencies:
     - idc_ui_theme_boots
 id: idc_ui_theme_boots_memberof
 theme: idc_ui_theme_boots
-region: top_header
-weight: -11
+region: sidebar_first
+weight: -7
 provider: null
 plugin: 'facet_block:member_of'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_page_title.yml b/config/sync/block.block.idc_ui_theme_boots_page_title.yml
index 8570458d7..e78fcadd1 100644
--- a/config/sync/block.block.idc_ui_theme_boots_page_title.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_page_title.yml
@@ -1,6 +1,6 @@
 uuid: 2d5933d0-c5a8-427c-a8de-fcfb23dfd90d
 langcode: en
-status: false
+status: true
 dependencies:
   module:
     - context
@@ -11,8 +11,8 @@ _core:
   default_config_hash: 6aOgWsNTXjqrDm98TXSAjP6qd2nCijD1xw45MrnbK-Y
 id: idc_ui_theme_boots_page_title
 theme: idc_ui_theme_boots
-region: top_header
-weight: -8
+region: content
+weight: -18
 provider: null
 plugin: page_title_block
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_physicalform.yml b/config/sync/block.block.idc_ui_theme_boots_physicalform.yml
index 24a2175af..dad2a4f90 100644
--- a/config/sync/block.block.idc_ui_theme_boots_physicalform.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_physicalform.yml
@@ -14,7 +14,7 @@ _core:
 id: idc_ui_theme_boots_physicalform
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -15
+weight: -14
 provider: null
 plugin: 'facet_block:physical_form'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_resourcetype.yml b/config/sync/block.block.idc_ui_theme_boots_resourcetype.yml
index 6d2040af9..33ffb2f74 100644
--- a/config/sync/block.block.idc_ui_theme_boots_resourcetype.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_resourcetype.yml
@@ -14,7 +14,7 @@ dependencies:
 id: idc_ui_theme_boots_resourcetype
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -17
+weight: -16
 provider: null
 plugin: 'facet_block:resource_type'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_subject.yml b/config/sync/block.block.idc_ui_theme_boots_subject.yml
index 1b05c6a83..0a50b543b 100644
--- a/config/sync/block.block.idc_ui_theme_boots_subject.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_subject.yml
@@ -14,7 +14,7 @@ _core:
 id: idc_ui_theme_boots_subject
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -11
+weight: -10
 provider: null
 plugin: 'facet_block:subject'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_subjectname.yml b/config/sync/block.block.idc_ui_theme_boots_subjectname.yml
index 81046866d..80a45cae2 100644
--- a/config/sync/block.block.idc_ui_theme_boots_subjectname.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_subjectname.yml
@@ -14,7 +14,7 @@ _core:
 id: idc_ui_theme_boots_subjectname
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -13
+weight: -12
 provider: null
 plugin: 'facet_block:subject_name'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_temporalsubject.yml b/config/sync/block.block.idc_ui_theme_boots_temporalsubject.yml
index 8f736dc6c..62b2fe242 100644
--- a/config/sync/block.block.idc_ui_theme_boots_temporalsubject.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_temporalsubject.yml
@@ -14,7 +14,7 @@ _core:
 id: idc_ui_theme_boots_temporalsubject
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -12
+weight: -11
 provider: null
 plugin: 'facet_block:temporal_subject'
 settings:
diff --git a/config/sync/block.block.idc_ui_theme_boots_year.yml b/config/sync/block.block.idc_ui_theme_boots_year.yml
index de546980f..c938a2c04 100644
--- a/config/sync/block.block.idc_ui_theme_boots_year.yml
+++ b/config/sync/block.block.idc_ui_theme_boots_year.yml
@@ -14,7 +14,7 @@ dependencies:
 id: idc_ui_theme_boots_year
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -14
+weight: -13
 provider: null
 plugin: 'facet_block:year'
 settings:
diff --git a/config/sync/block.block.memberof.yml b/config/sync/block.block.memberof.yml
index d4c0d0080..79df50a17 100644
--- a/config/sync/block.block.memberof.yml
+++ b/config/sync/block.block.memberof.yml
@@ -1,6 +1,6 @@
 uuid: 75be2606-c8db-4b9d-b8f4-fb61551c741b
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - facets.facet.member_of
@@ -12,8 +12,8 @@ dependencies:
     - idc_ui_theme_boots
 id: memberof
 theme: idc_ui_theme_boots
-region: top_header
-weight: -12
+region: sidebar_first
+weight: -8
 provider: null
 plugin: 'facet_block:member_of'
 settings:
diff --git a/config/sync/block.block.pagetitle.yml b/config/sync/block.block.pagetitle.yml
deleted file mode 100644
index 9e1322057..000000000
--- a/config/sync/block.block.pagetitle.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-uuid: 77c1752b-a3e4-4c4f-820b-e9f32f7a5c57
-langcode: en
-status: false
-dependencies:
-  module:
-    - context
-    - islandora
-  theme:
-    - idc_ui_theme_boots
-id: pagetitle
-theme: idc_ui_theme_boots
-region: content
-weight: -8
-provider: null
-plugin: page_title_block
-settings:
-  id: page_title_block
-  label: 'Page title'
-  label_display: '0'
-  provider: core
-visibility:
-  context_all:
-    id: context_all
-    negate: null
-    values: ''
-  context:
-    id: context
-    negate: null
-    values: ''
-  user_status:
-    id: user_status
-    negate: false
-    context_mapping:
-      user: '@user.current_user_context:current_user'
-    user_status:
-      viewing_profile: '0'
-      logged_viewing_profile: '0'
-      own_page_true: '0'
-      field_value: '0'
-    user_fields: uid
-  media_source_mimetype:
-    id: media_source_mimetype
-    negate: false
-    context_mapping: {  }
-    mimetype: ''
-  view_inclusion:
-    id: view_inclusion
-    negate: false
-    view_inclusion:
-      view-solr_search_content-page_1: view-solr_search_content-page_1
diff --git a/config/sync/block.block.search.yml b/config/sync/block.block.search.yml
index 557024501..3119fd2b1 100644
--- a/config/sync/block.block.search.yml
+++ b/config/sync/block.block.search.yml
@@ -1,4 +1,4 @@
-uuid: e31cee54-f0e1-4ac3-bf84-c89584745b31
+uuid: 42d9fb99-0fff-4f1c-a514-c0c6f8091e18
 langcode: en
 status: true
 dependencies:
@@ -6,19 +6,18 @@ dependencies:
     - advanced_search
     - context
     - islandora
-    - system
   theme:
     - idc_ui_theme_boots
 id: search
 theme: idc_ui_theme_boots
-region: primary_menu
-weight: -11
+region: sidebar_first
+weight: 0
 provider: null
 plugin: search_block
 settings:
   id: search_block
   label: Search
-  label_display: '0'
+  label_display: visible
   provider: advanced_search
   block_id: search
   search_view_machine_name: view.solr_search_content.page_1
@@ -29,7 +28,7 @@ visibility:
   context_all:
     id: context_all
     negate: null
-    values: ''
+    values: collection
   context:
     id: context
     negate: null
@@ -50,7 +49,3 @@ visibility:
     negate: false
     context_mapping: {  }
     mimetype: ''
-  request_path:
-    id: request_path
-    negate: true
-    pages: /search
diff --git a/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml b/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml
index f76037857..3fa9c59fb 100644
--- a/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml
+++ b/config/sync/block.block.solrsearchcontentadvancedsearchforblock.yml
@@ -11,7 +11,7 @@ dependencies:
 id: solrsearchcontentadvancedsearchforblock
 theme: idc_ui_theme_boots
 region: sidebar_first
-weight: -18
+weight: -17
 provider: null
 plugin: 'advanced_search_block:solr_search_content__block_1'
 settings:
diff --git a/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml b/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml
index 727231b3e..515615120 100644
--- a/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml
+++ b/config/sync/block.block.solrsearchcontentadvancedsearchforpage.yml
@@ -1,6 +1,6 @@
 uuid: 0224ff66-123d-4d86-94e0-0915b7cc0542
 langcode: en
-status: false
+status: true
 dependencies:
   module:
     - advanced_search
@@ -10,8 +10,8 @@ dependencies:
     - idc_ui_theme_boots
 id: solrsearchcontentadvancedsearchforpage
 theme: idc_ui_theme_boots
-region: top_header
-weight: -16
+region: sidebar_first
+weight: -9
 provider: null
 plugin: 'advanced_search_block:solr_search_content__page_1'
 settings:
diff --git a/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml b/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml
index fd58b995e..529560958 100644
--- a/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml
+++ b/config/sync/block.block.solrsearchcontentsearchresultspagerforblock.yml
@@ -11,7 +11,7 @@ dependencies:
 id: solrsearchcontentsearchresultspagerforblock
 theme: idc_ui_theme_boots
 region: content
-weight: -10
+weight: -13
 provider: null
 plugin: 'advanced_search_result_pager:solr_search_content__block_1'
 settings:
diff --git a/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml b/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml
index 521000876..a456de18b 100644
--- a/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml
+++ b/config/sync/block.block.solrsearchcontentsearchresultspagerforpage.yml
@@ -11,7 +11,7 @@ dependencies:
 id: solrsearchcontentsearchresultspagerforpage
 theme: idc_ui_theme_boots
 region: content
-weight: -12
+weight: -15
 provider: null
 plugin: 'advanced_search_result_pager:solr_search_content__page_1'
 settings:
diff --git a/config/sync/block.block.views_block__solr_search_content_block_1.yml b/config/sync/block.block.views_block__solr_search_content_block_1.yml
index ef4dbe271..8f95acdfe 100644
--- a/config/sync/block.block.views_block__solr_search_content_block_1.yml
+++ b/config/sync/block.block.views_block__solr_search_content_block_1.yml
@@ -1,4 +1,4 @@
-uuid: d9ad9477-0f98-4086-9711-33986fcd0121
+uuid: 425638ae-845e-4e36-8928-f590a7e8660d
 langcode: en
 status: true
 dependencies:
@@ -13,17 +13,25 @@ dependencies:
 id: views_block__solr_search_content_block_1
 theme: idc_ui_theme_boots
 region: content
-weight: -9
+weight: 0
 provider: null
 plugin: 'views_block:solr_search_content-block_1'
 settings:
   id: 'views_block:solr_search_content-block_1'
-  label: Broken/Missing
+  label: ''
   label_display: '0'
-  provider: core
+  provider: views
   views_label: ''
   items_per_page: none
 visibility:
+  context_all:
+    id: context_all
+    negate: null
+    values: collection
+  context:
+    id: context
+    negate: null
+    values: ''
   user_status:
     id: user_status
     negate: false
@@ -35,14 +43,6 @@ visibility:
       own_page_true: '0'
       field_value: '0'
     user_fields: uid
-  context:
-    id: context
-    negate: null
-    values: ''
-  context_all:
-    id: context_all
-    negate: null
-    values: collection
   media_source_mimetype:
     id: media_source_mimetype
     negate: false
diff --git a/config/sync/block.block.year.yml b/config/sync/block.block.year.yml
index 7c89c419e..d2ff01700 100644
--- a/config/sync/block.block.year.yml
+++ b/config/sync/block.block.year.yml
@@ -1,6 +1,6 @@
 uuid: e5f139d7-33fc-4da5-ae00-ffefb45e2816
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - facets.facet.year
@@ -12,8 +12,8 @@ dependencies:
     - idc_ui_theme_boots
 id: year
 theme: idc_ui_theme_boots
-region: top_header
-weight: 0
+region: sidebar_first
+weight: -6
 provider: null
 plugin: 'facet_block:year'
 settings:
diff --git a/config/sync/block.block.yearswc.yml b/config/sync/block.block.yearswc.yml
index 0874cf479..d413b36d0 100644
--- a/config/sync/block.block.yearswc.yml
+++ b/config/sync/block.block.yearswc.yml
@@ -1,6 +1,6 @@
 uuid: c6a1b124-c1d0-4249-9c5a-3eb0963f25a1
 langcode: en
-status: false
+status: true
 dependencies:
   config:
     - facets.facet.year_swc
@@ -12,8 +12,8 @@ dependencies:
     - idc_ui_theme_boots
 id: yearswc
 theme: idc_ui_theme_boots
-region: top_header
-weight: 0
+region: sidebar_first
+weight: -5
 provider: null
 plugin: 'facet_block:year_swc'
 settings:
diff --git a/config/sync/context.context.audio_original_file.yml b/config/sync/context.context.audio_original_file.yml
index 4bb3fc135..af2252aaf 100644
--- a/config/sync/context.context.audio_original_file.yml
+++ b/config/sync/context.context.audio_original_file.yml
@@ -11,7 +11,7 @@ name: audio_original_file
 group: Derivatives
 description: 'Derivatives for Audio'
 requireAllConditions: true
-disabled: true
+disabled: false
 conditions:
   media_has_term:
     id: media_has_term
diff --git a/config/sync/context.context.image_original_file.yml b/config/sync/context.context.image_original_file.yml
index 0d14e627b..fba98fcf4 100644
--- a/config/sync/context.context.image_original_file.yml
+++ b/config/sync/context.context.image_original_file.yml
@@ -11,7 +11,7 @@ name: image_original_file
 group: Derivatives
 description: 'Derivatives for Images'
 requireAllConditions: true
-disabled: true
+disabled: false
 conditions:
   media_has_term:
     id: media_has_term
diff --git a/config/sync/context.context.pages.yml b/config/sync/context.context.pages.yml
index 790f52a9a..883cb5316 100644
--- a/config/sync/context.context.pages.yml
+++ b/config/sync/context.context.pages.yml
@@ -11,7 +11,7 @@ name: pages
 group: Derivatives
 description: 'Derivatives for Pages'
 requireAllConditions: true
-disabled: true
+disabled: false
 conditions:
   parent_node_has_term:
     id: parent_node_has_term
diff --git a/config/sync/context.context.pdf_original_file.yml b/config/sync/context.context.pdf_original_file.yml
index d2705a79c..afc0034a2 100644
--- a/config/sync/context.context.pdf_original_file.yml
+++ b/config/sync/context.context.pdf_original_file.yml
@@ -11,7 +11,7 @@ name: pdf_original_file
 group: Derivatives
 description: 'Derivatives for PDF documents'
 requireAllConditions: true
-disabled: true
+disabled: false
 conditions:
   media_has_term:
     id: media_has_term
diff --git a/config/sync/context.context.video_original_file.yml b/config/sync/context.context.video_original_file.yml
index 1243b59b6..e7c740258 100644
--- a/config/sync/context.context.video_original_file.yml
+++ b/config/sync/context.context.video_original_file.yml
@@ -11,7 +11,7 @@ name: video_original_file
 group: Derivatives
 description: 'Derivatives for Video'
 requireAllConditions: true
-disabled: true
+disabled: false
 conditions:
   media_has_term:
     id: media_has_term
diff --git a/config/sync/core.entity_view_display.node.islandora_object.default.yml b/config/sync/core.entity_view_display.node.islandora_object.default.yml
index 5ea3776ef..040f64373 100644
--- a/config/sync/core.entity_view_display.node.islandora_object.default.yml
+++ b/config/sync/core.entity_view_display.node.islandora_object.default.yml
@@ -321,14 +321,6 @@ content:
     third_party_settings: {  }
     weight: 55
     region: content
-  field_display_hints:
-    type: entity_reference_label
-    label: hidden
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 75
-    region: content
   field_dspace_identifier:
     type: link
     label: above
@@ -587,14 +579,6 @@ content:
     third_party_settings: {  }
     weight: 16
     region: content
-  field_model:
-    type: entity_reference_label
-    label: hidden
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: 73
-    region: content
   field_note:
     type: text_default
     label: above
@@ -713,15 +697,6 @@ content:
     third_party_settings: {  }
     weight: 69
     region: content
-  field_weight:
-    type: number_integer
-    label: hidden
-    settings:
-      thousand_separator: ''
-      prefix_suffix: true
-    third_party_settings: {  }
-    weight: 74
-    region: content
   field_years:
     type: edtf_default
     label: above
@@ -734,15 +709,6 @@ content:
     third_party_settings: {  }
     weight: 70
     region: content
-  langcode:
-    type: language
-    label: hidden
-    settings:
-      link_to_entity: false
-      native_language: false
-    third_party_settings: {  }
-    weight: 72
-    region: content
   links:
     settings: {  }
     third_party_settings: {  }
@@ -756,9 +722,13 @@ content:
 hidden:
   display_media_entity_view_3: true
   display_media_thumbnail: true
+  field_display_hints: true
+  field_model: true
   field_pid: true
   field_place_published_country: true
+  field_weight: true
   islandora_fits_checksum: true
+  langcode: true
   openseadragon_media_evas_entity_view_1: true
   openseadragon_media_evas_entity_view_2: true
   openseadragon_media_evas_service_file: true
diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml
index 4c9a1ff05..cf3cd3815 100644
--- a/config/sync/core.extension.yml
+++ b/config/sync/core.extension.yml
@@ -50,6 +50,7 @@ module:
   file_replace: 0
   filehash: 0
   filter: 0
+  flexible_permissions: 0
   flysystem: 0
   geolocation: 0
   gnode: 0
diff --git a/config/sync/field.storage.group_content.group_roles.yml b/config/sync/field.storage.group_relationship.group_roles.yml
similarity index 61%
rename from config/sync/field.storage.group_content.group_roles.yml
rename to config/sync/field.storage.group_relationship.group_roles.yml
index 696665176..dad63d321 100644
--- a/config/sync/field.storage.group_content.group_roles.yml
+++ b/config/sync/field.storage.group_relationship.group_roles.yml
@@ -1,14 +1,14 @@
-uuid: 4f2c095d-1f6e-47b5-a1ad-33f22b4d108e
+uuid: 8483f840-c7e4-459e-9d97-79646f5be072
 langcode: en
 status: true
 dependencies:
   module:
     - group
 _core:
-  default_config_hash: Sgrm2nHDx7xKvByuR5oGB77nLvI0LikTM8ff3e_YlWY
-id: group_content.group_roles
+  default_config_hash: fflZgd81k910MmV3_gPZaFhuXnV9qflFVT6yo28Xj_Q
+id: group_relationship.group_roles
 field_name: group_roles
-entity_type: group_content
+entity_type: group_relationship
 type: entity_reference
 settings:
   target_type: group_role
diff --git a/config/sync/pathauto.pattern.group_content.yml b/config/sync/pathauto.pattern.group_content.yml
deleted file mode 100644
index 1dd564d33..000000000
--- a/config/sync/pathauto.pattern.group_content.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-uuid: 2cb1c5bb-5890-431c-8199-1281963eb36b
-langcode: en
-status: true
-dependencies:
-  module:
-    - group
-_core:
-  default_config_hash: rk2G0ozgUlKP7ic1RRjMcXUmeZxXUKPV-q-brekIKMc
-id: group_content
-label: 'Group content'
-type: 'canonical_entities:group_content'
-pattern: 'group/[group_content:group:id]/[group_content:pretty-path-key]/[group_content:id]'
-selection_criteria: {  }
-selection_logic: and
-weight: -5
-relationships:
-  'group_content:langcode:language':
-    label: Language
diff --git a/config/sync/pathauto.pattern.group_relationship.yml b/config/sync/pathauto.pattern.group_relationship.yml
new file mode 100644
index 000000000..868f8c8bf
--- /dev/null
+++ b/config/sync/pathauto.pattern.group_relationship.yml
@@ -0,0 +1,18 @@
+uuid: 2039f835-a370-4ede-8dd3-e44167005f44
+langcode: en
+status: true
+dependencies:
+  module:
+    - group
+_core:
+  default_config_hash: 1tEtbHvVBjy2ChRMYjieiOpb_YY3pH9m3ug1UJOvWrg
+id: group_relationship
+label: 'Group relationship'
+type: 'canonical_entities:group_relationship'
+pattern: 'group/[group_relationship:group:id]/[group_relationship:pretty-path-key]/[group_relationship:id]'
+selection_criteria: {  }
+selection_logic: and
+weight: -5
+relationships:
+  'group_relationship:langcode:language':
+    label: Language
diff --git a/config/sync/search_api.index.default_solr_index.yml b/config/sync/search_api.index.default_solr_index.yml
index bf09a984e..bb3d9f0be 100644
--- a/config/sync/search_api.index.default_solr_index.yml
+++ b/config/sync/search_api.index.default_solr_index.yml
@@ -3,12 +3,13 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.storage.node.field_abstract
     - field.storage.node.field_alt_title
+    - field.storage.node.field_edtf_date_created
     - field.storage.node.field_member_of
     - field.storage.node.field_description
     - field.storage.node.field_dewey_classification
     - field.storage.node.field_edition
-    - field.storage.node.field_edtf_date_created
     - field.storage.node.field_extent
     - field.storage.node.field_full_title
     - field.storage.node.field_isbn
@@ -18,12 +19,12 @@ dependencies:
     - field.storage.node.field_physical_form
     - field.storage.node.field_resource_type
     - field.storage.node.field_rights
-    - field.storage.node.field_tags
     - field.storage.node.field_subject_general
     - field.storage.node.field_geographic_subject
     - field.storage.node.field_subjects_name
     - field.storage.node.field_temporal_subject
     - field.storage.node.field_subject
+    - field.storage.node.field_tags
     - search_api.server.default_solr_server
     - core.entity_view_mode.node.search_index
   module:
@@ -86,6 +87,18 @@ name: 'Default Solr content index'
 description: 'Default content index created by the Solr Search Defaults module'
 read_only: false
 field_settings:
+  abstract_description_fulltext:
+    label: Description
+    property_path: aggregated_field
+    type: text
+    configuration:
+      type: union
+      separator: |+
+
+
+      fields:
+        - 'entity:node/field_abstract'
+        - 'entity:node/field_description'
   author:
     label: 'Author name'
     datasource_id: 'entity:node'
@@ -115,6 +128,14 @@ field_settings:
     label: 'EDTF Creation Date Year'
     property_path: edtf_year
     type: integer
+  field_abstract:
+    label: Abstract
+    datasource_id: 'entity:node'
+    property_path: field_abstract
+    type: text
+    dependencies:
+      config:
+        - field.storage.node.field_abstract
   field_alt_title:
     label: 'Alternative Title'
     datasource_id: 'entity:node'
@@ -210,6 +231,16 @@ field_settings:
         - field.storage.node.field_linked_agent
       module:
         - taxonomy
+  field_member_of:
+    label: 'Member of'
+    datasource_id: 'entity:node'
+    property_path: 'field_member_of:entity:field_member_of'
+    type: integer
+    dependencies:
+      config:
+        - field.storage.node.field_member_of
+      module:
+        - node
   field_oclc_number:
     label: 'OCLC Number'
     datasource_id: 'entity:node'
@@ -264,6 +295,14 @@ field_settings:
         - field.storage.node.field_member_of
       module:
         - node
+  nid:
+    label: ID
+    datasource_id: 'entity:node'
+    property_path: nid
+    type: integer
+    dependencies:
+      module:
+        - node
   node_grants:
     label: 'Node access information'
     property_path: search_api_node_grants
@@ -302,12 +341,15 @@ field_settings:
     dependencies:
       module:
         - node
-  subject_aggregated:
-    label: 'Subjects (All)'
+  subject_aggregated_fulltext:
+    label: Subjects
     property_path: aggregated_field
-    type: string
+    type: text
     configuration:
       type: union
+      separator: |+
+
+
       fields:
         - 'entity:node/field_geographic_subject'
         - 'entity:node/field_subject'
@@ -383,6 +425,20 @@ field_settings:
         - 'entity:node/field_alt_title'
         - 'entity:node/field_full_title'
         - 'entity:node/title'
+  title_aggregated_fulltext:
+    label: Title
+    property_path: aggregated_field
+    type: text
+    configuration:
+      type: union
+      separator: |+
+
+
+      fields:
+        - 'entity:node/field_alt_title'
+        - 'entity:node/field_alternative_title'
+        - 'entity:node/field_full_title'
+        - 'entity:node/title'
   type:
     label: 'Content type'
     datasource_id: 'entity:node'
@@ -421,6 +477,7 @@ processor_settings:
     weights:
       preprocess_index: -6
       preprocess_query: -4
+  custom_value: {  }
   edtf_year_only:
     fields:
       collection_object|field_edtf_date: collection_object|field_edtf_date
@@ -431,9 +488,9 @@ processor_settings:
       islandora_object|field_edtf_date_created: islandora_object|field_edtf_date_created
       islandora_object|field_edtf_date_issued: islandora_object|field_edtf_date_issued
     ignore_undated: 1
-    ignore_open_start: 1
+    ignore_open_start: 0
     open_start_year: '0'
-    ignore_open_end: 1
+    ignore_open_end: 0
     open_end_year: ''
   entity_status:
     weights:
@@ -453,9 +510,14 @@ processor_settings:
     excerpt_always: true
     excerpt_length: 256
     exclude_fields:
+      - abstract_description_fulltext
+      - field_abstract
       - field_description
       - field_full_title
+      - rendered_item
+      - subject_aggregated_fulltext
       - title
+      - title_aggregated_fulltext
     highlight: always
     highlight_partial: true
   html_filter:
diff --git a/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
new file mode 100644
index 000000000..ed1931002
--- /dev/null
+++ b/config/sync/search_api_solr.solr_cache.cache_document_default_9_0_0.yml
@@ -0,0 +1,17 @@
+uuid: bd49c3df-3757-4a99-a85e-cf7a9179845c
+langcode: en
+status: true
+dependencies: {  }
+_core:
+  default_config_hash: 8US9Yb33EXUGI8LNE2tUeFZGOdYR9ZEQnSmQ9oK_X98
+id: cache_document_default_9_0_0
+label: 'Document Cache'
+minimum_solr_version: 9.0.0
+environments: {  }
+cache:
+  name: document
+  class: solr.CaffeineCache
+  size: 512
+  initialSize: 512
+  autowarmCount: 0
+solr_configs: null
diff --git a/config/export/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml
similarity index 56%
rename from config/export/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml
rename to config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml
index e9d565783..730a55a3c 100644
--- a/config/export/search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_cache.cache_fieldvalue_default_9_0_0.yml
@@ -1,16 +1,16 @@
-uuid: 1048b128-4bf6-4f9e-b3e4-d277db1ede48
+uuid: 2462125f-9fe6-478d-aa08-22eb16e318f5
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 3rL3u7QmgEuqpnwDP4cb2-7nIv7xwf7V_WXZyrcHoGc
-id: cache_fieldvalue_default_7_0_0
+  default_config_hash: PpXzcu_b6Wkh_EE_vleOz9EJWVHQISeD0BN8Yrd5cY0
+id: cache_fieldvalue_default_9_0_0
 label: 'Field Value Cache'
-minimum_solr_version: 7.0.0
+minimum_solr_version: 9.0.0
 environments: {  }
 cache:
   name: fieldValue
-  class: solr.FastLRUCache
+  class: solr.CaffeineCache
   size: 512
   autowarmCount: 128
   showItems: 32
diff --git a/config/export/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml
similarity index 56%
rename from config/export/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml
rename to config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml
index c82ef247b..268ec216e 100644
--- a/config/export/search_api_solr.solr_cache.cache_filter_default_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_cache.cache_filter_default_9_0_0.yml
@@ -1,16 +1,16 @@
-uuid: 17508d3c-a9e5-412b-903c-1e17a34ecb42
+uuid: 9a908313-f018-4fce-8f56-56724f29c506
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: vq3VkGaE2DLoxkODTNhlaM8f4mgCN22b_XvadwGJXG8
-id: cache_filter_default_7_0_0
+  default_config_hash: kPqER5Lz5zFQ-x9Mmadmzp6QuCx8HkqXZaPkTNWoN64
+id: cache_filter_default_9_0_0
 label: 'Filter Cache'
-minimum_solr_version: 7.0.0
+minimum_solr_version: 9.0.0
 environments: {  }
 cache:
   name: filter
-  class: solr.FastLRUCache
+  class: solr.CaffeineCache
   size: 512
   initialSize: 512
   autowarmCount: 0
diff --git a/config/export/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
similarity index 53%
rename from config/export/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml
rename to config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
index ac3655d25..998f49f54 100644
--- a/config/export/search_api_solr.solr_cache.cache_persegfilter_default_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_cache.cache_persegfilter_default_9_0_0.yml
@@ -1,16 +1,16 @@
-uuid: 297acc0d-372b-411c-aa2c-ef8f03a46b78
+uuid: a6ec3c3d-686a-4711-8ffb-bf29b0653bbe
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: i1jxS-2SHFS6WaOhchNRw2Egt5YVnhLpVfq5h8dzPYE
-id: cache_persegfilter_default_7_0_0
+  default_config_hash: Dg7CT1jTSkupnhVxZ8Md-1x6rHDP4Z2_E59GpmPXxVM
+id: cache_persegfilter_default_9_0_0
 label: 'Per Segment Filter Cache'
-minimum_solr_version: 7.0.0
+minimum_solr_version: 9.0.0
 environments: {  }
 cache:
   name: perSegFilter
-  class: solr.search.LRUCache
+  class: solr.CaffeineCache
   size: 10
   initialSize: 0
   autowarmCount: 10
diff --git a/config/export/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml b/config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml
similarity index 64%
rename from config/export/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml
rename to config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml
index 473923114..dff3bb0a5 100644
--- a/config/export/search_api_solr.solr_cache.cache_queryresult_default_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_cache.cache_queryresult_default_9_0_0.yml
@@ -1,16 +1,16 @@
-uuid: 05efd042-c3e0-40fb-8221-1d044a548d22
+uuid: 7f32d949-8042-4845-88fc-5a495c1bdc96
 langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: SbahJ2YkJ9OYJZefxh8CfUXBfbfOMovWHaYa9Car6UQ
-id: cache_queryresult_default_7_0_0
+  default_config_hash: ltEiX6t3a_eaBraAs0zu-1Df4H0PfE6RPu2vl8ti3Io
+id: cache_queryresult_default_9_0_0
 label: 'Query Result Cache'
-minimum_solr_version: 7.0.0
+minimum_solr_version: 9.0.0
 environments: {  }
 cache:
   name: queryResult
-  class: solr.LRUCache
+  class: solr.CaffeineCache
   size: 512
   initialSize: 512
   autowarmCount: 0
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
index a23c396ad..f8a1bf088 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -68,6 +68,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
index 324882d09..72346c4a8 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -67,6 +67,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
index d9f287b0d..fa9c4d2d3 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: yW20VJKElb-oT85z7mW5B-hMiAUsl4B-UDLZzCZPats
+  default_config_hash: vonycwEIXvilFOrjA0oPt-JLoHRDBx3O-m62cERMQrY
 id: text_edge_und_6_0_0
 label: 'Edge NGram Text Field'
 minimum_solr_version: 6.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_edge
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -22,7 +23,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
index 3c812237e..e48724bbc 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edge_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: bMILcxf9yC5nDLZGe83FDm8YT9wRMyEczHD12Hkcc78
+  default_config_hash: x7hRmmjSQscuuefTJywoyq2xEywr2XojLNHJEgenImc
 id: text_edge_und_7_0_0
 label: 'Edge NGram Text Field'
 minimum_solr_version: 7.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_edge
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -22,7 +23,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -59,7 +60,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
index 3139581e5..c5df762a8 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_3_6_0.yml
@@ -37,6 +37,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
index 03504e3b3..d817c8ed4 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_4_5_0.yml
@@ -37,6 +37,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
index 588439254..073a2add5 100644
--- a/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_edgestring_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: iifw_DxebhUOezFaJM3sD9m2rvzGXWkwxPC_g_58nag
+  default_config_hash: bWSErrOZirxgC9CR3TdPlJXHNmex1pARA9RNC--VqY8
 id: text_edgestring_und_6_0_0
 label: 'Edge NGram String Field'
 minimum_solr_version: 6.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_edgenstring
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml
index 4dbc20670..90d56b286 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -92,6 +92,7 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -104,7 +105,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -136,7 +137,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -166,6 +167,7 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type: {  }
 solr_configs:
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml
index 4be799292..3d3045374 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -90,6 +90,7 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -102,7 +103,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -133,7 +134,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -162,6 +163,7 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type:
   name: collated_en
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
index b5a7c80da..ada959e58 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_6_0_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -90,6 +90,7 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -102,7 +103,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -133,7 +134,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -162,6 +163,7 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type:
   name: collated_en
@@ -241,7 +243,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'true'
+              VALUE: 'false'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
index 606578ad6..fb198f4c1 100644
--- a/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_en_7_0_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -38,6 +38,8 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
+        -
+          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -57,7 +59,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymGraphFilterFactory
@@ -90,6 +92,7 @@ field_type:
           language: English
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type:
   name: text_unstemmed_en
   class: solr.TextField
@@ -102,7 +105,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -118,6 +121,8 @@ unstemmed_field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
+        -
+          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -133,7 +138,7 @@ unstemmed_field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_en.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymGraphFilterFactory
@@ -162,6 +167,7 @@ unstemmed_field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 spellcheck_field_type: null
 collated_field_type:
   name: collated_en
@@ -241,7 +247,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'true'
+              VALUE: 'false'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
index 7c7788042..b99523066 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -58,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -68,6 +68,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
index 34d1b882b..d7a903069 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +57,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
@@ -67,6 +67,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
index 85da9d648..ec2e4e1c3 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: R-qv3m6WSi8tTmAcAyQK2adAXRPW4xLrmkIFbqIVmvc
+  default_config_hash: nQ6v8pgrKN3bzfcel5GP6EO6A1Yo5uRUQId9pOyds6U
 id: text_ngram_und_6_0_0
 label: 'NGram Text Field'
 minimum_solr_version: 6.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_ngram
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -22,7 +23,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -57,7 +58,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
index d9d3ad8d6..ce2895af1 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngram_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: Tk2-RQHVATad5Ju6FBaPcEPoZ2NTeauJtNtpwg7WIcY
+  default_config_hash: wr_ZSGx3pe-AgupW-Sz4q3a5tyhG5E0yg6IySnGjwW8
 id: text_ngram_und_7_0_0
 label: 'NGram Text Field'
 minimum_solr_version: 7.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_ngram
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -22,7 +23,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -59,7 +60,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.LengthFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
index d927716e6..d33d9e256 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_3_6_0.yml
@@ -37,6 +37,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
index 7a1f4db54..cb90d6514 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_4_5_0.yml
@@ -37,6 +37,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
index e67b6a06b..2b5fb2e45 100644
--- a/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_ngramstring_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: uSBOTyeTCtQQUTiAzoF9BQbK5H6RnvAFSII-DlIUcmQ
+  default_config_hash: yJG5axh8DBXy46CJWBW9DMcFecWKHvppKGxtp92fhKc
 id: text_ngramstring_und_6_0_0
 label: 'NGram String Field'
 minimum_solr_version: 6.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_ngramstring
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
index 7e825e96c..94615ec4a 100644
--- a/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_en_7_0_0.yml
@@ -18,7 +18,7 @@ field_type:
     -
       type: index
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -34,6 +34,8 @@ field_type:
           preserveOriginal: 1
           catenateAll: 0
           catenateWords: 1
+        -
+          class: solr.FlattenGraphFilterFactory
         -
           class: solr.LengthFilterFactory
           min: 2
@@ -51,7 +53,7 @@ field_type:
     -
       type: query
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -81,6 +83,7 @@ field_type:
           concat: true
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type: null
 collated_field_type: null
diff --git a/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
index c2b2c304a..60e0cf73f 100644
--- a/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_phonetic_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: 9WSnPy-9jL_8vLU6vI-G5z3eAL7Dsk4dDT99rWHf-CI
+  default_config_hash: puB8VCKbCpDzJ-dEd9mlRUEShkBB7TQLAPiTBxCYtQs
 id: text_phonetic_und_7_0_0
 label: 'Fulltext Phonetic'
 minimum_solr_version: 7.0.0
@@ -14,11 +14,12 @@ field_type:
   name: text_phonetic_und
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -53,7 +54,7 @@ field_type:
     -
       type: query
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
diff --git a/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
index dc1c94e75..ef41c9cc7 100644
--- a/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_string_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: FXULm2mt03ExX95R8L1xo0F9iEHVPEfogRZG8oj07Ec
+  default_config_hash: vdoqZyPxL2QPQ0fVwyjjhHZYz9sDDWD62-Ou86DFOs4
 id: text_string_und_6_0_0
 label: 'Fulltext String Field'
 minimum_solr_version: 6.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_string
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml
index 366d1a65c..85e995ef9 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_3_6_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -54,7 +54,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -84,6 +84,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type:
   name: text_spell_und
@@ -105,6 +106,7 @@ spellcheck_field_type:
         class: solr.LowerCaseFilterFactory
       -
         class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 collated_field_type: {  }
 solr_configs:
   searchComponents:
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml
index 8a02826aa..58348f46e 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_4_5_0.yml
@@ -22,7 +22,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -53,7 +53,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -82,6 +82,7 @@ field_type:
           class: solr.LowerCaseFilterFactory
         -
           class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 unstemmed_field_type: null
 spellcheck_field_type:
   name: text_spell_und
@@ -103,6 +104,7 @@ spellcheck_field_type:
         class: solr.LowerCaseFilterFactory
       -
         class: solr.RemoveDuplicatesTokenFilterFactory
+  storeOffsetsWithPositions: true
 collated_field_type:
   name: collated_und
   class: solr.ICUCollationField
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
index 64740da53..fac2b30fe 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_6_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: F_CbvhXxhM5f_yw68hsRDX9ItpKw_4b-wtP8Vkk_gqc
+  default_config_hash: ifD-40czfZSDUcZnDyE8YEb7WVu5ZiRcJSAYycpAftA
 id: text_und_6_0_0
 label: 'Language Undefined Text Field'
 minimum_solr_version: 6.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_und
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -22,7 +23,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -53,7 +54,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymFilterFactory
@@ -87,13 +88,14 @@ spellcheck_field_type:
   name: text_spell_und
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzer:
     charFilters:
       -
         class: solr.MappingCharFilterFactory
         mapping: accents_und.txt
     tokenizer:
-      class: solr.WhitespaceTokenizerFactory
+      class: solr.StandardTokenizerFactory
     filters:
       -
         class: solr.LengthFilterFactory
@@ -181,7 +183,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'true'
+              VALUE: 'false'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
index 8b76c8b4c..64bf7087f 100644
--- a/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
+++ b/config/sync/search_api_solr.solr_field_type.text_und_7_0_0.yml
@@ -3,7 +3,7 @@ langcode: en
 status: true
 dependencies: {  }
 _core:
-  default_config_hash: LqGQkyoX0jUump3klnm_uia46SmYnvVB5O-0A4UO4mI
+  default_config_hash: e24uTmPTMM6cwWTSGvotZEasK-TD0RybEtMy3s0qG-U
 id: text_und_7_0_0
 label: 'Language Undefined Text Field'
 minimum_solr_version: 7.0.0
@@ -14,6 +14,7 @@ field_type:
   name: text_und
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzers:
     -
       type: index
@@ -22,7 +23,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.StopFilterFactory
@@ -55,7 +56,7 @@ field_type:
           class: solr.MappingCharFilterFactory
           mapping: accents_und.txt
       tokenizer:
-        class: solr.WhitespaceTokenizerFactory
+        class: solr.StandardTokenizerFactory
       filters:
         -
           class: solr.SynonymGraphFilterFactory
@@ -89,13 +90,14 @@ spellcheck_field_type:
   name: text_spell_und
   class: solr.TextField
   positionIncrementGap: 100
+  storeOffsetsWithPositions: true
   analyzer:
     charFilters:
       -
         class: solr.MappingCharFilterFactory
         mapping: accents_und.txt
     tokenizer:
-      class: solr.WhitespaceTokenizerFactory
+      class: solr.StandardTokenizerFactory
     filters:
       -
         class: solr.LengthFilterFactory
@@ -183,7 +185,7 @@ solr_configs:
               VALUE: sm_context_tags
             -
               name: buildOnCommit
-              VALUE: 'true'
+              VALUE: 'false'
             -
               name: buildOnStartup
               VALUE: 'false'
diff --git a/config/sync/system.date.yml b/config/sync/system.date.yml
index 9fa466be6..aa5b247ab 100644
--- a/config/sync/system.date.yml
+++ b/config/sync/system.date.yml
@@ -2,9 +2,9 @@ _core:
   default_config_hash: t7clj3mzmOGrXX0HuCH5usf0vEqRtnMTBFVBIEmZ5pc
 first_day: 0
 country:
-  default: ''
+  default: US
 timezone:
-  default: America/Chicago
+  default: America/New_York
   user:
     configurable: true
     default: 0
diff --git a/config/sync/system.file.yml b/config/sync/system.file.yml
index 2ff344ab6..de4742464 100644
--- a/config/sync/system.file.yml
+++ b/config/sync/system.file.yml
@@ -1,5 +1,5 @@
 _core:
   default_config_hash: mguGHCYb9Dw5EcpfjwoShGV1Vjkbz3QuPRCLfxiye-g
 allow_insecure_uploads: false
-default_scheme: fedora
+default_scheme: public
 temporary_maximum_age: 21600
diff --git a/config/sync/system.logging.yml b/config/sync/system.logging.yml
index d6cedcd22..135cce725 100644
--- a/config/sync/system.logging.yml
+++ b/config/sync/system.logging.yml
@@ -1,3 +1,3 @@
 _core:
   default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA
-error_level: verbose
+error_level: some
diff --git a/config/sync/views.view.content.yml b/config/sync/views.view.content.yml
index be7f0a17c..8fd19b7a4 100644
--- a/config/sync/views.view.content.yml
+++ b/config/sync/views.view.content.yml
@@ -7,11 +7,12 @@ dependencies:
     - field.storage.node.field_model
     - taxonomy.vocabulary.islandora_models
   module:
-    - better_exposed_filters
     - media
     - node
     - taxonomy
     - user
+_core:
+  default_config_hash: vBKWYGGDoAX-tFd1JErB8tZLSxx3lJ0foouVsgpcbB4
 id: content
 label: Content
 module: node
@@ -581,7 +582,7 @@ display:
             first: '« First'
             last: 'Last »'
       exposed_form:
-        type: bef
+        type: basic
         options:
           submit_button: Filter
           reset_button: true
@@ -590,73 +591,6 @@ display:
           expose_sort_order: true
           sort_asc_label: Asc
           sort_desc_label: Desc
-          text_input_required: 'Select any filter and click on Apply to see results'
-          text_input_required_format: basic_html
-          bef:
-            general:
-              autosubmit: false
-              autosubmit_exclude_textfield: false
-              autosubmit_textfield_delay: 500
-              autosubmit_hide: false
-              input_required: false
-              allow_secondary: true
-              secondary_label: 'Advanced options'
-              secondary_open: false
-              reset_button_always_show: false
-            filter:
-              title:
-                plugin_id: default
-                advanced:
-                  placeholder_text: ''
-                  collapsible: false
-                  is_secondary: false
-              type:
-                plugin_id: default
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-              field_model_target_id:
-                plugin_id: default
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-              status:
-                plugin_id: default
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-              langcode:
-                plugin_id: default
-                advanced:
-                  sort_options: false
-                  rewrite:
-                    filter_rewrite_values: ''
-                  collapsible: false
-                  is_secondary: false
-              field_member_of_target_id:
-                plugin_id: default
-                advanced:
-                  collapsible: false
-                  is_secondary: true
-              nid:
-                plugin_id: default
-                advanced:
-                  collapsible: false
-                  is_secondary: true
-              mid:
-                plugin_id: default
-                advanced:
-                  collapsible: false
-                  is_secondary: true
       access:
         type: perm
         options:
@@ -911,12 +845,57 @@ display:
           expose:
             operator_limit_selection: false
             operator_list: {  }
+        title_1:
+          id: title_1
+          table: node_field_data
+          field: title
+          relationship: field_member_of
+          group_type: group
+          admin_label: ''
+          entity_type: node
+          entity_field: title
+          plugin_id: string
+          operator: contains
+          value: ''
+          group: 1
+          exposed: true
+          expose:
+            operator_id: title_1_op
+            label: 'Parent (Member of) title contains'
+            description: ''
+            use_operator: false
+            operator: title_1_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: title_1
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              content_editor: '0'
+              administrator: '0'
+              fedoraadmin: '0'
+            placeholder: ''
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
         field_member_of_target_id:
           id: field_member_of_target_id
           table: node__field_member_of
           field: field_member_of_target_id
           relationship: none
-          group_type: count_distinct
+          group_type: group
           admin_label: ''
           plugin_id: numeric
           operator: '='
@@ -928,44 +907,40 @@ display:
           exposed: true
           expose:
             operator_id: field_member_of_target_id_op
-            label: 'Number of Parents'
-            description: ''
-            use_operator: true
+            label: 'Member of (field_member_of)'
+            description: null
+            use_operator: false
             operator: field_member_of_target_id_op
-            operator_limit_selection: true
-            operator_list:
-              '<': '<'
-              '=': '='
-              '>': '>'
-              between: between
+            operator_limit_selection: false
+            operator_list: {  }
             identifier: field_member_of_target_id
             required: false
             remember: false
             multiple: true
             remember_roles:
               authenticated: authenticated
-              anonymous: '0'
-              content_editor: '0'
-              administrator: '0'
-              fedoraadmin: '0'
-            min_placeholder: ''
-            max_placeholder: ''
-            placeholder: ''
-          is_grouped: false
+            min_placeholder: null
+            max_placeholder: null
+            placeholder: null
+          is_grouped: true
           group_info:
-            label: 'Member of (field_member_of)'
-            description: null
+            label: Parents
+            description: ''
             identifier: field_member_of_target_id
             optional: true
-            widget: select
-            multiple: false
+            widget: radios
+            multiple: true
             remember: false
             default_group: All
             default_group_multiple: {  }
             group_items:
-              1: {  }
-              2: {  }
-              3: {  }
+              1:
+                title: 'No parent'
+                operator: empty
+                value:
+                  min: ''
+                  max: ''
+                  value: ''
         nid:
           id: nid
           table: node_field_data
@@ -994,7 +969,6 @@ display:
               '<': '<'
               '=': '='
               '>': '>'
-              between: between
             identifier: child_count
             required: false
             remember: false
@@ -1048,7 +1022,6 @@ display:
               '<': '<'
               '=': '='
               '>': '>'
-              between: between
             identifier: mid_count
             required: false
             remember: false
diff --git a/config/sync/views.view.group_media.yml b/config/sync/views.view.group_media.yml
index da57e3553..f1f436bca 100644
--- a/config/sync/views.view.group_media.yml
+++ b/config/sync/views.view.group_media.yml
@@ -1,4 +1,4 @@
-uuid: f439f18e-f3bb-413b-89d3-3f5a46ac6591
+uuid: 9a950710-619c-4f7a-ae01-14a92f4e36bb
 langcode: en
 status: true
 dependencies:
@@ -9,7 +9,7 @@ dependencies:
     module:
       - groupmedia
 _core:
-  default_config_hash: EHwbU77rWxN8VKFLmLexQH4fYbAr6b9AJBTe3_xRBk0
+  default_config_hash: a8l4sicTksJULMd2Kv40-t-lfoiFokG413E3TlvkinE
 id: group_media
 label: 'Group Media'
 module: views
@@ -270,16 +270,16 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
-          relationship: group_content
+        edit_media:
+          id: edit_media
+          table: media
+          field: edit_media
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_content
-          plugin_id: entity_link
-          label: 'View relation link'
+          entity_type: media
+          plugin_id: entity_link_edit
+          label: 'Edit media'
           exclude: true
           alter:
             alter_text: false
@@ -320,19 +320,19 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'View relation'
+          text: 'Edit media'
           output_url_as_text: false
           absolute: false
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
-          relationship: group_content
+        delete_media:
+          id: delete_media
+          table: media
+          field: delete_media
+          relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_content
-          plugin_id: entity_link_edit
-          label: 'Edit relation link'
+          entity_type: media
+          plugin_id: entity_link_delete
+          label: 'Delete Media'
           exclude: true
           alter:
             alter_text: false
@@ -373,17 +373,19 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Edit relation'
-        delete_group_content:
-          id: delete_group_content
-          table: group_content
-          field: delete_group_content
-          relationship: group_content
+          text: 'Delete media'
+          output_url_as_text: false
+          absolute: false
+        edit_group_relationship:
+          id: edit_group_relationship
+          table: group_relationship
+          field: edit_group_relationship
+          relationship: group_relationship
           group_type: group
           admin_label: ''
-          entity_type: group_content
-          plugin_id: entity_link_delete
-          label: 'Delete relation link'
+          entity_type: group_relationship
+          plugin_id: entity_link_edit
+          label: 'Link to edit Group relationship'
           exclude: true
           alter:
             alter_text: false
@@ -424,17 +426,19 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: 'Delete relation'
-        edit_media:
-          id: edit_media
-          table: media
-          field: edit_media
-          relationship: none
+          text: 'Edit relationship'
+          output_url_as_text: false
+          absolute: false
+        delete_group_relationship:
+          id: delete_group_relationship
+          table: group_relationship
+          field: delete_group_relationship
+          relationship: group_relationship
           group_type: group
           admin_label: ''
-          entity_type: media
-          plugin_id: entity_link_edit
-          label: 'Edit media'
+          entity_type: group_relationship
+          plugin_id: entity_link_delete
+          label: 'Delete relationship'
           exclude: true
           alter:
             alter_text: false
@@ -475,17 +479,19 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: Edit
-        delete_media:
-          id: delete_media
-          table: media
-          field: delete_media
-          relationship: none
+          text: 'Delete relationship'
+          output_url_as_text: false
+          absolute: false
+        view_group_relationship:
+          id: view_group_relationship
+          table: group_relationship
+          field: view_group_relationship
+          relationship: group_relationship
           group_type: group
           admin_label: ''
-          entity_type: media
-          plugin_id: entity_link_delete
-          label: 'Delete Media'
+          entity_type: group_relationship
+          plugin_id: entity_link
+          label: 'View relationship'
           exclude: true
           alter:
             alter_text: false
@@ -526,7 +532,9 @@ display:
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
-          text: Delete
+          text: 'View relationship'
+          output_url_as_text: false
+          absolute: false
         dropbutton:
           id: dropbutton
           table: views
@@ -535,7 +543,7 @@ display:
           group_type: group
           admin_label: ''
           plugin_id: dropbutton
-          label: Dropbutton
+          label: Operations
           exclude: false
           alter:
             alter_text: false
@@ -578,14 +586,15 @@ display:
           hide_alter_empty: true
           destination: true
           fields:
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
             edit_media: edit_media
             delete_media: delete_media
+            edit_group_relationship: edit_group_relationship
+            delete_group_relationship: delete_group_relationship
+            view_group_relationship: view_group_relationship
             name: '0'
             bundle: '0'
             status: '0'
+            uid: '0'
       pager:
         type: mini
         options:
@@ -626,12 +635,12 @@ display:
       arguments:
         gid:
           id: gid
-          table: group_content_field_data
+          table: group_relationship_field_data
           field: gid
-          relationship: group_content
+          relationship: group_relationship
           group_type: group
           admin_label: ''
-          entity_type: group_content
+          entity_type: group_relationship
           entity_field: gid
           plugin_id: group_id
           default_action: ignore
@@ -859,19 +868,19 @@ display:
           replica: false
           query_tags: {  }
       relationships:
-        group_content:
-          id: group_content
+        group_relationship:
+          id: group_relationship
           table: media_field_data
-          field: group_content
+          field: group_relationship
           relationship: none
           group_type: group
-          admin_label: 'Media group content'
+          admin_label: 'Media group relationship'
           entity_type: media
-          plugin_id: group_content_to_entity_reverse
+          plugin_id: group_relationship_to_entity_reverse
           required: false
-          group_content_plugins:
+          group_relation_plugins:
             'group_media:audio': '0'
-            'group_media:file': '0'
+            'group_media:document': '0'
             'group_media:image': '0'
             'group_media:remote_video': '0'
             'group_media:video': '0'
diff --git a/config/sync/views.view.group_members.yml b/config/sync/views.view.group_members.yml
index 70140529b..888c8c19f 100644
--- a/config/sync/views.view.group_members.yml
+++ b/config/sync/views.view.group_members.yml
@@ -1,4 +1,4 @@
-uuid: b7e0decd-0eac-4ece-bb42-f466dc1d48d4
+uuid: 43cb1656-d2d6-4822-b025-78b1efba55f1
 langcode: en
 status: true
 dependencies:
@@ -6,13 +6,13 @@ dependencies:
     - group
     - user
 _core:
-  default_config_hash: zIcnLmbW8inPRIQdPSVbKPuG2o5G5wHGJED4Jlgb2SY
+  default_config_hash: JObBEUBjxiblsPypD-apV4KDHMD6JetwJds-xV_IBs4
 id: group_members
 label: 'Group members'
 module: group
 description: ''
 tag: ''
-base_table: group_content_field_data
+base_table: group_relationship_field_data
 base_field: id
 display:
   default:
@@ -90,7 +90,7 @@ display:
           field_api_classes: false
         group_roles:
           id: group_roles
-          table: group_content__group_roles
+          table: group_relationship__group_roles
           field: group_roles
           relationship: none
           group_type: group
@@ -133,7 +133,7 @@ display:
           element_wrapper_type: ''
           element_wrapper_class: ''
           element_default_classes: true
-          empty: '<div class="item-list"><ul><li>&lt;none&gt;</li></ul></div>'
+          empty: None
           hide_empty: false
           empty_zero: false
           hide_alter_empty: true
@@ -153,12 +153,12 @@ display:
           field_api_classes: false
         changed:
           id: changed
-          table: group_content_field_data
+          table: group_relationship_field_data
           field: changed
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_content
+          entity_type: group_relationship
           entity_field: changed
           plugin_id: field
           label: Updated
@@ -220,12 +220,12 @@ display:
           field_api_classes: false
         created:
           id: created
-          table: group_content_field_data
+          table: group_relationship_field_data
           field: created
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_content
+          entity_type: group_relationship
           entity_field: created
           plugin_id: field
           label: Joined
@@ -285,14 +285,14 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
+        view_group_relationship:
+          id: view_group_relationship
+          table: group_relationship
+          field: view_group_relationship
           relationship: none
           group_type: group
           admin_label: 'View member link'
-          entity_type: group_content
+          entity_type: group_relationship
           plugin_id: entity_link
           label: ''
           exclude: true
@@ -338,14 +338,14 @@ display:
           text: 'View member'
           output_url_as_text: false
           absolute: false
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
+        edit_group_relationship:
+          id: edit_group_relationship
+          table: group_relationship
+          field: edit_group_relationship
           relationship: none
           group_type: group
           admin_label: 'Edit member link'
-          entity_type: group_content
+          entity_type: group_relationship
           plugin_id: entity_link_edit
           label: ''
           exclude: true
@@ -389,14 +389,14 @@ display:
           empty_zero: false
           hide_alter_empty: true
           text: 'Edit member'
-        delete_group_content:
-          id: delete_group_content
-          table: group_content
-          field: delete_group_content
+        delete_group_relationship:
+          id: delete_group_relationship
+          table: group_relationship
+          field: delete_group_relationship
           relationship: none
           group_type: group
           admin_label: 'Remove member link'
-          entity_type: group_content
+          entity_type: group_relationship
           plugin_id: entity_link_delete
           label: ''
           exclude: true
@@ -491,9 +491,9 @@ display:
           hide_alter_empty: true
           destination: true
           fields:
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
+            view_group_relationship: view_group_relationship
+            edit_group_relationship: edit_group_relationship
+            delete_group_relationship: delete_group_relationship
             name: '0'
             group_roles: '0'
             changed: '0'
@@ -552,12 +552,12 @@ display:
       arguments:
         gid:
           id: gid
-          table: group_content_field_data
+          table: group_relationship_field_data
           field: gid
           relationship: none
           group_type: group
           admin_label: ''
-          entity_type: group_content
+          entity_type: group_relationship
           entity_field: gid
           plugin_id: numeric
           default_action: 'access denied'
@@ -599,9 +599,9 @@ display:
             group_roles: group_roles
             changed: changed
             created: created
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
+            view_group_relationship: view_group_relationship
+            edit_group_relationship: edit_group_relationship
+            delete_group_relationship: delete_group_relationship
             dropbutton: dropbutton
           default: '-1'
           info:
@@ -631,21 +631,21 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            view_group_content:
+            view_group_relationship:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            edit_group_content:
+            edit_group_relationship:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            delete_group_content:
+            delete_group_relationship:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -683,15 +683,15 @@ display:
       relationships:
         gc__user:
           id: gc__user
-          table: group_content_field_data
+          table: group_relationship_field_data
           field: gc__user
           relationship: none
           group_type: group
           admin_label: 'Member account'
-          entity_type: group_content
-          plugin_id: group_content_to_entity
+          entity_type: group_relationship
+          plugin_id: group_relationship_to_entity
           required: true
-          group_content_plugins:
+          group_relation_plugins:
             group_membership: group_membership
       header: {  }
       footer: {  }
@@ -706,7 +706,7 @@ display:
         - url.query_args
         - user.group_permissions
       tags:
-        - 'config:field.storage.group_content.group_roles'
+        - 'config:field.storage.group_relationship.group_roles'
   page_1:
     id: page_1
     display_title: Page
@@ -735,4 +735,4 @@ display:
         - url.query_args
         - user.group_permissions
       tags:
-        - 'config:field.storage.group_content.group_roles'
+        - 'config:field.storage.group_relationship.group_roles'
diff --git a/config/sync/views.view.group_nodes.yml b/config/sync/views.view.group_nodes.yml
index cca5979a3..a2673325d 100644
--- a/config/sync/views.view.group_nodes.yml
+++ b/config/sync/views.view.group_nodes.yml
@@ -1,4 +1,4 @@
-uuid: ae302758-422c-4660-933a-8c0c67ac8455
+uuid: 5fff7cdd-2e7f-41e3-8f7e-0917ee2ce1a9
 langcode: en
 status: true
 dependencies:
@@ -7,7 +7,7 @@ dependencies:
     - group
     - node
 _core:
-  default_config_hash: za6rNdVPn3HsOOwx2Yka3EmWEkXSdUIlaUpT8qOAxG0
+  default_config_hash: 0bibzgCqmSgspCrEA2qTxfywBYHKOs3E6hju9O0acTw
 id: group_nodes
 label: 'Group nodes'
 module: gnode
@@ -288,16 +288,16 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        view_group_content:
-          id: view_group_content
-          table: group_content
-          field: view_group_content
-          relationship: group_content
+        view_group_relationship:
+          id: view_group_relationship
+          table: group_relationship
+          field: view_group_relationship
+          relationship: group_relationship
           group_type: group
           admin_label: 'View relation link'
-          entity_type: group_content
+          entity_type: group_relationship
           plugin_id: entity_link
-          label: 'Link to Group content'
+          label: 'Link to Group relationship'
           exclude: true
           alter:
             alter_text: false
@@ -341,16 +341,16 @@ display:
           text: 'View relation'
           output_url_as_text: false
           absolute: false
-        edit_group_content:
-          id: edit_group_content
-          table: group_content
-          field: edit_group_content
-          relationship: group_content
+        edit_group_relationship:
+          id: edit_group_relationship
+          table: group_relationship
+          field: edit_group_relationship
+          relationship: group_relationship
           group_type: group
           admin_label: 'Edit relation link'
-          entity_type: group_content
+          entity_type: group_relationship
           plugin_id: entity_link_edit
-          label: 'Link to edit Group content'
+          label: 'Link to edit Group relationship'
           exclude: true
           alter:
             alter_text: false
@@ -392,16 +392,16 @@ display:
           empty_zero: false
           hide_alter_empty: true
           text: 'Edit relation'
-        delete_group_content:
-          id: delete_group_content
-          table: group_content
-          field: delete_group_content
-          relationship: group_content
+        delete_group_relationship:
+          id: delete_group_relationship
+          table: group_relationship
+          field: delete_group_relationship
+          relationship: group_relationship
           group_type: group
           admin_label: 'Delete relation link'
-          entity_type: group_content
+          entity_type: group_relationship
           plugin_id: entity_link_delete
-          label: 'Link to delete Group content'
+          label: 'Link to delete Group relationship'
           exclude: true
           alter:
             alter_text: false
@@ -596,9 +596,9 @@ display:
           hide_alter_empty: true
           destination: true
           fields:
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
+            view_group_relationship: view_group_relationship
+            edit_group_relationship: edit_group_relationship
+            delete_group_relationship: delete_group_relationship
             edit_node: edit_node
             delete_node: delete_node
             title: '0'
@@ -659,12 +659,12 @@ display:
       arguments:
         gid:
           id: gid
-          table: group_content_field_data
+          table: group_relationship_field_data
           field: gid
-          relationship: group_content
+          relationship: group_relationship
           group_type: group
           admin_label: ''
-          entity_type: group_content
+          entity_type: group_relationship
           entity_field: gid
           plugin_id: numeric
           default_action: 'access denied'
@@ -715,8 +715,6 @@ display:
             description: ''
             use_operator: false
             operator: status_op
-            operator_limit_selection: false
-            operator_list: {  }
             identifier: status
             required: true
             remember: false
@@ -726,6 +724,8 @@ display:
               anonymous: '0'
               administrator: '0'
               group_admin: '0'
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: true
           group_info:
             label: 'Published status'
@@ -766,8 +766,6 @@ display:
             description: ''
             use_operator: false
             operator: type_op
-            operator_limit_selection: false
-            operator_list: {  }
             identifier: type
             required: false
             remember: false
@@ -778,6 +776,8 @@ display:
               administrator: '0'
               group_admin: '0'
             reduce: false
+            operator_limit_selection: false
+            operator_list: {  }
           is_grouped: false
           group_info:
             label: ''
@@ -801,9 +801,9 @@ display:
             type: type
             status: status
             changed: changed
-            view_group_content: view_group_content
-            edit_group_content: edit_group_content
-            delete_group_content: delete_group_content
+            view_group_relationship: view_group_relationship
+            edit_group_relationship: edit_group_relationship
+            delete_group_relationship: delete_group_relationship
             edit_node: edit_node
             delete_node: delete_node
             dropbutton: dropbutton
@@ -837,21 +837,21 @@ display:
               separator: ''
               empty_column: false
               responsive: ''
-            view_group_content:
+            view_group_relationship:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            edit_group_content:
+            edit_group_relationship:
               sortable: false
               default_sort_order: asc
               align: ''
               separator: ''
               empty_column: false
               responsive: ''
-            delete_group_content:
+            delete_group_relationship:
               sortable: false
               default_sort_order: asc
               align: ''
@@ -901,17 +901,17 @@ display:
           replica: false
           query_tags: {  }
       relationships:
-        group_content:
-          id: group_content
+        group_relationship:
+          id: group_relationship
           table: node_field_data
-          field: group_content
+          field: group_relationship
           relationship: none
           group_type: group
           admin_label: 'Content relation'
           entity_type: node
-          plugin_id: group_content_to_entity_reverse
+          plugin_id: group_relationship_to_entity_reverse
           required: true
-          group_content_plugins: {  }
+          group_relation_plugins: {  }
       header: {  }
       footer: {  }
       display_extenders: {  }
diff --git a/config/sync/views.view.solr_search_content.yml b/config/sync/views.view.solr_search_content.yml
index 3598f06b4..921c04715 100644
--- a/config/sync/views.view.solr_search_content.yml
+++ b/config/sync/views.view.solr_search_content.yml
@@ -3,11 +3,12 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.storage.node.field_abstract
     - field.storage.node.field_description
-    - field.storage.node.field_resource_type
     - search_api.index.default_solr_index
   module:
     - search_api
+    - text
     - views_field_view
 id: solr_search_content
 label: 'Solr search content'
@@ -145,8 +146,10 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: number_unformatted
-          settings: {  }
+          type: number_integer
+          settings:
+            thousand_separator: ''
+            prefix_suffix: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -568,14 +571,14 @@ display:
             use_highlighting: true
             multi_type: separator
             multi_separator: ', '
-        processed:
-          id: processed
+        field_abstract:
+          id: field_abstract
           table: search_api_index_default_solr_index
-          field: processed
+          field: field_abstract
           relationship: none
           group_type: group
           admin_label: ''
-          plugin_id: search_api
+          plugin_id: search_api_field
           label: Abstract
           exclude: false
           alter:
@@ -617,10 +620,26 @@ display:
           hide_empty: true
           empty_zero: false
           hide_alter_empty: true
-          link_to_item: false
-          use_highlighting: true
+          click_sort_column: value
+          type: text_default
+          settings: {  }
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
           multi_type: separator
-          multi_separator: ', '
+          separator: ', '
+          field_api_classes: false
+          field_rendering: false
+          fallback_handler: search_api
+          fallback_options:
+            link_to_item: false
+            use_highlighting: true
+            multi_type: separator
+            multi_separator: ', '
         search_api_excerpt:
           id: search_api_excerpt
           table: search_api_index_default_solr_index
@@ -774,6 +793,7 @@ display:
           plugin_id: search_api_options
           operator: or
           value:
+            collection_object: collection_object
             islandora_object: islandora_object
           group: 1
           exposed: false
@@ -850,8 +870,8 @@ display:
         - 'url.query_args:sort_order'
         - 'user.node_grants:view'
       tags:
+        - 'config:field.storage.node.field_abstract'
         - 'config:field.storage.node.field_description'
-        - 'config:field.storage.node.field_resource_type'
         - 'config:search_api.index.default_solr_index'
         - 'search_api_list:default_solr_index'
       cacheable: false
@@ -953,8 +973,8 @@ display:
         - 'url.query_args:sort_order'
         - 'user.node_grants:view'
       tags:
+        - 'config:field.storage.node.field_abstract'
         - 'config:field.storage.node.field_description'
-        - 'config:field.storage.node.field_resource_type'
         - 'config:search_api.index.default_solr_index'
         - 'search_api_list:default_solr_index'
   page_1:
@@ -988,6 +1008,7 @@ display:
           plugin_id: search_api_options
           operator: or
           value:
+            collection_object: collection_object
             islandora_object: islandora_object
           group: 1
           exposed: false
@@ -1052,8 +1073,8 @@ display:
         - 'url.query_args:sort_order'
         - 'user.node_grants:view'
       tags:
+        - 'config:field.storage.node.field_abstract'
         - 'config:field.storage.node.field_description'
-        - 'config:field.storage.node.field_resource_type'
         - 'config:search_api.index.default_solr_index'
         - 'search_api_list:default_solr_index'
       cacheable: false
diff --git a/web/.ht.router.php b/web/.ht.router.php
index 054f7119b..2c8a6f6ac 100644
--- a/web/.ht.router.php
+++ b/web/.ht.router.php
@@ -24,6 +24,12 @@
  * @see http://php.net/manual/en/features.commandline.webserver.php
  */
 
+if (PHP_SAPI !== 'cli-server') {
+  // Bail out if this is not PHP's Development Server.
+  header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
+  exit;
+}
+
 $url = parse_url($_SERVER['REQUEST_URI']);
 if (file_exists(__DIR__ . $url['path'])) {
   // Serve the requested resource as-is.
diff --git a/web/.htaccess b/web/.htaccess
index 4d19147cc..1575c51f3 100644
--- a/web/.htaccess
+++ b/web/.htaccess
@@ -3,7 +3,7 @@
 #
 
 # Protect files and directories from prying eyes.
-<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
+<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config|yarn\.lock|package\.json)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
   <IfModule mod_authz_core.c>
     Require all denied
   </IfModule>
@@ -42,7 +42,7 @@ AddEncoding gzip svgz
   # Enable expirations.
   ExpiresActive On
 
-  # Cache all files for 2 weeks after access (A).
+  # Cache all files and redirects for 2 weeks after access (A).
   ExpiresDefault A1209600
 
   <FilesMatch \.php$>
@@ -158,12 +158,12 @@ AddEncoding gzip svgz
     # Serve gzip compressed CSS files if they exist and the client accepts gzip.
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*)\.css $1\.css\.gz [QSA]
+    RewriteRule ^(.*css_[a-zA-Z0-9-_]+)\.css$ $1\.css\.gz [QSA]
 
     # Serve gzip compressed JS files if they exist and the client accepts gzip.
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*)\.js $1\.js\.gz [QSA]
+    RewriteRule ^(.*js_[a-zA-Z0-9-_]+)\.js$ $1\.js\.gz [QSA]
 
     # Serve correct content types, and prevent double compression.
     RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]
diff --git a/web/core/.cspell.json b/web/core/.cspell.json
index d12d3c824..40601594b 100644
--- a/web/core/.cspell.json
+++ b/web/core/.cspell.json
@@ -3,7 +3,7 @@
     "language": "en-US",
     "allowCompoundWords": false,
     "ignorePaths": [
-      ".*.json",
+      "**/.*.json",
       ".*ignore",
       "composer.lock",
       "assets/vendor/**",
@@ -25,6 +25,7 @@
       "modules/rdf/tests/fixtures/drupal7.php",
       "modules/search/tests/UnicodeTest.txt",
       "modules/system/tests/logo.svgz",
+      "modules/tracker/tests/fixtures/drupal7.php",
       "node_modules/*",
       "profiles/demo_umami/modules/demo_umami_content/default_content/languages/es/**/*",
       "tests/fixtures/files/*",
diff --git a/web/core/.env.example b/web/core/.env.example
index 13c5a7867..04db33703 100644
--- a/web/core/.env.example
+++ b/web/core/.env.example
@@ -46,6 +46,10 @@ DRUPAL_TEST_CHROMEDRIVER_AUTOSTART=true
 # e.g. `--disable-gpu --headless --no-sandbox`.
 #DRUPAL_TEST_WEBDRIVER_CHROME_ARGS=
 
+# A list of arguments to pass to Webdriver, separated by spaces
+# e.g. `--allowed-ips --disable-dev-shm-usage`.
+#DRUPAL_TEST_WEBDRIVER_CLI_ARGS=
+
 ##############
 # Nightwatch #
 ##############
diff --git a/web/core/.eslintrc.json b/web/core/.eslintrc.json
index ddf7aba38..984f63fbb 100644
--- a/web/core/.eslintrc.json
+++ b/web/core/.eslintrc.json
@@ -47,6 +47,7 @@
       "requireReturn": false
     }],
     "no-unused-vars": ["warn"],
-    "operator-linebreak": ["error", "after", { "overrides": { "?": "ignore", ":": "ignore" } }]
+    "operator-linebreak": ["error", "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
+    "yml/indent": ["error", 2]
   }
 }
diff --git a/web/core/.stylelintrc.json b/web/core/.stylelintrc.json
index 1de82b949..b8b3b53dd 100644
--- a/web/core/.stylelintrc.json
+++ b/web/core/.stylelintrc.json
@@ -14,6 +14,7 @@
     "function-url-quotes": null,
     "function-whitespace-after": null,
     "hue-degree-notation": "number",
+    "import-notation": "string",
     "no-descending-specificity": null,
     "no-duplicate-selectors": null,
     "no-unknown-animations": true,
@@ -461,6 +462,7 @@
     "selector-class-pattern": null,
     "selector-id-pattern": "^[a-z][-_a-z0-9]*$",
     "selector-no-vendor-prefix": null,
+    "selector-not-notation": "simple",
     "selector-pseudo-element-colon-notation": null,
     "shorthand-property-no-redundant-values": null,
     "string-quotes": "double",
@@ -477,7 +479,7 @@
   "ignoreFiles": [
     "assets/vendor/**/*.css",
     "tests/Drupal/Tests/Core/Asset/css_test_files/**/*.css",
-    "modules/media/css/plugins/drupalmedia/ckeditor.drupalmedia.css",
+    "modules/ckeditor/css/plugins/drupalmedia/ckeditor.drupalmedia.css",
     "themes/stable/css/core/assets/vendor/**/*.css",
     "themes/stable9/css/core/assets/vendor/**/*.css",
     "themes/stable9/css/media/plugins/drupalmedia/ckeditor.drupalmedia.css"
diff --git a/web/core/COPYRIGHT.txt b/web/core/COPYRIGHT.txt
index 6c6d0ad34..90555bcd3 100644
--- a/web/core/COPYRIGHT.txt
+++ b/web/core/COPYRIGHT.txt
@@ -22,36 +22,49 @@ license, including:
 
 JavaScript
 
-  Farbtastic - Copyright (c) 2010 Matt Farina
+  Backbone - Copyright (c) 2010 Jeremy Ashkenas and DocumentCloud
+
+  CKEditor - Copyright (c) 2003 CKSource Holding sp. z o.o.
+
+  CKEditor5 - Copyright (c) 2003 CKSource Holding sp. z o.o.
 
-  HTML5 Shiv - Copyright (c) 2014  Alexander Farkas, Jonathan Neal, Paul Irish,
-    and John-David Dalton
+  CSS.escape polyfill - Copyright (c) Mathias Bynens
 
-  jQuery - Copyright (c) 2011 John Resig
+  ES6-Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors
 
-  jQuery Bgiframe - Copyright (c) 2013 Brandon Aaron (http://brandonaaron.net)
+  Farbtastic - Copyright (c) 2010 Matt Farina
 
-  jQuery BBQ - Copyright (c) 2010 "Cowboy" Ben Alman
+  JavaScript Cookie - Copyright (c) 2006 Klaus Hartl & Fagner Brack
 
-  jQuery Cookie - Copyright (c) 2014 Klaus Hartl
+  jQuery - Copyright (c) OpenJS Foundation and other contributors
 
   jQuery Form - Copyright (c) 2017 Kevin Morris
 
-  jQuery Globalize - Copyright (c) 2012 Software Freedom Conservancy, Inc.
+  jQuery Joyride - Copyright (c) 2013 ZURB
+
+  jQuery Once - Copyright (c) 2016 Rob Loach
+
+  jQuery UI - Copyright (c) OpenJS Foundation and other contributors
+
+  LoadJS - Copyright (c) 2015 Andres Morey
+
+  Modernizr - Copyright (c) 2021 The Modernizr Team
+
+  Picturefill -  Copyright (c) 2014 Filament Group
+
+  Popperjs - Copyright (c) 2019 Federico Zivolo
+
+  Shepherd - Copyright (c) 2021
 
-  jQuery Mousewheel - Copyright OpenJS Foundation and other contributors
-    (https://openjsf.org/)
+  Sortable - Copyright (c) 2019 All contributors to Sortable
 
-  jQuery Metadata - Copyright (c) 2006 John Resig, Yehuda Katz, Jörn Zaefferer,
-    Paul McLanahan
+  Tabbable - Copyright (c) 2015 David Clark
 
-  jQuery Once - Copyright (c) 2009 Konstantin Käfer
+  Underscore - Copyright (c) 2009 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors
 
-  jQuery UI - Copyright (c) 2015 by the authors and other contributors
-    (http://jqueryui.com/about)
+CSS
 
-  Sizzle.js - Copyright (c) 2016 JS Foundation and other contributors
-    (https://js.foundation)
+  Normalize.css - Copyright (c) Nicolas Gallagher and Jonathan Neal
 
 PHP
 
diff --git a/web/core/INSTALL.txt b/web/core/INSTALL.txt
index a75ba11a2..5219b6a77 100644
--- a/web/core/INSTALL.txt
+++ b/web/core/INSTALL.txt
@@ -341,9 +341,10 @@ INSTALLATION
    page.
 
    More information about cron maintenance tasks is available at
-   https://www.drupal.org/cron, and sample cron shell scripts can be found in
-   the core/scripts/ directory. (Note that these scripts must be customized like
-   the above example, to add your site-specific cron key and domain name.)
+   https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks,
+   and sample cron shell scripts can be found in the core/scripts/ directory.
+   (Note that these scripts must be customized like the above example, to add
+   your site-specific cron key and domain name.)
 
 REINSTALL
 ------------
diff --git a/web/core/MAINTAINERS.txt b/web/core/MAINTAINERS.txt
index ab0f57697..5b67d9d69 100644
--- a/web/core/MAINTAINERS.txt
+++ b/web/core/MAINTAINERS.txt
@@ -18,8 +18,8 @@ BDFL
 
 Product managers
 - Dries Buytaert 'dries' https://www.drupal.org/u/dries
-- Angela Byron 'webchick' https://www.drupal.org/u/webchick
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
+- Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
 - Roy Scholten 'yoroy' https://www.drupal.org/u/yoroy
 
 Framework managers
@@ -31,18 +31,20 @@ Framework managers
   - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
 
   Frontend
-  - Lauri Eskola 'lauriii' https://www.drupal.org/u/lauriii
+  - Ben Mullins 'bnjmnm' https://www.drupal.org/u/bnjmnm
+  - (provisional) Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
   - (provisional) Cristina Chumillas 'ckrina' https://www.drupal.org/u/ckrina
-  - (provisional) Ben Mullins 'bnjmnm' https://www.drupal.org/u/bnjmnm
+  - (provisional) Sally Young 'justafish' https://www.drupal.org/u/justafish
 
 Release managers
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 - Jess Myrbo 'xjm' https://www.drupal.org/u/xjm
-- (provisional) Victoria Spagnolo 'quietone' https://www.drupal.org/u/quietone
+- Victoria Spagnolo 'quietone' https://www.drupal.org/u/quietone
+- (provisional) Dave Long 'longwave' https://www.drupal.org/u/longwave
 
 Core JavaScript packages
- - (provisional) Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
- - (provisional) Sally Young 'justafish' https://www.drupal.org/u/justafish
+ - Théodore Biadala 'nod_' https://www.drupal.org/u/nod_
+ - Sally Young 'justafish' https://www.drupal.org/u/justafish
 
 Committer team facilitators
 - Pamela Barone 'pameeela' https://www.drupal.org/u/pameeela
@@ -81,7 +83,7 @@ Bartik
 - Emma Maria Karayiannis 'emma.maria' https://www.drupal.org/u/emma.maria
 
 Base system
-- ?
+- See "Framework managers" above.
 
 Basic Auth
 - Juampy Novillo Requena 'juampy' https://www.drupal.org/u/juampy
@@ -99,6 +101,7 @@ Block
 
 Block Content
 - Lee Rowlands 'larowlan' https://www.drupal.org/u/larowlan
+- Stephen Mustgrave 'smustgrave' https://www.drupal.org/u/smustgrave
 
 Book
 - Peter Wolanin 'pwolanin' https://www.drupal.org/u/pwolanin
@@ -141,7 +144,6 @@ Comment
 
 Configuration API
 - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
-- Matthew Tift 'mtift' https://www.drupal.org/u/mtift
 
 Configuration Entity API
 - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
@@ -152,7 +154,6 @@ Configuration UI
 
 Configuration Translation
 - Gábor Hojtsy 'Gábor Hojtsy' https://www.drupal.org/u/gábor-hojtsy
-- Tobias Zimmermann 'tstoeckler' https://www.drupal.org/u/tstoeckler
 - Vijayachandran Mani 'vijaycs85' https://www.drupal.org/u/vijaycs85
 
 Contact
@@ -174,9 +175,10 @@ Cron
 
 CSS
 - John Albin Wilkins 'JohnAlbin' https://www.drupal.org/u/johnalbin
+- Mike Herchel 'mherchel' https://www.drupal.org/u/mherchel
 
 Database API
-- ?
+- David Bekker 'daffie' https://www.drupal.org/u/daffie
 
   MySQL DB driver
   - David Strauss 'David Strauss' https://www.drupal.org/u/david-strauss
@@ -213,7 +215,6 @@ Entity API
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 - Hristo Chonov 'hchonov' https://www.drupal.org/u/hchonov
 - Sascha Grossenbacher 'Berdir' https://www.drupal.org/u/berdir
-- Tobias Zimmermann 'tstoeckler' https://www.drupal.org/u/tstoeckler
 
 Extension API
 - ?
@@ -334,6 +335,7 @@ Olivero
 - Putra Bonaccorsi 'proeung' https://www.drupal.org/u/proeung
 - Jen Witkowski 'jwitkowski79' https://www.drupal.org/u/jwitkowski79
 - Konstantin Shupenko 'kostyashupenko' https://www.drupal.org/u/kostyashupenko
+- Andy Blum 'andy-blum' https://www.drupal.org/u/andy-blum
 
 Options
 - ?
@@ -394,7 +396,6 @@ Seven
 - ?
 
 Shortcut
-- Tobias Zimmermann 'tstoeckler' https://www.drupal.org/u/tstoeckler
 - Jibran Ijaz 'jibran' https://www.drupal.org/u/jibran
 
 Stable
@@ -417,7 +418,7 @@ Taxonomy
 - Nathaniel Catchpole 'catch' https://www.drupal.org/u/catch
 
 Telephone
-- ?
+- Stephen Mustgrave 'smustgrave' https://www.drupal.org/u/smustgrave
 
 Testing framework
 - Alex Pott 'alexpott' https://www.drupal.org/u/alexpott
@@ -426,7 +427,7 @@ Testing framework
 - Alberto M. 'mondrake' https://www.drupal.org/u/mondrake
 
 Text Field
-- ?
+- Stephen Mustgrave 'smustgrave' https://www.drupal.org/u/smustgrave
 
 Theme API
 - Alex Bronstein 'effulgentsia' https://www.drupal.org/u/effulgentsia
diff --git a/web/core/assets/scaffold/files/default.services.yml b/web/core/assets/scaffold/files/default.services.yml
index cdeb41fc4..b4d27e05a 100644
--- a/web/core/assets/scaffold/files/default.services.yml
+++ b/web/core/assets/scaffold/files/default.services.yml
@@ -147,6 +147,14 @@ parameters:
       #
       # @default []
       tags: []
+    # Renderer cache debug:
+    #
+    # Allows cache debugging output for each rendered element.
+    #
+    # Enabling render cache debugging is not recommended in production
+    # environments.
+    # @default false
+    debug: false
   # Cacheability debugging:
   #
   # Responses with cacheability metadata (CacheableResponseInterface instances)
@@ -161,15 +169,15 @@ parameters:
   # @default false
   http.response.debug_cacheability_headers: false
   factory.keyvalue: {}
-    # Default key/value storage service to use.
-    # @default keyvalue.database
-    # default: keyvalue.database
-    # Collection-specific overrides.
-    # state: keyvalue.database
+  # Default key/value storage service to use.
+  # @default keyvalue.database
+  # default: keyvalue.database
+  # Collection-specific overrides.
+  # state: keyvalue.database
   factory.keyvalue.expirable: {}
-    # Default key/value expirable storage service to use.
-    # @default keyvalue.database.expirable
-    # default: keyvalue.database.expirable
+  # Default key/value expirable storage service to use.
+  # @default keyvalue.database.expirable
+  # default: keyvalue.database.expirable
   # Allowed protocols for URL generation.
   filter_protocols:
     - http
@@ -196,7 +204,8 @@ parameters:
     allowedHeaders: []
     # Specify allowed request methods, specify ['*'] to allow all possible ones.
     allowedMethods: []
-    # Configure requests allowed from specific origins.
+    # Configure requests allowed from specific origins. Do not include trailing
+    # slashes with URLs.
     allowedOrigins: ['*']
     # Sets the Access-Control-Expose-Headers header.
     exposedHeaders: false
diff --git a/web/core/assets/scaffold/files/default.settings.php b/web/core/assets/scaffold/files/default.settings.php
index f3dca008f..20d789369 100644
--- a/web/core/assets/scaffold/files/default.settings.php
+++ b/web/core/assets/scaffold/files/default.settings.php
@@ -138,6 +138,21 @@
  * request as needed.  The fourth line creates a new database with a name of
  * "extra".
  *
+ * For MySQL, MariaDB or equivalent databases the 'isolation_level' option can
+ * be set. The recommended transaction isolation level for Drupal sites is
+ * 'READ COMMITTED'. The 'REPEATABLE READ' option is supported but can result
+ * in deadlocks, the other two options are 'READ UNCOMMITTED' and 'SERIALIZABLE'.
+ * They are available but not supported; use them at your own risk. For more
+ * info:
+ * https://dev.mysql.com/doc/refman/5.7/en/innodb-transaction-isolation-levels.html
+ *
+ * On your settings.php, change the isolation level:
+ * @code
+ * $databases['default']['default']['init_commands'] = [
+ *   'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
+ * ];
+ * @endcode
+ *
  * You can optionally set a prefix for all database table names by using the
  * 'prefix' setting. If a prefix is specified, the table name will be prepended
  * with its value. Be sure to use valid database characters only, usually
@@ -343,10 +358,13 @@
 # $settings['reverse_proxy'] = TRUE;
 
 /**
- * Specify every reverse proxy IP address in your environment.
- * This setting is required if $settings['reverse_proxy'] is TRUE.
+ * Reverse proxy addresses.
+ *
+ * Specify every reverse proxy IP address in your environment, as an array of
+ * IPv4/IPv6 addresses or subnets in CIDR notation. This setting is required if
+ * $settings['reverse_proxy'] is TRUE.
  */
-# $settings['reverse_proxy_addresses'] = ['a.b.c.d', ...];
+# $settings['reverse_proxy_addresses'] = ['a.b.c.d', 'e.f.g.h/24', ...];
 
 /**
  * Reverse proxy trusted headers.
@@ -513,6 +531,25 @@
  */
 # $settings['file_additional_public_schemes'] = ['example'];
 
+/**
+ * File schemes whose paths should not be normalized:
+ *
+ * Normally, Drupal normalizes '/./' and '/../' segments in file URIs in order
+ * to prevent unintended file access. For example, 'private://css/../image.png'
+ * is normalized to 'private://image.png' before checking access to the file.
+ *
+ * On Windows, Drupal also replaces '\' with '/' in URIs for the local
+ * filesystem.
+ *
+ * If file URIs with one or more scheme should not be normalized like this, then
+ * list the schemes here. For example, if 'porcelain://china/./plate.png' should
+ * not be normalized to 'porcelain://china/plate.png', then add 'porcelain' to
+ * this array. In this case, make sure that the module providing the 'porcelain'
+ * scheme does not allow unintended file access when using '/../' to move up the
+ * directory tree.
+ */
+# $settings['file_sa_core_2023_005_schemes'] = ['porcelain'];
+
 /**
  * Private file path:
  *
@@ -576,7 +613,7 @@
  *
  * Note: This setting does not apply to installation and update pages.
  */
-# $settings['maintenance_theme'] = 'bartik';
+# $settings['maintenance_theme'] = 'claro';
 
 /**
  * PHP settings:
@@ -601,21 +638,6 @@
 # ini_set('pcre.backtrack_limit', 200000);
 # ini_set('pcre.recursion_limit', 200000);
 
-/**
- * Add Permissions-Policy header to disable Google FLoC.
- *
- * By default, Drupal sends the 'Permissions-Policy: interest-cohort=()' header
- * to disable Google's Federated Learning of Cohorts feature, introduced in
- * Chrome 89.
- *
- * See https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts for more
- * information about FLoC.
- *
- * If you don't wish to disable FLoC in Chrome, you can set this value
- * to FALSE.
- */
-# $settings['block_interest_cohort'] = TRUE;
-
 /**
  * Configuration overrides.
  *
@@ -641,33 +663,6 @@
 # $config['system.site']['name'] = 'My Drupal site';
 # $config['user.settings']['anonymous'] = 'Visitor';
 
-/**
- * Fast 404 pages:
- *
- * Drupal can generate fully themed 404 pages. However, some of these responses
- * are for images or other resource files that are not displayed to the user.
- * This can waste bandwidth, and also generate server load.
- *
- * The options below return a simple, fast 404 page for URLs matching a
- * specific pattern:
- * - $config['system.performance']['fast_404']['exclude_paths']: A regular
- *   expression to match paths to exclude, such as images generated by image
- *   styles, or dynamically-resized images. The default pattern provided below
- *   also excludes the private file system. If you need to add more paths, you
- *   can add '|path' to the expression.
- * - $config['system.performance']['fast_404']['paths']: A regular expression to
- *   match paths that should return a simple 404 page, rather than the fully
- *   themed 404 page. If you don't have any aliases ending in htm or html you
- *   can add '|s?html?' to the expression.
- * - $config['system.performance']['fast_404']['html']: The html to return for
- *   simple 404 pages.
- *
- * Remove the leading hash signs if you would like to alter this functionality.
- */
-# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//';
-# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
-# $config['system.performance']['fast_404']['html'] = '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';
-
 /**
  * Load services definition file.
  */
@@ -777,6 +772,49 @@
  */
 $settings['migrate_node_migrate_type_classic'] = FALSE;
 
+/**
+ * The default settings for migration sources.
+ *
+ * These settings are used as the default settings on the Credential form at
+ * /upgrade/credentials.
+ *
+ * - migrate_source_version - The version of the source database. This can be
+ *   '6' or '7'. Defaults to '7'.
+ * - migrate_source_connection - The key in the $databases array for the source
+ *   site.
+ * - migrate_file_public_path - The location of the source Drupal 6 or Drupal 7
+ *   public files. This can be a local file directory containing the source
+ *   Drupal 6 or Drupal 7 site (e.g /var/www/docroot), or the site address
+ *   (e.g http://example.com).
+ * - migrate_file_private_path - The location of the source Drupal 7 private
+ *   files. This can be a local file directory containing the source Drupal 7
+ *   site (e.g /var/www/docroot), or empty to use the same value as Public
+ *   files directory.
+ *
+ * Sample configuration for a drupal 6 source site with the source files in a
+ * local directory.
+ *
+ * @code
+ * $settings['migrate_source_version'] = '6';
+ * $settings['migrate_source_connection'] = 'migrate';
+ * $settings['migrate_file_public_path'] = '/var/www/drupal6';
+ * @endcode
+ *
+ * Sample configuration for a drupal 7 source site with public source files on
+ * the source site and the private files in a local directory.
+ *
+ * @code
+ * $settings['migrate_source_version'] = '7';
+ * $settings['migrate_source_connection'] = 'migrate';
+ * $settings['migrate_file_public_path'] = 'https://drupal7.com';
+ * $settings['migrate_file_private_path'] = '/var/www/drupal7';
+ * @endcode
+ */
+# $settings['migrate_source_connection'] = '';
+# $settings['migrate_source_version'] = '';
+# $settings['migrate_file_public_path'] = '';
+# $settings['migrate_file_private_path'] = '';
+
 /**
  * Load local development override configuration, if available.
  *
diff --git a/web/core/assets/scaffold/files/example.settings.local.php b/web/core/assets/scaffold/files/example.settings.local.php
index 73671ab16..a9f1aca02 100644
--- a/web/core/assets/scaffold/files/example.settings.local.php
+++ b/web/core/assets/scaffold/files/example.settings.local.php
@@ -33,7 +33,7 @@
  * @see https://wiki.php.net/rfc/expectations
  */
 assert_options(ASSERT_ACTIVE, TRUE);
-\Drupal\Component\Assertion\Handle::register();
+assert_options(ASSERT_EXCEPTION, TRUE);
 
 /**
  * Enable local development services.
diff --git a/web/core/assets/scaffold/files/gitattributes b/web/core/assets/scaffold/files/gitattributes
index a37894e8e..76ea8feeb 100644
--- a/web/core/assets/scaffold/files/gitattributes
+++ b/web/core/assets/scaffold/files/gitattributes
@@ -19,24 +19,24 @@
 *.config  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.css     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.dist    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.engine  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.html    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=html
-*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.inc     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.install text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.js      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.json    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.lock    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.map     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.md      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
-*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.module  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
+*.php     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.po      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.profile text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.script  text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.sh      text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.sql     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.svg     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
-*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php
+*.theme   text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 diff=php linguist-language=php
 *.twig    text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.txt     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
diff --git a/web/core/assets/scaffold/files/ht.router.php b/web/core/assets/scaffold/files/ht.router.php
index 054f7119b..2c8a6f6ac 100644
--- a/web/core/assets/scaffold/files/ht.router.php
+++ b/web/core/assets/scaffold/files/ht.router.php
@@ -24,6 +24,12 @@
  * @see http://php.net/manual/en/features.commandline.webserver.php
  */
 
+if (PHP_SAPI !== 'cli-server') {
+  // Bail out if this is not PHP's Development Server.
+  header($_SERVER['SERVER_PROTOCOL'] . ' 403 Forbidden');
+  exit;
+}
+
 $url = parse_url($_SERVER['REQUEST_URI']);
 if (file_exists(__DIR__ . $url['path'])) {
   // Serve the requested resource as-is.
diff --git a/web/core/assets/scaffold/files/htaccess b/web/core/assets/scaffold/files/htaccess
index 4d19147cc..1575c51f3 100644
--- a/web/core/assets/scaffold/files/htaccess
+++ b/web/core/assets/scaffold/files/htaccess
@@ -3,7 +3,7 @@
 #
 
 # Protect files and directories from prying eyes.
-<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
+<FilesMatch "\.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config|yarn\.lock|package\.json)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$">
   <IfModule mod_authz_core.c>
     Require all denied
   </IfModule>
@@ -42,7 +42,7 @@ AddEncoding gzip svgz
   # Enable expirations.
   ExpiresActive On
 
-  # Cache all files for 2 weeks after access (A).
+  # Cache all files and redirects for 2 weeks after access (A).
   ExpiresDefault A1209600
 
   <FilesMatch \.php$>
@@ -158,12 +158,12 @@ AddEncoding gzip svgz
     # Serve gzip compressed CSS files if they exist and the client accepts gzip.
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*)\.css $1\.css\.gz [QSA]
+    RewriteRule ^(.*css_[a-zA-Z0-9-_]+)\.css$ $1\.css\.gz [QSA]
 
     # Serve gzip compressed JS files if they exist and the client accepts gzip.
     RewriteCond %{HTTP:Accept-encoding} gzip
     RewriteCond %{REQUEST_FILENAME}\.gz -s
-    RewriteRule ^(.*)\.js $1\.js\.gz [QSA]
+    RewriteRule ^(.*js_[a-zA-Z0-9-_]+)\.js$ $1\.js\.gz [QSA]
 
     # Serve correct content types, and prevent double compression.
     RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1,E=no-brotli:1]
diff --git a/web/core/assets/scaffold/files/robots.txt b/web/core/assets/scaffold/files/robots.txt
index 18f8df8e6..ebcd04b96 100644
--- a/web/core/assets/scaffold/files/robots.txt
+++ b/web/core/assets/scaffold/files/robots.txt
@@ -49,6 +49,8 @@ Disallow: /user/register
 Disallow: /user/password
 Disallow: /user/login
 Disallow: /user/logout
+Disallow: /media/oembed
+Disallow: /*/media/oembed
 # Paths (no clean URLs)
 Disallow: /index.php/admin/
 Disallow: /index.php/comment/reply/
@@ -59,3 +61,5 @@ Disallow: /index.php/user/password
 Disallow: /index.php/user/register
 Disallow: /index.php/user/login
 Disallow: /index.php/user/logout
+Disallow: /index.php/media/oembed
+Disallow: /index.php/*/media/oembed
diff --git a/web/core/assets/scaffold/files/web.config b/web/core/assets/scaffold/files/web.config
index 79a0433c9..b769e45e3 100644
--- a/web/core/assets/scaffold/files/web.config
+++ b/web/core/assets/scaffold/files/web.config
@@ -22,7 +22,7 @@
     <rewrite>
       <rules>
         <rule name="Protect files and directories from prying eyes" stopProcessing="true">
-          <match url="\.(engine|inc|install|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format|composer\.(json|lock)|\.htaccess)$" />
+          <match url="\.(engine|inc|install|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format|composer\.(json|lock)|\.htaccess|yarn.lock|package.json)$" />
           <action type="CustomResponse" statusCode="403" subStatusCode="0" statusReason="Forbidden" statusDescription="Access is forbidden." />
         </rule>
 
diff --git a/web/core/composer.json b/web/core/composer.json
index 1c7ef8c85..343aab62c 100644
--- a/web/core/composer.json
+++ b/web/core/composer.json
@@ -29,8 +29,8 @@
         "symfony/translation": "^4.4",
         "symfony/validator": "^4.4",
         "symfony/process": "^4.4",
-        "symfony/polyfill-iconv": "^1.25",
-        "symfony/polyfill-php80": "^1.25",
+        "symfony/polyfill-iconv": "^1.26",
+        "symfony/polyfill-php80": "^1.26",
         "symfony/yaml": "^4.4.19",
         "typo3/phar-stream-wrapper": "^3.1.3",
         "twig/twig": "^2.15.3",
@@ -43,7 +43,7 @@
         "egulias/email-validator": "^2.1.22|^3.2",
         "masterminds/html5": "^2.7",
         "symfony/psr-http-message-bridge": "^2.1",
-        "laminas/laminas-diactoros": "^2.11",
+        "longwave/laminas-diactoros": "^2.14",
         "composer/semver": "^3.3",
         "asm89/stack-cors": "^1.3",
         "pear/archive_tar": "^1.4.14",
@@ -151,9 +151,6 @@
         }
     },
     "scripts": {
-        "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
-        "post-autoload-dump": [
-          "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
-        ]
+        "pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump"
     }
 }
diff --git a/web/core/config/schema/core.data_types.schema.yml b/web/core/config/schema/core.data_types.schema.yml
index 640421d22..e6d7f243a 100644
--- a/web/core/config/schema/core.data_types.schema.yml
+++ b/web/core/config/schema/core.data_types.schema.yml
@@ -735,12 +735,12 @@ field.field_settings.decimal:
       label: 'Suffix'
 
 field.value.decimal:
-   type: mapping
-   label: 'Default value'
-   mapping:
-     value:
-       type: float
-       label: 'Value'
+  type: mapping
+  label: 'Default value'
+  mapping:
+    value:
+      type: float
+      label: 'Value'
 
 # Schema for the configuration of the Float field type.
 
diff --git a/web/core/config/schema/core.entity.schema.yml b/web/core/config/schema/core.entity.schema.yml
index 5603953b1..7b44b0acb 100644
--- a/web/core/config/schema/core.entity.schema.yml
+++ b/web/core/config/schema/core.entity.schema.yml
@@ -71,16 +71,16 @@ field_formatter:
       type: string
       label: 'Format type machine name'
     label:
-       type: string
-       label: 'Label setting machine name'
+      type: string
+      label: 'Label setting machine name'
     settings:
       type: field.formatter.settings.[%parent.type]
       label: 'Settings'
     third_party_settings:
-       type: sequence
-       label: 'Third party settings'
-       sequence:
-         type: field.formatter.third_party.[%key]
+      type: sequence
+      label: 'Third party settings'
+      sequence:
+        type: field.formatter.third_party.[%key]
 
 field_formatter.entity_view_display:
   type: field_formatter
diff --git a/web/core/core.api.php b/web/core/core.api.php
index 9ff2d5500..b70614524 100644
--- a/web/core/core.api.php
+++ b/web/core/core.api.php
@@ -889,6 +889,10 @@
  *   Note that $container here is an instance of
  *   \Drupal\Core\DependencyInjection\ContainerBuilder.
  *
+ * @section lazy_services Lazy services
+ * Some services can be declared as lazy to improve performance. See @link
+ * lazy_services Lazy Services @endlink for details.
+ *
  * @see https://www.drupal.org/node/2133171
  * @see core.services.yml
  * @see \Drupal
@@ -1802,6 +1806,7 @@
  * The queue system allows placing items in a queue and processing them later.
  * The system tries to ensure that only one consumer can process an item.
  *
+ * @section create_queues Creating queues
  * Before a queue can be used it needs to be created by
  * Drupal\Core\Queue\QueueInterface::createQueue().
  *
@@ -1826,6 +1831,7 @@
  * needs to be passed to Drupal\Core\Queue\QueueInterface::deleteItem() once
  * processing is completed.
  *
+ * @section queue_backends Queue backends
  * There are two kinds of queue backends available: reliable, which preserves
  * the order of messages and guarantees that every item will be executed at
  * least once. The non-reliable kind only does a best effort to preserve order
@@ -1919,6 +1925,8 @@
  * instead of executing the tasks directly. To do this, first define one or
  * more queues via a \Drupal\Core\Annotation\QueueWorker plugin. Then, add items
  * that need to be processed to the defined queues.
+ *
+ * @see queue
  */
 function hook_cron() {
   // Short-running operation example, not using a queue:
@@ -1978,6 +1986,8 @@ function hook_data_type_info_alter(&$data_types) {
  * @see \Drupal\Core\Queue\QueueWorkerInterface
  * @see \Drupal\Core\Annotation\QueueWorker
  * @see \Drupal\Core\Cron
+ *
+ * @ingroup queue
  */
 function hook_queue_info_alter(&$queues) {
   // This site has many feeds so let's spend 90 seconds on each cron run
@@ -1985,6 +1995,20 @@ function hook_queue_info_alter(&$queues) {
   $queues['aggregator_feeds']['cron']['time'] = 90;
 }
 
+/**
+ * Alter the information provided in \Drupal\Core\Condition\ConditionManager::getDefinitions().
+ *
+ * @param array $definitions
+ *   The array of condition definitions.
+ */
+function hook_condition_info_alter(array &$definitions) {
+  // Add custom or modify existing condition definitions.
+  if (isset($definitions['node_type']) && $definitions['node_type']['class'] == 'Drupal\node\Plugin\Condition\NodeType') {
+    // If the node_type's class is unaltered, use a custom implementation.
+    $definitions['node_type']['class'] = 'Drupal\mymodule\Plugin\Condition\NodeType';
+  }
+}
+
 /**
  * Alter an email message created with MailManagerInterface->mail().
  *
@@ -2444,6 +2468,28 @@ function hook_validation_constraint_alter(array &$definitions) {
  *   autocomplete, as a \Symfony\Component\HttpFoundation\JsonResponse object.
  *   See the @link menu Routing topic @endlink for more information about
  *   routing.
+ *
+ * @section sec_query Query parameters in Ajax requests
+ * If a form uses an Ajax field, all the query parameters in the current request
+ * will be also added to the Ajax POST requests along with an additional
+ * 'ajax_form=1' parameter (See \Drupal\Core\Render\Element\RenderElement).
+ * @code
+ * $settings['options']['query'] += \Drupal::request()->query->all();
+ * $settings['options']['query'][FormBuilderInterface::AJAX_FORM_REQUEST] = TRUE;
+ * @endcode
+ *
+ * Form elements of type 'managed_file' will have an additional
+ * 'element_parents' query parameter in Ajax POST requests. This parameter will
+ * include the name of the element and its parents as per the render array.
+ * This helps to identify the position of the element in the form (See
+ * \Drupal\file\Element\ManagedFile).
+ * @code
+ * 'options' => [
+ *   'query' => [
+ *     'element_parents' => implode('/', $element['#array_parents']),
+ *   ],
+ * ],
+ * @endcode
  */
 
 /**
@@ -2493,6 +2539,32 @@ function hook_validation_constraint_alter(array &$definitions) {
  * @}
  */
 
+/**
+ * @defgroup lazy_services Lazy Services
+ * @{
+ * Lazy services overview
+ *
+ * A service can be declared as lazy in order to improve performance. Classes
+ * that inject a lazy service receive a proxy class instead, and when a method
+ * on the lazy service is called, the proxy class gets the service from the
+ * container and forwards the method call. This means that the lazy service is
+ * only instantiated when it is needed.
+ *
+ * This is useful because some classes may inject a service which is expensive
+ * to instantiate (because it has multiple dependencies of its own), but is only
+ * used in exceptional cases. This would make the class dependent on the
+ * expensive service and all of the expensive service's dependencies.
+ *
+ * Making the expensive service lazy means that the class is only dependent on
+ * the proxy service, and not on all the dependencies of the lazy service.
+ *
+ * To define a service as lazy, add @code lazy: true @endcode to the service
+ * definition, and use the @code core/scripts/generate-proxy.sh @endcode script
+ * to generate the proxy class.
+ *
+ * @see core/scripts/generate-proxy.sh
+ */
+
 /**
  * @defgroup events Events
  * @{
diff --git a/web/core/core.libraries.yml b/web/core/core.libraries.yml
index 82c16545e..8da37de89 100644
--- a/web/core/core.libraries.yml
+++ b/web/core/core.libraries.yml
@@ -31,21 +31,22 @@ internal.backbone:
     - core/internal.underscore
 
 ckeditor:
+  deprecated: The "%library_id%" asset library is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3304481
   remote: https://github.com/ckeditor/ckeditor4
-  version: "4.18.0"
+  version: "4.21.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor4/4.18.0/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor4/4.21.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor/ckeditor.js: { preprocess: false, minified: true }
 
 ckeditor5:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.0/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     # This file is not aggregated to force the creation of a new aggregate file
@@ -59,10 +60,10 @@ ckeditor5:
 
 ckeditor5.editorClassic:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/editor-classic/editor-classic.js: { minified: true }
@@ -71,10 +72,10 @@ ckeditor5.editorClassic:
 
 ckeditor5.editorDecoupled:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/editor-decoupled/editor-decoupled.js: { minified: true }
@@ -82,12 +83,12 @@ ckeditor5.editorDecoupled:
     - core/ckeditor5
     - core/ckeditor5.htmlSupport
 
-ckeditor5.internal:
+ckeditor5.essentials:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.1.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://github.com/ckeditor/ckeditor5/blob/v35.3.2/LICENSE.md
+    url: https://github.com/ckeditor/ckeditor5/blob/v35.1.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/essentials/essentials.js: { minified: true }
@@ -97,10 +98,10 @@ ckeditor5.internal:
 
 ckeditor5.heading:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/heading/heading.js: { minified: true }
@@ -110,10 +111,10 @@ ckeditor5.heading:
 
 ckeditor5.basic:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/basic-styles/basic-styles.js: { minified: true }
@@ -123,10 +124,10 @@ ckeditor5.basic:
 
 ckeditor5.specialCharacters:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/special-characters/special-characters.js: { minified: true }
@@ -136,10 +137,10 @@ ckeditor5.specialCharacters:
 
 ckeditor5.blockquote:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/block-quote/block-quote.js: { minified: true }
@@ -149,10 +150,10 @@ ckeditor5.blockquote:
 
 ckeditor5.image:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/image/image.js: { minified: true }
@@ -162,10 +163,10 @@ ckeditor5.image:
 
 ckeditor5.link:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/link/link.js: { minified: true }
@@ -175,10 +176,10 @@ ckeditor5.link:
 
 ckeditor5.list:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/list/list.js: { minified: true }
@@ -188,10 +189,10 @@ ckeditor5.list:
 
 ckeditor5.horizontalLine:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/horizontal-line/horizontal-line.js: { minified: true }
@@ -201,10 +202,10 @@ ckeditor5.horizontalLine:
 
 ckeditor5.htmlSupport:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/html-support/html-support.js: { minified: true }
@@ -214,10 +215,10 @@ ckeditor5.htmlSupport:
 
 ckeditor5.alignment:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/alignment/alignment.js: { minified: true }
@@ -227,10 +228,10 @@ ckeditor5.alignment:
 
 ckeditor5.removeFormat:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/remove-format/remove-format.js: { minified: true }
@@ -240,10 +241,10 @@ ckeditor5.removeFormat:
 
 ckeditor5.pasteFromOffice:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/paste-from-office/paste-from-office.js: { minified: true }
@@ -252,10 +253,10 @@ ckeditor5.pasteFromOffice:
 
 ckeditor5.indent:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/indent/indent.js: { minified: true }
@@ -265,10 +266,10 @@ ckeditor5.indent:
 
 ckeditor5.sourceEditing:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/source-editing/source-editing.js: { minified: true }
@@ -278,10 +279,10 @@ ckeditor5.sourceEditing:
 
 ckeditor5.table:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/table/table.js: { minified: true }
@@ -291,10 +292,10 @@ ckeditor5.table:
 
 ckeditor5.language:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/language/language.js: { minified: true }
@@ -304,10 +305,10 @@ ckeditor5.language:
 
 ckeditor5.codeBlock:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/code-block/code-block.js: { minified: true }
@@ -317,10 +318,10 @@ ckeditor5.codeBlock:
 
 ckeditor5.style:
   remote: https://github.com/ckeditor/ckeditor5
-  version: "35.3.2"
+  version: "35.4.0"
   license:
     name: GNU-GPL-2.0-or-later
-    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.3.2/LICENSE.md
+    url: https://raw.githubusercontent.com/ckeditor/ckeditor5/v35.4.0/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/ckeditor5/style/style.js: { minified: true }
@@ -403,6 +404,8 @@ drupal.ajax:
     - core/once
     - core/jquery.once.bc
     - core/tabbable
+    - core/loadjs
+    - core/es6-promise
 
 drupal.announce:
   version: VERSION
@@ -428,7 +431,7 @@ drupal.autocomplete:
     misc/autocomplete.js: { weight: -1 }
     # The remaining JavaScript assets previously came from core/jquery.ui, a
     # deprecated library.
-    # All weights are based on on the requirements defined within each file.
+    # All weights are based on the requirements defined within each file.
     # @todo replace with solution in https://drupal.org/node/3076171
     assets/vendor/jquery.ui/ui/widgets/autocomplete-min.js: { weight: -11.7, minified: true }
     assets/vendor/jquery.ui/ui/labels-min.js: { weight: -11.7, minified: true }
@@ -540,7 +543,7 @@ drupal.dialog:
     misc/dialog/dialog.jquery-ui.js: {}
     # The remaining JavaScript assets previously came from core/jquery.ui, a
     # deprecated library.
-    # All weights are based on on the requirements defined within each file.
+    # All weights are based on the requirements defined within each file.
     # @todo replace with solution in https://drupal.org/node/2158943
     assets/vendor/jquery.ui/ui/widgets/dialog-min.js: { weight: -11.4, minified: true }
     assets/vendor/jquery.ui/ui/widgets/button-min.js: { weight: -11.5, minified: true }
@@ -809,10 +812,10 @@ es6-promise:
 
 jquery:
   remote: https://github.com/jquery/jquery
-  version: "3.6.0"
+  version: "3.6.3"
   license:
     name: MIT
-    url: https://raw.githubusercontent.com/jquery/jquery/3.6.0/LICENSE.txt
+    url: https://raw.githubusercontent.com/jquery/jquery/3.6.3/LICENSE.txt
     gpl-compatible: true
   js:
     assets/vendor/jquery/jquery.min.js: { minified: true, weight: -20 }
@@ -842,6 +845,7 @@ jquery.farbtastic:
       assets/vendor/farbtastic/farbtastic.css: {}
   dependencies:
     - core/jquery
+  deprecated: The %library_id% asset library is deprecated in Drupal 9.5.0 and will be removed in Drupal 10.0.0. There is no replacement. See https://www.drupal.org/node/3306232
 
 jquery.form:
   remote: https://github.com/jquery-form/form
@@ -883,16 +887,27 @@ jquery.joyride:
     gpl-compatible: true
   js:
     assets/vendor/jquery-joyride/jquery.joyride-2.1.js: { }
-  deprecated: The "%library_id%" asset library is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use the core/shepherd library instead. See https://www.drupal.org/node/3195234
+  deprecated: The "%library_id%" asset library is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/3195234.
   dependencies:
     - core/jquery
 
 shepherd:
   remote: https://github.com/shipshapecode/shepherd
-  version: "9.1.0"
+  version: "9.1.1"
   license:
     name: MIT
-    url: https://raw.githubusercontent.com/shipshapecode/shepherd/v9.1.0/LICENSE
+    url: https://raw.githubusercontent.com/shipshapecode/shepherd/v9.1.1/LICENSE
+    gpl-compatible: true
+  js:
+    assets/vendor/shepherd/shepherd.min.js: { minified: true }
+  deprecated: The %library_id% asset library is deprecated in Drupal 9.5.0 and will be removed in Drupal 10.0.0.
+
+internal.shepherd:
+  remote: https://github.com/shipshapecode/shepherd
+  version: "9.1.1"
+  license:
+    name: MIT
+    url: https://raw.githubusercontent.com/shipshapecode/shepherd/v9.1.1/LICENSE
     gpl-compatible: true
   js:
     assets/vendor/shepherd/shepherd.min.js: { minified: true }
@@ -1067,11 +1082,9 @@ jquery.ui.mouse:
   deprecated: *jquery_ui_unused_deprecated
 
 drupal.jquery.position:
-  # For most positioning needs, the core/popperjs library should be used. This
-  # is a modified version of jQuery UI position for that does not require any
-  # jQuery UI assets, only jQuery. It is provided by core for use with
-  # pre-existing libraries that expect the jQuery UI position API. Popperjs is
-  # recommended for any new uses.
+  # This is a modified version of jQuery UI position for that does not require
+  # any jQuery UI assets, only jQuery. It is provided by core for use with
+  # pre-existing libraries that expect the jQuery UI position API.
   version: VERSION
   js:
     misc/position.js: {}
@@ -1156,10 +1169,10 @@ picturefill:
     assets/vendor/picturefill/picturefill.min.js: { weight: -10, minified: true }
 
 popperjs:
-  version: "2.11.5"
+  version: "2.11.6"
   license:
     name: MIT
-    url: https://raw.githubusercontent.com/popperjs/popper-core/v2.11.5/LICENSE.md
+    url: https://raw.githubusercontent.com/popperjs/popper-core/v2.11.6/LICENSE.md
     gpl-compatible: true
   js:
     assets/vendor/popperjs/popper.min.js: { minified: true }
@@ -1167,6 +1180,8 @@ popperjs:
     - core/drupal.array.find
     - core/es6-promise
     - core/drupal.object.assign
+  deprecated: The "%library_id%" asset library is deprecated in Drupal 9.5.0 and will be removed in Drupal 10.0.0. There is no replacement. See https://www.drupal.org/node/3307518
+
 
 sortable:
   remote: https://github.com/SortableJS/Sortable
@@ -1180,10 +1195,10 @@ sortable:
 
 tabbable:
   remote: https://github.com/focus-trap/tabbable
-  version: "5.3.2"
+  version: "5.3.3"
   license:
     name: MIT
-    url: https://raw.githubusercontent.com/focus-trap/tabbable/v5.3.2/LICENSE
+    url: https://raw.githubusercontent.com/focus-trap/tabbable/v5.3.3/LICENSE
     gpl-compatible: true
   js:
     assets/vendor/tabbable/index.umd.min.js: { weight: -1, minified: true }
@@ -1201,10 +1216,10 @@ tabbable.jquery.shim:
 
 underscore:
   remote: https://github.com/jashkenas/underscore
-  version: "1.13.3"
+  version: "1.13.6"
   license:
     name: MIT
-    url: https://raw.githubusercontent.com/jashkenas/underscore/1.13.3/LICENSE
+    url: https://raw.githubusercontent.com/jashkenas/underscore/1.13.6/LICENSE
     gpl-compatible: true
   js:
     assets/vendor/underscore/underscore-min.js: { weight: -20, minified: true }
@@ -1218,10 +1233,10 @@ internal.underscore:
   #  - https://www.drupal.org/project/drupal/issues/3204011
   #  - https://www.drupal.org/project/drupal/issues/3204015
   remote: https://github.com/jashkenas/underscore
-  version: "1.13.3"
+  version: "1.13.6"
   license:
     name: MIT
-    url: https://raw.githubusercontent.com/jashkenas/underscore/1.13.3/LICENSE
+    url: https://raw.githubusercontent.com/jashkenas/underscore/1.13.6/LICENSE
     gpl-compatible: true
   js:
     assets/vendor/underscore/underscore-min.js: { weight: -20, minified: true }
diff --git a/web/core/core.services.yml b/web/core/core.services.yml
index 951613244..e3c1e094a 100644
--- a/web/core/core.services.yml
+++ b/web/core/core.services.yml
@@ -27,6 +27,7 @@ parameters:
       max-age: 0
       contexts: ['session', 'user']
       tags: []
+    debug: false
   factory.keyvalue:
     default: keyvalue.database
   http.response.debug_cacheability_headers: false
@@ -372,6 +373,8 @@ services:
   context.repository:
     class: Drupal\Core\Plugin\Context\LazyContextRepository
     arguments: ['@service_container']
+  Drupal\Component\DependencyInjection\ReverseContainer:
+    arguments: [ '@service_container' ]
   cron:
     class: Drupal\Core\Cron
     arguments: ['@module_handler', '@lock', '@queue', '@state', '@account_switcher', '@logger.channel.cron', '@plugin.manager.queue_worker', '@datetime.time']
@@ -726,8 +729,8 @@ services:
     tags:
       - { name: persist }
   current_route_match:
-     class: Drupal\Core\Routing\CurrentRouteMatch
-     arguments: ['@request_stack']
+    class: Drupal\Core\Routing\CurrentRouteMatch
+    arguments: ['@request_stack']
   event_dispatcher:
     class: Drupal\Component\EventDispatcher\ContainerAwareEventDispatcher
     arguments: ['@service_container']
@@ -811,10 +814,10 @@ services:
     calls:
       - [setContainer, ['@service_container']]
   http_middleware.cors:
-     class: Asm89\Stack\Cors
-     arguments: ['%cors.config%']
-     tags:
-       - { name: http_middleware, priority: 250 }
+    class: Asm89\Stack\Cors
+    arguments: ['%cors.config%']
+    tags:
+      - { name: http_middleware, priority: 250 }
   psr7.http_foundation_factory:
     class: Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory
   psr17.server_request_factory:
@@ -983,12 +986,12 @@ services:
     class: Drupal\Core\Path\PathValidator
     arguments: ['@router', '@router.no_access_checks', '@current_user', '@path_processor_manager']
 
-# The argument to the hashing service defined in services.yml, to the
-# constructor of PhpassHashedPassword is the log2 number of iterations for
-# password stretching.
-# @todo increase by 1 every Drupal version in order to counteract increases in
-# the speed and power of computers available to crack the hashes. The current
-# password hashing method was introduced in Drupal 7 with a log2 count of 15.
+  # The argument to the hashing service defined in services.yml, to the
+  # constructor of PhpassHashedPassword is the log2 number of iterations for
+  # password stretching.
+  # @todo increase by 1 every Drupal version in order to counteract increases in
+  # the speed and power of computers available to crack the hashes. The current
+  # password hashing method was introduced in Drupal 7 with a log2 count of 15.
   password:
     class: Drupal\Core\Password\PhpassHashedPassword
     arguments: [16]
@@ -1337,11 +1340,7 @@ services:
     class: Drupal\Core\EventSubscriber\Fast404ExceptionHtmlSubscriber
     tags:
       - { name: event_subscriber }
-    arguments: ['@config.factory', '@http_kernel']
-  exception.test_site:
-    class: Drupal\Core\EventSubscriber\ExceptionTestSiteSubscriber
-    tags:
-      - { name: event_subscriber }
+    arguments: ['@config.factory', '@cache_tags.invalidator']
   exception.enforced_form_response:
     class: Drupal\Core\EventSubscriber\EnforcedFormResponseSubscriber
     tags:
@@ -1458,7 +1457,8 @@ services:
       - [setStandalone, ['\Laminas\Feed\Writer\StandaloneExtensionManager']]
     arguments: ['feed.writer.']
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Use \Laminas\Feed\Writer\StandaloneExtensionManager or create your own service. See https://www.drupal.org/node/3258440
-# Laminas Feed reader plugins. Plugin instances should not be shared.
+
+  # Laminas Feed reader plugins. Plugin instances should not be shared.
   feed.reader.dublincoreentry:
     class: Laminas\Feed\Reader\Extension\DublinCore\Entry
     shared: false
@@ -1499,7 +1499,8 @@ services:
     class: Laminas\Feed\Reader\Extension\Podcast\Feed
     shared: false
     deprecated: The "%service_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. You should use \Drupal::service('feed.bridge.reader')->get('Podcast\Feed') instead. See https://www.drupal.org/node/2979042
-# Laminas Feed writer plugins. Plugins should be set as prototype scope.
+
+  # Laminas Feed writer plugins. Plugins should be set as prototype scope.
   feed.writer.atomrendererfeed:
     class: Laminas\Feed\Writer\Extension\Atom\Renderer\Feed
     shared: false
@@ -1554,7 +1555,7 @@ services:
     arguments: ['%app.root%', '@theme_handler', '@cache.bootstrap', '@module_handler']
   theme.registry:
     class: Drupal\Core\Theme\Registry
-    arguments: ['%app.root%', '@cache.default', '@lock', '@module_handler', '@theme_handler', '@theme.initialization', null, '@cache.bootstrap', '@extension.list.module']
+    arguments: ['%app.root%', '@cache.default', '@lock', '@module_handler', '@theme_handler', '@theme.initialization', '@cache.bootstrap', '@extension.list.module']
     tags:
       - { name: needs_destruction }
     calls:
@@ -1678,12 +1679,18 @@ services:
     arguments: ['@renderer', '@url_generator', '@theme.manager', '@date.formatter', '@file_url_generator']
     tags:
       - { name: twig.extension, priority: 100 }
-  # @todo Figure out what to do about debugging functions.
-  # @see https://www.drupal.org/node/1804998
   twig.extension.debug:
     class: Twig\Extension\DebugExtension
     tags:
-      - { name: twig.extension }
+      - { name: twig.extension, priority: 50 }
+  twig.extension.varDumper:
+    class: Drupal\Core\Template\DebugExtension
+    tags:
+      # This extension is loaded after the Twig Debug Extension because for Twig
+      # Extensions, last extension loaded takes precedent. This allows this
+      # extension to override the default Twig Debug Extension conditionally
+      # when Symfony VarDumper is available.
+      - { name: twig.extension, priority: 25 }
   twig.loader:
     class: Twig\Loader\ChainLoader
     public: false
diff --git a/web/core/includes/common.inc b/web/core/includes/common.inc
index 2bee0e554..b61593949 100644
--- a/web/core/includes/common.inc
+++ b/web/core/includes/common.inc
@@ -383,7 +383,7 @@ function drupal_attach_tabledrag(&$element, array $options) {
  * @param $element
  *   The element to be rendered.
  *
- * @return
+ * @return \Drupal\Component\Render\MarkupInterface|null
  *   The rendered element.
  *
  * @deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use
@@ -429,7 +429,7 @@ function render(&$element) {
  * @param $element
  *   The element to be hidden.
  *
- * @return
+ * @return array
  *   The element.
  *
  * @see \Drupal\Core\Render\RendererInterface
@@ -459,7 +459,7 @@ function hide(&$element) {
  * @param $element
  *   The element to be shown.
  *
- * @return
+ * @return array
  *   The element.
  *
  * @see \Drupal\Core\Render\RendererInterface
@@ -664,7 +664,7 @@ function drupal_get_updaters() {
 /**
  * Assembles the Drupal FileTransfer registry.
  *
- * @return
+ * @return array
  *   The Drupal FileTransfer class registry.
  *
  * @see \Drupal\Core\FileTransfer\FileTransfer
diff --git a/web/core/includes/errors.inc b/web/core/includes/errors.inc
index a4bffb2f3..4bf4fade1 100644
--- a/web/core/includes/errors.inc
+++ b/web/core/includes/errors.inc
@@ -113,7 +113,7 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line) {
  * @param $error
  *   Optional error to examine for ERROR_REPORTING_DISPLAY_SOME.
  *
- * @return
+ * @return bool
  *   TRUE if an error should be displayed.
  */
 function error_displayable($error = NULL) {
diff --git a/web/core/includes/file.inc b/web/core/includes/file.inc
index 29bbae45f..32543a4c1 100644
--- a/web/core/includes/file.inc
+++ b/web/core/includes/file.inc
@@ -203,7 +203,7 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
  * @param $filename
  *   String with the filename to be unmunged.
  *
- * @return
+ * @return string
  *   An unmunged filename string.
  *
  * @deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use
diff --git a/web/core/includes/form.inc b/web/core/includes/form.inc
index 5959b598e..4f353d008 100644
--- a/web/core/includes/form.inc
+++ b/web/core/includes/form.inc
@@ -156,7 +156,7 @@ function form_select_options($element, $choices = NULL) {
  * @param $key
  *   The key to look for.
  *
- * @return
+ * @return array|bool
  *   An array of indexes that match the given $key. Array will be
  *   empty if no elements were found. FALSE if optgroups were found.
  */
@@ -1011,7 +1011,7 @@ function _batch_populate_queue(&$batch, $set_id) {
  * @param $batch_set
  *   The batch set.
  *
- * @return
+ * @return \Drupal\Core\Queue\QueueInterface|null
  *   The queue object.
  */
 function _batch_queue($batch_set) {
diff --git a/web/core/includes/install.core.inc b/web/core/includes/install.core.inc
index 4375abdeb..6832eae70 100644
--- a/web/core/includes/install.core.inc
+++ b/web/core/includes/install.core.inc
@@ -246,7 +246,7 @@ function install_state_defaults() {
     // An array of available installation profiles.
     'profiles' => [],
     // The name of the theme to use during installation.
-    'theme' => 'seven',
+    'theme' => 'claro',
     // The server URL where the interface translation files can be downloaded.
     // Tokens in the pattern will be replaced by appropriate values for the
     // required translation file.
@@ -388,7 +388,7 @@ function install_begin_request($class_loader, &$install_state) {
   $install_state['database_verified'] = install_verify_database_settings($site_path);
   // A valid settings.php has database settings and a hash_salt value. Other
   // settings will be checked by system_requirements().
-  $install_state['settings_verified'] = $install_state['database_verified'] && (bool) Settings::get('hash_salt', FALSE);
+  $install_state['settings_verified'] = $install_state['config_verified'] && $install_state['database_verified'] && (bool) Settings::get('hash_salt', FALSE);
 
   if ($install_state['settings_verified']) {
     try {
@@ -551,7 +551,7 @@ function install_begin_request($class_loader, &$install_state) {
  *   (optional) A callback to allow command line processes to update a progress
  *   bar. The callback is passed the $install_state variable.
  *
- * @return
+ * @return array|null
  *   HTML output from the last completed task.
  */
 function install_run_tasks(&$install_state, callable $callback = NULL) {
@@ -608,7 +608,7 @@ function install_run_tasks(&$install_state, callable $callback = NULL) {
  *   An array of information about the current installation state. This is
  *   passed in by reference so that it can be modified by the task.
  *
- * @return
+ * @return array|null
  *   The output of the task function, if there is any.
  */
 function install_run_task($task, &$install_state) {
@@ -711,7 +711,7 @@ function install_run_task($task, &$install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   A list of tasks to be performed, with associated metadata.
  */
 function install_tasks_to_perform($install_state) {
@@ -747,7 +747,7 @@ function install_tasks_to_perform($install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   A list of tasks, with associated metadata as returned by
  *   hook_install_tasks().
  */
@@ -908,7 +908,7 @@ function install_tasks($install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   A list of tasks, with keys equal to the machine-readable task name and
  *   values equal to the name that should be displayed.
  *
@@ -981,7 +981,7 @@ function install_get_form($form_id, array &$install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return string
  *   The URL to redirect to.
  *
  * @see install_full_redirect_url()
@@ -996,7 +996,7 @@ function install_redirect_url($install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return string
  *   The complete URL to redirect to.
  *
  * @see install_redirect_url()
@@ -1074,7 +1074,7 @@ function install_display_output($output, $install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   A themed status report, or an exception if there are requirement errors.
  */
 function install_verify_requirements(&$install_state) {
@@ -1120,7 +1120,7 @@ function install_base_system(&$install_state) {
 /**
  * Verifies and returns the last installation task that was completed.
  *
- * @return
+ * @return null|string
  *   The last completed task, if there is one. An exception is thrown if Drupal
  *   is already installed.
  */
@@ -1224,7 +1224,7 @@ function install_database_errors($database, $settings_file) {
  *   profile will be added here, if it was not already selected previously, as
  *   will a list of all available profiles.
  *
- * @return
+ * @return array|null
  *   For interactive installations, a form allowing the profile to be selected,
  *   if the user has a choice that needs to be made. Otherwise, an exception is
  *   thrown if a profile cannot be chosen automatically.
@@ -1312,7 +1312,7 @@ function _install_select_profile(&$install_state) {
 /**
  * Finds all .po files that are useful to the installer.
  *
- * @return
+ * @return array
  *   An associative array of file URIs keyed by language code. URIs as
  *   returned by FileSystemInterface::scanDirectory().
  *
@@ -1343,7 +1343,7 @@ function install_find_translations() {
  *   langcode will be added here, if it was not already selected previously, as
  *   will a list of all available languages.
  *
- * @return
+ * @return array|null
  *   For interactive installations, a form or other page output allowing the
  *   language to be selected or providing information about language selection,
  *   if a language has not been chosen. Otherwise, an exception is thrown if a
@@ -1560,7 +1560,7 @@ function install_bootstrap_full() {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   The batch definition.
  */
 function install_profile_modules(&$install_state) {
@@ -1669,7 +1669,7 @@ function install_install_profile(&$install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   The batch definition, if there are language files to download.
  */
 function install_download_additional_translations_operations(&$install_state) {
@@ -1720,7 +1720,7 @@ function install_download_additional_translations_operations(&$install_state) {
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array|null
  *   The batch definition, if there are language files to import.
  */
 function install_import_translations(&$install_state) {
@@ -1841,7 +1841,7 @@ function install_finish_translations(&$install_state) {
   }
 
   // Creates configuration translations.
-  $batches[] = locale_config_batch_update_components([], array_keys($languages));
+  $batches[] = locale_config_batch_update_components([], array_keys($languages), [], TRUE);
   return $batches;
 }
 
@@ -1850,9 +1850,6 @@ function install_finish_translations(&$install_state) {
  *
  * @param $install_state
  *   An array of information about the current installation state.
- *
- * @return
- *   A message informing the user that the installation is complete.
  */
 function install_finished(&$install_state) {
   $profile = $install_state['parameters']['profile'];
@@ -2112,9 +2109,9 @@ function install_check_requirements($install_state) {
         'value' => $default_file_info['description_default'],
         'severity' => REQUIREMENT_ERROR,
         'description' => t('The @drupal installer requires that the %default-file file must not be deleted or modified from the original download.', [
-            '@drupal' => drupal_install_profile_distribution_name(),
-            '%default-file' => $default_file,
-          ]),
+          '@drupal' => drupal_install_profile_distribution_name(),
+          '%default-file' => $default_file,
+        ]),
       ];
     }
     // Otherwise, if $file does not exist yet, we can try to copy
@@ -2171,11 +2168,11 @@ function install_check_requirements($install_state) {
         'value' => t('The %file does not exist.', ['%file' => $default_file_info['title']]),
         'severity' => REQUIREMENT_ERROR,
         'description' => t('The @drupal installer requires that you create a %file as part of the installation process. Copy the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>.', [
-            '@drupal' => drupal_install_profile_distribution_name(),
-            '%file' => $file,
-            '%default_file' => $default_file,
-            ':install_txt' => base_path() . 'core/INSTALL.txt',
-          ]),
+          '@drupal' => drupal_install_profile_distribution_name(),
+          '%file' => $file,
+          '%default_file' => $default_file,
+          ':install_txt' => base_path() . 'core/INSTALL.txt',
+        ]),
       ];
     }
     else {
@@ -2190,10 +2187,10 @@ function install_check_requirements($install_state) {
           'value' => t('The %file is not readable.', ['%file' => $default_file_info['title']]),
           'severity' => REQUIREMENT_ERROR,
           'description' => t('@drupal requires read permissions to %file at all times. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [
-              '@drupal' => drupal_install_profile_distribution_name(),
-              '%file' => $file,
-              ':handbook_url' => 'https://www.drupal.org/server-permissions',
-            ]),
+            '@drupal' => drupal_install_profile_distribution_name(),
+            '%file' => $file,
+            ':handbook_url' => 'https://www.drupal.org/server-permissions',
+          ]),
         ];
       }
       // If the $file is not writable, throw an error.
@@ -2203,10 +2200,10 @@ function install_check_requirements($install_state) {
           'value' => t('The %file is not writable.', ['%file' => $default_file_info['title']]),
           'severity' => REQUIREMENT_ERROR,
           'description' => t('The @drupal installer requires write permissions to %file during the installation process. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [
-              '@drupal' => drupal_install_profile_distribution_name(),
-              '%file' => $file,
-              ':handbook_url' => 'https://www.drupal.org/server-permissions',
-            ]),
+            '@drupal' => drupal_install_profile_distribution_name(),
+            '%file' => $file,
+            ':handbook_url' => 'https://www.drupal.org/server-permissions',
+          ]),
         ];
       }
       else {
@@ -2221,12 +2218,12 @@ function install_check_requirements($install_state) {
           'value' => t('The @file is owned by the web server.', ['@file' => $default_file_info['title']]),
           'severity' => REQUIREMENT_ERROR,
           'description' => t('The @drupal installer failed to create a %file file with proper file ownership. Log on to your web server, remove the existing %file file, and create a new one by copying the %default_file file to %file. More details about installing Drupal are available in <a href=":install_txt">INSTALL.txt</a>. The <a href=":handbook_url">webhosting issues</a> documentation section offers help on this and other topics.', [
-              '@drupal' => drupal_install_profile_distribution_name(),
-              '%file' => $file,
-              '%default_file' => $default_file,
-              ':install_txt' => base_path() . 'core/INSTALL.txt',
-              ':handbook_url' => 'https://www.drupal.org/server-permissions',
-            ]),
+            '@drupal' => drupal_install_profile_distribution_name(),
+            '%file' => $file,
+            '%default_file' => $default_file,
+            ':install_txt' => base_path() . 'core/INSTALL.txt',
+            ':handbook_url' => 'https://www.drupal.org/server-permissions',
+          ]),
         ];
       }
     }
@@ -2262,7 +2259,7 @@ function install_check_requirements($install_state) {
  *   An array of requirements, in the same format as is returned by
  *   hook_requirements().
  *
- * @return
+ * @return array|null
  *   A themed status report, or an exception if there are requirement errors.
  *   If there are only requirement warnings, a themed status report is shown
  *   initially, but the user is allowed to bypass it by providing 'continue=1'
@@ -2356,7 +2353,8 @@ function install_config_import_batch() {
     \Drupal::service('module_installer'),
     \Drupal::service('theme_handler'),
     \Drupal::service('string_translation'),
-    \Drupal::service('extension.list.module')
+    \Drupal::service('extension.list.module'),
+    \Drupal::service('extension.list.theme')
   );
 
   try {
@@ -2428,7 +2426,8 @@ function install_config_revert_install_changes() {
       \Drupal::service('module_installer'),
       \Drupal::service('theme_handler'),
       \Drupal::service('string_translation'),
-      \Drupal::service('extension.list.module')
+      \Drupal::service('extension.list.module'),
+      \Drupal::service('extension.list.theme')
     );
     try {
       $config_importer->import();
diff --git a/web/core/includes/install.inc b/web/core/includes/install.inc
index adc4a787e..4053d3c5a 100644
--- a/web/core/includes/install.inc
+++ b/web/core/includes/install.inc
@@ -93,7 +93,7 @@ function drupal_load_updates() {
 /**
  * Loads the installation profile, extracting its defined distribution name.
  *
- * @return
+ * @return string
  *   The distribution name defined in the profile's .info.yml file. Defaults to
  *   "Drupal" if none is explicitly provided by the installation profile.
  *
@@ -145,7 +145,7 @@ function drupal_install_profile_distribution_version() {
 /**
  * Detects all supported databases that are compiled into PHP.
  *
- * @return
+ * @return array
  *   An array of database types compiled into PHP.
  */
 function drupal_detect_database_types() {
@@ -529,7 +529,7 @@ function _drupal_rewrite_settings_dump_one(\stdClass $variable, $prefix = '', $s
  * @param $install_state
  *   An array of information about the current installation state.
  *
- * @return
+ * @return array
  *   The list of modules to install.
  */
 function drupal_verify_profile($install_state) {
@@ -633,7 +633,7 @@ function drupal_install_system($install_state) {
   // its dependencies, and here the dependencies will be installed as well.
   if ($provider !== 'core') {
     $autoload = $connection->getConnectionOptions()['autoload'] ?? '';
-    if (($pos = strpos($autoload, 'src/Driver/Database/')) !== FALSE) {
+    if (str_contains($autoload, 'src/Driver/Database/')) {
       $kernel->getContainer()->get('module_installer')->install([$provider], TRUE);
     }
   }
@@ -663,7 +663,7 @@ function drupal_install_system($install_state) {
  *   (optional) Determines whether to attempt fixing the permissions according
  *   to the provided $mask. Defaults to TRUE.
  *
- * @return
+ * @return bool
  *   TRUE on success or FALSE on failure. A message is set for the latter.
  */
 function drupal_verify_install_file($file, $mask = NULL, $type = 'file', $autofix = TRUE) {
@@ -752,7 +752,7 @@ function drupal_verify_install_file($file, $mask = NULL, $type = 'file', $autofi
  * @param $message
  *   (optional) Whether to output messages. Defaults to TRUE.
  *
- * @return
+ * @return bool
  *   TRUE/FALSE whether or not the directory was successfully created.
  */
 function drupal_install_mkdir($file, $mask, $message = TRUE) {
@@ -803,7 +803,7 @@ function drupal_install_mkdir($file, $mask, $message = TRUE) {
  * @param $message
  *   (optional) Whether to output messages. Defaults to TRUE.
  *
- * @return
+ * @return bool
  *   TRUE/FALSE whether or not we were able to fix the file's permissions.
  */
 function drupal_install_fix_file($file, $mask, $message = TRUE) {
@@ -906,7 +906,7 @@ function install_goto($path) {
  * @param $query
  *   (optional) An array of query parameters to merge in to the existing ones.
  *
- * @return
+ * @return string
  *   The URL of the current script, with query parameters modified by the
  *   passed-in $query. The URL is not sanitized, so it still needs to be run
  *   through \Drupal\Component\Utility\UrlHelper::filterBadProtocol() if it will be
@@ -935,7 +935,7 @@ function drupal_current_script_url($query = []) {
  *   The severity of the requirements problem, as returned by
  *   drupal_requirements_severity().
  *
- * @return
+ * @return string
  *   A URL for attempting to proceed to the next step of the script. The URL is
  *   not sanitized, so it still needs to be run through
  *   \Drupal\Component\Utility\UrlHelper::filterBadProtocol() if it will be used
@@ -1010,7 +1010,7 @@ function drupal_check_profile($profile) {
  *   An array of requirements, in the same format as is returned by
  *   hook_requirements().
  *
- * @return
+ * @return int
  *   The highest severity in the array.
  */
 function drupal_requirements_severity(&$requirements) {
@@ -1029,7 +1029,7 @@ function drupal_requirements_severity(&$requirements) {
  * @param $module
  *   Machine name of module to check.
  *
- * @return
+ * @return bool
  *   TRUE or FALSE, depending on whether the requirements are met.
  */
 function drupal_check_module($module) {
@@ -1107,7 +1107,7 @@ function drupal_check_module($module) {
  * @param $langcode
  *   Language code (if any).
  *
- * @return
+ * @return array
  *   The info array.
  */
 function install_profile_info($profile, $langcode = 'en') {
diff --git a/web/core/includes/module.inc b/web/core/includes/module.inc
index 5bb5497b4..55e73b485 100644
--- a/web/core/includes/module.inc
+++ b/web/core/includes/module.inc
@@ -13,7 +13,7 @@ use Drupal\Core\Extension\ExtensionDiscovery;
  * @param $module
  *   The name of the module (without the .module extension).
  *
- * @return
+ * @return bool|string
  *   The name of the module's install file, if successful; FALSE otherwise.
  *
  * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Use
@@ -63,7 +63,7 @@ function module_load_install($module) {
  *   (optional) The base file name (without the $type extension). If omitted,
  *   $module is used; i.e., resulting in "$module.$type" by default.
  *
- * @return string|false
+ * @return bool|string
  *   The name of the included file, if successful; FALSE otherwise.
  *
  * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0.
diff --git a/web/core/includes/theme.inc b/web/core/includes/theme.inc
index 14bdbc960..1af98c675 100644
--- a/web/core/includes/theme.inc
+++ b/web/core/includes/theme.inc
@@ -84,7 +84,7 @@ const RESPONSIVE_PRIORITY_LOW = 'priority-low';
  *   ArrayObject which allows it to be accessed with array syntax and isset(),
  *   and should be more lightweight than the full registry. Defaults to TRUE.
  *
- * @return
+ * @return array|\Drupal\Core\Utility\ThemeRegistry
  *   The complete theme registry array, or an instance of the
  *   Drupal\Core\Utility\ThemeRegistry class.
  */
@@ -307,7 +307,7 @@ function drupal_find_theme_templates($cache, $extension, $path) {
  * @param $theme
  *   The name of a given theme; defaults to the current theme.
  *
- * @return
+ * @return mixed
  *   The value of the requested setting, NULL if the setting does not exist.
  */
 function theme_get_setting($setting_name, $theme = NULL) {
@@ -476,7 +476,7 @@ function theme_render_and_autoescape($arg) {
  * @param \Drupal\Core\Config\Config $config
  *   The configuration object to update.
  *
- * @return
+ * @return \Drupal\Core\Config\Config
  *   The Config object with updated data.
  */
 function theme_settings_convert_to_config(array $theme_settings, Config $config) {
@@ -1436,7 +1436,7 @@ function template_preprocess_page(&$variables) {
     $variables['db_is_active'] = FALSE;
   }
 
-  if ($node = \Drupal::routeMatch()->getParameter('node')) {
+  if (($node = \Drupal::routeMatch()->getParameter('node')) || ($node = \Drupal::routeMatch()->getParameter('node_preview'))) {
     $variables['node'] = $node;
   }
 }
@@ -1459,7 +1459,7 @@ function template_preprocess_page(&$variables) {
  *   of '__' is appropriate for theme hook suggestions. '-' is appropriate for
  *   extra classes.
  *
- * @return
+ * @return array
  *   An array of suggestions, suitable for adding to
  *   hook_theme_suggestions_HOOK_alter() or to $variables['attributes']['class']
  *   if the suggestions represent extra CSS classes.
diff --git a/web/core/includes/theme.maintenance.inc b/web/core/includes/theme.maintenance.inc
index 873738f88..fe7b6c146 100644
--- a/web/core/includes/theme.maintenance.inc
+++ b/web/core/includes/theme.maintenance.inc
@@ -14,7 +14,7 @@ use Drupal\Core\Site\Settings;
  * Used for site installs, updates and when the site is in maintenance mode.
  * It also applies when the database is unavailable or bootstrap was not
  * complete. Seven is always used for the initial install and update
- * operations. In other cases, Bartik is used, but this can be overridden by
+ * operations. In other cases, Claro is used, but this can be overridden by
  * setting a "maintenance_theme" key in the $settings variable in settings.php.
  */
 function _drupal_maintenance_theme() {
@@ -34,7 +34,7 @@ function _drupal_maintenance_theme() {
       $custom_theme = $GLOBALS['install_state']['theme'];
     }
     else {
-      $custom_theme = Settings::get('maintenance_theme', 'seven');
+      $custom_theme = Settings::get('maintenance_theme', 'claro');
     }
   }
   else {
@@ -54,8 +54,8 @@ function _drupal_maintenance_theme() {
     }
     if (!$custom_theme) {
       // We have been unable to identify the configured theme, so fall back to
-      // a safe default. Bartik is reasonably user friendly and fairly generic.
-      $custom_theme = 'bartik';
+      // a safe default. Claro is reasonably user friendly and fairly generic.
+      $custom_theme = 'claro';
     }
   }
 
diff --git a/web/core/includes/update.inc b/web/core/includes/update.inc
index 7a51a2625..5e499374a 100644
--- a/web/core/includes/update.inc
+++ b/web/core/includes/update.inc
@@ -335,7 +335,7 @@ function update_invoke_post_update($function, &$context) {
 /**
  * Returns a list of all the pending database updates.
  *
- * @return
+ * @return array
  *   An associative array keyed by module name which contains all information
  *   about database updates that need to be run, and any updates that are not
  *   going to proceed due to missing requirements. The system module will
@@ -453,7 +453,7 @@ function update_get_update_list() {
  *   and whose values contain the number of the first requested update for that
  *   module.
  *
- * @return
+ * @return array
  *   An array whose keys are the names of all update functions within the
  *   provided modules that would need to be run in order to fulfill the
  *   request, arranged in the order in which the update functions should be
@@ -519,7 +519,7 @@ function update_resolve_dependencies($starting_updates) {
  *   An array whose keys contain the names of modules and whose values contain
  *   the number of the first requested update for that module.
  *
- * @return
+ * @return array
  *   An array containing all the update functions that should be run for each
  *   module, including the provided starting update and all subsequent updates
  *   that are available. The keys of the array contain the module names, and
@@ -577,7 +577,7 @@ function update_get_update_function_list($starting_updates) {
  *   An organized array of update functions, in the format returned by
  *   update_get_update_function_list().
  *
- * @return
+ * @return array
  *   A multidimensional array representing the dependency graph, suitable for
  *   passing in to Drupal\Component\Graph\Graph::searchAndSort(), but with extra
  *   information about each update function also included. Each array key
@@ -645,7 +645,7 @@ function update_build_dependency_graph($update_functions) {
  *   update_get_update_function_list(). This should represent all module
  *   updates that are requested to run at the time this function is called.
  *
- * @return
+ * @return bool
  *   TRUE if the provided module update is not installed or is not in the
  *   provided list of updates to run; FALSE otherwise.
  */
@@ -661,7 +661,7 @@ function update_is_missing($module, $number, $update_functions) {
  * @param $number
  *   The number of the update within that module.
  *
- * @return
+ * @return bool
  *   TRUE if the database schema indicates that the update has already been
  *   performed; FALSE otherwise.
  */
@@ -677,7 +677,7 @@ function update_already_performed($module, $number) {
  * its hook, only that it be installed. This allows the update system to
  * properly perform updates even on modules that are currently disabled.
  *
- * @return
+ * @return array
  *   An array of return values obtained by merging the results of the
  *   hook_update_dependencies() implementations in all installed modules.
  *
diff --git a/web/core/install.php b/web/core/install.php
index b8df4ae0d..88c1e36f6 100644
--- a/web/core/install.php
+++ b/web/core/install.php
@@ -30,7 +30,7 @@
 // in the printed message to the user) whenever \Drupal::MINIMUM_PHP is
 // updated.
 if (version_compare(PHP_VERSION, '7.3.0') < 0) {
-  print 'Your PHP installation is too old. Drupal requires at least PHP 7.3.0. See <a href="http://php.net/supported-versions.php">PHP\'s version support documentation</a> and the <a href="https://www.drupal.org/docs/system-requirements/php-requirements">Drupal PHP requirements</a> page for more information.';
+  print 'Your PHP installation is too old. Refer to the <a href="https://www.drupal.org/docs/system-requirements/php-requirements">Drupal PHP requirements</a> for the currently recommended PHP version for this release. See <a href="https://php.net/supported-versions.php">PHP\'s version support documentation</a> for more information on PHP\'s own support schedule.';
   exit;
 }
 
diff --git a/web/core/lib/Drupal.php b/web/core/lib/Drupal.php
index 27aa673e7..a8737d67c 100644
--- a/web/core/lib/Drupal.php
+++ b/web/core/lib/Drupal.php
@@ -75,10 +75,20 @@ class Drupal {
   /**
    * The current system version.
    */
-  const VERSION = '9.4.12';
+  const VERSION = '9.5.11';
 
   /**
    * Core API compatibility.
+   *
+   * This constant is set to '8.x' to provide legacy compatibility with
+   * extensions that use the '8.x-' prefix to denote Drupal core major version
+   * compatibility, for example '8.x-1.0'. These extensions can specify
+   * compatibility with multiple major versions of Drupal core by setting the
+   * version constraint in 'core_version_requirement'. Drupal does not support
+   * using this core major version number prefix with versions greater than 8.
+   * For example '9.x-' prefixed extensions are not supported.
+   *
+   * @todo Remove or rename this constant in https://www.drupal.org/i/3085662
    */
   const CORE_COMPATIBILITY = '8.x';
 
@@ -131,12 +141,12 @@ class Drupal {
    * message, but Drupal can still be installed. Used for (e.g.) PHP versions
    * that have reached their EOL or will in the near future.
    */
-  const RECOMMENDED_PHP = '8.0';
+  const RECOMMENDED_PHP = '8.1.6';
 
   /**
    * The currently active container object, or NULL if not initialized yet.
    *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface|null
+   * @var \Drupal\Component\DependencyInjection\ContainerInterface|null
    */
   protected static $container;
 
@@ -160,7 +170,7 @@ public static function unsetContainer() {
   /**
    * Returns the currently active global container.
    *
-   * @return \Symfony\Component\DependencyInjection\ContainerInterface
+   * @return \Drupal\Component\DependencyInjection\ContainerInterface
    *
    * @throws \Drupal\Core\DependencyInjection\ContainerNotInitializedException
    */
@@ -565,10 +575,10 @@ public static function token() {
   }
 
   /**
-   * Returns the url generator service.
+   * Returns the URL generator service.
    *
    * @return \Drupal\Core\Routing\UrlGeneratorInterface
-   *   The url generator service.
+   *   The URL generator service.
    */
   public static function urlGenerator() {
     return static::getContainer()->get('url_generator');
diff --git a/web/core/lib/Drupal/Component/Annotation/composer.json b/web/core/lib/Drupal/Component/Annotation/composer.json
index c252a2f97..887d29378 100644
--- a/web/core/lib/Drupal/Component/Annotation/composer.json
+++ b/web/core/lib/Drupal/Component/Annotation/composer.json
@@ -1,19 +1,27 @@
 {
-  "name": "drupal/core-annotation",
-  "description": "Annotation discovery and implementation of plugins.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "doctrine/annotations": "^1.4",
-    "drupal/core-file-cache": "^8.8",
-    "drupal/core-plugin": "^8.8",
-    "drupal/core-utility": "^8.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Annotation\\": ""
-    }
-  }
+    "name": "drupal/core-annotation",
+    "description": "Annotation discovery and implementation of plugins.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "doctrine/annotations": "^1.13",
+        "drupal/core-file-cache": "^9.5",
+        "drupal/core-plugin": "^9.5",
+        "drupal/core-utility": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Annotation\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/Assertion/composer.json b/web/core/lib/Drupal/Component/Assertion/composer.json
index 661654b13..f5d9d17ac 100644
--- a/web/core/lib/Drupal/Component/Assertion/composer.json
+++ b/web/core/lib/Drupal/Component/Assertion/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-assertion",
-  "description": "Provides helper functionality for runtime assertions.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Assertion\\": ""
+    "name": "drupal/core-assertion",
+    "description": "Provides helper functionality for runtime assertions.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Assertion\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Bridge/composer.json b/web/core/lib/Drupal/Component/Bridge/composer.json
index 5429b4c4c..67ff57ddc 100644
--- a/web/core/lib/Drupal/Component/Bridge/composer.json
+++ b/web/core/lib/Drupal/Component/Bridge/composer.json
@@ -1,16 +1,24 @@
 {
-  "name": "drupal/core-bridge",
-  "description": "Bridge.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "laminas/laminas-feed": "^2.12"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Bridge\\": ""
+    "name": "drupal/core-bridge",
+    "abandoned": true,
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "description": "Bridge.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "laminas/laminas-feed": "^2.17"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Bridge\\": ""
+        }
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/ClassFinder/composer.json b/web/core/lib/Drupal/Component/ClassFinder/composer.json
index 9efde0acd..74af0a187 100644
--- a/web/core/lib/Drupal/Component/ClassFinder/composer.json
+++ b/web/core/lib/Drupal/Component/ClassFinder/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-class-finder",
-  "description": "This class provides a class finding utility.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\ClassFinder\\": ""
+    "name": "drupal/core-class-finder",
+    "description": "This class provides a class finding utility.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\ClassFinder\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Datetime/composer.json b/web/core/lib/Drupal/Component/Datetime/composer.json
index b06d7433a..4ce7364c6 100644
--- a/web/core/lib/Drupal/Component/Datetime/composer.json
+++ b/web/core/lib/Drupal/Component/Datetime/composer.json
@@ -1,16 +1,24 @@
 {
-  "name": "drupal/core-datetime",
-  "description": "This class wraps the PHP DateTime class with more flexible initialization parameters, allowing a date to be created from an existing date object, a timestamp, a string with an unknown format, a string with a known format, or an array of date parts. It also adds an errors array and a __toString() method to the date object.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "drupal/core-utility": "^8.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Datetime\\": ""
-    }
-  }
+    "name": "drupal/core-datetime",
+    "description": "This class wraps the PHP DateTime class with more flexible initialization parameters, allowing a date to be created from an existing date object, a timestamp, a string with an unknown format, a string with a known format, or an array of date parts. It also adds an errors array and a __toString() method to the date object.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "drupal/core-utility": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Datetime\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Container.php b/web/core/lib/Drupal/Component/DependencyInjection/Container.php
index 127656539..985d8fafe 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Component\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
@@ -46,6 +45,8 @@
  */
 class Container implements ContainerInterface, ResetInterface {
 
+  use ServiceIdHashTrait;
+
   /**
    * The parameters of the container.
    *
@@ -200,10 +201,6 @@ public function get($id, $invalid_behavior = ContainerInterface::EXCEPTION_ON_IN
    * a new instance of the shared service.
    */
   public function reset() {
-    if (!empty($this->scopedServices)) {
-      throw new LogicException('Resetting the container is not allowed when a scope is active.');
-    }
-
     $this->services = [];
   }
 
@@ -536,10 +533,7 @@ protected function getParameterAlternatives($name) {
   }
 
   /**
-   * Gets all defined service IDs.
-   *
-   * @return array
-   *   An array of all defined service IDs.
+   * {@inheritdoc}
    */
   public function getServiceIds() {
     return array_keys($this->serviceDefinitions + $this->services);
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
index be177a8b8..819f45851 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
+++ b/web/core/lib/Drupal/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumper.php
@@ -433,6 +433,7 @@ protected function dumpValue($value) {
     elseif (is_object($value)) {
       // Drupal specific: Instantiated objects have a _serviceId parameter.
       if (isset($value->_serviceId)) {
+        @trigger_error('_serviceId is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\DrupalKernelInterface::getServiceIdMapping() instead. See https://www.drupal.org/node/3292540', E_USER_DEPRECATED);
         return $this->getReferenceCall($value->_serviceId);
       }
       throw new RuntimeException('Unable to dump a service container if a parameter is an object without _serviceId.');
diff --git a/web/core/lib/Drupal/Component/DependencyInjection/composer.json b/web/core/lib/Drupal/Component/DependencyInjection/composer.json
index e370fa3ed..fc523503d 100644
--- a/web/core/lib/Drupal/Component/DependencyInjection/composer.json
+++ b/web/core/lib/Drupal/Component/DependencyInjection/composer.json
@@ -1,26 +1,33 @@
 {
-  "name": "drupal/core-dependency-injection",
-  "description": "Dependency Injection container optimized for Drupal's needs.",
-  "keywords": ["drupal", "dependency injection"],
-  "type": "library",
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/drupal",
-    "irc": "irc://irc.freenode.net/drupal-contribute",
-    "source": "https://www.drupal.org/project/drupal/git-instructions"
-  },
-  "require": {
-    "php": ">=7.3.0",
-    "symfony/dependency-injection": "^4.4",
-    "symfony/service-contracts": "^1.1|^2"
-  },
-  "suggest": {
-    "symfony/expression-language": "For using expressions in service container configuration"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\DependencyInjection\\": ""
+    "name": "drupal/core-dependency-injection",
+    "description": "Dependency Injection container optimized for Drupal's needs.",
+    "keywords": [
+        "drupal",
+        "dependency injection"
+    ],
+    "type": "library",
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/drupal",
+        "source": "https://www.drupal.org/project/drupal/git-instructions"
+    },
+    "require": {
+        "php": ">=7.3.0",
+        "symfony/dependency-injection": "^4.4",
+        "symfony/service-contracts": "v2.5.2"
+    },
+    "suggest": {
+        "symfony/expression-language": "For using expressions in service container configuration"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\DependencyInjection\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php b/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
index f8ec05fbb..75dfc46ee 100644
--- a/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
+++ b/web/core/lib/Drupal/Component/Diff/Engine/DiffEngine.php
@@ -25,6 +25,7 @@
  * @private
  * @subpackage DifferenceEngine
  */
+#[\AllowDynamicProperties]
 class DiffEngine {
 
   const USE_ASSERTS = FALSE;
diff --git a/web/core/lib/Drupal/Component/Diff/composer.json b/web/core/lib/Drupal/Component/Diff/composer.json
index 7af1986af..a3db50578 100644
--- a/web/core/lib/Drupal/Component/Diff/composer.json
+++ b/web/core/lib/Drupal/Component/Diff/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-diff",
-  "description": "Diff.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Diff\\": ""
+    "name": "drupal/core-diff",
+    "description": "Diff.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Diff\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Discovery/composer.json b/web/core/lib/Drupal/Component/Discovery/composer.json
index 59fe78eec..a2c458d35 100644
--- a/web/core/lib/Drupal/Component/Discovery/composer.json
+++ b/web/core/lib/Drupal/Component/Discovery/composer.json
@@ -1,17 +1,25 @@
 {
-  "name": "drupal/core-discovery",
-  "description": "Discovery.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "drupal/core-file-cache": "^8.8",
-    "drupal/core-serialization": "^8.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Discovery\\": ""
-    }
-  }
+    "name": "drupal/core-discovery",
+    "description": "Discovery.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "drupal/core-file-cache": "^9.5",
+        "drupal/core-serialization": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Discovery\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/EventDispatcher/composer.json b/web/core/lib/Drupal/Component/EventDispatcher/composer.json
index 3574908ff..3b934854f 100644
--- a/web/core/lib/Drupal/Component/EventDispatcher/composer.json
+++ b/web/core/lib/Drupal/Component/EventDispatcher/composer.json
@@ -1,18 +1,25 @@
 {
-  "name": "drupal/core-event-dispatcher",
-  "description": "EventDispatcher.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "symfony/dependency-injection": "^4.4",
-    "symfony/event-dispatcher": "^4.4",
-    "symfony/event-dispatcher-contracts": "^1.1"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\EventDispatcher\\": ""
+    "name": "drupal/core-event-dispatcher",
+    "description": "EventDispatcher.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "symfony/dependency-injection": "^4.4",
+        "symfony/event-dispatcher": "^4.4",
+        "symfony/event-dispatcher-contracts": "v1.1.13"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\EventDispatcher\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/FileCache/composer.json b/web/core/lib/Drupal/Component/FileCache/composer.json
index 68f202b57..4d30483ed 100644
--- a/web/core/lib/Drupal/Component/FileCache/composer.json
+++ b/web/core/lib/Drupal/Component/FileCache/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-file-cache",
-  "description": "FileCache.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\FileCache\\": ""
+    "name": "drupal/core-file-cache",
+    "description": "FileCache.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\FileCache\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/FileSecurity/composer.json b/web/core/lib/Drupal/Component/FileSecurity/composer.json
index 33a11ae6e..3bf3992f5 100644
--- a/web/core/lib/Drupal/Component/FileSecurity/composer.json
+++ b/web/core/lib/Drupal/Component/FileSecurity/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-file-security",
-  "description": "FileSecurity.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\FileSecurity\\": ""
+    "name": "drupal/core-file-security",
+    "description": "FileSecurity.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\FileSecurity\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/FileSystem/composer.json b/web/core/lib/Drupal/Component/FileSystem/composer.json
index 41fa20509..58fcc6bdf 100644
--- a/web/core/lib/Drupal/Component/FileSystem/composer.json
+++ b/web/core/lib/Drupal/Component/FileSystem/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-filesystem",
-  "description": "FileSystem.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\FileSystem\\": ""
+    "name": "drupal/core-filesystem",
+    "description": "FileSystem.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\FileSystem\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/FrontMatter/composer.json b/web/core/lib/Drupal/Component/FrontMatter/composer.json
index 15a0b081e..4f2dd1ab8 100644
--- a/web/core/lib/Drupal/Component/FrontMatter/composer.json
+++ b/web/core/lib/Drupal/Component/FrontMatter/composer.json
@@ -1,16 +1,24 @@
 {
-  "name": "drupal/core-front-matter",
-  "description": "Component for parsing front matter from a source.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "drupal/core-serialization": "^8.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\FrontMatter\\": ""
-    }
-  }
+    "name": "drupal/core-front-matter",
+    "description": "Component for parsing front matter from a source.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "drupal/core-serialization": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\FrontMatter\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/Gettext/PoHeader.php b/web/core/lib/Drupal/Component/Gettext/PoHeader.php
index 8bc912d3b..a54377aa5 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -183,10 +183,11 @@ public function __toString() {
    * @param string $pluralforms
    *   The Plural-Forms entry value.
    *
-   * @return
+   * @return array|bool
    *   An indexed array of parsed plural formula data. Containing:
    *   - 'nplurals': The number of plural forms defined by the plural formula.
    *   - 'plurals': Array of plural positions keyed by plural value.
+   *   False when there is no plural string.
    *
    * @throws \Exception
    */
@@ -270,8 +271,9 @@ private function parseHeader($header) {
    * @param string $string
    *   A string containing the arithmetic formula.
    *
-   * @return
-   *   A stack of values and operations to be evaluated.
+   * @return array|bool
+   *   A stack of values and operations to be evaluated. False if the formula
+   *   could not be parsed.
    */
   private function parseArithmetic($string) {
     // Operator precedence table.
diff --git a/web/core/lib/Drupal/Component/Gettext/PoItem.php b/web/core/lib/Drupal/Component/Gettext/PoItem.php
index 3ef8a2ace..7bb256d30 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -103,8 +103,7 @@ public function setContext($context) {
   }
 
   /**
-   * Gets the source string or the array of strings if the translation has
-   * plurals.
+   * Gets the source string(s) if the translation has plurals.
    *
    * @return string or array $translation
    */
@@ -113,8 +112,7 @@ public function getSource() {
   }
 
   /**
-   * Set the source string or the array of strings if the translation has
-   * plurals.
+   * Sets the source string(s) if the translation has plurals.
    *
    * @param string|array $source
    *   The source string or the array of strings if the translation has plurals.
@@ -124,8 +122,7 @@ public function setSource($source) {
   }
 
   /**
-   * Gets the translation string or the array of strings if the translation has
-   * plurals.
+   * Gets the translation string(s) if the translation has plurals.
    *
    * @return string or array $translation
    */
@@ -134,8 +131,7 @@ public function getTranslation() {
   }
 
   /**
-   * Set the translation string or the array of strings if the translation has
-   * plurals.
+   * Sets the translation string(s) if the translation has plurals.
    *
    * @param string|array $translation
    *   The translation string or the array of strings if the translation has
diff --git a/web/core/lib/Drupal/Component/Gettext/PoStreamInterface.php b/web/core/lib/Drupal/Component/Gettext/PoStreamInterface.php
index 33534ecaf..599929912 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoStreamInterface.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoStreamInterface.php
@@ -23,7 +23,7 @@ public function close();
   /**
    * Gets the URI of the PO stream that is being read or written.
    *
-   * @return
+   * @return string
    *   URI string for this stream.
    */
   public function getURI();
diff --git a/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php b/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php
index 9b4442606..87f50601e 100644
--- a/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/web/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -237,7 +237,7 @@ private function readHeader() {
    * indicated by MSGSTR or MSGSTR_ARR followed immediately by an MSGID or
    * MSGCTXT (when items closely follow each other).
    *
-   * @return
+   * @return bool|null
    *   FALSE if an error was logged, NULL otherwise. The errors are considered
    *   non-blocking, so reading can continue, while the errors are collected
    *   for later presentation.
@@ -544,8 +544,9 @@ public function setItemFromArray($value) {
    * @param $string
    *   A string specified with enclosing quotes.
    *
-   * @return
-   *   The string parsed from inside the quotes.
+   * @return bool|string
+   *   The string parsed from inside the quotes. False when the syntax is
+   *   invalid.
    */
   public function parseQuoted($string) {
     if (substr($string, 0, 1) != substr($string, -1, 1)) {
@@ -574,7 +575,7 @@ public function parseQuoted($string) {
    * @param $comment
    *   An array of strings containing a comment.
    *
-   * @return
+   * @return string
    *   Short one-string version of the comment.
    */
   private function shortenComments($comment) {
diff --git a/web/core/lib/Drupal/Component/Gettext/composer.json b/web/core/lib/Drupal/Component/Gettext/composer.json
index 7320270e3..e09cd7be5 100644
--- a/web/core/lib/Drupal/Component/Gettext/composer.json
+++ b/web/core/lib/Drupal/Component/Gettext/composer.json
@@ -1,20 +1,25 @@
 {
-  "name": "drupal/core-gettext",
-  "description": "PHP library for reading PO files.",
-  "type": "library",
-  "license": "GPL-2.0-or-later",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/drupal",
-    "irc": "irc://irc.freenode.net/drupal-contribute",
-    "source": "https://www.drupal.org/project/drupal/git-instructions"
-  },
-  "require": {
-    "php": ">=7.3.0",
-    "drupal/core-render": "^9.4"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Gettext\\": ""
-    }
-  }
+    "name": "drupal/core-gettext",
+    "description": "PHP library for reading PO files.",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/drupal",
+        "source": "https://www.drupal.org/project/drupal/git-instructions"
+    },
+    "require": {
+        "php": ">=7.3.0",
+        "drupal/core-render": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Gettext\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/Graph/Graph.php b/web/core/lib/Drupal/Component/Graph/Graph.php
index b155faa66..6fe9cf21b 100644
--- a/web/core/lib/Drupal/Component/Graph/Graph.php
+++ b/web/core/lib/Drupal/Component/Graph/Graph.php
@@ -44,7 +44,7 @@ public function __construct($graph) {
   /**
    * Performs a depth-first search and sort on the directed acyclic graph.
    *
-   * @return
+   * @return array
    *   The given $graph with more secondary keys filled in:
    *   - 'paths': Contains a list of vertices than can be reached on a path from
    *     this vertex.
diff --git a/web/core/lib/Drupal/Component/Graph/composer.json b/web/core/lib/Drupal/Component/Graph/composer.json
index dbcc0eebb..ebc7a00d2 100644
--- a/web/core/lib/Drupal/Component/Graph/composer.json
+++ b/web/core/lib/Drupal/Component/Graph/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-graph",
-  "description": "Graph.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Graph\\": ""
+    "name": "drupal/core-graph",
+    "description": "Graph.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Graph\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/HttpFoundation/composer.json b/web/core/lib/Drupal/Component/HttpFoundation/composer.json
index 0c481d601..aedb9a51d 100644
--- a/web/core/lib/Drupal/Component/HttpFoundation/composer.json
+++ b/web/core/lib/Drupal/Component/HttpFoundation/composer.json
@@ -1,16 +1,23 @@
 {
-  "name": "drupal/core-http-foundation",
-  "description": "HttpFoundation.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "symfony/http-foundation": "^4.4"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\HttpFoundation\\": ""
+    "name": "drupal/core-http-foundation",
+    "description": "HttpFoundation.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "symfony/http-foundation": "^4.4.7"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\HttpFoundation\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php b/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
index ff1949418..be287f99b 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
+++ b/web/core/lib/Drupal/Component/PhpStorage/MTimeProtectedFastFileStorage.php
@@ -185,8 +185,7 @@ public function garbageCollection() {
   }
 
   /**
-   * Gets the full path of the containing directory where the file is or should
-   * be stored.
+   * Gets the full path of the file storage directory's parent.
    *
    * @param string $name
    *   The virtual file name. Can be a relative path.
diff --git a/web/core/lib/Drupal/Component/PhpStorage/composer.json b/web/core/lib/Drupal/Component/PhpStorage/composer.json
index 776426ba3..97e51e0d2 100644
--- a/web/core/lib/Drupal/Component/PhpStorage/composer.json
+++ b/web/core/lib/Drupal/Component/PhpStorage/composer.json
@@ -1,16 +1,24 @@
 {
-  "name": "drupal/core-php-storage",
-  "description": "PhpStorage.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "drupal/core-file-security": "^8.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\PhpStorage\\": ""
-    }
-  }
+    "name": "drupal/core-php-storage",
+    "description": "PhpStorage.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "drupal/core-file-security": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\PhpStorage\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php b/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
index f664a06fa..0dd57fa30 100644
--- a/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
+++ b/web/core/lib/Drupal/Component/Plugin/ContextAwarePluginBase.php
@@ -8,8 +8,15 @@
 use Drupal\Component\Plugin\Context\Context;
 use Symfony\Component\Validator\ConstraintViolationList;
 
+@trigger_error(__NAMESPACE__ . '\ContextAwarePluginBase is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0 without replacement. See https://www.drupal.org/node/3120980', E_USER_DEPRECATED);
+
 /**
  * Base class for plugins that are context aware.
+ *
+ * @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0 without
+ *   replacement.
+ *
+ * @see https://www.drupal.org/node/3120980
  */
 abstract class ContextAwarePluginBase extends PluginBase implements ContextAwarePluginInterface {
 
diff --git a/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php b/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php
index ed1ac91c2..fd570872c 100644
--- a/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php
+++ b/web/core/lib/Drupal/Component/Plugin/Definition/PluginDefinition.php
@@ -5,6 +5,7 @@
 /**
  * Provides object-based plugin definitions.
  */
+#[\AllowDynamicProperties]
 class PluginDefinition implements PluginDefinitionInterface {
 
   /**
diff --git a/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php b/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
index d14c8796d..d9277db77 100644
--- a/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
+++ b/web/core/lib/Drupal/Component/Plugin/Discovery/StaticDiscoveryDecorator.php
@@ -17,7 +17,7 @@ class StaticDiscoveryDecorator extends StaticDiscovery {
   /**
    * A callback or closure used for registering additional definitions.
    *
-   * @var \Callable
+   * @var callable
    */
   protected $registerDefinitions;
 
diff --git a/web/core/lib/Drupal/Component/Plugin/composer.json b/web/core/lib/Drupal/Component/Plugin/composer.json
index 8814a8ef3..2bf1e2355 100644
--- a/web/core/lib/Drupal/Component/Plugin/composer.json
+++ b/web/core/lib/Drupal/Component/Plugin/composer.json
@@ -1,19 +1,28 @@
 {
-  "name": "drupal/core-plugin",
-  "description": "Base building block for a scalable and extensible plug-in system for PHP components and application framework extensions.",
-  "keywords": ["drupal", "plugin", "plugins"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "symfony/validator": "^4.4"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Plugin\\": ""
+    "name": "drupal/core-plugin",
+    "description": "Base building block for a scalable and extensible plug-in system for PHP components and application framework extensions.",
+    "keywords": [
+        "drupal",
+        "plugin",
+        "plugins"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "symfony/validator": "^4.4"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Plugin\\": ""
+        }
+    },
+    "suggest": {
+        "symfony/validator": "Leveraged in the use of context aware plugins."
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  },
-  "suggest": {
-    "symfony/validator": "Leveraged in the use of context aware plugins."
-  }
 }
diff --git a/web/core/lib/Drupal/Component/ProxyBuilder/composer.json b/web/core/lib/Drupal/Component/ProxyBuilder/composer.json
index 9b798e926..24c6d0a5d 100644
--- a/web/core/lib/Drupal/Component/ProxyBuilder/composer.json
+++ b/web/core/lib/Drupal/Component/ProxyBuilder/composer.json
@@ -1,15 +1,23 @@
 {
-  "name": "drupal/core-proxy-builder",
-  "description": "Provides a lightweight mechanism to provide lazy loaded proxies.",
-  "keywords": ["drupal", "proxy"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\ProxyBuilder\\": ""
+    "name": "drupal/core-proxy-builder",
+    "description": "Provides a lightweight mechanism to provide lazy loaded proxies.",
+    "keywords": [
+        "drupal",
+        "proxy"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\ProxyBuilder\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Render/FormattableMarkup.php b/web/core/lib/Drupal/Component/Render/FormattableMarkup.php
index d9cb205fe..a427dda96 100644
--- a/web/core/lib/Drupal/Component/Render/FormattableMarkup.php
+++ b/web/core/lib/Drupal/Component/Render/FormattableMarkup.php
@@ -131,11 +131,11 @@ public function jsonSerialize() {
    * @param array $args
    *   An associative array of replacements. Each array key should be the same
    *   as a placeholder in $string. The corresponding value should be a string
-   *   or an object that implements
-   *   \Drupal\Component\Render\MarkupInterface. The value replaces the
-   *   placeholder in $string. Sanitization and formatting will be done before
-   *   replacement. The type of sanitization and formatting depends on the first
-   *   character of the key:
+   *   or an object that implements \Drupal\Component\Render\MarkupInterface.
+   *   Null args[] values are deprecated in Drupal 9.5 and will fail in
+   *   Drupal 11.0. The value replaces the placeholder in $string. Sanitization
+   *   and formatting will be done before replacement. The type of sanitization
+   *   and formatting depends on the first character of the key:
    *   - @variable: When the placeholder replacement value is:
    *     - A string, the replaced value in the returned string will be sanitized
    *       using \Drupal\Component\Utility\Html::escape().
@@ -196,6 +196,14 @@ public function jsonSerialize() {
   protected static function placeholderFormat($string, array $args) {
     // Transform arguments before inserting them.
     foreach ($args as $key => $value) {
+      if (is_null($value)) {
+        // It's probably a bug to provide a null value for the placeholder arg,
+        // and in D11 this will no longer be allowed. When this trigger_error
+        // is removed, also remove isset $value checks inside the switch{}
+        // below.
+        @trigger_error(sprintf('Deprecated NULL placeholder value for key (%s) in: "%s". This will throw a PHP error in drupal:11.0.0. See https://www.drupal.org/node/3318826', (string) $key, (string) $string), E_USER_DEPRECATED);
+        $value = '';
+      }
       switch ($key[0]) {
         case '@':
           // Escape if the value is not an object from a class that implements
diff --git a/web/core/lib/Drupal/Component/Render/composer.json b/web/core/lib/Drupal/Component/Render/composer.json
index 5b35fcb2a..15e62fb03 100644
--- a/web/core/lib/Drupal/Component/Render/composer.json
+++ b/web/core/lib/Drupal/Component/Render/composer.json
@@ -1,16 +1,24 @@
 {
-  "name": "drupal/core-render",
-  "description": "Renders placeholder variables for HTML and plain-text display.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "drupal/core-utility": "^8.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Render\\": ""
-    }
-  }
+    "name": "drupal/core-render",
+    "description": "Renders placeholder variables for HTML and plain-text display.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "drupal/core-utility": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Render\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "minimum-stability": "dev"
 }
diff --git a/web/core/lib/Drupal/Component/Serialization/composer.json b/web/core/lib/Drupal/Component/Serialization/composer.json
index 7b40c55dd..40360bbef 100644
--- a/web/core/lib/Drupal/Component/Serialization/composer.json
+++ b/web/core/lib/Drupal/Component/Serialization/composer.json
@@ -1,16 +1,23 @@
 {
-  "name": "drupal/core-serialization",
-  "description": "Serialization.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0",
-    "symfony/yaml": "^4.4"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Serialization\\": ""
+    "name": "drupal/core-serialization",
+    "description": "Serialization.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0",
+        "symfony/yaml": "^4.4.19"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Serialization\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php b/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
index 977892dda..6704cdf4c 100644
--- a/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
+++ b/web/core/lib/Drupal/Component/Transliteration/PhpTransliteration.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Component\Transliteration;
 
+// cspell:ignore vibber
+
 /**
  * Implements transliteration without using the PECL extensions.
  *
diff --git a/web/core/lib/Drupal/Component/Transliteration/composer.json b/web/core/lib/Drupal/Component/Transliteration/composer.json
index abdce4fc8..7212fd917 100644
--- a/web/core/lib/Drupal/Component/Transliteration/composer.json
+++ b/web/core/lib/Drupal/Component/Transliteration/composer.json
@@ -1,16 +1,23 @@
 {
-  "name": "drupal/core-transliteration",
-  "description": "Transliteration.",
-  "type": "library",
-  "license": "GPL-2.0-or-later",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/drupal",
-    "irc": "irc://irc.freenode.net/drupal-contribute",
-    "source": "https://www.drupal.org/project/drupal/git-instructions"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Transliteration\\": ""
+    "name": "drupal/core-transliteration",
+    "description": "Transliteration.",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/drupal",
+        "source": "https://www.drupal.org/project/drupal/git-instructions"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Transliteration\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
+    },
+    "require": {
+        "php": ">=7.3.0"
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Utility/Color.php b/web/core/lib/Drupal/Component/Utility/Color.php
index 69239f916..8aeb9f613 100644
--- a/web/core/lib/Drupal/Component/Utility/Color.php
+++ b/web/core/lib/Drupal/Component/Utility/Color.php
@@ -58,8 +58,7 @@ public static function hexToRgb($hex) {
   }
 
   /**
-   * Converts RGB color arrays and RGB strings in CSS notation to lowercase
-   * simple colors like '#aabbcc'.
+   * Converts RGB color arrays or strings to lowercase CSS notation.
    *
    * @param array|string $input
    *   The value to convert. If the value is an array the first three elements
diff --git a/web/core/lib/Drupal/Component/Utility/DeprecatedArray.php b/web/core/lib/Drupal/Component/Utility/DeprecatedArray.php
index 63b5b7f13..f3ef310ce 100644
--- a/web/core/lib/Drupal/Component/Utility/DeprecatedArray.php
+++ b/web/core/lib/Drupal/Component/Utility/DeprecatedArray.php
@@ -75,6 +75,7 @@ public function getIterator() {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function unserialize($serialized) {
     @trigger_error($this->message, E_USER_DEPRECATED);
     parent::unserialize($serialized);
@@ -83,6 +84,7 @@ public function unserialize($serialized) {
   /**
    * {@inheritdoc}
    */
+  #[\ReturnTypeWillChange]
   public function serialize() {
     @trigger_error($this->message, E_USER_DEPRECATED);
     return parent::serialize();
diff --git a/web/core/lib/Drupal/Component/Utility/Html.php b/web/core/lib/Drupal/Component/Utility/Html.php
index 8c7d3888c..7271519e5 100644
--- a/web/core/lib/Drupal/Component/Utility/Html.php
+++ b/web/core/lib/Drupal/Component/Utility/Html.php
@@ -382,7 +382,11 @@ public static function escapeCdataElement(\DOMNode $node, $comment_start = '//',
    * @see html_entity_decode()
    * @see \Drupal\Component\Utility\Html::escape()
    */
-  public static function decodeEntities($text) {
+  public static function decodeEntities($text): string {
+    if (is_null($text)) {
+      @trigger_error('Passing NULL to ' . __METHOD__ . ' is deprecated in drupal:9.5.0 and will trigger a PHP error from drupal:11.0.0. Pass a string instead. See https://www.drupal.org/node/3318826', E_USER_DEPRECATED);
+      return '';
+    }
     return html_entity_decode($text, ENT_QUOTES, 'UTF-8');
   }
 
@@ -420,7 +424,11 @@ public static function decodeEntities($text) {
    *
    * @ingroup sanitization
    */
-  public static function escape($text) {
+  public static function escape($text): string {
+    if (is_null($text)) {
+      @trigger_error('Passing NULL to ' . __METHOD__ . ' is deprecated in drupal:9.5.0 and will trigger a PHP error from drupal:11.0.0. Pass a string instead. See https://www.drupal.org/node/3318826', E_USER_DEPRECATED);
+      return '';
+    }
     return htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
   }
 
diff --git a/web/core/lib/Drupal/Component/Utility/Unicode.php b/web/core/lib/Drupal/Component/Utility/Unicode.php
index 4a63ec2e4..3d2e8942e 100644
--- a/web/core/lib/Drupal/Component/Utility/Unicode.php
+++ b/web/core/lib/Drupal/Component/Utility/Unicode.php
@@ -77,8 +77,7 @@ class Unicode {
   const STATUS_SINGLEBYTE = 0;
 
   /**
-   * Indicates that full unicode support with the PHP mbstring extension is
-   * being used.
+   * Indicates that full unicode support with PHP mbstring extension is used.
    */
   const STATUS_MULTIBYTE = 1;
 
@@ -143,7 +142,7 @@ public static function check() {
   }
 
   /**
-   * Decodes UTF byte-order mark (BOM) into the encoding's name.
+   * Decodes UTF byte-order mark (BOM) to the encoding name.
    *
    * @param string $data
    *   The data possibly containing a BOM. This can be the entire contents of
diff --git a/web/core/lib/Drupal/Component/Utility/UrlHelper.php b/web/core/lib/Drupal/Component/Utility/UrlHelper.php
index b23a21351..79e275bdc 100644
--- a/web/core/lib/Drupal/Component/Utility/UrlHelper.php
+++ b/web/core/lib/Drupal/Component/Utility/UrlHelper.php
@@ -73,7 +73,7 @@ public static function buildQuery(array $query, $parent = '') {
    * @param string $parent
    *   Internal use only. Used to build the $query array key for nested items.
    *
-   * @return
+   * @return array
    *   An array containing query parameters.
    */
   public static function filterQueryParameters(array $query, array $exclude = [], $parent = '') {
diff --git a/web/core/lib/Drupal/Component/Utility/Xss.php b/web/core/lib/Drupal/Component/Utility/Xss.php
index 1f1690d11..1b8cfff94 100644
--- a/web/core/lib/Drupal/Component/Utility/Xss.php
+++ b/web/core/lib/Drupal/Component/Utility/Xss.php
@@ -237,6 +237,8 @@ protected static function attributes($attributes) {
               'alt',
               'rel',
               'property',
+              'class',
+              'datetime',
             ]);
 
             $working = $mode = 1;
@@ -264,6 +266,10 @@ protected static function attributes($attributes) {
           break;
 
         case 2:
+          // Once we've finished processing the attribute value continue to look
+          // for attributes.
+          $mode = 0;
+          $working = 1;
           // Attribute value, a URL after href= for instance.
           if (preg_match('/^"([^"]*)"(\s+|$)/', $attributes, $match)) {
             $value = $skip_protocol_filtering ? $match[1] : UrlHelper::filterBadProtocol($match[1]);
@@ -271,8 +277,6 @@ protected static function attributes($attributes) {
             if (!$skip) {
               $attributes_array[] = "$attribute_name=\"$value\"";
             }
-            $working = 1;
-            $mode = 0;
             $attributes = preg_replace('/^"[^"]*"(\s+|$)/', '', $attributes);
             break;
           }
@@ -283,8 +287,6 @@ protected static function attributes($attributes) {
             if (!$skip) {
               $attributes_array[] = "$attribute_name='$value'";
             }
-            $working = 1;
-            $mode = 0;
             $attributes = preg_replace("/^'[^']*'(\s+|$)/", '', $attributes);
             break;
           }
@@ -295,15 +297,13 @@ protected static function attributes($attributes) {
             if (!$skip) {
               $attributes_array[] = "$attribute_name=\"$value\"";
             }
-            $working = 1;
-            $mode = 0;
             $attributes = preg_replace("%^[^\s\"']+(\s+|$)%", '', $attributes);
           }
           break;
       }
 
       if ($working == 0) {
-        // Not well formed; remove and try again.
+        // Not well-formed; remove and try again.
         $attributes = preg_replace('/
           ^
           (
diff --git a/web/core/lib/Drupal/Component/Utility/composer.json b/web/core/lib/Drupal/Component/Utility/composer.json
index be455d0f4..99c28045b 100644
--- a/web/core/lib/Drupal/Component/Utility/composer.json
+++ b/web/core/lib/Drupal/Component/Utility/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-utility",
-  "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Utility\\": ""
+    "name": "drupal/core-utility",
+    "description": "Mostly static utility classes for string, xss, array, image, and other commonly needed manipulations.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Utility\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Uuid/UuidInterface.php b/web/core/lib/Drupal/Component/Uuid/UuidInterface.php
index f9f8a7b48..c5637b676 100644
--- a/web/core/lib/Drupal/Component/Uuid/UuidInterface.php
+++ b/web/core/lib/Drupal/Component/Uuid/UuidInterface.php
@@ -10,7 +10,7 @@ interface UuidInterface {
   /**
    * Generates a Universally Unique IDentifier (UUID).
    *
-   * @return
+   * @return string
    *   A 16 byte integer represented as a hex string formatted with 4 hyphens.
    */
   public function generate();
diff --git a/web/core/lib/Drupal/Component/Uuid/composer.json b/web/core/lib/Drupal/Component/Uuid/composer.json
index 0a4681e0e..bf29a0887 100644
--- a/web/core/lib/Drupal/Component/Uuid/composer.json
+++ b/web/core/lib/Drupal/Component/Uuid/composer.json
@@ -1,19 +1,23 @@
 {
-  "name": "drupal/core-uuid",
-  "description": "UUID generation and validation.",
-  "type": "library",
-  "license": "GPL-2.0-or-later",
-  "support": {
-    "issues": "https://www.drupal.org/project/issues/drupal",
-    "irc": "irc://irc.freenode.net/drupal-contribute",
-    "source": "https://www.drupal.org/project/drupal/git-instructions"
-  },
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Uuid\\": ""
+    "name": "drupal/core-uuid",
+    "description": "UUID generation and validation.",
+    "type": "library",
+    "license": "GPL-2.0-or-later",
+    "support": {
+        "issues": "https://www.drupal.org/project/issues/drupal",
+        "source": "https://www.drupal.org/project/drupal/git-instructions"
+    },
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Uuid\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Component/Version/composer.json b/web/core/lib/Drupal/Component/Version/composer.json
index 02e2814dd..f404f4e35 100644
--- a/web/core/lib/Drupal/Component/Version/composer.json
+++ b/web/core/lib/Drupal/Component/Version/composer.json
@@ -1,15 +1,22 @@
 {
-  "name": "drupal/core-version",
-  "description": "Utility classes for process Drupal specific version information.",
-  "keywords": ["drupal"],
-  "homepage": "https://www.drupal.org/project/drupal",
-  "license": "GPL-2.0-or-later",
-  "require": {
-    "php": ">=7.3.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Drupal\\Component\\Version\\": ""
+    "name": "drupal/core-version",
+    "description": "Utility classes for process Drupal specific version information.",
+    "keywords": [
+        "drupal"
+    ],
+    "homepage": "https://www.drupal.org/project/drupal",
+    "license": "GPL-2.0-or-later",
+    "require": {
+        "php": ">=7.3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Drupal\\Component\\Version\\": ""
+        }
+    },
+    "extra": {
+        "_readme": [
+            "This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
+        ]
     }
-  }
 }
diff --git a/web/core/lib/Drupal/Core/Access/AccessResultInterface.php b/web/core/lib/Drupal/Core/Access/AccessResultInterface.php
index 199ef3c22..e912acb07 100644
--- a/web/core/lib/Drupal/Core/Access/AccessResultInterface.php
+++ b/web/core/lib/Drupal/Core/Access/AccessResultInterface.php
@@ -23,6 +23,9 @@ interface AccessResultInterface {
   /**
    * Checks whether this access result indicates access is explicitly allowed.
    *
+   * Call this method to check whether someone has access, to convert an access
+   * result object to boolean.
+   *
    * @return bool
    *   When TRUE then isForbidden() and isNeutral() are FALSE.
    */
@@ -31,8 +34,13 @@ public function isAllowed();
   /**
    * Checks whether this access result indicates access is explicitly forbidden.
    *
-   * This is a kill switch — both orIf() and andIf() will result in
-   * isForbidden() if either results are isForbidden().
+   * Call this when optimizing an access checker (for hook_entity_access() or a
+   * route requirement): if this is TRUE, the final result will be forbidden and
+   * no further checking is necessary.
+   *
+   * Do not use this method to decide whether someone has access, to convert an
+   * access result to boolean: just because this returns FALSE, the end result
+   * might be neutral which is not allowed. Always use isAllowed() for this.
    *
    * @return bool
    *   When TRUE then isAllowed() and isNeutral() are FALSE.
@@ -44,6 +52,8 @@ public function isForbidden();
    *
    * @return bool
    *   When TRUE then isAllowed() and isForbidden() are FALSE.
+   *
+   * @internal
    */
   public function isNeutral();
 
diff --git a/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php b/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
index 48e75acb5..bd88a31c2 100644
--- a/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Access/CsrfAccessCheck.php
@@ -8,11 +8,19 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Allows access to routes to be controlled by a '_csrf_token' parameter.
+ * Access protection against CSRF attacks.
  *
- * To use this check, add a "token" GET parameter to URLs of which the value is
- * a token generated by \Drupal::csrfToken()->get() using the same value as the
- * "_csrf_token" parameter in the route.
+ * The CsrfAccessCheck is added to any route with the '_csrf_token' route
+ * requirement. If a link/url to a protected route is generated using the
+ * url_generator service, a valid token will be added automatically. Otherwise,
+ * a valid token can be generated by the csrf_token service using the route's
+ * path (without leading slash) as the argument when generating the token. This
+ * token can then be added as the 'token' query parameter when accessing the
+ * protected route.
+ *
+ * @see \Drupal\Core\Access\RouteProcessorCsrf
+ * @see \Drupal\Core\Access\CsrfTokenGenerator
+ * @see https://www.drupal.org/docs/8/api/routing-system/access-checking-on-routes/csrf-access-checking
  */
 class CsrfAccessCheck implements RoutingAccessInterface {
 
diff --git a/web/core/lib/Drupal/Core/Action/Plugin/Action/EmailAction.php b/web/core/lib/Drupal/Core/Action/Plugin/Action/EmailAction.php
index b345418d3..2a675fb99 100644
--- a/web/core/lib/Drupal/Core/Action/Plugin/Action/EmailAction.php
+++ b/web/core/lib/Drupal/Core/Action/Plugin/Action/EmailAction.php
@@ -163,25 +163,25 @@ public function defaultConfiguration() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['recipient'] = [
       '#type' => 'textfield',
-      '#title' => t('Recipient email address'),
+      '#title' => $this->t('Recipient email address'),
       '#default_value' => $this->configuration['recipient'],
       '#maxlength' => '254',
-      '#description' => t('You may also use tokens: [node:author:mail], [comment:author:mail], etc. Separate recipients with a comma.'),
+      '#description' => $this->t('You may also use tokens: [node:author:mail], [comment:author:mail], etc. Separate recipients with a comma.'),
     ];
     $form['subject'] = [
       '#type' => 'textfield',
-      '#title' => t('Subject'),
+      '#title' => $this->t('Subject'),
       '#default_value' => $this->configuration['subject'],
       '#maxlength' => '254',
-      '#description' => t('The subject of the message.'),
+      '#description' => $this->t('The subject of the message.'),
     ];
     $form['message'] = [
       '#type' => 'textarea',
-      '#title' => t('Message'),
+      '#title' => $this->t('Message'),
       '#default_value' => $this->configuration['message'],
       '#cols' => '80',
       '#rows' => '20',
-      '#description' => t('The message that should be sent. You may include placeholders like [node:title], [user:account-name], [user:display-name] and [comment:body] to represent data that will be different each time message is sent. Not all placeholders will be available in all contexts.'),
+      '#description' => $this->t('The message that should be sent. You may include placeholders like [node:title], [user:account-name], [user:display-name] and [comment:body] to represent data that will be different each time message is sent. Not all placeholders will be available in all contexts.'),
     ];
     return $form;
   }
@@ -192,7 +192,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
     if (!$this->emailValidator->isValid($form_state->getValue('recipient')) && strpos($form_state->getValue('recipient'), ':mail') === FALSE) {
       // We want the literal %author placeholder to be emphasized in the error message.
-      $form_state->setErrorByName('recipient', t('Enter a valid email address or use a token email address such as %author.', ['%author' => '[node:author:mail]']));
+      $form_state->setErrorByName('recipient', $this->t('Enter a valid email address or use a token email address such as %author.', ['%author' => '[node:author:mail]']));
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php b/web/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php
index 9fb6b0b61..befc21f6a 100644
--- a/web/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php
+++ b/web/core/lib/Drupal/Core/Action/Plugin/Action/GotoAction.php
@@ -114,8 +114,8 @@ public function defaultConfiguration() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['url'] = [
       '#type' => 'textfield',
-      '#title' => t('URL'),
-      '#description' => t('The URL to which the user should be redirected. This can be an internal URL like /node/1234 or an external URL like @url.', ['@url' => 'http://example.com']),
+      '#title' => $this->t('URL'),
+      '#description' => $this->t('The URL to which the user should be redirected. This can be an internal URL like /node/1234 or an external URL like @url.', ['@url' => 'http://example.com']),
       '#default_value' => $this->configuration['url'],
       '#required' => TRUE,
     ];
diff --git a/web/core/lib/Drupal/Core/Action/Plugin/Action/MessageAction.php b/web/core/lib/Drupal/Core/Action/Plugin/Action/MessageAction.php
index 7c892eeed..19575278c 100644
--- a/web/core/lib/Drupal/Core/Action/Plugin/Action/MessageAction.php
+++ b/web/core/lib/Drupal/Core/Action/Plugin/Action/MessageAction.php
@@ -106,11 +106,11 @@ public function defaultConfiguration() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['message'] = [
       '#type' => 'textarea',
-      '#title' => t('Message'),
+      '#title' => $this->t('Message'),
       '#default_value' => $this->configuration['message'],
       '#required' => TRUE,
       '#rows' => '8',
-      '#description' => t('The message to be displayed to the current user. You may include placeholders like [node:title], [user:account-name], [user:display-name] and [comment:body] to represent data that will be different each time message is sent. Not all placeholders will be available in all contexts.'),
+      '#description' => $this->t('The message to be displayed to the current user. You may include placeholders like [node:title], [user:account-name], [user:display-name] and [comment:body] to represent data that will be different each time message is sent. Not all placeholders will be available in all contexts.'),
     ];
     return $form;
   }
diff --git a/web/core/lib/Drupal/Core/Ajax/AfterCommand.php b/web/core/lib/Drupal/Core/Ajax/AfterCommand.php
index 41e232d20..0b981177b 100644
--- a/web/core/lib/Drupal/Core/Ajax/AfterCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/AfterCommand.php
@@ -6,8 +6,8 @@
  * An AJAX command for calling the jQuery after() method.
  *
  * The 'insert/after' command instructs the client to use jQuery's after()
- * method to insert the given HTML content after each element matched by the
- * given selector.
+ * method to insert the given render array or HTML content after each element
+ * matched by the given selector.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php b/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
index 600a6dbd7..3e2bc4876 100644
--- a/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
+++ b/web/core/lib/Drupal/Core/Ajax/AjaxResponseAttachmentsProcessor.php
@@ -174,11 +174,11 @@ protected function buildAttachmentsCommands(AjaxResponse $response, Request $req
     }
     if ($js_assets_header) {
       $js_header_render_array = $this->jsCollectionRenderer->render($js_assets_header);
-      $resource_commands[] = new PrependCommand('head', $this->renderer->renderPlain($js_header_render_array));
+      $resource_commands[] = new AddJsCommand(array_column($js_header_render_array, '#attributes'), 'head');
     }
     if ($js_assets_footer) {
       $js_footer_render_array = $this->jsCollectionRenderer->render($js_assets_footer);
-      $resource_commands[] = new AppendCommand('body', $this->renderer->renderPlain($js_footer_render_array));
+      $resource_commands[] = new AddJsCommand(array_column($js_footer_render_array, '#attributes'));
     }
     foreach (array_reverse($resource_commands) as $resource_command) {
       $response->addCommand($resource_command, TRUE);
diff --git a/web/core/lib/Drupal/Core/Ajax/AppendCommand.php b/web/core/lib/Drupal/Core/Ajax/AppendCommand.php
index 34c751d7e..ae1c2ea80 100644
--- a/web/core/lib/Drupal/Core/Ajax/AppendCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/AppendCommand.php
@@ -6,8 +6,8 @@
  * An AJAX command for calling the jQuery append() method.
  *
  * The 'insert/append' command instructs the client to use jQuery's append()
- * method to append the given HTML content to the inside of each element matched
- * by the given selector.
+ * method to append the given render array or HTML content to the inside of each
+ * element matched by the given selector.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php b/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php
index 8de47c8e6..f78abb31d 100644
--- a/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/BeforeCommand.php
@@ -6,8 +6,8 @@
  * An AJAX command for calling the jQuery before() method.
  *
  * The 'insert/before' command instructs the client to use jQuery's before()
- * method to insert the given HTML content before each of elements matched by
- * the given selector.
+ * method to insert the given render array or HTML content before each of
+ * elements matched by the given selector.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php b/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php
index e39f08f59..ce19c77e1 100644
--- a/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/HtmlCommand.php
@@ -7,7 +7,7 @@
  *
  * The 'insert/html' command instructs the client to use jQuery's html() method
  * to set the HTML content of each element matched by the given selector while
- * leaving the outer tags intact.
+ * leaving the outer tags intact using a given render array or HTML markup.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Ajax/InsertCommand.php b/web/core/lib/Drupal/Core/Ajax/InsertCommand.php
index 1813e5006..65479c3fb 100644
--- a/web/core/lib/Drupal/Core/Ajax/InsertCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/InsertCommand.php
@@ -5,9 +5,9 @@
 /**
  * Generic AJAX command for inserting content.
  *
- * This command instructs the client to insert the given HTML using whichever
- * jQuery DOM manipulation method has been specified in the #ajax['method']
- * variable of the element that triggered the request.
+ * This command instructs the client to insert the given render array or HTML
+ * using whichever jQuery DOM manipulation method has been specified in the
+ * #ajax['method'] variable of the element that triggered the request.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php b/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
index 623d3961b..9164fce15 100644
--- a/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/OpenDialogCommand.php
@@ -37,16 +37,18 @@ class OpenDialogCommand implements CommandInterface, CommandWithAttachedAssetsIn
   protected $content;
 
   /**
-   * Stores dialog-specific options passed directly to jQuery UI dialogs. Any
-   * jQuery UI option can be used. See http://api.jqueryui.com/dialog.
+   * Stores dialog-specific options passed directly to jQuery UI dialogs.
+   *
+   * Any jQuery UI option can be used.
+   *
+   * @see http://api.jqueryui.com/dialog.
    *
    * @var array
    */
   protected $dialogOptions;
 
   /**
-   * Custom settings that will be passed to the Drupal behaviors on the content
-   * of the dialog.
+   * Custom settings passed to Drupal behaviors on the content of the dialog.
    *
    * @var array
    */
diff --git a/web/core/lib/Drupal/Core/Ajax/PrependCommand.php b/web/core/lib/Drupal/Core/Ajax/PrependCommand.php
index e3902b8f4..7cca085a2 100644
--- a/web/core/lib/Drupal/Core/Ajax/PrependCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/PrependCommand.php
@@ -6,8 +6,8 @@
  * AJAX command for calling the jQuery insert() method.
  *
  * The 'insert/prepend' command instructs the client to use jQuery's prepend()
- * method to prepend the given HTML content to the inside each element matched
- * by the given selector.
+ * method to prepend the given render array or HTML content to the inside each
+ * element matched by the given selector.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php b/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
index 25927b799..9d7dcf266 100644
--- a/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
+++ b/web/core/lib/Drupal/Core/Ajax/ReplaceCommand.php
@@ -7,7 +7,7 @@
  *
  * The 'insert/replaceWith' command instructs the client to use jQuery's
  * replaceWith() method to replace each element matched by the given selector
- * with the given HTML.
+ * with the given render array or HTML.
  *
  * This command is implemented by Drupal.AjaxCommands.prototype.insert()
  * defined in misc/ajax.js.
diff --git a/web/core/lib/Drupal/Core/Annotation/QueueWorker.php b/web/core/lib/Drupal/Core/Annotation/QueueWorker.php
index 354642a72..4797d5f9b 100644
--- a/web/core/lib/Drupal/Core/Annotation/QueueWorker.php
+++ b/web/core/lib/Drupal/Core/Annotation/QueueWorker.php
@@ -31,6 +31,8 @@
  * @see \Drupal\Core\Queue\QueueWorkerManager
  * @see plugin_api
  *
+ * @ingroup queue
+ *
  * @Annotation
  */
 class QueueWorker extends Plugin {
@@ -45,22 +47,21 @@ class QueueWorker extends Plugin {
   /**
    * The human-readable title of the plugin.
    *
-   * @ingroup plugin_translatable
-   *
    * @var \Drupal\Core\Annotation\Translation
+   *
+   * @ingroup plugin_translatable
    */
   public $title;
 
   /**
-   * An associative array containing an optional key.
-   *
-   * This property is optional and it does not need to be declared.
-   *
-   * Available keys:
-   * - time (optional): How much time Drupal cron should spend on calling this
-   *   worker in seconds. Defaults to 15.
+   * An optional associative array of settings for cron.
    *
    * @var array
+   *   The array has one key, time, which is set to the time Drupal cron should
+   *   spend on calling this worker in seconds. The default is set in
+   *   \Drupal\Core\Queue\QueueWorkerManager::processDefinition().
+   *
+   * @see \Drupal\Core\Queue\QueueWorkerManager::processDefinition()
    */
   public $cron;
 
diff --git a/web/core/lib/Drupal/Core/Asset/AssetResolver.php b/web/core/lib/Drupal/Core/Asset/AssetResolver.php
index 7f4b110bc..496237e51 100644
--- a/web/core/lib/Drupal/Core/Asset/AssetResolver.php
+++ b/web/core/lib/Drupal/Core/Asset/AssetResolver.php
@@ -147,7 +147,7 @@ public function getCssAssets(AttachedAssetsInterface $assets, $optimize) {
 
           // Always add a tiny value to the weight, to conserve the insertion
           // order.
-          $options['weight'] += count($css) / 1000;
+          $options['weight'] += count($css) / 30000;
 
           // CSS files are being keyed by the full path.
           $css[$options['data']] = $options;
@@ -264,7 +264,7 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
 
             // Always add a tiny value to the weight, to conserve the insertion
             // order.
-            $options['weight'] += count($javascript) / 1000;
+            $options['weight'] += count($javascript) / 30000;
 
             // Local and external files must keep their name as the associative
             // key so the same JavaScript file is not added twice.
@@ -356,19 +356,22 @@ public function getJsAssets(AttachedAssetsInterface $assets, $optimize) {
   /**
    * Sorts CSS and JavaScript resources.
    *
+   * Callback for uasort().
+   *
    * This sort order helps optimize front-end performance while providing
    * modules and themes with the necessary control for ordering the CSS and
    * JavaScript appearing on a page.
    *
-   * @param $a
+   * @param array $a
    *   First item for comparison. The compared items should be associative
    *   arrays of member items.
-   * @param $b
+   * @param array $b
    *   Second item for comparison.
    *
    * @return int
+   *   The comparison result for uasort().
    */
-  public static function sort($a, $b) {
+  public static function sort(array $a, array $b) {
     // First order by group, so that all items in the CSS_AGGREGATE_DEFAULT
     // group appear before items in the CSS_AGGREGATE_THEME group. Modules may
     // create additional groups by defining their own constants.
diff --git a/web/core/lib/Drupal/Core/Asset/CssOptimizer.php b/web/core/lib/Drupal/Core/Asset/CssOptimizer.php
index c01a1ba87..9d12c6773 100644
--- a/web/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/web/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -118,7 +118,7 @@ protected function processFile($css_asset) {
    * @param $reset_basepath
    *   Used internally to facilitate recursive resolution of @import commands.
    *
-   * @return
+   * @return string
    *   Contents of the stylesheet, including any resolved @import commands.
    */
   public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
@@ -180,7 +180,7 @@ public function loadFile($file, $optimize = NULL, $reset_basepath = TRUE) {
    *   An array of matches by a preg_replace_callback() call that scans for
    *   @import-ed CSS files, except for external CSS files.
    *
-   * @return
+   * @return string
    *   The contents of the CSS file at $matches[1], with corrected paths.
    *
    * @see \Drupal\Core\Asset\AssetOptimizerInterface::loadFile()
@@ -211,7 +211,7 @@ protected function loadNestedFile($matches) {
    *   (optional) Boolean whether CSS contents should be minified. Defaults to
    *   FALSE.
    *
-   * @return
+   * @return string
    *   Contents of the stylesheet including the imported stylesheets.
    */
   protected function processCss($contents, $optimize = FALSE) {
diff --git a/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php b/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
index 09bdc01d3..9ab9a1dde 100644
--- a/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
+++ b/web/core/lib/Drupal/Core/Asset/LibraryDiscoveryParser.php
@@ -107,6 +107,18 @@ public function __construct($root, ModuleHandlerInterface $module_handler, Theme
    *   Thrown when a library has no js/css/setting.
    * @throws \UnexpectedValueException
    *   Thrown when a js file defines a positive weight.
+   * @throws \UnknownExtensionTypeException
+   *   Thrown when the extension type is unknown.
+   * @throws \UnknownExtensionException
+   *   Thrown when the extension is unknown.
+   * @throws \InvalidLibraryFileException
+   *   Thrown when the library file is invalid.
+   * @throws \InvalidLibrariesOverrideSpecificationException
+   *   Thrown when a definition refers to a non-existent library.
+   * @throws \Drupal\Core\Asset\Exception\LibraryDefinitionMissingLicenseException
+   *   Thrown when a library definition has no license information.
+   * @throws \LogicException
+   *   Thrown when a header key in a library definition is invalid.
    */
   public function buildByExtension($extension) {
     if ($extension === 'core') {
diff --git a/web/core/lib/Drupal/Core/Block/BlockPluginTrait.php b/web/core/lib/Drupal/Core/Block/BlockPluginTrait.php
index 401ab2bb1..acb850ed0 100644
--- a/web/core/lib/Drupal/Core/Block/BlockPluginTrait.php
+++ b/web/core/lib/Drupal/Core/Block/BlockPluginTrait.php
@@ -138,7 +138,7 @@ public function access(AccountInterface $account, $return_as_object = FALSE) {
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The user session for which to check access.
    *
-   * @return \Drupal\Core\Access\AccessResult
+   * @return \Drupal\Core\Access\AccessResultInterface
    *   The access result.
    *
    * @see self::access()
diff --git a/web/core/lib/Drupal/Core/Cache/CacheTagsChecksumTrait.php b/web/core/lib/Drupal/Core/Cache/CacheTagsChecksumTrait.php
index ad343de94..f75882c5e 100644
--- a/web/core/lib/Drupal/Core/Cache/CacheTagsChecksumTrait.php
+++ b/web/core/lib/Drupal/Core/Cache/CacheTagsChecksumTrait.php
@@ -48,7 +48,7 @@ public function rootTransactionEndCallback($success) {
   }
 
   /**
-   * Implements \Drupal\Core\Cache\CacheTagsChecksumInterface::invalidateTags()
+   * Implements \Drupal\Core\Cache\CacheTagsInvalidatorInterface::invalidateTags()
    */
   public function invalidateTags(array $tags) {
     // Only invalidate tags once per request unless they are written again.
diff --git a/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php b/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
index cd88b24bf..6c9206205 100644
--- a/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
+++ b/web/core/lib/Drupal/Core/Cache/Context/CacheContextsManager.php
@@ -36,6 +36,11 @@ class CacheContextsManager {
    */
   protected $contexts;
 
+  /**
+   * The set of valid context tokens.
+   */
+  protected $validContextTokens;
+
   /**
    * Constructs a CacheContextsManager object.
    *
diff --git a/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php b/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php
index 879ffae66..8fe09e93a 100644
--- a/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/DatabaseBackend.php
@@ -153,7 +153,7 @@ protected function prepareItem($cache, $allow_invalid) {
     // Check expire time.
     $cache->valid = $cache->expire == Cache::PERMANENT || $cache->expire >= REQUEST_TIME;
 
-    // Check if invalidateTags() has been called with any of the items's tags.
+    // Check if invalidateTags() has been called with any of the item's tags.
     if (!$this->checksumProvider->isValid($cache->checksum, $cache->tags)) {
       $cache->valid = FALSE;
     }
@@ -370,7 +370,7 @@ public function garbageCollection() {
         $first_invalid_create_time = $this->connection->select($this->bin)
           ->fields($this->bin, ['created'])
           ->orderBy("{$this->bin}.created", 'DESC')
-          ->range($this->maxRows, $this->maxRows + 1)
+          ->range($this->maxRows, 1)
           ->execute()
           ->fetchField();
 
diff --git a/web/core/lib/Drupal/Core/Cache/PhpBackend.php b/web/core/lib/Drupal/Core/Cache/PhpBackend.php
index 85935b0b6..c4ac0c81d 100644
--- a/web/core/lib/Drupal/Core/Cache/PhpBackend.php
+++ b/web/core/lib/Drupal/Core/Cache/PhpBackend.php
@@ -3,8 +3,8 @@
 namespace Drupal\Core\Cache;
 
 use Drupal\Component\Assertion\Inspector;
-use Drupal\Core\PhpStorage\PhpStorageFactory;
 use Drupal\Component\Utility\Crypt;
+use Drupal\Core\PhpStorage\PhpStorageFactory;
 
 /**
  * Defines a PHP cache implementation.
@@ -26,6 +26,11 @@ class PhpBackend implements CacheBackendInterface {
    */
   protected $bin;
 
+  /**
+   * The PHP storage.
+   */
+  protected $storage;
+
   /**
    * Array to store cache objects.
    */
diff --git a/web/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php b/web/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php
index 17d1e2936..f51513aed 100644
--- a/web/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php
+++ b/web/core/lib/Drupal/Core/Command/GenerateProxyClassApplication.php
@@ -8,6 +8,9 @@
 
 /**
  * Provides a console command to generate proxy classes.
+ *
+ * @see lazy_services
+ * @see core/scripts/generate-proxy.sh
  */
 class GenerateProxyClassApplication extends Application {
 
diff --git a/web/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php b/web/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php
index ac99bc6c3..be3c25d6d 100644
--- a/web/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php
+++ b/web/core/lib/Drupal/Core/Command/GenerateProxyClassCommand.php
@@ -10,6 +10,9 @@
 
 /**
  * Provides a console command to generate proxy classes.
+ *
+ * @see lazy_services
+ * @see core/scripts/generate-proxy.sh
  */
 class GenerateProxyClassCommand extends Command {
 
diff --git a/web/core/lib/Drupal/Core/Composer/Composer.php b/web/core/lib/Drupal/Core/Composer/Composer.php
index 4f7fcda1d..3dc521c62 100644
--- a/web/core/lib/Drupal/Core/Composer/Composer.php
+++ b/web/core/lib/Drupal/Core/Composer/Composer.php
@@ -155,8 +155,15 @@ public static function preAutoloadDump(Event $event) {
    *
    * @param \Composer\Script\Event $event
    *   The event.
+   *
+   * @deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Any
+   * "scripts" section mentioning this in composer.json can be removed and
+   * replaced with the drupal/core-vendor-hardening Composer plugin, as needed.
+   *
+   * @see https://www.drupal.org/node/3260624
    */
   public static function ensureHtaccess(Event $event) {
+    trigger_error('Calling ' . __METHOD__ . ' from composer.json is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Any "scripts" section mentioning this in composer.json can be removed and replaced with the drupal/core-vendor-hardening Composer plugin, as needed. See https://www.drupal.org/node/3260624', E_USER_DEPRECATED);
 
     // The current working directory for composer scripts is where you run
     // composer from.
@@ -175,8 +182,16 @@ public static function ensureHtaccess(Event $event) {
    * @param \Composer\Installer\PackageEvent $event
    *   A PackageEvent object to get the configured composer vendor directories
    *   from.
+   *
+   * @deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Any
+   * "scripts" section mentioning this in composer.json can be removed and
+   * replaced with the drupal/core-vendor-hardening Composer plugin, as needed.
+   *
+   * @see https://www.drupal.org/node/3260624
    */
   public static function vendorTestCodeCleanup(PackageEvent $event) {
+    trigger_error('Calling ' . __METHOD__ . ' from composer.json is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. Any "scripts" section mentioning this in composer.json can be removed and replaced with the drupal/core-vendor-hardening Composer plugin, as needed. See https://www.drupal.org/node/3260624', E_USER_DEPRECATED);
+
     $vendor_dir = $event->getComposer()->getConfig()->get('vendor-dir');
     $io = $event->getIO();
     $op = $event->getOperation();
@@ -232,6 +247,8 @@ public static function vendorTestCodeCleanup(PackageEvent $event) {
    *
    * @return string|null
    *   The string key, or NULL if none was found.
+   *
+   * @internal
    */
   protected static function findPackageKey($package_name) {
     $package_key = NULL;
@@ -255,8 +272,15 @@ protected static function findPackageKey($package_name) {
 
   /**
    * Removes Composer's timeout so that scripts can run indefinitely.
+   *
+   * @deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no
+   *   replacement.
+   *
+   * @see https://www.drupal.org/node/3260624
    */
   public static function removeTimeout() {
+    trigger_error('Calling ' . __METHOD__ . ' from composer.json is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3260624', E_USER_DEPRECATED);
+
     ProcessExecutor::setTimeout(0);
   }
 
@@ -268,6 +292,8 @@ public static function removeTimeout() {
    *
    * @return bool
    *   TRUE on success or FALSE on failure.
+   *
+   * @internal
    */
   protected static function deleteRecursive($path) {
     if (is_file($path) || is_link($path)) {
@@ -292,6 +318,8 @@ protected static function deleteRecursive($path) {
    *
    * @param \Composer\Script\Event $event
    *   The event.
+   *
+   * @internal
    */
   public static function upgradePHPUnit(Event $event) {
     $repository = $event->getComposer()->getRepositoryManager()->getLocalRepository();
@@ -325,6 +353,8 @@ public static function upgradePHPUnit(Event $event) {
    *
    * @return bool
    *   TRUE if the PHPUnit needs to be upgraded, FALSE if not.
+   *
+   * @internal
    */
   public static function upgradePHPUnitCheck($phpunit_version) {
     return !(version_compare(PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION, '7.4') >= 0 && version_compare($phpunit_version, '9.0') < 0);
diff --git a/web/core/lib/Drupal/Core/Config/ConfigImporter.php b/web/core/lib/Drupal/Core/Config/ConfigImporter.php
index dbe6ad994..8932423ff 100644
--- a/web/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/web/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Extension\ModuleExtensionList;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ModuleInstallerInterface;
+use Drupal\Core\Extension\ThemeExtensionList;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Config\Entity\ImportableEntityStorageInterface;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
@@ -166,6 +167,13 @@ class ConfigImporter {
    */
   protected $moduleExtensionList;
 
+  /**
+   * The theme extension list.
+   *
+   * @var \Drupal\Core\Extension\ThemeExtensionList
+   */
+  protected $themeExtensionList;
+
   /**
    * Constructs a configuration import object.
    *
@@ -190,8 +198,10 @@ class ConfigImporter {
    *   The string translation service.
    * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
    *   The module extension list.
+   * @param \Drupal\Core\Extension\ThemeExtensionList $extension_list_theme
+   *   The theme extension list.
    */
-  public function __construct(StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, LockBackendInterface $lock, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, TranslationInterface $string_translation, ModuleExtensionList $extension_list_module) {
+  public function __construct(StorageComparerInterface $storage_comparer, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, LockBackendInterface $lock, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, TranslationInterface $string_translation, ModuleExtensionList $extension_list_module, ThemeExtensionList $extension_list_theme = NULL) {
     $this->moduleExtensionList = $extension_list_module;
     $this->storageComparer = $storage_comparer;
     $this->eventDispatcher = $event_dispatcher;
@@ -202,6 +212,10 @@ public function __construct(StorageComparerInterface $storage_comparer, EventDis
     $this->moduleInstaller = $module_installer;
     $this->themeHandler = $theme_handler;
     $this->stringTranslation = $string_translation;
+    if ($extension_list_theme === NULL) {
+      $extension_list_theme = \Drupal::service('extension.list.theme');
+    }
+    $this->themeExtensionList = $extension_list_theme;
     foreach ($this->storageComparer->getAllCollectionNames() as $collection) {
       $this->processedConfiguration[$collection] = $this->storageComparer->getEmptyChangelist();
     }
@@ -384,7 +398,7 @@ protected function createExtensionChangelist() {
     $this->moduleExtensionList->reset();
     // Get a list of modules with dependency weights as values.
     $module_data = $this->moduleExtensionList->getList();
-    // Set the actual module weights.
+    // Use the actual module weights.
     $module_list = array_combine(array_keys($module_data), array_keys($module_data));
     $module_list = array_map(function ($module) use ($module_data) {
       return $module_data[$module]->sort;
@@ -429,9 +443,24 @@ protected function createExtensionChangelist() {
       $this->extensionChangelist['module']['install'][] = $new_extensions['profile'];
     }
 
+    // Get a list of themes with dependency weights as values.
+    $theme_data = $this->themeExtensionList->getList();
+    // Use the actual theme weights.
+    $theme_list = array_combine(array_keys($theme_data), array_keys($theme_data));
+    $theme_list = array_map(function ($theme) use ($theme_data) {
+      return $theme_data[$theme]->sort;
+    }, $theme_list);
+    array_multisort(array_values($theme_list), SORT_ASC, array_keys($theme_list), SORT_DESC, $theme_list);
+
     // Work out what themes to install and to uninstall.
-    $this->extensionChangelist['theme']['install'] = array_keys(array_diff_key($new_extensions['theme'], $current_extensions['theme']));
-    $this->extensionChangelist['theme']['uninstall'] = array_keys(array_diff_key($current_extensions['theme'], $new_extensions['theme']));
+    $uninstall = array_keys(array_diff_key($current_extensions['theme'], $new_extensions['theme']));
+    $this->extensionChangelist['theme']['uninstall'] = array_intersect(array_keys($theme_list), $uninstall);
+    // Ensure that installed themes are sorted in exactly the reverse order
+    // (with dependencies installed first, and themes of the same weight sorted
+    // in alphabetical order).
+    $install = array_keys(array_diff_key($new_extensions['theme'], $current_extensions['theme']));
+    $theme_list = array_reverse($theme_list);
+    $this->extensionChangelist['theme']['install'] = array_intersect(array_keys($theme_list), $install);
   }
 
   /**
@@ -507,7 +536,7 @@ public function import() {
    *   Exception thrown if the $sync_step can not be called.
    */
   public function doSyncStep($sync_step, &$context) {
-    if (!is_array($sync_step) && method_exists($this, $sync_step)) {
+    if (is_string($sync_step) && method_exists($this, $sync_step)) {
       \Drupal::service('config.installer')->setSyncing(TRUE);
       $this->$sync_step($context);
     }
@@ -601,6 +630,12 @@ protected function processConfigurations(&$context) {
           $this->totalConfigurationToProcess += count($this->getUnprocessedConfiguration($op, $collection));
         }
       }
+
+      // Adjust the totals for system.theme.
+      // @see \Drupal\Core\Config\ConfigImporter::processExtension
+      if ($this->processedSystemTheme) {
+        $this->totalConfigurationToProcess++;
+      }
     }
     $operation = $this->getNextConfigurationOperation();
     if (!empty($operation)) {
@@ -1067,13 +1102,13 @@ public function alreadyImporting() {
    * keep the services used by the importer in sync.
    */
   protected function reInjectMe() {
-    $this->_serviceIds = [];
-    $vars = get_object_vars($this);
-    foreach ($vars as $key => $value) {
-      if (is_object($value) && isset($value->_serviceId)) {
-        $this->$key = \Drupal::service($value->_serviceId);
-      }
-    }
+    // When rebuilding the container,
+    // \Drupal\Core\DrupalKernel::initializeContainer() saves the hashes of the
+    // old container and passes them to the new one. So __sleep() will
+    // recognize the old services and then __wakeup() will restore them from
+    // the new container.
+    $this->__sleep();
+    $this->__wakeup();
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Config/DatabaseStorage.php b/web/core/lib/Drupal/Core/Config/DatabaseStorage.php
index 14290691e..c40e70ee2 100644
--- a/web/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/web/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -215,7 +215,7 @@ protected static function schemaDefinition() {
   /**
    * Implements Drupal\Core\Config\StorageInterface::delete().
    *
-   * @throws PDOException
+   * @throws \PDOException
    *
    * @todo Ignore replica targets for data manipulation operations.
    */
@@ -232,7 +232,7 @@ public function delete($name) {
   /**
    * Implements Drupal\Core\Config\StorageInterface::rename().
    *
-   * @throws PDOException
+   * @throws \PDOException
    */
   public function rename($name, $new_name) {
     // @todo Remove the 'return' option in Drupal 11.
@@ -255,7 +255,7 @@ public function encode($data) {
   /**
    * Implements Drupal\Core\Config\StorageInterface::decode().
    *
-   * @throws ErrorException
+   * @throws \ErrorException
    *   The unserialize() call will trigger E_NOTICE if the string cannot
    *   be unserialized.
    */
@@ -324,9 +324,8 @@ public function getCollectionName() {
   public function getAllCollectionNames() {
     try {
       return $this->connection->query('SELECT DISTINCT [collection] FROM {' . $this->connection->escapeTable($this->table) . '} WHERE [collection] <> :collection ORDER by [collection]', [
-          ':collection' => StorageInterface::DEFAULT_COLLECTION,
-        ]
-      )->fetchCol();
+        ':collection' => StorageInterface::DEFAULT_COLLECTION,
+      ])->fetchCol();
     }
     catch (\Exception $e) {
       return [];
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
index 107126903..f171e1849 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigDependencyManager.php
@@ -186,7 +186,7 @@ public function getDependentEntities($type, $name) {
    * @param array $keys
    *   The keys whose values to extract.
    *
-   * @return
+   * @return array
    *   An array keyed by the $keys passed in. The values are arrays keyed by the
    *   row from the graph and the value is the corresponding value for the key
    *   from the graph.
diff --git a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 08731ab9d..6c614097c 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -18,6 +18,7 @@
  *
  * @ingroup entity_api
  */
+#[\AllowDynamicProperties]
 abstract class ConfigEntityBase extends EntityBase implements ConfigEntityInterface {
 
   use PluginDependencyTrait {
diff --git a/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
index 15d18cfc0..6ca9ce4dc 100644
--- a/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
+++ b/web/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
@@ -39,6 +39,16 @@ class QueryFactory implements QueryFactoryInterface, EventSubscriberInterface {
    */
   protected $namespaces;
 
+  /**
+   * The key value factory.
+   */
+  protected $keyValueFactory;
+
+  /**
+   * The configuration manager.
+   */
+  protected $configManager;
+
   /**
    * Constructs a QueryFactory object.
    *
diff --git a/web/core/lib/Drupal/Core/Config/FileStorage.php b/web/core/lib/Drupal/Core/Config/FileStorage.php
index 01b070697..fe202a3e0 100644
--- a/web/core/lib/Drupal/Core/Config/FileStorage.php
+++ b/web/core/lib/Drupal/Core/Config/FileStorage.php
@@ -154,10 +154,7 @@ public function write($name, array $data) {
       $status = @file_put_contents($target, $encoded_data);
     }
     if ($status === FALSE) {
-      throw new StorageException('Failed to write configuration file: ' . $this->getFilePath($name));
-    }
-    else {
-      $this->getFileSystem()->chmod($target);
+      throw new StorageException('Failed to write configuration file: ' . $target);
     }
 
     $this->fileCache->set($target, $data);
diff --git a/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php b/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
index 14e45059e..e9e499801 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/ArrayElement.php
@@ -137,8 +137,7 @@ protected function createElement($definition, $value, $key) {
   }
 
   /**
-   * Creates a new data definition object from a type definition array and
-   * actual configuration data.
+   * Creates a new data definition object from an array and configuration.
    *
    * @param array $definition
    *   The base type definition array, for which a data definition should be
diff --git a/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php b/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
index 9b94ae80a..18b9249ea 100644
--- a/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
+++ b/web/core/lib/Drupal/Core/Config/Schema/SchemaCheckTrait.php
@@ -18,7 +18,7 @@ trait SchemaCheckTrait {
   /**
    * The config schema wrapper object for the configuration object under test.
    *
-   * @var \Drupal\Core\Config\Schema\Element
+   * @var \Drupal\Core\TypedData\TraversableTypedDataInterface
    */
   protected $schema;
 
diff --git a/web/core/lib/Drupal/Core/Config/StorageComparer.php b/web/core/lib/Drupal/Core/Config/StorageComparer.php
index c7ccc6b0f..51f7bec93 100644
--- a/web/core/lib/Drupal/Core/Config/StorageComparer.php
+++ b/web/core/lib/Drupal/Core/Config/StorageComparer.php
@@ -90,6 +90,13 @@ class StorageComparer implements StorageComparerInterface {
    *   Storage object used to write configuration.
    */
   public function __construct(StorageInterface $source_storage, StorageInterface $target_storage) {
+    if ($source_storage->getCollectionName() !== StorageInterface::DEFAULT_COLLECTION) {
+      $source_storage = $source_storage->createCollection(StorageInterface::DEFAULT_COLLECTION);
+    }
+    if ($target_storage->getCollectionName() !== StorageInterface::DEFAULT_COLLECTION) {
+      $target_storage = $target_storage->createCollection(StorageInterface::DEFAULT_COLLECTION);
+    }
+
     // Wrap the storages in a static cache so that multiple reads of the same
     // raw configuration object are not costly.
     $this->sourceCacheStorage = new MemoryBackend();
diff --git a/web/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php b/web/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
index 5c3779fd1..b87c600fa 100644
--- a/web/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Config/TypedConfigManagerInterface.php
@@ -26,9 +26,10 @@ interface TypedConfigManagerInterface extends TypedDataManagerInterface {
   public function get($name);
 
   /**
-   * Creates a new data definition object from a type definition array and
-   * actual configuration data. Since type definitions may contain variables
-   * to be replaced, we need the configuration value to create it.
+   * Creates a new data definition object.
+   *
+   * Since type definitions may contain variables to be replaced, we need the
+   * configuration value to create it.
    *
    * @param array $definition
    *   The base type definition array, for which a data definition should be
diff --git a/web/core/lib/Drupal/Core/Controller/TitleResolver.php b/web/core/lib/Drupal/Core/Controller/TitleResolver.php
index 2cf06eca7..82c068113 100644
--- a/web/core/lib/Drupal/Core/Controller/TitleResolver.php
+++ b/web/core/lib/Drupal/Core/Controller/TitleResolver.php
@@ -57,16 +57,19 @@ public function getTitle(Request $request, Route $route) {
       $arguments = $this->argumentResolver->getArguments($request, $callable);
       $route_title = call_user_func_array($callable, $arguments);
     }
-    elseif ($title = $route->getDefault('_title')) {
+    elseif ($route->hasDefault('_title') && strlen($route->getDefault('_title')) > 0) {
+      $title = $route->getDefault('_title');
       $options = [];
-      if ($context = $route->getDefault('_title_context')) {
-        $options['context'] = $context;
+      if ($route->hasDefault('_title_context')) {
+        $options['context'] = $route->getDefault('_title_context');
       }
       $args = [];
       if (($raw_parameters = $request->attributes->get('_raw_variables'))) {
         foreach ($raw_parameters->all() as $key => $value) {
-          $args['@' . $key] = $value ?? '';
-          $args['%' . $key] = $value ?? '';
+          if (is_scalar($value)) {
+            $args['@' . $key] = $value;
+            $args['%' . $key] = $value;
+          }
         }
       }
       if ($title_arguments = $route->getDefault('_title_arguments')) {
diff --git a/web/core/lib/Drupal/Core/CoreServiceProvider.php b/web/core/lib/Drupal/Core/CoreServiceProvider.php
index 2c90f6fbc..dd94f4e5f 100644
--- a/web/core/lib/Drupal/Core/CoreServiceProvider.php
+++ b/web/core/lib/Drupal/Core/CoreServiceProvider.php
@@ -10,7 +10,6 @@
 use Drupal\Core\DependencyInjection\Compiler\DeprecatedServicePass;
 use Drupal\Core\DependencyInjection\Compiler\ContextProvidersPass;
 use Drupal\Core\DependencyInjection\Compiler\ProxyServicesPass;
-use Drupal\Core\DependencyInjection\Compiler\DependencySerializationTraitPass;
 use Drupal\Core\DependencyInjection\Compiler\StackedKernelPass;
 use Drupal\Core\DependencyInjection\Compiler\StackedSessionHandlerPass;
 use Drupal\Core\DependencyInjection\Compiler\RegisterStreamWrappersPass;
@@ -95,7 +94,6 @@ public function register(ContainerBuilder $container) {
     // Register plugin managers.
     $container->addCompilerPass(new PluginManagerPass());
 
-    $container->addCompilerPass(new DependencySerializationTraitPass());
     $container->addCompilerPass(new DeprecatedServicePass());
   }
 
diff --git a/web/core/lib/Drupal/Core/Cron.php b/web/core/lib/Drupal/Core/Cron.php
index 74e502064..569616087 100644
--- a/web/core/lib/Drupal/Core/Cron.php
+++ b/web/core/lib/Drupal/Core/Cron.php
@@ -134,6 +134,10 @@ public function run() {
     }
     else {
       $this->invokeCronHandlers();
+
+      // Process cron queues.
+      $this->processQueues();
+
       $this->setCronLastTime();
 
       // Release cron lock.
@@ -143,9 +147,6 @@ public function run() {
       $return = TRUE;
     }
 
-    // Process cron queues.
-    $this->processQueues();
-
     // Restore the user.
     $this->accountSwitcher->switchBack();
 
diff --git a/web/core/lib/Drupal/Core/CronInterface.php b/web/core/lib/Drupal/Core/CronInterface.php
index 98c3f37c6..f638e6282 100644
--- a/web/core/lib/Drupal/Core/CronInterface.php
+++ b/web/core/lib/Drupal/Core/CronInterface.php
@@ -5,7 +5,7 @@
 /**
  * An interface for running cron tasks.
  *
- * @see https://www.drupal.org/cron
+ * @see https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks
  */
 interface CronInterface {
 
diff --git a/web/core/lib/Drupal/Core/Database/Connection.php b/web/core/lib/Drupal/Core/Database/Connection.php
index 8402e6f6e..34996b8a5 100644
--- a/web/core/lib/Drupal/Core/Database/Connection.php
+++ b/web/core/lib/Drupal/Core/Database/Connection.php
@@ -16,10 +16,10 @@
 /**
  * Base Database API class.
  *
- * This class provides a Drupal-specific extension of the PDO database
- * abstraction class in PHP. Every database driver implementation must provide a
- * concrete implementation of it to support special handling required by that
- * database.
+ * This class provides a Drupal extension for a client database connection.
+ * Every database driver implementation must provide a concrete implementation
+ * of it to support special handling required by that database.
+ * The most common database abstraction layer in PHP is PDO.
  *
  * @see http://php.net/manual/book.pdo.php
  */
@@ -112,9 +112,9 @@ abstract class Connection {
   protected $temporaryNameIndex = 0;
 
   /**
-   * The actual PDO connection.
+   * The actual client connection.
    *
-   * @var \PDO
+   * @var object
    */
   protected $connection;
 
@@ -220,8 +220,8 @@ abstract class Connection {
   /**
    * Constructs a Connection object.
    *
-   * @param \PDO $connection
-   *   An object of the PDO class representing a database connection.
+   * @param object $connection
+   *   An object of the client class representing a database connection.
    * @param array $connection_options
    *   An array of options for the connection. May include the following:
    *   - prefix
@@ -230,7 +230,7 @@ abstract class Connection {
    *   An 'extra_prefix' option may be present to allow BC for attaching
    *   per-table prefixes, but it is meant for internal use only.
    */
-  public function __construct(\PDO $connection, array $connection_options) {
+  public function __construct(object $connection, array $connection_options) {
     if ($this->identifierQuotes === NULL) {
       @trigger_error('In drupal:10.0.0 not setting the $identifierQuotes property in the concrete Connection class will result in an RuntimeException. See https://www.drupal.org/node/2986894', E_USER_DEPRECATED);
       $this->identifierQuotes = ['', ''];
@@ -303,15 +303,15 @@ public function __construct(\PDO $connection, array $connection_options) {
   }
 
   /**
-   * Opens a PDO connection.
+   * Opens a client connection.
    *
    * @param array $connection_options
    *   The database connection settings array.
    *
-   * @return \PDO
-   *   A \PDO object.
+   * @return object
+   *   A client connection object.
    */
-  public static function open(array &$connection_options = []) {}
+  abstract public static function open(array &$connection_options = []);
 
   /**
    * Destroys this Connection object.
@@ -342,7 +342,7 @@ public function destroy() {
   }
 
   /**
-   * Ensures that the PDO connection can be garbage collected.
+   * Ensures that the client connection can be garbage collected.
    */
   public function __destruct() {
     // Call the ::destroy method to provide a BC layer.
@@ -362,8 +362,8 @@ public function __destruct() {
    * A given query can be customized with a number of option flags in an
    * associative array:
    * - fetch: This element controls how rows from a result set will be
-   *   returned. Legal values include PDO::FETCH_ASSOC, PDO::FETCH_BOTH,
-   *   PDO::FETCH_OBJ, PDO::FETCH_NUM, or a string representing the name of a
+   *   returned. Legal values include \PDO::FETCH_ASSOC, \PDO::FETCH_BOTH,
+   *   \PDO::FETCH_OBJ, \PDO::FETCH_NUM, or a string representing the name of a
    *   class. If a string is specified, each record will be fetched into a new
    *   object of that class. The behavior of all other values is defined by PDO.
    *   See http://php.net/manual/pdostatement.fetch.php
@@ -377,9 +377,11 @@ public function __destruct() {
    *     the query. This is usually only meaningful for SELECT queries, where
    *     the statement object is how one accesses the result set returned by the
    *     query.
-   *   - Database::RETURN_AFFECTED: Return the number of rows affected by an
-   *     UPDATE or DELETE query. Be aware that means the number of rows actually
-   *     changed, not the number of rows matched by the WHERE clause.
+   *   - Database::RETURN_AFFECTED: Return the number of rows found (matched) by
+   *     the WHERE clause of an UPDATE or DELETE query (not the number of rows
+   *     actually changed). Note that although named RETURN_AFFECTED for
+   *     historical reasons, the number of rows matched is returned for
+   *     consistency across database engines.
    *   - Database::RETURN_INSERT_ID: Return the sequence ID (primary key)
    *     created by an INSERT statement on a table that contains a serial
    *     column.
@@ -402,11 +404,11 @@ public function __destruct() {
    *   database type. In rare cases, such as creating an SQL function, []
    *   characters might be needed and can be allowed by changing this option to
    *   TRUE.
-   * - pdo: By default, queries will execute with the PDO options set on the
-   *   connection. In particular cases, it could be necessary to override the
-   *   PDO driver options on the statement level. In such case, pass the
-   *   required setting as an array here, and they will be passed to the
-   *   prepared statement. See https://www.php.net/manual/en/pdo.prepare.php.
+   * - pdo: By default, queries will execute with the client connection options
+   *   set on the connection. In particular cases, it could be necessary to
+   *   override the driver options on the statement level. In such case, pass
+   *   the required setting as an array here, and they will be passed to the
+   *   prepared statement.
    *
    * @return array
    *   An array of default query options.
@@ -607,7 +609,7 @@ public function getFullQualifiedTableName($table) {
    *   object. Defaults to FALSE.
    *
    * @return \Drupal\Core\Database\StatementInterface
-   *   A PDO prepared statement ready for its execute() method.
+   *   A prepared statement ready for its execute() method.
    *
    * @throws \InvalidArgumentException
    *   If multiple statements are included in the string, and delimiters are
@@ -874,8 +876,7 @@ protected function filterComment($comment = '') {
    * Executes a query string against the database.
    *
    * This method provides a central handler for the actual execution of every
-   * query. All queries executed by Drupal are executed as PDO prepared
-   * statements.
+   * query. All queries executed by Drupal are executed as prepared statements.
    *
    * @param string|\Drupal\Core\Database\StatementInterface|\PDOStatement $query
    *   The query to execute. This is a string containing an SQL query with
@@ -902,8 +903,8 @@ protected function filterComment($comment = '') {
    *     $options['return'] is not set (due to self::defaultOptions()),
    *     returns the executed statement.
    *   - If $options['return'] === self::RETURN_AFFECTED,
-   *     returns the number of rows affected by the query
-   *     (not the number matched).
+   *     returns the number of rows matched by the query
+   *     (not the number affected).
    *   - If $options['return'] === self::RETURN_INSERT_ID,
    *     returns the generated insert ID of the last query as a string.
    *   - If $options['return'] === self::RETURN_NULL, returns NULL.
@@ -954,6 +955,9 @@ public function query($query, array $args = [], $options = []) {
       // Depending on the type of query we may need to return a different value.
       // See DatabaseConnection::defaultOptions() for a description of each
       // value.
+      // @todo the block below is deprecated and as of Drupal 11 will be
+      //   removed, query() will only return a StatementInterface object.
+      // @see https://www.drupal.org/project/drupal/issues/3256524
       switch ($options['return'] ?? Database::RETURN_STATEMENT) {
         case Database::RETURN_STATEMENT:
           return $stmt;
@@ -967,7 +971,7 @@ public function query($query, array $args = [], $options = []) {
 
         case Database::RETURN_INSERT_ID:
           $sequence_name = $options['sequence_name'] ?? NULL;
-          return $this->connection->lastInsertId($sequence_name);
+          return $this->lastInsertId($sequence_name);
 
         case Database::RETURN_NULL:
           return NULL;
@@ -1264,10 +1268,6 @@ public function insert($table, array $options = []) {
    *
    * @throws \Drupal\Core\Database\DatabaseExceptionWrapper
    *   In case of failure.
-   *
-   * @see \PDO::lastInsertId
-   *
-   * @internal
    */
   public function lastInsertId(?string $name = NULL): string {
     if (($last_insert_id = $this->connection->lastInsertId($name)) === FALSE) {
@@ -1834,6 +1834,11 @@ abstract public function driver();
 
   /**
    * Returns the version of the database server.
+   *
+   * Assumes the client connection is \PDO. Non-PDO based drivers need to
+   * override this method.
+   *
+   * @return string
    */
   public function version() {
     return $this->connection->getAttribute(\PDO::ATTR_SERVER_VERSION);
@@ -1841,6 +1846,11 @@ public function version() {
 
   /**
    * Returns the version of the database client.
+   *
+   * Assumes the client connection is \PDO. Non-PDO based drivers need to
+   * override this method.
+   *
+   * @return string
    */
   public function clientVersion() {
     return $this->connection->getAttribute(\PDO::ATTR_CLIENT_VERSION);
@@ -1876,7 +1886,9 @@ public function supportsTransactionalDDL() {
   }
 
   /**
-   * Returns the name of the PDO driver for this connection.
+   * Returns the name of the database engine accessed by this driver.
+   *
+   * @return string
    */
   abstract public function databaseType();
 
@@ -1902,7 +1914,7 @@ abstract public function createDatabase($database);
    * @param string $operator
    *   The condition operator, such as "IN", "BETWEEN", etc. Case-sensitive.
    *
-   * @return
+   * @return array|null
    *   The extra handling directives for the specified operator, or NULL.
    *
    * @see \Drupal\Core\Database\Query\Condition::compile()
@@ -1915,7 +1927,7 @@ abstract public function mapConditionOperator($operator);
    * We do not want to allow users to commit transactions at any time, only
    * by destroying the transaction object or allowing it to go out of scope.
    * A direct commit bypasses all of the safety checks we've built on top of
-   * PDO's transaction routines.
+   * the database client's transaction routines.
    *
    * @throws \Drupal\Core\Database\TransactionExplicitCommitNotAllowedException
    *
@@ -1938,7 +1950,7 @@ public function commit() {
    *   is behind, so by passing in the maximum existing ID, it can be assured
    *   that we never issue the same ID.
    *
-   * @return
+   * @return int|string
    *   An integer number larger than any number returned by earlier calls and
    *   also larger than the $existing_id if one was passed in.
    */
@@ -2004,7 +2016,7 @@ public function quote($string, $parameter_type = \PDO::PARAM_STR) {
   }
 
   /**
-   * Extracts the SQLSTATE error from the PDOException.
+   * Extracts the SQLSTATE error from a PDOException.
    *
    * @param \Exception $e
    *   The exception
diff --git a/web/core/lib/Drupal/Core/Database/Database.php b/web/core/lib/Drupal/Core/Database/Database.php
index 8b5af32e0..3baff73a1 100644
--- a/web/core/lib/Drupal/Core/Database/Database.php
+++ b/web/core/lib/Drupal/Core/Database/Database.php
@@ -38,7 +38,7 @@ abstract class Database {
   const RETURN_STATEMENT = 1;
 
   /**
-   * Flag to indicate a query call should return the number of affected rows.
+   * Flag to indicate a query call should return the number of matched rows.
    *
    * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *   replacement.
@@ -58,8 +58,7 @@ abstract class Database {
   const RETURN_INSERT_ID = 3;
 
   /**
-   * A nested array of all active connections. It is keyed by database name
-   * and target.
+   * A nested array of active connections, keyed by database name and target.
    *
    * @var array
    */
@@ -461,8 +460,8 @@ final protected static function openConnection($key, $target) {
 
     $driver_class = self::$databaseInfo[$key][$target]['namespace'] . '\\Connection';
 
-    $pdo_connection = $driver_class::open(self::$databaseInfo[$key][$target]);
-    $new_connection = new $driver_class($pdo_connection, self::$databaseInfo[$key][$target]);
+    $client_connection = $driver_class::open(self::$databaseInfo[$key][$target]);
+    $new_connection = new $driver_class($client_connection, self::$databaseInfo[$key][$target]);
     $new_connection->setTarget($target);
     $new_connection->setKey($key);
 
@@ -495,8 +494,8 @@ public static function closeConnection($target = NULL, $key = NULL) {
     else {
       unset(self::$connections[$key]);
     }
-    // Force garbage collection to run. This ensures that PDO connection objects
-    // and destroyed and results in the connections being closed.
+    // Force garbage collection to run. This ensures that client connection
+    // objects and results in the connection being closed are destroyed.
     gc_collect_cycles();
   }
 
@@ -523,6 +522,10 @@ public static function ignoreTarget($key, $target) {
    *   The URL.
    * @param string $root
    *   The root directory of the Drupal installation.
+   * @param bool|null $include_test_drivers
+   *   (optional) Whether to include test extensions. If FALSE, all 'tests'
+   *   directories are excluded in the search. When NULL will be determined by
+   *   the extension_discovery_scan_tests setting.
    *
    * @return array
    *   The database connection info.
@@ -533,7 +536,7 @@ public static function ignoreTarget($key, $target) {
    * @throws \RuntimeException
    *   Exception thrown when a module provided database driver does not exist.
    */
-  public static function convertDbUrlToConnectionInfo($url, $root) {
+  public static function convertDbUrlToConnectionInfo($url, $root, ?bool $include_test_drivers = NULL) {
     // Check that the URL is well formed, starting with 'scheme://', where
     // 'scheme' is a database driver name.
     if (preg_match('/^(.*):\/\//', $url, $matches) !== 1) {
@@ -562,7 +565,7 @@ public static function convertDbUrlToConnectionInfo($url, $root) {
       // this method can be called before Drupal is installed and is never
       // called during regular runtime.
       $namespace = "Drupal\\$module\\Driver\\Database\\$driver";
-      $psr4_base_directory = Database::findDriverAutoloadDirectory($namespace, $root, TRUE);
+      $psr4_base_directory = Database::findDriverAutoloadDirectory($namespace, $root, $include_test_drivers);
       $additional_class_loader = new ClassLoader();
       $additional_class_loader->addPsr4($namespace . '\\', $psr4_base_directory);
       $additional_class_loader->register(TRUE);
@@ -634,6 +637,10 @@ public static function convertDbUrlToConnectionInfo($url, $root) {
    *   The database driver's namespace.
    * @param string $root
    *   The root directory of the Drupal installation.
+   * @param bool|null $include_test_drivers
+   *   (optional) Whether to include test extensions. If FALSE, all 'tests'
+   *   directories are excluded in the search. When NULL will be determined by
+   *   the extension_discovery_scan_tests setting.
    *
    * @return string|false
    *   The PSR-4 directory to add to the autoloader for the namespace if the
@@ -643,7 +650,7 @@ public static function convertDbUrlToConnectionInfo($url, $root) {
    * @throws \RuntimeException
    *   Exception thrown when a module provided database driver does not exist.
    */
-  public static function findDriverAutoloadDirectory($namespace, $root) {
+  public static function findDriverAutoloadDirectory($namespace, $root, ?bool $include_test_drivers = NULL) {
     // As explained by this method's documentation, return FALSE if the
     // namespace is not a sub-namespace of a Drupal module.
     if (!static::isWithinModuleNamespace($namespace)) {
@@ -656,7 +663,7 @@ public static function findDriverAutoloadDirectory($namespace, $root) {
     // The namespace is within a Drupal module. Find the directory where the
     // module is located.
     $extension_discovery = new ExtensionDiscovery($root, FALSE, []);
-    $modules = $extension_discovery->scan('module');
+    $modules = $extension_discovery->scan('module', $include_test_drivers);
     if (!isset($modules[$module])) {
       throw new \RuntimeException(sprintf("Cannot find the module '%s' for the database driver namespace '%s'", $module, $namespace));
     }
diff --git a/web/core/lib/Drupal/Core/Database/DatabaseException.php b/web/core/lib/Drupal/Core/Database/DatabaseException.php
index 7b7af3940..a56b5ccda 100644
--- a/web/core/lib/Drupal/Core/Database/DatabaseException.php
+++ b/web/core/lib/Drupal/Core/Database/DatabaseException.php
@@ -6,9 +6,8 @@
 /**
  * Interface for a database exception.
  *
- * All Database exceptions should implement this interface so that they can be
- * caught collectively.  Note that this applies only to Drupal-spawned
- * exceptions.  PDOException will not implement this interface and module
- * developers should account for it separately.
+ * Database drivers should catch lower-level database client exceptions and
+ * throw exceptions that implement this interface to allow database
+ * abstraction in Drupal.
  */
 interface DatabaseException { }
diff --git a/web/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php b/web/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
index 0b6f338c0..ec26c9331 100644
--- a/web/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
+++ b/web/core/lib/Drupal/Core/Database/DatabaseExceptionWrapper.php
@@ -5,7 +5,8 @@
 /**
  * This wrapper class serves only to provide additional debug information.
  *
- * This class will always wrap a PDOException.
+ * This class will always wrap a client connection exception, for example
+ * \PDOException or \mysqli_sql_exception.
  */
 class DatabaseExceptionWrapper extends \RuntimeException implements DatabaseException {
 
diff --git a/web/core/lib/Drupal/Core/Database/ExceptionHandler.php b/web/core/lib/Drupal/Core/Database/ExceptionHandler.php
index dcbbd5dd0..137410d28 100644
--- a/web/core/lib/Drupal/Core/Database/ExceptionHandler.php
+++ b/web/core/lib/Drupal/Core/Database/ExceptionHandler.php
@@ -5,9 +5,10 @@
 /**
  * Base Database exception handler class.
  *
- * This class handles exceptions thrown by the database layer. Database driver
- * implementation can provide an alternative implementation to support special
- * handling required by that database.
+ * This class handles exceptions thrown by the database layer of a PDO-based
+ * database connection. Database driver implementations can provide an
+ * alternative implementation to support special handling required by that
+ * database.
  */
 class ExceptionHandler {
 
diff --git a/web/core/lib/Drupal/Core/Database/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Install/Tasks.php
index fcbb1a401..91eaa3d87 100644
--- a/web/core/lib/Drupal/Core/Database/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Install/Tasks.php
@@ -8,7 +8,9 @@
 /**
  * Database installer structure.
  *
- * Defines basic Drupal requirements for databases.
+ * Defines basic Drupal requirements for databases connecting via PDO.
+ * Every database driver implementation must provide a concrete implementation
+ * of it to support special handling required by that database.
  */
 abstract class Tasks {
 
diff --git a/web/core/lib/Drupal/Core/Database/Log.php b/web/core/lib/Drupal/Core/Database/Log.php
index 6499a2b67..f29889468 100644
--- a/web/core/lib/Drupal/Core/Database/Log.php
+++ b/web/core/lib/Drupal/Core/Database/Log.php
@@ -70,7 +70,7 @@ public function start($logging_key) {
    * @param $logging_key
    *   The logging key to fetch.
    *
-   * @return
+   * @return array
    *   An indexed array of all query records for this logging key.
    */
   public function get($logging_key) {
@@ -144,7 +144,7 @@ public function log(StatementInterface $statement, $args, $time, float $start =
    * See the @link http://php.net/debug_backtrace debug_backtrace() @endlink
    * function.
    *
-   * @return
+   * @return array|null
    *   This method returns a stack trace entry similar to that generated by
    *   debug_backtrace(). However, it flattens the trace entry and the trace
    *   entry before it so that we get the function and args of the function that
diff --git a/web/core/lib/Drupal/Core/Database/Query/AlterableInterface.php b/web/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
index a77c26acd..347019569 100644
--- a/web/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
@@ -30,7 +30,7 @@ public function addTag($tag);
    * @param $tag
    *   The tag to check.
    *
-   * @return
+   * @return bool
    *   TRUE if this query has been marked with this tag, FALSE otherwise.
    */
   public function hasTag($tag);
@@ -43,7 +43,7 @@ public function hasTag($tag);
    * @todo Restore PHPDoc of variadic argument in Drupal 8.8, see
    * https://www.drupal.org/project/drupal/issues/3029729
    *
-   * @return
+   * @return bool
    *   TRUE if this query has been marked with all specified tags, FALSE
    *   otherwise.
    */
@@ -57,7 +57,7 @@ public function hasAllTags();
    * @todo Restore PHPDoc of variadic argument in Drupal 8.8, see
    * https://www.drupal.org/project/drupal/issues/3029729
    *
-   * @return
+   * @return bool
    *   TRUE if this query has been marked with at least one of the specified
    *   tags, FALSE otherwise.
    */
@@ -87,7 +87,7 @@ public function addMetaData($key, $object);
    * @param $key
    *   The unique identifier for the piece of metadata to retrieve.
    *
-   * @return
+   * @return mixed
    *   The previously attached metadata object, or NULL if one doesn't exist.
    */
   public function getMetaData($key);
diff --git a/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php b/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
index 5c08c9801..347f25645 100644
--- a/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
@@ -170,7 +170,7 @@ public function &conditions();
   /**
    * Gets a complete list of all values to insert into the prepared statement.
    *
-   * @return
+   * @return array
    *   An associative array of placeholders and values.
    */
   public function arguments();
@@ -192,7 +192,7 @@ public function compile(Connection $connection, PlaceholderInterface $queryPlace
   /**
    * Check whether a condition has been previously compiled.
    *
-   * @return
+   * @return bool
    *   TRUE if the condition has been previously compiled.
    */
   public function compiled();
diff --git a/web/core/lib/Drupal/Core/Database/Query/Insert.php b/web/core/lib/Drupal/Core/Database/Query/Insert.php
index b6538e4bb..58bd8d181 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -57,7 +57,7 @@ public function from(SelectInterface $query) {
   /**
    * Executes the insert query.
    *
-   * @return
+   * @return int|null|string
    *   The last insert ID of the query, if one exists. If the query was given
    *   multiple sets of values to insert, the return value is undefined. If no
    *   fields are specified, this method will do nothing and return NULL. That
diff --git a/web/core/lib/Drupal/Core/Database/Query/Merge.php b/web/core/lib/Drupal/Core/Database/Query/Merge.php
index fffca6ce9..1a13acf5c 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -356,7 +356,7 @@ public function __toString() {
   /**
    * Executes the merge database query.
    *
-   * @return
+   * @return int|null
    *   One of the following values:
    *   - Merge::STATUS_INSERT: If the entry does not already exist,
    *     and an INSERT query is executed.
@@ -420,6 +420,7 @@ public function execute() {
       }
       throw $e;
     }
+    return NULL;
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php b/web/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php
index f2a00dec5..9295a369a 100644
--- a/web/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/PlaceholderInterface.php
@@ -15,7 +15,7 @@ public function uniqueIdentifier();
   /**
    * Returns the next placeholder ID for the query.
    *
-   * @return
+   * @return int
    *   The next available placeholder ID as an integer.
    */
   public function nextPlaceholder();
diff --git a/web/core/lib/Drupal/Core/Database/Query/Select.php b/web/core/lib/Drupal/Core/Database/Query/Select.php
index ac7bdd4e6..9f0f72c03 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Select.php
@@ -93,8 +93,9 @@ class Select extends Query implements SelectInterface {
   protected $range;
 
   /**
-   * An array whose elements specify a query to UNION, and the UNION type. The
-   * 'type' key may be '', 'ALL', or 'DISTINCT' to represent a 'UNION',
+   * An array whose elements specify a query to UNION, and the UNION type.
+   *
+   * The 'type' key may be '', 'ALL', or 'DISTINCT' to represent a 'UNION',
    * 'UNION ALL', or 'UNION DISTINCT' statement, respectively.
    *
    * All entries in this array will be applied from front to back, with the
@@ -118,6 +119,16 @@ class Select extends Query implements SelectInterface {
    */
   protected $forUpdate = FALSE;
 
+  /**
+   * The query metadata for alter purposes.
+   */
+  public $alterMetaData;
+
+  /**
+   * The query tags.
+   */
+  public $alterTags;
+
   /**
    * Constructs a Select object.
    *
@@ -867,7 +878,10 @@ public function __toString() {
 
     // GROUP BY
     if ($this->group) {
-      $query .= "\nGROUP BY " . implode(', ', $this->group);
+      $group_by_fields = array_map(function (string $field): string {
+        return $this->connection->escapeField($field);
+      }, $this->group);
+      $query .= "\nGROUP BY " . implode(', ', $group_by_fields);
     }
 
     // HAVING
diff --git a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index 449d0b64d..2c4416ad2 100644
--- a/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/web/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -26,7 +26,7 @@ interface SelectInterface extends ConditionInterface, AlterableInterface, Extend
    * $fields =& $query->getFields();
    * @endcode
    *
-   * @return
+   * @return array
    *   A reference to the fields array structure.
    */
   public function &getFields();
@@ -44,7 +44,7 @@ public function &getFields();
    * $fields =& $query->getExpressions();
    * @endcode
    *
-   * @return
+   * @return array
    *   A reference to the expression array structure.
    */
   public function &getExpressions();
@@ -62,7 +62,7 @@ public function &getExpressions();
    * $fields =& $query->getOrderBy();
    * @endcode
    *
-   * @return
+   * @return array
    *   A reference to the expression array structure.
    */
   public function &getOrderBy();
@@ -80,7 +80,7 @@ public function &getOrderBy();
    * $fields =& $query->getGroupBy();
    * @endcode
    *
-   * @return
+   * @return array
    *   A reference to the group-by array structure.
    */
   public function &getGroupBy();
@@ -98,14 +98,15 @@ public function &getGroupBy();
    * $tables =& $query->getTables();
    * @endcode
    *
-   * @return
+   * @return array
    *   A reference to the tables array structure.
    */
   public function &getTables();
 
   /**
-   * Returns a reference to the union queries for this query. This include
-   * queries for UNION, UNION ALL, and UNION DISTINCT.
+   * Returns a reference to the union queries for this query.
+   *
+   * This includes queries for UNION, UNION ALL, and UNION DISTINCT.
    *
    * Because this method returns by reference, alter hooks may edit the tables
    * array directly to make their changes. If just adding union queries,
@@ -117,7 +118,7 @@ public function &getTables();
    * $fields =& $query->getUnion();
    * @endcode
    *
-   * @return
+   * @return array
    *   A reference to the union query array structure.
    */
   public function &getUnion();
@@ -145,7 +146,7 @@ public function escapeLike($string);
    * @param string $string
    *   An unsanitized field name.
    *
-   * @return
+   * @return string
    *   The sanitized field name string.
    */
   public function escapeField($string);
@@ -157,7 +158,7 @@ public function escapeField($string);
    *   When collecting the arguments of a subquery, the main placeholder
    *   object should be passed as this parameter.
    *
-   * @return
+   * @return array
    *   An associative array of all placeholder arguments for this query.
    */
   public function getArguments(PlaceholderInterface $queryPlaceholder = NULL);
@@ -190,7 +191,7 @@ public function distinct($distinct = TRUE);
    *   checked for uniqueness, so the requested alias may not be the alias
    *   that is assigned in all cases.
    *
-   * @return
+   * @return string
    *   The unique alias that was assigned for this field.
    */
   public function addField($table_alias, $field, $alias = NULL);
@@ -236,7 +237,7 @@ public function fields($table_alias, array $fields = []);
    * @param $arguments
    *   Any placeholder arguments needed for this expression.
    *
-   * @return
+   * @return string
    *   The unique alias that was assigned for this expression.
    */
   public function addExpression($expression, $alias = NULL, $arguments = []);
@@ -265,7 +266,7 @@ public function addExpression($expression, $alias = NULL, $arguments = []);
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
    *
-   * @return
+   * @return string
    *   The unique alias that was assigned for this table.
    */
   public function join($table, $alias = NULL, $condition = NULL, $arguments = []);
@@ -292,7 +293,7 @@ public function join($table, $alias = NULL, $condition = NULL, $arguments = []);
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
    *
-   * @return
+   * @return string
    *   The unique alias that was assigned for this table.
    */
   public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
@@ -319,7 +320,7 @@ public function innerJoin($table, $alias = NULL, $condition = NULL, $arguments =
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
    *
-   * @return
+   * @return string
    *   The unique alias that was assigned for this table.
    */
   public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments = []);
@@ -353,7 +354,7 @@ public function leftJoin($table, $alias = NULL, $condition = NULL, $arguments =
    * @param $arguments
    *   An array of arguments to replace into the $condition of this join.
    *
-   * @return
+   * @return string
    *   The unique alias that was assigned for this table.
    */
   public function addJoin($type, $table, $alias = NULL, $condition = NULL, $arguments = []);
@@ -478,7 +479,7 @@ public function countQuery();
   /**
    * Indicates if preExecute() has already been called on that object.
    *
-   * @return
+   * @return bool
    *   TRUE is this query has already been prepared, FALSE otherwise.
    */
   public function isPrepared();
@@ -486,7 +487,7 @@ public function isPrepared();
   /**
    * Generic preparation and validation for a SELECT query.
    *
-   * @return
+   * @return bool
    *   TRUE if the validation was successful, FALSE if not.
    */
   public function preExecute(SelectInterface $query = NULL);
diff --git a/web/core/lib/Drupal/Core/Database/Query/Truncate.php b/web/core/lib/Drupal/Core/Database/Query/Truncate.php
index 66b39644b..01f0c9d47 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Truncate.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Truncate.php
@@ -35,24 +35,10 @@ public function __construct(Connection $connection, $table, array $options = [])
     $this->table = $table;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function compile(Connection $connection, PlaceholderInterface $queryPlaceholder) {
-    return $this->condition->compile($connection, $queryPlaceholder);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function compiled() {
-    return $this->condition->compiled();
-  }
-
   /**
    * Executes the TRUNCATE query.
    *
-   * @return
+   * @return int|null
    *   Return value is dependent on whether the executed SQL statement is a
    *   TRUNCATE or a DELETE. TRUNCATE is DDL and no information on affected
    *   rows is available. DELETE is DML and will return the number of affected
@@ -70,6 +56,8 @@ public function execute() {
     catch (\Exception $e) {
       $this->connection->exceptionHandler()->handleExecutionException($e, $stmt, [], $this->queryOptions);
     }
+
+    return NULL;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Database/Query/Update.php b/web/core/lib/Drupal/Core/Database/Query/Update.php
index 1311083e1..fb7db437a 100644
--- a/web/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/web/core/lib/Drupal/Core/Database/Query/Update.php
@@ -115,7 +115,7 @@ public function expression($field, $expression, array $arguments = NULL) {
   /**
    * Executes the UPDATE query.
    *
-   * @return
+   * @return int|null
    *   The number of rows matched by the update query. This includes rows that
    *   actually didn't have to be updated because the values didn't change.
    */
diff --git a/web/core/lib/Drupal/Core/Database/RowCountException.php b/web/core/lib/Drupal/Core/Database/RowCountException.php
index 83b6d65e7..c3272e0ea 100644
--- a/web/core/lib/Drupal/Core/Database/RowCountException.php
+++ b/web/core/lib/Drupal/Core/Database/RowCountException.php
@@ -9,7 +9,7 @@ class RowCountException extends \RuntimeException implements DatabaseException {
 
   public function __construct($message = '', $code = 0, \Exception $previous = NULL) {
     if (empty($message)) {
-      $message = "rowCount() is supported for DELETE, INSERT, or UPDATE statements performed with structured query builders only, since they would not be portable across database engines otherwise. If the query builders are not sufficient, use a prepareStatement() with an \$allow_row_count argument set to TRUE, execute() the Statement and get the number of affected rows via rowCount().";
+      $message = "rowCount() is supported for DELETE, INSERT, or UPDATE statements performed with structured query builders only, since they would not be portable across database engines otherwise. If the query builders are not sufficient, use a prepareStatement() with an \$allow_row_count argument set to TRUE, execute() the Statement and get the number of matched rows via rowCount().";
     }
     parent::__construct($message, $code, $previous);
   }
diff --git a/web/core/lib/Drupal/Core/Database/Schema.php b/web/core/lib/Drupal/Core/Database/Schema.php
index 6c91b5d4a..546861e45 100644
--- a/web/core/lib/Drupal/Core/Database/Schema.php
+++ b/web/core/lib/Drupal/Core/Database/Schema.php
@@ -162,7 +162,7 @@ protected function buildTableNameCondition($table_name, $operator = '=', $add_pr
    * @param $table
    *   The name of the table in drupal (no prefixing).
    *
-   * @return
+   * @return bool
    *   TRUE if the given table exists, otherwise FALSE.
    */
   public function tableExists($table) {
@@ -248,7 +248,7 @@ public function findTables($table_expression) {
    * @param string $column
    *   The name of the column.
    *
-   * @return
+   * @return bool
    *   TRUE if the given column exists, otherwise FALSE.
    */
   public function fieldExists($table, $column) {
@@ -296,7 +296,7 @@ abstract public function renameTable($table, $new_name);
    * @param $table
    *   The table to be dropped.
    *
-   * @return
+   * @return bool
    *   TRUE if the table was successfully dropped, FALSE if there was no table
    *   by that name to begin with.
    */
@@ -340,7 +340,7 @@ abstract public function addField($table, $field, $spec, $keys_new = []);
    * @param $field
    *   The field to be dropped.
    *
-   * @return
+   * @return bool
    *   TRUE if the field was successfully dropped, FALSE if there was no field
    *   by that name to begin with.
    */
@@ -354,7 +354,7 @@ abstract public function dropField($table, $field);
    * @param $name
    *   The name of the index in drupal (no prefixing).
    *
-   * @return
+   * @return bool
    *   TRUE if the given index exists, otherwise FALSE.
    */
   abstract public function indexExists($table, $name);
@@ -380,7 +380,7 @@ abstract public function addPrimaryKey($table, $fields);
    * @param $table
    *   The table to be altered.
    *
-   * @return
+   * @return bool
    *   TRUE if the primary key was successfully dropped, FALSE if there was no
    *   primary key on this table to begin with.
    */
@@ -431,7 +431,7 @@ abstract public function addUniqueKey($table, $name, $fields);
    * @param $name
    *   The name of the key.
    *
-   * @return
+   * @return bool
    *   TRUE if the key was successfully dropped, FALSE if there was no key by
    *   that name to begin with.
    */
@@ -507,7 +507,7 @@ abstract public function addIndex($table, $name, $fields, array $spec);
    * @param $name
    *   The name of the index.
    *
-   * @return
+   * @return bool
    *   TRUE if the index was successfully dropped, FALSE if there was no index
    *   by that name to begin with.
    */
@@ -633,7 +633,7 @@ public function createTable($name, $table) {
    * @param $fields
    *   An array of key/index column specifiers.
    *
-   * @return
+   * @return array
    *   An array of field names.
    */
   public function fieldNames($fields) {
@@ -657,7 +657,7 @@ public function fieldNames($fields) {
    * @param $length
    *   Optional upper limit on the returned string length.
    *
-   * @return
+   * @return string
    *   The prepared comment.
    */
   public function prepareComment($comment, $length = NULL) {
@@ -667,8 +667,7 @@ public function prepareComment($comment, $length = NULL) {
   }
 
   /**
-   * Return an escaped version of its parameter to be used as a default value
-   * on a column.
+   * Escapes a value to be used as the default value on a column.
    *
    * @param mixed $value
    *   The value to be escaped (int, float, null or string).
diff --git a/web/core/lib/Drupal/Core/Database/StatementInterface.php b/web/core/lib/Drupal/Core/Database/StatementInterface.php
index 0bb030d01..c0a1733dd 100644
--- a/web/core/lib/Drupal/Core/Database/StatementInterface.php
+++ b/web/core/lib/Drupal/Core/Database/StatementInterface.php
@@ -31,7 +31,7 @@ interface StatementInterface extends \Traversable {
    * @param $options
    *   An array of options for this query.
    *
-   * @return
+   * @return bool
    *   TRUE on success, or FALSE on failure.
    */
   public function execute($args = [], $options = []);
@@ -39,7 +39,7 @@ public function execute($args = [], $options = []);
   /**
    * Gets the query string of this statement.
    *
-   * @return
+   * @return string
    *   The query string, in its form with placeholders.
    */
   public function getQueryString();
@@ -55,10 +55,10 @@ public function getQueryString();
   // public function getConnectionTarget(): string;
 
   /**
-   * Returns the number of rows affected by the last SQL statement.
+   * Returns the number of rows matched by the last SQL statement.
    *
-   * @return
-   *   The number of rows affected by the last DELETE, INSERT, or UPDATE
+   * @return int
+   *   The number of rows matched by the last DELETE, INSERT, or UPDATE
    *   statement executed or throws \Drupal\Core\Database\RowCountException
    *   if the last executed statement was SELECT.
    *
@@ -73,14 +73,14 @@ public function rowCount();
    * constants used.
    *
    * @param $mode
-   *   One of the PDO::FETCH_* constants.
+   *   One of the \PDO::FETCH_* constants.
    * @param $a1
    *   An option depending of the fetch mode specified by $mode:
-   *   - for PDO::FETCH_COLUMN, the index of the column to fetch
-   *   - for PDO::FETCH_CLASS, the name of the class to create
-   *   - for PDO::FETCH_INTO, the object to add the data to
+   *   - for \PDO::FETCH_COLUMN, the index of the column to fetch
+   *   - for \PDO::FETCH_CLASS, the name of the class to create
+   *   - for \PDO::FETCH_INTO, the object to add the data to
    * @param $a2
-   *   If $mode is PDO::FETCH_CLASS, the optional arguments to pass to the
+   *   If $mode is \PDO::FETCH_CLASS, the optional arguments to pass to the
    *   constructor.
    */
   public function setFetchMode($mode, $a1 = NULL, $a2 = []);
@@ -92,15 +92,15 @@ public function setFetchMode($mode, $a1 = NULL, $a2 = []);
    * constants used.
    *
    * @param $mode
-   *   One of the PDO::FETCH_* constants.
+   *   One of the \PDO::FETCH_* constants.
    *   Default to what was specified by setFetchMode().
    * @param $cursor_orientation
    *   Not implemented in all database drivers, don't use.
    * @param $cursor_offset
    *   Not implemented in all database drivers, don't use.
    *
-   * @return
-   *   A result, formatted according to $mode.
+   * @return array|object|false
+   *   A result, formatted according to $mode, or FALSE on failure.
    */
   public function fetch($mode = NULL, $cursor_orientation = NULL, $cursor_offset = NULL);
 
@@ -110,7 +110,7 @@ public function fetch($mode = NULL, $cursor_orientation = NULL, $cursor_offset =
    * @param $index
    *   The numeric index of the field to return. Defaults to the first field.
    *
-   * @return
+   * @return mixed
    *   A single field from the next record, or FALSE if there is no next record.
    */
   public function fetchField($index = 0);
@@ -122,7 +122,7 @@ public function fetchField($index = 0);
    * or stdClass if not specified.
    *
    * phpcs:disable Drupal.Commenting
-   * @todo Remove PHPCS overrides https://www.drupal.org/node/3194677.
+   * @todo Remove PHPCS overrides https://www.drupal.org/node/3354672.
    *
    * @param string|null $class_name
    *   Name of the created class.
@@ -139,11 +139,11 @@ public function fetchObject(/* string $class_name = NULL, array $constructor_arg
   /**
    * Fetches the next row and returns it as an associative array.
    *
-   * This method corresponds to PDOStatement::fetchObject(), but for associative
-   * arrays. For some reason PDOStatement does not have a corresponding array
-   * helper method, so one is added.
+   * This method corresponds to \PDOStatement::fetchObject(), but for
+   * associative arrays. For some reason \PDOStatement does not have a
+   * corresponding array helper method, so one is added.
    *
-   * @return
+   * @return array|bool
    *   An associative array, or FALSE if there is no next row.
    */
   public function fetchAssoc();
@@ -152,13 +152,13 @@ public function fetchAssoc();
    * Returns an array containing all of the result set rows.
    *
    * @param $mode
-   *   One of the PDO::FETCH_* constants.
+   *   One of the \PDO::FETCH_* constants.
    * @param $column_index
-   *   If $mode is PDO::FETCH_COLUMN, the index of the column to fetch.
+   *   If $mode is \PDO::FETCH_COLUMN, the index of the column to fetch.
    * @param $constructor_arguments
-   *   If $mode is PDO::FETCH_CLASS, the arguments to pass to the constructor.
+   *   If $mode is \PDO::FETCH_CLASS, the arguments to pass to the constructor.
    *
-   * @return
+   * @return array
    *   An array of results.
    */
   public function fetchAll($mode = NULL, $column_index = NULL, $constructor_arguments = NULL);
@@ -171,7 +171,7 @@ public function fetchAll($mode = NULL, $column_index = NULL, $constructor_argume
    * @param $index
    *   The index of the column number to fetch.
    *
-   * @return
+   * @return array
    *   An indexed array, or an empty array if there is no result set.
    */
   public function fetchCol($index = 0);
@@ -191,7 +191,7 @@ public function fetchCol($index = 0);
    * @param $value_index
    *   The numeric index of the field to use as the array value.
    *
-   * @return
+   * @return array
    *   An associative array, or an empty array if there is no result set.
    */
   public function fetchAllKeyed($key_index = 0, $value_index = 1);
@@ -205,12 +205,12 @@ public function fetchAllKeyed($key_index = 0, $value_index = 1);
    * @param $key
    *   The name of the field on which to index the array.
    * @param $fetch
-   *   The fetchmode to use. If set to PDO::FETCH_ASSOC, PDO::FETCH_NUM, or
-   *   PDO::FETCH_BOTH the returned value with be an array of arrays. For any
+   *   The fetch mode to use. If set to \PDO::FETCH_ASSOC, \PDO::FETCH_NUM, or
+   *   \PDO::FETCH_BOTH the returned value with be an array of arrays. For any
    *   other value it will be an array of objects. By default, the fetch mode
    *   set for the query will be used.
    *
-   * @return
+   * @return array
    *   An associative array, or an empty array if there is no result set.
    */
   public function fetchAllAssoc($key, $fetch = NULL);
diff --git a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
index 267b6a85d..a43792aae 100644
--- a/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/web/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -5,8 +5,9 @@
 /**
  * An implementation of StatementInterface that prefetches all data.
  *
- * This class behaves very similar to a \PDOStatement but as it always fetches
- * every row it is possible to manipulate those results.
+ * This class behaves very similar to a StatementWrapper of a \PDOStatement
+ * but as it always fetches every row it is possible to manipulate those
+ * results.
  */
 class StatementPrefetch implements \Iterator, StatementInterface {
 
@@ -67,7 +68,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
   protected $columnNames = NULL;
 
   /**
-   * The number of rows affected by the last query.
+   * The number of rows matched by the last query.
    *
    * @var int
    */
@@ -138,7 +139,7 @@ class StatementPrefetch implements \Iterator, StatementInterface {
    * @param array $driver_options
    *   Driver-specific options.
    * @param bool $row_count_enabled
-   *   (optional) Enables counting the rows affected. Defaults to FALSE.
+   *   (optional) Enables counting the rows matched. Defaults to FALSE.
    */
   public function __construct(\PDO $pdo_connection, Connection $connection, $query, array $driver_options = [], bool $row_count_enabled = FALSE) {
     $this->pdoConnection = $pdo_connection;
diff --git a/web/core/lib/Drupal/Core/Database/StatementWrapper.php b/web/core/lib/Drupal/Core/Database/StatementWrapper.php
index 2b3eb40f4..244e92e97 100644
--- a/web/core/lib/Drupal/Core/Database/StatementWrapper.php
+++ b/web/core/lib/Drupal/Core/Database/StatementWrapper.php
@@ -44,7 +44,7 @@ class StatementWrapper implements \IteratorAggregate, StatementInterface {
    * @param array $options
    *   Array of query options.
    * @param bool $row_count_enabled
-   *   (optional) Enables counting the rows affected. Defaults to FALSE.
+   *   (optional) Enables counting the rows matched. Defaults to FALSE.
    */
   public function __construct(Connection $connection, $client_connection, string $query, array $options, bool $row_count_enabled = FALSE) {
     $this->connection = $connection;
diff --git a/web/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php b/web/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php
index f1a4cbf9b..5d3434228 100644
--- a/web/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php
+++ b/web/core/lib/Drupal/Core/Database/TransactionExplicitCommitNotAllowedException.php
@@ -5,7 +5,7 @@
 /**
  * Exception to deny attempts to explicitly manage transactions.
  *
- * This exception will be thrown when the PDO connection commit() is called.
+ * This exception will be thrown when the client connection commit() is called.
  * Code should never call this method directly.
  */
 class TransactionExplicitCommitNotAllowedException extends TransactionException implements DatabaseException {}
diff --git a/web/core/lib/Drupal/Core/Database/database.api.php b/web/core/lib/Drupal/Core/Database/database.api.php
index cdaf84c35..ab7041088 100644
--- a/web/core/lib/Drupal/Core/Database/database.api.php
+++ b/web/core/lib/Drupal/Core/Database/database.api.php
@@ -14,13 +14,20 @@
  *
  * @section sec_intro Overview
  * Drupal's database abstraction layer provides a unified database query API
- * that can query different underlying databases. It is built upon PHP's
- * PDO (PHP Data Objects) database API, and inherits much of its syntax and
- * semantics. Besides providing a unified API for database queries, the
+ * that can query different underlying databases. It is generally built upon
+ * PHP's PDO (PHP Data Objects) database API, and inherits much of its syntax
+ * and semantics. Besides providing a unified API for database queries, the
  * database abstraction layer also provides a structured way to construct
  * complex queries, and it protects the database by using good security
  * practices.
  *
+ * Drupal provides 'database drivers', in the form of Drupal modules, for the
+ * concrete implementation of its API towards a specific database engine.
+ * MySql, PostgreSQL and SQLite are core implementations, built on PDO. Other
+ * modules can provide implementations for additional database engines, like
+ * MSSql or Oracle; or alternative low-level database connection clients like
+ * mysqli or oci8.
+ *
  * For more detailed information on the database abstraction layer, see
  * https://www.drupal.org/docs/8/api/database-api/database-api-overview.
  *
diff --git a/web/core/lib/Drupal/Core/Datetime/DateFormatter.php b/web/core/lib/Drupal/Core/Datetime/DateFormatter.php
index d784743cd..03fb79172 100644
--- a/web/core/lib/Drupal/Core/Datetime/DateFormatter.php
+++ b/web/core/lib/Drupal/Core/Datetime/DateFormatter.php
@@ -315,8 +315,14 @@ public function formatDiff($from, $to, $options = []) {
   /**
    * Loads the given format pattern for the given langcode.
    *
-   * @param string $format
-   *   The machine name of the date format.
+   * @param string $type
+   *   The machine name of the date format type which is one of:
+   *   - One of the built-in date format types: 'short', 'medium',
+   *     'long', 'html_datetime', 'html_date', 'html_time',
+   *     'html_yearless_date', 'html_week', 'html_month', 'html_year'.
+   *   - The name of a date format type defined by a date format config entity.
+   *   - The machine name of an administrator-defined date format type.
+   *   - 'custom' for a custom date format type.
    * @param string $langcode
    *   The langcode of the language to use.
    *
@@ -324,14 +330,14 @@ public function formatDiff($from, $to, $options = []) {
    *   The configuration entity for the date format in the given language for
    *   non-custom formats, NULL otherwise.
    */
-  protected function dateFormat($format, $langcode) {
-    if (!isset($this->dateFormats[$format][$langcode])) {
+  protected function dateFormat($type, $langcode) {
+    if (!isset($this->dateFormats[$type][$langcode])) {
       $original_language = $this->languageManager->getConfigOverrideLanguage();
       $this->languageManager->setConfigOverrideLanguage(new Language(['id' => $langcode]));
-      $this->dateFormats[$format][$langcode] = $this->dateFormatStorage->load($format);
+      $this->dateFormats[$type][$langcode] = $this->dateFormatStorage->load($type);
       $this->languageManager->setConfigOverrideLanguage($original_language);
     }
-    return $this->dateFormats[$format][$langcode];
+    return $this->dateFormats[$type][$langcode];
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Datetime/DateHelper.php b/web/core/lib/Drupal/Core/Datetime/DateHelper.php
index bbe76d1e2..6eabebfd3 100644
--- a/web/core/lib/Drupal/Core/Datetime/DateHelper.php
+++ b/web/core/lib/Drupal/Core/Datetime/DateHelper.php
@@ -436,9 +436,9 @@ public static function seconds($format = 's', $required = FALSE, $increment = 1)
   public static function ampm($required = FALSE) {
     $none = ['' => ''];
     $ampm = [
-             'am' => t('am', [], ['context' => 'ampm']),
-             'pm' => t('pm', [], ['context' => 'ampm']),
-            ];
+      'am' => t('am', [], ['context' => 'ampm']),
+      'pm' => t('pm', [], ['context' => 'ampm']),
+    ];
     return !$required ? $none + $ampm : $ampm;
   }
 
@@ -450,9 +450,10 @@ public static function ampm($required = FALSE) {
    *   Defaults to NULL, which means to use the current date.
    *
    * @return int
-   *   The number of days in the month.
+   *   The number of days in the month, or null if the $date has errors.
    */
   public static function daysInMonth($date = NULL) {
+    $date = $date ?? 'now';
     if (!$date instanceof DrupalDateTime) {
       $date = new DrupalDateTime($date);
     }
@@ -469,10 +470,11 @@ public static function daysInMonth($date = NULL) {
    *   (optional) A DrupalDateTime object or a date string.
    *   Defaults to NULL, which means to use the current date.
    *
-   * @return int
-   *   The number of days in the year.
+   * @return int|null
+   *   The number of days in the year, or null if the $date has errors.
    */
   public static function daysInYear($date = NULL) {
+    $date = $date ?? 'now';
     if (!$date instanceof DrupalDateTime) {
       $date = new DrupalDateTime($date);
     }
@@ -494,10 +496,11 @@ public static function daysInYear($date = NULL) {
    *   (optional) A DrupalDateTime object or a date string.
    *   Defaults to NULL, which means use the current date.
    *
-   * @return int
-   *   The number of the day in the week.
+   * @return int|null
+   *   The number of the day in the week, or null if the $date has errors.
    */
   public static function dayOfWeek($date = NULL) {
+    $date = $date ?? 'now';
     if (!$date instanceof DrupalDateTime) {
       $date = new DrupalDateTime($date);
     }
@@ -517,16 +520,21 @@ public static function dayOfWeek($date = NULL) {
    *   (optional) Whether to return the abbreviated name for that day.
    *   Defaults to TRUE.
    *
-   * @return string
-   *   The name of the day in the week for that date.
+   * @return string|null
+   *   The name of the day in the week for that date, or null if the $date has
+   *   errors.
    */
   public static function dayOfWeekName($date = NULL, $abbr = TRUE) {
+    $date = $date ?? 'now';
     if (!$date instanceof DrupalDateTime) {
       $date = new DrupalDateTime($date);
     }
-    $dow = self::dayOfWeek($date);
-    $days = $abbr ? self::weekDaysAbbr() : self::weekDays();
-    return $days[$dow];
+    if (!$date->hasErrors()) {
+      $dow = self::dayOfWeek($date);
+      $days = $abbr ? self::weekDaysAbbr() : self::weekDays();
+      return $days[$dow]->getUntranslatedString();
+    }
+    return NULL;
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php b/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
index 610c2d48d..1c455f494 100644
--- a/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
+++ b/web/core/lib/Drupal/Core/Datetime/Element/Datelist.php
@@ -359,7 +359,7 @@ protected static function checkEmptyInputs($input, $parts) {
    * @param $increment
    *   The value to round to.
    *
-   * @return
+   * @return \Drupal\Core\Datetime\DrupalDateTime
    */
   protected static function incrementRound(&$date, $increment) {
     // Round minutes and seconds, if necessary.
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php
index a0ba7f022..08a2b46e6 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/DependencySerializationTraitPass.php
@@ -8,6 +8,11 @@
 /**
  * Sets the _serviceId property on all services.
  *
+ * @deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. The _serviceId
+ *   property is no longer part of the container. Use
+ *   \Drupal\Core\DrupalKernelInterface::getServiceIdMapping() instead.
+ *
+ * @see https://www.drupal.org/node/3292540
  * @see \Drupal\Core\DependencyInjection\DependencySerializationTrait
  */
 class DependencySerializationTraitPass implements CompilerPassInterface {
@@ -16,35 +21,6 @@ class DependencySerializationTraitPass implements CompilerPassInterface {
    * {@inheritdoc}
    */
   public function process(ContainerBuilder $container) {
-    $decorations = new \SplPriorityQueue();
-    $order = PHP_INT_MAX;
-
-    foreach ($container->getDefinitions() as $service_id => $definition) {
-      // Only add the property to services that are public (as private services
-      // can not be reloaded through Container::get()) and are objects.
-      if (!$definition->hasTag('parameter_service') && $definition->isPublic()) {
-        $definition->setProperty('_serviceId', $service_id);
-      }
-
-      if ($decorated = $definition->getDecoratedService()) {
-        $decorations->insert([$service_id, $definition], [$decorated[2], --$order]);
-      }
-    }
-
-    foreach ($decorations as list($service_id, $definition)) {
-      list($inner, $renamedId) = $definition->getDecoratedService();
-      if (!$renamedId) {
-        $renamedId = $service_id . '.inner';
-      }
-
-      $original = $container->getDefinition($inner);
-      if ($original->isPublic()) {
-        // The old service is renamed.
-        $original->setProperty('_serviceId', $renamedId);
-        // The decorating service takes over the old ID.
-        $definition->setProperty('_serviceId', $inner);
-      }
-    }
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
index b37e900f5..1b1f03577 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
@@ -9,6 +9,8 @@
 
 /**
  * Replaces all services with a lazy flag.
+ *
+ * @see lazy_services
  */
 class ProxyServicesPass implements CompilerPassInterface {
 
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/Container.php b/web/core/lib/Drupal/Core/DependencyInjection/Container.php
index 564336331..349261052 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/Container.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/Container.php
@@ -9,18 +9,6 @@
  */
 class Container extends DrupalContainer {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function set($id, $service) {
-    parent::set($id, $service);
-
-    // Ensure that the _serviceId property is set on synthetic services as well.
-    if (isset($this->services[$id]) && is_object($this->services[$id]) && !isset($this->services[$id]->_serviceId)) {
-      $this->services[$id]->_serviceId = $id;
-    }
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/web/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index 5174d3818..6712e7531 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -1,15 +1,13 @@
 <?php
 
-// phpcs:ignoreFile Portions of this file are a direct copy of
-// \Symfony\Component\DependencyInjection\Container.
-
 namespace Drupal\Core\DependencyInjection;
 
+use Drupal\Component\DependencyInjection\ContainerInterface;
+use Drupal\Component\DependencyInjection\ServiceIdHashTrait;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder as SymfonyContainerBuilder;
 use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
 use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\RealServiceInstantiator;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 /**
@@ -19,12 +17,9 @@
  *
  * @ingroup container
  */
-class ContainerBuilder extends SymfonyContainerBuilder {
+class ContainerBuilder extends SymfonyContainerBuilder implements ContainerInterface {
 
-  /**
-   * @var \Doctrine\Instantiator\InstantiatorInterface|null
-   */
-  private $proxyInstantiator;
+  use ServiceIdHashTrait;
 
   /**
    * {@inheritdoc}
@@ -34,33 +29,6 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) {
     $this->setResourceTracking(FALSE);
   }
 
-  /**
-   * Retrieves the currently set proxy instantiator or instantiates one.
-   *
-   * @return InstantiatorInterface
-   */
-  private function getProxyInstantiator()
-  {
-    if (!$this->proxyInstantiator) {
-      $this->proxyInstantiator = new RealServiceInstantiator();
-    }
-
-    return $this->proxyInstantiator;
-  }
-
-  /**
-   * A 1to1 copy of parent::shareService.
-   *
-   * @todo https://www.drupal.org/project/drupal/issues/2937010 Since Symfony
-   *   3.4 this is not a 1to1 copy.
-   */
-  protected function shareService(Definition $definition, $service, $id, array &$inlineServices)
-  {
-    if ($definition->isShared()) {
-      $this->services[$lowerId = strtolower($id)] = $service;
-    }
-  }
-
   /**
    * Overrides Symfony\Component\DependencyInjection\ContainerBuilder::set().
    *
@@ -73,24 +41,13 @@ protected function shareService(Definition $definition, $service, $id, array &$i
    *   services in a frozen builder.
    */
   public function set($id, $service) {
-    if (strtolower($id) !== $id) {
-      throw new \InvalidArgumentException("Service ID names must be lowercase: $id");
-    }
     SymfonyContainer::set($id, $service);
-
-    // Ensure that the _serviceId property is set on synthetic services as well.
-    if (isset($this->services[$id]) && is_object($this->services[$id]) && !isset($this->services[$id]->_serviceId)) {
-      $this->services[$id]->_serviceId = $id;
-    }
   }
 
   /**
    * {@inheritdoc}
    */
-  public function register($id, $class = null): Definition {
-    if (strtolower($id) !== $id) {
-      throw new \InvalidArgumentException("Service ID names must be lowercase: $id");
-    }
+  public function register($id, $class = NULL): Definition {
     $definition = new Definition($class);
     // As of Symfony 5.2 all services are private by default, but in Drupal
     // services are still public by default.
@@ -135,24 +92,6 @@ public function setParameter($name, $value) {
     parent::setParameter($name, $value);
   }
 
-  /**
-   * A 1to1 copy of parent::callMethod.
-   *
-   * @todo https://www.drupal.org/project/drupal/issues/2937010 Since Symfony
-   *   3.4 this is not a 1to1 copy.
-   */
-  protected function callMethod($service, $call, array &$inlineServices = array()) {
-    $services = self::getServiceConditionals($call[1]);
-
-    foreach ($services as $s) {
-      if (!$this->has($s)) {
-        return;
-      }
-    }
-
-    call_user_func_array(array($service, $call[0]), $this->resolveServices($this->getParameterBag()->resolveValue($call[1])));
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php b/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
index c24598689..daf0c94a2 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
@@ -2,8 +2,9 @@
 
 namespace Drupal\Core\DependencyInjection;
 
+use Drupal\Component\DependencyInjection\ReverseContainer;
 use Drupal\Core\Entity\EntityStorageInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Provides dependency injection friendly methods for serialization.
@@ -30,33 +31,38 @@ trait DependencySerializationTrait {
    * {@inheritdoc}
    */
   public function __sleep() {
-    $this->_serviceIds = [];
     $vars = get_object_vars($this);
-    foreach ($vars as $key => $value) {
-      if (is_object($value) && isset($value->_serviceId)) {
-        // If a class member was instantiated by the dependency injection
-        // container, only store its ID so it can be used to get a fresh object
-        // on unserialization.
-        $this->_serviceIds[$key] = $value->_serviceId;
-        unset($vars[$key]);
-      }
-      // Special case the container, which might not have a service ID.
-      elseif ($value instanceof ContainerInterface) {
-        $this->_serviceIds[$key] = 'service_container';
-        unset($vars[$key]);
-      }
-      elseif ($value instanceof EntityStorageInterface) {
-        // If a class member is an entity storage, only store the entity type ID
-        // the storage is for so it can be used to get a fresh object on
-        // unserialization. By doing this we prevent possible memory leaks when
-        // the storage is serialized when it contains a static cache of entity
-        // objects and additionally we ensure that we'll not have multiple
-        // storage objects for the same entity type and therefore prevent
-        // returning different references for the same entity.
-        $this->_entityStorages[$key] = $value->getEntityTypeId();
-        unset($vars[$key]);
+    try {
+      $container = \Drupal::getContainer();
+      $reverse_container = $container->has(ReverseContainer::class) ? $container->get(ReverseContainer::class) : new ReverseContainer($container);
+      foreach ($vars as $key => $value) {
+        if (!is_object($value) || $value instanceof TranslatableMarkup) {
+          // Ignore properties that cannot be services.
+          continue;
+        }
+        if ($value instanceof EntityStorageInterface) {
+          // If a class member is an entity storage, only store the entity type
+          // ID the storage is for, so it can be used to get a fresh object on
+          // unserialization. By doing this we prevent possible memory leaks
+          // when the storage is serialized and it contains a static cache of
+          // entity objects. Additionally we ensure that we'll not have multiple
+          // storage objects for the same entity type and therefore prevent
+          // returning different references for the same entity.
+          $this->_entityStorages[$key] = $value->getEntityTypeId();
+          unset($vars[$key]);
+        }
+        elseif ($service_id = $reverse_container->getId($value)) {
+          // If a class member was instantiated by the dependency injection
+          // container, only store its ID so it can be used to get a fresh object
+          // on unserialization.
+          $this->_serviceIds[$key] = $service_id;
+          unset($vars[$key]);
+        }
       }
     }
+    catch (ContainerNotInitializedException $e) {
+      // No container, no problem.
+    }
 
     return array_keys($vars);
   }
diff --git a/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
index 215babce4..07d549445 100644
--- a/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
+++ b/web/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -31,6 +31,11 @@
  */
 class YamlFileLoader
 {
+    private const DEFAULTS_KEYWORDS = [
+        'public' => 'public',
+        'tags' => 'tags',
+        'autowire' => 'autowire',
+    ];
 
     /**
      * @var \Drupal\Core\DependencyInjection\ContainerBuilder $container
@@ -44,7 +49,6 @@ class YamlFileLoader
      */
     protected $fileCache;
 
-
     public function __construct(ContainerBuilder $container)
     {
         $this->container = $container;
@@ -121,12 +125,71 @@ private function parseDefinitions($content, $file)
             $basename = basename($file);
             [$provider, ] = explode('.', $basename, 2);
         }
+        $defaults = $this->parseDefaults($content, $file);
+        $defaults['tags'][] = [
+            'name' => '_provider',
+            'provider' => $provider
+        ];
         foreach ($content['services'] as $id => $service) {
-            if (is_array($service)) {
-              $service['tags'][] = ['name' => '_provider', 'provider' => $provider];
+            $this->parseDefinition($id, $service, $file, $defaults);
+        }
+    }
+
+    /**
+     * @param array  $content
+     * @param string $file
+     *
+     * @return array
+     *
+     * @throws InvalidArgumentException
+     */
+    private function parseDefaults(array &$content, string $file): array
+    {
+        if (!\array_key_exists('_defaults', $content['services'])) {
+            return [];
+        }
+        $defaults = $content['services']['_defaults'];
+        unset($content['services']['_defaults']);
+
+        if (!\is_array($defaults)) {
+            throw new InvalidArgumentException(sprintf('Service "_defaults" key must be an array, "%s" given in "%s".', \gettype($defaults), $file));
+        }
+
+        foreach ($defaults as $key => $default) {
+            if (!isset(self::DEFAULTS_KEYWORDS[$key])) {
+                throw new InvalidArgumentException(sprintf('The configuration key "%s" cannot be used to define a default value in "%s". Allowed keys are "%s".', $key, $file, implode('", "', self::DEFAULTS_KEYWORDS)));
+            }
+        }
+
+        if (isset($defaults['tags'])) {
+            if (!\is_array($tags = $defaults['tags'])) {
+                throw new InvalidArgumentException(sprintf('Parameter "tags" in "_defaults" must be an array in "%s". Check your YAML syntax.', $file));
+            }
+
+            foreach ($tags as $tag) {
+                if (!\is_array($tag)) {
+                    $tag = ['name' => $tag];
+                }
+
+                if (!isset($tag['name'])) {
+                    throw new InvalidArgumentException(sprintf('A "tags" entry in "_defaults" is missing a "name" key in "%s".', $file));
+                }
+                $name = $tag['name'];
+                unset($tag['name']);
+
+                if (!\is_string($name) || '' === $name) {
+                    throw new InvalidArgumentException(sprintf('The tag name in "_defaults" must be a non-empty string in "%s".', $file));
+                }
+
+                foreach ($tag as $attribute => $value) {
+                    if (!is_scalar($value) && null !== $value) {
+                        throw new InvalidArgumentException(sprintf('Tag "%s", attribute "%s" in "_defaults" must be of a scalar-type in "%s". Check your YAML syntax.', $name, $attribute, $file));
+                    }
+                }
             }
-            $this->parseDefinition($id, $service, $file);
         }
+
+        return $defaults;
     }
 
     /**
@@ -135,14 +198,18 @@ private function parseDefinitions($content, $file)
      * @param string $id
      * @param array $service
      * @param string $file
+     * @param array $defaults
      *
      * @throws InvalidArgumentException
      *   When tags are invalid.
      */
-    private function parseDefinition($id, $service, $file)
+    private function parseDefinition(string $id, $service, string $file, array $defaults)
     {
-        if (is_string($service) && 0 === strpos($service, '@')) {
-            $this->container->setAlias($id, substr($service, 1));
+        if (\is_string($service) && 0 === strpos($service, '@')) {
+            $this->container->setAlias($id, $alias = new Alias(substr($service, 1)));
+            if (isset($defaults['public'])) {
+                $alias->setPublic($defaults['public']);
+            }
 
             return;
         }
@@ -156,10 +223,11 @@ private function parseDefinition($id, $service, $file)
         }
 
         if (isset($service['alias'])) {
-            $alias = $this->container->setAlias($id, new Alias($service['alias']));
-
-            if (array_key_exists('public', $service)) {
+            $this->container->setAlias($id, $alias = new Alias($service['alias']));
+            if (isset($service['public'])) {
                 $alias->setPublic($service['public']);
+            } elseif (isset($defaults['public'])) {
+                $alias->setPublic($defaults['public']);
             }
 
             if (array_key_exists('deprecated', $service)) {
@@ -180,6 +248,17 @@ private function parseDefinition($id, $service, $file)
             $definition = new ChildDefinition($service['parent']);
         } else {
             $definition = new Definition();
+            // Drupal services are public by default.
+            $definition->setPublic(true);
+
+            if (isset($defaults['public'])) {
+                $definition->setPublic($defaults['public']);
+            }
+            if (isset($defaults['autowire'])) {
+                $definition->setAutowired($defaults['autowire']);
+            }
+
+            $definition->setChanges([]);
         }
 
         if (isset($service['class'])) {
@@ -201,9 +280,6 @@ private function parseDefinition($id, $service, $file)
         if (isset($service['public'])) {
             $definition->setPublic($service['public']);
         }
-        else {
-            $definition->setPublic(true);
-        }
 
         if (isset($service['abstract'])) {
             $definition->setAbstract($service['abstract']);
@@ -283,31 +359,37 @@ private function parseDefinition($id, $service, $file)
             }
         }
 
-        if (isset($service['tags'])) {
-            if (!is_array($service['tags'])) {
-                throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
-            }
+        $tags = $service['tags'] ?? [];
+        if (!\is_array($tags)) {
+            throw new InvalidArgumentException(sprintf('Parameter "tags" must be an array for service "%s" in "%s". Check your YAML syntax.', $id, $file));
+        }
 
-            foreach ($service['tags'] as $tag) {
-                if (!is_array($tag)) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry must be an array for service "%s" in %s. Check your YAML syntax.', $id, $file));
-                }
+        if (isset($defaults['tags'])) {
+            $tags = array_merge($tags, $defaults['tags']);
+        }
 
-                if (!isset($tag['name'])) {
-                    throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in %s.', $id, $file));
-                }
+        foreach ($tags as $tag) {
+            if (!\is_array($tag)) {
+                $tag = ['name' => $tag];
+            }
 
-                $name = $tag['name'];
-                unset($tag['name']);
+            if (!isset($tag['name'])) {
+                throw new InvalidArgumentException(sprintf('A "tags" entry is missing a "name" key for service "%s" in "%s".', $id, $file));
+            }
+            $name = $tag['name'];
+            unset($tag['name']);
 
-                foreach ($tag as $attribute => $value) {
-                    if (!is_scalar($value) && null !== $value) {
-                        throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in %s. Check your YAML syntax.', $id, $name, $attribute, $file));
-                    }
-                }
+            if (!\is_string($name) || '' === $name) {
+                throw new InvalidArgumentException(sprintf('The tag name for service "%s" in "%s" must be a non-empty string.', $id, $file));
+            }
 
-                $definition->addTag($name, $tag);
+            foreach ($tag as $attribute => $value) {
+                if (!is_scalar($value) && null !== $value) {
+                    throw new InvalidArgumentException(sprintf('A "tags" attribute must be of a scalar-type for service "%s", tag "%s", attribute "%s" in "%s". Check your YAML syntax.', $id, $name, $attribute, $file));
+                }
             }
+
+            $definition->addTag($name, $tag);
         }
 
         if (isset($service['decorates'])) {
diff --git a/web/core/lib/Drupal/Core/DrupalKernel.php b/web/core/lib/Drupal/Core/DrupalKernel.php
index 42eb60d5d..1d5052257 100644
--- a/web/core/lib/Drupal/Core/DrupalKernel.php
+++ b/web/core/lib/Drupal/Core/DrupalKernel.php
@@ -10,8 +10,8 @@
 use Drupal\Core\Cache\DatabaseBackend;
 use Drupal\Core\Config\BootstrapConfigStorageFactory;
 use Drupal\Core\Config\NullStorage;
-use Drupal\Core\Database\Database;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Component\DependencyInjection\ReverseContainer;
 use Drupal\Core\DependencyInjection\ServiceModifierInterface;
 use Drupal\Core\DependencyInjection\ServiceProviderInterface;
 use Drupal\Core\DependencyInjection\YamlFileLoader;
@@ -106,7 +106,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
   /**
    * Holds the container instance.
    *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface
+   * @var \Drupal\Component\DependencyInjection\ContainerInterface
    */
   protected $container;
 
@@ -230,7 +230,12 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
   protected static $isEnvironmentInitialized = FALSE;
 
   /**
-   * The site directory.
+   * The site path directory.
+   *
+   * Site path is relative to the app root directory.
+   * Usually defined as "sites/default".
+   *
+   * By default, Drupal uses sites/default.
    *
    * @var string
    */
@@ -243,6 +248,16 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
    */
   protected $root;
 
+  /**
+   * A mapping from service classes to service IDs.
+   *
+   * @deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the
+   *   'Drupal\Component\DependencyInjection\ReverseContainer' service instead.
+   *
+   * @see https://www.drupal.org/node/3327942
+   */
+  protected $serviceIdMapping = [];
+
   /**
    * Create a DrupalKernel object from a request.
    *
@@ -696,18 +711,11 @@ public function handle(Request $request, $type = self::MASTER_REQUEST, $catch =
     static::bootEnvironment();
 
     try {
-      $this->initializeSettings($request);
-
-      // Redirect the user to the installation script if Drupal has not been
-      // installed yet (i.e., if no $databases array has been defined in the
-      // settings.php file) and we are not already installing.
-      if (!Database::getConnectionInfo() && !InstallerKernel::installationAttempted() && PHP_SAPI !== 'cli') {
-        $response = new RedirectResponse($request->getBasePath() . '/core/install.php', 302, ['Cache-Control' => 'no-cache']);
-      }
-      else {
+      if (!$this->booted) {
+        $this->initializeSettings($request);
         $this->boot();
-        $response = $this->getHttpKernel()->handle($request, $type, $catch);
       }
+      $response = $this->getHttpKernel()->handle($request, $type, $catch);
     }
     catch (\Exception $e) {
       if ($catch === FALSE) {
@@ -823,6 +831,39 @@ public function updateModules(array $module_list, array $module_filenames = [])
     }
   }
 
+  /**
+   * Generate a unique hash for a service object.
+   *
+   * @param object $object
+   *   A service object.
+   *
+   * @return string
+   *   A unique hash value.
+   *
+   * @deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the
+   *   'Drupal\Component\DependencyInjection\ReverseContainer' service instead.
+   *
+   * @see https://www.drupal.org/node/3327942
+   */
+  public static function generateServiceIdHash($object) {
+    @trigger_error(__METHOD__ . "() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942", E_USER_DEPRECATED);
+    // Include class name as an additional namespace for the hash since
+    // spl_object_hash's return can be recycled. This still is not a 100%
+    // guarantee to be unique but makes collisions incredibly difficult and even
+    // then the interface would be preserved.
+    // @see https://php.net/spl_object_hash#refsect1-function.spl-object-hash-notes
+    return hash('sha256', get_class($object) . spl_object_hash($object));
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getServiceIdMapping() {
+    @trigger_error(__METHOD__ . "() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942", E_USER_DEPRECATED);
+    $this->collectServiceIdMapping();
+    return $this->serviceIdMapping;
+  }
+
   /**
    * Returns the container cache key based on the environment.
    *
@@ -868,6 +909,12 @@ protected function initializeContainer() {
       if ($this->container->initialized('current_user')) {
         $current_user_id = $this->container->get('current_user')->id();
       }
+      // After rebuilding the container some objects will have stale services.
+      // Record a map of objects to service IDs prior to rebuilding the
+      // container in order to ensure
+      // \Drupal\Core\DependencyInjection\DependencySerializationTrait works as
+      // expected.
+      $this->container->get(ReverseContainer::class)->recordContainer();
 
       // If there is a session, close and save it.
       if ($this->container->initialized('session')) {
@@ -988,7 +1035,14 @@ public static function bootEnvironment($app_root = NULL) {
     }
 
     // Enforce E_STRICT, but allow users to set levels not part of E_STRICT.
-    error_reporting(E_STRICT | E_ALL);
+    $error_reporting = E_STRICT | E_ALL;
+
+    // Drupal 9 uses PHP syntax that's deprecated in PHP 8.2.
+    if (PHP_VERSION_ID >= 80200) {
+      $error_reporting &= ~E_DEPRECATED;
+    }
+
+    error_reporting($error_reporting);
 
     // Override PHP settings required for Drupal to work properly.
     // sites/default/default.settings.php contains more runtime settings.
@@ -1538,11 +1592,11 @@ public static function validateHostname(Request $request) {
    * @return bool
    *   TRUE if the Host header is trusted, FALSE otherwise.
    *
-   * @see https://www.drupal.org/docs/8/install/trusted-host-settings
+   * @see https://www.drupal.org/docs/installing-drupal/trusted-host-settings
    * @see \Drupal\Core\Http\TrustedHostsRequestFactory
    */
   protected static function setupTrustedHosts(Request $request, $host_patterns) {
-    $request->setTrustedHosts($host_patterns);
+    Request::setTrustedHosts($host_patterns);
 
     // Get the host, which will validate the current request.
     try {
@@ -1575,6 +1629,23 @@ protected function addServiceFiles(array $service_yamls) {
     $this->serviceYamls['site'] = array_filter($service_yamls, 'file_exists');
   }
 
+  /**
+   * Collect a mapping between service to ids.
+   *
+   * @deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the
+   *   'Drupal\Component\DependencyInjection\ReverseContainer' service instead.
+   *
+   * @see https://www.drupal.org/node/3327942
+   */
+  protected function collectServiceIdMapping() {
+    @trigger_error(__METHOD__ . "() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942", E_USER_DEPRECATED);
+    if (isset($this->container)) {
+      foreach ($this->container->getServiceIdMappings() as $hash => $service_id) {
+        $this->serviceIdMapping[$hash] = $service_id;
+      }
+    }
+  }
+
   /**
    * Gets the active install profile.
    *
diff --git a/web/core/lib/Drupal/Core/DrupalKernelInterface.php b/web/core/lib/Drupal/Core/DrupalKernelInterface.php
index 28a24006d..f42e8eec6 100644
--- a/web/core/lib/Drupal/Core/DrupalKernelInterface.php
+++ b/web/core/lib/Drupal/Core/DrupalKernelInterface.php
@@ -74,7 +74,9 @@ public function getContainer();
   public function getCachedContainerDefinition();
 
   /**
-   * Set the current site path.
+   * Set the current site path directory.
+   *
+   * Format: "folder-name/child-folder" usually uses "sites/default".
    *
    * @param string $path
    *   The current site path.
@@ -85,10 +87,10 @@ public function getCachedContainerDefinition();
   public function setSitePath($path);
 
   /**
-   * Get the site path.
+   * Gets the site path directory.
    *
    * @return string
-   *   The current site path.
+   *   The current site path directory.
    */
   public function getSitePath();
 
@@ -137,4 +139,14 @@ public function preHandle(Request $request);
    */
   public function loadLegacyIncludes();
 
+  /**
+   * Get a mapping from service hashes to service IDs.
+   *
+   * @deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the
+   *   'Drupal\Component\DependencyInjection\ReverseContainer' service instead.
+   *
+   * @see https://www.drupal.org/node/3327942
+   */
+  public function getServiceIdMapping();
+
 }
diff --git a/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php b/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
index 110beb1ba..33f64d60e 100644
--- a/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
+++ b/web/core/lib/Drupal/Core/Entity/Annotation/EntityReferenceSelection.php
@@ -60,8 +60,9 @@ class EntityReferenceSelection extends Plugin {
   public $group;
 
   /**
-   * An array of entity types that can be referenced by this plugin. Defaults to
-   * all entity types.
+   * An array of entity types that can be referenced by this plugin.
+   *
+   * Defaults to all entity types.
    *
    * This property is optional and it does not need to be declared.
    *
diff --git a/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php b/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
index 7e18e5bca..f294f2f2f 100644
--- a/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
+++ b/web/core/lib/Drupal/Core/Entity/ContentEntityStorageBase.php
@@ -158,9 +158,6 @@ public function getBundleFromClass(string $class_name): ?string {
    *
    * @return string|null
    *   The bundle or NULL if not set.
-   *
-   * @throws \Drupal\Core\Entity\EntityStorageException
-   *   When a corresponding bundle cannot be found and is expected.
    */
   protected function getBundleFromValues(array $values): ?string {
     $bundle = NULL;
diff --git a/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php b/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php
index 4dd93475f..b75760cdb 100644
--- a/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php
+++ b/web/core/lib/Drupal/Core/Entity/Controller/EntityController.php
@@ -62,6 +62,11 @@ class EntityController implements ContainerInjectionInterface {
    */
   protected $renderer;
 
+  /**
+   * The url generator.
+   */
+  protected $urlGenerator;
+
   /**
    * Constructs a new EntityController.
    *
@@ -76,7 +81,7 @@ class EntityController implements ContainerInjectionInterface {
    * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
    *   The string translation.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
-   *   The url generator.
+   *   The URL generator.
    */
   public function __construct(EntityTypeManagerInterface $entity_type_manager, EntityTypeBundleInfoInterface $entity_type_bundle_info, EntityRepositoryInterface $entity_repository, RendererInterface $renderer, TranslationInterface $string_translation, UrlGeneratorInterface $url_generator) {
     $this->entityTypeManager = $entity_type_manager;
diff --git a/web/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/web/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
index 37d919e3b..979721832 100644
--- a/web/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
+++ b/web/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php
@@ -147,7 +147,6 @@ public function view(EntityInterface $_entity, $view_mode = 'full') {
           'rel' => 'canonical',
           'href' => $url->toString(),
         ],
-        TRUE,
       ];
 
       // Set the non-aliased canonical path as a default shortlink.
@@ -156,7 +155,6 @@ public function view(EntityInterface $_entity, $view_mode = 'full') {
           'rel' => 'shortlink',
           'href' => $url->setOption('alias', TRUE)->toString(),
         ],
-        TRUE,
       ];
 
       // Since this generates absolute URLs, it can only be cached "per site".
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php b/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
index 25c314110..ca7c7c8f9 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAccessControlHandler.php
@@ -109,6 +109,8 @@ public function access(EntityInterface $entity, $operation, AccountInterface $ac
   }
 
   /**
+   * Determines entity access.
+   *
    * We grant access to the entity if both of these conditions are met:
    * - No modules say to deny access.
    * - At least one module says to grant access.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
index ba0dbf84f..ab18ba090 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityAutocompleteMatcher.php
@@ -29,7 +29,7 @@ public function __construct(SelectionPluginManagerInterface $selection_manager)
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getMatches($target_type, $selection_handler, $selection_settings, $string = '') {
     $matches = [];
diff --git a/web/core/lib/Drupal/Core/Entity/EntityChangedInterface.php b/web/core/lib/Drupal/Core/Entity/EntityChangedInterface.php
index cd1a8304e..c0f89702e 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityChangedInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityChangedInterface.php
@@ -13,6 +13,8 @@
  * editing.
  *
  * @see \Drupal\Core\Entity\Plugin\Validation\Constraint\EntityChangedConstraint
+ *
+ * @ingroup entity_type_characteristics
  */
 interface EntityChangedInterface extends EntityInterface {
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php b/web/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php
index 72af92f68..d30d39632 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityCreateAnyAccessCheck.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Entity;
 
 use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Access\AccessResultReasonInterface;
 use Drupal\Core\Routing\Access\AccessInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Session\AccountInterface;
@@ -92,11 +93,16 @@ public function access(Route $route, RouteMatchInterface $route_match, AccountIn
 
     // Check whether an entity of any bundle may be created.
     foreach ($bundles as $bundle) {
-      $access = $access->orIf($access_control_handler->createAccess($bundle, $account, [], TRUE));
-      // In case there is a least one bundle user can create entities for,
+      $bundle_access = $access_control_handler->createAccess($bundle, $account, [], TRUE);
+      $access->inheritCacheability($bundle_access);
+      if ($bundle_access instanceof AccessResultReasonInterface && $bundle_access->getReason() !== "" && $access->getReason() === "") {
+        $access->setReason($bundle_access->getReason());
+      }
+
+      // In case there is at least one bundle the user can create entities for,
       // access is allowed.
-      if ($access->isAllowed()) {
-        break;
+      if ($bundle_access->isAllowed()) {
+        return AccessResult::allowed()->inheritCacheability($access);
       }
     }
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php b/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
index 0a6dc5d6b..edae57c9e 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDefinitionUpdateManagerInterface.php
@@ -184,8 +184,9 @@ public function updateFieldableEntityType(EntityTypeInterface $entity_type, arra
    * @param string $entity_type_id
    *   The entity type identifier.
    *
-   * @return \Drupal\Core\Field\FieldStorageDefinitionInterface
-   *   The field storage definition.
+   * @return \Drupal\Core\Field\FieldStorageDefinitionInterface|null
+   *   The field storage definition or NULL if there is none for the given field
+   *   name and entity type.
    *
    * @todo Make this return a mutable storage definition interface when we have
    *   one. See https://www.drupal.org/node/2346329.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php b/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
index ee0781718..1724addae 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityDisplayBase.php
@@ -13,8 +13,7 @@
 abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDisplayInterface {
 
   /**
-   * The 'mode' for runtime EntityDisplay objects used to render entities with
-   * arbitrary display options rather than a configured view mode or form mode.
+   * The mode used to render entities with arbitrary display options.
    *
    * @todo Prevent creation of a mode with this ID
    *   https://www.drupal.org/node/2410727
@@ -57,8 +56,10 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
   protected $mode = self::CUSTOM_MODE;
 
   /**
-   * Whether this display is enabled or not. If the entity (form) display
-   * is disabled, we'll fall back to the 'default' display.
+   * Whether this display is enabled or not.
+   *
+   * If the entity (form) display is disabled, we'll fall back to the 'default'
+   * display.
    *
    * @var bool
    */
@@ -79,8 +80,10 @@ abstract class EntityDisplayBase extends ConfigEntityBase implements EntityDispl
   protected $hidden = [];
 
   /**
-   * The original view or form mode that was requested (case of view/form modes
-   * being configured to fall back to the 'default' display).
+   * The original view or form mode that was requested.
+   *
+   * Case of view/form modes being configured to fall back to the 'default'
+   * display.
    *
    * @var string
    */
diff --git a/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php b/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php
index e38d823a9..b96dcfb81 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityFieldManager.php
@@ -63,8 +63,10 @@ class EntityFieldManager implements EntityFieldManagerInterface {
   protected $activeFieldStorageDefinitions;
 
   /**
-   * An array keyed by entity type. Each value is an array whose keys are
-   * field names and whose value is an array with two entries:
+   * An array of lightweight maps of fields, keyed by entity type.
+   *
+   * Each value is an array whose keys are field names and whose value is an
+   * array with two entries:
    *   - type: The field type.
    *   - bundles: The bundles in which the field appears.
    *
@@ -73,10 +75,11 @@ class EntityFieldManager implements EntityFieldManagerInterface {
   protected $fieldMap = [];
 
   /**
-   * An array keyed by field type. Each value is an array whose key are entity
-   * types including arrays in the same form that $fieldMap.
+   * An array of lightweight maps of fields, keyed by field type.
    *
-   * It helps access the mapping between types and fields by the field type.
+   * Each value is an array whose key are entity types including arrays in the
+   * same form as $fieldMap. It helps access the mapping between types and
+   * fields by the field type.
    *
    * @var array
    */
@@ -377,7 +380,9 @@ public function getFieldDefinitions($entity_type_id, $bundle) {
    */
   protected function buildBundleFieldDefinitions($entity_type_id, $bundle, array $base_field_definitions) {
     $entity_type = $this->entityTypeManager->getDefinition($entity_type_id);
-    $class = $entity_type->getClass();
+
+    // Use a bundle specific class if one is defined.
+    $class = $this->entityTypeManager->getStorage($entity_type_id)->getEntityClass($bundle);
 
     // Allow the entity class to provide bundle fields and bundle-specific
     // overrides of base fields.
diff --git a/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php b/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php
index 6e0679bb0..e168b538c 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityPublishedInterface.php
@@ -4,6 +4,8 @@
 
 /**
  * Provides an interface for access to an entity's published state.
+ *
+ * @ingroup entity_type_characteristics
  */
 interface EntityPublishedInterface extends EntityInterface {
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php b/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php
index 23fcebdf8..6f27fb796 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityResolverManager.php
@@ -28,6 +28,13 @@ class EntityResolverManager {
    */
   protected $classResolver;
 
+  /**
+   * The list of all entity types.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeInterface[]
+   */
+  protected $entityTypes;
+
   /**
    * Constructs a new EntityRouteAlterSubscriber.
    *
diff --git a/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php b/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
index eb99d5a90..d52fa27d5 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityStorageInterface.php
@@ -105,7 +105,7 @@ public function loadRevision($revision_id);
   public function deleteRevision($revision_id);
 
   /**
-   * Load entities by their property values.
+   * Load entities by their property values without any access checks.
    *
    * @param array $values
    *   An associative array where the keys are the property names and the
@@ -145,7 +145,7 @@ public function delete(array $entities);
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity to save.
    *
-   * @return
+   * @return int|null
    *   SAVED_NEW or SAVED_UPDATED is returned depending on the operation
    *   performed.
    *
diff --git a/web/core/lib/Drupal/Core/Entity/EntityType.php b/web/core/lib/Drupal/Core/Entity/EntityType.php
index 527930c06..13fc14775 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityType.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityType.php
@@ -200,9 +200,15 @@ class EntityType extends PluginDefinition implements EntityTypeInterface {
   /**
    * A definite singular/plural name of the type.
    *
-   * Needed keys: "singular" and "plural".
+   * Needed keys: "singular" and "plural". Can also have key: "context".
+   * @code
+   * [
+   *    'singular' => '@count entity',
+   *    'plural' => '@count entities',
+   *    'context' => 'Entity context',
+   * ]
    *
-   * @var string|\Drupal\Core\StringTranslation\TranslatableMarkup
+   * @var string[]
    *
    * @see \Drupal\Core\Entity\EntityTypeInterface::getCountLabel()
    */
@@ -219,6 +225,8 @@ class EntityType extends PluginDefinition implements EntityTypeInterface {
    * The machine name of the entity type group.
    *
    * @var string
+   *
+   * @see self::getGroup()
    */
   protected $group;
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php b/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
index 243b79d5a..34b74e137 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityTypeInterface.php
@@ -419,11 +419,9 @@ public function getPermissionGranularity();
    * should be used for them. Where possible, link relationships should use
    * established IANA relationships rather than custom relationships.
    *
-   * Every entity type should, at minimum, define "canonical", which is the
-   * pattern for URIs to that entity. Even if the entity will have no HTML page
-   * exposed to users it should still have a canonical URI in order to be
-   * compatible with web services. Entities that will be user-editable via an
-   * HTML page must also define an "edit-form" relationship.
+   * Entities which can be viewed should define "canonical", which is the
+   * pattern for URIs to that entity including REST. Entities that will be
+   * user-editable via an HTML page should define an "edit-form" relationship.
    *
    * By default, the following placeholders are supported:
    * - [entityType]: The entity type itself will also be a valid token for the
@@ -686,6 +684,14 @@ public function setUriCallback($callback);
   /**
    * Gets the machine name of the entity type group.
    *
+   * The entity type group is an annotation property of the entity type.
+   *
+   * Drupal core defines two entity type groups:
+   *  - content: Entities which form the information on a site. Content entities
+   *    are typically customized with fields.
+   *  - config: Entities which define structural elements of a site, which are
+   *    managed as part of the site's configuration.
+   *
    * @return string
    */
   public function getGroup();
@@ -695,6 +701,8 @@ public function getGroup();
    *
    * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup
    *   The group label.
+   *
+   * @see self::getGroup()
    */
   public function getGroupLabel();
 
diff --git a/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php b/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
index 3da448730..8951a18d1 100644
--- a/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/EntityViewBuilderInterface.php
@@ -60,7 +60,7 @@ public function view(EntityInterface $entity, $view_mode = 'full', $langcode = N
    *   (optional) For which language the entity should be rendered, defaults to
    *   the current content language.
    *
-   * @return
+   * @return array
    *   A render array for the entities, indexed by the same keys as the
    *   entities array passed in $entities.
    *
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php b/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
index d46490a8f..086063a3d 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -17,6 +18,7 @@
  * @see plugin_api
  */
 class DefaultSelectionDeriver extends DeriverBase implements ContainerDeriverInterface {
+  use StringTranslationTrait;
 
   /**
    * The entity type manager.
@@ -51,7 +53,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
     foreach ($this->entityTypeManager->getDefinitions() as $entity_type_id => $entity_type) {
       $this->derivatives[$entity_type_id] = $base_plugin_definition;
       $this->derivatives[$entity_type_id]['entity_types'] = [$entity_type_id];
-      $this->derivatives[$entity_type_id]['label'] = t('@entity_type selection', ['@entity_type' => $entity_type->getLabel()]);
+      $this->derivatives[$entity_type_id]['label'] = $this->t('@entity_type selection', ['@entity_type' => $entity_type->getLabel()]);
       $this->derivatives[$entity_type_id]['base_plugin_label'] = (string) $base_plugin_definition['label'];
 
       // If the entity type doesn't provide a 'label' key in its plugin
diff --git a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
index e8251e631..aa53c397d 100644
--- a/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
+++ b/web/core/lib/Drupal/Core/Entity/Plugin/EntityReferenceSelection/Broken.php
@@ -21,7 +21,7 @@ class Broken extends SelectionPluginBase {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form = parent::buildConfigurationForm($form, $form_state);
     $form['selection_handler'] = [
-      '#markup' => t('The selected selection handler is broken.'),
+      '#markup' => $this->t('The selected selection handler is broken.'),
     ];
     return $form;
   }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php b/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php
index 85878aa75..efb185fa4 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/QueryBase.php
@@ -131,6 +131,11 @@ abstract class QueryBase implements QueryInterface {
    */
   protected $namespaces = [];
 
+  /**
+   * Defines how the conditions on the query need to match.
+   */
+  protected $conjunction;
+
   /**
    * Constructs this object.
    *
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
index 4d70b1e45..ac0db1acd 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Condition.php
@@ -25,6 +25,13 @@ class Condition extends ConditionBase {
    */
   protected $query;
 
+  /**
+   * The current SQL query, set by parent condition compile() method calls.
+   *
+   * @var \Drupal\Core\Database\Query\SelectInterface
+   */
+  protected $sqlQuery;
+
   /**
    * {@inheritdoc}
    */
@@ -35,13 +42,13 @@ public function compile($conditionContainer) {
     // SQL query object is only necessary to pass to Query::addField() so it
     // can join tables as necessary. On the other hand, conditions need to be
     // added to the $conditionContainer object to keep grouping.
-    $sql_query = $conditionContainer instanceof SelectInterface ? $conditionContainer : $conditionContainer->sqlQuery;
+    $sql_query = $conditionContainer instanceof SelectInterface ? $conditionContainer : $this->sqlQuery;
     $tables = $this->query->getTables($sql_query);
     foreach ($this->conditions as $condition) {
       if ($condition['field'] instanceof ConditionInterface) {
         $sql_condition = $sql_query->getConnection()->condition($condition['field']->getConjunction());
         // Add the SQL query to the object before calling this method again.
-        $sql_condition->sqlQuery = $sql_query;
+        $condition['field']->sqlQuery = $sql_query;
         $condition['field']->nestedInsideOrCondition = $this->nestedInsideOrCondition || strtoupper($this->conjunction) === 'OR';
         $condition['field']->compile($sql_condition);
         $conditionContainer->condition($sql_condition);
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
index 75784bf11..15696a2d4 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/ConditionAggregate.php
@@ -12,6 +12,13 @@
  */
 class ConditionAggregate extends ConditionAggregateBase {
 
+  /**
+   * The current SQL query, set by parent condition compile() method calls.
+   *
+   * @var \Drupal\Core\Database\Query\SelectInterface
+   */
+  protected $sqlQuery;
+
   /**
    * {@inheritdoc}
    */
@@ -21,13 +28,13 @@ public function compile($conditionContainer) {
     // SQL query object is only necessary to pass to Query::addField() so it
     // can join tables as necessary. On the other hand, conditions need to be
     // added to the $conditionContainer object to keep grouping.
-    $sql_query = ($conditionContainer instanceof SelectInterface) ? $conditionContainer : $conditionContainer->sqlQuery;
+    $sql_query = ($conditionContainer instanceof SelectInterface) ? $conditionContainer : $this->sqlQuery;
     $tables = new Tables($sql_query);
     foreach ($this->conditions as $condition) {
       if ($condition['field'] instanceof ConditionAggregateInterface) {
         $sql_condition = $sql_query->getConnection()->condition($condition['field']->getConjunction());
         // Add the SQL query to the object before calling this method again.
-        $sql_condition->sqlQuery = $sql_query;
+        $condition['field']->sqlQuery = $sql_query;
         $condition['field']->compile($sql_condition);
         $sql_query->condition($sql_condition);
       }
diff --git a/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
index ad66a4297..aaf7c10d3 100644
--- a/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/web/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -41,8 +41,9 @@ class Query extends QueryBase implements QueryInterface {
   protected $sqlFields = [];
 
   /**
-   * An array of strings added as to the group by, keyed by the string to avoid
-   * duplicates.
+   * An array of strings for the SQL 'group by' operation.
+   *
+   * Array is keyed by the string to avoid duplicates.
    *
    * @var array
    */
@@ -263,7 +264,7 @@ protected function finish() {
    */
   protected function result() {
     if ($this->count) {
-      return $this->sqlQuery->countQuery()->execute()->fetchField();
+      return (int) $this->sqlQuery->countQuery()->execute()->fetchField();
     }
     // Return a keyed array of results. The key is either the revision_id or
     // the entity_id depending on whether the entity type supports revisions.
diff --git a/web/core/lib/Drupal/Core/Entity/RevisionLogInterface.php b/web/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
index becf97c16..d26158f56 100644
--- a/web/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/RevisionLogInterface.php
@@ -6,6 +6,8 @@
 
 /**
  * Defines methods for an entity that supports revision logging and ownership.
+ *
+ * @ingroup entity_type_characteristics
  */
 interface RevisionLogInterface extends RevisionableInterface {
 
diff --git a/web/core/lib/Drupal/Core/Entity/RevisionableInterface.php b/web/core/lib/Drupal/Core/Entity/RevisionableInterface.php
index 1ffe6e088..22b9563e8 100644
--- a/web/core/lib/Drupal/Core/Entity/RevisionableInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/RevisionableInterface.php
@@ -19,6 +19,8 @@
  * @see \Drupal\Core\Entity\EntityTypeInterface::isRevisionable()
  * @see https://www.drupal.org/docs/8/api/entity-api/structure-of-an-entity-annotation
  * @see https://www.drupal.org/docs/8/api/entity-api/making-an-entity-revisionable
+ *
+ * @ingroup entity_type_characteristics
  */
 interface RevisionableInterface extends EntityInterface {
 
@@ -48,7 +50,7 @@ public function setNewRevision($value = TRUE);
   /**
    * Gets the revision identifier of the entity.
    *
-   * @return
+   * @return int|null|string
    *   The revision identifier of the entity, or NULL if the entity does not
    *   have a revision identifier.
    */
diff --git a/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php b/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
index 7cc5cb2f9..f8f759f05 100644
--- a/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
+++ b/web/core/lib/Drupal/Core/Entity/Sql/DefaultTableMapping.php
@@ -54,8 +54,9 @@ class DefaultTableMapping implements TableMappingInterface {
   protected $dataTable;
 
   /**
-   * The table that stores revision field data if the entity supports revisions
-   * and has multilingual support.
+   * The table that stores revision field data.
+   *
+   * Only used if the entity supports revisions and has multilingual support.
    *
    * @var string
    */
diff --git a/web/core/lib/Drupal/Core/Entity/SynchronizableEntityTrait.php b/web/core/lib/Drupal/Core/Entity/SynchronizableEntityTrait.php
index 4b7f793ef..abd5e4b30 100644
--- a/web/core/lib/Drupal/Core/Entity/SynchronizableEntityTrait.php
+++ b/web/core/lib/Drupal/Core/Entity/SynchronizableEntityTrait.php
@@ -10,8 +10,7 @@
 trait SynchronizableEntityTrait {
 
   /**
-   * Whether this entity is being created, updated or deleted through a
-   * synchronization process.
+   * Is entity being created updated or deleted through synchronization process.
    *
    * @var bool
    */
diff --git a/web/core/lib/Drupal/Core/Entity/TranslatableInterface.php b/web/core/lib/Drupal/Core/Entity/TranslatableInterface.php
index 7cff2e3fc..47fe23ac4 100644
--- a/web/core/lib/Drupal/Core/Entity/TranslatableInterface.php
+++ b/web/core/lib/Drupal/Core/Entity/TranslatableInterface.php
@@ -6,6 +6,8 @@
 
 /**
  * Provides methods for an entity to support translation.
+ *
+ * @ingroup entity_type_characteristics
  */
 interface TranslatableInterface extends TranslatableDataInterface, EntityInterface {
 
diff --git a/web/core/lib/Drupal/Core/Entity/entity.api.php b/web/core/lib/Drupal/Core/Entity/entity.api.php
index deb6a75e2..27949bf92 100644
--- a/web/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/web/core/lib/Drupal/Core/Entity/entity.api.php
@@ -122,6 +122,12 @@
  * @see \Drupal\Core\Entity\TranslatableRevisionableInterface
  * @see \Drupal\Core\Entity\TranslatableRevisionableStorageInterface
  *
+ * @section characteristics Entity characteristics
+ *
+ * In addition to entity interfaces for revisionable and translatable
+ * interfaces, there are interfaces for other kinds of entity functionality.
+ * @see entity_characteristics
+ *
  * @section create Create operations
  * To create an entity:
  * @code
@@ -357,7 +363,10 @@
  *   as short as possible, and may not exceed 32 characters.
  * - Define an interface for your entity's get/set methods, usually extending
  *   either \Drupal\Core\Config\Entity\ConfigEntityInterface or
- *   \Drupal\Core\Entity\ContentEntityInterface.
+ *   \Drupal\Core\Entity\ContentEntityInterface. Other interfaces that add
+ *   functionality are also available: see the
+ *   @link entity_characteristics Entity characteristics topic @endlink
+ *   for more information.
  * - Define a class for your entity, implementing your interface and extending
  *   either \Drupal\Core\Config\Entity\ConfigEntityBase or
  *   \Drupal\Core\Entity\ContentEntityBase, with annotation for
@@ -640,6 +649,31 @@
  * @}
  */
 
+/**
+ * @defgroup entity_type_characteristics Entity type characteristics
+ * @{
+ * Describes how to enhance entity types with additional functionality.
+ *
+ * When @link entity_api defining an entity type @endlink, the functionality of
+ * the entities can be enhanced with additional characteristics. Examples
+ * include entities that have a published/unpublished status, or a timestamp
+ * that gives the time they were last modified.
+ *
+ * These characteristics are provided by an interface, which the entity's own
+ * interface should inherit from, in addition to
+ * \Drupal\Core\Config\Entity\ConfigEntityInterface or
+ * \Drupal\Core\Entity\ContentEntityInterface.
+ *
+ * Some characteristics also provide a trait for the entity class. This has
+ * implementations of the interface's methods, and may also have a helper method
+ * for \Drupal\Core\Entity\FieldableEntityInterface::baseFieldDefinitions()
+ * which defines base fields that the trait expects to store data. Furthermore,
+ * trait methods may expect certain entity keys to be set: see the documentation
+ * for each trait for details.
+ *
+ * @}
+ */
+
 /**
  * @addtogroup hooks
  * @{
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
index 0547a14d3..38cdd4df3 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/ConfigImportSubscriber.php
@@ -199,17 +199,13 @@ protected function validateThemes(ConfigImporter $config_importer) {
     // Get all themes including those that are not installed.
     $theme_data = $this->getThemeData();
     $module_data = $this->moduleExtensionList->getList();
-    $installs = $config_importer->getExtensionChangelist('theme', 'install');
-    foreach ($installs as $key => $theme) {
-      if (!isset($theme_data[$theme])) {
-        $config_importer->logError($this->t('Unable to install the %theme theme since it does not exist.', ['%theme' => $theme]));
-        // Remove non-existing installs from the list so we can validate theme
-        // dependencies later.
-        unset($installs[$key]);
-      }
+    $nonexistent_themes = array_keys(array_diff_key($core_extension['theme'], $theme_data));
+    foreach ($nonexistent_themes as $theme) {
+      $config_importer->logError($this->t('Unable to install the %theme theme since it does not exist.', ['%theme' => $theme]));
     }
 
     // Ensure that all themes being installed have their dependencies met.
+    $installs = $config_importer->getExtensionChangelist('theme', 'install');
     foreach ($installs as $theme) {
       $module_dependencies = $theme_data[$theme]->module_dependencies;
       // $theme_data[$theme]->requires contains both theme and module
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
deleted file mode 100644
index 2f9745c5c..000000000
--- a/web/core/lib/Drupal/Core/EventSubscriber/ExceptionTestSiteSubscriber.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace Drupal\Core\EventSubscriber;
-
-use Drupal\Core\Utility\Error;
-use Symfony\Component\HttpKernel\Event\ExceptionEvent;
-
-/**
- * Custom handling of errors when in a system-under-test.
- */
-class ExceptionTestSiteSubscriber extends HttpExceptionSubscriberBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static function getPriority() {
-    return 3;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getHandledFormats() {
-    return ['html'];
-  }
-
-  /**
-   * Checks for special handling of errors inside Simpletest.
-   *
-   * @todo The $headers array appears to not actually get used at all in the
-   *   original code. It's quite possible that this entire method is now
-   *   vestigial and can be removed.
-   *
-   * @param \Symfony\Component\HttpKernel\Event\ExceptionEvent $event
-   *   The event.
-   */
-  public function on500(ExceptionEvent $event) {
-    $exception = $event->getThrowable();
-    $error = Error::decodeException($exception);
-
-    $headers = [];
-
-    // When running inside the testing framework, we relay the errors
-    // to the tested site by the way of HTTP headers.
-    if (DRUPAL_TEST_IN_CHILD_SITE && !headers_sent() && (!defined('SIMPLETEST_COLLECT_ERRORS') || SIMPLETEST_COLLECT_ERRORS)) {
-      // $number does not use drupal_static as it should not be reset
-      // as it uniquely identifies each PHP error.
-      static $number = 0;
-      $assertion = [
-        $error['@message'],
-        $error['%type'],
-        [
-          'function' => $error['%function'],
-          'file' => $error['%file'],
-          'line' => $error['%line'],
-        ],
-      ];
-      $headers['X-Drupal-Assertion-' . $number] = rawurlencode(serialize($assertion));
-      $number++;
-    }
-  }
-
-}
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php
index 61159e979..5ebf3f417 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/Fast404ExceptionHtmlSubscriber.php
@@ -2,45 +2,62 @@
 
 namespace Drupal\Core\EventSubscriber;
 
-use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Component\Utility\Html;
+use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
+use Drupal\Core\Config\ConfigCrudEvent;
+use Drupal\Core\Config\ConfigEvents;
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Render\HtmlResponse;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 /**
  * High-performance 404 exception subscriber.
  *
  * This subscriber will return a minimalist 404 response for HTML requests
  * without running a full page theming operation.
+ *
+ * Fast 404s are configured using the system.performance configuration object.
+ * There are the following options:
+ * - system.performance:fast_404.exclude_paths: A regular expression to match
+ *   paths to exclude, such as images generated by image styles, or
+ *   dynamically-resized images. The default pattern provided below also
+ *   excludes the private file system. If you need to add more paths, you can
+ *   add '|path' to the expression.
+ * - system.performance:fast_404.paths: A regular expression to match paths that
+ *   should return a simple 404 page, rather than the fully themed 404 page. If
+ *   you don't have any aliases ending in htm or html you can add '|s?html?' to
+ *   the expression.
+ * - system.performance:fast_404.html: The html to return for simple 404 pages.
  */
 class Fast404ExceptionHtmlSubscriber extends HttpExceptionSubscriberBase {
 
   /**
-   * The HTTP kernel.
+   * The config factory.
    *
-   * @var \Symfony\Component\HttpKernel\HttpKernelInterface
+   * @var \Drupal\Core\Config\ConfigFactoryInterface
    */
-  protected $httpKernel;
+  protected $configFactory;
 
   /**
-   * The config factory.
+   * The cache tags invalidator.
    *
-   * @var \Drupal\Core\Config\ConfigFactoryInterface
+   * @var \Drupal\Core\Cache\CacheTagsInvalidatorInterface
    */
-  protected $configFactory;
+  protected $cacheTagsInvalidator;
 
   /**
    * Constructs a new Fast404ExceptionHtmlSubscriber.
    *
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
-   * @param \Symfony\Component\HttpKernel\HttpKernelInterface $http_kernel
-   *   The HTTP Kernel service.
+   * @param \Drupal\Core\Cache\CacheTagsInvalidatorInterface $cache_tags_invalidator
+   *   The cache tags invalidator.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, HttpKernelInterface $http_kernel) {
+  public function __construct(ConfigFactoryInterface $config_factory, CacheTagsInvalidatorInterface $cache_tags_invalidator) {
     $this->configFactory = $config_factory;
-    $this->httpKernel = $http_kernel;
+    $this->cacheTagsInvalidator = $cache_tags_invalidator;
   }
 
   /**
@@ -74,10 +91,40 @@ public function on404(ExceptionEvent $event) {
       $fast_paths = $config->get('fast_404.paths');
       if ($fast_paths && preg_match($fast_paths, $request->getPathInfo())) {
         $fast_404_html = strtr($config->get('fast_404.html'), ['@path' => Html::escape($request->getUri())]);
-        $response = new Response($fast_404_html, Response::HTTP_NOT_FOUND);
+        $response = new HtmlResponse($fast_404_html, Response::HTTP_NOT_FOUND);
+        // Some routes such as system.files conditionally throw a
+        // NotFoundHttpException depending on URL parameters instead of just the
+        // route and route parameters, so add the URL cache context to account
+        // for this.
+        $cacheable_metadata = new CacheableMetadata();
+        $cacheable_metadata->setCacheContexts(['url']);
+        $cacheable_metadata->addCacheTags(['4xx-response']);
+        $response->addCacheableDependency($cacheable_metadata);
         $event->setResponse($response);
       }
     }
   }
 
+  /**
+   * Invalidates 4xx-response cache tag if fast 404 config is changed.
+   *
+   * @param \Drupal\Core\Config\ConfigCrudEvent $event
+   *   The configuration event.
+   */
+  public function onConfigSave(ConfigCrudEvent $event): void {
+    $saved_config = $event->getConfig();
+    if ($saved_config->getName() === 'system.performance' && $event->isChanged('fast_404')) {
+      $this->cacheTagsInvalidator->invalidateTags(['4xx-response']);
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function getSubscribedEvents(): array {
+    $events = parent::getSubscribedEvents();
+    $events[ConfigEvents::SAVE] = 'onConfigSave';
+    return $events;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
index fefd1c175..261a3bbe9 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php
@@ -179,7 +179,7 @@ protected function isErrorDisplayable($error) {
    * @param $error
    *   Optional error to examine for ERROR_REPORTING_DISPLAY_SOME.
    *
-   * @return
+   * @return array
    *   The updated $error.
    */
   protected function simplifyFileInError($error) {
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
index 9d70038a7..3218829cf 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/FinishResponseSubscriber.php
@@ -54,7 +54,7 @@ class FinishResponseSubscriber implements EventSubscriberInterface {
    *
    * @var \Drupal\Core\Cache\Context\CacheContextsManager
    */
-  protected $cacheContexts;
+  protected $cacheContextsManager;
 
   /**
    * Whether to send cacheability headers for debugging purposes.
@@ -127,15 +127,10 @@ public function onRespond(ResponseEvent $event) {
     // Prevent browsers from sniffing a response and picking a MIME type
     // different from the declared content-type, since that can lead to
     // XSS and other vulnerabilities.
-    // https://www.owasp.org/index.php/List_of_useful_HTTP_headers
+    // https://owasp.org/www-project-secure-headers
     $response->headers->set('X-Content-Type-Options', 'nosniff', FALSE);
     $response->headers->set('X-Frame-Options', 'SAMEORIGIN', FALSE);
 
-    // Add a Permissions-Policy header to block Federated Learning of Cohorts.
-    if (Settings::get('block_interest_cohort', TRUE) && !$response->headers->has('Permissions-Policy')) {
-      $response->headers->set('Permissions-Policy', 'interest-cohort=()');
-    }
-
     // If the current response isn't an implementation of the
     // CacheableResponseInterface, we assume that a Response is either
     // explicitly not cacheable or that caching headers are already set in
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
index 0af47876e..e594fa2ff 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php
@@ -47,7 +47,7 @@ class MaintenanceModeSubscriber implements EventSubscriberInterface {
   protected $config;
 
   /**
-   * The url generator.
+   * The URL generator.
    *
    * @var \Drupal\Core\Routing\UrlGeneratorInterface
    */
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
index 2b4eb93b3..9bf98eba8 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RedirectLeadingSlashesSubscriber.php
@@ -8,12 +8,12 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * Redirects paths starting with multiple slashes to a single slash.
+ * Redirects paths containing successive slashes to those with single slashes.
  */
 class RedirectLeadingSlashesSubscriber implements EventSubscriberInterface {
 
   /**
-   * Redirects paths starting with multiple slashes to a single slash.
+   * Redirects paths containing successive slashes to those with single slashes.
    *
    * @param \Symfony\Component\HttpKernel\Event\RequestEvent $event
    *   The RequestEvent to process.
@@ -28,8 +28,8 @@ public function redirect(RequestEvent $event) {
     // submits back to the same URI this presents an open redirect
     // vulnerability. Also, Drupal 7 renders the same page for
     // http://www.example.org/foo and http://www.example.org////foo.
-    if (strpos($path, '//') === 0) {
-      $path = '/' . ltrim($path, '/');
+    if (strpos($path, '//') !== FALSE) {
+      $path = preg_replace('/\/+/', '/', $path);
       $qs = $request->getQueryString();
       if ($qs) {
         $qs = '?' . $qs;
diff --git a/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php b/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
index afd22cda3..f2bf4d7ca 100644
--- a/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
+++ b/web/core/lib/Drupal/Core/EventSubscriber/RedirectResponseSubscriber.php
@@ -25,6 +25,11 @@ class RedirectResponseSubscriber implements EventSubscriberInterface {
    */
   protected $unroutedUrlAssembler;
 
+  /**
+   * The request context.
+   */
+  protected $requestContext;
+
   /**
    * Constructs a RedirectResponseSubscriber object.
    *
diff --git a/web/core/lib/Drupal/Core/Extension/Extension.php b/web/core/lib/Drupal/Core/Extension/Extension.php
index 62977ba7c..accdb4e3c 100644
--- a/web/core/lib/Drupal/Core/Extension/Extension.php
+++ b/web/core/lib/Drupal/Core/Extension/Extension.php
@@ -10,6 +10,7 @@
  *
  * @see https://bugs.php.net/bug.php?id=66052
  */
+#[\AllowDynamicProperties]
 class Extension {
 
   /**
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php b/web/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php
index d91085a0e..4511f423d 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleDependencyMessageTrait.php
@@ -39,12 +39,13 @@ public function checkDependencyMessage(array $modules, $dependency, Dependency $
       }
 
       // Check if the module is incompatible with the dependency constraints.
-      $version = str_replace(\Drupal::CORE_COMPATIBILITY . '-', '', $modules[$dependency]->info['version'] ?? '');
+      // Remove CORE_COMPATIBILITY- only from the start of the string.
+      $version = preg_replace('/^(' . \Drupal::CORE_COMPATIBILITY . '\-)/', '', $modules[$dependency]->info['version'] ?? '');
       if (!$dependency_object->isCompatible($version)) {
         $constraint_string = $dependency_object->getConstraintString();
         return $this->t('@module_name (<span class="admin-missing">incompatible with</span> version @version)', [
           '@module_name' => "$module_name ($constraint_string)",
-          '@version' => $modules[$dependency]->info['version'],
+          '@version' => $modules[$dependency]->info['version'] ?? '* ? *',
         ]);
       }
     }
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleHandler.php b/web/core/lib/Drupal/Core/Extension/ModuleHandler.php
index 29c9da530..44ba53e78 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleHandler.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleHandler.php
@@ -679,8 +679,10 @@ protected function buildImplementationInfo($hook) {
   }
 
   /**
-   * Verifies an array of implementations loaded from the cache, by including
-   * the lazy-loaded $module.$group.inc, and checking function_exists().
+   * Verifies an array of implementations loaded from cache.
+   *
+   * Verification is done by including the lazy-loaded $module.$group.inc file,
+   * and checking function_exists().
    *
    * @param string[] $implementations
    *   Implementation "group" by module name.
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php b/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
index 909ce63d4..7da4f89b2 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleHandlerInterface.php
@@ -103,7 +103,7 @@ public function addProfile($name, $path);
    *   information discovered during a Drupal\Core\Extension\ExtensionDiscovery
    *   scan.
    *
-   * @return
+   * @return array
    *   The same array with the new keys for each module:
    *   - requires: An array with the keys being the modules that this module
    *     requires.
@@ -425,8 +425,10 @@ public function alter($type, &$data, &$context1 = NULL, &$context2 = NULL);
   public function alterDeprecated($description, $type, &$data, &$context1 = NULL, &$context2 = NULL);
 
   /**
-   * Returns an array of directories for all enabled modules. Useful for
-   * tasks such as finding a file that exists in all module directories.
+   * Returns an array of directories for all enabled modules.
+   *
+   * This is useful for tasks such as finding a file that exists in all module
+   * directories.
    *
    * @return array
    */
diff --git a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
index 909f0eb6c..e60dadd6e 100644
--- a/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
+++ b/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php
@@ -310,7 +310,7 @@ public function install(array $module_list, $enable_dependencies = TRUE) {
                   $update_manager->installFieldStorageDefinition($storage_definition->getName(), $entity_type->id(), $module, $storage_definition);
                 }
                 catch (EntityStorageException $e) {
-                  watchdog_exception('system', $e, 'An error occurred while notifying the creation of the @name field storage definition: "@message" in %function (line %line of %file).', ['@name' => $storage_definition->getName()]);
+                  watchdog_exception('system', $e, 'An error occurred while notifying the creation of the @name field storage definition: "@message" in %function (line %line of %file).', ['@name' => $storage_definition->getName(), '@message' => $e->getMessage()]);
                 }
               }
             }
diff --git a/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php b/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
index 16b7db4f9..bfbef9c86 100644
--- a/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
+++ b/web/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
@@ -146,7 +146,7 @@ public function themeExists($theme);
    * @return \Drupal\Core\Extension\Extension
    *   An extension object.
    *
-   * @throws \Drupal\Core\Extension\Extension\UnknownExtensionException
+   * @throws \Drupal\Core\Extension\Exception\UnknownExtensionException
    *   Thrown when the requested theme does not exist.
    */
   public function getTheme($name);
diff --git a/web/core/lib/Drupal/Core/Extension/module.api.php b/web/core/lib/Drupal/Core/Extension/module.api.php
index 69be62ed0..bab77e3a5 100644
--- a/web/core/lib/Drupal/Core/Extension/module.api.php
+++ b/web/core/lib/Drupal/Core/Extension/module.api.php
@@ -74,7 +74,7 @@
  *
  * See system_hook_info() for all hook groups defined by Drupal core.
  *
- * @return
+ * @return array
  *   An associative array whose keys are hook names and whose values are an
  *   associative array containing:
  *   - group: A string defining the group to which the hook belongs. The module
@@ -183,7 +183,9 @@ function hook_module_preinstall($module) {
  *   TRUE if the module is being installed as part of a configuration import. In
  *   these cases, your hook implementation needs to carefully consider what
  *   changes, if any, it should make. For example, it should not make any
- *   changes to configuration objects or entities.
+ *   changes to configuration objects or configuration entities. Those changes
+ *   should be made earlier and exported so during import there's no need to
+ *   do them again.
  *
  * @see \Drupal\Core\Extension\ModuleInstaller::install()
  * @see hook_install()
@@ -230,8 +232,9 @@ function hook_modules_installed($modules, $is_syncing) {
  * @param bool $is_syncing
  *   TRUE if the module is being installed as part of a configuration import. In
  *   these cases, your hook implementation needs to carefully consider what
- *   changes, if any, it should make. For example, it should not make any
- *   changes to configuration objects or entities.
+ *   changes to configuration objects or configuration entities. Those changes
+ *   should be made earlier and exported so during import there's no need to
+ *   do them again.
  *
  * @see \Drupal\Core\Config\ConfigInstallerInterface::isSyncing
  * @see hook_schema()
@@ -269,8 +272,9 @@ function hook_module_preuninstall($module) {
  * @param bool $is_syncing
  *   TRUE if the module is being uninstalled as part of a configuration import.
  *   In these cases, your hook implementation needs to carefully consider what
- *   changes, if any, it should make. For example, it should not make any
- *   changes to configuration objects or entities.
+ *   changes to configuration objects or configuration entities. Those changes
+ *   should be made earlier and exported so during import there's no need to
+ *   do them again.
  *
  * @see hook_uninstall()
  */
@@ -307,8 +311,9 @@ function hook_modules_uninstalled($modules, $is_syncing) {
  * @param bool $is_syncing
  *   TRUE if the module is being uninstalled as part of a configuration import.
  *   In these cases, your hook implementation needs to carefully consider what
- *   changes, if any, it should make. For example, it should not make any
- *   changes to configuration objects or entities.
+ *   changes to configuration objects or configuration entities. Those changes
+ *   should be made earlier and exported so during import there's no need to
+ *   do them again.
  *
  * @see hook_install()
  * @see hook_schema()
@@ -511,30 +516,61 @@ function hook_install_tasks_alter(&$tasks, $install_state) {
 /**
  * Perform a single update between minor versions.
  *
- * Hook hook_update_N() can only be used to update between minor versions of a
- * module. To upgrade between major versions of Drupal (for example, between
- * Drupal 7 and 8), use the @link migrate Migrate API @endlink instead.
+ * Modules should use hook hook_update_N() to update between minor or major
+ * versions of the module. Sites upgrading from Drupal 6 or 7 to any higher
+ * version should use the @link migrate Migrate API @endlink instead.
  *
  * @section sec_naming Naming and documenting your function
  * For each change in a module that requires one or more actions to be performed
  * when updating a site, add a new implementation of hook_update_N() to your
  * mymodule.install file (assuming mymodule is the machine name of your module).
  * Implementations of hook_update_N() are named (module name)_update_(number).
+ *
+ * The number (N) must be higher than hook_update_last_removed().
+ *
+ * @see hook_update_last_removed()
+ *
  * The numbers are normally composed of three parts:
  * - 1 or 2 digits for Drupal core compatibility (Drupal 8, 9, 10, etc.). This
- *   convention must be followed.
- * - 1 digit for your module's major release version; for example, for 8.x-1.*
- *   use 1, for 8.x-2.* use 2, for Core 8.0.x use 0, and for Core 8.1.x use 1.
- *   This convention is optional but suggested for clarity.
+ *   convention must be followed. If your module is compatible with multiple
+ *   major versions (e.g., it has a core_version_requirement of '^8.8 || ^9'),
+ *   use the lowest major core branch it is compatible with (8 in this example).
+ * - 1 or 2 digits for your module's major release version. Examples:
+ *   - For 8.x-1.* or 1.y.x (semantic versioning), use 1 or 01.
+ *   - For 8.x-2.* or 2.y.x, use 2 or 02.
+ *   - For 8.x-10.* or 10.y.x, use 10.
+ *   - For core 8.0.x, use 0 or 00.
+ *   - For core 8.1.x, use 1 or 01.
+ *   - For core 8.10.x, use 10.
+ *   This convention is optional but suggested for clarity. Note: While four-
+ *   digit update hooks are standard, if you follow the above convention, you
+ *   may run into the need to start using five digits if you get to a major (or,
+ *   for core, a minor) version 10. This will work fine; what matters is that
+ *   you must ALWAYS increase the number when a new update hook is added. For
+ *   example, if you add hook_update_81001(), you cannot later
+ *   add hook_update_9101(). Instead, you would need to use hook_update_90101().
  * - 2 digits for sequential counting, starting with 01. Note that the x000
  *   number can never be used: the lowest update number that will be recognized
- *   and run for major version x is x001.
+ *   and run is 8001.
+ *
+ * @todo Remove reference to CORE_MINIMUM_SCHEMA_VERSION (e.g., x001) once
+ *   https://www.drupal.org/project/drupal/issues/3106712 is resolved.
+ *
  * Examples:
  * - node_update_8001(): The first update for the Drupal 8.0.x version of the
  *   Drupal Core node module.
+ * - node_update_81001(): The first update for the Drupal 8.10.x version of the
+ *   Drupal Core node module.
  * - mymodule_update_8101(): The first update for your custom or contributed
  *   module's 8.x-1.x versions.
  * - mymodule_update_8201(): The first update for the 8.x-2.x versions.
+ * - mymodule_update_80201(): Alternate five-digit format for the first update
+ *   for the 8.x-2.x versions. Subsequent update hooks must always be five
+ *   digits and higher than 80201.
+ * - mymodule_update_8201(): The first update for the custom or contributed
+ *   module's 2.0.x versions, which are compatible with Drupal 8 and 9.
+ * - mymodule_update_91001(): The first update for the custom or contributed
+ *   module's 10.0.x versions, which are compatible with Drupal 9.
  *
  * Never renumber update functions. The numeric part of the hook implementation
  * function is stored in the database to keep track of which updates have run,
@@ -797,7 +833,7 @@ function hook_removed_post_updates() {
  * Implementations of this hook should be placed in a mymodule.install file in
  * the same directory as mymodule.module.
  *
- * @return
+ * @return array
  *   A multidimensional array containing information about the module update
  *   dependencies. The first two levels of keys represent the module and update
  *   number (respectively) for which information is being returned, and the
@@ -843,7 +879,7 @@ function hook_update_dependencies() {
  * Implementations of this hook should be placed in a mymodule.install file in
  * the same directory as mymodule.module.
  *
- * @return
+ * @return int
  *   An integer, corresponding to hook_update_N() which has been removed from
  *   mymodule.install.
  *
@@ -864,7 +900,7 @@ function hook_update_last_removed() {
  * of the Drupal file system, for example to update modules that have newer
  * releases, or to install a new theme.
  *
- * @return
+ * @return array
  *   An associative array of information about the updater(s) being provided.
  *   This array is keyed by a unique identifier for each updater, and the
  *   values are subarrays that can contain the following keys:
@@ -962,7 +998,7 @@ function hook_updater_info_alter(&$updaters) {
  *   - runtime: The runtime requirements are being checked and shown on the
  *     status report page.
  *
- * @return
+ * @return array
  *   An associative array where the keys are arbitrary but must be unique (it
  *   is suggested to use the module short name as a prefix) and the values are
  *   themselves associative arrays with the following elements:
@@ -1008,7 +1044,7 @@ function hook_requirements($phase) {
     }
     else {
       $requirements['cron'] = [
-        'description' => t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for <a href=":url">configuring cron jobs</a>.', [':url' => 'https://www.drupal.org/cron']),
+        'description' => t('Cron has not run. It appears cron jobs have not been setup on your system. Check the help pages for <a href=":url">configuring cron jobs</a>.', [':url' => 'https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks/cron-automated-tasks-overview']),
         'severity' => REQUIREMENT_ERROR,
         'value' => t('Never run'),
       ];
@@ -1022,6 +1058,29 @@ function hook_requirements($phase) {
   return $requirements;
 }
 
+/**
+ * Alters requirements data.
+ *
+ * Implementations are able to alter the title, value, description or the
+ * severity of certain requirements defined by hook_requirements()
+ * implementations or even remove such entries.
+ *
+ * @param array $requirements
+ *   The requirements data to be altered.
+ *
+ * @see hook_requirements()
+ */
+function hook_requirements_alter(array &$requirements): void {
+  // Change the title from 'PHP' to 'PHP version'.
+  $requirements['php']['title'] = t('PHP version');
+
+  // Decrease the 'update status' requirement severity from warning to info.
+  $requirements['update status']['severity'] = REQUIREMENT_INFO;
+
+  // Remove a requirements entry.
+  unset($requirements['foo']);
+}
+
 /**
  * @} End of "addtogroup hooks".
  */
diff --git a/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php b/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
index 9ecac7a34..5f499e917 100644
--- a/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Annotation/FieldFormatter.php
@@ -64,9 +64,10 @@ class FieldFormatter extends Plugin {
   public $field_types = [];
 
   /**
-   * An integer to determine the weight of this formatter relative to other
-   * formatter in the Field UI when selecting a formatter for a given field
-   * instance.
+   * An integer to determine the weight of this formatter.
+   *
+   * Weight is relative to other formatter in the Field UI when selecting a
+   * formatter for a given field instance.
    *
    * This property is optional and it does not need to be declared.
    *
diff --git a/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php b/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
index f17612284..ff7dffd7f 100644
--- a/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Annotation/FieldWidget.php
@@ -70,8 +70,10 @@ class FieldWidget extends Plugin {
   public $multiple_values = FALSE;
 
   /**
-   * An integer to determine the weight of this widget relative to other widgets
-   * in the Field UI when selecting a widget for a given field.
+   * An integer to determine weight of this widget relative to other widgets.
+   *
+   * Other widgets are in the Field UI when selecting a widget for a given
+   * field.
    *
    * This property is optional and it does not need to be declared.
    *
diff --git a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
index 3f4fc4ea5..bcac23792 100644
--- a/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/web/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -184,8 +184,10 @@ abstract class FieldConfigBase extends ConfigEntityBase implements FieldConfigIn
   protected $constraints = [];
 
   /**
-   * Array of property constraint options keyed by property ID. The values are
-   * associative array of constraint options keyed by constraint plugin ID.
+   * Array of property constraint options keyed by property ID.
+   *
+   * The values are associative array of constraint options keyed by constraint
+   * plugin ID.
    *
    * @var array[]
    */
diff --git a/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php b/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php
index c4df0f5f2..46305a5f2 100644
--- a/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php
+++ b/web/core/lib/Drupal/Core/Field/FormatterPluginManager.php
@@ -90,8 +90,8 @@ public function createInstance($plugin_id, array $configuration = []) {
    *     - third_party_settings: (array) Settings provided by other extensions
    *       through hook_field_formatter_third_party_settings_form().
    *
-   * @return \Drupal\Core\Field\FormatterInterface|null
-   *   A formatter object or NULL when plugin is not found.
+   * @return \Drupal\Core\Field\FormatterInterface|false
+   *   A formatter object or FALSE when plugin is not found.
    */
   public function getInstance(array $options) {
     $configuration = $options['configuration'];
@@ -114,7 +114,7 @@ public function getInstance(array $options) {
       // Grab the default widget for the field type.
       $field_type_definition = $this->fieldTypeManager->getDefinition($field_type);
       if (empty($field_type_definition['default_formatter'])) {
-        return NULL;
+        return FALSE;
       }
       $plugin_id = $field_type_definition['default_formatter'];
     }
@@ -123,7 +123,7 @@ public function getInstance(array $options) {
       'field_definition' => $field_definition,
       'view_mode' => $options['view_mode'],
     ];
-    return $this->createInstance($plugin_id, $configuration);
+    return $this->createInstance($plugin_id, $configuration) ?? FALSE;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php
index 2707ad846..fd0466958 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/BasicStringFormatter.php
@@ -14,9 +14,6 @@
  *   field_types = {
  *     "string_long",
  *     "email"
- *   },
- *   quickedit = {
- *     "editor" = "plain_text"
  *   }
  * )
  */
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
index 58e8fffc7..312f846d3 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/DecimalFormatter.php
@@ -42,18 +42,18 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $elements['decimal_separator'] = [
       '#type' => 'select',
-      '#title' => t('Decimal marker'),
-      '#options' => ['.' => t('Decimal point'), ',' => t('Comma')],
+      '#title' => $this->t('Decimal marker'),
+      '#options' => ['.' => $this->t('Decimal point'), ',' => $this->t('Comma')],
       '#default_value' => $this->getSetting('decimal_separator'),
       '#weight' => 5,
     ];
     $elements['scale'] = [
       '#type' => 'number',
-      '#title' => t('Scale', [], ['context' => 'decimal places']),
+      '#title' => $this->t('Scale', [], ['context' => 'decimal places']),
       '#min' => 0,
       '#max' => 10,
       '#default_value' => $this->getSetting('scale'),
-      '#description' => t('The number of digits to the right of the decimal.'),
+      '#description' => $this->t('The number of digits to the right of the decimal.'),
       '#weight' => 6,
     ];
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
index 8f95e07b5..38429246f 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceEntityFormatter.php
@@ -130,7 +130,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements['view_mode'] = [
       '#type' => 'select',
       '#options' => $this->entityDisplayRepository->getViewModeOptions($this->getFieldSetting('target_type')),
-      '#title' => t('View mode'),
+      '#title' => $this->t('View mode'),
       '#default_value' => $this->getSetting('view_mode'),
       '#required' => TRUE,
     ];
@@ -146,7 +146,7 @@ public function settingsSummary() {
 
     $view_modes = $this->entityDisplayRepository->getViewModeOptions($this->getFieldSetting('target_type'));
     $view_mode = $this->getSetting('view_mode');
-    $summary[] = t('Rendered as @mode', ['@mode' => $view_modes[$view_mode] ?? $view_mode]);
+    $summary[] = $this->t('Rendered as @mode', ['@mode' => $view_modes[$view_mode] ?? $view_mode]);
 
     return $summary;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
index ed9a6596d..5316105a8 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
@@ -35,7 +35,7 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements['link'] = [
-      '#title' => t('Link label to the referenced entity'),
+      '#title' => $this->t('Link label to the referenced entity'),
       '#type' => 'checkbox',
       '#default_value' => $this->getSetting('link'),
     ];
@@ -48,7 +48,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = $this->getSetting('link') ? t('Link to the referenced entity') : t('No link');
+    $summary[] = $this->getSetting('link') ? $this->t('Link to the referenced entity') : $this->t('No link');
     return $summary;
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
index bc3efc759..2ff9dc021 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/NumericFormatterBase.php
@@ -16,16 +16,16 @@ abstract class NumericFormatterBase extends FormatterBase {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $options = [
-      ''  => t('- None -'),
-      '.' => t('Decimal point'),
-      ',' => t('Comma'),
-      ' ' => t('Space'),
-      chr(8201) => t('Thin space'),
-      "'" => t('Apostrophe'),
+      ''  => $this->t('- None -'),
+      '.' => $this->t('Decimal point'),
+      ',' => $this->t('Comma'),
+      ' ' => $this->t('Space'),
+      chr(8201) => $this->t('Thin space'),
+      "'" => $this->t('Apostrophe'),
     ];
     $elements['thousand_separator'] = [
       '#type' => 'select',
-      '#title' => t('Thousand marker'),
+      '#title' => $this->t('Thousand marker'),
       '#options' => $options,
       '#default_value' => $this->getSetting('thousand_separator'),
       '#weight' => 0,
@@ -33,7 +33,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $elements['prefix_suffix'] = [
       '#type' => 'checkbox',
-      '#title' => t('Display prefix and suffix'),
+      '#title' => $this->t('Display prefix and suffix'),
       '#default_value' => $this->getSetting('prefix_suffix'),
       '#weight' => 10,
     ];
@@ -49,7 +49,7 @@ public function settingsSummary() {
 
     $summary[] = $this->numberFormat(1234.1234567890);
     if ($this->getSetting('prefix_suffix')) {
-      $summary[] = t('Display with prefix and suffix.');
+      $summary[] = $this->t('Display with prefix and suffix.');
     }
 
     return $summary;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
index c46a97b22..b72983664 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/StringFormatter.php
@@ -20,9 +20,6 @@
  *   field_types = {
  *     "string",
  *     "uri",
- *   },
- *   quickedit = {
- *     "editor" = "plain_text"
  *   }
  * )
  */
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
index 0c9e8195b..15b7b6554 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/DecimalItem.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Defines the 'decimal' field type.
@@ -36,7 +37,7 @@ public static function defaultStorageSettings() {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('string')
-      ->setLabel(t('Decimal value'))
+      ->setLabel(new TranslatableMarkup('Decimal value'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -66,21 +67,21 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['precision'] = [
       '#type' => 'number',
-      '#title' => t('Precision'),
+      '#title' => $this->t('Precision'),
       '#min' => 10,
       '#max' => 32,
       '#default_value' => $settings['precision'],
-      '#description' => t('The total number of digits to store in the database, including those to the right of the decimal.'),
+      '#description' => $this->t('The total number of digits to store in the database, including those to the right of the decimal.'),
       '#disabled' => $has_data,
     ];
 
     $element['scale'] = [
       '#type' => 'number',
-      '#title' => t('Scale', [], ['context' => 'decimal places']),
+      '#title' => $this->t('Scale', [], ['context' => 'decimal places']),
       '#min' => 0,
       '#max' => 10,
       '#default_value' => $settings['scale'],
-      '#description' => t('The number of digits to the right of the decimal.'),
+      '#description' => $this->t('The number of digits to the right of the decimal.'),
       '#disabled' => $has_data,
     ];
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index a6801fc22..59e918ae9 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Render\Element\Email;
 use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Defines the 'email' field type.
@@ -27,7 +28,7 @@ class EmailItem extends FieldItemBase {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('email')
-      ->setLabel(t('Email'))
+      ->setLabel(new TranslatableMarkup('Email'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -58,7 +59,10 @@ public function getConstraints() {
       'value' => [
         'Length' => [
           'max' => Email::EMAIL_MAX_LENGTH,
-          'maxMessage' => t('%name: the email address can not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => Email::EMAIL_MAX_LENGTH]),
+          'maxMessage' => $this->t('%name: the email address can not be longer than @max characters.', [
+            '%name' => $this->getFieldDefinition()->getLabel(),
+            '@max' => Email::EMAIL_MAX_LENGTH,
+          ]),
         ],
       ],
     ]);
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
index 0bf634ea5..552f8580b 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EntityReferenceItem.php
@@ -362,7 +362,7 @@ protected static function getRandomBundle(EntityTypeInterface $entity_type, arra
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
     $element['target_type'] = [
       '#type' => 'select',
-      '#title' => t('Type of item to reference'),
+      '#title' => $this->t('Type of item to reference'),
       '#default_value' => $this->getSetting('target_type'),
       '#required' => TRUE,
       '#disabled' => $has_data,
@@ -413,7 +413,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     ];
     $form['handler'] = [
       '#type' => 'details',
-      '#title' => t('Reference type'),
+      '#title' => $this->t('Reference type'),
       '#open' => TRUE,
       '#tree' => TRUE,
       '#process' => [[static::class, 'formProcessMergeParent']],
@@ -421,7 +421,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $form['handler']['handler'] = [
       '#type' => 'select',
-      '#title' => t('Reference method'),
+      '#title' => $this->t('Reference method'),
       '#options' => $handlers_options,
       '#default_value' => $field->getSetting('handler'),
       '#required' => TRUE,
@@ -430,7 +430,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     ];
     $form['handler']['handler_submit'] = [
       '#type' => 'submit',
-      '#value' => t('Change handler'),
+      '#value' => $this->t('Change handler'),
       '#limit_validation_errors' => [],
       '#attributes' => [
         'class' => ['js-hide'],
@@ -637,8 +637,6 @@ public function getSettableOptions(AccountInterface $account = NULL) {
   /**
    * Render API callback: Processes the field settings form.
    *
-   * Allows access to the form state.
-   *
    * @see static::fieldSettingsForm()
    */
   public static function fieldSettingsAjaxProcess($form, FormStateInterface $form_state) {
@@ -647,8 +645,7 @@ public static function fieldSettingsAjaxProcess($form, FormStateInterface $form_
   }
 
   /**
-   * Adds entity_reference specific properties to AJAX form elements from the
-   * field settings form.
+   * Adds the field settings to AJAX form elements.
    *
    * @see static::fieldSettingsAjaxProcess()
    */
@@ -667,9 +664,10 @@ public static function fieldSettingsAjaxProcessElement(&$element, $main_form) {
   }
 
   /**
-   * Render API callback: Moves entity_reference specific Form API elements
-   * (i.e. 'handler_settings') up a level for easier processing by the
-   * validation and submission handlers.
+   * Render API callback that moves entity reference elements up a level.
+   *
+   * The elements (i.e. 'handler_settings') are moved for easier processing by
+   * the validation and submission handlers.
    *
    * @see _entity_reference_field_settings_process()
    */
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
index 846912672..1ce7a4463 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/IntegerItem.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Defines the 'integer' field type.
@@ -49,7 +50,7 @@ public static function defaultFieldSettings() {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('integer')
-      ->setLabel(t('Integer value'))
+      ->setLabel(new TranslatableMarkup('Integer value'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -69,7 +70,7 @@ public function getConstraints() {
         'value' => [
           'Range' => [
             'min' => 0,
-            'minMessage' => t('%name: The integer must be larger or equal to %min.', [
+            'minMessage' => $this->t('%name: The integer must be larger or equal to %min.', [
               '%name' => $this->getFieldDefinition()->getLabel(),
               '%min' => 0,
             ]),
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
index a0c2af0e2..d1f3d644d 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/NumericItemBase.php
@@ -31,29 +31,29 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['min'] = [
       '#type' => 'number',
-      '#title' => t('Minimum'),
+      '#title' => $this->t('Minimum'),
       '#default_value' => $settings['min'],
-      '#description' => t('The minimum value that should be allowed in this field. Leave blank for no minimum.'),
+      '#description' => $this->t('The minimum value that should be allowed in this field. Leave blank for no minimum.'),
     ];
     $element['max'] = [
       '#type' => 'number',
-      '#title' => t('Maximum'),
+      '#title' => $this->t('Maximum'),
       '#default_value' => $settings['max'],
-      '#description' => t('The maximum value that should be allowed in this field. Leave blank for no maximum.'),
+      '#description' => $this->t('The maximum value that should be allowed in this field. Leave blank for no maximum.'),
     ];
     $element['prefix'] = [
       '#type' => 'textfield',
-      '#title' => t('Prefix'),
+      '#title' => $this->t('Prefix'),
       '#default_value' => $settings['prefix'],
       '#size' => 60,
-      '#description' => t("Define a string that should be prefixed to the value, like '$ ' or '&euro; '. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."),
+      '#description' => $this->t("Define a string that should be prefixed to the value, like '$ ' or '&euro; '. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."),
     ];
     $element['suffix'] = [
       '#type' => 'textfield',
-      '#title' => t('Suffix'),
+      '#title' => $this->t('Suffix'),
       '#default_value' => $settings['suffix'],
       '#size' => 60,
-      '#description' => t("Define a string that should be suffixed to the value, like ' m', ' kb/s'. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."),
+      '#description' => $this->t("Define a string that should be suffixed to the value, like ' m', ' kb/s'. Leave blank for none. Separate singular and plural values with a pipe ('pound|pounds')."),
     ];
 
     return $element;
@@ -85,7 +85,7 @@ public function getConstraints() {
         'value' => [
           'Range' => [
             'min' => $min,
-            'minMessage' => t('%name: the value may be no less than %min.', ['%name' => $label, '%min' => $min]),
+            'minMessage' => $this->t('%name: the value may be no less than %min.', ['%name' => $label, '%min' => $min]),
           ],
         ],
       ]);
@@ -97,7 +97,10 @@ public function getConstraints() {
         'value' => [
           'Range' => [
             'max' => $max,
-            'maxMessage' => t('%name: the value may be no greater than %max.', ['%name' => $label, '%max' => $max]),
+            'maxMessage' => $this->t('%name: the value may be no greater than %max.', [
+              '%name' => $label,
+              '%max' => $max,
+            ]),
           ],
         ],
       ]);
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
index b51764c29..172f904b2 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
@@ -58,7 +58,7 @@ public function getConstraints() {
         'value' => [
           'Length' => [
             'max' => $max_length,
-            'maxMessage' => t('%name: may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
+            'maxMessage' => $this->t('%name: may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
           ],
         ],
       ]);
@@ -84,10 +84,10 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['max_length'] = [
       '#type' => 'number',
-      '#title' => t('Maximum length'),
+      '#title' => $this->t('Maximum length'),
       '#default_value' => $this->getSetting('max_length'),
       '#required' => TRUE,
-      '#description' => t('The maximum length of the field in characters.'),
+      '#description' => $this->t('The maximum length of the field in characters.'),
       '#min' => 1,
       '#disabled' => $has_data,
     ];
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php
index f59c10c98..fc08eb501 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItemBase.php
@@ -25,8 +25,6 @@ public static function defaultStorageSettings() {
    * {@inheritdoc}
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    // This is called very early by the user entity roles field. Prevent
-    // early t() calls by using the TranslatableMarkup.
     $properties['value'] = DataDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Text value'))
       ->setSetting('case_sensitive', $field_definition->getSetting('case_sensitive'))
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
index 7991a6f64..a954dac07 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/BooleanCheckboxWidget.php
@@ -35,7 +35,7 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['display_label'] = [
       '#type' => 'checkbox',
-      '#title' => t('Use field label instead of the "On" label as the label.'),
+      '#title' => $this->t('Use field label instead of the "On" label as the label.'),
       '#default_value' => $this->getSetting('display_label'),
       '#weight' => -1,
     ];
@@ -49,7 +49,7 @@ public function settingsSummary() {
     $summary = [];
 
     $display_label = $this->getSetting('display_label');
-    $summary[] = t('Use field label: @display_label', ['@display_label' => ($display_label ? t('Yes') : t('No'))]);
+    $summary[] = $this->t('Use field label: @display_label', ['@display_label' => ($display_label ? $this->t('Yes') : $this->t('No'))]);
 
     return $summary;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
index 76d0bdd24..bf7bb4042 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EmailDefaultWidget.php
@@ -43,9 +43,9 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['placeholder'] = [
       '#type' => 'textfield',
-      '#title' => t('Placeholder'),
+      '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
-      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
+      '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
     ];
     return $element;
   }
@@ -58,12 +58,12 @@ public function settingsSummary() {
 
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
-      $summary[] = t('No placeholder');
+      $summary[] = $this->t('No placeholder');
     }
-    $summary[] = t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
+    $summary[] = $this->t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
 
     return $summary;
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
index 2ce3912d8..22a1b2a08 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/EntityReferenceAutocompleteWidget.php
@@ -40,10 +40,10 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['match_operator'] = [
       '#type' => 'radios',
-      '#title' => t('Autocomplete matching'),
+      '#title' => $this->t('Autocomplete matching'),
       '#default_value' => $this->getSetting('match_operator'),
       '#options' => $this->getMatchOperatorOptions(),
-      '#description' => t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of entities.'),
+      '#description' => $this->t('Select the method used to collect autocomplete suggestions. Note that <em>Contains</em> can cause performance issues on sites with thousands of entities.'),
     ];
     $element['match_limit'] = [
       '#type' => 'number',
@@ -54,16 +54,16 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['size'] = [
       '#type' => 'number',
-      '#title' => t('Size of textfield'),
+      '#title' => $this->t('Size of textfield'),
       '#default_value' => $this->getSetting('size'),
       '#min' => 1,
       '#required' => TRUE,
     ];
     $element['placeholder'] = [
       '#type' => 'textfield',
-      '#title' => t('Placeholder'),
+      '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
-      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
+      '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
     ];
     return $element;
   }
@@ -75,16 +75,16 @@ public function settingsSummary() {
     $summary = [];
 
     $operators = $this->getMatchOperatorOptions();
-    $summary[] = t('Autocomplete matching: @match_operator', ['@match_operator' => $operators[$this->getSetting('match_operator')]]);
+    $summary[] = $this->t('Autocomplete matching: @match_operator', ['@match_operator' => $operators[$this->getSetting('match_operator')]]);
     $size = $this->getSetting('match_limit') ?: $this->t('unlimited');
     $summary[] = $this->t('Autocomplete suggestion list size: @size', ['@size' => $size]);
-    $summary[] = t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
+    $summary[] = $this->t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
-      $summary[] = t('No placeholder');
+      $summary[] = $this->t('No placeholder');
     }
 
     return $summary;
@@ -207,8 +207,8 @@ protected function getSelectionHandlerSetting($setting_name) {
    */
   protected function getMatchOperatorOptions() {
     return [
-      'STARTS_WITH' => t('Starts with'),
-      'CONTAINS' => t('Contains'),
+      'STARTS_WITH' => $this->t('Starts with'),
+      'CONTAINS' => $this->t('Contains'),
     ];
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php
index 976b52832..f3ad57340 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/NumberWidget.php
@@ -38,9 +38,9 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['placeholder'] = [
       '#type' => 'textfield',
-      '#title' => t('Placeholder'),
+      '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
-      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
+      '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
     ];
     return $element;
   }
@@ -53,10 +53,10 @@ public function settingsSummary() {
 
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
-      $summary[] = t('No placeholder');
+      $summary[] = $this->t('No placeholder');
     }
 
     return $summary;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php
index 7787106d8..5c9603ee5 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsButtonsWidget.php
@@ -64,7 +64,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   protected function getEmptyLabel() {
     if (!$this->required && !$this->multiple) {
-      return t('N/A');
+      return $this->t('N/A');
     }
   }
 
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
index b623c8755..33e92109d 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsSelectWidget.php
@@ -62,7 +62,7 @@ protected function getEmptyLabel() {
     if ($this->multiple) {
       // Multiple select: add a 'none' option for non-required fields.
       if (!$this->required) {
-        return t('- None -');
+        return $this->t('- None -');
       }
     }
     else {
@@ -70,10 +70,10 @@ protected function getEmptyLabel() {
       // and a 'select a value' option for required fields that do not come
       // with a value selected.
       if (!$this->required) {
-        return t('- None -');
+        return $this->t('- None -');
       }
       if (!$this->has_value) {
-        return t('- Select a value -');
+        return $this->t('- Select a value -');
       }
     }
   }
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
index 0a5880173..9ebd8199a 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/OptionsWidgetBase.php
@@ -9,6 +9,7 @@
 use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Form\OptGroup;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Base class for the 'options_*' widgets.
@@ -23,13 +24,34 @@
 abstract class OptionsWidgetBase extends WidgetBase {
 
   /**
-   * Abstract over the actual field columns, to allow different field types to
-   * reuse those widgets.
+   * Abstract over the actual field columns.
+   *
+   * Allows different field types to reuse those widgets.
    *
    * @var string
    */
   protected $column;
 
+  /**
+   * Tracks whether the field is required.
+   */
+  protected $required;
+
+  /**
+   * Tracks whether the data is multi-valued.
+   */
+  protected $multiple;
+
+  /**
+   * Tracks whether the field has a value.
+   */
+  protected $has_value;
+
+  /**
+   * The array of options for the widget.
+   */
+  protected $options;
+
   /**
    * {@inheritdoc}
    */
@@ -68,7 +90,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   public static function validateElement(array $element, FormStateInterface $form_state) {
     if ($element['#required'] && $element['#value'] == '_none') {
-      $form_state->setError($element, t('@name field is required.', ['@name' => $element['#title']]));
+      $form_state->setError($element, new TranslatableMarkup('@name field is required.', ['@name' => $element['#title']]));
     }
 
     // Massage submitted form values.
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php
index 5f21b5edd..e3f4a218c 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextareaWidget.php
@@ -35,16 +35,16 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['rows'] = [
       '#type' => 'number',
-      '#title' => t('Rows'),
+      '#title' => $this->t('Rows'),
       '#default_value' => $this->getSetting('rows'),
       '#required' => TRUE,
       '#min' => 1,
     ];
     $element['placeholder'] = [
       '#type' => 'textfield',
-      '#title' => t('Placeholder'),
+      '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
-      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
+      '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
     ];
     return $element;
   }
@@ -55,10 +55,10 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = [];
 
-    $summary[] = t('Number of rows: @rows', ['@rows' => $this->getSetting('rows')]);
+    $summary[] = $this->t('Number of rows: @rows', ['@rows' => $this->getSetting('rows')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
 
     return $summary;
diff --git a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php
index a0bb425f0..4d86a33f8 100644
--- a/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php
+++ b/web/core/lib/Drupal/Core/Field/Plugin/Field/FieldWidget/StringTextfieldWidget.php
@@ -35,16 +35,16 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['size'] = [
       '#type' => 'number',
-      '#title' => t('Size of textfield'),
+      '#title' => $this->t('Size of textfield'),
       '#default_value' => $this->getSetting('size'),
       '#required' => TRUE,
       '#min' => 1,
     ];
     $element['placeholder'] = [
       '#type' => 'textfield',
-      '#title' => t('Placeholder'),
+      '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
-      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
+      '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
     ];
     return $element;
   }
@@ -55,10 +55,10 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = [];
 
-    $summary[] = t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
+    $summary[] = $this->t('Textfield size: @size', ['@size' => $this->getSetting('size')]);
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
 
     return $summary;
diff --git a/web/core/lib/Drupal/Core/Field/WidgetBase.php b/web/core/lib/Drupal/Core/Field/WidgetBase.php
index a5549e670..e1da2b905 100644
--- a/web/core/lib/Drupal/Core/Field/WidgetBase.php
+++ b/web/core/lib/Drupal/Core/Field/WidgetBase.php
@@ -444,6 +444,7 @@ public function flagErrors(FieldItemListInterface $items, ConstraintViolationLis
 
         $violations_by_delta = $item_list_violations = [];
         foreach ($violations as $violation) {
+          $violation = new InternalViolation($violation);
           // Separate violations by delta.
           $property_path = explode('.', $violation->getPropertyPath());
           $delta = array_shift($property_path);
@@ -454,6 +455,7 @@ public function flagErrors(FieldItemListInterface $items, ConstraintViolationLis
           else {
             $item_list_violations[] = $violation;
           }
+          // @todo Remove BC layer https://www.drupal.org/i/3307859 on PHP 8.2.
           $violation->arrayPropertyPath = $property_path;
         }
 
@@ -470,7 +472,6 @@ public function flagErrors(FieldItemListInterface $items, ConstraintViolationLis
             $delta_element = $element[$original_delta];
           }
           foreach ($delta_violations as $violation) {
-            // @todo: Pass $violation->arrayPropertyPath as property path.
             $error_element = $this->errorElement($delta_element, $violation, $form, $form_state);
             if ($error_element !== FALSE) {
               $form_state->setError($error_element, $violation->getMessage());
diff --git a/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php b/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php
index e5afb21e5..a2366f322 100644
--- a/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php
+++ b/web/core/lib/Drupal/Core/Field/WidgetPluginManager.php
@@ -69,8 +69,8 @@ public function __construct(\Traversable $namespaces, CacheBackendInterface $cac
    *     - third_party_settings: (array) Settings provided by other extensions
    *       through hook_field_formatter_third_party_settings_form().
    *
-   * @return \Drupal\Core\Field\WidgetInterface|null
-   *   A Widget object or NULL when plugin is not found.
+   * @return \Drupal\Core\Field\WidgetInterface|false
+   *   A Widget object or FALSE when plugin is not found.
    */
   public function getInstance(array $options) {
     // Fill in defaults for missing properties.
@@ -99,7 +99,7 @@ public function getInstance(array $options) {
       // Grab the default widget for the field type.
       $field_type_definition = $this->fieldTypeManager->getDefinition($field_type);
       if (empty($field_type_definition['default_widget'])) {
-        return NULL;
+        return FALSE;
       }
       $plugin_id = $field_type_definition['default_widget'];
     }
@@ -107,7 +107,7 @@ public function getInstance(array $options) {
     $configuration += [
       'field_definition' => $field_definition,
     ];
-    return $this->createInstance($plugin_id, $configuration);
+    return $this->createInstance($plugin_id, $configuration) ?? FALSE;
   }
 
   /**
diff --git a/web/core/lib/Drupal/Core/File/FileSystem.php b/web/core/lib/Drupal/Core/File/FileSystem.php
index 02175f9e1..36d802f52 100644
--- a/web/core/lib/Drupal/Core/File/FileSystem.php
+++ b/web/core/lib/Drupal/Core/File/FileSystem.php
@@ -240,8 +240,7 @@ public function mkdir($uri, $mode = NULL, $recursive = FALSE, $context = NULL) {
   }
 
   /**
-   * Helper function. Ensures we don't pass a NULL as a context resource to
-   * mkdir().
+   * Ensures we don't pass a NULL as a context resource to mkdir().
    *
    * @see self::mkdir()
    */
diff --git a/web/core/lib/Drupal/Core/File/FileSystemInterface.php b/web/core/lib/Drupal/Core/File/FileSystemInterface.php
index 59d2ee37f..aa31372c1 100644
--- a/web/core/lib/Drupal/Core/File/FileSystemInterface.php
+++ b/web/core/lib/Drupal/Core/File/FileSystemInterface.php
@@ -37,14 +37,14 @@ interface FileSystemInterface {
    *
    * @see \Drupal\Core\File\FileSystemInterface::INSECURE_EXTENSION_REGEX
    */
-  public const INSECURE_EXTENSIONS = ['phar', 'php', 'pl', 'py', 'cgi', 'asp', 'js', 'htaccess'];
+  public const INSECURE_EXTENSIONS = ['phar', 'php', 'pl', 'py', 'cgi', 'asp', 'js', 'htaccess', 'phtml'];
 
   /**
    * The regex pattern used when checking for insecure file types.
    *
    * @see \Drupal\Core\File\FileSystemInterface::INSECURE_EXTENSIONS
    */
-  public const INSECURE_EXTENSION_REGEX = '/\.(phar|php|pl|py|cgi|asp|js|htaccess)(\.|$)/i';
+  public const INSECURE_EXTENSION_REGEX = '/\.(phar|php|pl|py|cgi|asp|js|htaccess|phtml)(\.|$)/i';
 
   /**
    * Moves an uploaded file to a new location.
@@ -173,8 +173,7 @@ public function dirname($uri);
   public function basename($uri, $suffix = NULL);
 
   /**
-   * Creates a directory, optionally creating missing components in the path to
-   * the directory.
+   * Creates a directory, optionally creating missing components in the path.
    *
    * When PHP's mkdir() creates a directory, the requested mode is affected by
    * the process's umask. This function overrides the umask and sets the mode
diff --git a/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php b/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
index d8ec40554..9613ed45d 100644
--- a/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
+++ b/web/core/lib/Drupal/Core/File/MimeType/ExtensionMimeTypeGuesser.php
@@ -620,7 +620,6 @@ class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface, LegacyMimeTy
       'kar' => 187,
       'mpega' => 188,
       'mpga' => 188,
-      'm4a' => 188,
       'mp3' => 188,
       'mp2' => 188,
       'ogg' => 189,
@@ -846,6 +845,7 @@ class ExtensionMimeTypeGuesser implements MimeTypeGuesserInterface, LegacyMimeTy
       'vrml' => 345,
       'f4a' => 346,
       'f4b' => 346,
+      'm4a' => 346,
       'flv' => 347,
       'm4v' => 348,
       'azw' => 349,
diff --git a/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index 0da89b9c9..e23a4f868 100644
--- a/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+++ b/web/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
@@ -25,7 +25,7 @@ class MimeTypeGuesser implements LegacyMimeTypeGuesserInterface, MimeTypeGuesser
    *
    * If this is NULL a rebuild will be triggered.
    *
-   * @var \Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface[]
+   * @var \Symfony\Component\Mime\MimeTypeGuesserInterface[]
    *
    * @see \Drupal\Core\File\MimeType\MimeTypeGuesser::addGuesser()
    * @see \Drupal\Core\File\MimeType\MimeTypeGuesser::sortGuessers()
diff --git a/web/core/lib/Drupal/Core/File/file.api.php b/web/core/lib/Drupal/Core/File/file.api.php
index 33a5be1c8..a6c15a7db 100644
--- a/web/core/lib/Drupal/Core/File/file.api.php
+++ b/web/core/lib/Drupal/Core/File/file.api.php
@@ -23,7 +23,7 @@
  * @param $uri
  *   The URI of the file.
  *
- * @return
+ * @return string[]|int
  *   If the user does not have permission to access the file, return -1. If the
  *   user has permission, return an array with the appropriate headers. If the
  *   file is not controlled by the current module, the return value should be
diff --git a/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php b/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
index 4b68c237b..26fd98b34 100644
--- a/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
+++ b/web/core/lib/Drupal/Core/FileTransfer/FileTransfer.php
@@ -41,6 +41,27 @@ abstract class FileTransfer {
    */
   protected $port;
 
+  /**
+   * Full path to directory where file-transfer is restricted to.
+   *
+   * @var string
+   */
+  protected $jail;
+
+  /**
+   * Path to connection chroot.
+   *
+   * @var string|false|null
+   */
+  private $chrootPath;
+
+  /**
+   * The instantiated connection object.
+   *
+   * @var object|false|null
+   */
+  private $connectionHandle;
+
   /**
    * Constructs a Drupal\Core\FileTransfer\FileTransfer object.
    *
@@ -93,12 +114,49 @@ public static function factory($jail, $settings) {
   public function __get($name) {
     if ($name == 'connection') {
       $this->connect();
-      return $this->connection;
+      return $this->connectionHandle;
     }
 
     if ($name == 'chroot') {
       $this->setChroot();
-      return $this->chroot;
+      return $this->chrootPath;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __set(string $name, $value): void {
+    if ($name == 'connection') {
+      $this->connectionHandle = $value;
+    }
+    elseif ($name == 'chroot') {
+      $this->chrootPath = $value;
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __isset(string $name): bool {
+    if ($name == 'connection') {
+      return isset($this->connectionHandle);
+    }
+    if ($name == 'chroot') {
+      return isset($this->chrootPath);
+    }
+    return FALSE;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __unset(string $name): void {
+    if ($name == 'connection') {
+      unset($this->connectionHandle);
+    }
+    elseif ($name == 'chroot') {
+      unset($this->chrootPath);
     }
   }
 
@@ -235,8 +293,8 @@ final protected function fixRemotePath($path, $strip_chroot = TRUE) {
     // Strip out windows drive letter if its there.
     $path = preg_replace('|^([a-z]{1}):|i', '', $path);
     if ($strip_chroot) {
-      if ($this->chroot && strpos($path, $this->chroot) === 0) {
-        $path = ($path == $this->chroot) ? '' : substr($path, strlen($this->chroot));
+      if ($this->chrootPath && strpos($path, $this->chrootPath) === 0) {
+        $path = ($path == $this->chrootPath) ? '' : substr($path, strlen($this->chrootPath));
       }
     }
     return $path;
diff --git a/web/core/lib/Drupal/Core/Flood/FloodInterface.php b/web/core/lib/Drupal/Core/Flood/FloodInterface.php
index 5e3ead3a4..4a1c576de 100644
--- a/web/core/lib/Drupal/Core/Flood/FloodInterface.php
+++ b/web/core/lib/Drupal/Core/Flood/FloodInterface.php
@@ -54,15 +54,16 @@ public function clear($name, $identifier = NULL);
    *   (optional) Unique identifier of the current user. Defaults to the current
    *   user's IP address).
    *
-   * @return
+   * @return bool
    *   TRUE if the user is allowed to proceed. FALSE if they have exceeded the
    *   threshold and should not be allowed to proceed.
    */
   public function isAllowed($name, $threshold, $window = 3600, $identifier = NULL);
 
   /**
-   * Cleans up expired flood events. This method is called automatically on
-   * cron run.
+   * Cleans up expired flood events.
+   *
+   * This method is called automatically on cron run.
    *
    * @see system_cron()
    */
diff --git a/web/core/lib/Drupal/Core/Form/FormBuilder.php b/web/core/lib/Drupal/Core/Form/FormBuilder.php
index 98eb32634..106fee375 100644
--- a/web/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/web/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -108,8 +108,10 @@ class FormBuilder implements FormBuilderInterface, FormValidatorInterface, FormS
   protected $formCache;
 
   /**
-   * Defines element value callables which are safe to run even when the form
-   * state has an invalid CSRF token.
+   * Defines callables that are safe to run with invalid CSRF tokens.
+   *
+   * These Element value callables are safe to run even when the form state has
+   * an invalid CSRF token.
    *
    * Excluded from this list on purpose:
    *  - Drupal\file\Element\ManagedFile::valueCallback
@@ -193,8 +195,11 @@ public function getFormId($form_arg, FormStateInterface &$form_state) {
       $form_arg = $this->classResolver->getInstanceFromDefinition($form_arg);
     }
 
-    if (!is_object($form_arg) || !($form_arg instanceof FormInterface)) {
-      throw new \InvalidArgumentException("The form argument $form_arg is not a valid form.");
+    if (!is_object($form_arg)) {
+      throw new \InvalidArgumentException(("The form class $form_arg could not be found or loaded."));
+    }
+    elseif (!($form_arg instanceof FormInterface)) {
+      throw new \InvalidArgumentException('The form argument ' . get_class($form_arg) . ' must be an instance of \Drupal\Core\Form\FormInterface.');
     }
 
     // Add the $form_arg as the callback object and determine the form ID.
diff --git a/web/core/lib/Drupal/Core/Form/FormState.php b/web/core/lib/Drupal/Core/Form/FormState.php
index c4e76a4de..125aedb7d 100644
--- a/web/core/lib/Drupal/Core/Form/FormState.php
+++ b/web/core/lib/Drupal/Core/Form/FormState.php
@@ -36,9 +36,10 @@ class FormState implements FormStateInterface {
   protected $complete_form;
 
   /**
-   * An associative array of information stored by Form API that is necessary to
-   * build and rebuild the form from cache when the original context may no
-   * longer be available:
+   * An associative array of information stored by Form API.
+   *
+   * This associative array is necessary to build and rebuild the form from
+   * cache when the original context may no longer be available:
    *   - callback: The actual callback to be used to retrieve the form array.
    *     Can be any callable. If none is provided $form_id is used as the name
    *     of a function to call instead.
@@ -70,8 +71,9 @@ class FormState implements FormStateInterface {
   ];
 
   /**
-   * Similar to self::$build_info, but pertaining to
-   * \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
+   * Similar to self::$build_info.
+   *
+   * But pertaining to \Drupal\Core\Form\FormBuilderInterface::rebuildForm().
    *
    * This property is uncacheable.
    *
@@ -80,6 +82,8 @@ class FormState implements FormStateInterface {
   protected $rebuild_info = [];
 
   /**
+   * Determines whether the form is rebuilt.
+   *
    * Normally, after the entire form processing is completed and submit handlers
    * have run, a form is considered to be done and
    * \Drupal\Core\Form\FormSubmitterInterface::redirectForm() will redirect the
@@ -103,6 +107,8 @@ class FormState implements FormStateInterface {
   protected $rebuild = FALSE;
 
   /**
+   * Determines if only safe element value callbacks are called.
+   *
    * If set to TRUE the form will skip calling form element value callbacks,
    * except for a select list of callbacks provided by Drupal core that are
    * known to be safe.
@@ -116,6 +122,8 @@ class FormState implements FormStateInterface {
   protected $invalidToken = FALSE;
 
   /**
+   * The response object.
+   *
    * Used when a form needs to return some kind of a
    * \Symfony\Component\HttpFoundation\Response object, e.g., a
    * \Symfony\Component\HttpFoundation\BinaryFileResponse when triggering a
@@ -140,8 +148,9 @@ class FormState implements FormStateInterface {
   protected $redirect;
 
   /**
-   * If set to TRUE the form will NOT perform a redirect, even if
-   * self::$redirect is set.
+   * If set to TRUE the form will NOT perform a redirect.
+   *
+   * Redirect will not be performed, even if self::$redirect is set.
    *
    * This property is uncacheable.
    *
@@ -177,6 +186,8 @@ class FormState implements FormStateInterface {
   protected $requestMethod = 'GET';
 
   /**
+   * Determines if the unprocessed form structure is cached.
+   *
    * If set to TRUE the original, unprocessed form structure will be cached,
    * which allows the entire form to be rebuilt from cache. A typical form
    * workflow involves two page requests; first, a form is built and rendered
@@ -264,6 +275,8 @@ class FormState implements FormStateInterface {
   protected $always_process;
 
   /**
+   * Indicates if a validation will be forced.
+   *
    * Ordinarily, a form is only validated once, but there are times when a form
    * is resubmitted internally and should be validated again. Setting this to
    * TRUE will force that to happen. This is most likely to occur during Ajax
@@ -276,6 +289,8 @@ class FormState implements FormStateInterface {
   protected $must_validate;
 
   /**
+   * Indicates if the form was submitted programmatically.
+   *
    * If TRUE, the form was submitted programmatically, usually invoked via
    * \Drupal\Core\Form\FormBuilderInterface::submitForm(). Defaults to FALSE.
    *
@@ -284,6 +299,8 @@ class FormState implements FormStateInterface {
   protected $programmed = FALSE;
 
   /**
+   * Indicates if programmatic form submissions bypasses #access check.
+   *
    * If TRUE, programmatic form submissions are processed without taking #access
    * into account. Set this to FALSE when submitting a form programmatically
    * with values that may have been input by the user executing the current
@@ -295,6 +312,8 @@ class FormState implements FormStateInterface {
   protected $programmed_bypass_access_check = TRUE;
 
   /**
+   * Indicates correct form submission.
+   *
    * TRUE signifies correct form submission. This is always TRUE for programmed
    * forms coming from \Drupal\Core\Form\FormBuilderInterface::submitForm() (see
    * 'programmed' key), or if the form_id coming from the
@@ -323,10 +342,11 @@ class FormState implements FormStateInterface {
   protected $executed = FALSE;
 
   /**
-   * The form element that triggered submission, which may or may not be a
-   * button (in the case of Ajax forms). This key is often used to distinguish
-   * between various buttons in a submit handler, and is also used in Ajax
-   * handlers.
+   * The form element that triggered submission.
+   *
+   * This may or may not be a button (in the case of Ajax forms). This key is
+   * often used to distinguish between various buttons in a submit handler, and
+   * is also used in Ajax handlers.
    *
    * This property is uncacheable.
    *
@@ -335,6 +355,8 @@ class FormState implements FormStateInterface {
   protected $triggering_element;
 
   /**
+   * Indicates a file element is present.
+   *
    * If TRUE, there is a file element and Form API will set the appropriate
    * 'enctype' HTML attribute on the form.
    *
@@ -352,6 +374,8 @@ class FormState implements FormStateInterface {
   protected $groups = [];
 
   /**
+   * The storage.
+   *
    * This is not a special key, and no specific support is provided for it in
    * the Form API. By tradition it was the location where application-specific
    * data was stored for communication between the submit, validation, and form
diff --git a/web/core/lib/Drupal/Core/Image/ImageInterface.php b/web/core/lib/Drupal/Core/Image/ImageInterface.php
index 4bb6a9a67..cb43798fe 100644
--- a/web/core/lib/Drupal/Core/Image/ImageInterface.php
+++ b/web/core/lib/Drupal/Core/Image/ImageInterface.php
@@ -170,8 +170,7 @@ public function scale($width, $height = NULL, $upscale = FALSE);
   public function scaleAndCrop($width, $height);
 
   /**
-   * Instructs the toolkit to save the image in the format specified by the
-   * extension.
+   * Converts an image to the format specified by the extension.
    *
    * @param string $extension
    *   The extension to convert to (for instance, 'jpeg' or 'png'). Allowed
diff --git a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
index dcc3b3d12..3bf329aba 100644
--- a/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
+++ b/web/core/lib/Drupal/Core/ImageToolkit/ImageToolkitOperationBase.php
@@ -86,8 +86,7 @@ protected function getToolkit() {
   abstract protected function arguments();
 
   /**
-   * Checks if required arguments are passed in and adds defaults for non passed
-   * in optional arguments.
+   * Checks for required arguments and adds optional argument defaults.
    *
    * Image toolkit operation implementers should not normally need to override
    * this method as they should place their own validation in validateArguments.
diff --git a/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php b/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
index ca00d0be8..02d2995fd 100644
--- a/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
+++ b/web/core/lib/Drupal/Core/Installer/Exception/AlreadyInstalledException.php
@@ -19,14 +19,17 @@ public function __construct(TranslationInterface $string_translation) {
     $this->stringTranslation = $string_translation;
 
     $title = $this->t('Drupal already installed');
+    $replacements = [
+      ':base-url' => $GLOBALS['base_url'],
+      // We cannot use the route system.db_update here because we are too early
+      // in the execution stack.
+      ':update-url' => $GLOBALS['base_path'] . 'update.php',
+    ];
     $message = $this->t('<ul>
 <li>To start over, you must empty your existing database and copy <em>default.settings.php</em> over <em>settings.php</em>.</li>
 <li>To upgrade an existing installation, proceed to the <a href=":update-url">update script</a>.</li>
 <li>View your <a href=":base-url">existing site</a>.</li>
-</ul>', [
-      ':base-url' => $GLOBALS['base_url'],
-      ':update-url' => $GLOBALS['base_path'] . 'update.php',
-    ]);
+</ul>', $replacements);
     parent::__construct($message, $title);
   }
 
diff --git a/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php b/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
index 233853e4b..dc2654712 100644
--- a/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
+++ b/web/core/lib/Drupal/Core/Installer/Form/SiteSettingsForm.php
@@ -219,7 +219,7 @@ protected function getDatabaseErrors(array $database, $settings_file) {
   public static function getDatabaseErrorsTemplate(array $errors) {
     return [
       '#type' => 'inline_template',
-      '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/8/install">installation handbook</a>, or contact your hosting provider.{% endtrans %}{{ errors }}',
+      '#template' => '{% trans %}Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/installing-drupal">installation handbook</a>, or contact your hosting provider.{% endtrans %}{{ errors }}',
       '#context' => [
         'errors' => [
           '#theme' => 'item_list',
diff --git a/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php b/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php
index 73001e545..44be3c75a 100644
--- a/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php
+++ b/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php
@@ -3,6 +3,7 @@
 namespace Drupal\Core\Installer;
 
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\ConnectionNotDefinedException;
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\DatabaseException;
 use Drupal\Core\Database\DatabaseNotFoundException;
@@ -51,7 +52,7 @@ protected function shouldRedirectToInstaller(\Exception $exception, Connection $
     // If the database wasn't found, assume the user hasn't entered it properly
     // and redirect to the installer. This check needs to come first because a
     // DatabaseNotFoundException is also an instance of DatabaseException.
-    if ($exception instanceof DatabaseNotFoundException) {
+    if ($exception instanceof DatabaseNotFoundException || $exception instanceof ConnectionNotDefinedException) {
       return TRUE;
     }
 
diff --git a/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php b/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php
index a35905b58..507b27c7c 100644
--- a/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php
+++ b/web/core/lib/Drupal/Core/Installer/NormalInstallerServiceProvider.php
@@ -57,7 +57,7 @@ public function register(ContainerBuilder $container) {
     $container->getDefinition('extension.list.theme_engine')->setClass(InstallerThemeEngineExtensionList::class);
 
     // Don't register the lazy route provider in the super early installer.
-    if (get_called_class() === NormalInstallerServiceProvider::class) {
+    if (static::class === NormalInstallerServiceProvider::class) {
       $lazy_route_provider = $container->register('router.route_provider.installer');
       $lazy_route_provider
         ->setClass(InstallerRouteProviderLazyBuilder::class)
diff --git a/web/core/lib/Drupal/Core/Language/LanguageManager.php b/web/core/lib/Drupal/Core/Language/LanguageManager.php
index 915dac19f..2f7e4728e 100644
--- a/web/core/lib/Drupal/Core/Language/LanguageManager.php
+++ b/web/core/lib/Drupal/Core/Language/LanguageManager.php
@@ -32,6 +32,11 @@ class LanguageManager implements LanguageManagerInterface {
    */
   protected $defaultLanguage;
 
+  /**
+   * Information about all defined language types.
+   */
+  protected $definedLanguageTypesInfo;
+
   /**
    * Constructs the language manager.
    *
@@ -333,9 +338,8 @@ public static function getStandardLanguageList() {
   /**
    * The 6 official languages used at the United Nations.
    *
-   * This list is based on
-   * http://www.un.org/en/sections/about-un/official-languages/index.html and it
-   * uses the same format as getStandardLanguageList().
+   * This list is based on https://www.un.org/en/our-work/official-languages
+   * and it uses the same format as getStandardLanguageList().
    *
    * @return array
    *   An array with language codes as keys, and English and native language
diff --git a/web/core/lib/Drupal/Core/Layout/LayoutDefault.php b/web/core/lib/Drupal/Core/Layout/LayoutDefault.php
index 607b34a48..bd3780987 100644
--- a/web/core/lib/Drupal/Core/Layout/LayoutDefault.php
+++ b/web/core/lib/Drupal/Core/Layout/LayoutDefault.php
@@ -51,6 +51,7 @@ public function build(array $regions) {
         $build[$region_name] = $regions[$region_name];
       }
     }
+    $build['#in_preview'] = $this->inPreview;
     $build['#settings'] = $this->getConfiguration();
     $build['#layout'] = $this->pluginDefinition;
     $build['#theme'] = $this->pluginDefinition->getThemeHook();
diff --git a/web/core/lib/Drupal/Core/Link.php b/web/core/lib/Drupal/Core/Link.php
index d382ef6cd..abdc63e29 100644
--- a/web/core/lib/Drupal/Core/Link.php
+++ b/web/core/lib/Drupal/Core/Link.php
@@ -46,7 +46,7 @@ class Link implements RenderableInterface {
    *   the output of \Drupal\Component\Utility\Xss::filter() or
    *   \Drupal\Component\Render\FormattableMarkup.
    * @param \Drupal\Core\Url $url
-   *   The url object.
+   *   The \Drupal\Core\Url object.
    */
   public function __construct($text, Url $url) {
     $this->text = $text;
diff --git a/web/core/lib/Drupal/Core/Mail/MailManager.php b/web/core/lib/Drupal/Core/Mail/MailManager.php
index ea819c0c1..df6eb226d 100644
--- a/web/core/lib/Drupal/Core/Mail/MailManager.php
+++ b/web/core/lib/Drupal/Core/Mail/MailManager.php
@@ -309,10 +309,10 @@ public function doMail($module, $key, $to, $langcode, $params = [], $reply = NUL
         if (!$message['result']) {
           $this->loggerFactory->get('mail')
             ->error('Error sending email (from %from to %to with reply-to %reply).', [
-            '%from' => $message['from'],
-            '%to' => $message['to'],
-            '%reply' => $message['reply-to'] ? $message['reply-to'] : $this->t('not set'),
-          ]);
+              '%from' => $message['from'],
+              '%to' => $message['to'],
+              '%reply' => $message['reply-to'] ? $message['reply-to'] : $this->t('not set'),
+            ]);
           $error_message = $params['_error_message'] ?? $this->t('Unable to send email. Contact the site administrator if the problem persists.');
           if ($error_message) {
             $this->messenger()->addError($error_message);
diff --git a/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php b/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
index 138257b8d..825433d59 100644
--- a/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
+++ b/web/core/lib/Drupal/Core/Mail/Plugin/Mail/PhpMail.php
@@ -87,7 +87,9 @@ public function mail(array $message) {
     $headers = new Headers();
     foreach ($message['headers'] as $name => $value) {
       if (in_array(strtolower($name), self::MAILBOX_LIST_HEADERS, TRUE)) {
-        $value = explode(',', $value);
+        // Split values by comma, but ignore commas encapsulated in double
+        // quotes.
+        $value = str_getcsv($value, ',');
       }
       $headers->addHeader($name, $value);
     }
@@ -99,30 +101,35 @@ public function mail(array $message) {
     // line-ending format appropriate for your system. If you need to
     // override this, adjust $settings['mail_line_endings'] in settings.php.
     $mail_body = preg_replace('@\r?\n@', $line_endings, $message['body']);
-    // For headers, PHP's API suggests that we use CRLF normally,
-    // but some MTAs incorrectly replace LF with CRLF. See #234403.
-    $mail_headers = str_replace("\r\n", "\n", $headers->toString());
-    $mail_subject = str_replace("\r\n", "\n", $mail_subject);
-
-    $request = \Drupal::request();
+    $mail_headers = $headers->toString();
+
+    // Since Drupal 10+ does not support PHP < 8, this block is only relevant for Drupal 9.x.
+    // See: https://www.drupal.org/node/3270647
+    if (version_compare(PHP_VERSION, '8.0.0') < 0) {
+      // For headers, PHP's API suggests that we use CRLF normally,
+      // but some MTAs incorrectly replace LF with CRLF. See #234403.
+      // PHP 8+ requires headers to be separated by CRLF,
+      // so we'll replace CRLF by LF only when using PHP < 8. See:
+      // - https://bugs.php.net/bug.php?id=81158
+      // - https://github.com/php/php-src/commit/6983ae751cd301886c966b84367fc7aaa1273b2d#diff-c6922cd89f6f75912eb377833ca1eddb7dd41de088be821024b8a0e340fed3df
+      $mail_headers = str_replace("\r\n", "\n", $mail_headers);
+      $mail_subject = str_replace("\r\n", "\n", $mail_subject);
+    }
 
-    // We suppress warnings and notices from mail() because of issues on some
-    // hosts. The return value of this method will still indicate whether mail
-    // was sent successfully.
-    if (!$request->server->has('WINDIR') && strpos($request->server->get('SERVER_SOFTWARE'), 'Win32') === FALSE) {
+    if (substr(PHP_OS, 0, 3) != 'WIN') {
       // On most non-Windows systems, the "-f" option to the sendmail command
       // is used to set the Return-Path. There is no space between -f and
       // the value of the return path.
       // We validate the return path, unless it is equal to the site mail, which
       // we assume to be safe.
       $site_mail = $this->configFactory->get('system.site')->get('mail');
-      $additional_headers = isset($message['Return-Path']) && ($site_mail === $message['Return-Path'] || static::_isShellSafe($message['Return-Path'])) ? '-f' . $message['Return-Path'] : '';
-      $mail_result = @mail(
+      $additional_params = isset($message['Return-Path']) && ($site_mail === $message['Return-Path'] || static::_isShellSafe($message['Return-Path'])) ? '-f' . $message['Return-Path'] : '';
+      $mail_result = $this->doMail(
         $message['to'],
         $mail_subject,
         $mail_body,
         $mail_headers,
-        $additional_headers
+        $additional_params
       );
     }
     else {
@@ -130,7 +137,7 @@ public function mail(array $message) {
       // Return-Path header.
       $old_from = ini_get('sendmail_from');
       ini_set('sendmail_from', $message['Return-Path']);
-      $mail_result = @mail(
+      $mail_result = $this->doMail(
         $message['to'],
         $mail_subject,
         $mail_body,
@@ -142,6 +149,36 @@ public function mail(array $message) {
     return $mail_result;
   }
 
+  /**
+   * Wrapper around PHP's mail() function.
+   *
+   * We suppress warnings and notices from mail() because of issues on some
+   * hosts. The return value of this method will still indicate whether mail was
+   * sent successfully.
+   *
+   * @param string $to
+   *   Receiver, or receivers of the mail.
+   * @param string $subject
+   *   Subject of the email to be sent.
+   * @param string $message
+   *   Message to be sent.
+   * @param array $additional_headers
+   *   (optional) Array to be inserted at the end of the email header.
+   * @param string $additional_params
+   *   (optional) Can be used to pass additional flags as command line options.
+   *
+   * @see mail()
+   */
+  protected function doMail(string $to, string $subject, string $message, $additional_headers = [], string $additional_params = ''): bool {
+    return @mail(
+      $to,
+      $subject,
+      $message,
+      $additional_headers,
+      $additional_params
+    );
+  }
+
   /**
    * Disallows potentially unsafe shell characters.
    *
diff --git a/web/core/lib/Drupal/Core/Menu/menu.api.php b/web/core/lib/Drupal/Core/Menu/menu.api.php
index ce136e223..0d4b5a53c 100644
--- a/web/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/web/core/lib/Drupal/Core/Menu/menu.api.php
@@ -317,16 +317,16 @@ function hook_menu_local_tasks_alter(&$data, $route_name, \Drupal\Core\Cache\Ref
 
   // Add a tab linking to node/add to all pages.
   $data['tabs'][0]['node.add_page'] = [
-      '#theme' => 'menu_local_task',
-      '#link' => [
-          'title' => t('Example tab'),
-          'url' => Url::fromRoute('node.add_page'),
-          'localized_options' => [
-              'attributes' => [
-                  'title' => t('Add content'),
-              ],
-          ],
+    '#theme' => 'menu_local_task',
+    '#link' => [
+      'title' => t('Example tab'),
+      'url' => Url::fromRoute('node.add_page'),
+      'localized_options' => [
+        'attributes' => [
+          'title' => t('Add content'),
+        ],
       ],
+    ],
   ];
   // The tab we're adding is dependent on a user's access to add content.
   $cacheability->addCacheContexts(['user.permissions']);
diff --git a/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php b/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
index 515517b91..c3820baac 100644
--- a/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
+++ b/web/core/lib/Drupal/Core/ParamConverter/EntityConverter.php
@@ -27,7 +27,7 @@
  *         type: entity:node
  * @endcode
  *
- * If you want to have the entity type itself dynamic in the url you can
+ * If you want to have the entity type itself dynamic in the URL you can
  * specify it like the following:
  * @code
  * example.route:
@@ -120,7 +120,16 @@ public function convert($value, $definition, $name, array $defaults) {
     // If the entity type is revisionable and the parameter has the
     // "load_latest_revision" flag, load the active variant.
     if (!empty($definition['load_latest_revision'])) {
-      return $this->entityRepository->getActive($entity_type_id, $value);
+      $entity = $this->entityRepository->getActive($entity_type_id, $value);
+
+      if (
+        !empty($definition['bundle']) &&
+        $entity instanceof EntityInterface &&
+        !in_array($entity->bundle(), $definition['bundle'], TRUE)
+      ) {
+        return NULL;
+      }
+      return $entity;
     }
 
     // Do not inject the context repository as it is not an actual dependency:
diff --git a/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php b/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
index e01faffb2..de702d3ff 100644
--- a/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
+++ b/web/core/lib/Drupal/Core/Password/PhpassHashedPassword.php
@@ -31,6 +31,8 @@ class PhpassHashedPassword implements PasswordInterface {
   public static $ITOA64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
 
   /**
+   * Password stretching iteration count.
+   *
    * Specifies the number of times the hashing function will be applied when
    * generating new password hashes. The number of times is calculated by
    * raising 2 to the power of the given value.
diff --git a/web/core/lib/Drupal/Core/Path/PathValidatorInterface.php b/web/core/lib/Drupal/Core/Path/PathValidatorInterface.php
index e024ae520..06d9cc664 100644
--- a/web/core/lib/Drupal/Core/Path/PathValidatorInterface.php
+++ b/web/core/lib/Drupal/Core/Path/PathValidatorInterface.php
@@ -3,7 +3,7 @@
 namespace Drupal\Core\Path;
 
 /**
- * Provides an interface for url path validators.
+ * Provides an interface for URL path validators.
  */
 interface PathValidatorInterface {
 
@@ -14,7 +14,7 @@ interface PathValidatorInterface {
    *   The path to check.
    *
    * @return \Drupal\Core\Url|false
-   *   The url object, or FALSE if the path is not valid.
+   *   The \Drupal\Core\Url object, or FALSE if the path is not valid.
    */
   public function getUrlIfValid($path);
 
@@ -28,7 +28,7 @@ public function getUrlIfValid($path);
    *   The path to check.
    *
    * @return \Drupal\Core\Url|false
-   *   The url object, or FALSE if the path is not valid.
+   *   The \Drupal\Core\Url object, or FALSE if the path is not valid.
    */
   public function getUrlIfValidWithoutAccessCheck($path);
 
diff --git a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
index 463692d71..57ce0806a 100644
--- a/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
+++ b/web/core/lib/Drupal/Core/Plugin/ContextAwarePluginBase.php
@@ -9,7 +9,7 @@
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\TypedData\TypedDataTrait;
 
-@trigger_error(__NAMESPACE__ . '\ContextAwarePluginBase is deprecated in drupal:9.1.0 and will be removed before drupal:10.0.0. Instead, use \Drupal\Core\Plugin\ContextAwarePluginTrait. See https://www.drupal.org/node/3120980', E_USER_DEPRECATED);
+@trigger_error(__NAMESPACE__ . '\ContextAwarePluginBase is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use \Drupal\Core\Plugin\ContextAwarePluginTrait instead. See https://www.drupal.org/node/3120980', E_USER_DEPRECATED);
 
 /**
  * Base class for plugins that are context aware.
diff --git a/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php b/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
index 6b7d86e06..62c78c344 100644
--- a/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
+++ b/web/core/lib/Drupal/Core/Plugin/DefaultPluginManager.php
@@ -50,8 +50,9 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
   protected $alterHook;
 
   /**
-   * The subdirectory within a namespace to look for plugins, or FALSE if the
-   * plugins are in the top level of the namespace.
+   * The subdirectory within a namespace to look for plugins.
+   *
+   * Set to FALSE if the plugins are in the top level of the namespace.
    *
    * @var string|bool
    */
@@ -65,9 +66,10 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
   protected $moduleHandler;
 
   /**
-   * A set of defaults to be referenced by $this->processDefinition() if
-   * additional processing of plugins is necessary or helpful for development
-   * purposes.
+   * A set of defaults to be referenced by $this->processDefinition().
+   *
+   * Allows for additional processing of plugins when necessary or helpful for
+   * development purposes.
    *
    * @var array
    */
@@ -88,16 +90,20 @@ class DefaultPluginManager extends PluginManagerBase implements PluginManagerInt
   protected $pluginInterface;
 
   /**
-   * An object that implements \Traversable which contains the root paths
-   * keyed by the corresponding namespace to look for plugin implementations.
+   * An object of root paths that are traversable.
+   *
+   * The root paths are keyed by the corresponding namespace to look for plugin
+   * implementations.
    *
    * @var \Traversable
    */
   protected $namespaces;
 
   /**
-   * Additional namespaces the annotation discovery mechanism should scan for
-   * annotation definitions.
+   * Additional annotation namespaces.
+   *
+   * The annotation discovery mechanism should scan these for annotation
+   * definitions.
    *
    * @var string[]
    */
diff --git a/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php b/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
index 986ab77c9..8e78c9521 100644
--- a/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
+++ b/web/core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php
@@ -11,6 +11,8 @@
 class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
 
   /**
+   * The directory suffix.
+   *
    * A suffix to append to each PSR-4 directory associated with a base
    * namespace, to form the directories where plugins are found.
    *
@@ -19,6 +21,8 @@ class AnnotatedClassDiscovery extends ComponentAnnotatedClassDiscovery {
   protected $directorySuffix = '';
 
   /**
+   * The namespace suffix.
+   *
    * A suffix to append to each base namespace, to obtain the namespaces where
    * plugins are found.
    *
diff --git a/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php b/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php
index 2af4360dc..55b690ad3 100644
--- a/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php
+++ b/web/core/lib/Drupal/Core/Queue/DatabaseQueue.php
@@ -76,7 +76,7 @@ public function createItem($data) {
    * @param $data
    *   Arbitrary data to be associated with the new task in the queue.
    *
-   * @return
+   * @return int|string
    *   A unique ID if the item was successfully created and was (best effort)
    *   added to the queue, otherwise FALSE. We don't guarantee the item was
    *   committed to disk etc, but as far as we know, the item is now in the
diff --git a/web/core/lib/Drupal/Core/Queue/QueueInterface.php b/web/core/lib/Drupal/Core/Queue/QueueInterface.php
index 449ad6a0d..8b9ff654c 100644
--- a/web/core/lib/Drupal/Core/Queue/QueueInterface.php
+++ b/web/core/lib/Drupal/Core/Queue/QueueInterface.php
@@ -18,7 +18,7 @@ interface QueueInterface {
    * @param $data
    *   Arbitrary data to be associated with the new task in the queue.
    *
-   * @return
+   * @return bool|int|string
    *   A unique ID if the item was successfully created and was (best effort)
    *   added to the queue, otherwise FALSE. We don't guarantee the item was
    *   committed to disk etc, but as far as we know, the item is now in the
@@ -55,7 +55,7 @@ public function numberOfItems();
    *   more rare for a given task to run multiple times in cases of failure,
    *   at the cost of higher latency.
    *
-   * @return
+   * @return bool|object
    *   On success we return an item object. If the queue is unable to claim an
    *   item it returns false. This implies a best effort to retrieve an item
    *   and either the queue is empty or there is some other non-recoverable
diff --git a/web/core/lib/Drupal/Core/Queue/QueueWorkerBase.php b/web/core/lib/Drupal/Core/Queue/QueueWorkerBase.php
index 819966b85..96cc27d83 100644
--- a/web/core/lib/Drupal/Core/Queue/QueueWorkerBase.php
+++ b/web/core/lib/Drupal/Core/Queue/QueueWorkerBase.php
@@ -11,6 +11,8 @@
  * @see \Drupal\Core\Queue\QueueWorkerManager
  * @see \Drupal\Core\Annotation\QueueWorker
  * @see plugin_api
+ *
+ * @ingroup queue
  */
 abstract class QueueWorkerBase extends PluginBase implements QueueWorkerInterface {
 
diff --git a/web/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php b/web/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
index fff1ae21c..e6c710ffd 100644
--- a/web/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
+++ b/web/core/lib/Drupal/Core/Queue/QueueWorkerInterface.php
@@ -11,6 +11,8 @@
  * @see \Drupal\Core\Queue\QueueWorkerManager
  * @see \Drupal\Core\Annotation\QueueWorker
  * @see plugin_api
+ *
+ * @ingroup queue
  */
 interface QueueWorkerInterface extends PluginInspectionInterface {
 
diff --git a/web/core/lib/Drupal/Core/Render/AttachmentsResponseProcessorInterface.php b/web/core/lib/Drupal/Core/Render/AttachmentsResponseProcessorInterface.php
index 14cc6a215..31ba55cc9 100644
--- a/web/core/lib/Drupal/Core/Render/AttachmentsResponseProcessorInterface.php
+++ b/web/core/lib/Drupal/Core/Render/AttachmentsResponseProcessorInterface.php
@@ -38,6 +38,10 @@ interface AttachmentsResponseProcessorInterface {
    * - 'html_head_link' (<link> tags in HTML <head>)
    * - 'http_header' (HTTP headers and status code)
    *
+   * Placeholders need to be rendered first in order to have all attachments
+   * available for processing. For an example, see
+   * \Drupal\Core\Render\HtmlResponseAttachmentsProcessor::renderPlaceholders()
+   *
    * @param \Drupal\Core\Render\AttachmentsInterface $response
    *   The response to process.
    *
diff --git a/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php b/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php
index 5001b1ba9..0d6eae400 100644
--- a/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php
+++ b/web/core/lib/Drupal/Core/Render/BubbleableMetadata.php
@@ -146,8 +146,8 @@ public function addCacheableDependency($other_object) {
    */
   public static function mergeAttachments(array $a, array $b) {
     // If both #attached arrays contain drupalSettings, then merge them
-    // correctly; adding the same settings multiple times needs to behave
-    // idempotently.
+    // correctly; adding the same settings multiple times needs to be
+    // idempotent.
     if (!empty($a['drupalSettings']) && !empty($b['drupalSettings'])) {
       $drupalSettings = NestedArray::mergeDeepArray([$a['drupalSettings'], $b['drupalSettings']], TRUE);
       // No need for re-merging them.
diff --git a/web/core/lib/Drupal/Core/Render/Element.php b/web/core/lib/Drupal/Core/Render/Element.php
index 75c3ab740..45d517c67 100644
--- a/web/core/lib/Drupal/Core/Render/Element.php
+++ b/web/core/lib/Drupal/Core/Render/Element.php
@@ -187,8 +187,8 @@ public static function setAttributes(array &$element, array $map) {
   /**
    * Indicates whether the given element is empty.
    *
-   * An element that only has #cache set is considered empty, because it will
-   * render to the empty string.
+   * An element that only has #cache or #weight set is considered
+   * empty, because it will render to the empty string.
    *
    * @param array $elements
    *   The element.
@@ -197,7 +197,7 @@ public static function setAttributes(array &$element, array $map) {
    *   Whether the given element is empty.
    */
   public static function isEmpty(array $elements) {
-    return empty($elements) || (count($elements) === 1 && array_keys($elements) === ['#cache']);
+    return \array_diff(\array_keys($elements), ['#cache', '#weight']) === [];
   }
 
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/Details.php b/web/core/lib/Drupal/Core/Render/Element/Details.php
index cfd1b4ba8..794b36bb8 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Details.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Details.php
@@ -66,7 +66,7 @@ public function getInfo() {
    *   An associative array containing the properties and children of the
    *   details.
    *
-   * @return
+   * @return array
    *   The modified element.
    */
   public static function preRenderDetails($element) {
diff --git a/web/core/lib/Drupal/Core/Render/Element/File.php b/web/core/lib/Drupal/Core/Render/Element/File.php
index 5fe7b8f7f..44c895015 100644
--- a/web/core/lib/Drupal/Core/Render/Element/File.php
+++ b/web/core/lib/Drupal/Core/Render/Element/File.php
@@ -15,6 +15,10 @@
  * - #multiple: A Boolean indicating whether multiple files may be uploaded.
  * - #size: The size of the file input element in characters.
  *
+ * The value of this form element will always be an array of
+ * \Symfony\Component\HttpFoundation\File\UploadedFile objects, regardless of
+ * whether #multiple is TRUE or FALSE
+ *
  * @FormElement("file")
  */
 class File extends FormElement {
@@ -36,6 +40,9 @@ public function getInfo() {
       ],
       '#theme' => 'input__file',
       '#theme_wrappers' => ['form_element'],
+      '#value_callback' => [
+        [$class, 'valueCallback'],
+      ],
     ];
   }
 
@@ -72,4 +79,23 @@ public static function preRenderFile($element) {
     return $element;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function valueCallback(&$element, $input, FormStateInterface $form_state) {
+    if ($input === FALSE) {
+      return NULL;
+    }
+    $parents = $element['#parents'];
+    $element_name = array_shift($parents);
+    $uploaded_files = \Drupal::request()->files->get('files', []);
+    $uploaded_file = $uploaded_files[$element_name] ?? NULL;
+    if ($uploaded_file) {
+      // Cast this to an array so that the structure is consistent regardless of
+      // whether #value is set or not.
+      return (array) $uploaded_file;
+    }
+    return NULL;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Render/Element/PathElement.php b/web/core/lib/Drupal/Core/Render/Element/PathElement.php
index 86baff16d..00e8f6ebb 100644
--- a/web/core/lib/Drupal/Core/Render/Element/PathElement.php
+++ b/web/core/lib/Drupal/Core/Render/Element/PathElement.php
@@ -67,7 +67,7 @@ public static function validateMatchedPath(&$element, FormStateInterface $form_s
           return;
         }
         if ($element['#convert_path'] == self::CONVERT_NONE) {
-          // Url is valid, no conversion required.
+          // URL is valid, no conversion required.
           return;
         }
         // We do the value conversion here whilst the Url object is in scope
diff --git a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
index e02c91aef..dc63e5eb4 100644
--- a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
+++ b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
@@ -30,7 +30,7 @@ public function getInfo() {
       // of that specific type.
       '#display' => NULL,
       '#pre_render' => [
-        get_class() . '::generatePlaceholder',
+        self::class . '::generatePlaceholder',
       ],
       '#include_fallback' => FALSE,
     ];
@@ -47,7 +47,7 @@ public function getInfo() {
    */
   public static function generatePlaceholder(array $element) {
     $build = [
-      '#lazy_builder' => [get_class() . '::renderMessages', [$element['#display']]],
+      '#lazy_builder' => [self::class . '::renderMessages', [$element['#display']]],
       '#create_placeholder' => TRUE,
     ];
 
diff --git a/web/core/lib/Drupal/Core/Render/Element/Tableselect.php b/web/core/lib/Drupal/Core/Render/Element/Tableselect.php
index 908e66044..6258500c0 100644
--- a/web/core/lib/Drupal/Core/Render/Element/Tableselect.php
+++ b/web/core/lib/Drupal/Core/Render/Element/Tableselect.php
@@ -33,7 +33,9 @@
  * $options = [
  *   1 => ['color' => 'Red', 'shape' => 'Triangle'],
  *   2 => ['color' => 'Green', 'shape' => 'Square'],
- *   3 => ['color' => 'Blue', 'shape' => 'Hexagon'],
+ *   // Prevent users from selecting a row by adding a '#disabled' property set
+ *   // to TRUE.
+ *   3 => ['color' => 'Blue', 'shape' => 'Hexagon', '#disabled' => TRUE],
  * ];
  *
  * $form['table'] = array(
@@ -180,6 +182,9 @@ public static function preRenderTableselect($element) {
             }
           }
         }
+        if (!empty($element['#options'][$key]['#disabled'])) {
+          $row['class'][] = 'disabled';
+        }
         $rows[] = $row;
       }
       // Add an empty header or a "Select all" checkbox to provide room for the
@@ -238,6 +243,7 @@ public static function processTableselect(&$element, FormStateInterface $form_st
       foreach ($element['#options'] as $key => $choice) {
         // Do not overwrite manually created children.
         if (!isset($element[$key])) {
+          $disabled = !empty($element['#options'][$key]['#disabled']);
           if ($element['#multiple']) {
             $title = '';
             if (isset($element['#options'][$key]['title']) && is_array($element['#options'][$key]['title'])) {
@@ -254,6 +260,7 @@ public static function processTableselect(&$element, FormStateInterface $form_st
               '#return_value' => $key,
               '#default_value' => isset($value[$key]) ? $key : NULL,
               '#attributes' => $element['#attributes'],
+              '#disabled' => $disabled,
               '#ajax' => $element['#ajax'] ?? NULL,
             ];
           }
@@ -269,6 +276,7 @@ public static function processTableselect(&$element, FormStateInterface $form_st
               '#attributes' => $element['#attributes'],
               '#parents' => $element['#parents'],
               '#id' => HtmlUtility::getUniqueId('edit-' . implode('-', $parents_for_id)),
+              '#disabled' => $disabled,
               '#ajax' => $element['#ajax'] ?? NULL,
             ];
           }
diff --git a/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php b/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
index 7df92bdb6..0ab51234e 100644
--- a/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
+++ b/web/core/lib/Drupal/Core/Render/HtmlResponseAttachmentsProcessor.php
@@ -9,7 +9,6 @@
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Form\EnforcedResponseException;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Component\Utility\Html;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
@@ -413,7 +412,10 @@ protected function processHtmlHead(array $html_head) {
    * @param array $html_head_link
    *   The 'html_head_link' value of a render array. Each head link is specified
    *   by a two-element array:
-   *   - An array specifying the attributes of the link.
+   *   - An array specifying the attributes of the link. The 'href' and 'rel'
+   *     attributes are required, and the 'href' attribute is expected to be a
+   *     percent-encoded URI for proper serialization in the Link: HTTP header,
+   *     as specified by RFC 8288.
    *   - A boolean specifying whether the link should also be a Link: HTTP
    *     header.
    *
@@ -448,7 +450,7 @@ protected function processHtmlHeadLink(array $html_head_link) {
 
       if ($should_add_header) {
         // Also add a HTTP header "Link:".
-        $href = '<' . Html::escape($attributes['href']) . '>';
+        $href = '<' . $attributes['href'] . '>';
         unset($attributes['href']);
         if ($param = static::formatHttpHeaderAttributes($attributes)) {
           $href .= ';' . $param;
diff --git a/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php b/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
index 460f54366..be4a97099 100644
--- a/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
+++ b/web/core/lib/Drupal/Core/Render/MainContent/HtmlRenderer.php
@@ -223,6 +223,7 @@ protected function prepare(array $main_content, Request $request, RouteMatchInte
       $event = new PageDisplayVariantSelectionEvent('simple_page', $route_match);
       $this->eventDispatcher->dispatch($event, RenderEvents::SELECT_PAGE_DISPLAY_VARIANT);
       $variant_id = $event->getPluginId();
+      $variant_configuration = $event->getPluginConfiguration();
 
       // We must render the main content now already, because it might provide a
       // title. We set its $is_root_call parameter to FALSE, to ensure
@@ -248,15 +249,14 @@ protected function prepare(array $main_content, Request $request, RouteMatchInte
       $title = $get_title($main_content);
 
       // Instantiate the page display, and give it the main content.
-      $page_display = $this->displayVariantManager->createInstance($variant_id);
+      $page_display = $this->displayVariantManager->createInstance($variant_id, $variant_configuration);
       if (!$page_display instanceof PageVariantInterface) {
         throw new \LogicException('Cannot render the main content for this page because the provided display variant does not implement PageVariantInterface.');
       }
       $page_display
         ->setMainContent($main_content)
         ->setTitle($title)
-        ->addCacheableDependency($event)
-        ->setConfiguration($event->getPluginConfiguration());
+        ->addCacheableDependency($event);
       // Some display variants need to be passed an array of contexts with
       // values because they can't get all their contexts globally. For example,
       // in Page Manager, you can create a Page which has a specific static
@@ -285,7 +285,9 @@ protected function prepare(array $main_content, Request $request, RouteMatchInte
     }
 
     // Allow hooks to add attachments to $page['#attached'].
-    $this->invokePageAttachmentHooks($page);
+    $this->renderer->executeInRenderContext(new RenderContext(), function () use (&$page) {
+      $this->invokePageAttachmentHooks($page);
+    });
 
     return [$page, $title];
   }
diff --git a/web/core/lib/Drupal/Core/Render/Renderer.php b/web/core/lib/Drupal/Core/Render/Renderer.php
index f95116e5f..da19e3281 100644
--- a/web/core/lib/Drupal/Core/Render/Renderer.php
+++ b/web/core/lib/Drupal/Core/Render/Renderer.php
@@ -120,6 +120,9 @@ public function __construct(ControllerResolverInterface $controller_resolver, Th
     $this->elementInfo = $element_info;
     $this->placeholderGenerator = $placeholder_generator;
     $this->renderCache = $render_cache;
+    if (!isset($renderer_config['debug'])) {
+      $renderer_config['debug'] = FALSE;
+    }
     $this->rendererConfig = $renderer_config;
     $this->requestStack = $request_stack;
 
@@ -215,6 +218,10 @@ protected function doRender(&$elements, $is_root_call = FALSE) {
       return '';
     }
 
+    if ($this->rendererConfig['debug'] === TRUE) {
+      $render_start = microtime(TRUE);
+    }
+
     if (!isset($elements['#access']) && isset($elements['#access_callback'])) {
       $elements['#access'] = $this->doCallback('#access_callback', $elements['#access_callback'], [$elements]);
     }
@@ -276,6 +283,10 @@ protected function doRender(&$elements, $is_root_call = FALSE) {
         if (is_string($elements['#markup'])) {
           $elements['#markup'] = Markup::create($elements['#markup']);
         }
+        // Add debug output to the renderable array on cache hit.
+        if ($this->rendererConfig['debug'] === TRUE) {
+          $elements = $this->addDebugOutput($elements, TRUE);
+        }
         // The render cache item contains all the bubbleable rendering metadata
         // for the subtree.
         $context->update($elements);
@@ -513,6 +524,11 @@ protected function doRender(&$elements, $is_root_call = FALSE) {
         throw new \LogicException('Cache keys may not be changed after initial setup. Use the contexts property instead to bubble additional metadata.');
       }
       $this->renderCache->set($elements, $pre_bubbling_elements);
+      // Add debug output to the renderable array on cache miss.
+      if ($this->rendererConfig['debug'] === TRUE) {
+        $render_stop = microtime(TRUE);
+        $elements = $this->addDebugOutput($elements, FALSE, $pre_bubbling_elements, $render_stop - $render_start);
+      }
       // Update the render context; the render cache implementation may update
       // the element, and it may have different bubbleable metadata now.
       // @see \Drupal\Core\Render\PlaceholderingRenderCache::set()
@@ -772,4 +788,67 @@ protected function doCallback($callback_type, $callback, array $args) {
     return $this->doTrustedCallback($callback, $args, $message, TrustedCallbackInterface::THROW_EXCEPTION, RenderCallbackInterface::class);
   }
 
+  /**
+   * Add cache debug information to the render array.
+   *
+   * @param array $elements
+   *   The renderable array that must be wrapped with the cache debug output.
+   * @param bool $is_cache_hit
+   *   A flag indicating that the cache is hit or miss.
+   * @param array $pre_bubbling_elements
+   *   The renderable array for pre-bubbling elements.
+   * @param float $render_time
+   *   The rendering time.
+   *
+   * @return array
+   *   The renderable array.
+   */
+  protected function addDebugOutput(array $elements, bool $is_cache_hit, array $pre_bubbling_elements = [], float $render_time = 0) {
+    if (empty($elements['#markup'])) {
+      return $elements;
+    }
+
+    $debug_items = [
+      'CACHE' => &$elements,
+      'PRE-BUBBLING CACHE' => &$pre_bubbling_elements,
+    ];
+    $prefix = "<!-- START RENDERER -->";
+    $prefix .= "\n<!-- CACHE-HIT: " . ($is_cache_hit ? 'Yes' : 'No') . " -->";
+    foreach ($debug_items as $name_prefix => $debug_item) {
+      if (!empty($debug_item['#cache']['tags'])) {
+        $prefix .= "\n<!-- " . $name_prefix . " TAGS:";
+        foreach ($debug_item['#cache']['tags'] as $tag) {
+          $prefix .= "\n   * " . $tag;
+        }
+        $prefix .= "\n-->";
+      }
+      if (!empty($debug_item['#cache']['contexts'])) {
+        $prefix .= "\n<!-- " . $name_prefix . " CONTEXTS:";
+        foreach ($debug_item['#cache']['contexts'] as $context) {
+          $prefix .= "\n   * " . $context;
+        }
+        $prefix .= "\n-->";
+      }
+      if (!empty($debug_item['#cache']['keys'])) {
+        $prefix .= "\n<!-- " . $name_prefix . " KEYS:";
+        foreach ($debug_item['#cache']['keys'] as $key) {
+          $prefix .= "\n   * " . $key;
+        }
+        $prefix .= "\n-->";
+      }
+      if (!empty($debug_item['#cache']['max-age'])) {
+        $prefix .= "\n<!-- " . $name_prefix . " MAX-AGE: " . $debug_item['#cache']['max-age'] . " -->";
+      }
+    }
+
+    if (!empty($render_time)) {
+      $prefix .= "\n<!-- RENDERING TIME: " . number_format($render_time, 9) . " -->";
+    }
+    $suffix = "<!-- END RENDERER -->";
+
+    $elements['#markup'] = Markup::create("$prefix\n" . $elements['#markup'] . "\n$suffix");
+
+    return $elements;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Render/theme.api.php b/web/core/lib/Drupal/Core/Render/theme.api.php
index 77d057494..b8186a8b5 100644
--- a/web/core/lib/Drupal/Core/Render/theme.api.php
+++ b/web/core/lib/Drupal/Core/Render/theme.api.php
@@ -606,7 +606,26 @@ function hook_preprocess_HOOK(&$variables) {
  * must otherwise make sure that the hook implementation is available at
  * any given time.
  *
- * @todo Add @code sample.
+ * Suggestions must begin with the value of HOOK, followed by two underscores to be discoverable.
+ *
+ * In the following example, we provide suggestions to
+ * node templates based bundle, id, and view mode.
+ *
+ * @code
+ * function node_theme_suggestions_node(array $variables) {
+ *   $suggestions = [];
+ *   $node = $variables['elements']['#node'];
+ *   $sanitized_view_mode = strtr($variables['elements']['#view_mode'], '.', '_');
+ *   $suggestions[] = 'node__' . $sanitized_view_mode;
+ *   $suggestions[] = 'node__' . $node->bundle();
+ *   $suggestions[] = 'node__' . $node->bundle() . '__' . $sanitized_view_mode;
+ *   $suggestions[] = 'node__' . $node->id();
+ *   $suggestions[] = 'node__' . $node->id() . '__' . $sanitized_view_mode;
+ *
+ *   return $suggestions;
+ * }
+ *
+ * @endcode
  *
  * @param array $variables
  *   An array of variables passed to the theme hook. Note that this hook is
@@ -817,8 +836,7 @@ function hook_element_plugin_alter(array &$definitions) {
 }
 
 /**
- * Perform necessary alterations to the JavaScript before it is presented on
- * the page.
+ * Alters JavaScript before it is presented on the page.
  *
  * @param $javascript
  *   An array of all JavaScript being presented on the page.
@@ -963,24 +981,24 @@ function hook_js_settings_alter(array &$settings, \Drupal\Core\Asset\AttachedAss
  * @see \Drupal\Core\Asset\LibraryDiscoveryParser::parseLibraryInfo()
  */
 function hook_library_info_alter(&$libraries, $extension) {
-  // Update Farbtastic to version 2.0.
-  if ($extension == 'core' && isset($libraries['jquery.farbtastic'])) {
+  // Update imaginary library 'foo' to version 2.0.
+  if ($extension === 'core' && isset($libraries['foo'])) {
     // Verify existing version is older than the one we are updating to.
-    if (version_compare($libraries['jquery.farbtastic']['version'], '2.0', '<')) {
-      // Update the existing Farbtastic to version 2.0.
-      $libraries['jquery.farbtastic']['version'] = '2.0';
+    if (version_compare($libraries['foo']['version'], '2.0', '<')) {
+      // Update the existing 'foo' to version 2.0.
+      $libraries['foo']['version'] = '2.0';
       // To accurately replace library files, the order of files and the options
       // of each file have to be retained; e.g., like this:
-      $old_path = 'assets/vendor/farbtastic';
+      $old_path = 'assets/vendor/foo';
       // Since the replaced library files are no longer located in a directory
       // relative to the original extension, specify an absolute path (relative
       // to DRUPAL_ROOT / base_path()) to the new location.
-      $new_path = '/' . \Drupal::service('extension.list.module')->getPath('farbtastic_update') . '/js';
+      $new_path = '/' . \Drupal::service('extension.list.module')->getPath('foo_update') . '/js';
       $new_js = [];
       $replacements = [
-        $old_path . '/farbtastic.js' => $new_path . '/farbtastic-2.0.js',
+        $old_path . '/foo.js' => $new_path . '/foo-2.0.js',
       ];
-      foreach ($libraries['jquery.farbtastic']['js'] as $source => $options) {
+      foreach ($libraries['foo']['js'] as $source => $options) {
         if (isset($replacements[$source])) {
           $new_js[$replacements[$source]] = $options;
         }
@@ -988,7 +1006,7 @@ function hook_library_info_alter(&$libraries, $extension) {
           $new_js[$source] = $options;
         }
       }
-      $libraries['jquery.farbtastic']['js'] = $new_js;
+      $libraries['foo']['js'] = $new_js;
     }
   }
 }
@@ -1132,10 +1150,10 @@ function hook_page_bottom(array &$page_bottom) {
  *   - file: The file the implementation resides in. This file will be included
  *     prior to the theme being rendered, to make sure that the preprocess
  *     functions in this file are actually loaded.
- *   - path: Override the path of the file to be used. Ordinarily the module or
- *     theme path will be used, but if the file will not be in the default
- *     path, include it here. This path should be relative to the Drupal root
- *     directory.
+ *   - path: If specified, overrides the path to the directory that contains the
+ *     file to be used. This path should be relative to the Drupal root
+ *     directory. If not provided, the path will be set to the module or theme's
+ *     templates directory.
  *   - template: If specified, this is the template name. Do not add 'html.twig'
  *     on the end of the template name. The extension will be added
  *     automatically by the default rendering engine (which is Twig.) If 'path'
diff --git a/web/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php b/web/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php
index 4a5bcf769..e6454d4aa 100644
--- a/web/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php
+++ b/web/core/lib/Drupal/Core/RouteProcessor/OutboundRouteProcessorInterface.php
@@ -22,9 +22,6 @@ interface OutboundRouteProcessorInterface {
    *   reference.
    * @param \Drupal\Core\Render\BubbleableMetadata $bubbleable_metadata
    *   (optional) Object to collect route processors' bubbleable metadata.
-   *
-   * @return
-   *   The processed path.
    */
   public function processOutbound($route_name, Route $route, array &$parameters, BubbleableMetadata $bubbleable_metadata = NULL);
 
diff --git a/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php b/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
index 445c4fe3f..02c4525ce 100644
--- a/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
+++ b/web/core/lib/Drupal/Core/Routing/Enhancer/ParamConversionEnhancer.php
@@ -66,6 +66,13 @@ protected function copyRawVariables(array $defaults) {
     foreach (array_intersect_key($defaults, $variables) as $key => $value) {
       $raw_variables[$key] = $value;
     }
+    // Route defaults that do not start with a leading "_" are also
+    // parameters, even if they are not included in path or host patterns.
+    foreach ($route->getDefaults() as $name => $value) {
+      if (!isset($raw_variables[$name]) && substr($name, 0, 1) !== '_') {
+        $raw_variables[$name] = $value;
+      }
+    }
     return new ParameterBag($raw_variables);
   }
 
diff --git a/web/core/lib/Drupal/Core/Routing/FilterInterface.php b/web/core/lib/Drupal/Core/Routing/FilterInterface.php
index ca40c9b4d..0686c19bf 100644
--- a/web/core/lib/Drupal/Core/Routing/FilterInterface.php
+++ b/web/core/lib/Drupal/Core/Routing/FilterInterface.php
@@ -11,8 +11,7 @@
 interface FilterInterface {
 
   /**
-   * Filters the route collection against a request and returns all matching
-   * routes.
+   * Filters the route collection against a request.
    *
    * @param \Symfony\Component\Routing\RouteCollection $collection
    *   The collection against which to match.
@@ -22,7 +21,7 @@ interface FilterInterface {
    * @return \Symfony\Component\Routing\RouteCollection
    *   A non-empty RouteCollection of matched routes
    *
-   * @throws ResourceNotFoundException
+   * @throws \Symfony\Component\Routing\Exception\ResourceNotFoundException
    *   If none of the routes in $collection matches $request. This is a
    *   performance optimization to not continue the match process when a match
    *   will no longer be possible.
diff --git a/web/core/lib/Drupal/Core/Routing/LazyRouteCollection.php b/web/core/lib/Drupal/Core/Routing/LazyRouteCollection.php
index 02a45d833..8339cf8a3 100644
--- a/web/core/lib/Drupal/Core/Routing/LazyRouteCollection.php
+++ b/web/core/lib/Drupal/Core/Routing/LazyRouteCollection.php
@@ -9,7 +9,7 @@ class LazyRouteCollection extends RouteCollection {
   /**
    * The route provider for this generator.
    *
-   * @var \Symfony\Component\Routing\RouteProviderInterface
+   * @var \Drupal\Core\Routing\RouteProviderInterface
    */
   protected $provider;
 
diff --git a/web/core/lib/Drupal/Core/Routing/NullGenerator.php b/web/core/lib/Drupal/Core/Routing/NullGenerator.php
index 630e81ffe..1817d071a 100644
--- a/web/core/lib/Drupal/Core/Routing/NullGenerator.php
+++ b/web/core/lib/Drupal/Core/Routing/NullGenerator.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Routing\Route;
 
 /**
- * No-op implementation of a Url Generator, needed for backward compatibility.
+ * No-op implementation of a URL Generator, needed for backward compatibility.
  */
 class NullGenerator extends UrlGenerator {
 
diff --git a/web/core/lib/Drupal/Core/Routing/UrlGenerator.php b/web/core/lib/Drupal/Core/Routing/UrlGenerator.php
index f56736ab2..7714344e3 100644
--- a/web/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/web/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -163,7 +163,7 @@ public function getPathFromRoute($name, $parameters = []) {
    *   The route name or other identifying string from ::getRouteDebugMessage().
    *
    * @return string
-   *   The url path, without any base path, without the query string, not URL
+   *   The URL path, without any base path, without the query string, not URL
    *   encoded.
    *
    * @throws \Symfony\Component\Routing\Exception\MissingMandatoryParametersException
@@ -270,16 +270,15 @@ public function generateFromRoute($name, $parameters = [], $options = [], $colle
     $route = $this->getRoute($name);
     $generated_url = $collect_bubbleable_metadata ? new GeneratedUrl() : NULL;
 
-    $fragment = '';
-    if (isset($options['fragment'])) {
-      if (($fragment = trim($options['fragment'])) != '') {
-        $fragment = '#' . $fragment;
-      }
-    }
-
     // Generate a relative URL having no path, just query string and fragment.
     if ($route->getOption('_no_path')) {
       $query = $options['query'] ? '?' . UrlHelper::buildQuery($options['query']) : '';
+      $fragment = '';
+      if (isset($options['fragment'])) {
+        if (($fragment = trim($options['fragment'])) != '') {
+          $fragment = '#' . $fragment;
+        }
+      }
       $url = $query . $fragment;
       return $collect_bubbleable_metadata ? $generated_url->setGeneratedUrl($url) : $url;
     }
@@ -329,6 +328,13 @@ public function generateFromRoute($name, $parameters = [], $options = [], $colle
 
     $query = $options['query'] ? '?' . UrlHelper::buildQuery($options['query']) : '';
 
+    $fragment = '';
+    if (isset($options['fragment'])) {
+      if (($fragment = trim($options['fragment'])) != '') {
+        $fragment = '#' . $fragment;
+      }
+    }
+
     // The base_url might be rewritten from the language rewrite in domain mode.
     if (isset($options['base_url'])) {
       $base_url = $options['base_url'];
diff --git a/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php b/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
index bbc91de1d..a69ffb39a 100644
--- a/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/web/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface as SymfonyUrlGeneratorInterface;
 
 /**
- * Defines an interface for generating a url from a route or system path.
+ * Defines an interface for generating a URL from a route or system path.
  *
  * Provides additional methods and options not present in the base interface.
  */
@@ -53,6 +53,8 @@ public function getPathFromRoute($name, $parameters = []);
    *   - 'https': Whether this URL should point to a secure location. If not
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
+   *   - 'path_processing': Defaults to TRUE. Whether to pass the path to a
+   *     processor manager to allow alterations.
    *   - 'base_url': Only used internally by a path processor, for example, to
    *     modify the base URL when a language dependent URL requires so.
    *   - 'prefix': Only used internally, to modify the path when a language
diff --git a/web/core/lib/Drupal/Core/Session/SessionConfiguration.php b/web/core/lib/Drupal/Core/Session/SessionConfiguration.php
index cecc0a350..2687ac94b 100644
--- a/web/core/lib/Drupal/Core/Session/SessionConfiguration.php
+++ b/web/core/lib/Drupal/Core/Session/SessionConfiguration.php
@@ -118,8 +118,8 @@ protected function getUnprefixedName(Request $request) {
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The request.
    *
-   * @returns string
-   *   The session cookie domain.
+   * @returns string|null
+   *   The session cookie domain, or NULL if the calculated value is invalid.
    */
   protected function getCookieDomain(Request $request) {
     if (isset($this->options['cookie_domain'])) {
@@ -135,7 +135,8 @@ protected function getCookieDomain(Request $request) {
     // Cookies for domains without an embedded dot will be rejected by user
     // agents in order to defeat malicious websites attempting to set cookies
     // for top-level domains. Also IP addresses may not be used in the domain
-    // attribute of a Set-Cookie header.
+    // attribute of a Set-Cookie header. IPv6 addresses will not pass the first
+    // test, so it's acceptable to bias the second test to IPv4.
     if (count(explode('.', $cookie_domain)) > 2 && !is_numeric(str_replace('.', '', $cookie_domain))) {
       return $cookie_domain;
     }
diff --git a/web/core/lib/Drupal/Core/Session/UserSession.php b/web/core/lib/Drupal/Core/Session/UserSession.php
index 5ed8e4c72..372c8a958 100644
--- a/web/core/lib/Drupal/Core/Session/UserSession.php
+++ b/web/core/lib/Drupal/Core/Session/UserSession.php
@@ -7,6 +7,7 @@
  *
  * @todo: Change all properties to protected.
  */
+#[\AllowDynamicProperties]
 class UserSession implements AccountInterface {
 
   /**
diff --git a/web/core/lib/Drupal/Core/Site/Settings.php b/web/core/lib/Drupal/Core/Site/Settings.php
index 4b3fcc498..667dd3eb7 100644
--- a/web/core/lib/Drupal/Core/Site/Settings.php
+++ b/web/core/lib/Drupal/Core/Site/Settings.php
@@ -54,6 +54,10 @@ final class Settings {
       'replacement' => 'twig_sandbox_allowed_prefixes',
       'message' => 'The "twig_sandbox_whitelisted_prefixes" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_prefixes" instead. See https://www.drupal.org/node/3162897.',
     ],
+    'block_interest_cohort' => [
+      'replacement' => '',
+      'message' => 'The "block_interest_cohort" setting is deprecated in drupal:9.5.0. This setting should be removed from the settings file, since its usage has been removed. See https://www.drupal.org/node/3320787.',
+    ],
   ];
 
   /**
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
index 38a7758d0..a7e0c1572 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperInterface.php
@@ -82,11 +82,12 @@ interface StreamWrapperInterface extends PhpStreamWrapperInterface {
   const READ_VISIBLE = 0x0014;
 
   /**
-   * This is the default 'type' flag. This does not include
-   * StreamWrapperInterface::LOCAL, because PHP grants a greater trust level to
-   * local files (for example, they can be used in an "include" statement,
-   * regardless of the "allow_url_include" setting), so stream wrappers need to
-   * explicitly opt-in to this.
+   * The default 'type' flag.
+   *
+   * This does not include StreamWrapperInterface::LOCAL, because PHP grants a
+   * greater trust level to local files (for example, they can be used in an
+   * "include" statement, regardless of the "allow_url_include" setting), so
+   * stream wrappers need to explicitly opt-in to this.
    */
   const NORMAL = 0x001C;
 
diff --git a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
index 4799a378b..1e1bd5f17 100644
--- a/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
+++ b/web/core/lib/Drupal/Core/StreamWrapper/StreamWrapperManager.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Core\StreamWrapper;
 
+use Drupal\Core\Site\Settings;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
 
@@ -242,6 +243,36 @@ public function normalizeUri($uri) {
       $target = $this->getTarget($uri);
 
       if ($target !== FALSE) {
+
+        if (!in_array($scheme, Settings::get('file_sa_core_2023_005_schemes', []))) {
+          $class = $this->getClass($scheme);
+          $is_local = is_subclass_of($class, LocalStream::class);
+          if ($is_local) {
+            $target = str_replace(DIRECTORY_SEPARATOR, '/', $target);
+          }
+
+          $parts = explode('/', $target);
+          $normalized_parts = [];
+          while ($parts) {
+            $part = array_shift($parts);
+            if ($part === '' || $part === '.') {
+              continue;
+            }
+            elseif ($part === '..' && $is_local && $normalized_parts === []) {
+              $normalized_parts[] = $part;
+              break;
+            }
+            elseif ($part === '..') {
+              array_pop($normalized_parts);
+            }
+            else {
+              $normalized_parts[] = $part;
+            }
+          }
+
+          $target = implode('/', array_merge($normalized_parts, $parts));
+        }
+
         $uri = $scheme . '://' . $target;
       }
     }
diff --git a/web/core/lib/Drupal/Core/Template/TwigEnvironment.php b/web/core/lib/Drupal/Core/Template/TwigEnvironment.php
index d6db9fbbe..47ee8b9f2 100644
--- a/web/core/lib/Drupal/Core/Template/TwigEnvironment.php
+++ b/web/core/lib/Drupal/Core/Template/TwigEnvironment.php
@@ -50,8 +50,7 @@ class TwigEnvironment extends Environment {
   protected $twigCachePrefix = '';
 
   /**
-   * Constructs a TwigEnvironment object and stores cache and storage
-   * internally.
+   * Creates a TwigEnvironment object, including its cache and storage.
    *
    * @param string $root
    *   The app root.
diff --git a/web/core/lib/Drupal/Core/Template/TwigExtension.php b/web/core/lib/Drupal/Core/Template/TwigExtension.php
index 13f97e58f..460830400 100644
--- a/web/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/web/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -102,7 +102,7 @@ public function getFunctions() {
     return [
       // This function will receive a renderable array, if an array is detected.
       new TwigFunction('render_var', [$this, 'renderVar']),
-      // The url and path function are defined in close parallel to those found
+      // The URL and path function are defined in close parallel to those found
       // in \Symfony\Bridge\Twig\Extension\RoutingExtension
       new TwigFunction('url', [$this, 'getUrl'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
       new TwigFunction('path', [$this, 'getPath'], ['is_safe_callback' => [$this, 'isUrlGenerationSafe']]),
@@ -230,7 +230,7 @@ public function getUrl($name, $parameters = [], $options = []) {
   }
 
   /**
-   * Gets a rendered link from a url object.
+   * Gets a rendered link from a URL object.
    *
    * @param string $text
    *   The link text for the anchor tag as a translated string.
diff --git a/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php b/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
index 0429b6a31..0e0988450 100644
--- a/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
+++ b/web/core/lib/Drupal/Core/Template/TwigNodeVisitor.php
@@ -20,6 +20,11 @@
  */
 class TwigNodeVisitor extends AbstractNodeVisitor {
 
+  /**
+   * Tracks whether there is a render array aware filter active already.
+   */
+  protected $skipRenderVarFunction;
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php b/web/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
index bdfc98cd6..e111569c6 100644
--- a/web/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
+++ b/web/core/lib/Drupal/Core/Template/TwigSandboxPolicy.php
@@ -25,8 +25,9 @@ class TwigSandboxPolicy implements SecurityPolicyInterface {
   protected $allowed_methods;
 
   /**
-   * An array of allowed method prefixes -- any method starting with one of
-   * these prefixes will be allowed.
+   * Allowed method prefixes.
+   *
+   * Any method starting with one of these prefixes will be allowed.
    *
    * @var array
    */
diff --git a/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php b/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
index 32cb051dd..be50079b7 100644
--- a/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
+++ b/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php
@@ -42,7 +42,7 @@ trait FunctionalTestSetupTrait {
   /**
    * The class loader to use for installation and initialization of setup.
    *
-   * @var \Symfony\Component\Classloader\Classloader
+   * @var \Composer\Autoload\ClassLoader
    */
   protected $classLoader;
 
@@ -207,7 +207,7 @@ protected function rebuildContainer() {
     // Rebuild the kernel and bring it back to a fully bootstrapped state.
     $this->container = $this->kernel->rebuildContainer();
 
-    // Make sure the url generator has a request object, otherwise calls to
+    // Make sure the URL generator has a request object, otherwise calls to
     // $this->drupalGet() will fail.
     $this->prepareRequestForGenerator();
   }
@@ -236,12 +236,12 @@ protected function resetAll() {
    *
    * This is used to manipulate how the generator generates paths during tests.
    * It also ensures that calls to $this->drupalGet() will work when running
-   * from run-tests.sh because the url generator no longer looks at the global
+   * from run-tests.sh because the URL generator no longer looks at the global
    * variables that are set there but relies on getting this information from a
    * request object.
    *
    * @param bool $clean_urls
-   *   Whether to mock the request using clean urls.
+   *   Whether to mock the request using clean URLs.
    * @param array $override_server_vars
    *   An array of server variables to override.
    *
diff --git a/web/core/lib/Drupal/Core/Test/PerformanceTestRecorder.php b/web/core/lib/Drupal/Core/Test/PerformanceTestRecorder.php
index 8be037bdf..105f8993a 100644
--- a/web/core/lib/Drupal/Core/Test/PerformanceTestRecorder.php
+++ b/web/core/lib/Drupal/Core/Test/PerformanceTestRecorder.php
@@ -16,10 +16,8 @@ class PerformanceTestRecorder implements EventSubscriberInterface {
 
   /**
    * The state service for persistent storage if necessary.
-   *
-   * @var \Drupal\Core\State\StateInterface
    */
-  protected $service;
+  protected $state;
 
   /**
    * @var array
diff --git a/web/core/lib/Drupal/Core/Test/TestDatabase.php b/web/core/lib/Drupal/Core/Test/TestDatabase.php
index 02ced56cb..554eac85a 100644
--- a/web/core/lib/Drupal/Core/Test/TestDatabase.php
+++ b/web/core/lib/Drupal/Core/Test/TestDatabase.php
@@ -12,6 +12,8 @@
 class TestDatabase {
 
   /**
+   * The test lock ID.
+   *
    * A random number used to ensure that test fixtures are unique to each test
    * method.
    *
diff --git a/web/core/lib/Drupal/Core/Test/TestKernel.php b/web/core/lib/Drupal/Core/Test/TestKernel.php
index 124dff402..952692b9f 100644
--- a/web/core/lib/Drupal/Core/Test/TestKernel.php
+++ b/web/core/lib/Drupal/Core/Test/TestKernel.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Core\Test;
 
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Component\DependencyInjection\ReverseContainer;
 use Drupal\Core\DrupalKernel;
 
 /**
@@ -22,4 +24,24 @@ public function __construct($environment, $class_loader, $allow_dumping = TRUE)
     parent::__construct($environment, $class_loader, $allow_dumping);
   }
 
+  /**
+   * Sets a container with a kernel service on the Drupal class.
+   *
+   * @return \Drupal\Component\DependencyInjection\ContainerInterface
+   *   A container with the kernel service set.
+   */
+  public static function setContainerWithKernel() {
+    $container = new ContainerBuilder();
+    $kernel = new DrupalKernel('test', NULL);
+    // Objects of the same type will have access to each others private and
+    // protected members even though they are not the same instances. This is
+    // because the implementation specific details are already known when
+    // inside those objects.
+    $kernel->container = $container;
+    $container->set('kernel', $kernel);
+    $container->set(ReverseContainer::class, new ReverseContainer($container));
+    \Drupal::setContainer($container);
+    return $container;
+  }
+
 }
diff --git a/web/core/lib/Drupal/Core/Test/TestSetupTrait.php b/web/core/lib/Drupal/Core/Test/TestSetupTrait.php
index 46f0b91fc..97e51c6d5 100644
--- a/web/core/lib/Drupal/Core/Test/TestSetupTrait.php
+++ b/web/core/lib/Drupal/Core/Test/TestSetupTrait.php
@@ -167,7 +167,7 @@ protected function changeDatabasePrefix() {
       // Ensure no existing database gets in the way. If a default database
       // exists already it must be removed.
       Database::removeConnection('default');
-      $database = Database::convertDbUrlToConnectionInfo($db_url, $this->root ?? DRUPAL_ROOT);
+      $database = Database::convertDbUrlToConnectionInfo($db_url, $this->root ?? DRUPAL_ROOT, TRUE);
       Database::addConnectionInfo('default', 'default', $database);
     }
 
diff --git a/web/core/lib/Drupal/Core/Theme/Registry.php b/web/core/lib/Drupal/Core/Theme/Registry.php
index cb978d60e..df28db323 100644
--- a/web/core/lib/Drupal/Core/Theme/Registry.php
+++ b/web/core/lib/Drupal/Core/Theme/Registry.php
@@ -178,19 +178,22 @@ class Registry implements DestructableInterface {
    *   The theme handler.
    * @param \Drupal\Core\Theme\ThemeInitializationInterface $theme_initialization
    *   The theme initialization.
-   * @param string $theme_name
-   *   (optional) The name of the theme for which to construct the registry.
    * @param \Drupal\Core\Cache\CacheBackendInterface $runtime_cache
    *   The cache backend interface to use for the runtime theme registry data.
    * @param \Drupal\Core\Extension\ModuleExtensionList $module_list
    *   The module list.
+   * @param string $theme_name
+   *   (optional) The name of the theme for which to construct the registry.
    */
-  public function __construct($root, CacheBackendInterface $cache, LockBackendInterface $lock, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ThemeInitializationInterface $theme_initialization, $theme_name = NULL, CacheBackendInterface $runtime_cache = NULL, ModuleExtensionList $module_list = NULL) {
+  public function __construct($root, CacheBackendInterface $cache, LockBackendInterface $lock, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, ThemeInitializationInterface $theme_initialization, $runtime_cache = NULL, $module_list = NULL, $theme_name = NULL) {
+    if (!($runtime_cache instanceof CacheBackendInterface) || !($module_list instanceof ModuleExtensionList)) {
+      @trigger_error('Calling Registry::__construct() without the $runtime_cache as an instance of CacheBackendInterface or the $module_list as an instance of ModuleExtensionList is deprecated in drupal:9.5.0 and is required in drupal:10.0.0. See https://www.drupal.org/node/3285131', E_USER_DEPRECATED);
+      [$runtime_cache, $module_list, $theme_name] = [$module_list, $theme_name, $runtime_cache];
+    }
     $this->root = $root;
     $this->cache = $cache;
     $this->lock = $lock;
     $this->moduleHandler = $module_handler;
-    $this->themeName = $theme_name;
     $this->themeHandler = $theme_handler;
     $this->themeInitialization = $theme_initialization;
     $this->runtimeCache = $runtime_cache;
@@ -199,6 +202,7 @@ public function __construct($root, CacheBackendInterface $cache, LockBackendInte
       $module_list = \Drupal::service('extension.list.module');
     }
     $this->moduleList = $module_list;
+    $this->themeName = $theme_name;
   }
 
   /**
@@ -750,7 +754,7 @@ protected function postProcessExtension(array &$cache, ActiveTheme $theme) {
     ksort($suggestion_level);
     foreach ($suggestion_level as $level => $item) {
       foreach ($item as $preprocessor => $hook) {
-        if (isset($cache[$hook]['preprocess functions']) && !in_array($hook, $cache[$hook]['preprocess functions'])) {
+        if (isset($cache[$hook]['preprocess functions']) && !in_array($preprocessor, $cache[$hook]['preprocess functions'])) {
           // Add missing preprocessor to existing hook.
           $cache[$hook]['preprocess functions'][] = $preprocessor;
         }
diff --git a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
index d9c383014..5a75b6352 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
@@ -112,13 +112,6 @@ public function getActiveThemeByName($theme_name) {
     while ($ancestor && isset($themes[$ancestor]->base_theme)) {
       $ancestor = $themes[$ancestor]->base_theme;
       if (!$this->themeHandler->themeExists($ancestor)) {
-        if ($ancestor == 'stable') {
-          // Themes that depend on Stable will be fixed by system_update_8014().
-          // There is no harm in not adding it as an ancestor since at worst
-          // some people might experience slight visual regressions on
-          // update.php.
-          continue;
-        }
         throw new MissingThemeDependencyException(sprintf('Base theme %s has not been installed.', $ancestor), $ancestor);
       }
       $base_themes[] = $themes[$ancestor];
diff --git a/web/core/lib/Drupal/Core/TypedData/DataDefinition.php b/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
index 8ac57a164..9653d0967 100644
--- a/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
+++ b/web/core/lib/Drupal/Core/TypedData/DataDefinition.php
@@ -78,7 +78,7 @@ public function getLabel() {
   /**
    * Sets the human-readable label.
    *
-   * @param string $label
+   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $label
    *   The label to set.
    *
    * @return static
@@ -99,7 +99,7 @@ public function getDescription() {
   /**
    * Sets the human-readable description.
    *
-   * @param string $description
+   * @param string|\Drupal\Core\StringTranslation\TranslatableMarkup $description
    *   The description to set.
    *
    * @return static
diff --git a/web/core/lib/Drupal/Core/TypedData/DataDefinitionInterface.php b/web/core/lib/Drupal/Core/TypedData/DataDefinitionInterface.php
index a709b7a5c..e5614d3d4 100644
--- a/web/core/lib/Drupal/Core/TypedData/DataDefinitionInterface.php
+++ b/web/core/lib/Drupal/Core/TypedData/DataDefinitionInterface.php
@@ -57,9 +57,10 @@ public function getDataType();
   /**
    * Returns a human readable label.
    *
-   * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup
+   * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup|null
    *   The label. A string or an instance of TranslatableMarkup will be returned
-   *   based on the way the label translation is handled.
+   *   based on the way the label translation is handled. NULL if no label is
+   *   available.
    */
   public function getLabel();
 
@@ -69,8 +70,10 @@ public function getLabel();
    * Descriptions are usually used on user interfaces where the data is edited
    * or displayed.
    *
-   * @return string|null
-   *   The description, or NULL if no description is available.
+   * @return string|\Drupal\Core\StringTranslation\TranslatableMarkup|null
+   *   The description. A string or an instance of TranslatableMarkup will be
+   *   returned based on the way the description translation is handled. NULL if
+   *   no description is available.
    */
   public function getDescription();
 
diff --git a/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php b/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
index 9f74c4f45..98a429fbb 100644
--- a/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
+++ b/web/core/lib/Drupal/Core/TypedData/Plugin/DataType/Language.php
@@ -27,7 +27,7 @@ class Language extends TypedData {
   protected $id;
 
   /**
-   * @var \Drupal\Core\Language
+   * @var \Drupal\Core\Language\Language
    */
   protected $language;
 
diff --git a/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php b/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
index 5a8ab6984..202a5cb53 100644
--- a/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
+++ b/web/core/lib/Drupal/Core/TypedData/Validation/RecursiveContextualValidator.php
@@ -51,6 +51,11 @@ class RecursiveContextualValidator implements ContextualValidatorInterface {
    */
   protected $constraintValidatorFactory;
 
+  /**
+   * The typed data manager.
+   */
+  protected $typedDataManager;
+
   /**
    * Creates a validator for the given context.
    *
diff --git a/web/core/lib/Drupal/Core/Updater/Updater.php b/web/core/lib/Drupal/Core/Updater/Updater.php
index 65c7409bb..43531205b 100644
--- a/web/core/lib/Drupal/Core/Updater/Updater.php
+++ b/web/core/lib/Drupal/Core/Updater/Updater.php
@@ -24,6 +24,16 @@ class Updater {
    */
   protected $root;
 
+  /**
+   * The name of the project directory (basename).
+   */
+  protected $name;
+
+  /**
+   * The title of the project.
+   */
+  protected $title;
+
   /**
    * Constructs a new updater.
    *
diff --git a/web/core/lib/Drupal/Core/Url.php b/web/core/lib/Drupal/Core/Url.php
index c4779cf9a..7af4ff011 100644
--- a/web/core/lib/Drupal/Core/Url.php
+++ b/web/core/lib/Drupal/Core/Url.php
@@ -495,7 +495,7 @@ public static function createFromRequest(Request $request) {
   }
 
   /**
-   * Sets this Url to encapsulate an unrouted URI.
+   * Sets this URL to encapsulate an unrouted URI.
    *
    * @return $this
    */
@@ -537,7 +537,7 @@ public function toUriString() {
   }
 
   /**
-   * Indicates if this Url is external.
+   * Indicates if this URL is external.
    *
    * @return bool
    */
@@ -546,7 +546,7 @@ public function isExternal() {
   }
 
   /**
-   * Indicates if this Url has a Drupal route.
+   * Indicates if this URL has a Drupal route.
    *
    * @return bool
    */
@@ -727,7 +727,7 @@ public function getUri() {
    * Sets the value of the absolute option for this Url.
    *
    * @param bool $absolute
-   *   (optional) Whether to make this Url absolute or not. Defaults to TRUE.
+   *   (optional) Whether to make this URL absolute or not. Defaults to TRUE.
    *
    * @return $this
    */
@@ -777,7 +777,7 @@ public function toRenderArray() {
       '#options' => $this->getOptions(),
     ];
     if (!$this->unrouted) {
-      $render_array['#access_callback'] = [get_class(), 'renderAccess'];
+      $render_array['#access_callback'] = [self::class, 'renderAccess'];
     }
     return $render_array;
   }
@@ -829,13 +829,13 @@ public function access(AccountInterface $account = NULL, $return_as_object = FAL
   }
 
   /**
-   * Checks a Url render element against applicable access check services.
+   * Checks a URL render element against applicable access check services.
    *
    * @param array $element
    *   A render element as returned from \Drupal\Core\Url::toRenderArray().
    *
    * @return bool
-   *   Returns TRUE if the current user has access to the url, otherwise FALSE.
+   *   Returns TRUE if the current user has access to the URL, otherwise FALSE.
    */
   public static function renderAccess(array $element) {
     return $element['#url']->access();
diff --git a/web/core/lib/Drupal/Core/Utility/Error.php b/web/core/lib/Drupal/Core/Utility/Error.php
index 31ed9dd8e..1f55be5a2 100644
--- a/web/core/lib/Drupal/Core/Utility/Error.php
+++ b/web/core/lib/Drupal/Core/Utility/Error.php
@@ -21,7 +21,7 @@ class Error {
   const ERROR = 3;
 
   /**
-   * The the default message for logging errors.
+   * The default message for logging errors.
    */
   const DEFAULT_ERROR_MESSAGE = '%type: @message in %function (line %line of %file).';
 
diff --git a/web/core/lib/Drupal/Core/Utility/LinkGenerator.php b/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
index 50bc3089a..a8aa71f0c 100644
--- a/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
+++ b/web/core/lib/Drupal/Core/Utility/LinkGenerator.php
@@ -21,7 +21,7 @@
 class LinkGenerator implements LinkGeneratorInterface {
 
   /**
-   * The url generator.
+   * The URL generator.
    *
    * @var \Drupal\Core\Routing\UrlGeneratorInterface
    */
@@ -106,7 +106,7 @@ public function generate($text, Url $url) {
       'absolute' => FALSE,
     ];
 
-    // Add a hreflang attribute if we know the language of this link's url and
+    // Add a hreflang attribute if we know the language of this link's URL and
     // hreflang has not already been set.
     if (!empty($variables['options']['language']) && !isset($variables['options']['attributes']['hreflang'])) {
       $variables['options']['attributes']['hreflang'] = $variables['options']['language']->getId();
diff --git a/web/core/lib/Drupal/Core/Utility/ProjectInfo.php b/web/core/lib/Drupal/Core/Utility/ProjectInfo.php
index ef7d7faf2..f0ea0afcc 100644
--- a/web/core/lib/Drupal/Core/Utility/ProjectInfo.php
+++ b/web/core/lib/Drupal/Core/Utility/ProjectInfo.php
@@ -169,7 +169,7 @@ public function getProjectName(Extension $file) {
    *   (optional) Array of additional elements to be collected from the .info.yml
    *   file. Defaults to array().
    *
-   * @return
+   * @return array
    *   Array of .info.yml file data we need for the update manager.
    *
    * @see \Drupal\Core\Utility\ProjectInfo::processInfoList()
diff --git a/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php b/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php
index 8abb17d78..34b97dfb5 100644
--- a/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php
+++ b/web/core/lib/Drupal/Core/Utility/ThemeRegistry.php
@@ -79,7 +79,7 @@ public function __construct($cid, CacheBackendInterface $cache, LockBackendInter
   /**
    * Initializes the full theme registry.
    *
-   * @return
+   * @return array
    *   An array with the keys of the full theme registry, but the values
    *   initialized to NULL.
    */
diff --git a/web/core/lib/Drupal/Core/Utility/Token.php b/web/core/lib/Drupal/Core/Utility/Token.php
index 832befa34..c9c823747 100644
--- a/web/core/lib/Drupal/Core/Utility/Token.php
+++ b/web/core/lib/Drupal/Core/Utility/Token.php
@@ -44,8 +44,10 @@
  * $user = User::load(1);
  *
  * // [date:...] tokens use the current date automatically.
+ * $token_service = \Drupal::token();
  * $data = array('node' => $node, 'user' => $user);
- * return Token::replace($text, $data);
+ * $result = $token_service->replace($text, $data);
+ * return $result
  * @endcode
  *
  * Some tokens may be chained in the form of [$type:$pointer:$name], where $type
diff --git a/web/core/lib/Drupal/Core/Utility/token.api.php b/web/core/lib/Drupal/Core/Utility/token.api.php
index 4d1417d17..9fd09d979 100644
--- a/web/core/lib/Drupal/Core/Utility/token.api.php
+++ b/web/core/lib/Drupal/Core/Utility/token.api.php
@@ -175,7 +175,7 @@ function hook_tokens_alter(array &$replacements, array $context, \Drupal\Core\Re
  * module will need to implement that hook in order to generate token
  * replacements from the tokens defined here.
  *
- * @return
+ * @return array
  *   An associative array of available tokens and token types. The outer array
  *   has two components:
  *   - types: An associative array of token types (groups). Each token type is
diff --git a/web/core/lib/Drupal/Core/Validation/Annotation/Constraint.php b/web/core/lib/Drupal/Core/Validation/Annotation/Constraint.php
index 64af92e8f..61082902a 100644
--- a/web/core/lib/Drupal/Core/Validation/Annotation/Constraint.php
+++ b/web/core/lib/Drupal/Core/Validation/Annotation/Constraint.php
@@ -38,10 +38,11 @@ class Constraint extends Plugin {
   public $label;
 
   /**
-   * An array of DataType plugin IDs for which this constraint applies. Valid
-   * values are any types registered by the typed data API, or an array of
-   * multiple type names. For supporting all types, FALSE may be specified. The
-   * key defaults to an empty array, which indicates no types are supported.
+   * DataType plugin IDs for which this constraint applies.
+   *
+   * Valid values are any types registered by the typed data API, or an array
+   * of multiple type names. For supporting all types, FALSE may be specified.
+   * The key defaults to an empty array, which indicates no types are supported.
    *
    * @var string|string[]|false
    *
diff --git a/web/core/lib/Drupal/Core/Validation/ConstraintValidatorFactory.php b/web/core/lib/Drupal/Core/Validation/ConstraintValidatorFactory.php
index 218033e58..eeb7ad777 100644
--- a/web/core/lib/Drupal/Core/Validation/ConstraintValidatorFactory.php
+++ b/web/core/lib/Drupal/Core/Validation/ConstraintValidatorFactory.php
@@ -15,6 +15,11 @@
  */
 class ConstraintValidatorFactory extends BaseConstraintValidatorFactory {
 
+  /**
+   * The class resolver.
+   */
+  protected $classResolver;
+
   /**
    * Constructs a new ConstraintValidatorFactory.
    *
diff --git a/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php b/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
index 8adbd57f4..1aad291d9 100644
--- a/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
+++ b/web/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/UniqueFieldValueValidator.php
@@ -45,7 +45,7 @@ public function validate($items, Constraint $constraint) {
       $this->context->addViolation($constraint->message, [
         '%value' => $item->value,
         '@entity_type' => $entity->getEntityType()->getSingularLabel(),
-        '@field_name' => mb_strtolower($items->getFieldDefinition()->getLabel()),
+        '@field_name' => $items->getFieldDefinition()->getLabel(),
       ]);
     }
   }
diff --git a/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php b/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php
index e59e766ff..65df2a2ba 100644
--- a/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php
+++ b/web/core/lib/Drupal/Core/Validation/TranslatorInterface.php
@@ -29,7 +29,7 @@ interface TranslatorInterface {
    * @return string
    *   The translated string.
    *
-   * @throws InvalidArgumentException
+   * @throws \InvalidArgumentException
    *   If the locale contains invalid characters.
    */
   public function trans($id, array $parameters = [], $domain = NULL, $locale = NULL);
diff --git a/web/core/misc/active-link.js b/web/core/misc/active-link.js
index caa29f87d..5efe381c8 100644
--- a/web/core/misc/active-link.js
+++ b/web/core/misc/active-link.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, drupalSettings) {
   Drupal.behaviors.activeLinks = {
     attach: function attach(context) {
@@ -13,11 +12,9 @@
       var querySelector = path.currentQuery ? "[data-drupal-link-query='".concat(queryString, "']") : ':not([data-drupal-link-query])';
       var originalSelectors = ["[data-drupal-link-system-path=\"".concat(path.currentPath, "\"]")];
       var selectors;
-
       if (path.isFront) {
         originalSelectors.push('[data-drupal-link-system-path="<front>"]');
       }
-
       selectors = [].concat(originalSelectors.map(function (selector) {
         return "".concat(selector, ":not([hreflang])");
       }), originalSelectors.map(function (selector) {
@@ -28,7 +25,6 @@
       });
       var activeLinks = context.querySelectorAll(selectors.join(','));
       var il = activeLinks.length;
-
       for (var i = 0; i < il; i++) {
         activeLinks[i].classList.add('is-active');
       }
@@ -37,7 +33,6 @@
       if (trigger === 'unload') {
         var activeLinks = context.querySelectorAll('[data-drupal-link-system-path].is-active');
         var il = activeLinks.length;
-
         for (var i = 0; i < il; i++) {
           activeLinks[i].classList.remove('is-active');
         }
diff --git a/web/core/misc/ajax.es6.js b/web/core/misc/ajax.es6.js
index 94ff62df5..8f4c6c71c 100644
--- a/web/core/misc/ajax.es6.js
+++ b/web/core/misc/ajax.es6.js
@@ -11,7 +11,14 @@
  * included to provide Ajax capabilities.
  */
 
-(function ($, window, Drupal, drupalSettings, { isFocusable, tabbable }) {
+(function (
+  $,
+  window,
+  Drupal,
+  drupalSettings,
+  loadjs,
+  { isFocusable, tabbable },
+) {
   /**
    * Attaches the Ajax behavior to each Ajax form element.
    *
@@ -510,6 +517,9 @@
     ajax.options = {
       url: ajax.url,
       data: ajax.submit,
+      isInProgress() {
+        return ajax.ajaxing;
+      },
       beforeSerialize(elementSettings, options) {
         return ajax.beforeSerialize(elementSettings, options);
       },
@@ -547,10 +557,34 @@
           }
         }
 
-        return ajax.success(response, status);
+        return (
+          // Ensure that the return of the success callback is a Promise.
+          // When the return is a Promise, using resolve will unwrap it, and
+          // when the return is not a Promise we make sure it can be used as
+          // one. This is useful for code that overrides the success method.
+          Promise.resolve(ajax.success(response, status))
+            // Ajaxing status is back to false when all the AJAX commands have
+            // finished executing.
+            .then(() => {
+              ajax.ajaxing = false;
+              // jQuery normally triggers the ajaxSuccess, ajaxComplete, and
+              // ajaxStop events after the "success" function passed to $.ajax()
+              // returns, but we prevented that via
+              // $.event.special[EVENT_NAME].trigger in order to wait for the
+              // commands to finish executing. Now that they have, re-trigger
+              // those events.
+              $(document).trigger('ajaxSuccess', [xmlhttprequest, this]);
+              $(document).trigger('ajaxComplete', [xmlhttprequest, this]);
+              if (--$.active === 0) {
+                $(document).trigger('ajaxStop');
+              }
+            })
+        );
       },
-      complete(xmlhttprequest, status) {
+      error(xmlhttprequest, status, error) {
         ajax.ajaxing = false;
+      },
+      complete(xmlhttprequest, status) {
         if (status === 'error' || status === 'parsererror') {
           return ajax.error(xmlhttprequest, ajax.url);
         }
@@ -960,6 +994,36 @@
     $('body').append(this.progress.element);
   };
 
+  /**
+   * Helper method to make sure commands are executed in sequence.
+   *
+   * @param {Array.<Drupal.AjaxCommands~commandDefinition>} response
+   *   Drupal Ajax response.
+   * @param {number} status
+   *   XMLHttpRequest status.
+   *
+   * @return {Promise}
+   *  The promise that will resolve once all commands have finished executing.
+   */
+  Drupal.Ajax.prototype.commandExecutionQueue = function (response, status) {
+    const ajaxCommands = this.commands;
+    return Object.keys(response || {}).reduce(
+      // Add all commands to a single execution queue.
+      (executionQueue, key) =>
+        executionQueue.then(() => {
+          const { command } = response[key];
+          if (command && ajaxCommands[command]) {
+            // When a command returns a promise, the remaining commands will not
+            // execute until that promise has been fulfilled. This is typically
+            // used to ensure JavaScript files added via the 'add_js' command
+            // have loaded before subsequent commands execute.
+            return ajaxCommands[command](this, response[key], status);
+          }
+        }),
+      Promise.resolve(),
+    );
+  };
+
   /**
    * Handler for the form redirection completion.
    *
@@ -967,6 +1031,9 @@
    *   Drupal Ajax response.
    * @param {number} status
    *   XMLHttpRequest status.
+   *
+   * @return {Promise}
+   * The promise that will resolve once all commands have finished executing.
    */
   Drupal.Ajax.prototype.success = function (response, status) {
     // Remove the progress element.
@@ -989,55 +1056,61 @@
 
     // Track if any command is altering the focus so we can avoid changing the
     // focus set by the Ajax command.
-    let focusChanged = false;
-    Object.keys(response || {}).forEach((i) => {
-      if (response[i].command && this.commands[response[i].command]) {
-        this.commands[response[i].command](this, response[i], status);
-        if (
-          (response[i].command === 'invoke' &&
-            response[i].method === 'focus') ||
-          response[i].command === 'focusFirst'
-        ) {
-          focusChanged = true;
-        }
-      }
+    const focusChanged = Object.keys(response || {}).some((key) => {
+      const { command, method } = response[key];
+      return (
+        command === 'focusFirst' || (command === 'invoke' && method === 'focus')
+      );
     });
 
-    // If the focus hasn't be changed by the ajax commands, try to refocus the
-    // triggering element or one of its parents if that element does not exist
-    // anymore.
-    if (
-      !focusChanged &&
-      this.element &&
-      !$(this.element).data('disable-refocus')
-    ) {
-      let target = false;
-
-      for (let n = elementParents.length - 1; !target && n >= 0; n--) {
-        target = document.querySelector(
-          `[data-drupal-selector="${elementParents[n].getAttribute(
-            'data-drupal-selector',
-          )}"]`,
-        );
-      }
-
-      if (target) {
-        $(target).trigger('focus');
-      }
-    }
-
-    // Reattach behaviors, if they were detached in beforeSerialize(). The
-    // attachBehaviors() called on the new content from processing the response
-    // commands is not sufficient, because behaviors from the entire form need
-    // to be reattached.
-    if (this.$form && document.body.contains(this.$form.get(0))) {
-      const settings = this.settings || drupalSettings;
-      Drupal.attachBehaviors(this.$form.get(0), settings);
-    }
-
-    // Remove any response-specific settings so they don't get used on the next
-    // call by mistake.
-    this.settings = null;
+    return (
+      this.commandExecutionQueue(response, status)
+        // If the focus hasn't been changed by the AJAX commands, try to refocus
+        // the triggering element or one of its parents if that element does not
+        // exist anymore.
+        .then(() => {
+          if (
+            !focusChanged &&
+            this.element &&
+            !$(this.element).data('disable-refocus')
+          ) {
+            let target = false;
+
+            for (let n = elementParents.length - 1; !target && n >= 0; n--) {
+              target = document.querySelector(
+                `[data-drupal-selector="${elementParents[n].getAttribute(
+                  'data-drupal-selector',
+                )}"]`,
+              );
+            }
+            if (target) {
+              $(target).trigger('focus');
+            }
+          }
+          // Reattach behaviors, if they were detached in beforeSerialize(). The
+          // attachBehaviors() called on the new content from processing the
+          // response commands is not sufficient, because behaviors from the
+          // entire form need to be reattached.
+          if (this.$form && document.body.contains(this.$form.get(0))) {
+            const settings = this.settings || drupalSettings;
+            Drupal.attachBehaviors(this.$form.get(0), settings);
+          }
+          // Remove any response-specific settings so they don't get used on the
+          // next call by mistake.
+          this.settings = null;
+        })
+        .catch((error) =>
+          // eslint-disable-next-line no-console
+          console.error(
+            Drupal.t(
+              'An error occurred during the execution of the Ajax response: !error',
+              {
+                '!error': error,
+              },
+            ),
+          ),
+        )
+    );
   };
 
   /**
@@ -1620,5 +1693,118 @@
       }
       messages.add(response.message, response.messageOptions);
     },
+
+    /**
+     * Command to add JS.
+     *
+     * @param {Drupal.Ajax} [ajax]
+     *   {@link Drupal.Ajax} object created by {@link Drupal.ajax}.
+     * @param {object} response
+     *   The response from the Ajax request.
+     * @param {Array} response.data
+     *   An array of objects of script attributes.
+     * @param {number} [status]
+     *   The XMLHttpRequest status.
+     */
+    add_js(ajax, response, status) {
+      const parentEl = document.querySelector(response.selector || 'body');
+      const settings = ajax.settings || drupalSettings;
+      const allUniqueBundleIds = response.data.map((script) => {
+        // loadjs requires a unique ID, and an AJAX instance's `instanceIndex`
+        // is guaranteed to be unique.
+        // @see Drupal.behaviors.AJAX.detach
+        const uniqueBundleId = script.src + ajax.instanceIndex;
+        loadjs(script.src, uniqueBundleId, {
+          // The default loadjs behavior is to load script with async, in Drupal
+          // we need to explicitly tell scripts to load async, this is set in
+          // the before callback below if necessary.
+          async: false,
+          before(path, scriptEl) {
+            // This allows all attributes to be added, like defer, async and
+            // crossorigin.
+            Object.keys(script).forEach((attributeKey) => {
+              scriptEl.setAttribute(attributeKey, script[attributeKey]);
+            });
+
+            // By default, loadjs appends the script to the head. When scripts
+            // are loaded via AJAX, their location has no impact on
+            // functionality. But, since non-AJAX loaded scripts can choose
+            // their parent element, we provide that option here for the sake of
+            // consistency.
+            parentEl.appendChild(scriptEl);
+            // Return false to bypass loadjs' default DOM insertion mechanism.
+            return false;
+          },
+        });
+        return uniqueBundleId;
+      });
+      // Returns the promise so that the next AJAX command waits on the
+      // completion of this one to execute, ensuring the JS is loaded before
+      // executing.
+      return new Promise((resolve, reject) => {
+        loadjs.ready(allUniqueBundleIds, {
+          success() {
+            Drupal.attachBehaviors(parentEl, settings);
+            // All JS files were loaded and new and old behaviors have
+            // been attached. Resolve the promise and let the remaining
+            // commands execute.
+            resolve();
+          },
+          error(depsNotFound) {
+            const message = Drupal.t(
+              `The following files could not be loaded: @dependencies`,
+              { '@dependencies': depsNotFound.join(', ') },
+            );
+            reject(message);
+          },
+        });
+      });
+    },
   };
-})(jQuery, window, Drupal, drupalSettings, window.tabbable);
+
+  /**
+   * Delay jQuery's global completion events until after commands have executed.
+   *
+   * jQuery triggers the ajaxSuccess, ajaxComplete, and ajaxStop events after
+   * a successful response is returned and local success and complete events
+   * are triggered. However, Drupal Ajax responses contain commands that run
+   * asynchronously in a queue, so the following stops these events from getting
+   * triggered until after the Promise that executes the command queue is
+   * resolved.
+   */
+  const stopEvent = (xhr, settings) => {
+    return (
+      // Only interfere with Drupal's Ajax responses.
+      xhr.getResponseHeader('X-Drupal-Ajax-Token') === '1' &&
+      // The isInProgress() function might not be defined if the Ajax request
+      // was initiated without Drupal.ajax() or new Drupal.Ajax().
+      settings.isInProgress &&
+      // Until this is false, the Ajax request isn't completely done (the
+      // response's commands might still be running).
+      settings.isInProgress()
+    );
+  };
+  $.extend(true, $.event.special, {
+    ajaxSuccess: {
+      trigger(event, xhr, settings) {
+        if (stopEvent(xhr, settings)) {
+          return false;
+        }
+      },
+    },
+    ajaxComplete: {
+      trigger(event, xhr, settings) {
+        if (stopEvent(xhr, settings)) {
+          // jQuery decrements its internal active ajax counter even when we
+          // stop the ajaxComplete event, but we don't want that counter
+          // decremented, because for our purposes this request is still active
+          // while commands are executing. By incrementing it here, the net
+          // effect is that it remains unchanged. By remaining above 0, the
+          // ajaxStop event is also prevented.
+          $.active++;
+          return false;
+        }
+      },
+    },
+  });
+})(jQuery, window, Drupal, drupalSettings, loadjs, window.tabbable);
diff --git a/web/core/misc/ajax.js b/web/core/misc/ajax.js
index 505347666..9abcadf5a 100644
--- a/web/core/misc/ajax.js
+++ b/web/core/misc/ajax.js
@@ -4,38 +4,28 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-(function ($, window, Drupal, drupalSettings, _ref) {
+(function ($, window, Drupal, drupalSettings, loadjs, _ref) {
   var isFocusable = _ref.isFocusable,
-      tabbable = _ref.tabbable;
+    tabbable = _ref.tabbable;
   Drupal.behaviors.AJAX = {
     attach: function attach(context, settings) {
       function loadAjaxBehavior(base) {
         var elementSettings = settings.ajax[base];
-
         if (typeof elementSettings.selector === 'undefined') {
           elementSettings.selector = "#".concat(base);
         }
-
         once('drupal-ajax', $(elementSettings.selector)).forEach(function (el) {
           elementSettings.element = el;
           elementSettings.base = base;
           Drupal.ajax(elementSettings);
         });
       }
-
       Object.keys(settings.ajax || {}).forEach(function (base) {
         return loadAjaxBehavior(base);
       });
@@ -61,12 +51,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       }
     }
   };
-
   Drupal.AjaxError = function (xmlhttp, uri, customMessage) {
     var statusCode;
     var statusText;
     var responseText;
-
     if (xmlhttp.status) {
       statusCode = "\n".concat(Drupal.t('An AJAX HTTP error occurred.'), "\n").concat(Drupal.t('HTTP Result Code: !status', {
         '!status': xmlhttp.status
@@ -74,27 +62,22 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     } else {
       statusCode = "\n".concat(Drupal.t('An AJAX HTTP request terminated abnormally.'));
     }
-
     statusCode += "\n".concat(Drupal.t('Debugging information follows.'));
     var pathText = "\n".concat(Drupal.t('Path: !uri', {
       '!uri': uri
     }));
     statusText = '';
-
     try {
       statusText = "\n".concat(Drupal.t('StatusText: !statusText', {
         '!statusText': xmlhttp.statusText.trim()
       }));
     } catch (e) {}
-
     responseText = '';
-
     try {
       responseText = "\n".concat(Drupal.t('ResponseText: !responseText', {
         '!responseText': xmlhttp.responseText.trim()
       }));
     } catch (e) {}
-
     responseText = responseText.replace(/<("[^"]*"|'[^']*'|[^'">])*>/gi, '');
     responseText = responseText.replace(/[\n]+\s+/g, '\n');
     var readyStateText = xmlhttp.status === 0 ? "\n".concat(Drupal.t('ReadyState: !readyState', {
@@ -106,38 +89,30 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     this.message = statusCode + pathText + statusText + customMessage + responseText + readyStateText;
     this.name = 'AjaxError';
   };
-
   Drupal.AjaxError.prototype = new Error();
   Drupal.AjaxError.prototype.constructor = Drupal.AjaxError;
-
   Drupal.ajax = function (settings) {
     if (arguments.length !== 1) {
       throw new Error('Drupal.ajax() function must be called with one configuration object only');
     }
-
     var base = settings.base || false;
     var element = settings.element || false;
     delete settings.base;
     delete settings.element;
-
     if (!settings.progress && !element) {
       settings.progress = false;
     }
-
     var ajax = new Drupal.Ajax(base, element, settings);
     ajax.instanceIndex = Drupal.ajax.instances.length;
     Drupal.ajax.instances.push(ajax);
     return ajax;
   };
-
   Drupal.ajax.instances = [];
-
   Drupal.ajax.expired = function () {
     return Drupal.ajax.instances.filter(function (instance) {
       return instance && instance.element !== false && !document.body.contains(instance.element);
     });
   };
-
   Drupal.ajax.bindAjaxLinks = function (element) {
     once('ajax', '.use-ajax', element).forEach(function (ajaxLink) {
       var $linkElement = $(ajaxLink);
@@ -152,16 +127,13 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         element: ajaxLink
       };
       var href = $linkElement.attr('href');
-
       if (href) {
         elementSettings.url = href;
         elementSettings.event = 'click';
       }
-
       Drupal.ajax(elementSettings);
     });
   };
-
   Drupal.Ajax = function (base, element, elementSettings) {
     var defaults = {
       event: element ? 'mousedown' : null,
@@ -181,40 +153,35 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     $.extend(this, defaults, elementSettings);
     this.commands = new Drupal.AjaxCommands();
     this.instanceIndex = false;
-
     if (this.wrapper) {
       this.wrapper = "#".concat(this.wrapper);
     }
-
     this.element = element;
     this.element_settings = elementSettings;
     this.elementSettings = elementSettings;
-
     if (this.element && this.element.form) {
       this.$form = $(this.element.form);
     }
-
     if (!this.url) {
       var $element = $(this.element);
-
       if ($element.is('a')) {
         this.url = $element.attr('href');
       } else if (this.element && element.form) {
         this.url = this.$form.attr('action');
       }
     }
-
     var originalUrl = this.url;
     this.url = this.url.replace(/\/nojs(\/|$|\?|#)/, '/ajax$1');
-
     if (drupalSettings.ajaxTrustedUrl[originalUrl]) {
       drupalSettings.ajaxTrustedUrl[this.url] = true;
     }
-
     var ajax = this;
     ajax.options = {
       url: ajax.url,
       data: ajax.submit,
+      isInProgress: function isInProgress() {
+        return ajax.ajaxing;
+      },
       beforeSerialize: function beforeSerialize(elementSettings, options) {
         return ajax.beforeSerialize(elementSettings, options);
       },
@@ -227,22 +194,29 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         return ajax.beforeSend(xmlhttprequest, options);
       },
       success: function success(response, status, xmlhttprequest) {
+        var _this = this;
         if (typeof response === 'string') {
           response = $.parseJSON(response);
         }
-
         if (response !== null && !drupalSettings.ajaxTrustedUrl[ajax.url]) {
           if (xmlhttprequest.getResponseHeader('X-Drupal-Ajax-Token') !== '1') {
             var customMessage = Drupal.t('The response failed verification so will not be processed.');
             return ajax.error(xmlhttprequest, ajax.url, customMessage);
           }
         }
-
-        return ajax.success(response, status);
+        return Promise.resolve(ajax.success(response, status)).then(function () {
+          ajax.ajaxing = false;
+          $(document).trigger('ajaxSuccess', [xmlhttprequest, _this]);
+          $(document).trigger('ajaxComplete', [xmlhttprequest, _this]);
+          if (--$.active === 0) {
+            $(document).trigger('ajaxStop');
+          }
+        });
       },
-      complete: function complete(xmlhttprequest, status) {
+      error: function error(xmlhttprequest, status, _error) {
         ajax.ajaxing = false;
-
+      },
+      complete: function complete(xmlhttprequest, status) {
         if (status === 'error' || status === 'parsererror') {
           return ajax.error(xmlhttprequest, ajax.url);
         }
@@ -251,23 +225,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       jsonp: false,
       type: 'POST'
     };
-
     if (elementSettings.dialog) {
       ajax.options.data.dialogOptions = elementSettings.dialog;
     }
-
     if (ajax.options.url.indexOf('?') === -1) {
       ajax.options.url += '?';
     } else {
       ajax.options.url += '&';
     }
-
     var wrapper = "drupal_".concat(elementSettings.dialogType || 'ajax');
-
     if (elementSettings.dialogRenderer) {
       wrapper += ".".concat(elementSettings.dialogRenderer);
     }
-
     ajax.options.url += "".concat(Drupal.ajax.WRAPPER_FORMAT, "=").concat(wrapper);
     $(ajax.element).on(elementSettings.event, function (event) {
       if (!drupalSettings.ajaxTrustedUrl[ajax.url] && !Drupal.url.isLocal(ajax.url)) {
@@ -275,29 +244,23 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
           '!url': ajax.url
         }));
       }
-
       return ajax.eventResponse(this, event);
     });
-
     if (elementSettings.keypress) {
       $(ajax.element).on('keypress', function (event) {
         return ajax.keypressResponse(this, event);
       });
     }
-
     if (elementSettings.prevent) {
       $(ajax.element).on(elementSettings.prevent, false);
     }
   };
-
   Drupal.ajax.WRAPPER_FORMAT = '_wrapper_format';
   Drupal.Ajax.AJAX_REQUEST_PARAMETER = '_drupal_ajax';
-
   Drupal.Ajax.prototype.execute = function () {
     if (this.ajaxing) {
       return;
     }
-
     try {
       this.beforeSerialize(this.element, this.options);
       return $.ajax(this.options);
@@ -307,32 +270,26 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       return $.Deferred().reject();
     }
   };
-
   Drupal.Ajax.prototype.keypressResponse = function (element, event) {
     var ajax = this;
-
     if (event.which === 13 || event.which === 32 && element.type !== 'text' && element.type !== 'textarea' && element.type !== 'tel' && element.type !== 'number') {
       event.preventDefault();
       event.stopPropagation();
       $(element).trigger(ajax.elementSettings.event);
     }
   };
-
   Drupal.Ajax.prototype.eventResponse = function (element, event) {
     event.preventDefault();
     event.stopPropagation();
     var ajax = this;
-
     if (ajax.ajaxing) {
       return;
     }
-
     try {
       if (ajax.$form) {
         if (ajax.setClick) {
           element.form.clk = element;
         }
-
         ajax.$form.ajaxSubmit(ajax.options);
       } else {
         ajax.beforeSerialize(ajax.element, ajax.options);
@@ -343,139 +300,123 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       window.alert("An error occurred while attempting to process ".concat(ajax.options.url, ": ").concat(e.message));
     }
   };
-
   Drupal.Ajax.prototype.beforeSerialize = function (element, options) {
     if (this.$form && document.body.contains(this.$form.get(0))) {
       var settings = this.settings || drupalSettings;
       Drupal.detachBehaviors(this.$form.get(0), settings, 'serialize');
     }
-
     options.data[Drupal.Ajax.AJAX_REQUEST_PARAMETER] = 1;
     var pageState = drupalSettings.ajaxPageState;
     options.data['ajax_page_state[theme]'] = pageState.theme;
     options.data['ajax_page_state[theme_token]'] = pageState.theme_token;
     options.data['ajax_page_state[libraries]'] = pageState.libraries;
   };
-
   Drupal.Ajax.prototype.beforeSubmit = function (formValues, element, options) {};
-
   Drupal.Ajax.prototype.beforeSend = function (xmlhttprequest, options) {
     if (this.$form) {
       options.extraData = options.extraData || {};
       options.extraData.ajax_iframe_upload = '1';
       var v = $.fieldValue(this.element);
-
       if (v !== null) {
         options.extraData[this.element.name] = v;
       }
     }
-
     $(this.element).prop('disabled', true);
-
     if (!this.progress || !this.progress.type) {
       return;
     }
-
     var progressIndicatorMethod = "setProgressIndicator".concat(this.progress.type.slice(0, 1).toUpperCase()).concat(this.progress.type.slice(1).toLowerCase());
-
     if (progressIndicatorMethod in this && typeof this[progressIndicatorMethod] === 'function') {
       this[progressIndicatorMethod].call(this);
     }
   };
-
   Drupal.theme.ajaxProgressThrobber = function (message) {
     var messageMarkup = typeof message === 'string' ? Drupal.theme('ajaxProgressMessage', message) : '';
     var throbber = '<div class="throbber">&nbsp;</div>';
     return "<div class=\"ajax-progress ajax-progress-throbber\">".concat(throbber).concat(messageMarkup, "</div>");
   };
-
   Drupal.theme.ajaxProgressIndicatorFullscreen = function () {
     return '<div class="ajax-progress ajax-progress-fullscreen">&nbsp;</div>';
   };
-
   Drupal.theme.ajaxProgressMessage = function (message) {
     return "<div class=\"message\">".concat(message, "</div>");
   };
-
   Drupal.theme.ajaxProgressBar = function ($element) {
     return $('<div class="ajax-progress ajax-progress-bar"></div>').append($element);
   };
-
   Drupal.Ajax.prototype.setProgressIndicatorBar = function () {
     var progressBar = new Drupal.ProgressBar("ajax-progress-".concat(this.element.id), $.noop, this.progress.method, $.noop);
-
     if (this.progress.message) {
       progressBar.setProgress(-1, this.progress.message);
     }
-
     if (this.progress.url) {
       progressBar.startMonitoring(this.progress.url, this.progress.interval || 1500);
     }
-
     this.progress.element = $(Drupal.theme('ajaxProgressBar', progressBar.element));
     this.progress.object = progressBar;
     $(this.element).after(this.progress.element);
   };
-
   Drupal.Ajax.prototype.setProgressIndicatorThrobber = function () {
     this.progress.element = $(Drupal.theme('ajaxProgressThrobber', this.progress.message));
     $(this.element).after(this.progress.element);
   };
-
   Drupal.Ajax.prototype.setProgressIndicatorFullscreen = function () {
     this.progress.element = $(Drupal.theme('ajaxProgressIndicatorFullscreen'));
     $('body').append(this.progress.element);
   };
-
+  Drupal.Ajax.prototype.commandExecutionQueue = function (response, status) {
+    var _this2 = this;
+    var ajaxCommands = this.commands;
+    return Object.keys(response || {}).reduce(function (executionQueue, key) {
+      return executionQueue.then(function () {
+        var command = response[key].command;
+        if (command && ajaxCommands[command]) {
+          return ajaxCommands[command](_this2, response[key], status);
+        }
+      });
+    }, Promise.resolve());
+  };
   Drupal.Ajax.prototype.success = function (response, status) {
-    var _this = this;
-
+    var _this3 = this;
     if (this.progress.element) {
       $(this.progress.element).remove();
     }
-
     if (this.progress.object) {
       this.progress.object.stopMonitoring();
     }
-
     $(this.element).prop('disabled', false);
     var elementParents = $(this.element).parents('[data-drupal-selector]').addBack().toArray();
-    var focusChanged = false;
-    Object.keys(response || {}).forEach(function (i) {
-      if (response[i].command && _this.commands[response[i].command]) {
-        _this.commands[response[i].command](_this, response[i], status);
-
-        if (response[i].command === 'invoke' && response[i].method === 'focus' || response[i].command === 'focusFirst') {
-          focusChanged = true;
-        }
-      }
+    var focusChanged = Object.keys(response || {}).some(function (key) {
+      var _response$key = response[key],
+        command = _response$key.command,
+        method = _response$key.method;
+      return command === 'focusFirst' || command === 'invoke' && method === 'focus';
     });
-
-    if (!focusChanged && this.element && !$(this.element).data('disable-refocus')) {
-      var target = false;
-
-      for (var n = elementParents.length - 1; !target && n >= 0; n--) {
-        target = document.querySelector("[data-drupal-selector=\"".concat(elementParents[n].getAttribute('data-drupal-selector'), "\"]"));
+    return this.commandExecutionQueue(response, status).then(function () {
+      if (!focusChanged && _this3.element && !$(_this3.element).data('disable-refocus')) {
+        var target = false;
+        for (var n = elementParents.length - 1; !target && n >= 0; n--) {
+          target = document.querySelector("[data-drupal-selector=\"".concat(elementParents[n].getAttribute('data-drupal-selector'), "\"]"));
+        }
+        if (target) {
+          $(target).trigger('focus');
+        }
       }
-
-      if (target) {
-        $(target).trigger('focus');
+      if (_this3.$form && document.body.contains(_this3.$form.get(0))) {
+        var settings = _this3.settings || drupalSettings;
+        Drupal.attachBehaviors(_this3.$form.get(0), settings);
       }
-    }
-
-    if (this.$form && document.body.contains(this.$form.get(0))) {
-      var settings = this.settings || drupalSettings;
-      Drupal.attachBehaviors(this.$form.get(0), settings);
-    }
-
-    this.settings = null;
+      _this3.settings = null;
+    }).catch(function (error) {
+      return console.error(Drupal.t('An error occurred during the execution of the Ajax response: !error', {
+        '!error': error
+      }));
+    });
   };
-
   Drupal.Ajax.prototype.getEffect = function (response) {
     var type = response.effect || this.effect;
     var speed = response.speed || this.speed;
     var effect = {};
-
     if (type === 'none') {
       effect.showEffect = 'show';
       effect.hideEffect = 'hide';
@@ -489,42 +430,32 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       effect.hideEffect = "".concat(type, "Toggle");
       effect.showSpeed = speed;
     }
-
     return effect;
   };
-
   Drupal.Ajax.prototype.error = function (xmlhttprequest, uri, customMessage) {
     if (this.progress.element) {
       $(this.progress.element).remove();
     }
-
     if (this.progress.object) {
       this.progress.object.stopMonitoring();
     }
-
     $(this.wrapper).show();
     $(this.element).prop('disabled', false);
-
     if (this.$form && document.body.contains(this.$form.get(0))) {
       var settings = this.settings || drupalSettings;
       Drupal.attachBehaviors(this.$form.get(0), settings);
     }
-
     throw new Drupal.AjaxError(xmlhttprequest, uri, customMessage);
   };
-
   Drupal.theme.ajaxWrapperNewContent = function ($newContent, ajax, response) {
     return (response.effect || ajax.effect) !== 'none' && $newContent.filter(function (i) {
       return !($newContent[i].nodeName === '#comment' || $newContent[i].nodeName === '#text' && /^(\s|\n|\r)*$/.test($newContent[i].textContent));
     }).length > 1 ? Drupal.theme('ajaxWrapperMultipleRootElements', $newContent) : $newContent;
   };
-
   Drupal.theme.ajaxWrapperMultipleRootElements = function ($elements) {
     return $('<div></div>').append($elements);
   };
-
   Drupal.AjaxCommands = function () {};
-
   Drupal.AjaxCommands.prototype = {
     insert: function insert(ajax, response) {
       var $wrapper = response.selector ? $(response.selector) : $(ajax.wrapper);
@@ -533,7 +464,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       var settings = response.settings || ajax.settings || drupalSettings;
       var $newContent = $($.parseHTML(response.data, document, true));
       $newContent = Drupal.theme('ajaxWrapperNewContent', $newContent, ajax, response);
-
       switch (method) {
         case 'html':
         case 'replaceWith':
@@ -542,19 +472,14 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         case 'remove':
           Drupal.detachBehaviors($wrapper.get(0), settings);
           break;
-
         default:
           break;
       }
-
       $wrapper[method]($newContent);
-
       if (effect.showEffect !== 'show') {
         $newContent.hide();
       }
-
       var $ajaxNewContent = $newContent.find('.ajax-new-content');
-
       if ($ajaxNewContent.length) {
         $ajaxNewContent.hide();
         $newContent.show();
@@ -562,7 +487,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       } else if (effect.showEffect !== 'show') {
         $newContent[effect.showEffect](effect.showSpeed);
       }
-
       if ($newContent.parents('html').length) {
         $newContent.each(function (index, element) {
           if (element.nodeType === Node.ELEMENT_NODE) {
@@ -579,10 +503,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     },
     changed: function changed(ajax, response, status) {
       var $element = $(response.selector);
-
       if (!$element.hasClass('ajax-changed')) {
         $element.addClass('ajax-changed');
-
         if (response.asterisk) {
           $element.find(response.asterisk).append(" <abbr class=\"ajax-changed\" title=\"".concat(Drupal.t('Changed'), "\">*</abbr> "));
         }
@@ -606,19 +528,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     },
     settings: function settings(ajax, response, status) {
       var ajaxSettings = drupalSettings.ajax;
-
       if (ajaxSettings) {
         Drupal.ajax.expired().forEach(function (instance) {
           if (instance.selector) {
             var selector = instance.selector.replace('#', '');
-
             if (selector in ajaxSettings) {
               delete ajaxSettings[selector];
             }
           }
         });
       }
-
       if (response.merge) {
         $.extend(true, drupalSettings, response.settings);
       } else {
@@ -631,10 +550,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     focusFirst: function focusFirst(ajax, response, status) {
       var focusChanged = false;
       var container = document.querySelector(response.selector);
-
       if (container) {
         var tabbableElements = tabbable(container);
-
         if (tabbableElements.length) {
           tabbableElements[0].focus();
           focusChanged = true;
@@ -643,7 +560,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
           focusChanged = true;
         }
       }
-
       if (ajax.hasOwnProperty('element') && !focusChanged) {
         ajax.element.focus();
       }
@@ -665,12 +581,62 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     },
     message: function message(ajax, response) {
       var messages = new Drupal.Message(document.querySelector(response.messageWrapperQuerySelector));
-
       if (response.clearPrevious) {
         messages.clear();
       }
-
       messages.add(response.message, response.messageOptions);
+    },
+    add_js: function add_js(ajax, response, status) {
+      var parentEl = document.querySelector(response.selector || 'body');
+      var settings = ajax.settings || drupalSettings;
+      var allUniqueBundleIds = response.data.map(function (script) {
+        var uniqueBundleId = script.src + ajax.instanceIndex;
+        loadjs(script.src, uniqueBundleId, {
+          async: false,
+          before: function before(path, scriptEl) {
+            Object.keys(script).forEach(function (attributeKey) {
+              scriptEl.setAttribute(attributeKey, script[attributeKey]);
+            });
+            parentEl.appendChild(scriptEl);
+            return false;
+          }
+        });
+        return uniqueBundleId;
+      });
+      return new Promise(function (resolve, reject) {
+        loadjs.ready(allUniqueBundleIds, {
+          success: function success() {
+            Drupal.attachBehaviors(parentEl, settings);
+            resolve();
+          },
+          error: function error(depsNotFound) {
+            var message = Drupal.t("The following files could not be loaded: @dependencies", {
+              '@dependencies': depsNotFound.join(', ')
+            });
+            reject(message);
+          }
+        });
+      });
     }
   };
-})(jQuery, window, Drupal, drupalSettings, window.tabbable);
\ No newline at end of file
+  var stopEvent = function stopEvent(xhr, settings) {
+    return xhr.getResponseHeader('X-Drupal-Ajax-Token') === '1' && settings.isInProgress && settings.isInProgress();
+  };
+  $.extend(true, $.event.special, {
+    ajaxSuccess: {
+      trigger: function trigger(event, xhr, settings) {
+        if (stopEvent(xhr, settings)) {
+          return false;
+        }
+      }
+    },
+    ajaxComplete: {
+      trigger: function trigger(event, xhr, settings) {
+        if (stopEvent(xhr, settings)) {
+          $.active++;
+          return false;
+        }
+      }
+    }
+  });
+})(jQuery, window, Drupal, drupalSettings, loadjs, window.tabbable);
\ No newline at end of file
diff --git a/web/core/misc/announce.js b/web/core/misc/announce.js
index eacf55b51..67e6a21f6 100644
--- a/web/core/misc/announce.js
+++ b/web/core/misc/announce.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, debounce) {
   var liveElement;
   var announcements = [];
@@ -20,22 +19,18 @@
       }
     }
   };
-
   function announce() {
     var text = [];
     var priority = 'polite';
     var announcement;
     var il = announcements.length;
-
     for (var i = 0; i < il; i++) {
       announcement = announcements.pop();
       text.unshift(announcement.text);
-
       if (announcement.priority === 'assertive') {
         priority = 'assertive';
       }
     }
-
     if (text.length) {
       liveElement.innerHTML = '';
       liveElement.setAttribute('aria-busy', 'true');
@@ -44,7 +39,6 @@
       liveElement.setAttribute('aria-busy', 'false');
     }
   }
-
   Drupal.announce = function (text, priority) {
     announcements.push({
       text: text,
diff --git a/web/core/misc/autocomplete.js b/web/core/misc/autocomplete.js
index 3b4a4a242..30232bf8d 100644
--- a/web/core/misc/autocomplete.js
+++ b/web/core/misc/autocomplete.js
@@ -4,20 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   var autocomplete;
-
   function autocompleteSplitValues(value) {
     var result = [];
     var quote = false;
     var current = '';
     var valueLength = value.length;
     var character;
-
     for (var i = 0; i < valueLength; i++) {
       character = value.charAt(i);
-
       if (character === '"') {
         current += character;
         quote = !quote;
@@ -28,63 +24,46 @@
         current += character;
       }
     }
-
     if (value.length > 0) {
       result.push(current.trim());
     }
-
     return result;
   }
-
   function extractLastTerm(terms) {
     return autocomplete.splitValues(terms).pop();
   }
-
   function searchHandler(event) {
     var options = autocomplete.options;
-
     if (options.isComposing) {
       return false;
     }
-
     var term = autocomplete.extractLastTerm(event.target.value);
-
     if (term.length > 0 && options.firstCharacterBlacklist.indexOf(term[0]) !== -1) {
       return false;
     }
-
     return term.length >= options.minLength;
   }
-
   function sourceData(request, response) {
     var elementId = this.element.attr('id');
-
     if (!(elementId in autocomplete.cache)) {
       autocomplete.cache[elementId] = {};
     }
-
     function showSuggestions(suggestions) {
       var tagged = autocomplete.splitValues(request.term);
       var il = tagged.length;
-
       for (var i = 0; i < il; i++) {
         var index = suggestions.indexOf(tagged[i]);
-
         if (index >= 0) {
           suggestions.splice(index, 1);
         }
       }
-
       response(suggestions);
     }
-
     var term = autocomplete.extractLastTerm(request.term);
-
     function sourceCallbackHandler(data) {
       autocomplete.cache[elementId][term] = data;
       showSuggestions(data);
     }
-
     if (autocomplete.cache[elementId].hasOwnProperty(term)) {
       showSuggestions(autocomplete.cache[elementId][term]);
     } else {
@@ -97,11 +76,9 @@
       $.ajax(this.element.attr('data-autocomplete-path'), options);
     }
   }
-
   function focusHandler() {
     return false;
   }
-
   function selectHandler(event, ui) {
     var terms = autocomplete.splitValues(event.target.value);
     terms.pop();
@@ -109,15 +86,12 @@
     event.target.value = terms.join(', ');
     return false;
   }
-
   function renderItem(ul, item) {
     return $('<li>').append($('<a>').html(item.label)).appendTo(ul);
   }
-
   Drupal.behaviors.autocomplete = {
     attach: function attach(context) {
       var $autocomplete = $(once('autocomplete', 'input.form-autocomplete', context));
-
       if ($autocomplete.length) {
         var blacklist = $autocomplete.attr('data-autocomplete-first-character-blacklist');
         $.extend(autocomplete.options, {
diff --git a/web/core/misc/batch.js b/web/core/misc/batch.js
index 2511bdbb7..3126b056f 100644
--- a/web/core/misc/batch.js
+++ b/web/core/misc/batch.js
@@ -4,26 +4,22 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.batch = {
     attach: function attach(context, settings) {
       var batch = settings.batch;
       var $progress = $(once('batch', '[data-drupal-progress]'));
       var progressBar;
-
       function updateCallback(progress, status, pb) {
         if (progress === '100') {
           pb.stopMonitoring();
           window.location = "".concat(batch.uri, "&op=finished");
         }
       }
-
       function errorCallback(pb) {
         $progress.prepend($('<p class="error"></p>').html(batch.errorMessage));
         $('#wait').hide();
       }
-
       if ($progress.length) {
         progressBar = new Drupal.ProgressBar('updateprogress', updateCallback, 'POST', errorCallback);
         progressBar.setProgress(-1, batch.initMessage);
diff --git a/web/core/misc/checkbox.js b/web/core/misc/checkbox.js
index c27ca30df..759b08806 100644
--- a/web/core/misc/checkbox.js
+++ b/web/core/misc/checkbox.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.checkbox = function () {
     return "<input type=\"checkbox\" class=\"form-checkbox\"/>";
diff --git a/web/core/misc/collapse.js b/web/core/misc/collapse.js
index 60bd05a06..571248848 100644
--- a/web/core/misc/collapse.js
+++ b/web/core/misc/collapse.js
@@ -4,20 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Modernizr, Drupal) {
   function CollapsibleDetails(node) {
     this.$node = $(node);
     this.$node.data('details', this);
     var anchor = window.location.hash && window.location.hash !== '#' ? ", ".concat(window.location.hash) : '';
-
     if (this.$node.find(".error".concat(anchor)).length) {
       this.$node.attr('open', true);
     }
-
     this.setupSummaryPolyfill();
   }
-
   $.extend(CollapsibleDetails, {
     instances: []
   });
@@ -35,16 +31,13 @@
     },
     toggle: function toggle() {
       var _this = this;
-
       var isOpen = !!this.$node.attr('open');
       var $summaryPrefix = this.$node.find('> summary span.details-summary-prefix');
-
       if (isOpen) {
         $summaryPrefix.html(Drupal.t('Show'));
       } else {
         $summaryPrefix.html(Drupal.t('Hide'));
       }
-
       setTimeout(function () {
         _this.$node.attr('open', !isOpen);
       }, 0);
@@ -55,18 +48,15 @@
       if (Modernizr.details) {
         return;
       }
-
       once('collapse', 'details', context).forEach(function (detail) {
         detail.classList.add('collapse-processed');
         CollapsibleDetails.instances.push(new CollapsibleDetails(detail));
       });
     }
   };
-
   var handleFragmentLinkClickOrHashChange = function handleFragmentLinkClickOrHashChange(e, $target) {
     $target.parents('details').not('[open]').find('> summary').trigger('click');
   };
-
   $('body').on('formFragmentLinkClickOrHashChange.details', handleFragmentLinkClickOrHashChange);
   Drupal.CollapsibleDetails = CollapsibleDetails;
 })(jQuery, Modernizr, Drupal);
\ No newline at end of file
diff --git a/web/core/misc/cspell/dictionary.txt b/web/core/misc/cspell/dictionary.txt
index 0668ca83b..53501ecdb 100644
--- a/web/core/misc/cspell/dictionary.txt
+++ b/web/core/misc/cspell/dictionary.txt
@@ -56,7 +56,6 @@ atsign
 attrval
 attrvals
 authless
-authz
 autocompletefocus
 autocompleteresponses
 autocompletesearch
@@ -80,7 +79,6 @@ autoplace
 autoplay
 autoreply
 autorow
-autosave
 autosubmit
 autowire
 autowired
@@ -88,7 +86,6 @@ autowiring
 backlink
 backlinks
 backreferences
-backtraces
 bakeware
 bangpow
 barbar
@@ -116,8 +113,6 @@ behaviour
 bergmann
 berne
 bgblue
-bgcolor
-bggya
 bgred
 bigpipe
 bikeshed
@@ -179,8 +174,6 @@ callout
 camelcase
 camelid
 camelids
-camelize
-camelized
 canonicalized
 canonicalizing
 canvastext
@@ -193,7 +186,6 @@ ccyymm
 ccyymmdd
 cette
 cfield
-chainable
 chainedfast
 changelist
 checkboxified
@@ -224,7 +216,6 @@ clearfix
 cleartype
 clicksorter
 clist
-cloner
 closethick
 cnenzrgre
 cnfi
@@ -257,7 +248,6 @@ corefake
 coretest
 corge
 countquery
-cpan
 cpio
 createkey
 createrole
@@ -281,8 +271,6 @@ customly
 customrequest
 cweagans
 cádiz
-dasharray
-dashoffset
 databasefilename
 databasename
 datas
@@ -297,15 +285,12 @@ daycount
 dblog
 dbtng
 dburl
-ddev
+dealerdirect
 deckard
 deconstructor
-deduplicated
-deduplicates
 defaultable
 defgroup
 delayable
-deletable
 deletedline
 deletee
 deleter
@@ -332,7 +317,6 @@ desaturated
 desaturates
 desaturating
 descripcion
-deserialization
 destructable
 deutsch
 deutscher
@@ -409,7 +393,6 @@ editables
 editdrupalimage
 editunblock
 eerste
-egroe
 egulias
 eins
 elbonia
@@ -420,7 +403,6 @@ endapply
 endautoescape
 endcode
 endembed
-endfor
 endlink
 endmacro
 endofheader
@@ -438,7 +420,6 @@ entityviewedit
 eridani
 errmode
 errrf
-eslintignore
 espagnol
 estraven
 etag
@@ -468,8 +449,6 @@ favstar
 fcgi
 februar
 feededit
-fetchmode
-fffffg
 fichiers
 fieldable
 fieldapi
@@ -490,17 +469,14 @@ filestorage
 filesystems
 filetransfer
 filevalidationerror
-filterprovider
 filtertypes
 findwith
-firstcolumn
 fixnull
 flickr
 flipfit
 floatingspace
 foaf
 foat
-focusring
 fodg
 fodp
 fods
@@ -509,22 +485,17 @@ fontsizer
 fooalert
 foobarbaz
 foobargorilla
-foobars
 foofoo
 foos
-formatless
 formattable
 formvalidation
 fouc
 fourcol
-fourthcolumn
 fozzie
 fqcn
 fraîche
-freenode
 frombracket
 frontpage
-fsdf
 fudgy
 fulldata
 fulldate
@@ -537,18 +508,13 @@ funic
 furchtbar
 gabilondo
 gato
-getcode
-getfile
 gethttpclient
 getlist
-getmachine
 getview
 gids
-giggabyte
 gloop
 gnumeric
 goldfinger
-gonner
 googleapis
 gotit
 grandgrandchild
@@ -564,8 +530,6 @@ groupwise
 guzzlehttp
 gzipped
 hande
-hardcodes
-hardcoding
 harkonnen
 hasdata
 hasher
@@ -575,7 +539,6 @@ hbox
 heartz
 heke
 heroless
-herpderp
 herro
 heure
 heures
@@ -592,12 +555,9 @@ hookname
 horizontalrule
 hosters
 hostnames
-hreflang
-hreflangs
 hrefs
 htkey
 htmlcorrector
-htmlto
 httpheader
 httpkernel
 httponly
@@ -610,7 +570,6 @@ iconwrap
 idconflict
 idekey
 idempotency
-idempotently
 iframes
 iframeupload
 ignoretag
@@ -619,14 +578,12 @@ imagecreatefrom
 imagefields
 imagetest
 imagetextalternative
-inator
 indexname
 ingoa
 inited
 inno
 inputtypes
 insidekeyword
-inspectable
 instaclick
 instantiator
 interactable
@@ -636,7 +593,6 @@ invalididentifier
 invokable
 iopt
 isam
-isdst
 isinstallable
 itoa
 itok
@@ -662,7 +618,6 @@ jsonlint
 jssdk
 jumplinks
 juni
-junidecode
 justifyblock
 justifycenter
 justifyleft
@@ -701,15 +656,12 @@ lcode
 leftjoin
 libc
 libellé
-libicu
 libmysqlclient
-libyaml
 licious
 lified
 lightninggreen
 linebreak
 linebreaks
-linecap
 linefeeds
 linkability
 linkback
@@ -732,12 +684,12 @@ lolspeak
 longblob
 longerthan
 longtext
+longwave
 loquesea
 loreming
 loremingipsum
 loremipsum
 loremipsumloremipsum
-lowercased
 lowlevel
 lowline
 lrdd
@@ -755,7 +707,6 @@ mainpage
 makealternatemessage
 makedefaultmessage
 makewarningmessage
-makz
 mame
 mank
 maryjane
@@ -768,7 +719,6 @@ maxage
 maxdepth
 maximumred
 maxlifetime
-maxsize
 maynot
 mbytes
 mdhash
@@ -778,7 +728,6 @@ mediaimagetextalternativeui
 mediumint
 mediumtext
 membersonly
-menulist
 merhaba
 messagekey
 metainformation
@@ -789,7 +738,6 @@ metatags
 meφω
 miaus
 middlewares
-midgardmvc
 mikey
 milli
 mimetypes
@@ -801,7 +749,6 @@ minky
 minusthick
 missingkey
 missingkeys
-miterlimit
 mjuc
 mlfr
 mlid
@@ -828,7 +775,6 @@ msgctxt
 msgid
 msgstr
 msword
-mtimes
 mucho
 mulrev
 mulrevpub
@@ -874,7 +820,6 @@ negotiatiors
 nemo
 networkerror
 newcol
-newdata
 newfieldinitial
 newnode
 newstr
@@ -907,7 +852,6 @@ nonamespace
 nonconfigurable
 nonexistingfilename
 nonoptional
-nonspacing
 noquotes
 noschema
 nosniff
@@ -919,6 +863,7 @@ notnull
 notsimpletest
 nourriture
 nplurals
+nproc
 ntfs
 nyan
 nyancat
@@ -945,9 +890,7 @@ optionchecker
 orgchart
 ossp
 otsikko
-outdata
 outdent
-outdir
 outro
 overridable
 overrider
@@ -962,7 +905,6 @@ pagecache
 pagetop
 pageviews
 pagina
-pangram
 paramconverter
 parens
 parentlist
@@ -981,11 +923,13 @@ permissionless
 persistable
 phpass
 phpcbf
+phpcodesniffer
 phpcs
 phpdocumentor
 phpfile
 phpserialize
 phpspec
+phpstan
 phpunit
 phpunit's
 pianura
@@ -1022,26 +966,15 @@ poweredby
 powriter
 prebar
 precache
-precompiled
 preconfigure
 preconfigured
-preconnect
 precreated
 predelete
-prefetches
-prefill
-prefilled
-prefilling
-prefills
 prefixsqlite
 prefoo
 preinstall
-preload
 preloadable
-preloads
 preorder
-prepended
-prepending
 prepopulate
 prepopulated
 prepopulates
@@ -1093,7 +1026,6 @@ qzzz
 ragdoll
 ralouphie
 rasterizable
-rasterize
 rasterized
 rasterizes
 rawurlencoded
@@ -1101,7 +1033,6 @@ rdfa
 rdfs
 readmore
 readonlydir
-readystate
 realelement
 realise
 realpaths
@@ -1121,7 +1052,6 @@ referencers
 referer
 refinable
 regexes
-reimplement
 reindex
 reindexing
 reinject
@@ -1136,7 +1066,6 @@ replyto
 resave
 resaved
 resaving
-resizer
 restplugin
 restrictor
 restripe
@@ -1183,9 +1112,7 @@ screenreaders
 scriptable
 scrollbars
 searchdirs
-searchfield
 sebe
-secondcolumn
 seld
 selectbox
 serviceform
@@ -1216,6 +1143,7 @@ skynet
 slashentry
 slashrendererentry
 slatkin
+slevomat
 sloopal
 smacss
 smalldatetime
@@ -1249,10 +1177,10 @@ ssid
 stardivision
 starrrrr
 starterkit
+starterkit's
 starzzzz
 statuscode
 stdclass
-stdlib
 stitle
 streamwrapper
 streamwrappers
@@ -1292,7 +1220,6 @@ subrequests
 subresults
 subselect
 subsequentially
-subseven
 subshell
 substrategies
 subsubtheme
@@ -1314,12 +1241,10 @@ svgz
 svibanj
 swcf
 sxto
-symlinking
 synchronizable
 syrop
 szwr
 tabarnak
-tabbable
 tabbingmanager
 tabledrag
 tableheader
@@ -1390,13 +1315,11 @@ testwithtrailingslash
 textareas
 textboxes
 texte
-textfield
 textfields
 textfile
 textformat
 textgroup
 textwithsummary
-thaana
 themeable
 themename
 themer
@@ -1404,7 +1327,6 @@ themers
 themey
 theseer
 theseparator
-thirdcolumn
 threadentry
 threadingrendererentry
 threecol
@@ -1436,8 +1358,6 @@ toplevel
 topop
 torder
 totalcount
-totranslate
-touchevent
 touchevents
 tparams
 trackback
@@ -1451,7 +1371,6 @@ trid
 troopal
 truecolor
 tsid
-tspan
 turbolinks
 tuvan
 twistie
@@ -1481,7 +1400,6 @@ unbundleable
 unbustable
 uncacheable
 uncategorized
-unchecking
 unclickable
 uncollapsible
 unconfigured
@@ -1498,8 +1416,6 @@ ungroup
 ungroupable
 unhashed
 unhide
-unidecode
-unidecoder
 unindented
 unindexed
 uninstallation
@@ -1561,7 +1477,6 @@ uploaders
 uploadprogress
 uppercased
 upscaling
-upsert
 urandom
 urlalias
 urldecoding
@@ -1572,36 +1487,27 @@ userref
 userreference
 userspace
 usuario
-vals
 vampirize
 varchar
-veeeery
 veniam
-verison
 versionable
 versionless
 veryfast
 verygreatdrupalmodule
 vfsstream
-vibber
-vids
 viewmode
 viewports
-viewsviewfiles
 vmov
 vocabs
 volgende
 vorige
 vous
-vxezb
-vxfbk
 waitfor
+wcag
 wcprops
 webassert
 webcal
-webdriver
 webflo
-webfonts
 webheads
 webhosting
 webmention
@@ -1617,7 +1523,6 @@ whitespaces
 whos
 widthx
 wimoids
-windir
 wmet
 wmlscript
 wordprocessingml
@@ -1635,7 +1540,6 @@ xbap
 xbeg
 xbitmap
 xfbml
-xgbql
 xjkm
 xlen
 xlgp
diff --git a/web/core/misc/date.js b/web/core/misc/date.js
index d30fb1dbb..1fe33fe8c 100644
--- a/web/core/misc/date.js
+++ b/web/core/misc/date.js
@@ -4,13 +4,12 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 (function (Modernizr, Drupal, once) {
   Drupal.behaviors.date = {
     attach: function attach(context, settings) {
@@ -43,22 +42,18 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       }
     }
   };
-
   Drupal.DatepickerPolyfill = function () {
     function _class() {
       _classCallCheck(this, _class);
     }
-
     _createClass(_class, null, [{
       key: "attachDescription",
       value: function attachDescription(element, help, id) {
         var description = element.nextElementSibling;
-
         if (!(description && description.getAttribute('data-drupal-field-elements') === 'description')) {
           description = Drupal.DatepickerPolyfill.descriptionWrapperElement(id);
           element.parentNode.insertBefore(description, element.nextSibling);
         }
-
         description.insertAdjacentHTML('beforeend', help);
       }
     }, {
@@ -67,28 +62,23 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
         var description = document.createElement('div');
         description.classList.add('description');
         description.setAttribute('data-drupal-field-elements', 'description');
-
         if (id) {
           description.setAttribute('id', id);
         }
-
         return description;
       }
     }]);
-
     return _class;
   }();
-
   Drupal.theme.dateHelp = function (_ref) {
     var dateDesc = _ref.dateDesc;
     return "<div class=\"no-native-datepicker-help\">".concat(dateDesc, "</div>");
   };
-
   Drupal.theme.dateTimeHelp = function (_ref2) {
     var dateId = _ref2.dateId,
-        timeId = _ref2.timeId,
-        dateDesc = _ref2.dateDesc,
-        timeDesc = _ref2.timeDesc;
+      timeId = _ref2.timeId,
+      dateDesc = _ref2.dateDesc,
+      timeDesc = _ref2.timeDesc;
     return "<div class=\"no-native-datepicker-help\">\n       <span id=\"".concat(dateId, "\">").concat(dateDesc, "</span> <span id=\"").concat(timeId, "\">").concat(timeDesc, "</span>\n     </div>");
   };
 })(Modernizr, Drupal, once);
\ No newline at end of file
diff --git a/web/core/misc/debounce.js b/web/core/misc/debounce.js
index e33575670..919adf1a8 100644
--- a/web/core/misc/debounce.js
+++ b/web/core/misc/debounce.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 Drupal.debounce = function (func, wait, immediate) {
   var timeout;
   var result;
@@ -12,25 +11,19 @@ Drupal.debounce = function (func, wait, immediate) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     var context = this;
-
     var later = function later() {
       timeout = null;
-
       if (!immediate) {
         result = func.apply(context, args);
       }
     };
-
     var callNow = immediate && !timeout;
     clearTimeout(timeout);
     timeout = setTimeout(later, wait);
-
     if (callNow) {
       result = func.apply(context, args);
     }
-
     return result;
   };
 };
\ No newline at end of file
diff --git a/web/core/misc/details-aria.js b/web/core/misc/details-aria.js
index d80f3dcb6..7f314065a 100644
--- a/web/core/misc/details-aria.js
+++ b/web/core/misc/details-aria.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.detailsAria = {
     attach: function attach() {
diff --git a/web/core/misc/details-summarized-content.js b/web/core/misc/details-summarized-content.js
index d1b2d8d69..a9f243a01 100644
--- a/web/core/misc/details-summarized-content.js
+++ b/web/core/misc/details-summarized-content.js
@@ -4,13 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   function DetailsSummarizedContent(node) {
     this.$node = $(node);
     this.setupSummary();
   }
-
   $.extend(DetailsSummarizedContent, {
     instances: []
   });
@@ -32,11 +30,9 @@
     }
   };
   Drupal.DetailsSummarizedContent = DetailsSummarizedContent;
-
   Drupal.theme.detailsSummarizedContentWrapper = function () {
     return "<span class=\"summary\"></span>";
   };
-
   Drupal.theme.detailsSummarizedContentText = function (text) {
     return text ? " (".concat(text, ")") : '';
   };
diff --git a/web/core/misc/dialog/dialog.ajax.js b/web/core/misc/dialog/dialog.ajax.js
index c470491ab..39438be11 100644
--- a/web/core/misc/dialog/dialog.ajax.js
+++ b/web/core/misc/dialog/dialog.ajax.js
@@ -4,33 +4,25 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.dialog = {
     attach: function attach(context, settings) {
       var $context = $(context);
-
       if (!$('#drupal-modal').length) {
         $('<div id="drupal-modal" class="ui-front"></div>').hide().appendTo('body');
       }
-
       var $dialog = $context.closest('.ui-dialog-content');
-
       if ($dialog.length) {
         if ($dialog.dialog('option', 'drupalAutoButtons')) {
           $dialog.trigger('dialogButtonsChange');
         }
-
         $dialog.dialog('widget').trigger('focus');
       }
-
       var originalClose = settings.dialog.close;
-
       settings.dialog.close = function (event) {
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }
-
         originalClose.apply(settings.dialog, [event].concat(args));
         $(event.target).remove();
       };
@@ -58,69 +50,53 @@
       return buttons;
     }
   };
-
   Drupal.AjaxCommands.prototype.openDialog = function (ajax, response, status) {
     if (!response.selector) {
       return false;
     }
-
     var $dialog = $(response.selector);
-
     if (!$dialog.length) {
       $dialog = $("<div id=\"".concat(response.selector.replace(/^#/, ''), "\" class=\"ui-front\"></div>")).appendTo('body');
     }
-
     if (!ajax.wrapper) {
       ajax.wrapper = $dialog.attr('id');
     }
-
     response.command = 'insert';
     response.method = 'html';
     ajax.commands.insert(ajax, response, status);
-
     if (!response.dialogOptions.buttons) {
       response.dialogOptions.drupalAutoButtons = true;
       response.dialogOptions.buttons = Drupal.behaviors.dialog.prepareDialogButtons($dialog);
     }
-
     $dialog.on('dialogButtonsChange', function () {
       var buttons = Drupal.behaviors.dialog.prepareDialogButtons($dialog);
       $dialog.dialog('option', 'buttons', buttons);
     });
     response.dialogOptions = response.dialogOptions || {};
     var dialog = Drupal.dialog($dialog.get(0), response.dialogOptions);
-
     if (response.dialogOptions.modal) {
       dialog.showModal();
     } else {
       dialog.show();
     }
-
     $dialog.parent().find('.ui-dialog-buttonset').addClass('form-actions');
   };
-
   Drupal.AjaxCommands.prototype.closeDialog = function (ajax, response, status) {
     var $dialog = $(response.selector);
-
     if ($dialog.length) {
       Drupal.dialog($dialog.get(0)).close();
-
       if (!response.persist) {
         $dialog.remove();
       }
     }
-
     $dialog.off('dialogButtonsChange');
   };
-
   Drupal.AjaxCommands.prototype.setDialogOption = function (ajax, response, status) {
     var $dialog = $(response.selector);
-
     if ($dialog.length) {
       $dialog.dialog('option', response.optionName, response.optionValue);
     }
   };
-
   $(window).on('dialog:aftercreate', function (e, dialog, $element, settings) {
     $element.on('click.dialog', '.dialog-cancel', function (e) {
       dialog.close('cancel');
diff --git a/web/core/misc/dialog/dialog.jquery-ui.js b/web/core/misc/dialog/dialog.jquery-ui.js
index 86f9455d9..e05c8f079 100644
--- a/web/core/misc/dialog/dialog.jquery-ui.js
+++ b/web/core/misc/dialog/dialog.jquery-ui.js
@@ -4,10 +4,9 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _ref) {
   var tabbable = _ref.tabbable,
-      isTabbable = _ref.isTabbable;
+    isTabbable = _ref.isTabbable;
   $.widget('ui.dialog', $.ui.dialog, {
     options: {
       buttonClass: 'button',
@@ -18,7 +17,6 @@
       var primaryIndex;
       var index;
       var il = opts.buttons.length;
-
       for (index = 0; index < il; index++) {
         if (opts.buttons[index].primary && opts.buttons[index].primary === true) {
           primaryIndex = index;
@@ -26,48 +24,37 @@
           break;
         }
       }
-
       this._super();
-
       var $buttons = this.uiButtonSet.children().addClass(opts.buttonClass);
-
       if (typeof primaryIndex !== 'undefined') {
         $buttons.eq(index).addClass(opts.buttonPrimaryClass);
       }
     },
     _focusTabbable: function _focusTabbable() {
       var hasFocus = this._focusedElement ? this._focusedElement.get(0) : null;
-
       if (!hasFocus) {
         hasFocus = this.element.find('[autofocus]').get(0);
       }
-
       if (!hasFocus) {
         var $elements = [this.element, this.uiDialogButtonPane];
-
         for (var i = 0; i < $elements.length; i++) {
           var element = $elements[i].get(0);
-
           if (element) {
             var elementTabbable = tabbable(element);
             hasFocus = elementTabbable.length ? elementTabbable[0] : null;
           }
-
           if (hasFocus) {
             break;
           }
         }
       }
-
       if (!hasFocus) {
         var closeBtn = this.uiDialogTitlebarClose.get(0);
         hasFocus = closeBtn && isTabbable(closeBtn) ? closeBtn : null;
       }
-
       if (!hasFocus) {
         hasFocus = this.uiDialog.get(0);
       }
-
       $(hasFocus).eq(0).trigger('focus');
     }
   });
diff --git a/web/core/misc/dialog/dialog.js b/web/core/misc/dialog/dialog.js
index 979fdeff6..5760e40ed 100644
--- a/web/core/misc/dialog/dialog.js
+++ b/web/core/misc/dialog/dialog.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   drupalSettings.dialog = {
     autoOpen: true,
@@ -16,7 +15,6 @@
       Drupal.detachBehaviors(event.target, null, 'unload');
     }
   };
-
   Drupal.dialog = function (element, options) {
     var undef;
     var $element = $(element);
@@ -24,7 +22,6 @@
       open: false,
       returnValue: undef
     };
-
     function openDialog(settings) {
       settings = $.extend({}, drupalSettings.dialog, options, settings);
       $(window).trigger('dialog:beforecreate', [dialog, $element, settings]);
@@ -32,7 +29,6 @@
       dialog.open = true;
       $(window).trigger('dialog:aftercreate', [dialog, $element, settings]);
     }
-
     function closeDialog(value) {
       $(window).trigger('dialog:beforeclose', [dialog, $element]);
       $element.dialog('close');
@@ -40,19 +36,16 @@
       dialog.open = false;
       $(window).trigger('dialog:afterclose', [dialog, $element]);
     }
-
     dialog.show = function () {
       openDialog({
         modal: false
       });
     };
-
     dialog.showModal = function () {
       openDialog({
         modal: true
       });
     };
-
     dialog.close = closeDialog;
     return dialog;
   };
diff --git a/web/core/misc/dialog/dialog.position.js b/web/core/misc/dialog/dialog.position.js
index 552e1c596..53345cda8 100644
--- a/web/core/misc/dialog/dialog.position.js
+++ b/web/core/misc/dialog/dialog.position.js
@@ -4,13 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, debounce, displace) {
   drupalSettings.dialog = $.extend({
     autoResize: true,
     maxHeight: '95%'
   }, drupalSettings.dialog);
-
   function resetPosition(options) {
     var offsets = displace.offsets;
     var left = offsets.left - offsets.right;
@@ -23,7 +21,6 @@
     };
     return options;
   }
-
   function resetSize(event) {
     var positionOptions = ['width', 'height', 'minWidth', 'minHeight', 'maxHeight', 'maxWidth', 'position'];
     var adjustedOptions = {};
@@ -31,32 +28,25 @@
     var option;
     var optionValue;
     var adjustedValue;
-
     for (var n = 0; n < positionOptions.length; n++) {
       option = positionOptions[n];
       optionValue = event.data.settings[option];
-
       if (optionValue) {
         if (typeof optionValue === 'string' && /%$/.test(optionValue) && /height/i.test(option)) {
           windowHeight -= displace.offsets.top + displace.offsets.bottom;
           adjustedValue = parseInt(0.01 * parseInt(optionValue, 10) * windowHeight, 10);
-
           if (option === 'height' && event.data.$element.parent().outerHeight() < adjustedValue) {
             adjustedValue = 'auto';
           }
-
           adjustedOptions[option] = adjustedValue;
         }
       }
     }
-
     if (!event.data.settings.modal) {
       adjustedOptions = resetPosition(adjustedOptions);
     }
-
     event.data.$element.dialog('option', adjustedOptions).trigger('dialogContentResize');
   }
-
   $(window).on({
     'dialog:aftercreate': function dialogAftercreate(event, dialog, $element, settings) {
       var autoResize = debounce(resetSize, 20);
@@ -64,7 +54,6 @@
         settings: settings,
         $element: $element
       };
-
       if (settings.autoResize === true || settings.autoResize === 'true') {
         $element.dialog('option', {
           resizable: false,
diff --git a/web/core/misc/dialog/off-canvas.base.css b/web/core/misc/dialog/off-canvas.base.css
index bb87933a5..29f9312f9 100644
--- a/web/core/misc/dialog/off-canvas.base.css
+++ b/web/core/misc/dialog/off-canvas.base.css
@@ -25,94 +25,94 @@
  */
 
 #drupal-off-canvas span,
-  #drupal-off-canvas applet,
-  #drupal-off-canvas object,
-  #drupal-off-canvas iframe,
-  #drupal-off-canvas h1,
-  #drupal-off-canvas h2,
-  #drupal-off-canvas h3,
-  #drupal-off-canvas h4,
-  #drupal-off-canvas h5,
-  #drupal-off-canvas h6,
-  #drupal-off-canvas p,
-  #drupal-off-canvas blockquote,
-  #drupal-off-canvas pre,
-  #drupal-off-canvas a,
-  #drupal-off-canvas abbr,
-  #drupal-off-canvas acronym,
-  #drupal-off-canvas address,
-  #drupal-off-canvas big,
-  #drupal-off-canvas button,
-  #drupal-off-canvas cite,
-  #drupal-off-canvas code,
-  #drupal-off-canvas del,
-  #drupal-off-canvas dfn,
-  #drupal-off-canvas em,
-  #drupal-off-canvas img,
-  #drupal-off-canvas ins,
-  #drupal-off-canvas kbd,
-  #drupal-off-canvas q,
-  #drupal-off-canvas s,
-  #drupal-off-canvas samp,
-  #drupal-off-canvas small,
-  #drupal-off-canvas strike,
-  #drupal-off-canvas strong,
-  #drupal-off-canvas sub,
-  #drupal-off-canvas sup,
-  #drupal-off-canvas tt,
-  #drupal-off-canvas var,
-  #drupal-off-canvas b,
-  #drupal-off-canvas u,
-  #drupal-off-canvas i,
-  #drupal-off-canvas center,
-  #drupal-off-canvas dl,
-  #drupal-off-canvas dt,
-  #drupal-off-canvas dd,
-  #drupal-off-canvas ol,
-  #drupal-off-canvas ul,
-  #drupal-off-canvas li,
-  #drupal-off-canvas fieldset,
-  #drupal-off-canvas form,
-  #drupal-off-canvas label,
-  #drupal-off-canvas legend,
-  #drupal-off-canvas table,
-  #drupal-off-canvas caption,
-  #drupal-off-canvas tbody,
-  #drupal-off-canvas tfoot,
-  #drupal-off-canvas thead,
-  #drupal-off-canvas tr,
-  #drupal-off-canvas th,
-  #drupal-off-canvas td,
-  #drupal-off-canvas article,
-  #drupal-off-canvas aside,
-  #drupal-off-canvas canvas,
-  #drupal-off-canvas details,
-  #drupal-off-canvas embed,
-  #drupal-off-canvas figure,
-  #drupal-off-canvas figcaption,
-  #drupal-off-canvas footer,
-  #drupal-off-canvas header,
-  #drupal-off-canvas hgroup,
-  #drupal-off-canvas main,
-  #drupal-off-canvas menu,
-  #drupal-off-canvas meter,
-  #drupal-off-canvas nav,
-  #drupal-off-canvas output,
-  #drupal-off-canvas progress,
-  #drupal-off-canvas ruby,
-  #drupal-off-canvas section,
-  #drupal-off-canvas summary,
-  #drupal-off-canvas time,
-  #drupal-off-canvas mark,
-  #drupal-off-canvas audio,
-  #drupal-off-canvas video,
-  #drupal-off-canvas input,
-  #drupal-off-canvas select,
-  #drupal-off-canvas textarea {
-    color: inherit;
-    background: inherit;
-    font-family: "Lucida Grande", "Lucida Sans Unicode", "liberation sans", sans-serif;
-  }
+#drupal-off-canvas applet,
+#drupal-off-canvas object,
+#drupal-off-canvas iframe,
+#drupal-off-canvas h1,
+#drupal-off-canvas h2,
+#drupal-off-canvas h3,
+#drupal-off-canvas h4,
+#drupal-off-canvas h5,
+#drupal-off-canvas h6,
+#drupal-off-canvas p,
+#drupal-off-canvas blockquote,
+#drupal-off-canvas pre,
+#drupal-off-canvas a,
+#drupal-off-canvas abbr,
+#drupal-off-canvas acronym,
+#drupal-off-canvas address,
+#drupal-off-canvas big,
+#drupal-off-canvas button,
+#drupal-off-canvas cite,
+#drupal-off-canvas code,
+#drupal-off-canvas del,
+#drupal-off-canvas dfn,
+#drupal-off-canvas em,
+#drupal-off-canvas img,
+#drupal-off-canvas ins,
+#drupal-off-canvas kbd,
+#drupal-off-canvas q,
+#drupal-off-canvas s,
+#drupal-off-canvas samp,
+#drupal-off-canvas small,
+#drupal-off-canvas strike,
+#drupal-off-canvas strong,
+#drupal-off-canvas sub,
+#drupal-off-canvas sup,
+#drupal-off-canvas tt,
+#drupal-off-canvas var,
+#drupal-off-canvas b,
+#drupal-off-canvas u,
+#drupal-off-canvas i,
+#drupal-off-canvas center,
+#drupal-off-canvas dl,
+#drupal-off-canvas dt,
+#drupal-off-canvas dd,
+#drupal-off-canvas ol,
+#drupal-off-canvas ul,
+#drupal-off-canvas li,
+#drupal-off-canvas fieldset,
+#drupal-off-canvas form,
+#drupal-off-canvas label,
+#drupal-off-canvas legend,
+#drupal-off-canvas table,
+#drupal-off-canvas caption,
+#drupal-off-canvas tbody,
+#drupal-off-canvas tfoot,
+#drupal-off-canvas thead,
+#drupal-off-canvas tr,
+#drupal-off-canvas th,
+#drupal-off-canvas td,
+#drupal-off-canvas article,
+#drupal-off-canvas aside,
+#drupal-off-canvas canvas,
+#drupal-off-canvas details,
+#drupal-off-canvas embed,
+#drupal-off-canvas figure,
+#drupal-off-canvas figcaption,
+#drupal-off-canvas footer,
+#drupal-off-canvas header,
+#drupal-off-canvas hgroup,
+#drupal-off-canvas main,
+#drupal-off-canvas menu,
+#drupal-off-canvas meter,
+#drupal-off-canvas nav,
+#drupal-off-canvas output,
+#drupal-off-canvas progress,
+#drupal-off-canvas ruby,
+#drupal-off-canvas section,
+#drupal-off-canvas summary,
+#drupal-off-canvas time,
+#drupal-off-canvas mark,
+#drupal-off-canvas audio,
+#drupal-off-canvas video,
+#drupal-off-canvas input,
+#drupal-off-canvas select,
+#drupal-off-canvas textarea {
+  color: inherit;
+  background: inherit;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "liberation sans", sans-serif;
+}
 
 /* Generic elements. */
 
@@ -274,13 +274,14 @@
 #drupal-off-canvas ol li {
   display: block;
   padding: 0.3125rem 0;
-  border-bottom: 1px solid #333
+  border-bottom: 1px solid #333;
 }
 
-#drupal-off-canvas ul li:last-child, #drupal-off-canvas ol li:last-child {
-    padding-bottom: 0;
-    border-bottom: none;
-  }
+#drupal-off-canvas ul li:last-child,
+#drupal-off-canvas ol li:last-child {
+  padding-bottom: 0;
+  border-bottom: none;
+}
 
 #drupal-off-canvas blockquote,
 #drupal-off-canvas code {
@@ -312,6 +313,9 @@
 
 #drupal-off-canvas .visually-hidden {
   position: absolute !important;
+}
+
+#drupal-off-canvas .visually-hidden {
   overflow: hidden;
   clip: rect(1px, 1px, 1px, 1px);
   width: 1px;
@@ -322,6 +326,10 @@
 #drupal-off-canvas .visually-hidden.focusable:active,
 #drupal-off-canvas .visually-hidden.focusable:focus {
   position: static !important;
+}
+
+#drupal-off-canvas .visually-hidden.focusable:active,
+#drupal-off-canvas .visually-hidden.focusable:focus {
   overflow: visible;
   clip: auto;
   width: auto;
diff --git a/web/core/misc/dialog/off-canvas.es6.js b/web/core/misc/dialog/off-canvas.es6.js
index 86986c510..b8223e4fc 100644
--- a/web/core/misc/dialog/off-canvas.es6.js
+++ b/web/core/misc/dialog/off-canvas.es6.js
@@ -143,7 +143,7 @@
         .on(
           'resize.off-canvas',
           eventData,
-          debounce(Drupal.offCanvas.resetSize, 100),
+          debounce(Drupal.offCanvas.resetSize, 100, true),
         )
         .trigger('resize.off-canvas');
     },
diff --git a/web/core/misc/dialog/off-canvas.js b/web/core/misc/dialog/off-canvas.js
index 96369f40d..db833af79 100644
--- a/web/core/misc/dialog/off-canvas.js
+++ b/web/core/misc/dialog/off-canvas.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, debounce, displace) {
   Drupal.offCanvas = {
     position: null,
@@ -21,7 +20,7 @@
     },
     beforeCreate: function beforeCreate(_ref) {
       var settings = _ref.settings,
-          $element = _ref.$element;
+        $element = _ref.$element;
       Drupal.offCanvas.removeOffCanvasEvents($element);
       $('body').addClass('js-off-canvas-dialog-open');
       settings.position = {
@@ -43,7 +42,7 @@
     },
     afterCreate: function afterCreate(_ref3) {
       var $element = _ref3.$element,
-          settings = _ref3.settings;
+        settings = _ref3.settings;
       var eventData = {
         settings: settings,
         $element: $element,
@@ -51,7 +50,7 @@
       };
       $element.on('dialogContentResize.off-canvas', eventData, Drupal.offCanvas.handleDialogResize).on('dialogContentResize.off-canvas', eventData, Drupal.offCanvas.bodyPadding);
       Drupal.offCanvas.getContainer($element).attr("data-offset-".concat(Drupal.offCanvas.getEdge()), '');
-      $(window).on('resize.off-canvas', eventData, debounce(Drupal.offCanvas.resetSize, 100)).trigger('resize.off-canvas');
+      $(window).on('resize.off-canvas', eventData, debounce(Drupal.offCanvas.resetSize, 100, true)).trigger('resize.off-canvas');
     },
     render: function render(_ref4) {
       var settings = _ref4.settings;
@@ -76,15 +75,12 @@
       var $element = event.data.$element;
       var container = Drupal.offCanvas.getContainer($element);
       var position = event.data.settings.drupalOffCanvasPosition;
-
       if (Drupal.offCanvas.position && Drupal.offCanvas.position !== position) {
         container.removeAttr("data-offset-".concat(Drupal.offCanvas.position));
       }
-
       if (position === 'top') {
         $element.css('min-height', "".concat(Drupal.offCanvas.minimumHeight, "px"));
       }
-
       displace();
       var offsets = displace.offsets;
       var topPosition = position === 'side' && offsets.top !== 0 ? "+".concat(offsets.top) : '';
@@ -105,26 +101,21 @@
     },
     bodyPadding: function bodyPadding(event) {
       var position = event.data.settings.drupalOffCanvasPosition;
-
       if (position === 'side' && $('body').outerWidth() < Drupal.offCanvas.minDisplaceWidth) {
         return;
       }
-
       Drupal.offCanvas.resetPadding();
       var $element = event.data.$element;
       var $container = Drupal.offCanvas.getContainer($element);
       var $mainCanvasWrapper = Drupal.offCanvas.$mainCanvasWrapper;
       var width = $container.outerWidth();
       var mainCanvasPadding = $mainCanvasWrapper.css("padding-".concat(Drupal.offCanvas.getEdge()));
-
       if (position === 'side' && width !== mainCanvasPadding) {
         $mainCanvasWrapper.css("padding-".concat(Drupal.offCanvas.getEdge()), "".concat(width, "px"));
         $container.attr("data-offset-".concat(Drupal.offCanvas.getEdge()), width);
         displace();
       }
-
       var height = $container.outerHeight();
-
       if (position === 'top') {
         $mainCanvasWrapper.css('padding-top', "".concat(height, "px"));
         $container.attr('data-offset-top', height);
@@ -148,7 +139,6 @@
       if (!once('off-canvas', 'html').length) {
         return;
       }
-
       $(window).on({
         'dialog:beforecreate': function dialogBeforecreate(event, dialog, $element, settings) {
           if (Drupal.offCanvas.isOffCanvas($element)) {
diff --git a/web/core/misc/dialog/off-canvas.reset.css b/web/core/misc/dialog/off-canvas.reset.css
index c92a48700..d9d6e1476 100644
--- a/web/core/misc/dialog/off-canvas.reset.css
+++ b/web/core/misc/dialog/off-canvas.reset.css
@@ -20,445 +20,441 @@
  */
 
 #drupal-off-canvas span,
-  #drupal-off-canvas applet,
-  #drupal-off-canvas object,
-  #drupal-off-canvas iframe,
-  #drupal-off-canvas h1,
-  #drupal-off-canvas h2,
-  #drupal-off-canvas h3,
-  #drupal-off-canvas h4,
-  #drupal-off-canvas h5,
-  #drupal-off-canvas h6,
-  #drupal-off-canvas p,
-  #drupal-off-canvas blockquote,
-  #drupal-off-canvas pre,
-  #drupal-off-canvas a,
-  #drupal-off-canvas abbr,
-  #drupal-off-canvas acronym,
-  #drupal-off-canvas address,
-  #drupal-off-canvas big,
-  #drupal-off-canvas button,
-  #drupal-off-canvas cite,
-  #drupal-off-canvas code,
-  #drupal-off-canvas del,
-  #drupal-off-canvas dfn,
-  #drupal-off-canvas em,
-  #drupal-off-canvas img,
-  #drupal-off-canvas ins,
-  #drupal-off-canvas kbd,
-  #drupal-off-canvas q,
-  #drupal-off-canvas s,
-  #drupal-off-canvas samp,
-  #drupal-off-canvas small,
-  #drupal-off-canvas strike,
-  #drupal-off-canvas strong,
-  #drupal-off-canvas sub,
-  #drupal-off-canvas sup,
-  #drupal-off-canvas tt,
-  #drupal-off-canvas var,
-  #drupal-off-canvas b,
-  #drupal-off-canvas u,
-  #drupal-off-canvas i,
-  #drupal-off-canvas center,
-  #drupal-off-canvas dl,
-  #drupal-off-canvas dt,
-  #drupal-off-canvas dd,
-  #drupal-off-canvas ol,
-  #drupal-off-canvas ul,
-  #drupal-off-canvas li,
-  #drupal-off-canvas fieldset,
-  #drupal-off-canvas form,
-  #drupal-off-canvas label,
-  #drupal-off-canvas legend,
-  #drupal-off-canvas table,
-  #drupal-off-canvas caption,
-  #drupal-off-canvas tbody,
-  #drupal-off-canvas tfoot,
-  #drupal-off-canvas thead,
-  #drupal-off-canvas tr,
-  #drupal-off-canvas th,
-  #drupal-off-canvas td,
-  #drupal-off-canvas article,
-  #drupal-off-canvas aside,
-  #drupal-off-canvas canvas,
-  #drupal-off-canvas details,
-  #drupal-off-canvas embed,
-  #drupal-off-canvas figure,
-  #drupal-off-canvas figcaption,
-  #drupal-off-canvas footer,
-  #drupal-off-canvas header,
-  #drupal-off-canvas hgroup,
-  #drupal-off-canvas main,
-  #drupal-off-canvas menu,
-  #drupal-off-canvas meter,
-  #drupal-off-canvas nav,
-  #drupal-off-canvas output,
-  #drupal-off-canvas progress,
-  #drupal-off-canvas ruby,
-  #drupal-off-canvas section,
-  #drupal-off-canvas summary,
-  #drupal-off-canvas time,
-  #drupal-off-canvas mark,
-  #drupal-off-canvas audio,
-  #drupal-off-canvas video,
-  #drupal-off-canvas input,
-  #drupal-off-canvas select,
-  #drupal-off-canvas textarea {
-    animation: none 0s ease 0s 1 normal none running;
-    -webkit-backface-visibility: visible;
-    backface-visibility: visible;
-    background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
-    border: medium none currentColor;
-    border-collapse: separate;
-    border-image: none;
-    border-radius: 0;
-    border-spacing: 0;
-    bottom: auto;
-    box-shadow: none;
-    box-sizing: content-box;
-    caption-side: top;
-    clear: none;
-    clip: auto;
-    color: #000;
-    columns: auto;
-    column-count: auto;
-    column-fill: balance;
-    grid-column-gap: normal;
-    column-rule: medium none currentColor;
-    column-span: 1;
-    column-width: auto;
-    content: normal;
-    counter-increment: none;
-    counter-reset: none;
-    cursor: auto;
-    direction: ltr;
-    display: inline;
-    empty-cells: show;
-    float: none;
-    font-family: serif;
-    font-size: medium;
-    font-style: normal;
-    font-feature-settings: normal;
-    font-variant: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: normal;
-    height: auto;
-    -webkit-hyphens: none;
-    -ms-hyphens: none;
-    hyphens: none;
-    left: auto;
-    letter-spacing: normal;
-    list-style: disc outside none;
-    margin: 0;
-    max-height: none;
-    max-width: none;
-    min-height: 0;
-    min-width: 0;
-    opacity: 1;
-    orphans: 2;
-    outline: medium none invert;
-    overflow: visible;
-    overflow-x: visible;
-    overflow-y: visible;
-    padding: 0;
-    page-break-after: auto;
-    page-break-before: auto;
-    page-break-inside: auto;
-    perspective: none;
-    perspective-origin: 50% 50%;
-    position: static;
-    right: auto;
-    tab-size: 8;
-    table-layout: auto;
-    text-align: left;
-    text-align-last: auto;
-    text-decoration: none;
-    text-indent: 0;
-    text-shadow: none;
-    text-transform: none;
-    top: auto;
-    transform: none;
-    transform-origin: 50% 50% 0;
-    transform-style: flat;
-    transition: none 0s ease 0s;
-    unicode-bidi: normal;
-    vertical-align: baseline;
-    visibility: visible;
-    white-space: normal;
-    widows: 2;
-    width: auto;
-    word-spacing: normal;
-    z-index: auto;
-    all: initial;
-    box-sizing: border-box;
-    text-shadow: none;
-    -webkit-font-smoothing: antialiased;
-    -webkit-tap-highlight-color: initial
-  }
+#drupal-off-canvas applet,
+#drupal-off-canvas object,
+#drupal-off-canvas iframe,
+#drupal-off-canvas h1,
+#drupal-off-canvas h2,
+#drupal-off-canvas h3,
+#drupal-off-canvas h4,
+#drupal-off-canvas h5,
+#drupal-off-canvas h6,
+#drupal-off-canvas p,
+#drupal-off-canvas blockquote,
+#drupal-off-canvas pre,
+#drupal-off-canvas a,
+#drupal-off-canvas abbr,
+#drupal-off-canvas acronym,
+#drupal-off-canvas address,
+#drupal-off-canvas big,
+#drupal-off-canvas button,
+#drupal-off-canvas cite,
+#drupal-off-canvas code,
+#drupal-off-canvas del,
+#drupal-off-canvas dfn,
+#drupal-off-canvas em,
+#drupal-off-canvas img,
+#drupal-off-canvas ins,
+#drupal-off-canvas kbd,
+#drupal-off-canvas q,
+#drupal-off-canvas s,
+#drupal-off-canvas samp,
+#drupal-off-canvas small,
+#drupal-off-canvas strike,
+#drupal-off-canvas strong,
+#drupal-off-canvas sub,
+#drupal-off-canvas sup,
+#drupal-off-canvas tt,
+#drupal-off-canvas var,
+#drupal-off-canvas b,
+#drupal-off-canvas u,
+#drupal-off-canvas i,
+#drupal-off-canvas center,
+#drupal-off-canvas dl,
+#drupal-off-canvas dt,
+#drupal-off-canvas dd,
+#drupal-off-canvas ol,
+#drupal-off-canvas ul,
+#drupal-off-canvas li,
+#drupal-off-canvas fieldset,
+#drupal-off-canvas form,
+#drupal-off-canvas label,
+#drupal-off-canvas legend,
+#drupal-off-canvas table,
+#drupal-off-canvas caption,
+#drupal-off-canvas tbody,
+#drupal-off-canvas tfoot,
+#drupal-off-canvas thead,
+#drupal-off-canvas tr,
+#drupal-off-canvas th,
+#drupal-off-canvas td,
+#drupal-off-canvas article,
+#drupal-off-canvas aside,
+#drupal-off-canvas canvas,
+#drupal-off-canvas details,
+#drupal-off-canvas embed,
+#drupal-off-canvas figure,
+#drupal-off-canvas figcaption,
+#drupal-off-canvas footer,
+#drupal-off-canvas header,
+#drupal-off-canvas hgroup,
+#drupal-off-canvas main,
+#drupal-off-canvas menu,
+#drupal-off-canvas meter,
+#drupal-off-canvas nav,
+#drupal-off-canvas output,
+#drupal-off-canvas progress,
+#drupal-off-canvas ruby,
+#drupal-off-canvas section,
+#drupal-off-canvas summary,
+#drupal-off-canvas time,
+#drupal-off-canvas mark,
+#drupal-off-canvas audio,
+#drupal-off-canvas video,
+#drupal-off-canvas input,
+#drupal-off-canvas select,
+#drupal-off-canvas textarea {
+  position: static;
+  z-index: auto;
+  top: auto;
+  right: auto;
+  bottom: auto;
+  left: auto;
+  display: inline;
+  visibility: visible;
+  float: none;
+  clear: none;
+  overflow: visible;
+  overflow-x: visible;
+  overflow-y: visible;
+  clip: auto;
+  box-sizing: content-box;
+  box-sizing: border-box;
+  width: auto;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
+  margin: 0;
+  padding: 0;
+  table-layout: auto;
+  columns: auto;
+  column-span: 1;
+  column-width: auto;
+  column-count: auto;
+  column-fill: balance;
+  column-gap: normal;
+  column-rule: medium none currentColor;
+  empty-cells: show;
+  caption-side: top;
+  border-spacing: 0;
+  list-style: disc outside none;
+  content: normal;
+  counter-reset: none;
+  counter-increment: none;
+  cursor: auto;
+  transition: none 0s ease 0s;
+  transform: none;
+  transform-origin: 50% 50% 0;
+  animation: none 0s ease 0s 1 normal none running;
+  text-align: left;
+  text-align-last: auto;
+  vertical-align: baseline;
+  white-space: normal;
+  text-decoration: none;
+  text-indent: 0;
+  letter-spacing: normal;
+  word-spacing: normal;
+  text-transform: none;
+  tab-size: 8;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+  direction: ltr;
+  unicode-bidi: normal;
+  orphans: 2;
+  widows: 2;
+  opacity: 1;
+  color: #000;
+  border: medium none currentColor;
+  border-collapse: separate;
+  border-radius: 0;
+  border-image: none;
+  outline: medium none invert;
+  background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
+  box-shadow: none;
+  text-shadow: none;
+  font-family: serif;
+  font-size: medium;
+  font-weight: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-stretch: normal;
+  line-height: normal;
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  page-break-after: auto;
+  page-break-before: auto;
+  page-break-inside: auto;
+  perspective: none;
+  perspective-origin: 50% 50%;
+  transform-style: flat;
+  all: initial;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: initial;
+}
 
 #drupal-off-canvas span:after,
-    #drupal-off-canvas span:before,
-    #drupal-off-canvas applet:after,
-    #drupal-off-canvas applet:before,
-    #drupal-off-canvas object:after,
-    #drupal-off-canvas object:before,
-    #drupal-off-canvas iframe:after,
-    #drupal-off-canvas iframe:before,
-    #drupal-off-canvas h1:after,
-    #drupal-off-canvas h1:before,
-    #drupal-off-canvas h2:after,
-    #drupal-off-canvas h2:before,
-    #drupal-off-canvas h3:after,
-    #drupal-off-canvas h3:before,
-    #drupal-off-canvas h4:after,
-    #drupal-off-canvas h4:before,
-    #drupal-off-canvas h5:after,
-    #drupal-off-canvas h5:before,
-    #drupal-off-canvas h6:after,
-    #drupal-off-canvas h6:before,
-    #drupal-off-canvas p:after,
-    #drupal-off-canvas p:before,
-    #drupal-off-canvas blockquote:after,
-    #drupal-off-canvas blockquote:before,
-    #drupal-off-canvas pre:after,
-    #drupal-off-canvas pre:before,
-    #drupal-off-canvas a:after,
-    #drupal-off-canvas a:before,
-    #drupal-off-canvas abbr:after,
-    #drupal-off-canvas abbr:before,
-    #drupal-off-canvas acronym:after,
-    #drupal-off-canvas acronym:before,
-    #drupal-off-canvas address:after,
-    #drupal-off-canvas address:before,
-    #drupal-off-canvas big:after,
-    #drupal-off-canvas big:before,
-    #drupal-off-canvas button:after,
-    #drupal-off-canvas button:before,
-    #drupal-off-canvas cite:after,
-    #drupal-off-canvas cite:before,
-    #drupal-off-canvas code:after,
-    #drupal-off-canvas code:before,
-    #drupal-off-canvas del:after,
-    #drupal-off-canvas del:before,
-    #drupal-off-canvas dfn:after,
-    #drupal-off-canvas dfn:before,
-    #drupal-off-canvas em:after,
-    #drupal-off-canvas em:before,
-    #drupal-off-canvas img:after,
-    #drupal-off-canvas img:before,
-    #drupal-off-canvas ins:after,
-    #drupal-off-canvas ins:before,
-    #drupal-off-canvas kbd:after,
-    #drupal-off-canvas kbd:before,
-    #drupal-off-canvas q:after,
-    #drupal-off-canvas q:before,
-    #drupal-off-canvas s:after,
-    #drupal-off-canvas s:before,
-    #drupal-off-canvas samp:after,
-    #drupal-off-canvas samp:before,
-    #drupal-off-canvas small:after,
-    #drupal-off-canvas small:before,
-    #drupal-off-canvas strike:after,
-    #drupal-off-canvas strike:before,
-    #drupal-off-canvas strong:after,
-    #drupal-off-canvas strong:before,
-    #drupal-off-canvas sub:after,
-    #drupal-off-canvas sub:before,
-    #drupal-off-canvas sup:after,
-    #drupal-off-canvas sup:before,
-    #drupal-off-canvas tt:after,
-    #drupal-off-canvas tt:before,
-    #drupal-off-canvas var:after,
-    #drupal-off-canvas var:before,
-    #drupal-off-canvas b:after,
-    #drupal-off-canvas b:before,
-    #drupal-off-canvas u:after,
-    #drupal-off-canvas u:before,
-    #drupal-off-canvas i:after,
-    #drupal-off-canvas i:before,
-    #drupal-off-canvas center:after,
-    #drupal-off-canvas center:before,
-    #drupal-off-canvas dl:after,
-    #drupal-off-canvas dl:before,
-    #drupal-off-canvas dt:after,
-    #drupal-off-canvas dt:before,
-    #drupal-off-canvas dd:after,
-    #drupal-off-canvas dd:before,
-    #drupal-off-canvas ol:after,
-    #drupal-off-canvas ol:before,
-    #drupal-off-canvas ul:after,
-    #drupal-off-canvas ul:before,
-    #drupal-off-canvas li:after,
-    #drupal-off-canvas li:before,
-    #drupal-off-canvas fieldset:after,
-    #drupal-off-canvas fieldset:before,
-    #drupal-off-canvas form:after,
-    #drupal-off-canvas form:before,
-    #drupal-off-canvas label:after,
-    #drupal-off-canvas label:before,
-    #drupal-off-canvas legend:after,
-    #drupal-off-canvas legend:before,
-    #drupal-off-canvas table:after,
-    #drupal-off-canvas table:before,
-    #drupal-off-canvas caption:after,
-    #drupal-off-canvas caption:before,
-    #drupal-off-canvas tbody:after,
-    #drupal-off-canvas tbody:before,
-    #drupal-off-canvas tfoot:after,
-    #drupal-off-canvas tfoot:before,
-    #drupal-off-canvas thead:after,
-    #drupal-off-canvas thead:before,
-    #drupal-off-canvas tr:after,
-    #drupal-off-canvas tr:before,
-    #drupal-off-canvas th:after,
-    #drupal-off-canvas th:before,
-    #drupal-off-canvas td:after,
-    #drupal-off-canvas td:before,
-    #drupal-off-canvas article:after,
-    #drupal-off-canvas article:before,
-    #drupal-off-canvas aside:after,
-    #drupal-off-canvas aside:before,
-    #drupal-off-canvas canvas:after,
-    #drupal-off-canvas canvas:before,
-    #drupal-off-canvas details:after,
-    #drupal-off-canvas details:before,
-    #drupal-off-canvas embed:after,
-    #drupal-off-canvas embed:before,
-    #drupal-off-canvas figure:after,
-    #drupal-off-canvas figure:before,
-    #drupal-off-canvas figcaption:after,
-    #drupal-off-canvas figcaption:before,
-    #drupal-off-canvas footer:after,
-    #drupal-off-canvas footer:before,
-    #drupal-off-canvas header:after,
-    #drupal-off-canvas header:before,
-    #drupal-off-canvas hgroup:after,
-    #drupal-off-canvas hgroup:before,
-    #drupal-off-canvas main:after,
-    #drupal-off-canvas main:before,
-    #drupal-off-canvas menu:after,
-    #drupal-off-canvas menu:before,
-    #drupal-off-canvas meter:after,
-    #drupal-off-canvas meter:before,
-    #drupal-off-canvas nav:after,
-    #drupal-off-canvas nav:before,
-    #drupal-off-canvas output:after,
-    #drupal-off-canvas output:before,
-    #drupal-off-canvas progress:after,
-    #drupal-off-canvas progress:before,
-    #drupal-off-canvas ruby:after,
-    #drupal-off-canvas ruby:before,
-    #drupal-off-canvas section:after,
-    #drupal-off-canvas section:before,
-    #drupal-off-canvas summary:after,
-    #drupal-off-canvas summary:before,
-    #drupal-off-canvas time:after,
-    #drupal-off-canvas time:before,
-    #drupal-off-canvas mark:after,
-    #drupal-off-canvas mark:before,
-    #drupal-off-canvas audio:after,
-    #drupal-off-canvas audio:before,
-    #drupal-off-canvas video:after,
-    #drupal-off-canvas video:before,
-    #drupal-off-canvas input:after,
-    #drupal-off-canvas input:before,
-    #drupal-off-canvas select:after,
-    #drupal-off-canvas select:before,
-    #drupal-off-canvas textarea:after,
-    #drupal-off-canvas textarea:before {
-      animation: none 0s ease 0s 1 normal none running;
-      -webkit-backface-visibility: visible;
-      backface-visibility: visible;
-      background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
-      border: medium none currentColor;
-      border-collapse: separate;
-      border-image: none;
-      border-radius: 0;
-      border-spacing: 0;
-      bottom: auto;
-      box-shadow: none;
-      box-sizing: content-box;
-      caption-side: top;
-      clear: none;
-      clip: auto;
-      color: #000;
-      columns: auto;
-      column-count: auto;
-      column-fill: balance;
-      grid-column-gap: normal;
-      column-rule: medium none currentColor;
-      column-span: 1;
-      column-width: auto;
-      content: normal;
-      counter-increment: none;
-      counter-reset: none;
-      cursor: auto;
-      direction: ltr;
-      display: inline;
-      empty-cells: show;
-      float: none;
-      font-family: serif;
-      font-size: medium;
-      font-style: normal;
-      font-feature-settings: normal;
-      font-variant: normal;
-      font-weight: normal;
-      font-stretch: normal;
-      line-height: normal;
-      height: auto;
-      -webkit-hyphens: none;
-      -ms-hyphens: none;
-      hyphens: none;
-      left: auto;
-      letter-spacing: normal;
-      list-style: disc outside none;
-      margin: 0;
-      max-height: none;
-      max-width: none;
-      min-height: 0;
-      min-width: 0;
-      opacity: 1;
-      orphans: 2;
-      outline: medium none invert;
-      overflow: visible;
-      overflow-x: visible;
-      overflow-y: visible;
-      padding: 0;
-      page-break-after: auto;
-      page-break-before: auto;
-      page-break-inside: auto;
-      perspective: none;
-      perspective-origin: 50% 50%;
-      position: static;
-      right: auto;
-      tab-size: 8;
-      table-layout: auto;
-      text-align: left;
-      text-align-last: auto;
-      text-decoration: none;
-      text-indent: 0;
-      text-shadow: none;
-      text-transform: none;
-      top: auto;
-      transform: none;
-      transform-origin: 50% 50% 0;
-      transform-style: flat;
-      transition: none 0s ease 0s;
-      unicode-bidi: normal;
-      vertical-align: baseline;
-      visibility: visible;
-      white-space: normal;
-      widows: 2;
-      width: auto;
-      word-spacing: normal;
-      z-index: auto;
-      all: initial;
-      box-sizing: border-box;
-      text-shadow: none;
-      -webkit-font-smoothing: antialiased;
-      -webkit-tap-highlight-color: initial;
-    }
+#drupal-off-canvas applet:after,
+#drupal-off-canvas object:after,
+#drupal-off-canvas iframe:after,
+#drupal-off-canvas h1:after,
+#drupal-off-canvas h2:after,
+#drupal-off-canvas h3:after,
+#drupal-off-canvas h4:after,
+#drupal-off-canvas h5:after,
+#drupal-off-canvas h6:after,
+#drupal-off-canvas p:after,
+#drupal-off-canvas blockquote:after,
+#drupal-off-canvas pre:after,
+#drupal-off-canvas a:after,
+#drupal-off-canvas abbr:after,
+#drupal-off-canvas acronym:after,
+#drupal-off-canvas address:after,
+#drupal-off-canvas big:after,
+#drupal-off-canvas button:after,
+#drupal-off-canvas cite:after,
+#drupal-off-canvas code:after,
+#drupal-off-canvas del:after,
+#drupal-off-canvas dfn:after,
+#drupal-off-canvas em:after,
+#drupal-off-canvas img:after,
+#drupal-off-canvas ins:after,
+#drupal-off-canvas kbd:after,
+#drupal-off-canvas q:after,
+#drupal-off-canvas s:after,
+#drupal-off-canvas samp:after,
+#drupal-off-canvas small:after,
+#drupal-off-canvas strike:after,
+#drupal-off-canvas strong:after,
+#drupal-off-canvas sub:after,
+#drupal-off-canvas sup:after,
+#drupal-off-canvas tt:after,
+#drupal-off-canvas var:after,
+#drupal-off-canvas b:after,
+#drupal-off-canvas u:after,
+#drupal-off-canvas i:after,
+#drupal-off-canvas center:after,
+#drupal-off-canvas dl:after,
+#drupal-off-canvas dt:after,
+#drupal-off-canvas dd:after,
+#drupal-off-canvas ol:after,
+#drupal-off-canvas ul:after,
+#drupal-off-canvas li:after,
+#drupal-off-canvas fieldset:after,
+#drupal-off-canvas form:after,
+#drupal-off-canvas label:after,
+#drupal-off-canvas legend:after,
+#drupal-off-canvas table:after,
+#drupal-off-canvas caption:after,
+#drupal-off-canvas tbody:after,
+#drupal-off-canvas tfoot:after,
+#drupal-off-canvas thead:after,
+#drupal-off-canvas tr:after,
+#drupal-off-canvas th:after,
+#drupal-off-canvas td:after,
+#drupal-off-canvas article:after,
+#drupal-off-canvas aside:after,
+#drupal-off-canvas canvas:after,
+#drupal-off-canvas details:after,
+#drupal-off-canvas embed:after,
+#drupal-off-canvas figure:after,
+#drupal-off-canvas figcaption:after,
+#drupal-off-canvas footer:after,
+#drupal-off-canvas header:after,
+#drupal-off-canvas hgroup:after,
+#drupal-off-canvas main:after,
+#drupal-off-canvas menu:after,
+#drupal-off-canvas meter:after,
+#drupal-off-canvas nav:after,
+#drupal-off-canvas output:after,
+#drupal-off-canvas progress:after,
+#drupal-off-canvas ruby:after,
+#drupal-off-canvas section:after,
+#drupal-off-canvas summary:after,
+#drupal-off-canvas time:after,
+#drupal-off-canvas mark:after,
+#drupal-off-canvas audio:after,
+#drupal-off-canvas video:after,
+#drupal-off-canvas input:after,
+#drupal-off-canvas select:after,
+#drupal-off-canvas textarea:after,
+#drupal-off-canvas span:before,
+#drupal-off-canvas applet:before,
+#drupal-off-canvas object:before,
+#drupal-off-canvas iframe:before,
+#drupal-off-canvas h1:before,
+#drupal-off-canvas h2:before,
+#drupal-off-canvas h3:before,
+#drupal-off-canvas h4:before,
+#drupal-off-canvas h5:before,
+#drupal-off-canvas h6:before,
+#drupal-off-canvas p:before,
+#drupal-off-canvas blockquote:before,
+#drupal-off-canvas pre:before,
+#drupal-off-canvas a:before,
+#drupal-off-canvas abbr:before,
+#drupal-off-canvas acronym:before,
+#drupal-off-canvas address:before,
+#drupal-off-canvas big:before,
+#drupal-off-canvas button:before,
+#drupal-off-canvas cite:before,
+#drupal-off-canvas code:before,
+#drupal-off-canvas del:before,
+#drupal-off-canvas dfn:before,
+#drupal-off-canvas em:before,
+#drupal-off-canvas img:before,
+#drupal-off-canvas ins:before,
+#drupal-off-canvas kbd:before,
+#drupal-off-canvas q:before,
+#drupal-off-canvas s:before,
+#drupal-off-canvas samp:before,
+#drupal-off-canvas small:before,
+#drupal-off-canvas strike:before,
+#drupal-off-canvas strong:before,
+#drupal-off-canvas sub:before,
+#drupal-off-canvas sup:before,
+#drupal-off-canvas tt:before,
+#drupal-off-canvas var:before,
+#drupal-off-canvas b:before,
+#drupal-off-canvas u:before,
+#drupal-off-canvas i:before,
+#drupal-off-canvas center:before,
+#drupal-off-canvas dl:before,
+#drupal-off-canvas dt:before,
+#drupal-off-canvas dd:before,
+#drupal-off-canvas ol:before,
+#drupal-off-canvas ul:before,
+#drupal-off-canvas li:before,
+#drupal-off-canvas fieldset:before,
+#drupal-off-canvas form:before,
+#drupal-off-canvas label:before,
+#drupal-off-canvas legend:before,
+#drupal-off-canvas table:before,
+#drupal-off-canvas caption:before,
+#drupal-off-canvas tbody:before,
+#drupal-off-canvas tfoot:before,
+#drupal-off-canvas thead:before,
+#drupal-off-canvas tr:before,
+#drupal-off-canvas th:before,
+#drupal-off-canvas td:before,
+#drupal-off-canvas article:before,
+#drupal-off-canvas aside:before,
+#drupal-off-canvas canvas:before,
+#drupal-off-canvas details:before,
+#drupal-off-canvas embed:before,
+#drupal-off-canvas figure:before,
+#drupal-off-canvas figcaption:before,
+#drupal-off-canvas footer:before,
+#drupal-off-canvas header:before,
+#drupal-off-canvas hgroup:before,
+#drupal-off-canvas main:before,
+#drupal-off-canvas menu:before,
+#drupal-off-canvas meter:before,
+#drupal-off-canvas nav:before,
+#drupal-off-canvas output:before,
+#drupal-off-canvas progress:before,
+#drupal-off-canvas ruby:before,
+#drupal-off-canvas section:before,
+#drupal-off-canvas summary:before,
+#drupal-off-canvas time:before,
+#drupal-off-canvas mark:before,
+#drupal-off-canvas audio:before,
+#drupal-off-canvas video:before,
+#drupal-off-canvas input:before,
+#drupal-off-canvas select:before,
+#drupal-off-canvas textarea:before {
+  position: static;
+  z-index: auto;
+  top: auto;
+  right: auto;
+  bottom: auto;
+  left: auto;
+  display: inline;
+  visibility: visible;
+  float: none;
+  clear: none;
+  overflow: visible;
+  overflow-x: visible;
+  overflow-y: visible;
+  clip: auto;
+  box-sizing: content-box;
+  box-sizing: border-box;
+  width: auto;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
+  margin: 0;
+  padding: 0;
+  table-layout: auto;
+  columns: auto;
+  column-span: 1;
+  column-width: auto;
+  column-count: auto;
+  column-fill: balance;
+  column-gap: normal;
+  column-rule: medium none currentColor;
+  empty-cells: show;
+  caption-side: top;
+  border-spacing: 0;
+  list-style: disc outside none;
+  content: normal;
+  counter-reset: none;
+  counter-increment: none;
+  cursor: auto;
+  transition: none 0s ease 0s;
+  transform: none;
+  transform-origin: 50% 50% 0;
+  animation: none 0s ease 0s 1 normal none running;
+  text-align: left;
+  text-align-last: auto;
+  vertical-align: baseline;
+  white-space: normal;
+  text-decoration: none;
+  text-indent: 0;
+  letter-spacing: normal;
+  word-spacing: normal;
+  text-transform: none;
+  tab-size: 8;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+  direction: ltr;
+  unicode-bidi: normal;
+  orphans: 2;
+  widows: 2;
+  opacity: 1;
+  color: #000;
+  border: medium none currentColor;
+  border-collapse: separate;
+  border-radius: 0;
+  border-image: none;
+  outline: medium none invert;
+  background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
+  box-shadow: none;
+  text-shadow: none;
+  font-family: serif;
+  font-size: medium;
+  font-weight: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-stretch: normal;
+  line-height: normal;
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  page-break-after: auto;
+  page-break-before: auto;
+  page-break-inside: auto;
+  perspective: none;
+  perspective-origin: 50% 50%;
+  transform-style: flat;
+  all: initial;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: initial;
+}
 
 /* Reset size and position on elements. */
 
diff --git a/web/core/misc/displace.js b/web/core/misc/displace.js
index e0cef041d..bce4296e2 100644
--- a/web/core/misc/displace.js
+++ b/web/core/misc/displace.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, debounce) {
   var offsets = {
     top: 0,
@@ -12,7 +11,6 @@
     bottom: 0,
     left: 0
   };
-
   function getRawOffset(el, edge) {
     var $el = $(el);
     var documentElement = document.documentElement;
@@ -20,55 +18,41 @@
     var horizontal = edge === 'left' || edge === 'right';
     var placement = $el.offset()[horizontal ? 'left' : 'top'];
     placement -= window["scroll".concat(horizontal ? 'X' : 'Y')] || document.documentElement["scroll".concat(horizontal ? 'Left' : 'Top')] || 0;
-
     switch (edge) {
       case 'top':
         displacement = placement + $el.outerHeight();
         break;
-
       case 'left':
         displacement = placement + $el.outerWidth();
         break;
-
       case 'bottom':
         displacement = documentElement.clientHeight - placement;
         break;
-
       case 'right':
         displacement = documentElement.clientWidth - placement;
         break;
-
       default:
         displacement = 0;
     }
-
     return displacement;
   }
-
   function calculateOffset(edge) {
     var edgeOffset = 0;
     var displacingElements = document.querySelectorAll("[data-offset-".concat(edge, "]"));
     var n = displacingElements.length;
-
     for (var i = 0; i < n; i++) {
       var el = displacingElements[i];
-
       if (el.style.display === 'none') {
         continue;
       }
-
       var displacement = parseInt(el.getAttribute("data-offset-".concat(edge)), 10);
-
       if (isNaN(displacement)) {
         displacement = getRawOffset(el, edge);
       }
-
       edgeOffset = Math.max(edgeOffset, displacement);
     }
-
     return edgeOffset;
   }
-
   function calculateOffsets() {
     return {
       top: calculateOffset('top'),
@@ -77,24 +61,19 @@
       left: calculateOffset('left')
     };
   }
-
   function displace(broadcast) {
     offsets = calculateOffsets();
     Drupal.displace.offsets = offsets;
-
     if (typeof broadcast === 'undefined' || broadcast) {
       $(document).trigger('drupalViewportOffsetChange', offsets);
     }
-
     return offsets;
   }
-
   Drupal.behaviors.drupalDisplace = {
     attach: function attach() {
       if (this.displaceProcessed) {
         return;
       }
-
       this.displaceProcessed = true;
       $(window).on('resize.drupalDisplace', debounce(displace, 200));
     }
diff --git a/web/core/misc/dropbutton/dropbutton.css b/web/core/misc/dropbutton/dropbutton.css
index 654a8d8ef..02f01db9d 100644
--- a/web/core/misc/dropbutton/dropbutton.css
+++ b/web/core/misc/dropbutton/dropbutton.css
@@ -34,7 +34,7 @@
 .js .form-actions .dropbutton-widget {
   position: static;
 }
-.js td .dropbutton-widget {
+.js td .dropbutton-multiple .dropbutton-widget {
   position: absolute;
 }
 .js td .dropbutton-wrapper {
diff --git a/web/core/misc/dropbutton/dropbutton.js b/web/core/misc/dropbutton/dropbutton.js
index f7787d51c..0181cb488 100644
--- a/web/core/misc/dropbutton/dropbutton.js
+++ b/web/core/misc/dropbutton/dropbutton.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   function DropButton(dropbutton, settings) {
     var options = $.extend({
@@ -14,7 +13,6 @@
     this.$dropbutton = $dropbutton;
     this.$list = $dropbutton.find('.dropbutton');
     this.$actions = this.$list.find('li').addClass('dropbutton-action');
-
     if (this.$actions.length > 1) {
       var $primary = this.$actions.slice(0, 1);
       var $secondary = this.$actions.slice(1);
@@ -30,23 +28,18 @@
       this.$dropbutton.addClass('dropbutton-single');
     }
   }
-
   function dropbuttonClickHandler(e) {
     e.preventDefault();
     $(e.target).closest('.dropbutton-wrapper').toggleClass('open');
   }
-
   Drupal.behaviors.dropButton = {
     attach: function attach(context, settings) {
       var dropbuttons = once('dropbutton', '.dropbutton-wrapper', context);
-
       if (dropbuttons.length) {
         var body = once('dropbutton-click', 'body');
-
         if (body.length) {
           $(body).on('click', '.dropbutton-toggle', dropbuttonClickHandler);
         }
-
         dropbuttons.forEach(function (dropbutton) {
           DropButton.dropbuttons.push(new DropButton(dropbutton, settings.dropbutton));
         });
diff --git a/web/core/misc/drupal.init.js b/web/core/misc/drupal.init.js
index 81eb78e02..009809bf6 100644
--- a/web/core/misc/drupal.init.js
+++ b/web/core/misc/drupal.init.js
@@ -4,27 +4,22 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (window.jQuery) {
   jQuery.noConflict();
 }
-
 document.documentElement.className += ' js';
-
 (function (Drupal, drupalSettings) {
   var domReady = function domReady(callback) {
     var listener = function listener() {
       callback();
       document.removeEventListener('DOMContentLoaded', listener);
     };
-
     if (document.readyState !== 'loading') {
       setTimeout(callback, 0);
     } else {
       document.addEventListener('DOMContentLoaded', listener);
     }
   };
-
   domReady(function () {
     Drupal.attachBehaviors(document, drupalSettings);
   });
diff --git a/web/core/misc/drupal.js b/web/core/misc/drupal.js
index a1debf251..e03886c9e 100644
--- a/web/core/misc/drupal.js
+++ b/web/core/misc/drupal.js
@@ -4,19 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 window.Drupal = {
   behaviors: {},
   locale: {}
 };
-
 (function (Drupal, drupalSettings, drupalTranslations, console, Proxy, Reflect) {
   Drupal.throwError = function (error) {
     setTimeout(function () {
       throw error;
     }, 0);
   };
-
   Drupal.attachBehaviors = function (context, settings) {
     context = context || document;
     settings = settings || drupalSettings;
@@ -31,7 +28,6 @@ window.Drupal = {
       }
     });
   };
-
   Drupal.detachBehaviors = function (context, settings, trigger) {
     context = context || document;
     settings = settings || drupalSettings;
@@ -47,12 +43,10 @@ window.Drupal = {
       }
     });
   };
-
   Drupal.checkPlain = function (str) {
     str = str.toString().replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;').replace(/'/g, '&#39;');
     return str;
   };
-
   Drupal.formatString = function (str, args) {
     var processedArgs = {};
     Object.keys(args || {}).forEach(function (key) {
@@ -60,11 +54,9 @@ window.Drupal = {
         case '@':
           processedArgs[key] = Drupal.checkPlain(args[key]);
           break;
-
         case '!':
           processedArgs[key] = args[key];
           break;
-
         default:
           processedArgs[key] = Drupal.theme('placeholder', args[key]);
           break;
@@ -72,123 +64,94 @@ window.Drupal = {
     });
     return Drupal.stringReplace(str, processedArgs, null);
   };
-
   Drupal.stringReplace = function (str, args, keys) {
     if (str.length === 0) {
       return str;
     }
-
     if (!Array.isArray(keys)) {
       keys = Object.keys(args || {});
       keys.sort(function (a, b) {
         return a.length - b.length;
       });
     }
-
     if (keys.length === 0) {
       return str;
     }
-
     var key = keys.pop();
     var fragments = str.split(key);
-
     if (keys.length) {
       for (var i = 0; i < fragments.length; i++) {
         fragments[i] = Drupal.stringReplace(fragments[i], args, keys.slice(0));
       }
     }
-
     return fragments.join(args[key]);
   };
-
   Drupal.t = function (str, args, options) {
     options = options || {};
     options.context = options.context || '';
-
     if (typeof drupalTranslations !== 'undefined' && drupalTranslations.strings && drupalTranslations.strings[options.context] && drupalTranslations.strings[options.context][str]) {
       str = drupalTranslations.strings[options.context][str];
     }
-
     if (args) {
       str = Drupal.formatString(str, args);
     }
-
     return str;
   };
-
   Drupal.url = function (path) {
     return drupalSettings.path.baseUrl + drupalSettings.path.pathPrefix + path;
   };
-
   Drupal.url.toAbsolute = function (url) {
     var urlParsingNode = document.createElement('a');
-
     try {
       url = decodeURIComponent(url);
     } catch (e) {}
-
     urlParsingNode.setAttribute('href', url);
     return urlParsingNode.cloneNode(false).href;
   };
-
   Drupal.url.isLocal = function (url) {
     var absoluteUrl = Drupal.url.toAbsolute(url);
     var protocol = window.location.protocol;
-
     if (protocol === 'http:' && absoluteUrl.indexOf('https:') === 0) {
       protocol = 'https:';
     }
-
     var baseUrl = "".concat(protocol, "//").concat(window.location.host).concat(drupalSettings.path.baseUrl.slice(0, -1));
-
     try {
       absoluteUrl = decodeURIComponent(absoluteUrl);
     } catch (e) {}
-
     try {
       baseUrl = decodeURIComponent(baseUrl);
     } catch (e) {}
-
     return absoluteUrl === baseUrl || absoluteUrl.indexOf("".concat(baseUrl, "/")) === 0;
   };
-
   Drupal.formatPlural = function (count, singular, plural, args, options) {
     args = args || {};
     args['@count'] = count;
     var pluralDelimiter = drupalSettings.pluralDelimiter;
     var translations = Drupal.t(singular + pluralDelimiter + plural, args, options).split(pluralDelimiter);
     var index = 0;
-
     if (typeof drupalTranslations !== 'undefined' && drupalTranslations.pluralFormula) {
       index = count in drupalTranslations.pluralFormula ? drupalTranslations.pluralFormula[count] : drupalTranslations.pluralFormula.default;
     } else if (args['@count'] !== 1) {
       index = 1;
     }
-
     return translations[index];
   };
-
   Drupal.encodePath = function (item) {
     return window.encodeURIComponent(item).replace(/%2F/g, '/');
   };
-
   Drupal.deprecationError = function (_ref) {
     var message = _ref.message;
-
     if (drupalSettings.suppressDeprecationErrors === false && typeof console !== 'undefined' && console.warn) {
       console.warn("[Deprecation] ".concat(message));
     }
   };
-
   Drupal.deprecatedProperty = function (_ref2) {
     var target = _ref2.target,
-        deprecatedProperty = _ref2.deprecatedProperty,
-        message = _ref2.message;
-
+      deprecatedProperty = _ref2.deprecatedProperty,
+      message = _ref2.message;
     if (!Proxy || !Reflect) {
       return target;
     }
-
     return new Proxy(target, {
       get: function get(target, key) {
         if (key === deprecatedProperty) {
@@ -196,28 +159,22 @@ window.Drupal = {
             message: message
           });
         }
-
         for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
           rest[_key - 2] = arguments[_key];
         }
-
         return Reflect.get.apply(Reflect, [target, key].concat(rest));
       }
     });
   };
-
   Drupal.theme = function (func) {
     if (func in Drupal.theme) {
       var _Drupal$theme;
-
       for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
         args[_key2 - 1] = arguments[_key2];
       }
-
       return (_Drupal$theme = Drupal.theme)[func].apply(_Drupal$theme, args);
     }
   };
-
   Drupal.theme.placeholder = function (str) {
     return "<em class=\"placeholder\">".concat(Drupal.checkPlain(str), "</em>");
   };
diff --git a/web/core/misc/drupalSettingsLoader.js b/web/core/misc/drupalSettingsLoader.js
index 27450b84d..3d808eefa 100644
--- a/web/core/misc/drupalSettingsLoader.js
+++ b/web/core/misc/drupalSettingsLoader.js
@@ -4,11 +4,9 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function () {
   var settingsElement = document.querySelector('head > script[type="application/json"][data-drupal-selector="drupal-settings-json"], body > script[type="application/json"][data-drupal-selector="drupal-settings-json"]');
   window.drupalSettings = {};
-
   if (settingsElement !== null) {
     window.drupalSettings = JSON.parse(settingsElement.textContent);
   }
diff --git a/web/core/misc/entity-form.js b/web/core/misc/entity-form.js
index af450a020..a19e76c1b 100644
--- a/web/core/misc/entity-form.js
+++ b/web/core/misc/entity-form.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.entityContentDetailsSummaries = {
     attach: function attach(context) {
@@ -12,25 +11,21 @@
       $context.find('.entity-content-form-revision-information').drupalSetSummary(function (context) {
         var $revisionContext = $(context);
         var revisionCheckbox = $revisionContext.find('.js-form-item-revision input');
-
         if (revisionCheckbox.is(':checked') || !revisionCheckbox.length && $revisionContext.find('.js-form-item-revision-log textarea').length) {
           return Drupal.t('New revision');
         }
-
         return Drupal.t('No revision');
       });
       $context.find('details.entity-translation-options').drupalSetSummary(function (context) {
         var $translationContext = $(context);
         var translate;
         var $checkbox = $translationContext.find('.js-form-item-translation-translate input');
-
         if ($checkbox.length) {
           translate = $checkbox.is(':checked') ? Drupal.t('Needs to be updated') : Drupal.t('Does not need to be updated');
         } else {
           $checkbox = $translationContext.find('.js-form-item-translation-retranslate input');
           translate = $checkbox.is(':checked') ? Drupal.t('Flag other translations as outdated') : Drupal.t('Do not flag other translations as outdated');
         }
-
         return translate;
       });
     }
diff --git a/web/core/misc/form.js b/web/core/misc/form.js
index 30e20d9ec..41dd07d54 100644
--- a/web/core/misc/form.js
+++ b/web/core/misc/form.js
@@ -4,64 +4,52 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, debounce) {
   $.fn.drupalGetSummary = function () {
     var callback = this.data('summaryCallback');
     return this[0] && callback ? callback(this[0]).trim() : '';
   };
-
   $.fn.drupalSetSummary = function (callback) {
     var self = this;
-
     if (typeof callback !== 'function') {
       var val = callback;
-
       callback = function callback() {
         return val;
       };
     }
-
     return this.data('summaryCallback', callback).off('formUpdated.summary').on('formUpdated.summary', function () {
       self.trigger('summaryUpdated');
     }).trigger('summaryUpdated');
   };
-
   Drupal.behaviors.formSingleSubmit = {
     attach: function attach() {
       function onFormSubmit(e) {
         var $form = $(e.currentTarget);
         var formValues = $form.serialize();
         var previousValues = $form.attr('data-drupal-form-submit-last');
-
         if (previousValues === formValues) {
           e.preventDefault();
         } else {
           $form.attr('data-drupal-form-submit-last', formValues);
         }
       }
-
       $(once('form-single-submit', 'body')).on('submit.singleSubmit', 'form:not([method~="GET"])', onFormSubmit);
     }
   };
-
   function triggerFormUpdated(element) {
     $(element).trigger('formUpdated');
   }
-
   function fieldsList(form) {
     return [].map.call(form.querySelectorAll('[name][id]'), function (el) {
       return el.id;
     });
   }
-
   Drupal.behaviors.formUpdated = {
     attach: function attach(context) {
       var $context = $(context);
       var contextIsForm = $context.is('form');
       var $forms = $(once('form-updated', contextIsForm ? $context : $context.find('form')));
       var formFields;
-
       if ($forms.length) {
         $.makeArray($forms).forEach(function (form) {
           var events = 'change.formUpdated input.formUpdated ';
@@ -73,11 +61,9 @@
           $(form).on(events, eventHandler);
         });
       }
-
       if (contextIsForm) {
         formFields = fieldsList(context).join(',');
         var currentFields = $(context).attr('data-drupal-form-fields');
-
         if (formFields !== currentFields) {
           triggerFormUpdated(context);
         }
@@ -86,7 +72,6 @@
     detach: function detach(context, settings, trigger) {
       var $context = $(context);
       var contextIsForm = $context.is('form');
-
       if (trigger === 'unload') {
         once.remove('form-updated', contextIsForm ? $context : $context.find('form')).forEach(function (form) {
           form.removeAttribute('data-drupal-form-fields');
@@ -99,19 +84,15 @@
     attach: function attach(context, settings) {
       var userInfo = ['name', 'mail', 'homepage'];
       var $forms = $(once('user-info-from-browser', '[data-user-info-from-browser]'));
-
       if ($forms.length) {
         userInfo.forEach(function (info) {
           var $element = $forms.find("[name=".concat(info, "]"));
           var browserData = localStorage.getItem("Drupal.visitor.".concat(info));
-
           if (!$element.length) {
             return;
           }
-
           var emptyValue = $element[0].value === '';
           var defaultValue = $element.attr('data-drupal-default-value') === $element[0].value;
-
           if (browserData && (emptyValue || defaultValue)) {
             $element.each(function (index, item) {
               item.value = browserData;
@@ -119,11 +100,9 @@
           }
         });
       }
-
       $forms.on('submit', function () {
         userInfo.forEach(function (info) {
           var $element = $forms.find("[name=".concat(info, "]"));
-
           if ($element.length) {
             localStorage.setItem("Drupal.visitor.".concat(info), $element[0].value);
           }
@@ -131,18 +110,14 @@
       });
     }
   };
-
   var handleFragmentLinkClickOrHashChange = function handleFragmentLinkClickOrHashChange(e) {
     var url;
-
     if (e.type === 'click') {
       url = e.currentTarget.location ? e.currentTarget.location : e.currentTarget;
     } else {
       url = window.location;
     }
-
     var hash = url.hash.substr(1);
-
     if (hash) {
       var $target = $("#".concat(hash));
       $('body').trigger('formFragmentLinkClickOrHashChange', [$target]);
@@ -151,7 +126,6 @@
       }, 300);
     }
   };
-
   var debouncedHandleFragmentLinkClickOrHashChange = debounce(handleFragmentLinkClickOrHashChange, 300, true);
   $(window).on('hashchange.form-fragment', debouncedHandleFragmentLinkClickOrHashChange);
   $(document).on('click.form-fragment', 'a[href*="#"]', debouncedHandleFragmentLinkClickOrHashChange);
diff --git a/web/core/misc/jquery.cookie.shim.js b/web/core/misc/jquery.cookie.shim.js
index b05715788..aae0ab7e0 100644
--- a/web/core/misc/jquery.cookie.shim.js
+++ b/web/core/misc/jquery.cookie.shim.js
@@ -4,55 +4,44 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 (function ($, Drupal, cookies) {
   var deprecatedMessageSuffix = "is deprecated in Drupal 9.0.0 and will be removed in Drupal 10.0.0. Use the core/js-cookie library instead. See https://www.drupal.org/node/3104677";
-
   var isFunction = function isFunction(obj) {
     return Object.prototype.toString.call(obj) === '[object Function]';
   };
-
   var parseCookieValue = function parseCookieValue(value, parseJson) {
     if (value.indexOf('"') === 0) {
       value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
     }
-
     try {
       value = decodeURIComponent(value.replace(/\+/g, ' '));
       return parseJson ? JSON.parse(value) : value;
     } catch (e) {}
   };
-
   var reader = function reader(cookieValue, cookieName, converter, readUnsanitized, parseJson) {
     var value = readUnsanitized ? cookieValue : parseCookieValue(cookieValue, parseJson);
-
     if (converter !== undefined && isFunction(converter)) {
       return converter(value, cookieName);
     }
-
     return value;
   };
-
   $.cookie = function (key) {
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
     Drupal.deprecationError({
       message: "jQuery.cookie() ".concat(deprecatedMessageSuffix)
     });
-
     if (value !== undefined && !isFunction(value)) {
       var attributes = _objectSpread(_objectSpread({}, $.cookie.defaults), options);
-
       if (typeof attributes.expires === 'string' && attributes.expires !== '') {
         attributes.expires = new Date(attributes.expires);
       }
-
       var cookieSetter = cookies.withConverter({
         write: function write(cookieValue) {
           return encodeURIComponent(cookieValue);
@@ -61,18 +50,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       value = $.cookie.json && !$.cookie.raw ? JSON.stringify(value) : String(value);
       return cookieSetter.set(key, value, attributes);
     }
-
     var userProvidedConverter = value;
     var cookiesShim = cookies.withConverter({
       read: function read(cookieValue, cookieName) {
         return reader(cookieValue, cookieName, userProvidedConverter, $.cookie.raw, $.cookie.json);
       }
     });
-
     if (key !== undefined) {
       return cookiesShim.get(key);
     }
-
     var results = cookiesShim.get();
     Object.keys(results).forEach(function (resultKey) {
       if (results[resultKey] === undefined) {
@@ -81,13 +67,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     });
     return results;
   };
-
   $.cookie.defaults = _objectSpread({
     path: ''
   }, cookies.defaults);
   $.cookie.json = false;
   $.cookie.raw = false;
-
   $.removeCookie = function (key, options) {
     Drupal.deprecationError({
       message: "jQuery.removeCookie() ".concat(deprecatedMessageSuffix)
diff --git a/web/core/misc/jquery.once.bc.js b/web/core/misc/jquery.once.bc.js
index 9b3c3d4c6..588e31ccf 100644
--- a/web/core/misc/jquery.once.bc.js
+++ b/web/core/misc/jquery.once.bc.js
@@ -4,38 +4,31 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, once) {
   var deprecatedMessageSuffix = "is deprecated in Drupal 9.3.0 and will be removed in Drupal 10.0.0. Use the core/once library instead. See https://www.drupal.org/node/3158256";
   var originalJQOnce = $.fn.once;
   var originalJQRemoveOnce = $.fn.removeOnce;
-
   $.fn.once = function jQueryOnce(id) {
     Drupal.deprecationError({
       message: "jQuery.once() ".concat(deprecatedMessageSuffix)
     });
     return originalJQOnce.apply(this, [id]);
   };
-
   $.fn.removeOnce = function jQueryRemoveOnce(id) {
     Drupal.deprecationError({
       message: "jQuery.removeOnce() ".concat(deprecatedMessageSuffix)
     });
     return originalJQRemoveOnce.apply(this, [id]);
   };
-
   var drupalOnce = once;
-
   function augmentedOnce(id, selector, context) {
     originalJQOnce.apply($(selector, context), [id]);
     return drupalOnce(id, selector, context);
   }
-
   function remove(id, selector, context) {
     originalJQRemoveOnce.apply($(selector, context), [id]);
     return drupalOnce.remove(id, selector, context);
   }
-
   window.once = Object.assign(augmentedOnce, drupalOnce, {
     remove: remove
   });
diff --git a/web/core/misc/jquery.tabbable.shim.es6.js b/web/core/misc/jquery.tabbable.shim.es6.js
index de8d043e7..6820cd1b1 100644
--- a/web/core/misc/jquery.tabbable.shim.es6.js
+++ b/web/core/misc/jquery.tabbable.shim.es6.js
@@ -8,7 +8,7 @@
     tabbable(element) {
       Drupal.deprecationError({
         message:
-          'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 10.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730',
+          'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 11.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730',
       });
 
       // The tabbable library considers the summary element tabbable, and also
diff --git a/web/core/misc/jquery.tabbable.shim.js b/web/core/misc/jquery.tabbable.shim.js
index d58629984..b76c8e429 100644
--- a/web/core/misc/jquery.tabbable.shim.js
+++ b/web/core/misc/jquery.tabbable.shim.js
@@ -4,23 +4,19 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, _ref) {
   var isTabbable = _ref.isTabbable;
   $.extend($.expr[':'], {
     tabbable: function tabbable(element) {
       Drupal.deprecationError({
-        message: 'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 10.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730'
+        message: 'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 11.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730'
       });
-
       if (element.tagName === 'SUMMARY' || element.tagName === 'DETAILS') {
         var tabIndex = element.getAttribute('tabIndex');
-
         if (tabIndex === null || tabIndex < 0) {
           return false;
         }
       }
-
       return isTabbable(element);
     }
   });
diff --git a/web/core/misc/machine-name.js b/web/core/misc/machine-name.js
index ece950c73..c219086a3 100644
--- a/web/core/misc/machine-name.js
+++ b/web/core/misc/machine-name.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.machineName = {
     attach: function attach(context, settings) {
@@ -12,7 +11,6 @@
       var $context = $(context);
       var timeout = null;
       var xhr = null;
-
       function clickEditHandler(e) {
         var data = e.data;
         data.$wrapper.removeClass('visually-hidden');
@@ -20,24 +18,20 @@
         data.$suffix.hide();
         data.$source.off('.machineName');
       }
-
       function machineNameHandler(e) {
         var data = e.data;
         var options = data.options;
         var baseValue = e.target.value;
         var rx = new RegExp(options.replace_pattern, 'g');
         var expected = baseValue.toLowerCase().replace(rx, options.replace).substr(0, options.maxlength);
-
         if (xhr && xhr.readystate !== 4) {
           xhr.abort();
           xhr = null;
         }
-
         if (timeout) {
           clearTimeout(timeout);
           timeout = null;
         }
-
         if (baseValue.toLowerCase() !== expected) {
           timeout = setTimeout(function () {
             xhr = self.transliterate(baseValue, options).done(function (machine) {
@@ -48,38 +42,30 @@
           self.showMachineName(expected, data);
         }
       }
-
       Object.keys(settings.machineName).forEach(function (sourceId) {
         var options = settings.machineName[sourceId];
         var $source = $(once('machine-name', $context.find(sourceId).addClass('machine-name-source')));
         var $target = $context.find(options.target).addClass('machine-name-target');
         var $suffix = $context.find(options.suffix);
         var $wrapper = $target.closest('.js-form-item');
-
         if (!$source.length || !$target.length || !$suffix.length || !$wrapper.length) {
           return;
         }
-
         if ($target.hasClass('error')) {
           return;
         }
-
         options.maxlength = $target.attr('maxlength');
         $wrapper.addClass('visually-hidden');
         var machine = $target[0].value;
         var $preview = $("<span class=\"machine-name-value\">".concat(options.field_prefix).concat(Drupal.checkPlain(machine)).concat(options.field_suffix, "</span>"));
         $suffix.empty();
-
         if (options.label) {
           $suffix.append("<span class=\"machine-name-label\">".concat(options.label, ": </span>"));
         }
-
         $suffix.append($preview);
-
         if ($target.is(':disabled')) {
           return;
         }
-
         var eventData = {
           $source: $source,
           $target: $target,
@@ -88,32 +74,26 @@
           $preview: $preview,
           options: options
         };
-
         if (machine === '' && $source[0].value !== '') {
           self.transliterate($source[0].value, options).done(function (machineName) {
             self.showMachineName(machineName.substr(0, options.maxlength), eventData);
           });
         }
-
         var $link = $("<span class=\"admin-link\"><button type=\"button\" class=\"link\">".concat(Drupal.t('Edit'), "</button></span>")).on('click', eventData, clickEditHandler);
         $suffix.append($link);
-
         if ($target[0].value === '') {
           $source.on('formUpdated.machineName', eventData, machineNameHandler).trigger('formUpdated.machineName');
         }
-
         $target.on('invalid', eventData, clickEditHandler);
       });
     },
     showMachineName: function showMachineName(machine, data) {
       var settings = data.options;
-
       if (machine !== '') {
         if (machine !== settings.replace) {
           data.$target[0].value = machine;
           data.$preview.html(settings.field_prefix + Drupal.checkPlain(machine) + settings.field_suffix);
         }
-
         data.$suffix.show();
       } else {
         data.$suffix.hide();
diff --git a/web/core/misc/message.js b/web/core/misc/message.js
index e08cbaa8b..39e8980f1 100644
--- a/web/core/misc/message.js
+++ b/web/core/misc/message.js
@@ -4,48 +4,39 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 (function (Drupal) {
   Drupal.Message = function () {
     function _class() {
       var messageWrapper = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-
       _classCallCheck(this, _class);
-
       if (!messageWrapper) {
         this.messageWrapper = Drupal.Message.defaultWrapper();
       } else {
         this.messageWrapper = messageWrapper;
       }
     }
-
     _createClass(_class, [{
       key: "add",
       value: function add(message) {
         var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
         if (!options.hasOwnProperty('type')) {
           options.type = 'status';
         }
-
         if (typeof message !== 'string') {
           throw new Error('Message must be a string.');
         }
-
         Drupal.Message.announce(message, options);
         options.id = options.id ? String(options.id) : "".concat(options.type, "-").concat(Math.random().toFixed(15).replace('0.', ''));
-
         if (!Drupal.Message.getMessageTypeLabels().hasOwnProperty(options.type)) {
           var type = options.type;
           throw new Error("The message type, ".concat(type, ", is not present in Drupal.Message.getMessageTypeLabels()."));
         }
-
         this.messageWrapper.appendChild(Drupal.theme('message', {
           text: message
         }, options));
@@ -65,7 +56,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       key: "clear",
       value: function clear() {
         var _this = this;
-
         Array.prototype.forEach.call(this.messageWrapper.querySelectorAll('[data-drupal-message-id]'), function (message) {
           _this.messageWrapper.removeChild(message);
         });
@@ -74,14 +64,12 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       key: "defaultWrapper",
       value: function defaultWrapper() {
         var wrapper = document.querySelector('[data-drupal-messages]');
-
         if (!wrapper) {
           wrapper = document.querySelector('[data-drupal-messages-fallback]');
           wrapper.removeAttribute('data-drupal-messages-fallback');
           wrapper.setAttribute('data-drupal-messages', '');
           wrapper.classList.remove('hidden');
         }
-
         return wrapper.innerHTML === '' ? Drupal.Message.messageInternalWrapper(wrapper) : wrapper.firstElementChild;
       }
     }, {
@@ -99,7 +87,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
         if (!options.priority && (options.type === 'warning' || options.type === 'error')) {
           options.priority = 'assertive';
         }
-
         if (options.announce !== '') {
           Drupal.announce(options.announce || message, options.priority);
         }
@@ -113,14 +100,12 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
         return innerWrapper;
       }
     }]);
-
     return _class;
   }();
-
   Drupal.theme.message = function (_ref, _ref2) {
     var text = _ref.text;
     var type = _ref2.type,
-        id = _ref2.id;
+      id = _ref2.id;
     var messagesTypes = Drupal.Message.getMessageTypeLabels();
     var messageWrapper = document.createElement('div');
     messageWrapper.setAttribute('class', "messages messages--".concat(type));
diff --git a/web/core/misc/modernizr-additional-tests.js b/web/core/misc/modernizr-additional-tests.js
index 9510b95bf..204347198 100644
--- a/web/core/misc/modernizr-additional-tests.js
+++ b/web/core/misc/modernizr-additional-tests.js
@@ -4,25 +4,20 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Modernizr) {
   var _deprecationErrorModernizrCopy = function _deprecationErrorModernizrCopy(_ref) {
     var message = _ref.message;
-
     if (typeof console !== 'undefined' && console.warn) {
       console.warn("[Deprecation] ".concat(message));
     }
   };
-
   var _deprecatedPropertyModernizrCopy = function _deprecatedPropertyModernizrCopy(_ref2) {
     var target = _ref2.target,
-        deprecatedProperty = _ref2.deprecatedProperty,
-        message = _ref2.message;
-
+      deprecatedProperty = _ref2.deprecatedProperty,
+      message = _ref2.message;
     if (!Proxy || !Reflect) {
       return target;
     }
-
     return new Proxy(target, {
       get: function get(target, key) {
         if (key === deprecatedProperty) {
@@ -30,33 +25,26 @@
             message: message
           });
         }
-
         for (var _len = arguments.length, rest = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
           rest[_key - 2] = arguments[_key];
         }
-
         return Reflect.get.apply(Reflect, [target, key].concat(rest));
       }
     });
   };
-
   window.Modernizr = _deprecatedPropertyModernizrCopy({
     target: Modernizr,
     deprecatedProperty: 'touchevents',
     message: 'The touchevents property of Modernizr has been deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There will be no replacement for this feature. See https://www.drupal.org/node/3277381.'
   });
-
   if (document.documentElement.classList.contains('touchevents') || document.documentElement.classList.contains('no-touchevents')) {
     return;
   }
-
   Modernizr.addTest('touchevents', function () {
     _deprecationErrorModernizrCopy({
       message: 'The Modernizr touch events test is deprecated in Drupal 9.4.0 and will be removed in Drupal 10.0.0. See https://www.drupal.org/node/3277381 for information on its replacement and how it should be used.'
     });
-
     var bool;
-
     if ('ontouchstart' in window || window.DocumentTouch && document instanceof window.DocumentTouch) {
       bool = true;
     } else {
@@ -65,7 +53,6 @@
         bool = node.offsetTop === 9;
       });
     }
-
     return bool;
   });
 })(Modernizr);
\ No newline at end of file
diff --git a/web/core/misc/polyfills/array.find.js b/web/core/misc/polyfills/array.find.js
index 98341bf4c..52ab43b88 100644
--- a/web/core/misc/polyfills/array.find.js
+++ b/web/core/misc/polyfills/array.find.js
@@ -4,34 +4,26 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (!Array.prototype.find) {
   Object.defineProperty(Array.prototype, 'find', {
     value: function value(predicate) {
       if (this == null) {
         throw TypeError('"this" is null or not defined');
       }
-
       var o = Object(this);
       var len = o.length >>> 0;
-
       if (typeof predicate !== 'function') {
         throw TypeError('predicate must be a function');
       }
-
       var thisArg = arguments[1];
       var k = 0;
-
       while (k < len) {
         var kValue = o[k];
-
         if (predicate.call(thisArg, kValue, k, o)) {
           return kValue;
         }
-
         k++;
       }
-
       return undefined;
     },
     configurable: true,
diff --git a/web/core/misc/polyfills/array.includes.js b/web/core/misc/polyfills/array.includes.js
index 019fd8a04..41a96a4e0 100644
--- a/web/core/misc/polyfills/array.includes.js
+++ b/web/core/misc/polyfills/array.includes.js
@@ -4,45 +4,34 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (!Array.prototype.includes) {
   Array.prototype.includes = function (searchElement) {
     if (this == null) {
       throw new TypeError('Array.prototype.includes called on null or undefined');
     }
-
     var O = Object(this);
     var len = parseInt(O.length, 10) || 0;
-
     if (len === 0) {
       return false;
     }
-
     var n = parseInt(arguments[1], 10) || 0;
     var k;
-
     if (n >= 0) {
       k = n;
     } else {
       k = len + n;
-
       if (k < 0) {
         k = 0;
       }
     }
-
     var currentElement;
-
     while (k < len) {
       currentElement = O[k];
-
       if (searchElement === currentElement || searchElement !== searchElement && currentElement !== currentElement) {
         return true;
       }
-
       k += 1;
     }
-
     return false;
   };
 }
\ No newline at end of file
diff --git a/web/core/misc/polyfills/customevent.js b/web/core/misc/polyfills/customevent.js
index 87e371ed1..2f29cb340 100644
--- a/web/core/misc/polyfills/customevent.js
+++ b/web/core/misc/polyfills/customevent.js
@@ -4,10 +4,8 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function () {
   if (typeof window.CustomEvent === 'function') return false;
-
   function CustomEvent(event, params) {
     params = params || {
       bubbles: false,
@@ -18,6 +16,5 @@
     evt.initCustomEvent(event, params.bubbles, params.cancelable, params.detail);
     return evt;
   }
-
   window.CustomEvent = CustomEvent;
 })();
\ No newline at end of file
diff --git a/web/core/misc/polyfills/element.closest.js b/web/core/misc/polyfills/element.closest.js
index 3b4c03350..6407eaa3e 100644
--- a/web/core/misc/polyfills/element.closest.js
+++ b/web/core/misc/polyfills/element.closest.js
@@ -4,16 +4,13 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (!Element.prototype.closest) {
   Element.prototype.closest = function (s) {
     var el = this;
-
     do {
       if (Element.prototype.matches.call(el, s)) return el;
       el = el.parentElement || el.parentNode;
     } while (el !== null && el.nodeType === 1);
-
     return null;
   };
 }
\ No newline at end of file
diff --git a/web/core/misc/polyfills/element.matches.js b/web/core/misc/polyfills/element.matches.js
index 8fc544b4b..1d52bbd28 100644
--- a/web/core/misc/polyfills/element.matches.js
+++ b/web/core/misc/polyfills/element.matches.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (!Element.prototype.matches) {
   Element.prototype.matches = Element.prototype.msMatchesSelector || Element.prototype.webkitMatchesSelector;
 }
\ No newline at end of file
diff --git a/web/core/misc/polyfills/nodelist.foreach.js b/web/core/misc/polyfills/nodelist.foreach.js
index a0ecf7bbc..80a0caab5 100644
--- a/web/core/misc/polyfills/nodelist.foreach.js
+++ b/web/core/misc/polyfills/nodelist.foreach.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (window.NodeList && !NodeList.prototype.forEach) {
   NodeList.prototype.forEach = Array.prototype.forEach;
 }
\ No newline at end of file
diff --git a/web/core/misc/polyfills/object.assign.js b/web/core/misc/polyfills/object.assign.js
index 265eb629a..58f76f6cc 100644
--- a/web/core/misc/polyfills/object.assign.js
+++ b/web/core/misc/polyfills/object.assign.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (typeof Object.assign !== 'function') {
   Object.defineProperty(Object, 'assign', {
     value: function assign(target, varArgs) {
@@ -13,12 +12,9 @@ if (typeof Object.assign !== 'function') {
       if (target === null || target === undefined) {
         throw new TypeError('Cannot convert undefined or null to object');
       }
-
       var to = Object(target);
-
       for (var index = 1; index < arguments.length; index++) {
         var nextSource = arguments[index];
-
         if (nextSource !== null && nextSource !== undefined) {
           for (var nextKey in nextSource) {
             if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
@@ -27,7 +23,6 @@ if (typeof Object.assign !== 'function') {
           }
         }
       }
-
       return to;
     },
     writable: true,
diff --git a/web/core/misc/polyfills/string.includes.js b/web/core/misc/polyfills/string.includes.js
index 1a1ea7cd0..772c4c0c1 100644
--- a/web/core/misc/polyfills/string.includes.js
+++ b/web/core/misc/polyfills/string.includes.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (!String.prototype.includes) {
   String.prototype.includes = function (search, start) {
     'use strict';
@@ -12,11 +11,9 @@ if (!String.prototype.includes) {
     if (search instanceof RegExp) {
       throw TypeError('first argument must not be a RegExp');
     }
-
     if (start === undefined) {
       start = 0;
     }
-
     return this.indexOf(search, start) !== -1;
   };
 }
\ No newline at end of file
diff --git a/web/core/misc/position.es6.js b/web/core/misc/position.es6.js
index a371918f2..a42f2331f 100644
--- a/web/core/misc/position.es6.js
+++ b/web/core/misc/position.es6.js
@@ -7,9 +7,8 @@
  * provided by jQuery UI position, but refactored to meet Drupal coding
  * standards, and restructured so it extends jQuery core instead of jQuery UI.
  *
- * For most positioning needs, the core/popperjs library should be used instead
- * of the functionality provided here. This is provided to support pre-existing
- * code that expects the jQuery position API.
+ * This is provided to support pre-existing code that expects the jQuery
+ * position API.
  *
  * @see https://github.com/jquery/jquery-ui/blob/1.12.1/LICENSE.txt
  * @see https://raw.githubusercontent.com/jquery/jquery-ui/1.12.1/ui/position.js
diff --git a/web/core/misc/position.js b/web/core/misc/position.js
index 962def4ef..fc99097e0 100644
--- a/web/core/misc/position.js
+++ b/web/core/misc/position.js
@@ -4,29 +4,24 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($) {
   var cachedScrollbarWidth = null;
   var max = Math.max,
-      abs = Math.abs;
+    abs = Math.abs;
   var regexHorizontal = /left|center|right/;
   var regexVertical = /top|center|bottom/;
   var regexOffset = /[+-]\d+(\.[\d]+)?%?/;
   var regexPosition = /^\w+/;
   var regexPercent = /%$/;
   var _position = $.fn.position;
-
   function getOffsets(offsets, width, height) {
     return [parseFloat(offsets[0]) * (regexPercent.test(offsets[0]) ? width / 100 : 1), parseFloat(offsets[1]) * (regexPercent.test(offsets[1]) ? height / 100 : 1)];
   }
-
   function parseCss(element, property) {
     return parseInt($.css(element, property), 10) || 0;
   }
-
   function getDimensions(elem) {
     var raw = elem[0];
-
     if (raw.nodeType === 9) {
       return {
         width: elem.width(),
@@ -37,7 +32,6 @@
         }
       };
     }
-
     if ($.isWindow(raw)) {
       return {
         width: elem.width(),
@@ -48,7 +42,6 @@
         }
       };
     }
-
     if (raw.preventDefault) {
       return {
         width: 0,
@@ -59,14 +52,12 @@
         }
       };
     }
-
     return {
       width: elem.outerWidth(),
       height: elem.outerHeight(),
       offset: elem.offset()
     };
   }
-
   var collisions = {
     fit: {
       left: function left(position, data) {
@@ -77,7 +68,6 @@
         var overLeft = withinOffset - collisionPosLeft;
         var overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset;
         var newOverRight;
-
         if (data.collisionWidth > outerWidth) {
           if (overLeft > 0 && overRight <= 0) {
             newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
@@ -105,7 +95,6 @@
         var overTop = withinOffset - collisionPosTop;
         var overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset;
         var newOverBottom;
-
         if (data.collisionHeight > outerHeight) {
           if (overTop > 0 && overBottom <= 0) {
             newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
@@ -140,16 +129,13 @@
         var offset = -2 * data.offset[0];
         var newOverRight;
         var newOverLeft;
-
         if (overLeft < 0) {
           newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
-
           if (newOverRight < 0 || newOverRight < abs(overLeft)) {
             position.left += myOffset + atOffset + offset;
           }
         } else if (overRight > 0) {
           newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
-
           if (newOverLeft > 0 || abs(newOverLeft) < overRight) {
             position.left += myOffset + atOffset + offset;
           }
@@ -169,16 +155,13 @@
         var offset = -2 * data.offset[1];
         var newOverTop;
         var newOverBottom;
-
         if (overTop < 0) {
           newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
-
           if (newOverBottom < 0 || newOverBottom < abs(overTop)) {
             position.top += myOffset + atOffset + offset;
           }
         } else if (overBottom > 0) {
           newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
-
           if (newOverTop > 0 || abs(newOverTop) < overBottom) {
             position.top += myOffset + atOffset + offset;
           }
@@ -190,7 +173,6 @@
         for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
           args[_key] = arguments[_key];
         }
-
         collisions.flip.left.apply(this, args);
         collisions.fit.left.apply(this, args);
       },
@@ -198,7 +180,6 @@
         for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
           args[_key2] = arguments[_key2];
         }
-
         collisions.flip.top.apply(this, args);
         collisions.fit.top.apply(this, args);
       }
@@ -209,18 +190,15 @@
       if (cachedScrollbarWidth !== undefined) {
         return cachedScrollbarWidth;
       }
-
       var div = $('<div ' + "style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" + "<div style='height:100px;width:auto;'></div></div>");
       var innerDiv = div.children()[0];
       $('body').append(div);
       var w1 = innerDiv.offsetWidth;
       div.css('overflow', 'scroll');
       var w2 = innerDiv.offsetWidth;
-
       if (w1 === w2) {
         w2 = div[0].clientWidth;
       }
-
       div.remove();
       cachedScrollbarWidth = w1 - w2;
       return cachedScrollbarWidth;
@@ -255,12 +233,10 @@
       };
     }
   };
-
   $.fn.position = function (options) {
     if (!options || !options.of) {
       return _position.apply(this, arguments);
     }
-
     options = $.extend({}, options);
     var within = $.position.getWithinInfo(options.within);
     var scrollInfo = $.position.getScrollInfo(within);
@@ -271,19 +247,15 @@
     var targetWidth = dimensions.width;
     var targetHeight = dimensions.height;
     var targetOffset = dimensions.offset;
-
     if (target[0].preventDefault) {
       options.at = 'left top';
     }
-
     var basePosition = $.extend({}, targetOffset);
     $.each(['my', 'at'], function () {
       var pos = (options[this] || '').split(' ');
-
       if (pos.length === 1) {
         pos = regexHorizontal.test(pos[0]) ? pos.concat(['center']) : regexVertical.test(pos[0]) ? ['center'].concat(pos) : ['center', 'center'];
       }
-
       pos[0] = regexHorizontal.test(pos[0]) ? pos[0] : 'center';
       pos[1] = regexVertical.test(pos[1]) ? pos[1] : 'center';
       var horizontalOffset = regexOffset.exec(pos[0]);
@@ -291,23 +263,19 @@
       offsets[this] = [horizontalOffset ? horizontalOffset[0] : 0, verticalOffset ? verticalOffset[0] : 0];
       options[this] = [regexPosition.exec(pos[0])[0], regexPosition.exec(pos[1])[0]];
     });
-
     if (collision.length === 1) {
       collision[1] = collision[0];
     }
-
     if (options.at[0] === 'right') {
       basePosition.left += targetWidth;
     } else if (options.at[0] === 'center') {
       basePosition.left += targetWidth / 2;
     }
-
     if (options.at[1] === 'bottom') {
       basePosition.top += targetHeight;
     } else if (options.at[1] === 'center') {
       basePosition.top += targetHeight / 2;
     }
-
     var atOffset = getOffsets(offsets.at, targetWidth, targetHeight);
     basePosition.left += atOffset[0];
     basePosition.top += atOffset[1];
@@ -322,19 +290,16 @@
       var collisionHeight = elemHeight + marginTop + parseCss(this, 'marginBottom') + scrollInfo.height;
       var position = $.extend({}, basePosition);
       var myOffset = getOffsets(offsets.my, elem.outerWidth(), elem.outerHeight());
-
       if (options.my[0] === 'right') {
         position.left -= elemWidth;
       } else if (options.my[0] === 'center') {
         position.left -= elemWidth / 2;
       }
-
       if (options.my[1] === 'bottom') {
         position.top -= elemHeight;
       } else if (options.my[1] === 'center') {
         position.top -= elemHeight / 2;
       }
-
       position.left += myOffset[0];
       position.top += myOffset[1];
       var collisionPosition = {
@@ -359,7 +324,6 @@
           });
         }
       });
-
       if (options.using) {
         using = function using(props) {
           var left = targetOffset.left - position.left;
@@ -384,34 +348,27 @@
             horizontal: right < 0 ? 'left' : left > 0 ? 'right' : 'center',
             vertical: bottom < 0 ? 'top' : top > 0 ? 'bottom' : 'middle'
           };
-
           if (targetWidth < elemWidth && abs(left + right) < targetWidth) {
             feedback.horizontal = 'center';
           }
-
           if (targetHeight < elemHeight && abs(top + bottom) < targetHeight) {
             feedback.vertical = 'middle';
           }
-
           if (max(abs(left), abs(right)) > max(abs(top), abs(bottom))) {
             feedback.important = 'horizontal';
           } else {
             feedback.important = 'vertical';
           }
-
           options.using.call(this, props, feedback);
         };
       }
-
       elem.offset($.extend(position, {
         using: using
       }));
     });
   };
-
   if (!$.hasOwnProperty('ui')) {
     $.ui = {};
   }
-
   $.ui.position = collisions;
 })(jQuery);
\ No newline at end of file
diff --git a/web/core/misc/progress.js b/web/core/misc/progress.js
index fc532a897..53f690849 100644
--- a/web/core/misc/progress.js
+++ b/web/core/misc/progress.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.theme.progressBar = function (id) {
     return "<div id=\"".concat(id, "\" class=\"progress\" aria-live=\"polite\">") + '<div class="progress__label">&nbsp;</div>' + '<div class="progress__track"><div class="progress__bar"></div></div>' + '<div class="progress__percentage"></div>' + '<div class="progress__description">&nbsp;</div>' + '</div>';
   };
-
   Drupal.ProgressBar = function (id, updateCallback, method, errorCallback) {
     this.id = id;
     this.method = method || 'GET';
@@ -17,17 +15,14 @@
     this.errorCallback = errorCallback;
     this.element = $(Drupal.theme('progressBar', id));
   };
-
   $.extend(Drupal.ProgressBar.prototype, {
     setProgress: function setProgress(percentage, message, label) {
       if (percentage >= 0 && percentage <= 100) {
         $(this.element).find('div.progress__bar').css('width', "".concat(percentage, "%"));
         $(this.element).find('div.progress__percentage').html("".concat(percentage, "%"));
       }
-
       $('div.progress__description', this.element).html(message);
       $('div.progress__label', this.element).html(label);
-
       if (this.updateCallback) {
         this.updateCallback(percentage, message, this);
       }
@@ -45,17 +40,14 @@
       if (this.timer) {
         clearTimeout(this.timer);
       }
-
       if (this.uri) {
         var pb = this;
         var uri = this.uri;
-
         if (uri.indexOf('?') === -1) {
           uri += '?';
         } else {
           uri += '&';
         }
-
         uri += '_format=json';
         $.ajax({
           type: this.method,
@@ -67,7 +59,6 @@
               pb.displayError(progress.data);
               return;
             }
-
             pb.setProgress(progress.percentage, progress.message, progress.label);
             pb.timer = setTimeout(function () {
               pb.sendPing();
@@ -83,7 +74,6 @@
     displayError: function displayError(string) {
       var error = $('<div class="messages messages--error"></div>').html(string);
       $(this.element).before(error).hide();
-
       if (this.errorCallback) {
         this.errorCallback(this);
       }
diff --git a/web/core/misc/states.es6.js b/web/core/misc/states.es6.js
index b45e1e050..69cc4b345 100644
--- a/web/core/misc/states.es6.js
+++ b/web/core/misc/states.es6.js
@@ -526,6 +526,10 @@
         // the state.
         return this.val() === '';
       },
+      // Listen to 'change' for number native "spinner" widgets.
+      change() {
+        return this.val() === '';
+      },
     },
 
     checked: {
@@ -679,7 +683,6 @@
     // element monitoring itself.
     if (e.trigger) {
       $(e.target)
-        .prop('disabled', e.value)
         .closest('.js-form-item, .js-form-submit, .js-form-wrapper')
         .toggleClass('form-disabled', e.value)
         .find('select, input, textarea')
@@ -722,7 +725,11 @@
 
   $document.on('state:checked', (e) => {
     if (e.trigger) {
-      $(e.target).prop('checked', e.value);
+      $(e.target)
+        .closest('.js-form-item, .js-form-wrapper')
+        .find('input')
+        .prop('checked', e.value)
+        .trigger('change');
     }
   });
 
diff --git a/web/core/misc/states.js b/web/core/misc/states.js
index 8629f8da7..15987aca8 100644
--- a/web/core/misc/states.js
+++ b/web/core/misc/states.js
@@ -4,42 +4,33 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   var states = {
     postponed: []
   };
   Drupal.states = states;
-
   function invert(a, invertState) {
     return invertState && typeof a !== 'undefined' ? !a : a;
   }
-
   function _compare2(a, b) {
     if (a === b) {
       return typeof a === 'undefined' ? a : true;
     }
-
     return typeof a === 'undefined' || typeof b === 'undefined';
   }
-
   function ternary(a, b) {
     if (typeof a === 'undefined') {
       return b;
     }
-
     if (typeof b === 'undefined') {
       return a;
     }
-
     return a && b;
   }
-
   Drupal.behaviors.states = {
     attach: function attach(context, settings) {
       var $states = $(context).find('[data-drupal-states]');
       var il = $states.length;
-
       var _loop = function _loop(i) {
         var config = JSON.parse($states[i].getAttribute('data-drupal-states'));
         Object.keys(config || {}).forEach(function (state) {
@@ -50,20 +41,16 @@
           });
         });
       };
-
       for (var i = 0; i < il; i++) {
         _loop(i);
       }
-
       while (states.postponed.length) {
         states.postponed.shift()();
       }
     }
   };
-
   states.Dependent = function (args) {
     var _this = this;
-
     $.extend(this, {
       values: {},
       oldValue: null
@@ -73,7 +60,6 @@
       _this.initializeDependee(selector, _this.dependees[selector]);
     });
   };
-
   states.Dependent.comparisons = {
     RegExp: function RegExp(reference, value) {
       return reference.test(value);
@@ -88,15 +74,12 @@
   states.Dependent.prototype = {
     initializeDependee: function initializeDependee(selector, dependeeStates) {
       var _this2 = this;
-
       this.values[selector] = {};
       Object.keys(dependeeStates).forEach(function (i) {
         var state = dependeeStates[i];
-
         if ($.inArray(state, dependeeStates) === -1) {
           return;
         }
-
         state = states.State.sanitize(state);
         _this2.values[selector][state.name] = null;
         $(selector).on("state:".concat(state), {
@@ -113,11 +96,9 @@
     },
     compare: function compare(reference, selector, state) {
       var value = this.values[selector][state.name];
-
       if (reference.constructor.name in states.Dependent.comparisons) {
         return states.Dependent.comparisons[reference.constructor.name](reference, value);
       }
-
       return _compare2(reference, value);
     },
     update: function update(selector, state, value) {
@@ -128,7 +109,6 @@
     },
     reevaluate: function reevaluate() {
       var value = this.verifyConstraints(this.constraints);
-
       if (value !== this.oldValue) {
         this.oldValue = value;
         value = invert(value, this.state.invert);
@@ -141,19 +121,15 @@
     },
     verifyConstraints: function verifyConstraints(constraints, selector) {
       var result;
-
       if ($.isArray(constraints)) {
         var hasXor = $.inArray('xor', constraints) === -1;
         var len = constraints.length;
-
         for (var i = 0; i < len; i++) {
           if (constraints[i] !== 'xor') {
             var constraint = this.checkConstraints(constraints[i], selector, i);
-
             if (constraint && (hasXor || result)) {
               return hasXor;
             }
-
             result = result || constraint;
           }
         }
@@ -161,14 +137,12 @@
         for (var n in constraints) {
           if (constraints.hasOwnProperty(n)) {
             result = ternary(result, this.checkConstraints(constraints[n], selector, n));
-
             if (result === false) {
               return false;
             }
           }
         }
       }
-
       return result;
     },
     checkConstraints: function checkConstraints(value, selector, state) {
@@ -178,46 +152,36 @@
         selector = state;
         state = null;
       }
-
       if (state !== null) {
         state = states.State.sanitize(state);
         return invert(this.compare(value, selector, state), state.invert);
       }
-
       return this.verifyConstraints(value, selector);
     },
     getDependees: function getDependees() {
       var cache = {};
       var _compare = this.compare;
-
       this.compare = function (reference, selector, state) {
         (cache[selector] || (cache[selector] = [])).push(state.name);
       };
-
       this.verifyConstraints(this.constraints);
       this.compare = _compare;
       return cache;
     }
   };
-
   states.Trigger = function (args) {
     $.extend(this, args);
-
     if (this.state in states.Trigger.states) {
       this.element = $(this.selector);
-
       if (!this.element.data("trigger:".concat(this.state))) {
         this.initialize();
       }
     }
   };
-
   states.Trigger.prototype = {
     initialize: function initialize() {
       var _this3 = this;
-
       var trigger = states.Trigger.states[this.state];
-
       if (typeof trigger === 'function') {
         trigger.call(window, this.element);
       } else {
@@ -225,14 +189,12 @@
           _this3.defaultTrigger(event, trigger[event]);
         });
       }
-
       this.element.data("trigger:".concat(this.state), true);
     },
     defaultTrigger: function defaultTrigger(event, valueFn) {
       var oldValue = valueFn.call(this.element);
       this.element.on(event, $.proxy(function (e) {
         var value = valueFn.call(this.element, e);
-
         if (oldValue !== value) {
           this.element.trigger({
             type: "state:".concat(this.state),
@@ -255,6 +217,9 @@
     empty: {
       keyup: function keyup() {
         return this.val() === '';
+      },
+      change: function change() {
+        return this.val() === '';
       }
     },
     checked: {
@@ -272,14 +237,12 @@
         if (this.length > 1) {
           return this.filter(':checked').val() || false;
         }
-
         return this.val();
       },
       change: function change() {
         if (this.length > 1) {
           return this.filter(':checked').val() || false;
         }
-
         return this.val();
       }
     },
@@ -289,18 +252,15 @@
       }
     }
   };
-
   states.State = function (state) {
     this.pristine = state;
     this.name = state;
     var process = true;
-
     do {
       while (this.name.charAt(0) === '!') {
         this.name = this.name.substring(1);
         this.invert = !this.invert;
       }
-
       if (this.name in states.State.aliases) {
         this.name = states.State.aliases[this.name];
       } else {
@@ -308,15 +268,12 @@
       }
     } while (process);
   };
-
   states.State.sanitize = function (state) {
     if (state instanceof states.State) {
       return state;
     }
-
     return new states.State(state);
   };
-
   states.State.aliases = {
     enabled: '!disabled',
     invisible: '!visible',
@@ -340,7 +297,7 @@
   var $document = $(document);
   $document.on('state:disabled', function (e) {
     if (e.trigger) {
-      $(e.target).prop('disabled', e.value).closest('.js-form-item, .js-form-submit, .js-form-wrapper').toggleClass('form-disabled', e.value).find('select, input, textarea').prop('disabled', e.value);
+      $(e.target).closest('.js-form-item, .js-form-submit, .js-form-wrapper').toggleClass('form-disabled', e.value).find('select, input, textarea').prop('disabled', e.value);
     }
   });
   $document.on('state:required', function (e) {
@@ -351,7 +308,6 @@
           required: 'required',
           'aria-required': 'true'
         }).closest('.js-form-item, .js-form-wrapper').find(label);
-
         if (!$label.hasClass('js-form-required').length) {
           $label.addClass('js-form-required form-required');
         }
@@ -367,7 +323,7 @@
   });
   $document.on('state:checked', function (e) {
     if (e.trigger) {
-      $(e.target).prop('checked', e.value);
+      $(e.target).closest('.js-form-item, .js-form-wrapper').find('input').prop('checked', e.value).trigger('change');
     }
   });
   $document.on('state:collapsed', function (e) {
diff --git a/web/core/misc/tabbingmanager.js b/web/core/misc/tabbingmanager.js
index 7fd4f9192..4bd3fae94 100644
--- a/web/core/misc/tabbingmanager.js
+++ b/web/core/misc/tabbingmanager.js
@@ -4,27 +4,18 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 (function ($, Drupal, _ref) {
   var tabbable = _ref.tabbable,
-      isTabbable = _ref.isTabbable;
-
+    isTabbable = _ref.isTabbable;
   function TabbingManager() {
     this.stack = [];
   }
-
   function TabbingContext(options) {
     $.extend(this, {
       level: null,
@@ -35,23 +26,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       trapFocus: false
     }, options);
   }
-
   $.extend(TabbingManager.prototype, {
     constrain: function constrain(elements) {
       var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-          _ref2$trapFocus = _ref2.trapFocus,
-          trapFocus = _ref2$trapFocus === void 0 ? false : _ref2$trapFocus;
-
+        _ref2$trapFocus = _ref2.trapFocus,
+        trapFocus = _ref2$trapFocus === void 0 ? false : _ref2$trapFocus;
       var il = this.stack.length;
-
       for (var i = 0; i < il; i++) {
         this.stack[i].deactivate();
       }
-
       var tabbableElements = [];
       $(elements).each(function (index, rootElement) {
         tabbableElements = [].concat(_toConsumableArray(tabbableElements), _toConsumableArray(tabbable(rootElement)));
-
         if (isTabbable(rootElement)) {
           tabbableElements = [].concat(_toConsumableArray(tabbableElements), [rootElement]);
         }
@@ -68,13 +54,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     },
     release: function release() {
       var toActivate = this.stack.length - 1;
-
       while (toActivate >= 0 && this.stack[toActivate].released) {
         toActivate--;
       }
-
       this.stack.splice(toActivate + 1);
-
       if (toActivate >= 0) {
         this.stack[toActivate].activate();
       }
@@ -85,20 +68,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       var $disabledSet = $(tabbable(document.body)).not($set);
       tabbingContext.$disabledElements = $disabledSet;
       var il = $disabledSet.length;
-
       for (var i = 0; i < il; i++) {
         this.recordTabindex($disabledSet.eq(i), level);
       }
-
       $disabledSet.prop('tabindex', -1).prop('autofocus', false);
       var $hasFocus = $set.filter('[autofocus]').eq(-1);
-
       if ($hasFocus.length === 0) {
         $hasFocus = $set.eq(0);
       }
-
       $hasFocus.trigger('focus');
-
       if ($set.length && tabbingContext.trapFocus) {
         $set.last().on('keydown.focus-trap', function (event) {
           if (event.key === 'Tab' && !event.shiftKey) {
@@ -120,7 +98,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       var il = $set.length;
       tabbingContext.$tabbableElements.first().off('keydown.focus-trap');
       tabbingContext.$tabbableElements.last().off('keydown.focus-trap');
-
       for (var i = 0; i < il; i++) {
         this.restoreTabindex($set.eq(i), level);
       }
@@ -135,30 +112,24 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     },
     restoreTabindex: function restoreTabindex($el, level) {
       var tabInfo = $el.data('drupalOriginalTabIndices');
-
       if (tabInfo && tabInfo[level]) {
         var data = tabInfo[level];
-
         if (data.tabindex) {
           $el[0].setAttribute('tabindex', data.tabindex);
         } else {
           $el[0].removeAttribute('tabindex');
         }
-
         if (data.autofocus) {
           $el[0].setAttribute('autofocus', 'autofocus');
         }
-
         if (level === 0) {
           $el.removeData('drupalOriginalTabIndices');
         } else {
           var levelToDelete = level;
-
           while (tabInfo.hasOwnProperty(levelToDelete)) {
             delete tabInfo[levelToDelete];
             levelToDelete++;
           }
-
           $el.data('drupalOriginalTabIndices', tabInfo);
         }
       }
@@ -188,10 +159,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       }
     }
   });
-
   if (Drupal.tabbingManager) {
     return;
   }
-
   Drupal.tabbingManager = new TabbingManager();
 })(jQuery, Drupal, window.tabbable);
\ No newline at end of file
diff --git a/web/core/misc/tabledrag.es6.js b/web/core/misc/tabledrag.es6.js
index 7830c043b..b54ed7714 100644
--- a/web/core/misc/tabledrag.es6.js
+++ b/web/core/misc/tabledrag.es6.js
@@ -1704,7 +1704,7 @@
        */
       tableDragHandle() {
         return `<a href="#" title="${Drupal.t('Drag to re-order')}"
-        class="tabledrag-handle"><div class="handle">&nbsp;</div></a>`;
+        class="tabledrag-handle"><div class="handle"></div></a>`;
       },
     },
   );
diff --git a/web/core/misc/tabledrag.js b/web/core/misc/tabledrag.js
index 80b02f219..7729734d0 100644
--- a/web/core/misc/tabledrag.js
+++ b/web/core/misc/tabledrag.js
@@ -4,9 +4,7 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 (function ($, Drupal, drupalSettings) {
   var showWeight = JSON.parse(localStorage.getItem('Drupal.tableDrag.showWeight'));
   Drupal.behaviors.tableDrag = {
@@ -16,16 +14,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
           Drupal.tableDrag[base] = new Drupal.tableDrag(table[0], settings.tableDrag[base]);
         }
       }
-
       Object.keys(settings.tableDrag || {}).forEach(function (base) {
         initTableDrag($(once('tabledrag', "#".concat(base), context)), base);
       });
     }
   };
-
   Drupal.tableDrag = function (table, tableSettings) {
     var _this = this;
-
     var self = this;
     var $table = $(table);
     this.$table = $(table);
@@ -54,13 +49,11 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
         if (tableSettings[group][n].relationship === 'parent') {
           _this.indentEnabled = true;
         }
-
         if (tableSettings[group][n].limit > 0) {
           _this.maxDepth = tableSettings[group][n].limit;
         }
       });
     });
-
     if (this.indentEnabled) {
       this.indentCount = 1;
       var indent = Drupal.theme('tableDragIndentation');
@@ -70,7 +63,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       this.indentAmount = $indentation.get(1).offsetLeft - $indentation.get(0).offsetLeft;
       testRow.remove();
     }
-
     $table.find('> tr.draggable, > tbody > tr.draggable').each(function () {
       self.makeDraggable(this);
     });
@@ -101,10 +93,8 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       }
     }, this));
   };
-
   Drupal.tableDrag.prototype.initColumns = function () {
     var _this2 = this;
-
     var $table = this.$table;
     var hidden;
     var cell;
@@ -112,16 +102,13 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     Object.keys(this.tableSettings || {}).forEach(function (group) {
       Object.keys(_this2.tableSettings[group]).some(function (tableSetting) {
         var field = $table.find(".".concat(_this2.tableSettings[group][tableSetting].target)).eq(0);
-
         if (field.length && _this2.tableSettings[group][tableSetting].hidden) {
           hidden = _this2.tableSettings[group][tableSetting].hidden;
           cell = field.closest('td');
           return true;
         }
-
         return false;
       });
-
       if (hidden && cell[0]) {
         columnIndex = cell.parent().find('> td').index(cell.get(0)) + 1;
         $table.find('> thead > tr, > tbody > tr, > tr').each(_this2.addColspanClass(columnIndex));
@@ -129,7 +116,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     });
     this.displayColumns(showWeight);
   };
-
   Drupal.tableDrag.prototype.addColspanClass = function (columnIndex) {
     return function () {
       var $row = $(this);
@@ -141,10 +127,8 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
           index -= this.colSpan - 1;
         }
       });
-
       if (index > 0) {
         cell = cells.filter(":nth-child(".concat(index, ")"));
-
         if (cell[0].colSpan && cell[0].colSpan > 1) {
           cell.addClass('tabledrag-has-colspan');
         } else {
@@ -153,29 +137,24 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       }
     };
   };
-
   Drupal.tableDrag.prototype.displayColumns = function (displayWeight) {
     if (displayWeight) {
       this.showColumns();
     } else {
       this.hideColumns();
     }
-
     this.$toggleWeightButton.html(Drupal.theme('toggleButtonContent', displayWeight));
     $(once.filter('tabledrag', 'table')).trigger('columnschange', !!displayWeight);
   };
-
   Drupal.tableDrag.prototype.toggleColumns = function () {
     showWeight = !showWeight;
     this.displayColumns(showWeight);
-
     if (showWeight) {
       localStorage.setItem('Drupal.tableDrag.showWeight', showWeight);
     } else {
       localStorage.removeItem('Drupal.tableDrag.showWeight');
     }
   };
-
   Drupal.tableDrag.prototype.hideColumns = function () {
     var $tables = $(once.filter('tabledrag', 'table'));
     $tables.find('.tabledrag-hide').css('display', 'none');
@@ -184,7 +163,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       this.colSpan -= 1;
     });
   };
-
   Drupal.tableDrag.prototype.showColumns = function () {
     var $tables = $(once.filter('tabledrag', 'table'));
     $tables.find('.tabledrag-hide').css('display', '');
@@ -193,48 +171,40 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       this.colSpan += 1;
     });
   };
-
   Drupal.tableDrag.prototype.rowSettings = function (group, row) {
     var field = $(row).find(".".concat(group));
     var tableSettingsGroup = this.tableSettings[group];
     return Object.keys(tableSettingsGroup).map(function (delta) {
       var targetClass = tableSettingsGroup[delta].target;
       var rowSettings;
-
       if (field.is(".".concat(targetClass))) {
         rowSettings = {};
         Object.keys(tableSettingsGroup[delta]).forEach(function (n) {
           rowSettings[n] = tableSettingsGroup[delta][n];
         });
       }
-
       return rowSettings;
     }).filter(function (rowSetting) {
       return rowSetting;
     })[0];
   };
-
   Drupal.tableDrag.prototype.makeDraggable = function (item) {
     var self = this;
     var $item = $(item);
     $item.find('td:first-of-type').find('a').addClass('menu-item__link');
     var $handle = $(Drupal.theme('tableDragHandle'));
     var $indentationLast = $item.find('td:first-of-type').find('.js-indentation').eq(-1);
-
     if ($indentationLast.length) {
       $indentationLast.after($handle);
       self.indentCount = Math.max($item.find('.js-indentation').length, self.indentCount);
     } else {
       $item.find('td').eq(0).prepend($handle);
     }
-
     $handle.on('mousedown touchstart pointerdown', function (event) {
       event.preventDefault();
-
       if (event.originalEvent.type === 'touchstart') {
         event = event.originalEvent.touches[0];
       }
-
       self.dragStart(event, self, item);
     });
     $handle.on('click', function (e) {
@@ -252,42 +222,34 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       if (event.keyCode !== 9 && !self.rowObject) {
         self.rowObject = new self.row(item, 'keyboard', self.indentEnabled, self.maxDepth, true);
       }
-
       var keyChange = false;
       var groupHeight;
-
       switch (event.keyCode) {
         case 37:
         case 63234:
           keyChange = true;
           self.rowObject.indent(-1 * self.rtl);
           break;
-
         case 38:
         case 63232:
           {
             var $previousRow = $(self.rowObject.element).prev('tr').eq(0);
             var previousRow = $previousRow.get(0);
-
             while (previousRow && $previousRow.is(':hidden')) {
               $previousRow = $(previousRow).prev('tr').eq(0);
               previousRow = $previousRow.get(0);
             }
-
             if (previousRow) {
               self.safeBlur = false;
               self.rowObject.direction = 'up';
               keyChange = true;
-
               if ($(item).is('.tabledrag-root')) {
                 groupHeight = 0;
-
                 while (previousRow && $previousRow.find('.js-indentation').length) {
                   $previousRow = $(previousRow).prev('tr').eq(0);
                   previousRow = $previousRow.get(0);
                   groupHeight += $previousRow.is(':hidden') ? 0 : previousRow.offsetHeight;
                 }
-
                 if (previousRow) {
                   self.rowObject.swap('before', previousRow);
                   window.scrollBy(0, -groupHeight);
@@ -298,39 +260,31 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
                 self.rowObject.indent(0);
                 window.scrollBy(0, -parseInt(item.offsetHeight, 10));
               }
-
               $handle.trigger('focus');
             }
-
             break;
           }
-
         case 39:
         case 63235:
           keyChange = true;
           self.rowObject.indent(self.rtl);
           break;
-
         case 40:
         case 63233:
           {
             var $nextRow = $(self.rowObject.group).eq(-1).next('tr').eq(0);
             var nextRow = $nextRow.get(0);
-
             while (nextRow && $nextRow.is(':hidden')) {
               $nextRow = $(nextRow).next('tr').eq(0);
               nextRow = $nextRow.get(0);
             }
-
             if (nextRow) {
               self.safeBlur = false;
               self.rowObject.direction = 'down';
               keyChange = true;
-
               if ($(item).is('.tabledrag-root')) {
                 groupHeight = 0;
                 var nextGroup = new self.row(nextRow, 'keyboard', self.indentEnabled, self.maxDepth, false);
-
                 if (nextGroup) {
                   $(nextGroup.group).each(function () {
                     groupHeight += $(this).is(':hidden') ? 0 : this.offsetHeight;
@@ -345,30 +299,22 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
                 self.rowObject.indent(0);
                 window.scrollBy(0, parseInt(item.offsetHeight, 10));
               }
-
               $handle.trigger('focus');
             }
-
             break;
           }
       }
-
       if (self.rowObject && self.rowObject.changed === true) {
         $(item).addClass('drag');
-
         if (self.oldRowElement) {
           $(self.oldRowElement).removeClass('drag-previous');
         }
-
         self.oldRowElement = item;
-
         if (self.striping === true) {
           self.restripeTable();
         }
-
         self.onDrag();
       }
-
       if (keyChange) {
         return false;
       }
@@ -383,64 +329,51 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       }
     });
   };
-
   Drupal.tableDrag.prototype.dragStart = function (event, self, item) {
     self.dragObject = {};
     self.dragObject.initOffset = self.getPointerOffset(item, event);
     self.dragObject.initPointerCoords = self.pointerCoords(event);
-
     if (self.indentEnabled) {
       self.dragObject.indentPointerPos = self.dragObject.initPointerCoords;
     }
-
     if (self.rowObject) {
       $(self.rowObject.element).find('a.tabledrag-handle').trigger('blur');
     }
-
     self.rowObject = new self.row(item, 'pointer', self.indentEnabled, self.maxDepth, true);
     self.table.topY = $(self.table).offset().top;
     self.table.bottomY = self.table.topY + self.table.offsetHeight;
     $(item).addClass('drag');
     $('body').addClass('drag');
-
     if (self.oldRowElement) {
       $(self.oldRowElement).removeClass('drag-previous');
     }
-
     self.oldY = self.pointerCoords(event).y;
   };
-
   Drupal.tableDrag.prototype.dragRow = function (event, self) {
     if (self.dragObject) {
       self.currentPointerCoords = self.pointerCoords(event);
       var y = self.currentPointerCoords.y - self.dragObject.initOffset.y;
       var x = self.currentPointerCoords.x - self.dragObject.initOffset.x;
-
       if (y !== self.oldY) {
         self.rowObject.direction = y > self.oldY ? 'down' : 'up';
         self.oldY = y;
         var scrollAmount = self.checkScroll(self.currentPointerCoords.y);
         clearInterval(self.scrollInterval);
-
         if (scrollAmount > 0 && self.rowObject.direction === 'down' || scrollAmount < 0 && self.rowObject.direction === 'up') {
           self.setScroll(scrollAmount);
         }
-
         var currentRow = self.findDropTargetRow(x, y);
-
         if (currentRow) {
           if (self.rowObject.direction === 'down') {
             self.rowObject.swap('after', currentRow, self);
           } else {
             self.rowObject.swap('before', currentRow, self);
           }
-
           if (self.striping === true) {
             self.restripeTable();
           }
         }
       }
-
       if (self.indentEnabled) {
         var xDiff = self.currentPointerCoords.x - self.dragObject.indentPointerPos.x;
         var indentDiff = Math.round(xDiff / self.indentAmount);
@@ -448,24 +381,19 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
         self.dragObject.indentPointerPos.x += self.indentAmount * indentChange * self.rtl;
         self.indentCount = Math.max(self.indentCount, self.rowObject.indents);
       }
-
       return false;
     }
   };
-
   Drupal.tableDrag.prototype.dropRow = function (event, self) {
     var droppedRow;
     var $droppedRow;
-
     if (self.rowObject !== null) {
       droppedRow = self.rowObject.element;
       $droppedRow = $(droppedRow);
-
       if (self.rowObject.changed === true) {
         self.updateFields(droppedRow);
         Object.keys(self.tableSettings || {}).forEach(function (group) {
           var rowSettings = self.rowSettings(group, droppedRow);
-
           if (rowSettings.relationship === 'group') {
             Object.keys(self.rowObject.children || {}).forEach(function (n) {
               self.updateField(self.rowObject.children[n], group);
@@ -473,34 +401,28 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
           }
         });
         self.rowObject.markChanged();
-
         if (self.changed === false) {
           $(Drupal.theme('tableDragChangedWarning')).insertBefore(self.table).hide().fadeIn('slow');
           self.changed = true;
         }
       }
-
       if (self.indentEnabled) {
         self.rowObject.removeIndentClasses();
       }
-
       if (self.oldRowElement) {
         $(self.oldRowElement).removeClass('drag-previous');
       }
-
       $droppedRow.removeClass('drag').addClass('drag-previous');
       self.oldRowElement = droppedRow;
       self.onDrop();
       self.rowObject = null;
     }
-
     if (self.dragObject !== null) {
       self.dragObject = null;
       $('body').removeClass('drag');
       clearInterval(self.scrollInterval);
     }
   };
-
   Drupal.tableDrag.prototype.pointerCoords = function (event) {
     if (event.pageX || event.pageY) {
       return {
@@ -508,13 +430,11 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
         y: event.pageY
       };
     }
-
     return {
       x: event.clientX + document.body.scrollLeft - document.body.clientLeft,
       y: event.clientY + document.body.scrollTop - document.body.clientTop
     };
   };
-
   Drupal.tableDrag.prototype.getPointerOffset = function (target, event) {
     var docPos = $(target).offset();
     var pointerPos = this.pointerCoords(event);
@@ -523,24 +443,19 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       y: pointerPos.y - docPos.top
     };
   };
-
   Drupal.tableDrag.prototype.findDropTargetRow = function (x, y) {
     var _this3 = this;
-
     var rows = $(this.table.tBodies[0].rows).not(':hidden');
-
     var _loop = function _loop(n) {
       var row = rows[n];
       var $row = $(row);
       var rowY = $row.offset().top;
       var rowHeight = void 0;
-
       if (row.offsetHeight === 0) {
         rowHeight = parseInt(row.firstChild.offsetHeight, 10) / 2;
       } else {
         rowHeight = parseInt(row.offsetHeight, 10) / 2;
       }
-
       if (y > rowY - rowHeight && y < rowY + rowHeight) {
         if (_this3.indentEnabled) {
           if (Object.keys(_this3.rowObject.group).some(function (o) {
@@ -555,41 +470,32 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
             v: null
           };
         }
-
         if (!_this3.rowObject.isValidSwap(row)) {
           return {
             v: null
           };
         }
-
         while ($row.is(':hidden') && $row.prev('tr').is(':hidden')) {
           $row = $row.prev('tr:first-of-type');
           row = $row.get(0);
         }
-
         return {
           v: row
         };
       }
     };
-
     for (var n = 0; n < rows.length; n++) {
       var _ret = _loop(n);
-
       if (_typeof(_ret) === "object") return _ret.v;
     }
-
     return null;
   };
-
   Drupal.tableDrag.prototype.updateFields = function (changedRow) {
     var _this4 = this;
-
     Object.keys(this.tableSettings || {}).forEach(function (group) {
       _this4.updateField(changedRow, group);
     });
   };
-
   Drupal.tableDrag.prototype.updateField = function (changedRow, group) {
     var rowSettings = this.rowSettings(group, changedRow);
     var $changedRow = $(changedRow);
@@ -597,7 +503,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     var $previousRow;
     var previousRow;
     var useSibling;
-
     if (rowSettings.relationship === 'self' || rowSettings.relationship === 'group') {
       sourceRow = changedRow;
     } else if (rowSettings.relationship === 'sibling') {
@@ -606,7 +511,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       var $nextRow = $changedRow.next('tr:first-of-type');
       var nextRow = $nextRow.get(0);
       sourceRow = changedRow;
-
       if ($previousRow.is('.draggable') && $previousRow.find(".".concat(group)).length) {
         if (this.indentEnabled) {
           if ($previousRow.find('.js-indentations').length === $changedRow.find('.js-indentations').length) {
@@ -627,53 +531,41 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     } else if (rowSettings.relationship === 'parent') {
       $previousRow = $changedRow.prev('tr');
       previousRow = $previousRow;
-
       while ($previousRow.length && $previousRow.find('.js-indentation').length >= this.rowObject.indents) {
         $previousRow = $previousRow.prev('tr');
         previousRow = $previousRow;
       }
-
       if ($previousRow.length) {
         sourceRow = $previousRow.get(0);
       } else {
         sourceRow = $(this.table).find('tr.draggable:first-of-type').get(0);
-
         if (sourceRow === this.rowObject.element) {
           sourceRow = $(this.rowObject.group[this.rowObject.group.length - 1]).next('tr.draggable').get(0);
         }
-
         useSibling = true;
       }
     }
-
     this.copyDragClasses(sourceRow, changedRow, group);
     rowSettings = this.rowSettings(group, changedRow);
-
     if (useSibling) {
       rowSettings.relationship = 'sibling';
       rowSettings.source = rowSettings.target;
     }
-
     var targetClass = ".".concat(rowSettings.target);
     var targetElement = $changedRow.find(targetClass).get(0);
-
     if (targetElement) {
       var sourceClass = ".".concat(rowSettings.source);
       var sourceElement = $(sourceClass, sourceRow).get(0);
-
       switch (rowSettings.action) {
         case 'depth':
           targetElement.value = $(sourceElement).closest('tr').find('.js-indentation').length;
           break;
-
         case 'match':
           targetElement.value = sourceElement.value;
           break;
-
         case 'order':
           {
             var siblings = this.rowObject.findSiblings(rowSettings);
-
             if ($(targetElement).is('select')) {
               var values = [];
               $(targetElement).find('option').each(function () {
@@ -690,87 +582,71 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
             } else {
               var weight = 0;
               var $siblingTarget = $(siblings[0]).find(targetClass);
-
               if ($siblingTarget.length) {
                 weight = parseInt($siblingTarget[0].value, 10) || 0;
               }
-
               $(siblings).find(targetClass).each(function () {
                 this.value = weight;
                 weight++;
               });
             }
-
             break;
           }
       }
     }
   };
-
   Drupal.tableDrag.prototype.copyDragClasses = function (sourceRow, targetRow, group) {
     var sourceElement = $(sourceRow).find(".".concat(group));
     var targetElement = $(targetRow).find(".".concat(group));
-
     if (sourceElement.length && targetElement.length) {
       targetElement[0].className = sourceElement[0].className;
     }
   };
-
   Drupal.tableDrag.prototype.checkScroll = function (cursorY) {
     var de = document.documentElement;
     var b = document.body;
     var windowHeight = window.innerHeight || (de.clientHeight && de.clientWidth !== 0 ? de.clientHeight : b.offsetHeight);
     this.windowHeight = windowHeight;
     var scrollY;
-
     if (document.all) {
       scrollY = !de.scrollTop ? b.scrollTop : de.scrollTop;
     } else {
       scrollY = window.pageYOffset ? window.pageYOffset : window.scrollY;
     }
-
     this.scrollY = scrollY;
     var trigger = this.scrollSettings.trigger;
     var delta = 0;
-
     if (cursorY - scrollY > windowHeight - trigger) {
       delta = trigger / (windowHeight + scrollY - cursorY);
       delta = delta > 0 && delta < trigger ? delta : trigger;
       return delta * this.scrollSettings.amount;
     }
-
     if (cursorY - scrollY < trigger) {
       delta = trigger / (cursorY - scrollY);
       delta = delta > 0 && delta < trigger ? delta : trigger;
       return -delta * this.scrollSettings.amount;
     }
   };
-
   Drupal.tableDrag.prototype.setScroll = function (scrollAmount) {
     var self = this;
     this.scrollInterval = setInterval(function () {
       self.checkScroll(self.currentPointerCoords.y);
       var aboveTable = self.scrollY > self.table.topY;
       var belowTable = self.scrollY + self.windowHeight < self.table.bottomY;
-
       if (scrollAmount > 0 && belowTable || scrollAmount < 0 && aboveTable) {
         window.scrollBy(0, scrollAmount);
       }
     }, this.scrollSettings.interval);
   };
-
   Drupal.tableDrag.prototype.restripeTable = function () {
     $(this.table).find('> tbody > tr.draggable, > tr.draggable').filter(':visible').filter(':odd').removeClass('odd').addClass('even').end().filter(':even').removeClass('even').addClass('odd');
   };
-
   Drupal.tableDrag.prototype.onDrag = function () {
     return null;
   };
-
   Drupal.tableDrag.prototype.onDrop = function () {
     return null;
   };
-
   Drupal.tableDrag.prototype.row = function (tableRow, method, indentEnabled, maxDepth, addClasses) {
     var $tableRow = $(tableRow);
     this.element = tableRow;
@@ -782,67 +658,53 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     this.indentEnabled = indentEnabled;
     this.maxDepth = maxDepth;
     this.direction = '';
-
     if (this.indentEnabled) {
       this.indents = $tableRow.find('.js-indentation').length;
       this.children = this.findChildren(addClasses);
       this.group = this.group.concat(this.children);
-
       for (var n = 0; n < this.group.length; n++) {
         this.groupDepth = Math.max($(this.group[n]).find('.js-indentation').length, this.groupDepth);
       }
     }
   };
-
   Drupal.tableDrag.prototype.row.prototype.findChildren = function (addClasses) {
     var parentIndentation = this.indents;
     var currentRow = $(this.element, this.table).next('tr.draggable');
     var rows = [];
     var child = 0;
-
     function rowIndentation(indentNum, el) {
       var self = $(el);
-
       if (child === 1 && indentNum === parentIndentation) {
         self.addClass('tree-child-first');
       }
-
       if (indentNum === parentIndentation) {
         self.addClass('tree-child');
       } else if (indentNum > parentIndentation) {
         self.addClass('tree-child-horizontal');
       }
     }
-
     while (currentRow.length) {
       if (currentRow.find('.js-indentation').length > parentIndentation) {
         child++;
         rows.push(currentRow[0]);
-
         if (addClasses) {
           currentRow.find('.js-indentation').each(rowIndentation);
         }
       } else {
         break;
       }
-
       currentRow = currentRow.next('tr.draggable');
     }
-
     if (addClasses && rows.length) {
       $(rows[rows.length - 1]).find(".js-indentation:nth-child(".concat(parentIndentation + 1, ")")).addClass('tree-child-last');
     }
-
     return rows;
   };
-
   Drupal.tableDrag.prototype.row.prototype.isValidSwap = function (row) {
     var $row = $(row);
-
     if (this.indentEnabled) {
       var prevRow;
       var nextRow;
-
       if (this.direction === 'down') {
         prevRow = row;
         nextRow = $row.next('tr').get(0);
@@ -850,21 +712,16 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
         prevRow = $row.prev('tr').get(0);
         nextRow = row;
       }
-
       this.interval = this.validIndentInterval(prevRow, nextRow);
-
       if (this.interval.min > this.interval.max) {
         return false;
       }
     }
-
     if (this.table.tBodies[0].rows[0] === row && $row.is(':not(.draggable)')) {
       return false;
     }
-
     return true;
   };
-
   Drupal.tableDrag.prototype.row.prototype.swap = function (position, row) {
     this.group.forEach(function (row) {
       Drupal.detachBehaviors(row, drupalSettings, 'move');
@@ -876,42 +733,34 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
     this.changed = true;
     this.onSwap(row);
   };
-
   Drupal.tableDrag.prototype.row.prototype.validIndentInterval = function (prevRow, nextRow) {
     var $prevRow = $(prevRow);
     var maxIndent;
     var minIndent = nextRow ? $(nextRow).find('.js-indentation').length : 0;
-
     if (!prevRow || $prevRow.is(':not(.draggable)') || $(this.element).is('.tabledrag-root')) {
       maxIndent = 0;
     } else {
       maxIndent = $prevRow.find('.js-indentation').length + ($prevRow.is('.tabledrag-leaf') ? 0 : 1);
-
       if (this.maxDepth) {
         maxIndent = Math.min(maxIndent, this.maxDepth - (this.groupDepth - this.indents));
       }
     }
-
     return {
       min: minIndent,
       max: maxIndent
     };
   };
-
   Drupal.tableDrag.prototype.row.prototype.indent = function (indentDiff) {
     var $group = $(this.group);
-
     if (!this.interval) {
       var prevRow = $(this.element).prev('tr').get(0);
       var nextRow = $group.eq(-1).next('tr').get(0);
       this.interval = this.validIndentInterval(prevRow, nextRow);
     }
-
     var indent = this.indents + indentDiff;
     indent = Math.max(indent, this.interval.min);
     indent = Math.min(indent, this.interval.max);
     indentDiff = indent - this.indents;
-
     for (var n = 1; n <= Math.abs(indentDiff); n++) {
       if (indentDiff < 0) {
         $group.find('.js-indentation:first-of-type').remove();
@@ -921,31 +770,25 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
         this.indents++;
       }
     }
-
     if (indentDiff) {
       this.changed = true;
       this.groupDepth += indentDiff;
       this.onIndent();
     }
-
     return indentDiff;
   };
-
   Drupal.tableDrag.prototype.row.prototype.findSiblings = function (rowSettings) {
     var siblings = [];
     var directions = ['prev', 'next'];
     var rowIndentation = this.indents;
     var checkRowIndentation;
-
     for (var d = 0; d < directions.length; d++) {
       var checkRow = $(this.element)[directions[d]]();
-
       while (checkRow.length) {
         if (checkRow.find(".".concat(rowSettings.target))) {
           if (this.indentEnabled) {
             checkRowIndentation = checkRow.find('.js-indentation').length;
           }
-
           if (!this.indentEnabled || checkRowIndentation === rowIndentation) {
             siblings.push(checkRow[0]);
           } else if (checkRowIndentation < rowIndentation) {
@@ -954,44 +797,34 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
         } else {
           break;
         }
-
         checkRow = checkRow[directions[d]]();
       }
-
       if (directions[d] === 'prev') {
         siblings.reverse();
         siblings.push(this.element);
       }
     }
-
     return siblings;
   };
-
   Drupal.tableDrag.prototype.row.prototype.removeIndentClasses = function () {
     var _this5 = this;
-
     Object.keys(this.children || {}).forEach(function (n) {
       $(_this5.children[n]).find('.js-indentation').removeClass('tree-child').removeClass('tree-child-first').removeClass('tree-child-last').removeClass('tree-child-horizontal');
     });
   };
-
   Drupal.tableDrag.prototype.row.prototype.markChanged = function () {
     var marker = Drupal.theme('tableDragChangedMarker');
     var cell = $(this.element).find('td:first-of-type');
-
     if (cell.find('abbr.tabledrag-changed').length === 0) {
       cell.append(marker);
     }
   };
-
   Drupal.tableDrag.prototype.row.prototype.onIndent = function () {
     return null;
   };
-
   Drupal.tableDrag.prototype.row.prototype.onSwap = function (swappedRow) {
     return null;
   };
-
   $.extend(Drupal.theme, {
     tableDragChangedMarker: function tableDragChangedMarker() {
       return "<abbr class=\"warning tabledrag-changed\" title=\"".concat(Drupal.t('Changed'), "\">*</abbr>");
@@ -1009,7 +842,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
       return show ? Drupal.t('Hide row weights') : Drupal.t('Show row weights');
     },
     tableDragHandle: function tableDragHandle() {
-      return "<a href=\"#\" title=\"".concat(Drupal.t('Drag to re-order'), "\"\n        class=\"tabledrag-handle\"><div class=\"handle\">&nbsp;</div></a>");
+      return "<a href=\"#\" title=\"".concat(Drupal.t('Drag to re-order'), "\"\n        class=\"tabledrag-handle\"><div class=\"handle\"></div></a>");
     }
   });
 })(jQuery, Drupal, drupalSettings);
\ No newline at end of file
diff --git a/web/core/misc/tableheader.js b/web/core/misc/tableheader.js
index 110d30fee..0b271e99c 100644
--- a/web/core/misc/tableheader.js
+++ b/web/core/misc/tableheader.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, displace) {
   function TableHeader(table) {
     var $table = $(table);
@@ -19,32 +18,26 @@
       tableHeader: this
     }, function (e, display) {
       var tableHeader = e.data.tableHeader;
-
       if (tableHeader.displayWeight === null || tableHeader.displayWeight !== display) {
         tableHeader.recalculateSticky();
       }
-
       tableHeader.displayWeight = display;
     });
     this.createSticky();
   }
-
   function forTables(method, arg) {
     var tables = TableHeader.tables;
     var il = tables.length;
-
     for (var i = 0; i < il; i++) {
       tables[i][method](arg);
     }
   }
-
   function tableHeaderInitHandler(e) {
     once('tableheader', $(e.data.context).find('table.sticky-enabled')).forEach(function (table) {
       TableHeader.tables.push(new TableHeader(table));
     });
     forTables('onScroll');
   }
-
   Drupal.behaviors.tableHeader = {
     attach: function attach(context) {
       $(window).one('scroll.TableHeaderInit', {
@@ -52,23 +45,18 @@
       }, tableHeaderInitHandler);
     }
   };
-
   function scrollValue(position) {
     return document.documentElement[position] || document.body[position];
   }
-
   function tableHeaderResizeHandler(e) {
     forTables('recalculateSticky');
   }
-
   function tableHeaderOnScrollHandler(e) {
     forTables('onScroll');
   }
-
   function tableHeaderOffsetChangeHandler(e, offsets) {
     forTables('stickyPosition', offsets.top);
   }
-
   $(window).on({
     'resize.TableHeader': tableHeaderResizeHandler,
     'scroll.TableHeader': tableHeaderOnScrollHandler
@@ -98,15 +86,12 @@
     },
     stickyPosition: function stickyPosition(offsetTop, offsetLeft) {
       var css = {};
-
       if (typeof offsetTop === 'number') {
         css.top = "".concat(offsetTop, "px");
       }
-
       if (typeof offsetLeft === 'number') {
         css.left = "".concat(this.tableOffset.left - offsetLeft, "px");
       }
-
       this.$html.css('scroll-padding-top', displace.offsets.top + (this.stickyVisible ? this.$stickyTable.height() : 0));
       return this.$stickyTable.css(css);
     },
@@ -115,11 +100,9 @@
       var tableTop = this.tableOffset.top - displace.offsets.top;
       var tableBottom = tableTop + this.tableHeight;
       var visible = false;
-
       if (tableTop < scrollTop && scrollTop < tableBottom - this.minHeight) {
         visible = true;
       }
-
       this.stickyVisible = visible;
       return visible;
     },
@@ -137,12 +120,10 @@
       var $stickyCell = null;
       var display = null;
       var il = this.$originalHeaderCells.length;
-
       for (var i = 0; i < il; i++) {
         $that = $(this.$originalHeaderCells[i]);
         $stickyCell = this.$stickyHeaderCells.eq($that.index());
         display = $that.css('display');
-
         if (display !== 'none') {
           $stickyCell.css({
             width: $that.css('width'),
@@ -152,7 +133,6 @@
           $stickyCell.css('display', 'none');
         }
       }
-
       this.$stickyTable.css('width', this.$originalTable.outerWidth());
     }
   });
diff --git a/web/core/misc/tableresponsive.js b/web/core/misc/tableresponsive.js
index 192536d49..3fffd9b47 100644
--- a/web/core/misc/tableresponsive.js
+++ b/web/core/misc/tableresponsive.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, window) {
   function TableResponsive(table) {
     this.table = table;
@@ -16,7 +15,6 @@
     this.$table.before($('<div class="tableresponsive-toggle-columns"></div>').append(this.$link));
     $(window).on('resize.tableresponsive', $.proxy(this, 'eventhandlerEvaluateColumnVisibility')).trigger('resize.tableresponsive');
   }
-
   Drupal.behaviors.tableResponsive = {
     attach: function attach(context, settings) {
       once('tableresponsive', 'table.responsive-enabled', context).forEach(function (table) {
@@ -31,12 +29,10 @@
     eventhandlerEvaluateColumnVisibility: function eventhandlerEvaluateColumnVisibility(e) {
       var pegged = parseInt(this.$link.data('pegged'), 10);
       var hiddenLength = this.$headers.filter('.priority-medium:hidden, .priority-low:hidden').length;
-
       if (hiddenLength > 0) {
         this.$link.show();
         this.$link[0].textContent = this.showText;
       }
-
       if (!pegged && hiddenLength === 0) {
         this.$link.hide();
         this.$link[0].textContent = this.hideText;
@@ -47,7 +43,6 @@
       var self = this;
       var $hiddenHeaders = this.$headers.filter('.priority-medium:hidden, .priority-low:hidden');
       this.$revealedCells = this.$revealedCells || $();
-
       if ($hiddenHeaders.length > 0) {
         $hiddenHeaders.each(function (index, element) {
           var $header = $(this);
@@ -69,19 +64,15 @@
           var properties = $cell.attr('style').split(';');
           var newProps = [];
           var match = /^display\s*:\s*none$/;
-
           for (var i = 0; i < properties.length; i++) {
             var prop = properties[i];
             prop.trim();
             var isDisplayNone = match.exec(prop);
-
             if (isDisplayNone) {
               continue;
             }
-
             newProps.push(prop);
           }
-
           $cell.attr('style', newProps.join(';'));
         });
         this.$link[0].textContent = this.showText;
diff --git a/web/core/misc/tableselect.js b/web/core/misc/tableselect.js
index efd029f7c..98a216115 100644
--- a/web/core/misc/tableselect.js
+++ b/web/core/misc/tableselect.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.tableSelect = {
     attach: function attach(context, settings) {
@@ -13,12 +12,10 @@
       });
     }
   };
-
   Drupal.tableSelect = function () {
     if ($(this).find('td input[type="checkbox"]').length === 0) {
       return;
     }
-
     var table = this;
     var checkboxes;
     var lastChecked;
@@ -27,29 +24,24 @@
       selectAll: Drupal.t('Select all rows in this table'),
       selectNone: Drupal.t('Deselect all rows in this table')
     };
-
     var updateSelectAll = function updateSelectAll(state) {
       $table.prev('table.sticky-header').addBack().find('th.select-all input[type="checkbox"]').each(function () {
         var $checkbox = $(this);
         var stateChanged = $checkbox.prop('checked') !== state;
         $checkbox.attr('title', state ? strings.selectNone : strings.selectAll);
-
         if (stateChanged) {
           $checkbox.prop('checked', state).trigger('change');
         }
       });
     };
-
     $table.find('th.select-all').prepend($(Drupal.theme('checkbox')).attr('title', strings.selectAll)).on('click', function (event) {
       if ($(event.target).is('input[type="checkbox"]')) {
         checkboxes.each(function () {
           var $checkbox = $(this);
           var stateChanged = $checkbox.prop('checked') !== event.target.checked;
-
           if (stateChanged) {
             $checkbox.prop('checked', event.target.checked).trigger('change');
           }
-
           $checkbox.closest('tr').toggleClass('selected', this.checked);
         });
         updateSelectAll(event.target.checked);
@@ -57,30 +49,23 @@
     });
     checkboxes = $table.find('td input[type="checkbox"]:enabled').on('click', function (e) {
       $(this).closest('tr').toggleClass('selected', this.checked);
-
       if (e.shiftKey && lastChecked && lastChecked !== e.target) {
         Drupal.tableSelectRange($(e.target).closest('tr')[0], $(lastChecked).closest('tr')[0], e.target.checked);
       }
-
       updateSelectAll(checkboxes.length === checkboxes.filter(':checked').length);
       lastChecked = e.target;
     });
     updateSelectAll(checkboxes.length === checkboxes.filter(':checked').length);
   };
-
   Drupal.tableSelectRange = function (from, to, state) {
     var mode = from.rowIndex > to.rowIndex ? 'previousSibling' : 'nextSibling';
-
     for (var i = from[mode]; i; i = i[mode]) {
       var $i = $(i);
-
       if (i.nodeType !== 1) {
         continue;
       }
-
       $i.toggleClass('selected', state);
       $i.find('input[type="checkbox"]').prop('checked', state);
-
       if (to.nodeType) {
         if (i === to) {
           break;
diff --git a/web/core/misc/timezone.js b/web/core/misc/timezone.js
index ea252a113..eaa0fcecc 100644
--- a/web/core/misc/timezone.js
+++ b/web/core/misc/timezone.js
@@ -4,22 +4,18 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.setTimezone = {
     attach: function attach(context, settings) {
       var timezone = once('timezone', '.timezone-detect', context);
-
       if (timezone.length) {
         var tz = new Intl.DateTimeFormat().resolvedOptions().timeZone;
-
         if (tz && $(timezone).find("option[value=\"".concat(tz, "\"]")).length) {
           timezone.forEach(function (item) {
             item.value = tz;
           });
           return;
         }
-
         var dateString = Date();
         var matches = dateString.match(/\(([A-Z]{3,5})\)/);
         var abbreviation = matches ? matches[1] : 0;
@@ -30,7 +26,6 @@
         var offsetJan = dateJan.getTimezoneOffset() * -60;
         var offsetJul = dateJul.getTimezoneOffset() * -60;
         var isDaylightSavingTime;
-
         if (offsetJan === offsetJul) {
           isDaylightSavingTime = '';
         } else if (Math.max(offsetJan, offsetJul) === offsetNow) {
@@ -38,7 +33,6 @@
         } else {
           isDaylightSavingTime = 0;
         }
-
         var path = "system/timezone/".concat(abbreviation, "/").concat(offsetNow, "/").concat(isDaylightSavingTime);
         $.ajax({
           async: false,
diff --git a/web/core/misc/touchevents-test.js b/web/core/misc/touchevents-test.js
index 68efbdf9a..b6c8a6f6d 100644
--- a/web/core/misc/touchevents-test.js
+++ b/web/core/misc/touchevents-test.js
@@ -4,5 +4,4 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 document.documentElement.classList.add('ontouchstart' in window || window.DocumentTouch && document instanceof window.DocumentTouch ? 'touchevents' : 'no-touchevents');
\ No newline at end of file
diff --git a/web/core/misc/vertical-tabs.es6.js b/web/core/misc/vertical-tabs.es6.js
index 85f200f5f..67a9b3ea4 100644
--- a/web/core/misc/vertical-tabs.es6.js
+++ b/web/core/misc/vertical-tabs.es6.js
@@ -118,6 +118,21 @@
           }
         },
       );
+
+      // If a validation error is within a vertical tab, open that tab.
+      context.querySelectorAll('details .form-item .error').forEach((item) => {
+        const details = item.closest('details');
+
+        if (details.style.display === 'none') {
+          const tabSelect = document.querySelector(
+            "[href='#".concat(details.id, "']"),
+          );
+
+          if (tabSelect) {
+            tabSelect.click();
+          }
+        }
+      });
     },
   };
 
diff --git a/web/core/misc/vertical-tabs.js b/web/core/misc/vertical-tabs.js
index cac5d36b2..e63b638c9 100644
--- a/web/core/misc/vertical-tabs.js
+++ b/web/core/misc/vertical-tabs.js
@@ -4,34 +4,28 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   var handleFragmentLinkClickOrHashChange = function handleFragmentLinkClickOrHashChange(e, $target) {
     $target.parents('.vertical-tabs__pane').each(function (index, pane) {
       $(pane).data('verticalTab').focus();
     });
   };
-
   Drupal.behaviors.verticalTabs = {
     attach: function attach(context) {
       var width = drupalSettings.widthBreakpoint || 640;
       var mq = "(max-width: ".concat(width, "px)");
-
       if (window.matchMedia(mq).matches) {
         return;
       }
-
       $(once('vertical-tabs-fragments', 'body')).on('formFragmentLinkClickOrHashChange.verticalTabs', handleFragmentLinkClickOrHashChange);
       once('vertical-tabs', '[data-vertical-tabs-panes]', context).forEach(function (verticalTab) {
         var $this = $(verticalTab).addClass('vertical-tabs__panes');
         var focusID = $this.find(':hidden.vertical-tabs__active-tab')[0].value;
         var tabFocus;
         var $details = $this.find('> details');
-
         if ($details.length === 0) {
           return;
         }
-
         var tabList = $('<ul class="vertical-tabs__menu"></ul>');
         $this.wrap('<div class="vertical-tabs clearfix"></div>').before(tabList);
         $details.each(function () {
@@ -43,31 +37,35 @@
           });
           tabList.append(verticalTab.item);
           $that.removeClass('collapsed').removeAttr('open').addClass('vertical-tabs__pane').data('verticalTab', verticalTab);
-
           if (this.id === focusID) {
             tabFocus = $that;
           }
         });
         $(tabList).find('> li').eq(0).addClass('first');
         $(tabList).find('> li').eq(-1).addClass('last');
-
         if (!tabFocus) {
           var $locationHash = $this.find(window.location.hash);
-
           if (window.location.hash && $locationHash.length) {
             tabFocus = $locationHash.closest('.vertical-tabs__pane');
           } else {
             tabFocus = $this.find('> .vertical-tabs__pane').eq(0);
           }
         }
-
         if (tabFocus.length) {
           tabFocus.data('verticalTab').focus();
         }
       });
+      context.querySelectorAll('details .form-item .error').forEach(function (item) {
+        var details = item.closest('details');
+        if (details.style.display === 'none') {
+          var tabSelect = document.querySelector("[href='#".concat(details.id, "']"));
+          if (tabSelect) {
+            tabSelect.click();
+          }
+        }
+      });
     }
   };
-
   Drupal.verticalTab = function (settings) {
     var self = this;
     $.extend(this, settings, Drupal.theme('verticalTab', settings));
@@ -87,7 +85,6 @@
       self.updateSummary();
     }).trigger('summaryUpdated');
   };
-
   Drupal.verticalTab.prototype = {
     focus: function focus() {
       this.details.siblings('.vertical-tabs__pane').each(function () {
@@ -117,17 +114,14 @@
       this.item.parent().children('.vertical-tabs__menu-item').removeClass('first').filter(':visible').eq(0).addClass('first');
       this.details.addClass('vertical-tab--hidden').hide().removeAttr('open');
       var $firstTab = this.details.siblings('.vertical-tabs__pane:not(.vertical-tab--hidden)').eq(0);
-
       if ($firstTab.length) {
         $firstTab.data('verticalTab').focus();
       } else {
         this.item.closest('.js-form-type-vertical-tabs').hide();
       }
-
       return this;
     }
   };
-
   Drupal.theme.verticalTab = function (settings) {
     var tab = {};
     tab.title = $('<strong class="vertical-tabs__menu-item-title"></strong>');
diff --git a/web/core/modules/action/src/ActionListBuilder.php b/web/core/modules/action/src/ActionListBuilder.php
index 8dbbb6ba9..bf8b29737 100644
--- a/web/core/modules/action/src/ActionListBuilder.php
+++ b/web/core/modules/action/src/ActionListBuilder.php
@@ -64,7 +64,7 @@ public function load() {
     foreach ($entities as $entity) {
       if ($entity->isConfigurable()) {
         $this->hasConfigurableActions = TRUE;
-        continue;
+        break;
       }
     }
     return $entities;
diff --git a/web/core/modules/action/tests/src/Functional/ConfigurationTest.php b/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
index 051ba5032..8844cb097 100644
--- a/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
+++ b/web/core/modules/action/tests/src/Functional/ConfigurationTest.php
@@ -6,8 +6,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests complex actions configuration by adding, editing, and deleting a
- * complex action.
+ * Tests complex actions configuration.
  *
  * @group action
  */
diff --git a/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php b/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
index 70cc72db3..04f1cf99c 100644
--- a/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
+++ b/web/core/modules/action/tests/src/Unit/Menu/ActionLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class ActionLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = ['action' => 'core/modules/action'];
     parent::setUp();
diff --git a/web/core/modules/aggregator/aggregator.module b/web/core/modules/aggregator/aggregator.module
index 5288a3fd0..e8ced1415 100644
--- a/web/core/modules/aggregator/aggregator.module
+++ b/web/core/modules/aggregator/aggregator.module
@@ -163,12 +163,13 @@ function aggregator_entity_extra_field_info() {
  */
 function aggregator_cron() {
   $queue = \Drupal::queue('aggregator_feeds');
+  $request_time = \Drupal::time()->getRequestTime();
 
   $ids = \Drupal::entityTypeManager()->getStorage('aggregator_feed')->getFeedIdsToRefresh();
   foreach (Feed::loadMultiple($ids) as $feed) {
     if ($queue->createItem($feed)) {
       // Add timestamp to avoid queueing item more than once.
-      $feed->setQueuedTime(REQUEST_TIME);
+      $feed->setQueuedTime($request_time);
       $feed->save();
     }
   }
@@ -176,7 +177,7 @@ function aggregator_cron() {
   // Delete queued timestamp after 6 hours assuming the update has failed.
   $ids = \Drupal::entityQuery('aggregator_feed')
     ->accessCheck(FALSE)
-    ->condition('queued', REQUEST_TIME - (3600 * 6), '<')
+    ->condition('queued', $request_time - (3600 * 6), '<')
     ->execute();
 
   if ($ids) {
diff --git a/web/core/modules/aggregator/help_topics/aggregator.creating.html.twig b/web/core/modules/aggregator/help_topics/aggregator.creating.html.twig
index b9ba5b01f..bbf6b18b1 100644
--- a/web/core/modules/aggregator/help_topics/aggregator.creating.html.twig
+++ b/web/core/modules/aggregator/help_topics/aggregator.creating.html.twig
@@ -4,15 +4,18 @@ related:
   - aggregator.overview
   - aggregator.managing
 ---
-{% set aggregator_overview_url = render_var(url('aggregator.admin_overview')) %}
+{% set aggregator_overview_link_text %}
+{% trans %}Aggregator{% endtrans %}
+{% endset %}
+{% set aggregator_overview_link = render_var(help_route_link(aggregator_overview_link_text, 'aggregator.admin_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Create a new feed to display syndicated data from an outside source on your website, or import an OPML file to create multiple feeds.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Web services</em> &gt; <a href="{{ aggregator_overview_url }}"><em>Aggregator</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Web services</em> &gt; {{ aggregator_overview_link }}.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add feed</em> if you have an individual feed URL to add, or <em>Import OPML</em> if you have an OPML-formatted list of feeds to add.{% endtrans %}</li>
   <li>{% trans %}If you clicked <em>Add feed</em>, enter a <em>Title</em> for the feed and the <em>URL</em> of the feed. Select an <em>Update interval</em> and click <em>Save</em>.{% endtrans %}</li>
   <li>{% trans %}If you clicked <em>Import OPML</em>, either choose an <em>OPML file</em> from your local computer or enter an <em>OPML Remote URL</em> to import an OPML list from a URL. Select an <em>Update interval</em> and click <em>Import</em>.{% endtrans %}</li>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate back to <em>Configuration</em> &gt; <em>Web services</em> &gt; <a href="{{ aggregator_overview_url }}"><em>Aggregator</em></a>. You should see the new feed or feeds that you added in the list under <em>Feed overview</em>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate back to <em>Configuration</em> &gt; <em>Web services</em> &gt; {{ aggregator_overview_link }}. You should see the new feed or feeds that you added in the list under <em>Feed overview</em>.{% endtrans %}</li>
   <li>{% trans %}To verify that your feed is working, click <em>Update items</em> in the <em>Operations</em> list for your feed, and then click the feed name to view the imported items on the standard provided feed page.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/aggregator/help_topics/aggregator.managing.html.twig b/web/core/modules/aggregator/help_topics/aggregator.managing.html.twig
index 61fba6dca..dfe5c939d 100644
--- a/web/core/modules/aggregator/help_topics/aggregator.managing.html.twig
+++ b/web/core/modules/aggregator/help_topics/aggregator.managing.html.twig
@@ -4,12 +4,15 @@ related:
   - aggregator.overview
   - aggregator.creating
 ---
-{% set aggregator_overview_url = render_var(url('aggregator.admin_overview')) %}
+{% set aggregator_overview_link_text %}
+{% trans %}Aggregator{% endtrans %}
+{% endset %}
+{% set aggregator_overview_link = render_var(help_route_link(aggregator_overview_link_text, 'aggregator.admin_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Manage an existing feed or change its configuration.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Web services</em>&gt; <a href="{{ aggregator_overview_url }}"><em>Aggregator</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Web services</em>&gt; {{ aggregator_overview_link }}.{% endtrans %}</li>
   <li>{% trans %}Click <em>Edit</em> in the <em>Operations</em> list for the feed you want to configure. Enter new values and click <em>Save</em>.{% endtrans %}</li>
   <li>{% trans %}Optionally, delete the previously-imported items from the feed by clicking <em>Delete items</em> in the <em>Operations</em> list for the feed.{% endtrans %}</li>
   <li>{% trans %}Optionally, import new items from the feed by clicking <em>Update items</em> in the <em>Operations</em> list for the feed. You can also run the site Cron process to import items into all feeds, depending on the configured <em>Update interval</em> for each feed.{% endtrans %}</li>
diff --git a/web/core/modules/aggregator/src/Controller/AggregatorController.php b/web/core/modules/aggregator/src/Controller/AggregatorController.php
index 0d2a329a9..118a107c2 100644
--- a/web/core/modules/aggregator/src/Controller/AggregatorController.php
+++ b/web/core/modules/aggregator/src/Controller/AggregatorController.php
@@ -73,8 +73,8 @@ protected function buildPageList(array $items, $feed_source = '') {
     if ($items) {
       $build['items'] = $this->entityTypeManager()->getViewBuilder('aggregator_item')
         ->viewMultiple($items, 'default');
-      $build['pager'] = ['#type' => 'pager'];
     }
+    $build['pager'] = ['#type' => 'pager'];
     return $build;
   }
 
diff --git a/web/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php b/web/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php
index de8f70350..fd6805716 100644
--- a/web/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php
+++ b/web/core/modules/aggregator/src/Plugin/Field/FieldFormatter/AggregatorTitleFormatter.php
@@ -63,9 +63,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     foreach ($items as $delta => $item) {
       if ($this->getSetting('display_as_link') && $url_string) {
         $elements[$delta] = [
-            '#type' => 'link',
-            '#title' => $item->value,
-            '#url' => Url::fromUri($url_string),
+          '#type' => 'link',
+          '#title' => $item->value,
+          '#url' => Url::fromUri($url_string),
         ];
       }
       else {
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php b/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
index f306b9b4f..097bcf48d 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/fetcher/DefaultFetcher.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Http\ClientFactory;
 use Drupal\Core\Messenger\MessengerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use GuzzleHttp\Exception\TransferException;
 use GuzzleHttp\Psr7\Request;
 use Psr\Http\Message\RequestInterface;
@@ -28,6 +29,7 @@
  * )
  */
 class DefaultFetcher implements FetcherInterface, ContainerFactoryPluginInterface {
+  use StringTranslationTrait;
 
   /**
    * The HTTP client to fetch the feed data with.
@@ -127,7 +129,7 @@ public function fetch(FeedInterface $feed) {
     }
     catch (TransferException $e) {
       $this->logger->warning('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]);
-      $this->messenger->addWarning(t('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]));
+      $this->messenger->addWarning($this->t('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]));
       return FALSE;
     }
   }
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php b/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
index 66448fa5a..3266ac362 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/parser/DefaultParser.php
@@ -5,6 +5,7 @@
 use Drupal\aggregator\Plugin\ParserInterface;
 use Drupal\aggregator\FeedInterface;
 use Drupal\Core\Messenger\MessengerTrait;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Laminas\Feed\Reader\Reader;
 use Laminas\Feed\Reader\Exception\ExceptionInterface;
 
@@ -20,7 +21,7 @@
  * )
  */
 class DefaultParser implements ParserInterface {
-
+  use StringTranslationTrait;
   use MessengerTrait;
 
   /**
@@ -34,7 +35,7 @@ public function parse(FeedInterface $feed) {
     }
     catch (ExceptionInterface $e) {
       watchdog_exception('aggregator', $e);
-      $this->messenger()->addError(t('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]));
+      $this->messenger()->addError($this->t('The feed from %site seems to be broken because of error "%error".', ['%site' => $feed->label(), '%error' => $e->getMessage()]));
 
       return FALSE;
     }
diff --git a/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php b/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
index fb229ac80..4e9c7605c 100644
--- a/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
+++ b/web/core/modules/aggregator/src/Plugin/aggregator/processor/DefaultProcessor.php
@@ -124,14 +124,14 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     }, array_combine($counts, $counts));
     $intervals = [3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800];
     $period = array_map([$this->dateFormatter, 'formatInterval'], array_combine($intervals, $intervals));
-    $period[FeedStorageInterface::CLEAR_NEVER] = t('Never');
+    $period[FeedStorageInterface::CLEAR_NEVER] = $this->t('Never');
 
     $form['processors'][$info['id']] = [];
     // Only wrap into details if there is a basic configuration.
     if (isset($form['basic_conf'])) {
       $form['processors'][$info['id']] = [
         '#type' => 'details',
-        '#title' => t('Default processor settings'),
+        '#title' => $this->t('Default processor settings'),
         '#description' => $info['description'],
         '#open' => in_array($info['id'], $processors),
       ];
@@ -139,7 +139,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
 
     $form['processors'][$info['id']]['aggregator_summary_items'] = [
       '#type' => 'select',
-      '#title' => t('Number of items shown in listing pages'),
+      '#title' => $this->t('Number of items shown in listing pages'),
       '#default_value' => $config->get('source.list_max'),
       '#empty_value' => 0,
       '#options' => $items,
@@ -147,23 +147,23 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
 
     $form['processors'][$info['id']]['aggregator_clear'] = [
       '#type' => 'select',
-      '#title' => t('Discard items older than'),
+      '#title' => $this->t('Discard items older than'),
       '#default_value' => $config->get('items.expire'),
       '#options' => $period,
-      '#description' => t('Requires a correctly configured <a href=":cron">cron maintenance task</a>.', [':cron' => Url::fromRoute('system.status')->toString()]),
+      '#description' => $this->t('Requires a correctly configured <a href=":cron">cron maintenance task</a>.', [':cron' => Url::fromRoute('system.status')->toString()]),
     ];
 
     $lengths = [0, 200, 400, 600, 800, 1000, 1200, 1400, 1600, 1800, 2000];
     $options = array_map(function ($length) {
-      return ($length == 0) ? t('Unlimited') : $this->formatPlural($length, '1 character', '@count characters');
+      return ($length == 0) ? $this->t('Unlimited') : $this->formatPlural($length, '1 character', '@count characters');
     }, array_combine($lengths, $lengths));
 
     $form['processors'][$info['id']]['aggregator_teaser_length'] = [
       '#type' => 'select',
-      '#title' => t('Length of trimmed description'),
+      '#title' => $this->t('Length of trimmed description'),
       '#default_value' => $config->get('items.teaser_length'),
       '#options' => $options,
-      '#description' => t('The maximum number of characters used in the trimmed version of content.'),
+      '#description' => $this->t('The maximum number of characters used in the trimmed version of content.'),
     ];
     return $form;
   }
@@ -244,7 +244,7 @@ public function delete(FeedInterface $feed) {
       $this->itemStorage->delete($items);
     }
     // @todo This should be moved out to caller with a different message maybe.
-    $this->messenger->addStatus(t('The news items from %site have been deleted.', ['%site' => $feed->label()]));
+    $this->messenger->addStatus($this->t('The news items from %site have been deleted.', ['%site' => $feed->label()]));
   }
 
   /**
diff --git a/web/core/modules/aggregator/tests/modules/aggregator_display_configurable_test/aggregator_display_configurable_test.module b/web/core/modules/aggregator/tests/modules/aggregator_display_configurable_test/aggregator_display_configurable_test.module
index 0fb52f26c..70a65cc43 100644
--- a/web/core/modules/aggregator/tests/modules/aggregator_display_configurable_test/aggregator_display_configurable_test.module
+++ b/web/core/modules/aggregator/tests/modules/aggregator_display_configurable_test/aggregator_display_configurable_test.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * A module for testing making aggregator_feed base fields' displays
- * configurable.
+ * Allows testing of making aggregator_feed base fields' displays configurable.
  */
 
 use Drupal\Core\Entity\EntityTypeInterface;
diff --git a/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php b/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php
index 294697a2b..62dbba331 100644
--- a/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php
+++ b/web/core/modules/aggregator/tests/modules/aggregator_test/src/Plugin/aggregator/processor/TestProcessor.php
@@ -77,13 +77,13 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
 
     $form['processors'][$info['id']] = [
       '#type' => 'details',
-      '#title' => t('Test processor settings'),
+      '#title' => $this->t('Test processor settings'),
       '#description' => $info['description'],
       '#open' => in_array($info['id'], $processors),
     ];
     // Add some dummy settings to verify settingsForm is called.
     $form['processors'][$info['id']]['dummy_length'] = [
-      '#title' => t('Dummy length setting'),
+      '#title' => $this->t('Dummy length setting'),
       '#type' => 'number',
       '#min' => 1,
       '#max' => 1000,
diff --git a/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php b/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php
index cfb34e033..834dd1c02 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AddFeedTest.php
@@ -17,6 +17,9 @@ class AddFeedTest extends AggregatorTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorDisplayConfigurableTest.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorDisplayConfigurableTest.php
index 91576e2f2..b52e2273a 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AggregatorDisplayConfigurableTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorDisplayConfigurableTest.php
@@ -6,8 +6,7 @@
 use Drupal\node\Entity\Node;
 
 /**
- * Tests making aggregator_feed and aggregator_item base fields' displays
- * configurable.
+ * Tests aggregator_feed and aggregator_item base fields' displays.
  *
  * @group aggregator
  * @group legacy
@@ -29,8 +28,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Sets feed base fields to configurable display and checks settings are
-   * respected.
+   * Tests base fields to configurable display settings.
    */
   public function testFeedDisplayConfigurable() {
     $display = EntityViewDisplay::load('aggregator_feed.aggregator_feed.summary');
@@ -77,8 +75,7 @@ public function testFeedDisplayConfigurable() {
   }
 
   /**
-   * Sets item base fields to configurable display and checks settings are
-   * respected.
+   * Tests item base fields settings.
    */
   public function testItemDisplayConfigurable() {
     $this->createSampleNodes(1);
diff --git a/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php b/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
index ca2d1aac3..7ea19b985 100644
--- a/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/AggregatorRenderingTest.php
@@ -24,6 +24,9 @@ class AggregatorRenderingTest extends AggregatorTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -100,6 +103,8 @@ public function testFeedPage() {
     $feed = $this->createFeed();
     $this->updateFeedItems($feed, 30);
 
+    // Request page with no feed items to ensure cache context is set correctly.
+    $this->drupalGet('aggregator', ['query' => ['page' => 2]]);
     // Check for presence of an aggregator pager.
     $this->drupalGet('aggregator');
     $this->assertSession()->elementExists('xpath', '//ul[contains(@class, "pager__items")]');
diff --git a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d6/UpgradeTest.php b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d6/UpgradeTest.php
index 2e28e543f..7e215548d 100644
--- a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d6/UpgradeTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d6/UpgradeTest.php
@@ -82,7 +82,6 @@ protected function getEntityCounts() {
       // The 'book' module provides the 'book' node type, and the migration
       // creates 12 node types.
       'node_type' => 14,
-      'rdf_mapping' => 7,
       'search_page' => 2,
       'shortcut' => 2,
       'shortcut_set' => 1,
diff --git a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/MultilingualReviewPageTest.php b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/MultilingualReviewPageTest.php
index 7d2af25ed..905ffe04c 100644
--- a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/MultilingualReviewPageTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/MultilingualReviewPageTest.php
@@ -101,7 +101,6 @@ protected function getAvailablePaths() {
       'Path',
       'Poll',
       'Profile',
-      'RDF',
       'Search',
       'Search embedded form',
       'Shortcut',
@@ -148,6 +147,7 @@ protected function getMissingPaths() {
       'Path translation',
       'Phone',
       'Picture',
+      'RDF',
       'References',
       'References UUID',
       'Statistics',
diff --git a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/NoMultilingualReviewPageTest.php b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/NoMultilingualReviewPageTest.php
index 59bdc3c14..f0b1bdc42 100644
--- a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/NoMultilingualReviewPageTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/NoMultilingualReviewPageTest.php
@@ -87,7 +87,6 @@ protected function getAvailablePaths() {
       'Path',
       'Poll',
       'Profile',
-      'RDF',
       'Search',
       'Search embedded form',
       'Shortcut',
@@ -152,6 +151,7 @@ protected function getMissingPaths() {
       'Path translation',
       'Phone',
       'Picture',
+      'RDF',
       'References',
       'References UUID',
       'Statistics',
diff --git a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/UpgradeTest.php b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/UpgradeTest.php
index 2c9066e83..af2ef35fc 100644
--- a/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/UpgradeTest.php
+++ b/web/core/modules/aggregator/tests/src/Functional/migrate_drupal_ui/d7/UpgradeTest.php
@@ -83,7 +83,6 @@ protected function getEntityCounts() {
       'language_content_settings' => 24,
       'node' => 7,
       'node_type' => 8,
-      'rdf_mapping' => 8,
       'search_page' => 2,
       'shortcut' => 6,
       'shortcut_set' => 2,
@@ -151,7 +150,6 @@ protected function getAvailablePaths() {
       'Options',
       'Path',
       'Phone',
-      'RDF',
       'Search',
       'Shortcut',
       'Statistics',
@@ -187,6 +185,7 @@ protected function getAvailablePaths() {
   protected function getMissingPaths() {
     return [
       'Color',
+      'RDF',
       'References',
       'Translation sets',
       'Variable realm',
diff --git a/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php b/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
index 4f7427569..012578725 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
@@ -63,7 +63,7 @@ public function testStringFormatter() {
       'title' => 'test title',
       'fid' => $aggregator_feed->id(),
       'link' => 'http://www.example.com',
-      ]);
+    ]);
     $aggregator_item->save();
 
     // Verify aggregator feed title with and without links.
diff --git a/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index ea26ff8c1..b92ffbf4d 100644
--- a/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/web/core/modules/aggregator/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -8,7 +8,6 @@
  * Tests migration of aggregator block.
  *
  * @group aggregator
- * @group legacy
  */
 class MigrateBlockTest extends MigrateDrupal6TestBase {
 
@@ -31,14 +30,14 @@ protected function setUp(): void {
     parent::setUp();
 
     // Install the themes used for this test.
-    $this->container->get('theme_installer')->install(['bartik', 'test_theme']);
-
     $this->installEntitySchema('block_content');
+    $this->container->get('theme_installer')->install(['olivero', 'test_theme']);
+
     $this->installConfig(['block_content']);
 
-    // Set Bartik as the default public theme.
+    // Set Olivero as the default public theme.
     $config = $this->config('system.theme');
-    $config->set('default', 'bartik');
+    $config->set('default', 'olivero');
     $config->save();
 
     $this->executeMigrations([
@@ -92,7 +91,7 @@ public function assertEntity(string $id, array $visibility, string $region, stri
    */
   public function testBlockMigration() {
     $blocks = Block::loadMultiple();
-    $this->assertCount(14, $blocks);
+    $this->assertCount(25, $blocks);
 
     // Check aggregator block.
     $settings = [
@@ -103,7 +102,7 @@ public function testBlockMigration() {
       'block_count' => 7,
       'feed' => '5',
     ];
-    $this->assertEntity('aggregator', [], 'sidebar_second', 'bartik', -2, $settings);
+    $this->assertEntity('aggregator', [], 'sidebar', 'olivero', -2, $settings);
   }
 
 }
diff --git a/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php b/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
index db083bcd6..48b6fa859 100644
--- a/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
+++ b/web/core/modules/aggregator/tests/src/Unit/Plugin/AggregatorPluginSettingsBaseTest.php
@@ -54,7 +54,12 @@ protected function setUp(): void {
         ->getMock();
       $this->managers[$type]->expects($this->once())
         ->method('getDefinitions')
-        ->will($this->returnValue(['aggregator_test' => ['title' => '', 'description' => '']]));
+        ->willReturn([
+          'aggregator_test' => [
+            'title' => '',
+            'description' => '',
+          ],
+        ]);
     }
 
     /** @var \Drupal\Core\Messenger\MessengerInterface|\PHPUnit\Framework\MockObject\MockBuilder $messenger */
@@ -102,7 +107,7 @@ public function testSettingsForm() {
     $this->managers['processor']->expects($this->once())
       ->method('createInstance')
       ->with($this->equalTo('aggregator_test'))
-      ->will($this->returnValue($test_processor));
+      ->willReturn($test_processor);
 
     $form = $this->settingsForm->buildForm([], $form_state);
     $this->settingsForm->validateForm($form, $form_state);
diff --git a/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php b/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
index 14cb3cd25..b0c0e482d 100644
--- a/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
+++ b/web/core/modules/ban/src/Plugin/migrate/destination/BlockedIp.php
@@ -78,6 +78,8 @@ public function fields() {
    */
   public function import(Row $row, array $old_destination_id_values = []) {
     $this->banManager->banIp($row->getDestinationProperty('ip'));
+
+    return ['ip' => $row->getDestinationProperty('ip')];
   }
 
 }
diff --git a/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php b/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php
index f814e1962..c63b75228 100644
--- a/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php
+++ b/web/core/modules/ban/tests/src/Kernel/Migrate/d7/MigrateBlockedIpsTest.php
@@ -27,13 +27,15 @@ class MigrateBlockedIpsTest extends MigrateDrupal7TestBase {
   protected function setUp(): void {
     parent::setUp();
     $this->installSchema('ban', ['ban_ip']);
-    $this->executeMigration('d7_blocked_ips');
   }
 
   /**
    * Tests migration of blocked IPs.
    */
   public function testBlockedIps() {
+    $this->startCollectingMessages();
+    $this->executeMigration('d7_blocked_ips');
+    $this->assertEmpty($this->migrateMessages);
     $this->assertTrue(\Drupal::service('ban.ip_manager')->isBanned('111.111.111.111'));
   }
 
diff --git a/web/core/modules/basic_auth/basic_auth.services.yml b/web/core/modules/basic_auth/basic_auth.services.yml
index e1340489d..ef001aae4 100644
--- a/web/core/modules/basic_auth/basic_auth.services.yml
+++ b/web/core/modules/basic_auth/basic_auth.services.yml
@@ -5,7 +5,7 @@ services:
     tags:
       - { name: authentication_provider, provider_id: 'basic_auth', priority: 100 }
   basic_auth.page_cache_request_policy.disallow_basic_auth_requests:
-      class: Drupal\basic_auth\PageCache\DisallowBasicAuthRequests
-      public: false
-      tags:
-        - { name: page_cache_request_policy }
+    class: Drupal\basic_auth\PageCache\DisallowBasicAuthRequests
+    public: false
+    tags:
+      - { name: page_cache_request_policy }
diff --git a/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php b/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
index b51b17138..15de6407d 100644
--- a/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
+++ b/web/core/modules/basic_auth/tests/src/Traits/BasicAuthTestTrait.php
@@ -17,7 +17,7 @@ trait BasicAuthTestTrait {
    * @param string $password
    *   The password to use for basic authentication.
    * @param array $options
-   *   (optional) Options to be forwarded to the url generator.
+   *   (optional) Options to be forwarded to the URL generator.
    *
    * @return string
    *   The retrieved HTML string, also available as $this->getRawContent().
diff --git a/web/core/modules/big_pipe/js/big_pipe.es6.js b/web/core/modules/big_pipe/js/big_pipe.es6.js
index 0792a793e..097a03647 100644
--- a/web/core/modules/big_pipe/js/big_pipe.es6.js
+++ b/web/core/modules/big_pipe/js/big_pipe.es6.js
@@ -93,6 +93,11 @@
       return false;
     }
 
+    // Attach Drupal behaviors early, if possible.
+    once('big-pipe-early-behaviors', 'body', context).forEach((el) => {
+      Drupal.attachBehaviors(el);
+    });
+
     once(
       'big-pipe',
       'script[data-big-pipe-replacement-for-placeholder-with-id]',
diff --git a/web/core/modules/big_pipe/js/big_pipe.js b/web/core/modules/big_pipe/js/big_pipe.js
index 712001c7c..6a39124a0 100644
--- a/web/core/modules/big_pipe/js/big_pipe.js
+++ b/web/core/modules/big_pipe/js/big_pipe.js
@@ -4,27 +4,22 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, drupalSettings) {
   function mapTextContentToAjaxResponse(content) {
     if (content === '') {
       return false;
     }
-
     try {
       return JSON.parse(content);
     } catch (e) {
       return false;
     }
   }
-
   function bigPipeProcessPlaceholderReplacement(placeholderReplacement) {
     var placeholderId = placeholderReplacement.getAttribute('data-big-pipe-replacement-for-placeholder-with-id');
     var content = placeholderReplacement.textContent.trim();
-
     if (typeof drupalSettings.bigPipePlaceholderIds[placeholderId] !== 'undefined') {
       var response = mapTextContentToAjaxResponse(content);
-
       if (response === false) {
         once.remove('big-pipe', placeholderReplacement);
       } else {
@@ -38,28 +33,24 @@
       }
     }
   }
-
   var interval = drupalSettings.bigPipeInterval || 50;
   var timeoutID;
-
   function bigPipeProcessDocument(context) {
     if (!context.querySelector('script[data-big-pipe-event="start"]')) {
       return false;
     }
-
+    once('big-pipe-early-behaviors', 'body', context).forEach(function (el) {
+      Drupal.attachBehaviors(el);
+    });
     once('big-pipe', 'script[data-big-pipe-replacement-for-placeholder-with-id]', context).forEach(bigPipeProcessPlaceholderReplacement);
-
     if (context.querySelector('script[data-big-pipe-event="stop"]')) {
       if (timeoutID) {
         clearTimeout(timeoutID);
       }
-
       return true;
     }
-
     return false;
   }
-
   function bigPipeProcess() {
     timeoutID = setTimeout(function () {
       if (!bigPipeProcessDocument(document)) {
@@ -67,13 +58,11 @@
       }
     }, interval);
   }
-
   bigPipeProcess();
   window.addEventListener('load', function () {
     if (timeoutID) {
       clearTimeout(timeoutID);
     }
-
     bigPipeProcessDocument(document);
   });
 })(Drupal, drupalSettings);
\ No newline at end of file
diff --git a/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php b/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php
index c376676a9..22d1da8f1 100644
--- a/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php
+++ b/web/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipePlaceholderTestCases.php
@@ -274,35 +274,37 @@ public static function cases(ContainerInterface $container = NULL, AccountInterf
     ];
     $exception->embeddedHtmlResponse = NULL;
 
+    // cSpell:disable-next-line.
+    $token = 'PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU';
     // 7. Edge case: response filter throwing an exception for this placeholder.
     $embedded_response_exception = new BigPipePlaceholderTestCase(
       [
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::responseException', []],
         '#create_placeholder' => TRUE,
       ],
-      '<drupal-render-placeholder callback="\Drupal\big_pipe_test\BigPipeTestController::responseException" arguments="" token="PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU"></drupal-render-placeholder>',
+      '<drupal-render-placeholder callback="\Drupal\big_pipe_test\BigPipeTestController::responseException" arguments="" token="' . $token . ' "></drupal-render-placeholder>',
       [
         '#lazy_builder' => ['\Drupal\big_pipe_test\BigPipeTestController::responseException', []],
       ]
     );
-    $embedded_response_exception->bigPipePlaceholderId = 'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU';
+    $embedded_response_exception->bigPipePlaceholderId = 'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=' . $token;
     $embedded_response_exception->bigPipePlaceholderRenderArray = [
-      '#markup' => '<span data-big-pipe-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU"></span>',
+      '#markup' => '<span data-big-pipe-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=' . $token . '"></span>',
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
       '#attached' => [
         'library' => ['big_pipe/big_pipe'],
         'drupalSettings' => [
           'bigPipePlaceholderIds' => [
-            'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&&token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU' => TRUE,
+            'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&&token=' . $token => TRUE,
           ],
         ],
         'big_pipe_placeholders' => [
-          'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU' => $embedded_response_exception->placeholderRenderArray,
+          'callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=' . $token => $embedded_response_exception->placeholderRenderArray,
         ],
       ],
     ];
     $embedded_response_exception->embeddedAjaxResponseCommands = NULL;
-    $embedded_response_exception->bigPipeNoJsPlaceholder = '<span data-big-pipe-nojs-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=PxOHfS_QL-T01NjBgu7Z7I04tIwMp6La5vM-mVxezbU"></span>';
+    $embedded_response_exception->bigPipeNoJsPlaceholder = '<span data-big-pipe-nojs-placeholder-id="callback=%5CDrupal%5Cbig_pipe_test%5CBigPipeTestController%3A%3AresponseException&amp;&amp;token=' . $token . '"></span>';
     $embedded_response_exception->bigPipeNoJsPlaceholderRenderArray = [
       '#markup' => $embedded_response_exception->bigPipeNoJsPlaceholder,
       '#cache' => $cacheability_depends_on_session_and_nojs_cookie,
diff --git a/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php b/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
index ab7913195..33900bdea 100644
--- a/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
+++ b/web/core/modules/big_pipe/tests/src/Functional/BigPipeTest.php
@@ -414,9 +414,9 @@ protected function assertBigPipePlaceholders(array $expected_big_pipe_placeholde
     array_unshift($expected_stream_order, BigPipe::START_SIGNAL);
     array_push($expected_stream_order, BigPipe::STOP_SIGNAL);
     $actual_stream_order = $placeholder_replacement_positions + [
-        $start_signal_position => BigPipe::START_SIGNAL,
-        $stop_signal_position => BigPipe::STOP_SIGNAL,
-      ];
+      $start_signal_position => BigPipe::START_SIGNAL,
+      $stop_signal_position => BigPipe::STOP_SIGNAL,
+    ];
     ksort($actual_stream_order, SORT_NUMERIC);
     $this->assertEquals($expected_stream_order, array_values($actual_stream_order));
   }
diff --git a/web/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml b/web/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
index 7728013a0..253713a83 100644
--- a/web/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
+++ b/web/core/modules/big_pipe/tests/themes/big_pipe_test_theme/big_pipe_test_theme.info.yml
@@ -1,5 +1,5 @@
 name: 'BigPipe test theme'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Theme for testing BigPipe edge cases.'
 version: VERSION
diff --git a/web/core/modules/block/block.module b/web/core/modules/block/block.module
index 062a6fa9c..11bb4492b 100644
--- a/web/core/modules/block/block.module
+++ b/web/core/modules/block/block.module
@@ -246,6 +246,7 @@ function template_preprocess_block(&$variables) {
   $variables['plugin_id'] = $variables['elements']['#plugin_id'];
   $variables['base_plugin_id'] = $variables['elements']['#base_plugin_id'];
   $variables['derivative_plugin_id'] = $variables['elements']['#derivative_plugin_id'];
+  $variables['in_preview'] = $variables['elements']['#in_preview'] ?? FALSE;
   $variables['label'] = !empty($variables['configuration']['label_display']) ? $variables['configuration']['label'] : '';
   $variables['content'] = $variables['elements']['content'];
   // A block's label is configuration: it is static. Allow dynamic labels to be
diff --git a/web/core/modules/block/js/block.admin.js b/web/core/modules/block/js/block.admin.js
index 99777640f..bf3c866f1 100644
--- a/web/core/modules/block/js/block.admin.js
+++ b/web/core/modules/block/js/block.admin.js
@@ -4,23 +4,19 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, debounce, once) {
   Drupal.behaviors.blockFilterByText = {
     attach: function attach(context, settings) {
       var $input = $(once('block-filter-text', 'input.block-filter-text'));
       var $table = $($input.attr('data-element'));
       var $filterRows;
-
       function filterBlockList(e) {
         var query = e.target.value.toLowerCase();
-
         function toggleBlockEntry(index, label) {
           var $row = $(label).parent().parent();
           var textMatch = label.textContent.toLowerCase().includes(query);
           $row.toggle(textMatch);
         }
-
         if (query.length >= 2) {
           $filterRows.each(toggleBlockEntry);
           Drupal.announce(Drupal.formatPlural($table.find('tr:visible').length - 1, '1 block is available in the modified list.', '@count blocks are available in the modified list.'));
@@ -30,7 +26,6 @@
           });
         }
       }
-
       if ($table.length) {
         $filterRows = $table.find('div.block-filter-text-source');
         $input.on('keyup', debounce(filterBlockList, 200));
diff --git a/web/core/modules/block/js/block.es6.js b/web/core/modules/block/js/block.es6.js
index a642ce363..7f03b99a8 100644
--- a/web/core/modules/block/js/block.es6.js
+++ b/web/core/modules/block/js/block.es6.js
@@ -31,18 +31,18 @@
        *   A string with the summary.
        */
       function checkboxesSummary(context) {
-        const vals = [];
+        const values = [];
         const $checkboxes = $(context).find(
           'input[type="checkbox"]:checked + label',
         );
         const il = $checkboxes.length;
         for (let i = 0; i < il; i++) {
-          vals.push($($checkboxes[i]).html());
+          values.push($($checkboxes[i]).html());
         }
-        if (!vals.length) {
-          vals.push(Drupal.t('Not restricted'));
+        if (!values.length) {
+          values.push(Drupal.t('Not restricted'));
         }
-        return vals.join(', ');
+        return values.join(', ');
       }
 
       $(
diff --git a/web/core/modules/block/js/block.js b/web/core/modules/block/js/block.js
index 427efdf61..75ad5d7a8 100644
--- a/web/core/modules/block/js/block.js
+++ b/web/core/modules/block/js/block.js
@@ -4,38 +4,30 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, window, Drupal, once) {
   Drupal.behaviors.blockSettingsSummary = {
     attach: function attach() {
       if (typeof $.fn.drupalSetSummary === 'undefined') {
         return;
       }
-
       function checkboxesSummary(context) {
-        var vals = [];
+        var values = [];
         var $checkboxes = $(context).find('input[type="checkbox"]:checked + label');
         var il = $checkboxes.length;
-
         for (var i = 0; i < il; i++) {
-          vals.push($($checkboxes[i]).html());
+          values.push($($checkboxes[i]).html());
         }
-
-        if (!vals.length) {
-          vals.push(Drupal.t('Not restricted'));
+        if (!values.length) {
+          values.push(Drupal.t('Not restricted'));
         }
-
-        return vals.join(', ');
+        return values.join(', ');
       }
-
       $('[data-drupal-selector="edit-visibility-node-type"], [data-drupal-selector="edit-visibility-entity-bundlenode"], [data-drupal-selector="edit-visibility-language"], [data-drupal-selector="edit-visibility-user-role"]').drupalSetSummary(checkboxesSummary);
       $('[data-drupal-selector="edit-visibility-request-path"]').drupalSetSummary(function (context) {
         var $pages = $(context).find('textarea[name="visibility[request_path][pages]"]');
-
         if (!$pages.length || !$pages[0].value) {
           return Drupal.t('Not restricted');
         }
-
         return Drupal.t('Restricted to certain pages');
       });
     }
@@ -45,17 +37,14 @@
       if (typeof Drupal.tableDrag === 'undefined' || typeof Drupal.tableDrag.blocks === 'undefined') {
         return;
       }
-
       function checkEmptyRegions(table, rowObject) {
         table.find('tr.region-message').each(function () {
           var $this = $(this);
-
           if ($this.prev('tr').get(0) === rowObject.element) {
             if (rowObject.method !== 'keyboard' || rowObject.direction === 'down') {
               rowObject.swap('after', this);
             }
           }
-
           if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
             $this.removeClass('region-populated').addClass('region-empty');
           } else if ($this.is('.region-empty')) {
@@ -63,44 +52,36 @@
           }
         });
       }
-
       function updateLastPlaced(table, rowObject) {
         table.find('.color-success').removeClass('color-success');
         var $rowObject = $(rowObject);
-
         if (!$rowObject.is('.drag-previous')) {
           table.find('.drag-previous').removeClass('drag-previous');
           $rowObject.addClass('drag-previous');
         }
       }
-
       function updateBlockWeights(table, region) {
         var weight = -Math.round(table.find('.draggable').length / 2);
         table.find(".region-".concat(region, "-message")).nextUntil('.region-title').find('select.block-weight').each(function () {
           this.value = ++weight;
         });
       }
-
       var table = $('#blocks');
       var tableDrag = Drupal.tableDrag.blocks;
-
       tableDrag.row.prototype.onSwap = function (swappedRow) {
         checkEmptyRegions(table, this);
         updateLastPlaced(table, this);
       };
-
       tableDrag.onDrop = function () {
         var dragObject = this;
         var $rowElement = $(dragObject.rowObject.element);
         var regionRow = $rowElement.prevAll('tr.region-message').get(0);
         var regionName = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
         var regionField = $rowElement.find('select.block-region-select');
-
         if (regionField.find("option[value=".concat(regionName, "]")).length === 0) {
           window.alert(Drupal.t('The block cannot be placed in this region.'));
           regionField.trigger('change');
         }
-
         if (!regionField.is(".block-region-".concat(regionName))) {
           var weightField = $rowElement.find('select.block-weight');
           var oldRegionName = weightField[0].className.replace(/([^ ]+[ ]+)*block-weight-([^ ]+)([ ]+[^ ]+)*/, '$2');
@@ -108,32 +89,26 @@
           weightField.removeClass("block-weight-".concat(oldRegionName)).addClass("block-weight-".concat(regionName));
           regionField[0].value = regionName;
         }
-
         updateBlockWeights(table, regionName);
       };
-
       $(once('block-region-select', 'select.block-region-select', context)).on('change', function (event) {
         var row = $(this).closest('tr');
         var select = $(this);
         tableDrag.rowObject = new tableDrag.row(row[0]);
         var regionMessage = table.find(".region-".concat(select[0].value, "-message"));
         var regionItems = regionMessage.nextUntil('.region-message, .region-title');
-
         if (regionItems.length) {
           regionItems.last().after(row);
         } else {
           regionMessage.after(row);
         }
-
         updateBlockWeights(table, select[0].value);
         checkEmptyRegions(table, tableDrag.rowObject);
         updateLastPlaced(table, row);
-
         if (!tableDrag.changed) {
           $(Drupal.theme('tableDragChangedWarning')).insertBefore(tableDrag.table).hide().fadeIn('slow');
           tableDrag.changed = true;
         }
-
         select.trigger('blur');
       });
     }
diff --git a/web/core/modules/block/migrations/d6_block.yml b/web/core/modules/block/migrations/d6_block.yml
index 5b0f76a88..ae7ff2ed4 100644
--- a/web/core/modules/block/migrations/d6_block.yml
+++ b/web/core/modules/block/migrations/d6_block.yml
@@ -71,12 +71,12 @@ process:
       - region
     map:
       garland:
-        bartik:
-          # Garland 6.x --> Bartik 8.x
+        olivero:
+          # Garland 6.x --> Olivero
           header: header
-          footer: footer_fifth
-          left: sidebar_first
-          right: sidebar_second
+          footer: footer_top
+          left: sidebar
+          right: sidebar
     # If mapping fails, put the block in the content region.
     default_value: content
   weight: weight
diff --git a/web/core/modules/block/migrations/d7_block.yml b/web/core/modules/block/migrations/d7_block.yml
index 3b301ef0c..c6b8dffbc 100644
--- a/web/core/modules/block/migrations/d7_block.yml
+++ b/web/core/modules/block/migrations/d7_block.yml
@@ -1,3 +1,4 @@
+# cspell: ignore firstcolumn secondcolumn thirdcolumn fourthcolumn
 id: d7_block
 label: Blocks
 # This configuration migration depends on the d7_custom_block content migration.
@@ -74,17 +75,29 @@ process:
       - region
     map:
       bartik:
-        bartik:
-          # Bartik 7.x --> Bartik 8.x
-          featured: featured_top
-          triptych_first: featured_bottom_first
-          triptych_middle: featured_bottom_second
-          triptych_last: featured_bottom_third
-          footer_firstcolumn: footer_first
-          footer_secondcolumn: footer_second
-          footer_thirdcolumn: footer_third
-          footer_fourthcolumn: footer_fourth
-          footer: footer_fifth
+        # Bartik 7.x --> Olivero 9.4.x
+        olivero:
+          featured: highlighted
+          triptych_first: content_below
+          triptych_middle: content_below
+          triptych_last: content_below
+          footer_firstcolumn: footer_top
+          footer_secondcolumn: footer_top
+          footer_thirdcolumn: footer_top
+          footer_fourthcolumn: footer_top
+          footer: footer_bottom
+      seven:
+        # Seven 7.x --> Claro 9.4.x
+        claro:
+          header: 'header'
+          pre_content: 'pre_content'
+          breadcrumb: 'breadcrumb'
+          highlighted: 'highlighted'
+          help: 'help'
+          content: 'content'
+          page_top: 'page_top'
+          page_bottom: 'page_bottom'
+          sidebar_first: 'sidebar_first'
     # If mapping fails, put the block in the content region.
     default_value: content
   weight: weight
diff --git a/web/core/modules/block/src/BlockListBuilder.php b/web/core/modules/block/src/BlockListBuilder.php
index aa05ffc07..fb1422bff 100644
--- a/web/core/modules/block/src/BlockListBuilder.php
+++ b/web/core/modules/block/src/BlockListBuilder.php
@@ -272,11 +272,20 @@ protected function buildBlocksForm() {
             $form[$entity_id]['#attributes']['class'][] = 'js-block-placed';
           }
           $form[$entity_id]['info'] = [
-            '#plain_text' => $info['status'] ? $info['label'] : $this->t('@label (disabled)', ['@label' => $info['label']]),
             '#wrapper_attributes' => [
               'class' => ['block'],
             ],
           ];
+          // Ensure that the label is always rendered as plain text. Render
+          // array #plain_text key is essentially treated same as @ placeholder
+          // in translatable markup.
+          if ($info['status']) {
+            $form[$entity_id]['info']['#plain_text'] = $info['label'];
+          }
+          else {
+            $form[$entity_id]['info']['#markup'] = $this->t('@label (disabled)', ['@label' => $info['label']]);
+          }
+
           $form[$entity_id]['type'] = [
             '#markup' => $info['category'],
           ];
@@ -363,14 +372,18 @@ public function getDefaultOperations(EntityInterface $entity) {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    // No validation.
+    if (empty($form_state->getValue('blocks'))) {
+      $form_state->setErrorByName('blocks', $this->t('No blocks settings to update.'));
+    }
+
   }
 
   /**
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $entities = $this->storage->loadMultiple(array_keys($form_state->getValue('blocks')));
+    $blocks = $form_state->getValue('blocks');
+    $entities = $this->storage->loadMultiple(array_keys($blocks));
     /** @var \Drupal\block\BlockInterface[] $entities */
     foreach ($entities as $entity_id => $entity) {
       $entity_values = $form_state->getValue(['blocks', $entity_id]);
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockTheme.php b/web/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
index 408f83be6..596892fe3 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockTheme.php
@@ -31,6 +31,11 @@ class BlockTheme extends ProcessPluginBase implements ContainerFactoryPluginInte
    */
   protected $themeConfig;
 
+  /**
+   * List of themes available on the destination.
+   */
+  protected $themes;
+
   /**
    * Constructs a BlockTheme object.
    *
diff --git a/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php b/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
index 4d7b19cd5..cb365b955 100644
--- a/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
+++ b/web/core/modules/block/src/Plugin/migrate/process/BlockVisibility.php
@@ -34,8 +34,9 @@ class BlockVisibility extends ProcessPluginBase implements ContainerFactoryPlugi
   protected $migrateLookup;
 
   /**
-   * Whether or not to skip blocks that use PHP for visibility. Only applies
-   * if the PHP module is not enabled.
+   * Whether or not to skip blocks that use PHP for visibility.
+   *
+   * Only applies if the PHP module is not enabled.
    *
    * @var bool
    */
diff --git a/web/core/modules/block/templates/block.html.twig b/web/core/modules/block/templates/block.html.twig
index d88047525..8fc22725d 100644
--- a/web/core/modules/block/templates/block.html.twig
+++ b/web/core/modules/block/templates/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
index e558bcb90..a76d4054f 100644
--- a/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
+++ b/web/core/modules/block/tests/modules/block_test/src/Plugin/Block/TestAccessBlock.php
@@ -20,6 +20,11 @@
  */
 class TestAccessBlock extends BlockBase implements ContainerFactoryPluginInterface {
 
+  /**
+   * The state service.
+   */
+  protected $state;
+
   /**
    * Tests the test access block.
    *
diff --git a/web/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml b/web/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml
index ebfd83f93..59ed36afe 100644
--- a/web/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml
+++ b/web/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml
@@ -1,6 +1,6 @@
 name: '<"Cat" & ''Mouse''>'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Theme for testing special characters in block admin.'
 regions:
   content: Content
diff --git a/web/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml b/web/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
index db2e017ad..3c3f0e3a8 100644
--- a/web/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
+++ b/web/core/modules/block/tests/modules/block_test/themes/block_test_theme/block_test_theme.info.yml
@@ -1,6 +1,6 @@
 name: 'Block test theme'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Theme for testing the block system'
 version: VERSION
 regions:
diff --git a/web/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php b/web/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php
index b162f6d22..f78b1404d 100644
--- a/web/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php
+++ b/web/core/modules/block/tests/src/Functional/AssertBlockAppearsTrait.php
@@ -39,8 +39,14 @@ protected function assertNoBlockAppears(Block $block) {
    *
    * @return array
    *   The result from the xpath query.
+   *
+   * @deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. There is no
+   *   replacement.
+   *
+   * @see https://www.drupal.org/node/3293310
    */
   protected function findBlockInstance(Block $block) {
+    @trigger_error(__METHOD__ . '() is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. There is no replacement. See https://www.drupal.org/node/3293310', E_USER_DEPRECATED);
     return $this->xpath('//div[@id = :id]', [':id' => 'block-' . $block->id()]);
   }
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php b/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
index 187cacf3a..8559be707 100644
--- a/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockAdminThemeTest.php
@@ -36,22 +36,22 @@ public function testAdminTheme() {
 
     // Ensure that access to block admin page is denied when theme is not
     // installed.
-    $this->drupalGet('admin/structure/block/list/bartik');
+    $this->drupalGet('admin/structure/block/list/olivero');
     $this->assertSession()->statusCodeEquals(403);
 
     // Install admin theme and confirm that tab is accessible.
-    \Drupal::service('theme_installer')->install(['bartik']);
-    $edit['admin_theme'] = 'bartik';
+    \Drupal::service('theme_installer')->install(['olivero']);
+    $edit['admin_theme'] = 'olivero';
     $this->drupalGet('admin/appearance');
     $this->submitForm($edit, 'Save configuration');
-    $this->drupalGet('admin/structure/block/list/bartik');
+    $this->drupalGet('admin/structure/block/list/olivero');
     $this->assertSession()->statusCodeEquals(200);
   }
 
   /**
-   * Ensure contextual links are disabled in Seven theme.
+   * Ensure contextual links are disabled in Claro theme.
    */
-  public function testSevenAdminTheme() {
+  public function testClaroAdminTheme() {
     // Create administrative user.
     $admin_user = $this->drupalCreateUser([
       'access administration pages',
@@ -62,14 +62,14 @@ public function testSevenAdminTheme() {
     $this->drupalLogin($admin_user);
 
     // Install admin theme and confirm that tab is accessible.
-    \Drupal::service('theme_installer')->install(['seven']);
-    $edit['admin_theme'] = 'seven';
+    \Drupal::service('theme_installer')->install(['claro']);
+    $edit['admin_theme'] = 'claro';
     $this->drupalGet('admin/appearance');
     $this->submitForm($edit, 'Save configuration');
 
     // Define our block settings.
     $settings = [
-      'theme' => 'seven',
+      'theme' => 'claro',
       'region' => 'header',
     ];
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockCacheTest.php b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
index 397d89e5d..68c0c0a10 100644
--- a/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockCacheTest.php
@@ -52,6 +52,9 @@ class BlockCacheTest extends BrowserTestBase {
    */
   protected $block;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockDemoTest.php b/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
index d5dc7ba56..d9d1f519f 100644
--- a/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockDemoTest.php
@@ -44,9 +44,8 @@ public function testBlockDemo() {
 
     // All available themes in core.
     $available_themes = [
-      'bartik',
       'olivero',
-      'seven',
+      'claro',
       'stark',
     ];
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php b/web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
index 8a506ce74..7f5906be7 100644
--- a/web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockHiddenRegionTest.php
@@ -5,8 +5,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests that a newly installed theme does not inherit blocks to its hidden
- * regions.
+ * Tests that blocks are not added to hidden regions on theme installation.
  *
  * @group block
  */
@@ -29,6 +28,9 @@ class BlockHiddenRegionTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -37,8 +39,7 @@ protected function setUp(): void {
       'administer blocks',
       'administer themes',
       'search content',
-      ]
-    );
+    ]);
 
     $this->drupalLogin($this->adminUser);
     $this->drupalPlaceBlock('search_form_block');
diff --git a/web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php b/web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
index e66c89243..cb4030792 100644
--- a/web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockHookOperationTest.php
@@ -23,6 +23,9 @@ class BlockHookOperationTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockHtmlTest.php b/web/core/modules/block/tests/src/Functional/BlockHtmlTest.php
index b6b9db7e3..07af38369 100644
--- a/web/core/modules/block/tests/src/Functional/BlockHtmlTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockHtmlTest.php
@@ -23,6 +23,9 @@ class BlockHtmlTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php b/web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
index 032707a7f..9a0052b07 100644
--- a/web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockInvalidRegionTest.php
@@ -6,8 +6,7 @@
 use Drupal\block\Entity\Block;
 
 /**
- * Tests that an active block assigned to a non-existing region triggers the
- * warning message and is disabled.
+ * Tests that blocks assigned to invalid regions are disabled with a warning.
  *
  * @group block
  */
@@ -25,6 +24,9 @@ class BlockInvalidRegionTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create an admin user.
diff --git a/web/core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php b/web/core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php
index c72e72f31..9bfd99dd7 100644
--- a/web/core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockLanguageCacheTest.php
@@ -31,6 +31,9 @@ class BlockLanguageCacheTest extends BrowserTestBase {
    */
   protected $langcodes = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php b/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
index 7a74892e6..95c2b3fa4 100644
--- a/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockLanguageTest.php
@@ -6,8 +6,7 @@
 use Drupal\block\Entity\Block;
 
 /**
- * Tests if a block can be configured to be only visible on a particular
- * language.
+ * Tests per-language block configuration.
  *
  * @group block
  */
@@ -30,6 +29,9 @@ class BlockLanguageTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block/tests/src/Functional/BlockRenderOrderTest.php b/web/core/modules/block/tests/src/Functional/BlockRenderOrderTest.php
index 1bf5953ab..455aa6ca5 100644
--- a/web/core/modules/block/tests/src/Functional/BlockRenderOrderTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockRenderOrderTest.php
@@ -24,6 +24,9 @@ class BlockRenderOrderTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create a test user.
diff --git a/web/core/modules/block/tests/src/Functional/BlockTest.php b/web/core/modules/block/tests/src/Functional/BlockTest.php
index e72cc38a7..2e16a24d6 100644
--- a/web/core/modules/block/tests/src/Functional/BlockTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockTest.php
@@ -163,7 +163,7 @@ public function testAddBlockFromLibraryWithWeight() {
         'theme' => $default_theme,
       ]);
 
-      // Verify that one link is found, with the the expected link text.
+      // Verify that one link is found, with the expected link text.
       $xpath = $this->assertSession()->buildXPathQuery('//a[contains(@href, :href)]', [':href' => $add_url->toString()]);
       $this->assertSession()->elementsCount('xpath', $xpath, 1);
       $this->assertSession()->elementTextEquals('xpath', $xpath, 'Place block');
@@ -270,9 +270,8 @@ public function testBlock() {
   public function testBlockThemeSelector() {
     // Install all themes.
     $themes = [
-      'bartik',
       'olivero',
-      'seven',
+      'claro',
       'stark',
     ];
     \Drupal::service('theme_installer')->install($themes);
@@ -530,14 +529,14 @@ public function testUninstallTheme() {
     /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
     $theme_installer = \Drupal::service('theme_installer');
 
-    $theme_installer->install(['seven']);
-    $this->config('system.theme')->set('default', 'seven')->save();
-    $block = $this->drupalPlaceBlock('system_powered_by_block', ['theme' => 'seven', 'region' => 'help']);
+    $theme_installer->install(['claro']);
+    $this->config('system.theme')->set('default', 'claro')->save();
+    $block = $this->drupalPlaceBlock('system_powered_by_block', ['theme' => 'claro', 'region' => 'help']);
     $this->drupalGet('<front>');
     $this->assertSession()->pageTextContains('Powered by Drupal');
 
     $this->config('system.theme')->set('default', 'stark')->save();
-    $theme_installer->uninstall(['seven']);
+    $theme_installer->uninstall(['claro']);
 
     // Ensure that the block configuration does not exist anymore.
     $this->assertNull(Block::load($block->id()));
@@ -589,4 +588,32 @@ public function testBlockUserRoleDelete() {
     $this->assertEquals([$role2->id() => $role2->id()], $block->getVisibility()['user_role']['roles']);
   }
 
+  /**
+   * Tests block title.
+   */
+  public function testBlockTitle() {
+    // Create a custom title for the block.
+    $title = "This block's <b>great!</b>";
+    // Enable a standard block.
+    $default_theme = $this->config('system.theme')->get('default');
+    $edit = [
+      'id' => 'test',
+      'region' => 'sidebar_first',
+      'settings[label]' => $title,
+      'settings[label_display]' => TRUE,
+    ];
+    // Set the block to be shown only to authenticated users.
+    $edit['visibility[user_role][roles][' . RoleInterface::AUTHENTICATED_ID . ']'] = TRUE;
+    $this->drupalGet('admin/structure/block/add/foo/' . $default_theme);
+    $this->submitForm($edit, 'Save block');
+
+    // Ensure that the title is displayed as plain text.
+    $elements = $this->xpath('//table/tbody/tr//td[contains(@class, "block")]');
+    $this->assertEquals($title, $elements[0]->getText());
+
+    $this->clickLink('Disable');
+    $elements = $this->xpath('//table/tbody/tr//td[contains(@class, "block")]');
+    $this->assertEquals("$title (disabled)", $elements[0]->getText());
+  }
+
 }
diff --git a/web/core/modules/block/tests/src/Functional/BlockUiTest.php b/web/core/modules/block/tests/src/Functional/BlockUiTest.php
index bacb63e68..2ea46b4eb 100644
--- a/web/core/modules/block/tests/src/Functional/BlockUiTest.php
+++ b/web/core/modules/block/tests/src/Functional/BlockUiTest.php
@@ -54,6 +54,9 @@ class BlockUiTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create and log in an administrative user.
@@ -101,9 +104,23 @@ public function testBlockDemoUiPage() {
     $this->assertSession()->assertEscaped('<strong>Test theme</strong>');
 
     // Ensure that a hidden theme cannot use the block demo page.
-    \Drupal::service('theme_installer')->install(['stable']);
-    $this->drupalGet('admin/structure/block/demo/stable');
+    \Drupal::service('theme_installer')->install(['stable9']);
+    $this->drupalGet('admin/structure/block/demo/stable9');
     $this->assertSession()->statusCodeEquals(404);
+
+    // Delete all blocks and verify saving the block layout results in a
+    // validation error.
+    $block_storage = \Drupal::service('entity_type.manager')->getStorage('block');
+    $blocks = $block_storage->loadMultiple();
+    foreach ($blocks as $block) {
+      $block->delete();
+    }
+    $this->drupalGet('admin/structure/block');
+    $blocks_table = $this->xpath("//tr[@class='block-enabled']");
+    $this->assertEmpty($blocks_table, 'The blocks table is now empty.');
+    $this->submitForm([], 'Save blocks');
+    $this->assertSession()->pageTextContains('No blocks settings to update');
+
   }
 
   /**
@@ -147,25 +164,25 @@ public function testBlockAdminUiPage() {
     $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stark']);
     // We have to enable at least one extra theme that is not hidden so that
     // local tasks will show up. That's why we enable test_theme_theme.
-    \Drupal::service('theme_installer')->install(['stable', 'test_theme_theme']);
+    \Drupal::service('theme_installer')->install(['stable9', 'test_theme_theme']);
     $this->drupalGet('admin/structure/block');
     $theme_handler = \Drupal::service('theme_handler');
     $this->assertSession()->linkExists($theme_handler->getName('stark'));
     $this->assertSession()->linkExists($theme_handler->getName('test_theme_theme'));
-    $this->assertSession()->linkNotExists($theme_handler->getName('stable'));
+    $this->assertSession()->linkNotExists($theme_handler->getName('stable9'));
 
     // Ensure that a hidden theme cannot use the block demo page.
-    $this->drupalGet('admin/structure/block/list/stable');
+    $this->drupalGet('admin/structure/block/list/stable9');
     $this->assertSession()->statusCodeEquals(404);
 
     // Ensure that a hidden theme set as the admin theme can use the block demo
     // page.
-    \Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
+    \Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable9')->save();
     \Drupal::service('router.builder')->rebuildIfNeeded();
-    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
+    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable9']);
     $this->drupalGet('admin/structure/block');
-    $this->assertSession()->linkExists($theme_handler->getName('stable'));
-    $this->drupalGet('admin/structure/block/list/stable');
+    $this->assertSession()->linkExists($theme_handler->getName('stable9'));
+    $this->drupalGet('admin/structure/block/list/stable9');
     $this->assertSession()->statusCodeEquals(200);
   }
 
diff --git a/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php b/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
index 7da71c980..dac5331fa 100644
--- a/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
+++ b/web/core/modules/block/tests/src/Functional/NonDefaultBlockAdminTest.php
@@ -41,11 +41,11 @@ public function testNonDefaultBlockAdmin() {
       'administer themes',
     ]);
     $this->drupalLogin($admin_user);
-    $new_theme = 'bartik';
+    $new_theme = 'olivero';
     \Drupal::service('theme_installer')->install([$new_theme]);
-    // Ensure that the Bartik tab is shown.
+    // Ensure that the Olivero tab is shown.
     $this->drupalGet('admin/structure/block/list/' . $new_theme);
-    $this->assertSession()->pageTextContains('Bartik(active tab)');
+    $this->assertSession()->pageTextContains('Olivero(active tab)');
   }
 
 }
diff --git a/web/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php b/web/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php
index aad92f244..17e020d8c 100644
--- a/web/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php
+++ b/web/core/modules/block/tests/src/FunctionalJavascript/BlockAddTest.php
@@ -28,7 +28,7 @@ class BlockAddTest extends WebDriverTestBase {
    * Tests the AJAX for the theme selector.
    */
   public function testBlockAddThemeSelector() {
-    \Drupal::service('theme_installer')->install(['seven']);
+    \Drupal::service('theme_installer')->install(['claro']);
 
     $this->drupalLogin($this->drupalCreateUser([
       'administer blocks',
@@ -37,7 +37,7 @@ public function testBlockAddThemeSelector() {
     $this->drupalGet('admin/structure/block/add/system_powered_by_block');
     $assert_session = $this->assertSession();
     // Pick a theme with a region that does not exist in another theme.
-    $assert_session->selectExists('Theme')->selectOption('seven');
+    $assert_session->selectExists('Theme')->selectOption('claro');
     $assert_session->assertWaitOnAjaxRequest();
     $assert_session->selectExists('Region')->selectOption('pre_content');
     $assert_session->assertWaitOnAjaxRequest();
diff --git a/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php b/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
index 043eaf9e8..9f03b1469 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
@@ -30,6 +30,9 @@ class BlockStorageUnitTest extends KernelTestBase {
    */
   protected $controller;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php b/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
index 03b728da7..d14e9021a 100644
--- a/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
+++ b/web/core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
@@ -25,7 +25,7 @@ class BlockViewBuilderTest extends KernelTestBase {
   /**
    * The block being tested.
    *
-   * @var \Drupal\block\Entity\BlockInterface
+   * @var \Drupal\block\BlockInterface
    */
   protected $block;
 
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
index 55f48c3e5..10c594625 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockTest.php
@@ -36,14 +36,14 @@ protected function setUp(): void {
     parent::setUp();
 
     // Install the themes used for this test.
-    $this->container->get('theme_installer')->install(['bartik', 'test_theme']);
-
     $this->installEntitySchema('block_content');
+    $this->container->get('theme_installer')->install(['olivero', 'test_theme']);
+
     $this->installConfig(['block_content']);
 
-    // Set Bartik as the default public theme.
+    // Set Olivero as the default public theme.
     $config = $this->config('system.theme');
-    $config->set('default', 'bartik');
+    $config->set('default', 'olivero');
     $config->save();
 
     $this->executeMigrations([
@@ -97,7 +97,7 @@ public function assertEntity(string $id, array $visibility, string $region, stri
    */
   public function testBlockMigration() {
     $blocks = Block::loadMultiple();
-    $this->assertCount(14, $blocks);
+    $this->assertCount(25, $blocks);
 
     // Check user blocks.
     $visibility = [
@@ -113,7 +113,7 @@ public function testBlockMigration() {
       'provider' => 'user',
       'label_display' => '0',
     ];
-    $this->assertEntity('user', $visibility, 'sidebar_first', 'bartik', -10, $settings);
+    $this->assertEntity('user', $visibility, 'sidebar', 'olivero', -10, $settings);
 
     $visibility = [];
     $settings = [
@@ -125,7 +125,7 @@ public function testBlockMigration() {
       'expand_all_items' => FALSE,
       'depth' => 0,
     ];
-    $this->assertEntity('user_1', $visibility, 'sidebar_first', 'bartik', -11, $settings);
+    $this->assertEntity('user_1', $visibility, 'sidebar', 'olivero', -11, $settings);
 
     $visibility = [
       'user_role' => [
@@ -146,7 +146,7 @@ public function testBlockMigration() {
       'label_display' => '0',
       'items_per_page' => '5',
     ];
-    $this->assertEntity('user_2', $visibility, 'sidebar_second', 'bartik', -11, $settings);
+    $this->assertEntity('user_2', $visibility, 'sidebar', 'olivero', -11, $settings);
 
     $visibility = [
       'user_role' => [
@@ -167,7 +167,7 @@ public function testBlockMigration() {
       'label_display' => '0',
       'items_per_page' => '10',
     ];
-    $this->assertEntity('user_3', $visibility, 'sidebar_second', 'bartik', -10, $settings);
+    $this->assertEntity('user_3', $visibility, 'sidebar', 'olivero', -10, $settings);
 
     // Check system block.
     $visibility = [
@@ -183,7 +183,7 @@ public function testBlockMigration() {
       'provider' => 'system',
       'label_display' => '0',
     ];
-    $this->assertEntity('system', $visibility, 'footer_fifth', 'bartik', -5, $settings);
+    $this->assertEntity('system', $visibility, 'footer_top', 'olivero', -5, $settings);
 
     // Check menu blocks.
     $settings = [
@@ -192,7 +192,7 @@ public function testBlockMigration() {
       'provider' => 'core',
       'label_display' => '0',
     ];
-    $this->assertEntity('menu', [], 'header', 'bartik', -5, $settings);
+    $this->assertEntity('menu', [], 'header', 'olivero', -5, $settings);
 
     // Check aggregator block.
     $settings = [
@@ -203,7 +203,7 @@ public function testBlockMigration() {
       'block_count' => 7,
       'feed' => '5',
     ];
-    $this->assertEntity('aggregator', [], 'sidebar_second', 'bartik', -2, $settings);
+    $this->assertEntity('aggregator', [], 'sidebar', 'olivero', -2, $settings);
 
     // Check book block.
     $settings = [
@@ -213,7 +213,7 @@ public function testBlockMigration() {
       'label_display' => '0',
       'block_mode' => 'book pages',
     ];
-    $this->assertEntity('book', [], 'sidebar_second', 'bartik', -4, $settings);
+    $this->assertEntity('book', [], 'sidebar', 'olivero', -4, $settings);
 
     // Check forum block settings.
     $settings = [
@@ -226,7 +226,7 @@ public function testBlockMigration() {
         'administrative' => '1',
       ],
     ];
-    $this->assertEntity('forum', [], 'sidebar_first', 'bartik', -8, $settings);
+    $this->assertEntity('forum', [], 'sidebar', 'olivero', -8, $settings);
 
     $settings = [
       'id' => 'forum_new_block',
@@ -238,7 +238,7 @@ public function testBlockMigration() {
         'administrative' => '1',
       ],
     ];
-    $this->assertEntity('forum_1', [], 'sidebar_first', 'bartik', -9, $settings);
+    $this->assertEntity('forum_1', [], 'sidebar', 'olivero', -9, $settings);
 
     // Check statistic block settings.
     $settings = [
@@ -250,7 +250,7 @@ public function testBlockMigration() {
       'top_all_num' => 8,
       'top_last_num' => 9,
     ];
-    $this->assertEntity('statistics', [], 'sidebar_second', 'bartik', 0, $settings);
+    $this->assertEntity('statistics', [], 'sidebar', 'olivero', 0, $settings);
 
     // Check custom blocks.
     $visibility = [
@@ -269,7 +269,7 @@ public function testBlockMigration() {
       'info' => '',
       'view_mode' => 'full',
     ];
-    $this->assertEntity('block', $visibility, 'content', 'bartik', 0, $settings);
+    $this->assertEntity('block', $visibility, 'content', 'olivero', 0, $settings);
 
     $visibility = [
       'request_path' => [
diff --git a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
index 0e0117e8b..2b65a98f5 100644
--- a/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
+++ b/web/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockTest.php
@@ -36,15 +36,15 @@ protected function setUp(): void {
     parent::setUp();
 
     // Install the themes used for this test.
-    $this->container->get('theme_installer')->install(['bartik', 'seven']);
-
     $this->installEntitySchema('block_content');
+    $this->container->get('theme_installer')->install(['olivero', 'claro']);
+
     $this->installConfig(static::$modules);
 
-    // Set Bartik and Seven as the default public and admin theme.
+    // Set Olivero and Claro as the default public and admin theme.
     $config = $this->config('system.theme');
-    $config->set('default', 'bartik');
-    $config->set('admin', 'seven');
+    $config->set('default', 'olivero');
+    $config->set('admin', 'claro');
     $config->save();
 
     $this->executeMigrations([
@@ -113,18 +113,18 @@ public function assertEntity(string $id, string $plugin_id, array $roles, string
    * Tests the block migration.
    */
   public function testBlockMigration() {
-    $this->assertEntity('bartik_system_main', 'system_main_block', [], '', 'content', 'bartik', 0, '', '0');
-    $this->assertEntity('bartik_search_form', 'search_form_block', [], '', 'sidebar_first', 'bartik', -1, '', '0');
-    $this->assertEntity('bartik_user_login', 'user_login_block', [], '', 'sidebar_first', 'bartik', 0, 'User login title', 'visible');
-    $this->assertEntity('bartik_system_powered_by', 'system_powered_by_block', [], '', 'footer_fifth', 'bartik', 10, '', '0');
-    $this->assertEntity('seven_system_main', 'system_main_block', [], '', 'content', 'seven', 0, '', '0');
-    $this->assertEntity('seven_user_login', 'user_login_block', [], '', 'content', 'seven', 10, 'User login title', 'visible');
+    $this->assertEntity('bartik_system_main', 'system_main_block', [], '', 'content', 'olivero', 0, '', '0');
+    $this->assertEntity('bartik_search_form', 'search_form_block', [], '', 'content', 'olivero', -1, '', '0');
+    $this->assertEntity('bartik_user_login', 'user_login_block', [], '', 'content', 'olivero', 0, 'User login title', 'visible');
+    $this->assertEntity('bartik_system_powered_by', 'system_powered_by_block', [], '', 'footer_bottom', 'olivero', 10, '', '0');
+    $this->assertEntity('seven_system_main', 'system_main_block', [], '', 'content', 'claro', 0, '', '0');
+    $this->assertEntity('seven_user_login', 'user_login_block', [], '', 'content', 'claro', 10, 'User login title', 'visible');
 
     // The d7_custom_block migration should have migrated a block containing a
     // mildly amusing limerick. We'll need its UUID to determine
     // bartik_block_1's plugin ID.
     $uuid = BlockContent::load(1)->uuid();
-    $this->assertEntity('bartik_block_1', 'block_content:' . $uuid, ['authenticated'], '', 'highlighted', 'bartik', 0, 'Mildly amusing limerick of the day', 'visible');
+    $this->assertEntity('bartik_block_1', 'block_content:' . $uuid, ['authenticated'], '', 'content', 'olivero', 0, 'Mildly amusing limerick of the day', 'visible');
 
     // Assert that disabled blocks (or enabled blocks whose plugin IDs could
     // be resolved) did not migrate.
diff --git a/web/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php b/web/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
index b45f968aa..129ac5568 100644
--- a/web/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
+++ b/web/core/modules/block/tests/src/Kernel/NewDefaultThemeBlocksTest.php
@@ -6,7 +6,7 @@
 use Drupal\Tests\block\Traits\BlockCreationTrait;
 
 /**
- * Tests that the new default theme gets blocks.
+ * Tests that a new default theme gets blocks.
  *
  * @group block
  */
@@ -23,7 +23,7 @@ class NewDefaultThemeBlocksTest extends KernelTestBase {
   ];
 
   /**
-   * Check the enabled Bartik blocks are correctly copied over.
+   * Check the blocks are correctly copied by block_themes_installed().
    */
   public function testNewDefaultThemeBlocks() {
     $this->installConfig(['system']);
@@ -44,8 +44,8 @@ public function testNewDefaultThemeBlocks() {
       'id' => $default_theme . '_' . strtolower($this->randomMachineName(8)),
     ]);
 
-    // Install a different theme.
-    $new_theme = 'bartik';
+    // Install a different theme that does not have blocks.
+    $new_theme = 'test_theme';
     // The new theme is different from the previous default theme.
     $this->assertNotEquals($new_theme, $default_theme);
 
@@ -69,7 +69,7 @@ public function testNewDefaultThemeBlocks() {
     foreach ($default_block_names as $default_block_name) {
       // Remove the matching block from the list of blocks in the new theme.
       // E.g., if the old theme has block.block.stark_admin,
-      // unset block.block.bartik_admin.
+      // unset block.block.olivero_admin.
       unset($new_blocks[str_replace($default_theme . '_', $new_theme . '_', $default_block_name)]);
     }
     $this->assertEmpty($new_blocks);
diff --git a/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php b/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
index 77a8d5979..f26901fc7 100644
--- a/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
+++ b/web/core/modules/block/tests/src/Unit/BlockConfigEntityUnitTest.php
@@ -66,13 +66,13 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('block'));
+      ->willReturn('block');
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->uuid = $this->createMock('\Drupal\Component\Uuid\UuidInterface');
 
@@ -111,13 +111,13 @@ public function testCalculateDependencies() {
     $plugin_collection->expects($this->atLeastOnce())
       ->method('get')
       ->with($instance_id)
-      ->will($this->returnValue($instance));
+      ->willReturn($instance);
     $plugin_collection->addInstanceId($instance_id);
 
     // Return the mocked plugin collection.
     $entity->expects($this->once())
       ->method('getPluginCollections')
-      ->will($this->returnValue([$plugin_collection]));
+      ->willReturn([$plugin_collection]);
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertContains('test', $dependencies['module']);
diff --git a/web/core/modules/block/tests/src/Unit/BlockFormTest.php b/web/core/modules/block/tests/src/Unit/BlockFormTest.php
index 249e18da2..fdaee38e1 100644
--- a/web/core/modules/block/tests/src/Unit/BlockFormTest.php
+++ b/web/core/modules/block/tests/src/Unit/BlockFormTest.php
@@ -79,7 +79,7 @@ protected function setUp(): void {
     $this->themeHandler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $this->entityTypeManager->expects($this->any())
       ->method('getStorage')
-      ->will($this->returnValue($this->storage));
+      ->willReturn($this->storage);
 
     $this->pluginFormFactory = $this->prophesize(PluginFormFactoryInterface::class);
   }
@@ -99,14 +99,14 @@ protected function getBlockMockWithMachineName($machine_name) {
       ->getMock();
     $plugin->expects($this->any())
       ->method('getMachineNameSuggestion')
-      ->will($this->returnValue($machine_name));
+      ->willReturn($machine_name);
 
     $block = $this->getMockBuilder(Block::class)
       ->disableOriginalConstructor()
       ->getMock();
     $block->expects($this->any())
       ->method('getPlugin')
-      ->will($this->returnValue($plugin));
+      ->willReturn($plugin);
     return $block;
   }
 
@@ -126,15 +126,15 @@ public function testGetUniqueMachineName() {
     $query = $this->createMock('Drupal\Core\Entity\Query\QueryInterface');
     $query->expects($this->exactly(5))
       ->method('condition')
-      ->will($this->returnValue($query));
+      ->willReturn($query);
 
     $query->expects($this->exactly(5))
       ->method('execute')
-      ->will($this->returnValue(['test', 'other_test', 'other_test_1', 'other_test_2']));
+      ->willReturn(['test', 'other_test', 'other_test_1', 'other_test_2']);
 
     $this->storage->expects($this->exactly(5))
       ->method('getQuery')
-      ->will($this->returnValue($query));
+      ->willReturn($query);
 
     $block_form_controller = new BlockForm($this->entityTypeManager, $this->conditionManager, $this->contextRepository, $this->language, $this->themeHandler, $this->pluginFormFactory->reveal());
 
diff --git a/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php b/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
index 522b691af..9a13978fe 100644
--- a/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
+++ b/web/core/modules/block/tests/src/Unit/BlockRepositoryTest.php
@@ -1,17 +1,10 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\block\Unit\BlockRepositoryTest.
- */
-
 namespace Drupal\Tests\block\Unit;
 
 use Drupal\block\BlockRepository;
 use Drupal\Core\Access\AccessResult;
-use Drupal\Core\Block\BlockPluginInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -63,7 +56,7 @@ protected function setUp(): void {
     $theme_manager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface');
     $theme_manager->expects($this->atLeastOnce())
       ->method('getActiveTheme')
-      ->will($this->returnValue($active_theme));
+      ->willReturn($active_theme);
 
     $this->contextHandler = $this->createMock('Drupal\Core\Plugin\Context\ContextHandlerInterface');
     $this->blockStorage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
@@ -89,7 +82,7 @@ public function testGetVisibleBlocksPerRegion(array $blocks_config, array $expec
       $block = $this->createMock('Drupal\block\BlockInterface');
       $block->expects($this->once())
         ->method('access')
-        ->will($this->returnValue($block_config[0]));
+        ->willReturn($block_config[0]);
       $block->expects($block_config[0] ? $this->atLeastOnce() : $this->never())
         ->method('getRegion')
         ->willReturn($block_config[1]);
@@ -191,6 +184,3 @@ public function testGetVisibleBlocksPerRegionWithContext() {
   }
 
 }
-
-interface TestContextAwareBlockInterface extends BlockPluginInterface, ContextAwarePluginInterface {
-}
diff --git a/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php b/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
index 1814b636d..817c88bd5 100644
--- a/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
+++ b/web/core/modules/block/tests/src/Unit/CategoryAutocompleteTest.php
@@ -20,11 +20,14 @@ class CategoryAutocompleteTest extends UnitTestCase {
    */
   protected $autocompleteController;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $block_manager = $this->createMock('Drupal\Core\Block\BlockManagerInterface');
     $block_manager->expects($this->any())
       ->method('getCategories')
-      ->will($this->returnValue(['Comment', 'Node', 'None & Such', 'User']));
+      ->willReturn(['Comment', 'Node', 'None & Such', 'User']);
 
     $this->autocompleteController = new CategoryAutocompleteController($block_manager);
   }
diff --git a/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php b/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php
index 6be2812ba..0141e107e 100644
--- a/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php
+++ b/web/core/modules/block/tests/src/Unit/Menu/BlockLocalTasksTest.php
@@ -12,6 +12,9 @@
  */
 class BlockLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = ['block' => 'core/modules/block'];
     parent::setUp();
@@ -43,7 +46,7 @@ protected function setUp(): void {
     $theme_handler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $theme_handler->expects($this->any())
       ->method('listInfo')
-      ->will($this->returnValue($themes));
+      ->willReturn($themes);
     $theme_handler->expects($this->any())
       ->method('hasUi')
       ->willReturnMap([
diff --git a/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php b/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
index 4528737fe..946387c7c 100644
--- a/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
+++ b/web/core/modules/block/tests/src/Unit/Plugin/DisplayVariant/BlockPageVariantTest.php
@@ -219,7 +219,7 @@ public function testBuild(array $blocks_config, $visible_block_count, array $exp
     }
     $this->blockViewBuilder->expects($this->exactly($visible_block_count))
       ->method('view')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->blockRepository->expects($this->once())
       ->method('getVisibleBlocksPerRegion')
       ->willReturnCallback(function (&$cacheable_metadata) use ($blocks) {
diff --git a/web/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockRegionTest.php b/web/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockRegionTest.php
index f473dc4c8..c72fed64a 100644
--- a/web/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockRegionTest.php
+++ b/web/core/modules/block/tests/src/Unit/Plugin/migrate/process/BlockRegionTest.php
@@ -48,6 +48,8 @@ protected function transform(array $value, Row $row = NULL) {
   }
 
   /**
+   * Tests transforming a block with the same theme and an existing region.
+   *
    * If the source and destination themes are identical, the region should only
    * be passed through if it actually exists in the destination theme.
    *
@@ -58,6 +60,8 @@ public function testTransformSameThemeRegionExists() {
   }
 
   /**
+   * Tests transforming a block with the same theme and a non-existent region.
+   *
    * If the source and destination themes are identical, the region should be
    * changed to 'content' if it doesn't exist in the destination theme.
    *
diff --git a/web/core/modules/block_content/block_content.module b/web/core/modules/block_content/block_content.module
index 917248cd6..69717d6de 100644
--- a/web/core/modules/block_content/block_content.module
+++ b/web/core/modules/block_content/block_content.module
@@ -66,6 +66,13 @@ function block_content_entity_type_alter(array &$entity_types) {
     $translation['block_content'] = TRUE;
     $entity_types['block_content']->set('translation', $translation);
   }
+
+  // Swap out the default EntityChanged constraint with a custom one with
+  // different logic for inline blocks.
+  $constraints = $entity_types['block_content']->getConstraints();
+  unset($constraints['EntityChanged']);
+  $constraints['BlockContentEntityChanged'] = NULL;
+  $entity_types['block_content']->setConstraints($constraints);
 }
 
 /**
diff --git a/web/core/modules/block_content/block_content.post_update.php b/web/core/modules/block_content/block_content.post_update.php
index dfd7bbca7..8e707e909 100644
--- a/web/core/modules/block_content/block_content.post_update.php
+++ b/web/core/modules/block_content/block_content.post_update.php
@@ -13,3 +13,10 @@ function block_content_removed_post_updates() {
     'block_content_post_update_add_views_reusable_filter' => '9.0.0',
   ];
 }
+
+/**
+ * Clear the entity type cache.
+ */
+function block_content_post_update_entity_changed_constraint() {
+  // Empty post_update hook.
+}
diff --git a/web/core/modules/block_content/src/Entity/BlockContent.php b/web/core/modules/block_content/src/Entity/BlockContent.php
index 95ba40da6..b12536d95 100644
--- a/web/core/modules/block_content/src/Entity/BlockContent.php
+++ b/web/core/modules/block_content/src/Entity/BlockContent.php
@@ -126,6 +126,20 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function preDelete(EntityStorageInterface $storage, array $entities) {
+    parent::preDelete($storage, $entities);
+
+    /** @var \Drupal\block_content\BlockContentInterface $block */
+    foreach ($entities as $block) {
+      foreach ($block->getInstances() as $instance) {
+        $instance->delete();
+      }
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -162,16 +176,6 @@ public function preSaveRevision(EntityStorageInterface $storage, \stdClass $reco
     }
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function delete() {
-    foreach ($this->getInstances() as $instance) {
-      $instance->delete();
-    }
-    parent::delete();
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
index 8db7e25a1..183493966 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php
@@ -172,7 +172,7 @@ public function testDefaultBlockContentCreation() {
     $edit = [];
     $edit['info[0][value]'] = $this->randomMachineName(8);
     $edit['body[0][value]'] = $this->randomMachineName(16);
-    // Don't pass the custom block type in the url so the default is forced.
+    // Don't pass the custom block type in the URL so the default is forced.
     $this->drupalGet('block/add');
     $this->submitForm($edit, 'Save');
 
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
index 05b54a4d5..36d096d80 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentTypeTest.php
@@ -44,6 +44,9 @@ class BlockContentTypeTest extends BlockContentTestBase {
    */
   protected $autoCreateBasicBlockType = FALSE;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -204,7 +207,7 @@ public function testsBlockContentAddTypes() {
       ->getStorage('block_content');
 
     // Install all themes.
-    $themes = ['bartik', 'olivero', 'seven', 'stark'];
+    $themes = ['olivero', 'stark', 'claro'];
     \Drupal::service('theme_installer')->install($themes);
     $theme_settings = $this->config('system.theme');
     foreach ($themes as $default_theme) {
@@ -220,15 +223,7 @@ public function testsBlockContentAddTypes() {
         $this->drupalGet($path);
         $this->clickLink('Place block');
         $this->clickLink('Add custom block');
-        // The seven theme has markup inside the link, we cannot use clickLink().
-        if ($default_theme == 'seven') {
-          $options = $theme != $default_theme ? ['query' => ['theme' => $theme]] : [];
-          $this->assertSession()->linkByHrefExists(Url::fromRoute('block_content.add_form', ['block_content_type' => 'foo'], $options)->toString());
-          $this->drupalGet('block/add/foo', $options);
-        }
-        else {
-          $this->clickLink('foo');
-        }
+        $this->clickLink('foo');
         // Create a new block.
         $edit = ['info[0][value]' => $this->randomMachineName(8)];
         $this->submitForm($edit, 'Save');
diff --git a/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php b/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
index 1fd21b695..9c3968607 100644
--- a/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/BlockContentValidationTest.php
@@ -39,7 +39,7 @@ public function testValidation() {
     // Make sure the violation is on the info property
     $this->assertEquals('info', $violations[0]->getPropertyPath());
     // Make sure the message is correct.
-    $this->assertEquals(new FormattableMarkup('A custom block with block description %value already exists.', ['%value' => $block->label()]), $violations[0]->getMessage());
+    $this->assertEquals(new FormattableMarkup('A custom block with Block description %value already exists.', ['%value' => $block->label()]), $violations[0]->getMessage());
   }
 
 }
diff --git a/web/core/modules/block_content/tests/src/Functional/PageEditTest.php b/web/core/modules/block_content/tests/src/Functional/PageEditTest.php
index d35addb3e..e310cb1a7 100644
--- a/web/core/modules/block_content/tests/src/Functional/PageEditTest.php
+++ b/web/core/modules/block_content/tests/src/Functional/PageEditTest.php
@@ -16,6 +16,9 @@ class PageEditTest extends BlockContentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php b/web/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
index f41577634..8c28e3584 100644
--- a/web/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
+++ b/web/core/modules/block_content/tests/src/Functional/Rest/BlockContentTypeResourceTestBase.php
@@ -18,7 +18,7 @@ abstract class BlockContentTypeResourceTestBase extends ConfigEntityResourceTest
   protected static $entityTypeId = 'block_content_type';
 
   /**
-   * @var \Drupal\block_content\Entity\BlockContentTypeInterface
+   * @var \Drupal\block_content\BlockContentTypeInterface
    */
   protected $entity;
 
diff --git a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
index 2e369f27b..911485606 100644
--- a/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
+++ b/web/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
@@ -39,6 +39,9 @@ abstract class BlockContentTestBase extends ViewTestBase {
     'block_content_test_views',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['block_content_test_views']) {
     parent::setUp($import_test_views, $modules);
     // Ensure the basic bundle exists. This is provided by the standard profile.
diff --git a/web/core/modules/block_content/tests/src/Kernel/BlockContentDeletionTest.php b/web/core/modules/block_content/tests/src/Kernel/BlockContentDeletionTest.php
index 14833adff..7276eae05 100644
--- a/web/core/modules/block_content/tests/src/Kernel/BlockContentDeletionTest.php
+++ b/web/core/modules/block_content/tests/src/Kernel/BlockContentDeletionTest.php
@@ -6,6 +6,7 @@
 use Drupal\block_content\Entity\BlockContentType;
 use Drupal\Component\Plugin\PluginBase;
 use Drupal\KernelTests\KernelTestBase;
+use Drupal\Tests\block\Traits\BlockCreationTrait;
 
 /**
  * Tests that deleting a block clears the cached definitions.
@@ -14,6 +15,8 @@
  */
 class BlockContentDeletionTest extends KernelTestBase {
 
+  use BlockCreationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -57,6 +60,24 @@ public function testDeletingBlockContentShouldClearPluginCache() {
     $block_content->delete();
     // The plugin should no longer exist.
     $this->assertFalse($block_manager->hasDefinition($plugin_id));
+
+    // Create another block content entity.
+    $block_content = BlockContent::create([
+      'info' => 'Spiffy prototype',
+      'type' => 'spiffy',
+    ]);
+    $block_content->save();
+
+    $plugin_id = 'block_content' . PluginBase::DERIVATIVE_SEPARATOR . $block_content->uuid();
+    $block = $this->placeBlock($plugin_id, ['region' => 'content']);
+
+    // Delete it via storage.
+    $storage = $this->container->get('entity_type.manager')->getStorage('block_content');
+    $storage->delete([$block_content]);
+    // The plugin should no longer exist.
+    $this->assertFalse($block_manager->hasDefinition($plugin_id));
+
+    $this->assertNull($this->container->get('entity_type.manager')->getStorage('block')->loadUnchanged($block->id()));
   }
 
 }
diff --git a/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php b/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
index 5bfb2fbc8..4c407afcc 100644
--- a/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
+++ b/web/core/modules/block_content/tests/src/Unit/Menu/BlockContentLocalTasksTest.php
@@ -12,6 +12,9 @@
  */
 class BlockContentLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = [
       'block' => 'core/modules/block',
@@ -42,7 +45,7 @@ protected function setUp(): void {
     $theme_handler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $theme_handler->expects($this->any())
       ->method('listInfo')
-      ->will($this->returnValue($themes));
+      ->willReturn($themes);
 
     $container = new ContainerBuilder();
     $container->set('config.factory', $config_factory);
diff --git a/web/core/modules/book/book.install b/web/core/modules/book/book.install
index 770448336..90c6f87ff 100644
--- a/web/core/modules/book/book.install
+++ b/web/core/modules/book/book.install
@@ -18,7 +18,7 @@ function book_uninstall() {
  */
 function book_schema() {
   $schema['book'] = [
-  'description' => 'Stores book outline information. Uniquely defines the location of each node in the book outline',
+    'description' => 'Stores book outline information. Uniquely defines the location of each node in the book outline',
     'fields' => [
       'nid' => [
         'type' => 'int',
diff --git a/web/core/modules/book/book.js b/web/core/modules/book/book.js
index 8b320fc0b..683c90786 100644
--- a/web/core/modules/book/book.js
+++ b/web/core/modules/book/book.js
@@ -4,22 +4,18 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.bookDetailsSummaries = {
     attach: function attach(context) {
       $(context).find('.book-outline-form').drupalSetSummary(function (context) {
         var $select = $(context).find('.book-title-select');
         var val = $select[0].value;
-
         if (val === '0') {
           return Drupal.t('Not in book');
         }
-
         if (val === 'new') {
           return Drupal.t('New book');
         }
-
         return Drupal.checkPlain($select.find(':selected')[0].textContent);
       });
     }
diff --git a/web/core/modules/book/book.module b/web/core/modules/book/book.module
index 42fec612e..1760113fe 100644
--- a/web/core/modules/book/book.module
+++ b/web/core/modules/book/book.module
@@ -202,7 +202,7 @@ function book_pick_book_nojs_submit($form, FormStateInterface $form_state) {
  * This function is called via Ajax when the selected book is changed on a node
  * or book outline form.
  *
- * @return
+ * @return array
  *   The rendered parent page select element.
  */
 function book_form_update($form, FormStateInterface $form_state) {
diff --git a/web/core/modules/book/book.views.inc b/web/core/modules/book/book.views.inc
index 63dfb38ae..9e10ccb2e 100644
--- a/web/core/modules/book/book.views.inc
+++ b/web/core/modules/book/book.views.inc
@@ -84,7 +84,7 @@ function book_views_data() {
 
   $data['book']['depth'] = [
     'title' => t('Depth'),
-    'help' => t('The depth of the book page in the hierarchy; top level books have a depth of 1.'),
+    'help' => t('The depth of the book page in the hierarchy; top level book pages have a depth of 1.'),
     'field' => [
       'id' => 'numeric',
     ],
diff --git a/web/core/modules/book/src/BookManagerInterface.php b/web/core/modules/book/src/BookManagerInterface.php
index 44107f2f9..f78797165 100644
--- a/web/core/modules/book/src/BookManagerInterface.php
+++ b/web/core/modules/book/src/BookManagerInterface.php
@@ -183,15 +183,23 @@ public function getAllBooks();
   public function updateOutline(NodeInterface $node);
 
   /**
-   * Saves a single book entry.
+   * Saves a link for a single book entry to the book.
    *
    * @param array $link
-   *   The link data to save.
+   *   The link data to save. $link['nid'] must be set. Other keys in this array
+   *   get default values from
+   *   \Drupal\book\BookManagerInterface::getLinkDefaults(). The array keys
+   *   available to be set are documented in
+   *   \Drupal\book\BookOutlineStorageInterface::loadMultiple().
    * @param bool $new
-   *   Is this a new book.
+   *   Whether this is a link to a new book entry.
    *
    * @return array
-   *   The book data of that node.
+   *   The book entry link information. This is $link with values added or
+   *   updated.
+   *
+   * @see \Drupal\book\BookManagerInterface::getLinkDefaults()
+   * @see \Drupal\book\BookOutlineStorageInterface::loadMultiple()
    */
   public function saveBookLink(array $link, $new);
 
@@ -274,7 +282,7 @@ public function bookTreeCheckAccess(&$tree, $node_links = []);
    * @param array $link
    *   A fully loaded book link.
    *
-   * @return
+   * @return array
    *   A subtree of book links in an array, in the order they should be rendered.
    */
   public function bookSubtreeData($link);
diff --git a/web/core/modules/book/src/BookOutlineStorage.php b/web/core/modules/book/src/BookOutlineStorage.php
index 9953a1410..e986c1f77 100644
--- a/web/core/modules/book/src/BookOutlineStorage.php
+++ b/web/core/modules/book/src/BookOutlineStorage.php
@@ -133,8 +133,7 @@ public function insert($link, $parents) {
         'bid' => $link['bid'],
         'pid' => $link['pid'],
         'weight' => $link['weight'],
-        ] + $parents
-      )
+      ] + $parents)
       ->execute();
   }
 
diff --git a/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php b/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
index c1e2ca849..86d957739 100644
--- a/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
+++ b/web/core/modules/book/src/Plugin/Block/BookNavigationBlock.php
@@ -105,7 +105,7 @@ public function blockForm($form, FormStateInterface $form_state) {
       '#options' => $options,
       '#default_value' => $this->configuration['block_mode'],
       '#description' => $this->t("If <em>Show block on all pages</em> is selected, the block will contain the automatically generated menus for all of the site's books. If <em>Show block only on book pages</em> is selected, the block will contain only the one menu corresponding to the current page's book. In this case, if the current page is not in a book, no block will be displayed. The <em>Page specific visibility settings</em> or other visibility settings can be used in addition to selectively display this block."),
-      ];
+    ];
 
     return $form;
   }
diff --git a/web/core/modules/book/tests/modules/book_test_views/book_test_views.info.yml b/web/core/modules/book/tests/modules/book_test_views/book_test_views.info.yml
index b7fbcd4d1..6ee79b1e8 100644
--- a/web/core/modules/book/tests/modules/book_test_views/book_test_views.info.yml
+++ b/web/core/modules/book/tests/modules/book_test_views/book_test_views.info.yml
@@ -4,5 +4,5 @@ description: 'Provides default views for views book tests.'
 package: Testing
 version: VERSION
 dependencies:
- - drupal:book
- - drupal:views
+  - drupal:book
+  - drupal:views
diff --git a/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
index de5d3df9d..35858dbe2 100644
--- a/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookBreadcrumbTest.php
@@ -21,7 +21,7 @@ class BookBreadcrumbTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * A book node.
@@ -156,7 +156,7 @@ public function testBreadcrumbTitleUpdates() {
 
     $this->drupalGet($nodes[4]->toUrl());
     // Fetch each node title in the current breadcrumb.
-    $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
+    $links = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]/ol/li/a');
     $got_breadcrumb = [];
     foreach ($links as $link) {
       $got_breadcrumb[] = $link->getText();
@@ -171,7 +171,7 @@ public function testBreadcrumbTitleUpdates() {
     $this->submitForm($edit, 'Save');
     $this->drupalGet($nodes[4]->toUrl());
     // Fetch each node title in the current breadcrumb.
-    $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
+    $links = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]/ol/li/a');
     $got_breadcrumb = [];
     foreach ($links as $link) {
       $got_breadcrumb[] = $link->getText();
@@ -193,7 +193,7 @@ public function testBreadcrumbAccessUpdates() {
     $this->drupalGet($nodes[3]->toUrl('edit-form'));
     $this->submitForm($edit, 'Save');
     $this->drupalGet($nodes[4]->toUrl());
-    $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
+    $links = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]/ol/li/a');
     $got_breadcrumb = [];
     foreach ($links as $link) {
       $got_breadcrumb[] = $link->getText();
@@ -203,7 +203,7 @@ public function testBreadcrumbAccessUpdates() {
     $config = $this->container->get('config.factory')->getEditable('book_breadcrumb_test.settings');
     $config->set('hide', TRUE)->save();
     $this->drupalGet($nodes[4]->toUrl());
-    $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
+    $links = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]/ol/li/a');
     $got_breadcrumb = [];
     foreach ($links as $link) {
       $got_breadcrumb[] = $link->getText();
diff --git a/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php b/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
index 2c491b861..14898777d 100644
--- a/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookContentModerationTest.php
@@ -30,7 +30,7 @@ class BookContentModerationTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/book/tests/src/Functional/BookTest.php b/web/core/modules/book/tests/src/Functional/BookTest.php
index 230125f28..f5a3ed940 100644
--- a/web/core/modules/book/tests/src/Functional/BookTest.php
+++ b/web/core/modules/book/tests/src/Functional/BookTest.php
@@ -32,7 +32,7 @@ class BookTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * A user with permission to view a book and access printer-friendly version.
diff --git a/web/core/modules/book/tests/src/Functional/BookTestTrait.php b/web/core/modules/book/tests/src/Functional/BookTestTrait.php
index 724feea36..115e30e8b 100644
--- a/web/core/modules/book/tests/src/Functional/BookTestTrait.php
+++ b/web/core/modules/book/tests/src/Functional/BookTestTrait.php
@@ -92,7 +92,6 @@ public function checkBookNode(EntityInterface $node, $nodes, $previous, $up, $ne
     // since it uniquely identifies each call to checkBookNode().
     static $number = 0;
     $this->drupalGet('node/' . $node->id());
-
     // Check outline structure.
     if ($nodes !== NULL) {
       $this->assertSession()->responseMatches($this->generateOutlinePattern($nodes));
@@ -130,7 +129,7 @@ public function checkBookNode(EntityInterface $node, $nodes, $previous, $up, $ne
     }
 
     // Fetch links in the current breadcrumb.
-    $links = $this->xpath('//nav[@class="breadcrumb"]/ol/li/a');
+    $links = $this->xpath('//nav[@aria-labelledby="system-breadcrumb"]/ol/li/a');
     $got_breadcrumb = [];
     foreach ($links as $link) {
       $got_breadcrumb[] = $link->getAttribute('href');
@@ -161,8 +160,7 @@ public function generateOutlinePattern($nodes) {
     foreach ($nodes as $node) {
       $outline .= '(node\/' . $node->id() . ')(.*?)(' . $node->label() . ')(.*?)';
     }
-
-    return '/<nav id="book-navigation-' . $this->book->id() . '"(.*?)<ul(.*?)' . $outline . '<\/ul>/s';
+    return '/<nav role="navigation" aria-labelledby="book-label-' . $this->book->id() . '"(.*?)<ul(.*?)' . $outline . '<\/ul>/s';
   }
 
   /**
diff --git a/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php b/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php
index 30f61d63f..82aa9fb93 100644
--- a/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php
+++ b/web/core/modules/book/tests/src/Unit/Menu/BookLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class BookLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = [
       'book' => 'core/modules/book',
diff --git a/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php b/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
index 29b880f54..4dd405fbc 100644
--- a/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
+++ b/web/core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
@@ -22,6 +22,9 @@ class BreakpointDiscoveryTest extends KernelTestBase {
     'breakpoint_module_test',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['breakpoint_theme_test']);
@@ -185,7 +188,7 @@ public function testModuleBreakpoints() {
    */
   public function testBreakpointGroups() {
     $expected = [
-      'bartik' => 'Bartik',
+      'olivero' => 'Olivero',
       'breakpoint_module_test' => 'Breakpoint test module',
       'breakpoint_theme_test' => 'Breakpoint test theme',
       'breakpoint_theme_test.group2' => 'breakpoint_theme_test.group2',
diff --git a/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php b/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
index 7e5330602..dbd9de9b1 100644
--- a/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
+++ b/web/core/modules/breakpoint/tests/src/Unit/BreakpointTest.php
@@ -42,6 +42,9 @@ class BreakpointTest extends UnitTestCase {
    */
   protected $stringTranslation;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml b/web/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml
index 97f142d40..1be7e8f9b 100644
--- a/web/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml
+++ b/web/core/modules/breakpoint/tests/themes/breakpoint_theme_test/breakpoint_theme_test.info.yml
@@ -2,4 +2,4 @@ name: 'Breakpoint test theme'
 type: theme
 description: 'Test theme for breakpoint.'
 version: VERSION
-base theme: bartik
+base theme: olivero
diff --git a/web/core/modules/ckeditor/ckeditor.info.yml b/web/core/modules/ckeditor/ckeditor.info.yml
index f915250a8..5ab3c95d1 100644
--- a/web/core/modules/ckeditor/ckeditor.info.yml
+++ b/web/core/modules/ckeditor/ckeditor.info.yml
@@ -1,6 +1,8 @@
 name: CKEditor
 type: module
 description: "WYSIWYG editing for rich text fields using CKEditor."
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/node/3223395#s-ckeditor
 package: Core
 version: VERSION
 dependencies:
diff --git a/web/core/modules/ckeditor/ckeditor.libraries.yml b/web/core/modules/ckeditor/ckeditor.libraries.yml
index c929b2a1a..2c8923e57 100644
--- a/web/core/modules/ckeditor/ckeditor.libraries.yml
+++ b/web/core/modules/ckeditor/ckeditor.libraries.yml
@@ -92,3 +92,10 @@ drupal.ckeditor.language.admin:
     - core/jquery
     - core/drupal
     - core/drupal.vertical-tabs
+
+drupal.ckeditor.plugins.drupalmedia:
+  version: VERSION
+  js:
+    js/ckeditor.drupalmedia.theme.js: {}
+  dependencies:
+    - core/drupal
diff --git a/web/core/modules/ckeditor/ckeditor.module b/web/core/modules/ckeditor/ckeditor.module
index 9baebb409..babe27555 100644
--- a/web/core/modules/ckeditor/ckeditor.module
+++ b/web/core/modules/ckeditor/ckeditor.module
@@ -6,10 +6,13 @@
  */
 
 use Drupal\Core\Url;
+use Drupal\Component\Serialization\Json;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\ckeditor\CKEditorPluginButtonsInterface;
 use Drupal\ckeditor\CKEditorPluginContextualInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\editor\Entity\Editor;
 use Drupal\editor\EditorInterface;
 
@@ -187,6 +190,76 @@ function ckeditor_library_info_alter(&$libraries, $extension) {
   }
 }
 
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function ckeditor_form_filter_format_edit_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  // Add an additional validate callback so we can ensure the media_embed filter
+  // is enabled when the DrupalMediaLibrary button is enabled.
+  $form['#validate'][] = 'ckeditor_filter_format_edit_form_validate';
+}
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ */
+function ckeditor_form_filter_format_add_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
+  // Add an additional validate callback so we can ensure the media_embed filter
+  // is enabled when the DrupalMediaLibrary button is enabled.
+  $form['#validate'][] = 'ckeditor_filter_format_edit_form_validate';
+}
+
+/**
+ * Validate callback to ensure the DrupalMediaLibrary button can work correctly.
+ */
+function ckeditor_filter_format_edit_form_validate($form, FormStateInterface $form_state) {
+  if ($form_state->getTriggeringElement()['#name'] !== 'op') {
+    return;
+  }
+
+  // The "DrupalMediaLibrary" button is for the CKEditor text editor.
+  if ($form_state->getValue(['editor', 'editor']) !== 'ckeditor') {
+    return;
+  }
+
+  $button_group_path = [
+    'editor',
+    'settings',
+    'toolbar',
+    'button_groups',
+  ];
+
+  if ($button_groups = $form_state->getValue($button_group_path)) {
+    $buttons = [];
+    $button_groups = Json::decode($button_groups);
+
+    foreach ($button_groups as $button_row) {
+      foreach ($button_row as $button_group) {
+        $buttons = array_merge($buttons, array_values($button_group['items']));
+      }
+    }
+
+    $get_filter_label = function ($filter_plugin_id) use ($form) {
+      return (string) $form['filters']['order'][$filter_plugin_id]['filter']['#markup'];
+    };
+
+    if (in_array('DrupalMediaLibrary', $buttons, TRUE)) {
+      $media_embed_enabled = $form_state->getValue([
+        'filters',
+        'media_embed',
+        'status',
+      ]);
+
+      if (!$media_embed_enabled) {
+        $error_message = new TranslatableMarkup('The %media-embed-filter-label filter must be enabled to use the %drupal-media-library-button button.', [
+          '%media-embed-filter-label' => $get_filter_label('media_embed'),
+          '%drupal-media-library-button' => new TranslatableMarkup('Insert from Media Library'),
+        ]);
+        $form_state->setErrorByName('filters', $error_message);
+      }
+    }
+  }
+}
+
 /**
  * Implements hook_ENTITY_TYPE_presave().
  */
diff --git a/web/core/modules/ckeditor/css/ckeditor.admin.css b/web/core/modules/ckeditor/css/ckeditor.admin.css
index d1eff01f9..51429c0f0 100644
--- a/web/core/modules/ckeditor/css/ckeditor.admin.css
+++ b/web/core/modules/ckeditor/css/ckeditor.admin.css
@@ -210,6 +210,9 @@
 .ckeditor-buttons li a:active,
 .ckeditor-multiple-buttons li a:focus {
   z-index: 11; /* Ensure focused buttons show their outline on all sides. */
+  outline: 1px dotted #212121;
+  outline: 5px auto Highlight;
+  outline: 5px auto -webkit-focus-ring-color;
 }
 .ckeditor-buttons li:first-child a {
   border-top-left-radius: 2px; /* LTR */
diff --git a/web/core/modules/ckeditor/css/ckeditor.css b/web/core/modules/ckeditor/css/ckeditor.css
index c1e2d4409..567d35a03 100644
--- a/web/core/modules/ckeditor/css/ckeditor.css
+++ b/web/core/modules/ckeditor/css/ckeditor.css
@@ -24,16 +24,8 @@
   -webkit-touch-callout: none;
 }
 
-/**
- * Adjust the style of in-place editing CKEditor instances.
- */
-.quickedit-toolgroup.wysiwyg-main .cke_chrome,
-.quickedit-toolgroup.wysiwyg-main .cke_inner,
-.quickedit-toolgroup.wysiwyg-main .cke_top {
-  border-top: none;
-  border-right: none;
-  border-bottom: none;
-  border-left: none;
-  background: transparent;
-  box-shadow: none;
+.cke.cke_chrome.cke_focus {
+  outline: 1px dotted #212121;
+  outline: 5px auto Highlight;
+  outline: 5px auto -webkit-focus-ring-color;
 }
diff --git a/web/core/modules/ckeditor/js/ckeditor.admin.js b/web/core/modules/ckeditor/js/ckeditor.admin.js
index a1a0d1a64..cbdbc4e20 100644
--- a/web/core/modules/ckeditor/js/ckeditor.admin.js
+++ b/web/core/modules/ckeditor/js/ckeditor.admin.js
@@ -4,13 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, _) {
   Drupal.ckeditor = Drupal.ckeditor || {};
   Drupal.behaviors.ckeditorAdmin = {
     attach: function attach(context) {
       var configurationForm = once('ckeditor-configuration', '.ckeditor-toolbar-configuration', context);
-
       if (configurationForm.length) {
         var $configurationForm = $(configurationForm);
         var $textarea = $configurationForm.find('.js-form-item-editor-settings-toolbar-button-groups').hide().find('textarea');
@@ -36,14 +34,11 @@
       if (trigger !== 'unload') {
         return;
       }
-
       var configurationForm = once.filter('ckeditor-configuration', '.ckeditor-toolbar-configuration', context);
-
       if (configurationForm.length && Drupal.ckeditor.models && Drupal.ckeditor.models.Model) {
         var config = Drupal.ckeditor.models.Model.toJSON().activeEditorConfig;
         var buttons = Drupal.ckeditor.views.controller.getButtonList(config);
         var $activeToolbar = $('.ckeditor-toolbar-configuration').find('.ckeditor-toolbar-active');
-
         for (var i = 0; i < buttons.length; i++) {
           $activeToolbar.trigger('CKEditorToolbarChanged', ['removed', buttons[i]]);
         }
@@ -55,12 +50,10 @@
     models: {},
     registerButtonMove: function registerButtonMove(view, $button, callback) {
       var $group = $button.closest('.ckeditor-toolbar-group');
-
       if ($group.hasClass('placeholder')) {
         if (view.isProcessing) {
           return;
         }
-
         view.isProcessing = true;
         Drupal.ckeditor.openGroupNameDialog(view, $group, callback);
       } else {
@@ -70,14 +63,11 @@
     },
     registerGroupMove: function registerGroupMove(view, $group) {
       var $row = $group.closest('.ckeditor-row');
-
       if ($row.hasClass('placeholder')) {
         $row.removeClass('placeholder');
       }
-
       $row.parent().children().each(function () {
         $row = $(this);
-
         if ($row.find('.ckeditor-toolbar-group').not('.placeholder').length === 0) {
           $row.addClass('placeholder');
         }
@@ -86,49 +76,39 @@
     },
     openGroupNameDialog: function openGroupNameDialog(view, $group, callback) {
       callback = callback || function () {};
-
       function validateForm(form) {
         if (form.elements[0].value.length === 0) {
           var $form = $(form);
-
           if (!$form.hasClass('errors')) {
             $form.addClass('errors').find('input').addClass('error').attr('aria-invalid', 'true');
             $("<div class=\"description\" >".concat(Drupal.t('Please provide a name for the button group.'), "</div>")).insertAfter(form.elements[0]);
           }
-
           return true;
         }
-
         return false;
       }
-
       function closeDialog(action, form) {
         function shutdown() {
           dialog.close(action);
           delete view.isProcessing;
         }
-
         function namePlaceholderGroup($group, name) {
           if ($group.hasClass('placeholder')) {
             var groupID = "ckeditor-toolbar-group-aria-label-for-".concat(Drupal.checkPlain(name.toLowerCase().replace(/\s/g, '-')));
             $group.removeAttr('aria-label').attr('data-drupal-ckeditor-type', 'group').attr('tabindex', 0).children('.ckeditor-toolbar-group-name').attr('id', groupID).end().children('.ckeditor-toolbar-group-buttons').attr('aria-labelledby', groupID);
           }
-
           $group.attr('data-drupal-ckeditor-toolbar-group-name', name).children('.ckeditor-toolbar-group-name').each(function () {
             this.textContent = name;
           });
         }
-
         if (action === 'cancel') {
           shutdown();
           callback(false, $group);
           return;
         }
-
         if (form && validateForm(form)) {
           return;
         }
-
         if (action === 'apply') {
           shutdown();
           namePlaceholderGroup($group, Drupal.checkPlain(form.elements[0].value));
@@ -137,7 +117,6 @@
           view.model.set('isDirty', true);
         }
       }
-
       var $ckeditorButtonGroupNameForm = $(Drupal.theme('ckeditorButtonGroupNameForm'));
       var dialog = Drupal.dialog($ckeditorButtonGroupNameForm.get(0), {
         title: Drupal.t('Button group name'),
@@ -165,11 +144,9 @@
               var $target = $(event.currentTarget);
               var data = $target.data('ui-button');
               var action = 'apply';
-
               if (data && data.options && data.options.label) {
                 action = data.options.label.toLowerCase();
               }
-
               closeDialog(action, form);
               event.stopPropagation();
               event.stopImmediatePropagation();
@@ -177,13 +154,11 @@
             }
           });
           var text = Drupal.t('Editing the name of the new button group in a dialog.');
-
           if (typeof $group.attr('data-drupal-ckeditor-toolbar-group-name') !== 'undefined') {
             text = Drupal.t('Editing the name of the "@groupName" button group in a dialog.', {
               '@groupName': $group.attr('data-drupal-ckeditor-toolbar-group-name')
             });
           }
-
           Drupal.announce(text);
         },
         close: function close(event) {
@@ -198,33 +173,26 @@
     attach: function attach(context) {
       var $context = $(context);
       var ckeditorPluginSettings = once('ckeditor-plugin-settings', '#ckeditor-plugin-settings', context);
-
       if (ckeditorPluginSettings.length) {
         var $ckeditorPluginSettings = $(ckeditorPluginSettings);
         $ckeditorPluginSettings.find('[data-ckeditor-buttons]').each(function () {
           var $this = $(this);
-
           if ($this.data('verticalTab')) {
             $this.data('verticalTab').tabHide();
           } else {
             $this.hide();
           }
-
           $this.data('ckeditorButtonPluginSettingsActiveButtons', []);
         });
         $context.find('.ckeditor-toolbar-active').off('CKEditorToolbarChanged.ckeditorAdminPluginSettings').on('CKEditorToolbarChanged.ckeditorAdminPluginSettings', function (event, action, button) {
           var $pluginSettings = $ckeditorPluginSettings.find("[data-ckeditor-buttons~=".concat(button, "]"));
-
           if ($pluginSettings.length === 0) {
             return;
           }
-
           var verticalTab = $pluginSettings.data('verticalTab');
           var activeButtons = $pluginSettings.data('ckeditorButtonPluginSettingsActiveButtons');
-
           if (action === 'added') {
             activeButtons.push(button);
-
             if (verticalTab) {
               verticalTab.tabShow();
             } else {
@@ -232,7 +200,6 @@
             }
           } else {
             activeButtons.splice(activeButtons.indexOf(button), 1);
-
             if (activeButtons.length === 0) {
               if (verticalTab) {
                 verticalTab.tabHide();
@@ -241,17 +208,14 @@
               }
             }
           }
-
           $pluginSettings.data('ckeditorButtonPluginSettingsActiveButtons', activeButtons);
         });
       }
     }
   };
-
   Drupal.theme.ckeditorRow = function () {
     return '<li class="ckeditor-row placeholder" role="group"><ul class="ckeditor-toolbar-groups clearfix"></ul></li>';
   };
-
   Drupal.theme.ckeditorToolbarGroup = function () {
     var group = '';
     group += "<li class=\"ckeditor-toolbar-group placeholder\" role=\"presentation\" aria-label=\"".concat(Drupal.t('Place a button to create a new button group.'), "\">");
@@ -260,15 +224,12 @@
     group += '</li>';
     return group;
   };
-
   Drupal.theme.ckeditorButtonGroupNameForm = function () {
     return '<form><input name="group-name" required="required"></form>';
   };
-
   Drupal.theme.ckeditorButtonGroupNamesToggle = function () {
     return '<button class="link ckeditor-groupnames-toggle" aria-pressed="false"></button>';
   };
-
   Drupal.theme.ckeditorNewButtonGroup = function () {
     return "<li class=\"ckeditor-add-new-group\"><button aria-label=\"".concat(Drupal.t('Add a CKEditor button group to the end of this row.'), "\">").concat(Drupal.t('Add group'), "</button></li>");
   };
diff --git a/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js b/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js
index 5ea1cd8cd..ed693ac18 100644
--- a/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js
+++ b/web/core/modules/ckeditor/js/ckeditor.drupalimage.admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.ckeditorDrupalImageSettingsSummary = {
     attach: function attach() {
@@ -17,21 +16,17 @@
         var $scheme = $("".concat(root, "[scheme]\"]:checked"));
         var maxFileSize = maxFileSizeElement.value ? maxFileSizeElement.value : maxFileSizeElement.getAttribute('placeholder');
         var maxDimensions = maxWidth.value && maxHeight.value ? "(".concat(maxWidth.value, "x").concat(maxHeight.value, ")") : '';
-
         if (!$status.is(':checked')) {
           return Drupal.t('Uploads disabled');
         }
-
         var output = '';
         output += Drupal.t('Uploads enabled, max size: @size @dimensions', {
           '@size': maxFileSize,
           '@dimensions': maxDimensions
         });
-
         if ($scheme.length) {
           output += "<br />".concat($scheme.attr('data-label'));
         }
-
         return output;
       });
     }
diff --git a/web/core/modules/ckeditor/js/ckeditor.js b/web/core/modules/ckeditor/js/ckeditor.js
index be798f0e0..80d186254 100644
--- a/web/core/modules/ckeditor/js/ckeditor.js
+++ b/web/core/modules/ckeditor/js/ckeditor.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, debounce, CKEDITOR, $, displace, AjaxCommands) {
   Drupal.editors.ckeditor = {
     attach: function attach(element, format) {
       this._loadExternalPlugins(format);
-
       format.editorSettings.drupal = {
         format: format.format
       };
@@ -21,7 +19,6 @@
     },
     detach: function detach(element, format, trigger) {
       var editor = CKEDITOR.dom.element.get(element).getEditor();
-
       if (editor) {
         if (trigger === 'serialize') {
           editor.updateElement();
@@ -30,24 +27,20 @@
           element.removeAttribute('contentEditable');
         }
       }
-
       return !!editor;
     },
     onChange: function onChange(element, callback) {
       var editor = CKEDITOR.dom.element.get(element).getEditor();
-
       if (editor) {
         editor.on('change', debounce(function () {
           callback(editor.getData());
         }, 400));
         editor.on('mode', function () {
           var editable = editor.editable();
-
           if (!editable.isInline()) {
             editor.on('autoGrow', function (evt) {
               var doc = evt.editor.document;
               var scrollable = CKEDITOR.env.quirks ? doc.getBody() : doc.getDocumentElement();
-
               if (scrollable.$.scrollHeight < scrollable.$.clientHeight) {
                 scrollable.setStyle('overflow-y', 'hidden');
               } else {
@@ -57,17 +50,14 @@
           }
         });
       }
-
       return !!editor;
     },
     attachInlineEditor: function attachInlineEditor(element, format, mainToolbarId, floatedToolbarId) {
       this._loadExternalPlugins(format);
-
       format.editorSettings.drupal = {
         format: format.format
       };
       var settings = $.extend(true, {}, format.editorSettings);
-
       if (mainToolbarId) {
         var settingsOverride = {
           extraPlugins: 'sharedspace',
@@ -77,7 +67,6 @@
           }
         };
         var sourceButtonFound = false;
-
         for (var i = 0; !sourceButtonFound && i < settings.toolbar.length; i++) {
           if (settings.toolbar[i] !== '/') {
             for (var j = 0; !sourceButtonFound && j < settings.toolbar[i].items.length; j++) {
@@ -90,18 +79,15 @@
             }
           }
         }
-
         settings.extraPlugins += ",".concat(settingsOverride.extraPlugins);
         settings.removePlugins += ",".concat(settingsOverride.removePlugins);
         settings.sharedSpaces = settingsOverride.sharedSpaces;
       }
-
       element.setAttribute('contentEditable', 'true');
       return !!CKEDITOR.inline(element, settings);
     },
     _loadExternalPlugins: function _loadExternalPlugins(format) {
       var externalPlugins = format.editorSettings.drupalExternalPlugins;
-
       if (externalPlugins) {
         Object.keys(externalPlugins || {}).forEach(function (pluginName) {
           CKEDITOR.plugins.addExternal(pluginName, externalPlugins[pluginName], '');
@@ -114,11 +100,9 @@
     saveCallback: null,
     openDialog: function openDialog(editor, url, existingValues, saveCallback, dialogSettings) {
       var $target = $(editor.container.$);
-
       if (editor.elementMode === CKEDITOR.ELEMENT_MODE_REPLACE) {
         $target = $target.find('.cke_contents');
       }
-
       $target.css('position', 'relative').find('.ckeditor-dialog-loading').remove();
       var classes = dialogSettings.dialogClass ? dialogSettings.dialogClass.split(' ') : [];
       classes.push('ui-dialog--narrow');
@@ -171,30 +155,24 @@
   $(document).on('drupalViewportOffsetChange', function () {
     CKEDITOR.config.autoGrow_maxHeight = 0.7 * (window.innerHeight - displace.offsets.top - displace.offsets.bottom);
   });
-
   function redirectTextareaFragmentToCKEditorInstance() {
     var hash = window.location.hash.substr(1);
     var element = document.getElementById(hash);
-
     if (element) {
       var editor = CKEDITOR.dom.element.get(element).getEditor();
-
       if (editor) {
         var id = editor.container.getAttribute('id');
         window.location.replace("#".concat(id));
       }
     }
   }
-
   $(window).on('hashchange.ckeditor', redirectTextareaFragmentToCKEditorInstance);
   CKEDITOR.config.autoGrow_onStartup = true;
   CKEDITOR.config.autoGrow_maxHeight = 0.7 * window.innerHeight;
   CKEDITOR.timestamp = drupalSettings.ckeditor.timestamp;
-
   if (AjaxCommands) {
     AjaxCommands.prototype.ckeditor_add_stylesheet = function (ajax, response, status) {
       var editor = CKEDITOR.instances[response.editor_id];
-
       if (editor) {
         response.stylesheets.forEach(function (url) {
           editor.document.appendStyleSheet(url);
diff --git a/web/core/modules/ckeditor/js/ckeditor.language.admin.js b/web/core/modules/ckeditor/js/ckeditor.language.admin.js
index df9b5d794..fcb091d10 100644
--- a/web/core/modules/ckeditor/js/ckeditor.language.admin.js
+++ b/web/core/modules/ckeditor/js/ckeditor.language.admin.js
@@ -4,17 +4,14 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.ckeditorLanguageSettingsSummary = {
     attach: function attach() {
       $('#edit-editor-settings-plugins-language').drupalSetSummary(function (context) {
         var $selected = $('#edit-editor-settings-plugins-language-language-list-type option:selected');
-
         if ($selected.length) {
           return $selected[0].textContent;
         }
-
         return '';
       });
     }
diff --git a/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js b/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js
index e278cd634..847ed0efa 100644
--- a/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js
+++ b/web/core/modules/ckeditor/js/ckeditor.off-canvas-css-reset.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, CKEDITOR) {
   var convertToOffCanvasCss = function convertToOffCanvasCss(originalCss) {
     var selectorPrefix = '#drupal-off-canvas ';
@@ -12,35 +11,29 @@
     var css = originalCss.substring(originalCss.indexOf('*/') + 2).trim().replace(/}/g, "}".concat(selectorPrefix)).replace(/,/g, ",".concat(selectorPrefix)).replace(/url\(/g, skinPath);
     return "".concat(selectorPrefix).concat(css);
   };
-
   var insertCss = function insertCss(cssToInsert) {
     var offCanvasCss = document.createElement('style');
     offCanvasCss.innerHTML = cssToInsert;
     offCanvasCss.setAttribute('id', 'ckeditor-off-canvas-reset');
     document.body.appendChild(offCanvasCss);
   };
-
   var addCkeditorOffCanvasCss = function addCkeditorOffCanvasCss() {
     if (document.getElementById('ckeditor-off-canvas-reset')) {
       return;
     }
-
     CKEDITOR.skinName = CKEDITOR.skin.name;
     var editorCssPath = CKEDITOR.skin.getPath('editor');
     var dialogCssPath = CKEDITOR.skin.getPath('dialog');
     var storedOffCanvasCss = window.localStorage.getItem("Drupal.off-canvas.css.".concat(editorCssPath).concat(dialogCssPath));
-
     if (storedOffCanvasCss) {
       insertCss(storedOffCanvasCss);
       return;
     }
-
     $.when($.get(editorCssPath), $.get(dialogCssPath)).done(function (editorCss, dialogCss) {
       var offCanvasEditorCss = convertToOffCanvasCss(editorCss[0]);
       var offCanvasDialogCss = convertToOffCanvasCss(dialogCss[0]);
       var cssToInsert = "#drupal-off-canvas .cke_inner * {background: transparent;}\n          ".concat(offCanvasEditorCss, "\n          ").concat(offCanvasDialogCss);
       insertCss(cssToInsert);
-
       if (CKEDITOR.timestamp && editorCssPath.indexOf(CKEDITOR.timestamp) !== -1 && dialogCssPath.indexOf(CKEDITOR.timestamp) !== -1) {
         Object.keys(window.localStorage).forEach(function (key) {
           if (key.indexOf('Drupal.off-canvas.css.') === 0) {
@@ -51,6 +44,5 @@
       }
     });
   };
-
   addCkeditorOffCanvasCss();
 })(jQuery, CKEDITOR);
\ No newline at end of file
diff --git a/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js b/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js
index 3eb9cbb1e..b90150b72 100644
--- a/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js
+++ b/web/core/modules/ckeditor/js/ckeditor.stylescombo.admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, _) {
   Drupal.behaviors.ckeditorStylesComboSettings = {
     attach: function attach(context) {
@@ -14,9 +13,7 @@
       var that = this;
       $context.find('[name="editor[settings][plugins][stylescombo][styles]"]').on('blur.ckeditorStylesComboSettings', function () {
         var styles = this.value.trim();
-
         var stylesSet = that._generateStylesSetSetting(styles);
-
         if (!_.isEqual(previousStylesSet, stylesSet)) {
           previousStylesSet = stylesSet;
           $ckeditorActiveToolbar.trigger('CKEditorPluginSettingsChanged', [{
@@ -29,18 +26,14 @@
       var stylesSet = [];
       styles = styles.replace(/\r/g, '\n');
       var lines = styles.split('\n');
-
       for (var i = 0; i < lines.length; i++) {
         var style = lines[i].trim();
-
         if (style.length === 0) {
           continue;
         }
-
         if (style.match(/^ *[a-zA-Z0-9]+ *(\.[a-zA-Z0-9_-]+ *)*\| *.+ *$/) === null) {
           continue;
         }
-
         var parts = style.split('|');
         var selector = parts[0];
         var label = parts[1];
@@ -54,7 +47,6 @@
           name: label
         });
       }
-
       return stylesSet;
     }
   };
@@ -63,11 +55,9 @@
       $('[data-ckeditor-plugin-id="stylescombo"]').drupalSetSummary(function (context) {
         var stylesElement = document.querySelector('[data-drupal-selector="edit-editor-settings-plugins-stylescombo-styles"]');
         var styles = stylesElement ? stylesElement.value.trim() : '';
-
         if (styles.length === 0) {
           return Drupal.t('No styles configured');
         }
-
         var count = styles.split('\n').length;
         return Drupal.t('@count styles configured', {
           '@count': count
diff --git a/web/core/modules/ckeditor/js/models/Model.js b/web/core/modules/ckeditor/js/models/Model.js
index c38c580d7..ced5c1abd 100644
--- a/web/core/modules/ckeditor/js/models/Model.js
+++ b/web/core/modules/ckeditor/js/models/Model.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.ckeditor.Model = Backbone.Model.extend({
     defaults: {
diff --git a/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.js b/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
index 34b0cc051..d767e665e 100644
--- a/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
+++ b/web/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
@@ -4,47 +4,37 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, CKEDITOR) {
   function getFocusedWidget(editor) {
     var widget = editor.widgets.focused;
-
     if (widget && widget.name === 'image') {
       return widget;
     }
-
     return null;
   }
-
   function linkCommandIntegrator(editor) {
     if (!editor.plugins.drupallink) {
       return;
     }
-
     CKEDITOR.plugins.drupallink.registerLinkableWidget('image');
     editor.getCommand('drupalunlink').on('exec', function (evt) {
       var widget = getFocusedWidget(editor);
-
       if (!widget || !widget.parts.link) {
         return;
       }
-
       widget.setData('link', null);
       this.refresh(editor, editor.elementPath());
       evt.cancel();
     });
     editor.getCommand('drupalunlink').on('refresh', function (evt) {
       var widget = getFocusedWidget(editor);
-
       if (!widget) {
         return;
       }
-
       this.setState(widget.data.link || widget.wrapper.getAscendant('a') ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED);
       evt.cancel();
     });
   }
-
   CKEDITOR.plugins.add('drupalimage', {
     requires: 'image2',
     icons: 'drupalimage',
@@ -52,11 +42,9 @@
     beforeInit: function beforeInit(editor) {
       editor.on('widgetDefinition', function (event) {
         var widgetDefinition = event.data;
-
         if (widgetDefinition.name !== 'image') {
           return;
         }
-
         widgetDefinition.allowedContent = {
           img: {
             attributes: {
@@ -81,32 +69,25 @@
         widgetDefinition.requiredContent = new CKEDITOR.style(requiredContent);
         widgetDefinition.allowedContent.img.attributes['!data-entity-type'] = true;
         widgetDefinition.allowedContent.img.attributes['!data-entity-uuid'] = true;
-
         widgetDefinition.downcast = function (element) {
           element.attributes['data-entity-type'] = this.data['data-entity-type'];
           element.attributes['data-entity-uuid'] = this.data['data-entity-uuid'];
         };
-
         widgetDefinition.upcast = function (element, data) {
           if (element.name !== 'img') {
             return;
           }
-
           if (element.attributes['data-cke-realelement']) {
             return;
           }
-
           data['data-entity-type'] = element.attributes['data-entity-type'];
           data['data-entity-uuid'] = element.attributes['data-entity-uuid'];
           return element;
         };
-
         var originalGetClasses = widgetDefinition.getClasses;
-
         widgetDefinition.getClasses = function () {
           var classes = originalGetClasses.call(this);
           var captionedClasses = (this.editor.config.image2_captionedClass || '').split(/\s+/);
-
           if (captionedClasses.length && classes) {
             for (var i = 0; i < captionedClasses.length; i++) {
               if (captionedClasses[i] in classes) {
@@ -114,10 +95,8 @@
               }
             }
           }
-
           return classes;
         };
-
         widgetDefinition._mapDataToDialog = {
           src: 'src',
           alt: 'alt',
@@ -126,7 +105,6 @@
           'data-entity-type': 'data-entity-type',
           'data-entity-uuid': 'data-entity-uuid'
         };
-
         widgetDefinition._dataToDialogValues = function (data) {
           var dialogValues = {};
           var map = widgetDefinition._mapDataToDialog;
@@ -135,7 +113,6 @@
           });
           return dialogValues;
         };
-
         widgetDefinition._dialogValuesToData = function (dialogReturnValues) {
           var data = {};
           var map = widgetDefinition._mapDataToDialog;
@@ -146,28 +123,21 @@
           });
           return data;
         };
-
         widgetDefinition._createDialogSaveCallback = function (editor, widget) {
           return function (dialogReturnValues) {
             var firstEdit = !widget.ready;
-
             if (!firstEdit) {
               widget.focus();
             }
-
             editor.fire('saveSnapshot');
             var container = widget.wrapper.getParent(true);
             var image = widget.parts.image;
-
             var data = widgetDefinition._dialogValuesToData(dialogReturnValues.attributes);
-
             widget.setData(data);
             widget = editor.widgets.getByElement(image);
-
             if (firstEdit) {
               editor.widgets.finalizeCreation(container);
             }
-
             setTimeout(function () {
               widget.focus();
               editor.fire('saveSnapshot');
@@ -175,12 +145,9 @@
             return widget;
           };
         };
-
         var originalInit = widgetDefinition.init;
-
         widgetDefinition.init = function () {
           originalInit.call(this);
-
           if (this.parts.link) {
             this.setData('link', CKEDITOR.plugins.image2.getLinkAttributesParser()(editor, this.parts.link));
           }
@@ -188,11 +155,9 @@
       });
       editor.widgets.on('instanceCreated', function (event) {
         var widget = event.data;
-
         if (widget.name !== 'image') {
           return;
         }
-
         widget.on('edit', function (event) {
           event.cancel();
           editor.execCommand('editdrupalimage', {
@@ -217,7 +182,6 @@
           Drupal.ckeditor.openDialog(editor, Drupal.url("editor/dialog/image/".concat(editor.config.drupal.format)), data.existingValues, data.saveCallback, dialogSettings);
         }
       });
-
       if (editor.ui.addButton) {
         editor.ui.addButton('DrupalImage', {
           label: Drupal.t('Image'),
@@ -229,15 +193,12 @@
       linkCommandIntegrator(editor);
     }
   });
-
   CKEDITOR.plugins.image2.getLinkAttributesParser = function () {
     return CKEDITOR.plugins.drupallink.parseLinkAttributes;
   };
-
   CKEDITOR.plugins.image2.getLinkAttributesGetter = function () {
     return CKEDITOR.plugins.drupallink.getLinkAttributes;
   };
-
   CKEDITOR.plugins.drupalimage = {
     getFocusedWidget: getFocusedWidget
   };
diff --git a/web/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js b/web/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js
index 292f7b85b..c2d77d232 100644
--- a/web/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js
+++ b/web/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js
@@ -4,13 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (CKEDITOR) {
   function findElementByName(element, name) {
     if (element.name === name) {
       return element;
     }
-
     var found = null;
     element.forEach(function (el) {
       if (el.name === name) {
@@ -20,7 +18,6 @@
     }, CKEDITOR.NODE_ELEMENT);
     return found;
   }
-
   CKEDITOR.plugins.add('drupalimagecaption', {
     requires: 'drupalimage',
     beforeInit: function beforeInit(editor) {
@@ -28,11 +25,9 @@
       var placeholderText = editor.config.drupalImageCaption_captionPlaceholderText;
       editor.on('widgetDefinition', function (event) {
         var widgetDefinition = event.data;
-
         if (widgetDefinition.name !== 'image') {
           return;
         }
-
         var captionFilterEnabled = editor.config.drupalImageCaption_captionFilterEnabled;
         var alignFilterEnabled = editor.config.drupalImageCaption_alignFilterEnabled;
         CKEDITOR.tools.extend(widgetDefinition.features, {
@@ -51,89 +46,69 @@
         widgetDefinition.allowedContent.img.attributes['!data-caption'] = true;
         widgetDefinition.editables.caption.allowedContent = 'a[!href]; em strong cite code br';
         var originalDowncast = widgetDefinition.downcast;
-
         widgetDefinition.downcast = function (element) {
           var img = findElementByName(element, 'img');
           originalDowncast.call(this, img);
           var caption = this.editables.caption;
           var captionHtml = caption && caption.getData();
           var attrs = img.attributes;
-
           if (captionFilterEnabled) {
             if (captionHtml) {
               attrs['data-caption'] = captionHtml;
             }
           }
-
           if (alignFilterEnabled) {
             if (this.data.align !== 'none') {
               attrs['data-align'] = this.data.align;
             }
           }
-
           if (img.parent.name === 'a') {
             return img.parent;
           }
-
           return img;
         };
-
         var originalUpcast = widgetDefinition.upcast;
-
         widgetDefinition.upcast = function (element, data) {
           if (element.name !== 'img' || !element.attributes['data-entity-type'] || !element.attributes['data-entity-uuid']) {
             return;
           }
-
           if (element.attributes['data-cke-realelement']) {
             return;
           }
-
           element = originalUpcast.call(this, element, data);
           var attrs = element.attributes;
-
           if (element.parent.name === 'a') {
             element = element.parent;
           }
-
           var retElement = element;
           var caption;
-
           if (captionFilterEnabled) {
             caption = attrs['data-caption'];
             delete attrs['data-caption'];
           }
-
           if (alignFilterEnabled) {
             data.align = attrs['data-align'];
             delete attrs['data-align'];
           }
-
           data['data-entity-type'] = attrs['data-entity-type'];
           delete attrs['data-entity-type'];
           data['data-entity-uuid'] = attrs['data-entity-uuid'];
           delete attrs['data-entity-uuid'];
-
           if (captionFilterEnabled) {
             if (element.parent.name === 'p' && caption) {
               var index = element.getIndex();
               var splitBefore = index > 0;
               var splitAfter = index + 1 < element.parent.children.length;
-
               if (splitBefore) {
                 element.parent.split(index);
               }
-
               index = element.getIndex();
-
               if (splitAfter) {
                 element.parent.split(index + 1);
               }
-
               element.parent.replaceWith(element);
               retElement = element;
             }
-
             if (caption) {
               var figure = new CKEDITOR.htmlParser.element('figure');
               caption = new CKEDITOR.htmlParser.fragment.fromHtml(caption, 'figcaption');
@@ -147,7 +122,6 @@
               retElement = figure;
             }
           }
-
           if (alignFilterEnabled) {
             if (data.align === 'center' && (!captionFilterEnabled || !caption)) {
               var p = new CKEDITOR.htmlParser.element('p');
@@ -157,27 +131,22 @@
               retElement = p;
             }
           }
-
           return retElement;
         };
-
         CKEDITOR.tools.extend(widgetDefinition._mapDataToDialog, {
           align: 'data-align',
           'data-caption': 'data-caption',
           hasCaption: 'hasCaption'
         });
         var originalCreateDialogSaveCallback = widgetDefinition._createDialogSaveCallback;
-
         widgetDefinition._createDialogSaveCallback = function (editor, widget) {
           var saveCallback = originalCreateDialogSaveCallback.call(this, editor, widget);
           return function (dialogReturnValues) {
             dialogReturnValues.attributes.hasCaption = !!dialogReturnValues.attributes.hasCaption;
             var actualWidget = saveCallback(dialogReturnValues);
-
             if (dialogReturnValues.attributes.hasCaption) {
               actualWidget.editables.caption.setAttribute('data-placeholder', placeholderText);
               var captionElement = actualWidget.editables.caption.$;
-
               if (captionElement.childNodes.length === 1 && captionElement.childNodes.item(0).nodeName === 'BR') {
                 captionElement.removeChild(captionElement.childNodes.item(0));
               }
@@ -189,17 +158,14 @@
     afterInit: function afterInit(editor) {
       var disableButtonIfOnWidget = function disableButtonIfOnWidget(evt) {
         var widget = editor.widgets.focused;
-
         if (widget && widget.name === 'image') {
           this.setState(CKEDITOR.TRISTATE_DISABLED);
           evt.cancel();
         }
       };
-
       if (editor.plugins.justify && !editor.config.drupalImageCaption_alignFilterEnabled) {
         var cmd;
         var commands = ['justifyleft', 'justifycenter', 'justifyright', 'justifyblock'];
-
         for (var n = 0; n < commands.length; n++) {
           cmd = editor.getCommand(commands[n]);
           cmd.contextSensitive = 1;
diff --git a/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js b/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js
index b06b27675..af68da286 100644
--- a/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js
+++ b/web/core/modules/ckeditor/js/plugins/drupallink/plugin.js
@@ -4,32 +4,25 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, CKEDITOR) {
   function parseAttributes(editor, element) {
     var parsedAttributes = {};
     var domElement = element.$;
     var attribute;
     var attributeName;
-
     for (var attrIndex = 0; attrIndex < domElement.attributes.length; attrIndex++) {
       attribute = domElement.attributes.item(attrIndex);
       attributeName = attribute.nodeName.toLowerCase();
-
       if (attributeName.indexOf('data-cke-') === 0) {
         continue;
       }
-
       parsedAttributes[attributeName] = element.data("cke-saved-".concat(attributeName)) || attribute.nodeValue;
     }
-
     if (parsedAttributes.class) {
       parsedAttributes.class = CKEDITOR.tools.trim(parsedAttributes.class.replace(/cke_\S+/, ''));
     }
-
     return parsedAttributes;
   }
-
   function getAttributes(editor, data) {
     var set = {};
     Object.keys(data || {}).forEach(function (attributeName) {
@@ -45,41 +38,30 @@
       removed: CKEDITOR.tools.objectKeys(removed)
     };
   }
-
   var registeredLinkableWidgets = [];
-
   function registerLinkableWidget(widgetName) {
     registeredLinkableWidgets.push(widgetName);
   }
-
   function getFocusedLinkableWidget(editor) {
     var widget = editor.widgets.focused;
-
     if (widget && registeredLinkableWidgets.indexOf(widget.name) !== -1) {
       return widget;
     }
-
     return null;
   }
-
   function getSelectedLink(editor) {
     var selection = editor.getSelection();
     var selectedElement = selection.getSelectedElement();
-
     if (selectedElement && selectedElement.is('a')) {
       return selectedElement;
     }
-
     var range = selection.getRanges(true)[0];
-
     if (range) {
       range.shrink(CKEDITOR.SHRINK_TEXT);
       return editor.elementPath(range.getCommonAncestor()).contains('a', 1);
     }
-
     return null;
   }
-
   CKEDITOR.plugins.add('drupallink', {
     icons: 'drupallink,drupalunlink',
     hidpi: true,
@@ -107,32 +89,26 @@
           var focusedLinkableWidget = getFocusedLinkableWidget(editor);
           var linkElement = getSelectedLink(editor);
           var existingValues = {};
-
           if (linkElement && linkElement.$) {
             existingValues = parseAttributes(editor, linkElement);
           } else if (focusedLinkableWidget && focusedLinkableWidget.data.link) {
             existingValues = CKEDITOR.tools.clone(focusedLinkableWidget.data.link);
           }
-
           var saveCallback = function saveCallback(returnValues) {
             if (focusedLinkableWidget) {
               focusedLinkableWidget.setData('link', CKEDITOR.tools.extend(returnValues.attributes, focusedLinkableWidget.data.link));
               editor.fire('saveSnapshot');
               return;
             }
-
             editor.fire('saveSnapshot');
-
             if (!linkElement && returnValues.attributes.href) {
               var selection = editor.getSelection();
               var range = selection.getRanges(1)[0];
-
               if (range.collapsed) {
                 var text = new CKEDITOR.dom.text(returnValues.attributes.href.replace(/^mailto:/, ''), editor.document);
                 range.insertNode(text);
                 range.selectNodeContents(text);
               }
-
               var style = new CKEDITOR.style({
                 element: 'a',
                 attributes: returnValues.attributes
@@ -152,10 +128,8 @@
                 }
               });
             }
-
             editor.fire('saveSnapshot');
           };
-
           var dialogSettings = {
             title: linkElement ? editor.config.drupalLink_dialogTitleEdit : editor.config.drupalLink_dialogTitleAdd,
             dialogClass: 'editor-link-dialog'
@@ -182,7 +156,6 @@
         },
         refresh: function refresh(editor, path) {
           var element = path.lastElement && path.lastElement.getAscendant('a', true);
-
           if (element && element.getName() === 'a' && element.getAttribute('href') && element.getChildCount()) {
             this.setState(CKEDITOR.TRISTATE_OFF);
           } else {
@@ -191,7 +164,6 @@
         }
       });
       editor.setKeystroke(CKEDITOR.CTRL + 75, 'drupallink');
-
       if (editor.ui.addButton) {
         editor.ui.addButton('DrupalLink', {
           label: Drupal.t('Link'),
@@ -202,10 +174,8 @@
           command: 'drupalunlink'
         });
       }
-
       editor.on('doubleclick', function (evt) {
         var element = getSelectedLink(editor) || evt.data.element;
-
         if (!element.isReadOnly()) {
           if (element.is('a')) {
             editor.getSelection().selectElement(element);
@@ -213,7 +183,6 @@
           }
         }
       });
-
       if (editor.addMenuItems) {
         editor.addMenuItems({
           link: {
@@ -230,28 +199,22 @@
           }
         });
       }
-
       if (editor.contextMenu) {
         editor.contextMenu.addListener(function (element, selection) {
           if (!element || element.isReadOnly()) {
             return null;
           }
-
           var anchor = getSelectedLink(editor);
-
           if (!anchor) {
             return null;
           }
-
           var menu = {};
-
           if (anchor.getAttribute('href') && anchor.getChildCount()) {
             menu = {
               link: CKEDITOR.TRISTATE_OFF,
               unlink: CKEDITOR.TRISTATE_OFF
             };
           }
-
           return menu;
         });
       }
diff --git a/web/core/modules/ckeditor/js/views/AuralView.js b/web/core/modules/ckeditor/js/views/AuralView.js
index 6ffd0e324..7c9f92800 100644
--- a/web/core/modules/ckeditor/js/views/AuralView.js
+++ b/web/core/modules/ckeditor/js/views/AuralView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone, $) {
   Drupal.ckeditor.AuralView = Backbone.View.extend({
     events: {
@@ -20,10 +19,8 @@
     announceMove: function announceMove(model, isDirty) {
       if (!isDirty) {
         var item = document.activeElement || null;
-
         if (item) {
           var $item = $(item);
-
           if ($item.hasClass('ckeditor-toolbar-group')) {
             this.announceButtonGroupPosition($item);
           } else if ($item.parent().hasClass('ckeditor-button')) {
@@ -37,7 +34,6 @@
       var $originalTarget = $(event.target);
       var $currentTarget = $(event.currentTarget);
       var $parent = $currentTarget.parent();
-
       if ($parent.hasClass('ckeditor-button') || $parent.hasClass('ckeditor-button-separator')) {
         this.announceButtonPosition($currentTarget.parent());
       } else if ($originalTarget.attr('role') !== 'button' && $currentTarget.hasClass('ckeditor-toolbar-group')) {
@@ -59,12 +55,10 @@
         '@row': row,
         '@rowCount': rowCount
       });
-
       if (position === 1 && row === rowCount) {
         text += '\n';
         text += Drupal.t('Press the down arrow key to create a new row.');
       }
-
       Drupal.announce(text, 'assertive');
     },
     announceButtonPosition: function announceButtonPosition($button) {
@@ -81,7 +75,6 @@
       var rowCount = $rows.not('.placeholder').length;
       var type = $button.attr('data-drupal-ckeditor-type') === 'separator' ? '' : Drupal.t('button');
       var text;
-
       if ($button.closest('.ckeditor-toolbar-disabled').length > 0) {
         text = Drupal.t('@name @type.', {
           '@name': $button.children().attr('aria-label'),
@@ -99,17 +92,14 @@
           '@row': row,
           '@rowCount': rowCount
         });
-
         if (groupPosition === 1 && position === 1 && row === rowCount) {
           text += '\n';
           text += Drupal.t('Press the down arrow key to create a new button group in a new row.');
         }
-
         if (groupPosition === groupPositionCount && position === positionCount) {
           text += '\n';
           text += Drupal.t('This is the last group. Move the button forward to create a new group.');
         }
-
         Drupal.announce(text, 'assertive');
       }
     },
@@ -118,7 +108,6 @@
       var $button = $link.parent();
       var enabled = $button.closest('.ckeditor-toolbar-active').length > 0;
       var message;
-
       if (enabled) {
         message = Drupal.t('The "@name" button is currently enabled.', {
           '@name': $link.attr('aria-label')
@@ -131,7 +120,6 @@
         });
         message += "\n".concat(Drupal.t('Use the down arrow key to move this button into the active toolbar.'));
       }
-
       Drupal.announce(message);
       event.preventDefault();
     },
@@ -140,7 +128,6 @@
       var $button = $link.parent();
       var enabled = $button.closest('.ckeditor-toolbar-active').length > 0;
       var message;
-
       if (enabled) {
         message = Drupal.t('This @name is currently enabled.', {
           '@name': $link.attr('aria-label')
@@ -154,7 +141,6 @@
         message += "\n".concat(Drupal.t('Use the down arrow key to move this separator into the active toolbar.'));
         message += "\n".concat(Drupal.t('You may add multiple separators to each button group.'));
       }
-
       Drupal.announce(message);
       event.preventDefault();
     }
diff --git a/web/core/modules/ckeditor/js/views/ControllerView.js b/web/core/modules/ckeditor/js/views/ControllerView.js
index 3194d62f6..00fa3556f 100644
--- a/web/core/modules/ckeditor/js/views/ControllerView.js
+++ b/web/core/modules/ckeditor/js/views/ControllerView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Backbone, CKEDITOR, _) {
   Drupal.ckeditor.ControllerView = Backbone.View.extend({
     events: {},
@@ -22,7 +21,6 @@
           $(this).find('.ckeditor-toolbar-group').each(function () {
             var $group = $(this);
             var $buttons = $group.find('.ckeditor-button');
-
             if ($buttons.length) {
               var group = {
                 name: $group.attr('data-drupal-ckeditor-toolbar-group-name'),
@@ -34,18 +32,15 @@
               groups.push(group);
             }
           });
-
           if (groups.length) {
             rows.push(groups);
           }
         });
         this.model.set('activeEditorConfig', rows);
         this.model.set('isDirty', false);
-
         if (options.broadcast !== false) {
           var prev = this.getButtonList(currentConfig);
           var next = this.getButtonList(rows);
-
           if (prev.length !== next.length) {
             this.$el.find('.ckeditor-toolbar-active').trigger('CKEditorToolbarChanged', [prev.length < next.length ? 'added' : 'removed', _.difference(_.union(prev, next), _.intersection(prev, next))[0]]);
           }
@@ -56,7 +51,6 @@
       var getProperties = function getProperties(CKEPropertiesList) {
         return _.isObject(CKEPropertiesList) ? _.keys(CKEPropertiesList) : [];
       };
-
       var convertCKERulesToEditorFeature = function convertCKERulesToEditorFeature(feature, CKEFeatureRules) {
         for (var i = 0; i < CKEFeatureRules.length; i++) {
           var CKERule = CKEFeatureRules[i];
@@ -74,22 +68,17 @@
           feature.addHTMLRule(rule);
         }
       };
-
       var hiddenCKEditorID = 'ckeditor-hidden';
-
       if (CKEDITOR.instances[hiddenCKEditorID]) {
         CKEDITOR.instances[hiddenCKEditorID].destroy(true);
       }
-
       var hiddenEditorConfig = this.model.get('hiddenEditorConfig');
-
       if (hiddenEditorConfig.drupalExternalPlugins) {
         var externalPlugins = hiddenEditorConfig.drupalExternalPlugins;
         Object.keys(externalPlugins || {}).forEach(function (pluginName) {
           CKEDITOR.plugins.addExternal(pluginName, externalPlugins[pluginName], '');
         });
       }
-
       CKEDITOR.inline($("#".concat(hiddenCKEditorID)).get(0), CKEditorConfig);
       CKEDITOR.once('instanceReady', function (e) {
         if (e.editor.name === hiddenCKEditorID) {
@@ -97,18 +86,14 @@
           var rules = e.editor.filter.allowedContent;
           var rule;
           var name;
-
           for (var i = 0; i < rules.length; i++) {
             rule = rules[i];
             name = rule.featureName || ':(';
-
             if (!CKEFeatureRulesMap[name]) {
               CKEFeatureRulesMap[name] = [];
             }
-
             CKEFeatureRulesMap[name].push(rule);
           }
-
           var features = {};
           var buttonsToFeatures = {};
           Object.keys(CKEFeatureRulesMap).forEach(function (featureName) {
@@ -116,7 +101,6 @@
             convertCKERulesToEditorFeature(feature, CKEFeatureRulesMap[featureName]);
             features[featureName] = feature;
             var command = e.editor.getCommand(featureName);
-
             if (command) {
               buttonsToFeatures[command.uiItems[0].name] = featureName;
             }
@@ -129,20 +113,15 @@
       if (button === '-') {
         return false;
       }
-
       var featureName = this.model.get('buttonsToFeatures')[button.toLowerCase()];
-
       if (!featureName) {
         featureName = button.toLowerCase();
       }
-
       var featuresMetadata = this.model.get('featuresMetadata');
-
       if (!featuresMetadata[featureName]) {
         featuresMetadata[featureName] = new Drupal.EditorFeature(featureName);
         this.model.set('featuresMetadata', featuresMetadata);
       }
-
       return featuresMetadata[featureName];
     },
     disableFeaturesDisallowedByFilters: function disableFeaturesDisallowedByFilters(features, buttonsToFeatures) {
@@ -150,27 +129,20 @@
       this.model.set('buttonsToFeatures', buttonsToFeatures);
       this.broadcastConfigurationChanges(this.$el);
       var existingButtons = [];
-
       var buttonGroups = _.flatten(this.model.get('activeEditorConfig'));
-
       for (var i = 0; i < buttonGroups.length; i++) {
         var buttons = buttonGroups[i].items;
-
         for (var k = 0; k < buttons.length; k++) {
           existingButtons.push(buttons[k]);
         }
       }
-
       existingButtons = _.unique(existingButtons);
-
       for (var n = 0; n < existingButtons.length; n++) {
         var button = existingButtons[n];
         var feature = this.getFeatureForButton(button);
-
         if (feature === false) {
           continue;
         }
-
         if (Drupal.editorConfiguration.featureIsAllowedByFilters(feature)) {
           this.$el.find('.ckeditor-toolbar-active').trigger('CKEditorToolbarChanged', ['added', existingButtons[n]]);
         } else {
@@ -190,11 +162,9 @@
       var getCKEditorFeatures = this.getCKEditorFeatures.bind(this);
       $ckeditorToolbar.find('.ckeditor-toolbar-active').on('CKEditorToolbarChanged.ckeditorAdmin', function (event, action, button) {
         var feature = getFeatureForButton(button);
-
         if (feature === false) {
           return;
         }
-
         var configEvent = action === 'added' ? 'addedFeature' : 'removedFeature';
         Drupal.editorConfiguration[configEvent](feature);
       }).on('CKEditorPluginSettingsChanged.ckeditorAdmin', function (event, settingsChanges) {
@@ -205,7 +175,6 @@
           var featuresMetadata = view.model.get('featuresMetadata');
           Object.keys(features || {}).forEach(function (name) {
             var feature = features[name];
-
             if (featuresMetadata.hasOwnProperty(name) && !_.isEqual(featuresMetadata[name], feature)) {
               Drupal.editorConfiguration.modifiedFeature(feature);
             }
diff --git a/web/core/modules/ckeditor/js/views/KeyboardView.js b/web/core/modules/ckeditor/js/views/KeyboardView.js
index c1761ac62..5185de8b3 100644
--- a/web/core/modules/ckeditor/js/views/KeyboardView.js
+++ b/web/core/modules/ckeditor/js/views/KeyboardView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Backbone, _) {
   Drupal.ckeditor.KeyboardView = Backbone.View.extend({
     initialize: function initialize() {
@@ -15,11 +14,9 @@
     onPressButton: function onPressButton(event) {
       var upDownKeys = [38, 63232, 40, 63233];
       var leftRightKeys = [37, 63234, 39, 63235];
-
       if (event.keyCode === 13) {
         event.stopPropagation();
       }
-
       if (_.indexOf(_.union(upDownKeys, leftRightKeys), event.keyCode) > -1) {
         var view = this;
         var $target = $(event.currentTarget);
@@ -32,7 +29,6 @@
         var $activeButtons = this.$el.find('.ckeditor-toolbar-active');
         var $originalGroup = $group;
         var dir;
-
         if (containerType === 'source') {
           if (_.indexOf([40, 63233], event.keyCode) > -1) {
             $activeButtons.find('.ckeditor-toolbar-group-buttons').eq(0).prepend($button);
@@ -41,13 +37,11 @@
           if (_.indexOf(leftRightKeys, event.keyCode) > -1) {
             var $siblings = $container.children();
             var index = $siblings.index($button);
-
             if (_.indexOf([37, 63234], event.keyCode) > -1) {
               if (index > 0) {
                 $button.insertBefore($container.children().eq(index - 1));
               } else {
                 $group = $container.parent().prev();
-
                 if ($group.length > 0) {
                   $group.find('.ckeditor-toolbar-group-buttons').append($button);
                 } else {
@@ -64,7 +58,6 @@
           } else if (_.indexOf(upDownKeys, event.keyCode) > -1) {
             dir = _.indexOf([38, 63232], event.keyCode) > -1 ? 'prev' : 'next';
             $row = $container.closest('.ckeditor-row')[dir]();
-
             if (dir === 'prev' && $row.length === 0) {
               if ($button.data('drupal-ckeditor-type') === 'separator') {
                 $button.off().remove();
@@ -83,13 +76,11 @@
             $target = $button.children();
           }
         }
-
         view = this;
         Drupal.ckeditor.registerButtonMove(this, $button, function (result) {
           if (!result && $originalGroup) {
             $originalGroup.find('.ckeditor-buttons').append($button);
           }
-
           $target.trigger('focus');
         });
         event.preventDefault();
@@ -99,7 +90,6 @@
     onPressGroup: function onPressGroup(event) {
       var upDownKeys = [38, 63232, 40, 63233];
       var leftRightKeys = [37, 63234, 39, 63235];
-
       if (event.keyCode === 13) {
         var view = this;
         window.setTimeout(function () {
@@ -108,17 +98,14 @@
         event.preventDefault();
         event.stopPropagation();
       }
-
       if (_.indexOf(_.union(upDownKeys, leftRightKeys), event.keyCode) > -1) {
         var $group = $(event.currentTarget);
         var $container = $group.parent();
         var $siblings = $container.children();
         var index;
         var dir;
-
         if (_.indexOf(leftRightKeys, event.keyCode) > -1) {
           index = $siblings.index($group);
-
           if (_.indexOf([37, 63234], event.keyCode) > -1) {
             if (index > 0) {
               $group.insertBefore($siblings.eq(index - 1));
@@ -137,7 +124,6 @@
           dir = _.indexOf([38, 63232], event.keyCode) > -1 ? 'prev' : 'next';
           $group.closest('.ckeditor-row')[dir]().find('.ckeditor-toolbar-groups').eq(0).prepend($group);
         }
-
         Drupal.ckeditor.registerGroupMove(this, $group);
         $group.trigger('focus');
         event.preventDefault();
diff --git a/web/core/modules/ckeditor/js/views/VisualView.js b/web/core/modules/ckeditor/js/views/VisualView.js
index e7125d9ac..94a88ae53 100644
--- a/web/core/modules/ckeditor/js/views/VisualView.js
+++ b/web/core/modules/ckeditor/js/views/VisualView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone, $, Sortable) {
   Drupal.ckeditor.VisualView = Backbone.View.extend({
     events: {
@@ -21,7 +20,6 @@
       this.insertPlaceholders();
       this.applySorting();
       var groupNamesVisible = this.model.get('groupNamesVisible');
-
       if (changedAttributes && changedAttributes.changes && changedAttributes.changes.isDirty) {
         this.model.set({
           groupNamesVisible: true
@@ -30,7 +28,6 @@
         });
         groupNamesVisible = true;
       }
-
       this.$el.find('[data-toolbar="active"]').toggleClass('ckeditor-group-names-are-visible', groupNamesVisible);
       var $toggle = this.$el.find('.ckeditor-groupnames-toggle');
       $toggle.each(function (index, element) {
@@ -55,7 +52,6 @@
           $group.trigger('focus');
         }
       }
-
       Drupal.ckeditor.openGroupNameDialog(this, $(Drupal.theme('ckeditorToolbarGroup')), insertNewGroup);
       event.preventDefault();
     },
@@ -75,7 +71,6 @@
     },
     applySorting: function applySorting() {
       var _this = this;
-
       Array.prototype.forEach.call(this.el.querySelectorAll('.ckeditor-buttons:not(.js-sortable)'), function (buttons) {
         buttons.classList.add('js-sortable');
         Sortable.create(buttons, {
@@ -109,18 +104,15 @@
     },
     insertPlaceholderRow: function insertPlaceholderRow() {
       var $rows = this.$el.find('.ckeditor-row');
-
       if (!$rows.eq(-1).hasClass('placeholder')) {
         this.$el.find('.ckeditor-toolbar-active').children('.ckeditor-active-toolbar-configuration').append(Drupal.theme('ckeditorRow'));
       }
-
       $rows = this.$el.find('.ckeditor-row');
       var len = $rows.length;
       $rows.filter(function (index, row) {
         if (index + 1 === len) {
           return false;
         }
-
         return $(row).find('.ckeditor-toolbar-group').not('.placeholder').length === 0;
       }).remove();
     },
@@ -129,7 +121,6 @@
         var $row = $(this);
         var $groups = $row.find('.ckeditor-toolbar-group');
         var $button = $row.find('.ckeditor-add-new-group');
-
         if ($button.length === 0) {
           $row.children('.ckeditor-toolbar-groups').append(Drupal.theme('ckeditorNewButtonGroup'));
         } else if (!$groups.eq(-1).hasClass('ckeditor-add-new-group')) {
diff --git a/web/core/modules/ckeditor/tests/modules/js/ajax-css.js b/web/core/modules/ckeditor/tests/modules/js/ajax-css.js
index bb7ba0fb9..56f418ecd 100644
--- a/web/core/modules/ckeditor/tests/modules/js/ajax-css.js
+++ b/web/core/modules/ckeditor/tests/modules/js/ajax-css.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, ckeditor, editorSettings, $) {
   Drupal.behaviors.ajaxCssForm = {
     attach: function attach(context) {
diff --git a/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php b/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php
index fd8ef0e58..690a4c5e3 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Form/AjaxCssForm.php
@@ -34,7 +34,7 @@ public function __construct(FileUrlGeneratorInterface $file_url_generator) {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static($container->get('file_url_generator'));
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
index b724ff159..9b83ae3a6 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/Llama.php
@@ -4,6 +4,7 @@
 
 use Drupal\ckeditor\CKEditorPluginInterface;
 use Drupal\Component\Plugin\PluginBase;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\Entity\Editor;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -27,6 +28,7 @@
  * )
  */
 class Llama extends PluginBase implements CKEditorPluginInterface, ContainerFactoryPluginInterface {
+  use StringTranslationTrait;
 
   /**
    * The module list service.
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php
index 646eaa6d2..ca6d4a919 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaButton.php
@@ -20,7 +20,7 @@ class LlamaButton extends Llama implements CKEditorPluginButtonsInterface {
   public function getButtons() {
     return [
       'Llama' => [
-        'label' => t('Insert Llama'),
+        'label' => $this->t('Insert Llama'),
       ],
     ];
   }
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
index 3033904f2..c7742384b 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
@@ -9,8 +9,7 @@
 use Drupal\editor\Entity\Editor;
 
 /**
- * Defines a "LlamaContextualAndButton" plugin, with a contextually OR toolbar
- * builder-enabled "llama" feature.
+ * Defines a "LlamaContextualAndButton" plugin, with a "llama" feature.
  *
  * @CKEditorPlugin(
  *   id = "llama_contextual_and_button",
@@ -41,7 +40,7 @@ public function isEnabled(Editor $editor) {
   public function getButtons() {
     return [
       'Llama' => [
-        'label' => t('Insert Llama'),
+        'label' => $this->t('Insert Llama'),
       ],
     ];
   }
@@ -65,7 +64,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
     }
 
     $form['ultra_llama_mode'] = [
-      '#title' => t('Ultra llama mode'),
+      '#title' => $this->t('Ultra llama mode'),
       '#type' => 'checkbox',
       '#default_value' => $config['ultra_llama_mode'],
     ];
diff --git a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
index 23ffc8b5c..15f60e031 100644
--- a/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
+++ b/web/core/modules/ckeditor/tests/modules/src/Plugin/CKEditorPlugin/LlamaCss.php
@@ -22,7 +22,7 @@ class LlamaCss extends Llama implements CKEditorPluginButtonsInterface, CKEditor
   public function getButtons() {
     return [
       'LlamaCSS' => [
-        'label' => t('Insert Llama CSS'),
+        'label' => $this->t('Insert Llama CSS'),
       ],
     ];
   }
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
index ded1d54c7..9a8b6e6fe 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorAdminTest.php
@@ -12,6 +12,7 @@
  * Tests administration of CKEditor.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorAdminTest extends BrowserTestBase {
 
@@ -34,6 +35,9 @@ class CKEditorAdminTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
index eb56fc722..1f2fd901d 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorLoadingTest.php
@@ -10,6 +10,7 @@
  * Tests loading of CKEditor.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorLoadingTest extends BrowserTestBase {
 
@@ -39,6 +40,9 @@ class CKEditorLoadingTest extends BrowserTestBase {
    */
   protected $normalUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php
index 10ef5c316..46ed84112 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboAdminTest.php
@@ -10,6 +10,7 @@
  * Tests administration of the CKEditor StylesCombo plugin.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorStylesComboAdminTest extends BrowserTestBase {
 
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php
index 0e4cba82e..6ec024738 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorStylesComboTranslationTest.php
@@ -11,6 +11,7 @@
  * Tests administration of the CKEditor StylesCombo plugin.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorStylesComboTranslationTest extends BrowserTestBase {
 
diff --git a/web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php b/web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
index 74e762328..812b42990 100644
--- a/web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
+++ b/web/core/modules/ckeditor/tests/src/Functional/CKEditorToolbarButtonTest.php
@@ -11,6 +11,7 @@
  * Tests CKEditor toolbar buttons when the language direction is RTL.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorToolbarButtonTest extends BrowserTestBase {
 
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php
index dcd10351a..5453fe4d3 100644
--- a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/AjaxCssTest.php
@@ -10,6 +10,7 @@
  * Tests delivery of CSS to CKEditor via AJAX.
  *
  * @group ckeditor
+ * @group legacy
  */
 class AjaxCssTest extends WebDriverTestBase {
 
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/BigPipeRegressionTest.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
index da99c5c2a..9bc88d8e9 100644
--- a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/BigPipeRegressionTest.php
@@ -16,6 +16,7 @@
  * BigPipe regression test for CKEditor 4.
  *
  * @group legacy
+ * @group legacy
  */
 class BigPipeRegressionTest extends WebDriverTestBase {
 
@@ -110,7 +111,7 @@ public function testCommentForm_2698811() {
     // Confirm that CKEditor loaded.
     $javascript = <<<JS
     (function(){
-      return Object.keys(CKEDITOR.instances).length > 0;
+      return window.CKEDITOR && Object.keys(CKEDITOR.instances).length > 0;
     }())
 JS;
     $this->assertJsCondition($javascript);
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditor5CKEditor4Compatibility.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditor5CKEditor4Compatibility.php
index aa3c14968..49cbb9c70 100644
--- a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditor5CKEditor4Compatibility.php
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditor5CKEditor4Compatibility.php
@@ -15,6 +15,7 @@
  * Ensures that CKEditor 5 can be used on the same page with CKEditor 4.
  *
  * @group ckeditor
+ * @group legacy
  * @internal
  */
 class CKEditor5CKEditor4Compatibility extends WebDriverTestBase {
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
index 90d60e40e..0cc527eba 100644
--- a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
@@ -15,6 +15,7 @@
  * Tests the integration of CKEditor.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorIntegrationTest extends WebDriverTestBase {
 
@@ -45,7 +46,14 @@ class CKEditorIntegrationTest extends WebDriverTestBase {
   protected static $modules = ['node', 'ckeditor', 'filter', 'ckeditor_test'];
 
   /**
-   * {@inheritdoc}
+   * The theme to install as the default for testing.
+   *
+   * @var string
+   *
+   * @todo This test's reliance on classes makes Stark a bad fit as a base theme.
+   *   Change the default theme to Starterkit once it is stable.
+   *
+   * @see https://www.drupal.org/project/drupal/issues/3275827
    */
   protected function setUp(): void {
     parent::setUp();
diff --git a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php
index 3500ef1a4..b5373b8fa 100644
--- a/web/core/modules/ckeditor/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php
+++ b/web/core/modules/ckeditor/tests/src/FunctionalJavascript/FormErrorHandlerCKEditorTest.php
@@ -14,6 +14,7 @@
  * Tests the inline errors fragment link to a CKEditor-enabled textarea.
  *
  * @group ckeditor
+ * @group legacy
  */
 class FormErrorHandlerCKEditorTest extends WebDriverTestBase {
 
@@ -30,7 +31,7 @@ class FormErrorHandlerCKEditorTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/ckeditor/tests/src/Kernel/CKEditorPluginManagerTest.php b/web/core/modules/ckeditor/tests/src/Kernel/CKEditorPluginManagerTest.php
index 8de0c7038..53b42af95 100644
--- a/web/core/modules/ckeditor/tests/src/Kernel/CKEditorPluginManagerTest.php
+++ b/web/core/modules/ckeditor/tests/src/Kernel/CKEditorPluginManagerTest.php
@@ -10,6 +10,7 @@
  * Tests different ways of enabling CKEditor plugins.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorPluginManagerTest extends KernelTestBase {
 
@@ -33,6 +34,9 @@ class CKEditorPluginManagerTest extends KernelTestBase {
    */
   protected $manager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php b/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
index 5e0ccae39..a667c5d74 100644
--- a/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
+++ b/web/core/modules/ckeditor/tests/src/Kernel/CKEditorTest.php
@@ -11,6 +11,7 @@
  * Tests for the 'CKEditor' text editor plugin.
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorTest extends KernelTestBase {
 
@@ -49,6 +50,9 @@ class CKEditorTest extends KernelTestBase {
    */
   protected $manager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->fileUrlGenerator = $this->container->get('file_url_generator');
diff --git a/web/core/modules/ckeditor/tests/src/Kernel/Plugin/CKEditorPlugin/InternalTest.php b/web/core/modules/ckeditor/tests/src/Kernel/Plugin/CKEditorPlugin/InternalTest.php
index 1de3df5f7..d5d306028 100644
--- a/web/core/modules/ckeditor/tests/src/Kernel/Plugin/CKEditorPlugin/InternalTest.php
+++ b/web/core/modules/ckeditor/tests/src/Kernel/Plugin/CKEditorPlugin/InternalTest.php
@@ -10,6 +10,7 @@
  * @coversDefaultClass \Drupal\ckeditor\Plugin\CKEditorPlugin\Internal
  *
  * @group ckeditor
+ * @group legacy
  */
 class InternalTest extends KernelTestBase {
 
diff --git a/web/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php b/web/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php
index dfa1f163f..38c376d87 100644
--- a/web/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php
+++ b/web/core/modules/ckeditor/tests/src/Unit/CKEditorPluginManagerTest.php
@@ -10,6 +10,7 @@
  * @coversDefaultClass \Drupal\ckeditor\CKEditorPluginManager
  *
  * @group ckeditor
+ * @group legacy
  */
 class CKEditorPluginManagerTest extends UnitTestCase {
 
@@ -67,7 +68,7 @@ public function providerGetEnabledButtons() {
             ['name' => 'Formatting', 'items' => ['Bold', 'Italic']],
             // Group 2.
             ['name' => 'Linking', 'items' => ['Link']],
-        ],
+          ],
           // Row 2.
           [
             // Group 1.
diff --git a/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php b/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
index 1c6b56bb1..5b8bc6948 100644
--- a/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
+++ b/web/core/modules/ckeditor/tests/src/Unit/Plugin/CKEditorPlugin/LanguageTest.php
@@ -10,6 +10,7 @@
  * @coversDefaultClass \Drupal\ckeditor\Plugin\CKEditorPlugin\Language
  *
  * @group ckeditor
+ * @group legacy
  */
 class LanguageTest extends UnitTestCase {
 
diff --git a/web/core/modules/ckeditor5/ckeditor5.ckeditor5.yml b/web/core/modules/ckeditor5/ckeditor5.ckeditor5.yml
index afcdbd7a7..0a19bdca9 100644
--- a/web/core/modules/ckeditor5/ckeditor5.ckeditor5.yml
+++ b/web/core/modules/ckeditor5/ckeditor5.ckeditor5.yml
@@ -9,8 +9,8 @@ ckeditor5_essentials:
       - essentials.Essentials
   drupal:
     label: Essentials
-    library: ckeditor5/drupal.ckeditor5.internal
-    admin_library: ckeditor5/admin.internal
+    library: ckeditor5/internal.drupal.ckeditor5.htmlEngine
+    admin_library: ckeditor5/internal.admin.essentials
     toolbar_items:
       undo:
         label: Undo
@@ -25,8 +25,8 @@ ckeditor5_paragraph:
     plugins: [paragraph.Paragraph]
   drupal:
     label: Paragraph
-    library: core/ckeditor5.internal
-    admin_library: ckeditor5/admin.internal
+    library: core/ckeditor5.essentials
+    admin_library: ckeditor5/internal.admin.essentials
     elements:
       - <p>
 
@@ -48,8 +48,8 @@ ckeditor5_heading:
           - { model: 'heading6', view: 'h6', title: 'Heading 6', class: 'ck-heading_heading6' }
   drupal:
     label: Headings
-    library: core/ckeditor5.internal
-    admin_library: ckeditor5/admin.heading
+    library: core/ckeditor5.essentials
+    admin_library: ckeditor5/internal.admin.heading
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Heading
     toolbar_items:
       heading:
@@ -68,7 +68,7 @@ ckeditor5_style:
   drupal:
     label: Style
     library: core/ckeditor5.style
-    admin_library: ckeditor5/admin.style
+    admin_library: ckeditor5/internal.admin.style
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Style
     toolbar_items:
       style:
@@ -168,7 +168,7 @@ ckeditor5_specialCharacters:
   drupal:
     label: Special characters
     library: core/ckeditor5.specialCharacters
-    admin_library: ckeditor5/admin.specialCharacters
+    admin_library: ckeditor5/internal.admin.specialCharacters
     toolbar_items:
       specialCharacters:
         label: Special characters
@@ -188,7 +188,7 @@ ckeditor5_sourceEditing:
     # @see \Drupal\ckeditor5\Plugin\CKEditor5PluginManager::getProvidedElements()
     elements: []
     library: core/ckeditor5.sourceEditing
-    admin_library: ckeditor5/admin.sourceEditing
+    admin_library: ckeditor5/internal.admin.sourceEditing
     toolbar_items:
       sourceEditing:
         label: Source
@@ -199,7 +199,7 @@ ckeditor5_bold:
   drupal:
     label: Bold
     library: core/ckeditor5.basic
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       bold:
         label: Bold
@@ -213,8 +213,8 @@ ckeditor5_emphasis:
       - drupalEmphasis.DrupalEmphasis
   drupal:
     label: Emphasis
-    library: ckeditor5/drupal.ckeditor5.emphasis
-    admin_library: ckeditor5/admin.basic
+    library: ckeditor5/internal.drupal.ckeditor5.emphasis
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       italic:
         label: Italic
@@ -227,7 +227,7 @@ ckeditor5_underline:
   drupal:
     label: Underline
     library: core/ckeditor5.basic
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       underline:
         label: Underline
@@ -240,7 +240,7 @@ ckeditor5_code:
   drupal:
     label: Code
     library: core/ckeditor5.basic
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       code:
         label: Code
@@ -261,8 +261,8 @@ ckeditor5_codeBlock:
             name: pre
   drupal:
     label: Code Block
-    library: ckeditor5/drupal.ckeditor5.codeBlock
-    admin_library: ckeditor5/admin.codeBlock
+    library: ckeditor5/internal.drupal.ckeditor5.codeBlock
+    admin_library: ckeditor5/internal.admin.codeBlock
     toolbar_items:
       codeBlock:
         label: Code Block
@@ -277,7 +277,7 @@ ckeditor5_strikethrough:
   drupal:
     label: Strikethrough
     library: core/ckeditor5.basic
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       strikethrough:
         label: Strikethrough
@@ -290,7 +290,7 @@ ckeditor5_subscript:
   drupal:
     label: Subscript
     library: core/ckeditor5.basic
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       subscript:
         label: Subscript
@@ -303,7 +303,7 @@ ckeditor5_superscript:
   drupal:
     label: Superscript
     library: core/ckeditor5.basic
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     toolbar_items:
       superscript:
         label: Superscript
@@ -317,7 +317,7 @@ ckeditor5_blockquote:
   drupal:
     label: Block quote
     library: core/ckeditor5.blockquote
-    admin_library: ckeditor5/admin.blockquote
+    admin_library: ckeditor5/internal.admin.blockquote
     toolbar_items:
       blockQuote:
         label: Block quote
@@ -331,7 +331,7 @@ ckeditor5_link:
   drupal:
     label: Link
     library: core/ckeditor5.link
-    admin_library: ckeditor5/admin.link
+    admin_library: ckeditor5/internal.admin.link
     toolbar_items:
       link:
         label: Link
@@ -376,8 +376,8 @@ ckeditor5_linkMedia:
 ckeditor5_list:
   ckeditor5:
     plugins:
-     - list.DocumentList
-     - list.DocumentListProperties
+      - list.DocumentList
+      - list.DocumentListProperties
     config:
       list:
         properties:
@@ -388,7 +388,7 @@ ckeditor5_list:
   drupal:
     label: List
     library: core/ckeditor5.list
-    admin_library: ckeditor5/admin.list
+    admin_library: ckeditor5/internal.admin.list
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\ListPlugin
     toolbar_items:
       bulletedList:
@@ -407,7 +407,7 @@ ckeditor5_horizontalLine:
   drupal:
     label: Horizontal line
     library: core/ckeditor5.horizontalLine
-    admin_library: ckeditor5/admin.horizontalLine
+    admin_library: ckeditor5/internal.admin.horizontalLine
     toolbar_items:
       horizontalLine:
         label: Horizontal line
@@ -432,7 +432,7 @@ ckeditor5_alignment:
   drupal:
     label: Alignment
     library: core/ckeditor5.alignment
-    admin_library: ckeditor5/admin.alignment
+    admin_library: ckeditor5/internal.admin.alignment
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Alignment
     toolbar_items:
       alignment:
@@ -446,7 +446,7 @@ ckeditor5_removeFormat:
   drupal:
     label: Remove Format
     library: core/ckeditor5.removeFormat
-    admin_library: ckeditor5/admin.removeFormat
+    admin_library: ckeditor5/internal.admin.removeFormat
     toolbar_items:
       removeFormat:
         label: Remove Format
@@ -474,7 +474,7 @@ ckeditor5_table:
   drupal:
     label: Table
     library: core/ckeditor5.table
-    admin_library: ckeditor5/admin.table
+    admin_library: ckeditor5/internal.admin.table
     toolbar_items:
       insertTable:
         label: table
@@ -503,8 +503,8 @@ ckeditor5_image:
   drupal:
     label: Image
     class: \Drupal\ckeditor5\Plugin\CKEditor5Plugin\Image
-    library: ckeditor5/drupal.ckeditor5.image
-    admin_library: ckeditor5/admin.image
+    library: ckeditor5/internal.drupal.ckeditor5.image
+    admin_library: ckeditor5/internal.admin.image
     elements:
       - <img>
       - <img src alt height width>
@@ -619,7 +619,7 @@ ckeditor5_indent:
     label: Indent
     elements: false
     library: core/ckeditor5.indent
-    admin_library: ckeditor5/admin.indent
+    admin_library: ckeditor5/internal.admin.indent
     toolbar_items:
       indent:
         label: Indent
@@ -631,8 +631,8 @@ ckeditor5_language:
     plugins: [language.TextPartLanguage]
   drupal:
     label: Language
-    library: ckeditor5/ckeditor5.language
-    admin_library: ckeditor5/admin.language
+    library: ckeditor5/internal.ckeditor5.language
+    admin_library: ckeditor5/internal.admin.language
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Language
     toolbar_items:
       textPartLanguage:
@@ -656,7 +656,7 @@ media_media:
             invoke: true
   drupal:
     label: Media
-    library: ckeditor5/drupal.ckeditor5.media
+    library: ckeditor5/internal.drupal.ckeditor5.media
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\Media
     elements:
       - <drupal-media>
@@ -722,7 +722,7 @@ media_mediaAlign:
           - '|'
   drupal:
     label: Media align
-    library: ckeditor5/drupal.ckeditor5.mediaAlign
+    library: ckeditor5/internal.drupal.ckeditor5.mediaAlign
     elements:
       - <drupal-media data-align>
     conditions:
@@ -742,16 +742,15 @@ media_library_mediaLibrary:
         dialogSettings:
           height: 75%
           dialogClass: media-library-widget-modal
-          title: Add or select media
   drupal:
     label: Media Library
     elements: false
-    admin_library: ckeditor5/admin.drupalmedia
+    admin_library: ckeditor5/internal.admin.drupalmedia
     class: Drupal\ckeditor5\Plugin\CKEditor5Plugin\MediaLibrary
     library: editor/drupal.editor.dialog
     toolbar_items:
-        drupalMedia:
-          label: Drupal media
+      drupalMedia:
+        label: Drupal media
     conditions:
       filter: media_embed
       toolbarItem: drupalMedia
diff --git a/web/core/modules/ckeditor5/ckeditor5.info.yml b/web/core/modules/ckeditor5/ckeditor5.info.yml
index 6d93d11a3..c092f73f5 100644
--- a/web/core/modules/ckeditor5/ckeditor5.info.yml
+++ b/web/core/modules/ckeditor5/ckeditor5.info.yml
@@ -2,7 +2,6 @@ name: CKEditor 5
 type: module
 description: "WYSIWYG editing for rich text fields using CKEditor 5."
 version: VERSION
-package: Core (Experimental)
-lifecycle: experimental
+package: Core
 dependencies:
   - drupal:editor
diff --git a/web/core/modules/ckeditor5/ckeditor5.libraries.yml b/web/core/modules/ckeditor5/ckeditor5.libraries.yml
index 33c2008b4..011bf5372 100644
--- a/web/core/modules/ckeditor5/ckeditor5.libraries.yml
+++ b/web/core/modules/ckeditor5/ckeditor5.libraries.yml
@@ -1,57 +1,61 @@
-ckeditor5.language:
+# Internal libraries, do not depend on these.
+# CKEditor 5 has a much faster release cadence for major and minor releases
+# than Drupal. CKEditor 5 does not provide continued support for major or
+# minor releases; they almost never issue patch releases. Drupal therefore
+# has to keep its integration up-to-date with upstream. It is hence
+# impossible to provide "stable overrides", since the stability is not
+# controlled by Drupal, but by upstream.
+# Hence all CKEditor 5 asset libraries are considered internal.
+# @see https://ckeditor.com/docs/ckeditor5/latest/support/versioning-policy.html
+
+internal.ckeditor5.language:
   css:
     component:
       css/language.css: {}
   dependencies:
     - core/ckeditor5.language
 
-drupal.ckeditor5.internal:
+internal.drupal.ckeditor5.htmlEngine:
   js:
     js/build/drupalHtmlEngine.js: { minified: true }
   dependencies:
     - core/ckeditor5
-    - core/ckeditor5.internal
+    - core/ckeditor5.essentials
 
-drupal.ckeditor5:
+internal.drupal.ckeditor5:
   js:
     js/ckeditor5.js: {}
   css:
     theme:
-      css/quickedit.css: { }
       css/editor.css: { }
   dependencies:
     - core/jquery
     - core/once
     - core/drupal
+    - core/drupal.ajax
     - core/drupal.debounce
     - core/ckeditor5.editorClassic
     - core/ckeditor5.editorDecoupled
     - core/ckeditor5
     - editor/drupal.editor
-    - ckeditor5/ie11.user.warnings
-    - ckeditor5/drupal.ckeditor5.stylesheets
+    - ckeditor5/internal.ie11.user.warnings
+    - ckeditor5/internal.drupal.ckeditor5.stylesheets
     - core/drupalSettings
     - core/drupal.message
 
 # Library used for dynamically loading CKEditor 5 stylesheets from the default
 # front end theme.
 # @see ckeditor5_library_info_alter()
-drupal.ckeditor5.stylesheets:
+internal.drupal.ckeditor5.stylesheets:
   version: VERSION
   css: []
 
-drupal.ckeditor5.quickedit-temporary-work-around:
-  deprecated: "Temporary work-around until https://www.drupal.org/project/drupal/issues/3196689 lands."
-  css:
-    theme:
-      css/quickedit-override.css: {}
-
-drupal.ckeditor5.codeBlock:
+internal.drupal.ckeditor5.codeBlock:
   dependencies:
     - core/ckeditor5.codeBlock
     - core/ckeditor5.htmlSupport
 
-drupal.ckeditor5.image:
+internal.drupal.ckeditor5.image:
   js:
     js/build/drupalImage.js: { minified: true }
   css:
@@ -62,7 +66,7 @@ drupal.ckeditor5.image:
     - core/ckeditor5
     - core/ckeditor5.image
 
-drupal.ckeditor5.emphasis:
+internal.drupal.ckeditor5.emphasis:
   version: VERSION
   js:
     js/build/drupalEmphasis.js: { minified: true }
@@ -70,9 +74,8 @@ drupal.ckeditor5.emphasis:
     - core/ckeditor5
     - core/ckeditor5.basic
 
-drupal.ckeditor5.media:
+internal.drupal.ckeditor5.media:
   js:
-    js/media_embed_ckeditor5.theme.js: {}
     js/build/drupalMedia.js: { minified: true }
   css:
     theme:
@@ -80,15 +83,16 @@ drupal.ckeditor5.media:
   dependencies:
     - core/ckeditor5
     - core/drupal
+    - media/media_embed_ckeditor_theme
 
-drupal.ckeditor5.mediaAlign:
+internal.drupal.ckeditor5.mediaAlign:
   css:
     theme:
       css/media-alignment.css: { }
   dependencies:
-    - ckeditor5/drupal.ckeditor5.media
+    - ckeditor5/internal.drupal.ckeditor5.media
 
-ie11.user.warnings:
+internal.ie11.user.warnings:
   js:
     js/ie11.user.warnings.js: { }
   css:
@@ -99,7 +103,7 @@ ie11.user.warnings:
     - core/drupal.message
     - editor/drupal.editor
 
-ie11.filter.warnings:
+internal.ie11.filter.warnings:
   js:
     js/ie11.filter.warnings.js: {}
   dependencies:
@@ -107,7 +111,7 @@ ie11.filter.warnings:
     - core/drupal.message
     - core/once
 
-drupal.ckeditor5.filter.admin:
+internal.drupal.ckeditor5.filter.admin:
   js:
     js/ckeditor5.filter.admin.js: {}
   dependencies:
@@ -116,7 +120,7 @@ drupal.ckeditor5.filter.admin:
     - core/drupal.ajax
     - core/drupalSettings
 
-admin:
+internal.admin:
   js:
     js/ckeditor5.admin.js: { }
   css:
@@ -128,79 +132,79 @@ admin:
     - core/jquery
     - core/once
 
-admin.specialCharacters:
+internal.admin.specialCharacters:
   css:
     theme:
       css/special-characters.css: { }
 
-admin.removeFormat:
+internal.admin.removeFormat:
   css:
     theme:
       css/remove-format.css: { }
 
-admin.internal:
+internal.admin.essentials:
   css:
     theme:
-      css/internal.admin.css: { }
+      css/essentials.admin.css: { }
 
-admin.basic:
+internal.admin.basic:
   css:
     theme:
       css/basic.admin.css: { }
 
-admin.blockquote:
+internal.admin.blockquote:
   css:
     theme:
       css/blockquote.admin.css: { }
 
-admin.link:
+internal.admin.link:
   css:
     theme:
       css/link.admin.css: { }
 
-admin.list:
+internal.admin.list:
   css:
     theme:
       css/list.admin.css: { }
 
-admin.heading:
+internal.admin.heading:
   css:
     theme:
       css/heading.admin.css: { }
   dependencies:
-    - core/ckeditor5.internal
+    - core/ckeditor5.essentials
 
-admin.horizontalLine:
+internal.admin.horizontalLine:
   css:
     theme:
       css/horizontal-line.admin.css: { }
 
-admin.alignment:
+internal.admin.alignment:
   css:
     theme:
       css/alignment.admin.css: { }
 
-admin.indent:
+internal.admin.indent:
   css:
     theme:
       css/indent.admin.css: { }
 
-admin.language:
+internal.admin.language:
   css:
     theme:
       css/language.admin.css: { }
 
-admin.drupalmedia:
+internal.admin.drupalmedia:
   css:
     theme:
       css/drupalmedia.admin.css: { }
 
-admin.sourceEditing:
+internal.admin.sourceEditing:
   css:
     theme:
       css/source-editing.admin.css: { }
 
-admin.style:
+internal.admin.style:
   js:
     js/ckeditor5.style.admin.js: { }
   css:
@@ -211,17 +215,17 @@ admin.style:
     - core/drupal
     - core/drupal.vertical-tabs
 
-admin.table:
+internal.admin.table:
   css:
     theme:
       css/table.admin.css: { }
 
-admin.codeBlock:
+internal.admin.codeBlock:
   css:
     theme:
       css/code-block.admin.css: { }
 
-admin.image:
+internal.admin.image:
   css:
     theme:
       css/image.admin.css: { }
diff --git a/web/core/modules/ckeditor5/ckeditor5.module b/web/core/modules/ckeditor5/ckeditor5.module
index 8d05e3c90..38a9ff3db 100644
--- a/web/core/modules/ckeditor5/ckeditor5.module
+++ b/web/core/modules/ckeditor5/ckeditor5.module
@@ -423,8 +423,8 @@ function _ckeditor5_get_langcode_mapping($lang = FALSE) {
  */
 function ckeditor5_library_info_alter(&$libraries, $extension) {
   if ($extension === 'filter') {
-    $libraries['drupal.filter.admin']['dependencies'][] = 'ckeditor5/ie11.filter.warnings';
-    $libraries['drupal.filter.admin']['dependencies'][] = 'ckeditor5/drupal.ckeditor5.filter.admin';
+    $libraries['drupal.filter.admin']['dependencies'][] = 'ckeditor5/internal.ie11.filter.warnings';
+    $libraries['drupal.filter.admin']['dependencies'][] = 'ckeditor5/internal.drupal.ckeditor5.filter.admin';
   }
 
   $moduleHandler = \Drupal::moduleHandler();
@@ -433,15 +433,11 @@ function ckeditor5_library_info_alter(&$libraries, $extension) {
     // Add paths to stylesheets specified by a theme's ckeditor5-stylesheets
     // config property.
     $css = _ckeditor5_theme_css();
-    $libraries['drupal.ckeditor5.stylesheets'] = [
+    $libraries['internal.drupal.ckeditor5.stylesheets'] = [
       'css' => [
         'theme' => array_fill_keys(array_values($css), []),
       ],
     ];
-
-    if ($moduleHandler->moduleExists('quickedit')) {
-      $libraries['drupal.ckeditor5']['dependencies'][] = 'ckeditor5/drupal.ckeditor5.quickedit-temporary-work-around';
-    }
   }
 
   if ($extension === 'core') {
diff --git a/web/core/modules/ckeditor5/ckeditor5.post_update.php b/web/core/modules/ckeditor5/ckeditor5.post_update.php
index 1e56e029c..e826c427f 100644
--- a/web/core/modules/ckeditor5/ckeditor5.post_update.php
+++ b/web/core/modules/ckeditor5/ckeditor5.post_update.php
@@ -10,8 +10,7 @@
 use Drupal\editor\Entity\Editor;
 
 /**
- * Updates if an already migrated CKEditor 5 configuration for text formats
- * has alignment shown as individual buttons instead of a dropdown.
+ * Updates text formats that has alignment shown as individual buttons.
  */
 function ckeditor5_post_update_alignment_buttons(&$sandbox = []) {
   $config_entity_updater = \Drupal::classResolver(ConfigEntityUpdater::class);
diff --git a/web/core/modules/ckeditor5/ckeditor5.services.yml b/web/core/modules/ckeditor5/ckeditor5.services.yml
index f53718adf..b235935a8 100644
--- a/web/core/modules/ckeditor5/ckeditor5.services.yml
+++ b/web/core/modules/ckeditor5/ckeditor5.services.yml
@@ -15,7 +15,6 @@ services:
       - '@logger.channel.ckeditor5'
       - '@module_handler'
       - '@current_user'
-
   ckeditor5.stylesheets.message:
     class: Drupal\ckeditor5\CKEditor5StylesheetsMessage
     arguments:
diff --git a/web/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml b/web/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml
index 7b358f1e2..b7b2bc3b2 100644
--- a/web/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml
+++ b/web/core/modules/ckeditor5/config/schema/ckeditor5.schema.yml
@@ -1,4 +1,4 @@
-# Schema for the configuration files of the CKEditor5 module.
+# Schema for the configuration files of the CKEditor 5 module.
 
 editor.settings.ckeditor5:
   type: mapping
diff --git a/web/core/modules/ckeditor5/css/internal.admin.css b/web/core/modules/ckeditor5/css/internal.admin.css
deleted file mode 100644
index 62a5ac434..000000000
--- a/web/core/modules/ckeditor5/css/internal.admin.css
+++ /dev/null
@@ -1,45 +0,0 @@
-.ckeditor5-toolbar-button-divider {
-  background-image: url(../icons/divider.svg);
-}
-.ckeditor5-toolbar-button-wrapping {
-  background-image: url(../icons/separator.svg);
-}
-
-.ckeditor5-toolbar-button-undo {
-  background-image: url(../icons/undo.svg);
-}
-
-.ckeditor5-toolbar-button-redo {
-  background-image: url(../icons/redo.svg);
-}
-
-.ckeditor5-toolbar-button-heading {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100px;
-  color: #000;
-}
-.ckeditor5-toolbar-button-heading::before {
-  margin-left: 10px;
-  content: "Heading";
-  font-size: 14px;
-}
-[dir="rtl"] .ckeditor5-toolbar-button-heading::before {
-  margin-right: 10px;
-  margin-left: 0;
-}
-.ckeditor5-toolbar-button-heading::after {
-  display: inline-block;
-  width: 7px;
-  height: 7px;
-  margin-right: 10px;
-  content: "";
-  transform: rotate(135deg);
-  border-width: 2px 2px 0 0;
-  border-style: solid;
-}
-[dir="rtl"] .ckeditor5-toolbar-button-heading::after {
-  margin-right: 0;
-  margin-left: 10px;
-}
diff --git a/web/core/modules/ckeditor5/css/quickedit-override.css b/web/core/modules/ckeditor5/css/quickedit-override.css
deleted file mode 100644
index e64eb0d03..000000000
--- a/web/core/modules/ckeditor5/css/quickedit-override.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.quickedit-editable,
-.quickedit-editing.ck.ck-editor__editable_inline {
-  top: inherit !important;
-  left: inherit !important;
-  margin-bottom: inherit !important;
-}
-.quickedit-editing.ck.ck-editor__editable_inline > :first-child {
-  margin-top: inherit;
-}
diff --git a/web/core/modules/ckeditor5/css/quickedit.css b/web/core/modules/ckeditor5/css/quickedit.css
deleted file mode 100644
index 297adfc49..000000000
--- a/web/core/modules/ckeditor5/css/quickedit.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.quickedit-toolgroup.wysiwyg-main .ck.ck-toolbar {
-  border: none;
-  background: none;
-}
diff --git a/web/core/modules/ckeditor5/js/build/ckeditor5.types.jsdoc b/web/core/modules/ckeditor5/js/build/ckeditor5.types.jsdoc
index 7020d9ee6..0606da51b 100644
--- a/web/core/modules/ckeditor5/js/build/ckeditor5.types.jsdoc
+++ b/web/core/modules/ckeditor5/js/build/ckeditor5.types.jsdoc
@@ -256,6 +256,12 @@
  * @typedef {module:code-block/outdentcodeblockcommand} module:code-block/outdentcodeblockcommand~OutdentCodeBlockCommand
  */
 
+/**
+ * Declared in file @ckeditor/ckeditor5-core/src/command.js
+ *
+ * @typedef {module:core/command} module:core/command~Command
+ */
+
 /**
  * Declared in file @ckeditor/ckeditor5-core/src/commandcollection.js
  *
@@ -1546,6 +1552,12 @@
  * @typedef {module:list/documentlist/documentlistsplitcommand} module:list/documentlist/documentlistsplitcommand~DocumentListSplitCommand
  */
 
+/**
+ * Declared in file @ckeditor/ckeditor5-list/src/documentlist/documentlistutils.js
+ *
+ * @typedef {module:list/documentlist/documentlistutils} module:list/documentlist/documentlistutils~DocumentListUtils
+ */
+
 /**
  * Declared in file @ckeditor/ckeditor5-list/src/documentlist/utils/listwalker.js
  *
@@ -1564,6 +1576,12 @@
  * @typedef {module:list/documentlistproperties/documentlistpropertiesediting} module:list/documentlistproperties/documentlistpropertiesediting~DocumentListPropertiesEditing
  */
 
+/**
+ * Declared in file @ckeditor/ckeditor5-list/src/documentlistproperties/documentlistpropertiesutils.js
+ *
+ * @typedef {module:list/documentlist/documentlistpropertiesutils} module:list/documentlist/documentlistpropertiesutils~DocumentListPropertiesUtils
+ */
+
 /**
  * Declared in file @ckeditor/ckeditor5-list/src/documentlistproperties/documentlistreversedcommand.js
  *
@@ -1612,6 +1630,12 @@
  * @typedef {module:list/list/listui} module:list/list/listui~ListUI
  */
 
+/**
+ * Declared in file @ckeditor/ckeditor5-list/src/list/listutils.js
+ *
+ * @typedef {module:list/list/listutils} module:list/list/listutils~ListUtils
+ */
+
 /**
  * Declared in file @ckeditor/ckeditor5-list/src/listproperties.js
  *
@@ -2836,12 +2860,6 @@
  * @typedef {module:utils/dom/getpositionedancestor} module:utils/dom/getpositionedancestor~getPositionedAncestor
  */
 
-/**
- * Declared in file @ckeditor/ckeditor5-utils/src/dom/global.js
- *
- * @typedef {module:utils/dom/global} module:utils/dom/global~global
- */
-
 /**
  * Declared in file @ckeditor/ckeditor5-utils/src/dom/indexof.js
  *
@@ -2944,6 +2962,12 @@
  * @typedef {module:utils/eventinfo} module:utils/eventinfo~EventInfo
  */
 
+/**
+ * Declared in file @ckeditor/ckeditor5-utils/src/fastdiff.js
+ *
+ * @typedef {module:utils/fastdiff} module:utils/fastdiff~fastDiff
+ */
+
 /**
  * Declared in file @ckeditor/ckeditor5-utils/src/first.js
  *
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.admin.es6.js b/web/core/modules/ckeditor5/js/ckeditor5.admin.es6.js
index c996d2f50..5e79b7cd7 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.admin.es6.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.admin.es6.js
@@ -1049,21 +1049,4 @@
     // Call the original behavior.
     originalFilterStatusAttach(context, settings);
   };
-
-  // Activates otherwise-inactive tabs that have form elements with validation
-  // errors.
-  // @todo Remove when https://www.drupal.org/project/drupal/issues/2911932 lands.
-  Drupal.behaviors.tabErrorsVisible = {
-    attach(context) {
-      context.querySelectorAll('details .form-item .error').forEach((item) => {
-        const details = item.closest('details');
-        if (details.style.display === 'none') {
-          const tabSelect = document.querySelector(`[href='#${details.id}']`);
-          if (tabSelect) {
-            tabSelect.click();
-          }
-        }
-      });
-    },
-  };
 })(Drupal, drupalSettings, jQuery, JSON, once, Sortable, tabbable);
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.admin.js b/web/core/modules/ckeditor5/js/ckeditor5.admin.js
index bff2bc1c0..d8c3e521d 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.admin.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.admin.js
@@ -4,39 +4,25 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 (function (Drupal, drupalSettings, $, JSON, once, Sortable, _ref) {
   var tabbable = _ref.tabbable;
   var toolbarHelp = [{
@@ -52,20 +38,16 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
     button: 'wrapping',
     condition: true
   }];
-
   var Observable = function () {
     function Observable(value) {
       _classCallCheck(this, Observable);
-
       this._listeners = [];
       this._value = value;
     }
-
     _createClass(Observable, [{
       key: "notify",
       value: function notify() {
         var _this = this;
-
         this._listeners.forEach(function (listener) {
           return listener(_this._value);
         });
@@ -87,10 +69,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
         }
       }
     }]);
-
     return Observable;
   }();
-
   var getSelectedButtons = function getSelectedButtons(selected, dividers, available) {
     return selected.map(function (id) {
       return _objectSpread({}, [].concat(_toConsumableArray(dividers), _toConsumableArray(available)).find(function (button) {
@@ -98,7 +78,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       }));
     });
   };
-
   var updateSelectedButtons = function updateSelectedButtons(selection, textarea) {
     var newValue = JSON.stringify(selection);
     var priorValue = textarea.innerHTML;
@@ -110,53 +89,42 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       }
     }));
   };
-
   var addToSelectedButtons = function addToSelectedButtons(selection, element, announceChange) {
     var list = _toConsumableArray(selection.value);
-
     list.push(element.dataset.id);
     selection.value = list;
-
     if (announceChange) {
       setTimeout(function () {
         announceChange(element.dataset.label);
       });
     }
   };
-
   var removeFromSelectedButtons = function removeFromSelectedButtons(selection, element, announceChange) {
     var list = _toConsumableArray(selection.value);
-
     var index = Array.from(element.parentElement.children).findIndex(function (child) {
       return child === element;
     });
     list.splice(index, 1);
     selection.value = list;
-
     if (announceChange) {
       setTimeout(function () {
         announceChange(element.dataset.label);
       });
     }
   };
-
   var moveWithinSelectedButtons = function moveWithinSelectedButtons(selection, element, dir) {
     var list = _toConsumableArray(selection.value);
-
     var index = Array.from(element.parentElement.children).findIndex(function (child) {
       return child === element;
     });
     var condition = dir < 0 ? index > 0 : index < list.length - 1;
-
     if (condition) {
       list.splice(index + dir, 0, list.splice(index, 1)[0]);
       selection.value = list;
     }
   };
-
   var copyToActiveButtons = function copyToActiveButtons(selection, element, announceChange) {
     var list = _toConsumableArray(selection.value);
-
     list.push(element.dataset.id);
     selection.value = list;
     setTimeout(function () {
@@ -165,7 +133,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       }
     });
   };
-
   var render = function render(root, selectedButtons, availableButtons, dividerButtons) {
     var toolbarHelpText = toolbarHelp.filter(function (helpItem) {
       return selectedButtons.value.includes(helpItem.button) === helpItem.condition;
@@ -173,11 +140,9 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       return helpItem.message;
     });
     var existingToolbarHelpText = document.querySelector('[data-drupal-selector="ckeditor5-admin-help-message"]');
-
     if (existingToolbarHelpText && toolbarHelpText.join('').trim() !== existingToolbarHelpText.textContent.trim()) {
       Drupal.announce(toolbarHelpText.join(' '));
     }
-
     root.innerHTML = Drupal.theme.ckeditor5Admin({
       availableButtons: Drupal.theme.ckeditor5AvailableButtons({
         buttons: availableButtons.filter(function (button) {
@@ -235,13 +200,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
           buttonElement.setAttribute('data-expanded', true);
         });
       };
-
       var retractButton = function retractButton(event) {
         event.currentTarget.querySelectorAll('.ckeditor5-toolbar-button').forEach(function (buttonElement) {
           buttonElement.setAttribute('data-expanded', false);
         });
       };
-
       element.addEventListener('mouseenter', expandButton);
       element.addEventListener('focus', expandButton);
       element.addEventListener('mouseleave', retractButton);
@@ -249,7 +212,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       element.addEventListener('keyup', function (event) {
         var supportedKeys = ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
         var dir = document.documentElement.dir;
-
         if (supportedKeys.includes(event.key)) {
           if (event.currentTarget.dataset.divider.toLowerCase() === 'true') {
             switch (event.key) {
@@ -260,7 +222,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
                       '@name': name
                     }));
                   };
-
                   copyToActiveButtons(selectedButtons, event.currentTarget, announceChange);
                   root.querySelector('[data-button-list="ckeditor5-toolbar-active-buttons"] li:last-child').focus();
                   break;
@@ -270,7 +231,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
             var index = Array.from(element.parentElement.children).findIndex(function (child) {
               return child === element;
             });
-
             switch (event.key) {
               case 'ArrowLeft':
                 {
@@ -279,7 +239,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
                   root.querySelectorAll('[data-button-list="ckeditor5-toolbar-active-buttons"] li')[index + leftOffset].focus();
                   break;
                 }
-
               case 'ArrowRight':
                 {
                   var rightOffset = dir === 'ltr' ? 1 : -1;
@@ -287,7 +246,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
                   root.querySelectorAll('[data-button-list="ckeditor5-toolbar-active-buttons"] li')[index + rightOffset].focus();
                   break;
                 }
-
               case 'ArrowUp':
                 {
                   var _announceChange = function _announceChange(name) {
@@ -295,15 +253,12 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
                       '@name': name
                     }));
                   };
-
                   removeFromSelectedButtons(selectedButtons, event.currentTarget, _announceChange);
-
                   if (!dividerButtons.find(function (dividerButton) {
                     return event.currentTarget.dataset.id === dividerButton.id;
                   })) {
                     root.querySelector("[data-button-list=\"ckeditor5-toolbar-available-buttons\"] [data-id=\"".concat(event.currentTarget.dataset.id, "\"]")).focus();
                   }
-
                   break;
                 }
             }
@@ -316,7 +271,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
                       '@name': name
                     }));
                   };
-
                   addToSelectedButtons(selectedButtons, event.currentTarget, _announceChange2);
                   root.querySelector('[data-button-list="ckeditor5-toolbar-active-buttons"] li:last-child').focus();
                   break;
@@ -327,16 +281,14 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       });
     });
   };
-
   Drupal.behaviors.ckeditor5Admin = {
     attach: function attach(context) {
       once('ckeditor5-admin-toolbar', '#ckeditor5-toolbar-app').forEach(function (container) {
         var selectedTextarea = context.querySelector('#ckeditor5-toolbar-buttons-selected');
         var available = Object.entries(JSON.parse(context.querySelector('#ckeditor5-toolbar-buttons-available').innerHTML)).map(function (_ref2) {
           var _ref3 = _slicedToArray(_ref2, 2),
-              name = _ref3[0],
-              attrs = _ref3[1];
-
+            name = _ref3[0],
+            attrs = _ref3[1];
           return _objectSpread({
             name: name,
             id: name
@@ -356,7 +308,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
             return button.name === name;
           }).id;
         }));
-
         var mapSelection = function mapSelection(selection) {
           return selection.map(function (id) {
             return [].concat(dividers, _toConsumableArray(available)).find(function (button) {
@@ -364,7 +315,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
             }).name;
           });
         };
-
         selected.subscribe(function (selection) {
           updateSelectedButtons(mapSelection(selection), selectedTextarea);
           render(container, selected, available, dividers);
@@ -385,11 +335,9 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
             39: 'right',
             40: 'down'
           };
-
           if (['tab', 'left', 'up', 'right', 'down'].includes(keyCodeDirections[e.keyCode])) {
             var hideTip = false;
             var isActive = e.target.closest('[data-button-list="ckeditor5-toolbar-active__buttons"]');
-
             if (isActive) {
               if (['tab', 'left', 'up', 'right'].includes(keyCodeDirections[e.keyCode])) {
                 hideTip = true;
@@ -397,63 +345,49 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
             } else if (['tab', 'down'].includes(keyCodeDirections[e.keyCode])) {
               hideTip = true;
             }
-
             if (hideTip) {
               e.target.querySelector('[data-expanded]').setAttribute('data-expanded', 'false');
             }
           }
         });
       });
-
       var updateUiStateStorage = function updateUiStateStorage(states) {
         var form = document.querySelector('#filter-format-edit-form, #filter-format-add-form');
         var currentStates = form.hasAttribute('data-drupal-ui-state') ? JSON.parse(form.getAttribute('data-drupal-ui-state')) : {};
         form.setAttribute('data-drupal-ui-state', JSON.stringify(_objectSpread(_objectSpread({}, currentStates), states)));
       };
-
       var getUiStateStorage = function getUiStateStorage(property) {
         var form = document.querySelector('#filter-format-edit-form, #filter-format-add-form');
-
         if (form === null) {
           return;
         }
-
         return form.hasAttribute('data-drupal-ui-state') ? JSON.parse(form.getAttribute('data-drupal-ui-state'))[property] : null;
       };
-
       once('ui-state-storage', '#filter-format-edit-form, #filter-format-add-form').forEach(function (form) {
         form.setAttribute('data-drupal-ui-state', JSON.stringify({}));
       });
-
       var maintainActiveVerticalTab = function maintainActiveVerticalTab(verticalTabs) {
         var id = verticalTabs.id;
         var activeTab = getUiStateStorage("".concat(id, "-active-tab"));
-
         if (activeTab) {
           setTimeout(function () {
             var activeTabLink = document.querySelector(activeTab);
             activeTabLink.click();
-
             if (id !== 'plugin-settings-wrapper') {
               return;
             }
-
             if (document.activeElement !== document.body) {
               return;
             }
-
             var targetTabPane = document.querySelector(activeTabLink.getAttribute('href'));
-
             if (targetTabPane) {
               var tabbableElements = tabbable(targetTabPane);
-
               if (tabbableElements.length) {
                 tabbableElements[0].focus();
               }
             }
           });
         }
-
         verticalTabs.querySelectorAll('.vertical-tabs__menu').forEach(function (tab) {
           tab.addEventListener('click', function (e) {
             var state = {};
@@ -463,23 +397,18 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
           });
         });
       };
-
       once('maintainActiveVerticalTab', '#plugin-settings-wrapper, #filter-settings-wrapper').forEach(maintainActiveVerticalTab);
       var selectedButtons = document.querySelector('#ckeditor5-toolbar-buttons-selected');
       once('textarea-listener', selectedButtons).forEach(function (textarea) {
         textarea.addEventListener('change', function (e) {
           var buttonName = document.activeElement.getAttribute('data-id');
-
           if (!buttonName) {
             return;
           }
-
           var focusSelector = '';
-
           if (['divider', 'wrapping'].includes(buttonName)) {
             var oldConfig = JSON.parse(e.detail.priorValue);
             var newConfig = JSON.parse(e.target.innerHTML);
-
             if (oldConfig.length > newConfig.length) {
               for (var item = 0; item < newConfig.length; item++) {
                 if (newConfig[item] !== oldConfig[item]) {
@@ -499,21 +428,18 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
           } else {
             focusSelector = "[data-id='".concat(buttonName, "']");
           }
-
           updateUiStateStorage({
             focusSelector: focusSelector
           });
         });
         textarea.addEventListener('focus', function () {
           var focusSelector = getUiStateStorage('focusSelector');
-
           if (focusSelector) {
             if (focusSelector.includes('|')) {
               var _focusSelector$split = focusSelector.split('|'),
-                  _focusSelector$split2 = _slicedToArray(_focusSelector$split, 2),
-                  buttonName = _focusSelector$split2[0],
-                  count = _focusSelector$split2[1];
-
+                _focusSelector$split2 = _slicedToArray(_focusSelector$split, 2),
+                buttonName = _focusSelector$split2[0],
+                count = _focusSelector$split2[1];
               document.querySelectorAll("[data-button-list=\"ckeditor5-toolbar-active-buttons\"] [data-id='".concat(buttonName, "']")).forEach(function (item, index) {
                 if (index === parseInt(count, 10)) {
                   item.focus();
@@ -521,7 +447,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
               });
             } else {
               var toFocus = document.querySelector(focusSelector);
-
               if (toFocus) {
                 toFocus.focus();
               }
@@ -531,7 +456,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       });
     }
   };
-
   Drupal.theme.ckeditor5SelectedButtons = function (_ref4) {
     var buttons = _ref4.buttons;
     return "\n      <ul class=\"ckeditor5-toolbar-tray ckeditor5-toolbar-active__buttons\" data-button-list=\"ckeditor5-toolbar-active-buttons\" role=\"listbox\" aria-orientation=\"horizontal\" aria-labelledby=\"ckeditor5-toolbar-active-buttons-label\">\n        ".concat(buttons.map(function (button) {
@@ -541,7 +465,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       });
     }).join(''), "\n      </ul>\n    ");
   };
-
   Drupal.theme.ckeditor5DividerButtons = function (_ref5) {
     var buttons = _ref5.buttons;
     return "\n      <ul class=\"ckeditor5-toolbar-tray ckeditor5-toolbar-divider__buttons\" data-button-list=\"ckeditor5-toolbar-divider-buttons\" role=\"listbox\" aria-orientation=\"horizontal\" aria-labelledby=\"ckeditor5-toolbar-divider-buttons-label\">\n        ".concat(buttons.map(function (button) {
@@ -551,7 +474,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       });
     }).join(''), "\n      </ul>\n    ");
   };
-
   Drupal.theme.ckeditor5AvailableButtons = function (_ref6) {
     var buttons = _ref6.buttons;
     return "\n      <ul class=\"ckeditor5-toolbar-tray ckeditor5-toolbar-available__buttons\" data-button-list=\"ckeditor5-toolbar-available-buttons\" role=\"listbox\" aria-orientation=\"horizontal\" aria-labelledby=\"ckeditor5-toolbar-available-buttons-label\">\n        ".concat(buttons.map(function (button) {
@@ -561,12 +483,11 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
       });
     }).join(''), "\n      </ul>\n    ");
   };
-
   Drupal.theme.ckeditor5Button = function (_ref7) {
     var _ref7$button = _ref7.button,
-        label = _ref7$button.label,
-        id = _ref7$button.id,
-        listType = _ref7.listType;
+      label = _ref7$button.label,
+      id = _ref7$button.id,
+      listType = _ref7.listType;
     var buttonInstructions = {
       divider: Drupal.t('Press the down arrow key to use this divider in the active button list'),
       available: Drupal.t('Press the down arrow key to activate'),
@@ -578,37 +499,18 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
     });
     return "\n      <li class=\"ckeditor5-toolbar-item ckeditor5-toolbar-item-".concat(id, "\" role=\"option\" tabindex=\"0\" data-drupal-selector=\"ckeditor5-toolbar-button\" data-id=\"").concat(id, "\" data-label=\"").concat(label, "\" data-divider=\"").concat(listType === 'divider', "\">\n        <span class=\"ckeditor5-toolbar-button ckeditor5-toolbar-button-").concat(id, "\">\n          <span class=\"visually-hidden\">").concat(visuallyHiddenLabel, ". ").concat(buttonInstructions[listType], "</span>\n        </span>\n        <span class=\"ckeditor5-toolbar-tooltip\" aria-hidden=\"true\">").concat(label, " </span>\n      </li>\n    ");
   };
-
   Drupal.theme.ckeditor5Admin = function (_ref8) {
     var availableButtons = _ref8.availableButtons,
-        dividerButtons = _ref8.dividerButtons,
-        activeToolbar = _ref8.activeToolbar,
-        helpMessage = _ref8.helpMessage;
+      dividerButtons = _ref8.dividerButtons,
+      activeToolbar = _ref8.activeToolbar,
+      helpMessage = _ref8.helpMessage;
     return "\n    <div data-drupal-selector=\"ckeditor5-admin-help-message\">\n      <p>".concat(helpMessage.join('</p><p>'), "</p>\n    </div>\n    <div class=\"ckeditor5-toolbar-disabled\">\n      <div class=\"ckeditor5-toolbar-available\">\n        <label id=\"ckeditor5-toolbar-available-buttons-label\">").concat(Drupal.t('Available buttons'), "</label>\n        ").concat(availableButtons, "\n      </div>\n      <div class=\"ckeditor5-toolbar-divider\">\n        <label id=\"ckeditor5-toolbar-divider-buttons-label\">").concat(Drupal.t('Button divider'), "</label>\n        ").concat(dividerButtons, "\n      </div>\n    </div>\n    <div class=\"ckeditor5-toolbar-active\">\n      <label id=\"ckeditor5-toolbar-active-buttons-label\">").concat(Drupal.t('Active toolbar'), "</label>\n      ").concat(activeToolbar, "\n    </div>\n    ");
   };
-
   var originalFilterStatusAttach = Drupal.behaviors.filterStatus.attach;
-
   Drupal.behaviors.filterStatus.attach = function (context, settings) {
     var filterStatusCheckboxes = document.querySelectorAll('#filters-status-wrapper input.form-checkbox');
     once.remove('filter-status', filterStatusCheckboxes);
     $(filterStatusCheckboxes).off('click.filterUpdate');
     originalFilterStatusAttach(context, settings);
   };
-
-  Drupal.behaviors.tabErrorsVisible = {
-    attach: function attach(context) {
-      context.querySelectorAll('details .form-item .error').forEach(function (item) {
-        var details = item.closest('details');
-
-        if (details.style.display === 'none') {
-          var tabSelect = document.querySelector("[href='#".concat(details.id, "']"));
-
-          if (tabSelect) {
-            tabSelect.click();
-          }
-        }
-      });
-    }
-  };
 })(Drupal, drupalSettings, jQuery, JSON, once, Sortable, tabbable);
\ No newline at end of file
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js b/web/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js
index 5d769396f..f2e767fb5 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.dialog.fix.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($) {
   $.widget('ui.dialog', $.ui.dialog, {
     _allowInteraction: function _allowInteraction(event) {
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.es6.js b/web/core/modules/ckeditor5/js/ckeditor5.es6.js
index 92f3ec634..01a5cf873 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.es6.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.es6.js
@@ -326,7 +326,7 @@
       // prefixed versions of existing css in `existingCss`.
       const addedCss = [
         `${prefix} .ck.ck-content {display:block;min-height:5rem;}`,
-        `${prefix} .ck.ck-content * {display:initial;background:initial;color:initial;padding:initial;}`,
+        `${prefix} .ck.ck-content * {display:revert;background:revert;color:initial;padding:revert;}`,
         `${prefix} .ck.ck-content li {display:list-item}`,
         `${prefix} .ck.ck-content ol li {list-style-type: decimal}`,
         `${prefix} .ck[contenteditable], ${prefix} .ck[contenteditable] * {-webkit-user-modify: read-write;-moz-user-modify: read-write;}`,
@@ -469,6 +469,10 @@
           }
         })
         .catch((error) => {
+          // eslint-disable-next-line no-console
+          console.info(
+            'Debugging can be done with an unminified version of CKEditor by installing from the source file. Consult documentation at https://www.drupal.org/node/3258901',
+          );
           // eslint-disable-next-line no-console
           console.error(error);
         });
@@ -497,38 +501,11 @@
         editor.updateSourceElement();
       } else {
         element.removeAttribute('contentEditable');
-
-        // Prepare variables that will be used when discarding Quickedit changes.
-        let textElement = null;
-        let originalValue = null;
-        const usingQuickEdit = (((Drupal || {}).quickedit || {}).editors || {})
-          .editor;
-        if (usingQuickEdit) {
-          // The revert() function in QuickEdit's text editor does not work with
-          // CKEditor 5, as it is triggered before CKEditor 5 is fully
-          // destroyed. This function is overridden so the functionality it
-          // provides can happen after the CKEditor destroy() promise is
-          // fulfilled.
-          // This pulls the necessary values from the QuickEdit Backbone Model
-          // before it is destroyed, so they can be used by
-          // `editor.destroy().then()` to perform the expected revert.
-          Drupal.quickedit.editors.editor.prototype.revert =
-            function revertQuickeditChanges() {
-              textElement = this.$textElement[0];
-              originalValue = this.model.get('originalValue');
-            };
-        }
-
-        editor
+        // Return the promise to allow external code to queue code to
+        // execute after the destroy is complete.
+        return editor
           .destroy()
           .then(() => {
-            // If textElement and originalValue are not null, a QuickEdit
-            // revert has been requested. Perform the revert here as it
-            // can't happen until the CKEditor instance is destroyed.
-            if (textElement && originalValue) {
-              textElement.innerHTML = originalValue;
-            }
-
             // Clean up stored references.
             Drupal.CKEditor5Instances.delete(id);
             callbacks.delete(id);
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.filter.admin.js b/web/core/modules/ckeditor5/js/ckeditor5.filter.admin.js
index 98a6ecd2e..0e4e1808b 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.filter.admin.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.filter.admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once) {
   Drupal.behaviors.allowedTagsListener = {
     attach: function attach(context) {
@@ -18,18 +17,15 @@
     }
   };
   var originalAjaxEventResponse = Drupal.Ajax.prototype.eventResponse;
-
   Drupal.Ajax.prototype.eventResponse = function ckeditor5AjaxEventResponse() {
     if (this.ckeditor5_only) {
       if (this.$form[0].querySelector('#edit-editor-editor').value !== 'ckeditor5') {
         return;
       }
     }
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     originalAjaxEventResponse.apply(this, args);
   };
 })(Drupal, once);
\ No newline at end of file
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.js b/web/core/modules/ckeditor5/js/ckeditor5.js
index 29e8f0adb..9dee66587 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.js
@@ -4,98 +4,71 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 (function (Drupal, debounce, CKEditor5, $, once) {
   if (!CKEditor5) {
     return;
   }
-
   Drupal.CKEditor5Instances = new Map();
   var callbacks = new Map();
   var required = new Set();
-
   function findFunc(scope, name) {
     if (!scope) {
       return null;
     }
-
     var parts = name.includes('.') ? name.split('.') : name;
-
     if (parts.length > 1) {
       return findFunc(scope[parts.shift()], parts);
     }
-
     return typeof scope[parts[0]] === 'function' ? scope[parts[0]] : null;
   }
-
   function buildFunc(config) {
     var func = config.func;
     var fn = findFunc(window, func.name);
-
     if (typeof fn === 'function') {
       var result = func.invoke ? fn.apply(void 0, _toConsumableArray(func.args)) : fn;
       return result;
     }
-
     return null;
   }
-
   function buildRegexp(config) {
     var pattern = config.regexp.pattern;
     var main = pattern.match(/\/(.+)\/.*/)[1];
     var options = pattern.match(/\/.+\/(.*)/)[1];
     return new RegExp(main, options);
   }
-
   function processConfig(config) {
     function processArray(config) {
       return config.map(function (item) {
         if (_typeof(item) === 'object') {
           return processConfig(item);
         }
-
         return item;
       });
     }
-
     return Object.entries(config).reduce(function (processed, _ref) {
       var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          value = _ref2[1];
-
+        key = _ref2[0],
+        value = _ref2[1];
       if (_typeof(value) === 'object') {
         if (!value) {
           return processed;
         }
-
         if (value.hasOwnProperty('func')) {
           processed[key] = buildFunc(value);
         } else if (value.hasOwnProperty('regexp')) {
@@ -108,37 +81,30 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       } else {
         processed[key] = value;
       }
-
       return processed;
     }, {});
   }
-
   var setElementId = function setElementId(element) {
     var id = Math.random().toString().slice(2, 9);
     element.setAttribute('data-ckeditor5-id', id);
     return id;
   };
-
   var getElementId = function getElementId(element) {
     return element.getAttribute('data-ckeditor5-id');
   };
-
   function selectPlugins(plugins) {
     return plugins.map(function (pluginDefinition) {
       var _pluginDefinition$spl = pluginDefinition.split('.'),
-          _pluginDefinition$spl2 = _slicedToArray(_pluginDefinition$spl, 2),
-          build = _pluginDefinition$spl2[0],
-          name = _pluginDefinition$spl2[1];
-
+        _pluginDefinition$spl2 = _slicedToArray(_pluginDefinition$spl, 2),
+        build = _pluginDefinition$spl2[0],
+        name = _pluginDefinition$spl2[1];
       if (CKEditor5[build] && CKEditor5[build][name]) {
         return CKEditor5[build][name];
       }
-
       console.warn("Failed to load ".concat(build, " - ").concat(name));
       return null;
     });
   }
-
   function processRules(rulesGroup) {
     try {
       _toConsumableArray(rulesGroup.cssRules).forEach(ckeditor5SelectorProcessing);
@@ -146,45 +112,36 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       console.warn("Stylesheet ".concat(rulesGroup.href, " not included in CKEditor reset due to the browser's CORS policy."));
     }
   }
-
   function ckeditor5SelectorProcessing(rule) {
     if (rule.cssRules) {
       processRules(rule);
     }
-
     if (!rule.selectorText) {
       return;
     }
-
     var offCanvasId = '#drupal-off-canvas';
     var CKEditorClass = '.ck';
     var styleFence = '[data-drupal-ck-style-fence]';
-
     if (rule.selectorText.includes(offCanvasId) || rule.selectorText.includes(CKEditorClass)) {
       rule.selectorText = rule.selectorText.split(/,/g).map(function (selector) {
         if (selector.includes(offCanvasId)) {
           return "".concat(selector.trim(), ":not(").concat(styleFence, " *)");
         }
-
         if (selector.includes(CKEditorClass)) {
           return [selector.trim(), selector.trim().replace(CKEditorClass, "".concat(offCanvasId, " ").concat(styleFence, " ").concat(CKEditorClass))];
         }
-
         return selector;
       }).flat().join(', ');
     }
   }
-
   function offCanvasCss(element) {
     var fenceName = 'data-drupal-ck-style-fence';
     var editor = Drupal.CKEditor5Instances.get(element.getAttribute('data-ckeditor5-id'));
     editor.ui.view.element.setAttribute(fenceName, '');
-
     if (once('ckeditor5-off-canvas-reset', 'body').length) {
       _toConsumableArray(document.styleSheets).forEach(processRules);
-
       var prefix = "#drupal-off-canvas [".concat(fenceName, "]");
-      var addedCss = ["".concat(prefix, " .ck.ck-content {display:block;min-height:5rem;}"), "".concat(prefix, " .ck.ck-content * {display:initial;background:initial;color:initial;padding:initial;}"), "".concat(prefix, " .ck.ck-content li {display:list-item}"), "".concat(prefix, " .ck.ck-content ol li {list-style-type: decimal}"), "".concat(prefix, " .ck[contenteditable], ").concat(prefix, " .ck[contenteditable] * {-webkit-user-modify: read-write;-moz-user-modify: read-write;}")];
+      var addedCss = ["".concat(prefix, " .ck.ck-content {display:block;min-height:5rem;}"), "".concat(prefix, " .ck.ck-content * {display:revert;background:revert;color:initial;padding:revert;}"), "".concat(prefix, " .ck.ck-content li {display:list-item}"), "".concat(prefix, " .ck.ck-content ol li {list-style-type: decimal}"), "".concat(prefix, " .ck[contenteditable], ").concat(prefix, " .ck[contenteditable] * {-webkit-user-modify: read-write;-moz-user-modify: read-write;}")];
       var blockSelectors = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'ol', 'ul', 'address', 'article', 'aside', 'blockquote', 'body', 'dd', 'div', 'dl', 'dt', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'header', 'hgroup', 'hr', 'html', 'legend', 'main', 'menu', 'pre', 'section', 'xmp'].map(function (blockElement) {
         return "".concat(prefix, " .ck.ck-content ").concat(blockElement);
       }).join(', \n');
@@ -196,41 +153,35 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       document.body.appendChild(offCanvasCssStyle);
     }
   }
-
   Drupal.editors.ckeditor5 = {
     attach: function attach(element, format) {
       var editorClassic = CKEditor5.editorClassic;
       var _format$editorSetting = format.editorSettings,
-          toolbar = _format$editorSetting.toolbar,
-          plugins = _format$editorSetting.plugins,
-          config = _format$editorSetting.config,
-          language = _format$editorSetting.language;
+        toolbar = _format$editorSetting.toolbar,
+        plugins = _format$editorSetting.plugins,
+        config = _format$editorSetting.config,
+        language = _format$editorSetting.language;
       var extraPlugins = selectPlugins(plugins);
       var pluginConfig = processConfig(config);
-
       var editorConfig = _objectSpread(_objectSpread({
         extraPlugins: extraPlugins,
         toolbar: toolbar
       }, pluginConfig), {}, {
         language: _objectSpread(_objectSpread({}, pluginConfig.language), language)
       });
-
       var id = setElementId(element);
       var ClassicEditor = editorClassic.ClassicEditor;
       ClassicEditor.create(element, editorConfig).then(function (editor) {
         Drupal.CKEditor5Instances.set(id, editor);
-
         if (element.hasAttribute('required')) {
           required.add(id);
           element.removeAttribute('required');
         }
-
         $(document).on("drupalViewportOffsetChange.ckeditor5.".concat(id), function (event, offsets) {
           editor.ui.viewportOffset = offsets;
         });
         editor.model.document.on('change:data', function () {
           var callback = callbacks.get(id);
-
           if (callback) {
             if (editor.plugins.has('SourceEditing')) {
               if (editor.plugins.get('SourceEditing').isSourceEditingMode) {
@@ -238,52 +189,32 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
                 return;
               }
             }
-
             debounce(callback, 400)();
           }
         });
         var isOffCanvas = element.closest('#drupal-off-canvas');
-
         if (isOffCanvas) {
           offCanvasCss(element);
         }
       }).catch(function (error) {
+        console.info('Debugging can be done with an unminified version of CKEditor by installing from the source file. Consult documentation at https://www.drupal.org/node/3258901');
         console.error(error);
       });
     },
     detach: function detach(element, format, trigger) {
       var id = getElementId(element);
       var editor = Drupal.CKEditor5Instances.get(id);
-
       if (!editor) {
         return;
       }
-
       $(document).off("drupalViewportOffsetChange.ckeditor5.".concat(id));
-
       if (trigger === 'serialize') {
         editor.updateSourceElement();
       } else {
         element.removeAttribute('contentEditable');
-        var textElement = null;
-        var originalValue = null;
-        var usingQuickEdit = (((Drupal || {}).quickedit || {}).editors || {}).editor;
-
-        if (usingQuickEdit) {
-          Drupal.quickedit.editors.editor.prototype.revert = function revertQuickeditChanges() {
-            textElement = this.$textElement[0];
-            originalValue = this.model.get('originalValue');
-          };
-        }
-
-        editor.destroy().then(function () {
-          if (textElement && originalValue) {
-            textElement.innerHTML = originalValue;
-          }
-
+        return editor.destroy().then(function () {
           Drupal.CKEditor5Instances.delete(id);
           callbacks.delete(id);
-
           if (required.has(id)) {
             element.setAttribute('required', 'required');
             required.delete(id);
@@ -299,18 +230,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     attachInlineEditor: function attachInlineEditor(element, format, mainToolbarId) {
       var editorDecoupled = CKEditor5.editorDecoupled;
       var _format$editorSetting2 = format.editorSettings,
-          toolbar = _format$editorSetting2.toolbar,
-          plugins = _format$editorSetting2.plugins,
-          pluginConfig = _format$editorSetting2.config,
-          language = _format$editorSetting2.language;
+        toolbar = _format$editorSetting2.toolbar,
+        plugins = _format$editorSetting2.plugins,
+        pluginConfig = _format$editorSetting2.config,
+        language = _format$editorSetting2.language;
       var extraPlugins = selectPlugins(plugins);
-
       var config = _objectSpread({
         extraPlugins: extraPlugins,
         toolbar: toolbar,
         language: language
       }, processConfig(pluginConfig));
-
       var id = setElementId(element);
       var DecoupledEditor = editorDecoupled.DecoupledEditor;
       DecoupledEditor.create(element, config).then(function (editor) {
@@ -319,7 +248,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         toolbar.appendChild(editor.ui.view.toolbar.element);
         editor.model.document.on('change:data', function () {
           var callback = callbacks.get(id);
-
           if (callback) {
             debounce(callback, 400)(editor.getData());
           }
@@ -353,22 +281,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       Drupal.ckeditor5.saveCallback = saveCallback;
     }
   };
-
   function redirectTextareaFragmentToCKEditor5Instance() {
     var hash = window.location.hash.substr(1);
     var element = document.getElementById(hash);
-
     if (element) {
       var editorID = getElementId(element);
       var editor = Drupal.CKEditor5Instances.get(editorID);
-
       if (editor) {
         editor.sourceElement.nextElementSibling.setAttribute('id', "cke_".concat(hash));
         window.location.replace("#cke_".concat(hash));
       }
     }
   }
-
   $(window).on('hashchange.ckeditor', redirectTextareaFragmentToCKEditor5Instance);
   $(window).on('dialog:beforecreate', function () {
     $('.ckeditor5-dialog-loading').animate({
diff --git a/web/core/modules/ckeditor5/js/ckeditor5.style.admin.js b/web/core/modules/ckeditor5/js/ckeditor5.style.admin.js
index d9baa199d..6212da450 100644
--- a/web/core/modules/ckeditor5/js/ckeditor5.style.admin.js
+++ b/web/core/modules/ckeditor5/js/ckeditor5.style.admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.ckeditor5StyleSettingsSummary = {
     attach: function attach() {
@@ -13,11 +12,9 @@
         var styleCount = stylesElement.value.split('\n').filter(function (line) {
           return line.trim().length >= 5;
         }).length;
-
         if (styleCount === 0) {
           return Drupal.t('No styles configured');
         }
-
         return Drupal.formatPlural(styleCount, 'One style configured', '@count styles configured');
       });
     }
diff --git a/web/core/modules/ckeditor5/js/ckeditor5_plugins/drupalMedia/README.md b/web/core/modules/ckeditor5/js/ckeditor5_plugins/drupalMedia/README.md
deleted file mode 100644
index 60336a6af..000000000
--- a/web/core/modules/ckeditor5/js/ckeditor5_plugins/drupalMedia/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# ckeditor5-drupal-media
-
-Drupal media plugin for CKEditor5
-
-Provides required attributes `data-entity-uuid` and `data-entity-type`.
-
-## Usage
-
-This project is for creating minified js for [Drupal CKEditor5](http://drupal.org/project/ckeditor5)
-
-When using this plugin, you must provide the following config in `drupalMedia`:
-
-1. `libraryURL`: The URL at route media_library.ui to open a browse dialog
-2. `previewURL`: The URL at route media.filter.preview to render a media preview
-3. `openDialog`: The function to open a Drupal dialog
-4. `themeError`: The markup to display if the preview fails
-
-Example config:
-
-```
-ClassicEditor
-  .create(editorElement, {
-    drupalMedia: {
-      libraryURL: '/media-library?...',
-      previewURL: '/media/{filter_format}/preview',
-      openDialog: Drupal.ckeditor5.openDialog,
-      themeError: Drupal.theme('mediaEmbedPreviewError'),
-    },
- });
-  .then( ... )
-  .catch( ... );
-```
-
-## Build
-
-Run `npm run dll:build` to create the minified js.
-
-Check the file path in `webpack.config.js` to ensure it points to the dll
-manifest in your copy of `ckeditor5`.
diff --git a/web/core/modules/ckeditor5/js/ie11.filter.warnings.js b/web/core/modules/ckeditor5/js/ie11.filter.warnings.js
index 61ca106ce..370614865 100644
--- a/web/core/modules/ckeditor5/js/ie11.filter.warnings.js
+++ b/web/core/modules/ckeditor5/js/ie11.filter.warnings.js
@@ -4,26 +4,22 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once) {
   Drupal.behaviors.ckEditor5warn = {
     attach: function attach() {
       var isIE11 = !!document.documentMode;
       var editorSelect = once('editor-ie11-warning', '[data-drupal-selector="filter-format-edit-form"] [data-drupal-selector="edit-editor-editor"], [data-drupal-selector="filter-format-add-form"] [data-drupal-selector="edit-editor-editor"]');
-
       if (typeof editorSelect[0] !== 'undefined') {
         var select = editorSelect[0];
         var selectMessageContainer = document.createElement('div');
         select.parentNode.after(selectMessageContainer, select);
         var selectMessages = new Drupal.Message(selectMessageContainer);
         var editorSettings = document.querySelector('#editor-settings-wrapper');
-
         var addIE11Warning = function addIE11Warning() {
           selectMessages.add(Drupal.t('CKEditor 5 is not compatible with Internet Explorer. Text fields using CKEditor 5 will fall back to plain HTML editing without CKEditor for users of Internet Explorer.'), {
             type: 'warning',
             id: 'ie_11_warning'
           });
-
           if (isIE11) {
             selectMessages.add(Drupal.t('Text editor toolbar settings are not available in Internet Explorer. They will be available in other <a href="@supported-browsers">supported browsers</a>.', {
               '@supported-browsers': 'https://www.drupal.org/docs/system-requirements/browser-requirements'
@@ -34,7 +30,6 @@
             editorSettings.hidden = true;
           }
         };
-
         var updateWarningStatus = function updateWarningStatus() {
           if (select.value === 'ckeditor5' && !select.hasAttribute('data-error-switching-to-ckeditor5')) {
             addIE11Warning();
@@ -42,19 +37,16 @@
             if (selectMessages.select('ie_11_warning')) {
               selectMessages.remove('ie_11_warning');
             }
-
             if (selectMessages.select('ie_11_error')) {
               selectMessages.remove('ie_11_error');
             }
           }
         };
-
         updateWarningStatus();
         var editorSelectObserver = new MutationObserver(function (mutations) {
           for (var i = 0; i < mutations.length; i++) {
             var switchToCKEditor5Complete = mutations[i].type === 'attributes' && mutations[i].attributeName === 'disabled' && !select.disabled;
             var fixedErrorsPreventingSwitchToCKEditor5 = mutations[i].type === 'attributes' && mutations[i].attributeName === 'data-error-switching-to-ckeditor5' && !select.hasAttribute('data-error-switching-to-ckeditor5');
-
             if (switchToCKEditor5Complete || fixedErrorsPreventingSwitchToCKEditor5) {
               updateWarningStatus();
             }
diff --git a/web/core/modules/ckeditor5/js/ie11.user.warnings.js b/web/core/modules/ckeditor5/js/ie11.user.warnings.js
index 0356cc95c..bf32f20f6 100644
--- a/web/core/modules/ckeditor5/js/ie11.user.warnings.js
+++ b/web/core/modules/ckeditor5/js/ie11.user.warnings.js
@@ -4,10 +4,8 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   var isIE11 = !!document.documentMode;
-
   if (isIE11) {
     window.CKEditor5 = null;
     var quickEditLabelObserver = null;
@@ -24,7 +22,6 @@
       },
       detach: function detach() {
         var quickEditToolbar = document.querySelector('#quickedit-entity-toolbar .quickedit-toolbar');
-
         if (quickEditToolbar) {
           quickEditToolbar.classList.remove('ck5-ie11');
           quickEditToolbar.classList.add('icon-pencil');
@@ -36,7 +33,6 @@
         var quickEditToolbar = document.querySelector('#quickedit-entity-toolbar .quickedit-toolbar');
         var notEditableAlert = Drupal.t('Field Not Editable');
         var notEditableMessage = Drupal.t('CKEditor 5 is not compatible with IE11.');
-
         function quickEditLabelWarnIE11(toolbarLabel) {
           quickEditLabelObserver.disconnect();
           toolbarLabel.innerHTML = "<div><b>".concat(notEditableAlert, "</b><div>").concat(notEditableMessage, "</div></div>");
@@ -44,7 +40,6 @@
             childList: true
           });
         }
-
         if (quickEditToolbar) {
           quickEditToolbar.classList.add('ck5-ie11');
           quickEditToolbar.classList.remove('icon-pencil');
diff --git a/web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.es6.js b/web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.es6.js
deleted file mode 100644
index ee9dbbef7..000000000
--- a/web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.es6.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @file
- * Theme elements for the Media Embed CKEditor5 plugin.
- */
-
-((Drupal) => {
-  /**
-   * Themes the error displayed when the media embed preview fails.
-   *
-   * @return {string}
-   *   A string representing a DOM fragment.
-   *
-   * @see media-embed-error.html.twig
-   */
-  Drupal.theme.mediaEmbedPreviewError = () =>
-    `<div>${Drupal.t(
-      'An error occurred while trying to preview the media. Please save your work and reload this page.',
-    )}</div>`;
-})(Drupal);
diff --git a/web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.js b/web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.js
deleted file mode 100644
index 90d0db954..000000000
--- a/web/core/modules/ckeditor5/js/media_embed_ckeditor5.theme.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
-* DO NOT EDIT THIS FILE.
-* See the following change record for more information,
-* https://www.drupal.org/node/2815083
-* @preserve
-**/
-
-(function (Drupal) {
-  Drupal.theme.mediaEmbedPreviewError = function () {
-    return "<div>".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
-  };
-})(Drupal);
\ No newline at end of file
diff --git a/web/core/modules/ckeditor5/src/Annotation/CKEditor5AspectsOfCKEditor5Plugin.php b/web/core/modules/ckeditor5/src/Annotation/CKEditor5AspectsOfCKEditor5Plugin.php
index 533786a37..f106e0535 100644
--- a/web/core/modules/ckeditor5/src/Annotation/CKEditor5AspectsOfCKEditor5Plugin.php
+++ b/web/core/modules/ckeditor5/src/Annotation/CKEditor5AspectsOfCKEditor5Plugin.php
@@ -23,7 +23,7 @@
 class CKEditor5AspectsOfCKEditor5Plugin extends Plugin {
 
   /**
-   * The CKEditor5 plugin classes provided.
+   * The CKEditor 5 plugin classes provided.
    *
    * Found in the CKEditor5 global js object as {package.Class}.
    *
@@ -32,7 +32,7 @@ class CKEditor5AspectsOfCKEditor5Plugin extends Plugin {
   public $plugins;
 
   /**
-   * A keyed array of additional values for the CKEditor5 constructor config.
+   * A keyed array of additional values for the CKEditor 5 configuration.
    *
    * This property is optional and it does not need to be declared.
    *
diff --git a/web/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php b/web/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php
index ba6cdce28..4b57ea939 100644
--- a/web/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php
+++ b/web/core/modules/ckeditor5/src/Controller/CKEditor5ImageController.php
@@ -29,7 +29,7 @@
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 
 /**
- * Returns response for CKEditor5 Simple image upload adapter.
+ * Returns response for CKEditor 5 Simple image upload adapter.
  *
  * @internal
  *   Controller classes are internal.
@@ -107,7 +107,7 @@ public static function create(ContainerInterface $container) {
   }
 
   /**
-   * Uploads and saves an image from a CKEditor5 POST.
+   * Uploads and saves an image from a CKEditor 5 POST.
    *
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The current request object.
diff --git a/web/core/modules/ckeditor5/src/HTMLRestrictions.php b/web/core/modules/ckeditor5/src/HTMLRestrictions.php
index 68cd0589e..238d412c1 100644
--- a/web/core/modules/ckeditor5/src/HTMLRestrictions.php
+++ b/web/core/modules/ckeditor5/src/HTMLRestrictions.php
@@ -559,6 +559,7 @@ public static function fromString(string $elements_string): HTMLRestrictions {
     unset($allowed_elements['*']);
     // @see \Drupal\filter\Plugin\Filter\FilterHtml::getHTMLRestrictions()
     // @todo remove this in https://www.drupal.org/project/drupal/issues/3226368
+    // cSpell:disable-next-line
     unset($allowed_elements['__zqh6vxfbk3cg__']);
 
     // Postprocess tag wildcards: convert
diff --git a/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php b/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
index 2beb219ac..c6b9f345a 100644
--- a/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
+++ b/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/Media.php
@@ -55,7 +55,7 @@ public function __construct(array $configuration, string $plugin_id, CKEditor5Pl
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
diff --git a/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/MediaLibrary.php b/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/MediaLibrary.php
index 47cf82319..17a2188f6 100644
--- a/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/MediaLibrary.php
+++ b/web/core/modules/ckeditor5/src/Plugin/CKEditor5Plugin/MediaLibrary.php
@@ -7,6 +7,7 @@
 use Drupal\ckeditor5\Plugin\CKEditor5PluginDefault;
 use Drupal\ckeditor5\Plugin\CKEditor5PluginDefinition;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\EditorInterface;
@@ -23,6 +24,8 @@
  */
 class MediaLibrary extends CKEditor5PluginDefault implements ContainerFactoryPluginInterface {
 
+  use StringTranslationTrait;
+
   /**
    * The media type entity storage.
    *
@@ -48,7 +51,7 @@ public function __construct(array $configuration, string $plugin_id, CKEditor5Pl
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
     return new static(
@@ -65,6 +68,9 @@ public static function create(ContainerInterface $container, array $configuratio
   public function getDynamicPluginConfig(array $static_plugin_config, EditorInterface $editor): array {
     $media_type_ids = $this->mediaTypeStorage->getQuery()->execute();
 
+    // Making the title for editor drupal media embed translatable.
+    $static_plugin_config['drupalMedia']['dialogSettings']['title'] = $this->t('Add or select media');
+
     if ($editor->hasAssociatedFilterFormat()) {
       $media_embed_filter = $editor->getFilterFormat()->filters()->get('media_embed');
       // Optionally limit the allowed media types based on the MediaEmbed
diff --git a/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginDefinition.php b/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginDefinition.php
index cc4e89ba1..371a53aea 100644
--- a/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginDefinition.php
+++ b/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginDefinition.php
@@ -557,7 +557,7 @@ public function hasCKEditor5Plugins(): bool {
   }
 
   /**
-   * Gets keyed array of additional values for the CKEditor5 constructor config.
+   * Gets keyed array of additional values for the CKEditor 5 configuration.
    *
    * @return array
    *   The CKEditor 5 constructor config.
@@ -569,7 +569,7 @@ public function getCKEditor5Config(): array {
   }
 
   /**
-   * Whether this plugin has additional values for the CKEditor5 constructor.
+   * Whether this plugin has additional values for the CKEditor 5 configuration.
    *
    * @return bool
    *
diff --git a/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginInterface.php b/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginInterface.php
index 64b2b1ddd..c5fed201b 100644
--- a/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginInterface.php
+++ b/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginInterface.php
@@ -8,7 +8,7 @@
 use Drupal\editor\EditorInterface;
 
 /**
- * Defines an interface for CKEditor5 plugins.
+ * Defines an interface for CKEditor 5 plugins.
  *
  * @see \Drupal\ckeditor5\Plugin\CKEditor5PluginBase
  * @see \Drupal\ckeditor5\Plugin\CKEditor5PluginConfigurableInterface
diff --git a/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginManager.php b/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginManager.php
index 23a2c3862..3558ab407 100644
--- a/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginManager.php
+++ b/web/core/modules/ckeditor5/src/Plugin/CKEditor5PluginManager.php
@@ -20,7 +20,7 @@
 use Drupal\filter\FilterPluginCollection;
 
 /**
- * Provides a CKEditor5 plugin manager.
+ * Provides a CKEditor 5 plugin manager.
  *
  * @see \Drupal\ckeditor5\Plugin\CKEditor5PluginInterface
  * @see \Drupal\ckeditor5\Plugin\CKEditor5PluginBase
@@ -156,7 +156,7 @@ public function getToolbarItems(): array {
   public function getAdminLibraries(): array {
     $list = $this->mergeDefinitionValues('getAdminLibrary', $this->getDefinitions());
     // Include main admin library.
-    array_unshift($list, 'ckeditor5/admin');
+    array_unshift($list, 'ckeditor5/internal.admin');
     return $list;
   }
 
@@ -167,7 +167,7 @@ public function getEnabledLibraries(EditorInterface $editor): array {
     $list = $this->mergeDefinitionValues('getLibrary', $this->getEnabledDefinitions($editor));
     $list = array_unique($list);
     // Include main library.
-    array_unshift($list, 'ckeditor5/drupal.ckeditor5');
+    array_unshift($list, 'ckeditor5/internal.drupal.ckeditor5');
     sort($list);
     return $list;
   }
diff --git a/web/core/modules/ckeditor5/src/Plugin/Editor/CKEditor5.php b/web/core/modules/ckeditor5/src/Plugin/Editor/CKEditor5.php
index a31831a2c..fa5edd161 100644
--- a/web/core/modules/ckeditor5/src/Plugin/Editor/CKEditor5.php
+++ b/web/core/modules/ckeditor5/src/Plugin/Editor/CKEditor5.php
@@ -116,7 +116,7 @@ class CKEditor5 extends EditorBase implements ContainerFactoryPluginInterface {
   protected $logger;
 
   /**
-   * Constructs a CKEditor5 editor plugin.
+   * Constructs a CKEditor 5 editor plugin.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
@@ -125,7 +125,7 @@ class CKEditor5 extends EditorBase implements ContainerFactoryPluginInterface {
    * @param mixed $plugin_definition
    *   The plugin implementation definition.
    * @param \Drupal\ckeditor5\Plugin\CKEditor5PluginManagerInterface $ckeditor5_plugin_manager
-   *   The CKEditor5 plugin manager.
+   *   The CKEditor 5 plugin manager.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
    *   The language manager
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
@@ -312,7 +312,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
           'warning' => [$css_warning],
         ],
         '#status_headings' => [
-          'warning' => t('Warning message'),
+          'warning' => $this->t('Warning message'),
         ],
       ];
     }
@@ -392,7 +392,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
 
     $form['plugin_settings'] = [
       '#type' => 'vertical_tabs',
-      '#title' => $this->t('CKEditor5 plugin settings'),
+      '#title' => $this->t('CKEditor 5 plugin settings'),
       '#id' => 'ckeditor5-plugin-settings',
     ];
 
@@ -683,7 +683,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
 
       // Special case: AJAX updates that do not submit the form (that cannot
       // result in configuration being saved).
-      if ($form_state->getSubmitHandlers() === ['editor_form_filter_admin_format_editor_configure']) {
+      if (in_array('editor_form_filter_admin_format_editor_configure', $form_state->getSubmitHandlers(), TRUE)) {
         // Ensure that plugins' validation constraints do not immediately
         // trigger a validation error: the user may choose to configure other
         // CKEditor 5 aspects first.
diff --git a/web/core/modules/ckeditor5/src/SmartDefaultSettings.php b/web/core/modules/ckeditor5/src/SmartDefaultSettings.php
index 257c24488..9da23d1ab 100644
--- a/web/core/modules/ckeditor5/src/SmartDefaultSettings.php
+++ b/web/core/modules/ckeditor5/src/SmartDefaultSettings.php
@@ -145,7 +145,6 @@ public function computeSmartDefaultSettings(?EditorInterface $text_editor, Filte
     $editor->setEditor('ckeditor5');
 
     $source_editing_additions = HTMLRestrictions::emptySet();
-
     // Compute the appropriate settings based on the CKEditor 4 configuration
     // if it exists.
     $old_editor = $editor->id() ? Editor::load($editor->id()) : NULL;
@@ -179,39 +178,40 @@ public function computeSmartDefaultSettings(?EditorInterface $text_editor, Filte
       $unsupported = $missing->diff($missing_attributes);
 
       if ($enabling_message_content) {
-        $this->logger->info(new FormattableMarkup('The CKEditor 5 migration enabled the following plugins to support tags that are allowed by the %text_format text format: %enabling_message_content. The text format must be saved to make these changes active.',
+        $this->logger->info('The CKEditor 5 migration enabled the following plugins to support tags that are allowed by the %text_format text format: %enabling_message_content. The text format must be saved to make these changes active.',
           [
             '%text_format' => $editor->getFilterFormat()->get('name'),
             '%enabling_message_content' => $enabling_message_content,
-          ],
-        ));
+          ]
+        );
       }
+
       // Warn user about unsupported tags.
       if (!$unsupported->allowsNothing()) {
         $this->addTagsToSourceEditing($editor, $unsupported);
         $source_editing_additions = $source_editing_additions->merge($unsupported);
-        $this->logger->info(new FormattableMarkup("The following tags were permitted by the %text_format text format's filter configuration, but no plugin was available that supports them. To ensure the tags remain supported by this text format, the following were added to the Source Editing plugin's <em>Manually editable HTML tags</em>: @unsupported_string. The text format must be saved to make these changes active.", [
+        $this->logger->info("The following tags were permitted by the %text_format text format's filter configuration, but no plugin was available that supports them. To ensure the tags remain supported by this text format, the following were added to the Source Editing plugin's <em>Manually editable HTML tags</em>: @unsupported_string. The text format must be saved to make these changes active.", [
           '%text_format' => $editor->getFilterFormat()->get('name'),
           '@unsupported_string' => $unsupported->toFilterHtmlAllowedTagsString(),
-        ]));
+        ]);
       }
 
       if ($enabled_for_attributes_message_content) {
-        $this->logger->info(new FormattableMarkup('The CKEditor 5 migration process enabled the following plugins to support specific attributes that are allowed by the %text_format text format: %enabled_for_attributes_message_content.',
+        $this->logger->info('The CKEditor 5 migration process enabled the following plugins to support specific attributes that are allowed by the %text_format text format: %enabled_for_attributes_message_content.',
           [
             '%text_format' => $editor->getFilterFormat()->get('name'),
             '%enabled_for_attributes_message_content' => $enabled_for_attributes_message_content,
           ],
-        ));
+        );
       }
       // Warn user about supported tags but missing attributes.
       if (!$missing_attributes->allowsNothing()) {
         $this->addTagsToSourceEditing($editor, $missing_attributes);
         $source_editing_additions = $source_editing_additions->merge($missing_attributes);
-        $this->logger->info(new FormattableMarkup("As part of migrating to CKEditor 5, it was found that the %text_format text format's HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported, the following were added to the Source Editing plugin's <em>Manually editable HTML tags</em>: @missing_attributes. The text format must be saved to make these changes active.", [
+        $this->logger->info("As part of migrating to CKEditor 5, it was found that the %text_format text format's HTML filters includes plugins that support the following tags, but not some of their attributes. To ensure these attributes remain supported, the following were added to the Source Editing plugin's <em>Manually editable HTML tags</em>: @missing_attributes. The text format must be saved to make these changes active.", [
           '%text_format' => $editor->getFilterFormat()->get('name'),
           '@missing_attributes' => $missing_attributes->toFilterHtmlAllowedTagsString(),
-        ]));
+        ]);
       }
     }
 
@@ -226,10 +226,10 @@ public function computeSmartDefaultSettings(?EditorInterface $text_editor, Filte
       $missing_fundamental_tags = $fundamental->diff($filter_html_restrictions);
       if (!$missing_fundamental_tags->allowsNothing()) {
         $editor->getFilterFormat()->setFilterConfig('filter_html', $filter_html_restrictions->merge($fundamental)->getAllowedElements());
-        $this->logger->warning(new FormattableMarkup("As part of migrating the %text_format text format to CKEditor 5, the following tag(s) were added to <em>Limit allowed HTML tags and correct faulty HTML</em>, because they are needed to provide fundamental CKEditor 5 functionality : @missing_tags. The text format must be saved to make these changes active.", [
+        $this->logger->warning("As part of migrating the %text_format text format to CKEditor 5, the following tag(s) were added to <em>Limit allowed HTML tags and correct faulty HTML</em>, because they are needed to provide fundamental CKEditor 5 functionality : @missing_tags. The text format must be saved to make these changes active.", [
           '%text_format' => $editor->getFilterFormat()->get('name'),
           '@missing_tags' => $missing_fundamental_tags->toFilterHtmlAllowedTagsString(),
-        ]));
+        ]);
       }
     }
 
@@ -449,9 +449,9 @@ private function createSettingsFromCKEditor4(array $ckeditor4_settings, HTMLRest
             $equivalent = $this->upgradePluginManager->mapCKEditor4ToolbarButtonToCKEditor5ToolbarItem($cke4_button, $text_format_html_restrictions);
           }
           catch (\OutOfBoundsException $e) {
-            $this->logger->warning(new FormattableMarkup('The CKEditor 4 button %button does not have a known upgrade path. If it allowed editing markup, then you can do so now through the Source Editing functionality.', [
+            $this->logger->warning('The CKEditor 4 button %button does not have a known upgrade path. If it allowed editing markup, then you can do so now through the Source Editing functionality.', [
               '%button' => $cke4_button,
-            ]));
+            ]);
             $messages[MessengerInterface::TYPE_WARNING][] = $this->t('The CKEditor 4 button %button does not have a known upgrade path. If it allowed editing markup, then you can do so now through the Source Editing functionality.', [
               '%button' => $cke4_button,
             ]);
@@ -490,9 +490,9 @@ private function createSettingsFromCKEditor4(array $ckeditor4_settings, HTMLRest
         $settings['plugins'] += $cke5_plugin_settings;
       }
       catch (\OutOfBoundsException $e) {
-        $this->logger->warning(new FormattableMarkup('The %cke4_plugin_id plugin settings do not have a known upgrade path.', [
+        $this->logger->warning('The %cke4_plugin_id plugin settings do not have a known upgrade path.', [
           '%cke4_plugin_id' => $cke4_plugin_id,
-        ]));
+        ]);
         $messages[MessengerInterface::TYPE_WARNING][] = $this->t('The %cke4_plugin_id plugin settings do not have a known upgrade path.', [
           '%cke4_plugin_id' => $cke4_plugin_id,
         ]);
diff --git a/web/core/modules/ckeditor5/tests/src/Functional/AddedStylesheetsTest.php b/web/core/modules/ckeditor5/tests/src/Functional/AddedStylesheetsTest.php
index 50ed5a93a..7e8015ba7 100644
--- a/web/core/modules/ckeditor5/tests/src/Functional/AddedStylesheetsTest.php
+++ b/web/core/modules/ckeditor5/tests/src/Functional/AddedStylesheetsTest.php
@@ -96,8 +96,8 @@ public function testCkeditorStylesheets() {
 
     /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
     $theme_installer = \Drupal::service('theme_installer');
-    $theme_installer->install(['test_ckeditor_stylesheets_relative', 'seven']);
-    $this->config('system.theme')->set('admin', 'seven')->save();
+    $theme_installer->install(['test_ckeditor_stylesheets_relative', 'claro']);
+    $this->config('system.theme')->set('admin', 'claro')->save();
     $this->config('node.settings')->set('use_admin_theme', TRUE)->save();
 
     $this->drupalGet('node/add/article');
diff --git a/web/core/modules/ckeditor5/tests/src/Functional/CKEditor5QuickEditLibraryTest.php b/web/core/modules/ckeditor5/tests/src/Functional/CKEditor5QuickEditLibraryTest.php
deleted file mode 100644
index 5920a3dc4..000000000
--- a/web/core/modules/ckeditor5/tests/src/Functional/CKEditor5QuickEditLibraryTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Drupal\Tests\ckeditor5\Functional;
-
-use Drupal\ckeditor5\Plugin\Editor\CKEditor5;
-use Drupal\editor\Entity\Editor;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\Tests\BrowserTestBase;
-use Drupal\user\RoleInterface;
-use Symfony\Component\Validator\ConstraintViolation;
-
-/**
- * Tests that a Quick Edit specific library loads when Quick Edit is enabled.
- *
- * @group ckeditor5
- * @group legacy
- */
-class CKEditor5QuickEditLibraryTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'node',
-    'ckeditor5',
-    'quickedit',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  /**
-   * The admin user.
-   *
-   * @var \Drupal\user\Entity\User
-   */
-  protected $adminUser;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    $format = FilterFormat::create([
-      'format' => 'llama',
-      'name' => 'Llama',
-      'filters' => [],
-      'roles' => [RoleInterface::AUTHENTICATED_ID],
-    ]);
-    $format->save();
-    $editor = Editor::create([
-      'format' => 'llama',
-      'editor' => 'ckeditor5',
-      'settings' => [
-        'toolbar' => [
-          'items' => [],
-        ],
-      ],
-    ]);
-    $editor->save();
-    $this->assertSame([], array_map(
-      function (ConstraintViolation $v) {
-        return (string) $v->getMessage();
-      },
-      iterator_to_array(CKEditor5::validatePair($editor, $format))
-    ));
-    $this->drupalCreateContentType([
-      'type' => 'article',
-      'name' => 'Article',
-    ]);
-
-    $this->adminUser = $this->drupalCreateUser([
-      'create article content',
-      'use text format llama',
-    ]);
-    $this->drupalLogin($this->adminUser);
-  }
-
-  /**
-   * Tests that the Quick Edit workaround CSS loads when needed.
-   */
-  public function testQuickeditTemporaryWorkaround() {
-    $assert_session = $this->assertSession();
-
-    $this->expectDeprecation('Temporary work-around until https://www.drupal.org/project/drupal/issues/3196689 lands.');
-
-    $this->drupalGet('node/add/article');
-    $assert_session->responseContains('css/quickedit-override.css');
-  }
-
-}
diff --git a/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateAlignmentTest.php b/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateAlignmentTest.php
index e05e71081..639868cc5 100644
--- a/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateAlignmentTest.php
+++ b/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateAlignmentTest.php
@@ -31,8 +31,7 @@ protected function setDatabaseDumpFiles() {
   }
 
   /**
-   * Tests that CKEditor 5 alignment configurations that are individual buttons
-   * are updated to be in dropdown form in the toolbar.
+   * Tests update of individual button that are alignment configuration.
    */
   public function testUpdateAlignmentButtons() {
     $editor = Editor::load('test_format');
diff --git a/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php b/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php
index a08f314f2..b3039c2bd 100644
--- a/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php
+++ b/web/core/modules/ckeditor5/tests/src/Functional/Update/CKEditor5UpdateImageToolbarItemTest.php
@@ -161,9 +161,7 @@ public function provider(): array {
             'filter_html' => $filter_html_is_enabled,
             'image uploads' => $image_uploads_enabled,
             'sourceEditing already enabled' => $source_editing_already_enabled,
-            'expected sourceEditing additions' => $image_uploads_enabled
-              ? []
-              : ['<img data-entity-uuid data-entity-type>'],
+            'expected sourceEditing additions' => $image_uploads_enabled ? [] : ['<img data-entity-uuid data-entity-type>'],
           ];
         }
       }
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/AdminUiTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/AdminUiTest.php
index 44c293a47..2d258c904 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/AdminUiTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/AdminUiTest.php
@@ -113,7 +113,7 @@ protected function getAjaxResponseCount(): int {
   }
 
   /**
-   * CKEditor5's filter UI modifications should not break it for other editors.
+   * CKEditor 5's filter UI modifications should not break it for other editors.
    */
   public function testUnavailableFiltersHiddenWhenSwitching() {
     $page = $this->getSession()->getPage();
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php
index 9a8ff7542..a76551ede 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5AllowedTagsTest.php
@@ -10,7 +10,7 @@
 // cspell:ignore esque imageUpload nofilter noeditor sourceediting Editing's
 
 /**
- * Tests for CKEditor5.
+ * Tests for CKEditor 5.
  *
  * @group ckeditor5
  * @internal
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5FragmentLinkTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5FragmentLinkTest.php
index ec1c18db2..017d49253 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5FragmentLinkTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5FragmentLinkTest.php
@@ -104,18 +104,19 @@ public function testFragmentLink() {
     $session->executeScript("document.getElementById('edit-title-0-value').style.marginBottom = window.innerHeight*2 +'px';");
 
     $this->assertSession()->waitForElementVisible('css', $ckeditor_id);
-    // Check that the CKEditor5-enabled body field is currently not visible in
+    // Check that the CKEditor 5-enabled body field is currently not visible in
     // the viewport.
-    $web_assert->assertNotVisibleInViewport('css', $ckeditor_class, 'topLeft', 'CKEditor5-enabled body field is visible.');
+    $web_assert->assertNotVisibleInViewport('css', $ckeditor_class, 'topLeft', 'CKEditor 5-enabled body field is visible.');
 
     $before_url = $session->getCurrentUrl();
 
     // Trigger a hash change with as target the hidden textarea.
     $session->executeScript("location.hash = '#edit-body-0-value';");
 
-    // Check that the CKEditor5-enabled body field is visible in the viewport.
-    // The hash change adds an ID to the CKEditor 5 instance so check its visibility using the ID now.
-    $web_assert->assertVisibleInViewport('css', $ckeditor_id, 'topLeft', 'CKEditor5-enabled body field is not visible.');
+    // Check that the CKEditor 5-enabled body field is visible in the viewport.
+    // The hash change adds an ID to the CKEditor 5 instance so check its
+    // visibility using the ID now.
+    $web_assert->assertVisibleInViewport('css', $ckeditor_id, 'topLeft', 'CKEditor 5-enabled body field is not visible.');
 
     // Use JavaScript to go back in the history instead of
     // \Behat\Mink\Session::back() because that function doesn't work after a
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5OffCanvasTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5OffCanvasTest.php
index 2d30acc47..0a254fce1 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5OffCanvasTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5OffCanvasTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\Tests\ckeditor5\FunctionalJavascript;
 
 /**
- * Tests for CKEditor5 to ensure correct styling in off-canvas.
+ * Tests for CKEditor 5 to ensure correct styling in off-canvas.
  *
  * @group ckeditor5
  * @internal
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5Test.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5Test.php
index 7204c8762..71f7156d9 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5Test.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/CKEditor5Test.php
@@ -16,7 +16,7 @@
 // cspell:ignore esque splitbutton upcasted sourceediting
 
 /**
- * Tests for CKEditor5.
+ * Tests for CKEditor 5.
  *
  * @group ckeditor5
  * @internal
@@ -34,7 +34,7 @@ class CKEditor5Test extends CKEditor5TestBase {
   ];
 
   /**
-   * Tests configuring CKEditor5 for existing content.
+   * Tests configuring CKEditor 5 for existing content.
    */
   public function testExistingContent() {
     $page = $this->getSession()->getPage();
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php
index ec957bb8c..2701e48dd 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTest.php
@@ -124,6 +124,8 @@ protected function addImage() {
     $this->assertNotEmpty($image_upload_field = $page->find('css', '.ck-file-dialog-button input[type="file"]'));
     $image = $this->getTestFiles('image')[0];
     $image_upload_field->attachFile($this->container->get('file_system')->realpath($image->uri));
+    // Wait for the image to be uploaded and rendered by CKEditor 5.
+    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '.ck-widget.image > img[src*="' . $image->filename . '"]'));
   }
 
   /**
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
index a0b4f9327..0f8e8071a 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageTestBase.php
@@ -86,15 +86,11 @@ protected function addImage() {
     $this->waitForEditor();
     $this->pressEditorButton('Insert image');
     $panel = $page->find('css', '.ck-dropdown__panel.ck-image-insert__panel');
-    // Do not use setValue method as it triggers a blur event by default that
-    // closes the CKEditor 5 panel, making it impossible to click on the Insert
-    // button.
-    $this->getSession()->executeScript('
-      const input = document.querySelector(".ck-dropdown__panel.ck-image-insert__panel input[type=text]");
-      input.value = "' . $src . '";
-      input.dispatchEvent(new Event("input", {bubbles:true}));
-    ');
+    $src_input = $panel->find('css', 'input[type=text]');
+    $src_input->setValue($src);
     $panel->find('xpath', "//button[span[text()='Insert']]")->click();
+    // Wait for the image to be uploaded and rendered by CKEditor 5.
+    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '.ck-widget.image > img[src="' . $src . '"]'));
   }
 
   /**
@@ -441,8 +437,7 @@ public function testAltTextRequired(bool $unrestricted) {
     $this->drupalGet($this->host->toUrl('edit-form'));
     $this->waitForEditor();
     $this->addImage();
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.ck-widget.image'));
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.ck-balloon-panel'));
+    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.ck-text-alternative-form'));
     $this->assertVisibleBalloon('.ck-text-alternative-form');
   }
 
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageUrlTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageUrlTest.php
index 524b13db9..6b0e38fc9 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageUrlTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/ImageUrlTest.php
@@ -104,14 +104,8 @@ public function testImageUrlWidget(): void {
 
     $this->pressEditorButton('Insert image');
     $panel = $page->find('css', '.ck-dropdown__panel.ck-image-insert__panel');
-    // Do not use setValue method as it triggers a blur event by default that
-    // closes the CKEditor 5 panel, making it impossible to click on the Insert
-    // button.
-    $this->getSession()->executeScript('
-      const input = document.querySelector(".ck-dropdown__panel.ck-image-insert__panel input[type=text]");
-      input.value = "' . $src . '";
-      input.dispatchEvent(new Event("input", {bubbles:true}));
-    ');
+    $src_input = $panel->find('css', 'input[type=text]');
+    $src_input->setValue($src);
     $panel->find('xpath', "//button[span[text()='Insert']]")->click();
 
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', $image_selector));
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaLibraryTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaLibraryTest.php
index d8092135a..401eaf023 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaLibraryTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaLibraryTest.php
@@ -27,7 +27,7 @@ class MediaLibraryTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The user to use during testing.
@@ -149,6 +149,9 @@ function (ConstraintViolation $v) {
    * Tests using drupalMedia button to embed media into CKEditor 5.
    */
   public function testButton() {
+    // Skipped due to frequent random test failures.
+    // @todo Fix this and stop skipping it at https://www.drupal.org/i/3351597.
+    $this->markTestSkipped();
     $media_preview_selector = '.ck-content .ck-widget.drupal-media .media';
     $this->drupalGet('/node/add/blog');
     $this->waitForEditor();
@@ -246,21 +249,20 @@ public function testAllowedMediaTypes() {
       $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-modal #media-library-wrapper'));
 
       if (empty($allowed_media_types) || count($allowed_media_types) === 2) {
-        $assert_session->elementExists('css', 'li.media-library-menu-image');
-        $assert_session->elementExists('css', 'li.media-library-menu-arrakis');
-        $assert_session->elementTextContains('css', '.media-library-item__name', 'Fear is the mind-killer');
+        $menu = $assert_session->elementExists('css', '.js-media-library-menu');
+        $assert_session->elementExists('named', ['link', 'Image'], $menu);
+        $assert_session->elementExists('named', ['link', 'Arrakis'], $menu);
+        $assert_session->elementTextContains('css', '.js-media-library-item', 'Fear is the mind-killer');
       }
       elseif (count($allowed_media_types) === 1 && !empty($allowed_media_types['image'])) {
         // No tabs should appear if there's only one media type available.
-        $assert_session->elementNotExists('css', 'li.media-library-menu-image');
-        $assert_session->elementNotExists('css', 'li.media-library-menu-arrakis');
-        $assert_session->elementTextContains('css', '.media-library-item__name', 'Fear is the mind-killer');
+        $assert_session->elementNotExists('css', '.js-media-library-menu');
+        $assert_session->elementTextContains('css', '.js-media-library-item', 'Fear is the mind-killer');
       }
       elseif (count($allowed_media_types) === 1 && !empty($allowed_media_types['arrakis'])) {
         // No tabs should appear if there's only one media type available.
-        $assert_session->elementNotExists('css', 'li.media-library-menu-image');
-        $assert_session->elementNotExists('css', 'li.media-library-menu-arrakis');
-        $assert_session->elementTextContains('css', '.media-library-item__name', 'Le baron Vladimir Harkonnen');
+        $assert_session->elementNotExists('css', '.js-media-library-menu');
+        $assert_session->elementTextContains('css', '.js-media-library-item', 'Le baron Vladimir Harkonnen');
       }
     }
   }
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaTest.php
index e3eed4412..95abe1109 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/MediaTest.php
@@ -78,7 +78,7 @@ class MediaTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -439,18 +439,16 @@ public function testErrorMessages() {
     $this->waitForEditor();
     $this->assertNotEmpty($assert_session->waitForElement('css', '.ck-widget.drupal-media .this-error-message-is-themeable'));
 
-    // Test when using the classy theme, an additional class is added in
-    // classy/templates/content/media-embed-error.html.twig.
-    $this->assertTrue($this->container->get('theme_installer')->install(['classy']));
+    // Test when using the starterkit_theme theme, an additional class is added
+    // to the error, which is supported by
+    // stable9/templates/content/media-embed-error.html.twig.
+    $this->assertTrue($this->container->get('theme_installer')->install(['starterkit_theme']));
     $this->config('system.theme')
-      ->set('default', 'classy')
+      ->set('default', 'starterkit_theme')
       ->save();
     $this->drupalGet($this->host->toUrl('edit-form'));
     $this->waitForEditor();
-    $this->assertNotEmpty($assert_session->waitForElement('css', '.ck-widget.drupal-media .this-error-message-is-themeable.media-embed-error--missing-source'));
-    // @todo Uncomment this in https://www.drupal.org/project/ckeditor5/issues/3194084.
-    // @codingStandardsIgnoreLine
-    //$assert_session->responseContains('classy/css/components/media-embed-error.css');
+    $this->assertNotEmpty($assert_session->waitForElement('css', '.ck-widget.drupal-media .this-error-message-is-themeable'));
 
     // Test that restoring a valid UUID results in the media embed preview
     // displaying.
@@ -477,8 +475,8 @@ public function testPreviewUsesDefaultThemeAndIsClientCacheable() {
 
     // Configure a different default and admin theme, like on most Drupal sites.
     $this->config('system.theme')
-      ->set('default', 'stable')
-      ->set('admin', 'classy')
+      ->set('default', 'stable9')
+      ->set('admin', 'starterkit_theme')
       ->save();
 
     // Assert that when looking at an embedded entity in the CKEditor Widget,
@@ -489,7 +487,7 @@ public function testPreviewUsesDefaultThemeAndIsClientCacheable() {
     $assert_session = $this->assertSession();
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]'));
     $element = $assert_session->elementExists('css', '[data-media-embed-test-active-theme]');
-    $this->assertSame('stable', $element->getAttribute('data-media-embed-test-active-theme'));
+    $this->assertSame('stable9', $element->getAttribute('data-media-embed-test-active-theme'));
     // Assert that the first preview request transferred >500 B over the wire.
     // Then toggle source mode on and off. This causes the CKEditor widget to be
     // destroyed and then reconstructed. Assert that during this reconstruction,
@@ -635,6 +633,7 @@ public function testEditableCaption() {
 
     // Ensure that caption can be linked.
     $this->assertNotEmpty($figcaption = $assert_session->waitForElement('css', '.drupal-media figcaption'));
+    $figcaption->click();
     $this->selectTextInsideElement('.drupal-media figcaption');
     $this->assertNotEmpty($assert_session->waitForElement('css', '.drupal-media figcaption.ck-editor__nested-editable'));
     $this->pressEditorButton('Link');
@@ -1061,6 +1060,12 @@ public function testLinkManualDecorator(bool $unrestricted) {
 
     $this->assertNotEmpty($drupalmedia = $assert_session->waitForElementVisible('css', '.ck-content .ck-widget.drupal-media'));
     $drupalmedia->click();
+    $this->assertVisibleBalloon('.ck-toolbar[aria-label="Drupal Media toolbar"]');
+
+    // Turn off caption, so we don't accidentally put our link in that text
+    // field instead of on the actual media.
+    $this->getBalloonButton('Toggle caption off')->click();
+    $assert_session->assertNoElementAfterWait('css', 'figure.drupal-media > figcaption');
 
     $this->assertVisibleBalloon('.ck-toolbar[aria-label="Drupal Media toolbar"]');
     $this->getBalloonButton('Link media')->click();
@@ -1133,7 +1138,7 @@ public function testEmbedPreviewAccess($media_embed_enabled, $can_use_format) {
     if ($can_use_format) {
       $this->waitForEditor();
       if ($media_embed_enabled) {
-        // The preview rendering, which in this test will use Classy's
+        // The preview rendering, which in this test will use Starterkit theme's
         // media.html.twig template, will fail without the CSRF token/header.
         // @see ::testEmbeddedMediaPreviewWithCsrfToken()
         $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'article.media'));
@@ -1503,7 +1508,7 @@ public function testViewMode(bool $with_alignment) {
     $drupal_media_element = $editor_dom->getElementsByTagName('drupal-media')
       ->item(0);
     $this->assertFalse($drupal_media_element->hasAttribute('data-view-mode'));
-    $assert_session->elementExists('css', 'article.media--view-mode-view-mode-1');
+    $assert_session->waitForElement('css', 'article.media--view-mode-view-mode-1');
 
     // Test that setting allowed_view_modes back to two items restores the
     // field.
@@ -1546,7 +1551,7 @@ public function testViewMode(bool $with_alignment) {
     $this->assertVisibleBalloon('[aria-label="Drupal Media toolbar"]');
     $this->getBalloonButton('View Mode 1')->click();
     $this->getBalloonButton('View Mode 2 has Numeric ID')->click();
-    $assert_session->elementExists('css', 'article.media--view-mode-_2222');
+    $assert_session->waitForElement('css', 'article.media--view-mode-_2222');
     $this->assertEmpty($assert_session->waitForElementVisible('css', '.drupal-media figcaption'));
 
     // Test that a media with no view modes configured will be
diff --git a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/TableTest.php b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/TableTest.php
index 32da3b5e8..70a11e2cc 100644
--- a/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/TableTest.php
+++ b/web/core/modules/ckeditor5/tests/src/FunctionalJavascript/TableTest.php
@@ -53,6 +53,9 @@ class TableTest extends CKEditor5TestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -170,7 +173,10 @@ public function testTableCaptionUi() {
     $this->assertEquals($this->captionText, $caption->getText());
 
     // Update table cell content.
-    $assert_session->waitForElement('css', '.ck-editor__nested-editable .ck-table-bogus-paragraph')->setValue($this->tableCellText);
+    $table_cell = $assert_session->waitForElement('css', '.ck-editor__nested-editable .ck-table-bogus-paragraph');
+    $this->assertNotEmpty($table_cell);
+    $table_cell->click();
+    $table_cell->setValue($this->tableCellText);
     $table_cell = $page->find('css', 'figure.table > table > tbody > tr > td');
     $this->assertEquals($this->tableCellText, $table_cell->getText());
 
diff --git a/web/core/modules/ckeditor5/tests/src/Kernel/CKEditor5PluginManagerTest.php b/web/core/modules/ckeditor5/tests/src/Kernel/CKEditor5PluginManagerTest.php
index 9a48dabcb..64e18af00 100644
--- a/web/core/modules/ckeditor5/tests/src/Kernel/CKEditor5PluginManagerTest.php
+++ b/web/core/modules/ckeditor5/tests/src/Kernel/CKEditor5PluginManagerTest.php
@@ -359,7 +359,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       NULL,
     ];
@@ -375,7 +375,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       foo: bar
 YAML,
@@ -391,7 +391,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: [bold, italic]
 YAML,
@@ -407,7 +407,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
 YAML,
@@ -423,7 +423,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
       filter: true
@@ -440,7 +440,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
       filter: filter_caption
@@ -457,7 +457,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
       filter: filter_caption
@@ -475,7 +475,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
       filter: filter_caption
@@ -493,7 +493,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
       filter: filter_caption
@@ -512,7 +512,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions:
       toolbarItem: bold
       filter: filter_caption
@@ -531,7 +531,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions: []
 YAML,
       NULL,
@@ -546,7 +546,7 @@ public function providerTestInvalidPluginDefinitions(): \Generator {
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
     conditions: false
 YAML,
       NULL,
@@ -564,7 +564,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       'The CKEditor 5 "ckeditor5_invalid_plugin_foo_bar" provides a plugin class: "Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar", but it does not exist.',
     ];
@@ -580,7 +580,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       'CKEditor 5 plugins must implement \Drupal\ckeditor5\Plugin\CKEditor5PluginInterface. "ckeditor5_invalid_plugin_foo_bar" does not.',
       [
@@ -609,7 +609,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       NULL,
       [
@@ -641,7 +641,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       NULL,
       [
@@ -680,7 +680,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       'The "ckeditor5_invalid_plugin_foo_bar" CKEditor 5 plugin definition is configurable, has non-empty default configuration but has no config schema. Config schema is required for validation.',
       [
@@ -719,7 +719,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       NULL,
       [
@@ -771,7 +771,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       'The "ckeditor5_invalid_plugin_foo_bar" CKEditor 5 plugin definition is configurable, but its default configuration does not match its config schema. The following errors were found: [foo] The configuration property foo.bar doesn\'t exist, [baz] missing schema.',
       [
@@ -823,7 +823,7 @@ class: Drupal\ckeditor5_invalid_plugin\Plugin\CKEditor5Plugin\FooBar
     elements:
       - <foo>
       - <bar>
-    admin_library: ckeditor5/admin.basic
+    admin_library: ckeditor5/internal.admin.basic
 YAML,
       NULL,
       [
@@ -1085,12 +1085,12 @@ public function testEnabledPlugins() {
     ];
     $this->assertSame($default_plugins, $definitions, 'No CKEditor 5 plugins found besides the built-in ones.');
     $default_libraries = [
-      'ckeditor5/drupal.ckeditor5',
-      'ckeditor5/drupal.ckeditor5.emphasis',
-      'ckeditor5/drupal.ckeditor5.internal',
+      'ckeditor5/internal.drupal.ckeditor5',
+      'ckeditor5/internal.drupal.ckeditor5.emphasis',
+      'ckeditor5/internal.drupal.ckeditor5.htmlEngine',
       'core/ckeditor5.basic',
+      'core/ckeditor5.essentials',
       'core/ckeditor5.htmlSupport',
-      'core/ckeditor5.internal',
       'core/ckeditor5.pasteFromOffice',
     ];
     $this->assertSame($default_libraries, $this->manager->getEnabledLibraries($editor));
@@ -1136,8 +1136,8 @@ public function testEnabledPlugins() {
     sort($expected_plugins);
     $this->assertSame($expected_plugins, $plugin_ids);
     $expected_libraries = array_merge($default_libraries, [
-      'ckeditor5/drupal.ckeditor5.media',
-      'ckeditor5/drupal.ckeditor5.mediaAlign',
+      'ckeditor5/internal.drupal.ckeditor5.media',
+      'ckeditor5/internal.drupal.ckeditor5.mediaAlign',
       'ckeditor5_test/layercake',
     ]);
     sort($expected_libraries);
@@ -1165,8 +1165,8 @@ public function testEnabledPlugins() {
     sort($expected_plugins);
     $this->assertSame(array_values($expected_plugins), $plugin_ids);
     $expected_libraries = array_merge($default_libraries, [
-      'ckeditor5/drupal.ckeditor5.media',
-      'ckeditor5/drupal.ckeditor5.mediaAlign',
+      'ckeditor5/internal.drupal.ckeditor5.media',
+      'ckeditor5/internal.drupal.ckeditor5.mediaAlign',
       'ckeditor5_test/layercake',
       'core/ckeditor5.table',
     ]);
@@ -1205,12 +1205,12 @@ public function testEnabledPlugins() {
     ];
     $this->assertSame($default_plugins, $definitions, 'No CKEditor 5 plugins found besides the built-in ones.');
     $default_libraries = [
-      'ckeditor5/drupal.ckeditor5',
-      'ckeditor5/drupal.ckeditor5.emphasis',
-      'ckeditor5/drupal.ckeditor5.internal',
+      'ckeditor5/internal.drupal.ckeditor5',
+      'ckeditor5/internal.drupal.ckeditor5.emphasis',
+      'ckeditor5/internal.drupal.ckeditor5.htmlEngine',
       'core/ckeditor5.basic',
+      'core/ckeditor5.essentials',
       'core/ckeditor5.htmlSupport',
-      'core/ckeditor5.internal',
       'core/ckeditor5.pasteFromOffice',
     ];
     $this->assertSame($default_libraries, $this->manager->getEnabledLibraries($editor));
diff --git a/web/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php b/web/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
index c9d24f390..65c64f348 100644
--- a/web/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
+++ b/web/core/modules/ckeditor5/tests/src/Kernel/SmartDefaultSettingsTest.php
@@ -5,6 +5,7 @@
 namespace Drupal\Tests\ckeditor5\Kernel;
 
 use Drupal\ckeditor5\HTMLRestrictions;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Entity\Entity\EntityViewMode;
 use Drupal\editor\Entity\Editor;
@@ -129,22 +130,22 @@ protected function setUp(): void {
     ])->setSyncing(TRUE)->save();
 
     FilterFormat::create(
-      Yaml::parseFile('core/profiles/standard/config/install/filter.format.full_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/filter.format.full_html.yml')
     )
       ->setSyncing(TRUE)
       ->save();
     Editor::create(
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.full_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.full_html.yml')
     )->setSyncing(TRUE)->save();
 
-    $basic_html_format = Yaml::parseFile('core/profiles/standard/config/install/filter.format.basic_html.yml');
-    FilterFormat::create($basic_html_format)->save();
+    $basic_html_format = Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/filter.format.basic_html.yml');
+    FilterFormat::create($basic_html_format)->setSyncing(TRUE)->save();
     Editor::create(
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     FilterFormat::create(
-      Yaml::parseFile('core/profiles/standard/config/install/filter.format.restricted_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/filter.format.restricted_html.yml')
     )->setSyncing(TRUE)->save();
 
     $basic_html_format_without_image_uploads = $basic_html_format;
@@ -154,7 +155,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_without_image_uploads']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setImageUploadSettings(['status' => FALSE])->setSyncing(TRUE)->save();
 
     $allowed_html_parents = ['filters', 'filter_html', 'settings', 'allowed_html'];
@@ -168,7 +169,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_without_h4_h6']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     $new_value = str_replace(['<h2 id> ', '<h3 id> ', '<h4 id> ', '<h5 id> ', '<h6 id> '], '', $current_value);
@@ -180,7 +181,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_without_headings']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     $basic_html_format_with_pre = $basic_html_format;
@@ -191,7 +192,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_with_pre']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     $basic_html_format_with_h1 = $basic_html_format;
@@ -202,7 +203,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_with_h1']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     $new_value = str_replace('<p>', '<p class="text-align-center text-align-justify">', $current_value);
@@ -214,7 +215,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_with_alignable_p']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     $basic_html_format_with_media_embed = $basic_html_format;
@@ -228,7 +229,7 @@ protected function setUp(): void {
     $basic_html_editor_with_media_embed = Editor::create(
       ['format' => 'basic_html_with_media_embed']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     );
     $settings = $basic_html_editor_with_media_embed->getSettings();
     // Add "insert media from library" button to CKEditor 4 configuration, the
@@ -247,7 +248,7 @@ protected function setUp(): void {
     $basic_html_editor_with_media_embed_view_mode_enabled_no_view_modes_configured = Editor::create(
       ['format' => 'basic_html_with_media_embed_view_mode_enabled_no_view_modes_configured']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     );
     $settings = $basic_html_editor_with_media_embed_view_mode_enabled_no_view_modes_configured->getSettings();
     // Add "insert media from library" button to CKEditor 4 configuration, the
@@ -265,7 +266,7 @@ protected function setUp(): void {
     Editor::create(
       ['format' => 'basic_html_with_any_data_attr']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     )->setSyncing(TRUE)->save();
 
     $basic_html_format_with_media_embed_view_mode_enabled_two_view_modes_configured = $basic_html_format_with_media_embed_view_mode_invalid;
@@ -275,7 +276,7 @@ protected function setUp(): void {
     $basic_html_editor_with_media_embed_view_mode_enabled_two_view_modes_configured = Editor::create(
       ['format' => 'basic_html_with_media_embed_view_mode_enabled_two_view_modes_configured']
       +
-      Yaml::parseFile('core/profiles/standard/config/install/editor.editor.basic_html.yml')
+      Yaml::parseFile('core/modules/ckeditor5/tests/fixtures/ckeditor4_config/editor.editor.basic_html.yml')
     );
     $settings = $basic_html_editor_with_media_embed_view_mode_enabled_two_view_modes_configured->getSettings();
     // Add "insert media from library" button to CKEditor 4 configuration, the
@@ -572,7 +573,9 @@ public function test(string $format_id, array $filters_to_drop, array $expected_
     ];
     $db_logs = [];
     foreach ($db_logged as $log) {
-      $db_logs[$type_to_status[$log->severity]][] = $log->message;
+      $variables = unserialize($log->variables);
+      $message = new FormattableMarkup($log->message, $variables);
+      $db_logs[$type_to_status[$log->severity]][] = (string) $message;
     }
 
     // Transforms TranslatableMarkup objects to string.
diff --git a/web/core/modules/ckeditor5/tests/src/Nightwatch/Tests/drupalHtmlBuilderTest.js b/web/core/modules/ckeditor5/tests/src/Nightwatch/Tests/drupalHtmlBuilderTest.js
index 8d416758b..5fd62be7b 100644
--- a/web/core/modules/ckeditor5/tests/src/Nightwatch/Tests/drupalHtmlBuilderTest.js
+++ b/web/core/modules/ckeditor5/tests/src/Nightwatch/Tests/drupalHtmlBuilderTest.js
@@ -4,20 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 var assert = require('assert');
-
 var fs = require('fs');
-
 var path = require('path');
-
 var _require = require('jsdom'),
-    JSDOM = _require.JSDOM;
-
+  JSDOM = _require.JSDOM;
 var DrupalHtmlBuilder = eval("(".concat(fs.readFileSync(path.resolve(__dirname, '../../../../js/ckeditor5_plugins/drupalHtmlEngine/src/drupalhtmlbuilder.js')).toString(), ")").replace('export default', ''));
 var _JSDOM$window = new JSDOM("<!DOCTYPE html>").window,
-    document = _JSDOM$window.document,
-    Node = _JSDOM$window.Node;
+  document = _JSDOM$window.document,
+  Node = _JSDOM$window.Node;
 module.exports = {
   '@tags': ['ckeditor5'],
   '@unitTest': true,
diff --git a/web/core/modules/ckeditor5/webpack.config.js b/web/core/modules/ckeditor5/webpack.config.js
index 4496eb612..52b849cbc 100644
--- a/web/core/modules/ckeditor5/webpack.config.js
+++ b/web/core/modules/ckeditor5/webpack.config.js
@@ -1,7 +1,6 @@
 const path = require('path');
 const fs = require('fs');
 const webpack = require('webpack');
-const { styles, builds } = require('@ckeditor/ckeditor5-dev-utils');
 const TerserPlugin = require('terser-webpack-plugin');
 
 function getDirectories(srcpath) {
@@ -57,7 +56,7 @@ getDirectories(path.resolve(__dirname, './js/ckeditor5_plugins')).forEach((dir)
       }),
     ],
     module: {
-      rules: [{ test: /\.svg$/, use: 'raw-loader' }],
+      rules: [{ test: /\.svg$/, type: 'asset/source' }],
     },
   };
 
diff --git a/web/core/modules/color/color.js b/web/core/modules/color/color.js
index 2b73fcf00..a1180e8b4 100644
--- a/web/core/modules/color/color.js
+++ b/web/core/modules/color/color.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.color = {
     attach: function attach(context, settings) {
@@ -12,11 +11,9 @@
       var j;
       var colors;
       var form = $(once('color', '#system-theme-settings .color-form', context));
-
       if (form.length === 0) {
         return;
       }
-
       var inputs = [];
       var hooks = [];
       var locks = [];
@@ -29,95 +26,76 @@
       });
       var height = [];
       var width = [];
-
       function preview() {
         Drupal.color.callback(context, settings, form, farb, height, width);
       }
-
       function resetScheme() {
         form.find('#edit-scheme').each(function () {
           this.selectedIndex = this.options.length - 1;
         });
       }
-
       function shiftColor(given, ref1, ref2) {
         var d;
         given = farb.RGBToHSL(farb.unpack(given));
         given[0] += ref2[0] - ref1[0];
-
         if (ref1[1] === 0 || ref2[1] === 0) {
           given[1] = ref2[1];
         } else {
           d = ref1[1] / ref2[1];
-
           if (d > 1) {
             given[1] /= d;
           } else {
             given[1] = 1 - (1 - given[1]) * d;
           }
         }
-
         if (ref1[2] === 0 || ref2[2] === 0) {
           given[2] = ref2[2];
         } else {
           d = ref1[2] / ref2[2];
-
           if (d > 1) {
             given[2] /= d;
           } else {
             given[2] = 1 - (1 - given[2]) * d;
           }
         }
-
         return farb.pack(farb.HSLToRGB(given));
       }
-
       function callback(input, color, propagate, colorScheme) {
         var matched;
         $(input).css({
           backgroundColor: color,
           color: farb.RGBToHSL(farb.unpack(color))[2] > 0.5 ? '#000' : '#fff'
         });
-
         if (input.value && input.value !== color) {
           input.value = color;
-
           if (propagate) {
             i = input.i;
-
             for (j = i + 1;; ++j) {
               if (!locks[j - 1] || $(locks[j - 1]).is('.is-unlocked')) {
                 break;
               }
-
               matched = shiftColor(color, reference[input.key], reference[inputs[j].key]);
               callback(inputs[j], matched, false);
             }
-
             for (j = i - 1;; --j) {
               if (!locks[j] || $(locks[j]).is('.is-unlocked')) {
                 break;
               }
-
               matched = shiftColor(color, reference[input.key], reference[inputs[j].key]);
               callback(inputs[j], matched, false);
             }
-
             preview();
           }
-
           if (!colorScheme) {
             resetScheme();
           }
         }
       }
-
       Object.keys(settings.gradients || {}).forEach(function (i) {
         $(once('color', '.color-preview')).append("<div id=\"gradient-".concat(i, "\"></div>"));
         var gradient = $(".color-preview #gradient-".concat(i));
         height.push(parseInt(gradient.css('height'), 10) / 10);
         width.push(parseInt(gradient.css('width'), 10) / 10);
-
         for (j = 0; j < (settings.gradients[i].direction === 'vertical' ? height[i] : width[i]); ++j) {
           gradient.append('<div class="gradient-line"></div>');
         }
@@ -125,7 +103,6 @@
       form.find('#edit-scheme').on('change', function () {
         var schemes = settings.color.schemes;
         var colorScheme = this.options[this.selectedIndex].value;
-
         if (colorScheme !== '' && schemes[colorScheme]) {
           colors = schemes[colorScheme];
           Object.keys(colors || {}).forEach(function (fieldName) {
@@ -134,14 +111,11 @@
           preview();
         }
       });
-
       function focus(e) {
         var input = e.target;
-
         if (focused) {
           $(focused).off('keyup', farb.updateValue).off('keyup', preview).off('keyup', resetScheme).parent().removeClass('item-selected');
         }
-
         focused = input;
         farb.linkTo(function (color) {
           callback(input, color, true, false);
@@ -149,17 +123,14 @@
         farb.setColor(input.value);
         $(focused).on('keyup', farb.updateValue).on('keyup', preview).on('keyup', resetScheme).parent().addClass('item-selected');
       }
-
       form.find('.js-color-palette input.form-text').each(function () {
         this.key = this.id.substring(13);
         farb.linkTo(function () {}).setColor('#000').linkTo(this);
         var i = inputs.length;
-
         if (inputs.length) {
           var toggleClick = true;
           var lock = $("<button class=\"color-palette__lock\">".concat(Drupal.t('Unlock'), "</button>")).on('click', function (e) {
             e.preventDefault();
-
             if (toggleClick) {
               $(this).addClass('is-unlocked').html(Drupal.t('Lock'));
               $(hooks[i - 1]).attr('class', locks[i - 2] && $(locks[i - 2]).is(':not(.is-unlocked)') ? 'color-palette__hook is-up' : 'color-palette__hook');
@@ -169,13 +140,11 @@
               $(hooks[i - 1]).attr('class', locks[i - 2] && $(locks[i - 2]).is(':not(.is-unlocked)') ? 'color-palette__hook is-both' : 'color-palette__hook is-down');
               $(hooks[i]).attr('class', locks[i] && $(locks[i]).is(':not(.is-unlocked)') ? 'color-palette__hook is-both' : 'color-palette__hook is-up');
             }
-
             toggleClick = !toggleClick;
           });
           $(this).after(lock);
           locks.push(lock);
         }
-
         var hook = $('<div class="color-palette__hook"></div>');
         $(this).after(hook);
         hooks.push(hook);
diff --git a/web/core/modules/color/help_topics/color.changing.html.twig b/web/core/modules/color/help_topics/color.changing.html.twig
index 49cf90d7a..ac9f7acb6 100644
--- a/web/core/modules/color/help_topics/color.changing.html.twig
+++ b/web/core/modules/color/help_topics/color.changing.html.twig
@@ -3,12 +3,15 @@ label: 'Changing the color palette of a theme'
 related:
   - core.appearance
 ---
-{% set appearance = render_var(url('system.themes_page')) %}
+{% set appearance_link_text %}
+  {% trans %}Appearance{% endtrans %}
+{% endset %}
+{% set appearance_link = render_var(help_route_link(appearance_link_text, 'system.themes_page')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Change the colors for links, backgrounds, and text in a theme that supports the Color module. Color-specific stylesheets will be generated and saved; you will need to follow these steps again to regenerate the stylesheets if you make any changes to the base stylesheets of your theme.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the Manage administrative menu, navigate to <a href="{{ appearance }}">Appearance</a>.{% endtrans %}</li>
+  <li>{% trans %}In the Manage administrative menu, navigate to {{ appearance_link }}.{% endtrans %}</li>
   <li>{% trans %}Click the <em>Settings</em> link for the theme you want to change the colors of.{% endtrans %}</li>
   <li>{% trans %}In the <em>Color scheme</em> section, choose new colors for the backgrounds, text, and links that your theme defines colors for. However, if you do not see color settings, then your theme does not support the Color module.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save configuration</em>. Color-specific stylesheets will be generated and saved in the file system.{% endtrans %}</li>
diff --git a/web/core/modules/color/preview.js b/web/core/modules/color/preview.js
index a65d0ea17..40f348e69 100644
--- a/web/core/modules/color/preview.js
+++ b/web/core/modules/color/preview.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.color = {
     callback: function callback(context, settings, form, farb, height, width) {
@@ -13,20 +12,17 @@
       form.find('.color-preview').css('backgroundColor', form.find('.color-palette input[name="palette[base]"]').val());
       form.find('#text').css('color', form.find('.color-palette input[name="palette[text]"]').val());
       form.find('#text a, #text h2').css('color', form.find('.color-palette input[name="palette[link]"]').val());
-
       function gradientLineColor(i, element) {
         Object.keys(accum || {}).forEach(function (k) {
           accum[k] += delta[k];
         });
         element.style.backgroundColor = farb.pack(accum);
       }
-
       var colorStart;
       var colorEnd;
       Object.keys(settings.gradients || {}).forEach(function (i) {
         colorStart = farb.unpack(form.find(".color-palette input[name=\"palette[".concat(settings.gradients[i].colors[0], "]\"]")).val());
         colorEnd = farb.unpack(form.find(".color-palette input[name=\"palette[".concat(settings.gradients[i].colors[1], "]\"]")).val());
-
         if (colorStart && colorEnd) {
           delta = [];
           Object.keys(colorStart || {}).forEach(function (colorStartKey) {
diff --git a/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc b/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
index ee77a5a17..4b885f866 100644
--- a/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
+++ b/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/color/color.inc
@@ -29,5 +29,16 @@ $info = [
   'css' => [
     'css/colors.css',
   ],
+  'copy' => [
+    'logo.svg',
+  ],
   'preview_html' => 'color/preview.html',
+  '#attached' => [
+    'drupalSettings' => [
+      'color' => [
+        // Put the logo path into JavaScript for the live preview.
+        'logo' => theme_get_setting('logo.url', 'color_test_theme'),
+      ],
+    ],
+  ],
 ];
diff --git a/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js b/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js
index 546127de3..cea8a35ef 100644
--- a/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js
+++ b/web/core/modules/color/tests/modules/color_test/themes/color_test_theme/js/color_test_theme-fontsize.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($) {
   $(document).ready(function () {});
 })(jQuery);
\ No newline at end of file
diff --git a/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php b/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
index 669e01c2f..012304189 100644
--- a/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
+++ b/web/core/modules/color/tests/src/Functional/ColorConfigSchemaTest.php
@@ -22,7 +22,7 @@ class ColorConfigSchemaTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'stark';
+  protected $defaultTheme = 'color_test_theme';
 
   /**
    * A user with administrative permissions.
@@ -36,7 +36,6 @@ class ColorConfigSchemaTest extends BrowserTestBase {
    */
   protected function setUp(): void {
     parent::setUp();
-    \Drupal::service('theme_installer')->install(['bartik']);
 
     // Create user.
     $this->adminUser = $this->drupalCreateUser(['administer themes']);
@@ -46,8 +45,8 @@ protected function setUp(): void {
   /**
    * Tests whether the color config schema is valid.
    */
-  public function testValidColorConfigSchema() {
-    $settings_path = 'admin/appearance/settings/bartik';
+  public function testValidColorConfigSchema(): void {
+    $settings_path = 'admin/appearance/settings/color_test_theme';
     $edit['scheme'] = '';
     $edit['palette[bg]'] = '#123456';
     $this->drupalGet($settings_path);
diff --git a/web/core/modules/color/tests/src/Functional/ColorTest.php b/web/core/modules/color/tests/src/Functional/ColorTest.php
index b25cae61e..f628a8f94 100644
--- a/web/core/modules/color/tests/src/Functional/ColorTest.php
+++ b/web/core/modules/color/tests/src/Functional/ColorTest.php
@@ -5,8 +5,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Modify the Bartik theme colors and make sure the changes are reflected on the
- * frontend.
+ * Modify theme colors and make sure the changes are reflected on the frontend.
  *
  * @group color
  * @group legacy
@@ -23,7 +22,7 @@ class ColorTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'stark';
+  protected $defaultTheme = 'color_test_theme';
 
   /**
    * A user with administrative permissions.
@@ -32,23 +31,6 @@ class ColorTest extends BrowserTestBase {
    */
   protected $bigUser;
 
-  /**
-   * An associative array of settings for themes.
-   *
-   * @var array
-   */
-  protected $themes;
-
-  /**
-   * Associative array of hex color strings to test.
-   *
-   * Keys are the color string and values are a Boolean set to TRUE for valid
-   * colors.
-   *
-   * @var array
-   */
-  protected $colorTests;
-
   /**
    * {@inheritdoc}
    */
@@ -58,90 +40,50 @@ protected function setUp(): void {
     // Create user.
     $this->bigUser = $this->drupalCreateUser(['administer themes']);
 
-    // This tests the color module in Bartik.
-    $this->themes = [
-      'bartik' => [
-        'palette_input' => 'palette[bg]',
-        'scheme' => 'slate',
-        'scheme_color' => '#3b3b3b',
-      ],
-      'color_test_theme' => [
-        'palette_input' => 'palette[bg]',
-        'scheme' => 'custom',
-        'scheme_color' => '#3b3b3b',
-      ],
-    ];
-    \Drupal::service('theme_installer')->install(array_keys($this->themes));
-
-    // Array filled with valid and not valid color values.
-    $this->colorTests = [
-      '#000' => TRUE,
-      '#123456' => TRUE,
-      '#abcdef' => TRUE,
-      '#0' => FALSE,
-      '#00' => FALSE,
-      '#0000' => FALSE,
-      '#00000' => FALSE,
-      '123456' => FALSE,
-      '#00000g' => FALSE,
-    ];
+    // Set 'color_test_theme' as the default theme.
+    $this->config('system.theme')
+      ->set('default', 'color_test_theme')
+      ->save();
   }
 
   /**
    * Tests the Color module functionality.
    */
-  public function testColor() {
-    foreach ($this->themes as $theme => $test_values) {
-      $this->_testColor($theme, $test_values);
-    }
-  }
-
-  /**
-   * Tests the Color module functionality using the given theme.
-   *
-   * @param string $theme
-   *   The machine name of the theme being tested.
-   * @param array $test_values
-   *   An associative array of test settings (i.e. 'Main background', 'Text
-   *   color', 'Color set', etc) for the theme which being tested.
-   */
-  public function _testColor($theme, $test_values) {
-    $this->config('system.theme')
-      ->set('default', $theme)
-      ->save();
-    $settings_path = 'admin/appearance/settings/' . $theme;
+  public function testColor(): void {
+    $settings_path = 'admin/appearance/settings/color_test_theme';
+    $assert_session = $this->assertSession();
 
     $this->drupalLogin($this->bigUser);
     $this->drupalGet($settings_path);
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContainsOnce('Color set');
+    $assert_session->statusCodeEquals(200);
+    $assert_session->pageTextContainsOnce('Color set');
     $edit['scheme'] = '';
-    $edit[$test_values['palette_input']] = '#123456';
+    $edit['palette[bg]'] = '#123456';
     $this->drupalGet($settings_path);
     $this->submitForm($edit, 'Save configuration');
 
     $this->drupalGet('<front>');
-    $stylesheets = $this->config('color.theme.' . $theme)->get('stylesheets');
+    $stylesheets = $this->config('color.theme.color_test_theme')
+      ->get('stylesheets');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
     // Make sure the color stylesheet is included in the content.
     foreach ($stylesheets as $stylesheet) {
-      $this->assertSession()->responseMatches('|' . $file_url_generator->generateString($stylesheet) . '|');
+      $assert_session->responseMatches('|' . $file_url_generator->generateString($stylesheet) . '|');
       $stylesheet_content = implode("\n", file($stylesheet));
-      $this->assertStringContainsString('color: #123456', $stylesheet_content, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
+      $this->assertStringContainsString('color: #123456', $stylesheet_content, 'Make sure the color we changed is in the color stylesheet.');
     }
 
-    $this->drupalGet($settings_path);
-    $this->assertSession()->statusCodeEquals(200);
-    $edit['scheme'] = $test_values['scheme'];
+    $edit['scheme'] = 'custom';
     $this->drupalGet($settings_path);
     $this->submitForm($edit, 'Save configuration');
 
     $this->drupalGet('<front>');
-    $stylesheets = $this->config('color.theme.' . $theme)->get('stylesheets');
+    $stylesheets = $this->config('color.theme.color_test_theme')
+      ->get('stylesheets');
     foreach ($stylesheets as $stylesheet) {
       $stylesheet_content = implode("\n", file($stylesheet));
-      $this->assertStringContainsString('color: ' . $test_values['scheme_color'], $stylesheet_content, 'Make sure the color we changed is in the color stylesheet. (' . $theme . ')');
+      $this->assertStringContainsString('color: #3b3b3b', $stylesheet_content, 'Make sure the color we changed is in the color stylesheet.');
     }
 
     // Test with aggregated CSS turned on.
@@ -152,35 +94,45 @@ public function _testColor($theme, $test_values) {
     $stylesheets = \Drupal::state()->get('drupal_css_cache_files', []);
     $stylesheet_content = '';
     foreach ($stylesheets as $uri) {
-      $stylesheet_content .= implode("\n", file(\Drupal::service('file_system')->realpath($uri)));
+      $stylesheet_content .= implode("\n", file(\Drupal::service('file_system')
+        ->realpath($uri)));
     }
-    $this->assertStringNotContainsString('public://', $stylesheet_content, 'Make sure the color paths have been translated to local paths. (' . $theme . ')');
-    $config->set('css.preprocess', 0);
-    $config->save();
+    $this->assertStringNotContainsString('public://', $stylesheet_content, 'Make sure the color paths have been translated to local paths.');
   }
 
   /**
    * Tests whether the provided color is valid.
    */
-  public function testValidColor() {
-    $this->config('system.theme')
-      ->set('default', 'bartik')
-      ->save();
-    $settings_path = 'admin/appearance/settings/bartik';
+  public function testValidColor(): void {
+    $settings_path = 'admin/appearance/settings/color_test_theme';
+    $assert_session = $this->assertSession();
+
+    // Array filled with valid and not valid color values.
+    $colorTests = [
+      '#000' => TRUE,
+      '#123456' => TRUE,
+      '#abcdef' => TRUE,
+      '#0' => FALSE,
+      '#00' => FALSE,
+      '#0000' => FALSE,
+      '#00000' => FALSE,
+      '123456' => FALSE,
+      '#00000g' => FALSE,
+    ];
 
     $this->drupalLogin($this->bigUser);
     $edit['scheme'] = '';
 
-    foreach ($this->colorTests as $color => $is_valid) {
+    foreach ($colorTests as $color => $is_valid) {
       $edit['palette[bg]'] = $color;
       $this->drupalGet($settings_path);
       $this->submitForm($edit, 'Save configuration');
 
       if ($is_valid) {
-        $this->assertSession()->pageTextContains('The configuration options have been saved.');
+        $assert_session->pageTextContains('The configuration options have been saved.');
       }
       else {
-        $this->assertSession()->pageTextContains('You must enter a valid hexadecimal color value for Main background.');
+        $assert_session->pageTextContains('You must enter a valid hexadecimal color value for Main background.');
       }
     }
   }
@@ -188,7 +140,7 @@ public function testValidColor() {
   /**
    * Tests whether the custom logo is used in the color preview.
    */
-  public function testLogoSettingOverride() {
+  public function testLogoSettingOverride(): void {
     $this->drupalLogin($this->bigUser);
     $edit = [
       'default_logo' => FALSE,
@@ -197,32 +149,31 @@ public function testLogoSettingOverride() {
     $this->drupalGet('admin/appearance/settings');
     $this->submitForm($edit, 'Save configuration');
 
-    // Ensure that the overridden logo is present in Bartik, which is colorable.
-    $this->drupalGet('admin/appearance/settings/bartik');
+    // Ensure that the overridden logo is present in color_test_theme, which is
+    // colorable.
+    $this->drupalGet('admin/appearance/settings/color_test_theme');
     $this->assertSame($GLOBALS['base_path'] . 'core/misc/druplicon.png', $this->getDrupalSettings()['color']['logo']);
   }
 
   /**
    * Tests whether the scheme can be set, viewed anonymously and reset.
    */
-  public function testOverrideAndResetScheme() {
-    $settings_path = 'admin/appearance/settings/bartik';
-    $this->config('system.theme')
-      ->set('default', 'bartik')
-      ->save();
+  public function testOverrideAndResetScheme(): void {
+    $settings_path = 'admin/appearance/settings/color_test_theme';
+    $assert_session = $this->assertSession();
 
     // Place branding block with site name and slogan into header region.
     $this->drupalPlaceBlock('system_branding_block', ['region' => 'header']);
 
     $this->drupalGet('');
     // Make sure the color logo is not being used.
-    $this->assertSession()->responseNotContains('files/color/bartik-');
-    // Make sure the original bartik logo exists.
-    $this->assertSession()->responseContains('bartik/logo.svg');
+    $assert_session->responseNotContains('files/color/color_test_theme-');
+    // Make sure the original color_test_theme logo exists.
+    $assert_session->responseContains('color_test_theme/logo.svg');
 
-    // Log in and set the color scheme to 'slate'.
+    // Log in and set the color scheme to 'custom'.
     $this->drupalLogin($this->bigUser);
-    $edit['scheme'] = 'slate';
+    $edit['scheme'] = 'custom';
     $this->drupalGet($settings_path);
     $this->submitForm($edit, 'Save configuration');
 
@@ -230,9 +181,9 @@ public function testOverrideAndResetScheme() {
     $this->drupalLogout();
     $this->drupalGet('');
     // Make sure the color logo is being used.
-    $this->assertSession()->responseContains('files/color/bartik-');
-    // Make sure the original bartik logo does not exist.
-    $this->assertSession()->responseNotContains('bartik/logo.svg');
+    $assert_session->responseContains('files/color/color_test_theme-');
+    // Make sure the original color_test_theme logo does not exist.
+    $assert_session->responseNotContains('color_test_theme/logo.svg');
 
     // Log in and set the color scheme back to default (delete config).
     $this->drupalLogin($this->bigUser);
@@ -244,9 +195,9 @@ public function testOverrideAndResetScheme() {
     $this->drupalLogout();
     $this->drupalGet('');
     // Make sure the color logo is not being used.
-    $this->assertSession()->responseNotContains('files/color/bartik-');
-    // Make sure the original bartik logo exists.
-    $this->assertSession()->responseContains('bartik/logo.svg');
+    $assert_session->responseNotContains('files/color/color_test_theme-');
+    // Make sure the original color_test_theme logo exists.
+    $assert_session->responseContains('color_test_theme/logo.svg');
   }
 
 }
diff --git a/web/core/modules/comment/comment-entity-form.js b/web/core/modules/comment/comment-entity-form.js
index bed56e01c..5e497dd63 100644
--- a/web/core/modules/comment/comment-entity-form.js
+++ b/web/core/modules/comment/comment-entity-form.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.commentFieldsetSummaries = {
     attach: function attach(context) {
diff --git a/web/core/modules/comment/comment.module b/web/core/modules/comment/comment.module
index cabade3fe..583eac8d7 100644
--- a/web/core/modules/comment/comment.module
+++ b/web/core/modules/comment/comment.module
@@ -35,9 +35,9 @@ use Drupal\user\UserInterface;
  * Comments changed after this time may be marked new, updated, or read,
  * depending on their state for the current user. Defaults to 30 days ago.
  *
- * @todo Remove when https://www.drupal.org/node/1029708 lands.
+ * @todo Remove when https://www.drupal.org/node/2006632 lands.
  */
-define('COMMENT_NEW_LIMIT', REQUEST_TIME - 30 * 24 * 60 * 60);
+define('COMMENT_NEW_LIMIT', ((int) $_SERVER['REQUEST_TIME']) - 30 * 24 * 60 * 60);
 
 /**
  * Implements hook_help().
diff --git a/web/core/modules/comment/config/schema/comment.views.schema.yml b/web/core/modules/comment/config/schema/comment.views.schema.yml
index a46a004d7..f2f801f78 100644
--- a/web/core/modules/comment/config/schema/comment.views.schema.yml
+++ b/web/core/modules/comment/config/schema/comment.views.schema.yml
@@ -31,6 +31,10 @@ views.field.comment_last_timestamp:
 views.field.comment_link_approve:
   type: views.field.comment_link
   label: 'Comment approve link'
+  mapping:
+    text:
+      type: label
+      label: 'Text to display'
 
 views.field.comment_link_reply:
   type: views.field.comment_link
diff --git a/web/core/modules/comment/js/comment-by-viewer.js b/web/core/modules/comment/js/comment-by-viewer.js
index c255a10fc..511725b54 100644
--- a/web/core/modules/comment/js/comment-by-viewer.js
+++ b/web/core/modules/comment/js/comment-by-viewer.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.commentByViewer = {
     attach: function attach(context) {
diff --git a/web/core/modules/comment/js/comment-new-indicator.js b/web/core/modules/comment/js/comment-new-indicator.js
index ffa248176..367debde9 100644
--- a/web/core/modules/comment/js/comment-new-indicator.js
+++ b/web/core/modules/comment/js/comment-new-indicator.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, window) {
   function processCommentNewIndicators(placeholders) {
     var isFirstNewComment = true;
@@ -16,15 +15,12 @@
       var $node = $placeholder.closest('[data-history-node-id]');
       var nodeID = $node.attr('data-history-node-id');
       var lastViewTimestamp = Drupal.history.getLastRead(nodeID);
-
       if (timestamp > lastViewTimestamp) {
         placeholder.textContent = newCommentString;
         $placeholder.removeClass('hidden').closest('.js-comment').addClass('new');
-
         if (isFirstNewComment) {
           isFirstNewComment = false;
           $placeholder.prev().before('<a id="new"></a>');
-
           if (window.location.hash === '#new') {
             window.scrollTo(0, $placeholder.offset().top - Drupal.displace.offsets.top);
           }
@@ -32,7 +28,6 @@
       }
     });
   }
-
   Drupal.behaviors.commentNewIndicator = {
     attach: function attach(context) {
       var nodeIDs = [];
@@ -40,19 +35,15 @@
         var $placeholder = $(placeholder);
         var commentTimestamp = parseInt($placeholder.attr('data-comment-timestamp'), 10);
         var nodeID = $placeholder.closest('[data-history-node-id]').attr('data-history-node-id');
-
         if (Drupal.history.needsServerCheck(nodeID, commentTimestamp)) {
           nodeIDs.push(nodeID);
           return true;
         }
-
         return false;
       });
-
       if (placeholders.length === 0) {
         return;
       }
-
       Drupal.history.fetchTimestamps(nodeIDs, function () {
         processCommentNewIndicators(placeholders);
       });
diff --git a/web/core/modules/comment/js/node-new-comments-link.js b/web/core/modules/comment/js/node-new-comments-link.js
index 9285a60ad..b0634a116 100644
--- a/web/core/modules/comment/js/node-new-comments-link.js
+++ b/web/core/modules/comment/js/node-new-comments-link.js
@@ -4,20 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   function hide($placeholder) {
     return $placeholder.closest('.comment-new-comments').prev().addClass('last').end().hide();
   }
-
   function remove($placeholder) {
     hide($placeholder).remove();
   }
-
   function show($placeholder) {
     return $placeholder.closest('.comment-new-comments').prev().removeClass('last').end().show();
   }
-
   function processNodeNewCommentLinks(placeholders) {
     var $placeholdersToUpdate = {};
     var fieldName = 'comment';
@@ -28,7 +24,6 @@
       fieldName = $placeholder.attr('data-history-node-field-name');
       var nodeID = $placeholder.closest('[data-history-node-id]').attr('data-history-node-id');
       var lastViewTimestamp = Drupal.history.getLastRead(nodeID);
-
       if (timestamp > lastViewTimestamp) {
         $placeholdersToUpdate[nodeID] = $placeholder;
       } else {
@@ -36,11 +31,9 @@
       }
     });
     var nodeIDs = Object.keys($placeholdersToUpdate);
-
     if (nodeIDs.length === 0) {
       return;
     }
-
     function render(results) {
       Object.keys(results || {}).forEach(function (nodeID) {
         if ($placeholdersToUpdate.hasOwnProperty(nodeID)) {
@@ -52,7 +45,6 @@
         }
       });
     }
-
     if (drupalSettings.comment && drupalSettings.comment.newCommentsLinks) {
       render(drupalSettings.comment.newCommentsLinks.node[fieldName]);
     } else {
@@ -68,7 +60,6 @@
       });
     }
   }
-
   Drupal.behaviors.nodeNewCommentsLink = {
     attach: function attach(context) {
       var nodeIDs = [];
@@ -76,21 +67,17 @@
         var $placeholder = $(placeholder);
         var lastCommentTimestamp = parseInt($placeholder.attr('data-history-node-last-comment-timestamp'), 10);
         var nodeID = $placeholder.closest('[data-history-node-id]').attr('data-history-node-id');
-
         if (Drupal.history.needsServerCheck(nodeID, lastCommentTimestamp)) {
           nodeIDs.push(nodeID);
           hide($placeholder);
           return true;
         }
-
         remove($placeholder);
         return false;
       });
-
       if (placeholders.length === 0) {
         return;
       }
-
       Drupal.history.fetchTimestamps(nodeIDs, function () {
         processNodeNewCommentLinks(placeholders);
       });
diff --git a/web/core/modules/comment/src/CommentForm.php b/web/core/modules/comment/src/CommentForm.php
index e2b88f71e..45fd79229 100644
--- a/web/core/modules/comment/src/CommentForm.php
+++ b/web/core/modules/comment/src/CommentForm.php
@@ -382,9 +382,9 @@ public function save(array $form, FormStateInterface $form_state) {
 
       // Add a log entry.
       $logger->notice('Comment posted: %subject.', [
-          '%subject' => $comment->getSubject(),
-          'link' => Link::fromTextAndUrl(t('View'), $comment->toUrl()->setOption('fragment', 'comment-' . $comment->id()))->toString(),
-        ]);
+        '%subject' => $comment->getSubject(),
+        'link' => Link::fromTextAndUrl(t('View'), $comment->toUrl()->setOption('fragment', 'comment-' . $comment->id()))->toString(),
+      ]);
 
       // Explain the approval queue if necessary.
       if (!$comment->isPublished()) {
diff --git a/web/core/modules/comment/src/CommentStorage.php b/web/core/modules/comment/src/CommentStorage.php
index 6bf702521..4f668eac1 100644
--- a/web/core/modules/comment/src/CommentStorage.php
+++ b/web/core/modules/comment/src/CommentStorage.php
@@ -187,17 +187,18 @@ public function getNewCommentPageNumber($total_comments, $new_comments, Fieldabl
 
       // Find the number of the first comment of the first unread thread.
       $count = $this->database->query('SELECT COUNT(*) FROM {' . $data_table . '} WHERE [entity_id] = :entity_id
-                        AND [entity_type] = :entity_type
-                        AND [field_name] = :field_name
-                        AND [status] = :status
-                        AND SUBSTRING([thread], 1, (LENGTH([thread]) - 1)) < :thread
-                        AND [default_langcode] = 1', [
-        ':status' => CommentInterface::PUBLISHED,
-        ':entity_id' => $entity->id(),
-        ':field_name' => $field_name,
-        ':entity_type' => $entity->getEntityTypeId(),
-        ':thread' => $first_thread,
-      ])->fetchField();
+        AND [entity_type] = :entity_type
+        AND [field_name] = :field_name
+        AND [status] = :status
+        AND SUBSTRING([thread], 1, (LENGTH([thread]) - 1)) < :thread
+        AND [default_langcode] = 1', [
+          ':status' => CommentInterface::PUBLISHED,
+          ':entity_id' => $entity->id(),
+          ':field_name' => $field_name,
+          ':entity_type' => $entity->getEntityTypeId(),
+          ':thread' => $first_thread,
+        ]
+      )->fetchField();
     }
 
     return $comments_per_page > 0 ? (int) ($count / $comments_per_page) : 0;
diff --git a/web/core/modules/comment/src/Controller/CommentController.php b/web/core/modules/comment/src/Controller/CommentController.php
index 2cba4ac91..36adda0f7 100644
--- a/web/core/modules/comment/src/Controller/CommentController.php
+++ b/web/core/modules/comment/src/Controller/CommentController.php
@@ -52,7 +52,7 @@ class CommentController extends ControllerBase {
   /**
    * The entity repository.
    *
-   * @var Drupal\Core\Entity\EntityRepositoryInterface
+   * @var \Drupal\Core\Entity\EntityRepositoryInterface
    */
   protected $entityRepository;
 
diff --git a/web/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php b/web/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php
index 2c37f3412..7446b1259 100644
--- a/web/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php
+++ b/web/core/modules/comment/src/Plugin/EntityReferenceSelection/CommentSelection.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\comment\Plugin\EntityReferenceSelection;
 
+use Drupal\Component\Utility\Html;
 use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\Core\Entity\Plugin\EntityReferenceSelection\DefaultSelection;
 use Drupal\comment\CommentInterface;
@@ -76,19 +77,75 @@ public function entityQueryAlter(SelectInterface $query) {
       $query->innerJoin($data_table, NULL, "[base_table].[cid] = [$data_table].[cid] AND [$data_table].[default_langcode] = 1");
     }
 
-    // The Comment module doesn't implement any proper comment access,
-    // and as a consequence doesn't make sure that comments cannot be viewed
-    // when the user doesn't have access to the node.
-    $node_alias = $query->innerJoin('node_field_data', 'n', "[%alias].[nid] = [$data_table].[entity_id] AND [$data_table].[entity_type] = 'node'");
-    // Pass the query to the node access control.
-    $this->reAlterQuery($query, 'node_access', $node_alias);
-
-    // Passing the query to node_query_node_access_alter() is sadly
-    // insufficient for nodes.
-    // @see \Drupal\node\Plugin\EntityReferenceSelection\NodeSelection::buildEntityQuery()
-    if (!$this->currentUser->hasPermission('bypass node access') && !$this->moduleHandler->hasImplementations('node_grants')) {
-      $query->condition($node_alias . '.status', 1);
+    // Find the host entity type the comment field is on.
+    $comment = $this->getConfiguration()['entity'];
+    if ($comment) {
+      $host_entity_type_id = $comment->getCommentedEntityTypeId();
+
+      /** @var \Drupal\Core\Entity\EntityTypeInterface $host_entity_type */
+      $host_entity_type = $this->entityTypeManager->getDefinition($host_entity_type_id);
+      $host_entity_field_data_table = $host_entity_type->getDataTable();
+
+      // Not all entities have a data table, so check first.
+      if ($host_entity_field_data_table) {
+        $id_key = $host_entity_type->getKey('id');
+
+        // The Comment module doesn't implement per-comment access, so it
+        // checks instead that the user has access to the host entity.
+        $entity_alias = $query->innerJoin($host_entity_field_data_table, 'n', "[%alias].[$id_key] = [$data_table].[entity_id] AND [$data_table].[entity_type] = '$host_entity_type_id'");
+        // Pass the query to the entity access control.
+        $this->reAlterQuery($query, $host_entity_type_id . '_access', $entity_alias);
+
+        // Additional checks for "node" entities.
+        if ($host_entity_type_id === 'node') {
+          // Passing the query to node_query_node_access_alter() is sadly
+          // insufficient for nodes.
+          // @see \Drupal\node\Plugin\EntityReferenceSelection\NodeSelection::buildEntityQuery()
+          if (!$this->currentUser->hasPermission('bypass node access') && !$this->moduleHandler->hasImplementations('node_grants')) {
+            $query->condition($entity_alias . '.status', 1);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getReferenceableEntities($match = NULL, $match_operator = 'CONTAINS', $limit = 0) {
+    $target_type = $this->getConfiguration()['target_type'];
+
+    $query = $this->buildEntityQuery($match, $match_operator);
+    if ($limit > 0) {
+      $query->range(0, $limit);
     }
+
+    $result = $query->execute();
+
+    if (empty($result)) {
+      return [];
+    }
+
+    $options = [];
+    $entities = $this->entityTypeManager->getStorage($target_type)->loadMultiple($result);
+    foreach ($entities as $entity_id => $entity) {
+      // Additional access check as comments might be attached to entities
+      // which the current user does not have access to.
+      if ($entity->access('view', $this->currentUser)) {
+        $bundle = $entity->bundle();
+        $options[$bundle][$entity_id] = Html::escape($this->entityRepository->getTranslationFromContext($entity)->label() ?? '');
+      }
+    }
+
+    return $options;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function countReferenceableEntities($match = NULL, $match_operator = 'CONTAINS') {
+    $options = $this->getReferenceableEntities($match, $match_operator);
+    return count($options, COUNT_RECURSIVE) - count($options);
   }
 
 }
diff --git a/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php b/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
index 255b5ab7c..b3934b9d9 100644
--- a/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
+++ b/web/core/modules/comment/src/Plugin/Field/FieldType/CommentItem.php
@@ -12,6 +12,7 @@
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Session\AnonymousUserSession;
 use Drupal\Core\Url;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Plugin implementation of the 'comment' field type.
@@ -55,26 +56,26 @@ public static function defaultFieldSettings() {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['status'] = DataDefinition::create('integer')
-      ->setLabel(t('Comment status'))
+      ->setLabel(new TranslatableMarkup('Comment status'))
       ->setRequired(TRUE);
 
     $properties['cid'] = DataDefinition::create('integer')
-      ->setLabel(t('Last comment ID'));
+      ->setLabel(new TranslatableMarkup('Last comment ID'));
 
     $properties['last_comment_timestamp'] = DataDefinition::create('integer')
-      ->setLabel(t('Last comment timestamp'))
-      ->setDescription(t('The time that the last comment was created.'));
+      ->setLabel(new TranslatableMarkup('Last comment timestamp'))
+      ->setDescription(new TranslatableMarkup('The time that the last comment was created.'));
 
     $properties['last_comment_name'] = DataDefinition::create('string')
-      ->setLabel(t('Last comment name'))
-      ->setDescription(t('The name of the user posting the last comment.'));
+      ->setLabel(new TranslatableMarkup('Last comment name'))
+      ->setDescription(new TranslatableMarkup('The name of the user posting the last comment.'));
 
     $properties['last_comment_uid'] = DataDefinition::create('integer')
-      ->setLabel(t('Last comment user ID'));
+      ->setLabel(new TranslatableMarkup('Last comment user ID'));
 
     $properties['comment_count'] = DataDefinition::create('integer')
-      ->setLabel(t('Number of comments'))
-      ->setDescription(t('The number of comments.'));
+      ->setLabel(new TranslatableMarkup('Number of comments'))
+      ->setDescription(new TranslatableMarkup('The number of comments.'));
 
     return $properties;
   }
@@ -108,13 +109,13 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['default_mode'] = [
       '#type' => 'checkbox',
-      '#title' => t('Threading'),
+      '#title' => $this->t('Threading'),
       '#default_value' => $settings['default_mode'],
-      '#description' => t('Show comment replies in a threaded list.'),
+      '#description' => $this->t('Show comment replies in a threaded list.'),
     ];
     $element['per_page'] = [
       '#type' => 'number',
-      '#title' => t('Comments per page'),
+      '#title' => $this->t('Comments per page'),
       '#default_value' => $settings['per_page'],
       '#required' => TRUE,
       '#min' => 1,
@@ -122,28 +123,28 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['anonymous'] = [
       '#type' => 'select',
-      '#title' => t('Anonymous commenting'),
+      '#title' => $this->t('Anonymous commenting'),
       '#default_value' => $settings['anonymous'],
       '#options' => [
-        CommentInterface::ANONYMOUS_MAYNOT_CONTACT => t('Anonymous posters may not enter their contact information'),
-        CommentInterface::ANONYMOUS_MAY_CONTACT => t('Anonymous posters may leave their contact information'),
-        CommentInterface::ANONYMOUS_MUST_CONTACT => t('Anonymous posters must leave their contact information'),
+        CommentInterface::ANONYMOUS_MAYNOT_CONTACT => $this->t('Anonymous posters may not enter their contact information'),
+        CommentInterface::ANONYMOUS_MAY_CONTACT => $this->t('Anonymous posters may leave their contact information'),
+        CommentInterface::ANONYMOUS_MUST_CONTACT => $this->t('Anonymous posters must leave their contact information'),
       ],
       '#access' => $anonymous_user->hasPermission('post comments'),
     ];
     $element['form_location'] = [
       '#type' => 'checkbox',
-      '#title' => t('Show reply form on the same page as comments'),
+      '#title' => $this->t('Show reply form on the same page as comments'),
       '#default_value' => $settings['form_location'],
     ];
     $element['preview'] = [
       '#type' => 'radios',
-      '#title' => t('Preview comment'),
+      '#title' => $this->t('Preview comment'),
       '#default_value' => $settings['preview'],
       '#options' => [
-        DRUPAL_DISABLED => t('Disabled'),
-        DRUPAL_OPTIONAL => t('Optional'),
-        DRUPAL_REQUIRED => t('Required'),
+        DRUPAL_DISABLED => $this->t('Disabled'),
+        DRUPAL_OPTIONAL => $this->t('Optional'),
+        DRUPAL_REQUIRED => $this->t('Required'),
       ],
     ];
 
@@ -185,7 +186,7 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
     }
     $element['comment_type'] = [
       '#type' => 'select',
-      '#title' => t('Comment type'),
+      '#title' => $this->t('Comment type'),
       '#options' => $options,
       '#required' => TRUE,
       '#description' => $this->t('Select the Comment type to use for this comment field. Manage the comment types from the <a href=":url">administration overview page</a>.', [':url' => Url::fromRoute('entity.comment_type.collection')->toString()]),
diff --git a/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php b/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
index c9478f622..a7159513b 100644
--- a/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
+++ b/web/core/modules/comment/src/Plugin/Field/FieldWidget/CommentWidget.php
@@ -29,22 +29,22 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
 
     $element['status'] = [
       '#type' => 'radios',
-      '#title' => t('Comments'),
+      '#title' => $this->t('Comments'),
       '#title_display' => 'invisible',
       '#default_value' => $items->status,
       '#options' => [
-        CommentItemInterface::OPEN => t('Open'),
-        CommentItemInterface::CLOSED => t('Closed'),
-        CommentItemInterface::HIDDEN => t('Hidden'),
+        CommentItemInterface::OPEN => $this->t('Open'),
+        CommentItemInterface::CLOSED => $this->t('Closed'),
+        CommentItemInterface::HIDDEN => $this->t('Hidden'),
       ],
       CommentItemInterface::OPEN => [
-        '#description' => t('Users with the "Post comments" permission can post comments.'),
+        '#description' => $this->t('Users with the "Post comments" permission can post comments.'),
       ],
       CommentItemInterface::CLOSED => [
-        '#description' => t('Users cannot post comments, but existing comments will be displayed.'),
+        '#description' => $this->t('Users cannot post comments, but existing comments will be displayed.'),
       ],
       CommentItemInterface::HIDDEN => [
-        '#description' => t('Comments are hidden from view.'),
+        '#description' => $this->t('Comments are hidden from view.'),
       ],
     ];
     // If the entity doesn't have any comments, the "hidden" option makes no
@@ -53,7 +53,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     if (!$this->isDefaultValueWidget($form_state) && !$items->comment_count) {
       $element['status'][CommentItemInterface::HIDDEN]['#access'] = FALSE;
       // Also adjust the description of the "closed" option.
-      $element['status'][CommentItemInterface::CLOSED]['#description'] = t('Users cannot post comments.');
+      $element['status'][CommentItemInterface::CLOSED]['#description'] = $this->t('Users cannot post comments.');
     }
     // If the advanced settings tabs-set is available (normally rendered in the
     // second column on wide-resolutions), place the field as a details element
diff --git a/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php b/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
index 1b9cd0279..17210e364 100644
--- a/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
+++ b/web/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php
@@ -27,10 +27,10 @@ class Comment extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('comments', 'c')
-      ->fields('c', ['cid', 'pid', 'nid', 'uid', 'subject',
-      'comment', 'hostname', 'timestamp', 'status', 'thread', 'name',
-      'mail', 'homepage', 'format',
-    ]);
+      ->fields('c', ['cid', 'pid', 'nid', 'uid', 'subject', 'comment',
+        'hostname', 'timestamp', 'status', 'thread', 'name', 'mail', 'homepage',
+        'format',
+      ]);
     $query->innerJoin('node', 'n', '[c].[nid] = [n].[nid]');
     $query->fields('n', ['type', 'language']);
     $query->orderBy('c.timestamp');
diff --git a/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php b/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
index 433d3c68f..bb4dca48d 100644
--- a/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
+++ b/web/core/modules/comment/src/Plugin/views/field/NodeNewComments.php
@@ -158,12 +158,12 @@ public function preRender(&$values) {
       $result = $this->database->query("SELECT [n].[nid], COUNT([c].[cid]) AS [num_comments] FROM {node} [n] INNER JOIN {comment_field_data} [c] ON [n].[nid] = [c].[entity_id] AND [c].[entity_type] = 'node' AND [c].[default_langcode] = 1
         LEFT JOIN {history} [h] ON [h].[nid] = [n].[nid] AND [h].[uid] = :h_uid WHERE [n].[nid] IN ( :nids[] )
         AND [c].[changed] > GREATEST(COALESCE([h].[timestamp], :timestamp1), :timestamp2) AND [c].[status] = :status GROUP BY [n].[nid]", [
-        ':status' => CommentInterface::PUBLISHED,
-        ':h_uid' => $user->id(),
-        ':nids[]' => $nids,
-        ':timestamp1' => HISTORY_READ_LIMIT,
-        ':timestamp2' => HISTORY_READ_LIMIT,
-      ]);
+          ':status' => CommentInterface::PUBLISHED,
+          ':h_uid' => $user->id(),
+          ':nids[]' => $nids,
+          ':timestamp1' => HISTORY_READ_LIMIT,
+          ':timestamp2' => HISTORY_READ_LIMIT,
+        ]);
       foreach ($result as $node) {
         foreach ($ids[$node->nid] as $id) {
           $values[$id]->{$this->field_alias} = $node->num_comments;
diff --git a/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php b/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
index b8200c1c7..309c1de4f 100644
--- a/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
+++ b/web/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
@@ -15,6 +15,16 @@
  */
 class StatisticsLastCommentName extends FieldPluginBase {
 
+  /**
+   * The users table.
+   */
+  protected $user_table;
+
+  /**
+   * The user name field.
+   */
+  protected $user_field;
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/comment/src/Plugin/views/field/StatisticsLastUpdated.php b/web/core/modules/comment/src/Plugin/views/field/StatisticsLastUpdated.php
index a3788e0b5..128f67ef0 100644
--- a/web/core/modules/comment/src/Plugin/views/field/StatisticsLastUpdated.php
+++ b/web/core/modules/comment/src/Plugin/views/field/StatisticsLastUpdated.php
@@ -13,6 +13,11 @@
  */
 class StatisticsLastUpdated extends Date {
 
+  /**
+   * The node table.
+   */
+  protected $node_table;
+
   public function query() {
     $this->ensureMyTable();
     $this->node_table = $this->query->ensureTable('node_field_data', $this->relationship);
diff --git a/web/core/modules/comment/src/Plugin/views/filter/StatisticsLastUpdated.php b/web/core/modules/comment/src/Plugin/views/filter/StatisticsLastUpdated.php
index 046edf4c3..1db2e4e1c 100644
--- a/web/core/modules/comment/src/Plugin/views/filter/StatisticsLastUpdated.php
+++ b/web/core/modules/comment/src/Plugin/views/filter/StatisticsLastUpdated.php
@@ -13,6 +13,11 @@
  */
 class StatisticsLastUpdated extends Date {
 
+  /**
+   * The node table.
+   */
+  protected $node_table;
+
   public function query() {
     $this->ensureMyTable();
     $this->node_table = $this->query->ensureTable('node', $this->relationship);
diff --git a/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php b/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php
index 2a9604e6e..75bc43f8c 100644
--- a/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php
+++ b/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastCommentName.php
@@ -13,6 +13,16 @@
  */
 class StatisticsLastCommentName extends SortPluginBase {
 
+  /**
+   * The users table.
+   */
+  protected $user_table;
+
+  /**
+   * The user name field.
+   */
+  protected $user_field;
+
   public function query() {
     $this->ensureMyTable();
     $definition = [
diff --git a/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastUpdated.php b/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastUpdated.php
index 0f9c055ec..a0c7bec5a 100644
--- a/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastUpdated.php
+++ b/web/core/modules/comment/src/Plugin/views/sort/StatisticsLastUpdated.php
@@ -13,6 +13,16 @@
  */
 class StatisticsLastUpdated extends Date {
 
+  /**
+   * The node table.
+   */
+  protected $node_table;
+
+  /**
+   * The field alias.
+   */
+  protected $field_alias;
+
   public function query() {
     $this->ensureMyTable();
     $this->node_table = $this->query->ensureTable('node', $this->relationship);
diff --git a/web/core/modules/comment/tests/modules/comment_empty_title_test/comment_empty_title_test.module b/web/core/modules/comment/tests/modules/comment_empty_title_test/comment_empty_title_test.module
index 3fe1616e7..9baeb7e3f 100644
--- a/web/core/modules/comment/tests/modules/comment_empty_title_test/comment_empty_title_test.module
+++ b/web/core/modules/comment/tests/modules/comment_empty_title_test/comment_empty_title_test.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Dummy module emptying comment titles to test for appropriate and accessible
- * markup in edge case scenarios where comments have empty titles.
+ * Empties comment titles to test markup in edge case scenarios.
  */
 
 /**
diff --git a/web/core/modules/comment/tests/modules/comment_test/comment_test.module b/web/core/modules/comment/tests/modules/comment_test/comment_test.module
index 3b5437e2a..3dd4f4279 100644
--- a/web/core/modules/comment/tests/modules/comment_test/comment_test.module
+++ b/web/core/modules/comment/tests/modules/comment_test/comment_test.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Dummy module implementing comment related hooks to test API interaction with
- * the Comment module.
+ * Implements comment-related hooks to test API interactions.
  */
 
 use Drupal\comment\CommentInterface;
diff --git a/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php b/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php
index 9a3f40bc1..e7026026e 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentAdminTest.php
@@ -20,6 +20,9 @@ class CommentAdminTest extends CommentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php b/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
index 547fbfbf6..f65821f0c 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentAnonymousTest.php
@@ -17,6 +17,9 @@ class CommentAnonymousTest extends CommentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentBlockTest.php b/web/core/modules/comment/tests/src/Functional/CommentBlockTest.php
index ac72aeae0..7ff903327 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentBlockTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentBlockTest.php
@@ -23,6 +23,9 @@ class CommentBlockTest extends CommentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Update admin user to have the 'administer blocks' permission.
@@ -34,7 +37,7 @@ protected function setUp(): void {
       'access comments',
       'access content',
       'administer blocks',
-     ]);
+    ]);
   }
 
   /**
diff --git a/web/core/modules/comment/tests/src/Functional/CommentBookTest.php b/web/core/modules/comment/tests/src/Functional/CommentBookTest.php
index cb66313ed..605d9d5fe 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentBookTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentBookTest.php
@@ -29,6 +29,9 @@ class CommentBookTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php b/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php
index 8491e0ef9..5ad9c9324 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentCSSTest.php
@@ -21,14 +21,12 @@ class CommentCSSTest extends CommentTestBase {
    * The theme to install as the default for testing.
    *
    * @var string
-   *
-   * @todo This test's reliance on classes makes Stark a bad fit as a base
-   *   theme. Change the default theme to Starterkit once it is stable.
-   *
-   * @see https://www.drupal.org/project/drupal/issues/3267890
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentDisplayConfigurableTest.php b/web/core/modules/comment/tests/src/Functional/CommentDisplayConfigurableTest.php
index 7e1cea122..958a2d381 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentDisplayConfigurableTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentDisplayConfigurableTest.php
@@ -18,8 +18,11 @@ class CommentDisplayConfigurableTest extends CommentTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'bartik';
+  protected $defaultTheme = 'olivero';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php b/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php
index d31b6077c..984f1fe45 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentEntityTest.php
@@ -41,6 +41,9 @@ class CommentEntityTest extends CommentTestBase {
   protected $vocab;
   protected $commentType;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php b/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
index eca7d143b..ac81de679 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentInterfaceTest.php
@@ -121,7 +121,7 @@ public function testCommentInterface() {
     // Reply to comment #2 creating comment #3 with optional preview and no
     // subject though field enabled.
     $this->drupalLogin($this->webUser);
-    // Deliberately use the wrong url to test
+    // Deliberately use the wrong URL to test
     // \Drupal\comment\Controller\CommentController::redirectNode().
     $this->drupalGet('comment/' . $this->node->id() . '/reply');
     // Verify we were correctly redirected.
diff --git a/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php b/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
index 4759e0f32..664d3de56 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentLanguageTest.php
@@ -39,6 +39,9 @@ class CommentLanguageTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php b/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
index d7b16809b..ba65e98dc 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentLinksAlterTest.php
@@ -16,6 +16,9 @@ class CommentLinksAlterTest extends CommentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php b/web/core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php
index 9be22cc30..12fcc1230 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNodeAccessTest.php
@@ -26,6 +26,9 @@ class CommentNodeAccessTest extends CommentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
index 0d93e544d..16b809f3b 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentNonNodeTest.php
@@ -120,7 +120,7 @@ protected function setUp(): void {
    * @return \Drupal\comment\CommentInterface
    *   The new comment entity.
    */
-  public function postComment(EntityInterface $entity, $comment, $subject = '', $contact = NULL) {
+  public function postComment(?EntityInterface $entity, $comment, $subject = '', $contact = NULL) {
     $edit = [];
     $edit['comment_body[0][value]'] = $comment;
 
@@ -305,6 +305,18 @@ public function testCommentFunctionality() {
     $this->drupalGet('comment/' . $comment1->id() . '/delete');
     $this->assertSession()->elementTextEquals('xpath', '//nav[@aria-labelledby="system-breadcrumb"]/ol/li[last()]/a', $comment1->getSubject());
 
+    // Test threading replying to comment #1 creating comment #1_2.
+    $this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1->id());
+    $comment1_2 = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName());
+    $this->assertTrue($this->commentExists($comment1_2, TRUE), 'Comment #1_2. Reply found.');
+    $this->assertEquals('01.00/', $comment1_2->getThread());
+
+    // Test nested threading replying to comment #1_2 creating comment #1_2_3.
+    $this->drupalGet('comment/reply/entity_test/' . $this->entity->id() . '/comment/' . $comment1_2->id());
+    $comment1_2_3 = $this->postComment(NULL, $this->randomMachineName(), $this->randomMachineName());
+    $this->assertTrue($this->commentExists($comment1_2_3, TRUE), 'Comment #1_2_3. Reply found.');
+    $this->assertEquals('01.00.00/', $comment1_2_3->getThread());
+
     // Unpublish the comment.
     $this->performCommentOperation($comment1, 'unpublish');
     $this->drupalGet('admin/content/comment/approval');
@@ -450,7 +462,7 @@ public function testCommentFunctionality() {
     $this->assertSession()->checkboxChecked('edit-field-foobar-0-status-2');
     $this->assertSession()->fieldNotExists('edit-field-foobar-0-status-0');
 
-    // @todo Check proper url and form https://www.drupal.org/node/2458323
+    // @todo Check proper URL and form https://www.drupal.org/node/2458323
     $this->drupalGet('comment/reply/entity_test/comment/' . $new_entity->id());
     $this->assertSession()->fieldNotExists('subject[0][value]');
     $this->assertSession()->fieldNotExists('comment_body[0][value]');
diff --git a/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php b/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
index 6e24d5ebb..f9043c534 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentPreviewTest.php
@@ -20,13 +20,16 @@ class CommentPreviewTest extends CommentTestBase {
   }
 
   /**
-   * The profile to install as a basis for testing.
+   * Modules to install.
    *
-   * Using the standard profile to test user picture display in comments.
-   *
-   * @var string
+   * @var array
+   */
+  protected static $modules = ['olivero_test', 'test_user_config'];
+
+  /**
+   * {@inheritdoc}
    */
-  protected $profile = 'standard';
+  protected $defaultTheme = 'olivero';
 
   /**
    * Tests comment preview.
diff --git a/web/core/modules/comment/tests/src/Functional/CommentStatisticsTest.php b/web/core/modules/comment/tests/src/Functional/CommentStatisticsTest.php
index 1b8fbe630..1bccf23e6 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentStatisticsTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentStatisticsTest.php
@@ -25,6 +25,9 @@ class CommentStatisticsTest extends CommentTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTestBase.php b/web/core/modules/comment/tests/src/Functional/CommentTestBase.php
index 97acf2299..bfefc6169 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTestBase.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTestBase.php
@@ -54,6 +54,9 @@ abstract class CommentTestBase extends BrowserTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
@@ -78,7 +81,7 @@ protected function setUp() {
       // permission is granted.
       'access user profiles',
       'access content',
-     ]);
+    ]);
     $this->webUser = $this->drupalCreateUser([
       'access comments',
       'post comments',
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php b/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php
index c2a42e254..5f94a88e9 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTitleTest.php
@@ -3,8 +3,7 @@
 namespace Drupal\Tests\comment\Functional;
 
 /**
- * Tests to ensure that appropriate and accessible markup is created for comment
- * titles.
+ * Tests that appropriate and accessible markup is created for comment titles.
  *
  * @group comment
  */
@@ -93,7 +92,7 @@ public function testCommentPopulatedTitles() {
     // Tests that the comment's title link is the permalink of the comment.
     $comment_permalink = $this->cssSelect('.permalink');
     $comment_permalink = $comment_permalink[0]->getAttribute('href');
-    // Tests that the comment's title link contains the url fragment.
+    // Tests that the comment's title link contains the URL fragment.
     $this->assertStringContainsString('#comment-' . $comment1->id(), $comment_permalink, "The comment's title link contains the url fragment.");
     $this->assertEquals($comment1->permalink()->toString(), $comment_permalink, "The comment's title has the correct link.");
   }
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php b/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
index f7a90496e..c370c97ab 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTokenReplaceTest.php
@@ -14,8 +14,7 @@
 use Drupal\user\Entity\User;
 
 /**
- * Generates text using placeholders for dummy content to check comment token
- * replacement.
+ * Tests comment token replacement.
  *
  * @group comment
  */
diff --git a/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php b/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
index 09b92f2da..e20146500 100644
--- a/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
+++ b/web/core/modules/comment/tests/src/Functional/CommentTranslationUITest.php
@@ -62,6 +62,9 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
     'comment',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->entityTypeId = 'comment';
     $this->bundle = 'comment_article';
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentEditTest.php b/web/core/modules/comment/tests/src/Functional/Views/CommentEditTest.php
index 94263d081..c19ff3514 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentEditTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentEditTest.php
@@ -14,7 +14,7 @@ class CommentEditTest extends CommentBrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $profile = 'standard';
+  protected $defaultTheme = 'stark';
 
   /**
    * Tests comment label in admin view.
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php b/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
index 678fab6c8..eb053087c 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
@@ -36,6 +36,9 @@ class CommentFieldFilterTest extends CommentTestBase {
    */
   public $commentTitles = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['comment_test_views']): void {
     parent::setUp($import_test_views, $modules);
     $this->drupalLogin($this->drupalCreateUser(['access comments']));
diff --git a/web/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php b/web/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php
index ca5d67298..44a67eaac 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php
@@ -55,6 +55,9 @@ abstract class CommentTestBase extends ViewTestBase {
    */
   protected $comment;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['comment_test_views']) {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php b/web/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
index e62373a4f..5e584b15f 100644
--- a/web/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
+++ b/web/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
@@ -61,10 +61,13 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
   /**
    * Contains the node object used for comments of this test.
    *
-   * @var \Drupal\node\Node
+   * @var \Drupal\node\NodeInterface
    */
   public $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentBaseFieldTest.php b/web/core/modules/comment/tests/src/Kernel/CommentBaseFieldTest.php
index 6879613a4..4aeac696e 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentBaseFieldTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentBaseFieldTest.php
@@ -26,6 +26,9 @@ class CommentBaseFieldTest extends KernelTestBase {
     'comment_base_field_test',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('comment_test_base_field');
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php b/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
index 1997a843b..df383f399 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
@@ -12,8 +12,7 @@
 use Drupal\entity_test\Entity\EntityTest;
 
 /**
- * Tests the bubbling up of comment cache tags when using the Comment list
- * formatter on an entity.
+ * Tests comment cache tag bubbling up when using the Comment list formatter.
  *
  * @group comment
  */
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php b/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
index 0d9630323..414eb9a79 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
@@ -300,11 +300,11 @@ public function testAccessToAdministrativeFields() {
             $set['user']->hasPermission('post comments') &&
             $set['comment']->getFieldName() == 'comment_other'
           ), new FormattableMarkup('User @user @state update field @field on comment @comment', [
-          '@user' => $set['user']->getAccountName(),
-          '@state' => $may_update ? 'can' : 'cannot',
-          '@comment' => $set['comment']->getSubject(),
-          '@field' => $field,
-        ]));
+            '@user' => $set['user']->getAccountName(),
+            '@state' => $may_update ? 'can' : 'cannot',
+            '@comment' => $set['comment']->getSubject(),
+            '@field' => $field,
+          ]));
       }
     }
     foreach ($permutations as $set) {
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php b/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php
index 78b619222..cbdbd1fbe 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentItemTest.php
@@ -25,6 +25,9 @@ class CommentItemTest extends FieldKernelTestBase {
    */
   protected static $modules = ['comment', 'entity_test', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('comment');
diff --git a/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php b/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
index 817abbcd3..bb9c29a6f 100644
--- a/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
+++ b/web/core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
@@ -27,6 +27,9 @@ class CommentStringIdEntitiesTest extends KernelTestBase {
     'text',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('comment');
diff --git a/web/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php b/web/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php
index ec274bbe1..38101770a 100644
--- a/web/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php
+++ b/web/core/modules/comment/tests/src/Kernel/Views/CommentViewsKernelTestBase.php
@@ -39,6 +39,9 @@ abstract class CommentViewsKernelTestBase extends ViewsKernelTestBase {
    */
   protected $userStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE) {
     parent::setUp($import_test_views);
 
diff --git a/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php b/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php
index cfc65d3af..e93f9c86d 100644
--- a/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php
+++ b/web/core/modules/comment/tests/src/Unit/CommentManagerTest.php
@@ -26,28 +26,28 @@ public function testGetFields() {
     $entity_type = $this->createMock('Drupal\Core\Entity\ContentEntityTypeInterface');
     $entity_type->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Node'));
+      ->willReturn('Node');
     $entity_type->expects($this->any())
       ->method('entityClassImplements')
       ->with(FieldableEntityInterface::class)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $entity_field_manager = $this->createMock(EntityFieldManagerInterface::class);
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
 
     $entity_field_manager->expects($this->once())
       ->method('getFieldMapByFieldType')
-      ->will($this->returnValue([
+      ->willReturn([
         'node' => [
           'field_foobar' => [
             'type' => 'comment',
           ],
         ],
-      ]));
+      ]);
 
     $entity_type_manager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $comment_manager = new CommentManager(
       $entity_type_manager,
diff --git a/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php b/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
index b0412210e..a0dd40abc 100644
--- a/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
+++ b/web/core/modules/comment/tests/src/Unit/CommentStatisticsUnitTest.php
@@ -15,7 +15,7 @@ class CommentStatisticsUnitTest extends UnitTestCase {
   /**
    * Mock statement.
    *
-   * @var \Drupal\Core\Database\Statement
+   * @var \Drupal\Core\Database\StatementInterface
    */
   protected $statement;
 
@@ -73,7 +73,7 @@ protected function setUp(): void {
 
     $this->select->expects($this->any())
       ->method('execute')
-      ->will($this->returnValue($this->statement));
+      ->willReturn($this->statement);
 
     $this->database = $this->getMockBuilder('Drupal\Core\Database\Connection')
       ->disableOriginalConstructor()
@@ -81,7 +81,7 @@ protected function setUp(): void {
 
     $this->database->expects($this->once())
       ->method('select')
-      ->will($this->returnValue($this->select));
+      ->willReturn($this->select);
 
     $this->commentStatistics = new CommentStatistics($this->database, $this->createMock('Drupal\Core\Session\AccountInterface'), $this->createMock(EntityTypeManagerInterface::class), $this->createMock('Drupal\Core\State\StateInterface'), $this->database);
   }
diff --git a/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php b/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
index 304d2dd85..3e70f0bb8 100644
--- a/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Entity/CommentLockTest.php
@@ -33,7 +33,7 @@ public function testLocks() {
     $lock->expects($this->once())
       ->method('acquire')
       ->with($lock_name, 30)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $lock->expects($this->once())
       ->method('release')
       ->with($lock_name);
@@ -55,27 +55,27 @@ public function testLocks() {
       ->getMock();
     $comment->expects($this->once())
       ->method('isNew')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $comment->expects($this->once())
       ->method('hasParentComment')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $comment->expects($this->once())
       ->method('getParentComment')
-      ->will($this->returnValue($comment));
+      ->willReturn($comment);
     $comment->expects($this->once())
       ->method('getCommentedEntityId')
-      ->will($this->returnValue($cid));
+      ->willReturn($cid);
     $comment->expects($this->any())
       ->method('getThread')
-      ->will($this->returnValue(''));
+      ->willReturn('');
 
     $anon_user = $this->createMock('Drupal\Core\Session\AccountInterface');
     $anon_user->expects($this->any())
       ->method('isAnonymous')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $comment->expects($this->any())
       ->method('getOwner')
-      ->will($this->returnValue($anon_user));
+      ->willReturn($anon_user);
 
     $parent_entity = $this->createMock('\Drupal\Core\Entity\ContentEntityInterface');
     $parent_entity->expects($this->atLeastOnce())
@@ -88,7 +88,7 @@ public function testLocks() {
     $entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $comment->expects($this->any())
       ->method('getEntityType')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
     $storage = $this->createMock('Drupal\comment\CommentStorageInterface');
 
     // preSave() should acquire the lock. (This is what's really being tested.)
diff --git a/web/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php b/web/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php
index d342bda45..6a9aded8c 100644
--- a/web/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php
+++ b/web/core/modules/comment/tests/src/Unit/Plugin/views/field/CommentBulkFormTest.php
@@ -33,26 +33,26 @@ public function testConstructor() {
       $action = $this->createMock('\Drupal\system\ActionConfigEntityInterface');
       $action->expects($this->any())
         ->method('getType')
-        ->will($this->returnValue('comment'));
+        ->willReturn('comment');
       $actions[$i] = $action;
     }
 
     $action = $this->createMock('\Drupal\system\ActionConfigEntityInterface');
     $action->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('user'));
+      ->willReturn('user');
     $actions[] = $action;
 
     $entity_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $entity_storage->expects($this->any())
       ->method('loadMultiple')
-      ->will($this->returnValue($actions));
+      ->willReturn($actions);
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->once())
       ->method('getStorage')
       ->with('action')
-      ->will($this->returnValue($entity_storage));
+      ->willReturn($entity_storage);
 
     $entity_repository = $this->createMock(EntityRepositoryInterface::class);
 
@@ -66,7 +66,7 @@ public function testConstructor() {
     $views_data->expects($this->any())
       ->method('get')
       ->with('comment')
-      ->will($this->returnValue(['table' => ['entity type' => 'comment']]));
+      ->willReturn(['table' => ['entity type' => 'comment']]);
     $container = new ContainerBuilder();
     $container->set('views.views_data', $views_data);
     $container->set('string_translation', $this->getStringTranslationStub());
@@ -76,7 +76,7 @@ public function testConstructor() {
     $storage->expects($this->any())
       ->method('get')
       ->with('base_table')
-      ->will($this->returnValue('comment'));
+      ->willReturn('comment');
 
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
diff --git a/web/core/modules/config/src/Form/ConfigSingleImportForm.php b/web/core/modules/config/src/Form/ConfigSingleImportForm.php
index 88be9a58d..b33dc9c64 100644
--- a/web/core/modules/config/src/Form/ConfigSingleImportForm.php
+++ b/web/core/modules/config/src/Form/ConfigSingleImportForm.php
@@ -17,6 +17,7 @@
 use Drupal\Core\Extension\ModuleExtensionList;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ModuleInstallerInterface;
+use Drupal\Core\Extension\ThemeExtensionList;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
 use Drupal\Core\Form\FormStateInterface;
@@ -104,6 +105,13 @@ class ConfigSingleImportForm extends ConfirmFormBase {
    */
   protected $moduleExtensionList;
 
+  /**
+   * The theme extension list.
+   *
+   * @var \Drupal\Core\Extension\ThemeExtensionList
+   */
+  protected $themeExtensionList;
+
   /**
    * The module installer.
    *
@@ -150,8 +158,10 @@ class ConfigSingleImportForm extends ConfirmFormBase {
    *   The theme handler.
    * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
    *   The module extension list.
+   * @param \Drupal\Core\Extension\ThemeExtensionList $extension_list_theme
+   *   The theme extension list.
    */
-  public function __construct(EntityTypeManagerInterface $entity_type_manager, StorageInterface $config_storage, RendererInterface $renderer, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, LockBackendInterface $lock, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, ModuleExtensionList $extension_list_module) {
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, StorageInterface $config_storage, RendererInterface $renderer, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, LockBackendInterface $lock, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, ModuleExtensionList $extension_list_module, ThemeExtensionList $extension_list_theme = NULL) {
     $this->entityTypeManager = $entity_type_manager;
     $this->configStorage = $config_storage;
     $this->renderer = $renderer;
@@ -165,6 +175,10 @@ public function __construct(EntityTypeManagerInterface $entity_type_manager, Sto
     $this->moduleInstaller = $module_installer;
     $this->themeHandler = $theme_handler;
     $this->moduleExtensionList = $extension_list_module;
+    if ($extension_list_theme === NULL) {
+      $extension_list_theme = \Drupal::service('extension.list.theme');
+    }
+    $this->themeExtensionList = $extension_list_theme;
   }
 
   /**
@@ -182,7 +196,8 @@ public static function create(ContainerInterface $container) {
       $container->get('module_handler'),
       $container->get('module_installer'),
       $container->get('theme_handler'),
-      $container->get('extension.list.module')
+      $container->get('extension.list.module'),
+      $container->get('extension.list.theme')
     );
   }
 
@@ -370,7 +385,8 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
           $this->moduleInstaller,
           $this->themeHandler,
           $this->getStringTranslation(),
-          $this->moduleExtensionList
+          $this->moduleExtensionList,
+          $this->themeExtensionList
         );
 
         try {
diff --git a/web/core/modules/config/src/Form/ConfigSync.php b/web/core/modules/config/src/Form/ConfigSync.php
index f8613e77e..af39f3cea 100644
--- a/web/core/modules/config/src/Form/ConfigSync.php
+++ b/web/core/modules/config/src/Form/ConfigSync.php
@@ -11,6 +11,7 @@
 use Drupal\Core\Extension\ModuleExtensionList;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Extension\ModuleInstallerInterface;
+use Drupal\Core\Extension\ThemeExtensionList;
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Config\ConfigManagerInterface;
 use Drupal\Core\Form\FormBase;
@@ -121,6 +122,13 @@ class ConfigSync extends FormBase {
    */
   protected $importTransformer;
 
+  /**
+   * The theme extension list.
+   *
+   * @var \Drupal\Core\Extension\ThemeExtensionList
+   */
+  protected $themeExtensionList;
+
   /**
    * Constructs the object.
    *
@@ -150,8 +158,10 @@ class ConfigSync extends FormBase {
    *   The module extension list
    * @param \Drupal\Core\Config\ImportStorageTransformer $import_transformer
    *   The import transformer service.
+   * @param \Drupal\Core\Extension\ThemeExtensionList $extension_list_theme
+   *   The theme extension list.
    */
-  public function __construct(StorageInterface $sync_storage, StorageInterface $active_storage, StorageInterface $snapshot_storage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, RendererInterface $renderer, ModuleExtensionList $extension_list_module, ImportStorageTransformer $import_transformer) {
+  public function __construct(StorageInterface $sync_storage, StorageInterface $active_storage, StorageInterface $snapshot_storage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigManagerInterface $config_manager, TypedConfigManagerInterface $typed_config, ModuleHandlerInterface $module_handler, ModuleInstallerInterface $module_installer, ThemeHandlerInterface $theme_handler, RendererInterface $renderer, ModuleExtensionList $extension_list_module, ImportStorageTransformer $import_transformer, ThemeExtensionList $extension_list_theme = NULL) {
     $this->syncStorage = $sync_storage;
     $this->activeStorage = $active_storage;
     $this->snapshotStorage = $snapshot_storage;
@@ -165,6 +175,11 @@ public function __construct(StorageInterface $sync_storage, StorageInterface $ac
     $this->renderer = $renderer;
     $this->moduleExtensionList = $extension_list_module;
     $this->importTransformer = $import_transformer;
+    if ($extension_list_theme === NULL) {
+      @trigger_error('Calling ' . __METHOD__ . ' without the $extension_list_theme argument is deprecated in drupal:10.1.0 and will be required in drupal:11.0.0. See https://www.drupal.org/node/3284397', E_USER_DEPRECATED);
+      $extension_list_theme = \Drupal::service('extension.list.theme');
+    }
+    $this->themeExtensionList = $extension_list_theme;
   }
 
   /**
@@ -184,7 +199,8 @@ public static function create(ContainerInterface $container) {
       $container->get('theme_handler'),
       $container->get('renderer'),
       $container->get('extension.list.module'),
-      $container->get('config.import_transformer')
+      $container->get('config.import_transformer'),
+      $container->get('extension.list.theme')
     );
   }
 
@@ -357,7 +373,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       $this->moduleInstaller,
       $this->themeHandler,
       $this->getStringTranslation(),
-      $this->moduleExtensionList
+      $this->moduleExtensionList,
+      $this->themeExtensionList
     );
     if ($config_importer->alreadyImporting()) {
       $this->messenger()->addStatus($this->t('Another request may be synchronizing configuration already.'));
diff --git a/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.ignore.yml b/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.ignore.yml
index 3b64ae982..37e231ac0 100644
--- a/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.ignore.yml
+++ b/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.ignore.yml
@@ -3,7 +3,7 @@ irrelevant: 123
 indescribable:
   abc: 789
   def:
-   - 456
-   - 'abc'
+    - 456
+    - 'abc'
   xyz: 13.4
 weight: 27
diff --git a/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.noschema.yml b/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.noschema.yml
index 3c9efe813..378530a26 100644
--- a/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.noschema.yml
+++ b/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.noschema.yml
@@ -1,4 +1,4 @@
 testitem: "Whatever structure there is in this file"
 testlist:
- - "the main file has no schema, so individual items"
- - "will not have any schema information."
+  - "the main file has no schema, so individual items"
+  - "will not have any schema information."
diff --git a/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.yml b/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.yml
index f783c1370..3a18da2cf 100644
--- a/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.yml
+++ b/web/core/modules/config/tests/config_schema_test/config/install/config_schema_test.someschema.yml
@@ -1,5 +1,5 @@
 testitem: 'Since this file at least has top level schema in config_test.schema.yml'
 testlist:
- - 'Direct string items are identified and other items are'
- - 'recognized as undefined types.'
+  - 'Direct string items are identified and other items are'
+  - 'recognized as undefined types.'
 test_no_schema: 12
diff --git a/web/core/modules/config/tests/config_test/config/schema/config_test.schema.yml b/web/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
index 1a0cf347a..2a707facb 100644
--- a/web/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
+++ b/web/core/modules/config/tests/config_test/config/schema/config_test.schema.yml
@@ -131,13 +131,13 @@ config_test.new:
   type: config_object
   label: 'Configuration test'
   mapping:
-     key:
-       type: string
-       label: 'Test setting'
-     new_key:
-       type: string
-       label: 'Test setting'
-     uuid:
+    key:
+      type: string
+      label: 'Test setting'
+    new_key:
+      type: string
+      label: 'Test setting'
+    uuid:
       type: uuid
 
 config_test.old:
@@ -147,16 +147,16 @@ config_test.foo:
   type: config_object
   label: 'Configuration test'
   mapping:
-     value:
-       type: mapping
-       label: 'Value'
-       mapping:
-         key:
-           type: string
-           label: 'Key'
-     label:
-       type: label
-       label: 'Label'
+    value:
+      type: mapping
+      label: 'Value'
+      mapping:
+        key:
+          type: string
+          label: 'Key'
+    label:
+      type: label
+      label: 'Label'
 
 config_test.bar:
   type: config_test.foo
diff --git a/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php b/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
index 2c5a6bf56..f2aff9521 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigEntityTest.php
@@ -189,7 +189,7 @@ public function testCRUD() {
     $this->assertTrue($same_id->isNew());
     try {
       $same_id->save();
-      $this->fail('Not possible to overwrite an entity entity.');
+      $this->fail('Not possible to overwrite an entity.');
     }
     catch (EntityStorageException $e) {
       // Expected exception; just continue testing.
diff --git a/web/core/modules/config/tests/src/Functional/ConfigImportAllTest.php b/web/core/modules/config/tests/src/Functional/ConfigImportAllTest.php
index 2bfaf484a..72b4efd2b 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigImportAllTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigImportAllTest.php
@@ -33,6 +33,9 @@ class ConfigImportAllTest extends ModuleTestBase {
    */
   protected $profile = 'standard';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php b/web/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php
index cadd96ad3..6d3b222bc 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php
@@ -37,6 +37,9 @@ class ConfigImportInstallProfileTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php
index b6d984974..bfb329686 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigImportUITest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\config\Functional;
 
 use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Serialization\Yaml;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -37,6 +38,9 @@ class ConfigImportUITest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -88,18 +92,18 @@ public function testImport() {
     $core_extension['module']['automated_cron'] = 0;
     $core_extension['module']['ban'] = 0;
     $core_extension['module'] = module_config_sort($core_extension['module']);
-    // Bartik is a subtheme of Stable so Stable must be enabled.
-    $core_extension['theme']['stable'] = 0;
-    $core_extension['theme']['bartik'] = 0;
+    $core_extension['theme']['olivero'] = 0;
     $sync->write('core.extension', $core_extension);
+    // Olivero ships with configuration.
+    $sync->write('olivero.settings', Yaml::decode(file_get_contents('core/themes/olivero/config/install/olivero.settings.yml')));
 
     // Use the install storage so that we can read configuration from modules
     // and themes that are not installed.
     $install_storage = new InstallStorage();
 
-    // Set the Bartik theme as default.
+    // Set the Olivero theme as default.
     $system_theme = $this->config('system.theme')->get();
-    $system_theme['default'] = 'bartik';
+    $system_theme['default'] = 'olivero';
     $sync->write('system.theme', $system_theme);
 
     // Read the automated_cron config from module default config folder.
@@ -155,7 +159,7 @@ public function testImport() {
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists('automated_cron'), 'Automated Cron module installed during import.');
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists('options'), 'Options module installed during import.');
     $this->assertTrue(\Drupal::moduleHandler()->moduleExists('text'), 'Text module installed during import.');
-    $this->assertTrue(\Drupal::service('theme_handler')->themeExists('bartik'), 'Bartik theme installed during import.');
+    $this->assertTrue(\Drupal::service('theme_handler')->themeExists('olivero'), 'Olivero theme installed during import.');
 
     // Ensure installations and uninstallation occur as expected.
     $installed = \Drupal::state()->get('ConfigImportUITest.core.extension.modules_installed', []);
@@ -177,10 +181,11 @@ public function testImport() {
     unset($core_extension['module']['ban']);
     unset($core_extension['module']['options']);
     unset($core_extension['module']['text']);
-    unset($core_extension['theme']['bartik']);
+    unset($core_extension['theme']['olivero']);
     $sync->write('core.extension', $core_extension);
     $sync->delete('automated_cron.settings');
     $sync->delete('text.settings');
+    $sync->delete('olivero.settings');
 
     $system_theme = $this->config('system.theme')->get();
     $system_theme = [
@@ -221,7 +226,7 @@ public function testImport() {
     $this->assertEmpty($installed, 'No modules installed during import');
 
     $theme_info = \Drupal::service('theme_handler')->listInfo();
-    $this->assertFalse(isset($theme_info['bartik']), 'Bartik theme uninstalled during import.');
+    $this->assertFalse(isset($theme_info['olivero']), 'Olivero theme uninstalled during import.');
 
     // Verify that the automated_cron.settings configuration object was only
     // deleted once during the import process.
@@ -510,7 +515,6 @@ public function testExtensionValidation() {
     unset($core['module']['text']);
     $module_data = $this->container->get('extension.list.module')->getList();
     $this->assertTrue(isset($module_data['node']->requires['text']), 'The Node module depends on the Text module.');
-    // Bartik depends on Stable.
     unset($core['theme']['test_basetheme']);
     $theme_data = \Drupal::service('theme_handler')->rebuildThemeData();
     $this->assertTrue(isset($theme_data['test_subtheme']->requires['test_basetheme']), 'The Test Subtheme theme depends on the Test Basetheme theme.');
diff --git a/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php b/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
index 8cf1c883c..a7dca12e9 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigImportUploadTest.php
@@ -34,6 +34,9 @@ class ConfigImportUploadTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
index e022d5f12..4a5ca18c7 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallProfileOverrideTest.php
@@ -12,8 +12,10 @@
 use Drupal\user\Entity\Role;
 
 /**
- * Tests installation and removal of configuration objects in install, disable
- * and uninstall functionality.
+ * Tests that configuration objects are correct after various operations.
+ *
+ * The installation and removal of configuration objects in install, disable
+ * and uninstall functionality is tested.
  *
  * @group config
  */
diff --git a/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php b/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
index fc27b7d9b..314c3d50d 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigInstallWebTest.php
@@ -11,8 +11,10 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests installation and removal of configuration objects in install, disable
- * and uninstall functionality.
+ * Tests configuration objects before and after module install and uninstall.
+ *
+ * The installation and removal of configuration objects in install, disable
+ * and uninstall functionality is tested.
  *
  * @group config
  */
diff --git a/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php b/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
index 550ef3e46..5d9871a3b 100644
--- a/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
+++ b/web/core/modules/config/tests/src/Functional/ConfigSingleImportExportTest.php
@@ -31,6 +31,9 @@ class ConfigSingleImportExportTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config/tests/src/Kernel/ConfigUninstallViaCliImportTest.php b/web/core/modules/config/tests/src/Kernel/ConfigUninstallViaCliImportTest.php
index 1a0486ed3..58c966aa2 100644
--- a/web/core/modules/config/tests/src/Kernel/ConfigUninstallViaCliImportTest.php
+++ b/web/core/modules/config/tests/src/Kernel/ConfigUninstallViaCliImportTest.php
@@ -26,6 +26,9 @@ class ConfigUninstallViaCliImportTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'config'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     if (PHP_SAPI !== 'cli') {
@@ -50,7 +53,8 @@ protected function setUp(): void {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
   }
 
diff --git a/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php b/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php
index e6c3bf4a7..e6705d540 100644
--- a/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php
+++ b/web/core/modules/config/tests/src/Unit/Menu/ConfigLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class ConfigLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = ['config' => 'core/modules/config'];
     parent::setUp();
diff --git a/web/core/modules/config_translation/migrations/d6_field_instance_label_description_translation.yml b/web/core/modules/config_translation/migrations/d6_field_instance_label_description_translation.yml
index 20d54f542..699d599bf 100644
--- a/web/core/modules/config_translation/migrations/d6_field_instance_label_description_translation.yml
+++ b/web/core/modules/config_translation/migrations/d6_field_instance_label_description_translation.yml
@@ -36,8 +36,8 @@ process:
       plugin: migration_lookup
       migration: d6_field_instance
       source:
-         - '@field_name'
-         - '@bundle'
+        - '@field_name'
+        - '@bundle'
     -
       plugin: skip_on_empty
       method: row
diff --git a/web/core/modules/config_translation/migrations/d7_field_instance_label_description_translation.yml b/web/core/modules/config_translation/migrations/d7_field_instance_label_description_translation.yml
index b8b3735a0..78cf8b7ef 100644
--- a/web/core/modules/config_translation/migrations/d7_field_instance_label_description_translation.yml
+++ b/web/core/modules/config_translation/migrations/d7_field_instance_label_description_translation.yml
@@ -34,9 +34,9 @@ process:
       plugin: migration_lookup
       migration: d7_field_instance
       source:
-         - entity_type
-         - objectid
-         - type
+        - entity_type
+        - objectid
+        - type
     -
       plugin: skip_on_empty
       method: row
diff --git a/web/core/modules/config_translation/migrations/d7_field_instance_option_translation.yml b/web/core/modules/config_translation/migrations/d7_field_instance_option_translation.yml
index 06482b24a..984f2c6a5 100644
--- a/web/core/modules/config_translation/migrations/d7_field_instance_option_translation.yml
+++ b/web/core/modules/config_translation/migrations/d7_field_instance_option_translation.yml
@@ -19,9 +19,9 @@ process:
     method: getFieldType
   entity_type: entity_type
   field_name: field_name
-#  # The bundle needs to be statically mapped in order to support comment types
-#  # that might already exist before this migration is run. See
-#  # d7_comment_type.yml for more information.
+  # The bundle needs to be statically mapped in order to support comment types
+  # that might already exist before this migration is run. See
+  # d7_comment_type.yml for more information.
   bundle:
     plugin: static_map
     source: bundle
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationCacheTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationCacheTest.php
index b32a9d627..182b36595 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationCacheTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationCacheTest.php
@@ -70,6 +70,9 @@ class ConfigTranslationCacheTest extends BrowserTestBase {
    */
   protected $localeStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $translator_permissions = [
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
index be4d46da4..4247eb431 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationDateFormatUiTest.php
@@ -23,6 +23,9 @@ class ConfigTranslationDateFormatUiTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
index c44ecb251..0cf5548b9 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php
@@ -53,6 +53,9 @@ class ConfigTranslationListUiTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
index c7815b65b..223d34e8b 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationOverviewTest.php
@@ -54,6 +54,9 @@ class ConfigTranslationOverviewTest extends BrowserTestBase {
    */
   protected $localeStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $permissions = [
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
index 42d54b21e..de79040cf 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php
@@ -13,6 +13,8 @@
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
 
+// cspell:ignore viewsviewfiles
+
 /**
  * Translate settings and entities to various languages.
  *
@@ -78,6 +80,9 @@ class ConfigTranslationUiTest extends BrowserTestBase {
    */
   protected $localeStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $translator_permissions = [
@@ -643,8 +648,7 @@ public function testViewsTranslationUI() {
   }
 
   /**
-   * Tests the number of source elements for plural strings in config
-   * translation forms.
+   * Tests plural source elements in configuration translation forms.
    */
   public function testPluralConfigStringsSourceElements() {
     $this->drupalLogin($this->adminUser);
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
index f04173eb4..04227c637 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiThemeTest.php
@@ -41,6 +41,9 @@ class ConfigTranslationUiThemeTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
index 3cc36c8b5..8483d8e88 100644
--- a/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
+++ b/web/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
@@ -34,6 +34,9 @@ class ConfigTranslationViewListUiTest extends UITestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
index 2e8260bdd..ccae8e23b 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigEntityMapperTest.php
@@ -56,6 +56,9 @@ class ConfigEntityMapperTest extends UnitTestCase {
    */
   protected $eventDispatcher;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->entityTypeManager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface');
 
@@ -67,7 +70,7 @@ protected function setUp(): void {
       ->expects($this->any())
       ->method('getRouteByName')
       ->with('entity.configurable_language.edit_form')
-      ->will($this->returnValue(new Route('/admin/config/regional/language/edit/{configurable_language}')));
+      ->willReturn(new Route('/admin/config/regional/language/edit/{configurable_language}'));
 
     $definition = [
       'class' => '\Drupal\config_translation\ConfigEntityMapper',
@@ -111,18 +114,18 @@ public function testEntityGetterAndSetter() {
       ->expects($this->once())
       ->method('id')
       ->with()
-      ->will($this->returnValue('entity_id'));
+      ->willReturn('entity_id');
 
     $entity_type = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
     $entity_type
       ->expects($this->any())
       ->method('getConfigPrefix')
-      ->will($this->returnValue('config_prefix'));
+      ->willReturn('config_prefix');
     $this->entityTypeManager
       ->expects($this->once())
       ->method('getDefinition')
       ->with('configurable_language')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     // No entity is set.
     $this->assertNull($this->configEntityMapper->getEntity());
@@ -151,14 +154,14 @@ public function testGetOverviewRouteParameters() {
       ->expects($this->once())
       ->method('getDefinition')
       ->with('configurable_language')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
     $this->configEntityMapper->setEntity($this->entity);
 
     $this->entity
       ->expects($this->once())
       ->method('id')
       ->with()
-      ->will($this->returnValue('entity_id'));
+      ->willReturn('entity_id');
 
     $result = $this->configEntityMapper->getOverviewRouteParameters();
 
@@ -180,12 +183,12 @@ public function testGetTypeName() {
     $entity_type = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
     $entity_type->expects($this->once())
       ->method('getLabel')
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
     $this->entityTypeManager
       ->expects($this->once())
       ->method('getDefinition')
       ->with('configurable_language')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $result = $this->configEntityMapper->getTypeName();
     $this->assertSame('test', $result);
@@ -198,12 +201,12 @@ public function testGetTypeLabel() {
     $entity_type = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
     $entity_type->expects($this->once())
       ->method('getLabel')
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
     $this->entityTypeManager
       ->expects($this->once())
       ->method('getDefinition')
       ->with('configurable_language')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $result = $this->configEntityMapper->getTypeLabel();
     $this->assertSame('test', $result);
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
index e1f9b16ec..4c3a05ea9 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigFieldMapperTest.php
@@ -88,23 +88,23 @@ public function testSetEntity() {
     $entity_type
       ->expects($this->any())
       ->method('getConfigPrefix')
-      ->will($this->returnValue('config_prefix'));
+      ->willReturn('config_prefix');
 
     $this->entityTypeManager
       ->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $field_storage = $this->createMock('Drupal\field\FieldStorageConfigInterface');
     $field_storage
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('field_storage_id'));
+      ->willReturn('field_storage_id');
 
     $this->entity
       ->expects($this->any())
       ->method('getFieldStorageDefinition')
-      ->will($this->returnValue($field_storage));
+      ->willReturn($field_storage);
 
     $result = $this->configFieldMapper->setEntity($this->entity);
     $this->assertTrue($result);
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php
index 3bee25738..b91b61360 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigMapperManagerTest.php
@@ -30,13 +30,16 @@ class ConfigMapperManagerTest extends UnitTestCase {
    */
   protected $typedConfigManager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $language = new Language(['id' => 'en']);
     $language_manager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
     $language_manager->expects($this->once())
       ->method('getCurrentLanguage')
       ->with(LanguageInterface::TYPE_INTERFACE)
-      ->will($this->returnValue($language));
+      ->willReturn($language);
 
     $this->typedConfigManager = $this->getMockBuilder('Drupal\Core\Config\TypedConfigManagerInterface')
       ->getMock();
@@ -68,7 +71,7 @@ public function testHasTranslatable(TypedDataInterface $element, $expected) {
       ->expects($this->once())
       ->method('get')
       ->with('test')
-      ->will($this->returnValue($element));
+      ->willReturn($element);
 
     $result = $this->configMapperManager->hasTranslatable('test');
     $this->assertSame($expected, $result);
@@ -151,7 +154,7 @@ protected function getElement(array $definition) {
     $element = $this->createMock('Drupal\Core\TypedData\TypedDataInterface');
     $element->expects($this->any())
       ->method('getDataDefinition')
-      ->will($this->returnValue($data_definition));
+      ->willReturn($data_definition);
     return $element;
   }
 
@@ -176,7 +179,7 @@ protected function getNestedElement(array $elements) {
       ->getMock();
     $nested_element->expects($this->once())
       ->method('getIterator')
-      ->will($this->returnValue(new \ArrayIterator($elements)));
+      ->willReturn(new \ArrayIterator($elements));
     return $nested_element;
   }
 
diff --git a/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
index ea273e39f..915ac9dc6 100644
--- a/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
+++ b/web/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php
@@ -95,6 +95,9 @@ class ConfigNamesMapperTest extends UnitTestCase {
    */
   protected $eventDispatcher;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface');
 
@@ -125,7 +128,7 @@ protected function setUp(): void {
       ->expects($this->any())
       ->method('getRouteByName')
       ->with('system.site_information_settings')
-      ->will($this->returnValue($this->baseRoute));
+      ->willReturn($this->baseRoute);
 
     $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
 
diff --git a/web/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.info.yml b/web/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.info.yml
index fb7d54604..f045b20ca 100644
--- a/web/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.info.yml
+++ b/web/core/modules/config_translation/tests/themes/config_translation_test_theme/config_translation_test_theme.info.yml
@@ -1,5 +1,5 @@
 name: 'Configuration Translation Test Theme'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Theme for testing the configuration translation mapper system'
 version: VERSION
diff --git a/web/core/modules/contact/src/ContactFormInterface.php b/web/core/modules/contact/src/ContactFormInterface.php
index ef3b3ebfa..68998298e 100644
--- a/web/core/modules/contact/src/ContactFormInterface.php
+++ b/web/core/modules/contact/src/ContactFormInterface.php
@@ -34,12 +34,12 @@ public function getRecipients();
   public function getRedirectPath();
 
   /**
-   * Returns the url object for redirect path.
+   * Returns the \Drupal\Core\Url object for redirect path.
    *
-   * Empty redirect property results a url object of front page.
+   * Empty redirect property results a \Drupal\Core\Url object of front page.
    *
    * @return \Drupal\Core\Url
-   *   The redirect url object.
+   *   The redirect \Drupal\Core\Url object.
    */
   public function getRedirectUrl();
 
diff --git a/web/core/modules/contact/tests/drupal-7.contact.database.php b/web/core/modules/contact/tests/drupal-7.contact.database.php
index 8ace9362c..66119d351 100644
--- a/web/core/modules/contact/tests/drupal-7.contact.database.php
+++ b/web/core/modules/contact/tests/drupal-7.contact.database.php
@@ -25,10 +25,10 @@
   'selected',
 ])
   ->values([
-  'category' => 'Upgrade test',
-  'recipients' => 'test1@example.com,test2@example.com',
-  'reply' => 'Test reply',
-  'weight' => 1,
-  'selected' => 1,
-])
+    'category' => 'Upgrade test',
+    'recipients' => 'test1@example.com,test2@example.com',
+    'reply' => 'Test reply',
+    'weight' => 1,
+    'selected' => 1,
+  ])
   ->execute();
diff --git a/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
index e28c8aae9..4e8577334 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactPersonalTest.php
@@ -53,6 +53,9 @@ class ContactPersonalTest extends BrowserTestBase {
    */
   private $contactUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
index 796300257..ce2ace64b 100644
--- a/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
+++ b/web/core/modules/contact/tests/src/Functional/ContactSitewideTest.php
@@ -115,7 +115,7 @@ public function testSiteWideContact() {
     // Default form exists.
     $this->assertSession()->linkByHrefExists('admin/structure/contact/manage/feedback/delete');
     // User form could not be changed or deleted.
-    // Cannot use ::assertNoLinkByHref as it does partial url matching and with
+    // Cannot use ::assertNoLinkByHref as it does partial URL matching and with
     // field_ui enabled admin/structure/contact/manage/personal/fields exists.
     // @todo: See https://www.drupal.org/node/2031223 for the above.
     $url = Url::fromRoute('entity.contact_form.edit_form', ['contact_form' => 'personal'])->toString();
diff --git a/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php b/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
index 4a123c37a..0c094cc61 100644
--- a/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
+++ b/web/core/modules/contact/tests/src/Kernel/MessageEntityTest.php
@@ -25,6 +25,9 @@ class MessageEntityTest extends EntityKernelTestBase {
     'contact_test',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['contact', 'contact_test']);
diff --git a/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php b/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php
index 439e5077b..57108d3fc 100644
--- a/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php
+++ b/web/core/modules/contact/tests/src/Unit/MailHandlerTest.php
@@ -86,11 +86,11 @@ protected function setUp(): void {
 
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
-      ->will($this->returnValue($language));
+      ->willReturn($language);
 
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue($language));
+      ->willReturn($language);
   }
 
   /**
diff --git a/web/core/modules/content_moderation/src/Entity/ContentModerationState.php b/web/core/modules/content_moderation/src/Entity/ContentModerationState.php
index 6d0cb0abd..fabce0090 100644
--- a/web/core/modules/content_moderation/src/Entity/ContentModerationState.php
+++ b/web/core/modules/content_moderation/src/Entity/ContentModerationState.php
@@ -134,12 +134,17 @@ public static function loadFromModeratedEntity(EntityInterface $entity) {
       /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
       $storage = \Drupal::entityTypeManager()->getStorage('content_moderation_state');
 
+      // New entities may not have a loaded revision ID at this point, but the
+      // creation of a content moderation state entity may have already been
+      // triggered elsewhere. In this case we have to match on the revision ID
+      // (instead of the loaded revision ID).
+      $revision_id = $entity->getLoadedRevisionId() ?: $entity->getRevisionId();
       $ids = $storage->getQuery()
         ->accessCheck(FALSE)
         ->condition('content_entity_type_id', $entity->getEntityTypeId())
         ->condition('content_entity_id', $entity->id())
         ->condition('workflow', $moderation_info->getWorkflowForEntity($entity)->id())
-        ->condition('content_entity_revision_id', $entity->getLoadedRevisionId())
+        ->condition('content_entity_revision_id', $revision_id)
         ->allRevisions()
         ->execute();
 
diff --git a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
index 3eef74a73..cfcd45b37 100644
--- a/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
+++ b/web/core/modules/content_moderation/tests/src/Kernel/ContentModerationStateTest.php
@@ -548,8 +548,7 @@ public function testNonTranslatableEntityTypeModeration() {
   }
 
   /**
-   * Tests that a non-translatable entity type without a langcode can be
-   * moderated.
+   * Tests moderation of a non-translatable entity type with no langcode.
    */
   public function testNonLangcodeEntityTypeModeration() {
     // Unset the langcode entity key for 'entity_test_rev'.
diff --git a/web/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php b/web/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php
index 338615b7b..f4cf96d36 100644
--- a/web/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php
+++ b/web/core/modules/content_moderation/tests/src/Unit/ContentModerationRouteSubscriberTest.php
@@ -42,14 +42,14 @@ protected function setupEntityTypes() {
     $definition = $this->createMock(EntityTypeInterface::class);
     $definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue(SimpleTestEntity::class));
+      ->willReturn(SimpleTestEntity::class);
     $definition->expects($this->any())
       ->method('isRevisionable')
       ->willReturn(FALSE);
     $revisionable_definition = $this->createMock(EntityTypeInterface::class);
     $revisionable_definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue(SimpleTestEntity::class));
+      ->willReturn(SimpleTestEntity::class);
     $revisionable_definition->expects($this->any())
       ->method('isRevisionable')
       ->willReturn(TRUE);
diff --git a/web/core/modules/content_translation/content_translation.admin.js b/web/core/modules/content_translation/content_translation.admin.js
index 8a30f6861..2a3e94a9b 100644
--- a/web/core/modules/content_translation/content_translation.admin.js
+++ b/web/core/modules/content_translation/content_translation.admin.js
@@ -4,20 +4,17 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.contentTranslationDependentOptions = {
     attach: function attach(context) {
       var $context = $(context);
       var options = drupalSettings.contentTranslationDependentOptions;
       var $fields;
-
       function fieldsChangeHandler($fields, dependentColumns) {
         return function (e) {
           Drupal.behaviors.contentTranslationDependentOptions.check($fields, dependentColumns, $(e.target));
         };
       }
-
       if (options && options.dependent_selectors) {
         Object.keys(options.dependent_selectors).forEach(function (field) {
           $fields = $context.find("input[name^=\"".concat(field, "\"]"));
@@ -30,18 +27,14 @@
     check: function check($fields, dependentColumns, $changed) {
       var $element = $changed;
       var column;
-
       function filterFieldsList(index, field) {
         return field.value === column;
       }
-
       Object.keys(dependentColumns || {}).forEach(function (index) {
         column = dependentColumns[index];
-
         if (!$changed) {
           $element = $fields.filter(filterFieldsList);
         }
-
         if ($element.is("input[value=\"".concat(column, "\"]:checked"))) {
           $fields.prop('checked', true).not($element).prop('disabled', true);
         } else {
@@ -55,7 +48,6 @@
       once('translation-entity-admin-hide', $(context).find('table .bundle-settings .translatable :input')).forEach(function (input) {
         var $input = $(input);
         var $bundleSettings = $input.closest('.bundle-settings');
-
         if (!$input.is(':checked')) {
           $bundleSettings.nextUntil('.bundle-settings').hide();
         } else {
@@ -67,7 +59,6 @@
         var $bundleSettings = $target.closest('.bundle-settings');
         var $settings = $bundleSettings.nextUntil('.bundle-settings');
         var $fieldSettings = $settings.filter('.field-settings');
-
         if ($target.is(':checked')) {
           $bundleSettings.find('.operations :input[name$="[language_alterable]"]').prop('checked', true);
           $fieldSettings.find('.translatable :input').prop('checked', true);
@@ -79,7 +70,6 @@
         var $target = $(e.target);
         var $fieldSettings = $target.closest('.field-settings');
         var $columnSettings = $fieldSettings.nextUntil('.field-settings, .bundle-settings');
-
         if ($target.is(':checked')) {
           $columnSettings.show();
         } else {
diff --git a/web/core/modules/content_translation/content_translation.module b/web/core/modules/content_translation/content_translation.module
index 9910ba31b..0e0a547db 100644
--- a/web/core/modules/content_translation/content_translation.module
+++ b/web/core/modules/content_translation/content_translation.module
@@ -574,7 +574,7 @@ function content_translation_enable_widget($entity_type, $bundle, array &$form,
  * @param array $element
  *   Form API element.
  *
- * @return
+ * @return array
  *   Processed language configuration element.
  */
 function content_translation_language_configuration_element_process(array $element, FormStateInterface $form_state, array &$form) {
diff --git a/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml b/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml
index 2666e5c0c..eddee159f 100644
--- a/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml
+++ b/web/core/modules/content_translation/migrations/state/content_translation.migrate_drupal.yml
@@ -15,7 +15,7 @@ finished:
     i18ntaxonomy: content_translation
     locale: content_translation
     menu: content_translation
-  # Node revision translations.
+    # Node revision translations.
     node: content_translation
     statistics: statistics
     taxonomy: content_translation
diff --git a/web/core/modules/content_translation/src/ContentTranslationHandler.php b/web/core/modules/content_translation/src/ContentTranslationHandler.php
index 6a103e475..7e782db49 100644
--- a/web/core/modules/content_translation/src/ContentTranslationHandler.php
+++ b/web/core/modules/content_translation/src/ContentTranslationHandler.php
@@ -78,8 +78,9 @@ class ContentTranslationHandler implements ContentTranslationHandlerInterface, E
   protected $currentUser;
 
   /**
-   * The array of installed field storage definitions for the entity type, keyed
-   * by field name.
+   * Installed field storage definitions for the entity type.
+   *
+   * Keyed by field name.
    *
    * @var \Drupal\Core\Field\FieldStorageDefinitionInterface[]
    */
diff --git a/web/core/modules/content_translation/src/ContentTranslationHandlerInterface.php b/web/core/modules/content_translation/src/ContentTranslationHandlerInterface.php
index 8534a539a..c3b9e4cf8 100644
--- a/web/core/modules/content_translation/src/ContentTranslationHandlerInterface.php
+++ b/web/core/modules/content_translation/src/ContentTranslationHandlerInterface.php
@@ -21,8 +21,7 @@ interface ContentTranslationHandlerInterface {
   public function getFieldDefinitions();
 
   /**
-   * Checks if the user can perform the given operation on translations of the
-   * wrapped entity.
+   * Checks that the user can perform the operation on the entity translation.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   The entity whose translation has to be accessed.
diff --git a/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationContextualLinks.php b/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationContextualLinks.php
index 7a4cad5e3..91fd520ca 100644
--- a/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationContextualLinks.php
+++ b/web/core/modules/content_translation/src/Plugin/Derivative/ContentTranslationContextualLinks.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\content_translation\ContentTranslationManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -14,6 +15,8 @@
  */
 class ContentTranslationContextualLinks extends DeriverBase implements ContainerDeriverInterface {
 
+  use StringTranslationTrait;
+
   /**
    * The content translation manager.
    *
@@ -46,7 +49,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) {
   public function getDerivativeDefinitions($base_plugin_definition) {
     // Create contextual links for translatable entity types.
     foreach ($this->contentTranslationManager->getSupportedEntityTypes() as $entity_type_id => $entity_type) {
-      $this->derivatives[$entity_type_id]['title'] = t('Translate');
+      $this->derivatives[$entity_type_id]['title'] = $this->t('Translate');
       $this->derivatives[$entity_type_id]['route_name'] = "entity.$entity_type_id.content_translation_overview";
       $this->derivatives[$entity_type_id]['group'] = $entity_type_id;
     }
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
index 0e06ddd25..775bff50b 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationContextualLinksTest.php
@@ -61,6 +61,9 @@ class ContentTranslationContextualLinksTest extends BrowserTestBase {
    */
   protected $profile = 'testing';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Set up an additional language.
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
index 02913f556..26e7c5696 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationEntityBundleUITest.php
@@ -24,6 +24,9 @@ class ContentTranslationEntityBundleUITest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $user = $this->drupalCreateUser([
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
index 1d25cc06c..5e3a71768 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationLinkTagTest.php
@@ -124,7 +124,7 @@ function ($langcode) use ($url_base, $languageManager) {
     $entity_canonical = '/entity_test_mul/manage/' . $entity->id();
     $this->config('system.site')->set('page.front', $entity_canonical)->save();
 
-    // Tests hreflangs when using entities as a front page.
+    // Tests hreflang when using entities as a front page.
     foreach ($urls as $langcode => $url) {
       $this->drupalGet($url);
       foreach ($entity->getTranslationLanguages() as $language) {
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php
index 07dacff66..b01f5b5c7 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationOutdatedRevisionTranslationTest.php
@@ -39,7 +39,8 @@ public function testFlagAsOutdatedHidden() {
     $entity = $this->storage->load($id);
 
     // Add a published Italian translation.
-    $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", [
+    $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
+      [
         $entity->getEntityTypeId() => $id,
         'source' => 'en',
         'target' => 'it',
@@ -58,7 +59,8 @@ public function testFlagAsOutdatedHidden() {
     $this->submitForm($edit, 'Save (this translation)');
 
     // Add a published French translation.
-    $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", [
+    $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
+      [
         $entity->getEntityTypeId() => $id,
         'source' => 'en',
         'target' => 'fr',
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php
index cd89e4d4c..25b60c757 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationRevisionTranslationDeletionTest.php
@@ -61,7 +61,8 @@ public function doTestOverview($index) {
 
     // Add a draft translation and check that it is available only in the latest
     // revision.
-    $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add", [
+    $add_translation_url = Url::fromRoute("entity.{$this->entityTypeId}.content_translation_add",
+      [
         $entity->getEntityTypeId() => $id,
         'source' => 'en',
         'target' => 'it',
@@ -186,7 +187,8 @@ public function doTestOverview($index) {
     // again, since the active revision is now a default revision.
     $this->drupalLogin($this->editor);
     $this->drupalGet($it_revision->toUrl('version-history'));
-    $revision_deletion_url = Url::fromRoute('node.revision_delete_confirm', [
+    $revision_deletion_url = Url::fromRoute('node.revision_delete_confirm',
+      [
         'node' => $id,
         'node_revision' => $it_revision->getRevisionId(),
       ],
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
index 7d3331141..a18d69076 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSettingsTest.php
@@ -39,6 +39,9 @@ class ContentTranslationSettingsTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
index 0aab85796..14a5a2dda 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationSyncImageTest.php
@@ -52,6 +52,9 @@ class ContentTranslationSyncImageTest extends ContentTranslationTestBase {
     'field_ui',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->files = $this->drupalGetTestFiles('image');
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
index 17d40b7a8..c3a4c53d0 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationTestBase.php
@@ -82,6 +82,9 @@ abstract class ContentTranslationTestBase extends BrowserTestBase {
    */
   protected $manager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
index ddf75c14c..e012360be 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php
@@ -487,7 +487,7 @@ protected function getTranslation(EntityInterface $entity, $langcode) {
    * @param string $langcode
    *   The property value.
    *
-   * @return
+   * @return mixed
    *   The property value.
    */
   protected function getValue(EntityInterface $translation, $property, $langcode) {
diff --git a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
index 6291989f4..de500b19f 100644
--- a/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/ContentTranslationWorkflowsTest.php
@@ -69,6 +69,9 @@ class ContentTranslationWorkflowsTest extends ContentTranslationTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php b/web/core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php
index 52b6ca8f0..336bc3b9c 100644
--- a/web/core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php
+++ b/web/core/modules/content_translation/tests/src/Functional/Views/TranslationLinkTest.php
@@ -34,6 +34,9 @@ class TranslationLinkTest extends ContentTranslationTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     // @todo Use entity_type once it has multilingual Views integration.
     $this->entityTypeId = 'user';
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
index fb6ab7dcb..ae1428a00 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
@@ -58,7 +58,8 @@ protected function setUp(): void {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
   }
 
diff --git a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
index 8043e78b4..5d41f34a7 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
@@ -56,6 +56,9 @@ class ContentTranslationSyncUnitTest extends KernelTestBase {
 
   protected static $modules = ['language', 'content_translation'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
index 6f4449880..58149d411 100644
--- a/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
+++ b/web/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php
@@ -84,7 +84,7 @@ protected function assertEntity(int $id, string $expected_language, string $expe
     $this->assertSame($expected_vid, $entity->bundle());
     $this->assertSame($expected_description, $entity->getDescription());
     $this->assertSame($expected_format, $entity->getFormat());
-    $this->assertSame($expected_weight, (int) $entity->getWeight());
+    $this->assertSame($expected_weight, $entity->getWeight());
     $this->assertHierarchy($expected_vid, $id, $expected_parents);
   }
 
diff --git a/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php b/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
index 4e585c9a5..9c440fb0e 100644
--- a/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
+++ b/web/core/modules/content_translation/tests/src/Unit/Access/ContentTranslationManageAccessCheckTest.php
@@ -53,13 +53,13 @@ public function testCreateAccess() {
     $translation_handler = $this->createMock('\Drupal\content_translation\ContentTranslationHandlerInterface');
     $translation_handler->expects($this->once())
       ->method('getTranslationAccess')
-      ->will($this->returnValue(AccessResult::allowed()));
+      ->willReturn(AccessResult::allowed());
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->once())
       ->method('getHandler')
       ->withAnyParameters()
-      ->will($this->returnValue($translation_handler));
+      ->willReturn($translation_handler);
 
     // Set our source and target languages.
     $source = 'en';
@@ -87,7 +87,7 @@ public function testCreateAccess() {
     $entity->expects($this->once())
       ->method('getTranslationLanguages')
       ->with()
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $entity->expects($this->once())
       ->method('getCacheContexts')
       ->willReturn([]);
@@ -96,7 +96,7 @@ public function testCreateAccess() {
       ->willReturn(Cache::PERMANENT);
     $entity->expects($this->once())
       ->method('getCacheTags')
-      ->will($this->returnValue(['node:1337']));
+      ->willReturn(['node:1337']);
     $entity->expects($this->once())
       ->method('getCacheContexts')
       ->willReturn([]);
@@ -110,7 +110,7 @@ public function testCreateAccess() {
     $route_match->expects($this->once())
       ->method('getParameter')
       ->with('node')
-      ->will($this->returnValue($entity));
+      ->willReturn($entity);
 
     // Set the mock account.
     $account = $this->createMock('Drupal\Core\Session\AccountInterface');
diff --git a/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php b/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
index 38ea3a308..00e300ba0 100644
--- a/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
+++ b/web/core/modules/content_translation/tests/src/Unit/Menu/ContentTranslationLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class ContentTranslationLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = [
       'content_translation' => 'core/modules/content_translation',
@@ -31,9 +34,9 @@ protected function setUp(): void {
     $content_translation_manager = $this->createMock('Drupal\content_translation\ContentTranslationManagerInterface');
     $content_translation_manager->expects($this->any())
       ->method('getSupportedEntityTypes')
-      ->will($this->returnValue([
+      ->willReturn([
         'node' => $entity_type,
-      ]));
+      ]);
     \Drupal::getContainer()->set('content_translation.manager', $content_translation_manager);
     \Drupal::getContainer()->set('string_translation', $this->getStringTranslationStub());
   }
diff --git a/web/core/modules/contextual/js/contextual.es6.js b/web/core/modules/contextual/js/contextual.es6.js
index b5fe7d094..7d916d5e3 100644
--- a/web/core/modules/contextual/js/contextual.es6.js
+++ b/web/core/modules/contextual/js/contextual.es6.js
@@ -99,7 +99,7 @@
 
     // Set the destination parameter on each of the contextual links.
     const destination = `destination=${Drupal.encodePath(
-      Drupal.url(drupalSettings.path.currentPath),
+      Drupal.url(drupalSettings.path.currentPath + window.location.search),
     )}`;
     $contextual.find('.contextual-links a').each(function () {
       const url = this.getAttribute('href');
@@ -142,7 +142,7 @@
         },
         deprecatedProperty: 'model',
         message:
-          'The model property is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement.',
+          'The model property is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no replacement.',
       }),
     );
 
@@ -258,7 +258,7 @@
      *
      * @type {Array}
      *
-     * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+     * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
      *  replacement.
      */
     views: [],
@@ -269,7 +269,7 @@
      *
      * @type {Array}
      *
-     * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+     * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
      *  replacement.
      */
     regionViews: [],
@@ -280,7 +280,7 @@
    *
    * @type {Backbone.Collection}
    *
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextual.collection = new Backbone.Collection([], {
diff --git a/web/core/modules/contextual/js/contextual.js b/web/core/modules/contextual/js/contextual.js
index 878f0d38b..12d0ede2e 100644
--- a/web/core/modules/contextual/js/contextual.js
+++ b/web/core/modules/contextual/js/contextual.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, _, Backbone, JSON, storage) {
   var options = $.extend(drupalSettings.contextual, {
     strings: {
@@ -14,7 +13,6 @@
   });
   var cachedPermissionsHash = storage.getItem('Drupal.contextual.permissionsHash');
   var permissionsHash = drupalSettings.user.permissionsHash;
-
   if (cachedPermissionsHash !== permissionsHash) {
     if (typeof permissionsHash === 'string') {
       _.chain(storage).keys().each(function (key) {
@@ -23,20 +21,15 @@
         }
       });
     }
-
     storage.setItem('Drupal.contextual.permissionsHash', permissionsHash);
   }
-
   function adjustIfNestedAndOverlapping($contextual) {
     var $contextuals = $contextual.parents('.contextual-region').eq(-1).find('.contextual');
-
     if ($contextuals.length <= 1) {
       return;
     }
-
     var firstTop = $contextuals.eq(0).offset().top;
     var secondTop = $contextuals.eq(1).offset().top;
-
     if (firstTop === secondTop) {
       var $nestedContextual = $contextuals.eq(1);
       var height = 0;
@@ -49,12 +42,11 @@
       });
     }
   }
-
   function initContextual($contextual, html) {
     var $region = $contextual.closest('.contextual-region');
     var contextual = Drupal.contextual;
     $contextual.html(html).addClass('contextual').prepend(Drupal.theme('contextualTrigger'));
-    var destination = "destination=".concat(Drupal.encodePath(Drupal.url(drupalSettings.path.currentPath)));
+    var destination = "destination=".concat(Drupal.encodePath(Drupal.url(drupalSettings.path.currentPath + window.location.search)));
     $contextual.find('.contextual-links a').each(function () {
       var url = this.getAttribute('href');
       var glue = url.indexOf('?') === -1 ? '?' : '&';
@@ -62,11 +54,9 @@
     });
     var title = '';
     var $regionHeading = $region.find('h2');
-
     if ($regionHeading.length) {
       title = $regionHeading[0].textContent.trim();
     }
-
     var model = new contextual.StateModel({
       title: title
     });
@@ -91,20 +81,17 @@
         model: model
       },
       deprecatedProperty: 'model',
-      message: 'The model property is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement.'
+      message: 'The model property is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no replacement.'
     }));
     adjustIfNestedAndOverlapping($contextual);
   }
-
   Drupal.behaviors.contextual = {
     attach: function attach(context) {
       var $context = $(context);
       var $placeholders = $(once('contextual-render', '[data-contextual-id]', context));
-
       if ($placeholders.length === 0) {
         return;
       }
-
       var ids = [];
       $placeholders.each(function () {
         ids.push({
@@ -116,18 +103,15 @@
       var uncachedTokens = [];
       ids.forEach(function (contextualID) {
         var html = storage.getItem("Drupal.contextual.".concat(contextualID.id));
-
         if (html && html.length) {
           window.setTimeout(function () {
             initContextual($context.find("[data-contextual-id=\"".concat(contextualID.id, "\"]:empty")).eq(0), html);
           });
           return;
         }
-
         uncachedIDs.push(contextualID.id);
         uncachedTokens.push(contextualID.token);
       });
-
       if (uncachedIDs.length > 0) {
         $.ajax({
           url: Drupal.url('contextual/render'),
@@ -140,10 +124,8 @@
           success: function success(results) {
             _.each(results, function (html, contextualID) {
               storage.setItem("Drupal.contextual.".concat(contextualID), html);
-
               if (html.length > 0) {
                 $placeholders = $context.find("[data-contextual-id=\"".concat(contextualID, "\"]"));
-
                 for (var i = 0; i < $placeholders.length; i++) {
                   initContextual($placeholders.eq(i), html);
                 }
@@ -161,11 +143,9 @@
   Drupal.contextual.collection = new Backbone.Collection([], {
     model: Drupal.contextual.StateModel
   });
-
   Drupal.theme.contextualTrigger = function () {
     return '<button class="trigger visually-hidden focusable" type="button"></button>';
   };
-
   $(document).on('drupalContextualLinkAdded', function (event, data) {
     Drupal.ajax.bindAjaxLinks(data.$el[0]);
   });
diff --git a/web/core/modules/contextual/js/contextual.toolbar.js b/web/core/modules/contextual/js/contextual.toolbar.js
index bbd8792d0..3c09177b5 100644
--- a/web/core/modules/contextual/js/contextual.toolbar.js
+++ b/web/core/modules/contextual/js/contextual.toolbar.js
@@ -4,19 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Backbone) {
   var strings = {
     tabbingReleased: Drupal.t('Tabbing is no longer constrained by the Contextual module.'),
     tabbingConstrained: Drupal.t('Tabbing is constrained to a set of @contextualsCount and the edit mode toggle.'),
     pressEsc: Drupal.t('Press the esc key to exit.')
   };
-
   function initContextualToolbar(context) {
     if (!Drupal.contextual || !Drupal.contextual.collection) {
       return;
     }
-
     var contextualToolbar = Drupal.contextualToolbar;
     contextualToolbar.model = new contextualToolbar.StateModel({
       isViewing: localStorage.getItem('Drupal.contextualToolbar.isViewing') !== 'false'
@@ -31,7 +28,6 @@
     new contextualToolbar.VisualView(viewOptions);
     new contextualToolbar.AuralView(viewOptions);
   }
-
   Drupal.behaviors.contextualToolbar = {
     attach: function attach(context) {
       if (once('contextualToolbar-init', 'body').length) {
diff --git a/web/core/modules/contextual/js/models/StateModel.es6.js b/web/core/modules/contextual/js/models/StateModel.es6.js
index 09fe8ed4e..f0f47f4f7 100644
--- a/web/core/modules/contextual/js/models/StateModel.es6.js
+++ b/web/core/modules/contextual/js/models/StateModel.es6.js
@@ -11,7 +11,7 @@
    *
    * @augments Backbone.Model
    *
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextual.StateModel = Backbone.Model.extend(
diff --git a/web/core/modules/contextual/js/models/StateModel.js b/web/core/modules/contextual/js/models/StateModel.js
index 8be38641b..7128bf5d6 100644
--- a/web/core/modules/contextual/js/models/StateModel.js
+++ b/web/core/modules/contextual/js/models/StateModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextual.StateModel = Backbone.Model.extend({
     defaults: {
@@ -17,11 +16,9 @@
     toggleOpen: function toggleOpen() {
       var newIsOpen = !this.get('isOpen');
       this.set('isOpen', newIsOpen);
-
       if (newIsOpen) {
         this.focus();
       }
-
       return this;
     },
     close: function close() {
@@ -42,7 +39,6 @@
       if (!this.get('isOpen')) {
         this.set('hasFocus', false);
       }
-
       return this;
     }
   });
diff --git a/web/core/modules/contextual/js/toolbar/models/StateModel.es6.js b/web/core/modules/contextual/js/toolbar/models/StateModel.es6.js
index 07ab5dba4..bdba77766 100644
--- a/web/core/modules/contextual/js/toolbar/models/StateModel.es6.js
+++ b/web/core/modules/contextual/js/toolbar/models/StateModel.es6.js
@@ -5,7 +5,7 @@
 
 (function (Drupal, Backbone) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextualToolbar.StateModel = Backbone.Model.extend(
diff --git a/web/core/modules/contextual/js/toolbar/models/StateModel.js b/web/core/modules/contextual/js/toolbar/models/StateModel.js
index e9780c8f8..618a7f96e 100644
--- a/web/core/modules/contextual/js/toolbar/models/StateModel.js
+++ b/web/core/modules/contextual/js/toolbar/models/StateModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextualToolbar.StateModel = Backbone.Model.extend({
     defaults: {
diff --git a/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js b/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js
index 45449de62..5caa5ab67 100644
--- a/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js
+++ b/web/core/modules/contextual/js/toolbar/views/AuralView.es6.js
@@ -5,7 +5,7 @@
 
 (function ($, Drupal, Backbone, _) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextualToolbar.AuralView = Backbone.View.extend(
diff --git a/web/core/modules/contextual/js/toolbar/views/AuralView.js b/web/core/modules/contextual/js/toolbar/views/AuralView.js
index 1de1d173f..98b7526f3 100644
--- a/web/core/modules/contextual/js/toolbar/views/AuralView.js
+++ b/web/core/modules/contextual/js/toolbar/views/AuralView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Backbone, _) {
   Drupal.contextualToolbar.AuralView = Backbone.View.extend({
     announcedOnce: false,
@@ -21,15 +20,12 @@
     },
     manageTabbing: function manageTabbing() {
       var tabbingContext = this.model.get('tabbingContext');
-
       if (tabbingContext) {
         if (tabbingContext.active) {
           Drupal.announce(this.options.strings.tabbingReleased);
         }
-
         tabbingContext.release();
       }
-
       if (!this.model.get('isViewing')) {
         tabbingContext = Drupal.tabbingManager.constrain($('.contextual-toolbar-tab, .contextual'));
         this.model.set('tabbingContext', tabbingContext);
@@ -49,7 +45,6 @@
         this.announceTabbingConstraint();
         this.announcedOnce = true;
       }
-
       if (event.keyCode === 27) {
         this.model.set('isViewing', true);
       }
diff --git a/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js b/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js
index b939af8b2..87da96ecb 100644
--- a/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js
+++ b/web/core/modules/contextual/js/toolbar/views/VisualView.es6.js
@@ -5,7 +5,7 @@
 
 (function (Drupal, Backbone) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextualToolbar.VisualView = Backbone.View.extend(
diff --git a/web/core/modules/contextual/js/toolbar/views/VisualView.js b/web/core/modules/contextual/js/toolbar/views/VisualView.js
index fb8ecd3c5..7c1a4c105 100644
--- a/web/core/modules/contextual/js/toolbar/views/VisualView.js
+++ b/web/core/modules/contextual/js/toolbar/views/VisualView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextualToolbar.VisualView = Backbone.View.extend({
     events: function events() {
@@ -12,7 +11,6 @@
         event.preventDefault();
         event.target.click();
       };
-
       return {
         click: function click() {
           this.model.set('isViewing', !this.model.get('isViewing'));
diff --git a/web/core/modules/contextual/js/views/AuralView.es6.js b/web/core/modules/contextual/js/views/AuralView.es6.js
index 1e317242c..7a72c6ebb 100644
--- a/web/core/modules/contextual/js/views/AuralView.es6.js
+++ b/web/core/modules/contextual/js/views/AuralView.es6.js
@@ -5,7 +5,7 @@
 
 (function (Drupal, Backbone) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextual.AuralView = Backbone.View.extend(
diff --git a/web/core/modules/contextual/js/views/AuralView.js b/web/core/modules/contextual/js/views/AuralView.js
index 7da888713..d56201a83 100644
--- a/web/core/modules/contextual/js/views/AuralView.js
+++ b/web/core/modules/contextual/js/views/AuralView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextual.AuralView = Backbone.View.extend({
     initialize: function initialize(options) {
@@ -14,7 +13,6 @@
     },
     render: function render() {
       var _this = this;
-
       var isOpen = this.model.get('isOpen');
       this.$el.find('.contextual-links').prop('hidden', !isOpen);
       var $trigger = this.$el.find('.trigger');
diff --git a/web/core/modules/contextual/js/views/KeyboardView.es6.js b/web/core/modules/contextual/js/views/KeyboardView.es6.js
index d7bb10183..5458b9a47 100644
--- a/web/core/modules/contextual/js/views/KeyboardView.es6.js
+++ b/web/core/modules/contextual/js/views/KeyboardView.es6.js
@@ -5,7 +5,7 @@
 
 (function (Drupal, Backbone) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextual.KeyboardView = Backbone.View.extend(
diff --git a/web/core/modules/contextual/js/views/KeyboardView.js b/web/core/modules/contextual/js/views/KeyboardView.js
index 2f28f8658..35ad70a44 100644
--- a/web/core/modules/contextual/js/views/KeyboardView.js
+++ b/web/core/modules/contextual/js/views/KeyboardView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextual.KeyboardView = Backbone.View.extend({
     events: {
diff --git a/web/core/modules/contextual/js/views/RegionView.es6.js b/web/core/modules/contextual/js/views/RegionView.es6.js
index 08ec5880b..cf7d37493 100644
--- a/web/core/modules/contextual/js/views/RegionView.es6.js
+++ b/web/core/modules/contextual/js/views/RegionView.es6.js
@@ -5,7 +5,7 @@
 
 (function (Drupal, Backbone) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextual.RegionView = Backbone.View.extend(
diff --git a/web/core/modules/contextual/js/views/RegionView.js b/web/core/modules/contextual/js/views/RegionView.js
index bd020cb05..631b2398e 100644
--- a/web/core/modules/contextual/js/views/RegionView.js
+++ b/web/core/modules/contextual/js/views/RegionView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextual.RegionView = Backbone.View.extend({
     events: function events() {
diff --git a/web/core/modules/contextual/js/views/VisualView.es6.js b/web/core/modules/contextual/js/views/VisualView.es6.js
index 7f984cc81..c2a35027e 100644
--- a/web/core/modules/contextual/js/views/VisualView.es6.js
+++ b/web/core/modules/contextual/js/views/VisualView.es6.js
@@ -5,7 +5,7 @@
 
 (function (Drupal, Backbone) {
   /**
-   * @deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no
+   * @deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. There is no
    *  replacement.
    */
   Drupal.contextual.VisualView = Backbone.View.extend(
diff --git a/web/core/modules/contextual/js/views/VisualView.js b/web/core/modules/contextual/js/views/VisualView.js
index 7487eb620..d7c0db578 100644
--- a/web/core/modules/contextual/js/views/VisualView.js
+++ b/web/core/modules/contextual/js/views/VisualView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, Backbone) {
   Drupal.contextual.VisualView = Backbone.View.extend({
     events: function events() {
@@ -12,7 +11,6 @@
         event.preventDefault();
         event.target.click();
       };
-
       var touchStart = false;
       return {
         touchstart: function touchstart() {
@@ -43,11 +41,9 @@
       var isOpen = this.model.get('isOpen');
       var isVisible = this.model.get('isLocked') || this.model.get('regionIsHovered') || isOpen;
       this.$el.toggleClass('open', isOpen).find('.trigger').toggleClass('visually-hidden', !isVisible);
-
       if ('isOpen' in this.model.changed) {
         this.$el.closest('.contextual-region').find('.contextual .trigger:not(:first)').toggle(!isOpen);
       }
-
       return this;
     }
   });
diff --git a/web/core/modules/contextual/src/Element/ContextualLinks.php b/web/core/modules/contextual/src/Element/ContextualLinks.php
index 27c71dcbc..9ac0f42d1 100644
--- a/web/core/modules/contextual/src/Element/ContextualLinks.php
+++ b/web/core/modules/contextual/src/Element/ContextualLinks.php
@@ -3,6 +3,7 @@
 namespace Drupal\contextual\Element;
 
 use Drupal\Component\Utility\Html;
+use Drupal\Component\Utility\SortArray;
 use Drupal\Core\Render\Element\RenderElement;
 use Drupal\Core\Url;
 
@@ -42,7 +43,7 @@ public function getInfo() {
    *   render (based on the 'group' key in the *.links.contextual.yml files for
    *   all enabled modules). The value contains an associative array containing
    *   the following keys:
-   *   - route_parameters: The route parameters passed to the url generator.
+   *   - route_parameters: The route parameters passed to the URL generator.
    *   - metadata: Any additional data needed in order to alter the link.
    *   @code
    *     array('#contextual_links' => array(
@@ -72,6 +73,8 @@ public static function preRenderLinks(array $element) {
       $items += $contextual_links_manager->getContextualLinksArrayByGroup($group, $args['route_parameters'], $args['metadata']);
     }
 
+    uasort($items, [SortArray::class, 'sortByWeightElement']);
+
     // Transform contextual links into parameters suitable for links.html.twig.
     $links = [];
     foreach ($items as $class => $item) {
diff --git a/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php b/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
index 39998d2ed..b1f048d71 100644
--- a/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
+++ b/web/core/modules/contextual/tests/src/Functional/ContextualDynamicContextTest.php
@@ -10,8 +10,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests if contextual links are showing on the front page depending on
- * permissions.
+ * Tests contextual link display on the front page based on permissions.
  *
  * @group contextual
  */
@@ -57,6 +56,9 @@ class ContextualDynamicContextTest extends BrowserTestBase {
     'menu_test',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -158,6 +160,11 @@ public function testDifferentPermissions() {
     $this->drupalGet(Url::fromRoute('menu_test.contextual_test'));
     $this->assertSession()->assertEscaped("<script>alert('Welcome to the jungle!')</script>");
     $this->assertSession()->responseContains('<li><a href="' . base_path() . 'menu-test-contextual/1/edit" class="use-ajax" data-dialog-type="modal" data-is-something>Edit menu - contextual</a></li>');
+    // Test contextual links respects the weight set in *.links.contextual.yml.
+    $firstLink = $this->assertSession()->elementExists('css', 'ul.contextual-links li:nth-of-type(1) a');
+    $secondLink = $this->assertSession()->elementExists('css', 'ul.contextual-links li:nth-of-type(2) a');
+    $this->assertEquals(base_path() . 'menu-test-contextual/1/edit', $firstLink->getAttribute('href'));
+    $this->assertEquals(base_path() . 'menu-test-contextual/1', $secondLink->getAttribute('href'));
   }
 
   /**
diff --git a/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php b/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
index 1d16440cb..0a16d616b 100644
--- a/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
+++ b/web/core/modules/contextual/tests/src/FunctionalJavascript/ContextualLinksTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\contextual\FunctionalJavascript;
 
+use Drupal\Core\Url;
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\user\Entity\Role;
 
@@ -114,4 +115,20 @@ public function testContextualLinksDestination() {
     $this->assertEquals("destination=$expected_destination_value", $contextual_link_url_parsed['query']);
   }
 
+  /**
+   * Tests the contextual links destination with query.
+   */
+  public function testContextualLinksDestinationWithQuery() {
+    $this->grantPermissions(Role::load(Role::AUTHENTICATED_ID), [
+      'access contextual links',
+      'administer blocks',
+    ]);
+
+    $this->drupalGet('admin/structure/block', ['query' => ['foo' => 'bar']]);
+    $this->assertSession()->waitForElement('css', '.contextual button');
+    $expected_destination_value = Url::fromRoute('block.admin_display')->toString();
+    $contextual_link_url_parsed = parse_url($this->getSession()->getPage()->findLink('Configure block')->getAttribute('href'));
+    $this->assertEquals("destination=$expected_destination_value%3Ffoo%3Dbar", $contextual_link_url_parsed['query']);
+  }
+
 }
diff --git a/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php b/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
index 9e088aefb..dc46bef32 100644
--- a/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
+++ b/web/core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
@@ -5,8 +5,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests all edge cases of converting from #contextual_links to ids and vice
- * versa.
+ * Tests edge cases for converting between contextual links and IDs.
  *
  * @group contextual
  */
@@ -23,14 +22,13 @@ class ContextualUnitTest extends KernelTestBase {
    * Provides testcases for both test functions.
    *
    * Used in testContextualLinksToId() and testContextualIdToLinks().
+   *
+   * @return array[]
+   *   Test cases.
    */
-  public function _contextual_links_id_testcases() {
-    // Test branch conditions:
-    // - one group.
-    // - one dynamic path argument.
-    // - no metadata.
-    $tests[] = [
-      'links' => [
+  public function contextualLinksDataProvider(): array {
+    $tests['one group, one dynamic path argument, no metadata'] = [
+      [
         'node' => [
           'route_parameters' => [
             'node' => '14031991',
@@ -38,33 +36,25 @@ public function _contextual_links_id_testcases() {
           'metadata' => ['langcode' => 'en'],
         ],
       ],
-      'id' => 'node:node=14031991:langcode=en',
+      'node:node=14031991:langcode=en',
     ];
 
-    // Test branch conditions:
-    // - one group.
-    // - multiple dynamic path arguments.
-    // - no metadata.
-    $tests[] = [
-      'links' => [
+    $tests['one group, multiple dynamic path arguments, no metadata'] = [
+      [
         'foo' => [
           'route_parameters' => [
-            'bar',
+            0 => 'bar',
             'key' => 'baz',
-            'qux',
+            1 => 'qux',
           ],
           'metadata' => ['langcode' => 'en'],
         ],
       ],
-      'id' => 'foo:0=bar&key=baz&1=qux:langcode=en',
+      'foo:0=bar&key=baz&1=qux:langcode=en',
     ];
 
-    // Test branch conditions:
-    // - one group.
-    // - one dynamic path argument.
-    // - metadata.
-    $tests[] = [
-      'links' => [
+    $tests['one group, one dynamic path argument, metadata'] = [
+      [
         'views_ui_edit' => [
           'route_parameters' => [
             'view' => 'frontpage',
@@ -76,14 +66,11 @@ public function _contextual_links_id_testcases() {
           ],
         ],
       ],
-      'id' => 'views_ui_edit:view=frontpage:location=page&display=page_1&langcode=en',
+      'views_ui_edit:view=frontpage:location=page&display=page_1&langcode=en',
     ];
 
-    // Test branch conditions:
-    // - multiple groups.
-    // - multiple dynamic path arguments.
-    $tests[] = [
-      'links' => [
+    $tests['multiple groups, multiple dynamic path arguments'] = [
+      [
         'node' => [
           'route_parameters' => [
             'node' => '14031991',
@@ -92,9 +79,9 @@ public function _contextual_links_id_testcases() {
         ],
         'foo' => [
           'route_parameters' => [
-            'bar',
+            0 => 'bar',
             'key' => 'baz',
-            'qux',
+            1 => 'qux',
           ],
           'metadata' => ['langcode' => 'en'],
         ],
@@ -103,30 +90,42 @@ public function _contextual_links_id_testcases() {
           'metadata' => ['langcode' => 'en'],
         ],
       ],
-      'id' => 'node:node=14031991:langcode=en|foo:0=bar&key=baz&1=qux:langcode=en|edge:0=20011988:langcode=en',
+      'node:node=14031991:langcode=en|foo:0=bar&key=baz&1=qux:langcode=en|edge:0=20011988:langcode=en',
     ];
 
     return $tests;
   }
 
   /**
-   * Tests _contextual_links_to_id().
+   * Tests the conversion from contextual links to IDs.
+   *
+   * @param array $links
+   *   The #contextual_links property value array.
+   * @param string $id
+   *   The serialized representation of the passed links.
+   *
+   * @covers ::_contextual_links_to_id
+   *
+   * @dataProvider contextualLinksDataProvider
    */
-  public function testContextualLinksToId() {
-    $tests = $this->_contextual_links_id_testcases();
-    foreach ($tests as $test) {
-      $this->assertSame($test['id'], _contextual_links_to_id($test['links']));
-    }
+  public function testContextualLinksToId(array $links, string $id) {
+    $this->assertSame($id, _contextual_links_to_id($links));
   }
 
   /**
-   * Tests _contextual_id_to_links().
+   * Tests the conversion from contextual ID to links.
+   *
+   * @param array $links
+   *   The #contextual_links property value array.
+   * @param string $id
+   *   The serialized representation of the passed links.
+   *
+   * @covers ::_contextual_id_to_links
+   *
+   * @dataProvider contextualLinksDataProvider
    */
-  public function testContextualIdToLinks() {
-    $tests = $this->_contextual_links_id_testcases();
-    foreach ($tests as $test) {
-      $this->assertSame($test['links'], _contextual_id_to_links($test['id']));
-    }
+  public function testContextualIdToLinks(array $links, string $id) {
+    $this->assertSame($links, _contextual_id_to_links($id));
   }
 
 }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
index fa6549665..23d01ea3f 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php
@@ -52,8 +52,8 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $form['format_type'] = [
       '#type' => 'select',
-      '#title' => t('Date format'),
-      '#description' => t("Choose a format for displaying the date. Be sure to set a format appropriate for the field, i.e. omitting time for a field that only has a date."),
+      '#title' => $this->t('Date format'),
+      '#description' => $this->t("Choose a format for displaying the date. Be sure to set a format appropriate for the field, i.e. omitting time for a field that only has a date."),
       '#options' => $options,
       '#default_value' => $this->getSetting('format_type'),
     ];
@@ -68,7 +68,7 @@ public function settingsSummary() {
     $summary = parent::settingsSummary();
 
     $date = new DrupalDateTime();
-    $summary[] = t('Format: @display', ['@display' => $this->formatDate($date)]);
+    $summary[] = $this->t('Format: @display', ['@display' => $this->formatDate($date)]);
 
     return $summary;
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
index 5f77efcd6..8c2bc82a2 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeFieldItemList.php
@@ -34,19 +34,19 @@ public function defaultValuesForm(array &$form, FormStateInterface $form_state)
         '#parents' => ['default_value_input'],
         'default_date_type' => [
           '#type' => 'select',
-          '#title' => t('Default date'),
-          '#description' => t('Set a default value for this date.'),
+          '#title' => $this->t('Default date'),
+          '#description' => $this->t('Set a default value for this date.'),
           '#default_value' => $default_value[0]['default_date_type'] ?? '',
           '#options' => [
-            static::DEFAULT_VALUE_NOW => t('Current date'),
-            static::DEFAULT_VALUE_CUSTOM => t('Relative date'),
+            static::DEFAULT_VALUE_NOW => $this->t('Current date'),
+            static::DEFAULT_VALUE_CUSTOM => $this->t('Relative date'),
           ],
           '#empty_value' => '',
         ],
         'default_date' => [
           '#type' => 'textfield',
-          '#title' => t('Relative default value'),
-          '#description' => t("Describe a time by reference to the current day, like '+90 days' (90 days from the day the field is created) or '+1 Saturday' (the next Saturday). See <a href=\"http://php.net/manual/function.strtotime.php\">strtotime</a> for more details."),
+          '#title' => $this->t('Relative default value'),
+          '#description' => $this->t("Describe a time by reference to the current day, like '+90 days' (90 days from the day the field is created) or '+1 Saturday' (the next Saturday). See <a href=\"http://php.net/manual/function.strtotime.php\">strtotime</a> for more details."),
           '#default_value' => (isset($default_value[0]['default_date_type']) && $default_value[0]['default_date_type'] == static::DEFAULT_VALUE_CUSTOM) ? $default_value[0]['default_date'] : '',
           '#states' => [
             'visible' => [
@@ -67,7 +67,7 @@ public function defaultValuesFormValidate(array $element, array &$form, FormStat
     if ($form_state->getValue(['default_value_input', 'default_date_type']) == static::DEFAULT_VALUE_CUSTOM) {
       $is_strtotime = @strtotime($form_state->getValue(['default_value_input', 'default_date']));
       if (!$is_strtotime) {
-        $form_state->setErrorByName('default_value_input][default_date', t('The relative date value entered is invalid.'));
+        $form_state->setErrorByName('default_value_input][default_date', $this->t('The relative date value entered is invalid.'));
       }
     }
   }
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
index 326406900..5e17728b9 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldType/DateTimeItem.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Field\FieldItemBase;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Plugin implementation of the 'datetime' field type.
@@ -47,12 +48,12 @@ public static function defaultStorageSettings() {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('datetime_iso8601')
-      ->setLabel(t('Date value'))
+      ->setLabel(new TranslatableMarkup('Date value'))
       ->setRequired(TRUE);
 
     $properties['date'] = DataDefinition::create('any')
-      ->setLabel(t('Computed date'))
-      ->setDescription(t('The computed DateTime object.'))
+      ->setLabel(new TranslatableMarkup('Computed date'))
+      ->setDescription(new TranslatableMarkup('The computed DateTime object.'))
       ->setComputed(TRUE)
       ->setClass('\Drupal\datetime\DateTimeComputed')
       ->setSetting('date source', 'value');
@@ -86,12 +87,12 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['datetime_type'] = [
       '#type' => 'select',
-      '#title' => t('Date type'),
-      '#description' => t('Choose the type of date to create.'),
+      '#title' => $this->t('Date type'),
+      '#description' => $this->t('Choose the type of date to create.'),
       '#default_value' => $this->getSetting('datetime_type'),
       '#options' => [
-        static::DATETIME_TYPE_DATETIME => t('Date and time'),
-        static::DATETIME_TYPE_DATE => t('Date only'),
+        static::DATETIME_TYPE_DATETIME => $this->t('Date and time'),
+        static::DATETIME_TYPE_DATE => $this->t('Date only'),
       ],
       '#disabled' => $has_data,
     ];
diff --git a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
index 276d92c43..0d85d34a0 100644
--- a/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
+++ b/web/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php
@@ -93,29 +93,33 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $element['date_order'] = [
       '#type' => 'select',
-      '#title' => t('Date part order'),
+      '#title' => $this->t('Date part order'),
       '#default_value' => $this->getSetting('date_order'),
-      '#options' => ['MDY' => t('Month/Day/Year'), 'DMY' => t('Day/Month/Year'), 'YMD' => t('Year/Month/Day')],
+      '#options' => [
+        'MDY' => $this->t('Month/Day/Year'),
+        'DMY' => $this->t('Day/Month/Year'),
+        'YMD' => $this->t('Year/Month/Day'),
+      ],
     ];
 
     if ($this->getFieldSetting('datetime_type') == 'datetime') {
       $element['time_type'] = [
         '#type' => 'select',
-        '#title' => t('Time type'),
+        '#title' => $this->t('Time type'),
         '#default_value' => $this->getSetting('time_type'),
-        '#options' => ['24' => t('24 hour time'), '12' => t('12 hour time')],
+        '#options' => ['24' => $this->t('24 hour time'), '12' => $this->t('12 hour time')],
       ];
 
       $element['increment'] = [
         '#type' => 'select',
-        '#title' => t('Time increments'),
+        '#title' => $this->t('Time increments'),
         '#default_value' => $this->getSetting('increment'),
         '#options' => [
-          1 => t('1 minute'),
-          5 => t('5 minute'),
-          10 => t('10 minute'),
-          15 => t('15 minute'),
-          30 => t('30 minute'),
+          1 => $this->t('1 minute'),
+          5 => $this->t('5 minute'),
+          10 => $this->t('10 minute'),
+          15 => $this->t('15 minute'),
+          30 => $this->t('30 minute'),
         ],
       ];
     }
@@ -140,10 +144,10 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = [];
 
-    $summary[] = t('Date part order: @order', ['@order' => $this->getSetting('date_order')]);
+    $summary[] = $this->t('Date part order: @order', ['@order' => $this->getSetting('date_order')]);
     if ($this->getFieldSetting('datetime_type') == 'datetime') {
-      $summary[] = t('Time type: @time_type', ['@time_type' => $this->getSetting('time_type')]);
-      $summary[] = t('Time increments: @increment', ['@increment' => $this->getSetting('increment')]);
+      $summary[] = $this->t('Time type: @time_type', ['@time_type' => $this->getSetting('time_type')]);
+      $summary[] = $this->t('Time increments: @increment', ['@increment' => $this->getSetting('increment')]);
     }
 
     return $summary;
diff --git a/web/core/modules/datetime/tests/src/Functional/DateTimeWidgetTest.php b/web/core/modules/datetime/tests/src/Functional/DateTimeWidgetTest.php
index 529d06c96..72ed828c5 100644
--- a/web/core/modules/datetime/tests/src/Functional/DateTimeWidgetTest.php
+++ b/web/core/modules/datetime/tests/src/Functional/DateTimeWidgetTest.php
@@ -81,9 +81,11 @@ public function testDateonlyDefaultValue() {
       $this->setSiteTimezone($timezone);
       $this->assertEquals($timezone, $this->config('system.date')->get('timezone.default'), 'Time zone set to ' . $timezone);
 
+      // The time of the request is determined very early on in the request so
+      // use the current time prior to making a request.
+      $request_time = $this->container->get('datetime.time')->getCurrentTime();
       $this->drupalGet('node/add/dateonly_content');
 
-      $request_time = $this->container->get('datetime.time')->getRequestTime();
       $today = $this->dateFormatter->format($request_time, 'html_date', NULL, $timezone);
       $this->assertSession()->fieldValueEquals('field_dateonly[0][value][date]', $today);
 
diff --git a/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php b/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php
index 7d0bb6c45..ce3f43014 100644
--- a/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php
+++ b/web/core/modules/datetime/tests/src/Functional/Views/FilterDateTest.php
@@ -198,4 +198,55 @@ protected function assertIds(array $expected_ids = []): void {
     $this->assertEquals($expected_ids, $actual_ids);
   }
 
+  /**
+   * Tests exposed date filters with a pager.
+   */
+  public function testExposedFilterWithPager() {
+    // Expose the empty and not empty operators in a grouped filter.
+    $this->drupalGet('admin/structure/views/nojs/handler/test_filter_datetime/default/filter/' . $this->fieldName . '_value');
+    $this->submitForm([], t('Expose filter'));
+
+    $edit = [];
+    $edit['options[operator]'] = '>';
+
+    $this->submitForm($edit, 'Apply');
+
+    // Expose the view and set the pager to 2 items.
+    $path = 'test_filter_datetime-path';
+    $this->drupalGet('admin/structure/views/view/test_filter_datetime/edit');
+    $this->submitForm([], 'Add Page');
+    $this->drupalGet('admin/structure/views/nojs/display/test_filter_datetime/page_1/path');
+    $this->submitForm(['path' => $path], 'Apply');
+    $this->drupalGet('admin/structure/views/nojs/display/test_filter_datetime/default/pager_options');
+    $this->submitForm(['pager_options[items_per_page]' => 2], 'Apply');
+    $this->submitForm([], t('Save'));
+
+    // Assert the page without filters.
+    $this->drupalGet($path);
+    $results = $this->cssSelect('.views-row');
+    $this->assertCount(2, $results);
+    $this->assertSession()->pageTextContains('Next');
+
+    // Assert the page with filter in the future, one results without pager.
+    $page = $this->getSession()->getPage();
+    $now = \Drupal::time()->getRequestTime();
+    $page->fillField($this->fieldName . '_value', DrupalDateTime::createFromTimestamp($now + 1)->format('Y-m-d H:i:s'));
+    $page->pressButton('Apply');
+
+    $results = $this->cssSelect('.views-row');
+    $this->assertCount(1, $results);
+    $this->assertSession()->pageTextNotContains('Next');
+
+    // Assert the page with filter in the past, 3 results with pager.
+    $page->fillField($this->fieldName . '_value', DrupalDateTime::createFromTimestamp($now - 1000000)->format('Y-m-d H:i:s'));
+    $this->getSession()->getPage()->pressButton('Apply');
+    $results = $this->cssSelect('.views-row');
+    $this->assertCount(2, $results);
+    $this->assertSession()->pageTextContains('Next');
+    $page->clickLink('2');
+    $results = $this->cssSelect('.views-row');
+    $this->assertCount(1, $results);
+
+  }
+
 }
diff --git a/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php b/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
index fcb8bc99f..760013889 100644
--- a/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
+++ b/web/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php
@@ -40,6 +40,9 @@ class DateTimeItemTest extends FieldKernelTestBase {
    */
   protected static $modules = ['datetime'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/DateFieldTest.php b/web/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/DateFieldTest.php
index 1fce8a1a2..e3a7b8ed3 100644
--- a/web/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/DateFieldTest.php
+++ b/web/core/modules/datetime/tests/src/Unit/Plugin/migrate/field/DateFieldTest.php
@@ -55,7 +55,7 @@ public function testDefineValueProcessPipeline($data, $from_format, $to_format)
     $migration->expects($this->once())
       ->method('mergeProcessOfProperty')
       ->with('field_date', $pipeline)
-      ->will($this->returnValue($migration));
+      ->willReturn($migration);
 
     $plugin = new DateField([], '', []);
     $plugin->defineValueProcessPipeline($migration, 'field_date', $data);
diff --git a/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php b/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
index df03d6323..d78c73875 100644
--- a/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
+++ b/web/core/modules/datetime_range/tests/src/Functional/DateRangeFieldTest.php
@@ -226,9 +226,9 @@ public function testDateRangeField() {
         'type' => 'daterange_default',
         'label' => 'hidden',
         'settings' => [
-            'format_type' => 'long',
-            'separator' => 'THESEPARATOR',
-          ] + $this->defaultSettings,
+          'format_type' => 'long',
+          'separator' => 'THESEPARATOR',
+        ] + $this->defaultSettings,
       ];
 
       $display_repository->getViewDisplay($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
diff --git a/web/core/modules/dblog/src/Plugin/views/filter/DblogTypes.php b/web/core/modules/dblog/src/Plugin/views/filter/DblogTypes.php
index 23ea736ea..ed8f54716 100644
--- a/web/core/modules/dblog/src/Plugin/views/filter/DblogTypes.php
+++ b/web/core/modules/dblog/src/Plugin/views/filter/DblogTypes.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\dblog\Plugin\views\filter;
 
+use Drupal\Core\Form\FormStateInterface;
 use Drupal\views\Plugin\views\filter\InOperator;
 
 /**
@@ -21,4 +22,12 @@ public function getValueOptions() {
     return $this->valueOptions;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function valueForm(&$form, FormStateInterface $form_state) {
+    parent::valueForm($form, $form_state);
+    $form['value']['#access'] = !empty($form['value']['#options']);
+  }
+
 }
diff --git a/web/core/modules/dblog/tests/src/Functional/DbLogTest.php b/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
index 02e4ab937..d92ec07d2 100644
--- a/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/DbLogTest.php
@@ -14,8 +14,7 @@
 use Drupal\Tests\system\Functional\Menu\AssertBreadcrumbTrait;
 
 /**
- * Generate events and verify dblog entries; verify user access to log reports
- * based on permissions.
+ * Verifies log entries and user access based on permissions.
  *
  * @group dblog
  */
@@ -408,8 +407,7 @@ public function verifySort($sort = 'asc', $order = 'Date') {
   }
 
   /**
-   * Tests the escaping of links in the operation row of a database log detail
-   * page.
+   * Tests link escaping in the operation row of a database log detail page.
    */
   private function verifyLinkEscaping() {
     $link = Link::fromTextAndUrl('View', Url::fromRoute('entity.node.canonical', ['node' => 1]))->toString();
@@ -724,12 +722,14 @@ public function testFilter() {
     $this->drupalGet('admin/reports/dblog', ['query' => ['order' => 'Type']]);
     $this->assertSession()->statusCodeEquals(200);
     $this->assertSession()->pageTextContains('Operations');
+    $this->assertSession()->fieldExists('edit-type');
 
     // Clear all logs and make sure the confirmation message is found.
     $this->clearLogsEntries();
     // Confirm that the logs should be cleared.
     $this->submitForm([], 'Confirm');
     $this->assertSession()->pageTextContains('Database log cleared.');
+    $this->assertSession()->fieldNotExists('edit-type');
   }
 
   /**
diff --git a/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php b/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php
index 65f97621a..2e2cdda1c 100644
--- a/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php
+++ b/web/core/modules/dblog/tests/src/Functional/DbLogViewsTest.php
@@ -5,8 +5,7 @@
 use Drupal\views\Views;
 
 /**
- * Generate events and verify dblog entries; verify user access to log reports
- * based on permissions. Using the dblog UI generated by a View.
+ * Verifies user access to log reports based on permissions.
  *
  * @see Drupal\dblog\Tests\DbLogTest
  *
diff --git a/web/core/modules/dblog/tests/src/Kernel/DbLogControllerTest.php b/web/core/modules/dblog/tests/src/Kernel/DbLogControllerTest.php
index 2aac3efe5..d5585bc95 100644
--- a/web/core/modules/dblog/tests/src/Kernel/DbLogControllerTest.php
+++ b/web/core/modules/dblog/tests/src/Kernel/DbLogControllerTest.php
@@ -17,6 +17,9 @@ class DbLogControllerTest extends KernelTestBase {
    */
   protected static $modules = ['dblog', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
diff --git a/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php b/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
index ef73b55ae..1856d5cc7 100644
--- a/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
+++ b/web/core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php
@@ -24,13 +24,18 @@ class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp(): void {
     parent::setUp();
+    // Enable dblog in the source database so that requirements are met.
+    $this->sourceDatabase->update('system')
+      ->condition('name', 'dblog')
+      ->fields(['status' => '1'])
+      ->execute();
     $this->executeMigration('d6_dblog_settings');
   }
 
   /**
    * Tests migration of dblog variables to dblog.settings.yml.
    */
-  public function testBookSettings() {
+  public function testDblogSettings() {
     $config = $this->config('dblog.settings');
     $this->assertSame(10000, $config->get('row_limit'));
     $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config->get());
diff --git a/web/core/modules/editor/editor.libraries.yml b/web/core/modules/editor/editor.libraries.yml
index 2727f7da3..085839505 100644
--- a/web/core/modules/editor/editor.libraries.yml
+++ b/web/core/modules/editor/editor.libraries.yml
@@ -30,13 +30,3 @@ drupal.editor.dialog:
     - core/drupal.dialog
     - core/drupal.ajax
     - core/drupalSettings
-
-quickedit.inPlaceEditor.formattedText:
-  version: VERSION
-  js:
-    js/editor.formattedTextEditor.js: { attributes: { defer: true } }
-  dependencies:
-    - quickedit/quickedit
-    - editor/drupal.editor
-    - core/drupal.ajax
-    - core/drupalSettings
diff --git a/web/core/modules/editor/editor.module b/web/core/modules/editor/editor.module
index f95dd8bfd..fcada7ffb 100644
--- a/web/core/modules/editor/editor.module
+++ b/web/core/modules/editor/editor.module
@@ -68,18 +68,6 @@ function editor_element_info_alter(&$types) {
   $types['text_format']['#pre_render'][] = 'element.editor:preRenderTextFormat';
 }
 
-/**
- * Implements hook_field_formatter_info_alter().
- *
- * @see quickedit_field_formatter_info_alter()
- */
-function editor_field_formatter_info_alter(&$info) {
-  // Update \Drupal\text\Plugin\Field\FieldFormatter\TextDefaultFormatter's
-  // annotation to indicate that it supports the 'editor' in-place editor
-  // provided by this module.
-  $info['text_default']['quickedit'] = ['editor' => 'editor'];
-}
-
 /**
  * Implements hook_form_FORM_ID_alter().
  */
diff --git a/web/core/modules/editor/editor.routing.yml b/web/core/modules/editor/editor.routing.yml
index 0c5b2249b..5bc0ce5c8 100644
--- a/web/core/modules/editor/editor.routing.yml
+++ b/web/core/modules/editor/editor.routing.yml
@@ -5,18 +5,6 @@ editor.filter_xss:
   requirements:
     _entity_access: 'filter_format.use'
 
-editor.field_untransformed_text:
-  path: '/editor/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
-  defaults:
-    _controller: '\Drupal\editor\EditorController::getUntransformedText'
-  options:
-    parameters:
-      entity:
-        type: entity:{entity_type}
-  requirements:
-    _permission: 'access in-place editing'
-    _access_quickedit_entity_field: 'TRUE'
-
 editor.image_dialog:
   path: '/editor/dialog/image/{editor}'
   defaults:
diff --git a/web/core/modules/editor/js/editor.admin.js b/web/core/modules/editor/js/editor.admin.js
index a1175e85d..0cbc32821 100644
--- a/web/core/modules/editor/js/editor.admin.js
+++ b/web/core/modules/editor/js/editor.admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, document) {
   Drupal.editorConfiguration = {
     addedFeature: function addedFeature(feature) {
@@ -20,68 +19,53 @@
       function emptyProperties(section) {
         return section.attributes.length === 0 && section.classes.length === 0 && section.styles.length === 0;
       }
-
       function generateUniverseFromFeatureRequirements(feature) {
         var properties = ['attributes', 'styles', 'classes'];
         var universe = {};
-
         for (var r = 0; r < feature.rules.length; r++) {
           var featureRule = feature.rules[r];
           var requiredTags = featureRule.required.tags;
-
           for (var t = 0; t < requiredTags.length; t++) {
             universe[requiredTags[t]] = {
               tag: false,
               touchedByAllowedPropertyRule: false
             };
           }
-
           if (emptyProperties(featureRule.required)) {
             continue;
           }
-
           for (var p = 0; p < properties.length; p++) {
             var property = properties[p];
-
             for (var pv = 0; pv < featureRule.required[property].length; pv++) {
               var propertyValue = featureRule.required[property];
               universe[requiredTags]["".concat(property, ":").concat(propertyValue)] = false;
             }
           }
         }
-
         return universe;
       }
-
       function findPropertyValueOnTag(universe, tag, property, propertyValue, allowing) {
         if (!universe.hasOwnProperty(tag)) {
           return false;
         }
-
         var key = "".concat(property, ":").concat(propertyValue);
-
         if (allowing) {
           universe[tag].touchedByAllowedPropertyRule = true;
         }
-
         if (propertyValue.indexOf('*') === -1) {
           if (universe.hasOwnProperty(tag) && universe[tag].hasOwnProperty(key)) {
             if (allowing) {
               universe[tag][key] = true;
             }
-
             return true;
           }
-
           return false;
         }
-
         var atLeastOneFound = false;
         var regex = key.replace(/\*/g, '[^ ]*');
         Object.keys(universe[tag]).forEach(function (key) {
           if (key.match(regex)) {
             atLeastOneFound = true;
-
             if (allowing) {
               universe[tag][key] = true;
             }
@@ -89,7 +73,6 @@
         });
         return atLeastOneFound;
       }
-
       function findPropertyValuesOnAllTags(universe, property, propertyValues, allowing) {
         var atLeastOneFound = false;
         Object.keys(universe).forEach(function (tag) {
@@ -99,12 +82,10 @@
         });
         return atLeastOneFound;
       }
-
       function findPropertyValuesOnTag(universe, tag, property, propertyValues, allowing) {
         if (tag === '*') {
           return findPropertyValuesOnAllTags(universe, property, propertyValues, allowing);
         }
-
         var atLeastOneFound = false;
         propertyValues.forEach(function (propertyValue) {
           if (findPropertyValueOnTag(universe, tag, property, propertyValue, allowing)) {
@@ -113,7 +94,6 @@
         });
         return atLeastOneFound;
       }
-
       function deleteAllTagsFromUniverseIfAllowed(universe) {
         var atLeastOneDeleted = false;
         Object.keys(universe).forEach(function (tag) {
@@ -123,12 +103,10 @@
         });
         return atLeastOneDeleted;
       }
-
       function deleteFromUniverseIfAllowed(universe, tag) {
         if (tag === '*') {
           return deleteAllTagsFromUniverseIfAllowed(universe);
         }
-
         if (universe.hasOwnProperty(tag) && Object.keys(universe[tag]).filter(function (key) {
           return key !== 'touchedByAllowedPropertyRule';
         }).every(function (key) {
@@ -137,39 +115,30 @@
           delete universe[tag];
           return true;
         }
-
         return false;
       }
-
       function anyForbiddenFilterRuleMatches(universe, filterStatus) {
         var properties = ['attributes', 'styles', 'classes'];
         var allRequiredTags = Object.keys(universe);
         var filterRule;
-
         for (var i = 0; i < filterStatus.rules.length; i++) {
           filterRule = filterStatus.rules[i];
-
           if (filterRule.allow === false) {
             var intersection = filterRule.tags.filter(function (tag) {
               return allRequiredTags.includes(tag);
             });
-
             if (intersection.length > 0) {
               return true;
             }
           }
         }
-
         for (var n = 0; n < filterStatus.rules.length; n++) {
           filterRule = filterStatus.rules[n];
-
           if (filterRule.restrictedTags.tags.length && !emptyProperties(filterRule.restrictedTags.forbidden)) {
             for (var j = 0; j < filterRule.restrictedTags.tags.length; j++) {
               var tag = filterRule.restrictedTags.tags[j];
-
               for (var k = 0; k < properties.length; k++) {
                 var property = properties[k];
-
                 if (findPropertyValuesOnTag(universe, tag, property, filterRule.restrictedTags.forbidden[property], false)) {
                   return true;
                 }
@@ -177,22 +146,17 @@
             }
           }
         }
-
         return false;
       }
-
       function markAllowedTagsAndPropertyValues(universe, filterStatus) {
         var properties = ['attributes', 'styles', 'classes'];
         var filterRule;
         var tag;
-
         for (var l = 0; Object.keys(universe).length > 0 && l < filterStatus.rules.length; l++) {
           filterRule = filterStatus.rules[l];
-
           if (filterRule.allow === true) {
             for (var m = 0; Object.keys(universe).length > 0 && m < filterRule.tags.length; m++) {
               tag = filterRule.tags[m];
-
               if (universe.hasOwnProperty(tag)) {
                 universe[tag].tag = true;
                 deleteFromUniverseIfAllowed(universe, tag);
@@ -200,17 +164,13 @@
             }
           }
         }
-
         for (var i = 0; Object.keys(universe).length > 0 && i < filterStatus.rules.length; i++) {
           filterRule = filterStatus.rules[i];
-
           if (filterRule.restrictedTags.tags.length && !emptyProperties(filterRule.restrictedTags.allowed)) {
             for (var j = 0; Object.keys(universe).length > 0 && j < filterRule.restrictedTags.tags.length; j++) {
               tag = filterRule.restrictedTags.tags[j];
-
               for (var k = 0; k < properties.length; k++) {
                 var property = properties[k];
-
                 if (findPropertyValuesOnTag(universe, tag, property, filterRule.restrictedTags.allowed[property], true)) {
                   deleteFromUniverseIfAllowed(universe, tag);
                 }
@@ -219,28 +179,21 @@
           }
         }
       }
-
       function filterStatusAllowsFeature(filterStatus, feature) {
         if (!filterStatus.active) {
           return true;
         }
-
         if (feature.rules.length === 0) {
           return true;
         }
-
         if (filterStatus.rules.length === 0) {
           return true;
         }
-
         var universe = generateUniverseFromFeatureRequirements(feature);
-
         if (anyForbiddenFilterRuleMatches(universe, filterStatus)) {
           return false;
         }
-
         markAllowedTagsAndPropertyValues(universe, filterStatus);
-
         if (filterStatus.rules.some(function (_ref) {
           var allow = _ref.allow;
           return allow;
@@ -248,38 +201,30 @@
           if (Object.keys(universe).length === 0) {
             return true;
           }
-
           if (!Object.keys(universe).every(function (tagName) {
             return universe[tagName].tag;
           })) {
             return false;
           }
-
           var tags = Object.keys(universe);
-
           for (var i = 0; i < tags.length; i++) {
             var tag = tags[i];
-
             if (universe.hasOwnProperty(tag)) {
               if (universe[tag].touchedByAllowedPropertyRule === false) {
                 delete universe[tag];
               }
             }
           }
-
           return Object.keys(universe).length === 0;
         }
-
         return true;
       }
-
       Drupal.filterConfiguration.update();
       return Object.keys(Drupal.filterConfiguration.statuses).every(function (filterID) {
         return filterStatusAllowsFeature(Drupal.filterConfiguration.statuses[filterID], feature);
       });
     }
   };
-
   Drupal.EditorFeatureHTMLRule = function () {
     this.required = {
       tags: [],
@@ -295,26 +240,21 @@
     };
     this.raw = null;
   };
-
   Drupal.EditorFeature = function (name) {
     this.name = name;
     this.rules = [];
   };
-
   Drupal.EditorFeature.prototype.addHTMLRule = function (rule) {
     this.rules.push(rule);
   };
-
   Drupal.FilterStatus = function (name) {
     this.name = name;
     this.active = false;
     this.rules = [];
   };
-
   Drupal.FilterStatus.prototype.addHTMLRule = function (rule) {
     this.rules.push(rule);
   };
-
   Drupal.FilterHTMLRule = function () {
     this.tags = [];
     this.allow = null;
@@ -333,7 +273,6 @@
     };
     return this;
   };
-
   Drupal.FilterHTMLRule.prototype.clone = function () {
     var clone = new Drupal.FilterHTMLRule();
     clone.tags = this.tags.slice(0);
@@ -347,14 +286,12 @@
     clone.restrictedTags.forbidden.classes = this.restrictedTags.forbidden.classes.slice(0);
     return clone;
   };
-
   Drupal.filterConfiguration = {
     statuses: {},
     liveSettingParsers: {},
     update: function update() {
       Object.keys(Drupal.filterConfiguration.statuses || {}).forEach(function (filterID) {
         Drupal.filterConfiguration.statuses[filterID].active = $("[name=\"filters[".concat(filterID, "][status]\"]")).is(':checked');
-
         if (Drupal.filterConfiguration.liveSettingParsers[filterID]) {
           Drupal.filterConfiguration.statuses[filterID].rules = Drupal.filterConfiguration.liveSettingParsers[filterID].getRules();
         }
diff --git a/web/core/modules/editor/js/editor.dialog.js b/web/core/modules/editor/js/editor.dialog.js
index 1c6412cee..5880e6fc9 100644
--- a/web/core/modules/editor/js/editor.dialog.js
+++ b/web/core/modules/editor/js/editor.dialog.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.AjaxCommands.prototype.editorDialogSave = function (ajax, response, status) {
     $(window).trigger('editor:dialogsave', [response.values]);
diff --git a/web/core/modules/editor/js/editor.formattedTextEditor.es6.js b/web/core/modules/editor/js/editor.formattedTextEditor.es6.js
deleted file mode 100644
index 6e69d785f..000000000
--- a/web/core/modules/editor/js/editor.formattedTextEditor.es6.js
+++ /dev/null
@@ -1,244 +0,0 @@
-/**
- * @file
- * Text editor-based in-place editor for formatted text content in Drupal.
- *
- * Depends on editor.module. Works with any (WYSIWYG) editor that implements the
- * editor.js API, including the optional attachInlineEditor() and onChange()
- * methods.
- * For example, assuming that a hypothetical editor's name was "Magical Editor"
- * and its editor.js API implementation lived at Drupal.editors.magical, this
- * JavaScript would use:
- *  - Drupal.editors.magical.attachInlineEditor()
- */
-
-(function ($, Drupal, drupalSettings, _) {
-  Drupal.quickedit.editors.editor = Drupal.quickedit.EditorView.extend(
-    /** @lends Drupal.quickedit.editors.editor# */ {
-      /**
-       * The text format for this field.
-       *
-       * @type {string}
-       */
-      textFormat: null,
-
-      /**
-       * Indicates whether this text format has transformations.
-       *
-       * @type {bool}
-       */
-      textFormatHasTransformations: null,
-
-      /**
-       * Stores a reference to the text editor object for this field.
-       *
-       * @type {Drupal.quickedit.EditorModel}
-       */
-      textEditor: null,
-
-      /**
-       * Stores the textual DOM element that is being in-place edited.
-       *
-       * @type {jQuery}
-       */
-      $textElement: null,
-
-      /**
-       * @constructs
-       *
-       * @augments Drupal.quickedit.EditorView
-       *
-       * @param {object} options
-       *   Options for the editor view.
-       */
-      initialize(options) {
-        Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
-
-        const metadata = Drupal.quickedit.metadata.get(
-          this.fieldModel.get('fieldID'),
-          'custom',
-        );
-        this.textFormat = drupalSettings.editor.formats[metadata.format];
-        this.textFormatHasTransformations = metadata.formatHasTransformations;
-        this.textEditor = Drupal.editors[this.textFormat.editor];
-
-        // Store the actual value of this field. We'll need this to restore the
-        // original value when the user discards their modifications.
-        const $fieldItems = this.$el.find('.quickedit-field');
-        if ($fieldItems.length) {
-          this.$textElement = $fieldItems.eq(0);
-        } else {
-          this.$textElement = this.$el;
-        }
-        this.model.set('originalValue', this.$textElement.html());
-      },
-
-      /**
-       * {@inheritdoc}
-       *
-       * @return {jQuery}
-       *   The text element edited.
-       */
-      getEditedElement() {
-        return this.$textElement;
-      },
-
-      /**
-       * {@inheritdoc}
-       *
-       * @param {object} fieldModel
-       *   The field model.
-       * @param {string} state
-       *   The current state.
-       */
-      stateChange(fieldModel, state) {
-        const editorModel = this.model;
-        const from = fieldModel.previous('state');
-        const to = state;
-        switch (to) {
-          case 'inactive':
-            break;
-
-          case 'candidate':
-            // Detach the text editor when entering the 'candidate' state from one
-            // of the states where it could have been attached.
-            if (from !== 'inactive' && from !== 'highlighted') {
-              this.textEditor.detach(this.$textElement.get(0), this.textFormat);
-            }
-            // A field model's editor view revert() method is invoked when an
-            // 'active' field becomes a 'candidate' field. But, in the case of
-            // this in-place editor, the content will have been *replaced* if the
-            // text format has transformation filters. Therefore, if we stop
-            // in-place editing this entity, revert explicitly.
-            if (from === 'active' && this.textFormatHasTransformations) {
-              this.revert();
-            }
-            if (from === 'invalid') {
-              this.removeValidationErrors();
-            }
-            break;
-
-          case 'highlighted':
-            break;
-
-          case 'activating':
-            // When transformation filters have been applied to the formatted text
-            // of this field, then we'll need to load a re-formatted version of it
-            // without the transformation filters.
-            if (this.textFormatHasTransformations) {
-              const $textElement = this.$textElement;
-              this._getUntransformedText((untransformedText) => {
-                $textElement.html(untransformedText);
-                fieldModel.set('state', 'active');
-              });
-            }
-            // When no transformation filters have been applied: start WYSIWYG
-            // editing immediately!
-            else {
-              // Defer updating the model until the current state change has
-              // propagated, to not trigger a nested state change event.
-              _.defer(() => {
-                fieldModel.set('state', 'active');
-              });
-            }
-            break;
-
-          case 'active': {
-            const textElement = this.$textElement.get(0);
-            const toolbarView = fieldModel.toolbarView;
-            this.textEditor.attachInlineEditor(
-              textElement,
-              this.textFormat,
-              toolbarView.getMainWysiwygToolgroupId(),
-              toolbarView.getFloatedWysiwygToolgroupId(),
-            );
-            // Set the state to 'changed' whenever the content has changed.
-            this.textEditor.onChange(textElement, (htmlText) => {
-              editorModel.set('currentValue', htmlText);
-              fieldModel.set('state', 'changed');
-            });
-            break;
-          }
-
-          case 'changed':
-            break;
-
-          case 'saving':
-            if (from === 'invalid') {
-              this.removeValidationErrors();
-            }
-            this.save();
-            break;
-
-          case 'saved':
-            break;
-
-          case 'invalid':
-            this.showValidationErrors();
-            break;
-        }
-      },
-
-      /**
-       * {@inheritdoc}
-       *
-       * @return {object}
-       *   The settings for the quick edit UI.
-       */
-      getQuickEditUISettings() {
-        return {
-          padding: true,
-          unifiedToolbar: true,
-          fullWidthToolbar: true,
-          popup: false,
-        };
-      },
-
-      /**
-       * {@inheritdoc}
-       */
-      revert() {
-        this.$textElement.html(this.model.get('originalValue'));
-      },
-
-      /**
-       * Loads untransformed text for this field.
-       *
-       * More accurately: it re-filters formatted text to exclude transformation
-       * filters used by the text format.
-       *
-       * @param {function} callback
-       *   A callback function that will receive the untransformed text.
-       *
-       * @see \Drupal\editor\Ajax\GetUntransformedTextCommand
-       */
-      _getUntransformedText(callback) {
-        const fieldID = this.fieldModel.get('fieldID');
-
-        // Create a Drupal.ajax instance to load the form.
-        const textLoaderAjax = Drupal.ajax({
-          url: Drupal.quickedit.util.buildUrl(
-            fieldID,
-            Drupal.url(
-              'editor/!entity_type/!id/!field_name/!langcode/!view_mode',
-            ),
-          ),
-          submit: { nocssjs: true },
-        });
-
-        // Implement a scoped editorGetUntransformedText AJAX command: calls the
-        // callback.
-        textLoaderAjax.commands.editorGetUntransformedText = function (
-          ajax,
-          response,
-          status,
-        ) {
-          callback(response.data);
-        };
-
-        // This will ensure our scoped editorGetUntransformedText AJAX command
-        // gets called.
-        textLoaderAjax.execute();
-      },
-    },
-  );
-})(jQuery, Drupal, drupalSettings, _);
diff --git a/web/core/modules/editor/js/editor.formattedTextEditor.js b/web/core/modules/editor/js/editor.formattedTextEditor.js
deleted file mode 100644
index 2519b9040..000000000
--- a/web/core/modules/editor/js/editor.formattedTextEditor.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
-* DO NOT EDIT THIS FILE.
-* See the following change record for more information,
-* https://www.drupal.org/node/2815083
-* @preserve
-**/
-
-(function ($, Drupal, drupalSettings, _) {
-  Drupal.quickedit.editors.editor = Drupal.quickedit.EditorView.extend({
-    textFormat: null,
-    textFormatHasTransformations: null,
-    textEditor: null,
-    $textElement: null,
-    initialize: function initialize(options) {
-      Drupal.quickedit.EditorView.prototype.initialize.call(this, options);
-      var metadata = Drupal.quickedit.metadata.get(this.fieldModel.get('fieldID'), 'custom');
-      this.textFormat = drupalSettings.editor.formats[metadata.format];
-      this.textFormatHasTransformations = metadata.formatHasTransformations;
-      this.textEditor = Drupal.editors[this.textFormat.editor];
-      var $fieldItems = this.$el.find('.quickedit-field');
-
-      if ($fieldItems.length) {
-        this.$textElement = $fieldItems.eq(0);
-      } else {
-        this.$textElement = this.$el;
-      }
-
-      this.model.set('originalValue', this.$textElement.html());
-    },
-    getEditedElement: function getEditedElement() {
-      return this.$textElement;
-    },
-    stateChange: function stateChange(fieldModel, state) {
-      var editorModel = this.model;
-      var from = fieldModel.previous('state');
-      var to = state;
-
-      switch (to) {
-        case 'inactive':
-          break;
-
-        case 'candidate':
-          if (from !== 'inactive' && from !== 'highlighted') {
-            this.textEditor.detach(this.$textElement.get(0), this.textFormat);
-          }
-
-          if (from === 'active' && this.textFormatHasTransformations) {
-            this.revert();
-          }
-
-          if (from === 'invalid') {
-            this.removeValidationErrors();
-          }
-
-          break;
-
-        case 'highlighted':
-          break;
-
-        case 'activating':
-          if (this.textFormatHasTransformations) {
-            var $textElement = this.$textElement;
-
-            this._getUntransformedText(function (untransformedText) {
-              $textElement.html(untransformedText);
-              fieldModel.set('state', 'active');
-            });
-          } else {
-            _.defer(function () {
-              fieldModel.set('state', 'active');
-            });
-          }
-
-          break;
-
-        case 'active':
-          {
-            var textElement = this.$textElement.get(0);
-            var toolbarView = fieldModel.toolbarView;
-            this.textEditor.attachInlineEditor(textElement, this.textFormat, toolbarView.getMainWysiwygToolgroupId(), toolbarView.getFloatedWysiwygToolgroupId());
-            this.textEditor.onChange(textElement, function (htmlText) {
-              editorModel.set('currentValue', htmlText);
-              fieldModel.set('state', 'changed');
-            });
-            break;
-          }
-
-        case 'changed':
-          break;
-
-        case 'saving':
-          if (from === 'invalid') {
-            this.removeValidationErrors();
-          }
-
-          this.save();
-          break;
-
-        case 'saved':
-          break;
-
-        case 'invalid':
-          this.showValidationErrors();
-          break;
-      }
-    },
-    getQuickEditUISettings: function getQuickEditUISettings() {
-      return {
-        padding: true,
-        unifiedToolbar: true,
-        fullWidthToolbar: true,
-        popup: false
-      };
-    },
-    revert: function revert() {
-      this.$textElement.html(this.model.get('originalValue'));
-    },
-    _getUntransformedText: function _getUntransformedText(callback) {
-      var fieldID = this.fieldModel.get('fieldID');
-      var textLoaderAjax = Drupal.ajax({
-        url: Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('editor/!entity_type/!id/!field_name/!langcode/!view_mode')),
-        submit: {
-          nocssjs: true
-        }
-      });
-
-      textLoaderAjax.commands.editorGetUntransformedText = function (ajax, response, status) {
-        callback(response.data);
-      };
-
-      textLoaderAjax.execute();
-    }
-  });
-})(jQuery, Drupal, drupalSettings, _);
\ No newline at end of file
diff --git a/web/core/modules/editor/js/editor.js b/web/core/modules/editor/js/editor.js
index 70ae57a67..df3bc044c 100644
--- a/web/core/modules/editor/js/editor.js
+++ b/web/core/modules/editor/js/editor.js
@@ -4,13 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   function findFieldForFormatSelector($formatSelector) {
     var fieldId = $formatSelector.attr('data-editor-for');
     return $("#".concat(fieldId)).get(0);
   }
-
   function filterXssWhenSwitching(field, format, originalFormatID, callback) {
     if (format.editor.isXssSafe) {
       callback(field, format);
@@ -27,43 +25,34 @@
           if (xssFilteredValue !== false) {
             field.value = xssFilteredValue;
           }
-
           callback(field, format);
         }
       });
     }
   }
-
   function changeTextEditor(field, newFormatID) {
     var previousFormatID = field.getAttribute('data-editor-active-text-format');
-
     if (drupalSettings.editor.formats[previousFormatID]) {
       Drupal.editorDetach(field, drupalSettings.editor.formats[previousFormatID]);
     } else {
       $(field).off('.editor');
     }
-
     if (drupalSettings.editor.formats[newFormatID]) {
       var format = drupalSettings.editor.formats[newFormatID];
       filterXssWhenSwitching(field, format, previousFormatID, Drupal.editorAttach);
     }
-
     field.setAttribute('data-editor-active-text-format', newFormatID);
   }
-
   function onTextFormatChange(event) {
     var select = event.target;
     var field = event.data.field;
     var activeFormatID = field.getAttribute('data-editor-active-text-format');
     var newFormatID = select.value;
-
     if (newFormatID === activeFormatID) {
       return;
     }
-
     var supportContentFiltering = drupalSettings.editor.formats[newFormatID] && drupalSettings.editor.formats[newFormatID].editorSupportsContentFiltering;
     var hasContent = field.value !== '';
-
     if (hasContent && supportContentFiltering) {
       var message = Drupal.t('Changing the text format to %text_format will permanently remove content that is not allowed in that text format.<br><br>Save your changes before switching the text format to avoid losing data.', {
         '%text_format': $(select).find('option:selected')[0].textContent
@@ -101,45 +90,36 @@
       changeTextEditor(field, newFormatID);
     }
   }
-
   Drupal.editors = {};
   Drupal.behaviors.editor = {
     attach: function attach(context, settings) {
       if (!settings.editor) {
         return;
       }
-
       once('editor', '[data-editor-for]', context).forEach(function (editor) {
         var $this = $(editor);
         var field = findFieldForFormatSelector($this);
-
         if (!field) {
           return;
         }
-
         var activeFormatID = editor.value;
         field.setAttribute('data-editor-active-text-format', activeFormatID);
-
         if (settings.editor.formats[activeFormatID]) {
           Drupal.editorAttach(field, settings.editor.formats[activeFormatID]);
         }
-
         $(field).on('change.editor keypress.editor', function () {
           field.setAttribute('data-editor-value-is-changed', 'true');
           $(field).off('.editor');
         });
-
         if ($this.is('select')) {
           $this.on('change.editorAttach', {
             field: field
           }, onTextFormatChange);
         }
-
         $this.parents('form').on('submit', function (event) {
           if (event.isDefaultPrevented()) {
             return;
           }
-
           if (settings.editor.formats[activeFormatID]) {
             Drupal.editorDetach(field, settings.editor.formats[activeFormatID], 'serialize');
           }
@@ -148,25 +128,21 @@
     },
     detach: function detach(context, settings, trigger) {
       var editors;
-
       if (trigger === 'serialize') {
         editors = once.filter('editor', '[data-editor-for]', context);
       } else {
         editors = once.remove('editor', '[data-editor-for]', context);
       }
-
       editors.forEach(function (editor) {
         var $this = $(editor);
         var activeFormatID = editor.value;
         var field = findFieldForFormatSelector($this);
-
         if (field && activeFormatID in settings.editor.formats) {
           Drupal.editorDetach(field, settings.editor.formats[activeFormatID], trigger);
         }
       });
     }
   };
-
   Drupal.editorAttach = function (field, format) {
     if (format.editor) {
       Drupal.editors[format.editor].attach(field, format);
@@ -176,11 +152,9 @@
       });
     }
   };
-
   Drupal.editorDetach = function (field, format, trigger) {
     if (format.editor) {
       Drupal.editors[format.editor].detach(field, format, trigger);
-
       if (field.getAttribute('data-editor-value-is-changed') === 'false') {
         field.value = field.getAttribute('data-editor-value-original');
       }
diff --git a/web/core/modules/editor/src/Ajax/GetUntransformedTextCommand.php b/web/core/modules/editor/src/Ajax/GetUntransformedTextCommand.php
index 5a3768667..9dd0b764f 100644
--- a/web/core/modules/editor/src/Ajax/GetUntransformedTextCommand.php
+++ b/web/core/modules/editor/src/Ajax/GetUntransformedTextCommand.php
@@ -4,9 +4,15 @@
 
 use Drupal\Core\Ajax\BaseCommand;
 
+@trigger_error('The ' . __NAMESPACE__ . '\GetUntransformedTextCommand is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3271653', E_USER_DEPRECATED);
+
 /**
- * AJAX command to rerender a formatted text field without any transformation
- * filters.
+ * Rerenders a formatted text field without any transformation filters.
+ *
+ * @deprecated in drupal:9.5.0 and is removed from drupal:10.0.0.
+ * There is no replacement.
+ *
+ * @see http://www.drupal.org/node/3271653
  */
 class GetUntransformedTextCommand extends BaseCommand {
 
diff --git a/web/core/modules/editor/src/EditorController.php b/web/core/modules/editor/src/EditorController.php
index 81441772c..7c4500e55 100644
--- a/web/core/modules/editor/src/EditorController.php
+++ b/web/core/modules/editor/src/EditorController.php
@@ -2,11 +2,7 @@
 
 namespace Drupal\editor;
 
-use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Controller\ControllerBase;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\editor\Ajax\GetUntransformedTextCommand;
-use Drupal\filter\Plugin\FilterInterface;
 use Drupal\filter\FilterFormatInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -17,33 +13,6 @@
  */
 class EditorController extends ControllerBase {
 
-  /**
-   * Returns an Ajax response to render a text field without transformation filters.
-   *
-   * @param \Drupal\Core\Entity\EntityInterface $entity
-   *   The entity of which a formatted text field is being rerendered.
-   * @param string $field_name
-   *   The name of the (formatted text) field that is being rerendered
-   * @param string $langcode
-   *   The name of the language for which the formatted text field is being
-   *   rerendered.
-   * @param string $view_mode_id
-   *   The view mode the formatted text field should be rerendered in.
-   *
-   * @return \Drupal\Core\Ajax\AjaxResponse
-   *   The Ajax response.
-   */
-  public function getUntransformedText(EntityInterface $entity, $field_name, $langcode, $view_mode_id) {
-    $response = new AjaxResponse();
-
-    // Direct text editing is only supported for single-valued fields.
-    $field = $entity->getTranslation($langcode)->$field_name;
-    $editable_text = check_markup($field->value, $field->format, $langcode, [FilterInterface::TYPE_TRANSFORM_REVERSIBLE, FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE]);
-    $response->addCommand(new GetUntransformedTextCommand($editable_text));
-
-    return $response;
-  }
-
   /**
    * Apply the necessary XSS filtering for using a certain text format's editor.
    *
diff --git a/web/core/modules/editor/src/Entity/Editor.php b/web/core/modules/editor/src/Entity/Editor.php
index fc5f632d0..c48f21902 100644
--- a/web/core/modules/editor/src/Entity/Editor.php
+++ b/web/core/modules/editor/src/Entity/Editor.php
@@ -36,8 +36,7 @@
 class Editor extends ConfigEntityBase implements EditorInterface {
 
   /**
-   * The machine name of the text format with which this configured text editor
-   * is associated.
+   * Machine name of the text format for this configured text editor.
    *
    * @var string
    *
diff --git a/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php b/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
index dab14ef01..84da9c469 100644
--- a/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
+++ b/web/core/modules/editor/src/Plugin/InPlaceEditor/Editor.php
@@ -14,9 +14,22 @@
  * @InPlaceEditor(
  *   id = "editor"
  * )
+ *
+ * @deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no
+ * replacement.
+ *
+ * @see https://www.drupal.org/node/3271653
  */
 class Editor extends PluginBase implements InPlaceEditorInterface {
 
+  /**
+   * Constructs an Editor object.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition) {
+    @trigger_error('Drupal\editor\InPlaceEditor\Editor is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3271653', E_USER_DEPRECATED);
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -88,7 +101,7 @@ public function getAttachments() {
     $attachments = $manager->getAttachments($formats);
 
     // Also include editor.module's formatted text editor.
-    $attachments['library'][] = 'editor/quickedit.inPlaceEditor.formattedText';
+    $attachments['library'][] = 'quickedit/quickedit.inPlaceEditor.formattedText';
 
     return $attachments;
   }
diff --git a/web/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml b/web/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml
deleted file mode 100644
index b8a536708..000000000
--- a/web/core/modules/editor/tests/editor_private_test/config/install/editor.editor.private_images.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - filter.format.private_images
-  module:
-    - ckeditor
-format: private_images
-editor: ckeditor
-settings:
-  toolbar:
-    rows:
-      -
-        -
-          name: Media
-          items:
-            - DrupalImage
-        -
-          name: Tools
-          items:
-            - Source
-  plugins:
-    language:
-      language_list: un
-    stylescombo:
-      styles: ''
-image_upload:
-  status: true
-  scheme: private
-  directory: ''
-  max_size: ''
-  max_dimensions:
-    width: null
-    height: null
diff --git a/web/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml b/web/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml
deleted file mode 100644
index 33e777b24..000000000
--- a/web/core/modules/editor/tests/editor_private_test/config/install/filter.format.private_images.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - editor
-name: 'Private images'
-format: private_images
-filters:
-  editor_file_reference:
-    id: editor_file_reference
-    provider: editor
-    status: true
-    weight: 0
-    settings: {  }
-  filter_html:
-    id: filter_html
-    provider: filter
-    status: false
-    weight: -10
-    settings:
-      allowed_html: '<img src alt data-entity-type data-entity-uuid>'
-      filter_html_help: true
-      filter_html_nofollow: false
diff --git a/web/core/modules/editor/tests/editor_private_test/editor_private_test.info.yml b/web/core/modules/editor/tests/editor_private_test/editor_private_test.info.yml
deleted file mode 100644
index cdd0ad290..000000000
--- a/web/core/modules/editor/tests/editor_private_test/editor_private_test.info.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: 'Text Editor Private test'
-type: module
-description: 'Support module for the Text Editor Private module tests.'
-package: Testing
-version: VERSION
-dependencies:
-  - drupal:filter
-  - drupal:ckeditor
diff --git a/web/core/modules/editor/tests/modules/config/schema/editor_test.schema.yml b/web/core/modules/editor/tests/modules/config/schema/editor_test.schema.yml
deleted file mode 100644
index 4e0131622..000000000
--- a/web/core/modules/editor/tests/modules/config/schema/editor_test.schema.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-# Schema for the configuration files of the Editor test module.
-
-editor.settings.unicorn:
-  type: mapping
-  label: 'Unicorn settings'
-  mapping:
-    ponies_too:
-      type: boolean
-      label: 'Ponies too'
-
-editor.settings.trex:
-  type: mapping
-  label: 'T-Rex settings'
-  mapping:
-    stumpy_arms:
-      type: boolean
-      label: 'Stumpy arms'
diff --git a/web/core/modules/editor/tests/modules/editor_test.info.yml b/web/core/modules/editor/tests/modules/editor_test.info.yml
deleted file mode 100644
index 9a9558540..000000000
--- a/web/core/modules/editor/tests/modules/editor_test.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Text Editor test'
-type: module
-description: 'Support module for the Text Editor module tests.'
-package: Testing
-version: VERSION
diff --git a/web/core/modules/editor/tests/modules/editor_test.libraries.yml b/web/core/modules/editor/tests/modules/editor_test.libraries.yml
deleted file mode 100644
index 221a0be80..000000000
--- a/web/core/modules/editor/tests/modules/editor_test.libraries.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-unicorn:
-  version: VERSION
-  js:
-    unicorn.js: {}
-trex:
-  version: VERSION
-  js:
-    trex.js: {}
diff --git a/web/core/modules/editor/tests/modules/editor_test.module b/web/core/modules/editor/tests/modules/editor_test.module
deleted file mode 100644
index bdb7292d6..000000000
--- a/web/core/modules/editor/tests/modules/editor_test.module
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-/**
- * @file
- * Helper module for the Text Editor tests.
- */
-
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\node\NodeInterface;
-use Drupal\filter\FilterFormatInterface;
-use Drupal\file\FileInterface;
-
-/**
- * Implements hook_entity_update().
- *
- * @see \Drupal\Tests\editor\Kernel\EntityUpdateTest
- */
-function editor_test_entity_update(EntityInterface $entity) {
-  // Only act on nodes.
-  if (!$entity instanceof NodeInterface) {
-    return;
-  }
-
-  // Avoid infinite loop by only going through our post save logic once.
-  if (!empty($entity->editor_test_updating)) {
-    return;
-  }
-
-  // Set flag for whether or not the entity needs to be resaved.
-  $needs_update = FALSE;
-
-  // Perform our post save logic.
-  if ($entity->title->value == 'test updated') {
-    // Change the node title.
-    $entity->title->value = 'test updated 2';
-    $needs_update = TRUE;
-  }
-
-  if ($needs_update) {
-    // Set flag on entity that our logic was already executed.
-    $entity->editor_test_updating = TRUE;
-    // And resave entity.
-    $entity->save();
-  }
-}
-
-/**
- * Implements hook_editor_js_settings_alter().
- */
-function editor_test_editor_js_settings_alter(&$settings) {
-  // Allow tests to enable or disable this alter hook.
-  if (!\Drupal::state()->get('editor_test_js_settings_alter_enabled', FALSE)) {
-    return;
-  }
-
-  if (isset($settings['editor']['formats']['full_html'])) {
-    $settings['editor']['formats']['full_html']['editorSettings']['ponyModeEnabled'] = FALSE;
-  }
-}
-
-/**
- * Implements hook_editor_xss_filter_alter().
- */
-function editor_test_editor_xss_filter_alter(&$editor_xss_filter_class, FilterFormatInterface $format, FilterFormatInterface $original_format = NULL) {
-  // Allow tests to enable or disable this alter hook.
-  if (!\Drupal::state()->get('editor_test_editor_xss_filter_alter_enabled', FALSE)) {
-    return;
-  }
-
-  $filters = $format->filters()->getAll();
-  if (isset($filters['filter_html']) && $filters['filter_html']->status) {
-    $editor_xss_filter_class = '\Drupal\editor_test\EditorXssFilter\Insecure';
-  }
-}
-
-/**
- * Implements hook_editor_info_alter().
- */
-function editor_test_editor_info_alter(&$items) {
-  if (!\Drupal::state()->get('editor_test_give_me_a_trex_thanks', FALSE)) {
-    unset($items['trex']);
-  }
-}
-
-/**
- * Implements hook_ENTITY_TYPE_presave() for file entities.
- */
-function editor_test_file_presave(FileInterface $file) {
-  // Use state to keep track of how many times a file is saved.
-  $file_save_count = \Drupal::state()->get('editor_test.file_save_count', []);
-  $file_save_count[$file->getFilename()] = isset($file_save_count[$file->getFilename()]) ? $file_save_count[$file->getFilename()] + 1 : 1;
-  \Drupal::state()->set('editor_test.file_save_count', $file_save_count);
-}
diff --git a/web/core/modules/editor/tests/modules/src/EditorXssFilter/Insecure.php b/web/core/modules/editor/tests/modules/src/EditorXssFilter/Insecure.php
deleted file mode 100644
index 41ba6a4f9..000000000
--- a/web/core/modules/editor/tests/modules/src/EditorXssFilter/Insecure.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Drupal\editor_test\EditorXssFilter;
-
-use Drupal\filter\FilterFormatInterface;
-use Drupal\editor\EditorXssFilterInterface;
-
-/**
- * Defines an insecure text editor XSS filter (for testing purposes).
- */
-class Insecure implements EditorXssFilterInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function filterXss($html, FilterFormatInterface $format, FilterFormatInterface $original_format = NULL) {
-    // Don't apply any XSS filtering, just return the string we received.
-    return $html;
-  }
-
-}
diff --git a/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php b/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
deleted file mode 100644
index 5c8be2216..000000000
--- a/web/core/modules/editor/tests/modules/src/Plugin/Editor/TRexEditor.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-namespace Drupal\editor_test\Plugin\Editor;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\editor\Entity\Editor;
-use Drupal\editor\Plugin\EditorBase;
-
-/**
- * Defines a Tyrannosaurus-Rex powered text editor for testing purposes.
- *
- * @Editor(
- *   id = "trex",
- *   label = @Translation("TRex Editor"),
- *   supports_content_filtering = TRUE,
- *   supports_inline_editing = TRUE,
- *   is_xss_safe = FALSE,
- *   supported_element_types = {
- *     "textarea",
- *   }
- * )
- */
-class TRexEditor extends EditorBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultSettings() {
-    return ['stumpy_arms' => TRUE];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['stumpy_arms'] = [
-      '#title' => t('Stumpy arms'),
-      '#type' => 'checkbox',
-      '#default_value' => TRUE,
-    ];
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getJSSettings(Editor $editor) {
-    $js_settings = [];
-    $settings = $editor->getSettings();
-    if ($settings['stumpy_arms']) {
-      $js_settings['doMyArmsLookStumpy'] = TRUE;
-    }
-    return $js_settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries(Editor $editor) {
-    return [
-      'editor_test/trex',
-    ];
-  }
-
-}
diff --git a/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php b/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
deleted file mode 100644
index f6a35434a..000000000
--- a/web/core/modules/editor/tests/modules/src/Plugin/Editor/UnicornEditor.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-namespace Drupal\editor_test\Plugin\Editor;
-
-use Drupal\Core\Form\FormStateInterface;
-use Drupal\editor\Entity\Editor;
-use Drupal\editor\Plugin\EditorBase;
-
-/**
- * Defines a Unicorn-powered text editor for Drupal (for testing purposes).
- *
- * @Editor(
- *   id = "unicorn",
- *   label = @Translation("Unicorn Editor"),
- *   supports_content_filtering = TRUE,
- *   supports_inline_editing = TRUE,
- *   is_xss_safe = FALSE,
- *   supported_element_types = {
- *     "textarea",
- *     "textfield",
- *   }
- * )
- */
-class UnicornEditor extends EditorBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDefaultSettings() {
-    return ['ponies_too' => TRUE];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $form['ponies_too'] = [
-      '#title' => t('Pony mode'),
-      '#type' => 'checkbox',
-      '#default_value' => TRUE,
-    ];
-    $form_state->loadInclude('editor', 'admin.inc');
-    $form['image_upload'] = editor_image_upload_settings_form($form_state->get('editor'));
-    $form['image_upload']['#element_validate'][] = [$this, 'validateImageUploadSettings'];
-    return $form;
-  }
-
-  /**
-   * #element_validate handler for "image_upload" in buildConfigurationForm().
-   *
-   * Moves the text editor's image upload settings into $editor->image_upload.
-   *
-   * @see editor_image_upload_settings_form()
-   */
-  public function validateImageUploadSettings(array $element, FormStateInterface $form_state) {
-    $settings = &$form_state->getValue(['editor', 'settings', 'image_upload']);
-    $form_state->get('editor')->setImageUploadSettings($settings);
-    $form_state->unsetValue(['editor', 'settings', 'image_upload']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getJSSettings(Editor $editor) {
-    $js_settings = [];
-    $settings = $editor->getSettings();
-    if ($settings['ponies_too']) {
-      $js_settings['ponyModeEnabled'] = TRUE;
-    }
-    return $js_settings;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries(Editor $editor) {
-    return [
-      'editor_test/unicorn',
-    ];
-  }
-
-}
diff --git a/web/core/modules/editor/tests/modules/src/Plugin/Field/FieldType/EditorTestTextLongItem.php b/web/core/modules/editor/tests/modules/src/Plugin/Field/FieldType/EditorTestTextLongItem.php
deleted file mode 100644
index 14d22cab7..000000000
--- a/web/core/modules/editor/tests/modules/src/Plugin/Field/FieldType/EditorTestTextLongItem.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Drupal\editor_test\Plugin\Field\FieldType;
-
-use Drupal\text\Plugin\Field\FieldType\TextLongItem;
-
-/**
- * Plugin implementation of the 'editor_test_text_long' field type.
- *
- * @FieldType(
- *   id = "editor_test_text_long",
- *   label = @Translation("Filter test text (formatted, long)"),
- *   description = @Translation("This field stores a long text with a text format."),
- *   category = @Translation("Text"),
- *   default_widget = "text_textarea",
- *   default_formatter = "text_default"
- * )
- */
-class EditorTestTextLongItem extends TextLongItem {
-
-}
diff --git a/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php b/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php
index ec8c0174e..4323d5013 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorAdminTest.php
@@ -34,6 +34,9 @@ class EditorAdminTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php b/web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php
index 3fcdb18e7..f12dca0bb 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorDialogAccessTest.php
@@ -18,7 +18,7 @@ class EditorDialogAccessTest extends BrowserTestBase {
    *
    * @var array
    */
-  protected static $modules = ['editor', 'filter', 'ckeditor'];
+  protected static $modules = ['editor', 'filter', 'editor_test'];
 
   /**
    * {@inheritdoc}
@@ -39,23 +39,8 @@ public function testEditorImageDialogAccess() {
     // With a text editor but without image upload settings, expect a 200, but
     // there should not be an input[type=file].
     $editor = Editor::create([
-      'editor' => 'ckeditor',
+      'editor' => 'unicorn',
       'format' => 'plain_text',
-      'settings' => [
-        'toolbar' => [
-          'rows' => [
-            [
-              [
-                'name' => 'Media',
-                'items' => [
-                  'DrupalImage',
-                ],
-              ],
-            ],
-          ],
-        ],
-        'plugins' => [],
-      ],
       'image_upload' => [
         'status' => FALSE,
         'scheme' => 'public',
diff --git a/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php b/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
index 50ed06c21..efdccccc8 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorLoadingTest.php
@@ -48,6 +48,9 @@ class EditorLoadingTest extends BrowserTestBase {
    */
   protected $privilegedUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php b/web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php
index fa93aafd9..3b073288e 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorPrivateFileReferenceFilterTest.php
@@ -21,14 +21,12 @@ class EditorPrivateFileReferenceFilterTest extends BrowserTestBase {
    * @var array
    */
   protected static $modules = [
-    // Needed for the config: this is the only module in core that utilizes the
-    // functionality in editor.module to be tested, and depends on that.
-    'ckeditor',
+    'editor_test',
     // Depends on filter.module (indirectly).
     'node',
     // Pulls in the config we're using during testing which create a text format
     // - with the filter_html_image_secure filter DISABLED,
-    // - with the editor set to CKEditor,
+    // - with the editor set to Unicorn editor,
     // - with drupalimage.image_upload.scheme set to 'private',
     // - with drupalimage.image_upload.directory set to ''.
     'editor_private_test',
diff --git a/web/core/modules/editor/tests/src/Functional/EditorSecurityTest.php b/web/core/modules/editor/tests/src/Functional/EditorSecurityTest.php
index 4574ccb5a..239a5584f 100644
--- a/web/core/modules/editor/tests/src/Functional/EditorSecurityTest.php
+++ b/web/core/modules/editor/tests/src/Functional/EditorSecurityTest.php
@@ -62,8 +62,7 @@ class EditorSecurityTest extends BrowserTestBase {
   protected $normalUser;
 
   /**
-   * User with access to Restricted HTML text format, dangerous tags allowed
-   * with text editor.
+   * User with access to Restricted HTML and tags considered dangerous.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -76,6 +75,9 @@ class EditorSecurityTest extends BrowserTestBase {
    */
   protected $privilegedUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php b/web/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php
index c75ede4c5..065cb7dc1 100644
--- a/web/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php
+++ b/web/core/modules/editor/tests/src/FunctionalJavascript/EditorAdminTest.php
@@ -20,7 +20,7 @@ class EditorAdminTest extends WebDriverTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
-    'ckeditor',
+    'editor_test',
     'ckeditor5',
   ];
 
@@ -53,18 +53,17 @@ public function testEditorSelection() {
     $page->fillField('name', 'Sulaco');
     // Wait for machine name to be filled in.
     $this->assertNotEmpty($assert_session->waitForText('sulaco'));
-    $page->selectFieldOption('editor[editor]', 'ckeditor');
-    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', 'ul.ckeditor-toolbar-group-buttons'));
-    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', '#ckeditor-plugin-settings'));
+    $page->selectFieldOption('editor[editor]', 'unicorn');
+    $this->assertNotEmpty($this->assertSession()->waitForField('editor[settings][ponies_too]'));
     $page->pressButton('Save configuration');
 
     // Test that toggling the editor selection off and back on works.
     $this->drupalGet('/admin/config/content/formats/manage/sulaco');
     // Deselect and reselect an editor.
     $page->selectFieldOption('editor[editor]', '');
-    $this->assertNotEmpty($this->assertSession()->waitForElementRemoved('css', 'ul.ckeditor-toolbar-group-buttons'));
-    $page->selectFieldOption('editor[editor]', 'ckeditor');
-    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', 'ul.ckeditor-toolbar-group-buttons'));
+    $this->assertNotEmpty($this->assertSession()->waitForElementRemoved('named', ['field', 'editor[settings][ponies_too]']));
+    $page->selectFieldOption('editor[editor]', 'unicorn');
+    $this->assertNotEmpty($this->assertSession()->waitForField('editor[settings][ponies_too]'));
   }
 
   /**
@@ -84,10 +83,11 @@ public function testEditorCreation() {
     $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', 'ul.ckeditor5-toolbar-available__buttons'));
 
     $page->selectFieldOption('editor[editor]', '');
-    $assert_session->elementNotExists('css', 'ul.ckeditor-toolbar-group-buttons');
+    $this->assertNotEmpty($this->assertSession()->waitForElementRemoved('css', 'ul.ckeditor5-toolbar-available__buttons'));
+    $this->assertEmpty($this->assertSession()->waitForField('editor[settings][ponies_too]'));
 
-    $page->selectFieldOption('editor[editor]', 'ckeditor');
-    $this->assertNotEmpty($this->assertSession()->waitForElementVisible('css', 'ul.ckeditor-toolbar-group-buttons'));
+    $page->selectFieldOption('editor[editor]', 'unicorn');
+    $this->assertNotEmpty($this->assertSession()->waitForField('editor[settings][ponies_too]'));
   }
 
 }
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php b/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
index 813714756..143e312ab 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
@@ -26,6 +26,9 @@ class EditorFileUsageTest extends EntityKernelTestBase {
    */
   protected static $modules = ['editor', 'editor_test', 'node', 'file'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('file');
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php b/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
index 45cf9cd94..e57314282 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorImageDialogTest.php
@@ -102,7 +102,7 @@ public function testEditorImageDialog() {
       ],
       '_drupal_ajax' => '1',
       'ajax_page_state' => [
-        'theme' => 'bartik',
+        'theme' => 'olivero',
         'theme_token' => 'some-token',
         'libraries' => '',
       ],
diff --git a/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php b/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
index 646555f80..90c6ac030 100644
--- a/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
+++ b/web/core/modules/editor/tests/src/Kernel/EditorManagerTest.php
@@ -27,6 +27,9 @@ class EditorManagerTest extends KernelTestBase {
    */
   protected $editorManager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php b/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
index ab781b392..89787633f 100644
--- a/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
+++ b/web/core/modules/editor/tests/src/Unit/EditorConfigEntityUnitTest.php
@@ -65,13 +65,13 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('editor'));
+      ->willReturn('editor');
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->uuid = $this->createMock('\Drupal\Component\Uuid\UuidInterface');
 
@@ -98,33 +98,33 @@ public function testCalculateDependencies() {
       ->getMock();
     $plugin->expects($this->once())
       ->method('getPluginDefinition')
-      ->will($this->returnValue(['provider' => 'test_module']));
+      ->willReturn(['provider' => 'test_module']);
     $plugin->expects($this->once())
       ->method('getDefaultSettings')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->editorPluginManager->expects($this->any())
       ->method('createInstance')
       ->with($this->editorId)
-      ->will($this->returnValue($plugin));
+      ->willReturn($plugin);
 
     $entity = new Editor($values, $this->entityTypeId);
 
     $filter_format = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityInterface');
     $filter_format->expects($this->once())
       ->method('getConfigDependencyName')
-      ->will($this->returnValue('filter.format.test'));
+      ->willReturn('filter.format.test');
 
     $storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
       ->method('load')
       ->with($format_id)
-      ->will($this->returnValue($filter_format));
+      ->willReturn($filter_format);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with('filter_format')
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertContains('test_module', $dependencies['module']);
diff --git a/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php b/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php
index b570982ab..e45284beb 100644
--- a/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php
+++ b/web/core/modules/editor/tests/src/Unit/EditorXssFilter/StandardTest.php
@@ -23,6 +23,9 @@ class StandardTest extends UnitTestCase {
    */
   protected $format;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
 
     // Mock text format configuration entity object.
@@ -31,7 +34,7 @@ protected function setUp(): void {
       ->getMock();
     $this->format->expects($this->any())
       ->method('getFilterTypes')
-      ->will($this->returnValue([FilterInterface::TYPE_HTML_RESTRICTOR]));
+      ->willReturn([FilterInterface::TYPE_HTML_RESTRICTOR]);
     $restrictions = [
       'allowed' => [
         'p' => TRUE,
@@ -44,7 +47,7 @@ protected function setUp(): void {
     ];
     $this->format->expects($this->any())
       ->method('getHtmlRestrictions')
-      ->will($this->returnValue($restrictions));
+      ->willReturn($restrictions);
   }
 
   /**
@@ -104,7 +107,7 @@ public function providerTestFilterXss() {
 
     // Default SRC tag by leaving it empty.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_by_leaving_it_empty
-    $data[] = ['<IMG SRC= onmouseover="alert(\'xxs\')">', '<IMG nmouseover="alert(&#039;xxs&#039;)">'];
+    $data[] = ['<IMG SRC= onmouseover="alert(\'xxs\')">', '<IMG>'];
 
     // Default SRC tag by leaving it out entirely.
     // @see https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet#Default_SRC_tag_by_leaving_it_out_entirely
diff --git a/web/core/modules/field/migrations/d6_field.yml b/web/core/modules/field/migrations/d6_field.yml
index 38bc5971c..8ede3cbf3 100644
--- a/web/core/modules/field/migrations/d6_field.yml
+++ b/web/core/modules/field/migrations/d6_field.yml
@@ -11,8 +11,6 @@ source:
   constants:
     entity_type: node
     langcode: en
-  # Phone is here since it does not use a migrate field plugin.
-  source_module: phone
 process:
   entity_type: 'constants/entity_type'
   status: active
@@ -30,6 +28,7 @@ process:
         userreference_autocomplete: entity_reference
       nodereference:
         nodereference_select: entity_reference
+        nodereference_url: entity_reference
       number_integer:
         number: integer
         optionwidgets_select: list_integer
diff --git a/web/core/modules/field/migrations/d6_field_formatter_settings.yml b/web/core/modules/field/migrations/d6_field_formatter_settings.yml
index 8646cfa5f..8359756e3 100644
--- a/web/core/modules/field/migrations/d6_field_formatter_settings.yml
+++ b/web/core/modules/field/migrations/d6_field_formatter_settings.yml
@@ -59,122 +59,122 @@ process:
   "options/label": label
   "options/weight": weight
   "options/type":
-      -
-        plugin: static_map
-        bypass: true
-        source:
-          - type
-          - 'display_settings/format'
-        map:
-          number_integer:
-            default: number_integer
-            us_0: number_integer
-            be_0: number_integer
-            fr_0: number_integer
-            unformatted: number_unformatted
-          number_float:
-            default: number_decimal
-            us_0: number_decimal
-            us_1: number_decimal
-            us_2: number_decimal
-            be_0: number_decimal
-            be_1: number_decimal
-            be_2: number_decimal
-            fr_0: number_decimal
-            fr_1: number_decimal
-            fr_2: number_decimal
-            unformatted: number_unformatted
-          number_decimal:
-            default: number_decimal
-            us_0: number_decimal
-            us_1: number_decimal
-            us_2: number_decimal
-            be_0: number_decimal
-            be_1: number_decimal
-            be_2: number_decimal
-            fr_0: number_decimal
-            fr_1: number_decimal
-            fr_2: number_decimal
-            unformatted: number_unformatted
-          email:
-            default: email_mailto
-            spamspan: email_mailto
-            contact: email_mailto
-            plain: basic_string
-          fr_phone:
-            default: basic_string
-          be_phone:
-            default: basic_string
-          it_phone:
-            default: basic_string
-          el_phone:
-            default: basic_string
-          ch_phone:
-            default: basic_string
-          ca_phone:
-            default: basic_string
-          cr_phone:
-            default: basic_string
-          pa_phone:
-            default: basic_string
-          gb_phone:
-            default: basic_string
-          ru_phone:
-            default: basic_string
-          ua_phone:
-            default: basic_string
-          es_phone:
-            default: basic_string
-          au_phone:
-            default: basic_string
-          cs_phone:
-            default: basic_string
-          hu_phone:
-            default: basic_string
-          pl_phone:
-            default: basic_string
-          nl_phone:
-            default: basic_string
-          se_phone:
-            default: basic_string
-          za_phone:
-            default: basic_string
-          il_phone:
-            default: basic_string
-          nz_phone:
-            default: basic_string
-          br_phone:
-            default: basic_string
-          cl_phone:
-            default: basic_string
-          cn_phone:
-            default: basic_string
-          hk_phone:
-            default: basic_string
-          mo_phone:
-            default: basic_string
-          ph_phone:
-            default: basic_string
-          sg_phone:
-            default: basic_string
-          jo_phone:
-            default: basic_string
-          eg_phone:
-            default: basic_string
-          pk_phone:
-            default: basic_string
-          int_phone:
-            default: basic_string
-          nodereference:
-            default: entity_reference_label
-            plain: entity_reference_label
-            full: entity_reference_entity_view
-            teaser: entity_reference_entity_view
-          userreference:
-            default: entity_reference_label
-            plain: entity_reference_label
-      -
-        plugin: d6_field_type_defaults
+    -
+      plugin: static_map
+      bypass: true
+      source:
+        - type
+        - 'display_settings/format'
+      map:
+        number_integer:
+          default: number_integer
+          us_0: number_integer
+          be_0: number_integer
+          fr_0: number_integer
+          unformatted: number_unformatted
+        number_float:
+          default: number_decimal
+          us_0: number_decimal
+          us_1: number_decimal
+          us_2: number_decimal
+          be_0: number_decimal
+          be_1: number_decimal
+          be_2: number_decimal
+          fr_0: number_decimal
+          fr_1: number_decimal
+          fr_2: number_decimal
+          unformatted: number_unformatted
+        number_decimal:
+          default: number_decimal
+          us_0: number_decimal
+          us_1: number_decimal
+          us_2: number_decimal
+          be_0: number_decimal
+          be_1: number_decimal
+          be_2: number_decimal
+          fr_0: number_decimal
+          fr_1: number_decimal
+          fr_2: number_decimal
+          unformatted: number_unformatted
+        email:
+          default: email_mailto
+          spamspan: email_mailto
+          contact: email_mailto
+          plain: basic_string
+        fr_phone:
+          default: basic_string
+        be_phone:
+          default: basic_string
+        it_phone:
+          default: basic_string
+        el_phone:
+          default: basic_string
+        ch_phone:
+          default: basic_string
+        ca_phone:
+          default: basic_string
+        cr_phone:
+          default: basic_string
+        pa_phone:
+          default: basic_string
+        gb_phone:
+          default: basic_string
+        ru_phone:
+          default: basic_string
+        ua_phone:
+          default: basic_string
+        es_phone:
+          default: basic_string
+        au_phone:
+          default: basic_string
+        cs_phone:
+          default: basic_string
+        hu_phone:
+          default: basic_string
+        pl_phone:
+          default: basic_string
+        nl_phone:
+          default: basic_string
+        se_phone:
+          default: basic_string
+        za_phone:
+          default: basic_string
+        il_phone:
+          default: basic_string
+        nz_phone:
+          default: basic_string
+        br_phone:
+          default: basic_string
+        cl_phone:
+          default: basic_string
+        cn_phone:
+          default: basic_string
+        hk_phone:
+          default: basic_string
+        mo_phone:
+          default: basic_string
+        ph_phone:
+          default: basic_string
+        sg_phone:
+          default: basic_string
+        jo_phone:
+          default: basic_string
+        eg_phone:
+          default: basic_string
+        pk_phone:
+          default: basic_string
+        int_phone:
+          default: basic_string
+        nodereference:
+          default: entity_reference_label
+          plain: entity_reference_label
+          full: entity_reference_entity_view
+          teaser: entity_reference_entity_view
+        userreference:
+          default: entity_reference_label
+          plain: entity_reference_label
+    -
+      plugin: d6_field_type_defaults
   "options/settings":
     -
       plugin: static_map
diff --git a/web/core/modules/field/migrations/d6_field_instance_widget_settings.yml b/web/core/modules/field/migrations/d6_field_instance_widget_settings.yml
index 815e8316b..248c4289e 100644
--- a/web/core/modules/field/migrations/d6_field_instance_widget_settings.yml
+++ b/web/core/modules/field/migrations/d6_field_instance_widget_settings.yml
@@ -58,6 +58,7 @@ process:
         optionwidgets_buttons: options_buttons
         optionwidgets_select: options_select
         nodereference_select: options_select
+        nodereference_url: entity_reference_autocomplete
         nodereference_buttons: options_buttons
         nodereference_autocomplete: entity_reference_autocomplete_tags
         userreference_select: options_select
diff --git a/web/core/modules/field/migrations/state/field.migrate_drupal.yml b/web/core/modules/field/migrations/state/field.migrate_drupal.yml
index 0ec481972..1928868c0 100644
--- a/web/core/modules/field/migrations/state/field.migrate_drupal.yml
+++ b/web/core/modules/field/migrations/state/field.migrate_drupal.yml
@@ -2,6 +2,7 @@
 finished:
   6:
     nodereference: core
+    nodereference_url: core
     userreference: core
     content: field
     email: core
diff --git a/web/core/modules/field/tests/modules/field_test/field_test.module b/web/core/modules/field/tests/modules/field_test/field_test.module
index ec567dc13..91ca8c0f9 100644
--- a/web/core/modules/field/tests/modules/field_test/field_test.module
+++ b/web/core/modules/field/tests/modules/field_test/field_test.module
@@ -58,7 +58,7 @@ require_once __DIR__ . '/field_test.field.inc';
  * @param $value
  *   A value to store for $key.
  *
- * @return
+ * @return array|null
  *   An array mapping each $key to an array of each $value passed in
  *   for that key.
  */
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
index 80f860bfa..74065a567 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldDefaultFormatter.php
@@ -36,7 +36,7 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['test_formatter_setting'] = [
-      '#title' => t('Setting'),
+      '#title' => $this->t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('test_formatter_setting'),
@@ -50,7 +50,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('@setting: @value', ['@setting' => 'test_formatter_setting', '@value' => $this->getSetting('test_formatter_setting')]);
+    $summary[] = $this->t('@setting: @value', ['@setting' => 'test_formatter_setting', '@value' => $this->getSetting('test_formatter_setting')]);
     return $summary;
   }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
index f36fea2c3..86b8465e1 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldEmptySettingFormatter.php
@@ -34,7 +34,7 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['field_empty_setting'] = [
-      '#title' => t('Setting'),
+      '#title' => $this->t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('field_empty_setting'),
@@ -50,7 +50,7 @@ public function settingsSummary() {
     $summary = [];
     $setting = $this->getSetting('field_empty_setting');
     if (!empty($setting)) {
-      $summary[] = t('Default empty setting now has a value.');
+      $summary[] = $this->t('Default empty setting now has a value.');
     }
     return $summary;
   }
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
index 978e18fba..7f6bab89e 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldMultipleFormatter.php
@@ -37,7 +37,7 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['test_formatter_setting_multiple'] = [
-      '#title' => t('Setting'),
+      '#title' => $this->t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('test_formatter_setting_multiple'),
@@ -51,7 +51,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('@setting: @value', ['@setting' => 'test_formatter_setting_multiple', '@value' => $this->getSetting('test_formatter_setting_multiple')]);
+    $summary[] = $this->t('@setting: @value', ['@setting' => 'test_formatter_setting_multiple', '@value' => $this->getSetting('test_formatter_setting_multiple')]);
     return $summary;
   }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
index 39bff8d87..038fd151f 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldFormatter/TestFieldPrepareViewFormatter.php
@@ -35,7 +35,7 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['test_formatter_setting_additional'] = [
-      '#title' => t('Setting'),
+      '#title' => $this->t('Setting'),
       '#type' => 'textfield',
       '#size' => 20,
       '#default_value' => $this->getSetting('test_formatter_setting_additional'),
@@ -49,7 +49,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('@setting: @value', ['@setting' => 'test_formatter_setting_additional', '@value' => $this->getSetting('test_formatter_setting_additional')]);
+    $summary[] = $this->t('@setting: @value', ['@setting' => 'test_formatter_setting_additional', '@value' => $this->getSetting('test_formatter_setting_additional')]);
     return $summary;
   }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
index d889f816f..ad2a135a2 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItem.php
@@ -3,6 +3,7 @@
 namespace Drupal\field_test\Plugin\Field\FieldType;
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\Field\FieldItemBase;
@@ -47,7 +48,7 @@ public static function defaultFieldSettings() {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('integer')
-      ->setLabel(t('Test integer value'))
+      ->setLabel(new TranslatableMarkup('Test integer value'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -76,10 +77,10 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
   public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) {
     $form['test_field_storage_setting'] = [
       '#type' => 'textfield',
-      '#title' => t('Field test field storage setting'),
+      '#title' => $this->t('Field test field storage setting'),
       '#default_value' => $this->getSetting('test_field_storage_setting'),
       '#required' => FALSE,
-      '#description' => t('A dummy form element to simulate field storage setting.'),
+      '#description' => $this->t('A dummy form element to simulate field storage setting.'),
     ];
 
     return $form;
@@ -91,10 +92,10 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
   public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     $form['test_field_setting'] = [
       '#type' => 'textfield',
-      '#title' => t('Field test field setting'),
+      '#title' => $this->t('Field test field setting'),
       '#default_value' => $this->getSetting('test_field_setting'),
       '#required' => FALSE,
-      '#description' => t('A dummy form element to simulate field setting.'),
+      '#description' => $this->t('A dummy form element to simulate field setting.'),
     ];
 
     return $form;
@@ -119,7 +120,7 @@ public function getConstraints() {
       'value' => [
         'TestField' => [
           'value' => -1,
-          'message' => t('%name does not accept the value @value.', ['%name' => $this->getFieldDefinition()->getLabel(), '@value' => -1]),
+          'message' => $this->t('%name does not accept the value @value.', ['%name' => $this->getFieldDefinition()->getLabel(), '@value' => -1]),
         ],
       ],
     ]);
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithPreconfiguredOptions.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithPreconfiguredOptions.php
index 6c98205f4..1c5754238 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithPreconfiguredOptions.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldType/TestItemWithPreconfiguredOptions.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Field\PreconfiguredFieldUiOptionsInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Defines the 'test_field_with_preconfigured_options' entity field item.
@@ -24,8 +25,8 @@ class TestItemWithPreconfiguredOptions extends TestItem implements Preconfigured
   public static function getPreconfiguredOptions() {
     return [
       'custom_options' => [
-        'label' => t('All custom options'),
-        'category' => t('Custom category'),
+        'label' => new TranslatableMarkup('All custom options'),
+        'category' => new TranslatableMarkup('Custom category'),
         'field_storage_config' => [
           'cardinality' => FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED,
           'settings' => [
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
index b2f9738f2..ef4efd207 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidget.php
@@ -40,8 +40,8 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['test_widget_setting'] = [
       '#type' => 'textfield',
-      '#title' => t('Field test field widget setting'),
-      '#description' => t('A dummy form element to simulate field widget setting.'),
+      '#title' => $this->t('Field test field widget setting'),
+      '#description' => $this->t('A dummy form element to simulate field widget setting.'),
       '#default_value' => $this->getSetting('test_widget_setting'),
       '#required' => FALSE,
     ];
@@ -53,7 +53,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('@setting: @value', ['@setting' => 'test_widget_setting', '@value' => $this->getSetting('test_widget_setting')]);
+    $summary[] = $this->t('@setting: @value', ['@setting' => 'test_widget_setting', '@value' => $this->getSetting('test_widget_setting')]);
     return $summary;
   }
 
diff --git a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
index 3f9c0ea09..d4493bb55 100644
--- a/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
+++ b/web/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
@@ -40,8 +40,8 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['test_widget_setting_multiple'] = [
       '#type' => 'textfield',
-      '#title' => t('Field test field widget setting'),
-      '#description' => t('A dummy form element to simulate field widget setting.'),
+      '#title' => $this->t('Field test field widget setting'),
+      '#description' => $this->t('A dummy form element to simulate field widget setting.'),
       '#default_value' => $this->getSetting('test_widget_setting_multiple'),
       '#required' => FALSE,
     ];
@@ -53,7 +53,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('@setting: @value', ['@setting' => 'test_widget_setting_multiple', '@value' => $this->getSetting('test_widget_setting_multiple')]);
+    $summary[] = $this->t('@setting: @value', ['@setting' => 'test_widget_setting_multiple', '@value' => $this->getSetting('test_widget_setting_multiple')]);
     return $summary;
   }
 
@@ -93,8 +93,16 @@ public static function multipleValidate($element, FormStateInterface $form_state
   }
 
   /**
-   * {@inheritdoc}
-   * Used in \Drupal\field\Tests\EntityReference\EntityReferenceAdminTest::testAvailableFormatters().
+   * Test is the widget is applicable to the field definition.
+   *
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The field definition that should be checked.
+   *
+   * @return bool
+   *   TRUE if the machine name of the field is not equals to
+   *   field_onewidgetfield, FALSE otherwise.
+   *
+   * @see \Drupal\Tests\field\Functional\EntityReference\EntityReferenceAdminTest::testAvailableFormatters
    */
   public static function isApplicable(FieldDefinitionInterface $field_definition) {
     // Returns FALSE if machine name of the field equals field_onewidgetfield.
diff --git a/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php b/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
index 31bf7daa9..a696e8c98 100644
--- a/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/Email/EmailFieldTest.php
@@ -40,6 +40,9 @@ class EmailFieldTest extends BrowserTestBase {
    */
   protected $field;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
index 22c1d958a..cbe4305e7 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAdminTest.php
@@ -299,8 +299,10 @@ public function testAvailableFormatters() {
   }
 
   /**
-   * Tests field settings for an entity reference field when the field has
-   * multiple target bundles and is set to auto-create the target entity.
+   * Tests field settings for an entity reference field.
+   *
+   * The tested entity reference field has multiple target bundles and is set
+   * to auto-create the target entity.
    */
   public function testMultipleTargetBundles() {
     /** @var \Drupal\taxonomy\Entity\Vocabulary[] $vocabularies */
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
index ab00205b8..894cf63fe 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceAutoCreateTest.php
@@ -40,6 +40,9 @@ class EntityReferenceAutoCreateTest extends BrowserTestBase {
    */
   protected $referencedType;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -100,8 +103,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests that the autocomplete input element appears and the creation of a new
-   * entity.
+   * Tests the autocomplete input element and entity auto-creation.
    */
   public function testAutoCreate() {
     $this->drupalGet('node/add/' . $this->referencingType);
@@ -151,6 +153,8 @@ public function testAutoCreate() {
   }
 
   /**
+   * Tests multiple target bundles.
+   *
    * Tests if an entity reference field having multiple target bundles is
    * storing the auto-created entity in the right destination.
    */
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
index ec7c7b132..98f3e5aed 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldDefaultValueTest.php
@@ -36,6 +36,9 @@ class EntityReferenceFieldDefaultValueTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
index e69abc86d..ac1dbad44 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFieldTranslatedReferenceViewTest.php
@@ -129,6 +129,9 @@ class EntityReferenceFieldTranslatedReferenceViewTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -282,13 +285,13 @@ protected function setUpEntityReferenceField() {
    */
   protected function setUpContentTypes() {
     $this->referrerType = $this->drupalCreateContentType([
-        'type' => 'referrer',
-        'name' => 'Referrer',
-      ]);
+      'type' => 'referrer',
+      'name' => 'Referrer',
+    ]);
     $this->referencedType = $this->drupalCreateContentType([
-        'type' => 'referenced_page',
-        'name' => 'Referenced Page',
-      ]);
+      'type' => 'referenced_page',
+      'name' => 'Referenced Page',
+    ]);
   }
 
   /**
diff --git a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
index 96905cbd7..55c458190 100644
--- a/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
+++ b/web/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceFileUploadTest.php
@@ -45,6 +45,9 @@ class EntityReferenceFileUploadTest extends BrowserTestBase {
    */
   protected $nodeId;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -112,7 +115,7 @@ protected function setUp(): void {
         'type' => 'entity_reference_autocomplete',
       ])
       ->setComponent($file_field_name, [
-         'type' => 'file_generic',
+        'type' => 'file_generic',
       ])
       ->save();
   }
diff --git a/web/core/modules/field/tests/src/Functional/FieldAccessTest.php b/web/core/modules/field/tests/src/Functional/FieldAccessTest.php
index d96eb4f68..315d8e8c0 100644
--- a/web/core/modules/field/tests/src/Functional/FieldAccessTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldAccessTest.php
@@ -38,6 +38,9 @@ class FieldAccessTest extends FieldTestBase {
    */
   protected $testViewFieldValue;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/FieldHelpTest.php b/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
index dc92befad..a80a1890c 100644
--- a/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldHelpTest.php
@@ -28,6 +28,9 @@ class FieldHelpTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php b/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
index 38ed9b0d7..0ab8be68c 100644
--- a/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
+++ b/web/core/modules/field/tests/src/Functional/FieldImportDeleteUninstallUiTest.php
@@ -7,8 +7,7 @@
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
- * Delete field storages and fields during config synchronization and uninstall
- * module that provides the field type through the UI.
+ * Tests deleting field storage when a module in uninstalled through the UI.
  *
  * @group field
  * @see \Drupal\field\ConfigImporterFieldPurger
@@ -35,6 +34,9 @@ class FieldImportDeleteUninstallUiTest extends FieldTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/FieldTestBase.php b/web/core/modules/field/tests/src/Functional/FieldTestBase.php
index 4656ed5dc..5fffae3a4 100644
--- a/web/core/modules/field/tests/src/Functional/FieldTestBase.php
+++ b/web/core/modules/field/tests/src/Functional/FieldTestBase.php
@@ -18,7 +18,7 @@ abstract class FieldTestBase extends BrowserTestBase {
    * @param $cardinality
    *   Number of values to generate.
    *
-   * @return
+   * @return array
    *   An array of random values, in the format expected for field values.
    */
   public function _generateTestFieldValues($cardinality) {
diff --git a/web/core/modules/field/tests/src/Functional/FormTest.php b/web/core/modules/field/tests/src/Functional/FormTest.php
index edbd3d0d7..3fbe66895 100644
--- a/web/core/modules/field/tests/src/Functional/FormTest.php
+++ b/web/core/modules/field/tests/src/Functional/FormTest.php
@@ -66,6 +66,9 @@ class FormTest extends FieldTestBase {
    */
   protected $field;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/NestedFormTest.php b/web/core/modules/field/tests/src/Functional/NestedFormTest.php
index b6244d7a4..c5edf2847 100644
--- a/web/core/modules/field/tests/src/Functional/NestedFormTest.php
+++ b/web/core/modules/field/tests/src/Functional/NestedFormTest.php
@@ -40,6 +40,9 @@ class NestedFormTest extends FieldTestBase {
    */
   protected $field;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php b/web/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
index f9ff9fb3e..a7fb5a427 100644
--- a/web/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/Number/NumberFieldTest.php
@@ -26,6 +26,9 @@ class NumberFieldTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser([
diff --git a/web/core/modules/field/tests/src/Functional/ReEnableModuleFieldTest.php b/web/core/modules/field/tests/src/Functional/ReEnableModuleFieldTest.php
index 7480f9389..d68039ce0 100644
--- a/web/core/modules/field/tests/src/Functional/ReEnableModuleFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/ReEnableModuleFieldTest.php
@@ -34,6 +34,9 @@ class ReEnableModuleFieldTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php b/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
index 295169d4d..ae8741b72 100644
--- a/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
+++ b/web/core/modules/field/tests/src/Functional/String/StringFieldTest.php
@@ -34,6 +34,9 @@ class StringFieldTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Functional/TranslationWebTest.php b/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
index 3b8d33a2b..aeee7c512 100644
--- a/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
+++ b/web/core/modules/field/tests/src/Functional/TranslationWebTest.php
@@ -54,6 +54,9 @@ class TranslationWebTest extends FieldTestBase {
    */
   protected $field;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -129,6 +132,8 @@ public function testFieldFormTranslationRevisions() {
   }
 
   /**
+   * Tests translation revisions.
+   *
    * Check if the field translation attached to the entity revision identified
    * by the passed arguments were correctly stored.
    */
diff --git a/web/core/modules/field/tests/src/Functional/Views/FieldTestBase.php b/web/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
index bf09f61dd..639f68388 100644
--- a/web/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
+++ b/web/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
@@ -34,13 +34,15 @@ abstract class FieldTestBase extends ViewTestBase {
   public $fieldStorages;
 
   /**
-   * Stores the fields of the field storage. They have the same keys as the
-   * field storages.
+   * Stores the fields of the field storage.
    *
    * @var array
    */
   public $fields;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['field_test_views']) {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php b/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
index 6b057cbc8..36ca6b22f 100644
--- a/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
+++ b/web/core/modules/field/tests/src/FunctionalJavascript/EntityReference/EntityReferenceAdminTest.php
@@ -49,8 +49,7 @@ class EntityReferenceAdminTest extends WebDriverTestBase {
   protected $type;
 
   /**
-   * The name of a second content type to be used as a target of entity
-   * references.
+   * Name of a second content type to be used as a target of entity references.
    *
    * @var string
    */
diff --git a/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php b/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
index 78daf5261..da0f716f5 100644
--- a/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
+++ b/web/core/modules/field/tests/src/Kernel/BulkDeleteTest.php
@@ -88,6 +88,9 @@ public function checkHooksInvocations($expected_hooks, $actual_hooks) {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -152,6 +155,8 @@ protected function setUp(): void {
   }
 
   /**
+   * Tests deleting fields.
+   *
    * Verify that deleting a field leaves the field data items in the database
    * and that the appropriate Field API functions can operate on the deleted
    * data and field definition.
@@ -311,6 +316,8 @@ public function testPurgeWithDeletedAndActiveField() {
   }
 
   /**
+   * Tests purging fields.
+   *
    * Verify that field data items and fields are purged when a field storage is
    * deleted.
    */
@@ -370,6 +377,8 @@ public function testPurgeField() {
   }
 
   /**
+   * Tests purging field storages.
+   *
    * Verify that field storages are preserved and purged correctly as multiple
    * fields are deleted and purged.
    */
diff --git a/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php b/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php
index a460678bb..b6fc3e04c 100644
--- a/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php
+++ b/web/core/modules/field/tests/src/Kernel/DisplayApiTest.php
@@ -62,6 +62,9 @@ class DisplayApiTest extends FieldKernelTestBase {
    */
   protected static $modules = ['system'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php b/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
index ebb0ca94e..dc4361c0f 100644
--- a/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php
@@ -16,6 +16,9 @@
  */
 class EmailItemTest extends FieldKernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php b/web/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
index 60da20881..d3dc1e57f 100644
--- a/web/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Entity/Update/SqlContentEntityStorageSchemaColumnTest.php
@@ -26,7 +26,7 @@ class SqlContentEntityStorageSchemaColumnTest extends KernelTestBase {
   /**
    * The created entity.
    *
-   * @var \Drupal\Core\Entity\Entity
+   * @var \Drupal\Core\Entity\EntityInterface
    */
   protected $entity;
 
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
index c025b2caf..f0766968e 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceFormatterTest.php
@@ -54,13 +54,15 @@ class EntityReferenceFormatterTest extends EntityKernelTestBase {
   protected $referencedEntity;
 
   /**
-   * The entity that is not yet saved to its persistent storage to be referenced
-   * in this test.
+   * An entity that is not yet saved to its persistent storage.
    *
    * @var \Drupal\Core\Entity\EntityInterface
    */
   protected $unsavedReferencedEntity;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -267,7 +269,7 @@ public function testEntityFormatterRecursiveRendering() {
     // the entity title because we're rendering the full entity, not just the
     // reference field.
     $expected_occurrences = EntityReferenceEntityFormatter::RECURSIVE_RENDER_LIMIT * 2 + 2;
-    $actual_occurrences = substr_count($output, $referencing_entity_1->name->value);
+    $actual_occurrences = substr_count($output, $referencing_entity_1->label());
     $this->assertEquals($expected_occurrences, $actual_occurrences);
 
     // Repeat the process with another entity in order to check that the
@@ -280,17 +282,17 @@ public function testEntityFormatterRecursiveRendering() {
     $build = $view_builder->view($referencing_entity_2, 'default');
     $output = $renderer->renderRoot($build);
 
-    $actual_occurrences = substr_count($output, $referencing_entity_2->name->value);
+    $actual_occurrences = substr_count($output, $referencing_entity_2->label());
     $this->assertEquals($expected_occurrences, $actual_occurrences);
 
     // Now render both entities at the same time and check again.
     $build = $view_builder->viewMultiple([$referencing_entity_1, $referencing_entity_2], 'default');
     $output = $renderer->renderRoot($build);
 
-    $actual_occurrences = substr_count($output, $referencing_entity_1->name->value);
+    $actual_occurrences = substr_count($output, $referencing_entity_1->label());
     $this->assertEquals($expected_occurrences, $actual_occurrences);
 
-    $actual_occurrences = substr_count($output, $referencing_entity_2->name->value);
+    $actual_occurrences = substr_count($output, $referencing_entity_2->label());
     $this->assertEquals($expected_occurrences, $actual_occurrences);
   }
 
@@ -406,7 +408,9 @@ public function testLabelFormatter() {
   }
 
   /**
-   * Sets field values and returns a render array as built by
+   * Sets field values and returns a render array.
+   *
+   * The render array structure is as built by
    * \Drupal\Core\Field\FieldItemListInterface::view().
    *
    * @param \Drupal\Core\Entity\EntityInterface[] $referenced_entities
diff --git a/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php b/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
index 17766c048..f1be011b8 100644
--- a/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
+++ b/web/core/modules/field/tests/src/Kernel/EntityReference/Views/EntityReferenceRelationshipTest.php
@@ -34,7 +34,7 @@ class EntityReferenceRelationshipTest extends ViewsKernelTestBase {
     'test_entity_reference_entity_test_mul_view',
     'test_entity_reference_reverse_entity_test_mul_view',
     'test_entity_reference_group_by_empty_relationships',
-    ];
+  ];
 
   /**
    * Modules to install.
diff --git a/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php b/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
index 9ed593a72..ef9393bf5 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php
@@ -13,6 +13,9 @@
  */
 class FieldAttachOtherTest extends FieldKernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('entity_test_rev');
diff --git a/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php b/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
index 1ae862084..117b80cc7 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php
@@ -14,6 +14,9 @@
  */
 class FieldAttachStorageTest extends FieldKernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('entity_test_rev');
diff --git a/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php b/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
index 15ef3afe9..ddc71895a 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldCrudTest.php
@@ -38,6 +38,9 @@ class FieldCrudTest extends FieldKernelTestBase {
    */
   protected $fieldDefinition;
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php b/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
index 4b067276c..f521d6236 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldDataCountTest.php
@@ -10,8 +10,7 @@
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
- * Tests counting field data records and the hasData() method on
- * FieldStorageConfig entity.
+ * Tests the count of field data records.
  *
  * @group field
  * @see \Drupal\Core\Entity\FieldableEntityStorageInterface::countFieldData()
diff --git a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
index cb83f2d89..afc2d3d92 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php
@@ -7,8 +7,7 @@
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
- * Delete field storages and fields during config synchronization and uninstall
- * module that provides the field type.
+ * Tests field storages and fields deletion during config synchronization.
  *
  * @group field
  * @see \Drupal\field\ConfigImporterFieldPurger
@@ -23,6 +22,9 @@ class FieldImportDeleteUninstallTest extends FieldKernelTestBase {
    */
   protected static $modules = ['telephone'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Module uninstall requires users_data tables.
@@ -107,8 +109,7 @@ public function testImportDeleteUninstall() {
   }
 
   /**
-   * Tests purging already deleted field storages and fields during a config
-   * import.
+   * Tests purging previously deleted fields and storages in config import.
    */
   public function testImportAlreadyDeletedUninstall() {
     // Create a telephone field for validation.
diff --git a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
index 6ee56cd81..abb7050af 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php
@@ -169,7 +169,7 @@ protected function entityValidateAndSave(EntityInterface $entity) {
    * @param $cardinality
    *   Number of values to generate.
    *
-   * @return
+   * @return array
    *   An array of random values, in the format expected for field values.
    */
   protected function _generateTestFieldValues($cardinality) {
diff --git a/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php b/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
index 2aca2ab30..d91d12bf4 100644
--- a/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
+++ b/web/core/modules/field/tests/src/Kernel/FieldValidationTest.php
@@ -24,6 +24,9 @@ class FieldValidationTest extends FieldKernelTestBase {
    */
   private $entity;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php
index 6981a4a54..1540609d6 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldInstanceOptionTranslationTest.php
@@ -15,11 +15,11 @@ class MigrateFieldInstanceOptionTranslationTest extends MigrateDrupal6TestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
-      'config_translation',
-      'language',
-      'locale',
-      'menu_ui',
-    ];
+    'config_translation',
+    'language',
+    'locale',
+    'menu_ui',
+  ];
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
index e78c3506c..d931004b5 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldTest.php
@@ -102,6 +102,12 @@ public function testFields() {
     $this->assertSame('entity_reference', $field_storage->getType());
     $this->assertSame('node', $field_storage->getSetting('target_type'));
 
+    // Test a second node reference field.
+    $field_storage = FieldStorageConfig::load('node.field_company_4');
+    $this->assertInstanceOf(FieldStorageConfig::class, $field_storage);
+    $this->assertSame('entity_reference', $field_storage->getType());
+    $this->assertSame('node', $field_storage->getSetting('target_type'));
+
     // Test a user reference field.
     $field_storage = FieldStorageConfig::load('node.field_commander');
     $this->assertInstanceOf(FieldStorageConfig::class, $field_storage);
diff --git a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index c986b0c37..b98626036 100644
--- a/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -128,6 +128,11 @@ public function testWidgetSettings() {
     $this->assertIsArray($component);
     $this->assertSame('entity_reference_autocomplete_tags', $component['type']);
 
+    $component = $display_repository->getFormDisplay('node', 'employee', 'default')
+      ->getComponent('field_company_4');
+    $this->assertIsArray($component);
+    $this->assertSame('entity_reference_autocomplete', $component['type']);
+
     $component = $display_repository->getFormDisplay('node', 'employee', 'default')
       ->getComponent('field_commander');
     $this->assertIsArray($component);
diff --git a/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php b/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
index 8e0316425..4b56f1973 100644
--- a/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php
@@ -23,6 +23,9 @@ class NumberItemTest extends FieldKernelTestBase {
    */
   protected static $modules = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php b/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php
index 6be4de53d..ee3478f3c 100644
--- a/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php
+++ b/web/core/modules/field/tests/src/Kernel/Plugin/migrate/source/d7/FieldTest.php
@@ -173,14 +173,14 @@ public function providerSource() {
         'entity_type' => 'user',
         'instances' => [
            [
-            'id' => '33',
-            'field_id' => '11',
-            'field_name' => 'field_file',
-            'entity_type' => 'user',
-            'bundle' => 'user',
-            'data' => 'a:6:{s:5:"label";s:4:"File";s:6:"widget";a:5:{s:6:"weight";s:1:"8";s:4:"type";s:12:"file_generic";s:6:"module";s:4:"file";s:6:"active";i:1;s:8:"settings";a:1:{s:18:"progress_indicator";s:8:"throbber";}}s:8:"settings";a:5:{s:14:"file_directory";s:0:"";s:15:"file_extensions";s:3:"txt";s:12:"max_filesize";s:0:"";s:17:"description_field";i:0;s:18:"user_register_form";i:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"file_default";s:8:"settings";a:0:{}s:6:"module";s:4:"file";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";}',
-            'deleted' => '0',
-          ],
+             'id' => '33',
+             'field_id' => '11',
+             'field_name' => 'field_file',
+             'entity_type' => 'user',
+             'bundle' => 'user',
+             'data' => 'a:6:{s:5:"label";s:4:"File";s:6:"widget";a:5:{s:6:"weight";s:1:"8";s:4:"type";s:12:"file_generic";s:6:"module";s:4:"file";s:6:"active";i:1;s:8:"settings";a:1:{s:18:"progress_indicator";s:8:"throbber";}}s:8:"settings";a:5:{s:14:"file_directory";s:0:"";s:15:"file_extensions";s:3:"txt";s:12:"max_filesize";s:0:"";s:17:"description_field";i:0;s:18:"user_register_form";i:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"file_default";s:8:"settings";a:0:{}s:6:"module";s:4:"file";s:6:"weight";i:0;}}s:8:"required";i:0;s:11:"description";s:0:"";}',
+             'deleted' => '0',
+           ],
         ],
       ],
     ];
diff --git a/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php b/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
index 8b3259820..31af1f78c 100644
--- a/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/ShapeItemTest.php
@@ -29,6 +29,9 @@ class ShapeItemTest extends FieldKernelTestBase {
    */
   protected $fieldName = 'field_shape';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Kernel/TestItemTest.php b/web/core/modules/field/tests/src/Kernel/TestItemTest.php
index 7cbe6ea82..7e5588541 100644
--- a/web/core/modules/field/tests/src/Kernel/TestItemTest.php
+++ b/web/core/modules/field/tests/src/Kernel/TestItemTest.php
@@ -30,6 +30,9 @@ class TestItemTest extends FieldKernelTestBase {
    */
   protected $fieldName = 'field_test';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php b/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
index 87945c806..cb5e94cda 100644
--- a/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
+++ b/web/core/modules/field/tests/src/Unit/FieldConfigEntityUnitTest.php
@@ -95,10 +95,10 @@ protected function setUp(): void {
     $this->fieldStorage = $this->createMock('\Drupal\field\FieldStorageConfigInterface');
     $this->fieldStorage->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('test_field'));
+      ->willReturn('test_field');
     $this->fieldStorage->expects($this->any())
       ->method('getName')
-      ->will($this->returnValue('field_test'));
+      ->willReturn('field_test');
     $this->fieldStorage->expects($this->any())
       ->method('getSettings')
       ->willReturn([]);
@@ -106,9 +106,9 @@ protected function setUp(): void {
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldStorageDefinitions')
       ->with('test_entity_type')
-      ->will($this->returnValue([
+      ->willReturn([
         $this->fieldStorage->getName() => $this->fieldStorage,
-      ]));
+      ]);
   }
 
   /**
@@ -119,7 +119,7 @@ public function testCalculateDependencies() {
     $target_entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(['type' => 'config', 'name' => 'test.test_entity_type.id']));
+      ->willReturn(['type' => 'config', 'name' => 'test.test_entity_type.id']);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
@@ -135,7 +135,7 @@ public function testCalculateDependencies() {
 
     $this->fieldStorage->expects($this->once())
       ->method('getConfigDependencyName')
-      ->will($this->returnValue('field.storage.test_entity_type.test_field'));
+      ->willReturn('field.storage.test_entity_type.test_field');
 
     $field = new FieldConfig([
       'field_name' => $this->fieldStorage->getName(),
@@ -157,12 +157,12 @@ public function testCalculateDependenciesIncorrectBundle() {
     $storage->expects($this->any())
       ->method('load')
       ->with('test_bundle_not_exists')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getStorage')
       ->with('bundle_entity_type')
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $target_entity_type = new EntityType([
       'id' => 'test_entity_type',
@@ -252,15 +252,15 @@ public function testToArray() {
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
     $this->entityType->expects($this->once())
       ->method('getKey')
       ->with('id')
-      ->will($this->returnValue('id'));
+      ->willReturn('id');
     $this->entityType->expects($this->once())
       ->method('getPropertiesToExport')
       ->with('test_entity_type.test_bundle.field_test')
-      ->will($this->returnValue(array_combine(array_keys($expected), array_keys($expected))));
+      ->willReturn(array_combine(array_keys($expected), array_keys($expected)));
 
     $export = $field->toArray();
     $this->assertEquals($expected, $export);
diff --git a/web/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php b/web/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php
index 772c2e7e8..7ce3c92c7 100644
--- a/web/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php
+++ b/web/core/modules/field/tests/src/Unit/FieldStorageConfigAccessControlHandlerTest.php
@@ -68,11 +68,11 @@ protected function setUp(): void {
     $this->anon
       ->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->anon
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(0));
+      ->willReturn(0);
 
     $this->member = $this->createMock(AccountInterface::class);
     $this->member
@@ -84,23 +84,23 @@ protected function setUp(): void {
     $this->member
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(2));
+      ->willReturn(2);
 
     $storageType = $this->createMock(ConfigEntityTypeInterface::class);
     $storageType
       ->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('field'));
+      ->willReturn('field');
     $storageType
       ->expects($this->any())
       ->method('getConfigPrefix')
-      ->will($this->returnValue('field.storage'));
+      ->willReturn('field.storage');
 
     $entityType = $this->createMock(ConfigEntityTypeInterface::class);
     $entityType
       ->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('node'));
+      ->willReturn('node');
     $entityType
       ->expects($this->any())
       ->method('getConfigPrefix')
@@ -110,7 +110,7 @@ protected function setUp(): void {
     $this->moduleHandler
       ->expects($this->any())
       ->method('invokeAll')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $storage_access_control_handler = new FieldStorageConfigAccessControlHandler($storageType);
     $storage_access_control_handler->setModuleHandler($this->moduleHandler);
diff --git a/web/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php b/web/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php
index 184e1f4ac..2b6cda81e 100644
--- a/web/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php
+++ b/web/core/modules/field/tests/src/Unit/FieldStorageConfigEntityUnitTest.php
@@ -73,14 +73,14 @@ public function testCalculateDependencies() {
     $fieldStorageConfigentityType = $this->createMock('\Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
     $fieldStorageConfigentityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('field'));
+      ->willReturn('field');
 
     // Create a mock entity type to attach the field to.
     $attached_entity_type_id = $this->randomMachineName();
     $attached_entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $attached_entity_type->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('entity_provider_module'));
+      ->willReturn('entity_provider_module');
 
     // Get definition is called three times. Twice in
     // ConfigEntityBase::addDependency() to get the provider of the field config
diff --git a/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php b/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
index 8c739e1a2..9ada01447 100644
--- a/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
+++ b/web/core/modules/field_layout/tests/src/Functional/FieldLayoutTest.php
@@ -24,7 +24,7 @@ class FieldLayoutTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -60,7 +60,7 @@ public function testNodeView() {
     // By default, the one-column layout is used.
     $this->drupalGet('node/1');
     $this->assertSession()->elementExists('css', '.layout--onecol');
-    $this->assertSession()->elementExists('css', '.layout__region--content .field--name-body');
+    $this->assertSession()->elementTextContains('css', '.layout__region--content', 'The node body');
 
     $this->drupalGet('admin/structure/types/manage/article/display');
     $this->assertEquals(['Content', 'Disabled'], $this->getRegionTitles());
diff --git a/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php b/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
index 467114bc7..f5f3ec1c6 100644
--- a/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
+++ b/web/core/modules/field_layout/tests/src/FunctionalJavascript/FieldLayoutTest.php
@@ -25,7 +25,7 @@ class FieldLayoutTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -57,9 +57,9 @@ protected function setUp(): void {
   public function testEntityViewModes() {
     // By default, the field is not visible.
     $this->drupalGet('entity_test/1/test');
-    $this->assertSession()->elementNotExists('css', '.layout__region--content .field--name-field-test-text');
+    $this->assertSession()->elementNotExists('css', '.layout__region--content ');
     $this->drupalGet('entity_test/1');
-    $this->assertSession()->elementNotExists('css', '.layout__region--content .field--name-field-test-text');
+    $this->assertSession()->elementNotExists('css', '.layout__region--content');
 
     // Change the layout for the "test" view mode. See
     // core.entity_view_mode.entity_test.test.yml.
@@ -75,9 +75,9 @@ public function testEntityViewModes() {
 
     // Each view mode has a different layout.
     $this->drupalGet('entity_test/1/test');
-    $this->assertSession()->elementExists('css', '.layout__region--content .field--name-field-test-text');
+    $this->assertSession()->elementTextContains('css', '.layout__region--content', 'The field test text value');
     $this->drupalGet('entity_test/1');
-    $this->assertSession()->elementNotExists('css', '.layout__region--content .field--name-field-test-text');
+    $this->assertSession()->elementNotExists('css', '.layout__region--content');
   }
 
   /**
@@ -166,7 +166,7 @@ public function testEntityView() {
     // No fields are visible, and the regions don't display when empty.
     $this->assertSession()->elementNotExists('css', '.layout--twocol');
     $this->assertSession()->elementNotExists('css', '.layout__region');
-    $this->assertSession()->elementNotExists('css', '.field--name-field-test-text');
+    $this->assertSession()->pageTextNotContains('The field test text value');
 
     // After a refresh the new regions are still there.
     $this->drupalGet('entity_test/structure/entity_test/display');
@@ -188,7 +188,7 @@ public function testEntityView() {
     // The new layout is used.
     $this->drupalGet('entity_test/1');
     $this->assertSession()->elementExists('css', '.layout--twocol');
-    $this->assertSession()->elementExists('css', '.layout__region--first .field--name-field-test-text');
+    $this->assertSession()->elementTextContains('css', '.layout__region--first', 'The field test text value');
 
     // Move the field to the second region without tabledrag.
     $this->drupalGet('entity_test/structure/entity_test/display');
@@ -200,13 +200,13 @@ public function testEntityView() {
 
     // The updated region is used.
     $this->drupalGet('entity_test/1');
-    $this->assertSession()->elementExists('css', '.layout__region--second .field--name-field-test-text');
+    $this->assertSession()->elementTextContains('css', '.layout__region--second', 'The field test text value');
 
     // The layout is still in use without Field UI.
     $this->container->get('module_installer')->uninstall(['field_ui']);
     $this->drupalGet('entity_test/1');
     $this->assertSession()->elementExists('css', '.layout--twocol');
-    $this->assertSession()->elementExists('css', '.layout__region--second .field--name-field-test-text');
+    $this->assertSession()->elementTextContains('css', '.layout__region--second', 'The field test text value');
   }
 
   /**
diff --git a/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php b/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
index 8b074d5a0..431b8c1d3 100644
--- a/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
+++ b/web/core/modules/field_layout/tests/src/Unit/FieldLayoutBuilderTest.php
@@ -143,6 +143,7 @@ public function testBuildView() {
             '#markup' => 'Test1',
           ],
         ],
+        '#in_preview' => FALSE,
         '#settings' => [
           'label' => '',
         ],
@@ -243,6 +244,7 @@ public function testBuildForm() {
           '#process' => ['\Drupal\Core\Render\Element\RenderElement::processGroup'],
           '#pre_render' => ['\Drupal\Core\Render\Element\RenderElement::preRenderGroup'],
         ],
+        '#in_preview' => FALSE,
         '#settings' => [
           'label' => '',
         ],
diff --git a/web/core/modules/field_ui/field_ui.es6.js b/web/core/modules/field_ui/field_ui.es6.js
index 950df384c..d6e2b5c55 100644
--- a/web/core/modules/field_ui/field_ui.es6.js
+++ b/web/core/modules/field_ui/field_ui.es6.js
@@ -271,6 +271,45 @@
           // Fire the Ajax update.
           $refreshRows[0].value = rowNames.join(' ');
         }
+        once(
+          'edit-refresh',
+          'input[data-drupal-selector="edit-refresh"]',
+        ).forEach((input) => {
+          // Keep track of the element that was focused prior to triggering the
+          // mousedown event on the hidden submit button.
+          let returnFocus = {
+            drupalSelector: null,
+            scrollY: null,
+          };
+          // Use jQuery on to listen as the mousedown event is propagated by
+          // jQuery trigger().
+          $(input).on('mousedown', () => {
+            returnFocus = {
+              drupalSelector: document.activeElement.getAttribute(
+                'data-drupal-selector',
+              ),
+              scrollY: window.scrollY,
+            };
+          });
+          input.addEventListener('focus', () => {
+            if (returnFocus.drupalSelector) {
+              // Refocus the element that lost focus due to this hidden submit
+              // button being triggered by a mousedown event.
+              document
+                .querySelector(
+                  `[data-drupal-selector="${returnFocus.drupalSelector}"]`,
+                )
+                .focus();
+
+              // Ensure the scroll position is the same as when the input was
+              // initially changed.
+              window.scrollTo({
+                top: returnFocus.scrollY,
+              });
+              returnFocus = {};
+            }
+          });
+        });
         $('input[data-drupal-selector="edit-refresh"]').trigger('mousedown');
 
         // Disabled elements do not appear in POST ajax data, so we mark the
@@ -365,10 +404,14 @@
       // disabled previously. Pseudo-fields do not have default formatters,
       // we just return to 'visible' for those.
       if (this.region === 'hidden') {
+        const pluginSelect =
+          typeof this.$pluginSelect.find('option')[0] !== 'undefined'
+            ? this.$pluginSelect.find('option')[0].value
+            : undefined;
         const value =
           typeof this.defaultPlugin !== 'undefined'
             ? this.defaultPlugin
-            : this.$pluginSelect.find('option')[0].value;
+            : pluginSelect;
 
         if (typeof value !== 'undefined') {
           if (this.$pluginSelect.length) {
diff --git a/web/core/modules/field_ui/field_ui.js b/web/core/modules/field_ui/field_ui.js
index 30bdf9af8..957932816 100644
--- a/web/core/modules/field_ui/field_ui.js
+++ b/web/core/modules/field_ui/field_ui.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.fieldUIFieldStorageAddForm = {
     attach: function attach(context) {
       var form = once('field_ui_add', '[data-drupal-selector="field-ui-field-storage-add-form"]', context);
-
       if (form.length) {
         var $form = $(form);
         $form.find('.js-form-item-label label,' + '.js-form-item-field-name label,' + '.js-form-item-existing-storage-label label').addClass('js-form-required form-required');
@@ -26,13 +24,11 @@
         });
         $existingStorageName.on('change', function () {
           var value = this.value;
-
           if (value !== '') {
             if ($newFieldType.length) {
               $newFieldType[0].value = '';
               $newFieldType.trigger('change');
             }
-
             if (typeof drupalSettings.existingFieldLabels[value] !== 'undefined') {
               $existingStorageLabel[0].value = drupalSettings.existingFieldLabels[value];
             }
@@ -55,7 +51,6 @@
       tableDrag.row.prototype.onSwap = this.onSwap;
       $(table).find('tr.draggable').each(function () {
         var row = this;
-
         if (row.id in rowsData) {
           var data = rowsData[row.id];
           data.tableDrag = tableDrag;
@@ -71,18 +66,14 @@
       var refreshRows = {};
       refreshRows[rowHandler.name] = $trigger.get(0);
       var region = rowHandler.getRegion();
-
       if (region !== rowHandler.region) {
         var $fieldParent = $row.find('select.js-field-parent');
-
         if ($fieldParent.length) {
           $fieldParent[0].value = '';
         }
-
         $.extend(refreshRows, rowHandler.regionChange(region));
         rowHandler.region = region;
       }
-
       Drupal.fieldUIOverview.AJAXRefreshRows(refreshRows);
     },
     onDrop: function onDrop() {
@@ -90,11 +81,9 @@
       var row = dragObject.rowObject.element;
       var $row = $(row);
       var rowHandler = $row.data('fieldUIRowHandler');
-
       if (typeof rowHandler !== 'undefined') {
         var regionRow = $row.prevAll('tr.region-message').get(0);
         var region = regionRow.className.replace(/([^ ]+[ ]+)*region-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
-
         if (region !== rowHandler.region) {
           var refreshRows = rowHandler.regionChange(region);
           rowHandler.region = region;
@@ -106,13 +95,11 @@
       var rowObject = this;
       $(rowObject.table).find('tr.region-message').each(function () {
         var $this = $(this);
-
         if ($this.prev('tr').get(0) === rowObject.group[rowObject.group.length - 1]) {
           if (rowObject.method !== 'keyboard' || rowObject.direction === 'down') {
             rowObject.swap('after', this);
           }
         }
-
         if ($this.next('tr').is(':not(.draggable)') || $this.next('tr').length === 0) {
           $this.removeClass('region-populated').addClass('region-empty');
         } else if ($this.is('.region-empty')) {
@@ -127,22 +114,39 @@
         rowNames.push(rowName);
         ajaxElements.push(rows[rowName]);
       });
-
       if (rowNames.length) {
         $(ajaxElements).after(Drupal.theme.ajaxProgressThrobber());
         var $refreshRows = $('input[name=refresh_rows]');
-
         if ($refreshRows.length) {
           $refreshRows[0].value = rowNames.join(' ');
         }
-
+        once('edit-refresh', 'input[data-drupal-selector="edit-refresh"]').forEach(function (input) {
+          var returnFocus = {
+            drupalSelector: null,
+            scrollY: null
+          };
+          $(input).on('mousedown', function () {
+            returnFocus = {
+              drupalSelector: document.activeElement.getAttribute('data-drupal-selector'),
+              scrollY: window.scrollY
+            };
+          });
+          input.addEventListener('focus', function () {
+            if (returnFocus.drupalSelector) {
+              document.querySelector("[data-drupal-selector=\"".concat(returnFocus.drupalSelector, "\"]")).focus();
+              window.scrollTo({
+                top: returnFocus.scrollY
+              });
+              returnFocus = {};
+            }
+          });
+        });
         $('input[data-drupal-selector="edit-refresh"]').trigger('mousedown');
         $(ajaxElements).prop('disabled', true);
       }
     }
   };
   Drupal.fieldUIDisplayOverview = {};
-
   Drupal.fieldUIDisplayOverview.field = function (row, data) {
     this.row = row;
     this.name = data.name;
@@ -155,7 +159,6 @@
     this.$regionSelect.on('change', Drupal.fieldUIOverview.onChange);
     return this;
   };
-
   Drupal.fieldUIDisplayOverview.field.prototype = {
     getRegion: function getRegion() {
       if (this.$regionSelect.length) {
@@ -164,21 +167,18 @@
     },
     regionChange: function regionChange(region) {
       region = region.replace(/-/g, '_');
-
       if (this.$regionSelect.length) {
         this.$regionSelect[0].value = region;
       }
-
       if (this.region === 'hidden') {
-        var value = typeof this.defaultPlugin !== 'undefined' ? this.defaultPlugin : this.$pluginSelect.find('option')[0].value;
-
+        var pluginSelect = typeof this.$pluginSelect.find('option')[0] !== 'undefined' ? this.$pluginSelect.find('option')[0].value : undefined;
+        var value = typeof this.defaultPlugin !== 'undefined' ? this.defaultPlugin : pluginSelect;
         if (typeof value !== 'undefined') {
           if (this.$pluginSelect.length) {
             this.$pluginSelect[0].value = value;
           }
         }
       }
-
       var refreshRows = {};
       refreshRows[this.name] = this.$pluginSelect.get(0);
       return refreshRows;
diff --git a/web/core/modules/field_ui/field_ui.services.yml b/web/core/modules/field_ui/field_ui.services.yml
index 98aeef03e..0ee8964f3 100644
--- a/web/core/modules/field_ui/field_ui.services.yml
+++ b/web/core/modules/field_ui/field_ui.services.yml
@@ -3,7 +3,7 @@ services:
     class: Drupal\field_ui\Routing\RouteSubscriber
     arguments: ['@entity_type.manager']
     tags:
-     - { name: event_subscriber }
+      - { name: event_subscriber }
   field_ui.route_enhancer:
     alias: route_enhancer.entity_bundle
     deprecated: The "%alias_id%" service is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Use the "route_enhancer.entity_bundle" service instead. See https://www.drupal.org/node/3245017
@@ -15,9 +15,9 @@ services:
     class: Drupal\field_ui\Access\ViewModeAccessCheck
     arguments: ['@entity_type.manager']
     tags:
-     - { name: access_check, applies_to: _field_ui_view_mode_access }
+      - { name: access_check, applies_to: _field_ui_view_mode_access }
   access_check.field_ui.form_mode:
     class: Drupal\field_ui\Access\FormModeAccessCheck
     arguments: ['@entity_type.manager']
     tags:
-     - { name: access_check, applies_to: _field_ui_form_mode_access }
+      - { name: access_check, applies_to: _field_ui_form_mode_access }
diff --git a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
index 533a911ac..21ac85f52 100644
--- a/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
+++ b/web/core/modules/field_ui/src/Plugin/Derivative/FieldUiLocalAction.php
@@ -16,6 +16,11 @@ class FieldUiLocalAction extends DeriverBase implements ContainerDeriverInterfac
 
   use StringTranslationTrait;
 
+  /**
+   * The route provider to load routes by name.
+   */
+  protected $routeProvider;
+
   /**
    * The entity type manager.
    *
diff --git a/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php b/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
index 97489fb8f..4bdb40003 100644
--- a/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/FunctionalJavascript/ManageDisplayTest.php
@@ -148,11 +148,18 @@ public function testFormatterUI() {
     $this->assertEquals('hidden', $field_region->getValue());
     $field_region->setValue('content');
     $assert_session->assertWaitOnAjaxRequest();
+
+    // Confirm the region element retains focus after the AJAX update completes.
+    $this->assertJsCondition('document.activeElement === document.querySelector("[name=\'fields[field_test][region]\']")');
     $button_save->click();
 
     // Change the format for the test field.
     $field_test_format_type->setValue('field_test_multiple');
     $assert_session->assertWaitOnAjaxRequest();
+
+    // Confirm the format element retains focus after the AJAX update completes.
+    $this->assertJsCondition('document.activeElement === document.querySelector("[name=\'fields[field_test][type]\']")');
+
     $plugin_summary = $page->find('css', '#field-test .field-plugin-summary');
     $this->assertStringContainsString("test_formatter_setting_multiple: dummy test string", $plugin_summary->getText(), 'The expected summary is displayed.');
 
diff --git a/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php b/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
index c10ef036c..b246e0557 100644
--- a/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Kernel/EntityDisplayTest.php
@@ -39,6 +39,9 @@ class EntityDisplayTest extends KernelTestBase {
     'system',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('entity_test');
diff --git a/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php b/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
index c50e9cf59..19f199b0b 100644
--- a/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
+++ b/web/core/modules/field_ui/tests/src/Kernel/EntityFormDisplayTest.php
@@ -29,6 +29,9 @@ class EntityFormDisplayTest extends KernelTestBase {
     'text',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('entity_test');
diff --git a/web/core/modules/field_ui/tests/src/Unit/FieldUiRouteEnhancerTest.php b/web/core/modules/field_ui/tests/src/Unit/FieldUiRouteEnhancerTest.php
index d003d9586..79594f78d 100644
--- a/web/core/modules/field_ui/tests/src/Unit/FieldUiRouteEnhancerTest.php
+++ b/web/core/modules/field_ui/tests/src/Unit/FieldUiRouteEnhancerTest.php
@@ -15,8 +15,7 @@
 class FieldUiRouteEnhancerTest extends UnitTestCase {
 
   /**
-   * Tests deprecation of the Drupal\field_ui\Routing\FieldUiRouteEnhancer
-   * class.
+   * Tests deprecation of the Drupal\field_ui\Routing\FieldUiRouteEnhancer.
    */
   public function testDeprecation() {
     $this->expectDeprecation('The Drupal\field_ui\Routing\EntityBundleRouteEnhancer is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. Instead, use \Drupal\Core\Entity\Enhancer\EntityBundleRouteEnhancer. See https://www.drupal.org/node/3245017');
diff --git a/web/core/modules/file/file.install b/web/core/modules/file/file.install
index a975eed34..e2e4ce61a 100644
--- a/web/core/modules/file/file.install
+++ b/web/core/modules/file/file.install
@@ -69,7 +69,9 @@ function file_requirements($phase) {
   if ($phase == 'runtime') {
     $description = NULL;
     $implementation = file_progress_implementation();
-    $server_software = \Drupal::request()->server->get('SERVER_SOFTWARE');
+    // The environment variable might be missing. Fallback to an empty string to
+    // prevent passing NULL to preg_match(), a few lines later.
+    $server_software = \Drupal::request()->server->get('SERVER_SOFTWARE', '');
 
     // Test the web server identity.
     if (preg_match("/Nginx/i", $server_software)) {
diff --git a/web/core/modules/file/file.js b/web/core/modules/file/file.js
index b963984b4..64456dec5 100644
--- a/web/core/modules/file/file.js
+++ b/web/core/modules/file/file.js
@@ -4,19 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.fileValidateAutoAttach = {
     attach: function attach(context, settings) {
       var $context = $(context);
       var elements;
-
       function initFileValidation(selector) {
         $(once('fileValidate', $context.find(selector))).on('change.fileValidate', {
           extensions: elements[selector]
         }, Drupal.file.validateExtension);
       }
-
       if (settings.file && settings.file.elements) {
         elements = settings.file.elements;
         Object.keys(elements).forEach(initFileValidation);
@@ -25,11 +22,9 @@
     detach: function detach(context, settings, trigger) {
       var $context = $(context);
       var elements;
-
       function removeFileValidation(selector) {
         $(once.remove('fileValidate', $context.find(selector))).off('change.fileValidate', Drupal.file.validateExtension);
       }
-
       if (trigger === 'unload' && settings.file && settings.file.elements) {
         elements = settings.file.elements;
         Object.keys(elements).forEach(removeFileValidation);
@@ -73,10 +68,8 @@
       event.preventDefault();
       $('.file-upload-js-error').remove();
       var extensionPattern = event.data.extensions.replace(/,\s*/g, '|');
-
       if (extensionPattern.length > 1 && this.value.length > 0) {
         var acceptableMatch = new RegExp("\\.(".concat(extensionPattern, ")$"), 'gi');
-
         if (!acceptableMatch.test(this.value)) {
           var error = Drupal.t('The selected file %filename cannot be uploaded. Only files with the following extensions are allowed: %extensions.', {
             '%filename': this.value.replace('C:\\fakepath\\', ''),
@@ -95,11 +88,9 @@
       var $clickedButton = $(this);
       $clickedButton.trigger('formUpdated');
       var $enabledFields = [];
-
       if ($clickedButton.closest('div.js-form-managed-file').length > 0) {
         $enabledFields = $clickedButton.closest('div.js-form-managed-file').find('input.js-form-file');
       }
-
       var $fieldsToTemporarilyDisable = $('div.js-form-managed-file input.js-form-file').not($enabledFields).not(':disabled');
       $fieldsToTemporarilyDisable.prop('disabled', true);
       setTimeout(function () {
@@ -109,7 +100,6 @@
     progressBar: function progressBar(event) {
       var $clickedButton = $(this);
       var $progressId = $clickedButton.closest('div.js-form-managed-file').find('input.file-progress');
-
       if ($progressId.length) {
         var originalName = $progressId.attr('name');
         $progressId.attr('name', originalName.match(/APC_UPLOAD_PROGRESS|UPLOAD_IDENTIFIER/)[0]);
@@ -117,7 +107,6 @@
           $progressId.attr('name', originalName);
         }, 1000);
       }
-
       setTimeout(function () {
         $clickedButton.closest('div.js-form-managed-file').find('div.ajax-progress-bar').slideDown();
       }, 500);
diff --git a/web/core/modules/file/file.module b/web/core/modules/file/file.module
index 8e3f7e098..275e1d2b1 100644
--- a/web/core/modules/file/file.module
+++ b/web/core/modules/file/file.module
@@ -648,7 +648,7 @@ function file_cron() {
     $fids = Drupal::entityQuery('file')
       ->accessCheck(FALSE)
       ->condition('status', FileInterface::STATUS_PERMANENT, '<>')
-      ->condition('changed', REQUEST_TIME - $age, '<')
+      ->condition('changed', \Drupal::time()->getRequestTime() - $age, '<')
       ->range(0, 100)
       ->execute();
     $files = $file_storage->loadMultiple($fids);
@@ -867,15 +867,15 @@ function file_save_upload($form_field_name, $validators = [], $destination = FAL
     }
     catch (IniSizeFileException | FormSizeFileException $e) {
       \Drupal::messenger()->addError(t('The file %file could not be saved because it exceeds %maxsize, the maximum allowed size for uploads.', [
-          '%file' => $uploaded_file->getFilename(),
-          '%maxsize' => format_size(Environment::getUploadMaxSize()),
-        ]));
+        '%file' => $uploaded_file->getFilename(),
+        '%maxsize' => format_size(Environment::getUploadMaxSize()),
+      ]));
       $files[$i] = FALSE;
     }
     catch (PartialFileException | NoFileException $e) {
       \Drupal::messenger()->addError(t('The file %file could not be saved because the upload did not complete.', [
-          '%file' => $uploaded_file->getFilename(),
-        ]));
+        '%file' => $uploaded_file->getFilename(),
+      ]));
       $files[$i] = FALSE;
     }
     catch (SymfonyFileException $e) {
diff --git a/web/core/modules/file/migrations/d6_file.yml b/web/core/modules/file/migrations/d6_file.yml
index 2ae8f8eb4..51db2fdc6 100644
--- a/web/core/modules/file/migrations/d6_file.yml
+++ b/web/core/modules/file/migrations/d6_file.yml
@@ -11,15 +11,35 @@ source:
   constants:
     # The tool configuring this migration must set source_base_path. It
     # represents the fully qualified path relative to which URIs in the files
-    # table are specified, and must end with a /. See source_full_path
-    # configuration in this migration's process pipeline as an example.
+    # table are specified. This can be a local file directory containing the
+    # source site, e.g. /var/www/docroot, or the site address,
+    # e.g. https://example.com. This value will be concatenated with the file
+    # path (typically sites/default/files) and used as the source location for
+    # the files.
+    #
+    # Suppose that the source files have been moved by other means to a location
+    # on the destination site.
+    # Source site:
+    #   Location of files: /var/www/html/legacy/sites/default/files
+    #   Public scheme: sites/default/files
+    # In this example, source_base_path should be '/var/www/html/legacy'.
+    #
+    # Suppose that the source site is a multisite installation at
+    # https://example.com, and you plan to copy the files from there.
+    # Source site:
+    #   Location of files: https://example.com/sites/example.com/files
+    #   Public scheme: sites/example.com/files
+    # In this example, source_base_path should be 'https://example.com'.
+    #
+    # See the configuration for the source_full_path property in the process
+    # section below.
     source_base_path: ''
 process:
-    # If you are using both this migration and d6_user_picture_file in a custom
-    # migration and executing migrations incrementally, it is strongly
-    # recommended that you remove the fid mapping to avoid potential ID
-    # conflicts. For that reason, this mapping is commented out by default.
-    # fid: fid
+  # If you are using both this migration and d6_user_picture_file in a custom
+  # migration and executing migrations incrementally, it is strongly
+  # recommended that you remove the fid mapping to avoid potential ID conflicts.
+  # For that reason, this mapping is commented out by default.
+  # fid: fid
   filename: filename
   source_full_path:
     -
diff --git a/web/core/modules/file/migrations/d7_file.yml b/web/core/modules/file/migrations/d7_file.yml
index 3ead3e5ed..4c4b54ff5 100644
--- a/web/core/modules/file/migrations/d7_file.yml
+++ b/web/core/modules/file/migrations/d7_file.yml
@@ -12,8 +12,28 @@ source:
   constants:
     # The tool configuring this migration must set source_base_path. It
     # represents the fully qualified path relative to which URIs in the files
-    # table are specified, and must end with a /. See source_full_path
-    # configuration in this migration's process pipeline as an example.
+    # table are specified. This can be a local file directory containing the
+    # source site, e.g. /var/www/docroot, or the site address,
+    # e.g. https://example.com. This value will be concatenated with the file
+    # path (typically sites/default/files) and used as the source location for
+    # the files.
+    #
+    # Suppose that the source files have been moved by other means to a location
+    # on the destination site.
+    # Source site:
+    #   Location of files: /var/www/html/legacy/sites/default/files
+    #   Public scheme: sites/default/files
+    # In this example, source_base_path should be '/var/www/html/legacy'.
+    #
+    # Suppose that the source site is a multisite installation at
+    # https://example.com, and you plan to copy the files from there.
+    # Source site:
+    #   Location of files: https://example.com/sites/example.com/files
+    #   Public scheme: sites/example.com/files
+    # In this example, source_base_path should be 'https://example.com'.
+    #
+    # See the configuration for the source_full_path property in the process
+    # section below.
     source_base_path: ''
 process:
   # If you are using this file to build a custom migration consider removing
diff --git a/web/core/modules/file/src/Element/ManagedFile.php b/web/core/modules/file/src/Element/ManagedFile.php
index e198f353d..09a1b824e 100644
--- a/web/core/modules/file/src/Element/ManagedFile.php
+++ b/web/core/modules/file/src/Element/ManagedFile.php
@@ -194,10 +194,6 @@ public static function uploadAjaxCallback(&$form, FormStateInterface &$form_stat
     if (isset($form['#file_upload_delta']) && $current_file_count < $form['#file_upload_delta']) {
       $form[$current_file_count]['#attributes']['class'][] = 'ajax-new-content';
     }
-    // Otherwise just add the new content class on a placeholder.
-    else {
-      $form['#suffix'] .= '<span class="ajax-new-content"></span>';
-    }
 
     $status_messages = ['#type' => 'status_messages'];
     $form['#prefix'] .= $renderer->renderRoot($status_messages);
@@ -415,7 +411,8 @@ public static function preRenderManagedFile($element) {
    * Render API callback: Validates the managed_file element.
    */
   public static function validateManagedFile(&$element, FormStateInterface $form_state, &$complete_form) {
-    $clicked_button = end($form_state->getTriggeringElement()['#parents']);
+    $triggering_element = $form_state->getTriggeringElement();
+    $clicked_button = isset($triggering_element['#parents']) ? end($triggering_element['#parents']) : '';
     if ($clicked_button != 'remove_button' && !empty($element['fids']['#value'])) {
       $fids = $element['fids']['#value'];
       foreach ($fids as $fid) {
diff --git a/web/core/modules/file/src/Entity/File.php b/web/core/modules/file/src/Entity/File.php
index 57276f495..e977337d0 100644
--- a/web/core/modules/file/src/Entity/File.php
+++ b/web/core/modules/file/src/Entity/File.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\file\Entity;
 
+use Drupal\Core\Cache\Cache;
 use Drupal\Core\Entity\ContentEntityBase;
 use Drupal\Core\Entity\EntityChangedTrait;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -276,4 +277,20 @@ public static function getDefaultEntityOwner() {
     return NULL;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function invalidateTagsOnSave($update) {
+    $tags = $this->getListCacheTagsToInvalidate();
+    // Always invalidate the 404 or 403 response cache because while files do
+    // not have a canonical URL as such, they may be served via routes such as
+    // private files.
+    // Creating or updating an entity may change a cached 403 or 404 response.
+    $tags = Cache::mergeTags($tags, ['4xx-response']);
+    if ($update) {
+      $tags = Cache::mergeTags($tags, $this->getCacheTagsToInvalidate());
+    }
+    Cache::invalidateTags($tags);
+  }
+
 }
diff --git a/web/core/modules/file/src/FileRepository.php b/web/core/modules/file/src/FileRepository.php
index 3ec359c61..1a2d08d75 100644
--- a/web/core/modules/file/src/FileRepository.php
+++ b/web/core/modules/file/src/FileRepository.php
@@ -88,7 +88,7 @@ public function __construct(FileSystemInterface $fileSystem, StreamWrapperManage
    */
   public function writeData(string $data, string $destination, int $replace = FileSystemInterface::EXISTS_RENAME): FileInterface {
     if (!$this->streamWrapperManager->isValidUri($destination)) {
-      throw new InvalidStreamWrapperException(sprintf('Invalid stream wrapper: %destination', ['%destination' => $destination]));
+      throw new InvalidStreamWrapperException("Invalid stream wrapper: {$destination}");
     }
     $uri = $this->fileSystem->saveData($data, $destination, $replace);
     return $this->createOrUpdate($uri, $destination, $replace === FileSystemInterface::EXISTS_RENAME);
@@ -132,7 +132,7 @@ protected function createOrUpdate(string $uri, string $destination, bool $rename
    */
   public function copy(FileInterface $source, string $destination, int $replace = FileSystemInterface::EXISTS_RENAME): FileInterface {
     if (!$this->streamWrapperManager->isValidUri($destination)) {
-      throw new InvalidStreamWrapperException(sprintf('Invalid stream wrapper: %destination', ['%destination' => $destination]));
+      throw new InvalidStreamWrapperException("Invalid stream wrapper: {$destination}");
     }
     $uri = $this->fileSystem->copy($source->getFileUri(), $destination, $replace);
 
@@ -166,7 +166,7 @@ public function copy(FileInterface $source, string $destination, int $replace =
    */
   public function move(FileInterface $source, string $destination, int $replace = FileSystemInterface::EXISTS_RENAME): FileInterface {
     if (!$this->streamWrapperManager->isValidUri($destination)) {
-      throw new InvalidStreamWrapperException(sprintf('Invalid stream wrapper: %destination', ['%destination' => $destination]));
+      throw new InvalidStreamWrapperException("Invalid stream wrapper: {$destination}");
     }
     $uri = $this->fileSystem->move($source->getFileUri(), $destination, $replace);
     $delete_source = FALSE;
diff --git a/web/core/modules/file/src/FileViewsData.php b/web/core/modules/file/src/FileViewsData.php
index aad5ac23a..cc69d7e05 100644
--- a/web/core/modules/file/src/FileViewsData.php
+++ b/web/core/modules/file/src/FileViewsData.php
@@ -50,7 +50,7 @@ public function getViewsData() {
         'default_formatter' => 'file_extension',
         'id' => 'field',
         'click sortable' => FALSE,
-       ],
+      ],
     ];
 
     $data['file_managed']['filesize']['field']['default_formatter'] = 'file_size';
@@ -252,7 +252,7 @@ public function getViewsData() {
       'help' => $this->t('The module managing this file relationship.'),
       'field' => [
         'id' => 'standard',
-       ],
+      ],
       'filter' => [
         'id' => 'string',
       ],
@@ -268,7 +268,7 @@ public function getViewsData() {
       'help' => $this->t('The type of entity that is related to the file.'),
       'field' => [
         'id' => 'standard',
-       ],
+      ],
       'filter' => [
         'id' => 'string',
       ],
@@ -300,7 +300,7 @@ public function getViewsData() {
       'help' => $this->t('The number of times the file is used by this entity.'),
       'field' => [
         'id' => 'numeric',
-       ],
+      ],
       'filter' => [
         'id' => 'numeric',
       ],
diff --git a/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php b/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
index e6a8db603..3c0aa914f 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldFormatter/TableFormatter.php
@@ -24,7 +24,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     $elements = [];
 
     if ($files = $this->getEntitiesToView($items, $langcode)) {
-      $header = [t('Attachment'), t('Size')];
+      $header = [$this->t('Attachment'), $this->t('Size')];
       $rows = [];
       foreach ($files as $file) {
         $item = $file->_referringItem;
diff --git a/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php b/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
index 758d483e0..c8c96c254 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldType/FileItem.php
@@ -12,6 +12,7 @@
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
@@ -96,11 +97,11 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
     $properties = parent::propertyDefinitions($field_definition);
 
     $properties['display'] = DataDefinition::create('boolean')
-      ->setLabel(t('Display'))
-      ->setDescription(t('Flag to control whether this file should be displayed when viewing content'));
+      ->setLabel(new TranslatableMarkup('Display'))
+      ->setDescription(new TranslatableMarkup('Flag to control whether this file should be displayed when viewing content'));
 
     $properties['description'] = DataDefinition::create('string')
-      ->setLabel(t('Description'));
+      ->setLabel(new TranslatableMarkup('Description'));
 
     return $properties;
   }
@@ -115,15 +116,15 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['display_field'] = [
       '#type' => 'checkbox',
-      '#title' => t('Enable <em>Display</em> field'),
+      '#title' => $this->t('Enable <em>Display</em> field'),
       '#default_value' => $this->getSetting('display_field'),
-      '#description' => t('The display option allows users to choose if a file should be shown when viewing the content.'),
+      '#description' => $this->t('The display option allows users to choose if a file should be shown when viewing the content.'),
     ];
     $element['display_default'] = [
       '#type' => 'checkbox',
-      '#title' => t('Files displayed by default'),
+      '#title' => $this->t('Files displayed by default'),
       '#default_value' => $this->getSetting('display_default'),
-      '#description' => t('This setting only has an effect if the display option is enabled.'),
+      '#description' => $this->t('This setting only has an effect if the display option is enabled.'),
       '#states' => [
         'visible' => [
           ':input[name="settings[display_field]"]' => ['checked' => TRUE],
@@ -134,10 +135,10 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
     $scheme_options = \Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE);
     $element['uri_scheme'] = [
       '#type' => 'radios',
-      '#title' => t('Upload destination'),
+      '#title' => $this->t('Upload destination'),
       '#options' => $scheme_options,
       '#default_value' => $this->getSetting('uri_scheme'),
-      '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
+      '#description' => $this->t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
       '#disabled' => $has_data,
     ];
 
@@ -153,9 +154,9 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['file_directory'] = [
       '#type' => 'textfield',
-      '#title' => t('File directory'),
+      '#title' => $this->t('File directory'),
       '#default_value' => $settings['file_directory'],
-      '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'),
+      '#description' => $this->t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'),
       '#element_validate' => [[static::class, 'validateDirectory']],
       '#weight' => 3,
     ];
@@ -164,7 +165,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     $extensions = str_replace(' ', ', ', $settings['file_extensions']);
     $element['file_extensions'] = [
       '#type' => 'textfield',
-      '#title' => t('Allowed file extensions'),
+      '#title' => $this->t('Allowed file extensions'),
       '#default_value' => $extensions,
       '#description' => $this->t("Separate extensions with a comma or space. Each extension can contain alphanumeric characters, '.', and '_', and should start and end with an alphanumeric character."),
       '#element_validate' => [[static::class, 'validateExtensions']],
@@ -177,9 +178,9 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['max_filesize'] = [
       '#type' => 'textfield',
-      '#title' => t('Maximum upload size'),
+      '#title' => $this->t('Maximum upload size'),
       '#default_value' => $settings['max_filesize'],
-      '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', ['%limit' => format_size(Environment::getUploadMaxSize())]),
+      '#description' => $this->t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes could be limited only by PHP\'s maximum post and file upload sizes (current limit <strong>%limit</strong>).', ['%limit' => format_size(Environment::getUploadMaxSize())]),
       '#size' => 10,
       '#element_validate' => [[static::class, 'validateMaxFilesize']],
       '#weight' => 5,
@@ -187,9 +188,9 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['description_field'] = [
       '#type' => 'checkbox',
-      '#title' => t('Enable <em>Description</em> field'),
+      '#title' => $this->t('Enable <em>Description</em> field'),
       '#default_value' => $settings['description_field'] ?? '',
-      '#description' => t('The description field allows users to enter a description about the uploaded file.'),
+      '#description' => $this->t('The description field allows users to enter a description about the uploaded file.'),
       '#weight' => 11,
     ];
 
@@ -228,7 +229,7 @@ public static function validateExtensions($element, FormStateInterface $form_sta
       $extension_array = array_unique(array_filter(explode(' ', $extensions)));
       $extensions = implode(' ', $extension_array);
       if (!preg_match('/^([a-z0-9]+([._][a-z0-9])* ?)+$/', $extensions)) {
-        $form_state->setError($element, t("The list of allowed extensions is not valid. Allowed characters are a-z, 0-9, '.', and '_'. The first and last characters cannot be '.' or '_', and these two characters cannot appear next to each other. Separate extensions with a comma or space."));
+        $form_state->setError($element, new TranslatableMarkup("The list of allowed extensions is not valid. Allowed characters are a-z, 0-9, '.', and '_'. The first and last characters cannot be '.' or '_', and these two characters cannot appear next to each other. Separate extensions with a comma or space."));
       }
       else {
         $form_state->setValueForElement($element, $extensions);
@@ -239,7 +240,8 @@ public static function validateExtensions($element, FormStateInterface $form_sta
       if (!in_array('txt', $extension_array, TRUE) && !\Drupal::config('system.file')->get('allow_insecure_uploads')) {
         foreach ($extension_array as $extension) {
           if (preg_match(FileSystemInterface::INSECURE_EXTENSION_REGEX, 'test.' . $extension)) {
-            $form_state->setError($element, t('Add %txt_extension to the list of allowed extensions to securely upload files with a %extension extension. The %txt_extension extension will then be added automatically.', ['%extension' => $extension, '%txt_extension' => 'txt']));
+            $form_state->setError($element, new TranslatableMarkup('Add %txt_extension to the list of allowed extensions to securely upload files with a %extension extension. The %txt_extension extension will then be added automatically.', ['%extension' => $extension, '%txt_extension' => 'txt']));
+
             break;
           }
         }
@@ -260,7 +262,7 @@ public static function validateMaxFilesize($element, FormStateInterface $form_st
     $element['#value'] = trim($element['#value']);
     $form_state->setValue(['settings', 'max_filesize'], $element['#value']);
     if (!empty($element['#value']) && !Bytes::validate($element['#value'])) {
-      $form_state->setError($element, t('The "@name" option must contain a valid value. You may either leave the text field empty or enter a string like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes).', ['@name' => $element['#title']]));
+      $form_state->setError($element, new TranslatableMarkup('The "@name" option must contain a valid value. You may either leave the text field empty or enter a string like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes).', ['@name' => $element['#title']]));
     }
   }
 
diff --git a/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php b/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
index bf6ceb061..5b4144ad4 100644
--- a/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
+++ b/web/core/modules/file/src/Plugin/Field/FieldWidget/FileWidget.php
@@ -10,6 +10,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\ElementInfoManagerInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\file\Element\ManagedFile;
 use Drupal\file\Entity\File;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -28,6 +29,11 @@
  */
 class FileWidget extends WidgetBase {
 
+  /**
+   * The element info manager.
+   */
+  protected $elementInfo;
+
   /**
    * {@inheritdoc}
    */
@@ -58,13 +64,13 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['progress_indicator'] = [
       '#type' => 'radios',
-      '#title' => t('Progress indicator'),
+      '#title' => $this->t('Progress indicator'),
       '#options' => [
-        'throbber' => t('Throbber'),
-        'bar' => t('Bar with progress meter'),
+        'throbber' => $this->t('Throbber'),
+        'bar' => $this->t('Bar with progress meter'),
       ],
       '#default_value' => $this->getSetting('progress_indicator'),
-      '#description' => t('The throbber display does not show the status of uploads but takes up less space. The progress bar is helpful for monitoring progress on large uploads.'),
+      '#description' => $this->t('The throbber display does not show the status of uploads but takes up less space. The progress bar is helpful for monitoring progress on large uploads.'),
       '#weight' => 16,
       '#access' => file_progress_implementation(),
     ];
@@ -76,7 +82,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('Progress indicator: @progress_indicator', ['@progress_indicator' => $this->getSetting('progress_indicator')]);
+    $summary[] = $this->t('Progress indicator: @progress_indicator', ['@progress_indicator' => $this->getSetting('progress_indicator')]);
     return $summary;
   }
 
@@ -132,7 +138,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
           // defined by widget.
           $element['_weight'] = [
             '#type' => 'weight',
-            '#title' => t('Weight for row @number', ['@number' => $delta + 1]),
+            '#title' => $this->t('Weight for row @number', ['@number' => $delta + 1]),
             '#title_display' => 'invisible',
             // Note: this 'delta' is the FAPI #type 'weight' element's property.
             '#delta' => $max,
@@ -188,7 +194,7 @@ protected function formMultipleElements(FieldItemListInterface $items, array &$f
       // Add some properties that will eventually be added to the file upload
       // field. These are added here so that they may be referenced easily
       // through a hook_form_alter().
-      $elements['#file_upload_title'] = t('Add a new file');
+      $elements['#file_upload_title'] = $this->t('Add a new file');
       $elements['#file_upload_description'] = [
         '#theme' => 'file_upload_help',
         '#description' => '',
@@ -333,8 +339,7 @@ public static function value($element, $input, FormStateInterface $form_state) {
   }
 
   /**
-   * Form element validation callback for upload element on file widget. Checks
-   * if user has uploaded more files than allowed.
+   * Validates the number of uploaded files.
    *
    * This validator is used only when cardinality not set to 1 or unlimited.
    */
@@ -363,7 +368,7 @@ public static function validateMultipleCount($element, FormStateInterface $form_
         '@count' => $total_uploaded_count,
         '%list' => implode(', ', $removed_names),
       ];
-      $message = t('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args);
+      $message = new TranslatableMarkup('Field %field can only hold @max values but there were @count uploaded. The following files have been omitted as a result: %list.', $args);
       \Drupal::messenger()->addWarning($message);
       $values['fids'] = array_slice($values['fids'], 0, $keep);
       NestedArray::setValue($form_state->getValues(), $element['#parents'], $values);
@@ -386,7 +391,7 @@ public static function process($element, FormStateInterface $form_state, $form)
     if ($element['#display_field']) {
       $element['display'] = [
         '#type' => empty($item['fids']) ? 'hidden' : 'checkbox',
-        '#title' => t('Include file in display'),
+        '#title' => new TranslatableMarkup('Include file in display'),
         '#attributes' => ['class' => ['file-display']],
       ];
       if (isset($item['display'])) {
@@ -408,10 +413,10 @@ public static function process($element, FormStateInterface $form_state, $form)
       $config = \Drupal::config('file.settings');
       $element['description'] = [
         '#type' => $config->get('description.type'),
-        '#title' => t('Description'),
+        '#title' => new TranslatableMarkup('Description'),
         '#value' => $item['description'] ?? '',
         '#maxlength' => $config->get('description.length'),
-        '#description' => t('The description may be used as the label of the link to the file.'),
+        '#description' => new TranslatableMarkup('The description may be used as the label of the link to the file.'),
       ];
     }
 
@@ -478,7 +483,7 @@ public static function processMultiple($element, FormStateInterface $form_state,
         $description = static::getDescriptionFromElement($element[$key]);
         $element[$key]['_weight'] = [
           '#type' => 'weight',
-          '#title' => $description ? t('Weight for @title', ['@title' => $description]) : t('Weight for new file'),
+          '#title' => $description ? new TranslatableMarkup('Weight for @title', ['@title' => $description]) : new TranslatableMarkup('Weight for new file'),
           '#title_display' => 'invisible',
           '#delta' => $count,
           '#default_value' => $delta,
diff --git a/web/core/modules/file/src/Plugin/Validation/Constraint/FileValidationConstraintValidator.php b/web/core/modules/file/src/Plugin/Validation/Constraint/FileValidationConstraintValidator.php
index a6da920c6..cc7a17def 100644
--- a/web/core/modules/file/src/Plugin/Validation/Constraint/FileValidationConstraintValidator.php
+++ b/web/core/modules/file/src/Plugin/Validation/Constraint/FileValidationConstraintValidator.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\file\Plugin\Validation\Constraint;
 
+use Drupal\Component\Utility\Bytes;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
@@ -23,6 +24,17 @@ public function validate($value, Constraint $constraint) {
     $file = $target->getValue();
     // Get the validators.
     $validators = $value->getUploadValidators();
+
+    // Always respect the configured maximum file size.
+    $field_settings = $value->getFieldDefinition()->getSettings();
+    if (array_key_exists('max_filesize', $field_settings)) {
+      $validators['file_validate_size'] = [Bytes::toNumber($field_settings['max_filesize'])];
+    }
+    else {
+      // Do not validate the file size if it is not set explicitly.
+      unset($validators['file_validate_size']);
+    }
+
     // Checks that a file meets the criteria specified by the validators.
     if ($errors = file_validate($file, $validators)) {
       foreach ($errors as $error) {
diff --git a/web/core/modules/file/src/Plugin/migrate/process/d6/FieldFile.php b/web/core/modules/file/src/Plugin/migrate/process/d6/FieldFile.php
index 86987453d..f06eb2182 100644
--- a/web/core/modules/file/src/Plugin/migrate/process/d6/FieldFile.php
+++ b/web/core/modules/file/src/Plugin/migrate/process/d6/FieldFile.php
@@ -17,6 +17,11 @@
  */
 class FieldFile extends ProcessPluginBase implements ContainerFactoryPluginInterface {
 
+  /**
+   * The current migration.
+   */
+  protected $migration;
+
   /**
    * The migrate lookup service.
    *
diff --git a/web/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php b/web/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php
index 32c30b45b..2acf883f9 100644
--- a/web/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php
+++ b/web/core/modules/file/src/Plugin/migrate/process/d6/FileUri.php
@@ -7,7 +7,7 @@
 use Drupal\migrate\Row;
 
 /**
- * Process the file url into a D8 compatible URL.
+ * Process the file URL into a D8 compatible URL.
  *
  * @MigrateProcessPlugin(
  *   id = "file_uri"
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d6/File.php b/web/core/modules/file/src/Plugin/migrate/source/d6/File.php
index 1332a0c9c..8842cb031 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d6/File.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d6/File.php
@@ -8,6 +8,32 @@
 /**
  * Drupal 6 file source from database.
  *
+ * Available configuration keys:
+ * - site_path: (optional) The path to the site directory relative to Drupal
+ *   root. Defaults to 'sites/default'. This value is ignored if the
+ *   'file_directory_path' variable is set in the source Drupal database.
+ *
+ * Example:
+ *
+ * @code
+ * source:
+ *   plugin: d6_file
+ *   site_path: sites/example
+ * @endcode
+ *
+ * In this example, public file values are retrieved from the source database.
+ * The site path is specified because it's not the default one (sites/default).
+ * The final path to the public files will be "sites/example/files/", assuming
+ * the 'file_directory_path' variable is not set in the source database.
+ *
+ * For complete example, refer to the d6_file.yml migration.
+ *
+ * For additional configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ * @see d6_file.yml
+ *
  * @MigrateSource(
  *   id = "d6_file",
  *   source_module = "system"
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php b/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php
index 60b738b6b..1f93e0fd6 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d6/Upload.php
@@ -8,6 +8,11 @@
 /**
  * Drupal 6 upload source from database.
  *
+ * For available configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ *
  * @MigrateSource(
  *   id = "d6_upload",
  *   source_module = "upload"
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php b/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
index ef3c0d720..235c68b7c 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php
@@ -10,6 +10,11 @@
 /**
  * Drupal 6 upload instance source from database.
  *
+ * For available configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ *
  * @MigrateSource(
  *   id = "d6_upload_instance",
  *   source_module = "upload"
diff --git a/web/core/modules/file/src/Plugin/migrate/source/d7/File.php b/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
index cd285749e..1a754ed5d 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
@@ -8,6 +8,29 @@
 /**
  * Drupal 7 file source from database.
  *
+ * Available configuration keys:
+ * - scheme: (optional) The scheme of the files to get from the source, for
+ *   example, 'public' or 'private'. Can be a string or an array of schemes.
+ *   The 'temporary' scheme is not supported. If omitted, all files in
+ *   supported schemes are retrieved.
+ *
+ * Example:
+ *
+ * @code
+ * source:
+ *   plugin: d7_file
+ *   scheme: public
+ * @endcode
+ *
+ * In this example, public file values are retrieved from the source database.
+ * For complete example, refer to the d7_file.yml migration.
+ *
+ * For additional configuration keys, refer to the parent classes.
+ *
+ * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
+ * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
+ * @see d7_file.yml
+ *
  * @MigrateSource(
  *   id = "d7_file",
  *   source_module = "file"
diff --git a/web/core/modules/file/tests/file_test/file_test.module b/web/core/modules/file/tests/file_test/file_test.module
index 6551ae327..720912609 100644
--- a/web/core/modules/file/tests/file_test/file_test.module
+++ b/web/core/modules/file/tests/file_test/file_test.module
@@ -42,8 +42,9 @@ function file_test_reset() {
 }
 
 /**
- * Get the arguments passed to invocation of a given hook since
- * file_test_reset() was last called.
+ * Gets the arguments passed to a given hook invocation.
+ *
+ * Arguments are gathered since file_test_reset() was last called.
  *
  * @param string $op
  *   One of the hook_file_* operations: 'load', 'validate', 'download',
@@ -63,7 +64,7 @@ function file_test_get_calls($op) {
 /**
  * Get an array with the calls for all hooks.
  *
- * @return
+ * @return array
  *   An array keyed by hook name ('load', 'validate', 'download', 'insert',
  *   'update', 'copy', 'move', 'delete') with values being arrays of parameters
  *   passed to each call.
diff --git a/web/core/modules/file/tests/file_test/file_test.routing.yml b/web/core/modules/file/tests/file_test/file_test.routing.yml
index 0505615a4..20af642f9 100644
--- a/web/core/modules/file/tests/file_test/file_test.routing.yml
+++ b/web/core/modules/file/tests/file_test/file_test.routing.yml
@@ -10,3 +10,9 @@ file.save_upload_from_form_test:
     _form: '\Drupal\file_test\Form\FileTestSaveUploadFromForm'
   requirements:
     _access: 'TRUE'
+file.required_test:
+  path: '/file-test/upload_required'
+  defaults:
+    _form: '\Drupal\file_test\Form\FileRequiredTestForm'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php
index 1727b7950..347de4a3b 100644
--- a/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php
+++ b/web/core/modules/file/tests/file_test/src/StreamWrapper/DummyExternalReadOnlyWrapper.php
@@ -13,28 +13,28 @@
 class DummyExternalReadOnlyWrapper extends ReadOnlyStream {
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public static function getType() {
     return StreamWrapperInterface::READ_VISIBLE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function getName() {
     return t('Dummy external stream wrapper (readonly)');
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function getDescription() {
     return t('Dummy external read-only stream wrapper for testing.');
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function getExternalUrl() {
     [, $target] = explode('://', $this->uri, 2);
@@ -42,105 +42,105 @@ public function getExternalUrl() {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function realpath() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function dirname($uri = NULL) {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function dir_closedir() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function dir_opendir($path, $options) {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function dir_readdir() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function dir_rewinddir() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_cast($cast_as) {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_close() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_eof() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_read($count) {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_seek($offset, $whence = SEEK_SET) {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_set_option($option, $arg1, $arg2) {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_stat() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function stream_tell() {
     return FALSE;
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function url_stat($path, $flags) {
     return FALSE;
diff --git a/web/core/modules/file/tests/src/Functional/DownloadTest.php b/web/core/modules/file/tests/src/Functional/DownloadTest.php
index c961bbc4a..3bf34c1c5 100644
--- a/web/core/modules/file/tests/src/Functional/DownloadTest.php
+++ b/web/core/modules/file/tests/src/Functional/DownloadTest.php
@@ -24,6 +24,9 @@ class DownloadTest extends FileManagedTestBase {
    */
   protected $fileUrlGenerator;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -79,7 +82,7 @@ protected function doPrivateFileTransferTest() {
 
     // Create a file.
     $contents = $this->randomMachineName(8);
-    $file = $this->createFile(NULL, $contents, 'private');
+    $file = $this->createFile($contents . '.txt', $contents, 'private');
     // Created private files without usage are by default not accessible
     // for a user different from the owner, but createFile always uses uid 1
     // as the owner of the files. Therefore make it permanent to allow access
@@ -105,19 +108,33 @@ protected function doPrivateFileTransferTest() {
     $this->assertSame($contents, $this->getSession()->getPage()->getContent(), 'Contents of the file are correct.');
     $http_client = $this->getHttpClient();
 
-    // Deny access to all downloads via a -1 header.
-    file_test_set_return('download', -1);
-    $response = $http_client->head($url, ['http_errors' => FALSE]);
-    $this->assertSame(403, $response->getStatusCode(), 'Correctly denied access to a file when file_test sets the header to -1.');
-
     // Try non-existent file.
     file_test_reset();
-    $url = $this->fileUrlGenerator->generateAbsoluteString('private://' . $this->randomMachineName());
-    $response = $http_client->head($url, ['http_errors' => FALSE]);
+    $not_found_url = $this->fileUrlGenerator->generateAbsoluteString('private://' . $this->randomMachineName() . '.txt');
+    $response = $http_client->head($not_found_url, ['http_errors' => FALSE]);
     $this->assertSame(404, $response->getStatusCode(), 'Correctly returned 404 response for a non-existent file.');
     // Assert that hook_file_download is not called.
     $this->assertEquals([], \Drupal::state()->get('file_test.results')['download']);
 
+    // Having tried a non-existent file, try the original file again to ensure
+    // it's returned instead of a 404 response.
+    // Set file_test access header to allow the download.
+    file_test_reset();
+    file_test_set_return('download', ['x-foo' => 'Bar']);
+    $this->drupalGet($url);
+    // Verify that header is set by file_test module on private download.
+    $this->assertSession()->responseHeaderEquals('x-foo', 'Bar');
+    // Verify that page cache is disabled on private file download.
+    $this->assertSession()->responseHeaderDoesNotExist('x-drupal-cache');
+    $this->assertSession()->statusCodeEquals(200);
+    // Test that the file transferred correctly.
+    $this->assertSame($contents, $this->getSession()->getPage()->getContent(), 'Contents of the file are correct.');
+
+    // Deny access to all downloads via a -1 header.
+    file_test_set_return('download', -1);
+    $response = $http_client->head($url, ['http_errors' => FALSE]);
+    $this->assertSame(403, $response->getStatusCode(), 'Correctly denied access to a file when file_test sets the header to -1.');
+
     // Try requesting the private file url without a file specified.
     file_test_reset();
     $this->drupalGet('/system/files');
diff --git a/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php b/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
index 005bc1bad..292d24abc 100644
--- a/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileFieldValidateTest.php
@@ -8,8 +8,10 @@
 use Drupal\file\Entity\File;
 
 /**
- * Tests validation functions such as file type, max file size, max size per
- * node, and required.
+ * Tests file field validation functions.
+ *
+ * Values validated include the file type, max file size, max size per node,
+ * and whether the field is required.
  *
  * @group file
  */
diff --git a/web/core/modules/file/tests/src/Functional/FileListingTest.php b/web/core/modules/file/tests/src/Functional/FileListingTest.php
index d2d639d25..ca5534ca5 100644
--- a/web/core/modules/file/tests/src/Functional/FileListingTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileListingTest.php
@@ -32,6 +32,9 @@ class FileListingTest extends FileFieldTestBase {
    */
   protected $baseUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
index f9b14434c..cf54ae9a4 100644
--- a/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
+++ b/web/core/modules/file/tests/src/Functional/FileManagedTestBase.php
@@ -8,8 +8,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Base class for file tests that use the file_test module to test uploads and
- * hooks.
+ * Provides a base class for testing files with the file_test module.
  */
 abstract class FileManagedTestBase extends BrowserTestBase {
 
@@ -20,6 +19,9 @@ abstract class FileManagedTestBase extends BrowserTestBase {
    */
   protected static $modules = ['file_test', 'file'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     // Clear out any hook calls.
@@ -27,8 +29,7 @@ protected function setUp() {
   }
 
   /**
-   * Assert that all of the specified hook_file_* hooks were called once, other
-   * values result in failure.
+   * Asserts that the specified file hooks were called only once.
    *
    * @param string[] $expected
    *   An array of strings containing with the hook name; for example, 'load',
@@ -131,8 +132,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
   }
 
   /**
-   * Create a file and save it to the files table and assert that it occurs
-   * correctly.
+   * Creates and saves a file, asserting that it was saved.
    *
    * @param string $filepath
    *   Optional string specifying the file path. If none is provided then a
diff --git a/web/core/modules/file/tests/src/Functional/FilePrivateTest.php b/web/core/modules/file/tests/src/Functional/FilePrivateTest.php
index c1f4b3d23..9eb41af8f 100644
--- a/web/core/modules/file/tests/src/Functional/FilePrivateTest.php
+++ b/web/core/modules/file/tests/src/Functional/FilePrivateTest.php
@@ -25,6 +25,9 @@ class FilePrivateTest extends FileFieldTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     node_access_test_add_field(NodeType::load('article'));
diff --git a/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php b/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
index 041b0fe20..86fe0ed5d 100644
--- a/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
+++ b/web/core/modules/file/tests/src/Functional/FileTokenReplaceTest.php
@@ -8,8 +8,7 @@
 use Drupal\file\Entity\File;
 
 /**
- * Generates text using placeholders for dummy content to check file token
- * replacement.
+ * Tests file token replacement.
  *
  * @group file
  */
diff --git a/web/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php b/web/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
index 65686d22a..bce058f19 100644
--- a/web/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
+++ b/web/core/modules/file/tests/src/Functional/RemoteFileSaveUploadTest.php
@@ -21,6 +21,9 @@ class RemoteFileSaveUploadTest extends SaveUploadTest {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/modules/file/tests/src/Functional/SaveUploadTest.php b/web/core/modules/file/tests/src/Functional/SaveUploadTest.php
index 5fb1f1a81..4a70d2d1c 100644
--- a/web/core/modules/file/tests/src/Functional/SaveUploadTest.php
+++ b/web/core/modules/file/tests/src/Functional/SaveUploadTest.php
@@ -59,6 +59,9 @@ class SaveUploadTest extends FileManagedTestBase {
    */
   protected $imageExtension;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $account = $this->drupalCreateUser(['access site reports']);
@@ -463,9 +466,9 @@ public function testHandleFileMunge() {
     // extensions.
     $extensions = 'foo ' . $this->imageExtension;
     $edit = [
-        'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
-        'extensions' => $extensions,
-      ];
+      'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
+      'extensions' => $extensions,
+    ];
 
     $this->drupalGet('file-test/upload');
     $this->submitForm($edit, 'Submit');
@@ -505,9 +508,9 @@ public function testHandleFileMunge() {
 
     $extensions = 'php ' . $this->imageExtension;
     $edit = [
-        'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
-        'extensions' => $extensions,
-      ];
+      'files[file_test_upload]' => \Drupal::service('file_system')->realpath($this->image->getFileUri()),
+      'extensions' => $extensions,
+    ];
 
     $this->drupalGet('file-test/upload');
     $this->submitForm($edit, 'Submit');
@@ -729,4 +732,26 @@ public function testInvalidUtf8FilenameUpload() {
     $this->assertFileDoesNotExist('temporary://' . $filename);
   }
 
+  /**
+   * Tests the file_save_upload() function when the field is required.
+   */
+  public function testRequired() {
+    // Reset the hook counters to get rid of the 'load' we just called.
+    file_test_reset();
+
+    // Confirm the field is required.
+    $this->drupalGet('file-test/upload_required');
+    $this->submitForm([], 'Submit');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->responseContains('field is required');
+
+    // Confirm that uploading another file works.
+    $image = current($this->drupalGetTestFiles('image'));
+    $edit = ['files[file_test_upload]' => \Drupal::service('file_system')->realpath($image->uri)];
+    $this->drupalGet('file-test/upload_required');
+    $this->submitForm($edit, 'Submit');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->assertSession()->responseContains('You WIN!');
+  }
+
 }
diff --git a/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldValidateTest.php b/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldValidateTest.php
index 6c667ecd1..1d50b3bfd 100644
--- a/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldValidateTest.php
+++ b/web/core/modules/file/tests/src/FunctionalJavascript/FileFieldValidateTest.php
@@ -7,8 +7,10 @@
 use Drupal\Tests\TestFileCreationTrait;
 
 /**
- * Tests validation functions such as file type, max file size, max size per
- * node, and required.
+ * Tests file field validation functions.
+ *
+ * Values validated include the file type, max file size, max size per node,
+ * and whether the field is required.
  *
  * @group file
  */
diff --git a/web/core/modules/file/tests/src/Kernel/CopyTest.php b/web/core/modules/file/tests/src/Kernel/CopyTest.php
index 668f99ae4..9c8e79766 100644
--- a/web/core/modules/file/tests/src/Kernel/CopyTest.php
+++ b/web/core/modules/file/tests/src/Kernel/CopyTest.php
@@ -185,6 +185,7 @@ public function testExistingError() {
    */
   public function testInvalidStreamWrapper() {
     $this->expectException(InvalidStreamWrapperException::class);
+    $this->expectExceptionMessage('Invalid stream wrapper: foo://');
     $source = $this->createFile();
     $this->fileRepository->copy($source, 'foo://');
   }
diff --git a/web/core/modules/file/tests/src/Kernel/FileItemTest.php b/web/core/modules/file/tests/src/Kernel/FileItemTest.php
index a09cb5580..ff0410168 100644
--- a/web/core/modules/file/tests/src/Kernel/FileItemTest.php
+++ b/web/core/modules/file/tests/src/Kernel/FileItemTest.php
@@ -40,6 +40,9 @@ class FileItemTest extends FieldKernelTestBase {
    */
   protected $directory;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
index 53012f3d9..c36d4b427 100644
--- a/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
+++ b/web/core/modules/file/tests/src/Kernel/FileManagedUnitTestBase.php
@@ -9,8 +9,7 @@
 use Drupal\user\Entity\User;
 
 /**
- * Base class for file unit tests that use the file_test module to test uploads and
- * hooks.
+ * Provides a base class for testing file uploads and hook invocations.
  */
 abstract class FileManagedUnitTestBase extends KernelTestBase {
 
@@ -21,6 +20,9 @@ abstract class FileManagedUnitTestBase extends KernelTestBase {
    */
   protected static $modules = ['file_test', 'file', 'system', 'field', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     // Clear out any hook calls.
@@ -40,8 +42,7 @@ protected function setUp() {
   }
 
   /**
-   * Assert that all of the specified hook_file_* hooks were called once, other
-   * values result in failure.
+   * Asserts that the specified file hooks were called only once.
    *
    * @param array $expected
    *   Array with string containing with the hook name, e.g. 'load', 'save',
@@ -144,8 +145,7 @@ public function assertSameFile(FileInterface $file1, FileInterface $file2) {
   }
 
   /**
-   * Create a file and save it to the files table and assert that it occurs
-   * correctly.
+   * Creates and saves a file, asserting that it was saved.
    *
    * @param string $filepath
    *   Optional string specifying the file path. If none is provided then a
diff --git a/web/core/modules/file/tests/src/Kernel/FileRepositoryTest.php b/web/core/modules/file/tests/src/Kernel/FileRepositoryTest.php
index 7db4dd08b..b7790a659 100644
--- a/web/core/modules/file/tests/src/Kernel/FileRepositoryTest.php
+++ b/web/core/modules/file/tests/src/Kernel/FileRepositoryTest.php
@@ -170,6 +170,7 @@ public function testExistingError() {
    */
   public function testInvalidStreamWrapper() {
     $this->expectException(InvalidStreamWrapperException::class);
+    $this->expectExceptionMessage('Invalid stream wrapper: foo://');
     $this->fileRepository->writeData('asdf', 'foo://');
   }
 
diff --git a/web/core/modules/file/tests/src/Kernel/MoveTest.php b/web/core/modules/file/tests/src/Kernel/MoveTest.php
index 389b86210..c48ed721c 100644
--- a/web/core/modules/file/tests/src/Kernel/MoveTest.php
+++ b/web/core/modules/file/tests/src/Kernel/MoveTest.php
@@ -209,6 +209,7 @@ public function testExistingError() {
    */
   public function testInvalidStreamWrapper() {
     $this->expectException(InvalidStreamWrapperException::class);
+    $this->expectExceptionMessage('Invalid stream wrapper: foo://');
     $source = $this->createFile();
     $this->fileRepository->move($source, 'foo://');
   }
diff --git a/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php b/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
index f7e1ee7b8..f8c03c069 100644
--- a/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
+++ b/web/core/modules/file/tests/src/Kernel/SpaceUsedTest.php
@@ -12,6 +12,9 @@
  */
 class SpaceUsedTest extends FileManagedUnitTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/file/tests/src/Kernel/ValidatorTest.php b/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
index 27ad4b9df..a611ee48a 100644
--- a/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
+++ b/web/core/modules/file/tests/src/Kernel/ValidatorTest.php
@@ -25,6 +25,9 @@ class ValidatorTest extends FileManagedUnitTestBase {
    */
   protected $nonImage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/filter/filter.admin.js b/web/core/modules/filter/filter.admin.js
index 43baa7339..ea43f1434 100644
--- a/web/core/modules/filter/filter.admin.js
+++ b/web/core/modules/filter/filter.admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.filterStatus = {
     attach: function attach(context, settings) {
@@ -17,7 +16,6 @@
         $checkbox.on('click.filterUpdate', function () {
           if ($checkbox.is(':checked')) {
             $row.show();
-
             if (filterSettingsTab) {
               filterSettingsTab.tabShow().updateSummary();
             } else {
@@ -25,23 +23,19 @@
             }
           } else {
             $row.hide();
-
             if (filterSettingsTab) {
               filterSettingsTab.tabHide().updateSummary();
             } else {
               $filterSettings.hide();
             }
           }
-
           Drupal.tableDrag['filter-order'].restripeTable();
         });
-
         if (filterSettingsTab) {
           filterSettingsTab.details.drupalSetSummary(function () {
             return $checkbox.is(':checked') ? Drupal.t('Enabled') : Drupal.t('Disabled');
           });
         }
-
         $checkbox.triggerHandler('click.filterUpdate');
       });
     }
diff --git a/web/core/modules/filter/filter.filter_html.admin.js b/web/core/modules/filter/filter.filter_html.admin.js
index bbf687101..6e126b433 100644
--- a/web/core/modules/filter/filter.filter_html.admin.js
+++ b/web/core/modules/filter/filter.filter_html.admin.js
@@ -4,27 +4,18 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 (function ($, Drupal, document) {
   if (Drupal.filterConfiguration) {
     Drupal.filterConfiguration.liveSettingParsers.filter_html = {
       getRules: function getRules() {
         var currentValue = document.querySelector('#edit-filters-filter-html-settings-allowed-html').value;
-
         var rules = Drupal.behaviors.filterFilterHtmlUpdating._parseSetting(currentValue);
-
         var rule = new Drupal.FilterHTMLRule();
         rule.restrictedTags.tags = ['*'];
         rule.restrictedTags.forbidden.attributes = ['style', 'on*'];
@@ -33,19 +24,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       }
     };
   }
-
   function difference() {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     return args.reduce(function (mainData, otherData) {
       return mainData.filter(function (data) {
         return !otherData.includes(data);
       });
     });
   }
-
   Drupal.behaviors.filterFilterHtmlUpdating = {
     $allowedHTMLFormItem: null,
     $allowedHTMLDescription: null,
@@ -60,18 +48,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         that.userTags = that._parseSetting(formItem.value);
         $(document).on('drupalEditorFeatureAdded', function (e, feature) {
           that.newFeatures[feature.name] = feature.rules;
-
           that._updateAllowedTags();
         }).on('drupalEditorFeatureModified', function (e, feature) {
           if (that.newFeatures.hasOwnProperty(feature.name)) {
             that.newFeatures[feature.name] = feature.rules;
-
             that._updateAllowedTags();
           }
         }).on('drupalEditorFeatureRemoved', function (e, feature) {
           if (that.newFeatures.hasOwnProperty(feature.name)) {
             delete that.newFeatures[feature.name];
-
             that._updateAllowedTags();
           }
         });
@@ -82,10 +67,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     },
     _updateAllowedTags: function _updateAllowedTags() {
       var _this = this;
-
       this.autoTags = this._calculateAutoAllowedTags(this.userTags, this.newFeatures);
       this.$allowedHTMLDescription.find('.editor-update-message').remove();
-
       if (Object.keys(this.autoTags).length > 0) {
         this.$allowedHTMLDescription.append(Drupal.theme('filterFilterHTMLUpdateMessage', this.autoTags));
         var userTagsWithoutOverrides = {};
@@ -106,27 +89,21 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         var featureRule;
         var filterRule;
         var tag;
-
         for (var f = 0; f < feature.length; f++) {
           featureRule = feature[f];
-
           for (var t = 0; t < featureRule.required.tags.length; t++) {
             tag = featureRule.required.tags[t];
-
             if (!editorRequiredTags.hasOwnProperty(tag)) {
               filterRule = new Drupal.FilterHTMLRule();
               filterRule.restrictedTags.tags = [tag];
               filterRule.restrictedTags.allowed.attributes = featureRule.required.attributes.slice(0);
-
               if (userAllowedTags[tag] !== undefined && userAllowedTags[tag].restrictedTags.allowed.classes[0] !== '') {
                 filterRule.restrictedTags.allowed.classes = featureRule.required.classes.slice(0);
               }
-
               editorRequiredTags[tag] = filterRule;
             } else {
               filterRule = editorRequiredTags[tag];
               filterRule.restrictedTags.allowed.attributes = [].concat(_toConsumableArray(filterRule.restrictedTags.allowed.attributes), _toConsumableArray(featureRule.required.attributes));
-
               if (userAllowedTags[tag] !== undefined && userAllowedTags[tag].restrictedTags.allowed.classes[0] !== '') {
                 filterRule.restrictedTags.allowed.classes = [].concat(_toConsumableArray(filterRule.restrictedTags.allowed.classes), _toConsumableArray(featureRule.required.classes));
               }
@@ -145,15 +122,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
           var requiredClasses = editorRequiredTags[tag].restrictedTags.allowed.classes;
           var allowedClasses = userAllowedTags[tag].restrictedTags.allowed.classes;
           var needsAdditionalClasses = requiredClasses.length && difference(requiredClasses, allowedClasses).length;
-
           if (needsAdditionalAttributes || needsAdditionalClasses) {
             autoAllowedTags[tag] = userAllowedTags[tag].clone();
           }
-
           if (needsAdditionalAttributes) {
             autoAllowedTags[tag].restrictedTags.allowed.attributes = [].concat(_toConsumableArray(allowedAttributes), _toConsumableArray(requiredAttributes));
           }
-
           if (needsAdditionalClasses) {
             autoAllowedTags[tag].restrictedTags.allowed.classes = [].concat(_toConsumableArray(allowedClasses), _toConsumableArray(requiredClasses));
           }
@@ -168,18 +142,15 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       var attribute;
       var allowedTags = setting.match(/(<[^>]+>)/g);
       var rules = {};
-
       for (var t = 0; t < allowedTags.length; t++) {
         var $tagObject = $(allowedTags[t]);
         tag = $tagObject.prop('tagName').toLowerCase();
         rule = new Drupal.FilterHTMLRule();
         rule.restrictedTags.tags = [tag];
         attributes = $tagObject.prop('attributes');
-
         for (var i = 0; i < attributes.length; i++) {
           attribute = attributes.item(i);
           var attributeName = attribute.nodeName;
-
           if (attributeName === 'class') {
             var attributeValue = attribute.textContent;
             rule.restrictedTags.allowed.classes = attributeValue.split(' ');
@@ -187,44 +158,34 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
             rule.restrictedTags.allowed.attributes.push(attributeName);
           }
         }
-
         rules[tag] = rule;
       }
-
       return rules;
     },
     _generateSetting: function _generateSetting(tags) {
       return Object.keys(tags).reduce(function (setting, tag) {
         var rule = tags[tag];
         var allowedClasses = rule.restrictedTags.allowed.classes;
-
         if (setting.length) {
           setting += ' ';
         }
-
         setting += "<".concat(tag);
-
         if (rule.restrictedTags.allowed.attributes.length) {
           setting += " ".concat(rule.restrictedTags.allowed.attributes.join(' '));
         }
-
         if (allowedClasses.length === 1 && allowedClasses[0] === '') {
           setting += ' class';
         } else if (allowedClasses.length) {
           setting += " class=\"".concat(allowedClasses.join(' '), "\"");
         }
-
         setting += '>';
         return setting;
       }, '');
     }
   };
-
   Drupal.theme.filterFilterHTMLUpdateMessage = function (tags) {
     var html = '';
-
     var tagList = Drupal.behaviors.filterFilterHtmlUpdating._generateSetting(tags);
-
     html += '<p class="editor-update-message">';
     html += Drupal.t('Based on the text editor configuration, these tags have automatically been added: <strong>@tag-list</strong>.', {
       '@tag-list': tagList
diff --git a/web/core/modules/filter/filter.js b/web/core/modules/filter/filter.js
index d7964d951..ca15f3894 100644
--- a/web/core/modules/filter/filter.js
+++ b/web/core/modules/filter/filter.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.filterGuidelines = {
     attach: function attach(context) {
@@ -13,7 +12,6 @@
         var value = event.target.value;
         $this.closest('.js-filter-wrapper').find('[data-drupal-format-id]').hide().filter("[data-drupal-format-id=\"".concat(value, "\"]")).show();
       }
-
       $(once('filter-guidelines', '.js-filter-guidelines', context)).find(':header').hide().closest('.js-filter-wrapper').find('select.js-filter-list').on('change.filterGuidelines', updateFilterGuidelines).trigger('change.filterGuidelines');
     }
   };
diff --git a/web/core/modules/filter/filter.module b/web/core/modules/filter/filter.module
index d068ae03a..4fcaca58d 100644
--- a/web/core/modules/filter/filter.module
+++ b/web/core/modules/filter/filter.module
@@ -447,6 +447,9 @@ function template_preprocess_filter_tips(&$variables) {
  * expression that could possibly match all of the cases in one pass.
  */
 function _filter_url($text, $filter) {
+  // Store the current text in case any of the preg_* functions fail.
+  $saved_text = $text;
+
   // Tags to skip and not recurse into.
   $ignore_tags = 'a|script|style|code|pre';
 
@@ -523,56 +526,61 @@ function _filter_url($text, $filter) {
     // markup, especially a '>'. Therefore, remove all comment contents and add
     // them back later.
     _filter_url_escape_comments('', TRUE);
-    $text = preg_replace_callback('`<!--(.*?)-->`s', '_filter_url_escape_comments', $text);
+    $text = is_null($text) ? '' : preg_replace_callback('`<!--(.*?)-->`s', '_filter_url_escape_comments', $text);
 
     // Split at all tags; ensures that no tags or attributes are processed.
-    $chunks = preg_split('/(<.+?>)/is', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
-    // PHP ensures that the array consists of alternating delimiters and
-    // literals, and begins and ends with a literal (inserting NULL as
-    // required). Therefore, the first chunk is always text:
-    $chunk_type = 'text';
-    // If a tag of $ignore_tags is found, it is stored in $open_tag and only
-    // removed when the closing tag is found. Until the closing tag is found,
-    // no replacements are made.
-    $open_tag = '';
-
-    for ($i = 0; $i < count($chunks); $i++) {
-      if ($chunk_type == 'text') {
-        // Only process this text if there are no unclosed $ignore_tags.
-        if ($open_tag == '') {
-          // If there is a match, inject a link into this chunk via the callback
-          // function contained in $task.
-          $chunks[$i] = preg_replace_callback($pattern, $task, $chunks[$i]);
-        }
-        // Text chunk is done, so next chunk must be a tag.
-        $chunk_type = 'tag';
-      }
-      else {
-        // Only process this tag if there are no unclosed $ignore_tags.
-        if ($open_tag == '') {
-          // Check whether this tag is contained in $ignore_tags.
-          if (preg_match("`<($ignore_tags)(?:\s|>)`i", $chunks[$i], $matches)) {
-            $open_tag = $matches[1];
+    $chunks = is_null($text) ? [''] : preg_split('/(<.+?>)/is', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+    // Do not attempt to convert links into URLs if preg_split() fails.
+    if ($chunks !== FALSE) {
+      // PHP ensures that the array consists of alternating delimiters and
+      // literals, and begins and ends with a literal (inserting NULL as
+      // required). Therefore, the first chunk is always text:
+      $chunk_type = 'text';
+      // If a tag of $ignore_tags is found, it is stored in $open_tag and only
+      // removed when the closing tag is found. Until the closing tag is found,
+      // no replacements are made.
+      $open_tag = '';
+      for ($i = 0; $i < count($chunks); $i++) {
+        if ($chunk_type == 'text') {
+          // Only process this text if there are no unclosed $ignore_tags.
+          if ($open_tag == '') {
+            // If there is a match, inject a link into this chunk via the callback
+            // function contained in $task.
+            $chunks[$i] = preg_replace_callback($pattern, $task, $chunks[$i]);
           }
+          // Text chunk is done, so next chunk must be a tag.
+          $chunk_type = 'tag';
         }
-        // Otherwise, check whether this is the closing tag for $open_tag.
         else {
-          if (preg_match("`<\/$open_tag>`i", $chunks[$i], $matches)) {
-            $open_tag = '';
+          // Only process this tag if there are no unclosed $ignore_tags.
+          if ($open_tag == '') {
+            // Check whether this tag is contained in $ignore_tags.
+            if (preg_match("`<($ignore_tags)(?:\s|>)`i", $chunks[$i], $matches)) {
+              $open_tag = $matches[1];
+            }
           }
+          // Otherwise, check whether this is the closing tag for $open_tag.
+          else {
+            if (preg_match("`<\/$open_tag>`i", $chunks[$i], $matches)) {
+              $open_tag = '';
+            }
+          }
+          // Tag chunk is done, so next chunk must be text.
+          $chunk_type = 'text';
         }
-        // Tag chunk is done, so next chunk must be text.
-        $chunk_type = 'text';
       }
+
+      $text = implode($chunks);
     }
 
-    $text = implode($chunks);
     // Revert to the original comment contents
     _filter_url_escape_comments('', FALSE);
-    $text = preg_replace_callback('`<!--(.*?)-->`', '_filter_url_escape_comments', $text);
+    $text = $text ? preg_replace_callback('`<!--(.*?)-->`', '_filter_url_escape_comments', $text) : $text;
   }
 
-  return $text;
+  // If there is no text at this point revert to the previous text.
+  return strlen((string) $text) > 0 ? $text : $saved_text;
 }
 
 /**
diff --git a/web/core/modules/filter/src/FilterFormatFormBase.php b/web/core/modules/filter/src/FilterFormatFormBase.php
index 19f9eb93d..5a89904c6 100644
--- a/web/core/modules/filter/src/FilterFormatFormBase.php
+++ b/web/core/modules/filter/src/FilterFormatFormBase.php
@@ -88,9 +88,9 @@ public function form(array $form, FormStateInterface $form_state) {
       '#title' => $this->t('Filter processing order'),
       '#tabledrag' => [
         [
-         'action' => 'order',
-         'relationship' => 'sibling',
-         'group' => 'filter-order-weight',
+          'action' => 'order',
+          'relationship' => 'sibling',
+          'group' => 'filter-order-weight',
         ],
       ],
       '#tree' => FALSE,
diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index 533c763e4..e4474320c 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -256,6 +256,7 @@ public function getHTMLRestrictions() {
     $html = str_replace('>', ' />', $this->settings['allowed_html']);
     // Protect any trailing * characters in attribute names, since DomDocument
     // strips them as invalid.
+    // cSpell:disable-next-line
     $star_protector = '__zqh6vxfbk3cg__';
     $html = str_replace('*', $star_protector, $html);
     $body_child_nodes = Html::load($html)->getElementsByTagName('body')->item(0)->childNodes;
diff --git a/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php b/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
index 2e688aa71..83e18c2cb 100644
--- a/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
+++ b/web/core/modules/filter/src/Plugin/migrate/process/d6/FilterFormatPermission.php
@@ -20,6 +20,11 @@
  */
 class FilterFormatPermission extends ProcessPluginBase implements ContainerFactoryPluginInterface {
 
+  /**
+   * The current migration.
+   */
+  protected $migration;
+
   /**
    * The migrate lookup service.
    *
diff --git a/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php b/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
index dd006ed29..f7b0ecada 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterFormatAccessTest.php
@@ -68,6 +68,9 @@ class FilterFormatAccessTest extends BrowserTestBase {
    */
   protected $disallowedFormat;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php b/web/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
index 71ba364ee..3aa0428cf 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterHtmlImageSecureTest.php
@@ -31,6 +31,9 @@ class FilterHtmlImageSecureTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -108,7 +111,7 @@ public function testImageSource() {
     $images = [
       $http_base_url . '/' . $druplicon => base_path() . $druplicon,
       $https_base_url . '/' . $druplicon => base_path() . $druplicon,
-      // Test a url that includes a port.
+      // Test a URL that includes a port.
       preg_replace($host_pattern, 'http://' . $host . ':', $http_base_url . '/' . $druplicon) => base_path() . $druplicon,
       preg_replace($host_pattern, 'http://' . $host . ':80', $http_base_url . '/' . $druplicon) => base_path() . $druplicon,
       preg_replace($host_pattern, 'http://' . $host . ':443', $http_base_url . '/' . $druplicon) => base_path() . $druplicon,
diff --git a/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php b/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
index 76433f854..156b2f7c2 100644
--- a/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
+++ b/web/core/modules/filter/tests/src/Functional/FilterSecurityTest.php
@@ -8,9 +8,7 @@
 use Drupal\user\RoleInterface;
 
 /**
- * Tests the behavior of check_markup() when a filter or text format vanishes,
- * or when check_markup() is called in such a way that it is instructed to skip
- * all filters of the "FilterInterface::TYPE_HTML_RESTRICTOR" type.
+ * Tests HTML filtering with missing or skipped filters or text formats.
  *
  * @group filter
  */
@@ -35,6 +33,9 @@ class FilterSecurityTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/filter/tests/src/FunctionalJavascript/FilterHtmlTest.php b/web/core/modules/filter/tests/src/FunctionalJavascript/FilterHtmlTest.php
index adc0311f6..ac418911a 100644
--- a/web/core/modules/filter/tests/src/FunctionalJavascript/FilterHtmlTest.php
+++ b/web/core/modules/filter/tests/src/FunctionalJavascript/FilterHtmlTest.php
@@ -51,8 +51,7 @@ public function testTableTags() {
   }
 
   /**
-   * Tests that CSS classes defined in the Styles Dropdown section don't
-   * restrict elements in the Allowed Tags configuration that allow all classes.
+   * Tests the Allowed Tags configuration with CSS classes.
    *
    * @group legacy
    */
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php b/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
index 3e3699a7f..ca7996d31 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterAPITest.php
@@ -22,6 +22,9 @@ class FilterAPITest extends EntityKernelTestBase {
 
   protected static $modules = ['system', 'filter', 'filter_test', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -80,9 +83,10 @@ public function testCheckMarkupFilterSubset() {
   }
 
   /**
-   * Tests the following functions for a variety of formats:
-   *   - \Drupal\filter\Entity\FilterFormatInterface::getHtmlRestrictions()
-   *   - \Drupal\filter\Entity\FilterFormatInterface::getFilterTypes()
+   * Tests that HTML restrictions and filter types are correct.
+   *
+   * @covers \Drupal\filter\Entity\FilterFormat::getHtmlRestrictions
+   * @covers \Drupal\filter\Entity\FilterFormat::getFilterTypes
    */
   public function testFilterFormatAPI() {
     // Test on filtered_html.
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php b/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
index cde902423..4f533fbca 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterDefaultConfigTest.php
@@ -15,6 +15,9 @@ class FilterDefaultConfigTest extends KernelTestBase {
 
   protected static $modules = ['system', 'user', 'filter', 'filter_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php b/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
index c7f9b5fad..5c1c76962 100644
--- a/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
+++ b/web/core/modules/filter/tests/src/Kernel/FilterKernelTest.php
@@ -31,6 +31,9 @@ class FilterKernelTest extends KernelTestBase {
    */
   protected $filters;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system']);
@@ -333,12 +336,11 @@ public function testLineBreakFilter() {
       ],
       // Skip contents of certain block tags entirely.
       "<script>aaa\nbbb\n\nccc</script>
-<style>aaa\nbbb\n\nccc</style>
-<pre>aaa\nbbb\n\nccc</pre>
-<object>aaa\nbbb\n\nccc</object>
-<iframe>aaa\nbbb\n\nccc</iframe>
-<svg>aaa\nbbb\n\nccc</svg>
-" => [
+      <style>aaa\nbbb\n\nccc</style>
+      <pre>aaa\nbbb\n\nccc</pre>
+      <object>aaa\nbbb\n\nccc</object>
+      <iframe>aaa\nbbb\n\nccc</iframe>
+      <svg>aaa\nbbb\n\nccc</svg>" => [
         "<script>aaa\nbbb\n\nccc</script>" => TRUE,
         "<style>aaa\nbbb\n\nccc</style>" => TRUE,
         "<pre>aaa\nbbb\n\nccc</pre>" => TRUE,
@@ -570,16 +572,12 @@ public function testUrlFilter() {
     // Filter selection/pattern matching.
     $tests = [
       // HTTP URLs.
-      '
-http://example.com or www.example.com
-' => [
+      'http://example.com or www.example.com' => [
         '<a href="http://example.com">http://example.com</a>' => TRUE,
         '<a href="http://www.example.com">www.example.com</a>' => TRUE,
       ],
       // MAILTO URLs.
-      '
-person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email . '
-' => [
+      'person@example.com or mailto:person2@example.com or ' . $email_with_plus_sign . ' or ' . $long_email . ' but not ' . $too_long_email => [
         '<a href="mailto:person@example.com">person@example.com</a>' => TRUE,
         '<a href="mailto:person2@example.com">mailto:person2@example.com</a>' => TRUE,
         '<a href="mailto:' . $long_email . '">' . $long_email . '</a>' => TRUE,
@@ -587,15 +585,13 @@ public function testUrlFilter() {
         '<a href="mailto:' . $email_with_plus_sign . '">' . $email_with_plus_sign . '</a>' => TRUE,
       ],
       // URI parts and special characters.
-      '
-http://trailingslash.com/ or www.trailingslash.com/
-http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment
-http://twitter.com/#!/example/status/22376963142324226
-http://example.com/@user/
-ftp://user:pass@ftp.example.com/~home/dir1
-sftp://user@nonstandardport:222/dir
-ssh://192.168.0.100/srv/git/drupal.git
-' => [
+      'http://trailingslash.com/ or www.trailingslash.com/
+      http://host.com/some/path?query=foo&bar[baz]=beer#fragment or www.host.com/some/path?query=foo&bar[baz]=beer#fragment
+      http://twitter.com/#!/example/status/22376963142324226
+      http://example.com/@user/
+      ftp://user:pass@ftp.example.com/~home/dir1
+      sftp://user@nonstandardport:222/dir
+      ssh://192.168.0.100/srv/git/drupal.git' => [
         '<a href="http://trailingslash.com/">http://trailingslash.com/</a>' => TRUE,
         '<a href="http://www.trailingslash.com/">www.trailingslash.com/</a>' => TRUE,
         '<a href="http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment">http://host.com/some/path?query=foo&amp;bar[baz]=beer#fragment</a>' => TRUE,
@@ -607,15 +603,13 @@ public function testUrlFilter() {
         '<a href="ssh://192.168.0.100/srv/git/drupal.git">ssh://192.168.0.100/srv/git/drupal.git</a>' => TRUE,
       ],
       // International Unicode characters.
-      '
-http://пример.испытание/
-http://مثال.إختبار/
-http://例子.測試/
-http://12345.中国/
-http://例え.テスト/
-http://dréißig-bücher.de/
-http://méxico-mañana.es/
-' => [
+      'http://пример.испытание/
+      http://مثال.إختبار/
+      http://例子.測試/
+      http://12345.中国/
+      http://例え.テスト/
+      http://dréißig-bücher.de/
+      http://méxico-mañana.es/' => [
         '<a href="http://пример.испытание/">http://пример.испытание/</a>' => TRUE,
         '<a href="http://مثال.إختبار/">http://مثال.إختبار/</a>' => TRUE,
         '<a href="http://例子.測試/">http://例子.測試/</a>' => TRUE,
@@ -625,18 +619,14 @@ public function testUrlFilter() {
         '<a href="http://méxico-mañana.es/">http://méxico-mañana.es/</a>' => TRUE,
       ],
       // Encoding.
-      '
-http://ampersand.com/?a=1&b=2
-http://encoded.com/?a=1&amp;b=2
-' => [
+      'http://ampersand.com/?a=1&b=2
+      http://encoded.com/?a=1&amp;b=2' => [
         '<a href="http://ampersand.com/?a=1&amp;b=2">http://ampersand.com/?a=1&amp;b=2</a>' => TRUE,
         '<a href="http://encoded.com/?a=1&amp;b=2">http://encoded.com/?a=1&amp;b=2</a>' => TRUE,
       ],
       // Domain name length.
-      '
-www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or
-me@me.tv
-' => [
+      'www.ex.ex or www.example.example or www.toolongdomainexampledomainexampledomainexampledomainexampledomain or
+      me@me.tv' => [
         '<a href="http://www.ex.ex">www.ex.ex</a>' => TRUE,
         '<a href="http://www.example.example">www.example.example</a>' => TRUE,
         'http://www.toolong' => FALSE,
@@ -645,18 +635,17 @@ public function testUrlFilter() {
       // Absolute URL protocols.
       // The list to test is found in the beginning of _filter_url() at
       // $protocols = \Drupal::getContainer()->getParameter('filter_protocols').
-      '
-https://example.com,
-ftp://ftp.example.com,
-news://example.net,
-telnet://example,
-irc://example.host,
-ssh://odd.geek,
-sftp://secure.host?,
-webcal://calendar,
-rtsp://127.0.0.1,
-not foo://disallowed.com.
-' => [
+      'https://example.com,
+      ftp://ftp.example.com,
+      news://example.net,
+      telnet://example,
+      irc://example.host,
+      ssh://odd.geek,
+      sftp://secure.host?,
+      webcal://calendar,
+      rtsp://127.0.0.1,
+      not foo://disallowed.com.
+      ' => [
         'href="https://example.com"' => TRUE,
         'href="ftp://ftp.example.com"' => TRUE,
         'href="news://example.net"' => TRUE,
@@ -674,19 +663,16 @@ public function testUrlFilter() {
 
     // Surrounding text/punctuation.
     $tests = [
-      '
-Partial URL with trailing period www.partial.com.
-Email with trailing comma person@example.com,
-Absolute URL with trailing question http://www.absolute.com?
-Query string with trailing exclamation www.query.com/index.php?a=!
-Partial URL with 3 trailing www.partial.periods...
-Email with 3 trailing exclamations@example.com!!!
-Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc).
-Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com/more_(than)_one_(parens)).
-Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1]
-Absolute URL with quotes "https://www.drupal.org/sample"
-
-' => [
+      'Partial URL with trailing period www.partial.com.
+      Email with trailing comma person@example.com,
+      Absolute URL with trailing question http://www.absolute.com?
+      Query string with trailing exclamation www.query.com/index.php?a=!
+      Partial URL with 3 trailing www.partial.periods...
+      Email with 3 trailing exclamations@example.com!!!
+      Absolute URL and query string with 2 different punctuation characters (http://www.example.com/q=abc).
+      Partial URL with brackets in the URL as well as surrounded brackets (www.foo.com/more_(than)_one_(parens)).
+      Absolute URL with square brackets in the URL as well as surrounded brackets [https://www.drupal.org/?class[]=1]
+      Absolute URL with quotes "https://www.drupal.org/sample"' => [
         'period <a href="http://www.partial.com">www.partial.com</a>.' => TRUE,
         'comma <a href="mailto:person@example.com">person@example.com</a>,' => TRUE,
         'question <a href="http://www.absolute.com">http://www.absolute.com</a>?' => TRUE,
@@ -698,9 +684,7 @@ public function testUrlFilter() {
         'brackets [<a href="https://www.drupal.org/?class[]=1">https://www.drupal.org/?class[]=1</a>]' => TRUE,
         'quotes "<a href="https://www.drupal.org/sample">https://www.drupal.org/sample</a>"' => TRUE,
       ],
-      '
-(www.parenthesis.com/dir?a=1&b=2#a)
-' => [
+      '(www.parenthesis.com/dir?a=1&b=2#a)' => [
         '(<a href="http://www.parenthesis.com/dir?a=1&amp;b=2#a">www.parenthesis.com/dir?a=1&amp;b=2#a</a>)' => TRUE,
       ],
     ];
@@ -708,42 +692,36 @@ public function testUrlFilter() {
 
     // Surrounding markup.
     $tests = [
-      '
-<p xmlns="www.namespace.com" />
-<p xmlns="http://namespace.com">
-An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.
-</p>
-' => [
+      '<p xmlns="www.namespace.com" />
+      <p xmlns="http://namespace.com">
+      An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.
+      </p>' => [
         '<p xmlns="www.namespace.com" />' => TRUE,
         '<p xmlns="http://namespace.com">' => TRUE,
         'href="http://www.namespace.com"' => FALSE,
         'href="http://namespace.com"' => FALSE,
         'An <a href="http://example.com" title="Read more at www.example.info...">anchor</a>.' => TRUE,
       ],
-      '
-Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a>
-but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em>
-' => [
+      'Not <a href="foo">www.relative.com</a> or <a href="http://absolute.com">www.absolute.com</a>
+      but <strong>http://www.strong.net</strong> or <em>www.emphasis.info</em>' => [
         '<a href="foo">www.relative.com</a>' => TRUE,
         'href="http://www.relative.com"' => FALSE,
         '<a href="http://absolute.com">www.absolute.com</a>' => TRUE,
         '<strong><a href="http://www.strong.net">http://www.strong.net</a></strong>' => TRUE,
         '<em><a href="http://www.emphasis.info">www.emphasis.info</a></em>' => TRUE,
       ],
-      '
-Test <code>using www.example.com the code tag</code>.
-' => [
+      'Test <code>using www.example.com the code tag</code>.
+      ' => [
         'href' => FALSE,
         'http' => FALSE,
       ],
-      '
-Intro.
-<blockquote>
-Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com. <code>@see www.usage.example.com or <em>www.example.info</em> bla bla</code>.
-</blockquote>
-
-Outro.
-' => [
+      'Intro.
+      <blockquote>
+      Quoted text linking to www.example.com, written by person@example.com, originating from http://origin.example.com. <code>@see www.usage.example.com or <em>www.example.info</em> bla bla</code>.
+      </blockquote>
+
+      Outro.
+      ' => [
         'href="http://www.example.com"' => TRUE,
         'href="mailto:person@example.com"' => TRUE,
         'href="http://origin.example.com"' => TRUE,
@@ -752,17 +730,15 @@ public function testUrlFilter() {
         'Intro.' => TRUE,
         'Outro.' => TRUE,
       ],
-      '
-Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh>
-' => [
+      'Unknown tag <x>containing x and www.example.com</x>? And a tag <pooh>beginning with p and containing www.example.pooh with p?</pooh>
+      ' => [
         'href="http://www.example.com"' => TRUE,
         'href="http://www.example.pooh"' => TRUE,
       ],
-      '
-<p>Test &lt;br/&gt;: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/>
- It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br>
-HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
-' => [
+      '<p>Test &lt;br/&gt;: This is a www.example17.com example <strong>with</strong> various http://www.example18.com tags. *<br/>
+       It is important www.example19.com to *<br/>test different URLs and http://www.example20.com in the same paragraph. *<br>
+      HTML www.example21.com soup by person@example22.com can litererally http://www.example23.com contain *img*<img> anything. Just a www.example24.com with http://www.example25.com thrown in. www.example26.com from person@example27.com with extra http://www.example28.com.
+      ' => [
         'href="http://www.example17.com"' => TRUE,
         'href="http://www.example18.com"' => TRUE,
         'href="http://www.example19.com"' => TRUE,
@@ -776,53 +752,41 @@ public function testUrlFilter() {
         'href="mailto:person@example27.com"' => TRUE,
         'href="http://www.example28.com"' => TRUE,
       ],
-      '
-<script>
-<!--
-  // @see www.example.com
-  var exampleurl = "http://example.net";
--->
-<!--//--><![CDATA[//><!--
-  // @see www.example.com
-  var exampleurl = "http://example.net";
-//--><!]]>
-</script>
-' => [
+      '<script>
+      <!--
+        // @see www.example.com
+        var exampleurl = "http://example.net";
+      -->
+      <!--//--><![CDATA[//><!--
+        // @see www.example.com
+        var exampleurl = "http://example.net";
+      //--><!]]>
+      </script>' => [
         'href="http://www.example.com"' => FALSE,
         'href="http://example.net"' => FALSE,
       ],
-      '
-<style>body {
-  background: url(http://example.com/pixel.gif);
-}</style>
-' => [
+      '<style>body {
+        background: url(http://example.com/pixel.gif);
+      }</style>' => [
         'href' => FALSE,
       ],
-      '
-<!-- Skip any URLs like www.example.com in comments -->
-' => [
+      '<!-- Skip any URLs like www.example.com in comments -->' => [
         'href' => FALSE,
       ],
-      '
-<!-- Skip any URLs like
-www.example.com with a newline in comments -->
-' => [
+      '<!-- Skip any URLs like
+      www.example.com with a newline in comments -->' => [
         'href' => FALSE,
       ],
-      '
-<!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> -->
-' => [
+      '<!-- Skip any URLs like www.comment.com in comments. <p>Also ignore http://commented.out/markup.</p> -->' => [
         'href' => FALSE,
       ],
-      '
-<dl>
-<dt>www.example.com</dt>
-<dd>http://example.com</dd>
-<dd>person@example.com</dd>
-<dt>Check www.example.net</dt>
-<dd>Some text around http://www.example.info by person@example.info?</dd>
-</dl>
-' => [
+      '<dl>
+      <dt>www.example.com</dt>
+      <dd>http://example.com</dd>
+      <dd>person@example.com</dd>
+      <dt>Check www.example.net</dt>
+      <dd>Some text around http://www.example.info by person@example.info?</dd>
+      </dl>' => [
         'href="http://www.example.com"' => TRUE,
         'href="http://example.com"' => TRUE,
         'href="mailto:person@example.com"' => TRUE,
@@ -830,13 +794,11 @@ public function testUrlFilter() {
         'href="http://www.example.info"' => TRUE,
         'href="mailto:person@example.info"' => TRUE,
       ],
-      '
-<div>www.div.com</div>
-<ul>
-<li>http://listitem.com</li>
-<li class="odd">www.class.listitem.com</li>
-</ul>
-' => [
+      '<div>www.div.com</div>
+      <ul>
+      <li>http://listitem.com</li>
+      <li class="odd">www.class.listitem.com</li>
+      </ul>' => [
         '<div><a href="http://www.div.com">www.div.com</a></div>' => TRUE,
         '<li><a href="http://listitem.com">http://listitem.com</a></li>' => TRUE,
         '<li class="odd"><a href="http://www.class.listitem.com">www.class.listitem.com</a></li>' => TRUE,
@@ -917,6 +879,7 @@ public function assertFilteredString(FilterInterface $filter, array $tests): voi
    *   comments.
    * - Empty HTML tags (BR, IMG).
    * - Mix of absolute and partial URLs, and email addresses in one content.
+   * - Input that exceeds PCRE backtracking limit.
    */
   public function testUrlFilterContent() {
     // Get FilterUrl object.
@@ -932,6 +895,24 @@ public function testUrlFilterContent() {
     $expected = file_get_contents($path . '/filter.url-output.txt');
     $result = _filter_url($input, $filter);
     $this->assertSame($expected, $result, 'Complex HTML document was correctly processed.');
+
+    $pcre_backtrack_limit = ini_get('pcre.backtrack_limit');
+    // Setting this limit to the smallest possible value should cause PCRE
+    // errors and break the various preg_* functions used by _filter_url().
+    ini_set('pcre.backtrack_limit', 1);
+
+    // If PCRE errors occur, _filter_url() should return the exact same text.
+    // Case of a small and simple HTML document.
+    $input = $expected = '<p>www.test.com</p>';
+    $result = _filter_url($input, $filter);
+    $this->assertSame($expected, $result, 'Simple HTML document was left intact when PCRE errors occurred.');
+    // Case of a complex HTML document.
+    $input = $expected = file_get_contents($path . '/filter.url-input.txt');
+    $result = _filter_url($input, $filter);
+    $this->assertSame($expected, $result, 'Complex HTML document was left intact when PCRE errors occurred.');
+
+    // Setting limit back to default.
+    ini_set('pcre.backtrack_limit', $pcre_backtrack_limit);
   }
 
   /**
diff --git a/web/core/modules/forum/config/optional/rdf.mapping.node.forum.yml b/web/core/modules/forum/config/optional/rdf.mapping.node.forum.yml
deleted file mode 100644
index 2fbd52109..000000000
--- a/web/core/modules/forum/config/optional/rdf.mapping.node.forum.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.forum
-  module:
-    - node
-id: node.forum
-targetEntityType: node
-bundle: forum
-types:
-  - 'schema:Discussion'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  comment_count:
-    properties:
-      - 'schema:interactionCount'
-    datatype_callback:
-      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
-      arguments:
-        interaction_type: UserComments
diff --git a/web/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml b/web/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml
deleted file mode 100644
index 6daa517c4..000000000
--- a/web/core/modules/forum/config/optional/rdf.mapping.taxonomy_term.forums.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.forums
-  module:
-    - taxonomy
-id: taxonomy_term.forums
-targetEntityType: taxonomy_term
-bundle: forums
-types:
-  - 'sioc:Container'
-  - 'sioc:Forum'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
diff --git a/web/core/modules/forum/forum.install b/web/core/modules/forum/forum.install
index 1cc8ca3e5..0f5219df8 100644
--- a/web/core/modules/forum/forum.install
+++ b/web/core/modules/forum/forum.install
@@ -120,11 +120,11 @@ function forum_schema() {
         'default' => '',
       ],
       'tid' => [
-         'description' => 'The term ID.',
-         'type' => 'int',
-         'unsigned' => TRUE,
-         'not null' => TRUE,
-         'default' => 0,
+        'description' => 'The term ID.',
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
       ],
       'sticky' => [
         'description' => 'Boolean indicating whether the node is sticky.',
diff --git a/web/core/modules/forum/forum.module b/web/core/modules/forum/forum.module
index c11ec858f..10f0b37ba 100644
--- a/web/core/modules/forum/forum.module
+++ b/web/core/modules/forum/forum.module
@@ -576,7 +576,7 @@ function template_preprocess_forum_list(&$variables) {
   }
 
   $variables['pager'] = [
-   '#type' => 'pager',
+    '#type' => 'pager',
   ];
 
   // Give meaning to $tid for themers. $tid actually stands for term ID.
diff --git a/web/core/modules/forum/src/Controller/ForumController.php b/web/core/modules/forum/src/Controller/ForumController.php
index aa7ca3cfe..a7799e85d 100644
--- a/web/core/modules/forum/src/Controller/ForumController.php
+++ b/web/core/modules/forum/src/Controller/ForumController.php
@@ -255,7 +255,6 @@ public function addForum() {
     $vid = $this->config('forum.settings')->get('vocabulary');
     $taxonomy_term = $this->termStorage->create([
       'vid' => $vid,
-      'forum_controller' => 0,
     ]);
     return $this->entityFormBuilder()->getForm($taxonomy_term, 'forum');
   }
diff --git a/web/core/modules/forum/src/Form/ContainerForm.php b/web/core/modules/forum/src/Form/ContainerForm.php
index afcb1ccc3..1e4c1f341 100644
--- a/web/core/modules/forum/src/Form/ContainerForm.php
+++ b/web/core/modules/forum/src/Form/ContainerForm.php
@@ -12,7 +12,7 @@
 class ContainerForm extends ForumForm {
 
   /**
-   * Reusable url stub to use in watchdog messages.
+   * Reusable URL stub to use in watchdog messages.
    *
    * @var string
    */
diff --git a/web/core/modules/forum/src/Form/ForumForm.php b/web/core/modules/forum/src/Form/ForumForm.php
index 75264cc4d..339dd265c 100644
--- a/web/core/modules/forum/src/Form/ForumForm.php
+++ b/web/core/modules/forum/src/Form/ForumForm.php
@@ -22,7 +22,7 @@ class ForumForm extends TermForm {
   protected $forumFormType;
 
   /**
-   * Reusable url stub to use in watchdog messages.
+   * Reusable URL stub to use in watchdog messages.
    *
    * @var string
    */
diff --git a/web/core/modules/forum/src/ForumManagerInterface.php b/web/core/modules/forum/src/ForumManagerInterface.php
index 7ab14ba30..8730d15ab 100644
--- a/web/core/modules/forum/src/ForumManagerInterface.php
+++ b/web/core/modules/forum/src/ForumManagerInterface.php
@@ -72,7 +72,7 @@ public function checkNodeType(NodeInterface $node);
    * @param int $uid
    *   The user ID.
    *
-   * @return
+   * @return int
    *   The number of new posts in the forum that have not been read by the user.
    */
   public function unreadTopics($term, $uid);
diff --git a/web/core/modules/forum/src/ForumUninstallValidator.php b/web/core/modules/forum/src/ForumUninstallValidator.php
index 109200184..7f1d68738 100644
--- a/web/core/modules/forum/src/ForumUninstallValidator.php
+++ b/web/core/modules/forum/src/ForumUninstallValidator.php
@@ -60,7 +60,7 @@ public function validate($module) {
       }
 
       $vocabulary = $this->getForumVocabulary();
-      if ($this->hasTermsForVocabulary($vocabulary)) {
+      if (!empty($vocabulary) && $this->hasTermsForVocabulary($vocabulary)) {
         if ($vocabulary->access('view')) {
           $reasons[] = $this->t('To uninstall Forum, first delete all <a href=":url">%vocabulary</a> terms', [
             '%vocabulary' => $vocabulary->label(),
@@ -119,7 +119,12 @@ protected function hasTermsForVocabulary(VocabularyInterface $vocabulary) {
    */
   protected function getForumVocabulary() {
     $vid = $this->configFactory->get('forum.settings')->get('vocabulary');
-    return $this->entityTypeManager->getStorage('taxonomy_vocabulary')->load($vid);
+    if (!empty($vid)) {
+      return $this->entityTypeManager->getStorage('taxonomy_vocabulary')->load($vid);
+    }
+    else {
+      return NULL;
+    }
   }
 
 }
diff --git a/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php b/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
index 426ddc4fc..121102a63 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumBlockTest.php
@@ -31,6 +31,9 @@ class ForumBlockTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php b/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
index 8be1ca651..7631d224a 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumIndexTest.php
@@ -23,6 +23,9 @@ class ForumIndexTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
index 3dc342af2..cefacf48b 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php
@@ -31,6 +31,9 @@ class ForumNodeAccessTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     node_access_rebuild();
diff --git a/web/core/modules/forum/tests/src/Functional/ForumTest.php b/web/core/modules/forum/tests/src/Functional/ForumTest.php
index 1f0cac216..7c410fe71 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumTest.php
@@ -39,7 +39,7 @@ class ForumTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * A user with various administrative privileges.
@@ -202,27 +202,24 @@ public function testForum() {
     // Verify the topic and post counts on the forum page.
     $this->drupalGet('forum');
 
-    // Verify row for testing forum.
-    $forum_arg = [':forum' => 'forum-list-' . $this->forum['tid']];
-
-    // Topics cell contains number of topics and number of unread topics.
-    $xpath = $this->assertSession()->buildXPathQuery('//tr[@id=:forum]//td[@class="forum__topics"]', $forum_arg);
-    $topics = $this->xpath($xpath);
-    $topics = trim($topics[0]->getText());
-    // The extracted text contains the number of topics (6) and new posts
-    // (also 6) in this table cell.
-    $this->assertEquals('6 6 new posts in forum ' . $this->forum['name'], $topics, 'Number of topics found.');
+    // Find the table row for the forum that has new posts. This cannot be
+    // reliably identified by any CSS selector or its position in the table,
+    // so look for an element with the "New posts" title and traverse up the
+    // document tree until we get to the table row that contains it.
+    $row = $this->assertSession()->elementExists('css', '[title="New posts"]');
+    while ($row && $row->getTagName() !== 'tr') {
+      $row = $row->getParent();
+    }
+    $this->assertNotEmpty($row);
+    $cells = $row->findAll('css', 'td');
+    $this->assertCount(4, $cells);
 
-    // Verify the number of unread topics.
-    $elements = $this->xpath('//tr[@id=:forum]//td[@class="forum__topics"]//a', $forum_arg);
-    $this->assertStringStartsWith('6 new posts', $elements[0]->getText(), 'Number of unread topics found.');
-    // Verify that the forum name is in the unread topics text.
-    $elements = $this->xpath('//tr[@id=:forum]//em[@class="placeholder"]', $forum_arg);
-    $this->assertStringContainsString($this->forum['name'], $elements[0]->getText(), 'Forum name found in unread topics text.');
+    // Topics cell contains number of topics (6), number of unread topics (also
+    // 6), and the forum name.
+    $this->assertEquals('6 6 new posts in forum ' . $this->forum['name'], $cells[1]->getText(), 'Number of topics, number of unread topics, and forum name found.');
 
     // Verify total number of posts in forum.
-    $elements = $this->xpath('//tr[@id=:forum]//td[@class="forum__posts"]', $forum_arg);
-    $this->assertEquals('6', $elements[0]->getText(), 'Number of posts found.');
+    $this->assertEquals('6', $cells[2]->getText(), 'Number of posts found.');
 
     // Test loading multiple forum nodes on the front page.
     $this->drupalLogin($this->drupalCreateUser([
diff --git a/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
index 30ea8c1fd..1e2c6fa66 100644
--- a/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
+++ b/web/core/modules/forum/tests/src/Functional/ForumUninstallTest.php
@@ -7,6 +7,7 @@
 use Drupal\node\Entity\NodeType;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
+use Drupal\taxonomy\Entity\Vocabulary;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -159,4 +160,23 @@ public function testForumUninstallWithoutFieldStorage() {
     $this->container->get('module_installer')->uninstall(['forum']);
   }
 
+  /**
+   * Tests uninstallation of forum module when vocabulary is deleted.
+   */
+  public function testForumUninstallWithoutForumVocabulary() {
+    $this->drupalLogin($this->rootUser);
+    Vocabulary::load('forums')->delete();
+
+    // Now attempt to uninstall forum.
+    $this->drupalGet('admin/modules/uninstall');
+    $this->assertSession()->responseNotContains('The website encountered an unexpected error. Please try again later');
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Assert forum is no longer required.
+    $this->assertSession()->fieldExists('uninstall[forum]');
+
+    $this->drupalGet('admin/modules/uninstall');
+    $this->submitForm(['uninstall[forum]' => 1], 'Uninstall');
+  }
+
 }
diff --git a/web/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php b/web/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php
index 4b26069ad..a1f98ac25 100644
--- a/web/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php
+++ b/web/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php
@@ -32,6 +32,9 @@ class ForumIntegrationTest extends ViewTestBase {
    */
   public static $testViews = ['test_forum_index'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['forum_test_views']): void {
     parent::setUp($import_test_views, $modules);
   }
diff --git a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index f6834c4c8..062b8a958 100644
--- a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -92,16 +92,16 @@ public function testBuild() {
     $vocab_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $vocab_storage->expects($this->any())
       ->method('load')
-      ->will($this->returnValueMap([
+      ->willReturnMap([
         ['forums', $prophecy->reveal()],
-      ]));
+      ]);
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->any())
       ->method('getStorage')
-      ->will($this->returnValueMap([
+      ->willReturnMap([
         ['taxonomy_vocabulary', $vocab_storage],
-      ]));
+      ]);
 
     $config_factory = $this->getConfigFactoryStub(
       [
diff --git a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
index 960cb53d3..42d15d46b 100644
--- a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
+++ b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php
@@ -57,7 +57,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = [])
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
       ->method('getRouteName')
-      ->will($this->returnValue($route_name));
+      ->willReturn($route_name);
     $route_match->expects($this->any())
       ->method('getParameter')
       ->willReturnMap($parameter_map);
@@ -196,7 +196,7 @@ public function testBuild() {
     $route_match->expects($this->exactly(2))
       ->method('getParameter')
       ->with('taxonomy_term')
-      ->will($this->returnValue($forum_listing));
+      ->willReturn($forum_listing);
 
     // First test.
     $expected1 = [
diff --git a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
index 3c903fe41..893b48305 100644
--- a/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
+++ b/web/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php
@@ -52,7 +52,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = [])
     $forum_manager = $this->createMock('Drupal\forum\ForumManagerInterface');
     $forum_manager->expects($this->any())
       ->method('checkNodeType')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $translation_manager = $this->createMock('Drupal\Core\StringTranslation\TranslationInterface');
 
@@ -62,7 +62,7 @@ public function testApplies($expected, $route_name = NULL, $parameter_map = [])
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->once())
       ->method('getRouteName')
-      ->will($this->returnValue($route_name));
+      ->willReturn($route_name);
     $route_match->expects($this->any())
       ->method('getParameter')
       ->willReturnMap($parameter_map);
@@ -201,7 +201,7 @@ public function testBuild() {
     $route_match->expects($this->exactly(2))
       ->method('getParameter')
       ->with('node')
-      ->will($this->returnValue($forum_node));
+      ->willReturn($forum_node);
 
     // First test.
     $expected1 = [
diff --git a/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php b/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php
index c9208a704..e0c905584 100644
--- a/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php
+++ b/web/core/modules/forum/tests/src/Unit/ForumManagerTest.php
@@ -31,22 +31,22 @@ public function testGetIndex() {
 
     $config_factory->expects($this->once())
       ->method('get')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
 
     $config->expects($this->once())
       ->method('get')
-      ->will($this->returnValue('forums'));
+      ->willReturn('forums');
 
     $entity_type_manager->expects($this->once())
       ->method('getStorage')
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     // This is sufficient for testing purposes.
     $term = new \stdClass();
 
     $storage->expects($this->once())
       ->method('create')
-      ->will($this->returnValue($term));
+      ->willReturn($term);
 
     $connection = $this->getMockBuilder('\Drupal\Core\Database\Connection')
       ->disableOriginalConstructor()
@@ -74,7 +74,7 @@ public function testGetIndex() {
 
     $manager->expects($this->once())
       ->method('getChildren')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     // Get the index once.
     $index1 = $manager->getIndex();
diff --git a/web/core/modules/hal/hal.services.yml b/web/core/modules/hal/hal.services.yml
index 38ffb2261..156fbc23f 100644
--- a/web/core/modules/hal/hal.services.yml
+++ b/web/core/modules/hal/hal.services.yml
@@ -18,10 +18,10 @@ services:
     tags:
       - { name: normalizer, priority: 20 }
   serializer.normalizer.timestamp_item.hal:
-   class: Drupal\hal\Normalizer\TimestampItemNormalizer
-   tags:
-     # Priority must be higher than serializer.normalizer.field_item.hal.
-     - { name: normalizer, priority: 20 }
+    class: Drupal\hal\Normalizer\TimestampItemNormalizer
+    tags:
+      # Priority must be higher than serializer.normalizer.field_item.hal.
+      - { name: normalizer, priority: 20 }
   serializer.normalizer.entity.hal:
     class: Drupal\hal\Normalizer\ContentEntityNormalizer
     arguments: ['@hal.link_manager', '@entity_type.manager', '@module_handler', '@entity_type.repository', '@entity_field.manager']
diff --git a/web/core/modules/hal/tests/src/Functional/comment/Views/CommentHalExportTest.php b/web/core/modules/hal/tests/src/Functional/comment/Views/CommentHalExportTest.php
index 69617bd67..ff2df4fb1 100644
--- a/web/core/modules/hal/tests/src/Functional/comment/Views/CommentHalExportTest.php
+++ b/web/core/modules/hal/tests/src/Functional/comment/Views/CommentHalExportTest.php
@@ -37,6 +37,9 @@ class CommentHalExportTest extends CommentTestBase {
     'hal',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['hal_test_views']): void {
     parent::setUp($import_test_views, $modules);
     // Add another anonymous comment.
diff --git a/web/core/modules/hal/tests/src/Functional/rest/Views/StyleSerializerTest.php b/web/core/modules/hal/tests/src/Functional/rest/Views/StyleSerializerTest.php
index f367f5a6b..2a04663e5 100644
--- a/web/core/modules/hal/tests/src/Functional/rest/Views/StyleSerializerTest.php
+++ b/web/core/modules/hal/tests/src/Functional/rest/Views/StyleSerializerTest.php
@@ -58,6 +58,9 @@ class StyleSerializerTest extends ViewTestBase {
    */
   protected $renderer;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['hal_test_views']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/hal/tests/src/Functional/taxonomy/TermHalJsonAnonTest.php b/web/core/modules/hal/tests/src/Functional/taxonomy/TermHalJsonAnonTest.php
index 8c0516946..bfc4a4eca 100644
--- a/web/core/modules/hal/tests/src/Functional/taxonomy/TermHalJsonAnonTest.php
+++ b/web/core/modules/hal/tests/src/Functional/taxonomy/TermHalJsonAnonTest.php
@@ -70,7 +70,7 @@ protected function getExpectedNormalizedEntity() {
       case [2]:
         $expected_parent_normalization_links = [
           [
-          'href' => $this->baseUrl . '/taxonomy/term/2?_format=hal_json',
+            'href' => $this->baseUrl . '/taxonomy/term/2?_format=hal_json',
           ],
         ];
         $expected_parent_normalization_embedded = [
diff --git a/web/core/modules/hal/tests/src/Kernel/EntityResolverTest.php b/web/core/modules/hal/tests/src/Kernel/EntityResolverTest.php
index 62b65d820..da6f4f175 100644
--- a/web/core/modules/hal/tests/src/Kernel/EntityResolverTest.php
+++ b/web/core/modules/hal/tests/src/Kernel/EntityResolverTest.php
@@ -30,6 +30,9 @@ class EntityResolverTest extends NormalizerTestBase {
    */
   protected $format = 'hal_json';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php b/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php
index 15ff46e82..716f09eee 100644
--- a/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php
+++ b/web/core/modules/hal/tests/src/Unit/FieldNormalizerDenormalizeExceptionsTest.php
@@ -57,7 +57,7 @@ public function providerNormalizerDenormalizeExceptions() {
       ->getMock();
     $mock->expects($this->any())
       ->method('getParent')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
     return [
       [[]],
       [['target_instance' => $mock]],
diff --git a/web/core/modules/help/tests/src/Functional/HelpBlockTest.php b/web/core/modules/help/tests/src/Functional/HelpBlockTest.php
index 590d45ccc..61f5f3f33 100644
--- a/web/core/modules/help/tests/src/Functional/HelpBlockTest.php
+++ b/web/core/modules/help/tests/src/Functional/HelpBlockTest.php
@@ -33,6 +33,9 @@ class HelpBlockTest extends BrowserTestBase {
    */
   protected $helpBlock;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->helpBlock = $this->placeBlock('help_block');
diff --git a/web/core/modules/help/tests/src/Functional/HelpTest.php b/web/core/modules/help/tests/src/Functional/HelpTest.php
index 1b8dc59a6..ea2253344 100644
--- a/web/core/modules/help/tests/src/Functional/HelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/HelpTest.php
@@ -45,6 +45,9 @@ class HelpTest extends BrowserTestBase {
    */
   protected $anyUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -149,6 +152,12 @@ protected function verifyHelp($response = 200) {
         // Ensure there are no double escaped '&' or '<' characters.
         $this->assertSession()->assertNoEscaped('&amp;');
         $this->assertSession()->assertNoEscaped('&lt;');
+
+        // The help for CKEditor 5 intentionally has escaped '<' so leave this
+        // iteration before the assertion below.
+        if ($module === 'ckeditor5') {
+          continue;
+        }
         // Ensure there are no escaped '<' characters.
         $this->assertSession()->assertNoEscaped('<');
       }
diff --git a/web/core/modules/help/tests/src/Functional/NoHelpTest.php b/web/core/modules/help/tests/src/Functional/NoHelpTest.php
index 0ec7615f9..c6aa5bc19 100644
--- a/web/core/modules/help/tests/src/Functional/NoHelpTest.php
+++ b/web/core/modules/help/tests/src/Functional/NoHelpTest.php
@@ -30,6 +30,9 @@ class NoHelpTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->adminUser = $this->drupalCreateUser(['access administration pages']);
diff --git a/web/core/modules/help_topics/config/optional/block.block.seven_help_search.yml b/web/core/modules/help_topics/config/optional/block.block.seven_help_search.yml
deleted file mode 100644
index 6d93b8f8b..000000000
--- a/web/core/modules/help_topics/config/optional/block.block.seven_help_search.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - search
-    - system
-  theme:
-    - seven
-  enforced:
-    config:
-      - search.page.help_search
-id: seven_help_search
-theme: seven
-region: help
-weight: -4
-provider: null
-plugin: search_form_block
-settings:
-  id: search_form_block
-  label: 'Search help'
-  label_display: visible
-  provider: search
-  page_id: help_search
-visibility:
-  request_path:
-    id: request_path
-    negate: false
-    context_mapping: {  }
-    pages: /admin/help
diff --git a/web/core/modules/help_topics/help_topics.services.yml b/web/core/modules/help_topics/help_topics.services.yml
index 5fafe3a3f..6a2754d77 100644
--- a/web/core/modules/help_topics/help_topics.services.yml
+++ b/web/core/modules/help_topics/help_topics.services.yml
@@ -13,7 +13,7 @@ services:
     arguments: ['%app.root%', '@module_handler', '@theme_handler']
     # Lowest core priority because loading help topics is not the usual case.
     tags:
-    - { name: twig.loader, priority: -200 }
+      - { name: twig.loader, priority: -200 }
     public: false
   plugin.manager.help_section_topics:
     class: Drupal\help_topics\HelpSectionManager
diff --git a/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig b/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig
index ef10c82e6..160b02773 100644
--- a/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig
+++ b/web/core/modules/help_topics/help_topics/ban.banning_ips.html.twig
@@ -3,12 +3,13 @@ label: 'Banning IP addresses'
 related:
   - user.overview
 ---
-{% set ban = render_var(url('ban.admin_page')) %}
+{% set ban_link_text %}{% trans %}IP address bans{% endtrans %}{% endset %}
+{% set ban_link = render_var(help_route_link(ban_link_text, 'ban.admin_page')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Ban visitors from one or more IP addresses from accessing and viewing your site.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>People</em> &gt; <a href="{{ ban }}"><em>IP address bans</em></a>{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>People</em> &gt; <em>{{ ban_link }}</em>{% endtrans %}</li>
   <li>{% trans %}Enter an <em>IP address</em> and click <em>Add</em>.{% endtrans %}</li>
   <li>{% trans %}You should see the IP address you entered listed under <em>Banned IP addresses</em>. Repeat the above steps to ban additional IP addresses.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/block.configure.html.twig b/web/core/modules/help_topics/help_topics/block.configure.html.twig
index 8b5e8f851..cd95c8b77 100644
--- a/web/core/modules/help_topics/help_topics/block.configure.html.twig
+++ b/web/core/modules/help_topics/help_topics/block.configure.html.twig
@@ -4,12 +4,13 @@ related:
   - block.overview
   - core.ui_accessibility
 ---
-{% set layout_url = render_var(url('block.admin_display')) %}
+{% set layout_link_text %}{% trans %}Block layout{% endtrans %}{% endset %}
+{% set layout_link = render_var(help_route_link(layout_link_text, 'block.admin_display')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure the settings of a block that was previously placed in a region of a theme.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ layout_url }}"><em>Block layout</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ layout_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click the name of the theme that contains the block.{% endtrans %}</li>
   <li>{% trans %}Optionally, click <em>Demonstrate block regions</em> to see the regions of the theme.{% endtrans %}</li>
   <li>{% trans %}If you only want to change the region where a block is located, or the ordering of blocks within a region, drag blocks to their desired positions and click <em>Save blocks</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/block_content.add.html.twig b/web/core/modules/help_topics/help_topics/block_content.add.html.twig
index 19f3133c5..002a47ba1 100644
--- a/web/core/modules/help_topics/help_topics/block_content.add.html.twig
+++ b/web/core/modules/help_topics/help_topics/block_content.add.html.twig
@@ -6,12 +6,13 @@ related:
   - block.place
   - block_content.type
 ---
-{% set content_url = render_var(url('entity.block_content.collection')) %}
+{% set library_link_text %}{% trans %}Custom block library{% endtrans %}{% endset %}
+{% set library_link = render_var(help_route_link(library_link_text, 'entity.block_content.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Create a custom block, which can later be placed on the site.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Block layout</em> &gt; <a href="{{ content_url }}"><em>Custom block library</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Block layout</em> &gt; {{ library_link }}.{% endtrans %}</li>
   <li>{% trans %}Click  <em>Add custom block</em>. If you have more than one custom block type defined on your site, click the name of the type you want to create.{% endtrans %}</li>
   <li>{% trans %}Enter a description of your block (to be shown to administrators) and the body text for your block.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/block_content.type.html.twig b/web/core/modules/help_topics/help_topics/block_content.type.html.twig
index 5b7400db0..1b91c6366 100644
--- a/web/core/modules/help_topics/help_topics/block_content.type.html.twig
+++ b/web/core/modules/help_topics/help_topics/block_content.type.html.twig
@@ -9,12 +9,13 @@ related:
   - field_ui.manage_form
   - field_ui.manage_display
 ---
-{% set types_url = render_var(url('entity.block_content_type.collection')) %}
+{% set types_link_text %}{% trans %}Block types{% endtrans %}{% endset %}
+{% set types_link = render_var(help_route_link(types_link_text, 'entity.block_content_type.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Define a custom block type and its fields.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Block layout</em> &gt; <em>Custom block library</em> &gt; <a href="{{ types_url }}"><em>Block types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Block layout</em> &gt; <em>Custom block library</em> &gt; <em>{{ types_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click  <em>Add custom block type</em>.{% endtrans %}</li>
   <li>{% trans %}Enter a label for this block type (shown in the administrative interface). Optionally, edit the automatically-generated machine name or the description.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>. You will be returned to the <em>Block types</em> page.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/book.adding.html.twig b/web/core/modules/help_topics/help_topics/book.adding.html.twig
index 84e17b6dd..3ef60009e 100644
--- a/web/core/modules/help_topics/help_topics/book.adding.html.twig
+++ b/web/core/modules/help_topics/help_topics/book.adding.html.twig
@@ -6,13 +6,14 @@ related:
   - book.creating
   - book.organizing
 ---
-{% set node_add = render_var(url('node.add_page')) %}
+{% set node_add_link_text %}{% trans %}Add content{% endtrans %}{% endset %}
+{% set node_add_link = render_var(help_route_link(node_add_link_text, 'node.add_page')) %}
 {% set configuring_topic = render_var(help_topic_link('book.configuring')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add a page to an existing book.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Content</em> &gt; <a href="{{ node_add }}"><em>Add content</em></a> &gt; <em>Book page</em>. If you have configured additional content types that can be added to books, you can substitute a different content type for <em>Book page</em>; see {{ configuring_topic }} for more information.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Content</em> &gt; <em>{{ node_add_link }}</em> &gt; <em>Book page</em>. If you have configured additional content types that can be added to books, you can substitute a different content type for <em>Book page</em>; see {{ configuring_topic }} for more information.{% endtrans %}</li>
   <li>{% trans %}Enter a title for the page and some text for the body of the page.{% endtrans %}</li>
   <li>{% trans %}In the vertical tabs area, click <em>Book Outline</em>. Select the book you want to add the page to in the <em>Book</em> select list. If you want to insert this page into the book hierarchy, also select the desired parent page in the <em>Parent item</em> select list.{% endtrans %}</li>
   <li>{% trans %}Select the desired weight for the page in the <em>Weight</em> select list (pages with the same parent item are ordered from lowest to highest weight).{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/book.configuring.html.twig b/web/core/modules/help_topics/help_topics/book.configuring.html.twig
index e92143fc6..74bd6e105 100644
--- a/web/core/modules/help_topics/help_topics/book.configuring.html.twig
+++ b/web/core/modules/help_topics/help_topics/book.configuring.html.twig
@@ -6,12 +6,13 @@ related:
   - book.creating
   - book.organizing
 ---
-{% set settings = render_var(url('book.settings')) %}
+{% set settings_link_text %}{% trans %}Settings{% endtrans %}{% endset %}
+{% set settings_link = render_var(help_route_link(settings_link_text, 'book.settings')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure settings related to books.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Books</em> &gt; <a href="{{ settings }}"><em>Settings</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Books</em> &gt; <em>{{ settings_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Check all of the content types that you would like to use as book pages in the <em>Content types allowed in book outlines</em> field.{% endtrans %}</li>
   <li>{% trans %}In the <em>Content type for the Add child page link</em> field, select the content type that will be created from the <em>Add child page</em> link on a book page.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save configuration</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/book.organizing.html.twig b/web/core/modules/help_topics/help_topics/book.organizing.html.twig
index a07774b4c..abda65fa7 100644
--- a/web/core/modules/help_topics/help_topics/book.organizing.html.twig
+++ b/web/core/modules/help_topics/help_topics/book.organizing.html.twig
@@ -6,12 +6,13 @@ related:
   - book.creating
   - book.configuring
 ---
-{% set overview = render_var(url('book.admin')) %}
+{% set overview_link_text %}{% trans %}Books{% endtrans %}{% endset %}
+{% set overview_link = render_var(help_route_link(overview_link_text, 'book.admin')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Change the order and titles of pages within a book.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ overview }}"><em>Books</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ overview_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Edit order and titles</em> for the book you would like to change.{% endtrans %}</li>
   <li>{% trans %}Drag the book pages to the desired order.{% endtrans %}</li>
   <li>{% trans %}If desired, enter new text for one or more of the page titles within the book.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/config.export_full.html.twig b/web/core/modules/help_topics/help_topics/config.export_full.html.twig
index cc8f0b772..ed07aa9d6 100644
--- a/web/core/modules/help_topics/help_topics/config.export_full.html.twig
+++ b/web/core/modules/help_topics/help_topics/config.export_full.html.twig
@@ -6,12 +6,13 @@ related:
 - config.export_single
 - config.import_single
 ---
-{% set export = render_var(url('config.export_full')) %}
+{% set export_link_text %}{% trans %}Export{% endtrans %}{% endset %}
+{% set export_link = render_var(help_route_link(export_link_text, 'config.export_full')) %}
 {% set config_overview_topic = render_var(help_topic_link('core.config_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Create and download an archive containing all your site's configuration, exported as YAML files. See {{ config_overview_topic }} for more information about configuration.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <a href="{{ export }}"><em>Export</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em>{{ export_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Export</em> and save the archive file.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/config.export_single.html.twig b/web/core/modules/help_topics/help_topics/config.export_single.html.twig
index 290197a3c..c05aca091 100644
--- a/web/core/modules/help_topics/help_topics/config.export_single.html.twig
+++ b/web/core/modules/help_topics/help_topics/config.export_single.html.twig
@@ -6,13 +6,14 @@ related:
 - config.import_full
 - config.import_single
 ---
-{% set single_export = render_var(url('config.export_single')) %}
+{% set single_export_link_text %}{% trans %}Single item{% endtrans %}{% endset %}
+{% set single_export_link = render_var(help_route_link(single_export_link_text, 'config.export_single')) %}
 {% set config_overview_topic = render_var(help_topic_link('core.config_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Export a single configuration item to a file. See {{ config_overview_topic }} for more information about configuration.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em>Export</em> &gt; <em><a href="{{ single_export }}">Single item</a></em>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em>Export</em> &gt; <em>{{ single_export_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Select the <em>Configuration type</em> that you want to export, and then select the specific <em>Configuration name</em> to export.{% endtrans %}</li>
   <li>{% trans %}Use your browser to copy the text in the box marked <em>Here is your configuration</em> to the clipboard.{% endtrans %}</li>
   <li>{% trans %}Paste the copied text into a plain-text editor on your computer or other device, and save it using the suggested file name below the text box.{% endtrans %}
diff --git a/web/core/modules/help_topics/help_topics/config.import_full.html.twig b/web/core/modules/help_topics/help_topics/config.import_full.html.twig
index 302de56db..c9ce26228 100644
--- a/web/core/modules/help_topics/help_topics/config.import_full.html.twig
+++ b/web/core/modules/help_topics/help_topics/config.import_full.html.twig
@@ -6,14 +6,15 @@ related:
 - config.import_single
 - config.export_single
 ---
-{% set import_page = render_var(url('config.import_full')) %}
+{% set import_link_text %}{% trans %}Import{% endtrans %}{% endset %}
+{% set import_link = render_var(help_route_link(import_link_text, 'config.import_full')) %}
 {% set export_full_topic = render_var(help_topic_link('config.export_full')) %}
 {% set config_overview_topic = render_var(help_topic_link('core.config_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Import the complete configuration of your site from an archive file, such as one that was previously exported (see {{ export_full_topic }}). See {{ config_overview_topic }} for more information about configuration.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em><a href="{{ import_page }}">Import</a></em>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em>{{ import_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Browse to find the <em>Configuration archive</em> that you want to import.{% endtrans %}</li>
   <li>{% trans %}Click <em>Upload</em>. Your configuration archive will be unpacked and placed in the configuration synchronization directory, and you will be redirected to the <em>Synchronize</em> page.{% endtrans %}</li>
   <li>{% trans %}Review the differences between your uploaded configuration and the active configuration, if any, and click <em>Import all</em> to import the changes.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/config.import_single.html.twig b/web/core/modules/help_topics/help_topics/config.import_single.html.twig
index 0593963c8..759eca3ad 100644
--- a/web/core/modules/help_topics/help_topics/config.import_single.html.twig
+++ b/web/core/modules/help_topics/help_topics/config.import_single.html.twig
@@ -6,14 +6,15 @@ related:
 - config.import_full
 - config.export_single
 ---
-{% set single_import = render_var(url('config.import_single')) %}
+{% set single_import_link_text %}{% trans %}Single item{% endtrans %}{% endset %}
+{% set single_import_link = render_var(help_route_link(single_import_link_text, 'config.import_single')) %}
 {% set export_single_topic = render_var(help_topic_link('config.export_single')) %}
 {% set config_overview_topic = render_var(help_topic_link('core.config_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Import a single configuration item in YAML format, such as one that was previously exported (see {{ export_single_topic }}). See {{ config_overview_topic }} for more information about configuration.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em>Import</em> &gt; <a href="{{ single_import }}"><em>Single item</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>Configuration synchronization</em> &gt; <em>Import</em> &gt; <em>{{ single_import_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Select the <em>Configuration type</em> that you want to import.{% endtrans %}</li>
   <li>{% trans %}On your computer or other device, copy the YAML-format configuration that you want to import to the clipboard.{% endtrans %}</li>
   <li>{% trans %}Paste the clipboard text into the box labeled <em>Paste your configuration here</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/config_translation.overview.html.twig b/web/core/modules/help_topics/help_topics/config_translation.overview.html.twig
index 1d899e1e4..d543aedf9 100644
--- a/web/core/modules/help_topics/help_topics/config_translation.overview.html.twig
+++ b/web/core/modules/help_topics/help_topics/config_translation.overview.html.twig
@@ -5,14 +5,15 @@ related:
   - core.translations
   - language.add
 ---
-{% set config_translation = render_var(url('config_translation.mapper_list'))%}
+{% set config_translation_link_text %}{% trans %}Configuration translation{% endtrans %}{% endset %}
+{% set config_translation_link = render_var(help_route_link(config_translation_link_text, 'config_translation.mapper_list'))%}
 {% set config_overview_topic = render_var(help_topic_link('core.config_overview')) %}
 {% set language_add_topic = render_var(help_topic_link('language.add')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Translate your site configuration to another language. See {{ language_add_topic }} if you need to add a new language.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <a href="{{ config_translation }}"><em>Configuration translation</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <em>{{ config_translation_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Find either the configuration entity type or the simple configuration item that you want to translate in the <em>Label</em> column of the list. Click <em>List</em> under <em>Operations</em> for a configuration entity, or <em>Translate</em> for simple configuration. (See {{ config_overview_topic }} to learn more about types of configuration and configuration entities.){% endtrans %}</li>
   <li>{% trans %}For configuration entities, find the specific entity that you want to translate on the next page, and click <em>Translate</em> under <em>Operations</em>.{% endtrans %}</li>
   <li>{% trans %}Enter translations for the translatable text fields for the configuration item, and save.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/contact.adding_fields.html.twig b/web/core/modules/help_topics/help_topics/contact.adding_fields.html.twig
index 3c76ddb1a..70c881d79 100644
--- a/web/core/modules/help_topics/help_topics/contact.adding_fields.html.twig
+++ b/web/core/modules/help_topics/help_topics/contact.adding_fields.html.twig
@@ -3,14 +3,15 @@ label: 'Managing the fields of contact forms'
 related:
   - contact.overview
 ---
-{% set contact_url = render_var(url('entity.contact_form.collection')) %}
+{% set contact_link_text %}{% trans %}Contact forms{% endtrans %}{% endset %}
+{% set contact_link = render_var(help_route_link(contact_link_text, 'entity.contact_form.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add, remove, or rearrange the fields on personal and site-wide contact forms.{% endtrans %}</p>
 <h2>{% trans %}What are the fields on contact forms?{% endtrans %}</h2>
 <p>{% trans %}Both personal and site-wide contact forms will always have <em>Subject</em> and <em>Message</em> fields. You can add additional fields for users to fill out if desired. Note that if you want to display other content on a form page, such as text or images, you can use a custom block.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ contact_url }}"><em>Contact forms</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ contact_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Manage fields</em> for the form you want to change the fields of, and add or remove one or more fields on the form.{% endtrans %}</li>
   <li>{% trans %}Click <em>Manage form display</em> to change the order or configuration of the fields on the form.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/contact.configuring_personal.html.twig b/web/core/modules/help_topics/help_topics/contact.configuring_personal.html.twig
index 34d5f3ab4..9c270610a 100644
--- a/web/core/modules/help_topics/help_topics/contact.configuring_personal.html.twig
+++ b/web/core/modules/help_topics/help_topics/contact.configuring_personal.html.twig
@@ -4,17 +4,19 @@ related:
   - contact.overview
   - contact.adding_fields
 ---
-{% set config_url = render_var(url('entity.user.admin_form')) %}
-{% set permission_url = render_var(url('user.admin_permissions')) %}
+{% set config_link_text %}{% trans %}Account settings{% endtrans %}{% endset %}
+{% set config_link = render_var(help_route_link(config_link_text, 'entity.user.admin_form')) %}
+{% set permission_link_text %}{% trans %}Permissions{% endtrans %}{% endset %}
+{% set permission_link = render_var(help_route_link(permission_link_text, 'user.admin_permissions')) %}
 {% set adding_fields_topic = render_var(help_topic_link('contact.adding_fields')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure personal contact forms for registered users on the website.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>People</em> &gt; <a href="{{ config_url }}"><em>Account settings</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>People</em> &gt; <em>{{ config_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}In the <em>Contact settings</em> section, check/uncheck the box to enable/disable the contact form for new user accounts.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save configuration</em>.{% endtrans %}</li>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>People</em> &gt; <a href="{{ permission_url }}"><em>Permissions</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>People</em> &gt; <em>{{ permission_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Verify that permissions are correct for your site's roles, including the generic <em>Anonymous user</em> and <em>Authenticated user</em>. In order to use personal contact forms, users need both <em>View user information</em> (in the <em>User</em> section, which enables them to view user profiles) and <em>Use users' personal contact forms</em> (in the <em>Contact</em> section, which enables them to use contact forms if they can view user profiles).{% endtrans %}</li>
   <li>{% trans %}Click <em>Save permissions</em>.{% endtrans %}</li>
   <li>{% trans %}The contact form will always have <em>Subject</em> and <em>Message</em> fields. If you want to add more fields, follow the steps in {{ adding_fields_topic }}.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/contact.creating.html.twig b/web/core/modules/help_topics/help_topics/contact.creating.html.twig
index e4e990d25..d8bf35b54 100644
--- a/web/core/modules/help_topics/help_topics/contact.creating.html.twig
+++ b/web/core/modules/help_topics/help_topics/contact.creating.html.twig
@@ -5,13 +5,14 @@ related:
   - contact.adding_fields
   - contact.setting_default
 ---
-{% set contact_url = render_var(url('entity.contact_form.collection')) %}
+{% set contact_link_text %}{% trans %}Contact forms{% endtrans %}{% endset %}
+{% set contact_link = render_var(help_route_link(contact_link_text, 'entity.contact_form.collection')) %}
 {% set adding_fields_topic = render_var(help_topic_link('contact.adding_fields')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Create a new site-wide contact form.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ contact_url }}"><em>Contact forms</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ contact_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add contact form</em>.{% endtrans %}</li>
   <li>{% trans %}Fill in the <em>Label</em> (title) for the form, <em>Recipients</em>, and optionally the other settings.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>. You should see your new contact form in the table, along with a link to view it.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/contact.setting_default.html.twig b/web/core/modules/help_topics/help_topics/contact.setting_default.html.twig
index a1ccf8e67..00e4febb2 100644
--- a/web/core/modules/help_topics/help_topics/contact.setting_default.html.twig
+++ b/web/core/modules/help_topics/help_topics/contact.setting_default.html.twig
@@ -3,12 +3,13 @@ label: 'Setting a default contact form'
 related:
   - contact.overview
 ---
-{% set contact_url = render_var(url('entity.contact_form.collection')) %}
+{% set contact_link_text %}{% trans %}Contact forms{% endtrans %}{% endset %}
+{% set contact_link = render_var(help_route_link(contact_link_text, 'entity.contact_form.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Set a site-wide contact form to be the default contact form (the form that is shown on the <em>/contact</em> URL).{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ contact_url }}"><em>Contact forms</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ contact_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Edit</em> for the site-wide form you want to be the default.{% endtrans %}</li>
   <li>{% trans %}Check <em>Make this the default form</em> and click <em>Save</em>.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/content_translation.overview.html.twig b/web/core/modules/help_topics/help_topics/content_translation.overview.html.twig
index 317846d73..00c919844 100644
--- a/web/core/modules/help_topics/help_topics/content_translation.overview.html.twig
+++ b/web/core/modules/help_topics/help_topics/content_translation.overview.html.twig
@@ -4,13 +4,14 @@ related:
   - core.translations
   - language.add
 ---
-{% set translation_settings = render_var(url('language.content_settings_page')) %}
+{% set translation_settings_link_text %}{% trans %}Content language and translation{% endtrans %}{% endset %}
+{% set translation_settings_link = render_var(help_route_link(translation_settings_link_text, 'language.content_settings_page')) %}
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure language and translation settings for one or more content entity types (see {{ content_structure_topic }} for an overview of content entities). To do this, you must have at least two languages configured. Afterwards, you will have a <em>Translate</em> operation available for your content entities, either as a tab or link when you are viewing or editing content, or on content administration pages.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <a href="{{ translation_settings }}"><em>Content language and translation</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <em>{{ translation_settings_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Under <em>Custom language settings</em>, find the content entity types that should have customized language settings on your site. Check the box next to each one. A section will appear below the list with settings for that entity type.{% endtrans %}</li>
   <li>{% trans %}For each entity type you checked, in the settings section below check the boxes for each entity sub-type that should be <em>Translatable</em> on your site. If the entity type does not have sub-types, there is just one check box for the entity type as a whole.{% endtrans %}</li>
   <li>{% trans %}For each entity type or subtype, select the <em>Default language</em>. Also, if you want to have languages other than the default available when you create content, check <em>Show language selector on create and edit pages</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/core.content_structure.html.twig b/web/core/modules/help_topics/help_topics/core.content_structure.html.twig
index afc513510..d51762209 100644
--- a/web/core/modules/help_topics/help_topics/core.content_structure.html.twig
+++ b/web/core/modules/help_topics/help_topics/core.content_structure.html.twig
@@ -17,7 +17,7 @@ top_level: true
   <li>{% trans %}Boolean, Number (provided by the core system): Stores true/false values and numbers{% endtrans %}</li>
   <li>{% trans %}Comment (provided by the core Comment module): Allows users to add comments to an entity{% endtrans %}</li>
   <li>{% trans %}Date, Timestamp (Datetime module): Stores dates and times{% endtrans %}</li>
-  <li>{% trans %}Date range (Datetime range module): Stores time/date periods with a start and and an end{% endtrans %}</li>
+  <li>{% trans %}Date range (Datetime range module): Stores time/date periods with a start and an end{% endtrans %}</li>
   <li>{% trans %}Email (core system): Stores email addresses{% endtrans %}</li>
   <li>{% trans %}Link (Link module): Stores URLs and link text{% endtrans %}</li>
   <li>{% trans %}List (Options module): Stores values chosen from pre-defined lists, where the values can be numbers or text; see section below for more on list fields.{% endtrans %}</li>
@@ -39,7 +39,7 @@ top_level: true
   <li>{% trans %}The core Node, Comment, Custom Block, Custom Menu Links, User, File, Image, Media, Taxonomy, and Contact modules all provide content entity types.{% endtrans %}</li>
   <li>{% trans %}The core Field UI module provides a user interface for managing fields and their display on entities.{% endtrans %}</li>
   <li>{% trans %}The core Layout Builder module provides a more flexible user interface for configuring the display of entities.{% endtrans %}</li>
-  <li>{% trans %}The core Filter, RDF, Responsive Image, and Path modules provide settings and display options for entities and fields.{% endtrans %}</li>
+  <li>{% trans %}The core Filter, Responsive Image, and Path modules provide settings and display options for entities and fields.{% endtrans %}</li>
 </ul>
 <p>{% trans %}Depending on the core and contributed modules that you currently have installed on your site, the related topics below, and other topics listed on the main <a href="{{ help_url }}">Help page</a>, will help you with tasks related to content structure.{% endtrans %}</p>
 <h2>{% trans %}Additional resources{% endtrans %}</h2>
diff --git a/web/core/modules/help_topics/help_topics/core.cron.html.twig b/web/core/modules/help_topics/help_topics/core.cron.html.twig
index 0e94a38e0..1c310e51a 100644
--- a/web/core/modules/help_topics/help_topics/core.cron.html.twig
+++ b/web/core/modules/help_topics/help_topics/core.cron.html.twig
@@ -3,7 +3,8 @@ label: 'Running and configuring cron'
 related:
   - core.maintenance
 ---
-{% set cron = render_var(url('system.cron_settings')) %}
+{% set cron_link_text %}{% trans %}Cron{% endtrans %}{% endset %}
+{% set cron_link = render_var(help_route_link(cron_link_text, 'system.cron_settings')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure your system so that cron will run automatically.{% endtrans %}</p>
 <h2>{% trans %}What are cron tasks?{% endtrans %}</h2>
@@ -16,7 +17,7 @@ related:
 </ul>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Configuration</em> &gt; <em>System</em> &gt; <a href="{{ cron }}"><em>Cron</em></a>. Note the <em>Last run</em> time on the page.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Configuration</em> &gt; <em>System</em> &gt; <em>{{ cron_link }}</em>. Note the <em>Last run</em> time on the page.{% endtrans %}</li>
   <li>{% trans %}If you want to run cron right now, click <em>Run cron</em> and wait for cron to finish.{% endtrans %}</li>
   <li>{% trans %}If you have a way to configure tasks on your web server, copy the link where it says <em>To run cron from outside the site, go to</em>. Set up a task to visit that URL on your desired cron schedule, such as once an hour or once a week. (On Linux-like servers, you can use the <em>wget</em> command to visit a URL.) If you configure an outside task, you should uninstall the Automated Cron module.{% endtrans %}</li>
   <li>{% trans %}If you are not configuring an outside task, and you have the core Automated Cron module installed, select a schedule for automated cron runs in <em>Cron settings</em> &gt; <em>Run cron every</em>. Click <em>Save configuration</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/core.security.html.twig b/web/core/modules/help_topics/help_topics/core.security.html.twig
index 81b684cd2..bf78ba36f 100644
--- a/web/core/modules/help_topics/help_topics/core.security.html.twig
+++ b/web/core/modules/help_topics/help_topics/core.security.html.twig
@@ -4,9 +4,12 @@ top_level: true
 ---
 <h2>{% trans %}What are security updates?{% endtrans %}</h2>
 <p>{% trans %}Any software occasionally has bugs, and sometimes these bugs have security implications. When security bugs are fixed in the core software, modules, or themes that your site uses, they are released in a <em>security update</em>. You will need to apply security updates in order to keep your site secure.{% endtrans %}</p>
+<h2>{% trans %}What are security advisories?{% endtrans %}</h2>
+<p>{% trans %}A security advisory is a public announcement about a reported security problem in the core software. Contributed projects with a shield icon and "Stable releases for this project are covered by the security advisory policy" on their project page are also covered by Drupal's security advisory policy. Security advisories are managed by the <a href="https://www.drupal.org/drupal-security-team">Drupal Security Team</a>.{% endtrans %}</p>
 <h2>{% trans %}Security tasks{% endtrans %}</h2>
 <p>{% trans %}Keeping track of updates, updating the core software, and updating contributed modules and/or themes are all part of keeping your site secure. See the related topics listed below for specific tasks.{% endtrans %}</p>
 <h2>{% trans %}Additional resources{% endtrans %}</h2>
 <ul>
     <li>{% trans %}<a href="https://www.drupal.org/docs/user_guide/en/security-chapter.html">Security and Maintenance chapter in the User Guide</a>{% endtrans %}</li>
+  <li>{% trans %}<a href="https://www.drupal.org/drupal-security-team/security-advisory-process-and-permissions-policy">Security advisory process and permissions policy</a>{% endtrans %}</li>
 </ul>
diff --git a/web/core/modules/help_topics/help_topics/core.web_services.html.twig b/web/core/modules/help_topics/help_topics/core.web_services.html.twig
index a0f4e87f7..555752b49 100644
--- a/web/core/modules/help_topics/help_topics/core.web_services.html.twig
+++ b/web/core/modules/help_topics/help_topics/core.web_services.html.twig
@@ -26,8 +26,6 @@ related:
   <dd>{% trans %}Adds support for serializing content entities using the JSON version of HAL.{% endtrans %}</dd>
   <dt>{% trans %}HTTP Basic Authentication module{% endtrans %}</dt>
   <dd>{% trans %}Provides a way for web services to be authenticated using HTTP Basic authentication against Drupal user accounts.{% endtrans %}</dd>
-  <dt>{% trans %}RDF module{% endtrans %}</dt>
-  <dd>{% trans %}Enriches your content with metadata to let other applications (e.g., search engines, aggregators, and so on) better understand its relationships and attributes. This semantically enriched, machine-readable output for your website uses the <a href="http://www.w3.org/TR/xhtml-rdfa-primer/">RDFa specification</a>, which allows RDF data to be embedded in HTML markup.{% endtrans %}</dd>
 </dl>
 <p>{% trans %}There are also contributed modules that provide web services.{% endtrans %}</p>
 <h2>{% trans %}Additional resources{% endtrans %}</h2>
diff --git a/web/core/modules/help_topics/help_topics/editor.overview.html.twig b/web/core/modules/help_topics/help_topics/editor.overview.html.twig
index 4deb28d02..5712620e9 100644
--- a/web/core/modules/help_topics/help_topics/editor.overview.html.twig
+++ b/web/core/modules/help_topics/help_topics/editor.overview.html.twig
@@ -6,18 +6,19 @@ related:
   - filter.overview
 ---
 {% set filter_overview_topic = render_var(help_topic_link('filter.overview')) %}
-{% set content_url = render_var(url('filter.admin_overview')) %}
+{% set overview_link_text %}{% trans %}Text formats and editors{% endtrans %}{% endset %}
+{% set overview_link = render_var(help_route_link(overview_link_text, 'filter.admin_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure a text format so that when a user is editing text and selects this text format, a text editor installed on your site is shown. Configure the text editor, such as choosing which buttons and functions are available. See {{ filter_overview_topic }} for more about text formats.{% endtrans %}</p>
 <h2>{% trans %}What is a text editor?{% endtrans %}</h2>
-<p>{% trans %}A text editor is software (typically, a JavaScript library) that provides buttons and other command mechanisms to make editing HTML text easier. Some editors are called <em>visual</em> or <em>WYSIWYG (What You See Is What You Get)</em> editors; these editors hide the details of HTML from the user, and instead show formatted output on the screen. The core Text Editor module provides a framework for deploying text editors on your site. The core CKEditor module provides CKEditor, which is a widely-used JavaScript WYSIWYG editor that creates clean and valid HTML; the module also enforces the HTML tag restrictions in the associated text format. Various contributed modules provide other editors; to install a new editor, besides installing the module, you may need to download the editor library from a third-party site.{% endtrans %}</p>
+<p>{% trans %}A text editor is software (typically, a JavaScript library) that provides buttons and other command mechanisms to make editing HTML text easier. Some editors are called <em>visual</em> or <em>WYSIWYG (What You See Is What You Get)</em> editors; these editors hide the details of HTML from the user, and instead show formatted output on the screen. The core Text Editor module provides a framework for deploying text editors on your site. The core CKEditor 5 module provides CKEditor 5, which is a widely-used JavaScript text editor that creates clean and valid HTML; the module also enforces the HTML tag restrictions in the associated text format. Various contributed modules provide other editors; to install a new editor, besides installing the module, you may need to download the editor library from a third-party site.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Content Authoring</em> &gt; <a href="{{ content_url }}"><em>Text formats and editors</em></a>. The <em>Text editor</em> column in the table shows the text editor that is currently connected to each text format, if any.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Content Authoring</em> &gt; <em>{{ overview_link }}</em>. The <em>Text editor</em> column in the table shows the text editor that is currently connected to each text format, if any.{% endtrans %}</li>
   <li>{% trans %}Follow the steps on {{ filter_overview_topic }} to add a new text format or configure an existing text format; when you reach the step about text editors, return to this topic.{% endtrans %}</li>
-  <li>{% trans %}Select <em>CKEditor</em> as the <em>Text editor</em>, or another text editor that you have installed. The rest of these steps assume you selected <em>CKEditor</em>.{% endtrans %}</li>
-  <li>{% trans %}Under <em>Toolbar configuration</em>, drag buttons between <em>Available buttons</em> and <em>Active toolbar</em>; only buttons in <em>Active toolbar</em> will be shown to the user. If you are using a mouse, you can hover over a button to see a tooltip explaining what the button does.{% endtrans %}</li>
-  <li>{% trans %}Drag buttons within <em>Active toolbar</em> to the desired order, and group buttons by dragging them into the grouping boxes; click <em>Add group</em> to add additional groups.{% endtrans %}</li>
-  <li>{% trans %}Under <em>CKEditor plugin settings</em>, configure the buttons that have configuration. This section will not be present if there are no active buttons with configuration.{% endtrans %}</li>
+  <li>{% trans %}Select <em>CKEditor 5</em> as the <em>Text editor</em>, or another text editor that you have installed. The rest of these steps assume you selected <em>CKEditor 5</em>.{% endtrans %}</li>
+  <li>{% trans %}Under <em>Toolbar configuration</em>, drag buttons between <em>Available buttons</em> and <em>Active toolbar</em>; only buttons in <em>Active toolbar</em> will be shown to the user. Focusing or hovering over a button will display a tooltip explaining what the button does.{% endtrans %}</li>
+  <li>{% trans %}Drag buttons within <em>Active toolbar</em> to the desired order, and group buttons by dragging them between group identifiers; drag <em>a new group identifier</em> to the toolbar to add additional groups.{% endtrans %}</li>
+  <li>{% trans %}If you add buttons that require configuration, the <em>CKEditor 5 plugin settings</em> section will be visible, and provide their respective configuration forms. {% endtrans %}</li>
   <li>{% trans %}Return to {{ filter_overview_topic }} to complete the text format configuration, and be sure to save the text format.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig b/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig
index 2672450e1..25776b176 100644
--- a/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig
+++ b/web/core/modules/help_topics/help_topics/field_ui.add_field.html.twig
@@ -5,13 +5,14 @@ related:
   - field_ui.manage_display
   - field_ui.manage_form
 ---
-{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_types_link_text %}{% trans %}Content types{% endtrans %}{% endset %}
+{% set content_types_link = render_var(help_route_link(content_types_link_text, 'entity.node_type.collection')) %}
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add a field to an entity sub-type; see {{ content_structure_topic }} for an overview of entity types and sub-types, as well as an overview of field types.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Navigate to the page for managing the entity sub-type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}Navigate to the page for managing the entity sub-type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ content_types_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Find the particular sub-type that you want to add the field to, and click <em>Manage fields</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add field</em>.{% endtrans %}</li>
   <li>{% trans %}In <em>Add a new field</em>, select the type of field you want to add; see {{ content_structure_topic }} for an overview of field types.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig b/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig
index 10bd1b55a..8990743b2 100644
--- a/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig
+++ b/web/core/modules/help_topics/help_topics/field_ui.manage_display.html.twig
@@ -6,13 +6,14 @@ related:
   - field_ui.manage_form
   - core.ui_accessibility
 ---
-{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_types_link_text %}{% trans %}Content types{% endtrans %}{% endset %}
+{% set content_types_link = render_var(help_route_link(content_types_link_text, 'entity.node_type.collection')) %}
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure the <em>formatters</em> used to display the fields of an entity sub-type, their order in the display, and the formatter settings. See {{ content_structure_topic }} for background information.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ content_types_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Find the particular sub-type that you want to configure the display of, and click <em>Manage display</em> in the <em>Operations</em> list.{% endtrans %}</li>
   <li>{% trans %}Use the drag arrows to order the fields in your preferred order.{% endtrans %}</li>
   <li>{% trans %}Drag any fields that you do not wish to see in the display to the <em>Disabled</em> section.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig b/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig
index e3bacec71..6b7f59220 100644
--- a/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig
+++ b/web/core/modules/help_topics/help_topics/field_ui.manage_form.html.twig
@@ -6,13 +6,14 @@ related:
   - field_ui.manage_display
   - core.ui_accessibility
 ---
-{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_types_link_text %}{% trans %}Content types{% endtrans %}{% endset %}
+{% set content_types_link = render_var(help_route_link(content_types_link_text, 'entity.node_type.collection')) %}
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure the <em>widgets</em> used to edit the fields of an entity sub-type, their order on the form, and the widget settings. See {{ content_structure_topic }} for background information.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ content_types_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Find the particular sub-type that you want to configure the editing form for, and click <em>Manage form display</em> in the <em>Operations</em> list.{% endtrans %}</li>
   <li>{% trans %}Use the drag arrows to order the fields in your preferred order.{% endtrans %}</li>
   <li>{% trans %}Drag any fields that you do not wish to see on the editing form to the <em>Disabled</em> section.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig b/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig
index 4d5ddcee0..22a0048c6 100644
--- a/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig
+++ b/web/core/modules/help_topics/help_topics/field_ui.reference_field.html.twig
@@ -7,12 +7,13 @@ related:
   - field_ui.manage_form
 ---
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
-{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_types_link_text %}{% trans %}Content types{% endtrans %}{% endset %}
+{% set content_types_link = render_var(help_route_link(content_types_link_text, 'entity.node_type.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add an entity reference field to an entity sub-type; see {{ content_structure_topic }} for more information on entities and reference fields.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Navigate to the page for managing the entity sub-type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}Navigate to the page for managing the entity sub-type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ content_types_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Find the particular sub-type that you want to add the field to, and click <em>Manage fields</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add field</em>.{% endtrans %}</li>
   <li>{% trans %}In <em>Add a new field</em>, select the type of reference field you want to add. The <em>Reference</em> section of the select list shows the most common types of reference field; choose <em>Other...</em> if the entity type you want to reference is not listed.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/filter.overview.html.twig b/web/core/modules/help_topics/help_topics/filter.overview.html.twig
index 8beb2a7d9..b796156df 100644
--- a/web/core/modules/help_topics/help_topics/filter.overview.html.twig
+++ b/web/core/modules/help_topics/help_topics/filter.overview.html.twig
@@ -7,7 +7,8 @@ related:
   - field_ui.manage_display
   - field_ui.add_field
 ---
-{% set content_url = render_var(url('filter.admin_overview')) %}
+{% set overview_link_text %}{% trans %}Text formats and editors{% endtrans %}{% endset %}
+{% set overview_link = render_var(help_route_link(overview_link_text, 'filter.admin_overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure text formats on the site.{% endtrans %}</p>
 <h2>{% trans %}What are text filters and text formats?{% endtrans %}</h2>
@@ -27,7 +28,7 @@ related:
 </dl>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Content Authoring</em> &gt; <a href="{{ content_url }}"><em>Text formats and editors</em></a>. If you do not have the core Text Editor module installed, the menu link and page title will instead be <em>Text formats</em>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Content Authoring</em> &gt; <em>{{ overview_link }}</em>. If you do not have the core Text Editor module installed, the menu link and page title will instead be <em>Text formats</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Configure</em> to configure an existing text format, or <em>+ Add text format</em> to create a new text format.{% endtrans %}</li>
   <li>{% trans %}Enter the desired <em>Name</em> for the text format.{% endtrans %}</li>
   <li>{% trans %}Check the <em>Roles</em> that can use this text format. Some HTML tags allow users to embed malicious links or scripts in text. To ensure security, anonymous and untrusted users should only have access to text formats that restrict them to either plain text or a safe set of HTML tags. <strong>Improper text format configuration is a security risk.</strong>{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/forum.configuring.html.twig b/web/core/modules/help_topics/help_topics/forum.configuring.html.twig
index 0b2b123b1..b6b91ea77 100644
--- a/web/core/modules/help_topics/help_topics/forum.configuring.html.twig
+++ b/web/core/modules/help_topics/help_topics/forum.configuring.html.twig
@@ -3,21 +3,24 @@ label: 'Configuring forums'
 related:
   - forum.concept
 ---
-{% set settings = render_var(url('forum.settings')) %}
-{% set overview = render_var(url('forum.overview')) %}
 {% set forum_concept_topic = render_var(help_topic_link('forum.concept')) %}
-{% set index = render_var(url('forum.index')) %}
+{% set settings_link_text %}{% trans %}Settings{% endtrans %}{% endset %}
+{% set settings_link = render_var(help_route_link(settings_link_text, 'forum.settings')) %}
+{% set overview_link_text %}{% trans %}Forums{% endtrans %}{% endset %}
+{% set overview_link = render_var(help_route_link(overview_link_text, 'forum.overview')) %}
+{% set index_link_text %}{% trans %}Forums{% endtrans %}{% endset %}
+{% set index_link = render_var(help_route_link(index_link_text, 'forum.index')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure settings for forums, and set up forum structure.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Forums</em> &gt; <a href="{{ settings }}"><em>Settings</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Forums</em> &gt; <em>{{ settings_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Choose the desired settings for <em>Hot topic threshold</em>, <em>Topics per page</em>, and <em>Default order</em>. Click <em>Save configuration</em> if you have made any changes.{% endtrans %}</li>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ overview }}"><em>Forums</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ overview_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Decide on the hierarchy of containers and forums you want for your site; see {{ forum_concept_topic }} for an overview of forum hierarchy.{% endtrans %}</li>
   <li>{% trans %}Create the containers that you want in your forum hierarchy, starting at the top level, if any. To create a container, click <em>Add container</em>, enter the container name and optionally other settings, and click <em>Save</em>.{% endtrans %}</li>
   <li>{% trans %}Create the forums that you want in your forum hierarchy, starting at the top level. To create a forum, click <em>Add forum</em> and enter the forum name. If your hierarchy has this forum inside a container or another forum, select the parent forum/container in the <em>Parent</em> field. Review and/or edit the other settings, and click <em>Save</em>.{% endtrans %}</li>
   <li>{% trans %}Optionally, delete the provided <em>General discussion</em> forum, if you do not want this forum to be available on your site.{% endtrans %}</li>
   <li>{% trans %}Review and/or edit the permissions related to forums. The administrative permission for editing the forum settings is in the <em>Forum</em> module section of the permissions page, and administrative permissions for editing the forum hierarchy are in the <em>Taxonomy</em> module section. The user permissions for creating forum topics are in the <em>Node</em> module section, and for commenting on topics are in the <em>Comment</em> module section.{% endtrans %}</li>
-  <li>{% trans %}Add links to the main <a href="{{ index }}"><em>Forums</em></a> page (path: <em>/forum</em>), and optionally to individual forum pages, to navigation menus on your site, so that users can find the forums.{% endtrans %}</li>
+  <li>{% trans %}Add links to the main <em>{{ index_link }}</em> page (path: <em>/forum</em>), and optionally to individual forum pages, to navigation menus on your site, so that users can find the forums.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/forum.locking.html.twig b/web/core/modules/help_topics/help_topics/forum.locking.html.twig
index e87639eac..38a7e9c4e 100644
--- a/web/core/modules/help_topics/help_topics/forum.locking.html.twig
+++ b/web/core/modules/help_topics/help_topics/forum.locking.html.twig
@@ -3,12 +3,13 @@ label: 'Locking a forum topic'
 related:
   - forum.concept
 ---
-{% set index = render_var(url('forum.index')) %}
+{% set index_link_text %}{% trans %}Forums{% endtrans %}{% endset %}
+{% set index_link = render_var(help_route_link(index_link_text, 'forum.index')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Lock a topic to prevent users from making any more comments.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Starting from the <a href="{{ index }}">forums page</a>, navigate to the forum that currently contains the topic.{% endtrans %}</li>
+  <li>{% trans %}Starting from {{ index_link }} (path: <em>/forums</em>), navigate to the forum that currently contains the topic.{% endtrans %}</li>
   <li>{% trans %}Locate the topic within the forum, and click on the title to view the topic.{% endtrans %}</li>
   <li>{% trans %}Click <em>Edit</em>.{% endtrans %}</li>
   <li>{% trans %}Under <em>Comment settings</em>, check <em>Closed</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/forum.moving.html.twig b/web/core/modules/help_topics/help_topics/forum.moving.html.twig
index 8fb1df5ff..918daabeb 100644
--- a/web/core/modules/help_topics/help_topics/forum.moving.html.twig
+++ b/web/core/modules/help_topics/help_topics/forum.moving.html.twig
@@ -3,12 +3,13 @@ label: 'Moving a topic to a new forum'
 related:
   - forum.concept
 ---
-{% set index = render_var(url('forum.index')) %}
+{% set index_link_text %}{% trans %}Forums{% endtrans %}{% endset %}
+{% set index_link = render_var(help_route_link(index_link_text, 'forum.index')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Move a forum topic and all of its comments to a new forum. {% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Starting from the <a href="{{ index }}">forums page</a>, navigate to the forum that currently contains the topic.{% endtrans %}</li>
+  <li>{% trans %}Starting from {{ index_link }} (path: <em>/forums</em>), navigate to the forum that currently contains the topic.{% endtrans %}</li>
   <li>{% trans %}Locate the topic within the forum, and click on the title to view the topic.{% endtrans %}</li>
   <li>{% trans %}Click <em>Edit</em>.{% endtrans %}</li>
   <li>{% trans %}In the <em>Forums</em> field, select the new forum that you want the topic to move to.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/forum.starting.html.twig b/web/core/modules/help_topics/help_topics/forum.starting.html.twig
index 8942425e9..a93974805 100644
--- a/web/core/modules/help_topics/help_topics/forum.starting.html.twig
+++ b/web/core/modules/help_topics/help_topics/forum.starting.html.twig
@@ -3,12 +3,13 @@ label: 'Starting a forum discussion'
 related:
   - forum.concept
 ---
-{% set index = render_var(url('forum.index')) %}
+{% set index_link_text %}{% trans %}Forums{% endtrans %}{% endset %}
+{% set index_link = render_var(help_route_link(index_link_text, 'forum.index')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Post a new topic in a forum to start a discussion.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Starting from the <a href="{{ index }}">forums page</a>, navigate to the forum where you want to post the topic.{% endtrans %}</li>
+  <li>{% trans %}Starting from {{ index_link }} (path: <em>/forums</em>), navigate to the forum that currently contains the topic.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add new Forum topic</em>.{% endtrans %}</li>
   <li>{% trans %}Enter the topic's <em>Subject</em> and <em>Body</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig b/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig
index ae8ffd8d2..91957f550 100644
--- a/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig
+++ b/web/core/modules/help_topics/help_topics/help.help_topic_search.html.twig
@@ -6,20 +6,22 @@ related:
   - core.cron
   - search.overview
 ---
-{% set extend_url = render_var(url('system.modules_list')) %}
-{% set help_url = render_var(url('help.main')) %}
+{% set extend_link_text %}{% trans %}Extend{% endtrans %}{% endset %}
+{% set help_link_text %}{% trans %}Help{% endtrans %}{% endset %}
+{% set extend_link = render_var(help_route_link(extend_link_text, 'system.modules_list')) %}
+{% set help_link = render_var(help_route_link(help_link_text, 'help.main')) %}
 {% set cache_topic = render_var(help_topic_link('system.cache')) %}
 {% set cron_topic = render_var(help_topic_link('core.cron')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Set up your site so that users can search for help.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em><a href="{{ extend_url }}">Extend</a></em>. Verify that the Search, Help, Help Topics, and Block modules are installed (or install them if they are not already installed).{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>{{ extend_link }}</em>. Verify that the Search, Help, Help Topics, and Block modules are installed (or install them if they are not already installed).{% endtrans %}</li>
   <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Search and metadata</em> &gt; <em>Search pages</em>.{% endtrans %}</li>
   <li>{% trans %}Verify that a Help search page is listed in the <em>Search pages</em> section. If not, add a new page of type <em>Help</em>.{% endtrans %}</li>
   <li>{% trans %}Check the indexing status of the Help search page. If it is not fully indexed, see {{ cron_topic }} about how to run Cron until indexing is complete.{% endtrans %}</li>
   <li>{% trans %}In the future, you can click <em>Rebuild search index</em> on this page, or {{ cache_topic }}, in order to force help topic text to be reindexed for searching. This should be done whenever a module, theme, language, or string translation is updated.{% endtrans %}</li>
   <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>Block layout</em>.{% endtrans %}</li>
   <li>{% trans %}Click the link for your administrative theme (such as the core Seven theme), near the top of the page, and verify that there is already a search block for help located in the Help region. If not, follow the steps in the related topic to place the <em>Search form</em> block in the Help region. When configuring the block, choose <em>Help</em> as the search page, and in the <em>Pages</em> tab under <em>Visibility</em>, enter <em>/admin/help</em> to make the search form only visible on the main <em>Help</em> page.{% endtrans %}</li>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em><a href="{{ help_url }}">Help</a></em>. Verify that the search block is visible, and try a search.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>{{ help_link }}</em>. Verify that the search block is visible, and try a search.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/image.style.html.twig b/web/core/modules/help_topics/help_topics/image.style.html.twig
index d520b50bd..1ff06f8bf 100644
--- a/web/core/modules/help_topics/help_topics/image.style.html.twig
+++ b/web/core/modules/help_topics/help_topics/image.style.html.twig
@@ -6,12 +6,13 @@ related:
   - layout_builder.overview
 ---
 {% set media_topic = render_var(help_topic_link('core.media')) %}
-{% set styles = render_var(url('entity.image_style.collection')) %}
+{% set styles_text %}{% trans %}Image styles{% endtrans %}{% endset %}
+{% set styles_link = render_var(help_route_link(styles_text, 'entity.image_style.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add a new image style, which can be used to process and display images. See {{ media_topic }} for an overview of image styles.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Media</em> &gt; <a href="{{ styles }}"><em>Image styles</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Media</em> &gt; {{ styles_link }}.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add image style</em>.{% endtrans %}</li>
   <li>{% trans %}Enter a descriptive <em>Image style name</em>, and click <em>Create new style</em>.{% endtrans %}</li>
   <li>{% trans %}Under <em>Effect</em>, choose an effect to apply and click <em>Add</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/language.add.html.twig b/web/core/modules/help_topics/help_topics/language.add.html.twig
index 31940a737..7a3ef9010 100644
--- a/web/core/modules/help_topics/help_topics/language.add.html.twig
+++ b/web/core/modules/help_topics/help_topics/language.add.html.twig
@@ -4,12 +4,13 @@ related:
   - core.translations
   - language.detect
 ---
-{% set languages_url = render_var(url('entity.configurable_language.collection')) %}
+{% set languages_text %}{% trans %}Languages{% endtrans %}{% endset %}
+{% set languages_link = render_var(help_route_link(languages_text, 'entity.configurable_language.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add a language to your site.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <a href="{{ languages_url }}"><em>Languages</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; {{ languages_link }}.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add language</em>.{% endtrans %}</li>
   <li>{% trans %}If your language is in the <em>Language name</em> list, select it and click <em>Add language</em>.{% endtrans %}</li>
   <li>{% trans %}If your language is not in the list, select <em>Custom language...</em> and enter the <em>Language code</em>, <em>Language name</em>, and <em>Direction</em> for the language. Click <em>Add custom language</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/language.detect.html.twig b/web/core/modules/help_topics/help_topics/language.detect.html.twig
index 02d435607..b5ea08b75 100644
--- a/web/core/modules/help_topics/help_topics/language.detect.html.twig
+++ b/web/core/modules/help_topics/help_topics/language.detect.html.twig
@@ -4,7 +4,8 @@ related:
 - core.translations
 - language.add
 ---
-{% set detection = render_var(url('language.negotiation')) %}
+{% set detection_text %}{% trans %}Detection and selection{% endtrans %}{% endset %}
+{% set detection_link = render_var(help_route_link(detection_text, 'language.negotiation')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure the methods used to decide which language will be used to display text on your site.{% endtrans %}</p>
 <h2>{% trans %}What is a language detection method?{% endtrans %}</h2>
@@ -25,7 +26,7 @@ related:
 </dl>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-    <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <em>Languages</em> &gt; <a href="{{ detection }}"><em>Detection and selection</em></a>.{% endtrans %}</li>
+    <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <em>Languages</em> &gt; {{ detection_link }}.{% endtrans %}</li>
     <li>{% trans %}Check the boxes to enable the desired language detection methods, and uncheck boxes for the methods you do not want to use.{% endtrans %}</li>
     <li>{% trans %}Drag the methods to change their order, if desired.{% endtrans %}</li>
     <li>{% trans %}Click <em>Save settings</em>.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig b/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig
index 6b6d5b9c3..dc107acd6 100644
--- a/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig
+++ b/web/core/modules/help_topics/help_topics/layout_builder.overview.html.twig
@@ -6,7 +6,8 @@ related:
   - field_ui.manage_display
   - block.overview
 ---
-{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_types_text %}{% trans %}Content types{% endtrans %}{% endset %}
+{% set content_types_link = render_var(help_route_link(content_types_text, 'entity.node_type.collection')) %}
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
 {% set block_overview_topic = render_var(help_topic_link('block.overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
@@ -15,7 +16,7 @@ related:
 <p>{% trans %}A layout consists of one or more <em>sections</em>. Each section can have from one to four <em>columns</em>. You can place blocks, including special blocks for the fields on the entity sub-type, in each column of each section (see {{ block_overview_topic }} for more on blocks).{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}Navigate to the page for managing the entity type you want to add the field to. For example, to add a field to a content type, in the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; {{ content_types_link }}.{% endtrans %}</li>
   <li>{% trans %}Find the particular sub-type that you want to create a layout for, and click <em>Manage display</em> in the <em>Operations</em> list.{% endtrans %}</li>
   <li>{% trans %}Under <em>Layout options</em>, check <em>Use Layout Builder</em>. You can also check the box below to allow each entity item to have its layout individually customized (if it is left unchecked, the site will use the same layout for all items of this entity sub-type).{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>. You will be returned to the <em>Manage display</em> page, but you will no longer see the table of fields of the classic display manager.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/locale.import.html.twig b/web/core/modules/help_topics/help_topics/locale.import.html.twig
index 481f86f2f..90c8fa109 100644
--- a/web/core/modules/help_topics/help_topics/locale.import.html.twig
+++ b/web/core/modules/help_topics/help_topics/locale.import.html.twig
@@ -5,12 +5,13 @@ related:
 - locale.translation_status
 - locale.translate_strings
 ---
-{% set import = render_var(url('locale.translate_import')) %}
+{% set import_text %}{% trans %}Import{% endtrans %}{% endset %}
+{% set import_link = render_var(help_route_link(import_text, 'locale.translate_import')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Import a file (.po extension) containing translations for user interface text.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <em>User interface translation</em> &gt; <a href="{{ import }}"><em>Import</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <em>User interface translation</em> &gt; {{ import_link }}.{% endtrans %}</li>
   <li>{% trans %}Browse to find the <em>Translation file</em> you want to import. Select the language and check the desired import options.{% endtrans %}</li>
   <li>{% trans %}Click <em>Import</em> and wait for your file to be imported.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/locale.translate_strings.html.twig b/web/core/modules/help_topics/help_topics/locale.translate_strings.html.twig
index 8f4bde4a9..08ce2399a 100644
--- a/web/core/modules/help_topics/help_topics/locale.translate_strings.html.twig
+++ b/web/core/modules/help_topics/help_topics/locale.translate_strings.html.twig
@@ -6,12 +6,13 @@ related:
   - locale.translation_status
   - language.add
 ---
-{% set translate = render_var(url('locale.translate_page')) %}
+{% set translate_text %}{% trans %}User interface translation{% endtrans %}{% endset %}
+{% set translate_link = render_var(help_route_link(translate_text, 'locale.translate_page')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Translate user interface text strings from English into a non-English language that is configured on your site.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <a href="{{ translate }}"><em>User interface translation</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; {{ translate_link }}.{% endtrans %}</li>
   <li>{% trans %}Using the filters, search for a string or set of strings that you want to translate; make sure to select the correct <em>Translation language</em> if you have more than one non-English language on your site.{% endtrans %}</li>
   <li>{% trans %}Enter new translations and click <em>Save translations</em>.{% endtrans %}</li>
   <li>{% trans %}Repeat these steps until all of the desired user interface text is translated for all languages on your site.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/locale.translation_status.html.twig b/web/core/modules/help_topics/help_topics/locale.translation_status.html.twig
index c46fbc06b..e8e10a429 100644
--- a/web/core/modules/help_topics/help_topics/locale.translation_status.html.twig
+++ b/web/core/modules/help_topics/help_topics/locale.translation_status.html.twig
@@ -5,15 +5,17 @@ related:
 - locale.import
 - locale.translate_strings
 ---
-{% set language = render_var(url('entity.configurable_language.collection')) %}
-{% set translation_updates = render_var(url('locale.translate_status')) %}
+{% set language_text %}{% trans %}Languages{% endtrans %}{% endset %}
+{% set translation_updates_text %}{% trans %}Available translation updates{% endtrans %}{% endset %}
+{% set language_link = render_var(help_route_link(language_text, 'entity.configurable_language.collection')) %}
+{% set translation_updates_link = render_var(help_route_link(translation_updates_text, 'locale.translate_status')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Check the current status of interface translations, and see if there are any updates available.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; <a href="{{ language }}"><em>Languages</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Regional and language</em> &gt; {{ language_link }}.{% endtrans %}</li>
   <li>{% trans %}Look at the <em>Interface translation</em> column in the language table, to find the percentage of user interface text that has been translated for each language.{% endtrans %}</li>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Reports</em> &gt; <em><a href="{{ translation_updates }}">Available translation updates</a></em>. This report is only available if the core Update Status module is installed.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Reports</em> &gt; <em>{{ translation_updates_link }}</em>. This report is only available if the core Update Status module is installed.{% endtrans %}</li>
   <li>{% trans %}Optionally, click <em>Check manually</em> to update the report.{% endtrans %}</li>
   <li>{% trans %}View the report to find out if any languages have translation updates that you can download.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/media.media_type.html.twig b/web/core/modules/help_topics/help_topics/media.media_type.html.twig
index e36629b41..43c6e9c5b 100644
--- a/web/core/modules/help_topics/help_topics/media.media_type.html.twig
+++ b/web/core/modules/help_topics/help_topics/media.media_type.html.twig
@@ -7,12 +7,13 @@ related:
 ---
 {% set content_structure_topic = render_var(help_topic_link('core.content_structure')) %}
 {% set media_topic = render_var(help_topic_link('core.media')) %}
-{% set media = render_var(url('entity.media_type.collection')) %}
+{% set media_text %}{% trans %}Media types{% endtrans %}{% endset %}
+{% set media_link = render_var(help_route_link(media_text, 'entity.media_type.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add a new media type that can be referenced in Media reference fields; media types are a content entity type. See {{ media_topic }} for an overview of media items and media types, and {{ content_structure_topic }} for more information on content entities and fields.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ media }}"><em>Media types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; {{ media_link }}.{% endtrans %}</li>
   <li>{% trans %}If there is not already a media type for the type of media you want to use on your site, click <em>Add media type</em>.{% endtrans %}</li>
   <li>{% trans %}Enter a <em>Name</em> and <em>Description</em> for your media type, and select the <em>Media source</em>.{% endtrans %}</li>
   <li>{% trans %}For most media sources, there is additional information that will need to be stored with your media item, in a field on your media type. Under <em>Media source configuration</em>, select an existing field to re-use to store this information, or select <em> - Create -</em> to create a new field.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/menu_ui.content_type_configuration.html.twig b/web/core/modules/help_topics/help_topics/menu_ui.content_type_configuration.html.twig
index 5fcb85843..2698c9362 100644
--- a/web/core/modules/help_topics/help_topics/menu_ui.content_type_configuration.html.twig
+++ b/web/core/modules/help_topics/help_topics/menu_ui.content_type_configuration.html.twig
@@ -5,12 +5,13 @@ related:
   - menu_ui.menu_operations
   - core.menus
 ---
-{% set content_types = render_var(url('entity.node_type.collection')) %}
+{% set content_types_text %}{% trans %}Content types{% endtrans %}{% endset %}
+{% set content_types_link = render_var(help_route_link(content_types_text, 'entity.node_type.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}For an existing content type, configure the available menus that will be shown as options on content editing screens; links to content items of this type can be added to these menus during editing.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <a href="{{ content_types }}"><em>Content types</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; {{ content_types_link }}.{% endtrans %}</li>
   <li>{% trans %}Locate the content type you want to configure, and click <em>Edit</em> in the <em>Operations</em> list.{% endtrans %}</li>
   <li>{% trans %}Under <em>Menu settings</em>, check the menus that you want to be available when editing a content item of this type.{% endtrans %}</li>
   <li>{% trans %}Optionally, select the <em>Default parent item</em>, to put links to content items under a default location in the menu structure.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/menu_ui.menu_item_add.html.twig b/web/core/modules/help_topics/help_topics/menu_ui.menu_item_add.html.twig
index 9ce81dc5e..160ff3a34 100644
--- a/web/core/modules/help_topics/help_topics/menu_ui.menu_item_add.html.twig
+++ b/web/core/modules/help_topics/help_topics/menu_ui.menu_item_add.html.twig
@@ -5,12 +5,13 @@ related:
   - menu_ui.menu_operations
   - core.menus
 ---
-{% set structure_menu = render_var(url('entity.menu.collection')) %}
+{% set structure_menu_text %}{% trans %}Menus{% endtrans %}{% endset %}
+{% set structure_menu_link = render_var(help_route_link(structure_menu_text, 'entity.menu.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Add a link to a menu. Note that you can also add a link to a menu from the content edit page if menu settings have been configured for the content type.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Structure</em> &gt; <a href="{{ structure_menu }}"><em>Menus</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Structure</em> &gt; {{ structure_menu_link }}.{% endtrans %}</li>
   <li>{% trans %}Locate the desired menu and click <em>Add link</em> in the <em>Operations</em> list.{% endtrans %}</li>
   <li>{% trans %}Enter the <em>Menu link title</em> to be displayed.{% endtrans %}</li>
   <li>{% trans %}Enter the <em>Link</em>, one of the following:{% endtrans %}
@@ -27,7 +28,7 @@ related:
   <li>{% trans %}Optionally, check <em>Show as expanded</em> to automatically show the children of this link (if any) when this link is shown.{% endtrans %}</li>
   <li>{% trans %}Optionally, select the <em>Parent link</em>, if this menu link should be a child of another menu link.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>. You will be returned to the <em>Add link</em> page to add another link.{% endtrans %}</li>
-  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Structure</em> &gt; <a href="{{ structure_menu }}"><em>Menus</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Structure</em> &gt; {{ structure_menu_link }}.{% endtrans %}</li>
   <li>{% trans %}Locate the menu you just added a link to and click <em>Edit</em> in the <em>Operations</em> list.{% endtrans %}</li>
   <li>{% trans %}Verify that the order of links is correct. If it is not, drag menu links until the order is correct, and click <em>Save</em>.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/menu_ui.menu_operations.html.twig b/web/core/modules/help_topics/help_topics/menu_ui.menu_operations.html.twig
index b63bb8543..05c8d9ede 100644
--- a/web/core/modules/help_topics/help_topics/menu_ui.menu_operations.html.twig
+++ b/web/core/modules/help_topics/help_topics/menu_ui.menu_operations.html.twig
@@ -4,12 +4,13 @@ related:
   - menu_ui.content_type_configuration
   - core.menus
 ---
-{% set structure_menu = render_var(url('entity.menu.collection')) %}
+{% set structure_menu_text %}{% trans %}Menus{% endtrans %}{% endset %}
+{% set structure_menu_link = render_var(help_route_link(structure_menu_text, 'entity.menu.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Create a new menu.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administration menu, navigate <em>Structure</em> &gt; <a href="{{ structure_menu }}"> <em>Menus</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administration menu, navigate <em>Structure</em> &gt; {{ structure_menu_link }}.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add menu</em>.{% endtrans %}</li>
   <li>{% trans %}Enter the title for the menu, which is used as the default block title if the menu is displayed as a block. If desired, also edit the machine name of the menu, which is by default derived from the title.{% endtrans %}</li>
   <li>{% trans %}Enter an administrative summary, which is displayed on the <em>Menus</em> page.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/menu_ui.overriding.html.twig b/web/core/modules/help_topics/help_topics/menu_ui.overriding.html.twig
index 692cf765e..f150161ae 100644
--- a/web/core/modules/help_topics/help_topics/menu_ui.overriding.html.twig
+++ b/web/core/modules/help_topics/help_topics/menu_ui.overriding.html.twig
@@ -5,12 +5,13 @@ related:
   - menu_ui.menu_operations
   - core.menus
 ---
-{% set structure_menu = render_var(url('entity.menu.collection')) %}
+{% set structure_menu_text %}{% trans %}Menus{% endtrans %}{% endset %}
+{% set structure_menu_link = render_var(help_route_link(structure_menu_text, 'entity.menu.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Disable menu links or change the order and hierarchy of menu links.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Structure</em> &gt; <a href="{{ structure_menu }}"><em>Menus</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administration menu, navigate to <em>Structure</em> &gt; {{ structure_menu_link }}.{% endtrans %}</li>
   <li>{% trans %}Click <em>Edit menu</em> for the menu that you want to edit.{% endtrans %}</li>
   <li>{% trans %}Drag menu links into a new order, or check/uncheck <em>Enabled</em> to enable or disable menu links.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em> to save your changes.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/migrate_drupal_ui.upgrading.html.twig b/web/core/modules/help_topics/help_topics/migrate_drupal_ui.upgrading.html.twig
index 9aa5015b1..c5dcfa2dc 100644
--- a/web/core/modules/help_topics/help_topics/migrate_drupal_ui.upgrading.html.twig
+++ b/web/core/modules/help_topics/help_topics/migrate_drupal_ui.upgrading.html.twig
@@ -3,14 +3,14 @@ label: 'Migrating data for an upgrade using the user interface'
 related:
   - migrate.overview
 ---
-{% set migrate_drupal_upgrade = render_var(url('migrate_drupal_ui.upgrade')) %}
-{% set migrate_drupal_log = render_var(url('dblog.overview')) %}
+{% set migrate_drupal_upgrade_link_text %}{% trans %}Upgrade{% endtrans %}{% endset %}
+{% set migrate_drupal_upgrade_link = render_var(help_route_link(migrate_drupal_upgrade_link_text, 'migrate_drupal_ui.upgrade')) %}
 {% set migrate_overview_topic = render_var(help_topic_link('migrate.overview')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Migrate data into a new, empty site, as part of an upgrade from an older version of Drupal. See {{ migrate_overview_topic }} for an overview of migrating and upgrading.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em><a href="{{ migrate_drupal_upgrade }}">Upgrade</a></em>.{% endtrans %}</li>
+<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Development</em> &gt; <em>{{ migrate_drupal_upgrade_link }}</em>.{% endtrans %}</li>
 <li>{% trans %}Read the introduction and follow the <em>Preparation steps</em> on the page. Then click <em>Continue</em>.{% endtrans %}</li>
 <li>{% trans %}Select the Drupal version of the source site. Also enter the database credentials and public and private files directories (private file directory is not available when migrating from Drupal 6). Click <em>Review upgrade</em>.{% endtrans %}</li>
 <li>{% trans %}If the next page you see contains a message about conflicting content, that means that the site where you are running the upgrade is not empty. If you continue, you will lose the data in the site. If that is acceptable, click the button to continue; if not, start these steps over in a new, clean Drupal site.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/responsive_image.style.html.twig b/web/core/modules/help_topics/help_topics/responsive_image.style.html.twig
index 980bbb450..9aa7aeb56 100644
--- a/web/core/modules/help_topics/help_topics/responsive_image.style.html.twig
+++ b/web/core/modules/help_topics/help_topics/responsive_image.style.html.twig
@@ -10,12 +10,13 @@ related:
 {% set media_topic = render_var(help_topic_link('core.media')) %}
 {% set image_style_topic = render_var(help_topic_link('image.style')) %}
 {% set breakpoint_overview_topic = render_var(help_topic_link('breakpoint.overview')) %}
-{% set styles = render_var(url('entity.responsive_image_style.collection')) %}
+{% set styles_link_text %}{% trans %}Responsive image styles{% endtrans %}{% endset %}
+{% set styles_link = render_var(help_route_link(styles_link_text, 'entity.responsive_image_style.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure a responsive image style, which can be used to display images at different sizes on different devices. See {{ media_topic }} for an overview of responsive image styles, and {{ breakpoint_overview_topic }} for an overview of breakpoints.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Media</em> &gt; <a href="{{ styles }}"><em>Responsive image styles</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Media</em> &gt; <em>{{ styles_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add responsive image style</em>.{% endtrans %}</li>
   <li>{% trans %}Enter a descriptive <em>Label</em> for your style.{% endtrans %}</li>
   <li>{% trans %}Select a <em>Breakpoint group</em> from the groups defined by your installed themes and modules.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/search.configuring.html.twig b/web/core/modules/help_topics/help_topics/search.configuring.html.twig
index 0c6f7e218..349aa1431 100644
--- a/web/core/modules/help_topics/help_topics/search.configuring.html.twig
+++ b/web/core/modules/help_topics/help_topics/search.configuring.html.twig
@@ -4,13 +4,14 @@ related:
   - search.overview
   - search.index
 ---
-{% set search_settings = render_var(url('entity.search_page.collection')) %}
+{% set search_settings_link_text %}{% trans %}Search pages{% endtrans %}{% endset %}
+{% set search_settings_link = render_var(help_route_link(search_settings_link_text, 'entity.search_page.collection')) %}
 {% set search_index_topic = render_var(help_topic_link('search.index')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Configure one or more search pages.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Search and Metadata</em> &gt; <a href="{{ search_settings }}"><em>Search pages</em></a>.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Search and Metadata</em> &gt; <em>{{ search_settings_link }}</em>.{% endtrans %}</li>
   <li>{% trans %}Scroll down to the <em>Search pages</em> section. You will see a list of the already-configured search pages on your site.{% endtrans %}</li>
   <li>{% trans %}To configure an existing search page, click <em>Edit</em>. Or, to add a new search page, select the <em>Search page type</em> and click <em>Add search page</em>.{% endtrans %}</li>
   <li>{% trans %}Enter the desired <em>Label</em> name and URL <em>Path</em> for the search page.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/search.index.html.twig b/web/core/modules/help_topics/help_topics/search.index.html.twig
index 1451cebdd..e232d6e69 100644
--- a/web/core/modules/help_topics/help_topics/search.index.html.twig
+++ b/web/core/modules/help_topics/help_topics/search.index.html.twig
@@ -5,14 +5,15 @@ related:
   - search.configuring
 ---
 {% set cron_topic = render_var(help_topic_link('core.cron')) %}
-{% set search_settings = render_var(url('entity.search_page.collection')) %}
+{% set search_settings_link_text %}{% trans %}Search pages{% endtrans %}{% endset %}
+{% set search_settings_link = render_var(help_route_link(search_settings_link_text, 'entity.search_page.collection')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
 <p>{% trans %}Manage the search index, and make sure that the site is fully indexed for searching.{% endtrans %}</p>
 <h2>{% trans %}What is the search index?{% endtrans %}</h2>
 <p>{% trans %}The <em>Content</em> and <em>Help</em> search types provided by the core software pre-index their content and store the results in several database tables that are collectively called the <em>search index</em>. The process of indexing renders the content and breaks it up into words, which can then be matched more efficiently with keyword queries when users perform searches. Search indexing happens during cron runs; see {{ cron_topic }} for more information about cron.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Search and Metadata</em> &gt; <a href="{{ search_settings }}"><em>Search pages</em></a>.{% endtrans %}</li>
+<li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Search and Metadata</em> &gt; <em>{{ search_settings_link }}</em>.{% endtrans %}</li>
 <li>{% trans %}Under <em>Indexing throttle</em>, select the <em>Number of items to index per cron run</em>. A smaller number will make cron faster and reduce the possibility of timeout; a larger number will make sure more of your site is indexed in fewer cron runs.{% endtrans %}</li>
 <li>{% trans %}Under <em>Default indexing settings</em>, enter the desired <em>Minimum word length to index</em>. Words smaller than this length will be dropped from both keywords when searching and content when indexing.{% endtrans %}</li>
 <li>{% trans %}If your site uses Chinese, Japanese, or Korean languages, optionally check <em>Simple CJK handling</em> under <em>Default indexing settings</em> to provide some support for these languages.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/help_topics/system.reports.html.twig b/web/core/modules/help_topics/help_topics/system.reports.html.twig
index 411acff82..e5539087d 100644
--- a/web/core/modules/help_topics/help_topics/system.reports.html.twig
+++ b/web/core/modules/help_topics/help_topics/system.reports.html.twig
@@ -10,7 +10,7 @@ related:
 <p>{% trans %}Run reports to learn about the status and health of your site.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Reports</em> &gt; <a href="{{ status_url }}"><em>Status report</em></a> to see a report that summarizes the health and status of your site. If there are any warnings or errors, you will need to fix them.{% endtrans %}</li>
+  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Reports</em> &gt; <a href="{{ status_url }}"><em>Status report</em></a> to see a report that summarizes the health and status of your site. If there are any warnings or errors, you will need to fix them. Take note of any upcoming highly critical security releases that may impact your site.{% endtrans %}</li>
   <li>{% trans %}If you have the core Database Logging module installed, in the <em>Manage</em> administrative menu, navigate to <em>Reports</em> &gt; <em>Recent log messages</em> to see a report of the error and informational messages your site has generated. You can filter the report by <em>Severity</em> to see only the most critical messages, if desired.{% endtrans %}</li>
   <li>{% trans %}If you have the core Update Manager module installed, in the <em>Manage</em> administrative menu, navigate to <em>Reports</em> &gt; <em>Available updates</em> to see a report of the updates that are available for your site software. If <em>Last checked</em> is far in the past, click <em>Check manually</em> to update the report. Scan the report; if Drupal core or any modules or themes have security updates available, you should update them as soon as possible.{% endtrans %}</li>
 </ol>
diff --git a/web/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig b/web/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig
index 65043176e..9f4cd2ac9 100644
--- a/web/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig
+++ b/web/core/modules/help_topics/help_topics/views_ui.bulk_operations.html.twig
@@ -22,7 +22,7 @@ related:
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
   <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Structure</em> &gt; <em>{{ views }}</em>. A list of all views is shown.{% endtrans %}</li>
-  <li>{% trans %}Find the view that you would like to edit, and click <em>Edit</em> from the the dropdown button. Note that bulk operations work best in a view with a Page display, and a Table format.{% endtrans %}</li>
+  <li>{% trans %}Find the view that you would like to edit, and click <em>Edit</em> from the dropdown button. Note that bulk operations work best in a view with a Page display, and a Table format.{% endtrans %}</li>
   <li>{% trans %}If there is not already an <em>Operations bulk form</em> in the <em>Fields</em> list for the view, click <em>Add</em> in the <em>Fields</em> section to add it. (The exact name of the bulk form field will vary, and may contain keywords like "bulk update", "form element" or "operations" -- not to be confused with <em>operations links</em>, which are applied to each item in a row.) If the bulk operations field already exists, click the field name to edit its settings.{% endtrans %}</li>
   <li>{% trans %}Check the action(s) you want to make available in the <em>Selected actions</em> list and click <em>Apply (all displays)</em>.{% endtrans %}</li>
   <li>{% trans %}Verify that the <em>Access</em> settings for the view are at least as restrictive as the permissions necessary to perform the bulk operations. People with permission to see the view, but who don't have permission to do the bulk operations, will experience problems.{% endtrans %}</li>
diff --git a/web/core/modules/help_topics/src/Plugin/HelpSection/HelpTopicSection.php b/web/core/modules/help_topics/src/Plugin/HelpSection/HelpTopicSection.php
index 566aa1e3c..e957d9295 100644
--- a/web/core/modules/help_topics/src/Plugin/HelpSection/HelpTopicSection.php
+++ b/web/core/modules/help_topics/src/Plugin/HelpSection/HelpTopicSection.php
@@ -81,7 +81,7 @@ class HelpTopicSection extends HelpSectionPluginBase implements ContainerFactory
    *
    * @var \Drupal\Core\StringTranslation\TranslationManager
    */
-  protected $stringTranslation;
+  protected $translationManager;
 
   /**
    * Constructs a HelpTopicSection object.
diff --git a/web/core/modules/help_topics/tests/modules/help_topics_test/bad_help_topics/syntax/bad_help_topics.translated.html.twig b/web/core/modules/help_topics/tests/modules/help_topics_test/bad_help_topics/syntax/bad_help_topics.translated.html.twig
index 5b618acde..9cf37db4b 100644
--- a/web/core/modules/help_topics/tests/modules/help_topics_test/bad_help_topics/syntax/bad_help_topics.translated.html.twig
+++ b/web/core/modules/help_topics/tests/modules/help_topics_test/bad_help_topics/syntax/bad_help_topics.translated.html.twig
@@ -3,3 +3,4 @@ label: 'Help topic with untranslated text'
 top_level: true
 ---
 <p>Body goes here</p>
+<p>{% trans %}some translated text too{% endtrans %}</p>
diff --git a/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php b/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
index e7c4ff59b..b22bc4f52 100644
--- a/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
+++ b/web/core/modules/help_topics/tests/src/Functional/HelpTopicTest.php
@@ -57,14 +57,13 @@ class HelpTopicTest extends BrowserTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    // These tests rely on some markup from the 'Seven' theme and we test theme
+    // These tests rely on some markup from the 'stark' theme and we test theme
     // provided help topics.
-    \Drupal::service('theme_installer')->install(['seven', 'help_topics_test_theme']);
-    \Drupal::service('config.factory')->getEditable('system.theme')->set('admin', 'seven')->save();
+    \Drupal::service('theme_installer')->install(['help_topics_test_theme']);
 
     // Place various blocks.
     $settings = [
-      'theme' => 'seven',
+      'theme' => 'stark',
       'region' => 'help',
     ];
     $this->placeBlock('help_block', $settings);
@@ -173,7 +172,7 @@ protected function verifyHelp($response = 200) {
         // Verify page information.
         $name = $info['name'];
         $session->titleEquals($name . ' | Drupal');
-        $session->responseContains('<h1 class="page-title">' . $name . '</h1>');
+        $session->responseContains('<h1>' . $name . '</h1>');
         foreach ($info['tags'] as $tag) {
           $session->responseHeaderContains('X-Drupal-Cache-Tags', $tag);
         }
diff --git a/web/core/modules/help_topics/tests/src/Functional/HelpTopicTranslatedTestBase.php b/web/core/modules/help_topics/tests/src/Functional/HelpTopicTranslatedTestBase.php
index ec5ffce50..05c391db5 100644
--- a/web/core/modules/help_topics/tests/src/Functional/HelpTopicTranslatedTestBase.php
+++ b/web/core/modules/help_topics/tests/src/Functional/HelpTopicTranslatedTestBase.php
@@ -30,15 +30,16 @@ abstract class HelpTopicTranslatedTestBase extends BrowserTestBase {
   protected function setUp() {
     parent::setUp();
 
-    // These tests rely on some markup from the 'Seven' theme.
-    \Drupal::service('theme_installer')->install(['seven']);
+    // These tests rely on some markup from the 'Claro' theme, as well as an
+    // optional block added when Claro is enabled.
+    \Drupal::service('theme_installer')->install(['claro']);
     \Drupal::configFactory()->getEditable('system.theme')
-      ->set('admin', 'seven')
+      ->set('admin', 'claro')
       ->save(TRUE);
 
     // Place various blocks.
     $settings = [
-      'theme' => 'seven',
+      'theme' => 'claro',
       'region' => 'help',
     ];
     $this->placeBlock('help_block', $settings);
diff --git a/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php b/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
index 4d7d07ee0..06d288933 100644
--- a/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
+++ b/web/core/modules/help_topics/tests/src/Functional/HelpTopicsSyntaxTest.php
@@ -3,8 +3,10 @@
 namespace Drupal\Tests\help_topics\Functional;
 
 use Drupal\Core\Extension\ExtensionLifecycle;
+use Drupal\Component\FrontMatter\FrontMatter;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\help_topics\HelpTopicDiscovery;
+use Drupal\help_topics_twig_tester\HelpTestTwigNodeVisitor;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\AssertionFailedError;
 
@@ -27,6 +29,7 @@ class HelpTopicsSyntaxTest extends BrowserTestBase {
   protected static $modules = [
     'help',
     'help_topics',
+    'help_topics_twig_tester',
     'locale',
   ];
 
@@ -68,7 +71,7 @@ public function testHelpTopics() {
     // test can continue.
     $this->assertArrayHasKey('system', $directories, 'System module is being scanned');
     $this->assertArrayHasKey('help', $directories, 'Help module is being scanned');
-    $this->assertArrayHasKey('seven', $directories, 'Seven theme is being scanned');
+    $this->assertArrayHasKey('claro', $directories, 'Claro theme is being scanned');
     $this->assertArrayHasKey('standard', $directories, 'Standard profile is being scanned');
 
     $definitions = (new HelpTopicDiscovery($directories))->getDefinitions();
@@ -98,6 +101,7 @@ public function testHelpTopics() {
    */
   protected function verifyTopic($id, $definitions, $response = 200) {
     $definition = $definitions[$id];
+    HelpTestTwigNodeVisitor::setStateValue('manner', 0);
 
     // Visit the URL for the topic.
     $this->drupalGet('admin/help/topic/' . $id);
@@ -114,7 +118,7 @@ protected function verifyTopic($id, $definitions, $response = 200) {
     $has_top_level_related = FALSE;
     if (isset($definition['related'])) {
       foreach ($definition['related'] as $related_id) {
-        $this->assertArrayHasKey($related_id, $definitions, 'Topic ' . $id . ' is only related to topics that exist (' . $related_id . ')');
+        $this->assertArrayHasKey($related_id, $definitions, 'Topic ' . $id . ' is only related to topics that exist: ' . $related_id);
         $has_top_level_related = $has_top_level_related || !empty($definitions[$related_id]['top_level']);
       }
     }
@@ -125,42 +129,56 @@ protected function verifyTopic($id, $definitions, $response = 200) {
     // Verify that the label is not empty.
     $this->assertNotEmpty($definition['label'], 'Topic ' . $id . ' has a non-empty label');
 
-    // Read in the file so we can run some tests on that.
-    $body = file_get_contents($definition[HelpTopicDiscovery::FILE_KEY]);
-    $this->assertNotEmpty($body, 'Topic ' . $id . ' has a non-empty Twig file');
+    // Test the syntax and contents of the Twig file (without the front
+    // matter, which is tested in other ways above). We need to render the
+    // template several times with variations, so read it in once.
+    $template = file_get_contents($definition[HelpTopicDiscovery::FILE_KEY]);
+    $template_text = FrontMatter::create($template)->getContent();
 
-    // Remove the front matter data (already tested above), and Twig set and
-    // variable printouts from the file.
-    $body = preg_replace('|---.*---|sU', '', $body);
-    $body = preg_replace('|\{\{.*\}\}|sU', '', $body);
-    $body = preg_replace('|\{\% set.*\%\}|sU', '', $body);
-    $body = preg_replace('|\{\% endset \%\}|sU', '', $body);
-    $body = trim($body);
-    $this->assertNotEmpty($body, 'Topic ' . $id . ' Twig file contains some text outside of front matter');
-
-    // Verify that if we remove all the translated text, whitespace, and
-    // HTML tags, there is nothing left (that is, all text is translated).
-    $text = preg_replace('|\{\% trans \%\}.*\{\% endtrans \%\}|sU', '', $body);
-    $text = strip_tags($text);
-    $text = preg_replace('|\s+|', '', $text);
-    $this->assertEmpty($text, 'Topic ' . $id . ' Twig file has all of its text translated');
-
-    // Verify that all of the translated text is locale-safe and valid HTML.
-    $matches = [];
-    preg_match_all('|\{\% trans \%\}(.*)\{\% endtrans \%\}|sU', $body, $matches, PREG_PATTERN_ORDER);
-    foreach ($matches[1] as $string) {
-      $this->assertTrue(locale_string_is_safe($string), 'Topic ' . $id . ' Twig file translatable strings are all exportable');
-      $this->validateHtml($string, $id);
+    // Verify that the body is not empty and is valid HTML.
+    $text = $this->renderHelpTopic($template_text, 'bare_body');
+    $this->assertNotEmpty($text, 'Topic ' . $id . ' contains some text outside of front matter');
+    $this->validateHtml($text, $id);
+    $max_chunk_num = HelpTestTwigNodeVisitor::getState()['max_chunk'];
+    $this->assertTrue($max_chunk_num >= 0, 'Topic ' . $id . ' has at least one translated chunk');
+
+    // Verify that each chunk of the translated text is locale-safe and
+    // valid HTML.
+    $chunk_num = 0;
+    $number_checked = 0;
+    while ($chunk_num <= $max_chunk_num) {
+      $chunk_str = $id . ' section ' . $chunk_num;
+
+      // Render the topic, asking for just one chunk, and extract the chunk.
+      // Note that some chunks may not actually get rendered, if they are inside
+      // set statements, because we skip rendering variable output.
+      HelpTestTwigNodeVisitor::setStateValue('return_chunk', $chunk_num);
+      $text = $this->renderHelpTopic($template_text, 'translated_chunk');
+      $matches = [];
+      $matched = preg_match('|' . HelpTestTwigNodeVisitor::DELIMITER . '(.*)' . HelpTestTwigNodeVisitor::DELIMITER . '|', $text, $matches);
+      if ($matched) {
+        $number_checked++;
+        $text = $matches[1];
+        $this->assertNotEmpty($text, 'Topic ' . $chunk_str . ' contains text');
+
+        // Verify the chunk is OK.
+        $this->assertTrue(locale_string_is_safe($text), 'Topic ' . $chunk_str . ' translatable string is locale-safe');
+        $this->validateHtml($text, $chunk_str);
+      }
+      $chunk_num++;
     }
-
-    // Validate the HTML in the body as a whole.
-    $this->validateHtml($body, $id);
+    $this->assertTrue($number_checked > 0, 'Tested at least one translated chunk in ' . $id);
 
     // Validate the HTML in the body with the translated text replaced by a
     // dummy string, to verify that HTML syntax is not partly in and partly out
     // of the translated text.
-    $text = preg_replace('|\{\% trans \%\}.*\{\% endtrans \%\}|sU', 'dummy', $body);
+    $text = $this->renderHelpTopic($template_text, 'replace_translated');
     $this->validateHtml($text, $id);
+
+    // Verify that if we remove all the translated text, whitespace, and
+    // HTML tags, there is nothing left (that is, all text is translated).
+    $text = preg_replace('|\s+|', '', $this->renderHelpTopic($template_text, 'remove_translated'));
+    $this->assertEmpty($text, 'Topic ' . $id . ' Twig file has all of its text translated');
   }
 
   /**
@@ -245,6 +263,10 @@ protected function verifyBadTopic($id, $definitions) {
           $this->assertStringContainsString('Twig file has all of its text translated', $message);
           break;
 
+        case 'locale':
+          $this->assertStringContainsString('translatable string is locale-safe', $message);
+          break;
+
         case 'h1':
           $this->assertStringContainsString('has no H1 tag', $message);
           break;
@@ -297,4 +319,30 @@ protected function listDirectories($type) {
     return $directories;
   }
 
+  /**
+   * Renders a help topic in a special manner.
+   *
+   * @param string $content
+   *   Template text, without the front matter.
+   * @param string $manner
+   *   The special processing choice for topic rendering.
+   *
+   * @return string
+   *   The rendered topic.
+   */
+  protected function renderHelpTopic(string $content, string $manner) {
+    // Set up the special state variables for rendering.
+    HelpTestTwigNodeVisitor::setStateValue('manner', $manner);
+    HelpTestTwigNodeVisitor::setStateValue('max_chunk', -1);
+    HelpTestTwigNodeVisitor::setStateValue('chunk_count', -1);
+
+    // Add a random comment to the end, to thwart caching, and render. We need
+    // the HelpTestTwigNodeVisitor class to hit it each time we render.
+    $build = [
+      '#type' => 'inline_template',
+      '#template' => $content . "\n{# " . rand() . " #}",
+    ];
+    return (string) \Drupal::service('renderer')->renderPlain($build);
+  }
+
 }
diff --git a/web/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics_test_theme.info.yml b/web/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics_test_theme.info.yml
index 85421a1af..8bdbdc81b 100644
--- a/web/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics_test_theme.info.yml
+++ b/web/core/modules/help_topics/tests/themes/help_topics_test_theme/help_topics_test_theme.info.yml
@@ -1,5 +1,5 @@
 name: Test Help Topics
 type: theme
-base theme: stable
+base theme: stable9
 description: A theme to test help topics.
 version: VERSION
diff --git a/web/core/modules/history/history.module b/web/core/modules/history/history.module
index 02dd964fd..d7ca78246 100644
--- a/web/core/modules/history/history.module
+++ b/web/core/modules/history/history.module
@@ -20,8 +20,10 @@ use Drupal\user\UserInterface;
  *
  * Entities changed within this time may be marked as new, updated, or read,
  * depending on their state for the current user. Defaults to 30 days ago.
+ *
+ * @todo Remove when https://www.drupal.org/node/2006632 lands.
  */
-define('HISTORY_READ_LIMIT', REQUEST_TIME - 30 * 24 * 60 * 60);
+define('HISTORY_READ_LIMIT', ((int) $_SERVER['REQUEST_TIME']) - 30 * 24 * 60 * 60);
 
 /**
  * Implements hook_help().
@@ -109,16 +111,17 @@ function history_write($nid, $account = NULL) {
   }
 
   if ($account->isAuthenticated()) {
+    $request_time = \Drupal::time()->getRequestTime();
     \Drupal::database()->merge('history')
       ->keys([
         'uid' => $account->id(),
         'nid' => $nid,
       ])
-      ->fields(['timestamp' => REQUEST_TIME])
+      ->fields(['timestamp' => $request_time])
       ->execute();
     // Update static cache.
     $history = &drupal_static('history_read_multiple', []);
-    $history[$nid] = REQUEST_TIME;
+    $history[$nid] = $request_time;
   }
 }
 
diff --git a/web/core/modules/history/js/history.js b/web/core/modules/history/js/history.js
index 8e13059da..647866905 100644
--- a/web/core/modules/history/js/history.js
+++ b/web/core/modules/history/js/history.js
@@ -4,24 +4,20 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, storage) {
   var currentUserID = parseInt(drupalSettings.user.uid, 10);
   var secondsIn30Days = 2592000;
   var thirtyDaysAgo = Math.round(new Date().getTime() / 1000) - secondsIn30Days;
   var embeddedLastReadTimestamps = false;
-
   if (drupalSettings.history && drupalSettings.history.lastReadTimestamps) {
     embeddedLastReadTimestamps = drupalSettings.history.lastReadTimestamps;
   }
-
   Drupal.history = {
     fetchTimestamps: function fetchTimestamps(nodeIDs, callback) {
       if (embeddedLastReadTimestamps) {
         callback();
         return;
       }
-
       $.ajax({
         url: Drupal.url('history/get_node_read_timestamps'),
         type: 'POST',
@@ -41,7 +37,6 @@
       if (embeddedLastReadTimestamps && embeddedLastReadTimestamps[nodeID]) {
         return parseInt(embeddedLastReadTimestamps[nodeID], 10);
       }
-
       return parseInt(storage.getItem("Drupal.history.".concat(currentUserID, ".").concat(nodeID)) || 0, 10);
     },
     markAsRead: function markAsRead(nodeID) {
@@ -53,7 +48,6 @@
           if (embeddedLastReadTimestamps && embeddedLastReadTimestamps[nodeID]) {
             return;
           }
-
           storage.setItem("Drupal.history.".concat(currentUserID, ".").concat(nodeID), timestamp);
         }
       });
@@ -62,11 +56,9 @@
       if (contentTimestamp < thirtyDaysAgo) {
         return false;
       }
-
       if (embeddedLastReadTimestamps && embeddedLastReadTimestamps[nodeID]) {
         return contentTimestamp > parseInt(embeddedLastReadTimestamps[nodeID], 10);
       }
-
       var minLastReadTimestamp = parseInt(storage.getItem("Drupal.history.".concat(currentUserID, ".").concat(nodeID)) || 0, 10);
       return contentTimestamp > minLastReadTimestamp;
     }
diff --git a/web/core/modules/history/js/mark-as-read.js b/web/core/modules/history/js/mark-as-read.js
index c3a74f429..b4d651199 100644
--- a/web/core/modules/history/js/mark-as-read.js
+++ b/web/core/modules/history/js/mark-as-read.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (window, Drupal, drupalSettings) {
   window.addEventListener('load', function () {
     if (drupalSettings.history && drupalSettings.history.nodesToMarkAsRead) {
diff --git a/web/core/modules/history/tests/src/Functional/HistoryTest.php b/web/core/modules/history/tests/src/Functional/HistoryTest.php
index 6117a2dd8..0a961908a 100644
--- a/web/core/modules/history/tests/src/Functional/HistoryTest.php
+++ b/web/core/modules/history/tests/src/Functional/HistoryTest.php
@@ -42,6 +42,9 @@ class HistoryTest extends BrowserTestBase {
    */
   protected $testNode;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/image/image.admin.inc b/web/core/modules/image/image.admin.inc
index 178e5464b..9921e7b94 100644
--- a/web/core/modules/image/image.admin.inc
+++ b/web/core/modules/image/image.admin.inc
@@ -27,7 +27,7 @@ function template_preprocess_image_style_preview(&$variables) {
   $variables['style_name'] = $style->label();
 
   // Cache bypass token.
-  $variables['cache_bypass'] = REQUEST_TIME;
+  $variables['cache_bypass'] = \Drupal::time()->getRequestTime();
 
   // Sample image info.
   $sample_width = 160;
diff --git a/web/core/modules/image/image.module b/web/core/modules/image/image.module
index 27713afbb..c83544953 100644
--- a/web/core/modules/image/image.module
+++ b/web/core/modules/image/image.module
@@ -206,7 +206,7 @@ function image_path_flush($path) {
  * @param $include_empty
  *   If TRUE a '- None -' option will be inserted in the options array.
  *
- * @return
+ * @return string[]
  *   Array of image styles both key and value are set to style name.
  */
 function image_style_options($include_empty = TRUE) {
diff --git a/web/core/modules/image/src/Controller/ImageStyleDownloadController.php b/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
index c943452b5..aada27d8e 100644
--- a/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
+++ b/web/core/modules/image/src/Controller/ImageStyleDownloadController.php
@@ -114,6 +114,19 @@ public static function create(ContainerInterface $container) {
   public function deliver(Request $request, $scheme, ImageStyleInterface $image_style) {
     $target = $request->query->get('file');
     $image_uri = $scheme . '://' . $target;
+    $image_uri = $this->streamWrapperManager->normalizeUri($image_uri);
+
+    if ($this->streamWrapperManager->isValidScheme($scheme)) {
+      $normalized_target = $this->streamWrapperManager->getTarget($image_uri);
+      if ($normalized_target !== FALSE) {
+        if (!in_array($scheme, Settings::get('file_sa_core_2023_005_schemes', []))) {
+          $parts = explode('/', $normalized_target);
+          if (array_intersect($parts, ['.', '..'])) {
+            throw new NotFoundHttpException();
+          }
+        }
+      }
+    }
 
     // Check that the style is defined and the scheme is valid.
     $valid = !empty($image_style) && $this->streamWrapperManager->isValidScheme($scheme);
@@ -129,7 +142,8 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st
     // styles/<style_name>/... as structure, so we check if the $target variable
     // starts with styles/.
     $token = $request->query->get(IMAGE_DERIVATIVE_TOKEN, '');
-    $token_is_valid = hash_equals($image_style->getPathToken($image_uri), $token);
+    $token_is_valid = hash_equals($image_style->getPathToken($image_uri), $token)
+      || hash_equals($image_style->getPathToken($scheme . '://' . $target), $token);
     if (!$this->config('image.settings')->get('allow_insecure_derivatives') || strpos(ltrim($target, '\/'), 'styles/') === 0) {
       $valid = $valid && $token_is_valid;
     }
diff --git a/web/core/modules/image/src/Entity/ImageStyle.php b/web/core/modules/image/src/Entity/ImageStyle.php
index f7edba286..b66babe85 100644
--- a/web/core/modules/image/src/Entity/ImageStyle.php
+++ b/web/core/modules/image/src/Entity/ImageStyle.php
@@ -205,11 +205,11 @@ public function buildUri($uri) {
    * {@inheritdoc}
    */
   public function buildUrl($path, $clean_urls = NULL) {
-    $uri = $this->buildUri($path);
-
     /** @var \Drupal\Core\StreamWrapper\StreamWrapperManagerInterface $stream_wrapper_manager */
     $stream_wrapper_manager = \Drupal::service('stream_wrapper_manager');
 
+    $uri = $stream_wrapper_manager->normalizeUri($this->buildUri($path));
+
     // The token query is added even if the
     // 'image.settings:allow_insecure_derivatives' configuration is TRUE, so
     // that the emitted links remain valid if it is changed back to the default
diff --git a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
index 549d6d45c..9f51708b1 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageFormatter.php
@@ -129,24 +129,24 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
       Url::fromRoute('entity.image_style.collection')
     );
     $element['image_style'] = [
-      '#title' => t('Image style'),
+      '#title' => $this->t('Image style'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('image_style'),
-      '#empty_option' => t('None (original image)'),
+      '#empty_option' => $this->t('None (original image)'),
       '#options' => $image_styles,
       '#description' => $description_link->toRenderable() + [
         '#access' => $this->currentUser->hasPermission('administer image styles'),
       ],
     ];
     $link_types = [
-      'content' => t('Content'),
-      'file' => t('File'),
+      'content' => $this->t('Content'),
+      'file' => $this->t('File'),
     ];
     $element['image_link'] = [
-      '#title' => t('Link image to'),
+      '#title' => $this->t('Link image to'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('image_link'),
-      '#empty_option' => t('Nothing'),
+      '#empty_option' => $this->t('Nothing'),
       '#options' => $link_types,
     ];
 
@@ -189,15 +189,15 @@ public function settingsSummary() {
     // their styles in code.
     $image_style_setting = $this->getSetting('image_style');
     if (isset($image_styles[$image_style_setting])) {
-      $summary[] = t('Image style: @style', ['@style' => $image_styles[$image_style_setting]]);
+      $summary[] = $this->t('Image style: @style', ['@style' => $image_styles[$image_style_setting]]);
     }
     else {
-      $summary[] = t('Original image');
+      $summary[] = $this->t('Original image');
     }
 
     $link_types = [
-      'content' => t('Linked to content'),
-      'file' => t('Linked to file'),
+      'content' => $this->t('Linked to content'),
+      'file' => $this->t('Linked to file'),
     ];
     // Display this setting only if image is linked.
     $image_link_setting = $this->getSetting('image_link');
diff --git a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
index de59bacf6..dc4557949 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldFormatter/ImageUrlFormatter.php
@@ -3,8 +3,14 @@
 namespace Drupal\image\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Cache\CacheableMetadata;
+use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\Url;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Plugin implementation of the 'image_url' formatter.
@@ -17,7 +23,66 @@
  *   }
  * )
  */
-class ImageUrlFormatter extends ImageFormatter {
+class ImageUrlFormatter extends ImageFormatterBase {
+
+  /**
+   * The image style entity storage.
+   *
+   * @var \Drupal\image\ImageStyleStorageInterface
+   */
+  protected $imageStyleStorage;
+
+  /**
+   * The current user.
+   *
+   * @var \Drupal\Core\Session\AccountInterface
+   */
+  protected $currentUser;
+
+  /**
+   * Constructs an ImageFormatter object.
+   *
+   * @param string $plugin_id
+   *   The plugin_id for the formatter.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Field\FieldDefinitionInterface $field_definition
+   *   The definition of the field to which the formatter is associated.
+   * @param array $settings
+   *   The formatter settings.
+   * @param string $label
+   *   The formatter label display setting.
+   * @param string $view_mode
+   *   The view mode.
+   * @param array $third_party_settings
+   *   Any third party settings.
+   * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage
+   *   The image style storage.
+   * @param \Drupal\Core\Session\AccountInterface $current_user
+   *   The current user.
+   */
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, EntityStorageInterface $image_style_storage, AccountInterface $current_user) {
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
+    $this->imageStyleStorage = $image_style_storage;
+    $this->currentUser = $current_user;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $plugin_id,
+      $plugin_definition,
+      $configuration['field_definition'],
+      $configuration['settings'],
+      $configuration['label'],
+      $configuration['view_mode'],
+      $configuration['third_party_settings'],
+      $container->get('entity_type.manager')->getStorage('image_style'),
+      $container->get('current_user'),
+    );
+  }
 
   /**
    * {@inheritdoc}
@@ -36,6 +101,22 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     unset($element['image_link'], $element['image_loading']);
 
+    $image_styles = image_style_options(FALSE);
+    $description_link = Link::fromTextAndUrl(
+      $this->t('Configure Image Styles'),
+      Url::fromRoute('entity.image_style.collection')
+    );
+    $element['image_style'] = [
+      '#title' => $this->t('Image style'),
+      '#type' => 'select',
+      '#default_value' => $this->getSetting('image_style'),
+      '#empty_option' => $this->t('None (original image)'),
+      '#options' => $image_styles,
+      '#description' => $description_link->toRenderable() + [
+        '#access' => $this->currentUser->hasPermission('administer image styles'),
+      ],
+    ];
+
     return $element;
   }
 
@@ -43,8 +124,22 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = parent::settingsSummary();
-    return [$summary[0]];
+    $summary = [];
+
+    $image_styles = image_style_options(FALSE);
+    // Unset possible 'No defined styles' option.
+    unset($image_styles['']);
+    // Styles could be lost because of enabled/disabled modules that defines
+    // their styles in code.
+    $image_style_setting = $this->getSetting('image_style');
+    if (isset($image_styles[$image_style_setting])) {
+      $summary[] = $this->t('Image style: @style', ['@style' => $image_styles[$image_style_setting]]);
+    }
+    else {
+      $summary[] = $this->t('Original image');
+    }
+
+    return array_merge($summary, parent::settingsSummary());
   }
 
   /**
diff --git a/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index fa6ea636e..731cdbed4 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -10,6 +10,7 @@
 use Drupal\Core\File\FileSystemInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StreamWrapper\StreamWrapperInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\file\Entity\File;
 use Drupal\file\Plugin\Field\FieldType\FileItem;
@@ -142,20 +143,20 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
     unset($properties['description']);
 
     $properties['alt'] = DataDefinition::create('string')
-      ->setLabel(t('Alternative text'))
-      ->setDescription(t("Alternative image text, for the image's 'alt' attribute."));
+      ->setLabel(new TranslatableMarkup('Alternative text'))
+      ->setDescription(new TranslatableMarkup("Alternative image text, for the image's 'alt' attribute."));
 
     $properties['title'] = DataDefinition::create('string')
-      ->setLabel(t('Title'))
-      ->setDescription(t("Image title text, for the image's 'title' attribute."));
+      ->setLabel(new TranslatableMarkup('Title'))
+      ->setDescription(new TranslatableMarkup("Image title text, for the image's 'title' attribute."));
 
     $properties['width'] = DataDefinition::create('integer')
-      ->setLabel(t('Width'))
-      ->setDescription(t('The width of the image in pixels.'));
+      ->setLabel(new TranslatableMarkup('Width'))
+      ->setDescription(new TranslatableMarkup('The width of the image in pixels.'));
 
     $properties['height'] = DataDefinition::create('integer')
-      ->setLabel(t('Height'))
-      ->setDescription(t('The height of the image in pixels.'));
+      ->setLabel(new TranslatableMarkup('Height'))
+      ->setDescription(new TranslatableMarkup('The height of the image in pixels.'));
 
     return $properties;
   }
@@ -174,15 +175,15 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
     $scheme_options = \Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE);
     $element['uri_scheme'] = [
       '#type' => 'radios',
-      '#title' => t('Upload destination'),
+      '#title' => $this->t('Upload destination'),
       '#options' => $scheme_options,
       '#default_value' => $settings['uri_scheme'],
-      '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
+      '#description' => $this->t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'),
     ];
 
     // Add default_image element.
     static::defaultImageForm($element, $settings);
-    $element['default_image']['#description'] = t('If no image is uploaded, this image will be shown on display.');
+    $element['default_image']['#description'] = $this->t('If no image is uploaded, this image will be shown on display.');
 
     return $element;
   }
@@ -200,14 +201,14 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     $max_resolution = explode('x', $settings['max_resolution']) + ['', ''];
     $element['max_resolution'] = [
       '#type' => 'item',
-      '#title' => t('Maximum image resolution'),
+      '#title' => $this->t('Maximum image resolution'),
       '#element_validate' => [[static::class, 'validateResolution']],
       '#weight' => 4.1,
-      '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image.'),
+      '#description' => $this->t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="http://wikipedia.org/wiki/Exchangeable_image_file_format">EXIF data</a> in the image.'),
     ];
     $element['max_resolution']['x'] = [
       '#type' => 'number',
-      '#title' => t('Maximum width'),
+      '#title' => $this->t('Maximum width'),
       '#title_display' => 'invisible',
       '#default_value' => $max_resolution[0],
       '#min' => 1,
@@ -216,25 +217,25 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['max_resolution']['y'] = [
       '#type' => 'number',
-      '#title' => t('Maximum height'),
+      '#title' => $this->t('Maximum height'),
       '#title_display' => 'invisible',
       '#default_value' => $max_resolution[1],
       '#min' => 1,
-      '#field_suffix' => ' ' . t('pixels'),
+      '#field_suffix' => ' ' . $this->t('pixels'),
       '#suffix' => '</div>',
     ];
 
     $min_resolution = explode('x', $settings['min_resolution']) + ['', ''];
     $element['min_resolution'] = [
       '#type' => 'item',
-      '#title' => t('Minimum image resolution'),
+      '#title' => $this->t('Minimum image resolution'),
       '#element_validate' => [[static::class, 'validateResolution']],
       '#weight' => 4.2,
-      '#description' => t('The minimum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
+      '#description' => $this->t('The minimum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
     ];
     $element['min_resolution']['x'] = [
       '#type' => 'number',
-      '#title' => t('Minimum width'),
+      '#title' => $this->t('Minimum width'),
       '#title_display' => 'invisible',
       '#default_value' => $min_resolution[0],
       '#min' => 1,
@@ -243,11 +244,11 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['min_resolution']['y'] = [
       '#type' => 'number',
-      '#title' => t('Minimum height'),
+      '#title' => $this->t('Minimum height'),
       '#title_display' => 'invisible',
       '#default_value' => $min_resolution[1],
       '#min' => 1,
-      '#field_suffix' => ' ' . t('pixels'),
+      '#field_suffix' => ' ' . $this->t('pixels'),
       '#suffix' => '</div>',
     ];
 
@@ -257,16 +258,16 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     // Add title and alt configuration options.
     $element['alt_field'] = [
       '#type' => 'checkbox',
-      '#title' => t('Enable <em>Alt</em> field'),
+      '#title' => $this->t('Enable <em>Alt</em> field'),
       '#default_value' => $settings['alt_field'],
-      '#description' => t('Short description of the image used by screen readers and displayed when the image is not loaded. Enabling this field is recommended.'),
+      '#description' => $this->t('Short description of the image used by screen readers and displayed when the image is not loaded. Enabling this field is recommended.'),
       '#weight' => 9,
     ];
     $element['alt_field_required'] = [
       '#type' => 'checkbox',
-      '#title' => t('<em>Alt</em> field required'),
+      '#title' => $this->t('<em>Alt</em> field required'),
       '#default_value' => $settings['alt_field_required'],
-      '#description' => t('Making this field required is recommended.'),
+      '#description' => $this->t('Making this field required is recommended.'),
       '#weight' => 10,
       '#states' => [
         'visible' => [
@@ -276,14 +277,14 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['title_field'] = [
       '#type' => 'checkbox',
-      '#title' => t('Enable <em>Title</em> field'),
+      '#title' => $this->t('Enable <em>Title</em> field'),
       '#default_value' => $settings['title_field'],
-      '#description' => t('The title attribute is used as a tooltip when the mouse hovers over the image. Enabling this field is not recommended as it can cause problems with screen readers.'),
+      '#description' => $this->t('The title attribute is used as a tooltip when the mouse hovers over the image. Enabling this field is not recommended as it can cause problems with screen readers.'),
       '#weight' => 11,
     ];
     $element['title_field_required'] = [
       '#type' => 'checkbox',
-      '#title' => t('<em>Title</em> field required'),
+      '#title' => $this->t('<em>Title</em> field required'),
       '#default_value' => $settings['title_field_required'],
       '#weight' => 12,
       '#states' => [
@@ -295,7 +296,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     // Add default_image element.
     static::defaultImageForm($element, $settings);
-    $element['default_image']['#description'] = t("If no image is uploaded, this image will be shown on display and will override the field's default image.");
+    $element['default_image']['#description'] = $this->t("If no image is uploaded, this image will be shown on display and will override the field's default image.");
 
     return $element;
   }
@@ -395,9 +396,9 @@ public static function validateResolution($element, FormStateInterface $form_sta
     if (!empty($element['x']['#value']) || !empty($element['y']['#value'])) {
       foreach (['x', 'y'] as $dimension) {
         if (!$element[$dimension]['#value']) {
-          // We expect the field name placeholder value to be wrapped in t()
+          // We expect the field name placeholder value to be wrapped in $this->t()
           // here, so it won't be escaped again as it's already marked safe.
-          $form_state->setError($element[$dimension], t('Both a height and width value must be specified in the @name field.', ['@name' => $element['#title']]));
+          $form_state->setError($element[$dimension], new TranslatableMarkup('Both a height and width value must be specified in the @name field.', ['@name' => $element['#title']]));
           return;
         }
       }
@@ -419,7 +420,7 @@ public static function validateResolution($element, FormStateInterface $form_sta
   protected function defaultImageForm(array &$element, array $settings) {
     $element['default_image'] = [
       '#type' => 'details',
-      '#title' => t('Default image'),
+      '#title' => $this->t('Default image'),
       '#open' => TRUE,
     ];
     // Convert the stored UUID to a FID.
@@ -430,8 +431,8 @@ protected function defaultImageForm(array &$element, array $settings) {
     }
     $element['default_image']['uuid'] = [
       '#type' => 'managed_file',
-      '#title' => t('Image'),
-      '#description' => t('Image to be shown if no image is uploaded.'),
+      '#title' => $this->t('Image'),
+      '#description' => $this->t('Image to be shown if no image is uploaded.'),
       '#default_value' => $fids,
       '#upload_location' => $settings['uri_scheme'] . '://default_images/',
       '#element_validate' => [
@@ -442,15 +443,15 @@ protected function defaultImageForm(array &$element, array $settings) {
     ];
     $element['default_image']['alt'] = [
       '#type' => 'textfield',
-      '#title' => t('Alternative text'),
-      '#description' => t('Short description of the image used by screen readers and displayed when the image is not loaded. This is important for accessibility.'),
+      '#title' => $this->t('Alternative text'),
+      '#description' => $this->t('Short description of the image used by screen readers and displayed when the image is not loaded. This is important for accessibility.'),
       '#default_value' => $settings['default_image']['alt'],
       '#maxlength' => 512,
     ];
     $element['default_image']['title'] = [
       '#type' => 'textfield',
-      '#title' => t('Title'),
-      '#description' => t('The title attribute is used as a tooltip when the mouse hovers over the image.'),
+      '#title' => $this->t('Title'),
+      '#description' => $this->t('The title attribute is used as a tooltip when the mouse hovers over the image.'),
       '#default_value' => $settings['default_image']['title'],
       '#maxlength' => 1024,
     ];
diff --git a/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php b/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
index 5a602339a..3037615d8 100644
--- a/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldWidget/ImageWidget.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Image\ImageFactory;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Render\ElementInfoManagerInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\file\Entity\File;
 use Drupal\file\Plugin\Field\FieldWidget\FileWidget;
 use Drupal\image\Entity\ImageStyle;
@@ -71,12 +72,12 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     $element = parent::settingsForm($form, $form_state);
 
     $element['preview_image_style'] = [
-      '#title' => t('Preview image style'),
+      '#title' => $this->t('Preview image style'),
       '#type' => 'select',
       '#options' => image_style_options(FALSE),
-      '#empty_option' => '<' . t('no preview') . '>',
+      '#empty_option' => '<' . $this->t('no preview') . '>',
       '#default_value' => $this->getSetting('preview_image_style'),
-      '#description' => t('The preview image will be shown while editing the content.'),
+      '#description' => $this->t('The preview image will be shown while editing the content.'),
       '#weight' => 15,
     ];
 
@@ -96,10 +97,10 @@ public function settingsSummary() {
     // their styles in code.
     $image_style_setting = $this->getSetting('preview_image_style');
     if (isset($image_styles[$image_style_setting])) {
-      $preview_image_style = t('Preview image style: @style', ['@style' => $image_styles[$image_style_setting]]);
+      $preview_image_style = $this->t('Preview image style: @style', ['@style' => $image_styles[$image_style_setting]]);
     }
     else {
-      $preview_image_style = t('No preview');
+      $preview_image_style = $this->t('No preview');
     }
 
     array_unshift($summary, $preview_image_style);
@@ -256,10 +257,10 @@ public static function process($element, FormStateInterface $form_state, $form)
 
     // Add the additional alt and title fields.
     $element['alt'] = [
-      '#title' => t('Alternative text'),
+      '#title' => new TranslatableMarkup('Alternative text'),
       '#type' => 'textfield',
       '#default_value' => $item['alt'] ?? '',
-      '#description' => t('Short description of the image used by screen readers and displayed when the image is not loaded. This is important for accessibility.'),
+      '#description' => new TranslatableMarkup('Short description of the image used by screen readers and displayed when the image is not loaded. This is important for accessibility.'),
       // @see https://www.drupal.org/node/465106#alt-text
       '#maxlength' => 512,
       '#weight' => -12,
@@ -269,9 +270,9 @@ public static function process($element, FormStateInterface $form_state, $form)
     ];
     $element['title'] = [
       '#type' => 'textfield',
-      '#title' => t('Title'),
+      '#title' => new TranslatableMarkup('Title'),
       '#default_value' => $item['title'] ?? '',
-      '#description' => t('The title is used as a tool tip when the user hovers the mouse over the image.'),
+      '#description' => new TranslatableMarkup('The title is used as a tool tip when the user hovers the mouse over the image.'),
       '#maxlength' => 1024,
       '#weight' => -11,
       '#access' => (bool) $item['fids'] && $element['#title_field'],
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php
index 61fb4d478..4e848326c 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ConvertImageEffect.php
@@ -67,7 +67,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     );
     $form['extension'] = [
       '#type' => 'select',
-      '#title' => t('Convert to'),
+      '#title' => $this->t('Convert to'),
       '#default_value' => $this->configuration['extension'],
       '#required' => TRUE,
       '#options' => $options,
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php
index cdacda96b..8f99de881 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/CropImageEffect.php
@@ -59,21 +59,21 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     $form = parent::buildConfigurationForm($form, $form_state);
     $form['anchor'] = [
       '#type' => 'radios',
-      '#title' => t('Anchor'),
+      '#title' => $this->t('Anchor'),
       '#options' => [
-        'left-top' => t('Top left'),
-        'center-top' => t('Top center'),
-        'right-top' => t('Top right'),
-        'left-center' => t('Center left'),
-        'center-center' => t('Center'),
-        'right-center' => t('Center right'),
-        'left-bottom' => t('Bottom left'),
-        'center-bottom' => t('Bottom center'),
-        'right-bottom' => t('Bottom right'),
+        'left-top' => $this->t('Top left'),
+        'center-top' => $this->t('Top center'),
+        'right-top' => $this->t('Top right'),
+        'left-center' => $this->t('Center left'),
+        'center-center' => $this->t('Center'),
+        'right-center' => $this->t('Center right'),
+        'left-bottom' => $this->t('Bottom left'),
+        'center-bottom' => $this->t('Bottom center'),
+        'right-bottom' => $this->t('Bottom right'),
       ],
       '#theme' => 'image_anchor',
       '#default_value' => $this->configuration['anchor'],
-      '#description' => t('The part of the image that will be retained during the crop.'),
+      '#description' => $this->t('The part of the image that will be retained during the crop.'),
     ];
     return $form;
   }
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php
index dba34298d..26f70705d 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ResizeImageEffect.php
@@ -66,17 +66,17 @@ public function defaultConfiguration() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['width'] = [
       '#type' => 'number',
-      '#title' => t('Width'),
+      '#title' => $this->t('Width'),
       '#default_value' => $this->configuration['width'],
-      '#field_suffix' => ' ' . t('pixels'),
+      '#field_suffix' => ' ' . $this->t('pixels'),
       '#required' => TRUE,
       '#min' => 1,
     ];
     $form['height'] = [
       '#type' => 'number',
-      '#title' => t('Height'),
+      '#title' => $this->t('Height'),
       '#default_value' => $this->configuration['height'],
-      '#field_suffix' => ' ' . t('pixels'),
+      '#field_suffix' => ' ' . $this->t('pixels'),
       '#required' => TRUE,
       '#min' => 1,
     ];
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
index 7e394a3cc..d6453dbf9 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/RotateImageEffect.php
@@ -83,24 +83,24 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     $form['degrees'] = [
       '#type' => 'number',
       '#default_value' => $this->configuration['degrees'],
-      '#title' => t('Rotation angle'),
-      '#description' => t('The number of degrees the image should be rotated. Positive numbers are clockwise, negative are counter-clockwise.'),
+      '#title' => $this->t('Rotation angle'),
+      '#description' => $this->t('The number of degrees the image should be rotated. Positive numbers are clockwise, negative are counter-clockwise.'),
       '#field_suffix' => '°',
       '#required' => TRUE,
     ];
     $form['bgcolor'] = [
       '#type' => 'textfield',
       '#default_value' => $this->configuration['bgcolor'],
-      '#title' => t('Background color'),
-      '#description' => t('The background color to use for exposed areas of the image. Use web-style hex colors (#FFFFFF for white, #000000 for black). Leave blank for transparency on image types that support it.'),
+      '#title' => $this->t('Background color'),
+      '#description' => $this->t('The background color to use for exposed areas of the image. Use web-style hex colors (#FFFFFF for white, #000000 for black). Leave blank for transparency on image types that support it.'),
       '#size' => 7,
       '#maxlength' => 7,
     ];
     $form['random'] = [
       '#type' => 'checkbox',
       '#default_value' => $this->configuration['random'],
-      '#title' => t('Randomize'),
-      '#description' => t('Randomize the rotation angle for each image. The angle specified above is used as a maximum.'),
+      '#title' => $this->t('Randomize'),
+      '#description' => $this->t('Randomize the rotation angle for each image. The angle specified above is used as a maximum.'),
     ];
     return $form;
   }
diff --git a/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php b/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php
index bfb6d942f..13e5aaa2d 100644
--- a/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php
+++ b/web/core/modules/image/src/Plugin/ImageEffect/ScaleImageEffect.php
@@ -69,8 +69,8 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     $form['upscale'] = [
       '#type' => 'checkbox',
       '#default_value' => $this->configuration['upscale'],
-      '#title' => t('Allow Upscaling'),
-      '#description' => t('Let scale make images larger than their original size.'),
+      '#title' => $this->t('Allow Upscaling'),
+      '#description' => $this->t('Let scale make images larger than their original size.'),
     ];
     return $form;
   }
diff --git a/web/core/modules/image/src/Routing/ImageStyleRoutes.php b/web/core/modules/image/src/Routing/ImageStyleRoutes.php
index ed414e23e..acb0502b0 100644
--- a/web/core/modules/image/src/Routing/ImageStyleRoutes.php
+++ b/web/core/modules/image/src/Routing/ImageStyleRoutes.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Routing\Route;
 
 /**
- * Defines a route subscriber to register a url for serving image styles.
+ * Defines a route subscriber to register a URL for serving image styles.
  */
 class ImageStyleRoutes implements ContainerInjectionInterface {
 
diff --git a/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyAjaxFormatter.php b/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyAjaxFormatter.php
index cebc54bec..0952a48dc 100644
--- a/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyAjaxFormatter.php
+++ b/web/core/modules/image/tests/modules/image_module_test/src/Plugin/Field/FieldFormatter/DummyAjaxFormatter.php
@@ -24,7 +24,7 @@ class DummyAjaxFormatter extends FormatterBase {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('Renders nothing');
+    $summary[] = $this->t('Renders nothing');
     return $summary;
   }
 
diff --git a/web/core/modules/image/tests/modules/image_module_test/src/Plugin/ImageEffect/AjaxTestImageEffect.php b/web/core/modules/image/tests/modules/image_module_test/src/Plugin/ImageEffect/AjaxTestImageEffect.php
index a18c2637c..1a8cfd7ee 100644
--- a/web/core/modules/image/tests/modules/image_module_test/src/Plugin/ImageEffect/AjaxTestImageEffect.php
+++ b/web/core/modules/image/tests/modules/image_module_test/src/Plugin/ImageEffect/AjaxTestImageEffect.php
@@ -33,7 +33,7 @@ public function defaultConfiguration() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['test_parameter'] = [
       '#type' => 'number',
-      '#title' => t('Test parameter'),
+      '#title' => $this->t('Test parameter'),
       '#default_value' => $this->configuration['test_parameter'],
       '#min' => 0,
     ];
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php b/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
index bd33f0e32..7502129a7 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldDisplayTest.php
@@ -206,6 +206,9 @@ public function _testImageFieldFormatters($scheme) {
       $this->drupalLogout();
       $this->drupalGet(ImageStyle::load('thumbnail')->buildUrl($image_uri));
       $this->assertSession()->statusCodeEquals(403);
+
+      // Log in again.
+      $this->drupalLogin($this->adminUser);
     }
 
     // Test the image URL formatter without an image style.
@@ -220,6 +223,18 @@ public function _testImageFieldFormatters($scheme) {
     $display_options['settings']['image_style'] = 'thumbnail';
     $expected_url = \Drupal::service('file_url_generator')->transformRelative(ImageStyle::load('thumbnail')->buildUrl($image_uri));
     $this->assertEquals($expected_url, $node->{$field_name}->view($display_options)[0]['#markup']);
+
+    // Test the settings summary.
+    $display_options = [
+      'type' => 'image_url',
+      'settings' => [
+        'image_style' => 'thumbnail',
+      ],
+    ];
+    $display = \Drupal::service('entity_display.repository')->getViewDisplay('node', $node->getType(), 'default');
+    $display->setComponent($field_name, $display_options)->save();
+    $this->drupalGet("admin/structure/types/manage/" . $node->getType() . "/display");
+    $this->assertSession()->responseContains('Image style: Thumbnail (100×100)');
   }
 
   /**
diff --git a/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php b/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
index 82cef6e77..05c47ddce 100644
--- a/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
+++ b/web/core/modules/image/tests/src/Functional/ImageFieldTestBase.php
@@ -45,6 +45,9 @@ abstract class ImageFieldTestBase extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/image/tests/src/Kernel/ImageItemTest.php b/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
index 288474721..8c2de5d0c 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageItemTest.php
@@ -40,6 +40,9 @@ class ImageItemTest extends FieldKernelTestBase {
    */
   protected $imageFactory;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php b/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
index 1f9654e71..6fc83f07a 100644
--- a/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
+++ b/web/core/modules/image/tests/src/Kernel/ImageThemeFunctionTest.php
@@ -51,6 +51,9 @@ class ImageThemeFunctionTest extends KernelTestBase {
    */
   protected $imageFactory;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -187,7 +190,7 @@ public function testImageAltFunctionality() {
     // Test using alt directly with alt attribute.
     $image_with_alt_property = [
       '#theme' => 'image',
-      '#uri' => '/core/themes/bartik/logo.svg',
+      '#uri' => '/core/themes/olivero/logo.svg',
       '#alt' => 'Regular alt',
       '#title' => 'Test title',
       '#width' => '50%',
@@ -202,7 +205,7 @@ public function testImageAltFunctionality() {
     // Test using alt attribute inside attributes.
     $image_with_alt_attribute_alt_attribute = [
       '#theme' => 'image',
-      '#uri' => '/core/themes/bartik/logo.svg',
+      '#uri' => '/core/themes/olivero/logo.svg',
       '#width' => '50%',
       '#height' => '50%',
       '#attributes' => [
@@ -220,7 +223,7 @@ public function testImageAltFunctionality() {
     // Test using alt attribute as property and inside attributes.
     $image_with_alt_attribute_both = [
       '#theme' => 'image',
-      '#uri' => '/core/themes/bartik/logo.svg',
+      '#uri' => '/core/themes/olivero/logo.svg',
       '#width' => '50%',
       '#height' => '50%',
       '#alt' => 'Kitten sustainable',
diff --git a/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php b/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
index 89009fd05..7cb8ad8d9 100644
--- a/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Migrate/d6/MigrateImageCacheTest.php
@@ -85,19 +85,19 @@ public function testPassingMigration() {
   public function testMissingEffectPlugin() {
     Database::getConnection('default', 'migrate')->insert("imagecache_action")
       ->fields([
-       'presetid',
-       'weight',
-       'module',
-       'action',
-       'data',
-     ])
+        'presetid',
+        'weight',
+        'module',
+        'action',
+        'data',
+      ])
       ->values([
-       'presetid' => '1',
-       'weight' => '0',
-       'module' => 'imagecache',
-       'action' => 'imagecache_deprecated_scale',
-       'data' => 'a:3:{s:3:"fit";s:7:"outside";s:5:"width";s:3:"200";s:6:"height";s:3:"200";}',
-     ])->execute();
+        'presetid' => '1',
+        'weight' => '0',
+        'module' => 'imagecache',
+        'action' => 'imagecache_deprecated_scale',
+        'data' => 'a:3:{s:3:"fit";s:7:"outside";s:5:"width";s:3:"200";s:6:"height";s:3:"200";}',
+      ])->execute();
 
     $this->startCollectingMessages();
     $this->executeMigration('d6_imagecache_presets');
@@ -113,22 +113,22 @@ public function testMissingEffectPlugin() {
   public function testInvalidCropValues() {
     Database::getConnection('default', 'migrate')->insert("imagecache_action")
       ->fields([
-       'presetid',
-       'weight',
-       'module',
-       'action',
-       'data',
-     ])
+        'presetid',
+        'weight',
+        'module',
+        'action',
+        'data',
+      ])
       ->values([
-       'presetid' => '1',
-       'weight' => '0',
-       'module' => 'imagecache',
-       'action' => 'imagecache_crop',
-       'data' => serialize([
-         'xoffset' => '10',
-         'yoffset' => '10',
-       ]),
-     ])->execute();
+        'presetid' => '1',
+        'weight' => '0',
+        'module' => 'imagecache',
+        'action' => 'imagecache_crop',
+        'data' => serialize([
+          'xoffset' => '10',
+          'yoffset' => '10',
+        ]),
+      ])->execute();
 
     $this->startCollectingMessages();
     $this->executeMigration('d6_imagecache_presets');
diff --git a/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php b/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php
index 04a605c7f..7c0bc9ff5 100644
--- a/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php
+++ b/web/core/modules/image/tests/src/Kernel/Views/RelationshipUserImageDataTest.php
@@ -38,6 +38,9 @@ class RelationshipUserImageDataTest extends ViewsKernelTestBase {
    */
   public static $testViews = ['test_image_user_image_data'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp($import_test_views);
 
diff --git a/web/core/modules/image/tests/src/Unit/ImageStyleTest.php b/web/core/modules/image/tests/src/Unit/ImageStyleTest.php
index eef2acb8a..6ea87730a 100644
--- a/web/core/modules/image/tests/src/Unit/ImageStyleTest.php
+++ b/web/core/modules/image/tests/src/Unit/ImageStyleTest.php
@@ -53,7 +53,7 @@ protected function getImageStyleMock($image_effect_id, $image_effect, $stubs = [
     $effectManager->expects($this->any())
       ->method('createInstance')
       ->with($image_effect_id)
-      ->will($this->returnValue($image_effect));
+      ->willReturn($image_effect);
     $default_stubs = ['getImageEffectPluginManager', 'fileDefaultScheme'];
     $image_style = $this->getMockBuilder('\Drupal\image\Entity\ImageStyle')
       ->setConstructorArgs([
@@ -65,7 +65,7 @@ protected function getImageStyleMock($image_effect_id, $image_effect, $stubs = [
 
     $image_style->expects($this->any())
       ->method('getImageEffectPluginManager')
-      ->will($this->returnValue($effectManager));
+      ->willReturn($effectManager);
     $image_style->expects($this->any())
       ->method('fileDefaultScheme')
       ->willReturnCallback([$this, 'fileDefaultScheme']);
@@ -82,12 +82,12 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue($provider));
+      ->willReturn($provider);
     $this->entityTypeManager = $this->createMock('\Drupal\Core\Entity\EntityTypeManagerInterface');
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
   }
 
   /**
@@ -101,7 +101,7 @@ public function testGetDerivativeExtension() {
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
-      ->will($this->returnValue('png'));
+      ->willReturn('png');
 
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect);
 
@@ -124,7 +124,7 @@ public function testBuildUri() {
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
-      ->will($this->returnValue('png'));
+      ->willReturn('png');
 
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect);
     $this->assertEquals($image_style->buildUri('public://test.jpeg'), 'public://styles/' . $image_style->id() . '/public/test.jpeg.png');
@@ -157,15 +157,15 @@ public function testGetPathToken() {
       ->getMock();
     $image_effect->expects($this->any())
       ->method('getDerivativeExtension')
-      ->will($this->returnValue('png'));
+      ->willReturn('png');
 
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, ['getPrivateKey', 'getHashSalt']);
     $image_style->expects($this->any())
       ->method('getPrivateKey')
-      ->will($this->returnValue($private_key));
+      ->willReturn($private_key);
     $image_style->expects($this->any())
       ->method('getHashSalt')
-      ->will($this->returnValue($hash_salt));
+      ->willReturn($hash_salt);
 
     // Assert the extension has been added to the URI before creating the token.
     $this->assertEquals($image_style->getPathToken('public://test.jpeg.png'), $image_style->getPathToken('public://test.jpeg'));
@@ -184,10 +184,10 @@ public function testGetPathToken() {
     $image_style = $this->getImageStyleMock($image_effect_id, $image_effect, ['getPrivateKey', 'getHashSalt']);
     $image_style->expects($this->any())
       ->method('getPrivateKey')
-      ->will($this->returnValue($private_key));
+      ->willReturn($private_key);
     $image_style->expects($this->any())
       ->method('getHashSalt')
-      ->will($this->returnValue($hash_salt));
+      ->willReturn($hash_salt);
     // Assert no extension has been added to the uri before creating the token.
     $this->assertNotEquals($image_style->getPathToken('public://test.jpeg.png'), $image_style->getPathToken('public://test.jpeg'));
     $this->assertNotEquals(substr(Crypt::hmacBase64($image_style->id() . ':' . 'public://test.jpeg.png', $private_key . $hash_salt), 0, 8), $image_style->getPathToken('public://test.jpeg'));
diff --git a/web/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php b/web/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php
index 138b94db7..1fd9679f0 100644
--- a/web/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php
+++ b/web/core/modules/image/tests/src/Unit/PageCache/DenyPrivateImageStyleDownloadTest.php
@@ -42,6 +42,9 @@ class DenyPrivateImageStyleDownloadTest extends UnitTestCase {
    */
   protected $routeMatch;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $this->policy = new DenyPrivateImageStyleDownload($this->routeMatch);
@@ -58,7 +61,7 @@ protected function setUp(): void {
   public function testPrivateImageStyleDownloadPolicy($expected_result, $route_name) {
     $this->routeMatch->expects($this->once())
       ->method('getRouteName')
-      ->will($this->returnValue($route_name));
+      ->willReturn($route_name);
 
     $actual_result = $this->policy->check($this->response, $this->request);
     $this->assertSame($expected_result, $actual_result);
diff --git a/web/core/modules/inline_form_errors/src/FormErrorHandler.php b/web/core/modules/inline_form_errors/src/FormErrorHandler.php
index 23cef62c4..da286108b 100644
--- a/web/core/modules/inline_form_errors/src/FormErrorHandler.php
+++ b/web/core/modules/inline_form_errors/src/FormErrorHandler.php
@@ -108,7 +108,7 @@ protected function displayErrorMessages(array $form, FormStateInterface $form_st
     if (!empty($error_links)) {
       $render_array = [
         [
-         '#markup' => $this->formatPlural(count($error_links), '1 error has been found: ', '@count errors have been found: '),
+          '#markup' => $this->formatPlural(count($error_links), '1 error has been found: ', '@count errors have been found: '),
         ],
         [
           '#theme' => 'item_list',
diff --git a/web/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php b/web/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php
index 9d1feea4e..3fb60bff1 100644
--- a/web/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php
+++ b/web/core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php
@@ -7,11 +7,13 @@
 use Drupal\Core\Field\FieldItemInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\TypedData\FieldItemDataDefinitionInterface;
+use Drupal\Core\TypedData\DataDefinitionInterface;
 use Drupal\Core\TypedData\TypedDataInternalPropertiesHelper;
 use Drupal\jsonapi\Normalizer\Value\CacheableNormalization;
 use Drupal\jsonapi\ResourceType\ResourceType;
 use Drupal\serialization\Normalizer\CacheableNormalizerInterface;
 use Drupal\serialization\Normalizer\SerializedColumnNormalizerTrait;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 
 /**
@@ -128,6 +130,46 @@ public function denormalize($data, $class, $format = NULL, array $context = [])
 
     $data_internal = [];
     if (!empty($property_definitions)) {
+      $writable_properties = array_keys(array_filter($property_definitions, function (DataDefinitionInterface $data_definition) : bool {
+        return !$data_definition->isReadOnly();
+      }));
+      $invalid_property_names = [];
+      foreach ($data as $property_name => $property_value) {
+        if (!isset($property_definitions[$property_name])) {
+          $alt = static::getAlternatives($property_name, $writable_properties);
+          $invalid_property_names[$property_name] = reset($alt);
+        }
+      }
+      if (!empty($invalid_property_names)) {
+        $suggestions = array_values(array_filter($invalid_property_names));
+        // Only use the "Did you mean"-style error message if there is a
+        // suggestion for every invalid property name.
+        if (count($suggestions) === count($invalid_property_names)) {
+          $format = count($invalid_property_names) === 1
+            ? "The property '%s' does not exist on the '%s' field of type '%s'. Did you mean '%s'?"
+            : "The properties '%s' do not exist on the '%s' field of type '%s'. Did you mean '%s'?";
+          throw new UnexpectedValueException(sprintf(
+            $format,
+            implode("', '", array_keys($invalid_property_names)),
+            $item_definition->getFieldDefinition()->getName(),
+            $item_definition->getFieldDefinition()->getType(),
+            implode("', '", $suggestions)
+          ));
+        }
+        else {
+          $format = count($invalid_property_names) === 1
+            ? "The property '%s' does not exist on the '%s' field of type '%s'. Writable properties are: '%s'."
+            : "The properties '%s' do not exist on the '%s' field of type '%s'. Writable properties are: '%s'.";
+          throw new UnexpectedValueException(sprintf(
+            $format,
+            implode("', '", array_keys($invalid_property_names)),
+            $item_definition->getFieldDefinition()->getName(),
+            $item_definition->getFieldDefinition()->getType(),
+            implode("', '", $writable_properties)
+          ));
+        }
+      }
+
       foreach ($data as $property_name => $property_value) {
         $property_value_class = $property_definitions[$property_name]->getClass();
         $data_internal[$property_name] = $denormalize_property($property_name, $property_value, $property_value_class, $format, $context);
@@ -140,6 +182,37 @@ public function denormalize($data, $class, $format = NULL, array $context = [])
     return $data_internal;
   }
 
+  /**
+   * Provides alternatives for a given array and key.
+   *
+   * @param string $search_key
+   *   The search key to get alternatives for.
+   * @param array $keys
+   *   The search space to search for alternatives in.
+   *
+   * @return string[]
+   *   An array of strings with suitable alternatives.
+   *
+   * @see \Drupal\Component\DependencyInjection\Container::getAlternatives()
+   */
+  private static function getAlternatives(string $search_key, array $keys) : array {
+    // $search_key is user input and could be longer than the 255 string length
+    // limit of levenshtein().
+    if (strlen($search_key) > 255) {
+      return [];
+    }
+
+    $alternatives = [];
+    foreach ($keys as $key) {
+      $lev = levenshtein($search_key, $key);
+      if ($lev <= strlen($search_key) / 3 || strpos($key, $search_key) !== FALSE) {
+        $alternatives[] = $key;
+      }
+    }
+
+    return $alternatives;
+  }
+
   /**
    * Gets a field item instance for use with SerializedColumnNormalizerTrait.
    *
diff --git a/web/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php b/web/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php
index 8abd200e1..b102b9960 100644
--- a/web/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php
+++ b/web/core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php
@@ -51,6 +51,12 @@ public function __construct(AccountInterface $current_user) {
   public function normalize($object, $format = NULL, array $context = []) {
     $cacheability = new CacheableMetadata();
     $cacheability->addCacheableDependency($object);
+
+    $cacheability->addCacheTags(['config:system.logging']);
+    if (\Drupal::config('system.logging')->get('error_level') === ERROR_REPORTING_DISPLAY_VERBOSE) {
+      $cacheability->setCacheMaxAge(0);
+    }
+
     return new HttpExceptionNormalizerValue($cacheability, static::rasterizeValueRecursive($this->buildErrorObjects($object)));
   }
 
@@ -89,7 +95,10 @@ protected function buildErrorObjects(HttpException $exception) {
     if ($exception->getCode() !== 0) {
       $error['code'] = (string) $exception->getCode();
     }
-    if ($this->currentUser->hasPermission('access site reports')) {
+
+    $is_verbose_reporting = \Drupal::config('system.logging')->get('error_level') === ERROR_REPORTING_DISPLAY_VERBOSE;
+    $site_report_access = $this->currentUser->hasPermission('access site reports');
+    if ($site_report_access && $is_verbose_reporting) {
       // The following information may contain sensitive information. Only show
       // it to authorized users.
       $error['source'] = [
diff --git a/web/core/modules/jsonapi/src/Normalizer/NormalizerBase.php b/web/core/modules/jsonapi/src/Normalizer/NormalizerBase.php
index 37f639bdb..e3769b8ba 100644
--- a/web/core/modules/jsonapi/src/Normalizer/NormalizerBase.php
+++ b/web/core/modules/jsonapi/src/Normalizer/NormalizerBase.php
@@ -62,9 +62,10 @@ protected static function rasterizeValueRecursive($value) {
    */
   protected function checkFormat($format = NULL) {
     // The parent implementation allows format-specific normalizers to be used
-    // for formatless normalization. The JSON:API module wants to be cautious.
-    // Hence it only allows its normalizers to be used for the JSON:API format,
-    // to avoid JSON:API-specific normalizations showing up in the REST API.
+    // for normalization without a format. The JSON:API module wants to be
+    // cautious. Hence it only allows its normalizers to be used for the
+    // JSON:API format, to avoid JSON:API-specific normalizations showing up in
+    // the REST API.
     return $format === $this->format;
   }
 
diff --git a/web/core/modules/jsonapi/src/ResourceType/ResourceTypeRepositoryInterface.php b/web/core/modules/jsonapi/src/ResourceType/ResourceTypeRepositoryInterface.php
index 8a66abf5a..43db5b512 100644
--- a/web/core/modules/jsonapi/src/ResourceType/ResourceTypeRepositoryInterface.php
+++ b/web/core/modules/jsonapi/src/ResourceType/ResourceTypeRepositoryInterface.php
@@ -30,7 +30,7 @@ public function all();
    *   The ID for the bundle to find. If the entity type does not have a bundle,
    *   then the entity type ID again.
    *
-   * @return \Drupal\jsonapi\ResourceType\ResourceType
+   * @return \Drupal\jsonapi\ResourceType\ResourceType|null
    *   The requested JSON:API resource type, if it exists. NULL otherwise.
    *
    * @see \Drupal\Core\Entity\EntityInterface::bundle()
diff --git a/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php b/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
index ee5024604..f88fa4141 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/JsonApiRegressionTest.php
@@ -1027,43 +1027,6 @@ public function testRecursionDetectedWhenResponseContainsViolationsFrom3042124()
     $this->assertSame(sprintf('title: This value should not be null.'), $data['errors'][0]['detail']);
   }
 
-  /**
-   * Ensure that child comments can be retrieved via JSON:API.
-   */
-  public function testLeakedCacheMetadataViaRdfFromIssue3053827() {
-    $this->assertTrue($this->container->get('module_installer')->install(['comment', 'rdf'], TRUE), 'Installed modules.');
-    $this->addDefaultCommentField('node', 'article', 'comment', CommentItemInterface::OPEN, 'comment');
-    $this->rebuildAll();
-
-    // Create data.
-    Node::create([
-      'title' => 'Commented Node',
-      'type' => 'article',
-    ])->save();
-    $default_values = [
-      'entity_id' => 1,
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'status' => 1,
-    ];
-    $parent = Comment::create(['subject' => 'Marlin'] + $default_values);
-    $parent->save();
-    $child = Comment::create(['subject' => 'Nemo', 'pid' => $parent->id()] + $default_values);
-    $child->save();
-
-    // Test.
-    $user = $this->drupalCreateUser(['access comments']);
-    $request_options = [
-      RequestOptions::AUTH => [
-        $user->getAccountName(),
-        $user->pass_raw,
-      ],
-    ];
-    // Requesting the comment collection should succeed.
-    $response = $this->request('GET', Url::fromUri('internal:/jsonapi/comment/comment'), $request_options);
-    $this->assertSame(200, $response->getStatusCode());
-  }
-
   /**
    * Ensure non-translatable entities can be PATCHed with an alternate language.
    *
@@ -1430,4 +1393,99 @@ public function testFilteringEntitiesByEntityReferenceTargetId() {
     $this->assertSame('Article created by ' . $users[1]->uuid(), $document['data'][0]['attributes']['title']);
   }
 
+  /**
+   * Ensure PATCHing a non-existing field property results in a helpful error.
+   *
+   * @see https://www.drupal.org/project/drupal/issues/3127883
+   */
+  public function testPatchInvalidFieldPropertyFromIssue3127883() {
+    $this->config('jsonapi.settings')->set('read_only', FALSE)->save(TRUE);
+
+    // Set up data model.
+    $this->drupalCreateContentType(['type' => 'page']);
+    $this->rebuildAll();
+
+    // Create data.
+    $node = Node::create([
+      'title' => 'foo',
+      'type' => 'page',
+      'body' => [
+        'format' => 'plain_text',
+        'value' => 'Hello World',
+      ],
+    ]);
+    $node->save();
+
+    // Test.
+    $user = $this->drupalCreateUser(['bypass node access']);
+    $url = Url::fromUri('internal:/jsonapi/node/page/' . $node->uuid());
+    $request_options = [
+      RequestOptions::HEADERS => [
+        'Content-Type' => 'application/vnd.api+json',
+        'Accept' => 'application/vnd.api+json',
+      ],
+      RequestOptions::AUTH => [$user->getAccountName(), $user->pass_raw],
+      RequestOptions::JSON => [
+        'data' => [
+          'type' => 'node--page',
+          'id' => $node->uuid(),
+          'attributes' => [
+            'title' => 'Updated title',
+            'body' => [
+              'value' => 'Hello World … still.',
+              // Intentional typo in the property name!
+              'form' => 'plain_text',
+              // Another intentional typo.
+              // cSpell:disable-next-line
+              'sumary' => 'Boring old "Hello World".',
+              // And finally, one that is completely absurd.
+              'foobarbaz' => '<script>alert("HI!");</script>',
+            ],
+          ],
+        ],
+      ],
+    ];
+    $response = $this->request('PATCH', $url, $request_options);
+
+    // Assert a helpful error response is present.
+    $data = Json::decode((string) $response->getBody());
+    $this->assertSame(422, $response->getStatusCode());
+    $this->assertNotNull($data);
+    // cSpell:disable-next-line
+    $this->assertSame("The properties 'form', 'sumary', 'foobarbaz' do not exist on the 'body' field of type 'text_with_summary'. Writable properties are: 'value', 'format', 'summary'.", $data['errors'][0]['detail']);
+
+    $request_options = [
+      RequestOptions::HEADERS => [
+        'Content-Type' => 'application/vnd.api+json',
+        'Accept' => 'application/vnd.api+json',
+      ],
+      RequestOptions::AUTH => [$user->getAccountName(), $user->pass_raw],
+      RequestOptions::JSON => [
+        'data' => [
+          'type' => 'node--page',
+          'id' => $node->uuid(),
+          'attributes' => [
+            'title' => 'Updated title',
+            'body' => [
+              'value' => 'Hello World … still.',
+              // Intentional typo in the property name!
+              'form' => 'plain_text',
+              // Another intentional typo.
+              // cSpell:disable-next-line
+              'sumary' => 'Boring old "Hello World".',
+            ],
+          ],
+        ],
+      ],
+    ];
+    $response = $this->request('PATCH', $url, $request_options);
+
+    // Assert a helpful error response is present.
+    $data = Json::decode((string) $response->getBody());
+    $this->assertSame(422, $response->getStatusCode());
+    $this->assertNotNull($data);
+    // cSpell:disable-next-line
+    $this->assertSame("The properties 'form', 'sumary' do not exist on the 'body' field of type 'text_with_summary'. Did you mean 'format', 'summary'?", $data['errors'][0]['detail']);
+  }
+
 }
diff --git a/web/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php b/web/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php
deleted file mode 100644
index 61e0f378e..000000000
--- a/web/core/modules/jsonapi/tests/src/Functional/RdfMappingTest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Drupal\Tests\jsonapi\Functional;
-
-use Drupal\Core\Url;
-use Drupal\node\Entity\NodeType;
-use Drupal\rdf\Entity\RdfMapping;
-
-/**
- * JSON:API integration test for the "RdfMapping" config entity type.
- *
- * @group jsonapi
- */
-class RdfMappingTest extends ConfigEntityResourceTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['node', 'rdf'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $entityTypeId = 'rdf_mapping';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $resourceTypeName = 'rdf_mapping--rdf_mapping';
-
-  /**
-   * {@inheritdoc}
-   *
-   * @var \Drupal\rdf\RdfMappingInterface
-   */
-  protected $entity;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUpAuthorization($method) {
-    $this->grantPermissionsToTestedRole(['administer site configuration']);
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function createEntity() {
-    // Create a "Camelids" node type.
-    $camelids = NodeType::create([
-      'name' => 'Camelids',
-      'type' => 'camelids',
-    ]);
-
-    $camelids->save();
-
-    // Create the RDF mapping.
-    $llama = RdfMapping::create([
-      'targetEntityType' => 'node',
-      'bundle' => 'camelids',
-    ]);
-    $llama->setBundleMapping([
-      'types' => ['sioc:Item', 'foaf:Document'],
-    ])
-      ->setFieldMapping('title', [
-        'properties' => ['dc:title'],
-      ])
-      ->setFieldMapping('created', [
-        'properties' => ['dc:date', 'dc:created'],
-        'datatype' => 'xsd:dateTime',
-        'datatype_callback' => ['callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value'],
-      ])
-      ->save();
-
-    return $llama;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getExpectedDocument() {
-    $self_url = Url::fromUri('base:/jsonapi/rdf_mapping/rdf_mapping/' . $this->entity->uuid())->setAbsolute()->toString(TRUE)->getGeneratedUrl();
-    return [
-      'jsonapi' => [
-        'meta' => [
-          'links' => [
-            'self' => ['href' => 'http://jsonapi.org/format/1.0/'],
-          ],
-        ],
-        'version' => '1.0',
-      ],
-      'links' => [
-        'self' => ['href' => $self_url],
-      ],
-      'data' => [
-        'id' => $this->entity->uuid(),
-        'type' => 'rdf_mapping--rdf_mapping',
-        'links' => [
-          'self' => ['href' => $self_url],
-        ],
-        'attributes' => [
-          'bundle' => 'camelids',
-          'dependencies' => [
-            'config' => [
-              'node.type.camelids',
-            ],
-            'module' => [
-              'node',
-            ],
-          ],
-          'fieldMappings' => [
-            'title' => [
-              'properties' => [
-                'dc:title',
-              ],
-            ],
-            'created' => [
-              'properties' => [
-                'dc:date',
-                'dc:created',
-              ],
-              'datatype' => 'xsd:dateTime',
-              'datatype_callback' => [
-                'callable' => 'Drupal\rdf\CommonDataConverter::dateIso8601Value',
-              ],
-            ],
-          ],
-          'langcode' => 'en',
-          'status' => TRUE,
-          'targetEntityType' => 'node',
-          'types' => [
-            'sioc:Item',
-            'foaf:Document',
-          ],
-          'drupal_internal__id' => 'node.camelids',
-        ],
-      ],
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getPostDocument() {
-    // @todo Update in https://www.drupal.org/node/2300677.
-    return [];
-  }
-
-}
diff --git a/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php b/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
index 2f358158f..f00b9a467 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/ResourceTestBase.php
@@ -221,6 +221,8 @@ public function setUp() {
 
     $this->serializer = $this->container->get('jsonapi.serializer');
 
+    $this->config('system.logging')->set('error_level', ERROR_REPORTING_HIDE)->save();
+
     // Ensure the anonymous user role has no permissions at all.
     $user_role = Role::load(RoleInterface::ANONYMOUS_ID);
     foreach ($user_role->getPermissions() as $permission) {
@@ -607,21 +609,14 @@ protected static function getExpectedCollectionCacheability(AccountInterface $ac
   /**
    * Sets up the necessary authorization.
    *
-   * In case of a test verifying publicly accessible REST resources: grant
-   * permissions to the anonymous user role.
-   *
-   * In case of a test verifying behavior when using a particular authentication
-   * provider: create a user with a particular set of permissions.
-   *
    * Because of the $method parameter, it's possible to first set up
-   * authentication for only GET, then add POST, et cetera. This then also
+   * authorization for only GET, then add POST, et cetera. This then also
    * allows for verifying a 403 in case of missing authorization.
    *
    * @param string $method
-   *   The HTTP method for which to set up authentication.
+   *   The HTTP method for which to set up authorization.
    *
-   * @see ::grantPermissionsToAnonymousRole()
-   * @see ::grantPermissionsToAuthenticatedRole()
+   * @see ::grantPermissionsToTestedRole()
    */
   abstract protected function setUpAuthorization($method);
 
@@ -732,7 +727,14 @@ protected function assertResourceResponse($expected_status_code, $expected_docum
     // Expected cache tags: X-Drupal-Cache-Tags header.
     $this->assertSame($expected_cache_tags !== FALSE, $response->hasHeader('X-Drupal-Cache-Tags'));
     if (is_array($expected_cache_tags)) {
-      $this->assertEqualsCanonicalizing($expected_cache_tags, explode(' ', $response->getHeader('X-Drupal-Cache-Tags')[0]));
+      $actual_cache_tags = explode(' ', $response->getHeader('X-Drupal-Cache-Tags')[0]);
+
+      $tag = 'config:system.logging';
+      if (!in_array($tag, $expected_cache_tags) && in_array($tag, $actual_cache_tags)) {
+        $expected_cache_tags[] = $tag;
+      }
+
+      $this->assertEqualsCanonicalizing($expected_cache_tags, $actual_cache_tags);
     }
 
     // Expected cache contexts: X-Drupal-Cache-Contexts header.
diff --git a/web/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php b/web/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php
index afabfeefb..a2bf45c71 100644
--- a/web/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php
+++ b/web/core/modules/jsonapi/tests/src/Functional/RestJsonApiUnsupported.php
@@ -65,9 +65,7 @@ protected function setUpAuthorization($method) {
   public function setUp(): void {
     parent::setUp();
 
-    // Set up a HTTP client that accepts relative URLs.
-    $this->httpClient = $this->container->get('http_client_factory')
-      ->fromOptions(['base_uri' => $this->baseUrl]);
+    $this->config('system.logging')->set('error_level', ERROR_REPORTING_HIDE)->save();
 
     // Create a "Camelids" node type.
     NodeType::create([
@@ -103,7 +101,7 @@ public function testApiJsonNotSupportedInRest() {
       400,
       FALSE,
       $response,
-      ['4xx-response', 'config:user.role.anonymous', 'http_response', 'node:1'],
+      ['4xx-response', 'config:system.logging', 'config:user.role.anonymous', 'http_response', 'node:1'],
       ['url.query_args:_format', 'url.site', 'user.permissions'],
       'MISS',
       'MISS'
diff --git a/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php b/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
index c459aa275..be9f88310 100644
--- a/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
+++ b/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/JsonApiDocumentTopLevelNormalizerTest.php
@@ -24,8 +24,6 @@
 use Drupal\user\Entity\Role;
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
-use Symfony\Component\HttpFoundation\ParameterBag;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
@@ -195,7 +193,7 @@ protected function setUp(): void {
     $this->node = Node::create([
       'title' => 'dummy_title',
       'type' => 'article',
-      'uid' => 1,
+      'uid' => $this->user,
       'body' => [
         'format' => 'plain_text',
         'value' => $this->randomStringValidate(42),
@@ -259,7 +257,7 @@ public function tearDown(): void {
    * @covers ::normalize
    */
   public function testNormalize() {
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
 
     $resource_object = ResourceObject::createFromEntity($resource_type, $this->node);
     $includes = $this->includeResolver->resolve($resource_object, 'uid,field_tags,field_image');
@@ -356,61 +354,16 @@ public function testNormalize() {
     );
   }
 
-  /**
-   * @covers ::normalize
-   */
-  public function testNormalizeRelated() {
-    $this->markTestIncomplete('This fails and should be fixed by https://www.drupal.org/project/drupal/issues/3213752');
-
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
-    $request->query = new ParameterBag([
-      'fields' => [
-        'user--user' => 'name,roles',
-      ],
-      'include' => 'roles',
-    ]);
-    $document_wrapper = $this->prophesize(JsonApiDocumentTopLevel::class);
-    $author = $this->node->get('uid')->entity;
-    $document_wrapper->getData()->willReturn($author);
-
-    $jsonapi_doc_object = $this
-      ->getNormalizer()
-      ->normalize(
-        $document_wrapper->reveal(),
-        'api_json',
-        [
-          'resource_type' => $resource_type,
-          'account' => NULL,
-        ]
-      );
-    $normalized = $jsonapi_doc_object->getNormalization();
-    $this->assertSame($normalized['data']['attributes']['name'], 'user1');
-    $this->assertEquals($normalized['data']['id'], User::load(1)->uuid());
-    $this->assertEquals('user--user', $normalized['data']['type']);
-    // Make sure that the cache tags for the includes and the requested entities
-    // are bubbling as expected.
-    $this->assertSame(['user:1'], $jsonapi_doc_object->getCacheTags());
-    $this->assertSame(Cache::PERMANENT, $jsonapi_doc_object->getCacheMaxAge());
-  }
-
   /**
    * @covers ::normalize
    */
   public function testNormalizeUuid() {
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
     $resource_object = ResourceObject::createFromEntity($resource_type, $this->node);
     $include_param = 'uid,field_tags';
     $includes = $this->includeResolver->resolve($resource_object, $include_param);
     $document_wrapper = new JsonApiDocumentTopLevel(new ResourceObjectData([$resource_object], 1), $includes, new LinkCollection([]));
 
-    $request->query = new ParameterBag([
-      'fields' => [
-        'node--article' => 'title,node_type,uid,field_tags',
-        'user--user' => 'name',
-      ],
-      'include' => $include_param,
-    ]);
-
     $jsonapi_doc_object = $this
       ->getNormalizer()
       ->normalize(
@@ -467,8 +420,7 @@ public function testNormalizeException() {
   }
 
   /**
-   * Test the message and exceptions thrown when we are requesting additional
-   * field values for Label only resource.
+   * Tests the message and exceptions when requesting a Label only resource.
    */
   public function testAliasFieldRouteException() {
     $this->assertSame('uid', $this->resourceTypeRepository->getByTypeName('node--article')->getPublicName('uid'));
@@ -487,11 +439,12 @@ public function testAliasFieldRouteException() {
     $this->assertSame('user_roles', $this->resourceTypeRepository->getByTypeName('user--user')->getPublicName('roles'));
 
     // Create the request to fetch the articles and fetch included user.
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
     $user = User::load($this->node->getOwnerId());
 
     $resource_object = ResourceObject::createFromEntity($resource_type, $this->node);
-    [$request, $user_resource_type] = $this->generateProphecies('user', 'user');
+    $user_resource_type = $this->container->get('jsonapi.resource_type.repository')->get('user', 'user');
+
     $resource_object_user = LabelOnlyResourceObject::createFromEntity($user_resource_type, $user);
     $includes = $this->includeResolver->resolve($resource_object_user, 'user_roles');
 
@@ -534,7 +487,7 @@ public function testAliasFieldRouteException() {
    * @covers ::normalize
    */
   public function testNormalizeConfig() {
-    [$request, $resource_type] = $this->generateProphecies('node_type', 'node_type');
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node_type', 'node_type');
     $resource_object = ResourceObject::createFromEntity($resource_type, $this->nodeType);
     $document_wrapper = new JsonApiDocumentTopLevel(new ResourceObjectData([$resource_object], 1), new NullIncludedData(), new LinkCollection([]));
 
@@ -567,7 +520,7 @@ public function testNormalizeConfig() {
   public function testDenormalize() {
     $payload = '{"data":{"type":"article","attributes":{"title":"Testing article"}}}';
 
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
     $node = $this
       ->getNormalizer()
       ->denormalize(Json::decode($payload), NULL, 'api_json', [
@@ -636,8 +589,7 @@ public function testDenormalizeUuid() {
       [$payload_data, $expected] = $this->denormalizeUuidProviderBuilder($configuration);
       $payload = Json::encode($payload_data);
 
-      [$request, $resource_type] = $this->generateProphecies('node', 'article');
-      $this->container->get('request_stack')->push($request);
+      $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
       try {
         $node = $this
           ->getNormalizer()
@@ -706,8 +658,7 @@ public function testDenormalizeInvalidTypeAndNoType() {
 
     // Test relationship member with invalid type.
     $payload = Json::encode($payload_data);
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
-    $this->container->get('request_stack')->push($request);
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
     try {
       $this
         ->getNormalizer()
@@ -725,8 +676,7 @@ public function testDenormalizeInvalidTypeAndNoType() {
     unset($payload_data['data']['relationships']['field_tags']['data'][0]['type']);
 
     $payload = Json::encode($payload_data);
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
-    $this->container->get('request_stack')->push($request);
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
     try {
       $this->container->get('jsonapi_test_normalizers_kernel.jsonapi_document_toplevel')
         ->denormalize(Json::decode($payload), NULL, 'api_json', [
@@ -800,15 +750,11 @@ protected function denormalizeUuidProviderBuilder(array $options) {
    *
    * @param \Drupal\Core\Cache\CacheableMetadata $expected_metadata
    *   The expected cacheable metadata.
-   * @param array|null $fields
-   *   Fields to include in the response, keyed by resource type.
-   * @param array|null $includes
-   *   Resources paths to include in the response.
    *
    * @dataProvider testCacheableMetadataProvider
    */
-  public function testCacheableMetadata(CacheableMetadata $expected_metadata, $fields = NULL, $includes = NULL) {
-    [$request, $resource_type] = $this->generateProphecies('node', 'article');
+  public function testCacheableMetadata(CacheableMetadata $expected_metadata) {
+    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get('node', 'article');
     $resource_object = ResourceObject::createFromEntity($resource_type, $this->node);
     $context = [
       'resource_type' => $resource_type,
@@ -840,17 +786,6 @@ public function testCacheableMetadataProvider() {
     ];
   }
 
-  /**
-   * Decorates a request with sparse fieldsets and includes.
-   */
-  protected function decorateRequest(Request $request, array $fields = NULL, array $includes = NULL) {
-    $parameters = new ParameterBag();
-    $parameters->add($fields ? ['fields' => $fields] : []);
-    $parameters->add($includes ? ['include' => $includes] : []);
-    $request->query = $parameters;
-    return $request;
-  }
-
   /**
    * Helper to load the normalizer.
    */
@@ -862,23 +797,4 @@ protected function getNormalizer() {
     return $normalizer_service;
   }
 
-  /**
-   * Generates the prophecies for the mocked entity request.
-   *
-   * @param string $entity_type_id
-   *   The ID of the entity type. Ex: node.
-   * @param string $bundle
-   *   The bundle. Ex: article.
-   *
-   * @return array
-   *   A numeric array containing the request and the ResourceType.
-   *
-   * @throws \Exception
-   */
-  protected function generateProphecies($entity_type_id, $bundle) {
-    $resource_type = $this->container->get('jsonapi.resource_type.repository')->get($entity_type_id, $bundle);
-
-    return [new Request(), $resource_type];
-  }
-
 }
diff --git a/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/LinkCollectionNormalizerTest.php b/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/LinkCollectionNormalizerTest.php
index 4282b6294..9a8d96d31 100644
--- a/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/LinkCollectionNormalizerTest.php
+++ b/web/core/modules/jsonapi/tests/src/Kernel/Normalizer/LinkCollectionNormalizerTest.php
@@ -46,7 +46,7 @@ class LinkCollectionNormalizerTest extends KernelTestBase {
   protected $testUsers;
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   protected static $modules = [
     'jsonapi',
@@ -56,7 +56,7 @@ class LinkCollectionNormalizerTest extends KernelTestBase {
   ];
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   protected function setUp(): void {
     parent::setUp();
diff --git a/web/core/modules/jsonapi/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php b/web/core/modules/jsonapi/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php
index 550396719..40f439194 100644
--- a/web/core/modules/jsonapi/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php
+++ b/web/core/modules/jsonapi/tests/src/Kernel/ResourceType/ResourceTypeRepositoryTest.php
@@ -114,8 +114,7 @@ public function testCaching() {
   }
 
   /**
-   * Ensures that a naming conflict in the mapping causes an exception to be
-   * thrown.
+   * Ensures that a naming conflict in mapping causes an exception to be thrown.
    *
    * @covers ::getFields
    * @dataProvider getFieldsProvider
diff --git a/web/core/modules/jsonapi/tests/src/Unit/Normalizer/HttpExceptionNormalizerTest.php b/web/core/modules/jsonapi/tests/src/Unit/Normalizer/HttpExceptionNormalizerTest.php
index 928fdf851..5c061fe51 100644
--- a/web/core/modules/jsonapi/tests/src/Unit/Normalizer/HttpExceptionNormalizerTest.php
+++ b/web/core/modules/jsonapi/tests/src/Unit/Normalizer/HttpExceptionNormalizerTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\jsonapi\Unit\Normalizer;
 
+use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\jsonapi\Normalizer\HttpExceptionNormalizer;
 use Drupal\Tests\UnitTestCase;
@@ -26,6 +28,11 @@ public function testNormalize() {
     $request_stack->getCurrentRequest()->willReturn(Request::create('http://localhost/'));
     $container = $this->prophesize(ContainerInterface::class);
     $container->get('request_stack')->willReturn($request_stack->reveal());
+    $config = $this->prophesize(ImmutableConfig::class);
+    $config->get('error_level')->willReturn(ERROR_REPORTING_DISPLAY_VERBOSE);
+    $config_factory = $this->prophesize(ConfigFactory::class);
+    $config_factory->get('system.logging')->willReturn($config->reveal());
+    $container->get('config.factory')->willReturn($config_factory->reveal());
     \Drupal::setContainer($container->reveal());
     $exception = new AccessDeniedHttpException('lorem', NULL, 13);
     $current_user = $this->prophesize(AccountInterface::class);
diff --git a/web/core/modules/language/language.admin.js b/web/core/modules/language/language.admin.js
index 4ae06b194..c5886e7a0 100644
--- a/web/core/modules/language/language.admin.js
+++ b/web/core/modules/language/language.admin.js
@@ -4,18 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.negotiationLanguage = {
     attach: function attach() {
       var $configForm = $('#language-negotiation-configure-form');
       var inputSelector = 'input[name$="[configurable]"]';
-
       function toggleTable(checkbox) {
         var $checkbox = $(checkbox);
         $checkbox.closest('.table-language-group').find('table, .tabledrag-toggle-weight').toggle($checkbox.prop('checked'));
       }
-
       $(once('negotiation-language-admin-bind', $configForm)).on('change', inputSelector, function (event) {
         toggleTable(event.target);
       });
diff --git a/web/core/modules/language/migrations/d6_language_content_settings.yml b/web/core/modules/language/migrations/d6_language_content_settings.yml
index 9d307d13e..ce8732b6a 100644
--- a/web/core/modules/language/migrations/d6_language_content_settings.yml
+++ b/web/core/modules/language/migrations/d6_language_content_settings.yml
@@ -8,8 +8,8 @@ source:
   constants:
     target_type: 'node'
 process:
-# Ignore i18n_node_options_[node_type] options not available in Drupal 8,
-# i18n_required_node and i18n_newnode_current
+  # Ignore i18n_node_options_[node_type] options not available in Drupal 8,
+  # i18n_required_node and i18n_newnode_current
   target_bundle: type
   target_entity_type_id: 'constants/target_type'
   default_langcode:
diff --git a/web/core/modules/language/migrations/d7_language_content_settings.yml b/web/core/modules/language/migrations/d7_language_content_settings.yml
index dcc91b59e..3a8b2ba8e 100644
--- a/web/core/modules/language/migrations/d7_language_content_settings.yml
+++ b/web/core/modules/language/migrations/d7_language_content_settings.yml
@@ -8,8 +8,8 @@ source:
   constants:
     target_type: 'node'
 process:
-# Ignore i18n_node_options_[node_type] options not available in Drupal 8,
-# i18n_required_node and i18n_newnode_current
+  # Ignore i18n_node_options_[node_type] options not available in Drupal 8,
+  # i18n_required_node and i18n_newnode_current
   target_bundle: type
   target_entity_type_id: 'constants/target_type'
   default_langcode:
diff --git a/web/core/modules/language/src/ConfigurableLanguageManager.php b/web/core/modules/language/src/ConfigurableLanguageManager.php
index b72f9b370..c4187aaf6 100644
--- a/web/core/modules/language/src/ConfigurableLanguageManager.php
+++ b/web/core/modules/language/src/ConfigurableLanguageManager.php
@@ -410,25 +410,27 @@ public function getLanguageSwitchLinks($type, Url $url) {
         if ($reflector->implementsInterface('\Drupal\language\LanguageSwitcherInterface')) {
           $original_languages = $this->negotiatedLanguages;
           $result = $this->negotiator->getNegotiationMethodInstance($method_id)->getLanguageSwitchLinks($this->requestStack->getCurrentRequest(), $type, $url);
-          $result = array_filter($result, function (array $link): bool {
-            $url = $link['url'] ?? NULL;
-            $language = $link['language'] ?? NULL;
-            if ($language instanceof LanguageInterface) {
-              $this->negotiatedLanguages[LanguageInterface::TYPE_CONTENT] = $language;
-              $this->negotiatedLanguages[LanguageInterface::TYPE_INTERFACE] = $language;
-            }
-            try {
-              return $url instanceof Url && $url->access();
-            }
-            catch (\Exception $e) {
-              return FALSE;
-            }
-          });
-          $this->negotiatedLanguages = $original_languages;
 
           if (!empty($result)) {
             // Allow modules to provide translations for specific links.
             $this->moduleHandler->alter('language_switch_links', $result, $type, $url);
+
+            $result = array_filter($result, function (array $link): bool {
+              $url = $link['url'] ?? NULL;
+              $language = $link['language'] ?? NULL;
+              if ($language instanceof LanguageInterface) {
+                $this->negotiatedLanguages[LanguageInterface::TYPE_CONTENT] = $language;
+                $this->negotiatedLanguages[LanguageInterface::TYPE_INTERFACE] = $language;
+              }
+              try {
+                return $url instanceof Url && $url->access();
+              }
+              catch (\Exception $e) {
+                return FALSE;
+              }
+            });
+            $this->negotiatedLanguages = $original_languages;
+
             $links = (object) ['links' => $result, 'method_id' => $method_id];
             break;
           }
diff --git a/web/core/modules/language/src/Entity/ConfigurableLanguage.php b/web/core/modules/language/src/Entity/ConfigurableLanguage.php
index 5dbdeda0e..c8f246bf9 100644
--- a/web/core/modules/language/src/Entity/ConfigurableLanguage.php
+++ b/web/core/modules/language/src/Entity/ConfigurableLanguage.php
@@ -166,7 +166,7 @@ public function postSave(EntityStorageInterface $storage, $update = TRUE) {
   /**
    * {@inheritdoc}
    *
-   * @throws \DeleteDefaultLanguageException
+   * @throws \Drupal\language\Exception\DeleteDefaultLanguageException
    *   Exception thrown if we're trying to delete the default language entity.
    *   This is not allowed as a site must have a default language.
    */
diff --git a/web/core/modules/language/src/Form/NegotiationConfigureForm.php b/web/core/modules/language/src/Form/NegotiationConfigureForm.php
index 6af8c1458..2b808d54d 100644
--- a/web/core/modules/language/src/Form/NegotiationConfigureForm.php
+++ b/web/core/modules/language/src/Form/NegotiationConfigureForm.php
@@ -308,8 +308,8 @@ protected function configureFormTable(array &$form, $type) {
           $table_form['#show_operations'] = TRUE;
         }
         $table_form['operation'][$method_id] = [
-         '#type' => 'operations',
-         '#links' => $config_op,
+          '#type' => 'operations',
+          '#links' => $config_op,
         ];
       }
     }
diff --git a/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php b/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
index 512f22bde..a5d5ecbb8 100644
--- a/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
+++ b/web/core/modules/language/src/HttpKernel/PathProcessorLanguage.php
@@ -26,7 +26,7 @@ class PathProcessorLanguage implements InboundPathProcessorInterface, OutboundPa
   protected $config;
 
   /**
-   * Language manager for retrieving the url language type.
+   * Language manager for retrieving the URL language type.
    *
    * @var \Drupal\language\ConfigurableLanguageManagerInterface
    */
diff --git a/web/core/modules/language/src/LanguageListBuilder.php b/web/core/modules/language/src/LanguageListBuilder.php
index f73673866..290e699c2 100644
--- a/web/core/modules/language/src/LanguageListBuilder.php
+++ b/web/core/modules/language/src/LanguageListBuilder.php
@@ -103,9 +103,9 @@ public function getFormId() {
    */
   public function buildHeader() {
     $header = [
-        'label' => t('Name'),
-        'default' => t('Default'),
-      ] + parent::buildHeader();
+      'label' => t('Name'),
+      'default' => t('Default'),
+    ] + parent::buildHeader();
     return $header;
   }
 
diff --git a/web/core/modules/language/src/LanguageNegotiationMethodInterface.php b/web/core/modules/language/src/LanguageNegotiationMethodInterface.php
index 0488516f2..2c1cf3ac8 100644
--- a/web/core/modules/language/src/LanguageNegotiationMethodInterface.php
+++ b/web/core/modules/language/src/LanguageNegotiationMethodInterface.php
@@ -44,8 +44,15 @@ public function setCurrentUser(AccountInterface $current_user);
    *   (optional) The current request. Defaults to NULL if it has not been
    *   initialized yet.
    *
-   * @return string
-   *   A valid language code or FALSE if the negotiation was unsuccessful.
+   * @return string|null|false
+   *   A valid language code if the negotiation was successful and either NULL
+   *    or FALSE otherwise.
+   *
+   * @todo Determine whether string|false or string|null should be the
+   *   normalized result across all implementations and update the @return and
+   *   its comment accordingly.
+   *
+   * @see https://www.drupal.org/node/3329952
    */
   public function getLangcode(Request $request = NULL);
 
diff --git a/web/core/modules/language/src/LanguageNegotiationMethodManager.php b/web/core/modules/language/src/LanguageNegotiationMethodManager.php
index 53b59ed72..8b8fb5bef 100644
--- a/web/core/modules/language/src/LanguageNegotiationMethodManager.php
+++ b/web/core/modules/language/src/LanguageNegotiationMethodManager.php
@@ -11,6 +11,11 @@
  */
 class LanguageNegotiationMethodManager extends DefaultPluginManager {
 
+  /**
+   * The cache key prefix.
+   */
+  protected $cacheKeyPrefix;
+
   /**
    * Constructs a new LanguageNegotiationMethodManager object.
    *
diff --git a/web/core/modules/language/src/LanguageNegotiator.php b/web/core/modules/language/src/LanguageNegotiator.php
index c4e083ab1..72bf83cea 100644
--- a/web/core/modules/language/src/LanguageNegotiator.php
+++ b/web/core/modules/language/src/LanguageNegotiator.php
@@ -2,8 +2,10 @@
 
 namespace Drupal\language;
 
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
 use Drupal\Component\Plugin\PluginManagerInterface;
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Logger\LoggerChannelTrait;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Site\Settings;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUI;
@@ -13,6 +15,7 @@
  * Class responsible for performing language negotiation.
  */
 class LanguageNegotiator implements LanguageNegotiatorInterface {
+  use LoggerChannelTrait;
 
   /**
    * The language negotiation method plugin manager.
@@ -76,7 +79,7 @@ class LanguageNegotiator implements LanguageNegotiatorInterface {
    * @param \Drupal\language\ConfigurableLanguageManagerInterface $language_manager
    *   The language manager.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $negotiator_manager
-   *   The language negotiation methods plugin manager
+   *   The language negotiation methods plugin manager.
    * @param \Drupal\Core\Config\ConfigFactoryInterface $config_factory
    *   The configuration factory.
    * @param \Drupal\Core\Site\Settings $settings
@@ -130,7 +133,13 @@ public function initializeType($type) {
       // and return the first valid language found.
       foreach ($this->getEnabledNegotiators($type) as $method_id => $info) {
         if (!isset($this->negotiatedLanguages[$method_id])) {
-          $this->negotiatedLanguages[$method_id] = $this->negotiateLanguage($type, $method_id);
+          try {
+            $this->negotiatedLanguages[$method_id] = $this->negotiateLanguage($type, $method_id);
+          }
+          catch (PluginNotFoundException $e) {
+            // If a plugin is not found, log the error so user can handle it.
+            $this->getLogger('language')->error($e->getMessage());
+          }
         }
 
         // Since objects are references, we need to return a clone to prevent
diff --git a/web/core/modules/language/src/LanguageNegotiatorInterface.php b/web/core/modules/language/src/LanguageNegotiatorInterface.php
index 5c999c7f8..2702c8767 100644
--- a/web/core/modules/language/src/LanguageNegotiatorInterface.php
+++ b/web/core/modules/language/src/LanguageNegotiatorInterface.php
@@ -76,11 +76,11 @@
  * }
  *
  * class MyLanguageNegotiationUrl extends LanguageNegotiationUrl {
- *   public function getCurrentLanguage(Request $request = NULL) {
+ *   public function getLangcode(Request $request = NULL) {
  *     if ($request) {
  *       // Use the original URL language negotiation method to get a valid
  *       // language code.
- *       $langcode = parent::getCurrentLanguage($request);
+ *       $langcode = parent::getLangcode($request);
  *
  *       // If we are on an administrative path, override with the default
  *       language.
diff --git a/web/core/modules/language/src/Plugin/Block/LanguageBlock.php b/web/core/modules/language/src/Plugin/Block/LanguageBlock.php
index 583075834..bc64f05b1 100644
--- a/web/core/modules/language/src/Plugin/Block/LanguageBlock.php
+++ b/web/core/modules/language/src/Plugin/Block/LanguageBlock.php
@@ -84,7 +84,11 @@ protected function blockAccess(AccountInterface $account) {
   public function build() {
     $build = [];
     $type = $this->getDerivativeId();
-    $links = $this->languageManager->getLanguageSwitchLinks($type, Url::fromRouteMatch(\Drupal::routeMatch()));
+    $route_match = \Drupal::routeMatch();
+    // If there is no route match, for example when creating blocks on 404 pages
+    // for logged-in users with big_pipe enabled using the front page instead.
+    $url = $route_match->getRouteObject() ? Url::fromRouteMatch($route_match) : Url::fromRoute('<front>');
+    $links = $this->languageManager->getLanguageSwitchLinks($type, $url);
 
     if (isset($links->links)) {
       $build = [
diff --git a/web/core/modules/language/src/Plugin/Condition/Language.php b/web/core/modules/language/src/Plugin/Condition/Language.php
index f727dc770..62008496e 100644
--- a/web/core/modules/language/src/Plugin/Condition/Language.php
+++ b/web/core/modules/language/src/Plugin/Condition/Language.php
@@ -122,9 +122,9 @@ public function summary() {
       $languages = array_pop($language_names);
     }
     if (!empty($this->configuration['negate'])) {
-      return t('The language is not @languages.', ['@languages' => $languages]);
+      return $this->t('The language is not @languages.', ['@languages' => $languages]);
     }
-    return t('The language is @languages.', ['@languages' => $languages]);
+    return $this->t('The language is @languages.', ['@languages' => $languages]);
   }
 
   /**
diff --git a/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php b/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php
index 93cc5b1c9..54f0c1745 100644
--- a/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php
+++ b/web/core/modules/language/src/Plugin/Derivative/LanguageBlock.php
@@ -3,6 +3,7 @@
 namespace Drupal\language\Plugin\Derivative;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\language\ConfigurableLanguageManagerInterface;
 
 /**
@@ -10,6 +11,8 @@
  */
 class LanguageBlock extends DeriverBase {
 
+  use StringTranslationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -21,12 +24,12 @@ public function getDerivativeDefinitions($base_plugin_definition) {
       $configurable_types = $language_manager->getLanguageTypes();
       foreach ($configurable_types as $type) {
         $this->derivatives[$type] = $base_plugin_definition;
-        $this->derivatives[$type]['admin_label'] = t('Language switcher (@type)', ['@type' => $info[$type]['name']]);
+        $this->derivatives[$type]['admin_label'] = $this->t('Language switcher (@type)', ['@type' => $info[$type]['name']]);
       }
       // If there is just one configurable type then change the title of the
       // block.
       if (count($configurable_types) == 1) {
-        $this->derivatives[reset($configurable_types)]['admin_label'] = t('Language switcher');
+        $this->derivatives[reset($configurable_types)]['admin_label'] = $this->t('Language switcher');
       }
     }
 
diff --git a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
index d06497687..2c5157d20 100644
--- a/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
+++ b/web/core/modules/language/src/Plugin/LanguageNegotiation/LanguageNegotiationContentEntity.php
@@ -100,9 +100,9 @@ public function getLangcode(Request $request = NULL) {
    * {@inheritdoc}
    */
   public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
-    // If appropriate, process outbound to add a query parameter to the url and
-    // remove the language option, so that url negotiator does not rewrite the
-    // url.
+    // If appropriate, process outbound to add a query parameter to the URL and
+    // remove the language option, so that URL negotiator does not rewrite the
+    // URL.
 
     // First, check if processing conditions are met.
     if (!($request && !empty($options['route']) && $this->hasLowerLanguageNegotiationWeight() && $this->meetsContentEntityRoutesCondition($options['route'], $request))) {
@@ -110,8 +110,8 @@ public function processOutbound($path, &$options = [], Request $request = NULL,
     }
 
     if (isset($options['language']) || $langcode = $this->getLangcode($request)) {
-      // If the language option is set, unset it, so that the url language
-      // negotiator does not rewrite the url.
+      // If the language option is set, unset it, so that the URL language
+      // negotiator does not rewrite the URL.
       if (isset($options['language'])) {
         $langcode = $options['language']->getId();
         unset($options['language']);
@@ -158,13 +158,13 @@ public function getLanguageSwitchLinks(Request $request, $type, Url $url) {
   /**
    * Determines if content entity language negotiator has higher priority.
    *
-   * The content entity language negotiator having higher priority than the url
+   * The content entity language negotiator having higher priority than the URL
    * language negotiator, is a criteria in
    * \Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationContentEntity::processOutbound().
    *
    * @return bool
    *   TRUE if the content entity language negotiator has higher priority than
-   *   the url language negotiator, FALSE otherwise.
+   *   the URL language negotiator, FALSE otherwise.
    */
   protected function hasLowerLanguageNegotiationWeight() {
     if (!isset($this->hasLowerLanguageNegotiationWeightResult)) {
@@ -173,7 +173,7 @@ protected function hasLowerLanguageNegotiationWeight() {
       $content_method_weights = $this->config->get('language.types')->get('negotiation.language_content.enabled') ?: [];
 
       // Check if the content language is configured to be dependent on the
-      // url negotiator directly or indirectly over the interface negotiator.
+      // URL negotiator directly or indirectly over the interface negotiator.
       if (isset($content_method_weights[LanguageNegotiationUrl::METHOD_ID]) && ($content_method_weights[static::METHOD_ID] > $content_method_weights[LanguageNegotiationUrl::METHOD_ID])) {
         $this->hasLowerLanguageNegotiationWeightResult = FALSE;
       }
@@ -202,7 +202,7 @@ protected function hasLowerLanguageNegotiationWeight() {
    * Determines if content entity route condition is met.
    *
    * Requirements: currently being on a content entity route and processing
-   * outbound url pointing to the same content entity.
+   * outbound URL pointing to the same content entity.
    *
    * @param \Symfony\Component\Routing\Route $outbound_route
    *   The route object for the current outbound url being processed.
diff --git a/web/core/modules/language/tests/language_test/language_test.module b/web/core/modules/language/tests/language_test/language_test.module
index 2e7cc4914..f05c1bc30 100644
--- a/web/core/modules/language/tests/language_test/language_test.module
+++ b/web/core/modules/language/tests/language_test/language_test.module
@@ -105,5 +105,6 @@ function language_test_module_preinstall() {
  * Implements hook_language_switch_links_alter().
  */
 function language_test_language_switch_links_alter(array &$links, $type, Url $url) {
-  // I'll just sit here and wait to be called with the right arguments.
+  // Record which languages had links passed in.
+  \Drupal::state()->set('language_test.language_switch_link_ids', array_keys($links));
 }
diff --git a/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php b/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
index 1f12ffa42..a4917e5ca 100644
--- a/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
+++ b/web/core/modules/language/tests/src/Functional/AdminPathEntityConverterLanguageTest.php
@@ -19,6 +19,9 @@ class AdminPathEntityConverterLanguageTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $permissions = [
diff --git a/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
index 1d11edbef..e2f173d01 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageBrowserDetectionTest.php
@@ -20,8 +20,7 @@ class LanguageBrowserDetectionTest extends BrowserTestBase {
   protected $defaultTheme = 'stark';
 
   /**
-   * Tests for adding, editing and deleting mappings between browser language
-   * codes and Drupal language codes.
+   * Tests mappings between browser language codes and Drupal language codes.
    */
   public function testUIBrowserLanguageMappings() {
     // User to manage languages.
diff --git a/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
index 3d8c07383..dc54efbc4 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigurationElementTest.php
@@ -33,6 +33,9 @@ class LanguageConfigurationElementTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $user = $this->drupalCreateUser([
diff --git a/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php b/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
index 39ff21219..8ea06a2eb 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageConfigurationTest.php
@@ -165,7 +165,7 @@ public function testLanguageConfigurationWeight() {
     $admin_user = $this->drupalCreateUser([
       'administer languages',
       'access administration pages',
-      ]);
+    ]);
     $this->drupalLogin($admin_user);
     $this->checkConfigurableLanguageWeight();
 
diff --git a/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php b/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
index 9a7e9ddab..2b3fcf49e 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageListModuleInstallTest.php
@@ -5,8 +5,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests enabling Language if a module exists that calls
- * LanguageManager::getLanguages() during installation.
+ * Tests that the language list is not empty when language is installed.
  *
  * @group language
  */
diff --git a/web/core/modules/language/tests/src/Functional/LanguageNegotiationSessionTest.php b/web/core/modules/language/tests/src/Functional/LanguageNegotiationSessionTest.php
index ca3626a67..83906d2ee 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageNegotiationSessionTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageNegotiationSessionTest.php
@@ -2,12 +2,7 @@
 
 namespace Drupal\Tests\language\Functional;
 
-use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationBrowser;
-use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSelected;
-use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSession;
-use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -51,24 +46,15 @@ protected function setUp(): void {
    * Tests language negotiation via query/session parameters.
    */
   public function testSessionLanguageNegotiationMethod() {
-    $this->drupalGet('admin/config/regional/language/detection');
-
     // Enable Session and Selected language for interface language detection.
-    $config = $this->config('language.types');
-    $config->set('configurable', [LanguageInterface::TYPE_INTERFACE]);
-    $config->set('negotiation.language_interface.enabled', [
-      LanguageNegotiationSession::METHOD_ID => -6,
-      LanguageNegotiationSelected::METHOD_ID => 12,
-    ]);
-    $config->set('negotiation.language_interface.method_weights', [
-      'language-user-admin' => -10,
-      LanguageNegotiationUrl::METHOD_ID => -8,
-      LanguageNegotiationSession::METHOD_ID => -6,
-      'language-user' => -4,
-      LanguageNegotiationBrowser::METHOD_ID => -2,
-      LanguageNegotiationSelected::METHOD_ID => 12,
-    ]);
-    $config->save();
+    $this->drupalGet('admin/config/regional/language/detection');
+    $edit = [
+      'language_interface[enabled][language-session]' => 1,
+      'language_interface[enabled][language-selected]' => 1,
+      'language_interface[weight][language-session]' => -6,
+      'language_interface[weight][language-selected]' => 12,
+    ];
+    $this->submitForm($edit, 'Save settings');
 
     // Set language via query parameter.
     $this->drupalGet('user/' . $this->adminUser->id(), ['query' => ['language' => 'fr']]);
diff --git a/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
index fc8149881..a6e7bc6ee 100644
--- a/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguagePathMonolingualTest.php
@@ -23,6 +23,9 @@ class LanguagePathMonolingualTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php b/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
index eb07dffe4..17d20995c 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageSwitchingTest.php
@@ -8,6 +8,8 @@
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\Tests\BrowserTestBase;
 
+// cspell:ignore publi publié
+
 /**
  * Functional tests for the language switching feature.
  *
@@ -33,15 +35,12 @@ class LanguageSwitchingTest extends BrowserTestBase {
    * The theme to install as the default for testing.
    *
    * @var string
-   *
-   * @todo This test's focus on classes in ::doTestLanguageBlockAuthenticated()
-   *   and ::testLanguageBodyClass() make Stark a bad fit as a base theme.
-   *   Change the default theme to Starterkit once it is stable.
-   *
-   *  @see https://www.drupal.org/project/drupal/issues/3275543
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -50,6 +49,7 @@ protected function setUp(): void {
       'administer blocks',
       'administer languages',
       'access administration pages',
+      'access content',
     ]);
     $this->drupalLogin($admin_user);
   }
@@ -82,6 +82,18 @@ public function testLanguageBlock() {
 
     $this->doTestLanguageBlockAuthenticated($block->label());
     $this->doTestLanguageBlockAnonymous($block->label());
+    $this->doTestLanguageBlock404($block->label(), 'system/404');
+
+    // Test 404s with big_pipe where the behaviour is different for logged-in
+    // users.
+    \Drupal::service('module_installer')->install(['big_pipe']);
+    $this->rebuildAll();
+    $this->doTestLanguageBlock404($block->label(), 'system/404');
+    $this->drupalLogin($this->drupalCreateUser());
+    // @todo This is testing the current behaviour with the big_pipe module
+    //   enabled. This behaviour is a bug will be fixed in
+    //   https://www.drupal.org/project/drupal/issues/3349201.
+    $this->doTestLanguageBlock404($block->label(), '<front>');
   }
 
   /**
@@ -104,23 +116,21 @@ protected function doTestLanguageBlockAuthenticated($block_label) {
     $anchors = [];
     $labels = [];
     foreach ($language_switchers as $list_item) {
-      $classes = explode(" ", $list_item->getAttribute('class'));
-      [$langcode] = array_intersect($classes, ['en', 'fr']);
       $list_items[] = [
-        'langcode_class' => $langcode,
+        'hreflang' => $list_item->getAttribute('hreflang'),
         'data-drupal-link-system-path' => $list_item->getAttribute('data-drupal-link-system-path'),
       ];
 
       $link = $list_item->find('xpath', 'a');
       $anchors[] = [
-         'hreflang' => $link->getAttribute('hreflang'),
-         'data-drupal-link-system-path' => $link->getAttribute('data-drupal-link-system-path'),
+        'hreflang' => $link->getAttribute('hreflang'),
+        'data-drupal-link-system-path' => $link->getAttribute('data-drupal-link-system-path'),
       ];
       $labels[] = $link->getText();
     }
     $expected_list_items = [
-      0 => ['langcode_class' => 'en', 'data-drupal-link-system-path' => 'user/2'],
-      1 => ['langcode_class' => 'fr', 'data-drupal-link-system-path' => 'user/2'],
+      0 => ['hreflang' => 'en', 'data-drupal-link-system-path' => 'user/2'],
+      1 => ['hreflang' => 'fr', 'data-drupal-link-system-path' => 'user/2'],
     ];
     $this->assertSame($expected_list_items, $list_items, 'The list items have the correct attributes that will allow the drupal.active-link library to mark them as active.');
     $expected_anchors = [
@@ -163,9 +173,8 @@ protected function doTestLanguageBlockAnonymous($block_label) {
     ];
     $labels = [];
     foreach ($language_switchers as $list_item) {
-      $classes = explode(" ", $list_item->getAttribute('class'));
-      [$langcode] = array_intersect($classes, ['en', 'fr']);
-      if (in_array('is-active', $classes)) {
+      $langcode = $list_item->getAttribute('hreflang');
+      if ($list_item->hasClass('is-active')) {
         $links['active'][] = $langcode;
       }
       else {
@@ -187,6 +196,52 @@ protected function doTestLanguageBlockAnonymous($block_label) {
     $this->assertSame(['English', 'français'], $labels, 'The language links labels are in their own language on the language switcher block.');
   }
 
+  /**
+   * Tests the language switcher block on 404 pages.
+   *
+   * @param string $block_label
+   *   The label of the language switching block.
+   * @param string $system_path
+   *   The expected system path for the links in the language switcher.
+   *
+   * @see self::testLanguageBlock()
+   */
+  protected function doTestLanguageBlock404(string $block_label, string $system_path) {
+    $this->drupalGet('does-not-exist-' . $this->randomMachineName());
+    $this->assertSession()->pageTextContains($block_label);
+
+    // Assert that each list item and anchor element has the appropriate data-
+    // attributes.
+    $language_switchers = $this->xpath('//div[@id=:id]/ul/li', [':id' => 'block-test-language-block']);
+    $list_items = [];
+    $anchors = [];
+    $labels = [];
+    foreach ($language_switchers as $list_item) {
+      $list_items[] = [
+        'hreflang' => $list_item->getAttribute('hreflang'),
+        'data-drupal-link-system-path' => $list_item->getAttribute('data-drupal-link-system-path'),
+      ];
+
+      $link = $list_item->find('xpath', 'a');
+      $anchors[] = [
+        'hreflang' => $link->getAttribute('hreflang'),
+        'data-drupal-link-system-path' => $link->getAttribute('data-drupal-link-system-path'),
+      ];
+      $labels[] = $link->getText();
+    }
+    $expected_list_items = [
+      0 => ['hreflang' => 'en', 'data-drupal-link-system-path' => $system_path],
+      1 => ['hreflang' => 'fr', 'data-drupal-link-system-path' => $system_path],
+    ];
+    $this->assertSame($expected_list_items, $list_items, 'The list items have the correct attributes that will allow the drupal.active-link library to mark them as active.');
+    $expected_anchors = [
+      0 => ['hreflang' => 'en', 'data-drupal-link-system-path' => $system_path],
+      1 => ['hreflang' => 'fr', 'data-drupal-link-system-path' => $system_path],
+    ];
+    $this->assertSame($expected_anchors, $anchors, 'The anchors have the correct attributes that will allow the drupal.active-link library to mark them as active.');
+    $this->assertSame(['English', 'français'], $labels, 'The language links labels are in their own language on the language switcher block.');
+  }
+
   /**
    * Tests language switcher links for domain based negotiation.
    */
@@ -445,6 +500,126 @@ public function testLanguageSessionSwitchLinks() {
     $this->assertSession()->addressEquals('user/2');
   }
 
+  /**
+   * Test that the language switching block does not expose restricted paths.
+   */
+  public function testRestrictedPaths(): void {
+    \Drupal::service('module_installer')->install(['node']);
+    $entity_type_manager = \Drupal::entityTypeManager();
+
+    // Add the French language.
+    ConfigurableLanguage::createFromLangcode('fr')->save();
+
+    // Enable URL language detection and selection.
+    $this->config('language.types')
+      ->set('negotiation.language_interface.enabled.language-url', 1)
+      ->save();
+
+    // Enable the language switching block.
+    $block = $this->drupalPlaceBlock('language_block:' . LanguageInterface::TYPE_INTERFACE);
+
+    // Create a node type and make it translatable.
+    $entity_type_manager->getStorage('node_type')
+      ->create([
+        'type' => 'page',
+        'name' => 'Page',
+      ])
+      ->save();
+
+    // Create a published node with an unpublished translation.
+    $node = $entity_type_manager->getStorage('node')
+      ->create([
+        'type' => 'page',
+        'title' => $this->randomMachineName(),
+        'status' => 1,
+      ]);
+    $node->save();
+    $node->addTranslation('fr', ['title' => 'Non publié', 'status' => 0]);
+    $node->save();
+
+    // Create path aliases.
+    $alias_storage = $entity_type_manager->getStorage('path_alias');
+    $alias_storage->create([
+      'path' => '/user/1',
+      'alias' => '/secret-identity/peter-parker',
+    ])->save();
+    $alias_storage->create([
+      'path' => '/node/1',
+      'langcode' => 'en',
+      'alias' => '/press-release/published-report',
+    ])->save();
+    $alias_storage->create([
+      'path' => '/node/1',
+      'langcode' => 'fr',
+      'alias' => '/press-release/rapport-non-publié',
+    ])->save();
+
+    // Visit a restricted user page.
+    // Assert that the language switching block is displayed on the
+    // access-denied page, but it does not contain the path alias.
+    $this->assertLinkMarkup('/user/1', 403, $block->label(), 'peter-parker');
+
+    // Visit the node and its translation. Use internal paths and aliases. The
+    // non-ASCII character may be escaped, so remove it from the search string.
+    $this->assertLinkMarkup('/node/1', 200, $block->label(), 'rapport-non-publi');
+    $this->assertLinkMarkup('/press-release/published-report', 200, $block->label(), 'rapport-non-publi');
+    $this->assertLinkMarkup('/fr/node/1', 403, $block->label(), 'rapport-non-publi');
+    $this->assertLinkMarkup('/fr/press-release/rapport-non-publié', 403, $block->label(), 'rapport-non-publi');
+
+    // Test as a user with access to other users and unpublished content.
+    $privileged_user = $this->drupalCreateUser([
+      'access user profiles',
+      'bypass node access',
+    ]);
+    $this->drupalLogin($privileged_user);
+    $this->assertLinkMarkup('/user/1', 200, $block->label(), 'peter-parker', TRUE);
+    $this->assertLinkMarkup('/node/1', 200, $block->label(), 'rapport-non-publi', TRUE);
+    $this->assertLinkMarkup('/press-release/published-report', 200, $block->label(), 'rapport-non-publi', TRUE);
+    $this->assertLinkMarkup('/fr/node/1', 200, $block->label(), 'rapport-non-publi', TRUE);
+    $this->assertLinkMarkup('/fr/press-release/rapport-non-publié', 200, $block->label(), 'rapport-non-publi', TRUE);
+
+    // Test as an anonymous user.
+    $this->drupalLogout();
+    $this->assertLinkMarkup('/user/1', 403, $block->label(), 'peter-parker');
+    $this->assertLinkMarkup('/node/1', 200, $block->label(), 'rapport-non-publi');
+    $this->assertLinkMarkup('/press-release/published-report', 200, $block->label(), 'rapport-non-publi');
+    $this->assertLinkMarkup('/fr/node/1', 403, $block->label(), 'rapport-non-publi');
+    $this->assertLinkMarkup('/fr/press-release/rapport-non-publié', 403, $block->label(), 'rapport-non-publi');
+  }
+
+  /**
+   * Asserts that restricted text is or is not present in the page response.
+   *
+   * @param string $path
+   *   The path to test.
+   * @param int $status
+   *   The HTTP status code, such as 200 or 403.
+   * @param string $marker
+   *   Text that should always be present.
+   * @param string $restricted
+   *   Text that should be tested.
+   * @param bool $found
+   *   (optional) If TRUE, then the restricted text is present. Defaults to
+   *   FALSE.
+   */
+  protected function assertLinkMarkup(string $path, int $status, string $marker, string $restricted, bool $found = FALSE): void {
+    $this->drupalGet($path);
+    $this->assertSession()->statusCodeEquals($status);
+    $this->assertSession()->pageTextContains($marker);
+    if ($found) {
+      $this->assertSession()->responseContains($restricted);
+    }
+    else {
+      $this->assertSession()->responseNotContains($restricted);
+    }
+
+    // Assert that all languages had a link passed to
+    // hook_language_switch_links_alter() to allow alternatives to be provided.
+    $languages = \Drupal::languageManager()->getNativeLanguages();
+    $links_for_alter = \Drupal::state()->get('language_test.language_switch_link_ids');
+    $this->assertSame(array_keys($languages), $links_for_alter);
+  }
+
   /**
    * Saves the native name of a language entity in configuration as a label.
    *
diff --git a/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php b/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
index 21c2997d0..900b0c9dc 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageUILanguageNegotiationTest.php
@@ -71,6 +71,9 @@ class LanguageUILanguageNegotiationTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php b/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
index 93827d3e1..463b0d9b3 100644
--- a/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
+++ b/web/core/modules/language/tests/src/Functional/LanguageUrlRewritingTest.php
@@ -35,6 +35,9 @@ class LanguageUrlRewritingTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php b/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
index 5ec0af289..2175a3a9e 100644
--- a/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php
@@ -6,8 +6,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests that the language condition, provided by the language module, is
- * working properly.
+ * Tests the language condition plugin.
  *
  * @group language
  */
@@ -34,6 +33,9 @@ class LanguageConditionTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'language'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php b/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
index c7bfa77a1..85f88f0d4 100644
--- a/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
+++ b/web/core/modules/language/tests/src/Kernel/EntityUrlLanguageTest.php
@@ -31,6 +31,9 @@ class EntityUrlLanguageTest extends LanguageTestBase {
    */
   protected $entity;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php b/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
index dff6af4c2..954614d3a 100644
--- a/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
+++ b/web/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php
@@ -6,8 +6,7 @@
 use Drupal\language\Exception\DeleteDefaultLanguageException;
 
 /**
- * Compares the default language from $GLOBALS against the dependency injected
- * language object.
+ * Tests that a language object can be injected.
  *
  * @group language
  */
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
index 394e18e59..9a3d46335 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d6/MigrateLanguageContentSettingsTest.php
@@ -6,7 +6,9 @@
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
- * Tests migration of language content setting variables,
+ * Tests the migration of language-related settings.
+ *
+ * Settings tested include language content setting variables,
  * language_content_type_$type, i18n_node_options_* and i18n_lock_node_*.
  *
  * @group migrate_drupal_6
diff --git a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
index b86378c2d..ed65ee448 100644
--- a/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
+++ b/web/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php
@@ -6,7 +6,9 @@
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
 /**
- * Tests migration of language content setting variables,
+ * Tests the migration of language-related settings.
+ *
+ * Settings tested include the language content setting variables,
  * language_content_type_$type, i18n_node_options_* and i18n_lock_node_*.
  *
  * @group migrate_drupal_7
diff --git a/web/core/modules/language/tests/src/Kernel/OverriddenConfigImportTest.php b/web/core/modules/language/tests/src/Kernel/OverriddenConfigImportTest.php
index 604687295..db7b1cc60 100644
--- a/web/core/modules/language/tests/src/Kernel/OverriddenConfigImportTest.php
+++ b/web/core/modules/language/tests/src/Kernel/OverriddenConfigImportTest.php
@@ -49,7 +49,8 @@ protected function setUp(): void {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
   }
 
diff --git a/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php b/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
index fc4cabf1b..e78e96262 100644
--- a/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
+++ b/web/core/modules/language/tests/src/Kernel/Views/LanguageTestBase.php
@@ -17,6 +17,9 @@ abstract class LanguageTestBase extends ViewsKernelTestBase {
    */
   protected static $modules = ['system', 'language'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
     $this->installConfig(['language']);
diff --git a/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php b/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
index 31a2c1c48..636265bcf 100644
--- a/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
+++ b/web/core/modules/language/tests/src/Unit/ContentLanguageSettingsUnitTest.php
@@ -88,12 +88,12 @@ public function testCalculateDependencies() {
     $target_entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(['type' => 'config', 'name' => 'test.test_entity_type.id']));
+      ->willReturn(['type' => 'config', 'name' => 'test.test_entity_type.id']);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with('test_entity_type')
-      ->will($this->returnValue($target_entity_type));
+      ->willReturn($target_entity_type);
 
     $config = new ContentLanguageSettings([
       'target_entity_type_id' => 'test_entity_type',
@@ -250,17 +250,17 @@ public function testLoadByEntityTypeBundle($config_id, ContentLanguageSettings $
       ->expects($this->any())
       ->method('load')
       ->with($config_id)
-      ->will($this->returnValue($existing_config));
+      ->willReturn($existing_config);
     $this->configEntityStorageInterface
       ->expects($this->any())
       ->method('create')
-      ->will($this->returnValue($nullConfig));
+      ->willReturn($nullConfig);
 
     $this->entityTypeManager
       ->expects($this->any())
       ->method('getStorage')
       ->with('language_content_settings')
-      ->will($this->returnValue($this->configEntityStorageInterface));
+      ->willReturn($this->configEntityStorageInterface);
 
     $entity_type_repository = $this->getMockForAbstractClass(EntityTypeRepositoryInterface::class);
     $entity_type_repository->expects($this->any())
diff --git a/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php b/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
index 63cabedd4..dac165922 100644
--- a/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
+++ b/web/core/modules/language/tests/src/Unit/LanguageNegotiationUrlTest.php
@@ -29,11 +29,11 @@ protected function setUp(): void {
     $language_de = $this->createMock('\Drupal\Core\Language\LanguageInterface');
     $language_de->expects($this->any())
       ->method('getId')
-      ->will($this->returnValue('de'));
+      ->willReturn('de');
     $language_en = $this->createMock('\Drupal\Core\Language\LanguageInterface');
     $language_en->expects($this->any())
       ->method('getId')
-      ->will($this->returnValue('en'));
+      ->willReturn('en');
     $languages = [
       'de' => $language_de,
       'en' => $language_en,
@@ -45,7 +45,7 @@ protected function setUp(): void {
       ->getMock();
     $language_manager->expects($this->any())
       ->method('getLanguages')
-      ->will($this->returnValue($languages));
+      ->willReturn($languages);
     $this->languageManager = $language_manager;
 
     // Create a user stub.
@@ -69,7 +69,10 @@ protected function setUp(): void {
   public function testPathPrefix($prefix, $prefixes, $expected_langcode) {
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue($this->languages[(in_array($expected_langcode, ['en', 'de'])) ? $expected_langcode : 'en']));
+      ->willReturn($this->languages[(in_array($expected_langcode, [
+        'en',
+        'de',
+      ])) ? $expected_langcode : 'en']);
 
     $config = $this->getConfigFactoryStub([
       'language.negotiation' => [
@@ -158,7 +161,7 @@ public function providerTestPathPrefix() {
   public function testDomain($http_host, $domains, $expected_langcode) {
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue($this->languages['en']));
+      ->willReturn($this->languages['en']);
 
     $config = $this->getConfigFactoryStub([
       'language.negotiation' => [
diff --git a/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php b/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php
index aa4693ca0..7d49f1fae 100644
--- a/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php
+++ b/web/core/modules/language/tests/src/Unit/Menu/LanguageLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class LanguageLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = [
       'language' => 'core/modules/language',
diff --git a/web/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php b/web/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php
index 0fe3e3c88..64e9b3b87 100644
--- a/web/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php
+++ b/web/core/modules/language/tests/src/Unit/process/LanguageDomainsTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void {
     // to return TRUE to be able to test the process.
     $this->row->expects($this->once())
       ->method('getSourceProperty')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     // The language_domains plugin use $base_url to fill empty domains.
     global $base_url;
diff --git a/web/core/modules/layout_builder/js/layout-builder.es6.js b/web/core/modules/layout_builder/js/layout-builder.es6.js
index 5a9112717..f98e54894 100644
--- a/web/core/modules/layout_builder/js/layout-builder.es6.js
+++ b/web/core/modules/layout_builder/js/layout-builder.es6.js
@@ -43,9 +43,16 @@
          *   The link to add the block.
          */
         const toggleBlockEntry = (index, link) => {
+          const $link = $(link);
           const textMatch =
             link.textContent.toLowerCase().indexOf(query) !== -1;
-          $(link).toggle(textMatch);
+          // Checks if a category is currently hidden.
+          // Toggles the category on if so.
+          if ($link.closest('.js-layout-builder-category').is(':hidden')) {
+            $link.closest('.js-layout-builder-category').show();
+          }
+          // Toggle the li tag of the matching link.
+          $link.parent().toggle(textMatch);
         };
 
         // Filter if the length of the query is at least 2 characters.
@@ -82,15 +89,17 @@
             .find('.js-layout-builder-category[remember-closed]')
             .removeAttr('open')
             .removeAttr('remember-closed');
+          // Show all categories since filter is turned off.
           $categories.find('.js-layout-builder-category').show();
-          $filterLinks.show();
+          // Show all li tags since filter is turned off.
+          $filterLinks.parent().show();
           announce(Drupal.t('All available blocks are listed.'));
         }
       };
 
       $(
         once('block-filter-text', 'input.js-layout-builder-filter', context),
-      ).on('keyup', debounce(filterBlockList, 200));
+      ).on('input', debounce(filterBlockList, 200));
     },
   };
 
diff --git a/web/core/modules/layout_builder/js/layout-builder.js b/web/core/modules/layout_builder/js/layout-builder.js
index 729d53641..0d13e9435 100644
--- a/web/core/modules/layout_builder/js/layout-builder.js
+++ b/web/core/modules/layout_builder/js/layout-builder.js
@@ -4,27 +4,27 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Sortable) {
   var ajax = Drupal.ajax,
-      behaviors = Drupal.behaviors,
-      debounce = Drupal.debounce,
-      announce = Drupal.announce,
-      formatPlural = Drupal.formatPlural;
+    behaviors = Drupal.behaviors,
+    debounce = Drupal.debounce,
+    announce = Drupal.announce,
+    formatPlural = Drupal.formatPlural;
   var layoutBuilderBlocksFiltered = false;
   behaviors.layoutBuilderBlockFilter = {
     attach: function attach(context) {
       var $categories = $('.js-layout-builder-categories', context);
       var $filterLinks = $categories.find('.js-layout-builder-block-link');
-
       var filterBlockList = function filterBlockList(e) {
         var query = e.target.value.toLowerCase();
-
         var toggleBlockEntry = function toggleBlockEntry(index, link) {
+          var $link = $(link);
           var textMatch = link.textContent.toLowerCase().indexOf(query) !== -1;
-          $(link).toggle(textMatch);
+          if ($link.closest('.js-layout-builder-category').is(':hidden')) {
+            $link.closest('.js-layout-builder-category').show();
+          }
+          $link.parent().toggle(textMatch);
         };
-
         if (query.length >= 2) {
           $categories.find('.js-layout-builder-category:not([open])').attr('remember-closed', '');
           $categories.find('.js-layout-builder-category').attr('open', '');
@@ -36,20 +36,17 @@
           layoutBuilderBlocksFiltered = false;
           $categories.find('.js-layout-builder-category[remember-closed]').removeAttr('open').removeAttr('remember-closed');
           $categories.find('.js-layout-builder-category').show();
-          $filterLinks.show();
+          $filterLinks.parent().show();
           announce(Drupal.t('All available blocks are listed.'));
         }
       };
-
-      $(once('block-filter-text', 'input.js-layout-builder-filter', context)).on('keyup', debounce(filterBlockList, 200));
+      $(once('block-filter-text', 'input.js-layout-builder-filter', context)).on('input', debounce(filterBlockList, 200));
     }
   };
-
   Drupal.layoutBuilderBlockUpdate = function (item, from, to) {
     var $item = $(item);
     var $from = $(from);
     var itemRegion = $item.closest('.js-layout-builder-region');
-
     if (to === itemRegion[0]) {
       var deltaTo = $item.closest('[data-layout-delta]').data('layout-delta');
       var deltaFrom = $from ? $from.closest('[data-layout-delta]').data('layout-delta') : deltaTo;
@@ -60,7 +57,6 @@
       }).execute();
     }
   };
-
   behaviors.layoutBuilderBlockDrag = {
     attach: function attach(context) {
       var regionSelector = '.js-layout-builder-region';
@@ -95,35 +91,28 @@
     if (Drupal.offCanvas.isOffCanvas($element)) {
       $('.is-layout-builder-highlighted').removeClass('is-layout-builder-highlighted');
       var id = $element.find('[data-layout-builder-target-highlight-id]').attr('data-layout-builder-target-highlight-id');
-
       if (id) {
         $("[data-layout-builder-highlight-id=\"".concat(id, "\"]")).addClass('is-layout-builder-highlighted');
       }
-
       $('#layout-builder').removeClass('layout-builder--move-blocks-active');
       var layoutBuilderWrapperValue = $element.find('[data-add-layout-builder-wrapper]').attr('data-add-layout-builder-wrapper');
-
       if (layoutBuilderWrapperValue) {
         $('#layout-builder').addClass(layoutBuilderWrapperValue);
       }
     }
   });
-
   if (document.querySelector('[data-off-canvas-main-canvas]')) {
     var mainCanvas = document.querySelector('[data-off-canvas-main-canvas]');
     mainCanvas.addEventListener('transitionend', function () {
       var $target = $('.is-layout-builder-highlighted');
-
       if ($target.length > 0) {
         var targetTop = $target.offset().top;
         var targetBottom = targetTop + $target.outerHeight();
         var viewportTop = $(window).scrollTop();
         var viewportBottom = viewportTop + $(window).height();
-
         if (targetBottom < viewportTop || targetTop > viewportBottom) {
           var viewportMiddle = (viewportBottom + viewportTop) / 2;
           var scrollAmount = targetTop - viewportMiddle;
-
           if ('scrollBehavior' in document.documentElement.style) {
             window.scrollBy({
               top: scrollAmount,
@@ -137,7 +126,6 @@
       }
     });
   }
-
   $(window).on('dialog:afterclose', function (event, dialog, $element) {
     if (Drupal.offCanvas.isOffCanvas($element)) {
       $('.is-layout-builder-highlighted').removeClass('is-layout-builder-highlighted');
@@ -150,7 +138,6 @@
       var $layoutBuilderContentPreview = $('#layout-builder-content-preview');
       var contentPreviewId = $layoutBuilderContentPreview.data('content-preview-id');
       var isContentPreview = JSON.parse(localStorage.getItem(contentPreviewId)) !== false;
-
       var disableContentPreview = function disableContentPreview() {
         $layoutBuilder.addClass('layout-builder--content-preview-disabled');
         $('[data-layout-content-preview-placeholder-label]', context).each(function (i, element) {
@@ -161,7 +148,6 @@
           $element.prepend(contentPreviewPlaceholderLabel);
         });
       };
-
       var enableContentPreview = function enableContentPreview() {
         $layoutBuilder.removeClass('layout-builder--content-preview-disabled');
         $('.js-layout-builder-content-preview-placeholder-label').remove();
@@ -169,11 +155,9 @@
           $(element).children().show();
         });
       };
-
       $('#layout-builder-content-preview', context).on('change', function (event) {
         var isChecked = $(event.currentTarget).is(':checked');
         localStorage.setItem(contentPreviewId, JSON.stringify(isChecked));
-
         if (isChecked) {
           enableContentPreview();
           announce(Drupal.t('Block previews are visible. Block labels are hidden.'));
@@ -182,14 +166,12 @@
           announce(Drupal.t('Block previews are hidden. Block labels are visible.'));
         }
       });
-
       if (!isContentPreview) {
         $layoutBuilderContentPreview.attr('checked', false);
         disableContentPreview();
       }
     }
   };
-
   Drupal.theme.layoutBuilderPrependContentPreviewPlaceholderLabel = function (contentPreviewPlaceholderText) {
     var contentPreviewPlaceholderLabel = document.createElement('div');
     contentPreviewPlaceholderLabel.className = 'layout-builder-block__content-preview-placeholder-label js-layout-builder-content-preview-placeholder-label';
diff --git a/web/core/modules/layout_builder/layout_builder.info.yml b/web/core/modules/layout_builder/layout_builder.info.yml
index ccf4e273d..0a6e43ea3 100644
--- a/web/core/modules/layout_builder/layout_builder.info.yml
+++ b/web/core/modules/layout_builder/layout_builder.info.yml
@@ -6,7 +6,5 @@ version: VERSION
 dependencies:
   - drupal:layout_discovery
   - drupal:contextual
-  # @todo Discuss removing in https://www.drupal.org/project/drupal/issues/2935999.
-  - drupal:field_ui
   # @todo Discuss removing in https://www.drupal.org/project/drupal/issues/3003610.
   - drupal:block
diff --git a/web/core/modules/layout_builder/layout_builder.module b/web/core/modules/layout_builder/layout_builder.module
index 1646139aa..a6e9981fe 100644
--- a/web/core/modules/layout_builder/layout_builder.module
+++ b/web/core/modules/layout_builder/layout_builder.module
@@ -158,7 +158,7 @@ function layout_builder_entity_view_alter(array &$build, EntityInterface $entity
   // If the entity is displayed within a Layout Builder block and the current
   // route is in the Layout Builder UI, then remove all contextual link
   // placeholders.
-  if ($display instanceof LayoutBuilderEntityViewDisplay && strpos($route_name, 'layout_builder.') === 0) {
+  if ($route_name && $display instanceof LayoutBuilderEntityViewDisplay && strpos($route_name, 'layout_builder.') === 0) {
     unset($build['#contextual_links']);
   }
 }
diff --git a/web/core/modules/layout_builder/layout_builder.routing.yml b/web/core/modules/layout_builder/layout_builder.routing.yml
index 6dcf0c9f0..1e5fd50ff 100644
--- a/web/core/modules/layout_builder/layout_builder.routing.yml
+++ b/web/core/modules/layout_builder/layout_builder.routing.yml
@@ -1,8 +1,8 @@
 layout_builder.choose_section:
   path: '/layout_builder/choose/section/{section_storage_type}/{section_storage}/{delta}'
   defaults:
-   _controller: '\Drupal\layout_builder\Controller\ChooseSectionController::build'
-   _title: 'Choose a layout for this section'
+    _controller: '\Drupal\layout_builder\Controller\ChooseSectionController::build'
+    _title: 'Choose a layout for this section'
   requirements:
     _layout_builder_access: 'view'
   options:
diff --git a/web/core/modules/layout_builder/layout_builder.services.yml b/web/core/modules/layout_builder/layout_builder.services.yml
index e67a3b4d1..4e9fc3acd 100644
--- a/web/core/modules/layout_builder/layout_builder.services.yml
+++ b/web/core/modules/layout_builder/layout_builder.services.yml
@@ -14,7 +14,7 @@ services:
     class: Drupal\layout_builder\Routing\LayoutBuilderRoutes
     arguments: ['@plugin.manager.layout_builder.section_storage']
     tags:
-     - { name: event_subscriber }
+      - { name: event_subscriber }
   layout_builder.tempstore.route_enhancer:
     class: Drupal\layout_builder\Routing\LayoutTempstoreRouteEnhancer
     arguments: ['@layout_builder.tempstore_repository']
diff --git a/web/core/modules/layout_builder/layouts/fourcol_section/layout--fourcol-section.html.twig b/web/core/modules/layout_builder/layouts/fourcol_section/layout--fourcol-section.html.twig
index 9a380f76e..1f08a2ab5 100644
--- a/web/core/modules/layout_builder/layouts/fourcol_section/layout--fourcol-section.html.twig
+++ b/web/core/modules/layout_builder/layouts/fourcol_section/layout--fourcol-section.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation for a four-column 25%-25%-25%-25% layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_builder/layouts/threecol_section/layout--threecol-section.html.twig b/web/core/modules/layout_builder/layouts/threecol_section/layout--threecol-section.html.twig
index 1311f28ab..204a43621 100644
--- a/web/core/modules/layout_builder/layouts/threecol_section/layout--threecol-section.html.twig
+++ b/web/core/modules/layout_builder/layouts/threecol_section/layout--threecol-section.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation for a three-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_builder/layouts/twocol_section/layout--twocol-section.html.twig b/web/core/modules/layout_builder/layouts/twocol_section/layout--twocol-section.html.twig
index a5d1d3637..9969f8e57 100644
--- a/web/core/modules/layout_builder/layouts/twocol_section/layout--twocol-section.html.twig
+++ b/web/core/modules/layout_builder/layouts/twocol_section/layout--twocol-section.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation to display a two-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_builder/src/Cache/LayoutBuilderUiCacheContext.php b/web/core/modules/layout_builder/src/Cache/LayoutBuilderUiCacheContext.php
index 4626d1cd8..ded7d5816 100644
--- a/web/core/modules/layout_builder/src/Cache/LayoutBuilderUiCacheContext.php
+++ b/web/core/modules/layout_builder/src/Cache/LayoutBuilderUiCacheContext.php
@@ -25,7 +25,11 @@ public static function getLabel() {
    * {@inheritdoc}
    */
   public function getContext() {
-    return 'is_layout_builder_ui.' . (int) (strpos($this->routeMatch->getRouteName(), 'layout_builder.') !== 0);
+    $route_name = $this->routeMatch->getRouteName();
+    if ($route_name && str_starts_with($route_name, 'layout_builder.')) {
+      return 'is_layout_builder_ui.0';
+    }
+    return 'is_layout_builder_ui.1';
   }
 
 }
diff --git a/web/core/modules/layout_builder/src/EventSubscriber/BlockComponentRenderArray.php b/web/core/modules/layout_builder/src/EventSubscriber/BlockComponentRenderArray.php
index 8ed8137f2..7d51b78a8 100644
--- a/web/core/modules/layout_builder/src/EventSubscriber/BlockComponentRenderArray.php
+++ b/web/core/modules/layout_builder/src/EventSubscriber/BlockComponentRenderArray.php
@@ -124,6 +124,7 @@ public function onBuildRender(SectionComponentBuildRenderArrayEvent $event) {
         '#plugin_id' => $block->getPluginId(),
         '#base_plugin_id' => $block->getBaseId(),
         '#derivative_plugin_id' => $block->getDerivativeId(),
+        '#in_preview' => $event->inPreview(),
         '#weight' => $event->getComponent()->getWeight(),
       ];
 
diff --git a/web/core/modules/layout_builder/src/Form/ConfigureSectionForm.php b/web/core/modules/layout_builder/src/Form/ConfigureSectionForm.php
index a1c53b4bd..7f31ec571 100644
--- a/web/core/modules/layout_builder/src/Form/ConfigureSectionForm.php
+++ b/web/core/modules/layout_builder/src/Form/ConfigureSectionForm.php
@@ -47,6 +47,13 @@ class ConfigureSectionForm extends FormBase {
    */
   protected $layout;
 
+  /**
+   * The section being configured.
+   *
+   * @var \Drupal\layout_builder\Section
+   */
+  protected $section;
+
   /**
    * The plugin form manager.
    *
@@ -68,6 +75,13 @@ class ConfigureSectionForm extends FormBase {
    */
   protected $delta;
 
+  /**
+   * The plugin ID.
+   *
+   * @var string
+   */
+  protected $pluginId;
+
   /**
    * Indicates whether the section is being added or updated.
    *
@@ -112,16 +126,15 @@ public function buildForm(array $form, FormStateInterface $form_state, SectionSt
     $this->sectionStorage = $section_storage;
     $this->delta = $delta;
     $this->isUpdate = is_null($plugin_id);
+    $this->pluginId = $plugin_id;
+
+    $section = $this->getCurrentSection();
 
     if ($this->isUpdate) {
-      $section = $this->sectionStorage->getSection($this->delta);
       if ($label = $section->getLayoutSettings()['label']) {
         $form['#title'] = $this->t('Configure @section', ['@section' => $label]);
       }
     }
-    else {
-      $section = new Section($plugin_id);
-    }
     // Passing available contexts to the layout plugin here could result in an
     // exception since the layout may not have a context mapping for a required
     // context slot on creation.
@@ -179,14 +192,12 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       $this->layout->setContextMapping($subform_state->getValue('context_mapping', []));
     }
 
-    $plugin_id = $this->layout->getPluginId();
     $configuration = $this->layout->getConfiguration();
 
-    if ($this->isUpdate) {
-      $this->sectionStorage->getSection($this->delta)->setLayoutSettings($configuration);
-    }
-    else {
-      $this->sectionStorage->insertSection($this->delta, new Section($plugin_id, $configuration));
+    $section = $this->getCurrentSection();
+    $section->setLayoutSettings($configuration);
+    if (!$this->isUpdate) {
+      $this->sectionStorage->insertSection($this->delta, $section);
     }
 
     $this->layoutTempstoreRepository->set($this->sectionStorage);
@@ -208,6 +219,8 @@ protected function successfulAjaxSubmit(array $form, FormStateInterface $form_st
    *
    * @return \Drupal\Core\Plugin\PluginFormInterface
    *   The plugin form for the layout.
+   *
+   * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
    */
   protected function getPluginForm(LayoutInterface $layout) {
     if ($layout instanceof PluginWithFormsInterface) {
@@ -222,7 +235,7 @@ protected function getPluginForm(LayoutInterface $layout) {
   }
 
   /**
-   * Retrieve the section storage property.
+   * Retrieves the section storage property.
    *
    * @return \Drupal\layout_builder\SectionStorageInterface
    *   The section storage for the current form.
@@ -231,4 +244,33 @@ public function getSectionStorage() {
     return $this->sectionStorage;
   }
 
+  /**
+   * Retrieves the layout being modified by the form.
+   *
+   * @return \Drupal\Core\Layout\LayoutInterface|\Drupal\Core\Plugin\PluginFormInterface
+   *   The layout for the current form.
+   */
+  public function getCurrentLayout(): LayoutInterface {
+    return $this->layout;
+  }
+
+  /**
+   * Retrieves the section being modified by the form.
+   *
+   * @return \Drupal\layout_builder\Section
+   *   The section for the current form.
+   */
+  public function getCurrentSection(): Section {
+    if (!isset($this->section)) {
+      if ($this->isUpdate) {
+        $this->section = $this->sectionStorage->getSection($this->delta);
+      }
+      else {
+        $this->section = new Section($this->pluginId);
+      }
+    }
+
+    return $this->section;
+  }
+
 }
diff --git a/web/core/modules/layout_builder/src/Form/MoveBlockForm.php b/web/core/modules/layout_builder/src/Form/MoveBlockForm.php
index d051de47e..beb3aa975 100644
--- a/web/core/modules/layout_builder/src/Form/MoveBlockForm.php
+++ b/web/core/modules/layout_builder/src/Form/MoveBlockForm.php
@@ -190,6 +190,7 @@ public function buildForm(array $form, FormStateInterface $form_state, SectionSt
     if (!isset($components[$uuid])) {
       $components[$uuid] = $sections[$delta]->getComponent($uuid);
     }
+    $state_weight_delta = round(count($components) / 2);
     foreach ($components as $component_uuid => $component) {
       /** @var \Drupal\Core\Block\BlockPluginInterface $plugin */
       $plugin = $component->getPlugin();
@@ -222,6 +223,7 @@ public function buildForm(array $form, FormStateInterface $form_state, SectionSt
           '#attributes' => [
             'class' => ['table-sort-weight'],
           ],
+          '#delta' => $state_weight_delta,
         ],
       ];
     }
diff --git a/web/core/modules/layout_builder/src/Plugin/Derivative/FieldBlockDeriver.php b/web/core/modules/layout_builder/src/Plugin/Derivative/FieldBlockDeriver.php
index a2a94a024..9dc935d70 100644
--- a/web/core/modules/layout_builder/src/Plugin/Derivative/FieldBlockDeriver.php
+++ b/web/core/modules/layout_builder/src/Plugin/Derivative/FieldBlockDeriver.php
@@ -9,6 +9,7 @@
 use Drupal\Core\Field\FieldConfigInterface;
 use Drupal\Core\Field\FieldTypePluginManagerInterface;
 use Drupal\Core\Field\FormatterPluginManager;
+use Drupal\Core\Logger\LoggerChannelTrait;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Context\EntityContextDefinition;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
@@ -24,6 +25,7 @@
 class FieldBlockDeriver extends DeriverBase implements ContainerDeriverInterface {
 
   use StringTranslationTrait;
+  use LoggerChannelTrait;
 
   /**
    * The entity type repository.
@@ -99,7 +101,12 @@ public function getDerivativeDefinitions($base_plugin_definition) {
 
         foreach ($field_info['bundles'] as $bundle) {
           $derivative = $base_plugin_definition;
-          $field_definition = $this->entityFieldManager->getFieldDefinitions($entity_type_id, $bundle)[$field_name];
+          $field_definitions = $this->entityFieldManager->getFieldDefinitions($entity_type_id, $bundle);
+          if (empty($field_definitions[$field_name])) {
+            $this->getLogger('field')->error('Field %field_name exists but is missing a corresponding field definition and may be misconfigured.', ['%field_name' => "$entity_type_id.$bundle.$field_name"]);
+            continue;
+          }
+          $field_definition = $field_definitions[$field_name];
 
           // Store the default formatter on the definition.
           $derivative['default_formatter'] = '';
diff --git a/web/core/modules/layout_builder/src/Plugin/SectionStorage/DefaultsSectionStorage.php b/web/core/modules/layout_builder/src/Plugin/SectionStorage/DefaultsSectionStorage.php
index dc0f35707..4c5d6f103 100644
--- a/web/core/modules/layout_builder/src/Plugin/SectionStorage/DefaultsSectionStorage.php
+++ b/web/core/modules/layout_builder/src/Plugin/SectionStorage/DefaultsSectionStorage.php
@@ -14,7 +14,6 @@
 use Drupal\Core\Plugin\Context\EntityContext;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Url;
-use Drupal\field_ui\FieldUI;
 use Drupal\layout_builder\DefaultsSectionStorageInterface;
 use Drupal\layout_builder\Entity\SampleEntityGeneratorInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -136,15 +135,21 @@ public function getLayoutBuilderUrl($rel = 'view') {
   protected function getRouteParameters() {
     $display = $this->getDisplay();
     $entity_type = $this->entityTypeManager->getDefinition($display->getTargetEntityTypeId());
-    $route_parameters = FieldUI::getRouteBundleParameter($entity_type, $display->getTargetBundle());
-    $route_parameters['view_mode_name'] = $display->getMode();
-    return $route_parameters;
+    $bundle_parameter_key = $entity_type->getBundleEntityType() ?: 'bundle';
+    return [
+      $bundle_parameter_key => $display->getTargetBundle(),
+      'view_mode_name' => $display->getMode(),
+    ];
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildRoutes(RouteCollection $collection) {
+    if (!\Drupal::moduleHandler()->moduleExists('field_ui')) {
+      return;
+    }
+
     foreach ($this->getEntityTypes() as $entity_type_id => $entity_type) {
       // Try to get the route from the current collection.
       if (!$entity_route = $collection->get($entity_type->get('field_ui_base_route'))) {
diff --git a/web/core/modules/layout_builder/src/Section.php b/web/core/modules/layout_builder/src/Section.php
index cd5d3aeda..b8ce26a7b 100644
--- a/web/core/modules/layout_builder/src/Section.php
+++ b/web/core/modules/layout_builder/src/Section.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Config\Entity\ThirdPartySettingsInterface;
 use Drupal\Core\Plugin\PreviewAwarePluginInterface;
+use Drupal\Core\Render\Element;
 
 /**
  * Provides a domain object for layout sections.
@@ -94,7 +95,12 @@ public function toRenderArray(array $contexts = [], $in_preview = FALSE) {
       $layout->setInPreview($in_preview);
     }
 
-    return $layout->build($regions);
+    $build = $layout->build($regions);
+    // If an entity was used to build the layout, store it on the build.
+    if (!Element::isEmpty($build) && isset($contexts['layout_builder.entity'])) {
+      $build['#entity'] = $contexts['layout_builder.entity']->getContextValue();
+    }
+    return $build;
   }
 
   /**
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_element_test/src/EventSubscriber/TestPrepareLayout.php b/web/core/modules/layout_builder/tests/modules/layout_builder_element_test/src/EventSubscriber/TestPrepareLayout.php
index cec4af43b..d3b080f51 100644
--- a/web/core/modules/layout_builder/tests/modules/layout_builder_element_test/src/EventSubscriber/TestPrepareLayout.php
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_element_test/src/EventSubscriber/TestPrepareLayout.php
@@ -12,8 +12,7 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * An event subscriber to test altering section storage via the
- * \Drupal\layout_builder\Event\PrepareLayoutEvent.
+ * Provides an event subscriber for testing section storage alteration.
  *
  * @see \Drupal\layout_builder\Event\PrepareLayoutEvent
  * @see \Drupal\layout_builder\Element\LayoutBuilder::prepareLayout()
diff --git a/web/core/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module b/web/core/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module
index cd6070f53..fa027a6b0 100644
--- a/web/core/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module
+++ b/web/core/modules/layout_builder/tests/modules/layout_builder_test/layout_builder_test.module
@@ -97,6 +97,27 @@ function layout_builder_test_form_layout_builder_configure_block_alter(&$form, F
   ];
 }
 
+/**
+ * Implements hook_form_BASE_FORM_ID_alter() for layout_builder_configure_section.
+ */
+function layout_builder_test_form_layout_builder_configure_section_alter(&$form, FormStateInterface $form_state, $form_id) {
+  /** @var \Drupal\layout_builder\Form\ConfigureSectionForm $form_object */
+  $form_object = $form_state->getFormObject();
+
+  $form['layout_builder_test']['storage'] = [
+    '#type' => 'item',
+    '#title' => 'Layout Builder Storage: ' . $form_object->getSectionStorage()->getStorageId(),
+  ];
+  $form['layout_builder_test']['section'] = [
+    '#type' => 'item',
+    '#title' => 'Layout Builder Section: ' . $form_object->getCurrentSection()->getLayoutId(),
+  ];
+  $form['layout_builder_test']['layout'] = [
+    '#type' => 'item',
+    '#title' => 'Layout Builder Layout: ' . $form_object->getCurrentLayout()->getPluginId(),
+  ];
+}
+
 /**
  * Implements hook_entity_form_display_alter().
  */
@@ -111,6 +132,30 @@ function layout_builder_entity_form_display_alter(EntityFormDisplayInterface $fo
   }
 }
 
+/**
+ * Implements hook_preprocess_HOOK() for one-column layout template.
+ */
+function layout_builder_test_preprocess_layout__onecol(&$vars) {
+  if (!empty($vars['content']['#entity'])) {
+    $vars['content']['content'][\Drupal::service('uuid')->generate()] = [
+      '#type' => 'markup',
+      '#markup' => sprintf('Yes, I can access the %s', $vars['content']['#entity']->label()),
+    ];
+  }
+}
+
+/**
+ * Implements hook_preprocess_HOOK() for two-column layout template.
+ */
+function layout_builder_test_preprocess_layout__twocol_section(&$vars) {
+  if (!empty($vars['content']['#entity'])) {
+    $vars['content']['first'][\Drupal::service('uuid')->generate()] = [
+      '#type' => 'markup',
+      '#markup' => sprintf('Yes, I can access the entity %s in two column', $vars['content']['#entity']->label()),
+    ];
+  }
+}
+
 /**
  * Implements hook_system_breadcrumb_alter().
  */
@@ -131,3 +176,14 @@ function layout_builder_test_module_implements_alter(&$implementations, $hook) {
     ] + $implementations;
   }
 }
+
+/**
+ * Implements hook_theme().
+ */
+function layout_builder_test_theme() {
+  return [
+    'block__preview_aware_block' => [
+      'base hook' => 'block',
+    ],
+  ];
+}
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
index dcf482eb8..24983d439 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderAccessTest.php
@@ -18,6 +18,7 @@ class LayoutBuilderAccessTest extends BrowserTestBase {
   protected static $modules = [
     'layout_builder',
     'block_test',
+    'field_ui',
     'node',
     'user',
   ];
@@ -25,7 +26,7 @@ class LayoutBuilderAccessTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderPrepareLayoutTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderPrepareLayoutTest.php
index e991d909e..903ebfcff 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderPrepareLayoutTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderPrepareLayoutTest.php
@@ -16,6 +16,7 @@ class LayoutBuilderPrepareLayoutTest extends BrowserTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'field_ui',
     'layout_builder',
     'node',
     'layout_builder_element_test',
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderSectionStorageTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderSectionStorageTest.php
index a008b63f9..a30d65dcf 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderSectionStorageTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderSectionStorageTest.php
@@ -16,6 +16,7 @@ class LayoutBuilderSectionStorageTest extends BrowserTestBase {
    */
   protected static $modules = [
     'layout_builder',
+    'field_ui',
     'node',
     'layout_builder_test',
   ];
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
index f135ac4cb..1b38a4bb9 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTest.php
@@ -19,6 +19,7 @@ class LayoutBuilderTest extends BrowserTestBase {
    * {@inheritdoc}
    */
   protected static $modules = [
+    'field_ui',
     'views',
     'layout_builder',
     'layout_builder_views_test',
@@ -33,7 +34,7 @@ class LayoutBuilderTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -121,6 +122,30 @@ public function testOverridesWithoutDefaultsAccess() {
     $assert_session->linkNotExists('Edit the template for all Bundle with section field content items instead.');
   }
 
+  /**
+   * Tests Layout Builder overrides without Field UI installed.
+   */
+  public function testOverridesWithoutFieldUi() {
+    $this->container->get('module_installer')->uninstall(['field_ui']);
+
+    $assert_session = $this->assertSession();
+    $page = $this->getSession()->getPage();
+
+    // @todo In https://www.drupal.org/node/540008 switch this to logging in as
+    //   a user with the 'configure any layout' permission.
+    $this->drupalLogin($this->rootUser);
+
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
+
+    $this->drupalGet('node/1');
+    $page->clickLink('Layout');
+    $assert_session->elementTextContains('css', '.layout-builder__message.layout-builder__message--overrides', 'You are editing the layout for this Bundle with section field content item.');
+    $assert_session->linkNotExists('Edit the template for all Bundle with section field content items instead.');
+  }
+
   /**
    * Tests functionality of Layout Builder for overrides.
    */
@@ -326,6 +351,7 @@ public function testLayoutBuilderUi() {
     $assert_session->pageTextContains('Extra, Extra read all about it.');
     $assert_session->pageTextNotContains('Placeholder for the "Extra label" field');
     $assert_session->linkNotExists('Layout');
+    $assert_session->pageTextContains(sprintf('Yes, I can access the %s', Node::load(1)->label()));
 
     // Enable overrides.
     $this->drupalGet("{$field_ui_prefix}/display/default");
@@ -352,6 +378,7 @@ public function testLayoutBuilderUi() {
     $assert_session->pageTextNotContains('Powered by Drupal');
     $assert_session->pageTextNotContains('Extra, Extra read all about it.');
     $assert_session->pageTextNotContains('Placeholder for the "Extra label" field');
+    $assert_session->pageTextContains(sprintf('Yes, I can access the entity %s in two column', Node::load(1)->label()));
 
     // Assert that overrides cannot be turned off while overrides exist.
     $this->drupalGet("$field_ui_prefix/display/default");
@@ -376,6 +403,7 @@ public function testLayoutBuilderUi() {
     $assert_session->pageTextContains('Powered by Drupal');
     $assert_session->pageTextContains('Extra, Extra read all about it.');
     $assert_session->pageTextNotContains('Placeholder for the "Extra label" field');
+    $assert_session->pageTextContains(sprintf('Yes, I can access the %s', Node::load(2)->label()));
 
     // The overridden node does not pick up the changes to defaults.
     $this->drupalGet('node/1');
@@ -406,6 +434,8 @@ public function testLayoutBuilderUi() {
     $assert_session->pageTextContains('The first node body');
     $assert_session->pageTextContains('Powered by Drupal');
     $assert_session->pageTextContains('Extra, Extra read all about it.');
+    $assert_session->pageTextNotContains(sprintf('Yes, I can access the entity %s in two column', Node::load(1)->label()));
+    $assert_session->pageTextContains(sprintf('Yes, I can access the %s', Node::load(1)->label()));
 
     // Assert that overrides can be turned off now that all overrides are gone.
     $this->drupalGet("{$field_ui_prefix}/display/default");
@@ -694,15 +724,47 @@ public function testPreviewAwarePlugins() {
     $page->pressButton('Add block');
 
     $assert_session->elementExists('css', '.go-birds-preview');
+    $assert_session->pageTextContains('The block template is being previewed.');
     $assert_session->pageTextContains('This block is being rendered in preview mode.');
 
     $page->pressButton('Save layout');
     $this->drupalGet('node/1');
 
     $assert_session->elementNotExists('css', '.go-birds-preview');
+    $assert_session->pageTextNotContains('The block template is being previewed.');
     $assert_session->pageTextContains('This block is being rendered normally.');
   }
 
+  /**
+   * Tests preview-aware templates.
+   */
+  public function testPreviewAwareTemplates() {
+    $assert_session = $this->assertSession();
+    $page = $this->getSession()->getPage();
+
+    $this->drupalLogin($this->drupalCreateUser([
+      'configure any layout',
+      'administer node display',
+    ]));
+
+    $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default');
+    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
+    $page->clickLink('Manage layout');
+    $page->clickLink('Add section');
+    $page->clickLink('1 column layout');
+    $page->pressButton('Add section');
+    $page->clickLink('Add block');
+    $page->clickLink('Preview-aware block');
+    $page->pressButton('Add block');
+
+    $assert_session->pageTextContains('This is a preview, indeed');
+
+    $page->pressButton('Save layout');
+    $this->drupalGet('node/1');
+
+    $assert_session->pageTextNotContains('This is a preview, indeed');
+  }
+
   /**
    * Tests the interaction between full and default view modes.
    *
@@ -1105,6 +1167,14 @@ public function testFormAlter() {
     $assert_session->pageTextContains('Layout Builder Storage: node.bundle_with_section_field.default');
     $assert_session->pageTextContains('Layout Builder Section: layout_onecol');
     $assert_session->pageTextContains('Layout Builder Component: system_powered_by_block');
+
+    $this->drupalGet("$field_ui_prefix/display/default");
+    $page->clickLink('Manage layout');
+    $page->clickLink('Add section');
+    $page->clickLink('One column');
+    $assert_session->pageTextContains('Layout Builder Storage: node.bundle_with_section_field.default');
+    $assert_session->pageTextContains('Layout Builder Section: layout_onecol');
+    $assert_session->pageTextContains('Layout Builder Layout: layout_onecol');
   }
 
   /**
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php
index 3c140db94..bf22848f3 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderThemeSuggestionsTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\layout_builder\Functional;
 
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -23,7 +24,7 @@ class LayoutBuilderThemeSuggestionsTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -35,6 +36,10 @@ protected function setUp(): void {
       'type' => 'bundle_with_section_field',
       'name' => 'Bundle with section field',
     ]);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
     $this->createNode([
       'type' => 'bundle_with_section_field',
       'title' => 'A node title',
@@ -47,11 +52,7 @@ protected function setUp(): void {
 
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
     ]));
-
-    $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default');
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
   }
 
   /**
@@ -61,7 +62,7 @@ public function testLayoutListSuggestion() {
     $page = $this->getSession()->getPage();
     $assert_session = $this->assertSession();
 
-    $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default/layout');
+    $this->drupalGet('node/1/layout');
     $page->clickLink('Add section');
     $assert_session->pageTextContains('layout_builder_theme_suggestions_test_preprocess_item_list__layouts');
   }
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTranslationTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTranslationTest.php
index a4873d5d7..4b5999d90 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTranslationTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutBuilderTranslationTest.php
@@ -122,15 +122,6 @@ public function testLayoutOverrideBeforeTranslation() {
     $assert_session->pageTextContains('Access denied');
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function getAdministratorPermissions() {
-    $permissions = parent::getAdministratorPermissions();
-    $permissions[] = 'administer entity_test_mul display';
-    return $permissions;
-  }
-
   /**
    * {@inheritdoc}
    */
@@ -148,13 +139,6 @@ protected function getTranslatorPermissions() {
   protected function setUpEntities() {
     $this->drupalLogin($this->administrator);
 
-    $field_ui_prefix = 'entity_test_mul/structure/entity_test_mul';
-    // Allow overrides for the layout.
-    $this->drupalGet("{$field_ui_prefix}/display/default");
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $this->drupalGet("{$field_ui_prefix}/display/default");
-    $this->submitForm(['layout[allow_custom]' => TRUE], 'Save');
-
     // @todo The Layout Builder UI relies on local tasks; fix in
     //   https://www.drupal.org/project/drupal/issues/2917777.
     $this->drupalPlaceBlock('local_tasks_block');
@@ -179,7 +163,11 @@ protected function setUpViewDisplay() {
       'bundle' => $this->bundle,
       'mode' => 'default',
       'status' => TRUE,
-    ])->setComponent($this->fieldName, ['type' => 'string'])->save();
+    ])
+      ->setComponent($this->fieldName, ['type' => 'string'])
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
   }
 
   /**
diff --git a/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php b/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php
index c22938cb8..3bbc2410d 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/LayoutSectionTest.php
@@ -28,7 +28,7 @@ class LayoutSectionTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php b/web/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php
index 071dc0506..5b364f21d 100644
--- a/web/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php
+++ b/web/core/modules/layout_builder/tests/src/Functional/Rest/LayoutRestTestBase.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\Core\Url;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\rest\Functional\BasicAuthResourceTestTrait;
 use Drupal\Tests\rest\Functional\ResourceTestBase;
 use GuzzleHttp\RequestOptions;
@@ -49,24 +50,18 @@ public function setUp() {
     $assert_session = $this->assertSession();
 
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
 
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer display modes',
       'bypass node access',
       'create bundle_with_section_field content',
       'edit any bundle_with_section_field content',
     ]));
     $page = $this->getSession()->getPage();
-    $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field/display';
-
-    // Enable Layout Builder for the default view modes, and overrides.
-    $this->drupalGet("$field_ui_prefix/default");
-    $page->checkField('layout[enabled]');
-    $page->pressButton('Save');
-    $page->checkField('layout[allow_custom]');
-    $page->pressButton('Save');
 
     // Create a node.
     $this->node = $this->createNode([
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
index 9be2b7d25..beb156969 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/AjaxBlockTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\system\Traits\OffCanvasTestTrait;
 
 /**
@@ -30,21 +31,26 @@ class AjaxBlockTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
    */
   protected function setUp(): void {
     parent::setUp();
-    $user = $this->drupalCreateUser([
+
+    // @todo The Layout Builder UI relies on local tasks; fix in
+    //   https://www.drupal.org/project/drupal/issues/2917777.
+    $this->drupalPlaceBlock('local_tasks_block');
+
+    $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
-    ]);
-    $user->save();
-    $this->drupalLogin($user);
+    ]));
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
   }
 
   /**
@@ -53,8 +59,9 @@ protected function setUp(): void {
   public function testAddAjaxBlock() {
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
+
     // Start by creating a node.
-    $node = $this->createNode([
+    $this->createNode([
       'type' => 'bundle_with_section_field',
       'body' => [
         [
@@ -62,18 +69,13 @@ public function testAddAjaxBlock() {
         ],
       ],
     ]);
-    $node->save();
+
     $this->drupalGet('node/1');
     $assert_session->pageTextContains('The node body');
     $assert_session->pageTextNotContains('Every word is like an unnecessary stain on silence and nothingness.');
-    $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
 
     // From the manage display page, go to manage the layout.
-    $this->drupalGet("{$field_ui_prefix}/display/default");
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $assert_session->linkExists('Manage layout');
-    $this->clickLink('Manage layout');
-    $assert_session->addressEquals("$field_ui_prefix/display/default/layout");
+    $this->clickLink('Layout');
     // The body field is present.
     $assert_session->elementExists('css', '.field--name-body');
 
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php
index d4402a796..de4e6910c 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFilterTest.php
@@ -4,6 +4,7 @@
 
 use Behat\Mink\Element\NodeElement;
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 
 /**
  * Tests the JavaScript functionality of the block add filter.
@@ -33,13 +34,16 @@ class BlockFilterTest extends WebDriverTestBase {
    */
   protected function setUp(): void {
     parent::setUp();
-    $user = $this->drupalCreateUser([
+
+    $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
-    ]);
-    $this->drupalLogin($user);
+    ]));
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
+    $this->createNode(['type' => 'bundle_with_section_field']);
   }
 
   /**
@@ -50,22 +54,15 @@ public function testBlockFilter() {
     $session = $this->getSession();
     $page = $session->getPage();
 
-    // From the manage display page, go to manage the layout.
-    $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
-    $this->drupalGet("{$field_ui_prefix}/display/default");
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $assert_session->linkExists('Manage layout');
-    $this->clickLink('Manage layout');
-    $assert_session->addressEquals("$field_ui_prefix/display/default/layout");
-
     // Open the block listing.
+    $this->drupalGet('node/1/layout');
     $assert_session->linkExists('Add block');
     $this->clickLink('Add block');
     $assert_session->assertWaitOnAjaxRequest();
 
     // Get all blocks, for assertions later.
     $blocks = $page->findAll('css', '.js-layout-builder-block-link');
-    $categories = $page->findAll('css', '.js-layout-builder-category');
+    $categories = $page->findAll('css', '.js-layout-builder-categories li');
 
     $filter = $assert_session->elementExists('css', '.js-layout-builder-filter');
 
@@ -92,16 +89,32 @@ public function testBlockFilter() {
     $fewer_blocks_message = ' blocks are available in the modified list';
     $this->assertAnnounceContains($fewer_blocks_message);
     $visible_rows = $this->filterVisibleElements($blocks);
-    $this->assertGreaterThan(0, count($blocks));
-    $this->assertLessThan(count($blocks), count($visible_rows));
+    $this->assertCount(4, $visible_rows);
     $visible_categories = $this->filterVisibleElements($categories);
-    $this->assertGreaterThan(0, count($visible_categories));
-    $this->assertLessThan(count($categories), count($visible_categories));
+    $this->assertCount(4, $visible_categories);
 
     // Test Drupal.announce() message when multiple matches are present.
     $expected_message = count($visible_rows) . $fewer_blocks_message;
     $this->assertAnnounceContains($expected_message);
 
+    // Test 3 letter search.
+    $filter->setValue('adm');
+    $visible_rows = $this->filterVisibleElements($blocks);
+    $this->assertCount(3, $visible_rows);
+    $visible_categories = $this->filterVisibleElements($categories);
+    $this->assertCount(3, $visible_categories);
+
+    // Retest that blocks appear when reducing letters.
+    $filter->setValue('ad');
+    $visible_rows = $this->filterVisibleElements($blocks);
+    $this->assertCount(4, $visible_rows);
+    $visible_categories = $this->filterVisibleElements($categories);
+    $this->assertCount(4, $visible_categories);
+
+    // Test blocks reappear after being filtered by repeating search for "a".
+    $filter->setValue('a');
+    $this->assertAnnounceContains('All available blocks are listed.');
+
     // Test Drupal.announce() message when only one match is present.
     $filter->setValue('Powered by');
     $this->assertAnnounceContains(' block is available');
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFormMessagesTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFormMessagesTest.php
index 166e10893..e6c143585 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFormMessagesTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/BlockFormMessagesTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait;
 
 /**
@@ -27,7 +28,7 @@ class BlockFormMessagesTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -35,6 +36,11 @@ class BlockFormMessagesTest extends WebDriverTestBase {
   protected function setUp(): void {
     parent::setUp();
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
+    $this->createNode(['type' => 'bundle_with_section_field']);
   }
 
   /**
@@ -50,19 +56,11 @@ public function testValidationMessage() {
     $this->drupalLogin($this->drupalCreateUser([
       'access contextual links',
       'configure any layout',
-      'administer node display',
-      'administer node fields',
     ]));
-    $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
-    // Enable layout builder.
-    $this->drupalGet($field_ui_prefix . '/display/default');
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $page->findLink('Manage layout')->click();
-    $assert_session->addressEquals($field_ui_prefix . '/display/default/layout');
+    $this->drupalGet('node/1/layout');
     $page->findLink('Add block')->click();
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas .block-categories'));
     $page->findLink('Powered by Drupal')->click();
-    $this->markTestSkipped("Skipped temporarily for random fails.");
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas [name="settings[label]"]'));
     $page->findField('Title')->setValue('');
     $page->findButton('Add block')->click();
@@ -76,10 +74,10 @@ public function testValidationMessage() {
     $assert_session->assertWaitOnAjaxRequest();
     $this->drupalGet($this->getUrl());
     $page->findButton('Save layout')->click();
-    $this->assertNotEmpty($assert_session->waitForElement('css', 'div:contains("The layout has been saved")'));
+    $this->assertNotEmpty($assert_session->waitForElement('css', 'div:contains("The layout override has been saved")'));
 
     // Ensure that message are displayed when configuring an existing block.
-    $this->drupalGet($field_ui_prefix . '/display/default/layout');
+    $this->drupalGet('node/1/layout');
     $assert_session->assertWaitOnAjaxRequest();
     $this->clickContextualLink($block_css_locator, 'Configure', TRUE);
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas [name="settings[label]"]'));
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php
index c7596b5a4..bd2357a3b 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContentPreviewToggleTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait;
 use Drupal\Tests\system\Traits\OffCanvasTestTrait;
 
@@ -30,7 +31,7 @@ class ContentPreviewToggleTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -39,11 +40,13 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->createContentType(['type' => 'bundle_for_this_particular_test']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_for_this_particular_test.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
 
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
       'access contextual links',
     ]));
   }
@@ -58,12 +61,6 @@ public function testContentPreviewToggle() {
     $body_field_placeholder_label = '"Body" field';
     $content_preview_body_text = 'I should only be visible if content preview is enabled.';
 
-    $this->drupalGet('admin/structure/types/manage/bundle_for_this_particular_test/display/default');
-    $this->submitForm([
-      'layout[enabled]' => TRUE,
-      'layout[allow_custom]' => TRUE,
-    ], 'Save');
-
     $this->createNode([
       'type' => 'bundle_for_this_particular_test',
       'body' => [
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContextualLinksTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContextualLinksTest.php
index 67252e387..be25d1ca6 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContextualLinksTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ContextualLinksTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
@@ -31,7 +32,7 @@ class ContextualLinksTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -41,8 +42,6 @@ protected function setUp(): void {
 
     $user = $this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
       'access contextual links',
       'administer nodes',
       'bypass node access',
@@ -51,6 +50,10 @@ protected function setUp(): void {
     $user->save();
     $this->drupalLogin($user);
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
 
     $this->createNode([
       'type' => 'bundle_with_section_field',
@@ -66,17 +69,9 @@ protected function setUp(): void {
    * Tests that the contextual links inside Layout Builder are removed.
    */
   public function testContextualLinks() {
+    // Skipped due to frequent random test failures.
     $page = $this->getSession()->getPage();
 
-    $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
-
-    // Enable Layout Builder and overrides.
-    $this->drupalGet("{$field_ui_prefix}/display/default");
-    $this->submitForm([
-      'layout[enabled]' => TRUE,
-      'layout[allow_custom]' => TRUE,
-    ], 'Save');
-
     $this->drupalGet('node/1/layout');
 
     // Add a block that includes an entity contextual link.
@@ -127,7 +122,6 @@ protected function addBlock($block_name) {
    * @internal
    */
   protected function assertCorrectContextualLinksInUi(): void {
-    $this->markTestSkipped("Skipped temporarily for random fails.");
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.block-views-blocktest-block-view-block-2'));
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/FieldBlockTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/FieldBlockTest.php
index 002cece56..2350932a9 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/FieldBlockTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/FieldBlockTest.php
@@ -30,7 +30,7 @@ class FieldBlockTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -81,7 +81,7 @@ public function testUserFieldBlock() {
     $assert_session->pageTextNotContains('Initial email');
 
     $assert_session->pageTextContains('Date field');
-    $block_url = 'admin/structure/block/add/field_block_test%3Auser%3Auser%3Afield_date/classy';
+    $block_url = 'admin/structure/block/add/field_block_test%3Auser%3Auser%3Afield_date/starterkit_theme';
     $assert_session->linkByHrefExists($block_url);
 
     $this->drupalGet($block_url);
@@ -152,7 +152,7 @@ public function testStatesFieldBlock() {
     ]);
     $timestamp_field->save();
 
-    $this->drupalGet('admin/structure/block/add/field_block_test%3Auser%3Auser%3Afield_timestamp/classy');
+    $this->drupalGet('admin/structure/block/add/field_block_test%3Auser%3Auser%3Afield_timestamp/starterkit_theme');
     $this->assertFalse($page->findField('settings[formatter][settings][custom_date_format]')->isVisible(), 'Custom date format is not visible');
     $page->selectFieldOption('settings[formatter][settings][date_format]', 'custom');
     $this->assertTrue($page->findField('settings[formatter][settings][custom_date_format]')->isVisible(), 'Custom date format is visible');
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php
index 36d9712ae..95f213ac9 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockPrivateFilesTest.php
@@ -4,6 +4,7 @@
 
 use Drupal\file\Entity\File;
 use Drupal\file\FileInterface;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\file\Functional\FileFieldCreationTrait;
@@ -29,7 +30,7 @@ class InlineBlockPrivateFilesTest extends InlineBlockTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The file system service.
@@ -62,21 +63,10 @@ protected function setUp(): void {
    */
   public function testPrivateFiles() {
     $assert_session = $this->assertSession();
-    $this->drupalLogin($this->drupalCreateUser([
-      'access contextual links',
-      'configure any layout',
-      'administer node display',
-      'administer node fields',
-      'create and edit custom blocks',
-    ]));
-
-    // Enable layout builder and overrides.
-    $this->drupalGet(static::FIELD_UI_PREFIX . '/display/default');
-    $this->submitForm([
-      'layout[enabled]' => TRUE,
-      'layout[allow_custom]' => TRUE,
-    ], 'Save');
-    $this->drupalLogout();
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
 
     // Log in as user you can only configure layouts and access content.
     $this->drupalLogin($this->drupalCreateUser([
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
index 773ad3a39..c9093a176 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/InlineBlockTest.php
@@ -15,7 +15,14 @@ class InlineBlockTest extends InlineBlockTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected static $modules = [
+    'field_ui',
+  ];
 
   /**
    * Tests adding and editing of inline blocks.
@@ -662,4 +669,43 @@ public function testEditInlineBlocksPermission() {
     $assert($permissions, TRUE);
   }
 
+  /**
+   * Test editing inline blocks when the parent has been reverted.
+   */
+  public function testInlineBlockParentRevert() {
+    $this->drupalLogin($this->drupalCreateUser([
+      'access contextual links',
+      'configure any layout',
+      'administer node display',
+      'administer node fields',
+      'administer nodes',
+      'bypass node access',
+      'create and edit custom blocks',
+    ]));
+    $display = \Drupal::service('entity_display.repository')->getViewDisplay('node', 'bundle_with_section_field');
+    $display->enableLayoutBuilder()->setOverridable()->save();
+    $test_node = $this->createNode([
+      'title' => 'test node',
+      'type' => 'bundle_with_section_field',
+    ]);
+
+    $this->drupalGet("node/{$test_node->id()}/layout");
+    $this->addInlineBlockToLayout('Example block', 'original content');
+    $this->assertSaveLayout();
+    $original_content_revision_id = Node::load($test_node->id())->getLoadedRevisionId();
+
+    $this->drupalGet("node/{$test_node->id()}/layout");
+    $this->configureInlineBlock('original content', 'updated content');
+    $this->assertSaveLayout();
+
+    $this->drupalGet("node/{$test_node->id()}/revisions/$original_content_revision_id/revert");
+    $this->submitForm([], 'Revert');
+    $this->drupalGet("node/{$test_node->id()}/layout");
+    $this->configureInlineBlock('original content', 'second updated content');
+    $this->assertSaveLayout();
+
+    $this->drupalGet($test_node->toUrl());
+    $this->assertSession()->pageTextContains('second updated content');
+  }
+
 }
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ItemLayoutFieldBlockTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ItemLayoutFieldBlockTest.php
index 726cc31a2..eba608cdc 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ItemLayoutFieldBlockTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/ItemLayoutFieldBlockTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 
 /**
  * Field blocks tests for the override layout.
@@ -32,12 +33,14 @@ protected function setUp(): void {
 
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
     ]));
 
     // We need more then one content type for this test.
     $this->createContentType(['type' => 'bundle_with_layout_overrides']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_layout_overrides.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
     $this->createContentType(['type' => 'filler_bundle']);
   }
 
@@ -48,12 +51,6 @@ public function testAddAjaxBlock() {
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
 
-    // Allow overrides for the layout.
-    $this->drupalGet('admin/structure/types/manage/bundle_with_layout_overrides/display/default');
-    $page->checkField('layout[enabled]');
-    $page->checkField('layout[allow_custom]');
-    $page->pressButton('Save');
-
     // Start by creating a node of type with layout overrides.
     $node = $this->createNode([
       'type' => 'bundle_with_layout_overrides',
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
index 6ce658324..ce71c9f96 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderDisableInteractionsTest.php
@@ -27,6 +27,7 @@ class LayoutBuilderDisableInteractionsTest extends WebDriverTestBase {
   protected static $modules = [
     'block',
     'block_content',
+    'field_ui',
     'filter',
     'filter_test',
     'layout_builder',
@@ -39,7 +40,7 @@ class LayoutBuilderDisableInteractionsTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -235,7 +236,6 @@ protected function assertContextualLinksClickable(): void {
     $this->clickContextualLink('.block-field-blocknodebundle-with-section-fieldbody [data-contextual-id^="layout_builder_block"]', 'Configure');
     $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas'));
     $page->pressButton('Close');
-    $this->markTestSkipped('Temporarily skipped due to random failures.');
     $assert_session->assertNoElementAfterWait('css', '#drupal-off-canvas');
     $this->assertContextualLinkRetainsMouseup();
   }
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php
index a000ac8f5..82efebb9e 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderNestedFormUiTest.php
@@ -25,6 +25,7 @@ class LayoutBuilderNestedFormUiTest extends WebDriverTestBase {
    */
   protected static $modules = [
     'block',
+    'field_ui',
     'node',
     'layout_builder',
     'layout_builder_form_block_test',
@@ -65,7 +66,6 @@ protected function setUp(): void {
    * Tests blocks containing forms can be successfully saved editing defaults.
    */
   public function testAddingFormBlocksToDefaults() {
-    $this->markTestSkipped();
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
       'administer node display',
@@ -100,7 +100,6 @@ public function testAddingFormBlocksToDefaults() {
    * Tests blocks containing forms can be successfully saved editing overrides.
    */
   public function testAddingFormBlocksToOverrides() {
-    $this->markTestSkipped();
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
       'administer node display',
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderOptInTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderOptInTest.php
index c1e8908e5..a80ac8b7f 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderOptInTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderOptInTest.php
@@ -23,7 +23,7 @@ class LayoutBuilderOptInTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
index fe995ec24..08c18063a 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderTest.php
@@ -35,7 +35,7 @@ class LayoutBuilderTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The node to customize with Layout Builder.
@@ -100,7 +100,6 @@ protected function setUp(): void {
    * Tests the Layout Builder UI.
    */
   public function testLayoutBuilderUi() {
-    $this->markTestSkipped();
     $layout_url = 'node/1/layout';
     $node_url = 'node/1';
 
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderToolbarTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderToolbarTest.php
index 9cb41a4b4..8021710a2 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderToolbarTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderToolbarTest.php
@@ -17,6 +17,7 @@ class LayoutBuilderToolbarTest extends WebDriverTestBase {
   protected static $modules = [
     'block',
     'node',
+    'field_ui',
     'layout_builder',
     'node',
     'toolbar',
@@ -25,7 +26,7 @@ class LayoutBuilderToolbarTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php
index f6dd1eab7..ebe12b42f 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/LayoutBuilderUiTest.php
@@ -22,9 +22,13 @@ class LayoutBuilderUiTest extends WebDriverTestBase {
    */
   const FIELD_UI_PREFIX = 'admin/structure/types/manage/bundle_with_section_field';
 
+  /**
+   * {@inheritdoc}
+   */
   protected static $modules = [
     'layout_builder',
     'block',
+    'field_ui',
     'node',
     'block_content',
     'contextual',
@@ -34,7 +38,7 @@ class LayoutBuilderUiTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/MoveBlockFormTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/MoveBlockFormTest.php
index 79e5179c8..4f7397030 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/MoveBlockFormTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/MoveBlockFormTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\contextual\FunctionalJavascript\ContextualLinkClickTrait;
 
 /**
@@ -14,13 +15,6 @@ class MoveBlockFormTest extends WebDriverTestBase {
 
   use ContextualLinkClickTrait;
 
-  /**
-   * Path prefix for the field UI for the test bundle.
-   *
-   * @var string
-   */
-  const FIELD_UI_PREFIX = 'admin/structure/types/manage/bundle_with_section_field';
-
   /**
    * {@inheritdoc}
    */
@@ -34,7 +28,7 @@ class MoveBlockFormTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -44,21 +38,25 @@ protected function setUp(): void {
     $page = $this->getSession()->getPage();
     $assert_session = $this->assertSession();
 
+    // @todo The Layout Builder UI relies on local tasks; fix in
+    //   https://www.drupal.org/project/drupal/issues/2917777.
+    $this->drupalPlaceBlock('local_tasks_block');
+
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
+    $this->createNode([
+      'type' => 'bundle_with_section_field',
+    ]);
 
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
       'access contextual links',
     ]));
 
-    // Enable layout builder.
-    $this->drupalGet(static::FIELD_UI_PREFIX . '/display/default');
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $page->clickLink('Manage layout');
-    $assert_session->addressEquals(static::FIELD_UI_PREFIX . '/display/default/layout');
-
+    $this->drupalGet('node/1/layout');
     $expected_block_order = [
       '.block-extra-field-blocknodebundle-with-section-fieldlinks',
       '.block-field-blocknodebundle-with-section-fieldbody',
@@ -98,6 +96,7 @@ protected function setUp(): void {
    */
   public function testMoveBlock() {
     $page = $this->getSession()->getPage();
+    $assert_session = $this->assertSession();
 
     // Reorder body field in current region.
     $this->openBodyMoveForm(1, 'content', ['Links', 'Body (current)']);
@@ -109,7 +108,7 @@ public function testMoveBlock() {
     ];
     $this->assertRegionBlocksOrder(1, 'content', $expected_block_order);
     $page->pressButton('Save layout');
-    $page->clickLink('Manage layout');
+    $page->clickLink('Layout');
     $this->assertRegionBlocksOrder(1, 'content', $expected_block_order);
 
     // Move the body block into the first region above existing block.
@@ -128,7 +127,7 @@ public function testMoveBlock() {
     // Ensure the body block is no longer in the content region.
     $this->assertRegionBlocksOrder(1, 'content', ['.block-extra-field-blocknodebundle-with-section-fieldlinks']);
     $page->pressButton('Save layout');
-    $page->clickLink('Manage layout');
+    $page->clickLink('Layout');
     $this->assertRegionBlocksOrder(0, 'first', $expected_block_order);
 
     // Move into the second region that has no existing blocks.
@@ -137,6 +136,47 @@ public function testMoveBlock() {
     $this->assertBlockTable(['Body (current)']);
     $page->pressButton('Move');
     $this->assertRegionBlocksOrder(0, 'second', ['.block-field-blocknodebundle-with-section-fieldbody']);
+
+    // The weight element uses -10 to 10 by default, which can cause bugs.
+    // Add 25 'Powered by Drupal' blocks to a new section.
+    $page->clickLink('Add section');
+    $assert_session->waitForElementVisible('css', '#drupal-off-canvas');
+    $assert_session->assertWaitOnAjaxRequest();
+    $page->clickLink('One column');
+    $assert_session->assertWaitOnAjaxRequest();
+    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'input[value="Add section"]'));
+    $page->pressButton('Add section');
+    $assert_session->assertNoElementAfterWait('css', '#drupal-off-canvas');
+    $large_block_number = 25;
+    for ($i = 0; $i < $large_block_number; $i++) {
+      $assert_session->elementExists('css', '[data-layout-delta="0"].layout--onecol [data-region="content"] .layout-builder__add-block')->click();
+      $this->assertNotEmpty($assert_session->waitForElementVisible('css', '#drupal-off-canvas a:contains("Powered by Drupal")'));
+      $assert_session->assertWaitOnAjaxRequest();
+      $page->clickLink('Powered by Drupal');
+      $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'input[value="Add block"]'));
+      $assert_session->assertWaitOnAjaxRequest();
+      $page->pressButton('Add block');
+      $assert_session->assertNoElementAfterWait('css', '#drupal-off-canvas');
+    }
+    $first_region_block_locator = '[data-layout-delta="0"].layout--onecol [data-region="content"] [data-layout-block-uuid]';
+    $assert_session->elementsCount('css', $first_region_block_locator, $large_block_number);
+
+    // Move the Body block to the end of the new section.
+    $this->openBodyMoveForm(1, 'second', ['Body (current)']);
+    $page->selectFieldOption('Region', '0:content');
+    $expected_block_table = array_fill(0, $large_block_number, 'Powered by Drupal');
+    $expected_block_table[] = 'Body (current)';
+    $this->assertBlockTable($expected_block_table);
+    $expected_block_table = array_fill(0, $large_block_number - 1, 'Powered by Drupal');
+    $expected_block_table[] = 'Body (current)*';
+    $expected_block_table[] = 'Powered by Drupal';
+    $this->moveBlockWithKeyboard('up', 'Body', $expected_block_table);
+    $page->pressButton('Move');
+    $assert_session->assertNoElementAfterWait('css', '#drupal-off-canvas');
+    // Get all blocks currently in the region.
+    $blocks = $page->findAll('css', $first_region_block_locator);
+    // The second to last $block should be the body.
+    $this->assertTrue($blocks[count($blocks) - 2]->hasClass('block-field-blocknodebundle-with-section-fieldbody'));
   }
 
   /**
diff --git a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php
index 9ec01e7cb..6ada06020 100644
--- a/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php
+++ b/web/core/modules/layout_builder/tests/src/FunctionalJavascript/TestMultiWidthLayoutsTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\layout_builder\FunctionalJavascript;
 
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 
 /**
  * Test the multi-width layout plugins.
@@ -12,12 +13,8 @@
 class TestMultiWidthLayoutsTest extends WebDriverTestBase {
 
   /**
-   * Path prefix for the field UI for the test bundle.
-   *
-   * @var string
+   * {@inheritdoc}
    */
-  const FIELD_UI_PREFIX = 'admin/structure/types/manage/bundle_with_section_field';
-
   protected static $modules = [
     'layout_builder',
     'block',
@@ -36,11 +33,16 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->createContentType(['type' => 'bundle_with_section_field']);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
 
+    $this->createNode([
+      'type' => 'bundle_with_section_field',
+    ]);
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
-      'administer node fields',
     ]));
   }
 
@@ -51,13 +53,7 @@ public function testWidthChange() {
     $assert_session = $this->assertSession();
     $page = $this->getSession()->getPage();
 
-    // Enable layout builder.
-    $this->drupalGet(static::FIELD_UI_PREFIX . '/display/default');
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-
-    $this->clickLink('Manage layout');
-    $assert_session->addressEquals(static::FIELD_UI_PREFIX . '/display/default/layout');
-
+    $this->drupalGet('node/1/layout');
     $width_options = [
       [
         'label' => 'Two column',
diff --git a/web/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderCompatibilityTestBase.php b/web/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderCompatibilityTestBase.php
index 629f530cc..526492f9f 100644
--- a/web/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderCompatibilityTestBase.php
+++ b/web/core/modules/layout_builder/tests/src/Kernel/LayoutBuilderCompatibilityTestBase.php
@@ -46,8 +46,8 @@ protected function setUp() {
     // Set up a non-admin user that is allowed to view test entities.
     \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2], ['view test entity']));
 
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
 
     $field_storage = FieldStorageConfig::create([
       'entity_type' => 'entity_test_base_field_display',
diff --git a/web/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php b/web/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php
index 76281f873..9d797038d 100644
--- a/web/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php
+++ b/web/core/modules/layout_builder/tests/src/Unit/BlockComponentRenderArrayTest.php
@@ -120,6 +120,7 @@ public function testOnBuildRender($refinable_dependent_access) {
       '#base_plugin_id' => 'block_plugin_id',
       '#derivative_plugin_id' => NULL,
       'content' => $block_content,
+      '#in_preview' => FALSE,
     ];
 
     $expected_build_with_expected_cache = $expected_build + [
@@ -195,6 +196,7 @@ public function testOnBuildRenderWithoutPreviewFallbackString($refinable_depende
       '#base_plugin_id' => 'block_plugin_id',
       '#derivative_plugin_id' => NULL,
       'content' => $block_content,
+      '#in_preview' => FALSE,
     ];
 
     $expected_cache = $expected_build + [
@@ -324,6 +326,7 @@ public function testOnBuildRenderInPreview($refinable_dependent_access) {
       '#attributes' => [
         'data-layout-content-preview-placeholder-label' => $placeholder_label,
       ],
+      '#in_preview' => TRUE,
     ];
 
     $expected_cache = $expected_build + [
@@ -332,6 +335,7 @@ public function testOnBuildRenderInPreview($refinable_dependent_access) {
         'tags' => ['test'],
         'max-age' => 0,
       ],
+      '#in_preview' => TRUE,
     ];
 
     $subscriber->onBuildRender($event);
@@ -383,6 +387,7 @@ public function testOnBuildRenderInPreviewEmptyBuild() {
       '#attributes' => [
         'data-layout-content-preview-placeholder-label' => $placeholder_string,
       ],
+      '#in_preview' => TRUE,
     ];
     $expected_build['content']['#markup'] = $placeholder_string;
 
@@ -392,6 +397,7 @@ public function testOnBuildRenderInPreviewEmptyBuild() {
         'tags' => ['test'],
         'max-age' => 0,
       ],
+      '#in_preview' => TRUE,
     ];
 
     $subscriber->onBuildRender($event);
@@ -477,12 +483,12 @@ public function testOnBuildRenderEmptyBuildWithCacheTags() {
     $expected_build = [];
 
     $expected_cache = $expected_build + [
-        '#cache' => [
-          'contexts' => [],
-          'tags' => ['empty_build_cache_test', 'test'],
-          'max-age' => -1,
-        ],
-      ];
+      '#cache' => [
+        'contexts' => [],
+        'tags' => ['empty_build_cache_test', 'test'],
+        'max-age' => -1,
+      ],
+    ];
 
     $subscriber->onBuildRender($event);
     $result = $event->getBuild();
diff --git a/web/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php b/web/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php
index 11aff3d47..162935d5b 100644
--- a/web/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php
+++ b/web/core/modules/layout_builder/tests/src/Unit/DefaultsSectionStorageTest.php
@@ -9,6 +9,7 @@
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
+use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Context\ContextInterface;
 use Drupal\Core\Plugin\Context\EntityContextDefinition;
@@ -220,6 +221,12 @@ public function testExtractEntityFromRouteCreate() {
    * @covers \Drupal\layout_builder\Routing\LayoutBuilderRoutesTrait::buildLayoutRoutes
    */
   public function testBuildRoutes() {
+    $module_handler = $this->prophesize(ModuleHandlerInterface::class);
+    $module_handler->moduleExists('field_ui')->willReturn(TRUE);
+    $container = new ContainerBuilder();
+    $container->set('module_handler', $module_handler->reveal());
+    \Drupal::setContainer($container);
+
     $entity_types = [];
 
     $not_fieldable = $this->prophesize(EntityTypeInterface::class);
@@ -405,4 +412,19 @@ public function testBuildRoutes() {
     $this->assertSame(array_keys($expected), array_keys($collection->all()));
   }
 
+  /**
+   * @covers ::buildRoutes
+   */
+  public function testBuildRoutesNoFieldUi() {
+    $module_handler = $this->prophesize(ModuleHandlerInterface::class);
+    $module_handler->moduleExists('field_ui')->willReturn(FALSE);
+    $container = new ContainerBuilder();
+    $container->set('module_handler', $module_handler->reveal());
+    \Drupal::setContainer($container);
+
+    $collection = new RouteCollection();
+    $this->plugin->buildRoutes($collection);
+    $this->assertEmpty($collection->all());
+  }
+
 }
diff --git a/web/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php b/web/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php
index fe9fbdc35..a149ff846 100644
--- a/web/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php
+++ b/web/core/modules/layout_builder/tests/src/Unit/SectionRenderTest.php
@@ -115,6 +115,7 @@ public function testToRenderArray() {
         'tags' => [],
         'max-age' => -1,
       ],
+      '#in_preview' => FALSE,
     ];
 
     $block = $this->prophesize(BlockPluginInterface::class)->willImplement(PreviewFallbackInterface::class);
@@ -198,6 +199,7 @@ public function testToRenderArrayPreview() {
         'tags' => [],
         'max-age' => 0,
       ],
+      '#in_preview' => TRUE,
     ];
     $block = $this->prophesize(BlockPluginInterface::class)->willImplement(PreviewFallbackInterface::class);
     $this->blockManager->createInstance('block_plugin_id', ['id' => 'block_plugin_id'])->willReturn($block->reveal());
@@ -254,6 +256,7 @@ public function testContextAwareBlock() {
         'tags' => [],
         'max-age' => -1,
       ],
+      '#in_preview' => FALSE,
     ];
 
     $block = $this->prophesize(BlockPluginInterface::class)
diff --git a/web/core/modules/layout_discovery/layout_discovery.module b/web/core/modules/layout_discovery/layout_discovery.module
index ce08617e0..efc9d3b30 100644
--- a/web/core/modules/layout_discovery/layout_discovery.module
+++ b/web/core/modules/layout_discovery/layout_discovery.module
@@ -34,11 +34,12 @@ function layout_discovery_theme() {
  * @param array &$variables
  *   An associative array containing:
  *   - content: An associative array containing the properties of the element.
- *     Properties used: #settings, #layout.
+ *     Properties used: #settings, #layout, #in_preview.
  */
 function template_preprocess_layout(&$variables) {
   $variables['settings'] = $variables['content']['#settings'] ?? [];
   $variables['layout'] = $variables['content']['#layout'] ?? [];
+  $variables['in_preview'] = $variables['content']['#in_preview'] ?? FALSE;
 
   // Create an attributes variable for each region.
   foreach (Element::children($variables['content']) as $name) {
diff --git a/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig b/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
index 3a7f9934d..01d61e009 100644
--- a/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
+++ b/web/core/modules/layout_discovery/layouts/onecol/layout--onecol.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation to display a one-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig b/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
index e5441d8b6..cd226f020 100644
--- a/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
+++ b/web/core/modules/layout_discovery/layouts/threecol_25_50_25/layout--threecol-25-50-25.html.twig
@@ -7,6 +7,7 @@
  * additional areas for the top and the bottom.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig b/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
index 6445061c0..762cece8c 100644
--- a/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
+++ b/web/core/modules/layout_discovery/layouts/threecol_33_34_33/layout--threecol-33-34-33.html.twig
@@ -7,6 +7,7 @@
  * additional areas for the top and the bottom.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig b/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
index 262c657f9..11939907b 100644
--- a/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
+++ b/web/core/modules/layout_discovery/layouts/twocol/layout--twocol.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation to display a two-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig b/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
index dc29e03e4..f772834f5 100644
--- a/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
+++ b/web/core/modules/layout_discovery/layouts/twocol_bricks/layout--twocol-bricks.html.twig
@@ -7,6 +7,7 @@
  * the top, bottom and in the middle.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/modules/link/src/LinkItemInterface.php b/web/core/modules/link/src/LinkItemInterface.php
index 530617044..ed726473a 100644
--- a/web/core/modules/link/src/LinkItemInterface.php
+++ b/web/core/modules/link/src/LinkItemInterface.php
@@ -37,6 +37,9 @@ public function isExternal();
    *
    * @return \Drupal\Core\Url
    *   Returns a Url object.
+   *
+   * @throws \InvalidArgumentException
+   *   Thrown when there is a problem with field data.
    */
   public function getUrl();
 
diff --git a/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 83f1a2f27..2cce67779 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -94,21 +94,21 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
 
     $elements['trim_length'] = [
       '#type' => 'number',
-      '#title' => t('Trim link text length'),
-      '#field_suffix' => t('characters'),
+      '#title' => $this->t('Trim link text length'),
+      '#field_suffix' => $this->t('characters'),
       '#default_value' => $this->getSetting('trim_length'),
       '#min' => 1,
-      '#description' => t('Leave blank to allow unlimited link text lengths.'),
+      '#description' => $this->t('Leave blank to allow unlimited link text lengths.'),
     ];
     $elements['url_only'] = [
       '#type' => 'checkbox',
-      '#title' => t('URL only'),
+      '#title' => $this->t('URL only'),
       '#default_value' => $this->getSetting('url_only'),
       '#access' => $this->getPluginId() == 'link',
     ];
     $elements['url_plain'] = [
       '#type' => 'checkbox',
-      '#title' => t('Show URL as plain text'),
+      '#title' => $this->t('Show URL as plain text'),
       '#default_value' => $this->getSetting('url_plain'),
       '#access' => $this->getPluginId() == 'link',
       '#states' => [
@@ -119,13 +119,13 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     ];
     $elements['rel'] = [
       '#type' => 'checkbox',
-      '#title' => t('Add rel="nofollow" to links'),
+      '#title' => $this->t('Add rel="nofollow" to links'),
       '#return_value' => 'nofollow',
       '#default_value' => $this->getSetting('rel'),
     ];
     $elements['target'] = [
       '#type' => 'checkbox',
-      '#title' => t('Open link in new window'),
+      '#title' => $this->t('Open link in new window'),
       '#return_value' => '_blank',
       '#default_value' => $this->getSetting('target'),
     ];
@@ -142,24 +142,24 @@ public function settingsSummary() {
     $settings = $this->getSettings();
 
     if (!empty($settings['trim_length'])) {
-      $summary[] = t('Link text trimmed to @limit characters', ['@limit' => $settings['trim_length']]);
+      $summary[] = $this->t('Link text trimmed to @limit characters', ['@limit' => $settings['trim_length']]);
     }
     else {
-      $summary[] = t('Link text not trimmed');
+      $summary[] = $this->t('Link text not trimmed');
     }
     if ($this->getPluginId() == 'link' && !empty($settings['url_only'])) {
       if (!empty($settings['url_plain'])) {
-        $summary[] = t('Show URL only as plain-text');
+        $summary[] = $this->t('Show URL only as plain-text');
       }
       else {
-        $summary[] = t('Show URL only');
+        $summary[] = $this->t('Show URL only');
       }
     }
     if (!empty($settings['rel'])) {
-      $summary[] = t('Add rel="@rel"', ['@rel' => $settings['rel']]);
+      $summary[] = $this->t('Add rel="@rel"', ['@rel' => $settings['rel']]);
     }
     if (!empty($settings['target'])) {
-      $summary[] = t('Open link in new window');
+      $summary[] = $this->t('Open link in new window');
     }
 
     return $summary;
@@ -237,7 +237,13 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
    *   A Url object.
    */
   protected function buildUrl(LinkItemInterface $item) {
-    $url = $item->getUrl() ?: Url::fromRoute('<none>');
+    try {
+      $url = $item->getUrl();
+    }
+    catch (\InvalidArgumentException $e) {
+      // @todo Add logging here in https://www.drupal.org/project/drupal/issues/3348020
+      $url = Url::fromRoute('<none>');
+    }
 
     $settings = $this->getSettings();
     $options = $item->options;
diff --git a/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php b/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
index 84556f8be..9154eee1c 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldType/LinkItem.php
@@ -10,6 +10,7 @@
 use Drupal\Core\TypedData\DataDefinition;
 use Drupal\Core\TypedData\MapDataDefinition;
 use Drupal\Core\Url;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\link\LinkItemInterface;
 
 /**
@@ -41,13 +42,13 @@ public static function defaultFieldSettings() {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['uri'] = DataDefinition::create('uri')
-      ->setLabel(t('URI'));
+      ->setLabel(new TranslatableMarkup('URI'));
 
     $properties['title'] = DataDefinition::create('string')
-      ->setLabel(t('Link text'));
+      ->setLabel(new TranslatableMarkup('Link text'));
 
     $properties['options'] = MapDataDefinition::create()
-      ->setLabel(t('Options'));
+      ->setLabel(new TranslatableMarkup('Options'));
 
     return $properties;
   }
@@ -89,23 +90,23 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['link_type'] = [
       '#type' => 'radios',
-      '#title' => t('Allowed link type'),
+      '#title' => $this->t('Allowed link type'),
       '#default_value' => $this->getSetting('link_type'),
       '#options' => [
-        static::LINK_INTERNAL => t('Internal links only'),
-        static::LINK_EXTERNAL => t('External links only'),
-        static::LINK_GENERIC => t('Both internal and external links'),
+        static::LINK_INTERNAL => $this->t('Internal links only'),
+        static::LINK_EXTERNAL => $this->t('External links only'),
+        static::LINK_GENERIC => $this->t('Both internal and external links'),
       ],
     ];
 
     $element['title'] = [
       '#type' => 'radios',
-      '#title' => t('Allow link text'),
+      '#title' => $this->t('Allow link text'),
       '#default_value' => $this->getSetting('title'),
       '#options' => [
-        DRUPAL_DISABLED => t('Disabled'),
-        DRUPAL_OPTIONAL => t('Optional'),
-        DRUPAL_REQUIRED => t('Required'),
+        DRUPAL_DISABLED => $this->t('Disabled'),
+        DRUPAL_OPTIONAL => $this->t('Optional'),
+        DRUPAL_REQUIRED => $this->t('Required'),
       ],
     ];
 
diff --git a/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
index 3d6d80f62..ebc3ee61e 100644
--- a/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
+++ b/web/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\link\Plugin\Field\FieldWidget;
 
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Url;
 use Drupal\Core\Entity\Element\EntityAutocomplete;
 use Drupal\Core\Field\FieldItemListInterface;
@@ -147,7 +148,7 @@ public static function validateUriElement($element, FormStateInterface $form_sta
     // @todo '<front>' is valid input for BC reasons, may be removed by
     //   https://www.drupal.org/node/2421941
     if (parse_url($uri, PHP_URL_SCHEME) === 'internal' && !in_array($element['#value'][0], ['/', '?', '#'], TRUE) && substr($element['#value'], 0, 7) !== '<front>') {
-      $form_state->setError($element, t('Manually entered paths should start with one of the following characters: / ? #'));
+      $form_state->setError($element, new TranslatableMarkup('Manually entered paths should start with one of the following characters: / ? #'));
       return;
     }
   }
@@ -159,9 +160,9 @@ public static function validateUriElement($element, FormStateInterface $form_sta
    */
   public static function validateTitleElement(&$element, FormStateInterface $form_state, $form) {
     if ($element['uri']['#value'] !== '' && $element['title']['#value'] === '') {
-      // We expect the field name placeholder value to be wrapped in t() here,
+      // We expect the field name placeholder value to be wrapped in $this->t() here,
       // so it won't be escaped again as it's already marked safe.
-      $form_state->setError($element['title'], t('@title field is required if there is @uri input.', ['@title' => $element['title']['#title'], '@uri' => $element['uri']['#title']]));
+      $form_state->setError($element['title'], new TranslatableMarkup('@title field is required if there is @uri input.', ['@title' => $element['title']['#title'], '@uri' => $element['uri']['#title']]));
     }
   }
 
@@ -172,7 +173,7 @@ public static function validateTitleElement(&$element, FormStateInterface $form_
    */
   public static function validateTitleNoLink(&$element, FormStateInterface $form_state, $form) {
     if ($element['uri']['#value'] === '' && $element['title']['#value'] !== '') {
-      $form_state->setError($element['uri'], t('The @uri field is required when the @title field is specified.', ['@title' => $element['title']['#title'], '@uri' => $element['uri']['#title']]));
+      $form_state->setError($element['uri'], new TranslatableMarkup('The @uri field is required when the @title field is specified.', ['@title' => $element['title']['#title'], '@uri' => $element['uri']['#title']]));
     }
   }
 
diff --git a/web/core/modules/link/tests/src/Functional/LinkFieldTest.php b/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
index be98be91f..9f1255bce 100644
--- a/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
+++ b/web/core/modules/link/tests/src/Functional/LinkFieldTest.php
@@ -55,6 +55,9 @@ class LinkFieldTest extends BrowserTestBase {
    */
   protected $field;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -65,10 +68,24 @@ protected function setUp(): void {
     ]));
   }
 
+  /**
+   * Tests the functionality and rendering of the link field.
+   *
+   * This is being as one to avoid multiple Drupal install.
+   */
+  public function testLinkField() {
+    $this->doTestURLValidation();
+    $this->doTestLinkTitle();
+    $this->doTestLinkFormatter();
+    $this->doTestLinkSeparateFormatter();
+    $this->doTestEditNonNodeEntityLink();
+    $this->doTestLinkTypeOnLinkWidget();
+  }
+
   /**
    * Tests link field URL validation.
    */
-  public function testURLValidation() {
+  protected function doTestURLValidation() {
     $field_name = mb_strtolower($this->randomMachineName());
     // Create a field with settings to validate.
     $this->fieldStorage = FieldStorageConfig::create([
@@ -252,7 +269,7 @@ protected function assertInvalidEntries(string $field_name, array $invalid_entri
   /**
    * Tests the link title settings of a link field.
    */
-  public function testLinkTitle() {
+  protected function doTestLinkTitle() {
     $field_name = mb_strtolower($this->randomMachineName());
     // Create a field with settings to validate.
     $this->fieldStorage = FieldStorageConfig::create([
@@ -377,7 +394,7 @@ public function testLinkTitle() {
   /**
    * Tests the default 'link' formatter.
    */
-  public function testLinkFormatter() {
+  protected function doTestLinkFormatter() {
     $field_name = mb_strtolower($this->randomMachineName());
     // Create a field with settings to validate.
     $this->fieldStorage = FieldStorageConfig::create([
@@ -534,7 +551,7 @@ public function testLinkFormatter() {
    * This test is mostly the same as testLinkFormatter(), but they cannot be
    * merged, since they involve different configuration and output.
    */
-  public function testLinkSeparateFormatter() {
+  protected function doTestLinkSeparateFormatter() {
     $field_name = mb_strtolower($this->randomMachineName());
     // Create a field with settings to validate.
     $this->fieldStorage = FieldStorageConfig::create([
@@ -661,7 +678,7 @@ public function testLinkSeparateFormatter() {
    * a link and also which LinkItemInterface::LINK_* is (EXTERNAL, GENERIC,
    * INTERNAL).
    */
-  public function testLinkTypeOnLinkWidget() {
+  protected function doTestLinkTypeOnLinkWidget() {
 
     $link_type = LinkItemInterface::LINK_EXTERNAL;
     $field_name = mb_strtolower($this->randomMachineName());
@@ -699,7 +716,7 @@ public function testLinkTypeOnLinkWidget() {
   /**
    * Tests editing a link to a non-node entity.
    */
-  public function testEditNonNodeEntityLink() {
+  protected function doTestEditNonNodeEntityLink() {
 
     $entity_type_manager = \Drupal::entityTypeManager();
     $entity_test_storage = $entity_type_manager->getStorage('entity_test');
diff --git a/web/core/modules/link/tests/src/Kernel/LinkItemTest.php b/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
index ce608f00b..5f4d0819b 100644
--- a/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
+++ b/web/core/modules/link/tests/src/Kernel/LinkItemTest.php
@@ -26,6 +26,9 @@ class LinkItemTest extends FieldKernelTestBase {
    */
   protected static $modules = ['link'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
index e7aa0e0d8..5e2d911d2 100644
--- a/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
+++ b/web/core/modules/link/tests/src/Unit/Plugin/Validation/Constraint/LinkAccessConstraintValidatorTest.php
@@ -16,8 +16,7 @@
 class LinkAccessConstraintValidatorTest extends UnitTestCase {
 
   /**
-   * Tests the \Drupal\link\Plugin\Validation\Constraint\LinkAccessConstraintValidator::validate()
-   * method.
+   * Tests the access validation constraint for links.
    *
    * @param \Drupal\link\LinkItemInterface $value
    *   The link item.
diff --git a/web/core/modules/locale/locale.admin.js b/web/core/modules/locale/locale.admin.js
index b01f9a8d8..49c6c8b73 100644
--- a/web/core/modules/locale/locale.admin.js
+++ b/web/core/modules/locale/locale.admin.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.localeTranslateDirty = {
     attach: function attach() {
       var form = once('localetranslatedirty', '#locale-translate-edit-form');
-
       if (form.length) {
         var $form = $(form);
         $form.one('formUpdated.localeTranslateDirty', 'table', function () {
@@ -22,7 +20,6 @@
           var rowToMark = once('localemark', $row);
           var marker = Drupal.theme('localeTranslateChangedMarker');
           $row.addClass('changed');
-
           if (rowToMark.length) {
             $(rowToMark).find('td:first-child .js-form-item').append(marker);
           }
@@ -32,7 +29,6 @@
     detach: function detach(context, settings, trigger) {
       if (trigger === 'unload') {
         var form = once.remove('localetranslatedirty', '#locale-translate-edit-form');
-
         if (form.length) {
           $(form).off('formUpdated.localeTranslateDirty');
         }
@@ -42,7 +38,6 @@
   Drupal.behaviors.hideUpdateInformation = {
     attach: function attach(context, settings) {
       var table = once('expand-updates', '#locale-translation-status-form');
-
       if (table.length) {
         var $table = $(table);
         var $tbodies = $table.find('tbody');
@@ -50,12 +45,10 @@
           if (e.keyCode && e.keyCode !== 13 && e.keyCode !== 32) {
             return;
           }
-
           e.preventDefault();
           var $tr = $(this).closest('tr');
           $tr.toggleClass('expanded');
           var $localePrefix = $tr.find('.locale-translation-update__prefix');
-
           if ($localePrefix.length) {
             $localePrefix[0].textContent = $tr.hasClass('expanded') ? Drupal.t('Hide description') : Drupal.t('Show description');
           }
diff --git a/web/core/modules/locale/locale.batch.inc b/web/core/modules/locale/locale.batch.inc
index 106bc62b7..2b956e873 100644
--- a/web/core/modules/locale/locale.batch.inc
+++ b/web/core/modules/locale/locale.batch.inc
@@ -119,7 +119,7 @@ function locale_translation_batch_status_finished($success, $results) {
     if (!isset($results['failed_files']) && !isset($results['files'])) {
       \Drupal::messenger()->addStatus(t('Nothing to check.'));
     }
-    \Drupal::state()->set('locale.translation_last_checked', REQUEST_TIME);
+    \Drupal::state()->set('locale.translation_last_checked', \Drupal::time()->getRequestTime());
   }
   else {
     \Drupal::messenger()->addError(t('An error occurred trying to check available interface translation updates.'));
@@ -219,7 +219,7 @@ function locale_translation_batch_fetch_import($project, $langcode, $options, &$
 function locale_translation_batch_fetch_finished($success, $results) {
   \Drupal::moduleHandler()->loadInclude('locale', 'inc', 'locale.bulk');
   if ($success) {
-    \Drupal::state()->set('locale.translation_last_checked', REQUEST_TIME);
+    \Drupal::state()->set('locale.translation_last_checked', \Drupal::time()->getRequestTime());
   }
   return locale_translate_batch_finished($success, $results);
 }
diff --git a/web/core/modules/locale/locale.bulk.inc b/web/core/modules/locale/locale.bulk.inc
index 611d44b85..a2672c3e9 100644
--- a/web/core/modules/locale/locale.bulk.inc
+++ b/web/core/modules/locale/locale.bulk.inc
@@ -275,6 +275,7 @@ function locale_translate_batch_import($file, array $options, &$context) {
  */
 function locale_translate_batch_import_save($context) {
   if (isset($context['results']['files'])) {
+    $request_time = \Drupal::time()->getRequestTime();
     foreach ($context['results']['files'] as $file) {
       // Update the file history if both project and version are known. This
       // table is used by the automated translation update function which tracks
@@ -282,7 +283,7 @@ function locale_translate_batch_import_save($context) {
       // translation files are not tracked and are therefore not stored in this
       // table.
       if ($file->project && $file->version) {
-        $file->last_checked = REQUEST_TIME;
+        $file->last_checked = $request_time;
         locale_translation_update_file_history($file);
       }
     }
@@ -537,14 +538,19 @@ function locale_translate_delete_translation_files(array $projects = [], array $
  * @param array $components
  *   (optional) Array of component lists indexed by type. If not present or it
  *   is an empty array, it will update all components.
+ * @param bool $update_default_config_langcodes
+ *   Determines whether default configuration langcodes should be updated. This
+ *   Should only happen during site and extension install.
  *
  * @return array
  *   The batch definition.
  */
-function locale_config_batch_update_components(array $options, array $langcodes = [], array $components = []) {
+function locale_config_batch_update_components(array $options, array $langcodes = [], array $components = [], bool $update_default_config_langcodes = FALSE) {
   $langcodes = $langcodes ? $langcodes : array_keys(\Drupal::languageManager()->getLanguages());
   if ($langcodes && $names = Locale::config()->getComponentNames($components)) {
-    return locale_config_batch_build($names, $langcodes, $options);
+    // If the component list is empty we need to ensure that all configuration
+    // in the default collection is using the site's default langcode.
+    return locale_config_batch_build($names, $langcodes, $options, $update_default_config_langcodes);
   }
 }
 
@@ -559,19 +565,27 @@ function locale_config_batch_update_components(array $options, array $langcodes
  *   (optional) An array with options that can have the following elements:
  *   - 'finish_feedback': Whether or not to give feedback to the user when the
  *     batch is finished. Defaults to TRUE.
+ * @param bool $update_default_config_langcodes
+ *   Determines whether default configuration langcodes should be updated. This
+ *   Should only happen during site and extension install.
  *
  * @return array
  *   The batch definition.
  *
  * @see locale_config_batch_refresh_name()
  */
-function locale_config_batch_build(array $names, array $langcodes, array $options = []) {
+function locale_config_batch_build(array $names, array $langcodes, array $options = [], bool $update_default_config_langcodes = FALSE) {
   $options += ['finish_feedback' => TRUE];
   $batch_builder = (new BatchBuilder())
     ->setFile(\Drupal::service('extension.list.module')->getPath('locale') . '/locale.bulk.inc')
     ->setTitle(t('Updating configuration translations'))
     ->setInitMessage(t('Starting configuration update'))
     ->setErrorMessage(t('Error updating configuration translations'));
+
+  if ($update_default_config_langcodes && \Drupal::languageManager()->getDefaultLanguage()->getId() !== 'en') {
+    $batch_builder->addOperation('locale_config_batch_set_config_langcodes');
+  }
+
   $i = 0;
   $batch_names = [];
   foreach ($names as $name) {
@@ -595,6 +609,20 @@ function locale_config_batch_build(array $names, array $langcodes, array $option
   return $batch_builder->toArray();
 }
 
+/**
+ * Implements callback_batch_operation().
+ *
+ * Updates default configuration when new modules or themes are installed.
+ *
+ * @param array|\ArrayAccess $context
+ *   The batch context.
+ */
+function locale_config_batch_set_config_langcodes(&$context) {
+  Locale::config()->updateDefaultConfigLangcodes();
+  $context['finished'] = 1;
+  $context['message'] = t('Updated default configuration to %langcode', ['%langcode' => \Drupal::languageManager()->getDefaultLanguage()->getId()]);
+}
+
 /**
  * Implements callback_batch_operation().
  *
diff --git a/web/core/modules/locale/locale.bulk.js b/web/core/modules/locale/locale.bulk.js
index 80c284109..da2e27151 100644
--- a/web/core/modules/locale/locale.bulk.js
+++ b/web/core/modules/locale/locale.bulk.js
@@ -4,18 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.importLanguageCodeSelector = {
     attach: function attach(context, settings) {
       var form = once('autodetect-lang', '#locale-translate-import-form');
-
       if (form.length) {
         var $form = $(form);
         var $langcode = $form.find('.langcode-input');
         $form.find('.file-import-input').on('change', function () {
           var matches = this.value.match(/([^.][.]*)([\w-]+)\.po$/);
-
           if (matches && $langcode.find("option[value=\"".concat(matches[2], "\"]")).length) {
             $langcode[0].value = matches[2];
           }
diff --git a/web/core/modules/locale/locale.compare.inc b/web/core/modules/locale/locale.compare.inc
index 9b0209fd5..1fb10f513 100644
--- a/web/core/modules/locale/locale.compare.inc
+++ b/web/core/modules/locale/locale.compare.inc
@@ -191,7 +191,7 @@ function locale_translation_check_projects($projects = [], $langcodes = []) {
   else {
     // Retrieve and save the status of local translations only.
     locale_translation_check_projects_local($projects, $langcodes);
-    \Drupal::state()->set('locale.translation_last_checked', REQUEST_TIME);
+    \Drupal::state()->set('locale.translation_last_checked', \Drupal::time()->getRequestTime());
   }
 }
 
@@ -253,8 +253,7 @@ function locale_translation_batch_status_build($projects = [], $langcodes = [])
 }
 
 /**
- * Helper function to construct batch operations checking remote translation
- * status.
+ * Constructs batch operations for checking remote translation status.
  *
  * @param array $projects
  *   Array of project names to be processed.
diff --git a/web/core/modules/locale/locale.module b/web/core/modules/locale/locale.module
index 1bf5ba134..063132691 100644
--- a/web/core/modules/locale/locale.module
+++ b/web/core/modules/locale/locale.module
@@ -117,14 +117,16 @@ const LOCALE_TRANSLATION_STATUS_TTL = 600;
 const LOCALE_TRANSLATION_OVERWRITE_ALL = 'all';
 
 /**
- * UI option for override of existing translations. Only override non-customized
- * translations.
+ * UI option for override of existing translations.
+ *
+ * Only override non-customized translations.
  */
 const LOCALE_TRANSLATION_OVERWRITE_NON_CUSTOMIZED = 'non_customized';
 
 /**
- * UI option for override of existing translations. Don't override existing
- * translations.
+ * UI option for override of existing translations.
+ *
+ * Don't override existing translations.
  */
 const LOCALE_TRANSLATION_OVERWRITE_NONE = 'none';
 
@@ -317,8 +319,6 @@ function locale_get_plural($count, $langcode = NULL) {
  * Implements hook_modules_installed().
  */
 function locale_modules_installed($modules) {
-  locale_system_set_config_langcodes();
-
   $components['module'] = $modules;
   locale_system_update($components);
 }
@@ -335,8 +335,6 @@ function locale_module_preuninstall($module) {
  * Implements hook_themes_installed().
  */
 function locale_themes_installed($themes) {
-  locale_system_set_config_langcodes();
-
   $components['theme'] = $themes;
   locale_system_update($components);
 }
@@ -368,28 +366,7 @@ function locale_cron() {
  * Updates default configuration when new modules or themes are installed.
  */
 function locale_system_set_config_langcodes() {
-  // Need to rewrite some default configuration language codes if the default
-  // site language is not English.
-  $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
-  if ($default_langcode != 'en') {
-    // Update active configuration copies of all prior shipped configuration if
-    // they are still English. It is not enough to change configuration shipped
-    // with the components just installed, because installing a component such
-    // as views or tour module may bring in default configuration from prior
-    // components.
-    $names = Locale::config()->getComponentNames();
-    foreach ($names as $name) {
-      $config = \Drupal::configFactory()->reset($name)->getEditable($name);
-      // Should only update if still exists in active configuration. If locale
-      // module is enabled later, then some configuration may not exist anymore.
-      if (!$config->isNew()) {
-        $langcode = $config->get('langcode');
-        if (empty($langcode) || $langcode == 'en') {
-          $config->set('langcode', $default_langcode)->save();
-        }
-      }
-    }
-  }
+  Locale::config()->updateDefaultConfigLangcodes();
 }
 
 /**
@@ -433,7 +410,7 @@ function locale_system_update(array $components) {
     // components. Do this even if import is not enabled because parsing new
     // configuration may expose new source strings.
     $module_handler->loadInclude('locale', 'inc', 'locale.bulk');
-    if ($batch = locale_config_batch_update_components([])) {
+    if ($batch = locale_config_batch_update_components([], [], [], TRUE)) {
       batch_set($batch);
     }
   }
@@ -491,7 +468,6 @@ function locale_cache_flush() {
  * Implements hook_js_alter().
  */
 function locale_js_alter(&$javascript, AttachedAssetsInterface $assets) {
-  // @todo Remove this in https://www.drupal.org/node/2421323.
   $files = [];
   foreach ($javascript as $item) {
     if (isset($item['type']) && $item['type'] == 'file') {
@@ -912,6 +888,7 @@ function locale_translation_status_save($project, $langcode, $type, $data) {
 
   // Merge the new status data with the existing status.
   if (isset($status[$project][$langcode])) {
+    $request_time = \Drupal::time()->getRequestTime();
     switch ($type) {
       case LOCALE_TRANSLATION_REMOTE:
       case LOCALE_TRANSLATION_LOCAL:
@@ -923,14 +900,14 @@ function locale_translation_status_save($project, $langcode, $type, $data) {
         if (isset($data->timestamp) && $data->timestamp) {
           if ($data->timestamp > $status[$project][$langcode]->timestamp) {
             $status[$project][$langcode]->timestamp = $data->timestamp;
-            $status[$project][$langcode]->last_checked = REQUEST_TIME;
+            $status[$project][$langcode]->last_checked = $request_time;
             $status[$project][$langcode]->type = $type;
           }
         }
         break;
 
       case LOCALE_TRANSLATION_CURRENT:
-        $data->last_checked = REQUEST_TIME;
+        $data->last_checked = $request_time;
         $status[$project][$langcode]->timestamp = $data->timestamp;
         $status[$project][$langcode]->last_checked = $data->last_checked;
         $status[$project][$langcode]->type = $type;
@@ -939,7 +916,7 @@ function locale_translation_status_save($project, $langcode, $type, $data) {
     }
 
     \Drupal::keyValue('locale.translation_status')->set($project, $status[$project]);
-    \Drupal::state()->set('locale.translation_last_checked', REQUEST_TIME);
+    \Drupal::state()->set('locale.translation_last_checked', $request_time);
   }
 }
 
@@ -1053,7 +1030,7 @@ function _locale_refresh_translations($langcodes, $lids = []) {
   if (!empty($langcodes)) {
     // Update javascript translations if any of the strings has a javascript
     // location, or if no string ids were provided, update all languages.
-    if (empty($lids) || ($strings = \Drupal::service('locale.storage')->getStrings(['lid' => $lids, 'type' => 'javascript']))) {
+    if (empty($lids) || !empty(\Drupal::service('locale.storage')->getStrings(['lid' => $lids, 'type' => 'javascript']))) {
       array_map('_locale_invalidate_js', $langcodes);
     }
   }
@@ -1090,8 +1067,9 @@ function _locale_strip_quotes($string) {
 }
 
 /**
- * Parses a JavaScript file, extracts strings wrapped in Drupal.t() and
- * Drupal.formatPlural() and inserts them into the database.
+ * Parses a JavaScript file, extracts translatable strings, and saves them.
+ *
+ * Strings are extracted from both Drupal.t() and Drupal.formatPlural().
  *
  * @param string $filepath
  *   File name to parse.
diff --git a/web/core/modules/locale/locale.translation.inc b/web/core/modules/locale/locale.translation.inc
index efd1aad13..c87913965 100644
--- a/web/core/modules/locale/locale.translation.inc
+++ b/web/core/modules/locale/locale.translation.inc
@@ -331,7 +331,8 @@ function locale_cron_fill_queue() {
   $config = \Drupal::config('locale.settings');
 
   // Determine which project+language should be updated.
-  $last = REQUEST_TIME - $config->get('translation.update_interval_days') * 3600 * 24;
+  $request_time = \Drupal::time()->getRequestTime();
+  $last = $request_time - $config->get('translation.update_interval_days') * 3600 * 24;
   $projects = \Drupal::service('locale.project')->getAll();
   $projects = array_filter($projects, function ($project) {
     return $project['status'] == 1;
@@ -348,7 +349,7 @@ function locale_cron_fill_queue() {
     // Update the last_checked timestamp of the project+language that will
     // be checked for updates.
     $connection->update('locale_file')
-      ->fields(['last_checked' => REQUEST_TIME])
+      ->fields(['last_checked' => $request_time])
       ->condition('project', $file->project)
       ->condition('langcode', $file->langcode)
       ->execute();
diff --git a/web/core/modules/locale/src/LocaleConfigManager.php b/web/core/modules/locale/src/LocaleConfigManager.php
index 2ebdd735c..bb265cbc8 100644
--- a/web/core/modules/locale/src/LocaleConfigManager.php
+++ b/web/core/modules/locale/src/LocaleConfigManager.php
@@ -649,4 +649,34 @@ protected function filterOverride(array $override_data, array $translatable) {
     return $filtered_data;
   }
 
+  /**
+   * Updates default configuration when new modules or themes are installed.
+   */
+  public function updateDefaultConfigLangcodes() {
+    $this->isUpdatingFromLocale = TRUE;
+    // Need to rewrite some default configuration language codes if the default
+    // site language is not English.
+    $default_langcode = $this->languageManager->getDefaultLanguage()->getId();
+    if ($default_langcode != 'en') {
+      // Update active configuration copies of all prior shipped configuration if
+      // they are still English. It is not enough to change configuration shipped
+      // with the components just installed, because installing a component such
+      // as views or tour module may bring in default configuration from prior
+      // components.
+      $names = $this->getComponentNames();
+      foreach ($names as $name) {
+        $config = $this->configFactory->reset($name)->getEditable($name);
+        // Should only update if still exists in active configuration. If locale
+        // module is enabled later, then some configuration may not exist anymore.
+        if (!$config->isNew()) {
+          $langcode = $config->get('langcode');
+          if (empty($langcode) || $langcode == 'en') {
+            $config->set('langcode', $default_langcode)->save();
+          }
+        }
+      }
+    }
+    $this->isUpdatingFromLocale = FALSE;
+  }
+
 }
diff --git a/web/core/modules/locale/src/LocaleEvent.php b/web/core/modules/locale/src/LocaleEvent.php
index 8851dddc4..5fa780efe 100644
--- a/web/core/modules/locale/src/LocaleEvent.php
+++ b/web/core/modules/locale/src/LocaleEvent.php
@@ -21,7 +21,7 @@ class LocaleEvent extends Event {
    *
    * @var string[]
    */
-  protected $original;
+  protected $lids;
 
   /**
    * Constructs a new LocaleEvent.
diff --git a/web/core/modules/locale/src/LocaleTranslation.php b/web/core/modules/locale/src/LocaleTranslation.php
index e9b693894..a9ccc9362 100644
--- a/web/core/modules/locale/src/LocaleTranslation.php
+++ b/web/core/modules/locale/src/LocaleTranslation.php
@@ -119,6 +119,11 @@ public function getStringTranslation($langcode, $string, $context) {
       $this->translations[$langcode][$context] = new LocaleLookup($langcode, $context, $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack);
     }
     $translation = $this->translations[$langcode][$context]->get($string);
+    // If the translation is TRUE, no translation exists, but that string needs
+    // to be stored in the persistent cache for performance reasons (so for
+    // example, we don't have hundreds of queries to locale tables on each
+    // request). That cache is persisted when the request ends, and the lookup
+    // service is destroyed.
     return $translation === TRUE ? FALSE : $translation;
   }
 
diff --git a/web/core/modules/locale/src/PoDatabaseReader.php b/web/core/modules/locale/src/PoDatabaseReader.php
index 55c2b690a..4ed766346 100644
--- a/web/core/modules/locale/src/PoDatabaseReader.php
+++ b/web/core/modules/locale/src/PoDatabaseReader.php
@@ -91,7 +91,7 @@ public function getHeader() {
   /**
    * Implements Drupal\Component\Gettext\PoMetadataInterface::setHeader().
    *
-   * @throws Exception
+   * @throws \Exception
    *   Always, because you cannot set the PO header of a reader.
    */
   public function setHeader(PoHeader $header) {
diff --git a/web/core/modules/locale/src/PoDatabaseWriter.php b/web/core/modules/locale/src/PoDatabaseWriter.php
index 6763a79e6..7e7340cf1 100644
--- a/web/core/modules/locale/src/PoDatabaseWriter.php
+++ b/web/core/modules/locale/src/PoDatabaseWriter.php
@@ -154,7 +154,7 @@ public function getHeader() {
    * @param \Drupal\Component\Gettext\PoHeader $header
    *   Header metadata.
    *
-   * @throws Exception
+   * @throws \Exception
    */
   public function setHeader(PoHeader $header) {
     $this->header = $header;
diff --git a/web/core/modules/locale/tests/locale_test.js b/web/core/modules/locale/tests/locale_test.js
index 8c5ca7258..9462fd574 100644
--- a/web/core/modules/locale/tests/locale_test.js
+++ b/web/core/modules/locale/tests/locale_test.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 Drupal.t("Standard Call t");
 Drupal.t("Whitespace Call t");
 Drupal.t('Single Quote t');
diff --git a/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml b/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml
index 6ecdeabe9..d8dcb1f9b 100644
--- a/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml
+++ b/web/core/modules/locale/tests/modules/locale_test_development_release/locale_test_development_release.info.yml
@@ -1,6 +1,6 @@
 name: 'Locale Test Development Release'
 type: module
-description: 'Helper module to test the behavior when the core verison is a development release.'
+description: 'Helper module to test the behavior when the core version is a development release.'
 package: Testing
 version: VERSION
 hidden: true
diff --git a/web/core/modules/locale/tests/modules/locale_test_translate/config/schema/locale_test_translate.schema.yml b/web/core/modules/locale/tests/modules/locale_test_translate/config/schema/locale_test_translate.schema.yml
index 93e57c698..df9fd824a 100644
--- a/web/core/modules/locale/tests/modules/locale_test_translate/config/schema/locale_test_translate.schema.yml
+++ b/web/core/modules/locale/tests/modules/locale_test_translate/config/schema/locale_test_translate.schema.yml
@@ -8,3 +8,5 @@ locale_test_translate.settings:
       type: label
     translatable_default_with_no_translation:
       type: label
+    key_set_during_install:
+      type: boolean
diff --git a/web/core/modules/locale/tests/modules/locale_test_translate/locale_test_translate.module b/web/core/modules/locale/tests/modules/locale_test_translate/locale_test_translate.module
index e55d4dc48..ed7911df9 100644
--- a/web/core/modules/locale/tests/modules/locale_test_translate/locale_test_translate.module
+++ b/web/core/modules/locale/tests/modules/locale_test_translate/locale_test_translate.module
@@ -20,3 +20,15 @@ function locale_test_translate_system_info_alter(&$info, Extension $file, $type)
     $info['hidden'] = FALSE;
   }
 }
+
+/**
+ * Implements hook_modules_installed().
+ *
+ * @see \Drupal\Tests\locale\Functional\LocaleConfigTranslationImportTest::testConfigTranslationWithForeignLanguageDefault
+ */
+function locale_test_translate_modules_installed($modules, $is_syncing) {
+  // Ensure that writing to configuration during install does not cause
+  // \Drupal\locale\LocaleConfigSubscriber to create incorrect translations due
+  // the configuration langcode and data being out-of-sync.
+  \Drupal::configFactory()->getEditable('locale_test_translate.settings')->set('key_set_during_install', TRUE)->save();
+}
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
index 72db6ef1b..de506587d 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleConfigTranslationImportTest.php
@@ -305,4 +305,66 @@ public function testLocaleRemovalAndConfigOverridePreserve() {
     $this->assertEquals($expected, $override->get());
   }
 
+  /**
+   * Tests setting a non-English language as default and importing configuration.
+   */
+  public function testConfigTranslationWithNonEnglishLanguageDefault() {
+    /** @var \Drupal\Core\Extension\ModuleInstallerInterface $module_installer */
+    $module_installer = $this->container->get('module_installer');
+    ConfigurableLanguage::createFromLangcode('af')->save();
+
+    $module_installer->install(['locale']);
+    $this->resetAll();
+    /** @var \Drupal\locale\StringStorageInterface $local_storage */
+    $local_storage = $this->container->get('locale.storage');
+
+    $source_string = 'Locale can translate';
+    $translation_string = 'Locale can translate Afrikaans';
+
+    // Create a translation for the "Locale can translate" string, this string
+    // can be found in the "locale_test_translate" module's install config.
+    $source = $local_storage->createString([
+      'source' => $source_string,
+    ])->save();
+    $local_storage->createTranslation([
+      'lid' => $source->getId(),
+      'language' => 'af',
+      'translation' => $translation_string,
+    ])->save();
+
+    // Verify that we can find the newly added string translation, it is not a
+    // customized translation.
+    $translation = $local_storage->findTranslation([
+      'source' => $source_string,
+      'language' => 'af',
+    ]);
+    $this->assertEquals($translation_string, $translation->getString());
+    $this->assertFalse((bool) $translation->customized);
+
+    // Uninstall the "locale_test_translate" module, verify that we can still
+    // find the string translation.
+    $module_installer->uninstall(['locale_test_translate']);
+    $this->resetAll();
+    $translation = $local_storage->findTranslation([
+      'source' => $source_string,
+      'language' => 'af',
+    ]);
+    $this->assertEquals($translation_string, $translation->getString());
+
+    // Set the default language to "Afrikaans" and re-enable the
+    // "locale_test_translate" module.
+    $this->config('system.site')->set('default_langcode', 'af')->save();
+    $module_installer->install(['locale_test_translate']);
+    $this->resetAll();
+
+    // Verify that enabling the "locale_test_translate" module didn't cause
+    // the string translation to be overwritten.
+    $translation = $local_storage->findTranslation([
+      'source' => $source_string,
+      'language' => 'af',
+    ]);
+    $this->assertEquals($translation_string, $translation->getString());
+    $this->assertFalse((bool) $translation->customized);
+  }
+
 }
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php b/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
index ce06b9d2a..2a0608004 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleContentTest.php
@@ -7,8 +7,7 @@
 use Drupal\node\NodeInterface;
 
 /**
- * Tests you can enable multilingual support on content types and configure a
- * language for a node.
+ * Tests multilingual support for content types and individual nodes.
  *
  * @group locale
  */
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php b/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php
index 6eadb9321..64687fb69 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleExportTest.php
@@ -157,8 +157,7 @@ public function getPoFile() {
   }
 
   /**
-   * Helper function that returns a .po file which strings will be marked
-   * as customized.
+   * Returns a .po file that will be marked as customized.
    */
   public function getCustomPoFile() {
     return <<< EOF
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php b/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
index fcb107e4b..d0e6bf355 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleImportFunctionalTest.php
@@ -35,8 +35,7 @@ class LocaleImportFunctionalTest extends BrowserTestBase {
   protected $adminUser;
 
   /**
-   * A user able to create languages, import translations and access site
-   * reports.
+   * A user able to create languages, import translations, access site reports.
    *
    * @var \Drupal\user\Entity\User
    */
@@ -506,8 +505,7 @@ public function getOverwritePoFile() {
   }
 
   /**
-   * Helper function that returns a .po file which strings will be marked
-   * as customized.
+   * Returns a .po file that will be marked as customized.
    */
   public function getCustomPoFile() {
     return <<< EOF
diff --git a/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php b/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
index d77e626ab..0daf20edf 100644
--- a/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocalePluralFormatTest.php
@@ -48,8 +48,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests locale_get_plural() and \Drupal::translation()->formatPlural()
-   * functionality.
+   * Tests locale_get_plural() and \Drupal::translation()->formatPlural().
    */
   public function testGetPluralFormat() {
     // Import some .po files with formulas to set up the environment.
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
index 85148eebb..445ea672d 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslatedSchemaDefinitionTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\locale\Functional;
 
+use Drupal\Core\Url;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\RequirementsPageTrait;
@@ -71,7 +72,7 @@ public function testTranslatedUpdate() {
     // Visit the update page to collect any strings that may be translatable.
     $user = $this->drupalCreateUser(['administer software updates']);
     $this->drupalLogin($user);
-    $update_url = $GLOBALS['base_url'] . '/update.php';
+    $update_url = Url::fromRoute('system.db_update')->setAbsolute()->toString();
 
     // Collect strings from the PHP warning page, if applicable, as well as the
     // main update page.
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php b/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
index cdedb12cd..6e93d3680 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleTranslationUiTest.php
@@ -9,8 +9,7 @@
 use Drupal\Core\Language\LanguageInterface;
 
 /**
- * Adds a new locale and translates its name. Checks the validation of
- * translation strings and search results.
+ * Tests the validation of translation strings and search results.
  *
  * @group locale
  */
@@ -245,8 +244,7 @@ public function testStringTranslation() {
   }
 
   /**
-   * Adds a language and checks that the JavaScript translation files are
-   * properly created and rebuilt on deletion.
+   * Tests the rebuilding of JavaScript translation files on deletion.
    */
   public function testJavaScriptTranslation() {
     $user = $this->drupalCreateUser([
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php b/web/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php
index e6ddd71ee..17893063d 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleUpdateBase.php
@@ -209,8 +209,7 @@ protected function setTranslationFiles() {
   }
 
   /**
-   * Setup existing translations in the database and set up the status of
-   * existing translations.
+   * Sets up existing translations and their statuses in the database.
    */
   protected function setCurrentTranslations() {
     // Add non customized translations to the database.
diff --git a/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php b/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php
index 0d443d40d..d2838f5cf 100644
--- a/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php
+++ b/web/core/modules/locale/tests/src/Functional/LocaleUpdateDevelopmentReleaseTest.php
@@ -18,6 +18,9 @@ class LocaleUpdateDevelopmentReleaseTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::moduleHandler()->loadInclude('locale', 'inc', 'locale.compare');
diff --git a/web/core/modules/locale/tests/src/Kernel/LocaleStringTest.php b/web/core/modules/locale/tests/src/Kernel/LocaleStringTest.php
index 85cfd2bfd..391ad49cf 100644
--- a/web/core/modules/locale/tests/src/Kernel/LocaleStringTest.php
+++ b/web/core/modules/locale/tests/src/Kernel/LocaleStringTest.php
@@ -19,7 +19,7 @@ class LocaleStringTest extends KernelTestBase {
   protected static $modules = [
     'language',
     'locale',
-   ];
+  ];
 
   /**
    * The locale storage.
diff --git a/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php b/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
index de1409d52..3421de836 100644
--- a/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
+++ b/web/core/modules/locale/tests/src/Unit/LocaleLookupTest.php
@@ -77,7 +77,7 @@ protected function setUp(): void {
     $this->user = $this->createMock('Drupal\Core\Session\AccountInterface');
     $this->user->expects($this->any())
       ->method('getRoles')
-      ->will($this->returnValue(['anonymous']));
+      ->willReturn(['anonymous']);
 
     $this->configFactory = $this->getConfigFactoryStub(['locale.settings' => ['cache_strings' => FALSE]]);
 
@@ -112,7 +112,7 @@ public function testResolveCacheMissWithoutFallback() {
     $this->storage->expects($this->once())
       ->method('findTranslation')
       ->with($this->equalTo($args))
-      ->will($this->returnValue($result));
+      ->willReturn($result);
 
     $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
       ->setConstructorArgs(['en', 'irrelevant', $this->storage, $this->cache, $this->lock, $this->configFactory, $this->languageManager, $this->requestStack])
@@ -229,7 +229,7 @@ public function testResolveCacheMissWithPersist() {
     $this->storage->expects($this->once())
       ->method('findTranslation')
       ->with($this->equalTo($args))
-      ->will($this->returnValue($result));
+      ->willReturn($result);
 
     $this->configFactory = $this->getConfigFactoryStub(['locale.settings' => ['cache_strings' => TRUE]]);
     $locale_lookup = $this->getMockBuilder('Drupal\locale\LocaleLookup')
@@ -254,10 +254,10 @@ public function testResolveCacheMissNoTranslation() {
       ->will($this->returnSelf());
     $this->storage->expects($this->once())
       ->method('findTranslation')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
     $this->storage->expects($this->once())
       ->method('createString')
-      ->will($this->returnValue($string));
+      ->willReturn($string);
 
     $request = Request::create('/test');
     $this->requestStack->push($request);
@@ -349,7 +349,7 @@ public function testGetCid(array $roles, $expected) {
     $this->user = $this->createMock('Drupal\Core\Session\AccountInterface');
     $this->user->expects($this->any())
       ->method('getRoles')
-      ->will($this->returnValue($roles));
+      ->willReturn($roles);
 
     $container = new ContainerBuilder();
     $container->set('current_user', $this->user);
diff --git a/web/core/modules/media/css/plugins/drupalmedia/ckeditor.drupalmedia.css b/web/core/modules/media/css/plugins/drupalmedia/ckeditor.drupalmedia.css
deleted file mode 100644
index 82923ff63..000000000
--- a/web/core/modules/media/css/plugins/drupalmedia/ckeditor.drupalmedia.css
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file
- * Media embed: overrides to make focus styles and alignment work in CKEditor.
- */
-
-/**
- * Allow the drupal-media element's width to collapse to the size of its
- * contents so that the outline has no extra white space (margin). This
- * emulates the image2 plugin's styles inherited by the drupallink CKEditor
- * plugin.
- */
-drupal-media {
-  display: inline-block;
-}
-
-/**
- * For center alignment, take advantage of drupal-media's inline-block
- * display and center it as if it were text.
- */
-.cke_widget_drupalmedia.align-center {
-  text-align: center;
-}
-
-/**
- * Fix positioning without delete button. Can be removed with this issue:
- * @see https://www.drupal.org/project/drupal/issues/3074859
- */
-drupal-media .media-library-item__edit {
-  right: 10px;
-}
-
-/**
- * Allow alignment to display in CKEditor.
- */
-drupal-media[data-align=left],
-drupal-media[data-align=right] {
-  display: inline;
-}
-drupal-media[data-align=center] {
-  display: flex;
-}
diff --git a/web/core/modules/media/js/form.js b/web/core/modules/media/js/form.js
index 52f7bdc11..e56b2f8bd 100644
--- a/web/core/modules/media/js/form.js
+++ b/web/core/modules/media/js/form.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.mediaFormSummaries = {
     attach: function attach(context) {
@@ -13,20 +12,17 @@
         var name = nameInput && nameInput.value;
         var dateInput = context.querySelector('.field--name-created input');
         var date = dateInput && dateInput.value;
-
         if (name && date) {
           return Drupal.t('By @name on @date', {
             '@name': name,
             '@date': date
           });
         }
-
         if (name) {
           return Drupal.t('By @name', {
             '@name': name
           });
         }
-
         if (date) {
           return Drupal.t('Authored on @date', {
             '@date': date
diff --git a/web/core/modules/media/js/media_embed_ckeditor.theme.es6.js b/web/core/modules/media/js/media_embed_ckeditor.theme.es6.js
index 52ef82aa7..bb2bd6dcd 100644
--- a/web/core/modules/media/js/media_embed_ckeditor.theme.es6.js
+++ b/web/core/modules/media/js/media_embed_ckeditor.theme.es6.js
@@ -1,6 +1,6 @@
 /**
  * @file
- * Theme elements for the Media Embed CKEditor plugin.
+ * Theme elements for the Media Embed text editor plugins.
  */
 
 ((Drupal) => {
@@ -16,15 +16,4 @@
     `<div>${Drupal.t(
       'An error occurred while trying to preview the media. Please save your work and reload this page.',
     )}</div>`;
-
-  /**
-   * Themes the edit button for a media embed.
-   *
-   * @return {string}
-   *   An HTML string to insert in the CKEditor.
-   */
-  Drupal.theme.mediaEmbedEditButton = () =>
-    `<button class="media-library-item__edit">${Drupal.t(
-      'Edit media',
-    )}</button>`;
 })(Drupal);
diff --git a/web/core/modules/media/js/media_embed_ckeditor.theme.js b/web/core/modules/media/js/media_embed_ckeditor.theme.js
index bddc1ea47..6d463d1ff 100644
--- a/web/core/modules/media/js/media_embed_ckeditor.theme.js
+++ b/web/core/modules/media/js/media_embed_ckeditor.theme.js
@@ -4,13 +4,8 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.mediaEmbedPreviewError = function () {
     return "<div>".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
   };
-
-  Drupal.theme.mediaEmbedEditButton = function () {
-    return "<button class=\"media-library-item__edit\">".concat(Drupal.t('Edit media'), "</button>");
-  };
 })(Drupal);
\ No newline at end of file
diff --git a/web/core/modules/media/js/plugins/drupalmedia/plugin.es6.js b/web/core/modules/media/js/plugins/drupalmedia/plugin.es6.js
deleted file mode 100644
index 7a0c5a421..000000000
--- a/web/core/modules/media/js/plugins/drupalmedia/plugin.es6.js
+++ /dev/null
@@ -1,499 +0,0 @@
-/**
- * @file
- * Drupal Media embed plugin.
- */
-
-(function (jQuery, Drupal, CKEDITOR) {
-  /**
-   * Gets the focused widget, if of the type specific for this plugin.
-   *
-   * @param {CKEDITOR.editor} editor
-   *   A CKEditor instance.
-   *
-   * @return {?CKEDITOR.plugins.widget}
-   *   The focused drupalmedia widget instance, or null.
-   */
-  function getFocusedWidget(editor) {
-    const widget = editor.widgets.focused;
-
-    if (widget && widget.name === 'drupalmedia') {
-      return widget;
-    }
-    return null;
-  }
-
-  /**
-   * Makes embedded items linkable by integrating with the drupallink plugin.
-   *
-   * @param {CKEDITOR.editor} editor
-   *   A CKEditor instance.
-   */
-  function linkCommandIntegrator(editor) {
-    if (!editor.plugins.drupallink) {
-      return;
-    }
-
-    CKEDITOR.plugins.drupallink.registerLinkableWidget('drupalmedia');
-
-    editor.getCommand('drupalunlink').on('exec', function (evt) {
-      const widget = getFocusedWidget(editor);
-
-      if (!widget) {
-        return;
-      }
-
-      widget.setData('link', null);
-
-      this.refresh(editor, editor.elementPath());
-
-      evt.cancel();
-    });
-
-    editor.getCommand('drupalunlink').on('refresh', function (evt) {
-      const widget = getFocusedWidget(editor);
-
-      if (!widget) {
-        return;
-      }
-
-      this.setState(
-        widget.data.link ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED,
-      );
-
-      evt.cancel();
-    });
-
-    // Register context menu items for editing link.
-    if (editor.contextMenu) {
-      editor.contextMenu.addListener(() => {
-        const widget = getFocusedWidget(editor);
-
-        if (!widget) {
-          return;
-        }
-
-        if (widget.data.link) {
-          return {
-            link: CKEDITOR.TRISTATE_OFF,
-            unlink: CKEDITOR.TRISTATE_OFF,
-          };
-        }
-        return {};
-      });
-    }
-  }
-
-  CKEDITOR.plugins.add('drupalmedia', {
-    requires: 'widget',
-
-    beforeInit(editor) {
-      // Configure CKEditor DTD for custom drupal-media element.
-      // @see https://www.drupal.org/node/2448449#comment-9717735
-      const { dtd } = CKEDITOR;
-      // Allow text within the drupal-media tag.
-      dtd['drupal-media'] = { '#': 1 };
-      // Register drupal-media element as an allowed child in each tag that can
-      // contain a div element and as an allowed child of the a tag.
-      Object.keys(dtd).forEach((tagName) => {
-        if (dtd[tagName].div) {
-          dtd[tagName]['drupal-media'] = 1;
-        }
-      });
-      dtd.a['drupal-media'] = 1;
-
-      editor.widgets.add('drupalmedia', {
-        allowedContent: {
-          'drupal-media': {
-            attributes: {
-              '!data-entity-type': true,
-              '!data-entity-uuid': true,
-              'data-align': true,
-              'data-caption': true,
-              alt: true,
-              title: true,
-            },
-            classes: {},
-          },
-        },
-        // Minimum HTML which is required by this widget to work.
-        // This does not use the object format used above, but a
-        // CKEDITOR.style instance, because requiredContent does not support
-        // the object format.
-        // @see https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter_contentRule.html
-        requiredContent: new CKEDITOR.style({
-          element: 'drupal-media',
-          attributes: {
-            'data-entity-type': '',
-            'data-entity-uuid': '',
-          },
-        }),
-
-        pathName: Drupal.t('Embedded media'),
-
-        editables: {
-          caption: {
-            selector: 'figcaption',
-            allowedContent: 'a[!href]; em strong cite code br',
-            pathName: Drupal.t('Caption'),
-          },
-        },
-
-        getLabel() {
-          if (this.data.label) {
-            return this.data.label;
-          }
-          return Drupal.t('Embedded media');
-        },
-
-        upcast(element, data) {
-          const { attributes } = element;
-          // This matches the behavior of the corresponding server-side text filter plugin.
-          if (
-            element.name !== 'drupal-media' ||
-            attributes['data-entity-type'] !== 'media' ||
-            attributes['data-entity-uuid'] === undefined
-          ) {
-            return;
-          }
-          data.attributes = CKEDITOR.tools.copy(attributes);
-          data.hasCaption = data.attributes.hasOwnProperty('data-caption');
-          // Add space to the empty caption to allow the server-side text
-          // filter to render a caption, allowing the placeholder-rendering
-          // CSS to work.
-          if (data.hasCaption && data.attributes['data-caption'] === '') {
-            data.attributes['data-caption'] = ' ';
-          }
-          data.label = null;
-          data.link = null;
-          if (element.parent.name === 'a') {
-            data.link = CKEDITOR.tools.copy(element.parent.attributes);
-            // Omit CKEditor-internal attributes.
-            Object.keys(element.parent.attributes).forEach((attrName) => {
-              if (attrName.indexOf('data-cke-') !== -1) {
-                delete data.link[attrName];
-              }
-            });
-          }
-          // @see media_field_widget_single_element_form_alter()
-          const hostEntityLangcode = document
-            .getElementById(editor.name)
-            .getAttribute('data-media-embed-host-entity-langcode');
-          if (hostEntityLangcode) {
-            data.hostEntityLangcode = hostEntityLangcode;
-          }
-          return element;
-        },
-
-        destroy() {
-          this._tearDownDynamicEditables();
-        },
-
-        data(event) {
-          // Only run during changes.
-          if (this.oldData) {
-            // The server-side text filter plugin treats both an empty
-            // `data-caption` attribute and a non-existing one the same: it
-            // does not render a caption. But in the CKEditor Widget, we need
-            // to be able to show an empty caption with placeholder text using
-            // CSS even when technically there is no `data-caption` attribute
-            // value yet. That's why this CKEditor Widget has an independent
-            // `hasCaption` boolean (which is not an attribute) to know when
-            // to generate a non-empty `data-caption` attribute when the
-            // content creator has enabled caption: this makes the server-side
-            // text filter render a caption, allowing the placeholder-rendering
-            // CSS to work.
-            // @see core/modules/filter/css/filter.caption.css
-            // @see ckeditor_ckeditor_css_alter()
-            if (!this.data.hasCaption && this.oldData.hasCaption) {
-              delete this.data.attributes['data-caption'];
-            } else if (
-              this.data.hasCaption &&
-              !this.data.attributes['data-caption']
-            ) {
-              this.data.attributes['data-caption'] = ' ';
-            }
-          }
-
-          if (this._previewNeedsServerSideUpdate()) {
-            editor.fire('lockSnapshot');
-            this._tearDownDynamicEditables();
-
-            this._loadPreview((widget) => {
-              widget._setUpDynamicEditables();
-              widget._setUpEditButton();
-              editor.fire('unlockSnapshot');
-            });
-          }
-
-          // Remove old attributes from drupal-media element within the widget.
-          if (this.oldData) {
-            Object.keys(this.oldData.attributes).forEach((attrName) => {
-              this.element.removeAttribute(attrName);
-            });
-          }
-          // Add attributes to drupal-media element within the widget.
-          this.element.setAttributes(this.data.attributes);
-
-          // Track the previous state to allow checking if preview needs
-          // server side update.
-          this.oldData = CKEDITOR.tools.clone(this.data);
-        },
-
-        downcast() {
-          const downcastElement = new CKEDITOR.htmlParser.element(
-            'drupal-media',
-            this.data.attributes,
-          );
-          if (this.data.link) {
-            const link = new CKEDITOR.htmlParser.element('a', this.data.link);
-            link.add(downcastElement);
-            return link;
-          }
-          return downcastElement;
-        },
-
-        _setUpDynamicEditables() {
-          // Now that the caption is available in the DOM, make it editable.
-          if (this.initEditable('caption', this.definition.editables.caption)) {
-            const captionEditable = this.editables.caption;
-            // @see core/modules/filter/css/filter.caption.css
-            // @see ckeditor_ckeditor_css_alter()
-            captionEditable.setAttribute(
-              'data-placeholder',
-              Drupal.t('Enter caption here'),
-            );
-            // Ensure that any changes made to the caption are persisted in the
-            // widget's data-caption attribute.
-            this.captionObserver = new MutationObserver(() => {
-              const mediaAttributes = CKEDITOR.tools.clone(
-                this.data.attributes,
-              );
-              mediaAttributes['data-caption'] = captionEditable.getData();
-              this.setData('attributes', mediaAttributes);
-            });
-            this.captionObserver.observe(captionEditable.$, {
-              characterData: true,
-              attributes: true,
-              childList: true,
-              subtree: true,
-            });
-            // Some browsers will add a <br> tag to a newly created DOM element
-            // with no content. Remove this <br> if it is the only thing in the
-            // caption. Our placeholder support requires the element to be
-            // entirely empty.
-            // @see core/modules/filter/css/filter.caption.css
-            // @see core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.es6.js
-            if (
-              captionEditable.$.childNodes.length === 1 &&
-              captionEditable.$.childNodes.item(0).nodeName === 'BR'
-            ) {
-              captionEditable.$.removeChild(
-                captionEditable.$.childNodes.item(0),
-              );
-            }
-          }
-        },
-
-        /**
-         * Injects HTML for edit button into the preview that was just loaded.
-         */
-        _setUpEditButton() {
-          // No buttons for missing media.
-          if (this.element.findOne('.media-embed-error')) {
-            return;
-          }
-
-          /**
-           * Determines if a node is an element node.
-           *
-           * @param {CKEDITOR.dom.node} n
-           *   A DOM node to evaluate.
-           *
-           * @return {bool}
-           *   Returns true if node is an element node and not a non-element
-           *   node (such as NODE_TEXT, NODE_COMMENT, NODE_DOCUMENT or
-           *   NODE_DOCUMENT_FRAGMENT).
-           *
-           * @see https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#property-NODE_ELEMENT
-           */
-          const isElementNode = function (n) {
-            return n.type === CKEDITOR.NODE_ELEMENT;
-          };
-
-          // Find the actual embedded media in the DOM.
-          const embeddedMediaContainer = this.data.hasCaption
-            ? this.element.findOne('figure')
-            : this.element;
-          let embeddedMedia = embeddedMediaContainer.getFirst(isElementNode);
-          // If there is a link, the top-level element is the `a` tag, and the
-          // embedded media will be within the `a` tag.
-          if (this.data.link) {
-            embeddedMedia = embeddedMedia.getFirst(isElementNode);
-          }
-          // To allow the edit button to be absolutely positioned, the parent
-          // element must be positioned relative.
-          embeddedMedia.setStyle('position', 'relative');
-
-          const editButton = CKEDITOR.dom.element.createFromHtml(
-            Drupal.theme('mediaEmbedEditButton'),
-          );
-          embeddedMedia.getFirst().insertBeforeMe(editButton);
-
-          // Make the edit button do things.
-          const widget = this;
-          this.element
-            .findOne('.media-library-item__edit')
-            .on('click', (event) => {
-              const saveCallback = function (values) {
-                event.cancel();
-                editor.fire('saveSnapshot');
-                if (values.hasOwnProperty('attributes')) {
-                  // Combine the dialog attributes with the widget attributes.
-                  // This copies the properties from widget.data.attributes to
-                  // values.attributes. (Properties already present
-                  // in values.attributes are not overwritten.)
-                  CKEDITOR.tools.extend(
-                    values.attributes,
-                    widget.data.attributes,
-                  );
-                  // Allow the dialog to delete attributes by setting them
-                  // to `false` or `none`. For example: `alt`.
-                  Object.keys(values.attributes).forEach((prop) => {
-                    if (
-                      values.attributes[prop] === false ||
-                      (prop === 'data-align' &&
-                        values.attributes[prop] === 'none')
-                    ) {
-                      delete values.attributes[prop];
-                    }
-                  });
-                }
-                widget.setData({
-                  attributes: values.attributes,
-                  hasCaption: !!values.hasCaption,
-                });
-                editor.fire('saveSnapshot');
-              };
-
-              Drupal.ckeditor.openDialog(
-                editor,
-                Drupal.url(
-                  `editor/dialog/media/${editor.config.drupal.format}`,
-                ),
-                widget.data,
-                saveCallback,
-                {},
-              );
-            });
-
-          // Allow opening the dialog with the return key or the space bar
-          // by triggering a click event when a keydown event occurs on
-          // the edit button.
-          this.element
-            .findOne('.media-library-item__edit')
-            .on('keydown', (event) => {
-              // The character code for the return key.
-              const returnKey = 13;
-              // The character code for the space bar.
-              const spaceBar = 32;
-              if (typeof event.data !== 'undefined') {
-                const keypress = event.data.getKey();
-                if (keypress === returnKey || keypress === spaceBar) {
-                  // Clicks the edit button that triggered the 'keydown'
-                  // event.
-                  event.sender.$.click();
-                }
-                // Stop propagation to keep the return key from
-                // adding a line break.
-                event.data.$.stopPropagation();
-                event.data.$.stopImmediatePropagation();
-              }
-            });
-        },
-
-        _tearDownDynamicEditables() {
-          // If we are watching for changes to the caption, stop doing that.
-          if (this.captionObserver) {
-            this.captionObserver.disconnect();
-          }
-        },
-
-        /**
-         * Determines if the preview needs to be re-rendered by the server.
-         *
-         * @return {boolean}
-         *   Returns true if the data hashes differ.
-         */
-        _previewNeedsServerSideUpdate() {
-          // When the widget is first loading, it of course needs to still get a preview!
-          if (!this.ready) {
-            return true;
-          }
-
-          return this._hashData(this.oldData) !== this._hashData(this.data);
-        },
-
-        /**
-         * Computes a hash of the data that can only be previewed by the server.
-         *
-         * @return {string}
-         */
-        _hashData(data) {
-          const dataToHash = CKEDITOR.tools.clone(data);
-          // The caption does not need rendering.
-          delete dataToHash.attributes['data-caption'];
-          // The media entity's label is server-side data and cannot be
-          // modified by the content author.
-          delete dataToHash.label;
-          // Changed link destinations do not affect the visual preview.
-          if (dataToHash.link) {
-            delete dataToHash.link.href;
-          }
-          return JSON.stringify(dataToHash);
-        },
-
-        /**
-         * Loads an media embed preview and runs a callback after insertion.
-         *
-         * Note the absence of caching, that's because this uses a GET request (which is cacheable) and the server takes
-         * special care to make the responses privately cacheable (i.e. per session) in the browser.
-         *
-         * @see \Drupal\media\Controller\MediaFilterController::preview()
-         *
-         * @param {function} callback
-         *   A callback function that will be called after the preview has
-         *   loaded. Receives the widget instance.
-         */
-        _loadPreview(callback) {
-          jQuery.get({
-            url: Drupal.url(`media/${editor.config.drupal.format}/preview`),
-            data: {
-              text: this.downcast().getOuterHtml(),
-              uuid: this.data.attributes['data-entity-uuid'],
-            },
-            dataType: 'html',
-            headers: {
-              'X-Drupal-MediaPreview-CSRF-Token':
-                editor.config.drupalMedia_previewCsrfToken,
-            },
-            success: (previewHtml, textStatus, jqXhr) => {
-              this.element.setHtml(previewHtml);
-              this.setData(
-                'label',
-                jqXhr.getResponseHeader('Drupal-Media-Label'),
-              );
-              callback(this);
-            },
-            error: () => {
-              this.element.setHtml(Drupal.theme('mediaEmbedPreviewError'));
-            },
-          });
-        },
-      });
-    },
-
-    afterInit(editor) {
-      linkCommandIntegrator(editor);
-    },
-  });
-})(jQuery, Drupal, CKEDITOR);
diff --git a/web/core/modules/media/js/plugins/drupalmedia/plugin.js b/web/core/modules/media/js/plugins/drupalmedia/plugin.js
deleted file mode 100644
index 626931693..000000000
--- a/web/core/modules/media/js/plugins/drupalmedia/plugin.js
+++ /dev/null
@@ -1,335 +0,0 @@
-/**
-* DO NOT EDIT THIS FILE.
-* See the following change record for more information,
-* https://www.drupal.org/node/2815083
-* @preserve
-**/
-
-(function (jQuery, Drupal, CKEDITOR) {
-  function getFocusedWidget(editor) {
-    var widget = editor.widgets.focused;
-
-    if (widget && widget.name === 'drupalmedia') {
-      return widget;
-    }
-
-    return null;
-  }
-
-  function linkCommandIntegrator(editor) {
-    if (!editor.plugins.drupallink) {
-      return;
-    }
-
-    CKEDITOR.plugins.drupallink.registerLinkableWidget('drupalmedia');
-    editor.getCommand('drupalunlink').on('exec', function (evt) {
-      var widget = getFocusedWidget(editor);
-
-      if (!widget) {
-        return;
-      }
-
-      widget.setData('link', null);
-      this.refresh(editor, editor.elementPath());
-      evt.cancel();
-    });
-    editor.getCommand('drupalunlink').on('refresh', function (evt) {
-      var widget = getFocusedWidget(editor);
-
-      if (!widget) {
-        return;
-      }
-
-      this.setState(widget.data.link ? CKEDITOR.TRISTATE_OFF : CKEDITOR.TRISTATE_DISABLED);
-      evt.cancel();
-    });
-
-    if (editor.contextMenu) {
-      editor.contextMenu.addListener(function () {
-        var widget = getFocusedWidget(editor);
-
-        if (!widget) {
-          return;
-        }
-
-        if (widget.data.link) {
-          return {
-            link: CKEDITOR.TRISTATE_OFF,
-            unlink: CKEDITOR.TRISTATE_OFF
-          };
-        }
-
-        return {};
-      });
-    }
-  }
-
-  CKEDITOR.plugins.add('drupalmedia', {
-    requires: 'widget',
-    beforeInit: function beforeInit(editor) {
-      var dtd = CKEDITOR.dtd;
-      dtd['drupal-media'] = {
-        '#': 1
-      };
-      Object.keys(dtd).forEach(function (tagName) {
-        if (dtd[tagName].div) {
-          dtd[tagName]['drupal-media'] = 1;
-        }
-      });
-      dtd.a['drupal-media'] = 1;
-      editor.widgets.add('drupalmedia', {
-        allowedContent: {
-          'drupal-media': {
-            attributes: {
-              '!data-entity-type': true,
-              '!data-entity-uuid': true,
-              'data-align': true,
-              'data-caption': true,
-              alt: true,
-              title: true
-            },
-            classes: {}
-          }
-        },
-        requiredContent: new CKEDITOR.style({
-          element: 'drupal-media',
-          attributes: {
-            'data-entity-type': '',
-            'data-entity-uuid': ''
-          }
-        }),
-        pathName: Drupal.t('Embedded media'),
-        editables: {
-          caption: {
-            selector: 'figcaption',
-            allowedContent: 'a[!href]; em strong cite code br',
-            pathName: Drupal.t('Caption')
-          }
-        },
-        getLabel: function getLabel() {
-          if (this.data.label) {
-            return this.data.label;
-          }
-
-          return Drupal.t('Embedded media');
-        },
-        upcast: function upcast(element, data) {
-          var attributes = element.attributes;
-
-          if (element.name !== 'drupal-media' || attributes['data-entity-type'] !== 'media' || attributes['data-entity-uuid'] === undefined) {
-            return;
-          }
-
-          data.attributes = CKEDITOR.tools.copy(attributes);
-          data.hasCaption = data.attributes.hasOwnProperty('data-caption');
-
-          if (data.hasCaption && data.attributes['data-caption'] === '') {
-            data.attributes['data-caption'] = ' ';
-          }
-
-          data.label = null;
-          data.link = null;
-
-          if (element.parent.name === 'a') {
-            data.link = CKEDITOR.tools.copy(element.parent.attributes);
-            Object.keys(element.parent.attributes).forEach(function (attrName) {
-              if (attrName.indexOf('data-cke-') !== -1) {
-                delete data.link[attrName];
-              }
-            });
-          }
-
-          var hostEntityLangcode = document.getElementById(editor.name).getAttribute('data-media-embed-host-entity-langcode');
-
-          if (hostEntityLangcode) {
-            data.hostEntityLangcode = hostEntityLangcode;
-          }
-
-          return element;
-        },
-        destroy: function destroy() {
-          this._tearDownDynamicEditables();
-        },
-        data: function data(event) {
-          var _this = this;
-
-          if (this.oldData) {
-            if (!this.data.hasCaption && this.oldData.hasCaption) {
-              delete this.data.attributes['data-caption'];
-            } else if (this.data.hasCaption && !this.data.attributes['data-caption']) {
-              this.data.attributes['data-caption'] = ' ';
-            }
-          }
-
-          if (this._previewNeedsServerSideUpdate()) {
-            editor.fire('lockSnapshot');
-
-            this._tearDownDynamicEditables();
-
-            this._loadPreview(function (widget) {
-              widget._setUpDynamicEditables();
-
-              widget._setUpEditButton();
-
-              editor.fire('unlockSnapshot');
-            });
-          }
-
-          if (this.oldData) {
-            Object.keys(this.oldData.attributes).forEach(function (attrName) {
-              _this.element.removeAttribute(attrName);
-            });
-          }
-
-          this.element.setAttributes(this.data.attributes);
-          this.oldData = CKEDITOR.tools.clone(this.data);
-        },
-        downcast: function downcast() {
-          var downcastElement = new CKEDITOR.htmlParser.element('drupal-media', this.data.attributes);
-
-          if (this.data.link) {
-            var link = new CKEDITOR.htmlParser.element('a', this.data.link);
-            link.add(downcastElement);
-            return link;
-          }
-
-          return downcastElement;
-        },
-        _setUpDynamicEditables: function _setUpDynamicEditables() {
-          var _this2 = this;
-
-          if (this.initEditable('caption', this.definition.editables.caption)) {
-            var captionEditable = this.editables.caption;
-            captionEditable.setAttribute('data-placeholder', Drupal.t('Enter caption here'));
-            this.captionObserver = new MutationObserver(function () {
-              var mediaAttributes = CKEDITOR.tools.clone(_this2.data.attributes);
-              mediaAttributes['data-caption'] = captionEditable.getData();
-
-              _this2.setData('attributes', mediaAttributes);
-            });
-            this.captionObserver.observe(captionEditable.$, {
-              characterData: true,
-              attributes: true,
-              childList: true,
-              subtree: true
-            });
-
-            if (captionEditable.$.childNodes.length === 1 && captionEditable.$.childNodes.item(0).nodeName === 'BR') {
-              captionEditable.$.removeChild(captionEditable.$.childNodes.item(0));
-            }
-          }
-        },
-        _setUpEditButton: function _setUpEditButton() {
-          if (this.element.findOne('.media-embed-error')) {
-            return;
-          }
-
-          var isElementNode = function isElementNode(n) {
-            return n.type === CKEDITOR.NODE_ELEMENT;
-          };
-
-          var embeddedMediaContainer = this.data.hasCaption ? this.element.findOne('figure') : this.element;
-          var embeddedMedia = embeddedMediaContainer.getFirst(isElementNode);
-
-          if (this.data.link) {
-            embeddedMedia = embeddedMedia.getFirst(isElementNode);
-          }
-
-          embeddedMedia.setStyle('position', 'relative');
-          var editButton = CKEDITOR.dom.element.createFromHtml(Drupal.theme('mediaEmbedEditButton'));
-          embeddedMedia.getFirst().insertBeforeMe(editButton);
-          var widget = this;
-          this.element.findOne('.media-library-item__edit').on('click', function (event) {
-            var saveCallback = function saveCallback(values) {
-              event.cancel();
-              editor.fire('saveSnapshot');
-
-              if (values.hasOwnProperty('attributes')) {
-                CKEDITOR.tools.extend(values.attributes, widget.data.attributes);
-                Object.keys(values.attributes).forEach(function (prop) {
-                  if (values.attributes[prop] === false || prop === 'data-align' && values.attributes[prop] === 'none') {
-                    delete values.attributes[prop];
-                  }
-                });
-              }
-
-              widget.setData({
-                attributes: values.attributes,
-                hasCaption: !!values.hasCaption
-              });
-              editor.fire('saveSnapshot');
-            };
-
-            Drupal.ckeditor.openDialog(editor, Drupal.url("editor/dialog/media/".concat(editor.config.drupal.format)), widget.data, saveCallback, {});
-          });
-          this.element.findOne('.media-library-item__edit').on('keydown', function (event) {
-            var returnKey = 13;
-            var spaceBar = 32;
-
-            if (typeof event.data !== 'undefined') {
-              var keypress = event.data.getKey();
-
-              if (keypress === returnKey || keypress === spaceBar) {
-                event.sender.$.click();
-              }
-
-              event.data.$.stopPropagation();
-              event.data.$.stopImmediatePropagation();
-            }
-          });
-        },
-        _tearDownDynamicEditables: function _tearDownDynamicEditables() {
-          if (this.captionObserver) {
-            this.captionObserver.disconnect();
-          }
-        },
-        _previewNeedsServerSideUpdate: function _previewNeedsServerSideUpdate() {
-          if (!this.ready) {
-            return true;
-          }
-
-          return this._hashData(this.oldData) !== this._hashData(this.data);
-        },
-        _hashData: function _hashData(data) {
-          var dataToHash = CKEDITOR.tools.clone(data);
-          delete dataToHash.attributes['data-caption'];
-          delete dataToHash.label;
-
-          if (dataToHash.link) {
-            delete dataToHash.link.href;
-          }
-
-          return JSON.stringify(dataToHash);
-        },
-        _loadPreview: function _loadPreview(callback) {
-          var _this3 = this;
-
-          jQuery.get({
-            url: Drupal.url("media/".concat(editor.config.drupal.format, "/preview")),
-            data: {
-              text: this.downcast().getOuterHtml(),
-              uuid: this.data.attributes['data-entity-uuid']
-            },
-            dataType: 'html',
-            headers: {
-              'X-Drupal-MediaPreview-CSRF-Token': editor.config.drupalMedia_previewCsrfToken
-            },
-            success: function success(previewHtml, textStatus, jqXhr) {
-              _this3.element.setHtml(previewHtml);
-
-              _this3.setData('label', jqXhr.getResponseHeader('Drupal-Media-Label'));
-
-              callback(_this3);
-            },
-            error: function error() {
-              _this3.element.setHtml(Drupal.theme('mediaEmbedPreviewError'));
-            }
-          });
-        }
-      });
-    },
-    afterInit: function afterInit(editor) {
-      linkCommandIntegrator(editor);
-    }
-  });
-})(jQuery, Drupal, CKEDITOR);
\ No newline at end of file
diff --git a/web/core/modules/media/js/type_form.es6.js b/web/core/modules/media/js/type_form.es6.js
index f24d52b52..ebfe844aa 100644
--- a/web/core/modules/media/js/type_form.es6.js
+++ b/web/core/modules/media/js/type_form.es6.js
@@ -17,24 +17,26 @@
       const $context = $(context);
       // Provide the vertical tab summaries.
       $context.find('#edit-workflow').drupalSetSummary((context) => {
-        const vals = [];
+        const values = [];
         $(context)
           .find('input[name^="options"]:checked')
           .parent()
           .each(function () {
-            vals.push(Drupal.checkPlain($(this).find('label')[0].textContent));
+            values.push(
+              Drupal.checkPlain($(this).find('label')[0].textContent),
+            );
           });
         if (!$(context).find('#edit-options-status').is(':checked')) {
-          vals.unshift(Drupal.t('Not published'));
+          values.unshift(Drupal.t('Not published'));
         }
-        return vals.join(', ');
+        return values.join(', ');
       });
       $(context)
         .find('#edit-language')
         .drupalSetSummary((context) => {
-          const vals = [];
+          const values = [];
 
-          vals.push(
+          values.push(
             $(context).find(
               '.js-form-item-language-configuration-langcode select option:selected',
             )[0].textContent,
@@ -44,10 +46,10 @@
             .find('input:checked')
             .next('label')
             .each(function () {
-              vals.push(Drupal.checkPlain(this.textContent));
+              values.push(Drupal.checkPlain(this.textContent));
             });
 
-          return vals.join(', ');
+          return values.join(', ');
         });
     },
   };
diff --git a/web/core/modules/media/js/type_form.js b/web/core/modules/media/js/type_form.js
index 4bfe34493..04c484f77 100644
--- a/web/core/modules/media/js/type_form.js
+++ b/web/core/modules/media/js/type_form.js
@@ -4,30 +4,27 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.mediaTypeFormSummaries = {
     attach: function attach(context) {
       var $context = $(context);
       $context.find('#edit-workflow').drupalSetSummary(function (context) {
-        var vals = [];
+        var values = [];
         $(context).find('input[name^="options"]:checked').parent().each(function () {
-          vals.push(Drupal.checkPlain($(this).find('label')[0].textContent));
+          values.push(Drupal.checkPlain($(this).find('label')[0].textContent));
         });
-
         if (!$(context).find('#edit-options-status').is(':checked')) {
-          vals.unshift(Drupal.t('Not published'));
+          values.unshift(Drupal.t('Not published'));
         }
-
-        return vals.join(', ');
+        return values.join(', ');
       });
       $(context).find('#edit-language').drupalSetSummary(function (context) {
-        var vals = [];
-        vals.push($(context).find('.js-form-item-language-configuration-langcode select option:selected')[0].textContent);
+        var values = [];
+        values.push($(context).find('.js-form-item-language-configuration-langcode select option:selected')[0].textContent);
         $(context).find('input:checked').next('label').each(function () {
-          vals.push(Drupal.checkPlain(this.textContent));
+          values.push(Drupal.checkPlain(this.textContent));
         });
-        return vals.join(', ');
+        return values.join(', ');
       });
     }
   };
diff --git a/web/core/modules/media/media.libraries.yml b/web/core/modules/media/media.libraries.yml
index efc9dd1ad..f8febc4df 100644
--- a/web/core/modules/media/media.libraries.yml
+++ b/web/core/modules/media/media.libraries.yml
@@ -32,6 +32,8 @@ filter.caption:
   dependencies:
     - filter/caption
 
+# Despite the name, this is actually not specific to CKEditor 4, and can be
+# used by all text editor plugins.
 media_embed_ckeditor_theme:
   version: VERSION
   js:
diff --git a/web/core/modules/media/media.module b/web/core/modules/media/media.module
index b4d3112e9..30b219e57 100644
--- a/web/core/modules/media/media.module
+++ b/web/core/modules/media/media.module
@@ -510,9 +510,9 @@ function media_filter_format_edit_form_validate($form, FormStateInterface $form_
  * Implements hook_field_widget_single_element_form_alter().
  */
 function media_field_widget_single_element_form_alter(&$element, FormStateInterface $form_state, $context) {
-  // Add an attribute so that "drupalmedia" CKEditor plugin can pass the host
-  // entity's language to EditorMediaDialog, allowing it to present entities
-  // in the same language.
+  // Add an attribute so that text editors plugins can pass the host entity's
+  // language to EditorMediaDialog, allowing it to present entities in the same
+  // language.
   if (!empty($element['#type']) && $element['#type'] == 'text_format') {
     $element['#attributes']['data-media-embed-host-entity-langcode'] = $context['items']->getLangcode();
   }
diff --git a/web/core/modules/media/src/Annotation/MediaSource.php b/web/core/modules/media/src/Annotation/MediaSource.php
index 1286601b2..12d940922 100644
--- a/web/core/modules/media/src/Annotation/MediaSource.php
+++ b/web/core/modules/media/src/Annotation/MediaSource.php
@@ -89,6 +89,20 @@ class MediaSource extends Plugin {
    */
   public $thumbnail_uri_metadata_attribute = 'thumbnail_uri';
 
+  /**
+   * The metadata attribute name to provide the thumbnail width.
+   *
+   * @var string
+   */
+  public $thumbnail_width_metadata_attribute = 'thumbnail_width';
+
+  /**
+   * The metadata attribute name to provide the thumbnail height.
+   *
+   * @var string
+   */
+  public $thumbnail_height_metadata_attribute = 'thumbnail_height';
+
   /**
    * (optional) The metadata attribute name to provide the thumbnail alt.
    *
diff --git a/web/core/modules/media/src/Controller/OEmbedIframeController.php b/web/core/modules/media/src/Controller/OEmbedIframeController.php
index 9da8f9050..3c5079f62 100644
--- a/web/core/modules/media/src/Controller/OEmbedIframeController.php
+++ b/web/core/modules/media/src/Controller/OEmbedIframeController.php
@@ -18,7 +18,7 @@
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 
 /**
  * Controller which renders an oEmbed resource in a bare page (without blocks).
@@ -115,7 +115,7 @@ public static function create(ContainerInterface $container) {
    * @return \Symfony\Component\HttpFoundation\Response
    *   The response object.
    *
-   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   * @throws \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
    *   Will be thrown if either
    *   - the 'hash' parameter does not match the expected hash of the 'url'
    *     parameter;
@@ -129,7 +129,7 @@ public function render(Request $request) {
       $allowed_host = parse_url($allowed_domain, PHP_URL_HOST);
       $host = parse_url($request->getSchemeAndHttpHost(), PHP_URL_HOST);
       if ($allowed_host !== $host) {
-        throw new AccessDeniedHttpException('This resource is not available');
+        throw new BadRequestHttpException('This resource is not available');
       }
     }
 
@@ -141,7 +141,7 @@ public function render(Request $request) {
     // parameter passed in the query string.
     $hash = $this->iFrameUrlHelper->getHash($url, $max_width, $max_height);
     if (!hash_equals($hash, $request->query->get('hash', ''))) {
-      throw new AccessDeniedHttpException('This resource is not available');
+      throw new BadRequestHttpException('This resource is not available');
     }
 
     // Return a response instead of a render array so that the frame content
diff --git a/web/core/modules/media/src/Entity/Media.php b/web/core/modules/media/src/Entity/Media.php
index e4e0cab06..967e93306 100644
--- a/web/core/modules/media/src/Entity/Media.php
+++ b/web/core/modules/media/src/Entity/Media.php
@@ -154,6 +154,8 @@ public function getSource() {
    */
   protected function updateThumbnail($from_queue = FALSE) {
     $this->thumbnail->target_id = $this->loadThumbnail($this->getThumbnailUri($from_queue))->id();
+    $this->thumbnail->width = $this->getThumbnailWidth($from_queue);
+    $this->thumbnail->height = $this->getThumbnailHeight($from_queue);
 
     // Set the thumbnail alt.
     $media_source = $this->getSource();
@@ -258,6 +260,56 @@ protected function getThumbnailUri($from_queue) {
     return $source->getMetadata($this, $source->getPluginDefinition()['thumbnail_uri_metadata_attribute']);
   }
 
+  /**
+   * Gets the width of the thumbnail of a media item.
+   *
+   * @param bool $from_queue
+   *   Specifies whether the thumbnail is being fetched from the queue.
+   *
+   * @return int|null
+   *   The width of the thumbnail of the media item or NULL if the media is new
+   *   and the thumbnails are set to be downloaded in a queue.
+   *
+   * @internal
+   */
+  protected function getThumbnailWidth(bool $from_queue): ?int {
+    $thumbnails_queued = $this->bundle->entity->thumbnailDownloadsAreQueued();
+    if ($thumbnails_queued && $this->isNew()) {
+      return NULL;
+    }
+    elseif ($thumbnails_queued && !$from_queue) {
+      return $this->get('thumbnail')->width;
+    }
+
+    $source = $this->getSource();
+    return $source->getMetadata($this, $source->getPluginDefinition()['thumbnail_width_metadata_attribute']);
+  }
+
+  /**
+   * Gets the height of the thumbnail of a media item.
+   *
+   * @param bool $from_queue
+   *   Specifies whether the thumbnail is being fetched from the queue.
+   *
+   * @return int|null
+   *   The height of the thumbnail of the media item or NULL if the media is new
+   *   and the thumbnails are set to be downloaded in a queue.
+   *
+   * @internal
+   */
+  protected function getThumbnailHeight(bool $from_queue): ?int {
+    $thumbnails_queued = $this->bundle->entity->thumbnailDownloadsAreQueued();
+    if ($thumbnails_queued && $this->isNew()) {
+      return NULL;
+    }
+    elseif ($thumbnails_queued && !$from_queue) {
+      return $this->get('thumbnail')->height;
+    }
+
+    $source = $this->getSource();
+    return $source->getMetadata($this, $source->getPluginDefinition()['thumbnail_height_metadata_attribute']);
+  }
+
   /**
    * Determines if the source field value has changed.
    *
diff --git a/web/core/modules/media/src/Form/EditorMediaDialog.php b/web/core/modules/media/src/Form/EditorMediaDialog.php
index 65f2d5986..8a961df6d 100644
--- a/web/core/modules/media/src/Form/EditorMediaDialog.php
+++ b/web/core/modules/media/src/Form/EditorMediaDialog.php
@@ -96,7 +96,6 @@ public function buildForm(array $form, FormStateInterface $form_state, EditorInt
       $editor_object = $form_state->getUserInput()['editor_object'];
       // The data that the text editor sends to any dialog is in
       // the 'editor_object' key.
-      // @see core/modules/ckeditor/js/ckeditor.es6.js
       $media_embed_element = $editor_object['attributes'];
       $form_state->set('media_embed_element', $media_embed_element);
       $has_caption = $editor_object['hasCaption'];
diff --git a/web/core/modules/media/src/Plugin/CKEditorPlugin/DrupalMedia.php b/web/core/modules/media/src/Plugin/CKEditorPlugin/DrupalMedia.php
deleted file mode 100644
index d475f1ab9..000000000
--- a/web/core/modules/media/src/Plugin/CKEditorPlugin/DrupalMedia.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace Drupal\media\Plugin\CKEditorPlugin;
-
-use Drupal\ckeditor\CKEditorPluginContextualInterface;
-use Drupal\ckeditor\CKEditorPluginCssInterface;
-use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Drupal\Core\Plugin\PluginBase;
-use Drupal\editor\Entity\Editor;
-
-/**
- * Defines the "drupalmedia" plugin.
- *
- * @CKEditorPlugin(
- *   id = "drupalmedia",
- *   label = @Translation("Media Embed"),
- * )
- *
- * @internal
- *   This is an internal part of the media system in Drupal core and may be
- *   subject to change in minor releases. This class should not be
- *   instantiated or extended by external code.
- */
-class DrupalMedia extends PluginBase implements ContainerFactoryPluginInterface, CKEditorPluginContextualInterface, CKEditorPluginCssInterface {
-
-  /**
-   * The module extension list.
-   *
-   * @var \Drupal\Core\Extension\ModuleExtensionList
-   */
-  protected $moduleExtensionList;
-
-  /**
-   * Constructs a new DrupalMedia plugin object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
-   *   The module extension list.
-   */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleExtensionList $extension_list_module) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moduleExtensionList = $extension_list_module;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('extension.list.module')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isInternal() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDependencies(Editor $editor) {
-    return [];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries(Editor $editor) {
-    return [
-      'core/jquery',
-      'core/drupal',
-      'core/drupal.ajax',
-      'media/media_embed_ckeditor_theme',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFile() {
-    return $this->moduleExtensionList->getPath('media') . '/js/plugins/drupalmedia/plugin.js';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfig(Editor $editor) {
-    return [
-      'drupalMedia_previewCsrfToken' => \Drupal::csrfToken()->get('X-Drupal-MediaPreview-CSRF-Token'),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isEnabled(Editor $editor) {
-    if (!$editor->hasAssociatedFilterFormat()) {
-      return FALSE;
-    }
-
-    // Automatically enable this plugin if the text format associated with this
-    // text editor uses the media_embed filter.
-    $filters = $editor->getFilterFormat()->filters();
-    return $filters->has('media_embed') && $filters->get('media_embed')->status;
-  }
-
-  /**
-   * {@inheritdoc}
-   *
-   * @todo Improve this in https://www.drupal.org/project/drupal/issues/3072063
-   */
-  public function getCssFiles(Editor $editor) {
-    return [
-      $this->moduleExtensionList->getPath('media') . '/css/plugins/drupalmedia/ckeditor.drupalmedia.css',
-      $this->moduleExtensionList->getPath('system') . '/css/components/hidden.module.css',
-    ];
-  }
-
-}
diff --git a/web/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php b/web/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php
index e25a386f1..5d178b977 100644
--- a/web/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php
+++ b/web/core/modules/media/src/Plugin/Field/FieldFormatter/MediaThumbnailFormatter.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\Core\File\FileUrlGeneratorInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\image\ImageStyleStorageInterface;
@@ -55,11 +56,21 @@ class MediaThumbnailFormatter extends ImageFormatter {
    *   The current user.
    * @param \Drupal\image\ImageStyleStorageInterface $image_style_storage
    *   The image style entity storage handler.
-   * @param \Drupal\Core\Render\RendererInterface $renderer
+   * @param \Drupal\Core\File\FileUrlGeneratorInterface|null $file_url_generator
+   *   The file URL generator.
+   * @param \Drupal\Core\Render\RendererInterface|null $renderer
    *   The renderer service.
    */
-  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, ImageStyleStorageInterface $image_style_storage, RendererInterface $renderer) {
-    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings, $current_user, $image_style_storage);
+  public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, ImageStyleStorageInterface $image_style_storage, $file_url_generator = NULL, $renderer = NULL) {
+    if (!$file_url_generator instanceof FileUrlGeneratorInterface) {
+      $file_url_generator = \Drupal::service('file_url_generator');
+      @trigger_error('Calling ' . __METHOD__ . '() without the $file_url_generator argument is deprecated in drupal:9.5.0 and $file_url_generator argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3255887', E_USER_DEPRECATED);
+    }
+    if (!$renderer instanceof RendererInterface) {
+      $renderer = \Drupal::service('renderer');
+      @trigger_error('Calling ' . __METHOD__ . '() without the $renderer argument is deprecated in drupal:9.5.0 and $renderer argument will be required in drupal:10.0.0. See https://www.drupal.org/node/3255887', E_USER_DEPRECATED);
+    }
+    parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings, $current_user, $image_style_storage, $file_url_generator);
     $this->renderer = $renderer;
   }
 
@@ -77,6 +88,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration['third_party_settings'],
       $container->get('current_user'),
       $container->get('entity_type.manager')->getStorage('image_style'),
+      $container->get('file_url_generator'),
       $container->get('renderer')
     );
   }
@@ -113,14 +125,11 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = parent::settingsSummary();
 
-    $link_types = [
-      'content' => $this->t('Linked to content'),
-      'media' => $this->t('Linked to media item'),
-    ];
-    // Display this setting only if image is linked.
-    $image_link_setting = $this->getSetting('image_link');
-    if (isset($link_types[$image_link_setting])) {
-      $summary[] = $link_types[$image_link_setting];
+    // The parent class adds summary text if the image_link setting is
+    // 'content'. Here we only have to add summary text if the setting
+    // is 'media'.
+    if ($this->getSetting('image_link') === 'media') {
+      $summary[] = $this->t('Linked to media item');
     }
 
     return $summary;
@@ -145,7 +154,9 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
       $elements[$delta] = [
         '#theme' => 'image_formatter',
         '#item' => $media->get('thumbnail')->first(),
-        '#item_attributes' => [],
+        '#item_attributes' => [
+          'loading' => $this->getSetting('image_loading')['attribute'],
+        ],
         '#image_style' => $this->getSetting('image_style'),
         '#url' => $this->getMediaThumbnailUrl($media, $items->getEntity()),
       ];
diff --git a/web/core/modules/media/src/Plugin/media/Source/OEmbed.php b/web/core/modules/media/src/Plugin/media/Source/OEmbed.php
index 758a63f69..87e53f3da 100644
--- a/web/core/modules/media/src/Plugin/media/Source/OEmbed.php
+++ b/web/core/modules/media/src/Plugin/media/Source/OEmbed.php
@@ -50,8 +50,8 @@
  * function example_media_source_info_alter(array &$sources) {
  *   $sources['artwork'] = [
  *     'id' => 'artwork',
- *     'label' => t('Artwork'),
- *     'description' => t('Use artwork from Flickr and DeviantArt.'),
+ *     'label' => $this->t('Artwork'),
+ *     'description' => $this->t('Use artwork from Flickr and DeviantArt.'),
  *     'allowed_field_types' => ['string'],
  *     'default_thumbnail_filename' => 'no-thumbnail.png',
  *     'providers' => ['Deviantart.com', 'Flickr'],
diff --git a/web/core/modules/media/src/Plugin/media/Source/OEmbedDeriver.php b/web/core/modules/media/src/Plugin/media/Source/OEmbedDeriver.php
index 8da3265f5..bdbc53556 100644
--- a/web/core/modules/media/src/Plugin/media/Source/OEmbedDeriver.php
+++ b/web/core/modules/media/src/Plugin/media/Source/OEmbedDeriver.php
@@ -3,6 +3,7 @@
 namespace Drupal\media\Plugin\media\Source;
 
 use Drupal\Component\Plugin\Derivative\DeriverBase;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Derives media source plugin definitions for supported oEmbed providers.
@@ -13,6 +14,8 @@
  */
 class OEmbedDeriver extends DeriverBase {
 
+  use StringTranslationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -20,8 +23,8 @@ public function getDerivativeDefinitions($base_plugin_definition) {
     $this->derivatives = [
       'video' => [
         'id' => 'video',
-        'label' => t('Remote video'),
-        'description' => t('Use remote video URL for reusable media.'),
+        'label' => $this->t('Remote video'),
+        'description' => $this->t('Use remote video URL for reusable media.'),
         'providers' => ['YouTube', 'Vimeo'],
         'default_thumbnail_filename' => 'video.png',
       ] + $base_plugin_definition,
diff --git a/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.info.yml b/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.info.yml
index a06c93a92..eb7ca8827 100644
--- a/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.info.yml
+++ b/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.info.yml
@@ -1,5 +1,5 @@
-name: Media Embed plugin test
-description: 'Provides functionality to test embedding media items in CKEditor.'
+name: Media Embed text editor plugin test
+description: 'Provides functionality to test embedding media items in text editors.'
 type: module
 package: Testing
 version: VERSION
diff --git a/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.module b/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.module
index 2b8071ccf..35add70f0 100644
--- a/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.module
+++ b/web/core/modules/media/tests/modules/media_test_embed/media_test_embed.module
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Helper module for the Media Embed CKEditor plugin tests.
+ * Helper module for the Media Embed text editor plugin tests.
  */
 
 use Drupal\Core\Access\AccessResult;
@@ -14,7 +14,6 @@ use Drupal\Core\Session\AccountInterface;
  * Implements hook_entity_view_alter().
  */
 function media_test_embed_entity_view_alter(&$build, EntityInterface $entity, EntityViewDisplayInterface $display) {
-  // @see \Drupal\Tests\media\FunctionalJavascript\CKEditorIntegrationTest::testPreviewUsesDefaultThemeAndIsClientCacheable()
   $build['#attributes']['data-media-embed-test-active-theme'] = \Drupal::theme()->getActiveTheme()->getName();
   $build['#attributes']['data-media-embed-test-view-mode'] = $display->getMode();
 }
diff --git a/web/core/modules/media/tests/modules/media_test_embed/src/Controller/TestMediaFilterController.php b/web/core/modules/media/tests/modules/media_test_embed/src/Controller/TestMediaFilterController.php
index f1173450d..09b926dba 100644
--- a/web/core/modules/media/tests/modules/media_test_embed/src/Controller/TestMediaFilterController.php
+++ b/web/core/modules/media/tests/modules/media_test_embed/src/Controller/TestMediaFilterController.php
@@ -8,7 +8,7 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
- * Controller to allow testing of error handling in drupalmedia plugin.js.
+ * Controller to allow testing of error handling of Media Embed in text editors.
  */
 class TestMediaFilterController extends MediaFilterController {
 
diff --git a/web/core/modules/media/tests/src/Functional/MediaAccessTest.php b/web/core/modules/media/tests/src/Functional/MediaAccessTest.php
index 8bbfd14f3..a3c8cab2c 100644
--- a/web/core/modules/media/tests/src/Functional/MediaAccessTest.php
+++ b/web/core/modules/media/tests/src/Functional/MediaAccessTest.php
@@ -29,7 +29,7 @@ class MediaAccessTest extends MediaFunctionalTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -185,11 +185,13 @@ public function testMediaAccess() {
     $this->clickLink('Media');
     $this->assertCacheContext('user');
     $assert_session->statusCodeEquals(200);
-    $assert_session->elementExists('css', '.view-media');
-    $assert_session->pageTextContains($this->loggedInUser->getDisplayName());
-    $assert_session->pageTextContains($this->nonAdminUser->getDisplayName());
-    $assert_session->linkByHrefExists('/media/' . $media->id());
-    $assert_session->linkByHrefExists('/media/' . $user_media->id());
+    $assert_session->elementExists('css', '.views-element-container');
+    // First row of the View contains media created by admin user.
+    $assert_session->elementTextEquals('xpath', '//div[@class="views-element-container"]//tbody/tr[1]/td[contains(@class, "views-field-uid")]/a', $this->adminUser->getDisplayName());
+    $assert_session->elementTextEquals('xpath', "//div[@class='views-element-container']//tbody/tr[1]/td[contains(@class, 'views-field-name')]/a[contains(@href, '/media/{$media->id()}')]", 'Unnamed');
+    // Second row of the View contains media created by non-admin user.
+    $assert_session->elementTextEquals('xpath', '//div[@class="views-element-container"]//tbody/tr[2]/td[contains(@class, "views-field-uid")]/a', $this->nonAdminUser->getDisplayName());
+    $assert_session->elementTextEquals('xpath', "//div[@class='views-element-container']//tbody/tr[2]/td[contains(@class, 'views-field-name')]/a[contains(@href, '/media/{$user_media->id()}')]", 'Unnamed');
   }
 
   /**
diff --git a/web/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php b/web/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php
index ce6146cde..1f272ee23 100644
--- a/web/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php
+++ b/web/core/modules/media/tests/src/Functional/MediaOverviewPageTest.php
@@ -16,7 +16,7 @@ class MediaOverviewPageTest extends MediaFunctionalTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -133,11 +133,9 @@ public function testMediaOverviewPage() {
     $this->assertSame($expected, $changed_element1->getText());
 
     // Operations.
-    $edit_link1 = $assert_session->elementExists('css', 'td.views-field-operations li.edit a', $row1);
-    $this->assertSame('Edit', $edit_link1->getText());
+    $assert_session->elementExists('css', 'td.views-field-operations li a:contains("Edit")', $row1);
     $assert_session->linkByHrefExists('/media/' . $media1->id() . '/edit');
-    $delete_link1 = $assert_session->elementExists('css', 'td.views-field-operations li.delete a', $row1);
-    $this->assertSame('Delete', $delete_link1->getText());
+    $assert_session->elementExists('css', 'td.views-field-operations li a:contains("Delete")', $row1);
     $assert_session->linkByHrefExists('/media/' . $media1->id() . '/delete');
 
     // Make the user the owner of the unpublished media item and assert the
diff --git a/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php b/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
index e3889ca80..618a64cb7 100644
--- a/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
+++ b/web/core/modules/media/tests/src/Functional/Rest/MediaResourceTestBase.php
@@ -328,8 +328,12 @@ public function testPost() {
   }
 
   /**
-   * This duplicates some of the 'file_upload' REST resource plugin test
-   * coverage, to be able to test it on a concrete use case.
+   * Tests the 'file_upload' REST resource plugin.
+   *
+   * This test duplicates some of the 'file_upload' REST resource plugin test
+   * coverage.
+   *
+   * @see \Drupal\Tests\rest\Functional\FileUploadResourceTestBase
    */
   protected function uploadFile() {
     // Enable the 'file_upload' REST resource for the current format + auth.
diff --git a/web/core/modules/media/tests/src/Functional/UrlResolverTest.php b/web/core/modules/media/tests/src/Functional/UrlResolverTest.php
index 7668d6935..b2e1672b9 100644
--- a/web/core/modules/media/tests/src/Functional/UrlResolverTest.php
+++ b/web/core/modules/media/tests/src/Functional/UrlResolverTest.php
@@ -58,8 +58,7 @@ public function providerEndpointMatching() {
   }
 
   /**
-   * Tests resource URL resolution when the asset URL can be matched to a
-   * provider endpoint.
+   * Tests resource URL resolution with a matched provider endpoint.
    *
    * @covers ::getProviderByUrl
    * @covers ::getResourceUrl
@@ -118,8 +117,7 @@ public function providerUrlDiscovery() {
   }
 
   /**
-   * Tests URL resolution when the resource URL must be actively discovered by
-   * scanning the asset.
+   * Tests URL resolution when the URL is discovered by scanning the asset.
    *
    * @param string $url
    *   The asset URL to resolve.
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
deleted file mode 100644
index 53427a310..000000000
--- a/web/core/modules/media/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ /dev/null
@@ -1,1603 +0,0 @@
-<?php
-
-namespace Drupal\Tests\media\FunctionalJavascript;
-
-use Drupal\Component\Utility\Html;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\editor\Entity\Editor;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\file\Entity\File;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
-use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\language\Entity\ContentLanguageSettings;
-use Drupal\media\Entity\Media;
-use Drupal\Tests\ckeditor\Traits\CKEditorTestTrait;
-use Drupal\Tests\media\Traits\MediaTypeCreationTrait;
-use Drupal\Tests\TestFileCreationTrait;
-use Drupal\user\Entity\Role;
-use Drupal\user\RoleInterface;
-use Drupal\Core\Entity\Entity\EntityViewMode;
-
-/**
- * @coversDefaultClass \Drupal\media\Plugin\CKEditorPlugin\DrupalMedia
- * @group media
- */
-class CKEditorIntegrationTest extends WebDriverTestBase {
-
-  use CKEditorTestTrait;
-  use MediaTypeCreationTrait;
-  use TestFileCreationTrait;
-
-  /**
-   * The user to use during testing.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $adminUser;
-
-  /**
-   * The sample Media entity to embed.
-   *
-   * @var \Drupal\media\MediaInterface
-   */
-  protected $media;
-
-  /**
-   * A host entity with a body field to embed media in.
-   *
-   * @var \Drupal\node\NodeInterface
-   */
-  protected $host;
-
-  /**
-   * The character code for the return key.
-   *
-   * @var int
-   */
-  const RETURN_KEY = 13;
-
-  /**
-   * The character code for the space bar.
-   *
-   * @var int
-   */
-  const SPACE_BAR = 32;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'ckeditor',
-    'media',
-    'node',
-    'text',
-    'media_test_embed',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'classy';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    FilterFormat::create([
-      'format' => 'test_format',
-      'name' => 'Test format',
-      'filters' => [
-        'filter_align' => ['status' => TRUE],
-        'filter_caption' => ['status' => TRUE],
-        'media_embed' => ['status' => TRUE],
-      ],
-    ])->save();
-    Editor::create([
-      'editor' => 'ckeditor',
-      'format' => 'test_format',
-      'settings' => [
-        'toolbar' => [
-          'rows' => [
-            [
-              [
-                'name' => 'All the things',
-                'items' => [
-                  'Source',
-                  'Bold',
-                  'Italic',
-                  'DrupalLink',
-                  'DrupalUnlink',
-                  'DrupalImage',
-                ],
-              ],
-            ],
-          ],
-        ],
-      ],
-    ])->save();
-
-    // Note that media_install() grants 'view media' to all users by default.
-    $this->adminUser = $this->drupalCreateUser([
-      'use text format test_format',
-      'bypass node access',
-    ]);
-
-    // Create a sample media entity to be embedded.
-    $this->createMediaType('image', ['id' => 'image']);
-    File::create([
-      'uri' => $this->getTestFiles('image')[0]->uri,
-    ])->save();
-    $this->media = Media::create([
-      'bundle' => 'image',
-      'name' => 'Screaming hairy armadillo',
-      'field_media_image' => [
-        [
-          'target_id' => 1,
-          'alt' => 'default alt',
-          'title' => 'default title',
-        ],
-      ],
-    ]);
-    $this->media->save();
-
-    // Create a sample host entity to embed media in.
-    $this->drupalCreateContentType(['type' => 'blog']);
-    $this->host = $this->createNode([
-      'type' => 'blog',
-      'title' => 'Animals with strange names',
-      'body' => [
-        'value' => '<drupal-media data-caption="baz" data-entity-type="media" data-entity-uuid="' . $this->media->uuid() . '"></drupal-media>',
-        'format' => 'test_format',
-      ],
-    ]);
-    $this->host->save();
-
-    $this->drupalLogin($this->adminUser);
-  }
-
-  /**
-   * Tests that only <drupal-media> tags are processed.
-   *
-   * @see \Drupal\Tests\media\Kernel\MediaEmbedFilterTest::testOnlyDrupalMediaTagProcessed()
-   */
-  public function testOnlyDrupalMediaTagProcessed() {
-    $original_value = $this->host->body->value;
-    $this->host->body->value = str_replace('drupal-media', 'p', $original_value);
-    $this->host->save();
-
-    // Assert that `<p data-* …>` is not upcast into a CKEditor Widget.
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session = $this->assertSession();
-    $this->assertEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]', 1000));
-    $assert_session->elementNotExists('css', 'figure');
-
-    $this->host->body->value = $original_value;
-    $this->host->save();
-
-    // Assert that `<drupal-media data-* …>` is upcast into a CKEditor Widget.
-    $this->getSession()->reload();
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]'));
-    $assert_session->elementExists('css', 'figure');
-  }
-
-  /**
-   * Tests that failed media embed preview requests inform the end user.
-   */
-  public function testErrorMessages() {
-    // This test currently frequently causes the SQLite database to lock, so
-    // skip the test on SQLite until the issue can be resolved.
-    // @todo https://www.drupal.org/project/drupal/issues/3273626
-    if (Database::getConnection()->driver() === 'sqlite') {
-      $this->markTestSkipped('Test frequently causes a locked database on SQLite');
-    }
-
-    // Assert that a request to the `media.filter.preview` route that does not
-    // result in a 200 response (due to server error or network error) is
-    // handled in the JavaScript by displaying the expected error message.
-    // @see core/modules/media/js/media_embed_ckeditor.theme.js
-    // @see core/modules/media/js/plugins/drupalmedia/plugin.js
-    $this->container->get('state')->set('test_media_filter_controller_throw_error', TRUE);
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session = $this->assertSession();
-    $this->assertEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]', 1000));
-    $assert_session->elementNotExists('css', 'figure');
-    $this->assertNotEmpty($assert_session->waitForText('An error occurred while trying to preview the media. Please save your work and reload this page.'));
-    // Now assert that the error doesn't appear when the override to force an
-    // error is removed.
-    $this->container->get('state')->set('test_media_filter_controller_throw_error', FALSE);
-    $this->getSession()->reload();
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]'));
-
-    // There's a second kind of error message that comes from the back end
-    // that happens when the media uuid can't be converted to a media preview.
-    // In this case, the error will appear in a the themeable
-    // media-embed-error.html template.  We have a hook altering the css
-    // classes to test the twi template is working properly and picking up our
-    // extra class.
-    // @see \Drupal\media\Plugin\Filter\MediaEmbed::renderMissingMediaIndicator()
-    // @see core/modules/media/templates/media-embed-error.html.twig
-    // @see media_test_embed_preprocess_media_embed_error()
-    $original_value = $this->host->body->value;
-    $this->host->body->value = str_replace($this->media->uuid(), 'invalid_uuid', $original_value);
-    $this->host->save();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElement('css', 'drupal-media figure.caption-drupal-media .this-error-message-is-themeable'));
-
-    // Test when using the classy theme, an additional class is added in
-    // classy/templates/content/media-embed-error.html.twig.
-    $this->assertTrue($this->container->get('theme_installer')->install(['classy']));
-    $this->config('system.theme')
-      ->set('default', 'classy')
-      ->save();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElement('css', 'drupal-media figure.caption-drupal-media .this-error-message-is-themeable.media-embed-error--missing-source'));
-    $assert_session->responseContains('classy/css/components/media-embed-error.css');
-
-    // Test that restoring a valid UUID results in the media embed preview
-    // displaying.
-    $this->host->body->value = $original_value;
-    $this->host->save();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]'));
-    $assert_session->elementNotExists('css', 'drupal-media figure.caption-drupal-media .this-error-message-is-themeable');
-  }
-
-  /**
-   * The CKEditor Widget must load a preview generated using the default theme.
-   */
-  public function testPreviewUsesDefaultThemeAndIsClientCacheable() {
-    // Make the node edit form use the admin theme, like on most Drupal sites.
-    $this->config('node.settings')
-      ->set('use_admin_theme', TRUE)
-      ->save();
-
-    // Allow the test user to view the admin theme.
-    $this->adminUser->addRole($this->drupalCreateRole(['view the administration theme']));
-    $this->adminUser->save();
-
-    // Configure a different default and admin theme, like on most Drupal sites.
-    $this->config('system.theme')
-      ->set('default', 'stable')
-      ->set('admin', 'classy')
-      ->save();
-
-    // Assert that when looking at an embedded entity in the CKEditor Widget,
-    // the preview is generated using the default theme, not the admin theme.
-    // @see media_test_embed_entity_view_alter()
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session = $this->assertSession();
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]'));
-    $element = $assert_session->elementExists('css', '[data-media-embed-test-active-theme]');
-    $this->assertSame('stable', $element->getAttribute('data-media-embed-test-active-theme'));
-    // Assert that the first preview request transferred >500 B over the wire.
-    // Then toggle source mode on and off. This causes the CKEditor widget to be
-    // destroyed and then reconstructed. Assert that during this reconstruction,
-    // a second request is sent. This second request should have transferred 0
-    // bytes: the browser should have cached the response, thus resulting in a
-    // much better user experience.
-    $this->assertGreaterThan(500, $this->getLastPreviewRequestTransferSize());
-    $this->pressEditorButton('source');
-    $this->assertNotEmpty($assert_session->waitForElement('css', 'textarea.cke_source'));
-    $this->pressEditorButton('source');
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'img[src*="image-test.png"]'));
-    $this->assertSame(0, $this->getLastPreviewRequestTransferSize());
-  }
-
-  /**
-   * Tests caption editing in the CKEditor widget.
-   */
-  public function testEditableCaption() {
-    $page = $this->getSession()->getPage();
-    $assert_session = $this->assertSession();
-    // Test that setting caption to blank string doesn't break 'Edit media'
-    // button.
-    $original_value = $this->host->body->value;
-    $this->host->body->value = str_replace('data-caption="baz"', 'data-caption=""', $original_value);
-    $this->host->save();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForButton('Edit media'));
-    // Test `aria-label` attribute appears on the widget wrapper.
-    $assert_session->elementExists('css', '.cke_widget_drupalmedia[aria-label="Screaming hairy armadillo"]');
-    $assert_session->elementContains('css', 'figcaption', '');
-    $assert_session->elementAttributeContains('css', 'figcaption', 'data-placeholder', 'Enter caption here');
-    // Test if you leave the caption blank, but change another attribute,
-    // such as the alt text, the editable caption is still there and the edit
-    // button still exists.
-    $this->fillFieldInMetadataDialogAndSubmit('attributes[alt]', 'Mama, life had just begun');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img[alt*="Mama, life had just begun"]'));
-    $assert_session->buttonExists('Edit media');
-    $assert_session->elementContains('css', 'figcaption', '');
-    $assert_session->elementAttributeContains('css', 'figcaption', 'data-placeholder', 'Enter caption here');
-
-    // Restore caption in saved body value.
-    $original_value = $this->host->body->value;
-    $this->host->body->value = str_replace('data-caption=""', 'data-caption="baz"', $original_value);
-    $this->host->save();
-
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    // Assert that figcaption element exists within the drupal-media element.
-    $this->assertNotEmpty($figcaption = $assert_session->waitForElement('css', 'drupal-media figcaption'));
-    $this->assertSame('baz', $figcaption->getHtml());
-
-    // Test that disabling the caption in the metadata dialog removes it
-    // from the drupal-media element.
-    $this->openMetadataDialogWithKeyPress(static::SPACE_BAR);
-    $page->uncheckField('hasCaption');
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($drupal_media = $assert_session->waitForElementVisible('css', 'drupal-media'));
-
-    // Wait for element to update without figcaption.
-    $result = $page->waitFor(10, function () use ($drupal_media) {
-      return empty($drupal_media->find('css', 'figcaption'));
-    });
-    // Will be true if no figcaption exists within the drupal-media element.
-    $this->assertTrue($result);
-
-    // Test that enabling the caption in the metadata dialog adds an editable
-    // caption to the embedded media.
-    $this->openMetadataDialogWithKeyPress(static::SPACE_BAR);
-    $page->checkField('hasCaption');
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($drupal_media = $assert_session->waitForElementVisible('css', 'drupal-media figcaption'));
-
-    // Type into the widget's caption element.
-    $this->assertNotEmpty($assert_session->waitForElement('css', 'figcaption'));
-    $this->setCaption('Caught in a <strong>landslide</strong>! No escape from <em>reality</em>!');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session->elementExists('css', 'figcaption > em');
-    $assert_session->elementExists('css', 'figcaption > strong')->click();
-
-    // Select the <strong> element and unbold it.
-    $this->clickPathLinkByTitleAttribute("strong element");
-    $this->pressEditorButton('bold');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session->elementExists('css', 'figcaption > em');
-    $assert_session->elementNotExists('css', 'figcaption > strong');
-
-    // Select the <em> element and unitalicize it.
-    $assert_session->elementExists('css', 'figcaption > em')->click();
-    $this->clickPathLinkByTitleAttribute("em element");
-    $this->pressEditorButton('italic');
-
-    // The "source" button should reveal the HTML source in a state matching
-    // what is shown in the CKEditor widget.
-    $this->pressEditorButton('source');
-    $source = $assert_session->elementExists('css', 'textarea.cke_source');
-    $value = $source->getValue();
-    $dom = Html::load($value);
-    $xpath = new \DOMXPath($dom);
-    $drupal_media = $xpath->query('//drupal-media')[0];
-    $this->assertSame('Caught in a landslide! No escape from reality!', $drupal_media->getAttribute('data-caption'));
-
-    // Change the caption by modifying the HTML source directly. When exiting
-    // "source" mode, this should be respected.
-    $poor_boy_text = "I'm just a <strong>poor boy</strong>, I need no sympathy!";
-    $drupal_media->setAttribute("data-caption", $poor_boy_text);
-    $source->setValue(Html::serialize($dom));
-    $this->pressEditorButton('source');
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $figcaption = $assert_session->waitForElement('css', 'figcaption');
-    $this->assertNotEmpty($figcaption);
-    $this->assertSame($poor_boy_text, $figcaption->getHtml());
-
-    // Select the <strong> element that we just set in "source" mode. This
-    // proves that it was indeed rendered by the CKEditor widget.
-    $strong = $figcaption->find('css', 'strong');
-    $this->assertNotEmpty($strong);
-    $strong->click();
-    $this->pressEditorButton('bold');
-
-    // Insert a link into the caption.
-    $this->clickPathLinkByTitleAttribute("Caption element");
-    $this->pressEditorButton('drupallink');
-    $field = $assert_session->waitForElementVisible('xpath', '//input[@name="attributes[href]"]');
-    $this->assertNotEmpty($field);
-    $field->setValue('https://www.drupal.org');
-    $assert_session->elementExists('css', 'button.form-submit')->press();
-
-    // Wait for the live preview in the CKEditor widget to finish loading, then
-    // edit the link; no `data-cke-saved-href` attribute should exist on it.
-    $this->getSession()->switchToIFrame('ckeditor');
-    $figcaption = $assert_session->waitForElement('css', 'figcaption');
-    $page = $this->getSession()->getPage();
-    // Wait for AJAX refresh.
-    $page->waitFor(10, function () use ($figcaption) {
-      return $figcaption->find('xpath', '//a[@href="https://www.drupal.org"]');
-    });
-    $assert_session->elementExists('css', 'a', $figcaption)->click();
-    $this->clickPathLinkByTitleAttribute("a element");
-    $this->pressEditorButton('drupallink');
-    $field = $assert_session->waitForElementVisible('xpath', '//input[@name="attributes[href]"]');
-    $this->assertNotEmpty($field);
-    $field->setValue('https://www.drupal.org/project/drupal');
-    $assert_session->elementExists('css', 'button.form-submit')->press();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $figcaption = $assert_session->waitForElement('css', 'figcaption');
-    $page = $this->getSession()->getPage();
-    // Wait for AJAX refresh.
-    $page->waitFor(10, function () use ($figcaption) {
-      return $figcaption->find('xpath', '//a[@href="https://www.drupal.org/project/drupal"]');
-    });
-    $this->pressEditorButton('source');
-    $source = $assert_session->elementExists('css', "textarea.cke_source");
-    $value = $source->getValue();
-    $this->assertStringContainsString('https://www.drupal.org/project/drupal', $value);
-    $this->assertStringNotContainsString('data-cke-saved-href', $value);
-
-    // Save the entity.
-    $assert_session->buttonExists('Save')->press();
-
-    // Verify the saved entity when viewed also contains the captioned media.
-    $link = $assert_session->elementExists('css', 'figcaption > a');
-    $this->assertSame('https://www.drupal.org/project/drupal', $link->getAttribute('href'));
-    $this->assertSame("I'm just a poor boy, I need no sympathy!", $link->getText());
-
-    // Edit it again, type a different caption in the widget.
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'figcaption'));
-    $this->setCaption('Scaramouch, <em>Scaramouch</em>, will you do the <strong>Fandango</strong>?');
-
-    // Erase the caption in the CKEditor Widget, verify the <figcaption> still
-    // exists and contains placeholder text, then type something else.
-    $this->setCaption('');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session->elementContains('css', 'figcaption', '');
-    $assert_session->elementAttributeContains('css', 'figcaption', 'data-placeholder', 'Enter caption here');
-    $this->setCaption('Fin.');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session->elementContains('css', 'figcaption', 'Fin.');
-  }
-
-  /**
-   * Tests the EditorMediaDialog's form elements' #access logic.
-   */
-  public function testDialogAccess() {
-    $page = $this->getSession()->getPage();
-    $assert_session = $this->assertSession();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Enable `filter_html` without "alt", "data-align" or "data-caption"
-    // attributes added to the drupal-media tag.
-    $allowed_html = "<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type='1 A I'> <li> <dl> <dt> <dd> <h2 id='jump-*'> <h3 id> <h4 id> <h5 id> <h6 id> <drupal-media data-entity-type data-entity-uuid data-view-mode>";
-    $filter_format = FilterFormat::load('test_format');
-    $filter_format->setFilterConfig('filter_html', [
-      'status' => TRUE,
-      'settings' => [
-        'allowed_html' => $allowed_html,
-      ],
-    ])->save();
-
-    // Test the validation of attributes in the dialog.  If the alt,
-    // data-caption, and data-align attributes are not set on the drupal-media
-    // tag, the respective fields shouldn't display in the dialog.
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    // Test `aria-label` attribute appears on the widget wrapper.
-    $assert_session->elementExists('css', '.cke_widget_drupalmedia[aria-label="Screaming hairy armadillo"]');
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldNotExists('attributes[alt]');
-    $assert_session->fieldNotExists('attributes[align]');
-    $assert_session->fieldNotExists('hasCaption');
-    $assert_session->pageTextContains('There is nothing to configure for this media.');
-    // The edit link for the format shouldn't appear unless the user has
-    // permission to edit the text format.
-    $assert_session->pageTextNotContains('Edit the text format Test format to modify the attributes that can be overridden.');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Now test the same thing with a user who has access to edit text formats.
-    // An extra message containing a link to edit the text format should
-    // appear.
-    Role::load(RoleInterface::AUTHENTICATED_ID)
-      ->grantPermission('administer filters')
-      ->save();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldNotExists('attributes[alt]');
-    $assert_session->fieldNotExists('attributes[align]');
-    $assert_session->fieldNotExists('hasCaption');
-    $assert_session->pageTextContains('There is nothing to configure for this media. Edit the text format Test format to modify the attributes that can be overridden.');
-    $assert_session->linkExists('Edit the text format Test format');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Now test that adding the attributes to the allowed HTML will allow
-    // the fields to display in the dialog.
-    $allowed_html = str_replace('<drupal-media data-entity-type data-entity-uuid data-view-mode>', '<drupal-media alt data-align data-caption data-entity-type data-entity-uuid data-view-mode>', $allowed_html);
-    $filter_format->setFilterConfig('filter_html', [
-      'status' => TRUE,
-      'settings' => [
-        'allowed_html' => $allowed_html,
-      ],
-    ])->save();
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldExists('attributes[alt]');
-    $assert_session->fieldExists('attributes[data-align]');
-    $assert_session->fieldExists('hasCaption');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that setting the media image field to not display alt field also
-    // disables it in the dialog.
-    FieldConfig::loadByName('media', 'image', 'field_media_image')
-      ->setSetting('alt_field', FALSE)
-      ->save();
-    // @todo This manual cache clearing should not be necessary, fix in
-    // https://www.drupal.org/project/drupal/issues/3076544
-    $this->container
-      ->get('cache.discovery')
-      ->delete('entity_bundle_field_definitions:media:image:en');
-    // Wait for preview.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldNotExists('attributes[alt]');
-    $assert_session->fieldExists('attributes[data-align]');
-    $assert_session->fieldExists('hasCaption');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that enabling the alt field on the media image field restores
-    // the field in the dialog.
-    FieldConfig::loadByName('media', 'image', 'field_media_image')
-      ->setSetting('alt_field', TRUE)
-      ->save();
-    // @todo This manual cache clearing should not be necessary, fix in
-    // https://www.drupal.org/project/drupal/issues/3076544
-    $this->container
-      ->get('cache.discovery')
-      ->delete('entity_bundle_field_definitions:media:image:en');
-    // Wait for preview.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldExists('attributes[alt]');
-    $assert_session->fieldExists('attributes[data-align]');
-    $assert_session->fieldExists('hasCaption');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that disabling `filter_caption` and `filter_align` disables the
-    // respective fields in the dialog.
-    $filter_format
-      ->setFilterConfig('filter_caption', [
-        'status' => FALSE,
-      ])->setFilterConfig('filter_align', [
-        'status' => FALSE,
-      ])->save();
-    // Wait for preview.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldNotExists('attributes[data-align]');
-    $assert_session->fieldNotExists('hasCaption');
-    // The alt field should be unaffected.
-    $assert_session->fieldExists('attributes[alt]');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that enabling the two filters restores the fields in the dialog.
-    $filter_format
-      ->setFilterConfig('filter_caption', [
-        'status' => TRUE,
-      ])->setFilterConfig('filter_align', [
-        'status' => TRUE,
-      ])->save();
-    // Wait for preview.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media', 2000));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldExists('attributes[data-align]');
-    $assert_session->fieldExists('hasCaption');
-    $assert_session->pageTextNotContains('There is nothing to configure for this media. Edit the text format Test format to modify the attributes that can be overridden.');
-    // The alt field should be unaffected.
-    $assert_session->fieldExists('attributes[alt]');
-  }
-
-  /**
-   * Tests the EditorMediaDialog can set the alt attribute.
-   */
-  public function testAlt() {
-    $page = $this->getSession()->getPage();
-    $assert_session = $this->assertSession();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    // Wait for the media preview to load.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img'));
-    // Test that by default no alt attribute is present on the drupal-media
-    // element.
-    $this->pressEditorButton('source');
-    $this->assertSourceAttributeSame('alt', NULL);
-    $this->leaveSourceMode();
-    // Test that the preview shows the alt value from the media field's
-    // alt text.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img[alt*="default alt"]'));
-    $this->openMetadataDialogWithKeyPress(static::RETURN_KEY);
-    // Assert that the placeholder is set to the value of the media field's
-    // alt text.
-    $assert_session->elementAttributeContains('named', ['field', 'attributes[alt]'], 'placeholder', 'default alt');
-
-    // Fill in the alt field, submit and return to CKEditor.
-    // cSpell:disable-next-line
-    $who_is_zartan = 'Zartan is the leader of the Dreadnoks.';
-    $page->fillField('attributes[alt]', $who_is_zartan);
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Assert that the img within the media embed within the CKEditor contains
-    // the overridden alt text set in the dialog.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img[alt*="' . $who_is_zartan . '"]'));
-    // Test `aria-label` attribute appears on the widget wrapper.
-    $assert_session->elementExists('css', '.cke_widget_drupalmedia[aria-label="Screaming hairy armadillo"]');
-
-    // Test that the downcast drupal-media element now has the alt attribute
-    // entered in the dialog.
-    $this->pressEditorButton('source');
-    $this->assertSourceAttributeSame('alt', $who_is_zartan);
-
-    // The alt field should now display the override instead of the default.
-    $this->leaveSourceMode();
-    $this->openMetadataDialog();
-    $assert_session->fieldValueEquals('attributes[alt]', $who_is_zartan);
-
-    // Test the process again with a different alt text to make sure it works
-    // the second time around.
-    $cobra_commander_bio = 'The supreme leader of the terrorist organization Cobra';
-    // Set the alt field to the new alt text.
-    $page->fillField('attributes[alt]', $cobra_commander_bio);
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    // Assert that the img within the media embed preview
-    // within the CKEditor contains the overridden alt text set in the dialog.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img[alt*="' . $cobra_commander_bio . '"]'));
-
-    // Test that the downcast drupal-media element now has the alt attribute
-    // entered in the dialog.
-    $this->pressEditorButton('source');
-    $this->assertSourceAttributeSame('alt', $cobra_commander_bio);
-
-    // The default value of the alt field should now display the override
-    // instead of the value on the media image field.
-    $this->leaveSourceMode();
-    $this->openMetadataDialogWithKeyPress(static::RETURN_KEY);
-    $assert_session->fieldValueEquals('attributes[alt]', $cobra_commander_bio);
-
-    // Test that setting alt value to two double quotes will signal to the
-    // MediaEmbed filter to unset the attribute on the media image field. We
-    // intentionally add a space after the two double quotes to test the string
-    // is trimmed to two quotes.
-    $page->fillField('attributes[alt]', '"" ');
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    // Verify that the two double quote empty alt indicator ('""') set in
-    // the dialog has successfully resulted in a media image field with the
-    // alt attribute present but without a value.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img[alt=""]'));
-
-    // Test that the downcast drupal-media element's alt attribute now has the
-    // empty string indicator.
-    $this->pressEditorButton('source');
-    $this->assertSourceAttributeSame('alt', '""');
-
-    // Test that setting alt to back to an empty string within the dialog will
-    // restore the default alt value saved in to the media image field of the
-    // media item.
-    $this->leaveSourceMode();
-    $this->openMetadataDialog();
-    $page->fillField('attributes[alt]', '');
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media img[alt*="default alt"]'));
-
-    // Test that the downcast drupal-media element no longer has an alt
-    // attribute.
-    $this->pressEditorButton('source');
-    $this->assertSourceAttributeSame('alt', NULL);
-  }
-
-  /**
-   * Tests that dialog loads appropriate translation's alt text.
-   */
-  public function testTranslationAlt() {
-    \Drupal::service('module_installer')->install(['language', 'content_translation']);
-    $this->resetAll();
-    ConfigurableLanguage::create(['id' => 'fr'])->save();
-    ContentLanguageSettings::loadByEntityTypeBundle('media', 'image')
-      ->setDefaultLangcode('en')
-      ->setLanguageAlterable(TRUE)
-      ->save();
-    $media = Media::create([
-      'bundle' => 'image',
-      'name' => 'Screaming hairy armadillo',
-      'field_media_image' => [
-        [
-          'target_id' => 1,
-          'alt' => 'default alt',
-          'title' => 'default title',
-        ],
-      ],
-    ]);
-    $media->save();
-    $media_fr = $media->addTranslation('fr');
-    $media_fr->name = "Tatou poilu hurlant";
-    $media_fr->field_media_image->setValue([
-      [
-        'target_id' => '1',
-        'alt' => "texte alternatif par défaut",
-        'title' => "titre alternatif par défaut",
-      ],
-    ]);
-    $media_fr->save();
-
-    ContentLanguageSettings::loadByEntityTypeBundle('node', 'blog')
-      ->setDefaultLangcode('en')
-      ->setLanguageAlterable(TRUE)
-      ->save();
-
-    $host = $this->createNode([
-      'type' => 'blog',
-      'title' => 'Animals with strange names',
-      'body' => [
-        'value' => '<drupal-media data-caption="baz" data-entity-type="media" data-entity-uuid="' . $media->uuid() . '"></drupal-media>',
-        'format' => 'test_format',
-      ],
-    ]);
-    $host->save();
-
-    $translation = $host->addTranslation('fr');
-    // cSpell:disable-next-line
-    $translation->title = 'Animaux avec des noms étranges';
-    $translation->body->value = $host->body->value;
-    $translation->body->format = $host->body->format;
-    $translation->save();
-
-    Role::load(RoleInterface::AUTHENTICATED_ID)
-      ->grantPermission('translate any entity')
-      ->save();
-
-    $page = $this->getSession()->getPage();
-    $assert_session = $this->assertSession();
-    $this->drupalGet('/fr/node/' . $host->id() . '/edit');
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that the default alt attribute displays without an override.
-    // cSpell:disable-next-line
-    $this->assertNotEmpty($assert_session->waitForElementVisible('xpath', '//img[contains(@alt, "texte alternatif par défaut")]'));
-    // Test `aria-label` attribute appears on the widget wrapper.
-    // cSpell:disable-next-line
-    $assert_session->elementExists('css', '.cke_widget_drupalmedia[aria-label="Tatou poilu hurlant"]');
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    // Assert that the placeholder is set to the value of the media field's
-    // alt text.
-    // cSpell:disable-next-line
-    $assert_session->elementAttributeContains('named', ['field', 'attributes[alt]'], 'placeholder', 'texte alternatif par défaut');
-
-    // Fill in the alt field in the dialog.
-    // cSpell:disable-next-line
-    $qui_est_zartan = 'Zartan est le chef des Dreadnoks.';
-    $page->fillField('attributes[alt]', $qui_est_zartan);
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Assert that the img within the media embed within CKEditor contains
-    // the overridden alt text set in the dialog.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('xpath', '//img[contains(@alt, "' . $qui_est_zartan . '")]'));
-    $this->getSession()->switchToIFrame();
-    $page->pressButton('Save');
-    $assert_session->elementExists('xpath', '//img[contains(@alt, "' . $qui_est_zartan . '")]');
-  }
-
-  /**
-   * Tests linkability of the CKEditor widget.
-   *
-   * @dataProvider linkabilityProvider
-   */
-  public function testLinkability($drupalimage_is_enabled) {
-    if (!$drupalimage_is_enabled) {
-      // Remove the `drupalimage` plugin's `DrupalImage` button.
-      $editor = Editor::load('test_format');
-      $settings = $editor->getSettings();
-      $rows = $settings['toolbar']['rows'];
-      foreach ($rows as $row_key => $row) {
-        foreach ($row as $group_key => $group) {
-          foreach ($group['items'] as $item_key => $item) {
-            if ($item === 'DrupalImage') {
-              unset($settings['toolbar']['rows'][$row_key][$group_key]['items'][$item_key]);
-            }
-          }
-        }
-      }
-      $editor->setSettings($settings);
-      $editor->save();
-    }
-
-    $this->host->body->value .= '<p>The pirate is irate.</p><p>';
-    if ($drupalimage_is_enabled) {
-      // Add an image with a link wrapped around it.
-      $uri = $this->media->field_media_image->entity->getFileUri();
-      /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
-      $file_url_generator = \Drupal::service('file_url_generator');
-      $src = $file_url_generator->generateString($uri);
-      $this->host->body->value .= '<a href="http://www.drupal.org/association"><img alt="drupalimage test image" data-entity-type="" data-entity-uuid="" src="' . $src . '" /></a></p>';
-    }
-    $this->host->save();
-
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session = $this->assertSession();
-
-    // Select the CKEditor Widget.
-    $drupalmedia = $assert_session->waitForElementVisible('css', 'drupal-media');
-    $this->assertNotEmpty($drupalmedia);
-    $drupalmedia->click();
-
-    // While the CKEditor Widget is selected, assert the context menu does not
-    // contain link-related context menu items.
-    $this->openContextMenu();
-    $this->assignNameToCkeditorPanelIframe();
-    $this->getSession()->switchToIFrame('panel');
-    $this->assertContextMenuItemNotExists('Edit Link');
-    $this->assertContextMenuItemNotExists('Unlink');
-    $this->closeContextMenu();
-
-    // While the CKEditor Widget is selected, click the "link" button.
-    $this->pressEditorButton('drupallink');
-    $assert_session->waitForId('drupal-modal');
-
-    // Enter a link in the link dialog and save.
-    $field = $assert_session->waitForElementVisible('xpath', '//input[@name="attributes[href]"]');
-    $this->assertNotEmpty($field);
-    $field->setValue('https://www.drupal.org');
-    $assert_session->elementExists('css', 'button.form-submit')->press();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $link = $assert_session->waitForElementVisible('css', 'a[href="https://www.drupal.org"]');
-    $this->assertNotEmpty($link);
-
-    // Select the CKEditor Widget again and assert the context menu now does
-    // contain link-related context menu items.
-    $drupalmedia = $assert_session->waitForElementVisible('css', 'drupal-media');
-    $this->assertNotEmpty($drupalmedia);
-    $drupalmedia->click();
-    $this->openContextMenu();
-    $this->getSession()->switchToIFrame('panel');
-    $this->assertContextMenuItemExists('Edit Link');
-    $this->assertContextMenuItemExists('Unlink');
-    $this->closeContextMenu();
-
-    // Save the entity.
-    $this->getSession()->switchToIFrame();
-    $assert_session->buttonExists('Save')->press();
-
-    // Verify the saved entity when viewed also contains the linked media.
-    $assert_session->elementExists('css', 'figure > a[href="https://www.drupal.org"] > .media--type-image > .field--type-image > img[src*="image-test.png"]');
-
-    // Test that `drupallink` also still works independently: inserting a link
-    // is possible.
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->pressEditorButton('drupallink');
-    $assert_session->waitForId('drupal-modal');
-    $field = $assert_session->waitForElementVisible('xpath', '//input[@name="attributes[href]"]');
-    $this->assertNotEmpty($field);
-    $field->setValue('https://wikipedia.org');
-    $assert_session->elementExists('css', 'button.form-submit')->press();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $link = $assert_session->waitForElementVisible('css', 'body > a[href="https://wikipedia.org"]');
-    $this->assertNotEmpty($link);
-    $assert_session->elementExists('css', 'body > .cke_widget_drupalmedia > drupal-media > figure > a[href="https://www.drupal.org"]');
-
-    // Select the CKEditor Widget again and assert the `drupalunlink` button is
-    // enabled. Also assert the context menu again contains link-related context
-    // menu items.
-    $drupalmedia = $assert_session->waitForElementVisible('css', 'drupal-media');
-    $this->assertNotEmpty($drupalmedia);
-    $drupalmedia->click();
-    $this->openContextMenu();
-    $this->getSession()->switchToIFrame();
-    $this->assertEditorButtonEnabled('drupalunlink');
-    $this->assignNameToCkeditorPanelIframe();
-    $this->getSession()->switchToIFrame('panel');
-    $this->assertContextMenuItemExists('Edit Link');
-    $this->assertContextMenuItemExists('Unlink');
-
-    // Test that moving focus to another element causes the `drupalunlink`
-    // button to become disabled and causes link-related context menu items to
-    // disappear.
-    $this->getSession()->switchToIFrame();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $p = $assert_session->waitForElementVisible('xpath', "//p[contains(text(), 'The pirate is irate')]");
-    $this->assertNotEmpty($p);
-    $p->click();
-    $this->assertEditorButtonDisabled('drupalunlink');
-    $this->getSession()->switchToIFrame('panel');
-    $this->assertContextMenuItemExists('Edit Link');
-    $this->assertContextMenuItemExists('Unlink');
-
-    // To switch from the context menu iframe ("panel") back to the CKEditor
-    // iframe, we first have to reset to top frame.
-    $this->getSession()->switchToIFrame();
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that moving focus to the `drupalimage` CKEditor Widget enables the
-    // `drupalunlink` button again, because it is a linked image.
-    if ($drupalimage_is_enabled) {
-      $drupalimage = $assert_session->waitForElementVisible('xpath', '//img[@alt="drupalimage test image"]');
-      $this->assertNotEmpty($drupalimage);
-      $drupalimage->click();
-      $this->assertEditorButtonEnabled('drupalunlink');
-      $this->getSession()->switchToIFrame('panel');
-      $this->assertContextMenuItemExists('Edit Link');
-      $this->assertContextMenuItemExists('Unlink');
-      $this->getSession()->switchToIFrame();
-      $this->getSession()->switchToIFrame('ckeditor');
-    }
-
-    // Tests the `drupalunlink` button for the `drupalmedia` CKEditor Widget.
-    $drupalmedia->click();
-    $this->assertEditorButtonEnabled('drupalunlink');
-    $this->getSession()->switchToIFrame('panel');
-    $this->assertContextMenuItemExists('Edit Link');
-    $this->assertContextMenuItemExists('Unlink');
-    $this->pressEditorButton('drupalunlink');
-    $this->assertEditorButtonDisabled('drupalunlink');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $assert_session->elementNotExists('css', 'figure > a[href="https://www.drupal.org"] > .media--type-image > .field--type-image > img[src*="image-test.png"]');
-    $assert_session->elementExists('css', 'figure .media--type-image > .field--type-image > img[src*="image-test.png"]');
-    if ($drupalimage_is_enabled) {
-      // Tests the `drupalunlink` button for the `drupalimage` CKEditor Widget.
-      $drupalimage->click();
-      $this->assertEditorButtonEnabled('drupalunlink');
-      $this->pressEditorButton('drupalunlink');
-      $this->assertEditorButtonDisabled('drupalunlink');
-      $this->getSession()->switchToIFrame('ckeditor');
-      $assert_session->elementNotExists('css', 'p > a[href="https://www.drupal.org/association"] > img[src*="image-test.png"]');
-      $assert_session->elementExists('css', 'p > img[src*="image-test.png"]');
-    }
-  }
-
-  /**
-   * Data Provider for ::testLinkability.
-   */
-  public function linkabilityProvider() {
-    return [
-      'linkability when `drupalimage` is enabled' => [
-        TRUE,
-      ],
-      'linkability when `drupalimage` is disabled' => [
-        FALSE,
-      ],
-    ];
-  }
-
-  /**
-   * Tests preview route access.
-   *
-   * @param bool $media_embed_enabled
-   *   Whether to test with media_embed filter enabled on the text format.
-   * @param bool $can_use_format
-   *   Whether the logged in user is allowed to use the text format.
-   *
-   * @dataProvider previewAccessProvider
-   */
-  public function testEmbedPreviewAccess($media_embed_enabled, $can_use_format) {
-    // Reconfigure the host entity's text format to suit our needs.
-    /** @var \Drupal\filter\FilterFormatInterface $format */
-    $format = FilterFormat::load($this->host->body->format);
-    $format->set('filters', [
-      'filter_align' => ['status' => TRUE],
-      'filter_caption' => ['status' => TRUE],
-      'media_embed' => ['status' => $media_embed_enabled],
-    ]);
-    $format->save();
-
-    $permissions = [
-      'bypass node access',
-    ];
-    if ($can_use_format) {
-      $permissions[] = $format->getPermissionName();
-    }
-    $this->drupalLogin($this->drupalCreateUser($permissions));
-    $this->drupalGet($this->host->toUrl('edit-form'));
-
-    $assert_session = $this->assertSession();
-    if ($can_use_format) {
-      $this->waitForEditor();
-      $this->assignNameToCkeditorIframe();
-      $this->getSession()->switchToIFrame('ckeditor');
-      if ($media_embed_enabled) {
-        // The preview rendering, which in this test will use Classy's
-        // media.html.twig template, will fail without the CSRF token/header.
-        // @see ::testEmbeddedMediaPreviewWithCsrfToken()
-        $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'article.media'));
-      }
-      else {
-        // If the filter isn't enabled, there won't be an error, but the
-        // preview shouldn't be rendered.
-        $assert_session->assertWaitOnAjaxRequest();
-        $assert_session->elementNotExists('css', 'article.media');
-      }
-    }
-    else {
-      $assert_session->pageTextContains('This field has been disabled because you do not have sufficient permissions to edit it.');
-    }
-  }
-
-  /**
-   * Data provider for ::testEmbedPreviewAccess.
-   */
-  public function previewAccessProvider() {
-    return [
-      'media_embed filter enabled' => [
-        TRUE,
-        TRUE,
-      ],
-      'media_embed filter disabled' => [
-        FALSE,
-        TRUE,
-      ],
-      'media_embed filter enabled, user not allowed to use text format' => [
-        TRUE,
-        FALSE,
-      ],
-    ];
-  }
-
-  /**
-   * Tests alignment integration.
-   *
-   * Tests that alignment is reflected onto the CKEditor Widget wrapper, that
-   * the EditorMediaDialog allows altering the alignment and that the changes
-   * are reflected on the widget and downcast drupal-media tag.
-   */
-  public function testAlignment() {
-    $assert_session = $this->assertSession();
-
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    // Wait for preview to load.
-    $this->assertNotEmpty($assert_session->waitForElement('css', 'drupal-media img'));
-    // Assert the drupal-media element starts without a data-align attribute.
-    $drupal_media = $assert_session->elementExists('css', 'drupal-media');
-    $this->assertFalse($drupal_media->hasAttribute('data-align'));
-
-    // Assert that setting the data-align property in the dialog adds the
-    // `align-right', `align-left` or `align-center' class on the widget,
-    // caption figure and drupal-media element.
-    $alignments = [
-      'right',
-      'left',
-      'center',
-    ];
-    foreach ($alignments as $alignment) {
-      $this->fillFieldInMetadataDialogAndSubmit('attributes[data-align]', $alignment);
-      // Wait for preview to load.
-      $this->assertNotEmpty($assert_session->waitForElement('css', 'drupal-media img'));
-      // Now verify the result. Assert the first element within the
-      // <drupal-media> element has the alignment class.
-      $selector = sprintf('drupal-media[data-align="%s"] .caption-drupal-media.align-%s', $alignment, $alignment);
-      $this->assertNotEmpty($assert_session->waitForElementVisible('css', $selector, 2000));
-
-      // Assert that the resultant downcast drupal-media element has the proper
-      // `data-align` attribute.
-      $this->pressEditorButton('source');
-      $this->assertSourceAttributeSame('data-align', $alignment);
-      $this->leaveSourceMode();
-    }
-    // Test that setting the "Align" field to "none" in the dialog will
-    // remove the attribute from the drupal-media element in the CKEditor.
-    $this->fillFieldInMetadataDialogAndSubmit('attributes[data-align]', 'none');
-
-    // Assert the drupal-media element no longer has data-align attribute.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media .caption-drupal-media:not(.align-center)', 2000));
-    $drupal_media = $assert_session->elementExists('css', 'drupal-media');
-    $this->assertFalse($drupal_media->hasAttribute('data-align'));
-    // Assert that the resultant downcast <drupal-media> tag has no data-align
-    // attribute.
-    $this->pressEditorButton('source');
-    $this->assertNotEmpty($drupal_media = $this->getDrupalMediaFromSource());
-    $this->assertFalse($drupal_media->hasAttribute('data-align'));
-  }
-
-  /**
-   * Tests the EditorMediaDialog can set the data-view-mode attribute.
-   */
-  public function testViewMode() {
-    EntityViewMode::create([
-      'id' => 'media.view_mode_1',
-      'targetEntityType' => 'media',
-      'status' => TRUE,
-      'enabled' => TRUE,
-      'label' => 'View Mode 1',
-    ])->save();
-    EntityViewMode::create([
-      'id' => 'media.22222',
-      'targetEntityType' => 'media',
-      'status' => TRUE,
-      'enabled' => TRUE,
-      'label' => 'View Mode 2 has Numeric ID',
-    ])->save();
-    EntityViewMode::create([
-      'id' => 'media.view_mode_3',
-      'targetEntityType' => 'media',
-      'status' => TRUE,
-      'enabled' => TRUE,
-      'label' => 'View Mode 3',
-    ])->save();
-
-    // Only enable view mode 1 & 2 for Image.
-    EntityViewDisplay::create([
-      'id' => 'media.image.view_mode_1',
-      'targetEntityType' => 'media',
-      'status' => TRUE,
-      'bundle' => 'image',
-      'mode' => 'view_mode_1',
-    ])->save();
-    EntityViewDisplay::create([
-      'id' => 'media.image.22222',
-      'targetEntityType' => 'media',
-      'status' => TRUE,
-      'bundle' => 'image',
-      'mode' => '22222',
-    ])->save();
-
-    $filter_format = FilterFormat::load('test_format');
-    $filter_format->setFilterConfig('media_embed', [
-      'status' => TRUE,
-      'settings' => [
-        'default_view_mode' => 'view_mode_1',
-        'allowed_media_types' => [],
-        'allowed_view_modes' => [
-          'view_mode_1' => 'view_mode_1',
-          '22222' => '22222',
-          'view_mode_3' => 'view_mode_3',
-        ],
-      ],
-    ])->save();
-
-    // Test that view mode dependencies are returned from the MediaEmbed
-    // filter's ::getDependencies() method.
-    $expected_config_dependencies = [
-      'core.entity_view_mode.media.view_mode_1',
-      'core.entity_view_mode.media.22222',
-      'core.entity_view_mode.media.view_mode_3',
-    ];
-    $dependencies = $filter_format->getDependencies();
-    $this->assertArrayHasKey('config', $dependencies);
-    $this->assertEqualsCanonicalizing($expected_config_dependencies, $dependencies['config']);
-
-    // Test MediaEmbed's allowed_view_modes option setting enables a view mode
-    // selection field.
-    $page = $this->getSession()->getPage();
-    $assert_session = $this->assertSession();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media'));
-    $assert_session->elementExists('css', '.cke_widget_drupalmedia[aria-label="Screaming hairy armadillo"]');
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->optionExists('attributes[data-view-mode]', 'view_mode_1');
-    $assert_session->optionExists('attributes[data-view-mode]', '22222');
-    $assert_session->optionNotExists('attributes[data-view-mode]', 'view_mode_3');
-    $assert_session->selectExists('attributes[data-view-mode]')->selectOption('22222');
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'article.media--view-mode-_2222'));
-    // Test that the downcast drupal-media element contains the
-    // `data-view-mode` attribute set in the dialog.
-    $this->pressEditorButton('source');
-    $this->assertNotEmpty($drupal_media = $this->getDrupalMediaFromSource());
-    $this->assertSame('22222', $drupal_media->getAttribute('data-view-mode'));
-
-    // Press the source button again to leave source mode.
-    $this->pressEditorButton('source');
-    // Having entered source mode means we need to reassign an ID to the
-    // CKEditor iframe.
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that setting the allowed_view_modes option to only one option hides
-    // the field (it requires more than one option).
-    $filter_format->setFilterConfig('media_embed', [
-      'status' => TRUE,
-      'settings' => [
-        'default_view_mode' => 'view_mode_1',
-        'allowed_media_types' => [],
-        'allowed_view_modes' => [
-          'view_mode_1' => 'view_mode_1',
-        ],
-      ],
-    ])->save();
-
-    // Test that the dependencies change when the allowed_view_modes change.
-    $dependencies = $filter_format->getDependencies();
-    $this->assertArrayHasKey('config', $dependencies);
-    $this->assertSame(['core.entity_view_mode.media.view_mode_1'], $dependencies['config']);
-
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media'));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->fieldNotExists('attributes[data-view-mode]');
-    $page->pressButton('Close');
-    $this->getSession()->switchToIFrame('ckeditor');
-
-    // Test that setting allowed_view_modes back to two items restores the
-    // field.
-    $filter_format->setFilterConfig('media_embed', [
-      'status' => TRUE,
-      'settings' => [
-        'default_view_mode' => 'view_mode_1',
-        'allowed_media_types' => [],
-        'allowed_view_modes' => [
-          'view_mode_1' => 'view_mode_1',
-          '22222' => '22222',
-        ],
-      ],
-    ])->save();
-
-    // Test that the dependencies change when the allowed_view_modes change.
-    $expected_config_dependencies = [
-      'core.entity_view_mode.media.view_mode_1',
-      'core.entity_view_mode.media.22222',
-    ];
-    $dependencies = $filter_format->getDependencies();
-    $this->assertArrayHasKey('config', $dependencies);
-    $this->assertEqualsCanonicalizing($expected_config_dependencies, $dependencies['config']);
-
-    // Test that setting the view mode back to the default removes the
-    // `data-view-mode` attribute.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'drupal-media'));
-    $page->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-    $assert_session->optionExists('attributes[data-view-mode]', 'view_mode_1');
-    $assert_session->optionExists('attributes[data-view-mode]', '22222');
-    $assert_session->selectExists('attributes[data-view-mode]')->selectOption('view_mode_1');
-    $this->submitDialog();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'article.media--view-mode-view-mode-1'));
-    $this->pressEditorButton('source');
-    $this->assertNotEmpty($drupal_media = $this->getDrupalMediaFromSource());
-    $this->assertFalse($drupal_media->hasAttribute('data-view-mode'));
-
-    // Test that changing the view mode with an empty editable caption
-    // preserves the empty editable caption when the preview reloads.
-    $original_value = $this->host->body->value;
-    $this->host->body->value = str_replace('data-caption="baz"', '', $original_value);
-    $this->host->save();
-    $this->drupalGet($this->host->toUrl('edit-form'));
-    $this->waitForEditor();
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    // Wait for preview to load with default view mode.
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', 'article.media--view-mode-view-mode-1'));
-  }
-
-  /**
-   * Waits for the form that allows editing metadata.
-   *
-   * @see \Drupal\media\Form\EditorMediaDialog
-   */
-  protected function waitForMetadataDialog() {
-    $page = $this->getSession()->getPage();
-    $this->getSession()->switchToIFrame();
-    // Wait for the dialog to open.
-    $result = $page->waitFor(10, function ($page) {
-      $metadata_editor = $page->find('css', 'form.editor-media-dialog');
-      return !empty($metadata_editor);
-    });
-    $this->assertTrue($result);
-  }
-
-  /**
-   * Fills in a field in the metadata dialog for an embedded media item.
-   *
-   * This method assumes that the calling code has already switched into the
-   * CKEditor iframe.
-   *
-   * @param string $locator
-   *   The field ID, name, or label.
-   * @param string $value
-   *   The value to set on the field.
-   */
-  protected function fillFieldInMetadataDialogAndSubmit($locator, $value) {
-    // Wait for the drupal-media which holds the "Edit media" button which
-    // opens the dialog.
-    $this->openMetadataDialog();
-    $this->getSession()->getPage()->fillField($locator, $value);
-    $this->submitDialog();
-    // Since ::waitforMetadataDialog() switches back to the main iframe, we'll
-    // need to switch back.
-    $this->getSession()->switchToIFrame('ckeditor');
-  }
-
-  /**
-   * Clicks the `Edit media` button and waits for the metadata dialog.
-   *
-   * This method assumes that the calling code has already switched into the
-   * CKEditor iframe.
-   */
-  protected function openMetadataDialog() {
-    $this->assertNotEmpty($embedded_media = $this->assertSession()->waitForElementVisible('css', 'drupal-media'));
-    $embedded_media->pressButton('Edit media');
-    $this->waitForMetadataDialog();
-  }
-
-  /**
-   * Focuses on `Edit media` button and presses the given key.
-   *
-   * @param int $char
-   *   The character code to press.
-   *
-   *   This method assumes that the calling code has already switched into the
-   *   CKEditor iframe.
-   */
-  protected function openMetadataDialogWithKeyPress($char) {
-    $this->assertNotEmpty($button = $this->assertSession()->waitForButton('Edit media'));
-    $button->keyDown($char);
-    $this->waitForMetadataDialog();
-  }
-
-  /**
-   * Leaves source mode and returns to the CKEditor iframe.
-   */
-  protected function leaveSourceMode() {
-    // Press the source button again to leave source mode.
-    $this->pressEditorButton('source');
-    // Having entered source mode means we need to reassign an ID to the
-    // CKEditor iframe.
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-  }
-
-  /**
-   * Verifies value of an attribute on the downcast <drupal-media> element.
-   *
-   * Assumes CKEditor is in source mode.
-   *
-   * @param string $attribute
-   *   The attribute to check.
-   * @param string|null $value
-   *   Either a string value or if NULL, asserts that <drupal-media> element
-   *   doesn't have the attribute.
-   *
-   * @internal
-   */
-  protected function assertSourceAttributeSame(string $attribute, ?string $value): void {
-    $this->assertNotEmpty($drupal_media = $this->getDrupalMediaFromSource());
-    if ($value === NULL) {
-      $this->assertFalse($drupal_media->hasAttribute($attribute));
-    }
-    else {
-      $this->assertSame($value, $drupal_media->getAttribute($attribute));
-    }
-  }
-
-  /**
-   * Closes and submits the metadata dialog.
-   */
-  protected function submitDialog() {
-    $this->assertNotEmpty($dialog_buttons = $this->assertSession()->elementExists('css', 'div.ui-dialog-buttonpane'));
-    $dialog_buttons->pressButton('Save');
-  }
-
-  /**
-   * Closes the metadata dialog.
-   */
-  protected function closeDialog() {
-    $page = $this->getSession()->getPage();
-    $page->pressButton('Close');
-    $result = $page->waitFor(10, function ($page) {
-      $metadata_editor = $page->find('css', 'form.editor-media-dialog');
-      return empty($metadata_editor);
-    });
-    $this->assertTrue($result);
-  }
-
-  /**
-   * Gets the transfer size of the last preview request.
-   *
-   * @return int
-   *   The size of the bytes transferred.
-   */
-  protected function getLastPreviewRequestTransferSize() {
-    $this->getSession()->switchToIFrame();
-    $javascript = <<<JS
-(function(){
-  return window.performance
-    .getEntries()
-    .filter(function (entry) {
-      return entry.initiatorType == 'xmlhttprequest' && entry.name.indexOf('/media/test_format/preview') !== -1;
-    })
-    .pop()
-    .transferSize;
-})()
-JS;
-    return $this->getSession()->evaluateScript($javascript);
-  }
-
-  /**
-   * Sets the text of the editable caption to the given text.
-   *
-   * @param string $text
-   *   The text to set in the caption.
-   */
-  protected function setCaption($text) {
-    $this->getSession()->switchToIFrame();
-    $select_and_edit_caption = "var editor = CKEDITOR.instances['edit-body-0-value'];
-       var figcaption = editor.widgets.getByElement(editor.editable().findOne('figcaption'));
-       figcaption.editables.caption.setData('" . $text . "')";
-    $this->getSession()->executeScript($select_and_edit_caption);
-  }
-
-  /**
-   * Assigns a name to the CKEditor context menu iframe.
-   *
-   * Note that this iframe doesn't appear until context menu appears.
-   *
-   * @see \Behat\Mink\Session::switchToIFrame()
-   */
-  protected function assignNameToCkeditorPanelIframe() {
-    $javascript = <<<JS
-(function(){
-  document.getElementsByClassName('cke_panel_frame')[0].id = 'panel';
-})()
-JS;
-    $this->getSession()->evaluateScript($javascript);
-  }
-
-  /**
-   * Opens the context menu for the currently selected widget.
-   *
-   * @param string $instance_id
-   *   The CKEditor instance ID.
-   */
-  protected function openContextMenu($instance_id = 'edit-body-0-value') {
-    $this->getSession()->switchToIFrame();
-    $script = <<<JS
-      (function() {
-        var editor = CKEDITOR.instances["$instance_id"];
-        editor.contextMenu.open(editor.widgets.selected[0].element);
-      }());
-JS;
-    $this->getSession()->executeScript($script);
-  }
-
-  /**
-   * Asserts that a context menu item exists by aria-label attribute.
-   *
-   * @param string $label
-   *   The `aria-label` attribute value of the context menu item.
-   *
-   * @internal
-   */
-  protected function assertContextMenuItemExists(string $label): void {
-    $this->assertSession()->elementExists('xpath', '//a[@aria-label="' . $label . '"]');
-  }
-
-  /**
-   * Asserts that a context menu item does not exist by aria-label attribute.
-   *
-   * @param string $label
-   *   The `aria-label` attribute value of the context menu item.
-   *
-   * @internal
-   */
-  protected function assertContextMenuItemNotExists(string $label): void {
-    $this->assertSession()->elementNotExists('xpath', '//a[@aria-label="' . $label . '"]');
-  }
-
-  /**
-   * Closes the open context menu.
-   *
-   * @param string $instance_id
-   *   The CKEditor instance ID.
-   */
-  protected function closeContextMenu($instance_id = 'edit-body-0-value') {
-    $this->getSession()->switchToIFrame();
-    $script = <<<JS
-      (function() {
-        var editor = CKEDITOR.instances["$instance_id"];
-        editor.contextMenu.hide();
-      }());
-JS;
-    $this->getSession()->executeScript($script);
-  }
-
-  /**
-   * Clicks a link in the editor's path links with the given title text.
-   *
-   * @param string $text
-   *   The title attribute of the link to click.
-   */
-  protected function clickPathLinkByTitleAttribute($text) {
-    $this->getSession()->switchToIFrame();
-    $selector = '//span[@id="cke_1_path"]//a[@title="' . $text . '"]';
-    $this->assertSession()->elementExists('xpath', $selector)->click();
-  }
-
-  /**
-   * Parses the <drupal-media> element from CKEditor's "source" view.
-   *
-   * Assumes CKEditor is in source mode.
-   *
-   * @return \DOMNode|null
-   *   The drupal-media element or NULL if it can't be found.
-   */
-  protected function getDrupalMediaFromSource() {
-    $value = $this->assertSession()
-      ->elementExists('css', 'textarea.cke_source')
-      ->getValue();
-    $dom = Html::load($value);
-    $xpath = new \DOMXPath($dom);
-    $list = $xpath->query('//drupal-media');
-    return count($list) > 0 ? $list[0] : NULL;
-  }
-
-}
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
index fbe516239..5b9305b8c 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaDisplayTest.php
@@ -20,7 +20,7 @@ class MediaDisplayTest extends MediaJavascriptTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -62,8 +62,10 @@ public function testMediaDisplay() {
     $media->save();
 
     $this->drupalGet('media/' . $media->id());
-    // Verify the "name" field is really not present.
-    $assert_session->elementNotExists('css', '.field--name-name');
+    // Verify the "name" field is really not present. The name should be in the
+    // h1 with no additional markup in the h1.
+    $assert_session->elementTextContains('css', 'h1', $media->getName());
+    $assert_session->elementNotExists('css', 'h1 div');
 
     // Enable the field on the display and verify it becomes visible on the UI.
     $this->drupalGet("/admin/structure/media/manage/{$media_type->id()}/display");
@@ -73,10 +75,10 @@ public function testMediaDisplay() {
     $assert_session->waitForElementVisible('css', '#edit-fields-name-settings-edit');
     $page->pressButton('Save');
     $this->drupalGet('media/' . $media->id());
-    // Verify the name is present, and its text matches what is expected.
-    $assert_session->elementExists('css', '.field--name-name');
-    $name_field = $page->find('css', '.field--name-name .field__item');
-    $this->assertSame($media->label(), $name_field->getText());
+    // Verify the name is present, and its text matches what is expected. Now
+    // there should be markup in the h1.
+    $assert_session->elementTextContains('xpath', '//h1/div/div[1]', 'Name');
+    $assert_session->elementTextContains('xpath', '//h1/div/div[2]', $media->getName());
 
     // In the standard profile, there are some pre-cooked types. Make sure the
     // elements configured on their displays are the expected ones.
@@ -100,23 +102,22 @@ public function testMediaDisplay() {
     $this->drupalGet('/media/' . $image_media_id);
 
     // Check if the default media name is generated as expected.
-    $assert_session->elementTextContains('css', 'h1', $image_media_name);
+    $assert_session->elementTextContains('xpath', '//h1', $image_media_name);
     // Here we expect to see only the image, nothing else.
     // Assert only one element in the content region.
-    $this->assertCount(1, $page->findAll('css', '.media--type-image > div'));
+    $media_item = $assert_session->elementExists('xpath', '//div[@class="layout-content"]/div/div[2]');
+    $assert_session->elementsCount('xpath', '/div', 1, $media_item);
     // Assert the image is present inside the media element.
-    $media_item = $assert_session->elementExists('css', '.media--type-image > div');
-    $assert_session->elementExists('css', 'img', $media_item);
+    $media_image = $assert_session->elementExists('xpath', '//img', $media_item);
     // Assert that the image src uses the large image style, the label is
     // visually hidden, and there is no link to the image file.
-    $media_image = $assert_session->elementExists('css', '.media--type-image img');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
     $expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg'));
     $this->assertStringContainsString($expected_image_src, $media_image->getAttribute('src'));
-    $field = $assert_session->elementExists('css', '.field--name-field-media-image');
-    $assert_session->elementExists('css', '.field__label.visually-hidden', $field);
-    $assert_session->elementNotExists('css', 'a', $field);
+    $field = $assert_session->elementExists('xpath', '/div[1]', $media_item);
+    $assert_session->elementExists('xpath', '/div[@class="visually-hidden"]', $field);
+    $assert_session->elementNotExists('xpath', '//a', $field);
 
     $test_filename = $this->randomMachineName() . '.txt';
     $test_filepath = 'public://' . $test_filename;
@@ -134,10 +135,10 @@ public function testMediaDisplay() {
     $assert_session->elementTextContains('css', 'h1', $test_filename);
     // Here we expect to see only the linked filename.
     // Assert only one element in the content region.
-    $this->assertCount(1, $page->findAll('css', 'article.media--type-document > div'));
+    $media_item = $assert_session->elementExists('xpath', '//div[@class="layout-content"]/div/div[2]');
+    $assert_session->elementsCount('xpath', '/div', 1, $media_item);
     // Assert the file link is present, and its text matches the filename.
-    $assert_session->elementExists('css', 'article.media--type-document .field--name-field-media-document a');
-    $link = $page->find('css', 'article.media--type-document .field--name-field-media-document a');
+    $link = $assert_session->elementExists('xpath', '//a', $media_item);
     $this->assertSame($test_filename, $link->getText());
 
     // Create a node type "page" to use as host entity.
@@ -176,7 +177,7 @@ public function testMediaDisplay() {
     \Drupal::service('entity_display.repository')->getViewDisplay('node', $node_type->id())
       ->setComponent('field_related_media', [
         'type' => 'entity_reference_entity_view',
-        'label' => 'hidden',
+        'label' => 'above',
         'settings' => [
           'view_mode' => 'full',
         ],
@@ -192,15 +193,14 @@ public function testMediaDisplay() {
     $node->save();
 
     $this->drupalGet('/node/' . $node->id());
-    // Media field is there.
-    $assert_session->elementExists('css', '.field--name-field-related-media');
+    // Media field (field_related_media) is there.
+    $assert_session->pageTextContains('Related media');
     // Media name element is not there.
-    $assert_session->elementNotExists('css', '.field--name-name');
     $assert_session->pageTextNotContains($image_media_name);
-    // Only one element is present inside the media container.
-    $this->assertCount(1, $page->findAll('css', '.field--name-field-related-media article.media--type-image > div'));
-    // Assert the image is present.
-    $assert_session->elementExists('css', '.field--name-field-related-media article.media--type-image img');
+    // Only one image is present.
+    $assert_session->elementsCount('xpath', '//img', 1);
+    // The image has the correct image style.
+    $assert_session->elementAttributeContains('xpath', '//img', 'src', '/styles/large/');
   }
 
 }
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php
index 13513802d..6b142dc15 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaEmbedFilterConfigurationUiTest.php
@@ -144,8 +144,7 @@ public function testValidationWhenEditing($filter_html_status, $filter_align_sta
   }
 
   /**
-   * Data provider for testValidationWhenAdding() and
-   * testValidationWhenEditing().
+   * Data provider for testing validation when adding and editing media embeds.
    */
   public function providerTestValidations() {
     return [
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php
index 88fc891ef..878c27f58 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaJavascriptTestBase.php
@@ -51,7 +51,7 @@ protected function waitUntilVisible($selector, $timeout = 1000, $message = '') {
    */
   protected function assertLinkToCreatedMedia() {
     $assert_session = $this->assertSession();
-    $selector = '.messages a';
+    $selector = 'div[aria-label="Status message"] a';
 
     // Get the canonical media entity URL from the creation message.
     $link = $assert_session->elementExists('css', $selector);
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php
index a3223c748..bc7a3b36f 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceAudioVideoTest.php
@@ -17,7 +17,7 @@ class MediaSourceAudioVideoTest extends MediaSourceTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Check the Audio source functionality.
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
index 6d9c1f44b..97bf8cc18 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceFileTest.php
@@ -15,12 +15,14 @@ class MediaSourceFileTest extends MediaSourceTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Tests the file media source.
    */
   public function testMediaFileSource() {
+    // Skipped due to frequent random test failures.
+    $this->markTestSkipped();
     $media_type_id = 'test_media_file_type';
     $source_field_id = 'field_media_file';
     $provided_fields = [
@@ -70,7 +72,7 @@ public function testMediaFileSource() {
     // Make sure a link to the file is displayed.
     $assert_session->linkExists($test_filename);
     // The thumbnail should not be displayed.
-    $assert_session->elementNotExists('css', '.image-style-thumbnail');
+    $assert_session->elementNotExists('css', 'img');
 
     // Make sure checkbox changes the visibility of log message field.
     $this->drupalGet("media/1/edit");
@@ -93,7 +95,7 @@ public function testMediaFileSource() {
     $result = $assert_session->waitForButton('Remove');
     $this->assertNotEmpty($result);
     $page->pressButton('Save');
-    $assert_session->elementAttributeContains('css', '.image-style-thumbnail', 'src', 'text--plain.png');
+    $assert_session->elementAttributeContains('css', 'img', 'src', 'text--plain.png');
 
     // Check if the mapped name is automatically updated.
     $new_filename = $this->randomMachineName() . '.txt';
@@ -110,7 +112,7 @@ public function testMediaFileSource() {
     /** @var \Drupal\media\MediaInterface $media */
     $media = \Drupal::entityTypeManager()->getStorage('media')->loadUnchanged(1);
     $this->assertEquals($new_filename, $media->getName());
-    $assert_session->pageTextContains("$new_filename has been updated.");
+    $assert_session->statusMessageContains("$new_filename has been updated.", 'status');
   }
 
 }
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
index 9f17c9245..5e79060fc 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceImageTest.php
@@ -21,7 +21,7 @@ class MediaSourceImageTest extends MediaSourceTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Tests the image media source.
@@ -71,13 +71,14 @@ public function testMediaImageSource() {
     // Assert the image element is present inside the media element and that its
     // src attribute uses the large image style, the label is visually hidden,
     // and there is no link to the image file.
-    $image_element = $assert_session->elementExists('css', '.field--name-field-media-image img');
+    $label = $assert_session->elementExists('xpath', '//div[contains(@class, "visually-hidden") and text()="Image"]');
+    // The field is the parent div of the label.
+    $field = $label->getParent();
+    $image_element = $field->find('css', 'img');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
     $expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/example_1.jpeg'));
     $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
-    $field = $assert_session->elementExists('css', '.field--name-field-media-image');
-    $assert_session->elementExists('css', '.field__label.visually-hidden', $field);
     $assert_session->elementNotExists('css', 'a', $field);
 
     // Ensure the image has the correct alt attribute.
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
index b6a8fff68..62b7500be 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaSourceOEmbedVideoTest.php
@@ -25,7 +25,7 @@ class MediaSourceOEmbedVideoTest extends MediaSourceTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   use OEmbedTestTrait;
 
@@ -150,7 +150,7 @@ public function testMediaOEmbedVideoSource() {
     // The oEmbed content iFrame should be visible.
     $assert_session->elementExists('css', 'iframe.media-oembed-content');
     // The thumbnail should not be displayed.
-    $assert_session->elementNotExists('css', '.image-style-thumbnail');
+    $assert_session->elementNotExists('css', 'img');
 
     // Load the media and check that all fields are properly populated.
     $media = Media::load(1);
@@ -195,22 +195,12 @@ public function testMediaOEmbedVideoSource() {
     $no_hash_query = array_diff_key($query, ['hash' => '']);
     $this->drupalGet('media/oembed', ['query' => $no_hash_query]);
     $assert_session->pageTextNotContains('By the power of Grayskull, Vimeo works!');
-    $assert_session->pageTextContains('Access denied');
+    $assert_session->pageTextContains('Client error');
 
     // A correct query should be allowed because the anonymous role has the
     // 'view media' permission.
     $this->drupalGet('media/oembed', ['query' => $query]);
     $assert_session->pageTextContains('By the power of Grayskull, Vimeo works!');
-    $this->assertSession()->responseContains('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
-    $this->assertSession()->responseNotContains('core/modules/media/templates/media-oembed-iframe.html.twig');
-
-    // Test themes not inheriting from stable.
-    \Drupal::service('theme_installer')->install(['stark']);
-    $this->config('system.theme')->set('default', 'stark')->save();
-    $this->drupalGet('media/oembed', ['query' => $query]);
-    $assert_session->pageTextContains('By the power of Grayskull, Vimeo works!');
-    $this->assertSession()->responseNotContains('core/themes/stable/templates/content/media-oembed-iframe.html.twig');
-    $this->assertSession()->responseContains('core/modules/media/templates/media-oembed-iframe.html.twig');
 
     // Remove the 'view media' permission to test that this restricts access.
     $role = Role::load(AccountInterface::ANONYMOUS_ROLE);
diff --git a/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php b/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
index 10f5409a4..17bf826a1 100644
--- a/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
+++ b/web/core/modules/media/tests/src/FunctionalJavascript/MediaStandardProfileTest.php
@@ -29,11 +29,6 @@ class MediaStandardProfileTest extends MediaJavascriptTestBase {
    */
   protected static $modules = ['media_test_oembed'];
 
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'classy';
-
   /**
    * {@inheritdoc}
    */
@@ -156,11 +151,11 @@ protected function audioTest() {
 
     // Here we expect to see only the linked filename. Assert only one element
     // in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-audio > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-audio > *', 1);
 
     // Assert the audio file is present inside the media element and that its
     // src attribute matches the audio file.
-    $audio_element = $assert_session->elementExists('css', 'article.media--type-audio .field--name-field-media-audio-file audio > source');
+    $audio_element = $assert_session->elementExists('css', 'div.media--type-audio .field--name-field-media-audio-file audio > source');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
     $expected_audio_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename));
@@ -185,11 +180,11 @@ protected function audioTest() {
 
     // Again we expect to see only the linked filename. Assert only one element
     // in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-audio > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-audio > *', 1);
 
     // Assert the audio file is present inside the media element and that its
     // src attribute matches the updated audio file.
-    $audio_element = $assert_session->elementExists('css', 'article.media--type-audio .field--name-field-media-audio-file audio > source');
+    $audio_element = $assert_session->elementExists('css', 'div.media--type-audio .field--name-field-media-audio-file audio > source');
     $expected_audio_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename_updated));
     $this->assertSame($expected_audio_src, $audio_element->getAttribute('src'));
   }
@@ -244,12 +239,12 @@ protected function imageTest() {
 
     // Here we expect to see only the image, nothing else. Assert only one
     // element in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-image > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-image > *', 1);
 
     // Assert the image element is present inside the media element and that its
     // src attribute uses the large image style, the label is visually hidden,
     // and there is no link to the image file.
-    $image_element = $assert_session->elementExists('css', 'article.media--type-image img');
+    $image_element = $assert_session->elementExists('css', 'div.media--type-image img');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
     $expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name));
@@ -279,12 +274,12 @@ protected function imageTest() {
 
     // Again we expect to see only the image, nothing else. Assert only one
     // element in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-image > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-image > *', 1);
 
     // Assert the image element is present inside the media element and that its
     // src attribute uses the large image style, the label is visually hidden,
     // and there is no link to the image file.
-    $image_element = $assert_session->elementExists('css', 'article.media--type-image img');
+    $image_element = $assert_session->elementExists('css', 'div.media--type-image img');
     $expected_image_src = $file_url_generator->generateString(\Drupal::token()->replace('public://styles/large/public/[date:custom:Y]-[date:custom:m]/' . $image_media_name_updated));
     $this->assertStringContainsString($expected_image_src, $image_element->getAttribute('src'));
     $assert_session->elementExists('css', '.field--name-field-media-image .field__label.visually-hidden');
@@ -347,11 +342,11 @@ protected function documentTest() {
 
     // Here we expect to see only the linked filename. Assert only one element
     // in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-document > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-document > *', 1);
 
     // Assert the file link is present in the media element and its text matches
     // the filename.
-    $link_element = $assert_session->elementExists('css', 'article.media--type-document .field--name-field-media-document a');
+    $link_element = $assert_session->elementExists('css', 'div.media--type-document .field--name-field-media-document a');
     $this->assertSame($test_filename, $link_element->getText());
 
     // Assert the media name is updated through the field mapping when changing
@@ -373,11 +368,11 @@ protected function documentTest() {
 
     // Again we expect to see only the linked filename. Assert only one element
     // in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-document > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-document > *', 1);
 
     // Assert the file link is present in the media element and its text matches
     // the updated filename.
-    $link_element = $assert_session->elementExists('css', 'article.media--type-document .field--name-field-media-document a');
+    $link_element = $assert_session->elementExists('css', 'div.media--type-document .field--name-field-media-document a');
     $this->assertSame($test_filename_updated, $link_element->getText());
   }
 
@@ -435,11 +430,11 @@ protected function remoteVideoTest() {
 
     // Here we expect to see only the video iframe. Assert only one element in
     // the content region.
-    $assert_session->elementsCount('css', 'article.media--type-remote-video > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-remote-video > *', 1);
 
     // Assert the iframe is present in the media element and its src attribute
     // matches the URL and query parameters.
-    $iframe_url = $assert_session->elementExists('css', 'article.media--type-remote-video .field--name-field-media-oembed-video iframe')->getAttribute('src');
+    $iframe_url = $assert_session->elementExists('css', 'div.media--type-remote-video .field--name-field-media-oembed-video iframe')->getAttribute('src');
     $iframe_url = parse_url($iframe_url);
     $this->assertStringEndsWith('/media/oembed', $iframe_url['path']);
     $this->assertNotEmpty($iframe_url['query']);
@@ -462,11 +457,11 @@ protected function remoteVideoTest() {
 
     // Again we expect to see only the video iframe. Assert only one element in
     // the content region.
-    $assert_session->elementsCount('css', 'article.media--type-remote-video > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-remote-video > *', 1);
 
     // Assert the iframe is present in the media element and its src attribute
     // matches the updated URL and query parameters.
-    $iframe_url = $assert_session->elementExists('css', 'article.media--type-remote-video .field--name-field-media-oembed-video iframe')->getAttribute('src');
+    $iframe_url = $assert_session->elementExists('css', 'div.media--type-remote-video .field--name-field-media-oembed-video iframe')->getAttribute('src');
     $iframe_url = parse_url($iframe_url);
     $this->assertStringEndsWith('/media/oembed', $iframe_url['path']);
     $this->assertNotEmpty($iframe_url['query']);
@@ -532,11 +527,11 @@ protected function videoTest() {
 
     // Here we expect to see only the linked filename. Assert only one element
     // in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-video > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-video > *', 1);
 
     // Assert the video element is present inside the media element and that its
     // src attribute matches the video file.
-    $video_element = $assert_session->elementExists('css', 'article.media--type-video .field--name-field-media-video-file video > source');
+    $video_element = $assert_session->elementExists('css', 'div.media--type-video .field--name-field-media-video-file video > source');
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
     $expected_video_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename));
@@ -561,11 +556,11 @@ protected function videoTest() {
 
     // Again we expect to see only the linked filename. Assert only one element
     // in the content region.
-    $assert_session->elementsCount('css', 'article.media--type-video > *', 1);
+    $assert_session->elementsCount('css', 'div.media--type-video > *', 1);
 
     // Assert the video element is present inside the media element and that its
     // src attribute matches the updated video file.
-    $video_element = $assert_session->elementExists('css', 'article.media--type-video .field--name-field-media-video-file video > source');
+    $video_element = $assert_session->elementExists('css', 'div.media--type-video .field--name-field-media-video-file video > source');
     $expected_video_src = $file_url_generator->generateString(\Drupal::token()->replace('public://[date:custom:Y]-[date:custom:m]/' . $test_filename_updated));
     $this->assertSame($expected_video_src, $video_element->getAttribute('src'));
   }
diff --git a/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php b/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
index 4483b89b3..e2b4b820a 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTest.php
@@ -356,8 +356,6 @@ public function providerMissingEntityIndicator() {
 
   /**
    * Tests that only <drupal-media> tags are processed.
-   *
-   * @see \Drupal\Tests\media\FunctionalJavascript\CKEditorIntegrationTest::testOnlyDrupalMediaTagProcessed()
    */
   public function testOnlyDrupalMediaTagProcessed() {
     $content = $this->createEmbedCode([
diff --git a/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php b/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php
index 2031eefa9..ead63b80b 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaEmbedFilterTranslationTest.php
@@ -33,10 +33,10 @@ protected function setUp(): void {
 
     $this->embeddedEntity->addTranslation('pt-br')
       ->set('field_media_image', [
-      'target_id' => $this->image->id(),
-      'alt' => 'pt-br alt',
-      'title' => 'pt-br title',
-    ])->save();
+        'target_id' => $this->image->id(),
+        'alt' => 'pt-br alt',
+        'title' => 'pt-br title',
+      ])->save();
   }
 
   /**
diff --git a/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php b/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php
index 07e764544..b6e67c897 100644
--- a/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php
+++ b/web/core/modules/media/tests/src/Kernel/MediaSourceTest.php
@@ -300,6 +300,25 @@ public function testThumbnail() {
     $this->assertEmpty($media->thumbnail->title);
     $this->assertSame('', $media->thumbnail->alt);
 
+    // Set the width and height metadata attributes and make sure they're used
+    // for the thumbnail.
+    \Drupal::state()->set('media_source_test_definition', [
+      'thumbnail_width_metadata_attribute' => 'width',
+      'thumbnail_height_metadata_attribute' => 'height',
+    ]);
+    \Drupal::state()->set('media_source_test_attributes', [
+      'width' => ['value' => 1024],
+      'height' => ['value' => 768],
+    ]);
+    $media = Media::create([
+      'bundle' => $this->testMediaType->id(),
+      'name' => 'Are you looking at me?',
+      'field_media_test' => 'some_value',
+    ]);
+    $media->save();
+    $this->assertSame(1024, $media->thumbnail->width);
+    $this->assertSame(768, $media->thumbnail->height);
+
     // Enable queued thumbnails and make sure that the entity gets the default
     // thumbnail initially.
     \Drupal::state()->set('media_source_test_definition', []);
diff --git a/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php b/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php
index 1d618716a..c71c2e327 100644
--- a/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php
+++ b/web/core/modules/media/tests/src/Kernel/OEmbedIframeControllerTest.php
@@ -55,7 +55,7 @@ public function testBadHashParameter($hash) {
 
     $this->assertIsCallable($controller);
 
-    $this->expectException('\Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException');
+    $this->expectException('\Symfony\Component\HttpKernel\Exception\BadRequestHttpException');
     $this->expectExceptionMessage('This resource is not available');
     $request = new Request([
       'url' => 'https://example.com/path/to/resource',
diff --git a/web/core/modules/media/tests/src/Traits/OEmbedTestTrait.php b/web/core/modules/media/tests/src/Traits/OEmbedTestTrait.php
index 7f44db1ea..8744bffef 100644
--- a/web/core/modules/media/tests/src/Traits/OEmbedTestTrait.php
+++ b/web/core/modules/media/tests/src/Traits/OEmbedTestTrait.php
@@ -39,10 +39,11 @@ protected function useFixtureProviders() {
   }
 
   /**
-   * Configures the http_client service so that all requests are carried out
-   * relative to the URL of the fixtures directory. For example, after calling
-   * this method, a request for foobar.html will actually request
-   * http://test-site/path/to/fuxtures/foobar.html.
+   * Configures the HTTP client to always use the fixtures directory.
+   *
+   * All requests are carried out relative to the URL of the fixtures directory.
+   * For example, after calling this method, a request for foobar.html will
+   * actually request http://test-site/path/to/fixtures/foobar.html.
    */
   protected function lockHttpClientToFixtures() {
     $this->writeSettings([
@@ -62,9 +63,10 @@ protected function lockHttpClientToFixtures() {
   }
 
   /**
-   * Ensures that all oEmbed provider endpoints defined in the fixture
-   * providers.json will use the media_test_oembed.resource.get route as their
-   * URL.
+   * Ensures that oEmbed provider endpoints use the test resource route.
+   *
+   * All oEmbed provider endpoints defined in the fixture providers.json will
+   * use the media_test_oembed.resource.get route as their URL.
    *
    * This requires the media_test_oembed module in order to work.
    */
diff --git a/web/core/modules/media_library/js/media_library.click_to_select.js b/web/core/modules/media_library/js/media_library.click_to_select.js
index 4c4aeaa39..03a424585 100644
--- a/web/core/modules/media_library/js/media_library.click_to_select.js
+++ b/web/core/modules/media_library/js/media_library.click_to_select.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.ClickToSelect = {
     attach: function attach(context) {
@@ -18,12 +17,12 @@
         $(currentTarget).closest('.js-click-to-select').toggleClass('checked', $(currentTarget).prop('checked'));
       }).on('focus blur', function (_ref2) {
         var currentTarget = _ref2.currentTarget,
-            type = _ref2.type;
+          type = _ref2.type;
         $(currentTarget).closest('.js-click-to-select').toggleClass('is-focus', type === 'focus');
       });
       $(once('media-library-click-to-select-hover', '.js-click-to-select-trigger, .js-click-to-select-checkbox', context)).on('mouseover mouseout', function (_ref3) {
         var currentTarget = _ref3.currentTarget,
-            type = _ref3.type;
+          type = _ref3.type;
         $(currentTarget).closest('.js-click-to-select').toggleClass('is-hover', type === 'mouseover');
       });
     }
diff --git a/web/core/modules/media_library/js/media_library.ui.es6.js b/web/core/modules/media_library/js/media_library.ui.es6.js
index 95bc01ac3..569b44312 100644
--- a/web/core/modules/media_library/js/media_library.ui.es6.js
+++ b/web/core/modules/media_library/js/media_library.ui.es6.js
@@ -83,37 +83,21 @@
           // Override the AJAX success callback to shift focus to the media
           // library content.
           ajaxObject.success = function (response, status) {
-            // Remove the progress element.
-            if (this.progress.element) {
-              $(this.progress.element).remove();
-            }
-            if (this.progress.object) {
-              this.progress.object.stopMonitoring();
-            }
-            $(this.element).prop('disabled', false);
-
-            // Execute the AJAX commands.
-            Object.keys(response || {}).forEach((i) => {
-              if (response[i].command && this.commands[response[i].command]) {
-                this.commands[response[i].command](this, response[i], status);
+            return Promise.resolve(
+              Drupal.Ajax.prototype.success.call(ajaxObject, response, status),
+            ).then(() => {
+              // Set focus to the first tabbable element in the media library
+              // content.
+              const mediaLibraryContent = document.getElementById(
+                'media-library-content',
+              );
+              if (mediaLibraryContent) {
+                const tabbableContent = tabbable(mediaLibraryContent);
+                if (tabbableContent.length) {
+                  tabbableContent[0].focus();
+                }
               }
             });
-
-            // Set focus to the first tabbable element in the media library
-            // content.
-            const mediaLibraryContent = document.getElementById(
-              'media-library-content',
-            );
-            if (mediaLibraryContent) {
-              const tabbableContent = tabbable(mediaLibraryContent);
-              if (tabbableContent.length) {
-                tabbableContent[0].focus();
-              }
-            }
-
-            // Remove any response-specific settings so they don't get used on
-            // the next call by mistake.
-            this.settings = null;
           };
           ajaxObject.execute();
 
diff --git a/web/core/modules/media_library/js/media_library.ui.js b/web/core/modules/media_library/js/media_library.ui.js
index bf5e93f2f..1eb2d4ec4 100644
--- a/web/core/modules/media_library/js/media_library.ui.js
+++ b/web/core/modules/media_library/js/media_library.ui.js
@@ -4,19 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, window, _ref) {
   var tabbable = _ref.tabbable;
   Drupal.MediaLibrary = {
     currentSelection: []
   };
-
   Drupal.AjaxCommands.prototype.updateMediaLibrarySelection = function (ajax, response, status) {
     Object.values(response.mediaIds).forEach(function (value) {
       Drupal.MediaLibrary.currentSelection.push(value);
     });
   };
-
   Drupal.behaviors.MediaLibraryTabs = {
     attach: function attach(context) {
       var $menu = $('.js-media-library-menu');
@@ -38,37 +35,17 @@
             message: Drupal.t('Please wait...')
           }
         });
-
         ajaxObject.success = function (response, status) {
-          var _this = this;
-
-          if (this.progress.element) {
-            $(this.progress.element).remove();
-          }
-
-          if (this.progress.object) {
-            this.progress.object.stopMonitoring();
-          }
-
-          $(this.element).prop('disabled', false);
-          Object.keys(response || {}).forEach(function (i) {
-            if (response[i].command && _this.commands[response[i].command]) {
-              _this.commands[response[i].command](_this, response[i], status);
+          return Promise.resolve(Drupal.Ajax.prototype.success.call(ajaxObject, response, status)).then(function () {
+            var mediaLibraryContent = document.getElementById('media-library-content');
+            if (mediaLibraryContent) {
+              var tabbableContent = tabbable(mediaLibraryContent);
+              if (tabbableContent.length) {
+                tabbableContent[0].focus();
+              }
             }
           });
-          var mediaLibraryContent = document.getElementById('media-library-content');
-
-          if (mediaLibraryContent) {
-            var tabbableContent = tabbable(mediaLibraryContent);
-
-            if (tabbableContent.length) {
-              tabbableContent[0].focus();
-            }
-          }
-
-          this.settings = null;
         };
-
         ajaxObject.execute();
         $menu.find('.active-tab').remove();
         $menu.find('a').removeClass('active');
@@ -92,7 +69,6 @@
         var loadingAnnouncement = '';
         var displayAnnouncement = '';
         var focusSelector = '';
-
         if ($link.hasClass('views-display-link-widget')) {
           loadingAnnouncement = Drupal.t('Loading grid view.');
           displayAnnouncement = Drupal.t('Changed to grid view.');
@@ -102,7 +78,6 @@
           displayAnnouncement = Drupal.t('Changed to table view.');
           focusSelector = '.views-display-link-widget_table';
         }
-
         var ajaxObject = Drupal.ajax({
           wrapper: 'media-library-view',
           url: e.currentTarget.href,
@@ -112,25 +87,19 @@
             message: loadingAnnouncement || Drupal.t('Please wait...')
           }
         });
-
         if (displayAnnouncement || focusSelector) {
           var success = ajaxObject.success;
-
           ajaxObject.success = function (response, status) {
             success.bind(this)(response, status);
-
             if (focusSelector) {
               $(focusSelector).focus();
             }
-
             if (displayAnnouncement) {
               Drupal.announce(displayAnnouncement);
             }
           };
         }
-
         ajaxObject.execute();
-
         if (loadingAnnouncement) {
           Drupal.announce(loadingAnnouncement);
         }
@@ -141,32 +110,25 @@
     attach: function attach(context, settings) {
       var $form = $('.js-media-library-views-form, .js-media-library-add-form', context);
       var currentSelection = Drupal.MediaLibrary.currentSelection;
-
       if (!$form.length) {
         return;
       }
-
       var $mediaItems = $('.js-media-library-item input[type="checkbox"]', $form);
-
       function disableItems($items) {
         $items.prop('disabled', true).closest('.js-media-library-item').addClass('media-library-item--disabled');
       }
-
       function enableItems($items) {
         $items.prop('disabled', false).closest('.js-media-library-item').removeClass('media-library-item--disabled');
       }
-
       function updateSelectionCount(remaining) {
         var selectItemsText = remaining < 0 ? Drupal.formatPlural(currentSelection.length, '1 item selected', '@count items selected') : Drupal.formatPlural(remaining, '@selected of @count item selected', '@selected of @count items selected', {
           '@selected': currentSelection.length
         });
         $('.js-media-library-selected-count').html(selectItemsText);
       }
-
       $(once('media-item-change', $mediaItems)).on('change', function (e) {
         var id = e.currentTarget.value;
         var position = currentSelection.indexOf(id);
-
         if (e.currentTarget.checked) {
           if (position === -1) {
             currentSelection.push(id);
@@ -174,21 +136,17 @@
         } else if (position !== -1) {
           currentSelection.splice(position, 1);
         }
-
         var mediaLibraryModalSelection = document.querySelector('#media-library-modal-selection');
-
         if (mediaLibraryModalSelection) {
           mediaLibraryModalSelection.value = currentSelection.join();
           $(mediaLibraryModalSelection).trigger('change');
         }
-
         document.querySelectorAll('.js-media-library-add-form-current-selection').forEach(function (item) {
           item.value = currentSelection.join();
         });
       });
       $(once('media-library-selection-change', $form.find('#media-library-modal-selection'))).on('change', function (e) {
         updateSelectionCount(settings.media_library.selection_remaining);
-
         if (currentSelection.length === settings.media_library.selection_remaining) {
           disableItems($mediaItems.not(':checked'));
           enableItems($mediaItems.filter(':checked'));
@@ -199,18 +157,14 @@
       currentSelection.forEach(function (value) {
         $form.find("input[type=\"checkbox\"][value=\"".concat(value, "\"]")).prop('checked', true).trigger('change');
       });
-
       if (!once('media-library-selection-info', 'html').length) {
         return;
       }
-
       $(window).on('dialog:aftercreate', function () {
         var $buttonPane = $('.media-library-widget-modal .ui-dialog-buttonpane');
-
         if (!$buttonPane.length) {
           return;
         }
-
         $buttonPane.append(Drupal.theme('mediaLibrarySelectionCount'));
         updateSelectionCount(settings.media_library.selection_remaining);
       });
@@ -221,13 +175,11 @@
       if (!once('media-library-clear-selection', 'html').length) {
         return;
       }
-
       $(window).on('dialog:afterclose', function () {
         Drupal.MediaLibrary.currentSelection = [];
       });
     }
   };
-
   Drupal.theme.mediaLibrarySelectionCount = function () {
     return "<div class=\"media-library-selected-count js-media-library-selected-count\" role=\"status\" aria-live=\"polite\" aria-atomic=\"true\"></div>";
   };
diff --git a/web/core/modules/media_library/js/media_library.view.js b/web/core/modules/media_library/js/media_library.view.js
index 4e9e8be78..231692782 100644
--- a/web/core/modules/media_library/js/media_library.view.js
+++ b/web/core/modules/media_library/js/media_library.view.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.MediaLibrarySelectAll = {
     attach: function attach(context) {
       var $view = $(once('media-library-select-all', '.js-media-library-view[data-view-display-id="page"]', context));
-
       if ($view.length && $view.find('.js-media-library-item').length) {
         var $checkbox = $(Drupal.theme('checkbox')).on('click', function (_ref) {
           var currentTarget = _ref.currentTarget;
diff --git a/web/core/modules/media_library/js/media_library.widget.js b/web/core/modules/media_library/js/media_library.widget.js
index b83668f9e..9de27a381 100644
--- a/web/core/modules/media_library/js/media_library.widget.js
+++ b/web/core/modules/media_library/js/media_library.widget.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Sortable) {
   Drupal.behaviors.MediaLibraryWidgetSortable = {
     attach: function attach(context) {
diff --git a/web/core/modules/media_library/js/plugins/drupalmedialibrary/icons/drupalmedialibrary.png b/web/core/modules/media_library/js/plugins/drupalmedialibrary/icons/drupalmedialibrary.png
deleted file mode 100644
index bcd36d441320e4d316b0c9c291a059dcd2526d6f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e0002uNkl<Zc-no?
zp-Tio6vy$W$tWUNzY7jrJi-4!Zh6t*A7Zjx6wD@@*<d)VrsKjDgF&>qD2PF@oVvQ6
zKXEu^XI+k8nBmQ59`nXz^JAIXQv+@H8lXSOtNvgP$g8gMDg|`dW5ji%gD?2j3``N?
zz3~P=4Dyo*elq1b0$=g5AIp3vC{vIZnK);c4wsh6PyIH?U;NA;nqx-ro6Xs}{s&m3
zX!$7W9q#{q5nWzclM%SszGIReZZPDEH&$ib#5ulF@Dz&`%QA|%|4hM0ES4<E=<&#e
hqZAxaQnFvKeFF!*|7uC;>xBRS002ovPDHLkV1iqse#`&>

diff --git a/web/core/modules/media_library/js/plugins/drupalmedialibrary/icons/hidpi/drupalmedialibrary.png b/web/core/modules/media_library/js/plugins/drupalmedialibrary/icons/hidpi/drupalmedialibrary.png
deleted file mode 100644
index 6d5f1405cf2142432ae7a055d278866095182ad3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg0006rNkl<Zc-muN
zpaw9xZ}3L{10iVe&g6l+I93C+|LFcOc|Zv2f6)HpE{oLwt$!AW3A@vwMeDD-G<F02
zS{#M2JeZxLof14)v8l4}Bxr!Uyvc2?|62de&$x4vWq|cskaiGss3pq)vkNc-Y?hN{
zfI|(`fPXH2WEsG~U^m6^rQvIbW`vx(u&Wu80TNJA4p%$-R;$ez1~4#qu(@*}8*Xt>
z_q$UX)PO(k5^lPV#a7!5Uuyl;`mgf~ivg&>t{>zjou7`S3=9tSTK|lm>imL*lh%K|
zFBk^6OFKs*v^&LV{edaAoo6=@p%sS#PSFN$wEkP}_h1Garl9`;S-JLad<Gn5U~tOP
z`3a506$}g>Or}@SHNfJ?@U_)W$3pXyh%oqLe%yA3)<1+IyJ<Env1t8ke%ij<#RU?~
zR$H}yLk-aVuKfpxZ75Lpn>#lmgsgVz{Dx;|Vzg`h*ZzZ?kdO>8yI^_~H`M#0_21+^
zh-G%cT@<SU_<_YCt^aOHnBv46a763Bn+~N0=wdMd5euXl;HGOk&uW`}r}=4}pTvg&
z+yJL&-LDua5j${~cgnGEb&55+sPzwKfV(Itu@hy0iw`0v==_2i;Npjpuy7mT!DjLR
zp%7t!n<^~7fS|!!oCdfWf(i_{0lyJpU^@#r$KdwA1R|)k{_B5m7e*=@TTLG5e>A!8
z(1JGzZRaBlu-b`XfiS_y^I)=BWcX75qv31Iy*SEZ>Hq+>sllg?OV4fq0000<MNUMn
GLSTYkStU>a

diff --git a/web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.es6.js b/web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.es6.js
deleted file mode 100644
index 1e270a66b..000000000
--- a/web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.es6.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * @file
- * Drupal Media Library plugin.
- */
-
-(function (Drupal, CKEDITOR) {
-  CKEDITOR.plugins.add('drupalmedialibrary', {
-    requires: 'drupalmedia',
-    icons: 'drupalmedialibrary',
-    hidpi: true,
-    beforeInit(editor) {
-      editor.addCommand('drupalmedialibrary', {
-        allowedContent: {
-          'drupal-media': {
-            attributes: {
-              '!data-entity-type': true,
-              '!data-entity-uuid': true,
-              '!data-view-mode': true,
-              '!data-align': true,
-              '!data-caption': true,
-              '!alt': true,
-              '!title': true,
-            },
-            classes: {},
-          },
-        },
-        // This does not use the object format used above, but a
-        // CKEDITOR.style instance, because requiredContent does not support
-        // the object format.
-        // @see https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter_contentRule.html
-        // eslint-disable-next-line new-cap
-        requiredContent: new CKEDITOR.style({
-          element: 'drupal-media',
-          attributes: {
-            'data-entity-type': '',
-            'data-entity-uuid': '',
-          },
-        }),
-        modes: { wysiwyg: 1 },
-        // There is an edge case related to the undo functionality that will
-        // be resolved in https://www.drupal.org/project/drupal/issues/3073294.
-        canUndo: true,
-        // eslint-disable-next-line no-shadow
-        exec(editor) {
-          const saveCallback = function (values) {
-            editor.fire('saveSnapshot');
-            const mediaElement = editor.document.createElement('drupal-media');
-            // eslint-disable-next-line prefer-destructuring
-            const attributes = values.attributes;
-            Object.keys(attributes).forEach((key) => {
-              mediaElement.setAttribute(key, attributes[key]);
-            });
-            editor.insertHtml(mediaElement.getOuterHtml());
-            editor.fire('saveSnapshot');
-          };
-
-          // @see \Drupal\media_library\MediaLibraryUiBuilder::dialogOptions()
-          Drupal.ckeditor.openDialog(
-            editor,
-            editor.config.DrupalMediaLibrary_url,
-            {},
-            saveCallback,
-            editor.config.DrupalMediaLibrary_dialogOptions,
-          );
-        },
-      });
-
-      if (editor.ui.addButton) {
-        editor.ui.addButton('DrupalMediaLibrary', {
-          label: Drupal.t('Insert from Media Library'),
-          command: 'drupalmedialibrary',
-        });
-      }
-    },
-  });
-})(Drupal, CKEDITOR);
diff --git a/web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.js b/web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.js
deleted file mode 100644
index bfb1e1952..000000000
--- a/web/core/modules/media_library/js/plugins/drupalmedialibrary/plugin.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-* DO NOT EDIT THIS FILE.
-* See the following change record for more information,
-* https://www.drupal.org/node/2815083
-* @preserve
-**/
-
-(function (Drupal, CKEDITOR) {
-  CKEDITOR.plugins.add('drupalmedialibrary', {
-    requires: 'drupalmedia',
-    icons: 'drupalmedialibrary',
-    hidpi: true,
-    beforeInit: function beforeInit(editor) {
-      editor.addCommand('drupalmedialibrary', {
-        allowedContent: {
-          'drupal-media': {
-            attributes: {
-              '!data-entity-type': true,
-              '!data-entity-uuid': true,
-              '!data-view-mode': true,
-              '!data-align': true,
-              '!data-caption': true,
-              '!alt': true,
-              '!title': true
-            },
-            classes: {}
-          }
-        },
-        requiredContent: new CKEDITOR.style({
-          element: 'drupal-media',
-          attributes: {
-            'data-entity-type': '',
-            'data-entity-uuid': ''
-          }
-        }),
-        modes: {
-          wysiwyg: 1
-        },
-        canUndo: true,
-        exec: function exec(editor) {
-          var saveCallback = function saveCallback(values) {
-            editor.fire('saveSnapshot');
-            var mediaElement = editor.document.createElement('drupal-media');
-            var attributes = values.attributes;
-            Object.keys(attributes).forEach(function (key) {
-              mediaElement.setAttribute(key, attributes[key]);
-            });
-            editor.insertHtml(mediaElement.getOuterHtml());
-            editor.fire('saveSnapshot');
-          };
-
-          Drupal.ckeditor.openDialog(editor, editor.config.DrupalMediaLibrary_url, {}, saveCallback, editor.config.DrupalMediaLibrary_dialogOptions);
-        }
-      });
-
-      if (editor.ui.addButton) {
-        editor.ui.addButton('DrupalMediaLibrary', {
-          label: Drupal.t('Insert from Media Library'),
-          command: 'drupalmedialibrary'
-        });
-      }
-    }
-  });
-})(Drupal, CKEDITOR);
\ No newline at end of file
diff --git a/web/core/modules/media_library/media_library.libraries.yml b/web/core/modules/media_library/media_library.libraries.yml
index 8c2f1b393..36cc1ad35 100644
--- a/web/core/modules/media_library/media_library.libraries.yml
+++ b/web/core/modules/media_library/media_library.libraries.yml
@@ -38,3 +38,4 @@ ui:
     - core/jquery
     - media_library/view
     - core/tabbable
+    - core/es6-promise
diff --git a/web/core/modules/media_library/media_library.module b/web/core/modules/media_library/media_library.module
index 24a534ce8..0c8e197f8 100644
--- a/web/core/modules/media_library/media_library.module
+++ b/web/core/modules/media_library/media_library.module
@@ -26,8 +26,6 @@ use Drupal\media_library\Form\OEmbedForm;
 use Drupal\media_library\MediaLibraryState;
 use Drupal\views\Plugin\views\cache\CachePluginBase;
 use Drupal\views\ViewExecutable;
-use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Component\Serialization\Json;
 
 /**
  * Implements hook_help().
@@ -474,73 +472,3 @@ function _media_library_configure_view_display(MediaTypeInterface $type) {
   ]);
   return (bool) $display->save();
 }
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function media_library_form_filter_format_edit_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  // Add an additional validate callback so we can ensure the media_embed filter
-  // is enabled when the DrupalMediaLibrary button is enabled.
-  $form['#validate'][] = 'media_library_filter_format_edit_form_validate';
-}
-
-/**
- * Implements hook_form_FORM_ID_alter().
- */
-function media_library_form_filter_format_add_form_alter(array &$form, FormStateInterface $form_state, $form_id) {
-  // Add an additional validate callback so we can ensure the media_embed filter
-  // is enabled when the DrupalMediaLibrary button is enabled.
-  $form['#validate'][] = 'media_library_filter_format_edit_form_validate';
-}
-
-/**
- * Validate callback to ensure the DrupalMediaLibrary button can work correctly.
- */
-function media_library_filter_format_edit_form_validate($form, FormStateInterface $form_state) {
-  if ($form_state->getTriggeringElement()['#name'] !== 'op') {
-    return;
-  }
-
-  // The "DrupalMediaLibrary" button is for the CKEditor text editor.
-  if ($form_state->getValue(['editor', 'editor']) !== 'ckeditor') {
-    return;
-  }
-
-  $button_group_path = [
-    'editor',
-    'settings',
-    'toolbar',
-    'button_groups',
-  ];
-
-  if ($button_groups = $form_state->getValue($button_group_path)) {
-    $buttons = [];
-    $button_groups = Json::decode($button_groups);
-
-    foreach ($button_groups as $button_row) {
-      foreach ($button_row as $button_group) {
-        $buttons = array_merge($buttons, array_values($button_group['items']));
-      }
-    }
-
-    $get_filter_label = function ($filter_plugin_id) use ($form) {
-      return (string) $form['filters']['order'][$filter_plugin_id]['filter']['#markup'];
-    };
-
-    if (in_array('DrupalMediaLibrary', $buttons, TRUE)) {
-      $media_embed_enabled = $form_state->getValue([
-        'filters',
-        'media_embed',
-        'status',
-      ]);
-
-      if (!$media_embed_enabled) {
-        $error_message = new TranslatableMarkup('The %media-embed-filter-label filter must be enabled to use the %drupal-media-library-button button.', [
-          '%media-embed-filter-label' => $get_filter_label('media_embed'),
-          '%drupal-media-library-button' => new TranslatableMarkup('Insert from Media Library'),
-        ]);
-        $form_state->setErrorByName('filters', $error_message);
-      }
-    }
-  }
-}
diff --git a/web/core/modules/media_library/src/MediaLibraryEditorOpener.php b/web/core/modules/media_library/src/MediaLibraryEditorOpener.php
index 0c0af98b4..b8c07ff82 100644
--- a/web/core/modules/media_library/src/MediaLibraryEditorOpener.php
+++ b/web/core/modules/media_library/src/MediaLibraryEditorOpener.php
@@ -11,10 +11,8 @@
 /**
  * The media library opener for text editors.
  *
- * @see \Drupal\media_library\Plugin\CKEditorPlugin\DrupalMediaLibrary
- *
  * @internal
- *   This service is an internal part of Media Library's CKEditor integration.
+ *   This is an internal part of Media Library's text editor integration.
  */
 class MediaLibraryEditorOpener implements MediaLibraryOpenerInterface {
 
diff --git a/web/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php b/web/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
deleted file mode 100644
index b0739136d..000000000
--- a/web/core/modules/media_library/src/Plugin/CKEditorPlugin/DrupalMediaLibrary.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-namespace Drupal\media_library\Plugin\CKEditorPlugin;
-
-use Drupal\ckeditor\CKEditorPluginBase;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleExtensionList;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Url;
-use Drupal\editor\Entity\Editor;
-use Drupal\media_library\MediaLibraryState;
-use Drupal\media_library\MediaLibraryUiBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Defines the "drupalmedialibrary" plugin.
- *
- * @CKEditorPlugin(
- *   id = "drupalmedialibrary",
- *   label = @Translation("Embed media from the Media Library"),
- * )
- *
- * @internal
- *   Plugin classes are internal.
- */
-class DrupalMediaLibrary extends CKEditorPluginBase implements ContainerFactoryPluginInterface {
-
-  /**
-   * The module extension list.
-   *
-   * @var \Drupal\Core\Extension\ModuleExtensionList
-   */
-  protected $moduleExtensionList;
-
-  /**
-   * The media type entity storage.
-   *
-   * @var \Drupal\Core\Config\Entity\ConfigEntityStorageInterface
-   */
-  protected $mediaTypeStorage;
-
-  /**
-   * Constructs a new DrupalMediaLibrary plugin object.
-   *
-   * @param array $configuration
-   *   A configuration array containing information about the plugin instance.
-   * @param string $plugin_id
-   *   The plugin_id for the plugin instance.
-   * @param array $plugin_definition
-   *   The plugin implementation definition.
-   * @param \Drupal\Core\Extension\ModuleExtensionList $extension_list_module
-   *   The module extension list.
-   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
-   *   The entity type manager.
-   */
-  public function __construct(array $configuration, $plugin_id, array $plugin_definition, ModuleExtensionList $extension_list_module, EntityTypeManagerInterface $entity_type_manager) {
-    parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->moduleExtensionList = $extension_list_module;
-    $this->mediaTypeStorage = $entity_type_manager->getStorage('media_type');
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $configuration,
-      $plugin_id,
-      $plugin_definition,
-      $container->get('extension.list.module'),
-      $container->get('entity_type.manager')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isInternal() {
-    return FALSE;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getDependencies(Editor $editor) {
-    return [
-      'drupalmedia',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getLibraries(Editor $editor) {
-    return [
-      'editor/drupal.editor.dialog',
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getFile() {
-    return $this->moduleExtensionList->getPath('media_library') . '/js/plugins/drupalmedialibrary/plugin.js';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getConfig(Editor $editor) {
-    // If the editor has not been saved yet, we may not be able to create a
-    // coherent MediaLibraryState object, which is needed in order to generate
-    // the required configuration. But, if we're creating a new editor, we don't
-    // need to do that anyway, so just return an empty array.
-    if ($editor->isNew()) {
-      return [];
-    }
-
-    $media_type_ids = $this->mediaTypeStorage->getQuery()->execute();
-    if ($editor->hasAssociatedFilterFormat()) {
-      if ($media_embed_filter = $editor->getFilterFormat()->filters()->get('media_embed')) {
-        // Optionally limit the allowed media types based on the MediaEmbed
-        // setting. If the setting is empty, do not limit the options.
-        if (!empty($media_embed_filter->settings['allowed_media_types'])) {
-          $media_type_ids = array_intersect_key($media_type_ids, $media_embed_filter->settings['allowed_media_types']);
-        }
-      }
-    }
-
-    if (in_array('image', $media_type_ids, TRUE)) {
-      // Due to a bug where the active item styling and the focus styling
-      // create the visual appearance of two active items, we'll move
-      // the 'image' media type to first position, so that the focused item and
-      // the active item are the same.
-      // This workaround can be removed once this issue is fixed:
-      // @see https://www.drupal.org/project/drupal/issues/3073799
-      array_unshift($media_type_ids, 'image');
-      $media_type_ids = array_unique($media_type_ids);
-    }
-
-    $state = MediaLibraryState::create(
-      'media_library.opener.editor',
-      $media_type_ids,
-      reset($media_type_ids),
-      1,
-      ['filter_format_id' => $editor->getFilterFormat()->id()]
-    );
-
-    return [
-      'DrupalMediaLibrary_url' => Url::fromRoute('media_library.ui')
-        ->setOption('query', $state->all())
-        ->toString(TRUE)
-        ->getGeneratedUrl(),
-      'DrupalMediaLibrary_dialogOptions' => MediaLibraryUiBuilder::dialogOptions(),
-    ];
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function getButtons() {
-    return [
-      'DrupalMediaLibrary' => [
-        'label' => $this->t('Insert from Media Library'),
-        'image' => $this->moduleExtensionList->getPath('media_library') . '/js/plugins/drupalmedialibrary/icons/drupalmedialibrary.png',
-      ],
-    ];
-  }
-
-}
diff --git a/web/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php b/web/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
index d34ee84ec..a94bb4ad4 100644
--- a/web/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
+++ b/web/core/modules/media_library/src/Plugin/Field/FieldWidget/MediaLibraryWidget.php
@@ -19,6 +19,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Security\TrustedCallbackInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Url;
 use Drupal\field_ui\FieldUI;
 use Drupal\media\Entity\Media;
@@ -206,7 +207,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
         'label' => ['#markup' => $label],
         'weight' => [
           '#type' => 'weight',
-          '#title' => t('Weight for @title', ['@title' => $label]),
+          '#title' => $this->t('Weight for @title', ['@title' => $label]),
           '#title_display' => 'invisible',
           '#default_value' => $weight,
           '#attributes' => ['class' => ['weight']],
@@ -268,7 +269,7 @@ public function settingsSummary() {
       foreach ($media_types as $media_type) {
         $media_type_labels[] = $media_type->label();
       }
-      $summary[] = t('Tab order: @order', ['@order' => implode(', ', $media_type_labels)]);
+      $summary[] = $this->t('Tab order: @order', ['@order' => implode(', ', $media_type_labels)]);
     }
     return $summary;
   }
@@ -714,7 +715,7 @@ public static function updateWidget(array $form, FormStateInterface $form_state)
     // Announce the updated content to screen readers.
     if ($is_remove_button) {
       $media_item = Media::load($field_state['removed_item_id']);
-      $announcement = $media_item->access('view label') ? t('@label has been removed.', ['@label' => $media_item->label()]) : t('Media has been removed.');
+      $announcement = $media_item->access('view label') ? new TranslatableMarkup('@label has been removed.', ['@label' => $media_item->label()]) : new TranslatableMarkup('Media has been removed.');
     }
     else {
       $new_items = count(static::getNewMediaItems($element, $form_state));
@@ -864,7 +865,7 @@ public static function validateItems(array $form, FormStateInterface $form_state
     }, $element['#target_bundles']);
     foreach ($media as $media_item) {
       if ($element['#target_bundles'] && !in_array($media_item->bundle(), $element['#target_bundles'], TRUE)) {
-        $form_state->setError($element, t('The media item "@label" is not of an accepted type. Allowed types: @types', [
+        $form_state->setError($element, new TranslatableMarkup('The media item "@label" is not of an accepted type. Allowed types: @types', [
           '@label' => $media_item->label(),
           '@types' => implode(', ', $bundle_labels),
         ]));
@@ -1008,12 +1009,17 @@ public static function validateRequired(array $element, FormStateInterface $form
       return;
     }
 
+    // If user has no access, the validation isn't needed.
+    if (isset($element['#access']) && !$element['#access']) {
+      return;
+    }
+
     $field_state = static::getFieldState($element, $form_state);
     // Trigger error if the field is required and no media is present. Although
     // the Form API's default validation would also catch this, the validation
     // error message is too vague, so a more precise one is provided here.
     if (count($field_state['items']) === 0) {
-      $form_state->setError($element, t('@name field is required.', ['@name' => $element['#title']]));
+      $form_state->setError($element, new TranslatableMarkup('@name field is required.', ['@name' => $element['#title']]));
     }
   }
 
diff --git a/web/core/modules/media_library/tests/modules/media_library_test/media_library_test.module b/web/core/modules/media_library/tests/modules/media_library_test/media_library_test.module
index 26d0362e1..bbebbb0f1 100644
--- a/web/core/modules/media_library/tests/modules/media_library_test/media_library_test.module
+++ b/web/core/modules/media_library/tests/modules/media_library_test/media_library_test.module
@@ -27,7 +27,10 @@ function media_library_test_media_create_access(AccountInterface $account, array
  * Implements hook_entity_field_access().
  */
 function media_library_test_entity_field_access($operation, FieldDefinitionInterface $field_definition, AccountInterface $account, FieldItemListInterface $items = NULL) {
-  return AccessResult::forbiddenIf($field_definition->getName() === 'field_media_no_access', 'Field access denied by test module');
+  $deny_fields = \Drupal::state()->get('media_library_test_entity_field_access_deny_fields', []);
+  // Always deny the field_media_no_access field.
+  $deny_fields[] = 'field_media_no_access';
+  return AccessResult::forbiddenIf(in_array($field_definition->getName(), $deny_fields, TRUE), 'Field access denied by test module');
 }
 
 /**
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
deleted file mode 100644
index 40fe5f7f5..000000000
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/CKEditorIntegrationTest.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-
-namespace Drupal\Tests\media_library\FunctionalJavascript;
-
-use Drupal\Component\Utility\Html;
-use Drupal\editor\Entity\Editor;
-use Drupal\file\Entity\File;
-use Drupal\filter\Entity\FilterFormat;
-use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
-use Drupal\media\Entity\Media;
-use Drupal\Tests\ckeditor\Traits\CKEditorTestTrait;
-use Drupal\Tests\ckeditor\Traits\CKEditorAdminSortTrait;
-use Drupal\Tests\media\Traits\MediaTypeCreationTrait;
-use Drupal\Tests\TestFileCreationTrait;
-
-/**
- * @coversDefaultClass \Drupal\media_library\Plugin\CKEditorPlugin\DrupalMediaLibrary
- * @group media_library
- */
-class CKEditorIntegrationTest extends WebDriverTestBase {
-
-  use CKEditorTestTrait;
-  use CKEditorAdminSortTrait;
-  use MediaTypeCreationTrait;
-  use TestFileCreationTrait;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'classy';
-
-  /**
-   * The user to use during testing.
-   *
-   * @var \Drupal\user\UserInterface
-   */
-  protected $user;
-
-  /**
-   * The media item to embed.
-   *
-   * @var \Drupal\media\MediaInterface
-   */
-  protected $media;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'ckeditor',
-    'media_library',
-    'node',
-    'text',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    FilterFormat::create([
-      'format' => 'test_format',
-      'name' => 'Test format',
-      'filters' => [
-        'media_embed' => ['status' => TRUE],
-      ],
-    ])->save();
-    Editor::create([
-      'editor' => 'ckeditor',
-      'format' => 'test_format',
-      'settings' => [
-        'toolbar' => [
-          'rows' => [
-            [
-              [
-                'name' => 'Main',
-                'items' => [
-                  'Source',
-                  'Undo',
-                  'Redo',
-                ],
-              ],
-            ],
-            [
-              [
-                'name' => 'Embeds',
-                'items' => [
-                  'DrupalMediaLibrary',
-                ],
-              ],
-            ],
-          ],
-        ],
-      ],
-    ])->save();
-
-    $this->drupalCreateContentType(['type' => 'blog']);
-
-    // Note that media_install() grants 'view media' to all users by default.
-    $this->user = $this->drupalCreateUser([
-      'use text format test_format',
-      'access media overview',
-      'create blog content',
-    ]);
-
-    // Create a media type that starts with the letter a, to test tab order.
-    $this->createMediaType('image', ['id' => 'arrakis', 'label' => 'Arrakis']);
-
-    // Create a sample media entity to be embedded.
-    $this->createMediaType('image', ['id' => 'image', 'label' => 'Image']);
-    File::create([
-      'uri' => $this->getTestFiles('image')[0]->uri,
-    ])->save();
-    $this->media = Media::create([
-      'bundle' => 'image',
-      'name' => 'Fear is the mind-killer',
-      'field_media_image' => [
-        [
-          'target_id' => 1,
-          'alt' => 'default alt',
-          'title' => 'default title',
-        ],
-      ],
-    ]);
-    $this->media->save();
-
-    $arrakis_media = Media::create([
-      'bundle' => 'arrakis',
-      'name' => 'Le baron Vladimir Harkonnen',
-      'field_media_image' => [
-        [
-          'target_id' => 1,
-          'alt' => 'Il complote pour détruire le duc Leto',
-          'title' => 'Il complote pour détruire le duc Leto',
-        ],
-      ],
-    ]);
-    $arrakis_media->save();
-
-    $this->drupalLogin($this->user);
-  }
-
-  /**
-   * Tests validation that DrupalMediaLibrary requires media_embed filter.
-   */
-  public function testConfigurationValidation() {
-    $page = $this->getSession()->getPage();
-    $assert_session = $this->assertSession();
-    $admin_user = $this->drupalCreateUser([
-      'access administration pages',
-      'administer site configuration',
-      'administer filters',
-    ]);
-    $this->drupalLogin($admin_user);
-    $this->drupalGet('/admin/config/content/formats/manage/test_format');
-    $page->uncheckField('filters[media_embed][status]');
-    $page->pressButton('Save configuration');
-    $assert_session->pageTextContains('The Embed media filter must be enabled to use the Insert from Media Library button.');
-    $page->checkField('filters[media_embed][status]');
-    $page->pressButton('Save configuration');
-    $assert_session->pageTextContains('The text format Test format has been updated.');
-
-    // Now test adding a new format.
-    $this->drupalGet('/admin/config/content/formats/add');
-    $page->fillField('name', 'Sulaco');
-    // Wait for machine name to be filled in.
-    $this->assertNotEmpty($assert_session->waitForText('sulaco'));
-    $page->checkField('roles[authenticated]');
-    $page->selectFieldOption('editor[editor]', 'ckeditor');
-
-    $targetSelector = 'ul.ckeditor-toolbar-group-buttons';
-    $buttonSelector = 'li[data-drupal-ckeditor-button-name="DrupalMediaLibrary"]';
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', $targetSelector));
-    $this->assertNotEmpty($assert_session->elementExists('css', $buttonSelector));
-    $this->sortableTo($buttonSelector, 'ul.ckeditor-available-buttons', $targetSelector);
-    $page->pressButton('Save configuration');
-    $assert_session->pageTextContains('The Embed media filter must be enabled to use the Insert from Media Library button.');
-    $page->checkField('filters[media_embed][status]');
-    $page->pressButton('Save configuration');
-    $assert_session->pageTextContains('Added text format Sulaco.');
-
-    // Test that when adding the DrupalMediaLibrary button to the editor the
-    // correct attributes are added to the <drupal-media> tag in the Allowed
-    // HTML tags.
-    $this->drupalGet('/admin/config/content/formats/manage/sulaco');
-    $page->checkField('filters[filter_html][status]');
-    $expected = 'drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title';
-    $allowed_html = $assert_session->fieldExists('filters[filter_html][settings][allowed_html]')->getValue();
-    $this->assertStringContainsString($expected, $allowed_html);
-    $page->pressButton('Save configuration');
-    $assert_session->pageTextContains('The text format Sulaco has been updated.');
-
-    // Test that the config form allows removing non-required attributes from
-    // the <drupal-media> tag.
-    $this->drupalGet('/admin/config/content/formats/manage/sulaco');
-    $allowed_html_field = $assert_session->fieldExists('filters[filter_html][settings][allowed_html]');
-    $allowed_html = $allowed_html_field->getValue();
-    $search = 'drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title';
-    $replace = 'drupal-media data-entity-type data-entity-uuid';
-    $allowed_html = str_replace($search, $replace, $allowed_html);
-    $page->clickLink('Limit allowed HTML tags and correct faulty HTML');
-    $this->assertTrue($allowed_html_field->waitFor(10, function ($allowed_html_field) {
-      return $allowed_html_field->isVisible();
-    }));
-    $allowed_html_field->setValue($allowed_html);
-    $page->pressButton('Save configuration');
-    $assert_session->pageTextContains('The text format Sulaco has been updated.');
-  }
-
-  /**
-   * Tests using DrupalMediaLibrary button to embed media into CKEditor.
-   */
-  public function testButton() {
-    $this->drupalGet('/node/add/blog');
-    $this->waitForEditor();
-    $this->pressEditorButton('drupalmedialibrary');
-    $assert_session = $this->assertSession();
-    $page = $this->getSession()->getPage();
-    $this->assertNotEmpty($assert_session->waitForId('drupal-modal'));
-
-    // Test that the order is the order set in DrupalMediaLibrary::getConfig().
-    $tabs = $page->findAll('css', '.media-library-menu__link');
-    $expected_tab_order = [
-      'Show Image media (selected)',
-      'Show Arrakis media',
-    ];
-    foreach ($tabs as $key => $tab) {
-      $this->assertSame($expected_tab_order[$key], $tab->getText());
-    }
-
-    $assert_session->pageTextContains('0 of 1 item selected');
-    $assert_session->elementExists('css', '.js-media-library-item')->click();
-    $assert_session->pageTextContains('1 of 1 item selected');
-    $assert_session->elementExists('css', '.ui-dialog-buttonpane')->pressButton('Insert selected');
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.cke_widget_drupalmedia drupal-media .media'));
-    $this->pressEditorButton('source');
-    $value = $assert_session->elementExists('css', 'textarea.cke_source')->getValue();
-    $dom = Html::load($value);
-    $xpath = new \DOMXPath($dom);
-    $drupal_media = $xpath->query('//drupal-media')[0];
-    $expected_attributes = [
-      'data-entity-type' => 'media',
-      'data-entity-uuid' => $this->media->uuid(),
-      'data-align' => 'center',
-    ];
-    foreach ($expected_attributes as $name => $expected) {
-      $this->assertSame($expected, $drupal_media->getAttribute($name));
-    }
-    $this->pressEditorButton('source');
-    // Why do we keep switching to the 'ckeditor' iframe? Because the buttons
-    // are in a separate iframe from the markup, so after calling
-    // ::pressEditorButton() (which switches to the button iframe), we'll need
-    // to switch back to the CKEditor iframe.
-    $this->assignNameToCkeditorIframe();
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.cke_widget_drupalmedia drupal-media .media'));
-    $this->assertEditorButtonEnabled('undo');
-    $this->pressEditorButton('undo');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertEmpty($assert_session->waitForElementVisible('css', '.cke_widget_drupalmedia drupal-media .media'));
-    $this->assertEditorButtonDisabled('undo');
-    $this->pressEditorButton('redo');
-    $this->getSession()->switchToIFrame('ckeditor');
-    $this->assertNotEmpty($assert_session->waitForElementVisible('css', '.cke_widget_drupalmedia drupal-media .media'));
-    $this->assertEditorButtonEnabled('undo');
-  }
-
-  /**
-   * Tests the allowed media types setting on the MediaEmbed filter.
-   */
-  public function testAllowedMediaTypes() {
-    $test_cases = [
-      'all_media_types' => [],
-      'only_image' => ['image' => 'image'],
-      'only_arrakis' => ['arrakis' => 'arrakis'],
-      'both_items_checked' => [
-        'image' => 'image',
-        'arrakis' => 'arrakis',
-      ],
-    ];
-
-    foreach ($test_cases as $allowed_media_types) {
-      // Update the filter format to set the allowed media types.
-      FilterFormat::load('test_format')
-        ->setFilterConfig('media_embed', [
-        'status' => TRUE,
-        'settings' => [
-          'default_view_mode' => 'view_mode_1',
-          'allowed_media_types' => $allowed_media_types,
-          'allowed_view_modes' => [
-            'view_mode_1' => 'view_mode_1',
-            'view_mode_2' => 'view_mode_2',
-          ],
-        ],
-      ])->save();
-
-      // Now test opening the media library from the CKEditor plugin, and
-      // verify the expected behavior.
-      $this->drupalGet('/node/add/blog');
-      $this->waitForEditor();
-      $this->pressEditorButton('drupalmedialibrary');
-      $assert_session = $this->assertSession();
-      $this->assertNotEmpty($assert_session->waitForId('media-library-wrapper'));
-
-      if (empty($allowed_media_types) || count($allowed_media_types) === 2) {
-        $assert_session->elementExists('css', 'li.media-library-menu-image');
-        $assert_session->elementExists('css', 'li.media-library-menu-arrakis');
-        $assert_session->elementTextContains('css', '.media-library-item__name', 'Fear is the mind-killer');
-      }
-      elseif (count($allowed_media_types) === 1 && !empty($allowed_media_types['image'])) {
-        // No tabs should appear if there's only one media type available.
-        $assert_session->elementNotExists('css', 'li.media-library-menu-image');
-        $assert_session->elementNotExists('css', 'li.media-library-menu-arrakis');
-        $assert_session->elementTextContains('css', '.media-library-item__name', 'Fear is the mind-killer');
-      }
-      elseif (count($allowed_media_types) === 1 && !empty($allowed_media_types['arrakis'])) {
-        // No tabs should appear if there's only one media type available.
-        $assert_session->elementNotExists('css', 'li.media-library-menu-image');
-        $assert_session->elementNotExists('css', 'li.media-library-menu-arrakis');
-        $assert_session->elementTextContains('css', '.media-library-item__name', 'Le baron Vladimir Harkonnen');
-      }
-    }
-  }
-
-}
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/ContentModerationTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/ContentModerationTest.php
index dd21529b7..e2e65b294 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/ContentModerationTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/ContentModerationTest.php
@@ -38,7 +38,7 @@ class ContentModerationTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * User with the 'administer media' permission.
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php
index 09c184464..5f90e70be 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/EntityReferenceWidgetTest.php
@@ -21,6 +21,13 @@ class EntityReferenceWidgetTest extends MediaLibraryTestBase {
    */
   protected static $modules = ['field_ui'];
 
+  /**
+   * The theme to install as the default for testing.
+   *
+   * @var string
+   */
+  protected $defaultTheme = 'starterkit_theme';
+
   /**
    * Test media items.
    *
@@ -591,8 +598,7 @@ public function testWidgetPreview() {
 
     // Assert that preview is present for current user, who can view media.
     $this->drupalGet($node->toUrl('edit-form'));
-    $preview_name = $page->find('css', '[data-drupal-selector="edit-field-unlimited-media-selection-0"] .media-library-item__name');
-    $this->assertSame('Horse', $preview_name->getText());
+    $assert_session->elementTextContains('css', '[data-drupal-selector="edit-field-unlimited-media-selection-0"]', 'Horse');
     $remove_button = $page->find('css', '[data-drupal-selector="edit-field-unlimited-media-selection-0-remove-button"]');
     $this->assertSame('Remove Horse', $remove_button->getAttribute('aria-label'));
     $assert_session->pageTextNotContains('You do not have permission to view media item');
@@ -618,8 +624,7 @@ public function testWidgetPreview() {
     // Assert that preview does not reveal media name.
     $this->drupalGet($node->toUrl('edit-form'));
     // There should be no preview name.
-    $preview_name = $page->find('css', '[data-drupal-selector="edit-field-unlimited-media-selection-0"] .media-library-item__name');
-    $this->assertNull($preview_name);
+    $assert_session->elementTextNotContains('css', '[data-drupal-selector="edit-field-unlimited-media-selection-0"]', 'Horse');
     // The remove button should have a generic message.
     $remove_button = $page->find('css', '[data-drupal-selector="edit-field-unlimited-media-selection-0-remove-button"]');
     $this->assertSame('Remove media', $remove_button->getAttribute('aria-label'));
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/FieldUiIntegrationTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/FieldUiIntegrationTest.php
index 68220b48b..72bd066fd 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/FieldUiIntegrationTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/FieldUiIntegrationTest.php
@@ -14,6 +14,11 @@ class FieldUiIntegrationTest extends MediaLibraryTestBase {
    */
   protected static $modules = ['field_ui'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTestBase.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTestBase.php
index 8ec4b3b5a..1b63a63c7 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTestBase.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTestBase.php
@@ -18,7 +18,7 @@ abstract class MediaLibraryTestBase extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * Create media items.
@@ -333,7 +333,6 @@ protected function assertMediaAdded($index = 0) {
     $assert_session->elementNotExists('css', '[data-drupal-selector$="preview"]', $fields);
     $assert_session->buttonNotExists('Remove', $fields);
     $assert_session->elementNotExists('css', '[data-drupal-selector$="filename"]', $fields);
-    $assert_session->elementNotExists('css', '.file-size', $fields);
   }
 
   /**
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaOverviewTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaOverviewTest.php
index e3eaab22e..88e6cecb1 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaOverviewTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/MediaOverviewTest.php
@@ -14,6 +14,11 @@ class MediaOverviewTest extends MediaLibraryTestBase {
    */
   protected static $modules = ['block'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
@@ -64,7 +69,7 @@ public function testAdministrationPage() {
     $assert_session->linkExists('Table');
 
     // We should see the table view and a link to add media.
-    $assert_session->elementExists('css', '.view-media .views-table');
+    $assert_session->elementExists('css', '[data-drupal-selector="views-form-media-media-page-list"] table');
     $assert_session->linkExists('Add media');
 
     // Go to the grid display for the rest of the test.
@@ -78,8 +83,12 @@ public function testAdministrationPage() {
     $assert_session->pageTextContains('Dog');
     $assert_session->pageTextContains('Turtle');
 
-    // Verify that the media name does not contain a link.
-    $assert_session->elementNotExists('css', '.media-library-item__name a');
+    // Verify that the media name does not contain a link. The selector is
+    // tricky, so start by asserting ".js-media-library-item-preview + div"
+    // can select a div containing a media name.
+    $assert_session->elementExists('css', '.js-media-library-item-preview + div:contains("Dog")');
+    $assert_session->elementExists('css', '.js-media-library-item-preview + div:contains("Turtle")');
+    $assert_session->elementNotExists('css', '.js-media-library-item-preview + div a');
     // Verify that there are links to edit and delete media items.
     $assert_session->linkExists('Edit Dog');
     $assert_session->linkExists('Delete Turtle');
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/TranslationsTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/TranslationsTest.php
index 0aa581b42..4b14a2345 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/TranslationsTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/TranslationsTest.php
@@ -37,7 +37,7 @@ class TranslationsTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -127,7 +127,7 @@ public function testMediaLibraryTranslations() {
     // regardless of the interface language.
     $this->drupalGet('nl/admin/content/media-grid');
     $assert_session->elementsCount('css', '.js-media-library-item', 6);
-    $media_items = $page->findAll('css', '.media-library-item__name');
+    $media_items = $page->findAll('css', '.js-media-library-item-preview + div');
     $media_names = [];
     foreach ($media_items as $media_item) {
       $media_names[] = $media_item->getText();
@@ -138,7 +138,7 @@ public function testMediaLibraryTranslations() {
 
     $this->drupalGet('es/admin/content/media-grid');
     $assert_session->elementsCount('css', '.js-media-library-item', 6);
-    $media_items = $page->findAll('css', '.media-library-item__name');
+    $media_items = $page->findAll('css', '.js-media-library-item-preview + div');
     $media_names = [];
     foreach ($media_items as $media_item) {
       $media_names[] = $media_item->getText();
@@ -153,7 +153,7 @@ public function testMediaLibraryTranslations() {
     $assert_session->elementExists('css', '.js-media-library-open-button[name^="field_media"]')->click();
     $assert_session->waitForText('Add or select media');
     $assert_session->elementsCount('css', '.js-media-library-item', 4);
-    $media_items = $page->findAll('css', '.media-library-item__name');
+    $media_items = $page->findAll('css', '.js-media-library-item-preview + div');
     $media_names = [];
     foreach ($media_items as $media_item) {
       $media_names[] = $media_item->getText();
@@ -166,7 +166,7 @@ public function testMediaLibraryTranslations() {
     $assert_session->elementExists('css', '.js-media-library-open-button[name^="field_media"]')->click();
     $assert_session->waitForText('Add or select media');
     $assert_session->elementsCount('css', '.js-media-library-item', 4);
-    $media_items = $page->findAll('css', '.media-library-item__name');
+    $media_items = $page->findAll('css', '.js-media-library-item-preview + div');
     $media_names = [];
     foreach ($media_items as $media_item) {
       $media_names[] = $media_item->getText();
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php
index 0e2eab677..f66795fb9 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/ViewsUiIntegrationTest.php
@@ -14,6 +14,11 @@ class ViewsUiIntegrationTest extends MediaLibraryTestBase {
    */
   protected static $modules = ['views_ui'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
@@ -51,8 +56,8 @@ public function testViewsAdmin() {
     $this->waitForElementsCount('css', '.js-media-library-item', 8);
 
     // Assert that filtering works in live preview.
-    $page->find('css', '.js-media-library-view .view-filters')->fillField('name', 'snake');
-    $page->find('css', '.js-media-library-view .view-filters')->pressButton('Apply filters');
+    $page->find('css', '.js-media-library-view')->fillField('name', 'snake');
+    $page->find('css', '.js-media-library-view')->pressButton('Apply filters');
     $this->waitForElementsCount('css', '.js-media-library-item', 1);
 
     // Test the same routine but in the view for the table widget.
@@ -60,8 +65,8 @@ public function testViewsAdmin() {
     $this->waitForElementsCount('css', '.js-media-library-item', 8);
 
     // Assert that filtering works in live preview.
-    $page->find('css', '.js-media-library-view .view-filters')->fillField('name', 'snake');
-    $page->find('css', '.js-media-library-view .view-filters')->pressButton('Apply filters');
+    $page->find('css', '.js-media-library-view')->fillField('name', 'snake');
+    $page->find('css', '.js-media-library-view')->pressButton('Apply filters');
     $this->waitForElementsCount('css', '.js-media-library-item', 1);
 
     // We cannot test clicking the 'Insert selected' button in either view
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAccessTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAccessTest.php
index 0abb57271..0761bab5c 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAccessTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAccessTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\media_library\FunctionalJavascript;
 
+use Drupal\field\Entity\FieldConfig;
 use Drupal\media\Entity\Media;
 use Drupal\media_library\MediaLibraryState;
 use Drupal\user\Entity\Role;
@@ -14,6 +15,11 @@
  */
 class WidgetAccessTest extends MediaLibraryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * Tests that the widget access works as expected.
    */
@@ -80,11 +86,11 @@ public function testWidgetAccess() {
       'view media',
     ]);
     $this->drupalGet('admin/content/media-widget', $url_options);
-    $assert_session->elementExists('css', '.view-media-library');
+    $assert_session->elementExists('css', '.js-media-library-view');
     $this->drupalGet('admin/content/media-widget-table', $url_options);
-    $assert_session->elementExists('css', '.view-media-library');
+    $assert_session->elementExists('css', '.js-media-library-view');
     $this->drupalGet('media-library', $url_options);
-    $assert_session->elementExists('css', '.view-media-library');
+    $assert_session->elementExists('css', '.js-media-library-view');
     // Assert the user does not have access to the media add form if the user
     // does not have the 'create media' permission.
     $assert_session->fieldNotExists('files[upload][]');
@@ -104,7 +110,7 @@ public function testWidgetAccess() {
       'create media',
     ]);
     $this->drupalGet('media-library', $url_options);
-    $assert_session->elementExists('css', '.view-media-library');
+    $assert_session->elementExists('css', '.js-media-library-view');
     $assert_session->fieldExists('Add files');
 
     // Assert the media library can not be accessed if the required state
@@ -131,4 +137,37 @@ public function testWidgetAccess() {
     $assert_session->responseContains('Access denied');
   }
 
+  /**
+   * Tests the widget with a required field that the user can't access.
+   */
+  public function testRequiredFieldNoAccess() {
+    // Make field_single_media_type required.
+    $fieldConfig = FieldConfig::loadByName('node', 'basic_page', 'field_single_media_type');
+    assert($fieldConfig instanceof FieldConfig);
+    $fieldConfig->setRequired(TRUE)
+      ->save();
+
+    // Deny access to the field.
+    \Drupal::state()->set('media_library_test_entity_field_access_deny_fields', ['field_single_media_type']);
+
+    $user = $this->drupalCreateUser([
+      'access administration pages',
+      'access content',
+      'create basic_page content',
+      'create type_one media',
+      'view media',
+    ]);
+    $this->drupalLogin($user);
+    $this->drupalGet('node/add/basic_page');
+
+    $this->assertSession()->elementNotExists('css', '.field--name-field-single-media-type');
+
+    $this->submitForm([
+      'title[0][value]' => $this->randomMachineName(),
+    ], 'Save');
+
+    $this->assertSession()->elementNotExists('css', '.messages--error');
+    $this->assertSession()->pageTextNotContains('Single media type field is required.');
+  }
+
 }
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAnonymousTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAnonymousTest.php
index 1a6ab1925..73442e0e2 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAnonymousTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetAnonymousTest.php
@@ -12,6 +12,11 @@
  */
 class WidgetAnonymousTest extends MediaLibraryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetOEmbedTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetOEmbedTest.php
index 945b63f9e..5a7936319 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetOEmbedTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetOEmbedTest.php
@@ -20,6 +20,11 @@ class WidgetOEmbedTest extends MediaLibraryTestBase {
    */
   protected static $modules = ['media_test_oembed'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
@@ -77,6 +82,10 @@ public function testWidgetOEmbed() {
     // consistently match their label's "for" attribute.
     $assert_session->assertWaitOnAjaxRequest();
     $this->waitForText('The media item has been created but has not yet been saved.');
+    // There is no other selected media and this is not the advanced ui.
+    // Assert that the Additional selected media element does not appear.
+    $assert_session->pageTextNotContains('Additional selected media');
+    $assert_session->elementNotExists('css', '[data-drupal-selector="edit-selection"]');
     // Assert the name field contains the remote video title.
     $assert_session->fieldValueEquals('Name', $youtube_title);
     $this->pressSaveButton();
@@ -137,7 +146,9 @@ public function testWidgetOEmbed() {
     $assert_session->assertWaitOnAjaxRequest();
     $this->waitForText('The media item has been created but has not yet been saved.');
     $page->fillField('Name', 'Custom video title');
-    $assert_session->elementNotExists('css', '.media-library-add-form__selected-media');
+    // The non-advanced ui should not show the Additional selected media.
+    $assert_session->pageTextNotContains('Additional selected media');
+    $assert_session->elementNotExists('css', '[data-drupal-selector="edit-selection"]');
     $this->pressSaveButton();
 
     // Load the created media item.
@@ -258,6 +269,9 @@ public function testWidgetOEmbedAdvancedUi() {
     // consistently match their label's "for" attribute.
     $assert_session->assertWaitOnAjaxRequest();
     $this->waitForText('The media item has been created but has not yet been saved.');
+    // Assert that Additional selected media does not appear.
+    $assert_session->pageTextNotContains('Additional selected media');
+    $assert_session->elementNotExists('css', '[data-drupal-selector="edit-selection"]');
     // Assert the name field contains the remote video title.
     $assert_session->fieldValueEquals('Name', $youtube_title);
     $this->saveAnd('select');
@@ -317,6 +331,9 @@ public function testWidgetOEmbedAdvancedUi() {
     // consistently match their label's "for" attribute.
     $assert_session->assertWaitOnAjaxRequest();
     $this->waitForText('The media item has been created but has not yet been saved.');
+    // The advanced ui should show the Additional selected media.
+    $assert_session->pageTextContains('Additional selected media');
+    $assert_session->elementExists('css', '[data-drupal-selector="edit-selection"]');
     $page->fillField('Name', 'Custom video title');
     $assert_session->checkboxChecked("Select $youtube_title", $this->getSelectionArea());
     $this->saveAnd('select');
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
index 74c51bc1e..6bd9829ec 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetUploadTest.php
@@ -17,6 +17,11 @@ class WidgetUploadTest extends MediaLibraryTestBase {
 
   use TestFileCreationTrait;
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * Tests that uploads in the Media library's widget works as expected.
    */
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php
index 838e0d332..82bde406b 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetViewsTest.php
@@ -9,6 +9,11 @@
  */
 class WidgetViewsTest extends MediaLibraryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * {@inheritdoc}
    */
@@ -79,13 +84,18 @@ public function testWidgetViews() {
     $assert_session->buttonNotExists('Apply filters', $button_pane);
 
     // Assert the pager works as expected.
-    $assert_session->elementTextContains('css', '.js-media-library-view .pager__item.is-active', 'Page 1');
+    // An active pager item is not linked and contains "Page #" as text.
+    $assert_session->elementTextContains('css', '.js-media-library-view .js-pager__items > li:nth-of-type(1)', 'Page 1');
+    $assert_session->elementNotExists('css', '.js-media-library-view .js-pager__items > li:nth-of-type(1) a');
+    $assert_session->elementExists('css', '.js-media-library-view .js-pager__items > li:nth-of-type(2) a');
     $this->assertCount(24, $this->getCheckboxes());
     $page->clickLink('Next page');
-    $this->waitForElementTextContains('.js-media-library-view .pager__item.is-active', 'Page 2');
+    $this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(2)', 'Page 2');
+    $assert_session->elementExists('css', '.js-media-library-view .js-pager__items > li:nth-of-type(1) a');
+    $assert_session->elementNotExists('css', '.js-media-library-view .js-pager__items > li:nth-of-type(2) a');
     $this->assertCount(1, $this->getCheckboxes());
     $page->clickLink('Previous page');
-    $this->waitForElementTextContains('.js-media-library-view .pager__item.is-active', 'Page 1');
+    $this->waitForElementTextContains('.js-media-library-view .js-pager__items > li:nth-of-type(1)', 'Page 1');
     $this->assertCount(24, $this->getCheckboxes());
 
     $this->switchToMediaLibraryTable();
diff --git a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php
index c43f22c7c..dc301d5f4 100644
--- a/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php
+++ b/web/core/modules/media_library/tests/src/FunctionalJavascript/WidgetWithoutTypesTest.php
@@ -17,6 +17,11 @@ class WidgetWithoutTypesTest extends MediaLibraryTestBase {
    */
   protected static $modules = ['field_ui'];
 
+  /**
+   * {@inheritdoc}
+   */
+  protected $defaultTheme = 'stark';
+
   /**
    * Tests that the widget works as expected when media types are deleted.
    */
@@ -95,8 +100,8 @@ public function testWidgetWithoutMediaTypes() {
     $field_empty_types_message = 'There are no allowed media types configured for this field. <a href="' . $field_empty_types_url->toString() . '">Edit the field settings</a> to select the allowed media types.';
 
     $field_null_types_url = new Url('entity.field_config.node_field_edit_form', [
-        'field_config' => 'node.basic_page.field_null_types_media',
-      ] + $route_bundle_params);
+      'field_config' => 'node.basic_page.field_null_types_media',
+    ] + $route_bundle_params);
     $field_null_types_message = 'There are no allowed media types configured for this field. <a href="' . $field_null_types_url->toString() . '">Edit the field settings</a> to select the allowed media types.';
 
     // Visit a node create page.
diff --git a/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php b/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
index f4309c131..0f4676b62 100644
--- a/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
+++ b/web/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php
@@ -50,7 +50,11 @@ class MenuLink extends DrupalSqlBase {
    */
   public function query() {
     $query = $this->select('menu_links', 'ml')
-      ->fields('ml');
+      ->fields('ml')
+      // Shortcut set links are migrated by the d7_shortcut migration.
+      // Shortcuts are not used in Drupal 6.
+      // @see Drupal\shortcut\Plugin\migrate\source\d7\Shortcut::query()
+      ->condition('ml.menu_name', 'shortcut-set-%', 'NOT LIKE');
     $and = $query->andConditionGroup()
       ->condition('ml.module', 'menu')
       ->condition('ml.router_path', ['admin/build/menu-customize/%', 'admin/structure/menu/manage/%'], 'NOT IN');
@@ -73,31 +77,31 @@ public function query() {
    */
   public function fields() {
     $fields = [
-      'menu_name' => t("The menu name. All links with the same menu name (such as 'navigation') are part of the same menu."),
-      'mlid' => t('The menu link ID (mlid) is the integer primary key.'),
-      'plid' => t('The parent link ID (plid) is the mlid of the link above in the hierarchy, or zero if the link is at the top level in its menu.'),
-      'link_path' => t('The Drupal path or external path this link points to.'),
-      'router_path' => t('For links corresponding to a Drupal path (external = 0), this connects the link to a {menu_router}.path for joins.'),
-      'link_title' => t('The text displayed for the link, which may be modified by a title callback stored in {menu_router}.'),
-      'options' => t('A serialized array of options to set on the URL, such as a query string or HTML attributes.'),
-      'module' => t('The name of the module that generated this link.'),
-      'hidden' => t('A flag for whether the link should be rendered in menus. (1 = a disabled menu link that may be shown on admin screens, -1 = a menu callback, 0 = a normal, visible link)'),
-      'external' => t('A flag to indicate if the link points to a full URL starting with a protocol, like http:// (1 = external, 0 = internal).'),
-      'has_children' => t('Flag indicating whether any links have this link as a parent (1 = children exist, 0 = no children).'),
-      'expanded' => t('Flag for whether this link should be rendered as expanded in menus - expanded links always have their child links displayed, instead of only when the link is in the active trail (1 = expanded, 0 = not expanded)'),
-      'weight' => t('Link weight among links in the same menu at the same depth.'),
-      'depth' => t('The depth relative to the top level. A link with plid == 0 will have depth == 1.'),
-      'customized' => t('A flag to indicate that the user has manually created or edited the link (1 = customized, 0 = not customized).'),
-      'p1' => t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the plid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
-      'p2' => t('The second mlid in the materialized path. See p1.'),
-      'p3' => t('The third mlid in the materialized path. See p1.'),
-      'p4' => t('The fourth mlid in the materialized path. See p1.'),
-      'p5' => t('The fifth mlid in the materialized path. See p1.'),
-      'p6' => t('The sixth mlid in the materialized path. See p1.'),
-      'p7' => t('The seventh mlid in the materialized path. See p1.'),
-      'p8' => t('The eighth mlid in the materialized path. See p1.'),
-      'p9' => t('The ninth mlid in the materialized path. See p1.'),
-      'updated' => t('Flag that indicates that this link was generated during the update from Drupal 5.'),
+      'menu_name' => $this->t("The menu name. All links with the same menu name (such as 'navigation') are part of the same menu."),
+      'mlid' => $this->t('The menu link ID (mlid) is the integer primary key.'),
+      'plid' => $this->t('The parent link ID (plid) is the mlid of the link above in the hierarchy, or zero if the link is at the top level in its menu.'),
+      'link_path' => $this->t('The Drupal path or external path this link points to.'),
+      'router_path' => $this->t('For links corresponding to a Drupal path (external = 0), this connects the link to a {menu_router}.path for joins.'),
+      'link_title' => $this->t('The text displayed for the link, which may be modified by a title callback stored in {menu_router}.'),
+      'options' => $this->t('A serialized array of options to set on the URL, such as a query string or HTML attributes.'),
+      'module' => $this->t('The name of the module that generated this link.'),
+      'hidden' => $this->t('A flag for whether the link should be rendered in menus. (1 = a disabled menu link that may be shown on admin screens, -1 = a menu callback, 0 = a normal, visible link)'),
+      'external' => $this->t('A flag to indicate if the link points to a full URL starting with a protocol, like http:// (1 = external, 0 = internal).'),
+      'has_children' => $this->t('Flag indicating whether any links have this link as a parent (1 = children exist, 0 = no children).'),
+      'expanded' => $this->t('Flag for whether this link should be rendered as expanded in menus - expanded links always have their child links displayed, instead of only when the link is in the active trail (1 = expanded, 0 = not expanded)'),
+      'weight' => $this->t('Link weight among links in the same menu at the same depth.'),
+      'depth' => $this->t('The depth relative to the top level. A link with plid == 0 will have depth == 1.'),
+      'customized' => $this->t('A flag to indicate that the user has manually created or edited the link (1 = customized, 0 = not customized).'),
+      'p1' => $this->t('The first mlid in the materialized path. If N = depth, then pN must equal the mlid. If depth > 1 then p(N-1) must equal the plid. All pX where X > depth must equal zero. The columns p1 .. p9 are also called the parents.'),
+      'p2' => $this->t('The second mlid in the materialized path. See p1.'),
+      'p3' => $this->t('The third mlid in the materialized path. See p1.'),
+      'p4' => $this->t('The fourth mlid in the materialized path. See p1.'),
+      'p5' => $this->t('The fifth mlid in the materialized path. See p1.'),
+      'p6' => $this->t('The sixth mlid in the materialized path. See p1.'),
+      'p7' => $this->t('The seventh mlid in the materialized path. See p1.'),
+      'p8' => $this->t('The eighth mlid in the materialized path. See p1.'),
+      'p9' => $this->t('The ninth mlid in the materialized path. See p1.'),
+      'updated' => $this->t('Flag that indicates that this link was generated during the update from Drupal 5.'),
     ];
     $schema = $this->getDatabase()->schema();
     if ($schema->fieldExists('menu_links', 'language')) {
diff --git a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index 8dc2b7865..e8ab747f6 100644
--- a/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
+++ b/web/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -92,18 +92,18 @@ public function testTranslationLinkTheme() {
     $this->drupalLogin($this->administrator);
     $entityId = $this->createEntity([], 'en');
 
-    // Set up Seven as the admin theme to test.
-    $this->container->get('theme_installer')->install(['seven']);
+    // Set up the default admin theme to test.
+    $this->container->get('theme_installer')->install(['claro']);
     $edit = [];
-    $edit['admin_theme'] = 'seven';
+    $edit['admin_theme'] = 'claro';
     $this->drupalGet('admin/appearance');
     $this->submitForm($edit, 'Save configuration');
     // Check that edit uses the admin theme.
     $this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit');
-    $this->assertSession()->responseContains('core/themes/seven/css/base/elements.css');
+    $this->assertSession()->responseContains('core/themes/claro/css/base/elements.css');
     // Check that translation uses admin theme as well.
     $this->drupalGet('admin/structure/menu/item/' . $entityId . '/edit/translations');
-    $this->assertSession()->responseContains('core/themes/seven/css/base/elements.css');
+    $this->assertSession()->responseContains('core/themes/claro/css/base/elements.css');
   }
 
   /**
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php
index 27b49b27e..bc1288972 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php
@@ -15,8 +15,9 @@
 use Symfony\Component\Routing\Route;
 
 /**
- * Ensures that rendered menu links bubble the necessary bubbleable metadata
- * for outbound path/route processing.
+ * Ensures that rendered menu links bubble the necessary bubbleable metadata.
+ *
+ * This for outbound path/route processing.
  *
  * @group menu_link_content
  */
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
index cd271f89d..dbe7d0f13 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php
@@ -112,6 +112,11 @@ public function testMenuLinks() {
     $this->assertEntity(485, 'en', 'is - The thing about Deep Space 9', 'tools', NULL, TRUE, FALSE, ['attributes' => ['title' => '']], 'entity:node/2', 10);
     $this->assertEntity(486, 'und', 'is - The thing about Firefly', 'tools', NULL, TRUE, FALSE, ['attributes' => ['title' => '']], 'entity:node/4', 11);
     $this->assertEntity(487, 'en', 'en - The thing about Firefly', 'tools', NULL, TRUE, FALSE, ['attributes' => ['title' => '']], 'entity:node/4', 12);
+
+    // Test there have been no attempts to stub a shortcut in a MigrationLookup
+    // process.
+    $messages = $this->getMigration('d7_menu')->getIdMap()->getMessages()->fetchAll();
+    $this->assertCount(0, $messages);
   }
 
 }
diff --git a/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php b/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php
index b8d80c153..2f6d19a3e 100644
--- a/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Kernel/Plugin/migrate/source/MenuLinkTest.php
@@ -241,6 +241,37 @@ public function providerSource() {
         'i18n_tsid' => '1',
         'skip_translation' => FALSE,
       ],
+      [
+        // D7 shortcut set link.
+        'menu_name' => 'shortcut-set-1',
+        'mlid' => 301,
+        'plid' => 0,
+        'link_path' => 'node/add',
+        'router_path' => 'node/add',
+        'link_title' => 'Add Content',
+        'options' => [],
+        'module' => 'menu',
+        'hidden' => 0,
+        'external' => 0,
+        'has_children' => 0,
+        'expanded' => 0,
+        'weight' => 0,
+        'depth' => 1,
+        'customized' => 0,
+        'p1' => '301',
+        'p2' => '0',
+        'p3' => '0',
+        'p4' => '0',
+        'p5' => '0',
+        'p6' => '0',
+        'p7' => '0',
+        'p8' => '0',
+        'p9' => '0',
+        'updated' => '0',
+        'language' => 'und',
+        'i18n_tsid' => '0',
+        'skip_translation' => TRUE,
+      ],
     ];
 
     // Add long link title attributes to source data.
diff --git a/web/core/modules/menu_link_content/tests/src/Unit/MenuLinkContentEntityAccessTest.php b/web/core/modules/menu_link_content/tests/src/Unit/MenuLinkContentEntityAccessTest.php
index ea39e96b8..6751fcf29 100644
--- a/web/core/modules/menu_link_content/tests/src/Unit/MenuLinkContentEntityAccessTest.php
+++ b/web/core/modules/menu_link_content/tests/src/Unit/MenuLinkContentEntityAccessTest.php
@@ -36,7 +36,7 @@ public function testUnrecognizedOperation() {
     $language = $this->createMock(LanguageInterface::class);
     $language->expects($this->any())
       ->method('getId')
-      ->will($this->returnValue('de'));
+      ->willReturn('de');
 
     $entity = $this->createMock(ContentEntityInterface::class);
     $entity->expects($this->any())
diff --git a/web/core/modules/menu_ui/config/schema/menu_ui.schema.yml b/web/core/modules/menu_ui/config/schema/menu_ui.schema.yml
index 69af435fa..468802390 100644
--- a/web/core/modules/menu_ui/config/schema/menu_ui.schema.yml
+++ b/web/core/modules/menu_ui/config/schema/menu_ui.schema.yml
@@ -16,8 +16,8 @@ node.type.*.third_party.menu_ui:
       type: sequence
       label: 'Available menus'
       sequence:
-       type: string
-       label: 'Menu machine name'
+        type: string
+        label: 'Menu machine name'
     parent:
       type: string
       label: 'Parent'
diff --git a/web/core/modules/menu_ui/menu_ui.admin.js b/web/core/modules/menu_ui/menu_ui.admin.js
index cbaea3207..fd965fe38 100644
--- a/web/core/modules/menu_ui/menu_ui.admin.js
+++ b/web/core/modules/menu_ui/menu_ui.admin.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.menuUiChangeParentItems = {
     attach: function attach(context, settings) {
       var menu = once('menu-parent', '#edit-menu');
-
       if (menu.length) {
         var $menu = $(menu);
         Drupal.menuUiUpdateParentList();
@@ -17,7 +15,6 @@
       }
     }
   };
-
   Drupal.menuUiUpdateParentList = function () {
     var $menu = $('#edit-menu');
     var values = [];
diff --git a/web/core/modules/menu_ui/menu_ui.js b/web/core/modules/menu_ui/menu_ui.js
index caf4bd108..be1b64cf8 100644
--- a/web/core/modules/menu_ui/menu_ui.js
+++ b/web/core/modules/menu_ui/menu_ui.js
@@ -4,17 +4,14 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.menuUiDetailsSummaries = {
     attach: function attach(context) {
       $(context).find('.menu-link-form').drupalSetSummary(function (context) {
         var $context = $(context);
-
         if ($context.find('.js-form-item-menu-enabled input').is(':checked')) {
           return Drupal.checkPlain($context.find('.js-form-item-menu-title input')[0].value);
         }
-
         return Drupal.t('Not in menu');
       });
     }
@@ -27,15 +24,12 @@
         var $checkbox = $this.find('.js-form-item-menu-enabled input');
         var $linkTitle = $context.find('.js-form-item-menu-title input');
         var $title = $this.closest('form').find('.js-form-item-title-0-value input');
-
         if (!($checkbox.length && $linkTitle.length && $title.length)) {
           return;
         }
-
         if ($checkbox.is(':checked') && $linkTitle[0].value.length) {
           $linkTitle.data('menuLinkAutomaticTitleOverridden', true);
         }
-
         $linkTitle.on('keyup', function () {
           $linkTitle.data('menuLinkAutomaticTitleOverridden', true);
         });
@@ -48,7 +42,6 @@
             $linkTitle[0].value = '';
             $linkTitle.removeData('menuLinkAutomaticTitleOverridden');
           }
-
           $checkbox.closest('.vertical-tabs-pane').trigger('summaryUpdated');
           $checkbox.trigger('formUpdated');
         });
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php
index 0694b1d7f..85aa57bf1 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiLanguageTest.php
@@ -35,6 +35,9 @@ class MenuUiLanguageTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
index 01efbcf01..35aada1ec 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiNodeTest.php
@@ -41,6 +41,9 @@ class MenuUiNodeTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php b/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
index 497f7f9a8..5689f00c4 100644
--- a/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
+++ b/web/core/modules/menu_ui/tests/src/Functional/MenuUiTest.php
@@ -15,8 +15,10 @@
 use Drupal\Tests\menu_ui\Traits\MenuUiTrait;
 
 /**
- * Add a custom menu, add menu links to the custom menu and Tools menu, check
- * their data, and delete them using the UI.
+ * Tests the menu UI.
+ *
+ * This test adds a custom menu, adds menu links to the custom menu and the
+ * Tools menu, checks their data, and deletes them using the UI.
  *
  * @group menu_ui
  */
@@ -80,6 +82,9 @@ class MenuUiTest extends BrowserTestBase {
    */
   protected $items;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php b/web/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
index a17986c8e..5aa830acf 100644
--- a/web/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
+++ b/web/core/modules/migrate/src/Event/MigrateIdMapMessageEvent.php
@@ -88,8 +88,11 @@ public function getMessage() {
   }
 
   /**
-   * Gets the severity level of the message (one of the
-   * MigrationInterface::MESSAGE_* constants).
+   * Gets the severity level of the message.
+   *
+   * Message levels are declared in MigrationInterface and start with MESSAGE_.
+   *
+   * @see \Drupal\migrate\Plugin\MigrationInterface
    *
    * @return int
    *   The message level.
diff --git a/web/core/modules/migrate/src/Plugin/Migration.php b/web/core/modules/migrate/src/Plugin/Migration.php
index 01ae6aea5..9b1137b87 100644
--- a/web/core/modules/migrate/src/Plugin/Migration.php
+++ b/web/core/modules/migrate/src/Plugin/Migration.php
@@ -95,6 +95,7 @@
  *
  * @link https://www.drupal.org/docs/8/api/migrate-api Migrate API handbook. @endlink
  */
+#[\AllowDynamicProperties]
 class Migration extends PluginBase implements MigrationInterface, RequirementsInterface, ContainerFactoryPluginInterface {
 
   /**
@@ -204,8 +205,7 @@ class Migration extends PluginBase implements MigrationInterface, RequirementsIn
   protected $destinationIds = [];
 
   /**
-   * Specify value of source_row_status for current map row. Usually set by
-   * MigrateFieldHandler implementations.
+   * The source_row_status for the current map row.
    *
    * @var int
    */
@@ -495,7 +495,7 @@ public function getIdMap() {
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function getRequirements(): array {
     return $this->requirements;
diff --git a/web/core/modules/migrate/src/Plugin/MigrationInterface.php b/web/core/modules/migrate/src/Plugin/MigrationInterface.php
index 61942a21f..2435ad5d3 100644
--- a/web/core/modules/migrate/src/Plugin/MigrationInterface.php
+++ b/web/core/modules/migrate/src/Plugin/MigrationInterface.php
@@ -195,8 +195,7 @@ public function getInterruptionResult();
   public function clearInterruptionResult();
 
   /**
-   * Signal that the migration should be interrupted with the specified result
-   * code.
+   * Sets the migration status as interrupted with a given result code.
    *
    * @param int $result
    *   One of the MigrationInterface::RESULT_* constants.
@@ -204,8 +203,7 @@ public function clearInterruptionResult();
   public function interruptMigration($result);
 
   /**
-   * Get the normalized process pipeline configuration describing the process
-   * plugins.
+   * Gets the normalized process plugin configuration.
    *
    * The process configuration is always normalized. All shorthand processing
    * will be expanded into their full representations.
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/web/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index 0e9668b54..1548f3e08 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -70,6 +70,11 @@ abstract class Entity extends DestinationBase implements ContainerFactoryPluginI
    */
   protected $storage;
 
+  /**
+   * The entity field manager.
+   */
+  protected $entityFieldManager;
+
   /**
    * The list of the bundles of this entity type.
    *
diff --git a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
index bcee94a83..103805fea 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/destination/EntityContentBase.php
@@ -93,13 +93,6 @@
  */
 class EntityContentBase extends Entity implements HighestIdInterface, MigrateValidatableEntityInterface {
 
-  /**
-   * Entity field manager.
-   *
-   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
-   */
-  protected $entityFieldManager;
-
   /**
    * Field type plugin manager.
    *
@@ -349,9 +342,10 @@ protected function processStubRow(Row $row) {
       $row->setDestinationProperty($bundle_key, reset($this->bundles));
     }
 
+    $bundle = $row->getDestinationProperty($bundle_key) ?? $this->storage->getEntityTypeId();
     // Populate any required fields not already populated.
     $fields = $this->entityFieldManager
-      ->getFieldDefinitions($this->storage->getEntityTypeId(), $row->getDestinationProperty($bundle_key));
+      ->getFieldDefinitions($this->storage->getEntityTypeId(), $bundle);
     foreach ($fields as $field_name => $field_definition) {
       if ($field_definition->isRequired() && is_null($row->getDestinationProperty($field_name))) {
         // Use the configured default value for this specific field, if any.
diff --git a/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php b/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
index d0f31ffa0..e1225ae9a 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -14,6 +14,7 @@
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\MigrateMessageInterface;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Drupal\migrate\Row;
 use Drupal\migrate\Event\MigrateEvents;
 use Drupal\migrate\Event\MigrateMapSaveEvent;
@@ -143,6 +144,13 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    */
   protected $currentKey = [];
 
+  /**
+   * The migration plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigrationPluginManagerInterface
+   */
+  protected $migrationPluginManager;
+
   /**
    * Constructs an SQL object.
    *
@@ -158,8 +166,10 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
    *   The migration to do.
    * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher.
+   * @param \Drupal\migrate\Plugin\MigrationPluginManagerInterface $migration_plugin_manager
+   *   The migration plugin manager.
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher, MigrationPluginManagerInterface $migration_plugin_manager = NULL) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
     $this->migration = $migration;
     $this->eventDispatcher = $event_dispatcher;
@@ -176,6 +186,12 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
     $this->mapTableName = mb_substr($this->mapTableName, 0, 63 - $prefix_length);
     $this->messageTableName = 'migrate_message_' . mb_strtolower($machine_name);
     $this->messageTableName = mb_substr($this->messageTableName, 0, 63 - $prefix_length);
+
+    if (!$migration_plugin_manager) {
+      @trigger_error('Calling Sql::__construct() without the $migration_manager argument is deprecated in drupal:9.5.0 and the $migration_manager argument will be required in drupal:11.0.0. See https://www.drupal.org/node/3277306', E_USER_DEPRECATED);
+      $migration_plugin_manager = \Drupal::service('plugin.manager.migration');
+    }
+    $this->migrationPluginManager = $migration_plugin_manager;
   }
 
   /**
@@ -187,7 +203,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_id,
       $plugin_definition,
       $migration,
-      $container->get('event_dispatcher')
+      $container->get('event_dispatcher'),
+      $container->get('plugin.manager.migration')
     );
   }
 
@@ -315,7 +332,7 @@ public function setMessage(MigrateMessageInterface $message) {
   /**
    * Create the map and message tables if they don't already exist.
    *
-   * @throws \Drupal\Core\Database\DatabaseException
+   * @throws \Drupal\Core\Database\DatabaseExceptionWrapper
    */
   protected function ensureTables() {
     if (!$this->getDatabase()->schema()->tableExists($this->mapTableName)) {
@@ -678,7 +695,7 @@ public function saveIdMapping(Row $row, array $destination_id_values, $source_ro
       $fields['destid' . ++$count] = $dest_id;
     }
     if ($count && $count != count($this->destinationIdFields())) {
-      $this->message->display(t('Could not save to map table due to missing destination id values'), 'error');
+      $this->message->display($this->t('Could not save to map table due to missing destination id values'), 'error');
       return;
     }
     if ($this->migration->getTrackLastImported()) {
@@ -996,13 +1013,17 @@ public function valid() {
   /**
    * Returns the migration plugin manager.
    *
-   * @todo Inject as a dependency in https://www.drupal.org/node/2919158.
-   *
    * @return \Drupal\migrate\Plugin\MigrationPluginManagerInterface
    *   The migration plugin manager.
+   *
+   * @deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use
+   *   $this->migrationPluginManager instead.
+   *
+   * @see https://www.drupal.org/node/3277306
    */
   protected function getMigrationPluginManager() {
-    return \Drupal::service('plugin.manager.migration');
+    @trigger_error('deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use $this->migrationPluginManager instead. See https://www.drupal.org/node/3277306', E_USER_DEPRECATED);
+    return $this->migrationPluginManager;
   }
 
   /**
@@ -1023,13 +1044,12 @@ public function getHighestId() {
     // If there's a bundle, it means we have a derived migration and we need to
     // find all the mapping tables from the related derived migrations.
     if ($base_id = substr($this->migration->id(), 0, strpos($this->migration->id(), $this::DERIVATIVE_SEPARATOR))) {
-      $migration_manager = $this->getMigrationPluginManager();
-      $migrations = $migration_manager->getDefinitions();
+      $migrations = $this->migrationPluginManager->getDefinitions();
       foreach ($migrations as $migration_id => $migration) {
         if ($migration['id'] === $base_id) {
           // Get this derived migration's mapping table and add it to the list
           // of mapping tables to look in for the highest ID.
-          $stub = $migration_manager->createInstance($migration_id);
+          $stub = $this->migrationPluginManager->createInstance($migration_id);
           $map_tables[$migration_id] = $stub->getIdMap()->mapTableName();
         }
       }
diff --git a/web/core/modules/migrate/src/Plugin/migrate/process/Route.php b/web/core/modules/migrate/src/Plugin/migrate/process/Route.php
index 63c102007..155a71ed0 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/process/Route.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/process/Route.php
@@ -57,6 +57,11 @@
  */
 class Route extends ProcessPluginBase implements ContainerFactoryPluginInterface {
 
+  /**
+   * The current migration.
+   */
+  protected $migration;
+
   /**
    * The path validator service.
    *
diff --git a/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php b/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
index 123eb9c4c..2991aeec7 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/source/EmptySource.php
@@ -34,7 +34,7 @@ class EmptySource extends SourcePluginBase {
    */
   public function fields() {
     return [
-      'id' => t('ID'),
+      'id' => $this->t('ID'),
     ];
   }
 
diff --git a/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
index a3925d50d..3191c7256 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -528,8 +528,9 @@ protected function getCache() {
   }
 
   /**
-   * Gets the source count checking if the source is countable or using the
-   * iterator_count function.
+   * Gets the source count.
+   *
+   * Checks if the source is countable or using the iterator_count function.
    *
    * @return int
    */
diff --git a/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index 4a1c35ebc..64db362ee 100644
--- a/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/web/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -376,6 +376,16 @@ protected function fetchNextBatch() {
     $this->getIterator()->rewind();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function rewind(): void {
+    $this->batch = 0;
+    // Database queries have to be run again as they cannot be rewound.
+    unset($this->iterator);
+    parent::rewind();
+  }
+
   /**
    * @return \Drupal\Core\Database\Query\SelectInterface
    */
diff --git a/web/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module b/web/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
index 6b7bc8c25..6c1484778 100644
--- a/web/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
+++ b/web/core/modules/migrate/tests/modules/migrate_prepare_row_test/migrate_prepare_row_test.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Test module for testing the migration source plugin prepareRow() exception
- * handling.
+ * Tests the migration source plugin prepareRow() exception handling.
  */
 
 use Drupal\migrate\Plugin\MigrationInterface;
diff --git a/web/core/modules/migrate/tests/modules/migrate_skip_all_rows_test/migrate_skip_all_rows_test.module b/web/core/modules/migrate/tests/modules/migrate_skip_all_rows_test/migrate_skip_all_rows_test.module
index cd87d0ee1..a9c91ebbe 100644
--- a/web/core/modules/migrate/tests/modules/migrate_skip_all_rows_test/migrate_skip_all_rows_test.module
+++ b/web/core/modules/migrate/tests/modules/migrate_skip_all_rows_test/migrate_skip_all_rows_test.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * Test module for testing the migration source plugin prepareRow() exception
- * handling.
+ * Tests the migration source plugin prepareRow() exception.
  */
 
 use Drupal\migrate\Plugin\MigrationInterface;
diff --git a/web/core/modules/migrate/tests/modules/migrate_sql_count_cache_test/src/Plugin/migrate/source/SqlCountCache.php b/web/core/modules/migrate/tests/modules/migrate_sql_count_cache_test/src/Plugin/migrate/source/SqlCountCache.php
index 48026d10a..5d0193070 100644
--- a/web/core/modules/migrate/tests/modules/migrate_sql_count_cache_test/src/Plugin/migrate/source/SqlCountCache.php
+++ b/web/core/modules/migrate/tests/modules/migrate_sql_count_cache_test/src/Plugin/migrate/source/SqlCountCache.php
@@ -18,7 +18,7 @@ class SqlCountCache extends SqlBase {
    */
   public function fields() {
     return [
-      'id' => t('Id'),
+      'id' => $this->t('Id'),
     ];
   }
 
diff --git a/web/core/modules/migrate/tests/modules/migrate_track_changes_test/migrations/track_changes_test.yml b/web/core/modules/migrate/tests/modules/migrate_track_changes_test/migrations/track_changes_test.yml
index 31d03476f..52917e7b2 100644
--- a/web/core/modules/migrate/tests/modules/migrate_track_changes_test/migrations/track_changes_test.yml
+++ b/web/core/modules/migrate/tests/modules/migrate_track_changes_test/migrations/track_changes_test.yml
@@ -3,6 +3,7 @@ label: Track changes test.
 source:
   plugin: track_changes_test
   track_changes: true
+  batch_size: 1
 destination:
   plugin: entity:taxonomy_term
 migration_tags:
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentBaseTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentBaseTest.php
index b5fb3ec25..df326502b 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentBaseTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateEntityContentBaseTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\migrate\Kernel;
 
+use Drupal\Core\Entity\EntityFieldManager;
 use Drupal\entity_test\Entity\EntityTestMul;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\language\Entity\ConfigurableLanguage;
@@ -10,6 +11,7 @@
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
+use Drupal\migrate_drupal\Tests\StubTestTrait;
 use Drupal\migrate_entity_test\Entity\StringIdEntityTest;
 
 /**
@@ -19,6 +21,8 @@
  */
 class MigrateEntityContentBaseTest extends KernelTestBase {
 
+  use StubTestTrait;
+
   /**
    * Modules to enable.
    *
@@ -324,4 +328,48 @@ public function testAccountSwitcherBackwardsCompatibility() {
     $this->assertInstanceOf(EntityContentBase::class, $destination);
   }
 
+  /**
+   * Tests bundle is properly provided for stubs without bundle support.
+   *
+   * @todo Remove this test in when native PHP type-hints will be added for
+   *   EntityFieldManagerInterface::getFieldDefinitions(). See
+   *   https://www.drupal.org/project/drupal/issues/3050720.
+   */
+  public function testBundleFallbackForStub(): void {
+    $this->enableModules(['migrate_entity_test']);
+    $this->installEntitySchema('migrate_string_id_entity_test');
+
+    $entity_type_manager = $this->container->get('entity_type.manager');
+    $entity_type_bundle_info = $this->container->get('entity_type.bundle.info');
+    $entity_display_repository = $this
+      ->container
+      ->get('entity_display.repository');
+    $typed_data_manager = $this->container->get('typed_data_manager');
+    $language_manager = $this->container->get('language_manager');
+    $keyvalue = $this->container->get('keyvalue');
+    $module_handler = $this->container->get('module_handler');
+    $cache_discovery = $this->container->get('cache.discovery');
+    $entity_last_installed_schema_repository = $this
+      ->container
+      ->get('entity.last_installed_schema.repository');
+
+    $decorated_entity_field_manager = new class ($entity_type_manager, $entity_type_bundle_info, $entity_display_repository, $typed_data_manager, $language_manager, $keyvalue, $module_handler, $cache_discovery, $entity_last_installed_schema_repository) extends EntityFieldManager {
+
+      /**
+       * {@inheritdoc}
+       */
+      public function getFieldDefinitions($entity_type_id, $bundle) {
+        if (\is_null($bundle)) {
+          throw new \Exception("Bundle value shouldn't be NULL.");
+        }
+
+        return parent::getFieldDefinitions($entity_type_id, $bundle);
+      }
+
+    };
+
+    $this->container->set('entity_field.manager', $decorated_entity_field_manager);
+    $this->createEntityStub('migrate_string_id_entity_test');
+  }
+
 }
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateExecutableTest.php b/web/core/modules/migrate/tests/src/Kernel/MigrateExecutableTest.php
index 65e3f1314..90f16acf7 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateExecutableTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateExecutableTest.php
@@ -16,6 +16,9 @@ class MigrateExecutableTest extends MigrateTestBase {
     'user',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
diff --git a/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php b/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
index fcae35cb6..ba11c234a 100644
--- a/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
+++ b/web/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
@@ -97,7 +97,7 @@ public function testSource(array $source_data, array $expected_data, $expected_c
     /** @var MemoryCounterBackend $cache **/
     $cache = \Drupal::cache('migrate');
     if ($expected_cache_key) {
-      // Verify the the computed cache key.
+      // Verify the computed cache key.
       $property = $reflector->getProperty('cacheKey');
       $property->setAccessible(TRUE);
       $this->assertSame($expected_cache_key, $property->getValue($plugin));
diff --git a/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php b/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
index 65987ab60..1fee2243f 100644
--- a/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/Plugin/MigrationPluginListTest.php
@@ -55,6 +55,7 @@ class MigrationPluginListTest extends KernelTestBase {
     'system',
     'taxonomy',
     'text',
+    // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     'tracker',
     'update',
     'user',
diff --git a/web/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php b/web/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php
index 42f7c4626..6267771c4 100644
--- a/web/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/Plugin/id_map/SqlTest.php
@@ -87,7 +87,7 @@ public function testEnsureTables($ids) {
     $this->migrationDefinition['source']['ids'] = $ids;
     $migration = $this->migrationPluginManager->createStubMigration($this->migrationDefinition);
 
-    $map = new TestSqlIdMap($this->database, [], 'test', [], $migration, $this->eventDispatcher);
+    $map = new TestSqlIdMap($this->database, [], 'test', [], $migration, $this->eventDispatcher, $this->migrationPluginManager);
     $map->ensureTables();
 
     // Checks that the map table was created.
@@ -149,7 +149,7 @@ public function testFailEnsureTables($ids) {
       ->createStubMigration($this->migrationDefinition);
 
     // Use local id map plugin to force an error.
-    $map = new SqlIdMapTest($this->database, [], 'test', [], $migration, $this->eventDispatcher);
+    $map = new SqlIdMapTest($this->database, [], 'test', [], $migration, $this->eventDispatcher, $this->migrationPluginManager);
 
     $this->expectException(DatabaseExceptionWrapper::class);
     $this->expectExceptionMessage("Syntax error or access violation: 1074 Column length too big for column 'sourceid1' (max = 16383); use BLOB or TEXT instead:");
diff --git a/web/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php b/web/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php
index 46be5bc67..6a692d581 100644
--- a/web/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php
+++ b/web/core/modules/migrate/tests/src/Kernel/TrackChangesTest.php
@@ -143,7 +143,7 @@ public function testTrackChanges() {
       ->execute();
 
     // Execute migration again.
-    $this->executeMigration('track_changes_test');
+    $this->executeMigration($this->migration);
 
     // Check that the all the hashes except for 'Item 2'and 'Item 4' have
     // changed.
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
index 5999e7af8..073a21a4a 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
@@ -89,7 +89,7 @@ public function testImportWithFailingRewind() {
 
     $this->migration->expects($this->any())
       ->method('getSourcePlugin')
-      ->will($this->returnValue($source));
+      ->willReturn($source);
 
     // Ensure that a message with the proper message was added.
     $exception_message .= " in " . __FILE__ . " line $line";
@@ -115,7 +115,7 @@ public function testImportWithValidRow() {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $destination = $this->createMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
 
@@ -140,7 +140,7 @@ public function testImportWithValidRowWithoutDestinationId() {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $destination = $this->createMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
 
@@ -168,7 +168,7 @@ public function testImportWithValidRowNoDestinationValues() {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $destination = $this->createMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
 
@@ -196,7 +196,7 @@ public function testImportWithValidRowWithDestinationMigrateException() {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $destination = $this->createMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
 
@@ -270,7 +270,7 @@ public function testImportWithValidRowWithException() {
 
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $destination = $this->createMock('Drupal\migrate\Plugin\MigrateDestinationInterface');
 
@@ -293,15 +293,15 @@ public function testProcessRow() {
       $plugins[$key][0] = $this->createMock('Drupal\migrate\Plugin\MigrateProcessInterface');
       $plugins[$key][0]->expects($this->once())
         ->method('getPluginDefinition')
-        ->will($this->returnValue([]));
+        ->willReturn([]);
       $plugins[$key][0]->expects($this->once())
         ->method('transform')
-        ->will($this->returnValue($value));
+        ->willReturn($value);
     }
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
       ->with(NULL)
-      ->will($this->returnValue($plugins));
+      ->willReturn($plugins);
     $row = new Row();
     $this->executable->processRow($row);
     foreach ($expected as $key => $value) {
@@ -317,7 +317,7 @@ public function testProcessRowEmptyPipeline() {
     $this->migration->expects($this->once())
       ->method('getProcessPlugins')
       ->with(NULL)
-      ->will($this->returnValue(['test' => []]));
+      ->willReturn(['test' => []]);
     $row = new Row();
     $this->executable->processRow($row);
     $this->assertSame($row->getDestination(), []);
@@ -386,10 +386,10 @@ protected function getMockSource() {
       ->getMockForAbstractClass();
     $source->expects($this->once())
       ->method('rewind')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $source->expects($this->any())
       ->method('initializeIterator')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $source->expects($this->any())
       ->method('valid')
       ->will($this->onConsecutiveCalls(TRUE, FALSE));
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
index 8f5d2e627..9042419f8 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -421,8 +421,7 @@ public function testPrepareRowPrepareException() {
   }
 
   /**
-   * Tests that cacheCounts, skipCount, trackChanges preserve their default
-   * values.
+   * Tests that default values are preserved for several source methods.
    */
   public function testDefaultPropertiesValues() {
     $this->migrationConfiguration['id'] = 'test_migration';
@@ -500,8 +499,10 @@ protected function initializeIterator() {
 }
 
 /**
- * Stubbed source plugin with a generator as iterator. Also it overwrites the
- * $skipCount, $cacheCounts and $trackChanges properties.
+ * Defines a stubbed source plugin with a generator as iterator.
+ *
+ * This stub overwrites the $skipCount, $cacheCounts, and $trackChanges
+ * properties.
  */
 class StubSourceGeneratorPlugin extends StubSourcePlugin {
 
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php
index 2963547dc..cdcbc4468 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapEnsureTablesTest.php
@@ -208,13 +208,13 @@ protected function runEnsureTablesTest($schema) {
     $plugin->expects($this->any())
       ->method('getIds')
       ->willReturn([
-      'source_id_property' => [
-        'type' => 'integer',
-      ],
-      'source_id_property_2' => [
-        'type' => 'integer',
-      ],
-    ]);
+        'source_id_property' => [
+          'type' => 'integer',
+        ],
+        'source_id_property_2' => [
+          'type' => 'integer',
+        ],
+      ]);
     $migration->expects($this->any())
       ->method('getSourcePlugin')
       ->willReturn($plugin);
@@ -222,16 +222,17 @@ protected function runEnsureTablesTest($schema) {
     $plugin->expects($this->any())
       ->method('getIds')
       ->willReturn([
-      'destination_id_property' => [
-        'type' => 'string',
-      ],
-    ]);
+        'destination_id_property' => [
+          'type' => 'string',
+        ],
+      ]);
     $migration->expects($this->any())
       ->method('getDestinationPlugin')
       ->willReturn($plugin);
     /** @var \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher */
     $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface');
-    $map = new TestSqlIdMap($database, [], 'sql', [], $migration, $event_dispatcher);
+    $migration_manager = $this->createMock('Drupal\migrate\Plugin\MigrationPluginManagerInterface');
+    $map = new TestSqlIdMap($database, [], 'sql', [], $migration, $event_dispatcher, $migration_manager);
     $map->getDatabase();
   }
 
diff --git a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
index 7908fd912..f05ed19c7 100644
--- a/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/MigrateSqlIdMapTest.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\Tests\migrate\Unit;
 
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\sqlite\Driver\Database\sqlite\Connection;
+use Drupal\migrate\Plugin\MigrationPluginManager;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
@@ -111,8 +113,9 @@ protected function getIdMap() {
       ->method('getDestinationPlugin')
       ->willReturn($plugin);
     $event_dispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface');
+    $migration_manager = $this->createMock('Drupal\migrate\Plugin\MigrationPluginManagerInterface');
 
-    $id_map = new TestSqlIdMap($this->database, [], 'sql', [], $migration, $event_dispatcher);
+    $id_map = new TestSqlIdMap($this->database, [], 'sql', [], $migration, $event_dispatcher, $migration_manager);
     $migration
       ->method('getIdMap')
       ->willReturn($id_map);
@@ -1176,4 +1179,20 @@ public function getHighestIdInvalidDataProvider() {
     ];
   }
 
+  /**
+   * Tests deprecation message from Sql::getMigrationPluginManager().
+   *
+   * @group legacy
+   */
+  public function testGetMigrationPluginManagerDeprecation() {
+    $container = new ContainerBuilder();
+    $migration_plugin_manager = $this->createMock(MigrationPluginManager::class);
+    $container->set('plugin.manager.migration', $migration_plugin_manager);
+    \Drupal::setContainer($container);
+
+    $this->expectDeprecation('deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use $this->migrationPluginManager instead. See https://www.drupal.org/node/3277306');
+    $id_map = $this->getIdMap();
+    $id_map->getMigrationPluginManager();
+  }
+
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/RowTest.php b/web/core/modules/migrate/tests/src/Unit/RowTest.php
index 1770ccd9b..6bf26e94e 100644
--- a/web/core/modules/migrate/tests/src/Unit/RowTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/RowTest.php
@@ -236,29 +236,29 @@ public function testSourceIdValues() {
   public function testMultipleSourceIdValues() {
     // Set values in same order as ids.
     $multi_source_ids = $this->testSourceIds + [
-        'vid' => 'Node revision',
-        'type' => 'Node type',
-        'langcode' => 'Node language',
-      ];
+      'vid' => 'Node revision',
+      'type' => 'Node type',
+      'langcode' => 'Node language',
+    ];
     $multi_source_ids_values = $this->testValues + [
-        'vid' => 1,
-        'type' => 'page',
-        'langcode' => 'en',
-      ];
+      'vid' => 1,
+      'type' => 'page',
+      'langcode' => 'en',
+    ];
     $row = new Row($multi_source_ids_values, $multi_source_ids);
     $this->assertSame(array_keys($multi_source_ids), array_keys($row->getSourceIdValues()));
 
     // Set values in different order.
     $multi_source_ids = $this->testSourceIds + [
-        'vid' => 'Node revision',
-        'type' => 'Node type',
-        'langcode' => 'Node language',
-      ];
+      'vid' => 'Node revision',
+      'type' => 'Node type',
+      'langcode' => 'Node language',
+    ];
     $multi_source_ids_values = $this->testValues + [
-        'langcode' => 'en',
-        'type' => 'page',
-        'vid' => 1,
-      ];
+      'langcode' => 'en',
+      'type' => 'page',
+      'vid' => 1,
+    ];
     $row = new Row($multi_source_ids_values, $multi_source_ids);
     $this->assertSame(array_keys($multi_source_ids), array_keys($row->getSourceIdValues()));
   }
diff --git a/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php b/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
index 1716a8785..433b3907e 100644
--- a/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
+++ b/web/core/modules/migrate/tests/src/Unit/TestSqlIdMap.php
@@ -6,6 +6,7 @@
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\id_map\Sql;
+use Drupal\migrate\Plugin\MigrationPluginManagerInterface;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
@@ -28,10 +29,12 @@ class TestSqlIdMap extends Sql implements \Iterator {
    *   The migration to do.
    * @param \Symfony\Contracts\EventDispatcher\EventDispatcherInterface $event_dispatcher
    *   The event dispatcher service.
+   * @param \Drupal\migrate\Plugin\MigrationPluginManagerInterface $migration_manager
+   *   The migration manager.
    */
-  public function __construct(Connection $database, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher) {
+  public function __construct(Connection $database, array $configuration, $plugin_id, $plugin_definition, MigrationInterface $migration, EventDispatcherInterface $event_dispatcher, MigrationPluginManagerInterface $migration_manager) {
     $this->database = $database;
-    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $event_dispatcher);
+    parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $event_dispatcher, $migration_manager);
   }
 
   /**
@@ -88,4 +91,11 @@ public function ensureTables() {
     parent::ensureTables();
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getMigrationPluginManager() {
+    return parent::getMigrationPluginManager();
+  }
+
 }
diff --git a/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php b/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
index d55c21197..cf3f77b5b 100644
--- a/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/destination/ConfigTest.php
@@ -29,7 +29,7 @@ public function testImport() {
       $config->expects($this->once())
         ->method('set')
         ->with($this->equalTo($key), $this->equalTo($val))
-        ->will($this->returnValue($config));
+        ->willReturn($config);
     }
     $config->expects($this->once())
       ->method('save');
@@ -40,20 +40,20 @@ public function testImport() {
     $config_factory->expects($this->once())
       ->method('getEditable')
       ->with('d8_config')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $row = $this->getMockBuilder('Drupal\migrate\Row')
       ->disableOriginalConstructor()
       ->getMock();
     $row->expects($this->any())
       ->method('getRawDestination')
-      ->will($this->returnValue($source));
+      ->willReturn($source);
     $language_manager = $this->getMockBuilder('Drupal\language\ConfigurableLanguageManagerInterface')
       ->disableOriginalConstructor()
       ->getMock();
     $language_manager->expects($this->never())
       ->method('getLanguageConfigOverride')
       ->with('fr', 'd8_config')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $destination = new Config(['config_name' => 'd8_config'], 'd8_config', ['pluginId' => 'd8_config'], $migration, $config_factory, $language_manager);
     $destination_id = $destination->import($row);
     $this->assertEquals(['d8_config'], $destination_id);
@@ -76,7 +76,7 @@ public function testLanguageImport() {
       $config->expects($this->once())
         ->method('set')
         ->with($this->equalTo($key), $this->equalTo($val))
-        ->will($this->returnValue($config));
+        ->willReturn($config);
     }
     $config->expects($this->once())
       ->method('save');
@@ -87,23 +87,23 @@ public function testLanguageImport() {
     $config_factory->expects($this->once())
       ->method('getEditable')
       ->with('d8_config')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $row = $this->getMockBuilder('Drupal\migrate\Row')
       ->disableOriginalConstructor()
       ->getMock();
     $row->expects($this->any())
       ->method('getRawDestination')
-      ->will($this->returnValue($source));
+      ->willReturn($source);
     $row->expects($this->any())
       ->method('getDestinationProperty')
-      ->will($this->returnValue($source['langcode']));
+      ->willReturn($source['langcode']);
     $language_manager = $this->getMockBuilder('Drupal\language\ConfigurableLanguageManagerInterface')
       ->disableOriginalConstructor()
       ->getMock();
     $language_manager->expects($this->any())
       ->method('getLanguageConfigOverride')
       ->with('mi', 'd8_config')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $destination = new Config(['config_name' => 'd8_config', 'translations' => 'true'], 'd8_config', ['pluginId' => 'd8_config'], $migration, $config_factory, $language_manager);
     $destination_id = $destination->import($row);
     $this->assertEquals(['d8_config', 'mi'], $destination_id);
diff --git a/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php b/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
index 94a96a9c0..374db8a94 100644
--- a/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/destination/EntityRevisionTest.php
@@ -51,6 +51,9 @@ class EntityRevisionTest extends UnitTestCase {
    */
   protected $accountSwitcher;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php b/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
index 27a640ccb..426f45631 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/ExplodeTest.php
@@ -89,8 +89,7 @@ public function providerExplodeWithNonStrictAndEmptySource() {
   }
 
   /**
-   * Tests that explode raises an exception when the value cannot be casted to
-   * string.
+   * Tests Explode exception handling when string-cast fails.
    */
   public function testExplodeWithNonStrictAndNonCastable() {
     $plugin = new Explode(['delimiter' => '|', 'strict' => FALSE], 'map', []);
@@ -101,8 +100,7 @@ public function testExplodeWithNonStrictAndNonCastable() {
   }
 
   /**
-   * Tests that explode with an empty string and strict check returns a
-   * non-empty array.
+   * Tests Explode return values with an empty string and strict check.
    */
   public function testExplodeWithStrictAndEmptyString() {
     $plugin = new Explode(['delimiter' => '|'], 'map', []);
diff --git a/web/core/modules/migrate/tests/src/Unit/process/GetTest.php b/web/core/modules/migrate/tests/src/Unit/process/GetTest.php
index f9793bb8e..0e6a0fa2d 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/GetTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/GetTest.php
@@ -18,7 +18,7 @@ public function testTransformSourceString() {
     $this->row->expects($this->once())
       ->method('get')
       ->with('test')
-      ->will($this->returnValue('source_value'));
+      ->willReturn('source_value');
     $this->plugin = new Get(['source' => 'test'], '', []);
     $value = $this->plugin->transform(NULL, $this->migrateExecutable, $this->row, 'destination_property');
     $this->assertSame('source_value', $value);
@@ -49,7 +49,7 @@ public function testTransformSourceStringAt() {
     $this->row->expects($this->once())
       ->method('get')
       ->with('@@test')
-      ->will($this->returnValue('source_value'));
+      ->willReturn('source_value');
     $this->plugin = new Get(['source' => '@@test'], '', []);
     $value = $this->plugin->transform(NULL, $this->migrateExecutable, $this->row, 'destination_property');
     $this->assertSame('source_value', $value);
@@ -113,8 +113,9 @@ public function integerValuesDataProvider() {
   }
 
   /**
-   * Tests the Get plugin for syntax errors, e.g. "Invalid tag_line detected" by
-   * creating a prophecy of the class.
+   * Tests the Get plugin for syntax errors by creating a prophecy of the class.
+   *
+   * An example of a syntax error is "Invalid tag_line detected".
    */
   public function testPluginSyntax() {
     $this->assertNotNull($this->prophesize(Get::class));
diff --git a/web/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php b/web/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php
index 05a5a8d53..465de7e3d 100644
--- a/web/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php
+++ b/web/core/modules/migrate/tests/src/Unit/process/MakeUniqueEntityFieldTest.php
@@ -162,10 +162,10 @@ public function providerTestMakeUniqueEntityField() {
   protected function entityQueryExpects($count) {
     $this->entityQuery->expects($this->exactly($count + 1))
       ->method('condition')
-      ->will($this->returnValue($this->entityQuery));
+      ->willReturn($this->entityQuery);
     $this->entityQuery->expects($this->exactly($count + 1))
       ->method('count')
-      ->will($this->returnValue($this->entityQuery));
+      ->willReturn($this->entityQuery);
     $this->entityQuery->expects($this->exactly($count + 1))
       ->method('execute')
       ->willReturnCallback(function () use (&$count) {
diff --git a/web/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml b/web/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
index f5b5a1eac..a0c39a3c5 100644
--- a/web/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
+++ b/web/core/modules/migrate_drupal/migrations/state/migrate_drupal.migrate_drupal.yml
@@ -37,6 +37,7 @@ finished:
     ping: core
     poll: core
     throttle: core
+    # @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     tracker: core
     translation: core
     trigger: core
diff --git a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
index 0df37ea25..14efa3d16 100644
--- a/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/web/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -104,18 +104,18 @@ public static function create(ContainerInterface $container, array $configuratio
   public function checkRequirements() {
     parent::checkRequirements();
     if ($this->pluginDefinition['requirements_met'] === TRUE) {
-      if (isset($this->pluginDefinition['source_module'])) {
-        if ($this->moduleExists($this->pluginDefinition['source_module'])) {
+      if ($source_module = $this->getSourceModule()) {
+        if ($this->moduleExists($source_module)) {
           if (isset($this->pluginDefinition['minimum_version'])) {
-            $minimum_version = $this->pluginDefinition['minimum_version'];
-            $installed_version = $this->getModuleSchemaVersion($this->pluginDefinition['source_module']);
+            $minimum_version = (int) $this->pluginDefinition['minimum_version'];
+            $installed_version = (int) $this->getModuleSchemaVersion($source_module);
             if ($minimum_version > $installed_version) {
               throw new RequirementsException('Required minimum version ' . $this->pluginDefinition['minimum_version'], ['minimum_version' => $this->pluginDefinition['minimum_version']]);
             }
           }
         }
         else {
-          throw new RequirementsException('The module ' . $this->pluginDefinition['source_module'] . ' is not enabled in the source site.', ['source_module' => $this->pluginDefinition['source_module']]);
+          throw new RequirementsException('The module ' . $source_module . ' is not enabled in the source site.', ['source_module' => $source_module]);
         }
       }
     }
diff --git a/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php b/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
index d334aff67..1f026ada9 100644
--- a/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
+++ b/web/core/modules/migrate_drupal/src/Tests/StubTestTrait.php
@@ -10,7 +10,7 @@
 trait StubTestTrait {
 
   /**
-   * Tests that a stub of the given entity type results in a valid entity.
+   * Tests that creating a stub of an entity type results in a valid entity.
    *
    * @param string $entity_type_id
    *   The entity type we are stubbing.
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
index 0badecba7..85503493c 100644
--- a/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal6.php
@@ -2963,6 +2963,18 @@
   'active' => '1',
   'locked' => '0',
 ))
+->values(array(
+  'field_name' => 'field_company_4',
+  'type' => 'nodereference',
+  'global_settings' => 'a:1:{s:19:"referenceable_types";a:10:{s:7:"company";s:7:"company";s:7:"article";i:0;s:8:"employee";i:0;s:5:"forum";i:0;s:10:"test_event";i:0;s:9:"test_page";i:0;s:11:"test_planet";i:0;s:10:"test_story";i:0;s:7:"sponsor";i:0;s:5:"story";i:0;}}',
+  'required' => '0',
+  'multiple' => '0',
+  'db_storage' => '1',
+  'module' => 'nodereference',
+  'db_columns' => 'a:1:{s:3:"nid";a:4:{s:4:"type";s:3:"int";s:8:"unsigned";b:1;s:8:"not null";b:0;s:5:"index";b:1;}}',
+  'active' => '1',
+  'locked' => '0',
+))
 ->values(array(
   'field_name' => 'field_multivalue',
   'type' => 'number_decimal',
@@ -3440,6 +3452,18 @@
   'widget_module' => 'nodereference',
   'widget_active' => '1',
 ))
+->values(array(
+  'field_name' => 'field_company_4',
+  'type_name' => 'employee',
+  'weight' => '36',
+  'label' => 'Company 4',
+  'widget_type' => 'nodereference_url',
+  'widget_settings' => 'a:7:{s:18:"autocomplete_match";s:8:"contains";s:4:"size";s:2:"60";s:13:"default_value";a:1:{i:0;a:2:{s:3:"nid";N;s:14:"_error_element";s:50:"default_value_widget][field_company_4][0][nid][nid";}}s:17:"default_value_php";N;s:9:"node_link";a:5:{s:6:"teaser";i:0;s:4:"full";i:1;s:5:"title";s:14:"Company create";s:11:"hover_title";s:0:"";s:11:"destination";s:4:"node";}s:8:"fallback";s:12:"autocomplete";s:13:"edit_fallback";i:1;}',
+  'display_settings' => 'a:5:{s:5:"label";a:2:{s:6:"format";s:5:"above";s:7:"exclude";i:0;}i:5;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:6:"teaser";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}s:4:"full";a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}i:4;a:2:{s:6:"format";s:7:"default";s:7:"exclude";i:0;}}',
+  'description' => '',
+  'widget_module' => 'nodereference',
+  'widget_active' => '1',
+))
 ->values(array(
   'field_name' => 'field_multivalue',
   'type_name' => 'test_planet',
@@ -3847,6 +3871,12 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
+    'field_company_4_nid' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
     'field_sync_email' => array(
       'type' => 'varchar',
       'not null' => FALSE,
@@ -3869,6 +3899,9 @@
     'field_company_3_nid' => array(
       'field_company_3_nid',
     ),
+    'field_company_4_nid' => array(
+      'field_company_4_nid',
+    ),
   ),
   'mysql_character_set' => 'utf8',
 ));
@@ -3880,6 +3913,7 @@
   'field_commander_uid',
   'field_company_2_nid',
   'field_company_3_nid',
+  'field_company_4_nid',
   'field_sync_email',
 ))
 ->values(array(
@@ -3888,6 +3922,7 @@
   'field_commander_uid' => '8',
   'field_company_2_nid' => '15',
   'field_company_3_nid' => '16',
+  'field_company_4_nid' => '16',
   'field_sync_email' => NULL,
 ))
 ->values(array(
@@ -3896,6 +3931,7 @@
   'field_commander_uid' => NULL,
   'field_company_2_nid' => NULL,
   'field_company_3_nid' => NULL,
+  'field_company_4_nid' => NULL,
   'field_sync_email' => 'jsmith@example.com',
 ))
 ->values(array(
@@ -3904,6 +3940,7 @@
   'field_commander_uid' => NULL,
   'field_company_2_nid' => NULL,
   'field_company_3_nid' => NULL,
+  'field_company_4_nid' => NULL,
   'field_sync_email' => 'jsmith@example.com',
 ))
 ->execute();
@@ -48073,6 +48110,18 @@
   'weight' => '0',
   'info' => 'a:13:{s:4:"name";s:10:"Pushbutton";s:11:"description";s:52:"Tabled, multi-column theme in blue and orange tones.";s:7:"version";s:4:"6.38";s:4:"core";s:3:"6.x";s:6:"engine";s:11:"phptemplate";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1456343372";s:7:"regions";a:5:{s:4:"left";s:12:"Left sidebar";s:5:"right";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";}s:8:"features";a:10:{i:0;s:20:"comment_user_picture";i:1;s:7:"favicon";i:2;s:7:"mission";i:3;s:4:"logo";i:4;s:4:"name";i:5;s:17:"node_user_picture";i:6;s:6:"search";i:7;s:6:"slogan";i:8;s:13:"primary_links";i:9;s:15:"secondary_links";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"style.css";s:27:"themes/pushbutton/style.css";}}s:7:"scripts";a:1:{s:9:"script.js";s:27:"themes/pushbutton/script.js";}s:10:"screenshot";s:32:"themes/pushbutton/screenshot.png";s:3:"php";s:5:"4.3.5";}',
 ))
+->values(array(
+  'filename' => 'sites/all/modules/nodereference_url/nodereference_url.module',
+  'name' => 'nodereference_url',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '6100',
+  'weight' => '0',
+  'info' => 'a:8:{s:4:"name";s:25:"Node Reference URL Widget";s:11:"description";s:99:"Adds an additional widget to the CCK Node Reference field that prepopulates a reference by the URL.";s:12:"dependencies";a:1:{i:0;s:13:"nodereference";}s:7:"package";s:3:"CCK";s:4:"core";s:3:"6.x";s:10:"dependents";a:0:{}s:7:"version";N;s:3:"php";s:5:"4.3.5";}',
+))
 ->execute();
 $connection->schema()->createTable('term_data', array(
   'fields' => array(
diff --git a/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php b/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
index 26a5b50fd..6e85c3661 100644
--- a/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
+++ b/web/core/modules/migrate_drupal/tests/fixtures/drupal7.php
@@ -4,12 +4,18 @@
  * @file
  * A database agnostic dump for testing purposes.
  *
- * This file was generated by the Drupal 9.3.0-dev db-tools.php script.
+ * This file was generated by the Drupal 9.5.0-dev db-tools.php script.
  */
 
 use Drupal\Core\Database\Database;
 
 $connection = Database::getConnection();
+// Ensure any tables with a serial column with a value of 0 are created as
+// expected.
+if ($connection->databaseType() === 'mysql') {
+  $sql_mode = $connection->query("SELECT @@sql_mode;")->fetchField();
+  $connection->query("SET sql_mode = '$sql_mode,NO_AUTO_VALUE_ON_ZERO'");
+}
 
 $connection->schema()->createTable('accesslog', array(
   'fields' => array(
@@ -72,305 +78,6 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('accesslog')
-->fields(array(
-  'aid',
-  'sid',
-  'title',
-  'path',
-  'url',
-  'hostname',
-  'uid',
-  'timer',
-  'timestamp',
-))
-->values(array(
-  'aid' => '92',
-  'sid' => 'a8ksMY2GH4yXK0-PsLNAlCv4zNnapnyCpx4lryZDEfk',
-  'title' => '',
-  'path' => 'node',
-  'url' => 'http://drupal7.local/?q=user/register',
-  'hostname' => '127.0.0.1',
-  'uid' => '0',
-  'timer' => '655',
-  'timestamp' => '1444944970',
-))
-->values(array(
-  'aid' => '93',
-  'sid' => 'e89G2redQpxRTIndbV3qH8snVR621DqSQ2s4vciJedA',
-  'title' => '',
-  'path' => 'node',
-  'url' => 'http://drupal7.local/',
-  'hostname' => '127.0.0.1',
-  'uid' => '0',
-  'timer' => '214',
-  'timestamp' => '1444944974',
-))
-->values(array(
-  'aid' => '94',
-  'sid' => 'KkVxQTCiKqKEGNcRs7GYrmXXbEk4szXCHVTknFkbiG0',
-  'title' => 'User account',
-  'path' => 'user/login',
-  'url' => '',
-  'hostname' => '127.0.0.1',
-  'uid' => '0',
-  'timer' => '259',
-  'timestamp' => '1444945094',
-))
-->values(array(
-  'aid' => '95',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'My account',
-  'path' => 'user/login',
-  'url' => 'http://drupal7.local/?q=user/login',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '217',
-  'timestamp' => '1444945097',
-))
-->values(array(
-  'aid' => '96',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'root',
-  'path' => 'user/1',
-  'url' => 'http://drupal7.local/?q=user/login',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '211',
-  'timestamp' => '1444945097',
-))
-->values(array(
-  'aid' => '97',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Modules',
-  'path' => 'admin/modules',
-  'url' => 'http://drupal7.local/user/1',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '619',
-  'timestamp' => '1444945104',
-))
-->values(array(
-  'aid' => '98',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Configuration',
-  'path' => 'admin/config',
-  'url' => 'http://drupal7.local/admin/modules',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '273',
-  'timestamp' => '1444945114',
-))
-->values(array(
-  'aid' => '99',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language',
-  'url' => 'http://drupal7.local/admin/config',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '213',
-  'timestamp' => '1444945121',
-))
-->values(array(
-  'aid' => '100',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language/add',
-  'url' => 'http://drupal7.local/admin/config/regional/language',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '148',
-  'timestamp' => '1444945122',
-))
-->values(array(
-  'aid' => '101',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language/add',
-  'url' => 'http://drupal7.local/admin/config/regional/language/add',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '260',
-  'timestamp' => '1444945153',
-))
-->values(array(
-  'aid' => '102',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language/add',
-  'url' => '',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '195',
-  'timestamp' => '1444945160',
-))
-->values(array(
-  'aid' => '103',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language/add',
-  'url' => 'http://drupal7.local/?q=admin/config/regional/language/add',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '177',
-  'timestamp' => '1444945168',
-))
-->values(array(
-  'aid' => '104',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language',
-  'url' => 'http://drupal7.local/?q=admin/config/regional/language/add',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '145',
-  'timestamp' => '1444945168',
-))
-->values(array(
-  'aid' => '105',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language',
-  'url' => '',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '159',
-  'timestamp' => '1444945175',
-))
-->values(array(
-  'aid' => '106',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language',
-  'url' => 'http://drupal7.local/?q=admin/config/regional/language',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '152',
-  'timestamp' => '1444945176',
-))
-->values(array(
-  'aid' => '107',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Languages',
-  'path' => 'admin/config/regional/language',
-  'url' => 'http://drupal7.local/?q=admin/config/regional/language',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '148',
-  'timestamp' => '1444945176',
-))
-->values(array(
-  'aid' => '108',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Structure',
-  'path' => 'admin/structure',
-  'url' => 'http://drupal7.local/admin/config/regional/language',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '156',
-  'timestamp' => '1444945206',
-))
-->values(array(
-  'aid' => '109',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Content types',
-  'path' => 'admin/structure/types',
-  'url' => 'http://drupal7.local/admin/structure',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '154',
-  'timestamp' => '1444945208',
-))
-->values(array(
-  'aid' => '110',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Blog entry',
-  'path' => 'admin/structure/types/manage/blog',
-  'url' => 'http://drupal7.local/admin/structure/types',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '203',
-  'timestamp' => '1444945211',
-))
-->values(array(
-  'aid' => '111',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Parent menu items',
-  'path' => 'admin/structure/menu/parents',
-  'url' => 'http://drupal7.local/admin/structure/types/manage/blog',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '211',
-  'timestamp' => '1444945211',
-))
-->values(array(
-  'aid' => '112',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Blog entry',
-  'path' => 'admin/structure/types/manage/blog',
-  'url' => 'http://drupal7.local/admin/structure/types/manage/blog',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '224',
-  'timestamp' => '1444945236',
-))
-->values(array(
-  'aid' => '113',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Parent menu items',
-  'path' => 'admin/structure/menu/parents',
-  'url' => 'http://drupal7.local/admin/structure/types/manage/blog',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '165',
-  'timestamp' => '1444945237',
-))
-->values(array(
-  'aid' => '114',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Blog entry',
-  'path' => 'admin/structure/types/manage/blog',
-  'url' => '',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '155',
-  'timestamp' => '1444945242',
-))
-->values(array(
-  'aid' => '115',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Parent menu items',
-  'path' => 'admin/structure/menu/parents',
-  'url' => 'http://drupal7.local/?q=admin/structure/types/manage/blog',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '217',
-  'timestamp' => '1444945242',
-))
-->values(array(
-  'aid' => '116',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Blog entry',
-  'path' => 'admin/structure/types/manage/blog',
-  'url' => 'http://drupal7.local/?q=admin/structure/types/manage/blog',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '667',
-  'timestamp' => '1444945246',
-))
-->values(array(
-  'aid' => '117',
-  'sid' => 'FA1BMWZvsAAE1G-OBMzfiJyA12sh588cOKSmEmxFQiA',
-  'title' => 'Content types',
-  'path' => 'admin/structure/types',
-  'url' => 'http://drupal7.local/?q=admin/structure/types/manage/blog',
-  'hostname' => '127.0.0.1',
-  'uid' => '1',
-  'timer' => '149',
-  'timestamp' => '1444945246',
-))
-->execute();
 $connection->schema()->createTable('actions', array(
   'fields' => array(
     'aid' => array(
@@ -722,13 +429,13 @@
   'title' => 'Know Your Meme',
   'url' => 'http://knowyourmeme.com/newsfeed.rss',
   'refresh' => '900',
-  'checked' => '1444944970',
+  'checked' => '1664931769',
   'queued' => '0',
-  'link' => 'http://knowyourmeme.com',
+  'link' => 'https://knowyourmeme.com',
   'description' => 'New items added to the News Feed',
   'image' => '',
-  'hash' => 'e6295b3ba81b24db62b41515494a7e9fb87979ff45045a1c946de5fa5abc9c52',
-  'etag' => '"bad5e20e4993f31c869cffd22f1645b9"',
+  'hash' => 'c753aa16060da2c47b3258a912b84e609667ae7c332f2bbbb42bc59052ad4cf6',
+  'etag' => '"2ed1a6a90557f4ece3b94535ce371b03"',
   'modified' => '0',
   'block' => '5',
 ))
@@ -896,6 +603,106 @@
   'timestamp' => '1444944831',
   'guid' => 'post:18829',
 ))
+->values(array(
+  'iid' => '22',
+  'fid' => '1',
+  'title' => 'Jinkies',
+  'link' => 'https://knowyourmeme.com/photos/2452904-homophobic-dog-not-too-fond-of-gay-people',
+  'author' => '',
+  'description' => '<img alt="40f" src="https://i.kym-cdn.com/photos/images/newsfeed/002/452/904/40f.jpg" />',
+  'timestamp' => '1664916608',
+  'guid' => 'post:65743',
+))
+->values(array(
+  'iid' => '23',
+  'fid' => '1',
+  'title' => "What Is The 'Completely Unorganized Playlist' Meme And Is Spotify Scared?",
+  'link' => 'https://knowyourmeme.com/editorials/guides/what-is-the-completely-unorganized-playlist-meme-and-is-spotify-scared',
+  'author' => '',
+  'description' => "<img alt=\"Completelyunorganizedplaylistexplained\" src=\"https://i.kym-cdn.com/editorials/icons/mobile/000/004/864/completelyunorganizedplaylistexplained.jpg\" /><p>It's totally normal to have a 400-hour-long Spotify playlist. The rapid succession of musical genres will have you tossing and turning in your seat.</p>",
+  'timestamp' => '1664914805',
+  'guid' => 'post:65739',
+))
+->values(array(
+  'iid' => '24',
+  'fid' => '1',
+  'title' => "Elon Musk In Twitter's Crosshairs Yet Again After Suggesting Ceasefire In Russia-Ukraine Conflict",
+  'link' => 'https://knowyourmeme.com/news/elon-musk-in-twitters-crosshairs-yet-again-after-suggesting-ceasefire-in-russia-ukraine-conflict',
+  'author' => '',
+  'description' => '<img alt="1" src="https://i.kym-cdn.com/news/posts/mobile/000/002/678/1.JPG" /><p>Elon Musk, half a year after supplying Ukraine with his patented Starlink technology to aid in their defense against Russia, now finds himself branded a Russian loyalist after proposing a ceasefire in the ongoing conflict.</p>',
+  'timestamp' => '1664917721',
+  'guid' => 'post:65745',
+))
+->values(array(
+  'iid' => '25',
+  'fid' => '1',
+  'title' => 'Tumblr Cartoon Wants You To Think About Your Mutuals Before You Type Something Hurtful',
+  'link' => 'https://knowyourmeme.com/memes/insult-reflection',
+  'author' => '',
+  'description' => '<img alt="92c" src="https://i.kym-cdn.com/news_feeds/icons/mobile/000/065/747/92c.jpg" /><p>Does making fun of some rando feel so good it makes it worth it to hurt your mutuals in the process?</p>',
+  'timestamp' => '1664921469',
+  'guid' => 'post:65747',
+))
+->values(array(
+  'iid' => '26',
+  'fid' => '1',
+  'title' => 'A Reaction GIF Of Lily Mo Sheen Allegedly Doing A Little Underage Drinking At The 2014 Golden Globe Awards Goes Viral On Reddit',
+  'link' => 'https://knowyourmeme.com/memes/lily-mo-sheen-drinks-then-claps-nervously-at-awards-show',
+  'author' => '',
+  'description' => '<img alt="Lilycover" src="https://i.kym-cdn.com/entries/icons/mobile/000/042/139/lilycover.jpg" /><p>Sheen is the daughter of Kate Beckinsale and Martin Sheen and has lately been blowing up on Reddit for an old video that everyone can relate to.</p>',
+  'timestamp' => '1664912866',
+  'guid' => 'post:65738',
+))
+->values(array(
+  'iid' => '27',
+  'fid' => '1',
+  'title' => "Playing 'Cyberpunk 2077' Before And After 'Edgerunners'",
+  'link' => 'https://knowyourmeme.com/videos/382171-cyberpunk-edgerunners',
+  'author' => '',
+  'description' => '<img alt="Thumbnail_missing" src="https://s.kym-cdn.com/assets/thumbnail_missing-3a6027eed043f39f22e15715958e7b50.png" /><p>No going back now.</p>',
+  'timestamp' => '1664922077',
+  'guid' => 'post:65748',
+))
+->values(array(
+  'iid' => '28',
+  'fid' => '1',
+  'title' => 'Elon Musk Offers To Buy Twitter For $54.20 A Share, Again',
+  'link' => 'https://knowyourmeme.com/news/elon-musk-offers-to-buy-twitter-for-5420-a-share-again',
+  'author' => '',
+  'description' => '<img alt="Elon_musk_banner" src="https://i.kym-cdn.com/news/posts/mobile/000/002/679/Elon_Musk_banner.jpg" /><p>After months of trying to back out of his infamous deal, Musk suddenly reversed course and re-offered to buy Twitter at the original price he offered, weeks before the case was set to go to trial.</p>',
+  'timestamp' => '1664910995',
+  'guid' => 'post:65736',
+))
+->values(array(
+  'iid' => '29',
+  'fid' => '1',
+  'title' => "'Adult Happy Meals' From McDonald's Are Finally Here, And The Toys Are Odd",
+  'link' => 'https://knowyourmeme.com/memes/mcdonalds-adult-happy-meals',
+  'author' => '',
+  'description' => "<img alt=\"Grimace\" src=\"https://i.kym-cdn.com/entries/icons/mobile/000/042/138/grimace.jpg\" /><p>The promotion inspired memes on Twitter and elsewhere in which creators speculated as to what the meal's toy was.</p>",
+  'timestamp' => '1664917585',
+  'guid' => 'post:65744',
+))
+->values(array(
+  'iid' => '30',
+  'fid' => '1',
+  'title' => 'Why Does Jackie Kennedy Eat Sheet Metal?',
+  'link' => 'https://knowyourmeme.com/editorials/guides/why-does-jackie-kennedy-eat-sheet-metal',
+  'author' => '',
+  'description' => '<img alt="Sheet_metal" src="https://i.kym-cdn.com/editorials/icons/mobile/000/004/863/Sheet_Metal.jpg" /><p>The absurdist TikTok and Twitter meme challenges decades of Camelot mythology.</p>',
+  'timestamp' => '1664912639',
+  'guid' => 'post:65737',
+))
+->values(array(
+  'iid' => '31',
+  'fid' => '1',
+  'title' => "Someone Messed With Google And Now It Translates 'Tuna Fish in Marathi' To 'Ask The Fish, D*ckhead'",
+  'link' => 'https://knowyourmeme.com/memes/marathi-name-of-tuna-fish',
+  'author' => '',
+  'description' => '<img alt="Machhi_ko_puch" src="https://i.kym-cdn.com/entries/icons/mobile/000/042/137/machhi_ko_puch.jpg" /><p>January 2022 had people all over India urging their friends to Google the Marathi word for tuna fish, only to be roasted alive by the top result selected by the algorithm</p>',
+  'timestamp' => '1664915662',
+  'guid' => 'post:65741',
+))
 ->execute();
 $connection->schema()->createTable('authmap', array(
   'fields' => array(
@@ -927,6 +734,12 @@
   'primary key' => array(
     'aid',
   ),
+  'indexes' => array(
+    'uid_module' => array(
+      'uid',
+      'module',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -1811,6 +1624,36 @@
   'cache' => '-1',
   'i18n_mode' => '0',
 ))
+->values(array(
+  'bid' => '51',
+  'module' => 'menu',
+  'delta' => 'menu-fixedlang',
+  'theme' => 'bartik',
+  'status' => '0',
+  'weight' => '0',
+  'region' => '-1',
+  'custom' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+  'i18n_mode' => '0',
+))
+->values(array(
+  'bid' => '52',
+  'module' => 'menu',
+  'delta' => 'menu-fixedlang',
+  'theme' => 'seven',
+  'status' => '0',
+  'weight' => '0',
+  'region' => '-1',
+  'custom' => '0',
+  'visibility' => '0',
+  'pages' => '',
+  'title' => '',
+  'cache' => '-1',
+  'i18n_mode' => '0',
+))
 ->execute();
 $connection->schema()->createTable('block_custom', array(
   'fields' => array(
@@ -2471,82 +2314,6 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->schema()->createTable('cache_views', array(
-  'fields' => array(
-    'cid' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => '',
-    ),
-    'data' => array(
-      'type' => 'blob',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-    'expire' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'created' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'serialized' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-  ),
-  'primary key' => array(
-    'cid',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->schema()->createTable('cache_views_data', array(
-  'fields' => array(
-    'cid' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => '',
-    ),
-    'data' => array(
-      'type' => 'blob',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-    'expire' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'created' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'serialized' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '1',
-    ),
-  ),
-  'primary key' => array(
-    'cid',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
 $connection->schema()->createTable('comment', array(
   'fields' => array(
     'cid' => array(
@@ -2823,7 +2590,7 @@
     'obj' => array(
       'type' => 'varchar',
       'not null' => TRUE,
-      'length' => '32',
+      'length' => '128',
     ),
     'updated' => array(
       'type' => 'int',
@@ -3294,6 +3061,18 @@
   'created' => '1531838064',
   'changed' => '1531838064',
 ))
+->values(array(
+  'entity_type' => 'comment',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'en',
+  'source' => '',
+  'uid' => '1',
+  'status' => '1',
+  'translate' => '0',
+  'created' => '1426781880',
+  'changed' => '1426781880',
+))
 ->values(array(
   'entity_type' => 'node',
   'entity_id' => '1',
@@ -3331,52 +3110,40 @@
   'changed' => '1529615813',
 ))
 ->values(array(
-  'entity_type' => 'user',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_type' => 'node',
+  'entity_id' => '11',
+  'revision_id' => '18',
   'language' => 'en',
   'source' => '',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1527594929',
-  'changed' => '1527594929',
+  'created' => '1568261523',
+  'changed' => '1568261687',
 ))
 ->values(array(
-  'entity_type' => 'user',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_type' => 'node',
+  'entity_id' => '11',
+  'revision_id' => '18',
   'language' => 'fr',
   'source' => 'en',
   'uid' => '1',
-  'status' => '0',
+  'status' => '1',
   'translate' => '0',
-  'created' => '1531663916',
-  'changed' => '1531663916',
+  'created' => '1568261721',
+  'changed' => '1568261721',
 ))
 ->values(array(
-  'entity_type' => 'user',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_type' => 'node',
+  'entity_id' => '11',
+  'revision_id' => '18',
   'language' => 'is',
   'source' => 'en',
-  'uid' => '2',
-  'status' => '1',
-  'translate' => '1',
-  'created' => '1531663925',
-  'changed' => '1531663925',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'en',
-  'source' => '',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1426781880',
-  'changed' => '1426781880',
+  'created' => '1568261548',
+  'changed' => '1568261548',
 ))
 ->values(array(
   'entity_type' => 'taxonomy_term',
@@ -3415,40 +3182,40 @@
   'changed' => '1531922279',
 ))
 ->values(array(
-  'entity_type' => 'node',
-  'entity_id' => '11',
-  'revision_id' => '18',
+  'entity_type' => 'user',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'en',
   'source' => '',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1568261523',
-  'changed' => '1568261687',
+  'created' => '1527594929',
+  'changed' => '1527594929',
 ))
 ->values(array(
-  'entity_type' => 'node',
-  'entity_id' => '11',
-  'revision_id' => '18',
+  'entity_type' => 'user',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'fr',
   'source' => 'en',
   'uid' => '1',
-  'status' => '1',
+  'status' => '0',
   'translate' => '0',
-  'created' => '1568261721',
-  'changed' => '1568261721',
+  'created' => '1531663916',
+  'changed' => '1531663916',
 ))
 ->values(array(
-  'entity_type' => 'node',
-  'entity_id' => '11',
-  'revision_id' => '18',
+  'entity_type' => 'user',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'is',
   'source' => 'en',
-  'uid' => '1',
+  'uid' => '2',
   'status' => '1',
-  'translate' => '0',
-  'created' => '1568261548',
-  'changed' => '1568261548',
+  'translate' => '1',
+  'created' => '1531663925',
+  'changed' => '1531663925',
 ))
 ->execute();
 $connection->schema()->createTable('entity_translation_revision', array(
@@ -3579,19 +3346,19 @@
 ->values(array(
   'entity_type' => 'node',
   'entity_id' => '11',
-  'revision_id' => '17',
-  'language' => 'en',
-  'source' => '',
+  'revision_id' => '16',
+  'language' => 'is',
+  'source' => 'en',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1568261523',
-  'changed' => '1568261687',
+  'created' => '1568261548',
+  'changed' => '1568261548',
 ))
 ->values(array(
   'entity_type' => 'node',
   'entity_id' => '11',
-  'revision_id' => '18',
+  'revision_id' => '17',
   'language' => 'en',
   'source' => '',
   'uid' => '1',
@@ -3603,38 +3370,38 @@
 ->values(array(
   'entity_type' => 'node',
   'entity_id' => '11',
-  'revision_id' => '18',
-  'language' => 'fr',
+  'revision_id' => '17',
+  'language' => 'is',
   'source' => 'en',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1568261721',
-  'changed' => '1568261721',
+  'created' => '1568261548',
+  'changed' => '1568261548',
 ))
 ->values(array(
   'entity_type' => 'node',
   'entity_id' => '11',
-  'revision_id' => '16',
-  'language' => 'is',
-  'source' => 'en',
+  'revision_id' => '18',
+  'language' => 'en',
+  'source' => '',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1568261548',
-  'changed' => '1568261548',
+  'created' => '1568261523',
+  'changed' => '1568261687',
 ))
 ->values(array(
   'entity_type' => 'node',
   'entity_id' => '11',
-  'revision_id' => '17',
-  'language' => 'is',
+  'revision_id' => '18',
+  'language' => 'fr',
   'source' => 'en',
   'uid' => '1',
   'status' => '1',
   'translate' => '0',
-  'created' => '1568261548',
-  'changed' => '1568261548',
+  'created' => '1568261721',
+  'changed' => '1568261721',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -3877,7 +3644,7 @@
   'storage_module' => 'field_sql_storage',
   'storage_active' => '1',
   'locked' => '0',
-  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";s:4:"hour";s:6:"minute";s:6:"minute";s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:0:"";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:21:"field_data_field_date";a:1:{s:5:"value";s:16:"field_date_value";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:25:"field_revision_field_date";a:1:{s:5:"value";s:16:"field_date_value";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:0:{}s:2:"id";s:1:"9";}',
+  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";s:4:"hour";s:6:"minute";s:6:"minute";s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:0:"";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:21:"field_data_field_date";a:1:{s:5:"value";s:16:"field_date_value";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:25:"field_revision_field_date";a:1:{s:5:"value";s:16:"field_date_value";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:1:{s:5:"value";a:1:{i:0;s:5:"value";}}s:2:"id";s:1:"9";}',
   'cardinality' => '1',
   'translatable' => '0',
   'deleted' => '0',
@@ -3892,7 +3659,7 @@
   'storage_module' => 'field_sql_storage',
   'storage_active' => '1',
   'locked' => '0',
-  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";s:4:"hour";s:6:"minute";s:6:"minute";s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:8:"optional";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:35:"field_data_field_date_with_end_time";a:2:{s:5:"value";s:30:"field_date_with_end_time_value";s:6:"value2";s:31:"field_date_with_end_time_value2";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:39:"field_revision_field_date_with_end_time";a:2:{s:5:"value";s:30:"field_date_with_end_time_value";s:6:"value2";s:31:"field_date_with_end_time_value2";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:0:{}s:2:"id";s:2:"10";}',
+  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";s:4:"hour";s:6:"minute";s:6:"minute";s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:8:"optional";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:35:"field_data_field_date_with_end_time";a:2:{s:5:"value";s:30:"field_date_with_end_time_value";s:6:"value2";s:31:"field_date_with_end_time_value2";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:39:"field_revision_field_date_with_end_time";a:2:{s:5:"value";s:30:"field_date_with_end_time_value";s:6:"value2";s:31:"field_date_with_end_time_value2";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:2:{s:5:"value";a:2:{i:0;s:5:"value";i:1;s:6:"value2";}s:6:"value2";a:1:{i:0;s:6:"value2";}}s:2:"id";s:2:"10";}',
   'cardinality' => '1',
   'translatable' => '0',
   'deleted' => '0',
@@ -4252,7 +4019,7 @@
   'storage_module' => 'field_sql_storage',
   'storage_active' => '1',
   'locked' => '0',
-  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";i:0;s:6:"minute";i:0;s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:0:"";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:38:"field_data_field_datetime_without_time";a:1:{s:5:"value";s:33:"field_datetime_without_time_value";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:42:"field_revision_field_datetime_without_time";a:1:{s:5:"value";s:33:"field_datetime_without_time_value";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:0:{}s:2:"id";s:1:"9";}',
+  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";i:0;s:6:"minute";i:0;s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:0:"";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:38:"field_data_field_datetime_without_time";a:1:{s:5:"value";s:33:"field_datetime_without_time_value";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:42:"field_revision_field_datetime_without_time";a:1:{s:5:"value";s:33:"field_datetime_without_time_value";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:1:{s:5:"value";a:1:{i:0;s:5:"value";}}s:2:"id";s:1:"9";}',
   'cardinality' => '1',
   'translatable' => '0',
   'deleted' => '0',
@@ -4267,7 +4034,7 @@
   'storage_module' => 'field_sql_storage',
   'storage_active' => '1',
   'locked' => '0',
-  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";i:0;s:6:"minute";i:0;s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:0:"";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:34:"field_data_field_date_without_time";a:1:{s:5:"value";s:29:"field_date_without_time_value";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:38:"field_revision_field_date_without_time";a:1:{s:5:"value";s:29:"field_date_without_time_value";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:0:{}s:2:"id";s:1:"9";}',
+  'data' => 'a:7:{s:12:"translatable";s:1:"0";s:12:"entity_types";a:0:{}s:8:"settings";a:6:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";i:0;s:6:"minute";i:0;s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:0:"";}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:34:"field_data_field_date_without_time";a:1:{s:5:"value";s:29:"field_date_without_time_value";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:38:"field_revision_field_date_without_time";a:1:{s:5:"value";s:29:"field_date_without_time_value";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:1:{s:5:"value";a:1:{i:0;s:5:"value";}}s:2:"id";s:1:"9";}',
   'cardinality' => '1',
   'translatable' => '0',
   'deleted' => '0',
@@ -4642,12 +4409,12 @@
   'storage_module' => 'field_sql_storage',
   'storage_active' => '1',
   'locked' => '0',
-  'data' => 'a:7:{s:12:"translatable";i:0;s:12:"entity_types";a:0:{}s:8:"settings";a:7:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";s:4:"hour";s:6:"minute";s:6:"minute";s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:8:"optional";s:23:"entity_translation_sync";b:0;}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:22:"field_data_field_event";a:2:{s:5:"value";s:17:"field_event_value";s:6:"value2";s:18:"field_event_value2";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:26:"field_revision_field_event";a:2:{s:5:"value";s:17:"field_event_value";s:6:"value2";s:18:"field_event_value2";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:0:{}s:2:"id";s:2:"54";}',
+  'data' => 'a:7:{s:12:"translatable";i:0;s:12:"entity_types";a:0:{}s:8:"settings";a:7:{s:11:"granularity";a:6:{s:5:"month";s:5:"month";s:3:"day";s:3:"day";s:4:"hour";s:4:"hour";s:6:"minute";s:6:"minute";s:4:"year";s:4:"year";s:6:"second";i:0;}s:11:"tz_handling";s:4:"site";s:11:"timezone_db";s:3:"UTC";s:13:"cache_enabled";i:0;s:11:"cache_count";s:1:"4";s:6:"todate";s:8:"optional";s:23:"entity_translation_sync";b:0;}s:7:"storage";a:5:{s:4:"type";s:17:"field_sql_storage";s:8:"settings";a:0:{}s:6:"module";s:17:"field_sql_storage";s:6:"active";s:1:"1";s:7:"details";a:1:{s:3:"sql";a:2:{s:18:"FIELD_LOAD_CURRENT";a:1:{s:22:"field_data_field_event";a:2:{s:5:"value";s:17:"field_event_value";s:6:"value2";s:18:"field_event_value2";}}s:19:"FIELD_LOAD_REVISION";a:1:{s:26:"field_revision_field_event";a:2:{s:5:"value";s:17:"field_event_value";s:6:"value2";s:18:"field_event_value2";}}}}}s:12:"foreign keys";a:0:{}s:7:"indexes";a:2:{s:5:"value";a:2:{i:0;s:5:"value";i:1;s:6:"value2";}s:6:"value2";a:1:{i:0;s:6:"value2";}}s:2:"id";s:2:"54";}',
   'cardinality' => '1',
   'translatable' => '0',
   'deleted' => '0',
 ))
-  ->execute();
+->execute();
 $connection->schema()->createTable('field_config_instance', array(
   'fields' => array(
     'id' => array(
@@ -4874,7 +4641,7 @@
   'field_name' => 'field_date_with_end_time',
   'entity_type' => 'node',
   'bundle' => 'test_content_type',
-  'data' => 'a:6:{s:5:"label";s:18:"Date With End Time";s:6:"widget";a:5:{s:6:"weight";s:1:"3";s:4:"type";s:9:"date_text";s:6:"module";s:4:"date";s:6:"active";i:1;s:8:"settings";a:6:{s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:10:"year_range";s:5:"-3:+3";s:9:"increment";i:15;s:14:"label_position";s:5:"above";s:10:"text_parts";a:0:{}}}s:8:"settings";a:5:{s:13:"default_value";s:3:"now";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:18:"user_register_form";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"date_default";s:6:"weight";s:1:"4";s:8:"settings";a:5:{s:11:"format_type";s:4:"long";s:15:"multiple_number";s:0:"";s:13:"multiple_from";s:0:"";s:11:"multiple_to";s:0:"";s:6:"fromto";s:4:"both";}s:6:"module";s:4:"date";}}s:8:"required";i:0;s:11:"description";s:0:"";}',
+  'data' => 'a:6:{s:5:"label";s:18:"Date With End Time";s:6:"widget";a:5:{s:6:"weight";s:1:"3";s:4:"type";s:9:"date_text";s:6:"module";s:4:"date";s:6:"active";i:1;s:8:"settings";a:6:{s:12:"input_format";s:13:"m/d/Y - H:i:s";s:19:"input_format_custom";s:0:"";s:10:"year_range";s:5:"-3:+3";s:9:"increment";i:1;s:14:"label_position";s:5:"above";s:10:"text_parts";a:0:{}}}s:8:"settings";a:5:{s:13:"default_value";s:3:"now";s:18:"default_value_code";s:0:"";s:14:"default_value2";s:4:"same";s:19:"default_value_code2";s:0:"";s:18:"user_register_form";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"date_default";s:6:"weight";s:1:"4";s:8:"settings";a:5:{s:11:"format_type";s:4:"long";s:15:"multiple_number";s:0:"";s:13:"multiple_from";s:0:"";s:11:"multiple_to";s:0:"";s:6:"fromto";s:4:"both";}s:6:"module";s:4:"date";}}s:8:"required";i:0;s:11:"description";s:0:"";}',
   'deleted' => '0',
 ))
 ->values(array(
@@ -5516,7 +5283,7 @@
   'data' => 'a:7:{s:5:"label";s:8:"checkbox";s:6:"widget";a:5:{s:6:"weight";s:2:"25";s:4:"type";s:15:"options_buttons";s:6:"module";s:7:"options";s:6:"active";i:1;s:8:"settings";a:0:{}}s:8:"settings";a:2:{s:18:"user_register_form";b:0;s:23:"entity_translation_sync";b:0;}s:7:"display";a:1:{s:7:"default";a:5:{s:5:"label";s:5:"above";s:4:"type";s:12:"list_default";s:8:"settings";a:0:{}s:6:"module";s:4:"list";s:6:"weight";i:25;}}s:8:"required";i:0;s:11:"description";s:0:"";s:13:"default_value";N;}',
   'deleted' => '0',
 ))
- ->values(array(
+->values(array(
   'id' => '94',
   'field_id' => '62',
   'field_name' => 'field_event',
@@ -5682,211 +5449,129 @@
   'body_format' => 'filtered_html',
 ))
 ->execute();
-$connection->schema()->createTable('field_data_field_checkbox', array(
-  'fields' => array(
-    'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'tiny',
-      'default' => '0',
-    ),
-    'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'revision_id' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'field_checkbox_value' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-  ),
-  'primary key' => array(
-    'entity_type',
-    'entity_id',
-    'deleted',
-    'delta',
-    'language',
-  ),
-  'indexes' => array(
-    'entity_type' => array(
-      'entity_type',
-    ),
-    'bundle' => array(
-      'bundle',
-    ),
-    'deleted' => array(
-      'deleted',
-    ),
-    'entity_id' => array(
-      'entity_id',
-    ),
-    'revision_id' => array(
-      'revision_id',
-    ),
-    'language' => array(
-      'language',
-    ),
-    'field_checkbox_value' => array(
-      'field_checkbox_value',
-    ),
-  ),
-    'mysql_character_set' => 'utf8',
-  ));
-$connection->schema()->createTable('field_data_comment_body', array(
-  'fields' => array(
-    'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'revision_id' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'comment_body_value' => array(
-      'type' => 'text',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-    'comment_body_format' => array(
-      'type' => 'varchar',
-      'not null' => FALSE,
-      'length' => '255',
-    ),
-  ),
-  'primary key' => array(
-    'entity_type',
-    'deleted',
-    'entity_id',
-    'language',
-    'delta',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('field_data_comment_body')
-->fields(array(
-  'entity_type',
-  'bundle',
-  'deleted',
-  'entity_id',
-  'revision_id',
-  'language',
-  'delta',
-  'comment_body_value',
-  'comment_body_format',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_test_content_type',
-  'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'This is a comment',
-  'comment_body_format' => 'filtered_html',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_article',
-  'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'TNG is better than DS9.',
-  'comment_body_format' => 'filtered_html',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_article',
-  'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '3',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'This is a comment to an Icelandic translation.',
-  'comment_body_format' => 'filtered_html',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_test_content_type',
-  'deleted' => '0',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'A comment without language (migrated from Drupal 6)',
-  'comment_body_format' => 'filtered_html',
-))
-->execute();
-$connection->schema()->createTable('field_data_description_field', array(
+$connection->schema()->createTable('field_data_comment_body', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'comment_body_value' => array(
+      'type' => 'text',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+    'comment_body_format' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '255',
+    ),
+  ),
+  'primary key' => array(
+    'entity_type',
+    'deleted',
+    'entity_id',
+    'language',
+    'delta',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_data_comment_body')
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'comment_body_value',
+  'comment_body_format',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'This is a comment',
+  'comment_body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_article',
+  'deleted' => '0',
+  'entity_id' => '2',
+  'revision_id' => '2',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'TNG is better than DS9.',
+  'comment_body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'This is a comment to an Icelandic translation.',
+  'comment_body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_test_content_type',
+  'deleted' => '0',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'A comment without language (migrated from Drupal 6)',
+  'comment_body_format' => 'filtered_html',
+))
+->execute();
+$connection->schema()->createTable('field_data_description_field', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -6230,7 +5915,10 @@
       'language',
     ),
     'field_chancellor_format' => array(
-      'field_chancellor_format',
+      array(
+        'field_chancellor_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -6271,6 +5959,89 @@
   'field_chancellor_format' => NULL,
 ))
 ->execute();
+$connection->schema()->createTable('field_data_field_checkbox', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'tiny',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'field_checkbox_value' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+  ),
+  'primary key' => array(
+    'entity_type',
+    'entity_id',
+    'deleted',
+    'delta',
+    'language',
+  ),
+  'indexes' => array(
+    'entity_type' => array(
+      'entity_type',
+    ),
+    'bundle' => array(
+      'bundle',
+    ),
+    'deleted' => array(
+      'deleted',
+    ),
+    'entity_id' => array(
+      'entity_id',
+    ),
+    'revision_id' => array(
+      'revision_id',
+    ),
+    'language' => array(
+      'language',
+    ),
+    'field_checkbox_value' => array(
+      'field_checkbox_value',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
 $connection->schema()->createTable('field_data_field_color', array(
   'fields' => array(
     'entity_type' => array(
@@ -6456,6 +6227,11 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_date_value' => array(
+      'field_date_value',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -6528,12 +6304,12 @@
     'field_date_with_end_time_value' => array(
       'type' => 'int',
       'not null' => FALSE,
-      'size' => 'normal',
+      'size' => 'big',
     ),
     'field_date_with_end_time_value2' => array(
       'type' => 'int',
       'not null' => FALSE,
-      'size' => 'normal',
+      'size' => 'big',
     ),
   ),
   'primary key' => array(
@@ -6543,6 +6319,15 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_date_with_end_time_value' => array(
+      'field_date_with_end_time_value',
+      'field_date_with_end_time_value2',
+    ),
+    'field_date_with_end_time_value2' => array(
+      'field_date_with_end_time_value2',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -6627,6 +6412,11 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_date_without_time_value' => array(
+      'field_date_without_time_value',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -6712,6 +6502,11 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_datetime_without_time_value' => array(
+      'field_datetime_without_time_value',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -6916,6 +6711,13 @@
     'language' => array(
       'language',
     ),
+    'field_event_value' => array(
+      'field_event_value',
+      'field_event_value2',
+    ),
+    'field_event_value2' => array(
+      'field_event_value2',
+    ),
   ),
   'mysql_character_set' => 'utf8',
 ));
@@ -7421,6 +7223,7 @@
   ),
   'mysql_character_set' => 'utf8',
 ));
+
 $connection->schema()->createTable('field_data_field_image_miw', array(
   'fields' => array(
     'entity_type' => array(
@@ -7741,6 +7544,16 @@
   'delta' => '0',
   'field_integer_value' => '3000000',
 ))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_test_content_type',
+  'deleted' => '0',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'en',
+  'delta' => '0',
+  'field_integer_value' => '10',
+))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'test_content_type',
@@ -7772,74 +7585,64 @@
   'field_integer_value' => '7',
 ))
 ->values(array(
-  'entity_type' => 'user',
-  'bundle' => 'user',
+  'entity_type' => 'taxonomy_term',
+  'bundle' => 'test_vocabulary',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_id' => '4',
+  'revision_id' => '4',
   'language' => 'en',
   'delta' => '0',
-  'field_integer_value' => '99',
+  'field_integer_value' => '6',
 ))
 ->values(array(
-  'entity_type' => 'user',
-  'bundle' => 'user',
+  'entity_type' => 'taxonomy_term',
+  'bundle' => 'test_vocabulary',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_id' => '4',
+  'revision_id' => '4',
   'language' => 'fr',
   'delta' => '0',
-  'field_integer_value' => '9',
-))
-->values(array(
-  'entity_type' => 'user',
-  'bundle' => 'user',
-  'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
-  'language' => 'is',
-  'delta' => '0',
-  'field_integer_value' => '1',
+  'field_integer_value' => '5',
 ))
 ->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_test_content_type',
+  'entity_type' => 'taxonomy_term',
+  'bundle' => 'test_vocabulary',
   'deleted' => '0',
   'entity_id' => '4',
   'revision_id' => '4',
-  'language' => 'en',
+  'language' => 'is',
   'delta' => '0',
-  'field_integer_value' => '10',
+  'field_integer_value' => '4',
 ))
 ->values(array(
-  'entity_type' => 'taxonomy_term',
-  'bundle' => 'test_vocabulary',
+  'entity_type' => 'user',
+  'bundle' => 'user',
   'deleted' => '0',
-  'entity_id' => '4',
-  'revision_id' => '4',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'en',
   'delta' => '0',
-  'field_integer_value' => '6',
+  'field_integer_value' => '99',
 ))
 ->values(array(
-  'entity_type' => 'taxonomy_term',
-  'bundle' => 'test_vocabulary',
+  'entity_type' => 'user',
+  'bundle' => 'user',
   'deleted' => '0',
-  'entity_id' => '4',
-  'revision_id' => '4',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'fr',
   'delta' => '0',
-  'field_integer_value' => '5',
+  'field_integer_value' => '9',
 ))
 ->values(array(
-  'entity_type' => 'taxonomy_term',
-  'bundle' => 'test_vocabulary',
+  'entity_type' => 'user',
+  'bundle' => 'user',
   'deleted' => '0',
-  'entity_id' => '4',
-  'revision_id' => '4',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'is',
   'delta' => '0',
-  'field_integer_value' => '4',
+  'field_integer_value' => '1',
 ))
 ->execute();
 $connection->schema()->createTable('field_data_field_integer_list', array(
@@ -9022,7 +8825,10 @@
       'language',
     ),
     'field_sector_format' => array(
-      'field_sector_format',
+      array(
+        'field_sector_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -9138,11 +8944,11 @@
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '12',
+  'entity_id' => '2',
+  'revision_id' => '11',
   'language' => 'und',
-  'delta' => '0',
-  'field_tags_tid' => '9',
+  'delta' => '1',
+  'field_tags_tid' => '14',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -9151,8 +8957,8 @@
   'entity_id' => '2',
   'revision_id' => '11',
   'language' => 'und',
-  'delta' => '1',
-  'field_tags_tid' => '14',
+  'delta' => '2',
+  'field_tags_tid' => '17',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -9161,18 +8967,18 @@
   'entity_id' => '3',
   'revision_id' => '12',
   'language' => 'und',
-  'delta' => '1',
-  'field_tags_tid' => '14',
+  'delta' => '0',
+  'field_tags_tid' => '9',
 ))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '11',
+  'entity_id' => '3',
+  'revision_id' => '12',
   'language' => 'und',
-  'delta' => '2',
-  'field_tags_tid' => '17',
+  'delta' => '1',
+  'field_tags_tid' => '14',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -9266,28 +9072,28 @@
 ));
 
 $connection->insert('field_data_field_telephone')
-  ->fields(array(
-    'entity_type',
-    'bundle',
-    'deleted',
-    'entity_id',
-    'revision_id',
-    'language',
-    'delta',
-    'field_telephone_value',
-  ))
-  ->values(array(
-    'entity_type' => 'node',
-    'bundle' => 'test_content_type',
-    'deleted' => '0',
-    'entity_id' => '1',
-    'revision_id' => '1',
-    'language' => 'und',
-    'delta' => '0',
-    'field_telephone_value' => '99-99-99-99',
-  ))
-  ->execute();
-$connection->schema()->createTable('field_data_field_termplain', array(
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'field_telephone_value',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '0',
+  'field_telephone_value' => '99-99-99-99',
+))
+->execute();
+$connection->schema()->createTable('field_data_field_term_entityreference', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -9304,7 +9110,7 @@
     'deleted' => array(
       'type' => 'int',
       'not null' => TRUE,
-      'size' => 'normal',
+      'size' => 'tiny',
       'default' => '0',
     ),
     'entity_id' => array(
@@ -9331,85 +9137,79 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_termplain_tid' => array(
+    'field_term_entityreference_target_id' => array(
       'type' => 'int',
-      'not null' => FALSE,
+      'not null' => TRUE,
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
   ),
   'primary key' => array(
     'entity_type',
-    'deleted',
     'entity_id',
-    'language',
+    'deleted',
     'delta',
+    'language',
   ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->schema()->createTable('field_data_field_termrss', array(
-  'fields' => array(
+  'indexes' => array(
     'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
+      'entity_type',
     ),
     'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
+      'bundle',
     ),
     'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
+      'deleted',
     ),
     'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
+      'entity_id',
     ),
     'revision_id' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
+      'revision_id',
     ),
     'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
+      'language',
     ),
-    'field_termrss_tid' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
+    'field_term_entityreference_target_id' => array(
+      'field_term_entityreference_target_id',
     ),
   ),
-  'primary key' => array(
-    'entity_type',
-    'deleted',
-    'entity_id',
-    'language',
-    'delta',
-  ),
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->schema()->createTable('field_data_field_term_entityreference', array(
+$connection->insert('field_data_field_term_entityreference')
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'field_term_entityreference_target_id',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '0',
+  'field_term_entityreference_target_id' => '17',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '1',
+  'field_term_entityreference_target_id' => '15',
+))
+->execute();
+$connection->schema()->createTable('field_data_field_term_reference', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -9426,7 +9226,7 @@
     'deleted' => array(
       'type' => 'int',
       'not null' => TRUE,
-      'size' => 'tiny',
+      'size' => 'normal',
       'default' => '0',
     ),
     'entity_id' => array(
@@ -9453,47 +9253,24 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_term_entityreference_target_id' => array(
+    'field_term_reference_tid' => array(
       'type' => 'int',
-      'not null' => TRUE,
+      'not null' => FALSE,
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
   ),
   'primary key' => array(
     'entity_type',
-    'entity_id',
     'deleted',
-    'delta',
+    'entity_id',
     'language',
-  ),
-  'indexes' => array(
-    'entity_type' => array(
-      'entity_type',
-    ),
-    'bundle' => array(
-      'bundle',
-    ),
-    'deleted' => array(
-      'deleted',
-    ),
-    'entity_id' => array(
-      'entity_id',
-    ),
-    'revision_id' => array(
-      'revision_id',
-    ),
-    'language' => array(
-      'language',
-    ),
-    'field_term_entityreference_target_id' => array(
-      'field_term_entityreference_target_id',
-    ),
+    'delta',
   ),
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_data_field_term_entityreference')
+$connection->insert('field_data_field_term_reference')
 ->fields(array(
   'entity_type',
   'bundle',
@@ -9502,7 +9279,7 @@
   'revision_id',
   'language',
   'delta',
-  'field_term_entityreference_target_id',
+  'field_term_reference_tid',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -9512,20 +9289,20 @@
   'revision_id' => '1',
   'language' => 'und',
   'delta' => '0',
-  'field_term_entityreference_target_id' => '17',
+  'field_term_reference_tid' => '4',
 ))
 ->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'test_content_type',
+  'entity_type' => 'taxonomy_term',
+  'bundle' => 'test_vocabulary',
   'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'und',
-  'delta' => '1',
-  'field_term_entityreference_target_id' => '15',
+  'delta' => '0',
+  'field_term_reference_tid' => '3',
 ))
 ->execute();
-$connection->schema()->createTable('field_data_field_term_reference', array(
+$connection->schema()->createTable('field_data_field_termplain', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -9569,7 +9346,68 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_term_reference_tid' => array(
+    'field_termplain_tid' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+  ),
+  'primary key' => array(
+    'entity_type',
+    'deleted',
+    'entity_id',
+    'language',
+    'delta',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->schema()->createTable('field_data_field_termrss', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'field_termrss_tid' => array(
       'type' => 'int',
       'not null' => FALSE,
       'size' => 'normal',
@@ -9586,38 +9424,6 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_data_field_term_reference')
-->fields(array(
-  'entity_type',
-  'bundle',
-  'deleted',
-  'entity_id',
-  'revision_id',
-  'language',
-  'delta',
-  'field_term_reference_tid',
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'test_content_type',
-  'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
-  'language' => 'und',
-  'delta' => '0',
-  'field_term_reference_tid' => '4',
-))
-->values(array(
-  'entity_type' => 'taxonomy_term',
-  'bundle' => 'test_vocabulary',
-  'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
-  'language' => 'und',
-  'delta' => '0',
-  'field_term_reference_tid' => '3',
-))
-->execute();
 $connection->schema()->createTable('field_data_field_text', array(
   'fields' => array(
     'entity_type' => array(
@@ -10061,6 +9867,7 @@
   ),
   'mysql_character_set' => 'utf8',
 ));
+
 $connection->insert('field_data_field_text_long_plain')
 ->fields(array(
   'entity_type',
@@ -10118,7 +9925,6 @@
   'field_text_long_plain_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_data_field_text_long_plain_filtered', array(
   'fields' => array(
     'entity_type' => array(
@@ -10797,7 +10603,10 @@
       'language',
     ),
     'field_training_format' => array(
-      'field_training_format',
+      array(
+        'field_training_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12302,214 +12111,130 @@
   'body_format' => 'filtered_html',
 ))
 ->execute();
-$connection->schema()->createTable('field_revision_field_checkbox', array(
-  'fields' => array(
-    'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'tiny',
-      'default' => '0',
-    ),
-    'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'revision_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'field_checkbox_value' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-  ),
-  'primary key' => array(
-    'entity_type',
-    'entity_id',
-    'revision_id',
-    'deleted',
-    'delta',
-    'language',
-  ),
-  'indexes' => array(
-    'entity_type' => array(
-      'entity_type',
-    ),
-    'bundle' => array(
-      'bundle',
-    ),
-    'deleted' => array(
-      'deleted',
-    ),
-    'entity_id' => array(
-      'entity_id',
-    ),
-    'revision_id' => array(
-      'revision_id',
-    ),
-    'language' => array(
-      'language',
-    ),
-    'field_checkbox_value' => array(
-      'field_checkbox_value',
-    ),
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->schema()->createTable('field_revision_comment_body', array(
-  'fields' => array(
-    'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'revision_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'comment_body_value' => array(
-      'type' => 'text',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-    'comment_body_format' => array(
-      'type' => 'varchar',
-      'not null' => FALSE,
-      'length' => '255',
-    ),
-  ),
-  'primary key' => array(
-    'entity_type',
-    'deleted',
-    'entity_id',
-    'revision_id',
-    'language',
-    'delta',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('field_revision_comment_body')
-->fields(array(
-  'entity_type',
-  'bundle',
-  'deleted',
-  'entity_id',
-  'revision_id',
-  'language',
-  'delta',
-  'comment_body_value',
-  'comment_body_format',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_test_content_type',
-  'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'This is a comment',
-  'comment_body_format' => 'filtered_html',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_article',
-  'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'TNG is better than DS9.',
-  'comment_body_format' => 'filtered_html',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_article',
-  'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '3',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'This is a comment to an Icelandic translation.',
-  'comment_body_format' => 'filtered_html',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_test_content_type',
-  'deleted' => '0',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'und',
-  'delta' => '0',
-  'comment_body_value' => 'A comment without language (migrated from Drupal 6)',
-  'comment_body_format' => 'filtered_html',
-))
-->execute();
-$connection->schema()->createTable('field_revision_description_field', array(
+$connection->schema()->createTable('field_revision_comment_body', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'comment_body_value' => array(
+      'type' => 'text',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+    'comment_body_format' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '255',
+    ),
+  ),
+  'primary key' => array(
+    'entity_type',
+    'deleted',
+    'entity_id',
+    'revision_id',
+    'language',
+    'delta',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_comment_body')
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'comment_body_value',
+  'comment_body_format',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'This is a comment',
+  'comment_body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_article',
+  'deleted' => '0',
+  'entity_id' => '2',
+  'revision_id' => '2',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'TNG is better than DS9.',
+  'comment_body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_article',
+  'deleted' => '0',
+  'entity_id' => '3',
+  'revision_id' => '3',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'This is a comment to an Icelandic translation.',
+  'comment_body_format' => 'filtered_html',
+))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_test_content_type',
+  'deleted' => '0',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'und',
+  'delta' => '0',
+  'comment_body_value' => 'A comment without language (migrated from Drupal 6)',
+  'comment_body_format' => 'filtered_html',
+))
+->execute();
+$connection->schema()->createTable('field_revision_description_field', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -12866,7 +12591,10 @@
       'language',
     ),
     'field_chancellor_format' => array(
-      'field_chancellor_format',
+      array(
+        'field_chancellor_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -12907,6 +12635,90 @@
   'field_chancellor_format' => NULL,
 ))
 ->execute();
+$connection->schema()->createTable('field_revision_field_checkbox', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'tiny',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'field_checkbox_value' => array(
+      'type' => 'int',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+  ),
+  'primary key' => array(
+    'entity_type',
+    'entity_id',
+    'revision_id',
+    'deleted',
+    'delta',
+    'language',
+  ),
+  'indexes' => array(
+    'entity_type' => array(
+      'entity_type',
+    ),
+    'bundle' => array(
+      'bundle',
+    ),
+    'deleted' => array(
+      'deleted',
+    ),
+    'entity_id' => array(
+      'entity_id',
+    ),
+    'revision_id' => array(
+      'revision_id',
+    ),
+    'language' => array(
+      'language',
+    ),
+    'field_checkbox_value' => array(
+      'field_checkbox_value',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
 $connection->schema()->createTable('field_revision_field_color', array(
   'fields' => array(
     'entity_type' => array(
@@ -13094,6 +12906,11 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_date_value' => array(
+      'field_date_value',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -13166,12 +12983,12 @@
     'field_date_with_end_time_value' => array(
       'type' => 'int',
       'not null' => FALSE,
-      'size' => 'normal',
+      'size' => 'big',
     ),
     'field_date_with_end_time_value2' => array(
       'type' => 'int',
       'not null' => FALSE,
-      'size' => 'normal',
+      'size' => 'big',
     ),
   ),
   'primary key' => array(
@@ -13182,6 +12999,15 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_date_with_end_time_value' => array(
+      'field_date_with_end_time_value',
+      'field_date_with_end_time_value2',
+    ),
+    'field_date_with_end_time_value2' => array(
+      'field_date_with_end_time_value2',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -13267,6 +13093,11 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_date_without_time_value' => array(
+      'field_date_without_time_value',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -13353,6 +13184,11 @@
     'language',
     'delta',
   ),
+  'indexes' => array(
+    'field_datetime_without_time_value' => array(
+      'field_datetime_without_time_value',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -13559,6 +13395,13 @@
     'language' => array(
       'language',
     ),
+    'field_event_value' => array(
+      'field_event_value',
+      'field_event_value2',
+    ),
+    'field_event_value2' => array(
+      'field_event_value2',
+    ),
   ),
   'mysql_character_set' => 'utf8',
 ));
@@ -14393,6 +14236,16 @@
   'delta' => '0',
   'field_integer_value' => '3000000',
 ))
+->values(array(
+  'entity_type' => 'comment',
+  'bundle' => 'comment_node_test_content_type',
+  'deleted' => '0',
+  'entity_id' => '4',
+  'revision_id' => '4',
+  'language' => 'en',
+  'delta' => '0',
+  'field_integer_value' => '10',
+))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'test_content_type',
@@ -14423,26 +14276,6 @@
   'delta' => '0',
   'field_integer_value' => '7',
 ))
-->values(array(
-  'entity_type' => 'user',
-  'bundle' => 'user',
-  'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
-  'language' => 'en',
-  'delta' => '0',
-  'field_integer_value' => '99',
-))
-->values(array(
-  'entity_type' => 'comment',
-  'bundle' => 'comment_node_test_content_type',
-  'deleted' => '0',
-  'entity_id' => '4',
-  'revision_id' => '4',
-  'language' => 'en',
-  'delta' => '0',
-  'field_integer_value' => '10',
-))
 ->values(array(
   'entity_type' => 'taxonomy_term',
   'bundle' => 'test_vocabulary',
@@ -14473,6 +14306,16 @@
   'delta' => '0',
   'field_integer_value' => '4',
 ))
+->values(array(
+  'entity_type' => 'user',
+  'bundle' => 'user',
+  'deleted' => '0',
+  'entity_id' => '2',
+  'revision_id' => '2',
+  'language' => 'en',
+  'delta' => '0',
+  'field_integer_value' => '99',
+))
 ->execute();
 $connection->schema()->createTable('field_revision_field_integer_list', array(
   'fields' => array(
@@ -15789,7 +15632,10 @@
       'language',
     ),
     'field_sector_format' => array(
-      'field_sector_format',
+      array(
+        'field_sector_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -15896,8 +15742,8 @@
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '12',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'und',
   'delta' => '0',
   'field_tags_tid' => '9',
@@ -15909,25 +15755,25 @@
   'entity_id' => '2',
   'revision_id' => '2',
   'language' => 'und',
-  'delta' => '0',
-  'field_tags_tid' => '9',
+  'delta' => '1',
+  'field_tags_tid' => '14',
 ))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
   'entity_id' => '2',
-  'revision_id' => '11',
+  'revision_id' => '2',
   'language' => 'und',
-  'delta' => '0',
-  'field_tags_tid' => '9',
+  'delta' => '2',
+  'field_tags_tid' => '17',
 ))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '3',
+  'entity_id' => '2',
+  'revision_id' => '11',
   'language' => 'und',
   'delta' => '0',
   'field_tags_tid' => '9',
@@ -15936,8 +15782,8 @@
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '3',
-  'revision_id' => '12',
+  'entity_id' => '2',
+  'revision_id' => '11',
   'language' => 'und',
   'delta' => '1',
   'field_tags_tid' => '14',
@@ -15947,20 +15793,20 @@
   'bundle' => 'article',
   'deleted' => '0',
   'entity_id' => '2',
-  'revision_id' => '2',
+  'revision_id' => '11',
   'language' => 'und',
-  'delta' => '1',
-  'field_tags_tid' => '14',
+  'delta' => '2',
+  'field_tags_tid' => '17',
 ))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '11',
+  'entity_id' => '3',
+  'revision_id' => '3',
   'language' => 'und',
-  'delta' => '1',
-  'field_tags_tid' => '14',
+  'delta' => '0',
+  'field_tags_tid' => '9',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -15976,8 +15822,8 @@
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
+  'entity_id' => '3',
+  'revision_id' => '3',
   'language' => 'und',
   'delta' => '2',
   'field_tags_tid' => '17',
@@ -15986,21 +15832,21 @@
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '11',
+  'entity_id' => '3',
+  'revision_id' => '12',
   'language' => 'und',
-  'delta' => '2',
-  'field_tags_tid' => '17',
+  'delta' => '0',
+  'field_tags_tid' => '9',
 ))
 ->values(array(
   'entity_type' => 'node',
   'bundle' => 'article',
   'deleted' => '0',
   'entity_id' => '3',
-  'revision_id' => '3',
+  'revision_id' => '12',
   'language' => 'und',
-  'delta' => '2',
-  'field_tags_tid' => '17',
+  'delta' => '1',
+  'field_tags_tid' => '14',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -16095,28 +15941,145 @@
 ));
 
 $connection->insert('field_revision_field_telephone')
-  ->fields(array(
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'field_telephone_value',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '0',
+  'field_telephone_value' => '99-99-99-99',
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_term_entityreference', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'tiny',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'field_term_entityreference_target_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+  ),
+  'primary key' => array(
     'entity_type',
-    'bundle',
-    'deleted',
     'entity_id',
     'revision_id',
-    'language',
+    'deleted',
     'delta',
-    'field_telephone_value',
-  ))
-  ->values(array(
-    'entity_type' => 'node',
-    'bundle' => 'test_content_type',
-    'deleted' => '0',
-    'entity_id' => '1',
-    'revision_id' => '1',
-    'language' => 'und',
-    'delta' => '0',
-    'field_telephone_value' => '99-99-99-99',
-  ))
-  ->execute();
-$connection->schema()->createTable('field_revision_field_term_entityreference', array(
+    'language',
+  ),
+  'indexes' => array(
+    'entity_type' => array(
+      'entity_type',
+    ),
+    'bundle' => array(
+      'bundle',
+    ),
+    'deleted' => array(
+      'deleted',
+    ),
+    'entity_id' => array(
+      'entity_id',
+    ),
+    'revision_id' => array(
+      'revision_id',
+    ),
+    'language' => array(
+      'language',
+    ),
+    'field_term_entityreference_target_id' => array(
+      'field_term_entityreference_target_id',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('field_revision_field_term_entityreference')
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'field_term_entityreference_target_id',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '0',
+  'field_term_entityreference_target_id' => '17',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'test_content_type',
+  'deleted' => '0',
+  'entity_id' => '1',
+  'revision_id' => '1',
+  'language' => 'und',
+  'delta' => '1',
+  'field_term_entityreference_target_id' => '15',
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_term_reference', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -16133,7 +16096,7 @@
     'deleted' => array(
       'type' => 'int',
       'not null' => TRUE,
-      'size' => 'tiny',
+      'size' => 'normal',
       'default' => '0',
     ),
     'entity_id' => array(
@@ -16160,48 +16123,25 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_term_entityreference_target_id' => array(
+    'field_term_reference_tid' => array(
       'type' => 'int',
-      'not null' => TRUE,
+      'not null' => FALSE,
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
   ),
   'primary key' => array(
     'entity_type',
+    'deleted',
     'entity_id',
     'revision_id',
-    'deleted',
-    'delta',
     'language',
-  ),
-  'indexes' => array(
-    'entity_type' => array(
-      'entity_type',
-    ),
-    'bundle' => array(
-      'bundle',
-    ),
-    'deleted' => array(
-      'deleted',
-    ),
-    'entity_id' => array(
-      'entity_id',
-    ),
-    'revision_id' => array(
-      'revision_id',
-    ),
-    'language' => array(
-      'language',
-    ),
-    'field_term_entityreference_target_id' => array(
-      'field_term_entityreference_target_id',
-    ),
+    'delta',
   ),
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('field_revision_field_term_entityreference')
+$connection->insert('field_revision_field_term_reference')
 ->fields(array(
   'entity_type',
   'bundle',
@@ -16210,7 +16150,7 @@
   'revision_id',
   'language',
   'delta',
-  'field_term_entityreference_target_id',
+  'field_term_reference_tid',
 ))
 ->values(array(
   'entity_type' => 'node',
@@ -16220,20 +16160,19 @@
   'revision_id' => '1',
   'language' => 'und',
   'delta' => '0',
-  'field_term_entityreference_target_id' => '17',
+  'field_term_reference_tid' => '4',
 ))
 ->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'test_content_type',
+  'entity_type' => 'taxonomy_term',
+  'bundle' => 'test_vocabulary',
   'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
+  'entity_id' => '2',
+  'revision_id' => '2',
   'language' => 'und',
-  'delta' => '1',
-  'field_term_entityreference_target_id' => '15',
+  'delta' => '0',
+  'field_term_reference_tid' => '3',
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_termplain', array(
   'fields' => array(
     'entity_type' => array(
@@ -16358,100 +16297,6 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->schema()->createTable('field_revision_field_term_reference', array(
-  'fields' => array(
-    'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'revision_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'field_term_reference_tid' => array(
-      'type' => 'int',
-      'not null' => FALSE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-  ),
-  'primary key' => array(
-    'entity_type',
-    'deleted',
-    'entity_id',
-    'revision_id',
-    'language',
-    'delta',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('field_revision_field_term_reference')
-->fields(array(
-  'entity_type',
-  'bundle',
-  'deleted',
-  'entity_id',
-  'revision_id',
-  'language',
-  'delta',
-  'field_term_reference_tid',
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'test_content_type',
-  'deleted' => '0',
-  'entity_id' => '1',
-  'revision_id' => '1',
-  'language' => 'und',
-  'delta' => '0',
-  'field_term_reference_tid' => '4',
-))
-->values(array(
-  'entity_type' => 'taxonomy_term',
-  'bundle' => 'test_vocabulary',
-  'deleted' => '0',
-  'entity_id' => '2',
-  'revision_id' => '2',
-  'language' => 'und',
-  'delta' => '0',
-  'field_term_reference_tid' => '3',
-))
-->execute();
 $connection->schema()->createTable('field_revision_field_text', array(
   'fields' => array(
     'entity_type' => array(
@@ -16900,6 +16745,7 @@
   ),
   'mysql_character_set' => 'utf8',
 ));
+
 $connection->insert('field_revision_field_text_long_plain')
 ->fields(array(
   'entity_type',
@@ -16990,7 +16836,6 @@
   'field_text_long_plain_format' => NULL,
 ))
 ->execute();
-
 $connection->schema()->createTable('field_revision_field_text_long_plain_filtered', array(
   'fields' => array(
     'entity_type' => array(
@@ -17676,7 +17521,10 @@
       'language',
     ),
     'field_training_format' => array(
-      'field_training_format',
+      array(
+        'field_training_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
@@ -17717,7 +17565,7 @@
   'field_training_format' => NULL,
 ))
 ->execute();
-$connection->schema()->createTable('field_revision_field_user_entityreference', array(
+$connection->schema()->createTable('field_revision_field_tree', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -17761,11 +17609,15 @@
       'size' => 'normal',
       'unsigned' => TRUE,
     ),
-    'field_user_entityreference_target_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
+    'field_tree_value' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '255',
+    ),
+    'field_tree_format' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '255',
     ),
   ),
   'primary key' => array(
@@ -17795,13 +17647,203 @@
     'language' => array(
       'language',
     ),
-    'field_user_entityreference_target_id' => array(
-      'field_user_entityreference_target_id',
+    'field_tree_format' => array(
+      array(
+        'field_tree_format',
+        '191',
+      ),
     ),
   ),
   'mysql_character_set' => 'utf8',
 ));
-$connection->schema()->createTable('field_revision_field_user_reference', array(
+
+$connection->insert('field_revision_field_tree')
+->fields(array(
+  'entity_type',
+  'bundle',
+  'deleted',
+  'entity_id',
+  'revision_id',
+  'language',
+  'delta',
+  'field_tree_value',
+  'field_tree_format',
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '15',
+  'language' => 'en',
+  'delta' => '0',
+  'field_tree_value' => 'lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '16',
+  'language' => 'en',
+  'delta' => '0',
+  'field_tree_value' => 'lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '16',
+  'language' => 'is',
+  'delta' => '0',
+  'field_tree_value' => 'is - lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '17',
+  'language' => 'en',
+  'delta' => '0',
+  'field_tree_value' => 'lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '17',
+  'language' => 'is',
+  'delta' => '0',
+  'field_tree_value' => 'is - lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '18',
+  'language' => 'en',
+  'delta' => '0',
+  'field_tree_value' => 'lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '18',
+  'language' => 'fr',
+  'delta' => '0',
+  'field_tree_value' => 'fr - lancewood',
+  'field_tree_format' => NULL,
+))
+->values(array(
+  'entity_type' => 'node',
+  'bundle' => 'et',
+  'deleted' => '0',
+  'entity_id' => '11',
+  'revision_id' => '18',
+  'language' => 'is',
+  'delta' => '0',
+  'field_tree_value' => 'is - lancewood',
+  'field_tree_format' => NULL,
+))
+->execute();
+$connection->schema()->createTable('field_revision_field_user_entityreference', array(
+  'fields' => array(
+    'entity_type' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'bundle' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '128',
+      'default' => '',
+    ),
+    'deleted' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'tiny',
+      'default' => '0',
+    ),
+    'entity_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'revision_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'delta' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'field_user_entityreference_target_id' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+  ),
+  'primary key' => array(
+    'entity_type',
+    'entity_id',
+    'revision_id',
+    'deleted',
+    'delta',
+    'language',
+  ),
+  'indexes' => array(
+    'entity_type' => array(
+      'entity_type',
+    ),
+    'bundle' => array(
+      'bundle',
+    ),
+    'deleted' => array(
+      'deleted',
+    ),
+    'entity_id' => array(
+      'entity_id',
+    ),
+    'revision_id' => array(
+      'revision_id',
+    ),
+    'language' => array(
+      'language',
+    ),
+    'field_user_entityreference_target_id' => array(
+      'field_user_entityreference_target_id',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->schema()->createTable('field_revision_field_user_reference', array(
   'fields' => array(
     'entity_type' => array(
       'type' => 'varchar',
@@ -18862,199 +18904,6 @@
   'title_field_format' => NULL,
 ))
 ->execute();
-$connection->schema()->createTable('field_revision_field_tree', array(
-  'fields' => array(
-    'entity_type' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'bundle' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '128',
-      'default' => '',
-    ),
-    'deleted' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'tiny',
-      'default' => '0',
-    ),
-    'entity_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'revision_id' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'delta' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'field_tree_value' => array(
-      'type' => 'varchar',
-      'not null' => FALSE,
-      'length' => '255',
-    ),
-    'field_tree_format' => array(
-      'type' => 'varchar',
-      'not null' => FALSE,
-      'length' => '255',
-    ),
-  ),
-  'primary key' => array(
-    'entity_type',
-    'entity_id',
-    'revision_id',
-    'deleted',
-    'delta',
-    'language',
-  ),
-  'indexes' => array(
-    'entity_type' => array(
-      'entity_type',
-    ),
-    'bundle' => array(
-      'bundle',
-    ),
-    'deleted' => array(
-      'deleted',
-    ),
-    'entity_id' => array(
-      'entity_id',
-    ),
-    'revision_id' => array(
-      'revision_id',
-    ),
-    'language' => array(
-      'language',
-    ),
-    'field_tree_format' => array(
-      array(
-        'field_tree_format',
-        '191',
-      ),
-    ),
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('field_revision_field_tree')
-->fields(array(
-  'entity_type',
-  'bundle',
-  'deleted',
-  'entity_id',
-  'revision_id',
-  'language',
-  'delta',
-  'field_tree_value',
-  'field_tree_format',
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '15',
-  'language' => 'en',
-  'delta' => '0',
-  'field_tree_value' => 'lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '16',
-  'language' => 'en',
-  'delta' => '0',
-  'field_tree_value' => 'lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '17',
-  'language' => 'en',
-  'delta' => '0',
-  'field_tree_value' => 'lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '18',
-  'language' => 'en',
-  'delta' => '0',
-  'field_tree_value' => 'lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '18',
-  'language' => 'fr',
-  'delta' => '0',
-  'field_tree_value' => 'fr - lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '16',
-  'language' => 'is',
-  'delta' => '0',
-  'field_tree_value' => 'is - lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '17',
-  'language' => 'is',
-  'delta' => '0',
-  'field_tree_value' => 'is - lancewood',
-  'field_tree_format' => NULL,
-))
-->values(array(
-  'entity_type' => 'node',
-  'bundle' => 'et',
-  'deleted' => '0',
-  'entity_id' => '11',
-  'revision_id' => '18',
-  'language' => 'is',
-  'delta' => '0',
-  'field_tree_value' => 'is - lancewood',
-  'field_tree_format' => NULL,
-))
-->execute();
 $connection->schema()->createTable('file_managed', array(
   'fields' => array(
     'fid' => array(
@@ -19772,6 +19621,7 @@
       'not null' => TRUE,
       'size' => 'normal',
       'default' => '0',
+      'unsigned' => TRUE,
     ),
     'timestamp' => array(
       'type' => 'int',
@@ -19784,9 +19634,36 @@
     'uid',
     'nid',
   ),
+  'indexes' => array(
+    'nid' => array(
+      'nid',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
+$connection->insert('history')
+->fields(array(
+  'uid',
+  'nid',
+  'timestamp',
+))
+->values(array(
+  'uid' => '1',
+  'nid' => '1',
+  'timestamp' => '1664880277',
+))
+->values(array(
+  'uid' => '1',
+  'nid' => '2',
+  'timestamp' => '1664880274',
+))
+->values(array(
+  'uid' => '1',
+  'nid' => '5',
+  'timestamp' => '1664880304',
+))
+->execute();
 $connection->schema()->createTable('i18n_block_language', array(
   'fields' => array(
     'module' => array(
@@ -20945,356 +20822,6 @@
   'objectindex' => '0',
   'format' => '',
 ))
-->values(array(
-  'lid' => '674',
-  'textgroup' => 'field',
-  'context' => 'comment_body:comment_node_book:label',
-  'objectid' => 'comment_node_book',
-  'type' => 'comment_body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '675',
-  'textgroup' => 'field',
-  'context' => 'comment_body:comment_node_forum:label',
-  'objectid' => 'comment_node_forum',
-  'type' => 'comment_body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '676',
-  'textgroup' => 'field',
-  'context' => 'comment_body:comment_node_test_content_type:label',
-  'objectid' => 'comment_node_test_content_type',
-  'type' => 'comment_body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '677',
-  'textgroup' => 'field',
-  'context' => 'body:page:label',
-  'objectid' => 'page',
-  'type' => 'body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '678',
-  'textgroup' => 'field',
-  'context' => 'body:article:label',
-  'objectid' => 'article',
-  'type' => 'body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '679',
-  'textgroup' => 'field',
-  'context' => 'body:blog:label',
-  'objectid' => 'blog',
-  'type' => 'body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '680',
-  'textgroup' => 'field',
-  'context' => 'body:book:label',
-  'objectid' => 'book',
-  'type' => 'body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '681',
-  'textgroup' => 'field',
-  'context' => 'body:forum:label',
-  'objectid' => 'forum',
-  'type' => 'body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '682',
-  'textgroup' => 'field',
-  'context' => 'field_tags:article:label',
-  'objectid' => 'article',
-  'type' => 'field_tags',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '683',
-  'textgroup' => 'field',
-  'context' => 'field_tags:article:description',
-  'objectid' => 'article',
-  'type' => 'field_tags',
-  'property' => 'description',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '684',
-  'textgroup' => 'field',
-  'context' => 'field_image:article:label',
-  'objectid' => 'article',
-  'type' => 'field_image',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '685',
-  'textgroup' => 'field',
-  'context' => 'field_image:article:description',
-  'objectid' => 'article',
-  'type' => 'field_image',
-  'property' => 'description',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '686',
-  'textgroup' => 'field',
-  'context' => 'taxonomy_forums:forum:label',
-  'objectid' => 'forum',
-  'type' => 'taxonomy_forums',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '687',
-  'textgroup' => 'field',
-  'context' => 'field_boolean:#allowed_values:0',
-  'objectid' => '#allowed_values',
-  'type' => 'field_boolean',
-  'property' => '0',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '688',
-  'textgroup' => 'field',
-  'context' => 'field_boolean:#allowed_values:1',
-  'objectid' => '#allowed_values',
-  'type' => 'field_boolean',
-  'property' => '1',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '689',
-  'textgroup' => 'field',
-  'context' => 'field_boolean:test_content_type:label',
-  'objectid' => 'test_content_type',
-  'type' => 'field_boolean',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '754',
-  'textgroup' => 'field',
-  'context' => 'subject_field:comment_node_article:label',
-  'objectid' => 'comment_node_article',
-  'type' => 'subject_field',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '755',
-  'textgroup' => 'field',
-  'context' => 'subject_field:comment_node_test_content_type:label',
-  'objectid' => 'comment_node_test_content_type',
-  'type' => 'subject_field',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '756',
-  'textgroup' => 'field',
-  'context' => 'name_field:test_vocabulary:label',
-  'objectid' => 'test_vocabulary',
-  'type' => 'name_field',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '758',
-  'textgroup' => 'field',
-  'context' => 'field_vocab_localize:article:label',
-  'objectid' => 'article',
-  'type' => 'field_vocab_localize',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '759',
-  'textgroup' => 'field',
-  'context' => 'field_vocab_translate:article:label',
-  'objectid' => 'article',
-  'type' => 'field_vocab_translate',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '760',
-  'textgroup' => 'field',
-  'context' => 'field_vocab_fixed:article:label',
-  'objectid' => 'article',
-  'type' => 'field_vocab_fixed',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '761',
-  'textgroup' => 'field',
-  'context' => 'field_color:#allowed_values:0',
-  'objectid' => '#allowed_values',
-  'type' => 'field_color',
-  'property' => '0',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '762',
-  'textgroup' => 'field',
-  'context' => 'field_color:#allowed_values:1',
-  'objectid' => '#allowed_values',
-  'type' => 'field_color',
-  'property' => '1',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '763',
-  'textgroup' => 'field',
-  'context' => 'field_color:#allowed_values:2',
-  'objectid' => '#allowed_values',
-  'type' => 'field_color',
-  'property' => '2',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '764',
-  'textgroup' => 'field',
-  'context' => 'field_color:blog:label',
-  'objectid' => 'blog',
-  'type' => 'field_color',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '765',
-  'textgroup' => 'field',
-  'context' => 'field_rating:#allowed_values:1',
-  'objectid' => '#allowed_values',
-  'type' => 'field_rating',
-  'property' => '1',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '766',
-  'textgroup' => 'field',
-  'context' => 'field_rating:#allowed_values:2',
-  'objectid' => '#allowed_values',
-  'type' => 'field_rating',
-  'property' => '2',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '767',
-  'textgroup' => 'field',
-  'context' => 'field_rating:#allowed_values:3',
-  'objectid' => '#allowed_values',
-  'type' => 'field_rating',
-  'property' => '3',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '768',
-  'textgroup' => 'field',
-  'context' => 'field_rating:blog:label',
-  'objectid' => 'blog',
-  'type' => 'field_rating',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '780',
-  'textgroup' => 'taxonomy',
-  'context' => 'vocabulary:2:name',
-  'objectid' => '2',
-  'type' => 'vocabulary',
-  'property' => 'name',
-  'objectindex' => '2',
-  'format' => '',
-))
-->values(array(
-  'lid' => '781',
-  'textgroup' => 'taxonomy',
-  'context' => 'vocabulary:2:description',
-  'objectid' => '2',
-  'type' => 'vocabulary',
-  'property' => 'description',
-  'objectindex' => '2',
-  'format' => '',
-))
-->values(array(
-  'lid' => '794',
-  'textgroup' => 'field',
-  'context' => 'taxonomy_forums:forum:label',
-  'objectid' => 'forum',
-  'type' => 'taxonomy_forums',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '795',
-  'textgroup' => 'field',
-  'context' => 'comment_body:comment_node_article:label',
-  'objectid' => 'comment_node_article',
-  'type' => 'comment_body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
-->values(array(
-  'lid' => '796',
-  'textgroup' => 'field',
-  'context' => 'comment_body:comment_node_blog:label',
-  'objectid' => 'comment_node_blog',
-  'type' => 'comment_body',
-  'property' => 'label',
-  'objectindex' => '0',
-  'format' => '',
-))
 ->values(array(
   'lid' => '194',
   'textgroup' => 'field',
@@ -21326,32 +20853,352 @@
   'format' => '',
 ))
 ->values(array(
-  'lid' => '800',
-  'textgroup' => 'menu',
-  'context' => 'menu:main-menu:title',
-  'objectid' => 'main-menu',
-  'type' => 'menu',
-  'property' => 'title',
+  'lid' => '674',
+  'textgroup' => 'field',
+  'context' => 'comment_body:comment_node_book:label',
+  'objectid' => 'comment_node_book',
+  'type' => 'comment_body',
+  'property' => 'label',
   'objectindex' => '0',
   'format' => '',
 ))
 ->values(array(
-  'lid' => '801',
-  'textgroup' => 'menu',
-  'context' => 'menu:main-menu:description',
-  'objectid' => 'main-menu',
-  'type' => 'menu',
+  'lid' => '675',
+  'textgroup' => 'field',
+  'context' => 'comment_body:comment_node_forum:label',
+  'objectid' => 'comment_node_forum',
+  'type' => 'comment_body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '676',
+  'textgroup' => 'field',
+  'context' => 'comment_body:comment_node_test_content_type:label',
+  'objectid' => 'comment_node_test_content_type',
+  'type' => 'comment_body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '677',
+  'textgroup' => 'field',
+  'context' => 'body:page:label',
+  'objectid' => 'page',
+  'type' => 'body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '678',
+  'textgroup' => 'field',
+  'context' => 'body:article:label',
+  'objectid' => 'article',
+  'type' => 'body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '679',
+  'textgroup' => 'field',
+  'context' => 'body:blog:label',
+  'objectid' => 'blog',
+  'type' => 'body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '680',
+  'textgroup' => 'field',
+  'context' => 'body:book:label',
+  'objectid' => 'book',
+  'type' => 'body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '681',
+  'textgroup' => 'field',
+  'context' => 'body:forum:label',
+  'objectid' => 'forum',
+  'type' => 'body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '682',
+  'textgroup' => 'field',
+  'context' => 'field_tags:article:label',
+  'objectid' => 'article',
+  'type' => 'field_tags',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '683',
+  'textgroup' => 'field',
+  'context' => 'field_tags:article:description',
+  'objectid' => 'article',
+  'type' => 'field_tags',
   'property' => 'description',
   'objectindex' => '0',
   'format' => '',
 ))
 ->values(array(
-  'lid' => '802',
-  'textgroup' => 'menu',
-  'context' => 'menu:menu-test-menu:description',
-  'objectid' => 'menu-test-menu',
-  'type' => 'menu',
+  'lid' => '684',
+  'textgroup' => 'field',
+  'context' => 'field_image:article:label',
+  'objectid' => 'article',
+  'type' => 'field_image',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '685',
+  'textgroup' => 'field',
+  'context' => 'field_image:article:description',
+  'objectid' => 'article',
+  'type' => 'field_image',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '686',
+  'textgroup' => 'field',
+  'context' => 'taxonomy_forums:forum:label',
+  'objectid' => 'forum',
+  'type' => 'taxonomy_forums',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '687',
+  'textgroup' => 'field',
+  'context' => 'field_boolean:#allowed_values:0',
+  'objectid' => '#allowed_values',
+  'type' => 'field_boolean',
+  'property' => '0',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '688',
+  'textgroup' => 'field',
+  'context' => 'field_boolean:#allowed_values:1',
+  'objectid' => '#allowed_values',
+  'type' => 'field_boolean',
+  'property' => '1',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '689',
+  'textgroup' => 'field',
+  'context' => 'field_boolean:test_content_type:label',
+  'objectid' => 'test_content_type',
+  'type' => 'field_boolean',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '754',
+  'textgroup' => 'field',
+  'context' => 'subject_field:comment_node_article:label',
+  'objectid' => 'comment_node_article',
+  'type' => 'subject_field',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '755',
+  'textgroup' => 'field',
+  'context' => 'subject_field:comment_node_test_content_type:label',
+  'objectid' => 'comment_node_test_content_type',
+  'type' => 'subject_field',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '756',
+  'textgroup' => 'field',
+  'context' => 'name_field:test_vocabulary:label',
+  'objectid' => 'test_vocabulary',
+  'type' => 'name_field',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '758',
+  'textgroup' => 'field',
+  'context' => 'field_vocab_localize:article:label',
+  'objectid' => 'article',
+  'type' => 'field_vocab_localize',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '759',
+  'textgroup' => 'field',
+  'context' => 'field_vocab_translate:article:label',
+  'objectid' => 'article',
+  'type' => 'field_vocab_translate',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '760',
+  'textgroup' => 'field',
+  'context' => 'field_vocab_fixed:article:label',
+  'objectid' => 'article',
+  'type' => 'field_vocab_fixed',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '761',
+  'textgroup' => 'field',
+  'context' => 'field_color:#allowed_values:0',
+  'objectid' => '#allowed_values',
+  'type' => 'field_color',
+  'property' => '0',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '762',
+  'textgroup' => 'field',
+  'context' => 'field_color:#allowed_values:1',
+  'objectid' => '#allowed_values',
+  'type' => 'field_color',
+  'property' => '1',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '763',
+  'textgroup' => 'field',
+  'context' => 'field_color:#allowed_values:2',
+  'objectid' => '#allowed_values',
+  'type' => 'field_color',
+  'property' => '2',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '764',
+  'textgroup' => 'field',
+  'context' => 'field_color:blog:label',
+  'objectid' => 'blog',
+  'type' => 'field_color',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '765',
+  'textgroup' => 'field',
+  'context' => 'field_rating:#allowed_values:1',
+  'objectid' => '#allowed_values',
+  'type' => 'field_rating',
+  'property' => '1',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '766',
+  'textgroup' => 'field',
+  'context' => 'field_rating:#allowed_values:2',
+  'objectid' => '#allowed_values',
+  'type' => 'field_rating',
+  'property' => '2',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '767',
+  'textgroup' => 'field',
+  'context' => 'field_rating:#allowed_values:3',
+  'objectid' => '#allowed_values',
+  'type' => 'field_rating',
+  'property' => '3',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '768',
+  'textgroup' => 'field',
+  'context' => 'field_rating:blog:label',
+  'objectid' => 'blog',
+  'type' => 'field_rating',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '780',
+  'textgroup' => 'taxonomy',
+  'context' => 'vocabulary:2:name',
+  'objectid' => '2',
+  'type' => 'vocabulary',
+  'property' => 'name',
+  'objectindex' => '2',
+  'format' => '',
+))
+->values(array(
+  'lid' => '781',
+  'textgroup' => 'taxonomy',
+  'context' => 'vocabulary:2:description',
+  'objectid' => '2',
+  'type' => 'vocabulary',
   'property' => 'description',
+  'objectindex' => '2',
+  'format' => '',
+))
+->values(array(
+  'lid' => '794',
+  'textgroup' => 'field',
+  'context' => 'taxonomy_forums:forum:label',
+  'objectid' => 'forum',
+  'type' => 'taxonomy_forums',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '795',
+  'textgroup' => 'field',
+  'context' => 'comment_body:comment_node_article:label',
+  'objectid' => 'comment_node_article',
+  'type' => 'comment_body',
+  'property' => 'label',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '796',
+  'textgroup' => 'field',
+  'context' => 'comment_body:comment_node_blog:label',
+  'objectid' => 'comment_node_blog',
+  'type' => 'comment_body',
+  'property' => 'label',
   'objectindex' => '0',
   'format' => '',
 ))
@@ -21375,7 +21222,37 @@
   'objectindex' => '25',
   'format' => '',
 ))
-  ->values(array(
+->values(array(
+  'lid' => '800',
+  'textgroup' => 'menu',
+  'context' => 'menu:main-menu:title',
+  'objectid' => 'main-menu',
+  'type' => 'menu',
+  'property' => 'title',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '801',
+  'textgroup' => 'menu',
+  'context' => 'menu:main-menu:description',
+  'objectid' => 'main-menu',
+  'type' => 'menu',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
+  'lid' => '802',
+  'textgroup' => 'menu',
+  'context' => 'menu:menu-test-menu:description',
+  'objectid' => 'menu-test-menu',
+  'type' => 'menu',
+  'property' => 'description',
+  'objectindex' => '0',
+  'format' => '',
+))
+->values(array(
   'lid' => '803',
   'textgroup' => 'menu',
   'context' => 'item:467:title',
@@ -21933,7 +21810,7 @@
   'textgroup' => 'default',
   'source' => 'Edit',
   'context' => '',
-  'version' => 'none',
+  'version' => '7.92',
 ))
 ->values(array(
   'lid' => '14',
@@ -22583,831 +22460,3349 @@
   'context' => 'vocabulary:4:description',
   'version' => '1',
 ))
-->execute();
-$connection->schema()->createTable('locales_target', array(
-  'fields' => array(
-    'lid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'translation' => array(
-      'type' => 'blob',
-      'not null' => TRUE,
-      'size' => 'normal',
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => '',
-    ),
-    'plid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'plural' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'i18n_status' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-  ),
-  'primary key' => array(
-    'lid',
-    'language',
-    'plural',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('locales_target')
-->fields(array(
-  'lid',
-  'translation',
-  'language',
-  'plid',
-  'plural',
-  'i18n_status',
+->values(array(
+  'lid' => '95',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Public files',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '57',
-  'translation' => 'fr - Mildly amusing limerick of the day',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '96',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Public local files served by the webserver.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '60',
-  'translation' => "fr - A fellow jumped off a high wall\r\nAnd had a most terrible fall\r\nHe went back to bed\r\nWith a bump on his head\r\nThat's why you don't jump off a wall",
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '97',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Temporary files',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '76',
-  'translation' => 'fr - User login title',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '98',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Temporary local files for upload and previews.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '77',
-  'translation' => 'fr - DS9 (localized)',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '99',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Private files',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '78',
-  'translation' => 'fr - Terok Nor (localized)',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '100',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Private local files served by Drupal.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '87',
-  'translation' => 'fr - VocabFixed',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '101',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Title',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '89',
-  'translation' => 'fr - VocabLocalized',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '102',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Name',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '90',
-  'translation' => 'fr - Vocabulary localize option',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '103',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Description',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '97',
-  'translation' => 'fr - The email help text.',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '104',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Subject',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '113',
-  'translation' => 'fr - Link',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '1',
+  'lid' => '105',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '163',
-  'translation' => 'fr - User login title',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '106',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Full comment',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '678',
-  'translation' => 'fr - Body',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '1',
+  'lid' => '107',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Blog entry',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '684',
-  'translation' => 'fr - Image',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '1',
+  'lid' => '108',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Use for multi-user blogs. Every user gets a personal blog.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '761',
-  'translation' => 'Verte',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '109',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Forum topic',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '762',
-  'translation' => 'Noire',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '110',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'A <em>forum topic</em> starts a new discussion thread within a forum.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '763',
-  'translation' => 'Blanche',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '111',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => '@node_type comment',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '764',
-  'translation' => 'Color',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '112',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Menu link',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '765',
-  'translation' => 'Haute',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '113',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy term',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '766',
-  'translation' => 'Moyenne',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '114',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Translation set',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '767',
-  'translation' => 'Faible',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '115',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '768',
-  'translation' => 'Rating',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '116',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Full content',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '57',
-  'translation' => 'is - Mildly amusing limerick of the day',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '117',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Teaser',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '79',
-  'translation' => 'Jupiter Station',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '118',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'RSS',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '80',
-  'translation' => 'is - Holographic research. (localized)',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '119',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Search index',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '89',
-  'translation' => 'is - VocabLocalized',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '120',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Search result highlighting input',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '90',
-  'translation' => 'is - Vocabulary localize option',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '121',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'File',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '91',
-  'translation' => 'is - VocabTranslate',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '122',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy term page',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '92',
-  'translation' => 'is - Vocabulary translate option',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '123',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy vocabulary',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '95',
-  'translation' => 'is - Some helpful text.',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '124',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '96',
-  'translation' => 'is - Email',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '125',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User account',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '97',
-  'translation' => 'is - The email help text.',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '126',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Print',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '128',
-  'translation' => 'is - Term Reference',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '127',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Nodes',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '687',
-  'translation' => 'is - Off',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '128',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Users',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '688',
-  'translation' => 'is - 1',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '129',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Files',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '758',
-  'translation' => 'is field - vocab_localize',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '130',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Nodes represent the main site content items.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '761',
-  'translation' => 'Grænn',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '131',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Users who have created accounts on your site.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '762',
-  'translation' => 'Svartur',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '132',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Uploaded file.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '763',
-  'translation' => 'Hvítur',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '133',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comments',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '764',
-  'translation' => 'Color',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '134',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Remark or note that refers to a node.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '765',
-  'translation' => 'Hár',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '135',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy terms',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '766',
-  'translation' => 'Miðlungs',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '136',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy terms are used for classifying content.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '767',
-  'translation' => 'Lágt',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '137',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy vocabularies',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '768',
-  'translation' => 'Rating',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '138',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Vocabularies contain related taxonomy terms, which are used for classifying content.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '800',
-  'translation' => 'is - Main menu',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '139',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Long',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '801',
-  'translation' => 'is - Main menu description',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '140',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Medium',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '800',
-  'translation' => 'fr - Main menu',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '141',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Short',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '801',
-  'translation' => 'fr - Main menu description',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '142',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Simple (with optional filter by bundle)',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '802',
-  'translation' => 'fr - Test menu description',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '143',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Recursive rendering detected when rendering entity @entity_type(@entity_id). Aborting rendering.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '797',
-  'translation' => 'fr - Emissary',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '144',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => '%type: !message in %function (line %line of %file).',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '798',
-  'translation' => 'fr - Pilot episode',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '145',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Error',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '803',
-  'translation' => 'fr - Google',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '146',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The website encountered an unexpected error. Please try again later.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '804',
-  'translation' => 'fr - Google description',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '147',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Search results',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '805',
-  'translation' => 'is - Stop',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '148',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The results of a search using keywords.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '806',
-  'translation' => 'is - Go',
-  'language' => 'is',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '149',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Keywords',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '805',
-  'translation' => 'fr - Stop',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '150',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Widgets',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'lid' => '806',
-  'translation' => 'Go',
-  'language' => 'fr',
-  'plid' => '0',
-  'plural' => '0',
-  'i18n_status' => '0',
+  'lid' => '151',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Advanced search form',
+  'context' => '',
+  'version' => '7.92',
 ))
-->execute();
-$connection->schema()->createTable('menu_custom', array(
-  'fields' => array(
-    'menu_name' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'title' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => '',
-    ),
-    'description' => array(
-      'type' => 'text',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => 'und',
-    ),
-    'i18n_mode' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-  ),
-  'primary key' => array(
-    'menu_name',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('menu_custom')
-->fields(array(
-  'menu_name',
-  'title',
-  'description',
-  'language',
-  'i18n_mode',
+->values(array(
+  'lid' => '152',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'A search form with advanced options.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'menu_name' => 'main-menu',
-  'title' => 'Main menu',
-  'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
-  'language' => 'und',
-  'i18n_mode' => '0',
+  'lid' => '153',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Tokens',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'title' => 'Management',
-  'description' => 'The <em>Management</em> menu contains links for administrative tasks.',
-  'language' => 'und',
-  'i18n_mode' => '0',
+  'lid' => '154',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Help',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'menu_name' => 'menu-fixedlang',
-  'title' => 'FixedLang',
-  'description' => '',
-  'language' => 'is',
-  'i18n_mode' => '2',
+  'lid' => '155',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the help text of the current page as content.',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'menu_name' => 'menu-test-menu',
-  'title' => 'Test Menu',
-  'description' => 'Test menu description.',
-  'language' => 'und',
-  'i18n_mode' => '5',
+  'lid' => '156',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Page elements',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'title' => 'Navigation',
-  'description' => 'The <em>Navigation</em> menu contains links intended for site visitors. Links are added to the <em>Navigation</em> menu automatically by some modules.',
-  'language' => 'und',
-  'i18n_mode' => '0',
+  'lid' => '157',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Secondary navigation links',
+  'context' => '',
+  'version' => '7.92',
 ))
 ->values(array(
-  'menu_name' => 'user-menu',
-  'title' => 'User menu',
-  'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link.",
-  'language' => 'und',
-  'i18n_mode' => '0',
+  'lid' => '158',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the secondary_links (local tasks) as content.',
+  'context' => '',
+  'version' => '7.92',
 ))
-->execute();
-$connection->schema()->createTable('menu_links', array(
-  'fields' => array(
-    'menu_name' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '32',
-      'default' => '',
-    ),
-    'mlid' => array(
-      'type' => 'serial',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'unsigned' => TRUE,
-    ),
-    'plid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'link_path' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => '',
-    ),
-    'router_path' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => '',
-    ),
-    'link_title' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => '',
-    ),
-    'options' => array(
-      'type' => 'blob',
-      'not null' => FALSE,
-      'size' => 'normal',
-    ),
-    'module' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '255',
-      'default' => 'system',
-    ),
-    'hidden' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'external' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'has_children' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'expanded' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'weight' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'depth' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'customized' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'p1' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p2' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p3' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p4' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p5' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p6' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p7' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p8' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'p9' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-    'updated' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-    ),
-    'language' => array(
-      'type' => 'varchar',
-      'not null' => TRUE,
-      'length' => '12',
-      'default' => 'und',
-    ),
-    'i18n_tsid' => array(
-      'type' => 'int',
-      'not null' => TRUE,
-      'size' => 'normal',
-      'default' => '0',
-      'unsigned' => TRUE,
-    ),
-  ),
-  'primary key' => array(
-    'mlid',
-  ),
-  'mysql_character_set' => 'utf8',
-));
-
-$connection->insert('menu_links')
-->fields(array(
-  'menu_name',
-  'mlid',
-  'plid',
-  'link_path',
-  'router_path',
-  'link_title',
-  'options',
-  'module',
-  'hidden',
-  'external',
-  'has_children',
-  'expanded',
-  'weight',
-  'depth',
-  'customized',
-  'p1',
-  'p2',
-  'p3',
-  'p4',
-  'p5',
-  'p6',
-  'p7',
-  'p8',
-  'p9',
-  'updated',
-  'language',
-  'i18n_tsid',
+->values(array(
+  'lid' => '159',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Site name',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '160',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The name of the site, optionally links to the front page.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '161',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Actions',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '162',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the action links (local tasks) as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '163',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Page title',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '164',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the page title as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '165',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Site logo',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '166',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the logo trail as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '167',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Feed icons',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '168',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the site feed_icons statement as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '169',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Site slogan',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '170',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => "Add the site's slogan as content.",
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '171',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Status messages',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '172',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the status messages of the current page as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '173',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Breadcrumb',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '174',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the breadcrumb trail as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '175',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Primary navigation links',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '176',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the primary_links (local tasks) as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '177',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Tabs',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '178',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add the tabs (local tasks) as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '179',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User contact form',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '180',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The site contact form that allows users to contact other users.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '181',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Contact form',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '182',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The site contact form that allows users to send a message to site administrators.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '183',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Vocabulary terms',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '184',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'All the terms in a vocabulary.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '185',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Vocabulary',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '186',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Block',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '187',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form url path settings',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '188',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Publishing options on the Node form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '189',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Form',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '190',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form submit buttons',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '191',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Submit buttons for the node form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '192',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form comment settings',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '193',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment settings on the Node form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '194',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form languages',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '195',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The language selection form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '196',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form book options',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '197',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Book options for the node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '198',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form title field',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '199',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The node title form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '200',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form menu settings',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '201',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Menu settings on the Node form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '202',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form revision log message',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '203',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Revision log message for the node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '204',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form publishing options',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '205',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node form author information',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '206',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Author information on the Node form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '207',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Entity extra field',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '208',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Entity field',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '209',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Custom content',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '210',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'General form',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '211',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Everything in the form that is not displayed by other content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '212',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Book navigation',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '213',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The navigation menu the book the node belongs to.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '214',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node links',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '215',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node links of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '216',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment form',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '217',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'A form to add a new comment.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '218',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node last updated date',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '219',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The date the referenced node was last updated.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '220',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node terms',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '221',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Taxonomy terms of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '222',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Book children',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '223',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The children menu the book the node belongs to.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '224',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node comments',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '225',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The comments of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '226',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Attached files',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '227',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'A list of files attached to the node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '228',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comments and comment form.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '229',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The comments and comment form for the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '230',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node content',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '231',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The content of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '232',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node type description',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '233',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node type description.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '234',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node title',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '235',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The title of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '236',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node body',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '237',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The body of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '238',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node author',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '239',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The author of the referenced node.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '240',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Node created date',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '241',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The date the referenced node was created.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '242',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Existing node',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '243',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Add a node from your site as content.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '244',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Custom',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '245',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User signature',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '246',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The signature of a user.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '247',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User links',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '248',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User links of the referenced user.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '249',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User profile',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '250',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The profile of a user.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '251',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'User picture',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '252',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The picture of a user.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '253',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment Reply Form',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '254',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'A form to add a new comment reply.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '255',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment links',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '256',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment links of the referenced comment.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '257',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Comment created date',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '258',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The date the referenced comment was created.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '259',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Term name',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '260',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'The name of this taxonomy term.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '261',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Term',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '262',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'List of related terms',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '263',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Terms related to an existing term; may be child, siblings or top level.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '264',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Term description',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '265',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Term description.',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '266',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Rendered entity',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '267',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Status message',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '268',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Error message',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '269',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Warning message',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '270',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Skip to main content',
+  'context' => '',
+  'version' => '7.92',
+))
+->values(array(
+  'lid' => '271',
+  'location' => '/is/firefly-is',
+  'textgroup' => 'default',
+  'source' => 'Home',
+  'context' => '',
+  'version' => '7.92',
+))
+->execute();
+$connection->schema()->createTable('locales_target', array(
+  'fields' => array(
+    'lid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'translation' => array(
+      'type' => 'blob',
+      'not null' => TRUE,
+      'size' => 'normal',
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => '',
+    ),
+    'plid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'plural' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'i18n_status' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+  ),
+  'primary key' => array(
+    'lid',
+    'language',
+    'plural',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('locales_target')
+->fields(array(
+  'lid',
+  'translation',
+  'language',
+  'plid',
+  'plural',
+  'i18n_status',
+))
+->values(array(
+  'lid' => '57',
+  'translation' => 'fr - Mildly amusing limerick of the day',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '57',
+  'translation' => 'is - Mildly amusing limerick of the day',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '60',
+  'translation' => "fr - A fellow jumped off a high wall\r\nAnd had a most terrible fall\r\nHe went back to bed\r\nWith a bump on his head\r\nThat's why you don't jump off a wall",
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '76',
+  'translation' => 'fr - User login title',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '77',
+  'translation' => 'fr - DS9 (localized)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '78',
+  'translation' => 'fr - Terok Nor (localized)',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '79',
+  'translation' => 'Jupiter Station',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '80',
+  'translation' => 'is - Holographic research. (localized)',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '87',
+  'translation' => 'fr - VocabFixed',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '89',
+  'translation' => 'fr - VocabLocalized',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '89',
+  'translation' => 'is - VocabLocalized',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '90',
+  'translation' => 'fr - Vocabulary localize option',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '90',
+  'translation' => 'is - Vocabulary localize option',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '91',
+  'translation' => 'is - VocabTranslate',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '92',
+  'translation' => 'is - Vocabulary translate option',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '95',
+  'translation' => 'is - Some helpful text.',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '96',
+  'translation' => 'is - Email',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '97',
+  'translation' => 'fr - The email help text.',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '97',
+  'translation' => 'is - The email help text.',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '113',
+  'translation' => 'fr - Link',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '1',
+))
+->values(array(
+  'lid' => '128',
+  'translation' => 'is - Term Reference',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '163',
+  'translation' => 'fr - User login title',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '678',
+  'translation' => 'fr - Body',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '1',
+))
+->values(array(
+  'lid' => '684',
+  'translation' => 'fr - Image',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '1',
+))
+->values(array(
+  'lid' => '687',
+  'translation' => 'is - Off',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '688',
+  'translation' => 'is - 1',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '758',
+  'translation' => 'is field - vocab_localize',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '761',
+  'translation' => 'Verte',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '761',
+  'translation' => 'Grænn',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '762',
+  'translation' => 'Noire',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '762',
+  'translation' => 'Svartur',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '763',
+  'translation' => 'Blanche',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '763',
+  'translation' => 'Hvítur',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '764',
+  'translation' => 'Color',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '764',
+  'translation' => 'Color',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '765',
+  'translation' => 'Haute',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '765',
+  'translation' => 'Hár',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '766',
+  'translation' => 'Moyenne',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '766',
+  'translation' => 'Miðlungs',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '767',
+  'translation' => 'Faible',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '767',
+  'translation' => 'Lágt',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '768',
+  'translation' => 'Rating',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '768',
+  'translation' => 'Rating',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '797',
+  'translation' => 'fr - Emissary',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '798',
+  'translation' => 'fr - Pilot episode',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '800',
+  'translation' => 'fr - Main menu',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '800',
+  'translation' => 'is - Main menu',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '801',
+  'translation' => 'fr - Main menu description',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '801',
+  'translation' => 'is - Main menu description',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '802',
+  'translation' => 'fr - Test menu description',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '803',
+  'translation' => 'fr - Google',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '804',
+  'translation' => 'fr - Google description',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '805',
+  'translation' => 'fr - Stop',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '805',
+  'translation' => 'is - Stop',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '806',
+  'translation' => 'Go',
+  'language' => 'fr',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->values(array(
+  'lid' => '806',
+  'translation' => 'is - Go',
+  'language' => 'is',
+  'plid' => '0',
+  'plural' => '0',
+  'i18n_status' => '0',
+))
+->execute();
+$connection->schema()->createTable('menu_custom', array(
+  'fields' => array(
+    'menu_name' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'title' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'description' => array(
+      'type' => 'text',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => 'und',
+    ),
+    'i18n_mode' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+  ),
+  'primary key' => array(
+    'menu_name',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('menu_custom')
+->fields(array(
+  'menu_name',
+  'title',
+  'description',
+  'language',
+  'i18n_mode',
+))
+->values(array(
+  'menu_name' => 'main-menu',
+  'title' => 'Main menu',
+  'description' => 'The <em>Main</em> menu is used on many sites to show the major sections of the site, often in a top navigation bar.',
+  'language' => 'und',
+  'i18n_mode' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'title' => 'Management',
+  'description' => 'The <em>Management</em> menu contains links for administrative tasks.',
+  'language' => 'und',
+  'i18n_mode' => '0',
+))
+->values(array(
+  'menu_name' => 'menu-fixedlang',
+  'title' => 'FixedLang',
+  'description' => '',
+  'language' => 'is',
+  'i18n_mode' => '2',
+))
+->values(array(
+  'menu_name' => 'menu-test-menu',
+  'title' => 'Test Menu',
+  'description' => 'Test menu description.',
+  'language' => 'und',
+  'i18n_mode' => '5',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'title' => 'Navigation',
+  'description' => 'The <em>Navigation</em> menu contains links intended for site visitors. Links are added to the <em>Navigation</em> menu automatically by some modules.',
+  'language' => 'und',
+  'i18n_mode' => '0',
+))
+->values(array(
+  'menu_name' => 'user-menu',
+  'title' => 'User menu',
+  'description' => "The <em>User</em> menu contains links related to the user's account, as well as the 'Log out' link.",
+  'language' => 'und',
+  'i18n_mode' => '0',
+))
+->execute();
+$connection->schema()->createTable('menu_links', array(
+  'fields' => array(
+    'menu_name' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '32',
+      'default' => '',
+    ),
+    'mlid' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'unsigned' => TRUE,
+    ),
+    'plid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'link_path' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'router_path' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'link_title' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => '',
+    ),
+    'options' => array(
+      'type' => 'blob',
+      'not null' => FALSE,
+      'size' => 'normal',
+    ),
+    'module' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '255',
+      'default' => 'system',
+    ),
+    'hidden' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'external' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'has_children' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'expanded' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'weight' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'depth' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'customized' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'p1' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p2' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p3' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p4' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p5' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p6' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p7' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p8' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'p9' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+    'updated' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
+    'language' => array(
+      'type' => 'varchar',
+      'not null' => TRUE,
+      'length' => '12',
+      'default' => 'und',
+    ),
+    'i18n_tsid' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+      'unsigned' => TRUE,
+    ),
+  ),
+  'primary key' => array(
+    'mlid',
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->insert('menu_links')
+->fields(array(
+  'menu_name',
+  'mlid',
+  'plid',
+  'link_path',
+  'router_path',
+  'link_title',
+  'options',
+  'module',
+  'hidden',
+  'external',
+  'has_children',
+  'expanded',
+  'weight',
+  'depth',
+  'customized',
+  'p1',
+  'p2',
+  'p3',
+  'p4',
+  'p5',
+  'p6',
+  'p7',
+  'p8',
+  'p9',
+  'updated',
+  'language',
+  'i18n_tsid',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '1',
+  'plid' => '0',
+  'link_path' => 'admin',
+  'router_path' => 'admin',
+  'link_title' => 'Administration',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '9',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'user-menu',
+  'mlid' => '2',
+  'plid' => '0',
+  'link_path' => 'user',
+  'router_path' => 'user',
+  'link_title' => 'User account',
+  'options' => 'a:1:{s:5:"alter";b:1;}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '2',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '3',
+  'plid' => '0',
+  'link_path' => 'comment/%',
+  'router_path' => 'comment/%',
+  'link_title' => 'Comment permalink',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '3',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '4',
+  'plid' => '0',
+  'link_path' => 'filter/tips',
+  'router_path' => 'filter/tips',
+  'link_title' => 'Compose tips',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '1',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '4',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '5',
+  'plid' => '0',
+  'link_path' => 'node/%',
+  'router_path' => 'node/%',
+  'link_title' => '',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '5',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '6',
+  'plid' => '0',
+  'link_path' => 'node/add',
+  'router_path' => 'node/add',
+  'link_title' => 'Add content',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '6',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '7',
+  'plid' => '1',
+  'link_path' => 'admin/appearance',
+  'router_path' => 'admin/appearance',
+  'link_title' => 'Appearance',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"Select and configure your themes.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-6',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '7',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '8',
+  'plid' => '1',
+  'link_path' => 'admin/config',
+  'router_path' => 'admin/config',
+  'link_title' => 'Configuration',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:20:"Administer settings.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '9',
+  'plid' => '1',
+  'link_path' => 'admin/content',
+  'router_path' => 'admin/content',
+  'link_title' => 'Content',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:32:"Administer content and comments.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '9',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'user-menu',
+  'mlid' => '10',
+  'plid' => '2',
+  'link_path' => 'user/register',
+  'router_path' => 'user/register',
+  'link_title' => 'Create new account',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '2',
+  'p2' => '10',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '12',
+  'plid' => '1',
+  'link_path' => 'admin/index',
+  'router_path' => 'admin/index',
+  'link_title' => 'Index',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-18',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '12',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'user-menu',
+  'mlid' => '13',
+  'plid' => '2',
+  'link_path' => 'user/login',
+  'router_path' => 'user/login',
+  'link_title' => 'Log in',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '2',
+  'p2' => '13',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'user-menu',
+  'mlid' => '14',
+  'plid' => '0',
+  'link_path' => 'user/logout',
+  'router_path' => 'user/logout',
+  'link_title' => 'Log out',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '10',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '14',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '15',
+  'plid' => '1',
+  'link_path' => 'admin/modules',
+  'router_path' => 'admin/modules',
+  'link_title' => 'Modules',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:26:"Extend site functionality.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-2',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '15',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '16',
+  'plid' => '0',
+  'link_path' => 'user/%',
+  'router_path' => 'user/%',
+  'link_title' => 'My account',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '16',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '17',
+  'plid' => '1',
+  'link_path' => 'admin/people',
+  'router_path' => 'admin/people',
+  'link_title' => 'People',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Manage user accounts, roles, and permissions.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-4',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '17',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '18',
+  'plid' => '1',
+  'link_path' => 'admin/reports',
+  'router_path' => 'admin/reports',
+  'link_title' => 'Reports',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"View reports, updates, and errors.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '5',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '18',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'user-menu',
+  'mlid' => '19',
+  'plid' => '2',
+  'link_path' => 'user/password',
+  'router_path' => 'user/password',
+  'link_title' => 'Request new password',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '2',
+  'p2' => '19',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '20',
+  'plid' => '1',
+  'link_path' => 'admin/structure',
+  'router_path' => 'admin/structure',
+  'link_title' => 'Structure',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Administer blocks, content types, menus, etc.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-8',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '21',
+  'plid' => '1',
+  'link_path' => 'admin/tasks',
+  'router_path' => 'admin/tasks',
+  'link_title' => 'Tasks',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-20',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '21',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '22',
+  'plid' => '0',
+  'link_path' => 'comment/reply/%',
+  'router_path' => 'comment/reply/%',
+  'link_title' => 'Add new comment',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '0',
+  'p1' => '22',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '23',
+  'plid' => '3',
+  'link_path' => 'comment/%/approve',
+  'router_path' => 'comment/%/approve',
+  'link_title' => 'Approve',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '1',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '3',
+  'p2' => '23',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '24',
+  'plid' => '3',
+  'link_path' => 'comment/%/delete',
+  'router_path' => 'comment/%/delete',
+  'link_title' => 'Delete',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '2',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '3',
+  'p2' => '24',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '25',
+  'plid' => '3',
+  'link_path' => 'comment/%/edit',
+  'router_path' => 'comment/%/edit',
+  'link_title' => 'Edit',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '3',
+  'p2' => '25',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '26',
+  'plid' => '3',
+  'link_path' => 'comment/%/view',
+  'router_path' => 'comment/%/view',
+  'link_title' => 'View comment',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '3',
+  'p2' => '26',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '27',
+  'plid' => '17',
+  'link_path' => 'admin/people/create',
+  'router_path' => 'admin/people/create',
+  'link_title' => 'Add user',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '17',
+  'p3' => '27',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '28',
+  'plid' => '20',
+  'link_path' => 'admin/structure/block',
+  'router_path' => 'admin/structure/block',
+  'link_title' => 'Blocks',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:79:\"Configure what block content appears in your site's sidebars and other regions.\";}}",
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '29',
+  'plid' => '16',
+  'link_path' => 'user/%/cancel',
+  'router_path' => 'user/%/cancel',
+  'link_title' => 'Cancel account',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '16',
+  'p2' => '29',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '30',
+  'plid' => '9',
+  'link_path' => 'admin/content/comment',
+  'router_path' => 'admin/content/comment',
+  'link_title' => 'Comments',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:59:"List and edit site comments and the comment approval queue.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '9',
+  'p3' => '30',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '32',
+  'plid' => '9',
+  'link_path' => 'admin/content/node',
+  'router_path' => 'admin/content/node',
+  'link_title' => 'Content',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '9',
+  'p3' => '32',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '33',
+  'plid' => '8',
+  'link_path' => 'admin/config/content',
+  'router_path' => 'admin/config/content',
+  'link_title' => 'Content authoring',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:53:"Settings related to formatting and authoring content.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-15',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '34',
+  'plid' => '20',
+  'link_path' => 'admin/structure/types',
+  'router_path' => 'admin/structure/types',
+  'link_title' => 'Content types',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:92:"Manage content types, including default status, front page promotion, comment settings, etc.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '36',
+  'plid' => '5',
+  'link_path' => 'node/%/delete',
+  'router_path' => 'node/%/delete',
+  'link_title' => 'Delete',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '1',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '5',
+  'p2' => '36',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '37',
+  'plid' => '8',
+  'link_path' => 'admin/config/development',
+  'router_path' => 'admin/config/development',
+  'link_title' => 'Development',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:18:"Development tools.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '38',
+  'plid' => '16',
+  'link_path' => 'user/%/edit',
+  'router_path' => 'user/%/edit',
+  'link_title' => 'Edit',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '16',
+  'p2' => '38',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '39',
+  'plid' => '5',
+  'link_path' => 'node/%/edit',
+  'router_path' => 'node/%/edit',
+  'link_title' => 'Edit',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '5',
+  'p2' => '39',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '40',
+  'plid' => '15',
+  'link_path' => 'admin/modules/list',
+  'router_path' => 'admin/modules/list',
+  'link_title' => 'List',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '15',
+  'p3' => '40',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '41',
+  'plid' => '17',
+  'link_path' => 'admin/people/people',
+  'router_path' => 'admin/people/people',
+  'link_title' => 'List',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:50:"Find and manage people interacting with your site.";}}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '17',
+  'p3' => '41',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '1',
-  'plid' => '0',
-  'link_path' => 'admin',
-  'router_path' => 'admin',
-  'link_title' => 'Administration',
-  'options' => 'a:0:{}',
+  'mlid' => '42',
+  'plid' => '7',
+  'link_path' => 'admin/appearance/list',
+  'router_path' => 'admin/appearance/list',
+  'link_title' => 'List',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:31:"Select and configure your theme";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '9',
-  'depth' => '1',
+  'weight' => '-1',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '0',
-  'p3' => '0',
+  'p2' => '7',
+  'p3' => '42',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23419,24 +25814,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'user-menu',
-  'mlid' => '2',
-  'plid' => '0',
-  'link_path' => 'user',
-  'router_path' => 'user',
-  'link_title' => 'User account',
-  'options' => 'a:1:{s:5:"alter";b:1;}',
+  'menu_name' => 'management',
+  'mlid' => '43',
+  'plid' => '8',
+  'link_path' => 'admin/config/media',
+  'router_path' => 'admin/config/media',
+  'link_title' => 'Media',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:12:"Media tools.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '2',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '43',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23448,24 +25843,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '3',
-  'plid' => '0',
-  'link_path' => 'comment/%',
-  'router_path' => 'comment/%',
-  'link_title' => 'Comment permalink',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '44',
+  'plid' => '20',
+  'link_path' => 'admin/structure/menu',
+  'router_path' => 'admin/structure/menu',
+  'link_title' => 'Menus',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:86:"Add new menus to your site, edit existing menus, and rename and reorganize menu links.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '3',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '44',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23477,24 +25872,53 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '4',
-  'plid' => '0',
-  'link_path' => 'filter/tips',
-  'router_path' => 'filter/tips',
-  'link_title' => 'Compose tips',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '45',
+  'plid' => '8',
+  'link_path' => 'admin/config/people',
+  'router_path' => 'admin/config/people',
+  'link_title' => 'People',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:24:"Configure user accounts.";}}',
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
+  'weight' => '-20',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '45',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '46',
+  'plid' => '17',
+  'link_path' => 'admin/people/permissions',
+  'router_path' => 'admin/people/permissions',
+  'link_title' => 'Permissions',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:64:"Determine access to features by selecting permissions for roles.";}}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '4',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '17',
+  'p3' => '46',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23506,24 +25930,53 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '5',
-  'plid' => '0',
-  'link_path' => 'node/%',
-  'router_path' => 'node/%',
-  'link_title' => '',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '47',
+  'plid' => '18',
+  'link_path' => 'admin/reports/dblog',
+  'router_path' => 'admin/reports/dblog',
+  'link_title' => 'Recent log messages',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"View events that have recently been logged.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
+  'weight' => '-1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '18',
+  'p3' => '47',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '48',
+  'plid' => '8',
+  'link_path' => 'admin/config/regional',
+  'router_path' => 'admin/config/regional',
+  'link_title' => 'Regional and language',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:48:"Regional settings, localization and translation.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-5',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '48',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23536,22 +25989,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '6',
-  'plid' => '0',
-  'link_path' => 'node/add',
-  'router_path' => 'node/add',
-  'link_title' => 'Add content',
+  'mlid' => '49',
+  'plid' => '5',
+  'link_path' => 'node/%/revisions',
+  'router_path' => 'node/%/revisions',
+  'link_title' => 'Revisions',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
+  'weight' => '2',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '6',
-  'p2' => '0',
+  'p1' => '5',
+  'p2' => '49',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -23565,23 +26018,52 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '7',
-  'plid' => '1',
-  'link_path' => 'admin/appearance',
-  'router_path' => 'admin/appearance',
-  'link_title' => 'Appearance',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"Select and configure your themes.";}}',
+  'mlid' => '50',
+  'plid' => '8',
+  'link_path' => 'admin/config/search',
+  'router_path' => 'admin/config/search',
+  'link_title' => 'Search and metadata',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:36:"Local site search, metadata and SEO.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '-10',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '51',
+  'plid' => '7',
+  'link_path' => 'admin/appearance/settings',
+  'router_path' => 'admin/appearance/settings',
+  'link_title' => 'Settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:46:"Configure default and theme specific settings.";}}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-6',
-  'depth' => '2',
+  'weight' => '20',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
   'p2' => '7',
-  'p3' => '0',
+  'p3' => '51',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23594,23 +26076,52 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '8',
-  'plid' => '1',
-  'link_path' => 'admin/config',
-  'router_path' => 'admin/config',
-  'link_title' => 'Configuration',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:20:"Administer settings.";}}',
+  'mlid' => '52',
+  'plid' => '18',
+  'link_path' => 'admin/reports/status',
+  'router_path' => 'admin/reports/status',
+  'link_title' => 'Status report',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:74:\"Get a status report about your site's operation and any detected problems.\";}}",
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '-60',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '18',
+  'p3' => '52',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '53',
+  'plid' => '8',
+  'link_path' => 'admin/config/system',
+  'router_path' => 'admin/config/system',
+  'link_title' => 'System',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:37:"General system related configuration.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-20',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '0',
+  'p3' => '53',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23623,22 +26134,138 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '9',
-  'plid' => '1',
-  'link_path' => 'admin/content',
-  'router_path' => 'admin/content',
-  'link_title' => 'Content',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:32:"Administer content and comments.";}}',
+  'mlid' => '54',
+  'plid' => '18',
+  'link_path' => 'admin/reports/access-denied',
+  'router_path' => 'admin/reports/access-denied',
+  'link_title' => "Top 'access denied' errors",
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:35:\"View 'access denied' errors (403s).\";}}",
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '18',
+  'p3' => '54',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '55',
+  'plid' => '18',
+  'link_path' => 'admin/reports/page-not-found',
+  'router_path' => 'admin/reports/page-not-found',
+  'link_title' => "Top 'page not found' errors",
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:36:\"View 'page not found' errors (404s).\";}}",
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '18',
+  'p3' => '55',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '56',
+  'plid' => '15',
+  'link_path' => 'admin/modules/uninstall',
+  'router_path' => 'admin/modules/uninstall',
+  'link_title' => 'Uninstall',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '20',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '15',
+  'p3' => '56',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '57',
+  'plid' => '8',
+  'link_path' => 'admin/config/user-interface',
+  'router_path' => 'admin/config/user-interface',
+  'link_title' => 'User interface',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Tools that enhance the user interface.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
+  'weight' => '-15',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '58',
+  'plid' => '5',
+  'link_path' => 'node/%/view',
+  'router_path' => 'node/%/view',
+  'link_title' => 'View',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
   'weight' => '-10',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '9',
+  'p1' => '5',
+  'p2' => '58',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -23651,23 +26278,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'user-menu',
-  'mlid' => '10',
-  'plid' => '2',
-  'link_path' => 'user/register',
-  'router_path' => 'user/register',
-  'link_title' => 'Create new account',
+  'menu_name' => 'navigation',
+  'mlid' => '59',
+  'plid' => '16',
+  'link_path' => 'user/%/view',
+  'router_path' => 'user/%/view',
+  'link_title' => 'View',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '-10',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '2',
-  'p2' => '10',
+  'p1' => '16',
+  'p2' => '59',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -23681,24 +26308,82 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '12',
-  'plid' => '1',
-  'link_path' => 'admin/index',
-  'router_path' => 'admin/index',
-  'link_title' => 'Index',
-  'options' => 'a:0:{}',
+  'mlid' => '60',
+  'plid' => '8',
+  'link_path' => 'admin/config/services',
+  'router_path' => 'admin/config/services',
+  'link_title' => 'Web services',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:30:"Tools related to web services.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '1',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '61',
+  'plid' => '8',
+  'link_path' => 'admin/config/workflow',
+  'router_path' => 'admin/config/workflow',
+  'link_title' => 'Workflow',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"Content workflow, editorial workflow tools.";}}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '5',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '61',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '66',
+  'plid' => '45',
+  'link_path' => 'admin/config/people/accounts',
+  'router_path' => 'admin/config/people/accounts',
+  'link_title' => 'Account settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:109:"Configure default behavior of users, including registration requirements, e-mails, fields, and user pictures.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-18',
-  'depth' => '2',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '12',
-  'p3' => '0',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '45',
+  'p4' => '66',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23709,25 +26394,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'user-menu',
-  'mlid' => '13',
-  'plid' => '2',
-  'link_path' => 'user/login',
-  'router_path' => 'user/login',
-  'link_title' => 'Log in',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '67',
+  'plid' => '53',
+  'link_path' => 'admin/config/system/actions',
+  'router_path' => 'admin/config/system/actions',
+  'link_title' => 'Actions',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:41:"Manage the actions defined for your site.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '2',
-  'p2' => '13',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '53',
+  'p4' => '67',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23738,25 +26423,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'user-menu',
-  'mlid' => '14',
-  'plid' => '0',
-  'link_path' => 'user/logout',
-  'router_path' => 'user/logout',
-  'link_title' => 'Log out',
+  'menu_name' => 'management',
+  'mlid' => '68',
+  'plid' => '28',
+  'link_path' => 'admin/structure/block/add',
+  'router_path' => 'admin/structure/block/add',
+  'link_title' => 'Add block',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '14',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '68',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23768,24 +26453,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '15',
-  'plid' => '1',
-  'link_path' => 'admin/modules',
-  'router_path' => 'admin/modules',
-  'link_title' => 'Modules',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:26:"Extend site functionality.";}}',
+  'mlid' => '69',
+  'plid' => '34',
+  'link_path' => 'admin/structure/types/add',
+  'router_path' => 'admin/structure/types/add',
+  'link_title' => 'Add content type',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-2',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '15',
-  'p3' => '0',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '69',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23796,25 +26481,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '16',
-  'plid' => '0',
-  'link_path' => 'user/%',
-  'router_path' => 'user/%',
-  'link_title' => 'My account',
+  'menu_name' => 'management',
+  'mlid' => '70',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/add',
+  'router_path' => 'admin/structure/menu/add',
+  'link_title' => 'Add menu',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '70',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23826,24 +26511,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '17',
-  'plid' => '1',
-  'link_path' => 'admin/people',
-  'router_path' => 'admin/people',
-  'link_title' => 'People',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Manage user accounts, roles, and permissions.";}}',
+  'mlid' => '71',
+  'plid' => '51',
+  'link_path' => 'admin/appearance/settings/bartik',
+  'router_path' => 'admin/appearance/settings/bartik',
+  'link_title' => 'Bartik',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-4',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '0',
-  'p4' => '0',
+  'p2' => '7',
+  'p3' => '51',
+  'p4' => '71',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23855,24 +26540,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '18',
-  'plid' => '1',
-  'link_path' => 'admin/reports',
-  'router_path' => 'admin/reports',
-  'link_title' => 'Reports',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"View reports, updates, and errors.";}}',
+  'mlid' => '72',
+  'plid' => '50',
+  'link_path' => 'admin/config/search/clean-urls',
+  'router_path' => 'admin/config/search/clean-urls',
+  'link_title' => 'Clean URLs',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"Enable or disable clean URLs for your site.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '5',
-  'depth' => '2',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '0',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '72',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23883,25 +26568,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'user-menu',
-  'mlid' => '19',
-  'plid' => '2',
-  'link_path' => 'user/password',
-  'router_path' => 'user/password',
-  'link_title' => 'Request new password',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '73',
+  'plid' => '53',
+  'link_path' => 'admin/config/system/cron',
+  'router_path' => 'admin/config/system/cron',
+  'link_title' => 'Cron',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:40:"Manage automatic site maintenance tasks.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '20',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '2',
-  'p2' => '19',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '53',
+  'p4' => '73',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23913,24 +26598,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '20',
-  'plid' => '1',
-  'link_path' => 'admin/structure',
-  'router_path' => 'admin/structure',
-  'link_title' => 'Structure',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Administer blocks, content types, menus, etc.";}}',
+  'mlid' => '74',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/date-time',
+  'router_path' => 'admin/config/regional/date-time',
+  'link_title' => 'Date and time',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:44:"Configure display formats for date and time.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-8',
-  'depth' => '2',
+  'weight' => '-15',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '0',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '74',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23942,23 +26627,23 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '21',
-  'plid' => '1',
-  'link_path' => 'admin/tasks',
-  'router_path' => 'admin/tasks',
-  'link_title' => 'Tasks',
+  'mlid' => '75',
+  'plid' => '18',
+  'link_path' => 'admin/reports/event/%',
+  'router_path' => 'admin/reports/event/%',
+  'link_title' => 'Details',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '21',
-  'p3' => '0',
+  'p2' => '18',
+  'p3' => '75',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -23970,25 +26655,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '22',
-  'plid' => '0',
-  'link_path' => 'comment/reply/%',
-  'router_path' => 'comment/reply/%',
-  'link_title' => 'Add new comment',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '76',
+  'plid' => '43',
+  'link_path' => 'admin/config/media/file-system',
+  'router_path' => 'admin/config/media/file-system',
+  'link_title' => 'File system',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:68:"Tell Drupal where to store uploaded files and how they are accessed.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '22',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '76',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -23999,25 +26684,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '23',
-  'plid' => '3',
-  'link_path' => 'comment/%/approve',
-  'router_path' => 'comment/%/approve',
-  'link_title' => 'Approve',
+  'menu_name' => 'management',
+  'mlid' => '78',
+  'plid' => '51',
+  'link_path' => 'admin/appearance/settings/garland',
+  'router_path' => 'admin/appearance/settings/garland',
+  'link_title' => 'Garland',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '3',
-  'p2' => '23',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '7',
+  'p3' => '51',
+  'p4' => '78',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24028,25 +26713,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '24',
-  'plid' => '3',
-  'link_path' => 'comment/%/delete',
-  'router_path' => 'comment/%/delete',
-  'link_title' => 'Delete',
+  'menu_name' => 'management',
+  'mlid' => '79',
+  'plid' => '51',
+  'link_path' => 'admin/appearance/settings/global',
+  'router_path' => 'admin/appearance/settings/global',
+  'link_title' => 'Global settings',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '2',
+  'weight' => '-1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '3',
-  'p2' => '24',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '7',
+  'p3' => '51',
+  'p4' => '79',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24057,25 +26742,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '25',
-  'plid' => '3',
-  'link_path' => 'comment/%/edit',
-  'router_path' => 'comment/%/edit',
-  'link_title' => 'Edit',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '80',
+  'plid' => '45',
+  'link_path' => 'admin/config/people/ip-blocking',
+  'router_path' => 'admin/config/people/ip-blocking',
+  'link_title' => 'IP address blocking',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:28:"Manage blocked IP addresses.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '10',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '3',
-  'p2' => '25',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '45',
+  'p4' => '80',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24086,25 +26771,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '26',
-  'plid' => '3',
-  'link_path' => 'comment/%/view',
-  'router_path' => 'comment/%/view',
-  'link_title' => 'View comment',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '81',
+  'plid' => '43',
+  'link_path' => 'admin/config/media/image-toolkit',
+  'router_path' => 'admin/config/media/image-toolkit',
+  'link_title' => 'Image toolkit',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:74:"Choose which image toolkit to use if you have installed optional toolkits.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '2',
+  'weight' => '20',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '3',
-  'p2' => '26',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '81',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24116,11 +26801,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '27',
-  'plid' => '17',
-  'link_path' => 'admin/people/create',
-  'router_path' => 'admin/people/create',
-  'link_title' => 'Add user',
+  'mlid' => '82',
+  'plid' => '40',
+  'link_path' => 'admin/modules/list/confirm',
+  'router_path' => 'admin/modules/list/confirm',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -24128,12 +26813,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '27',
-  'p4' => '0',
+  'p2' => '15',
+  'p3' => '40',
+  'p4' => '82',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24145,24 +26830,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '28',
-  'plid' => '20',
-  'link_path' => 'admin/structure/block',
-  'router_path' => 'admin/structure/block',
-  'link_title' => 'Blocks',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:79:\"Configure what block content appears in your site's sidebars and other regions.\";}}",
+  'mlid' => '83',
+  'plid' => '34',
+  'link_path' => 'admin/structure/types/list',
+  'router_path' => 'admin/structure/types/list',
+  'link_title' => 'List',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '28',
-  'p4' => '0',
+  'p3' => '34',
+  'p4' => '83',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24173,25 +26858,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '29',
-  'plid' => '16',
-  'link_path' => 'user/%/cancel',
-  'router_path' => 'user/%/cancel',
-  'link_title' => 'Cancel account',
+  'menu_name' => 'management',
+  'mlid' => '84',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/list',
+  'router_path' => 'admin/structure/menu/list',
+  'link_title' => 'List menus',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '29',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '84',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24203,24 +26888,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '30',
-  'plid' => '9',
-  'link_path' => 'admin/content/comment',
-  'router_path' => 'admin/content/comment',
-  'link_title' => 'Comments',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:59:"List and edit site comments and the comment approval queue.";}}',
+  'mlid' => '85',
+  'plid' => '37',
+  'link_path' => 'admin/config/development/logging',
+  'router_path' => 'admin/config/development/logging',
+  'link_title' => 'Logging and errors',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:154:\"Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.\";}}",
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-15',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '9',
-  'p3' => '30',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '85',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24232,24 +26917,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '32',
-  'plid' => '9',
-  'link_path' => 'admin/content/node',
-  'router_path' => 'admin/content/node',
-  'link_title' => 'Content',
-  'options' => 'a:0:{}',
+  'mlid' => '86',
+  'plid' => '37',
+  'link_path' => 'admin/config/development/maintenance',
+  'router_path' => 'admin/config/development/maintenance',
+  'link_title' => 'Maintenance mode',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:62:"Take the site offline for maintenance or bring it back online.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '9',
-  'p3' => '32',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '86',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24261,24 +26946,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '33',
-  'plid' => '8',
-  'link_path' => 'admin/config/content',
-  'router_path' => 'admin/config/content',
-  'link_title' => 'Content authoring',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:53:"Settings related to formatting and authoring content.";}}',
+  'mlid' => '89',
+  'plid' => '37',
+  'link_path' => 'admin/config/development/performance',
+  'router_path' => 'admin/config/development/performance',
+  'link_title' => 'Performance',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:101:"Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-15',
-  'depth' => '3',
+  'weight' => '-20',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '33',
-  'p4' => '0',
+  'p3' => '37',
+  'p4' => '89',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24290,24 +26975,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '34',
-  'plid' => '20',
-  'link_path' => 'admin/structure/types',
-  'router_path' => 'admin/structure/types',
-  'link_title' => 'Content types',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:92:"Manage content types, including default status, front page promotion, comment settings, etc.";}}',
+  'mlid' => '90',
+  'plid' => '46',
+  'link_path' => 'admin/people/permissions/list',
+  'router_path' => 'admin/people/permissions/list',
+  'link_title' => 'Permissions',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:64:"Determine access to features by selecting permissions for roles.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-8',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '0',
+  'p2' => '17',
+  'p3' => '46',
+  'p4' => '90',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24318,25 +27003,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '36',
-  'plid' => '5',
-  'link_path' => 'node/%/delete',
-  'router_path' => 'node/%/delete',
-  'link_title' => 'Delete',
+  'menu_name' => 'management',
+  'mlid' => '93',
+  'plid' => '30',
+  'link_path' => 'admin/content/comment/new',
+  'router_path' => 'admin/content/comment/new',
+  'link_title' => 'Published comments',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '2',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '36',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '9',
+  'p3' => '30',
+  'p4' => '93',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24348,24 +27033,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '37',
-  'plid' => '8',
-  'link_path' => 'admin/config/development',
-  'router_path' => 'admin/config/development',
-  'link_title' => 'Development',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:18:"Development tools.";}}',
+  'mlid' => '94',
+  'plid' => '60',
+  'link_path' => 'admin/config/services/rss-publishing',
+  'router_path' => 'admin/config/services/rss-publishing',
+  'link_title' => 'RSS publishing',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:114:"Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '37',
-  'p4' => '0',
+  'p3' => '60',
+  'p4' => '94',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24376,25 +27061,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '38',
-  'plid' => '16',
-  'link_path' => 'user/%/edit',
-  'router_path' => 'user/%/edit',
-  'link_title' => 'Edit',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '95',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/settings',
+  'router_path' => 'admin/config/regional/settings',
+  'link_title' => 'Regional settings',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:54:\"Settings for the site's default time zone and country.\";}}",
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-20',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '38',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '95',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24405,25 +27090,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '39',
-  'plid' => '5',
-  'link_path' => 'node/%/edit',
-  'router_path' => 'node/%/edit',
-  'link_title' => 'Edit',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '96',
+  'plid' => '46',
+  'link_path' => 'admin/people/permissions/roles',
+  'router_path' => 'admin/people/permissions/roles',
+  'link_title' => 'Roles',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:30:"List, edit, or add user roles.";}}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-5',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '39',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '17',
+  'p3' => '46',
+  'p4' => '96',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24435,24 +27120,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '40',
-  'plid' => '15',
-  'link_path' => 'admin/modules/list',
-  'router_path' => 'admin/modules/list',
-  'link_title' => 'List',
+  'mlid' => '97',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/settings',
+  'router_path' => 'admin/structure/menu/settings',
+  'link_title' => 'Settings',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '5',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '15',
-  'p3' => '40',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '97',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24464,24 +27149,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '41',
-  'plid' => '17',
-  'link_path' => 'admin/people/people',
-  'router_path' => 'admin/people/people',
-  'link_title' => 'List',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:50:"Find and manage people interacting with your site.";}}',
+  'mlid' => '98',
+  'plid' => '51',
+  'link_path' => 'admin/appearance/settings/seven',
+  'router_path' => 'admin/appearance/settings/seven',
+  'link_title' => 'Seven',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '41',
-  'p4' => '0',
+  'p2' => '7',
+  'p3' => '51',
+  'p4' => '98',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24493,24 +27178,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '42',
-  'plid' => '7',
-  'link_path' => 'admin/appearance/list',
-  'router_path' => 'admin/appearance/list',
-  'link_title' => 'List',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:31:"Select and configure your theme";}}',
+  'mlid' => '99',
+  'plid' => '53',
+  'link_path' => 'admin/config/system/site-information',
+  'router_path' => 'admin/config/system/site-information',
+  'link_title' => 'Site information',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:104:"Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-1',
-  'depth' => '3',
+  'weight' => '-20',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '42',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '53',
+  'p4' => '99',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24522,24 +27207,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '43',
-  'plid' => '8',
-  'link_path' => 'admin/config/media',
-  'router_path' => 'admin/config/media',
-  'link_title' => 'Media',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:12:"Media tools.";}}',
+  'mlid' => '100',
+  'plid' => '51',
+  'link_path' => 'admin/appearance/settings/stark',
+  'router_path' => 'admin/appearance/settings/stark',
+  'link_title' => 'Stark',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '0',
+  'p2' => '7',
+  'p3' => '51',
+  'p4' => '100',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24551,24 +27236,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '44',
-  'plid' => '20',
-  'link_path' => 'admin/structure/menu',
-  'router_path' => 'admin/structure/menu',
-  'link_title' => 'Menus',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:86:"Add new menus to your site, edit existing menus, and rename and reorganize menu links.";}}',
+  'mlid' => '101',
+  'plid' => '33',
+  'link_path' => 'admin/config/content/formats',
+  'router_path' => 'admin/config/content/formats',
+  'link_title' => 'Text formats',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:127:"Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '101',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24580,24 +27265,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '45',
-  'plid' => '8',
-  'link_path' => 'admin/config/people',
-  'router_path' => 'admin/config/people',
-  'link_title' => 'People',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:24:"Configure user accounts.";}}',
+  'mlid' => '102',
+  'plid' => '30',
+  'link_path' => 'admin/content/comment/approval',
+  'router_path' => 'admin/content/comment/approval',
+  'link_title' => 'Unapproved comments',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '0',
+  'p2' => '9',
+  'p3' => '30',
+  'p4' => '102',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24609,24 +27294,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '46',
-  'plid' => '17',
-  'link_path' => 'admin/people/permissions',
-  'router_path' => 'admin/people/permissions',
-  'link_title' => 'Permissions',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:64:"Determine access to features by selecting permissions for roles.";}}',
+  'mlid' => '103',
+  'plid' => '56',
+  'link_path' => 'admin/modules/uninstall/confirm',
+  'router_path' => 'admin/modules/uninstall/confirm',
+  'link_title' => 'Uninstall',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '46',
-  'p4' => '0',
+  'p2' => '15',
+  'p3' => '56',
+  'p4' => '103',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24637,24 +27322,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '47',
-  'plid' => '18',
-  'link_path' => 'admin/reports/dblog',
-  'router_path' => 'admin/reports/dblog',
-  'link_title' => 'Recent log messages',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"View events that have recently been logged.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '104',
+  'plid' => '38',
+  'link_path' => 'user/%/edit/account',
+  'router_path' => 'user/%/edit/account',
+  'link_title' => 'Account',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-1',
+  'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '18',
-  'p3' => '47',
+  'p1' => '16',
+  'p2' => '38',
+  'p3' => '104',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -24667,25 +27352,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '48',
-  'plid' => '8',
-  'link_path' => 'admin/config/regional',
-  'router_path' => 'admin/config/regional',
-  'link_title' => 'Regional and language',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:48:"Regional settings, localization and translation.";}}',
+  'mlid' => '105',
+  'plid' => '101',
+  'link_path' => 'admin/config/content/formats/%',
+  'router_path' => 'admin/config/content/formats/%',
+  'link_title' => '',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
-  'weight' => '-5',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '0',
-  'p5' => '0',
+  'p3' => '33',
+  'p4' => '101',
+  'p5' => '105',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24695,26 +27380,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '49',
-  'plid' => '5',
-  'link_path' => 'node/%/revisions',
-  'router_path' => 'node/%/revisions',
-  'link_title' => 'Revisions',
+  'menu_name' => 'management',
+  'mlid' => '110',
+  'plid' => '101',
+  'link_path' => 'admin/config/content/formats/add',
+  'router_path' => 'admin/config/content/formats/add',
+  'link_title' => 'Add text format',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '2',
+  'weight' => '1',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '49',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '101',
+  'p5' => '110',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24725,24 +27410,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '50',
-  'plid' => '8',
-  'link_path' => 'admin/config/search',
-  'router_path' => 'admin/config/search',
-  'link_title' => 'Search and metadata',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:36:"Local site search, metadata and SEO.";}}',
+  'mlid' => '111',
+  'plid' => '28',
+  'link_path' => 'admin/structure/block/list/bartik',
+  'router_path' => 'admin/structure/block/list/bartik',
+  'link_title' => 'Bartik',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '111',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24754,25 +27439,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '51',
-  'plid' => '7',
-  'link_path' => 'admin/appearance/settings',
-  'router_path' => 'admin/appearance/settings',
-  'link_title' => 'Settings',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:46:"Configure default and theme specific settings.";}}',
+  'mlid' => '112',
+  'plid' => '67',
+  'link_path' => 'admin/config/system/actions/configure',
+  'router_path' => 'admin/config/system/actions/configure',
+  'link_title' => 'Configure an advanced action',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '20',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '51',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '53',
+  'p4' => '67',
+  'p5' => '112',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24783,24 +27468,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '52',
-  'plid' => '18',
-  'link_path' => 'admin/reports/status',
-  'router_path' => 'admin/reports/status',
-  'link_title' => 'Status report',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:74:\"Get a status report about your site's operation and any detected problems.\";}}",
+  'mlid' => '113',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/%',
+  'router_path' => 'admin/structure/menu/manage/%',
+  'link_title' => 'Customize menu',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '-60',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '52',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '113',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24812,24 +27497,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '53',
-  'plid' => '8',
-  'link_path' => 'admin/config/system',
-  'router_path' => 'admin/config/system',
-  'link_title' => 'System',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:37:"General system related configuration.";}}',
+  'mlid' => '114',
+  'plid' => '34',
+  'link_path' => 'admin/structure/types/manage/%',
+  'router_path' => 'admin/structure/types/manage/%',
+  'link_title' => 'Edit content type',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '53',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24841,25 +27526,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '54',
-  'plid' => '18',
-  'link_path' => 'admin/reports/access-denied',
-  'router_path' => 'admin/reports/access-denied',
-  'link_title' => "Top 'access denied' errors",
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:35:\"View 'access denied' errors (403s).\";}}",
+  'mlid' => '116',
+  'plid' => '74',
+  'link_path' => 'admin/config/regional/date-time/formats',
+  'router_path' => 'admin/config/regional/date-time/formats',
+  'link_title' => 'Formats',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:51:"Configure display format strings for date and time.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-9',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '54',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '116',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24870,24 +27555,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '55',
-  'plid' => '18',
-  'link_path' => 'admin/reports/page-not-found',
-  'router_path' => 'admin/reports/page-not-found',
-  'link_title' => "Top 'page not found' errors",
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:36:\"View 'page not found' errors (404s).\";}}",
+  'mlid' => '117',
+  'plid' => '28',
+  'link_path' => 'admin/structure/block/list/garland',
+  'router_path' => 'admin/structure/block/list/garland',
+  'link_title' => 'Garland',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '55',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '117',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -24899,25 +27584,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '56',
-  'plid' => '15',
-  'link_path' => 'admin/modules/uninstall',
-  'router_path' => 'admin/modules/uninstall',
-  'link_title' => 'Uninstall',
+  'mlid' => '118',
+  'plid' => '101',
+  'link_path' => 'admin/config/content/formats/list',
+  'router_path' => 'admin/config/content/formats/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '20',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '15',
-  'p3' => '56',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '101',
+  'p5' => '118',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24928,25 +27613,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '57',
-  'plid' => '8',
-  'link_path' => 'admin/config/user-interface',
-  'router_path' => 'admin/config/user-interface',
-  'link_title' => 'User interface',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Tools that enhance the user interface.";}}',
+  'mlid' => '119',
+  'plid' => '67',
+  'link_path' => 'admin/config/system/actions/manage',
+  'router_path' => 'admin/config/system/actions/manage',
+  'link_title' => 'Manage actions',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:41:"Manage the actions defined for your site.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-15',
-  'depth' => '3',
+  'weight' => '-2',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '57',
-  'p4' => '0',
-  'p5' => '0',
+  'p3' => '53',
+  'p4' => '67',
+  'p5' => '119',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24956,12 +27641,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '58',
-  'plid' => '5',
-  'link_path' => 'node/%/view',
-  'router_path' => 'node/%/view',
-  'link_title' => 'View',
+  'menu_name' => 'management',
+  'mlid' => '124',
+  'plid' => '66',
+  'link_path' => 'admin/config/people/accounts/settings',
+  'router_path' => 'admin/config/people/accounts/settings',
+  'link_title' => 'Settings',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -24969,13 +27654,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '2',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '58',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '124',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -24985,25 +27670,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '59',
-  'plid' => '16',
-  'link_path' => 'user/%/view',
-  'router_path' => 'user/%/view',
-  'link_title' => 'View',
+  'menu_name' => 'management',
+  'mlid' => '125',
+  'plid' => '28',
+  'link_path' => 'admin/structure/block/list/seven',
+  'router_path' => 'admin/structure/block/list/seven',
+  'link_title' => 'Seven',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '59',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '125',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25015,24 +27700,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '60',
-  'plid' => '8',
-  'link_path' => 'admin/config/services',
-  'router_path' => 'admin/config/services',
-  'link_title' => 'Web services',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:30:"Tools related to web services.";}}',
+  'mlid' => '126',
+  'plid' => '28',
+  'link_path' => 'admin/structure/block/list/stark',
+  'router_path' => 'admin/structure/block/list/stark',
+  'link_title' => 'Stark',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '126',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25044,25 +27729,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '61',
-  'plid' => '8',
-  'link_path' => 'admin/config/workflow',
-  'router_path' => 'admin/config/workflow',
-  'link_title' => 'Workflow',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"Content workflow, editorial workflow tools.";}}',
+  'mlid' => '127',
+  'plid' => '74',
+  'link_path' => 'admin/config/regional/date-time/types',
+  'router_path' => 'admin/config/regional/date-time/types',
+  'link_title' => 'Types',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:44:"Configure display formats for date and time.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '3',
+  'weight' => '-10',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '61',
-  'p4' => '0',
-  'p5' => '0',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '127',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25072,25 +27757,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '66',
-  'plid' => '45',
-  'link_path' => 'admin/config/people/accounts',
-  'router_path' => 'admin/config/people/accounts',
-  'link_title' => 'Account settings',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:109:"Configure default behavior of users, including registration requirements, e-mails, fields, and user pictures.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '128',
+  'plid' => '49',
+  'link_path' => 'node/%/revisions/%/delete',
+  'router_path' => 'node/%/revisions/%/delete',
+  'link_title' => 'Delete earlier revision',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
+  'p1' => '5',
+  'p2' => '49',
+  'p3' => '128',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25101,25 +27786,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '67',
-  'plid' => '53',
-  'link_path' => 'admin/config/system/actions',
-  'router_path' => 'admin/config/system/actions',
-  'link_title' => 'Actions',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:41:"Manage the actions defined for your site.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '129',
+  'plid' => '49',
+  'link_path' => 'node/%/revisions/%/revert',
+  'router_path' => 'node/%/revisions/%/revert',
+  'link_title' => 'Revert to earlier revision',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '53',
-  'p4' => '67',
+  'p1' => '5',
+  'p2' => '49',
+  'p3' => '129',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25130,25 +27815,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '68',
-  'plid' => '28',
-  'link_path' => 'admin/structure/block/add',
-  'router_path' => 'admin/structure/block/add',
-  'link_title' => 'Add block',
+  'menu_name' => 'navigation',
+  'mlid' => '130',
+  'plid' => '49',
+  'link_path' => 'node/%/revisions/%/view',
+  'router_path' => 'node/%/revisions/%/view',
+  'link_title' => 'Revisions',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '68',
+  'p1' => '5',
+  'p2' => '49',
+  'p3' => '130',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25160,11 +27845,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '69',
-  'plid' => '34',
-  'link_path' => 'admin/structure/types/add',
-  'router_path' => 'admin/structure/types/add',
-  'link_title' => 'Add content type',
+  'mlid' => '136',
+  'plid' => '117',
+  'link_path' => 'admin/structure/block/list/garland/add',
+  'router_path' => 'admin/structure/block/list/garland/add',
+  'link_title' => 'Add block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -25172,13 +27857,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '34',
-  'p4' => '69',
-  'p5' => '0',
+  'p3' => '28',
+  'p4' => '117',
+  'p5' => '136',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25189,11 +27874,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '70',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/add',
-  'router_path' => 'admin/structure/menu/add',
-  'link_title' => 'Add menu',
+  'mlid' => '141',
+  'plid' => '125',
+  'link_path' => 'admin/structure/block/list/seven/add',
+  'router_path' => 'admin/structure/block/list/seven/add',
+  'link_title' => 'Add block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -25201,13 +27886,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '44',
-  'p4' => '70',
-  'p5' => '0',
+  'p3' => '28',
+  'p4' => '125',
+  'p5' => '141',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25218,11 +27903,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '71',
-  'plid' => '51',
-  'link_path' => 'admin/appearance/settings/bartik',
-  'router_path' => 'admin/appearance/settings/bartik',
-  'link_title' => 'Bartik',
+  'mlid' => '142',
+  'plid' => '126',
+  'link_path' => 'admin/structure/block/list/stark/add',
+  'router_path' => 'admin/structure/block/list/stark/add',
+  'link_title' => 'Add block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -25230,13 +27915,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '51',
-  'p4' => '71',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '126',
+  'p5' => '142',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25247,26 +27932,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '72',
-  'plid' => '50',
-  'link_path' => 'admin/config/search/clean-urls',
-  'router_path' => 'admin/config/search/clean-urls',
-  'link_title' => 'Clean URLs',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"Enable or disable clean URLs for your site.";}}',
+  'mlid' => '143',
+  'plid' => '127',
+  'link_path' => 'admin/config/regional/date-time/types/add',
+  'router_path' => 'admin/config/regional/date-time/types/add',
+  'link_title' => 'Add date type',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:18:"Add new date type.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '4',
+  'weight' => '-10',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '50',
-  'p4' => '72',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '127',
+  'p6' => '143',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -25276,26 +27961,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '73',
-  'plid' => '53',
-  'link_path' => 'admin/config/system/cron',
-  'router_path' => 'admin/config/system/cron',
-  'link_title' => 'Cron',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:40:"Manage automatic site maintenance tasks.";}}',
+  'mlid' => '144',
+  'plid' => '116',
+  'link_path' => 'admin/config/regional/date-time/formats/add',
+  'router_path' => 'admin/config/regional/date-time/formats/add',
+  'link_title' => 'Add format',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"Allow users to add additional date formats.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '20',
-  'depth' => '4',
+  'weight' => '-10',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '53',
-  'p4' => '73',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '116',
+  'p6' => '144',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -25305,25 +27990,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '74',
-  'plid' => '48',
-  'link_path' => 'admin/config/regional/date-time',
-  'router_path' => 'admin/config/regional/date-time',
-  'link_title' => 'Date and time',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:44:"Configure display formats for date and time.";}}',
+  'mlid' => '145',
+  'plid' => '113',
+  'link_path' => 'admin/structure/menu/manage/%/add',
+  'router_path' => 'admin/structure/menu/manage/%/add',
+  'link_title' => 'Add link',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-15',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '113',
+  'p5' => '145',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25334,11 +28019,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '75',
-  'plid' => '18',
-  'link_path' => 'admin/reports/event/%',
-  'router_path' => 'admin/reports/event/%',
-  'link_title' => 'Details',
+  'mlid' => '146',
+  'plid' => '28',
+  'link_path' => 'admin/structure/block/manage/%/%',
+  'router_path' => 'admin/structure/block/manage/%/%',
+  'link_title' => 'Configure block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
@@ -25346,12 +28031,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '75',
-  'p4' => '0',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '146',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25362,25 +28047,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '76',
-  'plid' => '43',
-  'link_path' => 'admin/config/media/file-system',
-  'router_path' => 'admin/config/media/file-system',
-  'link_title' => 'File system',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:68:"Tell Drupal where to store uploaded files and how they are accessed.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '147',
+  'plid' => '29',
+  'link_path' => 'user/%/cancel/confirm/%/%',
+  'router_path' => 'user/%/cancel/confirm/%/%',
+  'link_title' => 'Confirm account cancellation',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '76',
+  'p1' => '16',
+  'p2' => '29',
+  'p3' => '147',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25392,25 +28077,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '78',
-  'plid' => '51',
-  'link_path' => 'admin/appearance/settings/garland',
-  'router_path' => 'admin/appearance/settings/garland',
-  'link_title' => 'Garland',
+  'mlid' => '148',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/delete',
+  'router_path' => 'admin/structure/types/manage/%/delete',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '51',
-  'p4' => '78',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '148',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25421,25 +28106,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '79',
-  'plid' => '51',
-  'link_path' => 'admin/appearance/settings/global',
-  'router_path' => 'admin/appearance/settings/global',
-  'link_title' => 'Global settings',
+  'mlid' => '149',
+  'plid' => '80',
+  'link_path' => 'admin/config/people/ip-blocking/delete/%',
+  'router_path' => 'admin/config/people/ip-blocking/delete/%',
+  'link_title' => 'Delete IP address',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-1',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '51',
-  'p4' => '79',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '45',
+  'p4' => '80',
+  'p5' => '149',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25450,25 +28135,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '80',
-  'plid' => '45',
-  'link_path' => 'admin/config/people/ip-blocking',
-  'router_path' => 'admin/config/people/ip-blocking',
-  'link_title' => 'IP address blocking',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:28:"Manage blocked IP addresses.";}}',
+  'mlid' => '150',
+  'plid' => '67',
+  'link_path' => 'admin/config/system/actions/delete/%',
+  'router_path' => 'admin/config/system/actions/delete/%',
+  'link_title' => 'Delete action',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:17:"Delete an action.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '45',
-  'p4' => '80',
-  'p5' => '0',
+  'p3' => '53',
+  'p4' => '67',
+  'p5' => '150',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25479,25 +28164,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '81',
-  'plid' => '43',
-  'link_path' => 'admin/config/media/image-toolkit',
-  'router_path' => 'admin/config/media/image-toolkit',
-  'link_title' => 'Image toolkit',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:74:"Choose which image toolkit to use if you have installed optional toolkits.";}}',
+  'mlid' => '151',
+  'plid' => '113',
+  'link_path' => 'admin/structure/menu/manage/%/delete',
+  'router_path' => 'admin/structure/menu/manage/%/delete',
+  'link_title' => 'Delete menu',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '20',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '81',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '113',
+  'p5' => '151',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25508,14 +28193,14 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '82',
-  'plid' => '40',
-  'link_path' => 'admin/modules/list/confirm',
-  'router_path' => 'admin/modules/list/confirm',
-  'link_title' => 'List',
+  'mlid' => '152',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/item/%/delete',
+  'router_path' => 'admin/structure/menu/item/%/delete',
+  'link_title' => 'Delete menu link',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
@@ -25523,9 +28208,9 @@
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '15',
-  'p3' => '40',
-  'p4' => '82',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '152',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25537,25 +28222,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '83',
-  'plid' => '34',
-  'link_path' => 'admin/structure/types/list',
-  'router_path' => 'admin/structure/types/list',
-  'link_title' => 'List',
+  'mlid' => '153',
+  'plid' => '96',
+  'link_path' => 'admin/people/permissions/roles/delete/%',
+  'router_path' => 'admin/people/permissions/roles/delete/%',
+  'link_title' => 'Delete role',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '83',
-  'p5' => '0',
+  'p2' => '17',
+  'p3' => '46',
+  'p4' => '96',
+  'p5' => '153',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25566,26 +28251,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '84',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/list',
-  'router_path' => 'admin/structure/menu/list',
-  'link_title' => 'List menus',
+  'mlid' => '154',
+  'plid' => '105',
+  'link_path' => 'admin/config/content/formats/%/disable',
+  'router_path' => 'admin/config/content/formats/%/disable',
+  'link_title' => 'Disable text format',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '84',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '101',
+  'p5' => '105',
+  'p6' => '154',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -25595,25 +28280,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '85',
-  'plid' => '37',
-  'link_path' => 'admin/config/development/logging',
-  'router_path' => 'admin/config/development/logging',
-  'link_title' => 'Logging and errors',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:154:\"Settings for logging and alerts modules. Various modules can route Drupal's system events to different destinations, such as syslog, database, email, etc.\";}}",
+  'mlid' => '155',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/edit',
+  'router_path' => 'admin/structure/types/manage/%/edit',
+  'link_title' => 'Edit',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-15',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '37',
-  'p4' => '85',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '155',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25624,25 +28309,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '86',
-  'plid' => '37',
-  'link_path' => 'admin/config/development/maintenance',
-  'router_path' => 'admin/config/development/maintenance',
-  'link_title' => 'Maintenance mode',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:62:"Take the site offline for maintenance or bring it back online.";}}',
+  'mlid' => '156',
+  'plid' => '113',
+  'link_path' => 'admin/structure/menu/manage/%/edit',
+  'router_path' => 'admin/structure/menu/manage/%/edit',
+  'link_title' => 'Edit menu',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '37',
-  'p4' => '86',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '113',
+  'p5' => '156',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25653,24 +28338,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '89',
-  'plid' => '37',
-  'link_path' => 'admin/config/development/performance',
-  'router_path' => 'admin/config/development/performance',
-  'link_title' => 'Performance',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:101:"Enable or disable page caching for anonymous users and set CSS and JS bandwidth optimization options.";}}',
+  'mlid' => '157',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/item/%/edit',
+  'router_path' => 'admin/structure/menu/item/%/edit',
+  'link_title' => 'Edit menu link',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
+  'weight' => '0',
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '37',
-  'p4' => '89',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '157',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25682,25 +28367,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '90',
-  'plid' => '46',
-  'link_path' => 'admin/people/permissions/list',
-  'router_path' => 'admin/people/permissions/list',
-  'link_title' => 'Permissions',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:64:"Determine access to features by selecting permissions for roles.";}}',
+  'mlid' => '158',
+  'plid' => '96',
+  'link_path' => 'admin/people/permissions/roles/edit/%',
+  'router_path' => 'admin/people/permissions/roles/edit/%',
+  'link_title' => 'Edit role',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-8',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '17',
   'p3' => '46',
-  'p4' => '90',
-  'p5' => '0',
+  'p4' => '96',
+  'p5' => '158',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25711,11 +28396,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '93',
-  'plid' => '30',
-  'link_path' => 'admin/content/comment/new',
-  'router_path' => 'admin/content/comment/new',
-  'link_title' => 'Published comments',
+  'mlid' => '159',
+  'plid' => '113',
+  'link_path' => 'admin/structure/menu/manage/%/list',
+  'router_path' => 'admin/structure/menu/manage/%/list',
+  'link_title' => 'List links',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -25723,13 +28408,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '9',
-  'p3' => '30',
-  'p4' => '93',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '113',
+  'p5' => '159',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25740,12 +28425,12 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '94',
-  'plid' => '60',
-  'link_path' => 'admin/config/services/rss-publishing',
-  'router_path' => 'admin/config/services/rss-publishing',
-  'link_title' => 'RSS publishing',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:114:"Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.";}}',
+  'mlid' => '160',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/item/%/reset',
+  'router_path' => 'admin/structure/menu/item/%/reset',
+  'link_title' => 'Reset menu link',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
@@ -25755,9 +28440,9 @@
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '94',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '160',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -25769,25 +28454,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '95',
-  'plid' => '48',
-  'link_path' => 'admin/config/regional/settings',
-  'router_path' => 'admin/config/regional/settings',
-  'link_title' => 'Regional settings',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:54:\"Settings for the site's default time zone and country.\";}}",
+  'mlid' => '161',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/comment/display',
+  'router_path' => 'admin/structure/types/manage/%/comment/display',
+  'link_title' => 'Comment display',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '4',
+  'weight' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '95',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '161',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25798,25 +28483,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '96',
-  'plid' => '46',
-  'link_path' => 'admin/people/permissions/roles',
-  'router_path' => 'admin/people/permissions/roles',
-  'link_title' => 'Roles',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:30:"List, edit, or add user roles.";}}',
+  'mlid' => '162',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields',
+  'link_title' => 'Comment fields',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
-  'weight' => '-5',
-  'depth' => '4',
+  'weight' => '3',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '46',
-  'p4' => '96',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25827,25 +28512,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '97',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/settings',
-  'router_path' => 'admin/structure/menu/settings',
-  'link_title' => 'Settings',
+  'mlid' => '163',
+  'plid' => '146',
+  'link_path' => 'admin/structure/block/manage/%/%/configure',
+  'router_path' => 'admin/structure/block/manage/%/%/configure',
+  'link_title' => 'Configure',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '4',
+  'weight' => '-100',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '44',
-  'p4' => '97',
-  'p5' => '0',
+  'p3' => '28',
+  'p4' => '146',
+  'p5' => '163',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25856,11 +28541,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '98',
-  'plid' => '51',
-  'link_path' => 'admin/appearance/settings/seven',
-  'router_path' => 'admin/appearance/settings/seven',
-  'link_title' => 'Seven',
+  'mlid' => '164',
+  'plid' => '146',
+  'link_path' => 'admin/structure/block/manage/%/%/delete',
+  'router_path' => 'admin/structure/block/manage/%/%/delete',
+  'link_title' => 'Delete block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -25868,13 +28553,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '51',
-  'p4' => '98',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '146',
+  'p5' => '164',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -25885,26 +28570,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '99',
-  'plid' => '53',
-  'link_path' => 'admin/config/system/site-information',
-  'router_path' => 'admin/config/system/site-information',
-  'link_title' => 'Site information',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:104:"Change site name, e-mail address, slogan, default front page, and number of posts per page, error pages.";}}',
+  'mlid' => '165',
+  'plid' => '116',
+  'link_path' => 'admin/config/regional/date-time/formats/%/delete',
+  'router_path' => 'admin/config/regional/date-time/formats/%/delete',
+  'link_title' => 'Delete date format',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:47:"Allow users to delete a configured date format.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '53',
-  'p4' => '99',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '116',
+  'p6' => '165',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -25914,26 +28599,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '100',
-  'plid' => '51',
-  'link_path' => 'admin/appearance/settings/stark',
-  'router_path' => 'admin/appearance/settings/stark',
-  'link_title' => 'Stark',
-  'options' => 'a:0:{}',
+  'mlid' => '166',
+  'plid' => '127',
+  'link_path' => 'admin/config/regional/date-time/types/%/delete',
+  'router_path' => 'admin/config/regional/date-time/types/%/delete',
+  'link_title' => 'Delete date type',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Allow users to delete a configured date type.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '7',
-  'p3' => '51',
-  'p4' => '100',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '127',
+  'p6' => '166',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -25943,26 +28628,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '101',
-  'plid' => '33',
-  'link_path' => 'admin/config/content/formats',
-  'router_path' => 'admin/config/content/formats',
-  'link_title' => 'Text formats',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:127:"Configure how content input by users is filtered, including allowed HTML tags. Also allows enabling of module-provided filters.";}}',
+  'mlid' => '167',
+  'plid' => '116',
+  'link_path' => 'admin/config/regional/date-time/formats/%/edit',
+  'router_path' => 'admin/config/regional/date-time/formats/%/edit',
+  'link_title' => 'Edit date format',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Allow users to edit a configured date format.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '33',
-  'p4' => '101',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '116',
+  'p6' => '167',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -25972,14 +28657,14 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '102',
-  'plid' => '30',
-  'link_path' => 'admin/content/comment/approval',
-  'router_path' => 'admin/content/comment/approval',
-  'link_title' => 'Unapproved comments',
+  'mlid' => '168',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/main-menu',
+  'router_path' => 'admin/structure/menu/manage/%',
+  'link_title' => 'Main menu',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
@@ -25987,9 +28672,9 @@
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '9',
-  'p3' => '30',
-  'p4' => '102',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '168',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26001,14 +28686,14 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '103',
-  'plid' => '56',
-  'link_path' => 'admin/modules/uninstall/confirm',
-  'router_path' => 'admin/modules/uninstall/confirm',
-  'link_title' => 'Uninstall',
+  'mlid' => '169',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/management',
+  'router_path' => 'admin/structure/menu/manage/%',
+  'link_title' => 'Management',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
@@ -26016,9 +28701,9 @@
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '15',
-  'p3' => '56',
-  'p4' => '103',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '169',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26029,25 +28714,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '104',
-  'plid' => '38',
-  'link_path' => 'user/%/edit/account',
-  'router_path' => 'user/%/edit/account',
-  'link_title' => 'Account',
+  'menu_name' => 'management',
+  'mlid' => '170',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/navigation',
+  'router_path' => 'admin/structure/menu/manage/%',
+  'link_title' => 'Navigation',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '38',
-  'p3' => '104',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '170',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26059,25 +28744,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '105',
-  'plid' => '101',
-  'link_path' => 'admin/config/content/formats/%',
-  'router_path' => 'admin/config/content/formats/%',
-  'link_title' => '',
+  'mlid' => '171',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/user-menu',
+  'router_path' => 'admin/structure/menu/manage/%',
+  'link_title' => 'User menu',
   'options' => 'a:0:{}',
-  'module' => 'system',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '33',
-  'p4' => '101',
-  'p5' => '105',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '171',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26087,26 +28772,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '110',
-  'plid' => '101',
-  'link_path' => 'admin/config/content/formats/add',
-  'router_path' => 'admin/config/content/formats/add',
-  'link_title' => 'Add text format',
+  'menu_name' => 'navigation',
+  'mlid' => '172',
+  'plid' => '0',
+  'link_path' => 'search',
+  'router_path' => 'search',
+  'link_title' => 'Search',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '33',
-  'p4' => '101',
-  'p5' => '110',
+  'p1' => '172',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26116,12 +28801,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '111',
-  'plid' => '28',
-  'link_path' => 'admin/structure/block/list/bartik',
-  'router_path' => 'admin/structure/block/list/bartik',
-  'link_title' => 'Bartik',
+  'menu_name' => 'navigation',
+  'mlid' => '173',
+  'plid' => '172',
+  'link_path' => 'search/node',
+  'router_path' => 'search/node',
+  'link_title' => 'Content',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26129,12 +28814,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '4',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '111',
+  'p1' => '172',
+  'p2' => '173',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26146,53 +28831,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '112',
-  'plid' => '67',
-  'link_path' => 'admin/config/system/actions/configure',
-  'router_path' => 'admin/config/system/actions/configure',
-  'link_title' => 'Configure an advanced action',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '53',
-  'p4' => '67',
-  'p5' => '112',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
-))
-->values(array(
-  'menu_name' => 'management',
-  'mlid' => '113',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/%',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'Customize menu',
-  'options' => 'a:0:{}',
+  'mlid' => '175',
+  'plid' => '1',
+  'link_path' => 'admin/help',
+  'router_path' => 'admin/help',
+  'link_title' => 'Help',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:48:"Reference for usage, configuration, and modules.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '9',
+  'depth' => '2',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '113',
+  'p2' => '175',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26203,25 +28859,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '114',
-  'plid' => '34',
-  'link_path' => 'admin/structure/types/manage/%',
-  'router_path' => 'admin/structure/types/manage/%',
-  'link_title' => 'Edit content type',
+  'menu_name' => 'navigation',
+  'mlid' => '176',
+  'plid' => '0',
+  'link_path' => 'taxonomy/term/%',
+  'router_path' => 'taxonomy/term/%',
+  'link_title' => 'Taxonomy term',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
+  'p1' => '176',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26232,26 +28888,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '116',
-  'plid' => '74',
-  'link_path' => 'admin/config/regional/date-time/formats',
-  'router_path' => 'admin/config/regional/date-time/formats',
-  'link_title' => 'Formats',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:51:"Configure display format strings for date and time.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '177',
+  'plid' => '173',
+  'link_path' => 'search/node/%',
+  'router_path' => 'search/node/%',
+  'link_title' => 'Content',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-9',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '116',
+  'p1' => '172',
+  'p2' => '173',
+  'p3' => '177',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26262,24 +28918,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '117',
-  'plid' => '28',
-  'link_path' => 'admin/structure/block/list/garland',
-  'router_path' => 'admin/structure/block/list/garland',
-  'link_title' => 'Garland',
-  'options' => 'a:0:{}',
+  'mlid' => '178',
+  'plid' => '18',
+  'link_path' => 'admin/reports/fields',
+  'router_path' => 'admin/reports/fields',
+  'link_title' => 'Field list',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:39:"Overview of fields on all entity types.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '117',
+  'p2' => '18',
+  'p3' => '178',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26290,12 +28946,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '118',
-  'plid' => '101',
-  'link_path' => 'admin/config/content/formats/list',
-  'router_path' => 'admin/config/content/formats/list',
-  'link_title' => 'List',
+  'menu_name' => 'navigation',
+  'mlid' => '179',
+  'plid' => '16',
+  'link_path' => 'user/%/shortcuts',
+  'router_path' => 'user/%/shortcuts',
+  'link_title' => 'Shortcuts',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26303,13 +28959,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '33',
-  'p4' => '101',
-  'p5' => '118',
+  'p1' => '16',
+  'p2' => '179',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26320,25 +28976,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '119',
-  'plid' => '67',
-  'link_path' => 'admin/config/system/actions/manage',
-  'router_path' => 'admin/config/system/actions/manage',
-  'link_title' => 'Manage actions',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:41:"Manage the actions defined for your site.";}}',
+  'mlid' => '180',
+  'plid' => '20',
+  'link_path' => 'admin/structure/taxonomy',
+  'router_path' => 'admin/structure/taxonomy',
+  'link_title' => 'Taxonomy',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:67:"Manage tagging, categorization, and classification of your content.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '-2',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '53',
-  'p4' => '67',
-  'p5' => '119',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26349,25 +29005,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '124',
-  'plid' => '66',
-  'link_path' => 'admin/config/people/accounts/settings',
-  'router_path' => 'admin/config/people/accounts/settings',
-  'link_title' => 'Settings',
-  'options' => 'a:0:{}',
+  'mlid' => '181',
+  'plid' => '18',
+  'link_path' => 'admin/reports/search',
+  'router_path' => 'admin/reports/search',
+  'link_title' => 'Top search phrases',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"View most popular search phrases.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '124',
+  'p2' => '18',
+  'p3' => '181',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26378,11 +29034,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '125',
-  'plid' => '28',
-  'link_path' => 'admin/structure/block/list/seven',
-  'router_path' => 'admin/structure/block/list/seven',
-  'link_title' => 'Seven',
+  'mlid' => '183',
+  'plid' => '175',
+  'link_path' => 'admin/help/block',
+  'router_path' => 'admin/help/block',
+  'link_title' => 'block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26390,12 +29046,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '125',
+  'p2' => '175',
+  'p3' => '183',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26407,11 +29063,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '126',
-  'plid' => '28',
-  'link_path' => 'admin/structure/block/list/stark',
-  'router_path' => 'admin/structure/block/list/stark',
-  'link_title' => 'Stark',
+  'mlid' => '184',
+  'plid' => '175',
+  'link_path' => 'admin/help/color',
+  'router_path' => 'admin/help/color',
+  'link_title' => 'color',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26419,12 +29075,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '126',
+  'p2' => '175',
+  'p3' => '184',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26436,25 +29092,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '127',
-  'plid' => '74',
-  'link_path' => 'admin/config/regional/date-time/types',
-  'router_path' => 'admin/config/regional/date-time/types',
-  'link_title' => 'Types',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:44:"Configure display formats for date and time.";}}',
+  'mlid' => '185',
+  'plid' => '175',
+  'link_path' => 'admin/help/comment',
+  'router_path' => 'admin/help/comment',
+  'link_title' => 'comment',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '127',
+  'p2' => '175',
+  'p3' => '185',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26464,24 +29120,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '128',
-  'plid' => '49',
-  'link_path' => 'node/%/revisions/%/delete',
-  'router_path' => 'node/%/revisions/%/delete',
-  'link_title' => 'Delete earlier revision',
+  'menu_name' => 'management',
+  'mlid' => '186',
+  'plid' => '175',
+  'link_path' => 'admin/help/contextual',
+  'router_path' => 'admin/help/contextual',
+  'link_title' => 'contextual',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '49',
-  'p3' => '128',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '186',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -26493,24 +29149,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '129',
-  'plid' => '49',
-  'link_path' => 'node/%/revisions/%/revert',
-  'router_path' => 'node/%/revisions/%/revert',
-  'link_title' => 'Revert to earlier revision',
+  'menu_name' => 'management',
+  'mlid' => '188',
+  'plid' => '175',
+  'link_path' => 'admin/help/dblog',
+  'router_path' => 'admin/help/dblog',
+  'link_title' => 'dblog',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '49',
-  'p3' => '129',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '188',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -26522,24 +29178,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '130',
-  'plid' => '49',
-  'link_path' => 'node/%/revisions/%/view',
-  'router_path' => 'node/%/revisions/%/view',
-  'link_title' => 'Revisions',
+  'menu_name' => 'management',
+  'mlid' => '189',
+  'plid' => '175',
+  'link_path' => 'admin/help/field',
+  'router_path' => 'admin/help/field',
+  'link_title' => 'field',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '49',
-  'p3' => '130',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '189',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -26552,11 +29208,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '136',
-  'plid' => '117',
-  'link_path' => 'admin/structure/block/list/garland/add',
-  'router_path' => 'admin/structure/block/list/garland/add',
-  'link_title' => 'Add block',
+  'mlid' => '190',
+  'plid' => '175',
+  'link_path' => 'admin/help/field_sql_storage',
+  'router_path' => 'admin/help/field_sql_storage',
+  'link_title' => 'field_sql_storage',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26564,13 +29220,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '117',
-  'p5' => '136',
+  'p2' => '175',
+  'p3' => '190',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26581,11 +29237,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '141',
-  'plid' => '125',
-  'link_path' => 'admin/structure/block/list/seven/add',
-  'router_path' => 'admin/structure/block/list/seven/add',
-  'link_title' => 'Add block',
+  'mlid' => '191',
+  'plid' => '175',
+  'link_path' => 'admin/help/field_ui',
+  'router_path' => 'admin/help/field_ui',
+  'link_title' => 'field_ui',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26593,13 +29249,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '125',
-  'p5' => '141',
+  'p2' => '175',
+  'p3' => '191',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26610,11 +29266,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '142',
-  'plid' => '126',
-  'link_path' => 'admin/structure/block/list/stark/add',
-  'router_path' => 'admin/structure/block/list/stark/add',
-  'link_title' => 'Add block',
+  'mlid' => '192',
+  'plid' => '175',
+  'link_path' => 'admin/help/file',
+  'router_path' => 'admin/help/file',
+  'link_title' => 'file',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26622,13 +29278,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '126',
-  'p5' => '142',
+  'p2' => '175',
+  'p3' => '192',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26639,26 +29295,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '143',
-  'plid' => '127',
-  'link_path' => 'admin/config/regional/date-time/types/add',
-  'router_path' => 'admin/config/regional/date-time/types/add',
-  'link_title' => 'Add date type',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:18:"Add new date type.";}}',
+  'mlid' => '193',
+  'plid' => '175',
+  'link_path' => 'admin/help/filter',
+  'router_path' => 'admin/help/filter',
+  'link_title' => 'filter',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '6',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '127',
-  'p6' => '143',
+  'p2' => '175',
+  'p3' => '193',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -26668,26 +29324,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '144',
-  'plid' => '116',
-  'link_path' => 'admin/config/regional/date-time/formats/add',
-  'router_path' => 'admin/config/regional/date-time/formats/add',
-  'link_title' => 'Add format',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"Allow users to add additional date formats.";}}',
+  'mlid' => '194',
+  'plid' => '175',
+  'link_path' => 'admin/help/help',
+  'router_path' => 'admin/help/help',
+  'link_title' => 'help',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '6',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '116',
-  'p6' => '144',
+  'p2' => '175',
+  'p3' => '194',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -26697,11 +29353,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '145',
-  'plid' => '113',
-  'link_path' => 'admin/structure/menu/manage/%/add',
-  'router_path' => 'admin/structure/menu/manage/%/add',
-  'link_title' => 'Add link',
+  'mlid' => '195',
+  'plid' => '175',
+  'link_path' => 'admin/help/image',
+  'router_path' => 'admin/help/image',
+  'link_title' => 'image',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26709,13 +29365,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '113',
-  'p5' => '145',
+  'p2' => '175',
+  'p3' => '195',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26726,24 +29382,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '146',
-  'plid' => '28',
-  'link_path' => 'admin/structure/block/manage/%/%',
-  'router_path' => 'admin/structure/block/manage/%/%',
-  'link_title' => 'Configure block',
+  'mlid' => '196',
+  'plid' => '175',
+  'link_path' => 'admin/help/list',
+  'router_path' => 'admin/help/list',
+  'link_title' => 'list',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '146',
+  'p2' => '175',
+  'p3' => '196',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26754,24 +29410,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '147',
-  'plid' => '29',
-  'link_path' => 'user/%/cancel/confirm/%/%',
-  'router_path' => 'user/%/cancel/confirm/%/%',
-  'link_title' => 'Confirm account cancellation',
+  'menu_name' => 'management',
+  'mlid' => '197',
+  'plid' => '175',
+  'link_path' => 'admin/help/menu',
+  'router_path' => 'admin/help/menu',
+  'link_title' => 'menu',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '29',
-  'p3' => '147',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '197',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -26784,25 +29440,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '148',
-  'plid' => '114',
-  'link_path' => 'admin/structure/types/manage/%/delete',
-  'router_path' => 'admin/structure/types/manage/%/delete',
-  'link_title' => 'Delete',
+  'mlid' => '198',
+  'plid' => '175',
+  'link_path' => 'admin/help/node',
+  'router_path' => 'admin/help/node',
+  'link_title' => 'node',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '148',
+  'p2' => '175',
+  'p3' => '198',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26813,25 +29469,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '149',
-  'plid' => '80',
-  'link_path' => 'admin/config/people/ip-blocking/delete/%',
-  'router_path' => 'admin/config/people/ip-blocking/delete/%',
-  'link_title' => 'Delete IP address',
+  'mlid' => '199',
+  'plid' => '175',
+  'link_path' => 'admin/help/number',
+  'router_path' => 'admin/help/number',
+  'link_title' => 'number',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '80',
-  'p5' => '149',
+  'p2' => '175',
+  'p3' => '199',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26842,25 +29498,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '150',
-  'plid' => '67',
-  'link_path' => 'admin/config/system/actions/delete/%',
-  'router_path' => 'admin/config/system/actions/delete/%',
-  'link_title' => 'Delete action',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:17:"Delete an action.";}}',
+  'mlid' => '200',
+  'plid' => '175',
+  'link_path' => 'admin/help/options',
+  'router_path' => 'admin/help/options',
+  'link_title' => 'options',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '53',
-  'p4' => '67',
-  'p5' => '150',
+  'p2' => '175',
+  'p3' => '200',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26871,25 +29527,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '151',
-  'plid' => '113',
-  'link_path' => 'admin/structure/menu/manage/%/delete',
-  'router_path' => 'admin/structure/menu/manage/%/delete',
-  'link_title' => 'Delete menu',
+  'mlid' => '202',
+  'plid' => '175',
+  'link_path' => 'admin/help/path',
+  'router_path' => 'admin/help/path',
+  'link_title' => 'path',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '113',
-  'p5' => '151',
+  'p2' => '175',
+  'p3' => '202',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26900,24 +29556,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '152',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/item/%/delete',
-  'router_path' => 'admin/structure/menu/item/%/delete',
-  'link_title' => 'Delete menu link',
+  'mlid' => '203',
+  'plid' => '175',
+  'link_path' => 'admin/help/rdf',
+  'router_path' => 'admin/help/rdf',
+  'link_title' => 'rdf',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '152',
+  'p2' => '175',
+  'p3' => '203',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -26929,25 +29585,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '153',
-  'plid' => '96',
-  'link_path' => 'admin/people/permissions/roles/delete/%',
-  'router_path' => 'admin/people/permissions/roles/delete/%',
-  'link_title' => 'Delete role',
+  'mlid' => '204',
+  'plid' => '175',
+  'link_path' => 'admin/help/search',
+  'router_path' => 'admin/help/search',
+  'link_title' => 'search',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '46',
-  'p4' => '96',
-  'p5' => '153',
+  'p2' => '175',
+  'p3' => '204',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -26958,26 +29614,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '154',
-  'plid' => '105',
-  'link_path' => 'admin/config/content/formats/%/disable',
-  'router_path' => 'admin/config/content/formats/%/disable',
-  'link_title' => 'Disable text format',
+  'mlid' => '205',
+  'plid' => '175',
+  'link_path' => 'admin/help/shortcut',
+  'router_path' => 'admin/help/shortcut',
+  'link_title' => 'shortcut',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '33',
-  'p4' => '101',
-  'p5' => '105',
-  'p6' => '154',
+  'p2' => '175',
+  'p3' => '205',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -26987,11 +29643,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '155',
-  'plid' => '114',
-  'link_path' => 'admin/structure/types/manage/%/edit',
-  'router_path' => 'admin/structure/types/manage/%/edit',
-  'link_title' => 'Edit',
+  'mlid' => '206',
+  'plid' => '175',
+  'link_path' => 'admin/help/system',
+  'router_path' => 'admin/help/system',
+  'link_title' => 'system',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -26999,13 +29655,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '155',
+  'p2' => '175',
+  'p3' => '206',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27016,11 +29672,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '156',
-  'plid' => '113',
-  'link_path' => 'admin/structure/menu/manage/%/edit',
-  'router_path' => 'admin/structure/menu/manage/%/edit',
-  'link_title' => 'Edit menu',
+  'mlid' => '207',
+  'plid' => '175',
+  'link_path' => 'admin/help/taxonomy',
+  'router_path' => 'admin/help/taxonomy',
+  'link_title' => 'taxonomy',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -27028,13 +29684,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '113',
-  'p5' => '156',
+  'p2' => '175',
+  'p3' => '207',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27045,24 +29701,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '157',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/item/%/edit',
-  'router_path' => 'admin/structure/menu/item/%/edit',
-  'link_title' => 'Edit menu link',
+  'mlid' => '208',
+  'plid' => '175',
+  'link_path' => 'admin/help/text',
+  'router_path' => 'admin/help/text',
+  'link_title' => 'text',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '157',
+  'p2' => '175',
+  'p3' => '208',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -27074,25 +29730,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '158',
-  'plid' => '96',
-  'link_path' => 'admin/people/permissions/roles/edit/%',
-  'router_path' => 'admin/people/permissions/roles/edit/%',
-  'link_title' => 'Edit role',
+  'mlid' => '209',
+  'plid' => '175',
+  'link_path' => 'admin/help/user',
+  'router_path' => 'admin/help/user',
+  'link_title' => 'user',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '17',
-  'p3' => '46',
-  'p4' => '96',
-  'p5' => '158',
+  'p2' => '175',
+  'p3' => '209',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27102,26 +29758,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '159',
-  'plid' => '113',
-  'link_path' => 'admin/structure/menu/manage/%/list',
-  'router_path' => 'admin/structure/menu/manage/%/list',
-  'link_title' => 'List links',
+  'menu_name' => 'navigation',
+  'mlid' => '210',
+  'plid' => '176',
+  'link_path' => 'taxonomy/term/%/edit',
+  'router_path' => 'taxonomy/term/%/edit',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '5',
+  'weight' => '10',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '113',
-  'p5' => '159',
+  'p1' => '176',
+  'p2' => '210',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27131,25 +29787,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '160',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/item/%/reset',
-  'router_path' => 'admin/structure/menu/item/%/reset',
-  'link_title' => 'Reset menu link',
+  'menu_name' => 'navigation',
+  'mlid' => '211',
+  'plid' => '176',
+  'link_path' => 'taxonomy/term/%/view',
+  'router_path' => 'taxonomy/term/%/view',
+  'link_title' => 'View',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '160',
+  'p1' => '176',
+  'p2' => '211',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -27161,25 +29817,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '161',
-  'plid' => '114',
-  'link_path' => 'admin/structure/types/manage/%/comment/display',
-  'router_path' => 'admin/structure/types/manage/%/comment/display',
-  'link_title' => 'Comment display',
+  'mlid' => '212',
+  'plid' => '180',
+  'link_path' => 'admin/structure/taxonomy/%',
+  'router_path' => 'admin/structure/taxonomy/%',
+  'link_title' => '',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '4',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '161',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27190,25 +29846,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '162',
-  'plid' => '114',
-  'link_path' => 'admin/structure/types/manage/%/comment/fields',
-  'router_path' => 'admin/structure/types/manage/%/comment/fields',
-  'link_title' => 'Comment fields',
+  'mlid' => '213',
+  'plid' => '180',
+  'link_path' => 'admin/structure/taxonomy/add',
+  'router_path' => 'admin/structure/taxonomy/add',
+  'link_title' => 'Add vocabulary',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '3',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '162',
+  'p3' => '180',
+  'p4' => '213',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27219,25 +29875,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '163',
-  'plid' => '146',
-  'link_path' => 'admin/structure/block/manage/%/%/configure',
-  'router_path' => 'admin/structure/block/manage/%/%/configure',
-  'link_title' => 'Configure block',
-  'options' => 'a:0:{}',
+  'mlid' => '214',
+  'plid' => '43',
+  'link_path' => 'admin/config/media/image-styles',
+  'router_path' => 'admin/config/media/image-styles',
+  'link_title' => 'Image styles',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:78:"Configure styles that can be used for resizing or adjusting images on display.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '28',
-  'p4' => '146',
-  'p5' => '163',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27248,25 +29904,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '164',
-  'plid' => '146',
-  'link_path' => 'admin/structure/block/manage/%/%/delete',
-  'router_path' => 'admin/structure/block/manage/%/%/delete',
-  'link_title' => 'Delete block',
+  'mlid' => '215',
+  'plid' => '180',
+  'link_path' => 'admin/structure/taxonomy/list',
+  'router_path' => 'admin/structure/taxonomy/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '28',
-  'p4' => '146',
-  'p5' => '164',
+  'p3' => '180',
+  'p4' => '215',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27277,26 +29933,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '165',
-  'plid' => '116',
-  'link_path' => 'admin/config/regional/date-time/formats/%/delete',
-  'router_path' => 'admin/config/regional/date-time/formats/%/delete',
-  'link_title' => 'Delete date format',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:47:"Allow users to delete a configured date format.";}}',
+  'mlid' => '216',
+  'plid' => '50',
+  'link_path' => 'admin/config/search/settings',
+  'router_path' => 'admin/config/search/settings',
+  'link_title' => 'Search settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:67:"Configure relevance settings for search and other indexing options.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '116',
-  'p6' => '165',
+  'p3' => '50',
+  'p4' => '216',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27306,26 +29962,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '166',
-  'plid' => '127',
-  'link_path' => 'admin/config/regional/date-time/types/%/delete',
-  'router_path' => 'admin/config/regional/date-time/types/%/delete',
-  'link_title' => 'Delete date type',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Allow users to delete a configured date type.";}}',
+  'mlid' => '217',
+  'plid' => '57',
+  'link_path' => 'admin/config/user-interface/shortcut',
+  'router_path' => 'admin/config/user-interface/shortcut',
+  'link_title' => 'Shortcuts',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:29:"Add and modify shortcut sets.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '127',
-  'p6' => '166',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27335,26 +29991,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '167',
-  'plid' => '116',
-  'link_path' => 'admin/config/regional/date-time/formats/%/edit',
-  'router_path' => 'admin/config/regional/date-time/formats/%/edit',
-  'link_title' => 'Edit date format',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:45:"Allow users to edit a configured date format.";}}',
+  'mlid' => '218',
+  'plid' => '50',
+  'link_path' => 'admin/config/search/path',
+  'router_path' => 'admin/config/search/path',
+  'link_title' => 'URL aliases',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:46:\"Change your site's URL paths by aliasing them.\";}}",
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '-5',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '116',
-  'p6' => '167',
+  'p3' => '50',
+  'p4' => '218',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27364,25 +30020,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '168',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/main-menu',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'Main menu',
+  'mlid' => '219',
+  'plid' => '218',
+  'link_path' => 'admin/config/search/path/add',
+  'router_path' => 'admin/config/search/path/add',
+  'link_title' => 'Add alias',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '168',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '218',
+  'p5' => '219',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27393,25 +30049,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '169',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/management',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'Management',
+  'mlid' => '220',
+  'plid' => '217',
+  'link_path' => 'admin/config/user-interface/shortcut/add-set',
+  'router_path' => 'admin/config/user-interface/shortcut/add-set',
+  'link_title' => 'Add shortcut set',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '169',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '220',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27422,25 +30078,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '170',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/navigation',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'Navigation',
-  'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'mlid' => '221',
+  'plid' => '214',
+  'link_path' => 'admin/config/media/image-styles/add',
+  'router_path' => 'admin/config/media/image-styles/add',
+  'link_title' => 'Add style',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:22:"Add a new image style.";}}',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '2',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '44',
-  'p4' => '170',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '221',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27451,25 +30107,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '171',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/user-menu',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'User menu',
+  'mlid' => '222',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/add',
+  'router_path' => 'admin/structure/taxonomy/%/add',
+  'link_title' => 'Add term',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '44',
-  'p4' => '171',
-  'p5' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '222',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27479,26 +30135,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '172',
-  'plid' => '0',
-  'link_path' => 'search',
-  'router_path' => 'search',
-  'link_title' => 'Search',
+  'menu_name' => 'management',
+  'mlid' => '223',
+  'plid' => '216',
+  'link_path' => 'admin/config/search/settings/reindex',
+  'router_path' => 'admin/config/search/settings/reindex',
+  'link_title' => 'Clear index',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '172',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '216',
+  'p5' => '223',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27508,12 +30164,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '173',
-  'plid' => '172',
-  'link_path' => 'search/node',
-  'router_path' => 'search/node',
-  'link_title' => 'Content',
+  'menu_name' => 'management',
+  'mlid' => '224',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/edit',
+  'router_path' => 'admin/structure/taxonomy/%/edit',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -27521,13 +30177,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '2',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '172',
-  'p2' => '173',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '224',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27537,26 +30193,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '174',
-  'plid' => '172',
-  'link_path' => 'search/user',
-  'router_path' => 'search/user',
-  'link_title' => 'Users',
+  'menu_name' => 'management',
+  'mlid' => '225',
+  'plid' => '217',
+  'link_path' => 'admin/config/user-interface/shortcut/%',
+  'router_path' => 'admin/config/user-interface/shortcut/%',
+  'link_title' => 'Edit shortcuts',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '172',
-  'p2' => '174',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '225',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27567,25 +30223,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '175',
-  'plid' => '1',
-  'link_path' => 'admin/help',
-  'router_path' => 'admin/help',
-  'link_title' => 'Help',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:48:"Reference for usage, configuration, and modules.";}}',
+  'mlid' => '226',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/list',
+  'router_path' => 'admin/structure/taxonomy/%/list',
+  'link_title' => 'List',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '9',
-  'depth' => '2',
+  'weight' => '-20',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '226',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27595,26 +30251,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '176',
-  'plid' => '0',
-  'link_path' => 'taxonomy/term/%',
-  'router_path' => 'taxonomy/term/%',
-  'link_title' => 'Taxonomy term',
+  'menu_name' => 'management',
+  'mlid' => '227',
+  'plid' => '218',
+  'link_path' => 'admin/config/search/path/list',
+  'router_path' => 'admin/config/search/path/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
+  'weight' => '-10',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '176',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '218',
+  'p5' => '227',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27624,26 +30280,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '177',
-  'plid' => '173',
-  'link_path' => 'search/node/%',
-  'router_path' => 'search/node/%',
-  'link_title' => 'Content',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '228',
+  'plid' => '214',
+  'link_path' => 'admin/config/media/image-styles/list',
+  'router_path' => 'admin/config/media/image-styles/list',
+  'link_title' => 'List',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:42:"List the current image styles on the site.";}}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '1',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '172',
-  'p2' => '173',
-  'p3' => '177',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '228',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27654,26 +30310,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '178',
-  'plid' => '18',
-  'link_path' => 'admin/reports/fields',
-  'router_path' => 'admin/reports/fields',
-  'link_title' => 'Field list',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:39:"Overview of fields on all entity types.";}}',
+  'mlid' => '229',
+  'plid' => '225',
+  'link_path' => 'admin/config/user-interface/shortcut/%/add-link',
+  'router_path' => 'admin/config/user-interface/shortcut/%/add-link',
+  'link_title' => 'Add shortcut',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '178',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '225',
+  'p6' => '229',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27682,26 +30338,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '179',
-  'plid' => '16',
-  'link_path' => 'user/%/shortcuts',
-  'router_path' => 'user/%/shortcuts',
-  'link_title' => 'Shortcuts',
+  'menu_name' => 'management',
+  'mlid' => '230',
+  'plid' => '218',
+  'link_path' => 'admin/config/search/path/delete/%',
+  'router_path' => 'admin/config/search/path/delete/%',
+  'link_title' => 'Delete alias',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '179',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '218',
+  'p5' => '230',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27712,26 +30368,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '180',
-  'plid' => '20',
-  'link_path' => 'admin/structure/taxonomy',
-  'router_path' => 'admin/structure/taxonomy',
-  'link_title' => 'Taxonomy',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:67:"Manage tagging, categorization, and classification of your content.";}}',
+  'mlid' => '231',
+  'plid' => '225',
+  'link_path' => 'admin/config/user-interface/shortcut/%/delete',
+  'router_path' => 'admin/config/user-interface/shortcut/%/delete',
+  'link_title' => 'Delete shortcut set',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '225',
+  'p6' => '231',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27741,25 +30397,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '181',
-  'plid' => '18',
-  'link_path' => 'admin/reports/search',
-  'router_path' => 'admin/reports/search',
-  'link_title' => 'Top search phrases',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"View most popular search phrases.";}}',
+  'mlid' => '232',
+  'plid' => '218',
+  'link_path' => 'admin/config/search/path/edit/%',
+  'router_path' => 'admin/config/search/path/edit/%',
+  'link_title' => 'Edit alias',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '181',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '50',
+  'p4' => '218',
+  'p5' => '232',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27769,27 +30425,27 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '182',
-  'plid' => '174',
-  'link_path' => 'search/user/%',
-  'router_path' => 'search/user/%',
-  'link_title' => 'Users',
+  'menu_name' => 'management',
+  'mlid' => '233',
+  'plid' => '225',
+  'link_path' => 'admin/config/user-interface/shortcut/%/edit',
+  'router_path' => 'admin/config/user-interface/shortcut/%/edit',
+  'link_title' => 'Edit set name',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '10',
+  'depth' => '6',
   'customized' => '0',
-  'p1' => '172',
-  'p2' => '174',
-  'p3' => '182',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '225',
+  'p6' => '233',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27799,25 +30455,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '183',
-  'plid' => '175',
-  'link_path' => 'admin/help/block',
-  'router_path' => 'admin/help/block',
-  'link_title' => 'block',
+  'mlid' => '234',
+  'plid' => '217',
+  'link_path' => 'admin/config/user-interface/shortcut/link/%',
+  'router_path' => 'admin/config/user-interface/shortcut/link/%',
+  'link_title' => 'Edit shortcut',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '183',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '234',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27828,25 +30484,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '184',
-  'plid' => '175',
-  'link_path' => 'admin/help/color',
-  'router_path' => 'admin/help/color',
-  'link_title' => 'color',
-  'options' => 'a:0:{}',
+  'mlid' => '235',
+  'plid' => '214',
+  'link_path' => 'admin/config/media/image-styles/edit/%',
+  'router_path' => 'admin/config/media/image-styles/edit/%',
+  'link_title' => 'Edit style',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:25:"Configure an image style.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '184',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '235',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27857,11 +30513,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '185',
-  'plid' => '175',
-  'link_path' => 'admin/help/comment',
-  'router_path' => 'admin/help/comment',
-  'link_title' => 'comment',
+  'mlid' => '236',
+  'plid' => '225',
+  'link_path' => 'admin/config/user-interface/shortcut/%/links',
+  'router_path' => 'admin/config/user-interface/shortcut/%/links',
+  'link_title' => 'List links',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -27869,14 +30525,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '185',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '225',
+  'p6' => '236',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27886,25 +30542,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '186',
-  'plid' => '175',
-  'link_path' => 'admin/help/contextual',
-  'router_path' => 'admin/help/contextual',
-  'link_title' => 'contextual',
-  'options' => 'a:0:{}',
+  'mlid' => '237',
+  'plid' => '214',
+  'link_path' => 'admin/config/media/image-styles/delete/%',
+  'router_path' => 'admin/config/media/image-styles/delete/%',
+  'link_title' => 'Delete style',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:22:"Delete an image style.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '186',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '237',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27915,25 +30571,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '188',
-  'plid' => '175',
-  'link_path' => 'admin/help/dblog',
-  'router_path' => 'admin/help/dblog',
-  'link_title' => 'dblog',
-  'options' => 'a:0:{}',
+  'mlid' => '238',
+  'plid' => '214',
+  'link_path' => 'admin/config/media/image-styles/revert/%',
+  'router_path' => 'admin/config/media/image-styles/revert/%',
+  'link_title' => 'Revert style',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:22:"Revert an image style.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '188',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '238',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -27944,26 +30600,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '189',
-  'plid' => '175',
-  'link_path' => 'admin/help/field',
-  'router_path' => 'admin/help/field',
-  'link_title' => 'field',
+  'mlid' => '239',
+  'plid' => '234',
+  'link_path' => 'admin/config/user-interface/shortcut/link/%/delete',
+  'router_path' => 'admin/config/user-interface/shortcut/link/%/delete',
+  'link_title' => 'Delete shortcut',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '189',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '57',
+  'p4' => '217',
+  'p5' => '234',
+  'p6' => '239',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -27973,26 +30629,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '190',
-  'plid' => '175',
-  'link_path' => 'admin/help/field_sql_storage',
-  'router_path' => 'admin/help/field_sql_storage',
-  'link_title' => 'field_sql_storage',
-  'options' => 'a:0:{}',
+  'mlid' => '240',
+  'plid' => '235',
+  'link_path' => 'admin/config/media/image-styles/edit/%/add/%',
+  'router_path' => 'admin/config/media/image-styles/edit/%/add/%',
+  'link_title' => 'Add image effect',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:28:"Add a new effect to a style.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '190',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '235',
+  'p6' => '240',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -28002,26 +30658,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '191',
-  'plid' => '175',
-  'link_path' => 'admin/help/field_ui',
-  'router_path' => 'admin/help/field_ui',
-  'link_title' => 'field_ui',
-  'options' => 'a:0:{}',
+  'mlid' => '241',
+  'plid' => '235',
+  'link_path' => 'admin/config/media/image-styles/edit/%/effects/%',
+  'router_path' => 'admin/config/media/image-styles/edit/%/effects/%',
+  'link_title' => 'Edit image effect',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:39:"Edit an existing effect within a style.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '191',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '235',
+  'p6' => '241',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -28031,27 +30687,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '192',
-  'plid' => '175',
-  'link_path' => 'admin/help/file',
-  'router_path' => 'admin/help/file',
-  'link_title' => 'file',
-  'options' => 'a:0:{}',
+  'mlid' => '242',
+  'plid' => '241',
+  'link_path' => 'admin/config/media/image-styles/edit/%/effects/%/delete',
+  'router_path' => 'admin/config/media/image-styles/edit/%/effects/%/delete',
+  'link_title' => 'Delete image effect',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:39:"Delete an existing effect from a style.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '192',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p2' => '8',
+  'p3' => '43',
+  'p4' => '214',
+  'p5' => '235',
+  'p6' => '241',
+  'p7' => '242',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -28059,24 +30715,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '193',
-  'plid' => '175',
-  'link_path' => 'admin/help/filter',
-  'router_path' => 'admin/help/filter',
-  'link_title' => 'filter',
+  'menu_name' => 'shortcut-set-1',
+  'mlid' => '243',
+  'plid' => '0',
+  'link_path' => 'node/add',
+  'router_path' => 'node/add',
+  'link_title' => 'Add content',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-20',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '193',
+  'p1' => '243',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28088,24 +30744,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '194',
-  'plid' => '175',
-  'link_path' => 'admin/help/help',
-  'router_path' => 'admin/help/help',
-  'link_title' => 'help',
+  'menu_name' => 'shortcut-set-1',
+  'mlid' => '244',
+  'plid' => '0',
+  'link_path' => 'admin/content',
+  'router_path' => 'admin/content',
+  'link_title' => 'Find content',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-19',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '194',
+  'p1' => '244',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28117,24 +30773,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '195',
-  'plid' => '175',
-  'link_path' => 'admin/help/image',
-  'router_path' => 'admin/help/image',
-  'link_title' => 'image',
+  'menu_name' => 'main-menu',
+  'mlid' => '245',
+  'plid' => '0',
+  'link_path' => '<front>',
+  'router_path' => '',
+  'link_title' => 'Home',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
+  'module' => 'menu',
+  'hidden' => '0',
+  'external' => '1',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '195',
+  'p1' => '245',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28146,24 +30802,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '196',
-  'plid' => '175',
-  'link_path' => 'admin/help/list',
-  'router_path' => 'admin/help/list',
-  'link_title' => 'list',
-  'options' => 'a:0:{}',
+  'menu_name' => 'navigation',
+  'mlid' => '246',
+  'plid' => '6',
+  'link_path' => 'node/add/article',
+  'router_path' => 'node/add/article',
+  'link_title' => 'Article',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:89:"Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '196',
+  'p1' => '6',
+  'p2' => '246',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28175,24 +30831,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '197',
-  'plid' => '175',
-  'link_path' => 'admin/help/menu',
-  'router_path' => 'admin/help/menu',
-  'link_title' => 'menu',
-  'options' => 'a:0:{}',
+  'menu_name' => 'navigation',
+  'mlid' => '247',
+  'plid' => '6',
+  'link_path' => 'node/add/page',
+  'router_path' => 'node/add/page',
+  'link_title' => 'Basic page',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:77:\"Use <em>basic pages</em> for your static content, such as an 'About us' page.\";}}",
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '197',
+  'p1' => '6',
+  'p2' => '247',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28205,11 +30861,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '198',
+  'mlid' => '248',
   'plid' => '175',
-  'link_path' => 'admin/help/node',
-  'router_path' => 'admin/help/node',
-  'link_title' => 'node',
+  'link_path' => 'admin/help/toolbar',
+  'router_path' => 'admin/help/toolbar',
+  'link_title' => 'toolbar',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -28221,7 +30877,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '198',
+  'p3' => '248',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28234,23 +30890,23 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '199',
-  'plid' => '175',
-  'link_path' => 'admin/help/number',
-  'router_path' => 'admin/help/number',
-  'link_title' => 'number',
-  'options' => 'a:0:{}',
+  'mlid' => '287',
+  'plid' => '18',
+  'link_path' => 'admin/reports/updates',
+  'router_path' => 'admin/reports/updates',
+  'link_title' => 'Available updates',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:82:"Get a status report about available updates for your installed modules and themes.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '-50',
   'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '199',
+  'p2' => '18',
+  'p3' => '287',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28263,23 +30919,23 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '200',
-  'plid' => '175',
-  'link_path' => 'admin/help/options',
-  'router_path' => 'admin/help/options',
-  'link_title' => 'options',
+  'mlid' => '288',
+  'plid' => '15',
+  'link_path' => 'admin/modules/install',
+  'router_path' => 'admin/modules/install',
+  'link_title' => 'Install new module',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '25',
   'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '200',
+  'p2' => '15',
+  'p3' => '288',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28292,23 +30948,23 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '202',
-  'plid' => '175',
-  'link_path' => 'admin/help/path',
-  'router_path' => 'admin/help/path',
-  'link_title' => 'path',
+  'mlid' => '289',
+  'plid' => '7',
+  'link_path' => 'admin/appearance/install',
+  'router_path' => 'admin/appearance/install',
+  'link_title' => 'Install new theme',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '25',
   'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '202',
+  'p2' => '7',
+  'p3' => '289',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28321,23 +30977,23 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '203',
-  'plid' => '175',
-  'link_path' => 'admin/help/rdf',
-  'router_path' => 'admin/help/rdf',
-  'link_title' => 'rdf',
+  'mlid' => '290',
+  'plid' => '15',
+  'link_path' => 'admin/modules/update',
+  'router_path' => 'admin/modules/update',
+  'link_title' => 'Update',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '10',
   'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '203',
+  'p2' => '15',
+  'p3' => '290',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28350,23 +31006,23 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '204',
-  'plid' => '175',
-  'link_path' => 'admin/help/search',
-  'router_path' => 'admin/help/search',
-  'link_title' => 'search',
+  'mlid' => '291',
+  'plid' => '7',
+  'link_path' => 'admin/appearance/update',
+  'router_path' => 'admin/appearance/update',
+  'link_title' => 'Update',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '10',
   'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '204',
+  'p2' => '7',
+  'p3' => '291',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28379,11 +31035,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '205',
+  'mlid' => '292',
   'plid' => '175',
-  'link_path' => 'admin/help/shortcut',
-  'router_path' => 'admin/help/shortcut',
-  'link_title' => 'shortcut',
+  'link_path' => 'admin/help/update',
+  'router_path' => 'admin/help/update',
+  'link_title' => 'update',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -28395,7 +31051,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '205',
+  'p3' => '292',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -28408,11 +31064,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '206',
-  'plid' => '175',
-  'link_path' => 'admin/help/system',
-  'router_path' => 'admin/help/system',
-  'link_title' => 'system',
+  'mlid' => '293',
+  'plid' => '287',
+  'link_path' => 'admin/reports/updates/list',
+  'router_path' => 'admin/reports/updates/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -28420,12 +31076,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '206',
-  'p4' => '0',
+  'p2' => '18',
+  'p3' => '287',
+  'p4' => '293',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28437,24 +31093,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '207',
-  'plid' => '175',
-  'link_path' => 'admin/help/taxonomy',
-  'router_path' => 'admin/help/taxonomy',
-  'link_title' => 'taxonomy',
+  'mlid' => '294',
+  'plid' => '287',
+  'link_path' => 'admin/reports/updates/settings',
+  'router_path' => 'admin/reports/updates/settings',
+  'link_title' => 'Settings',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '50',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '207',
-  'p4' => '0',
+  'p2' => '18',
+  'p3' => '287',
+  'p4' => '294',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28466,24 +31122,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '208',
-  'plid' => '175',
-  'link_path' => 'admin/help/text',
-  'router_path' => 'admin/help/text',
-  'link_title' => 'text',
+  'mlid' => '295',
+  'plid' => '287',
+  'link_path' => 'admin/reports/updates/install',
+  'router_path' => 'admin/reports/updates/install',
+  'link_title' => 'Install new module or theme',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '25',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '208',
-  'p4' => '0',
+  'p2' => '18',
+  'p3' => '287',
+  'p4' => '295',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28495,24 +31151,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '209',
-  'plid' => '175',
-  'link_path' => 'admin/help/user',
-  'router_path' => 'admin/help/user',
-  'link_title' => 'user',
+  'mlid' => '296',
+  'plid' => '287',
+  'link_path' => 'admin/reports/updates/update',
+  'router_path' => 'admin/reports/updates/update',
+  'link_title' => 'Update',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '209',
-  'p4' => '0',
+  'p2' => '18',
+  'p3' => '287',
+  'p4' => '296',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28524,22 +31180,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '210',
-  'plid' => '176',
-  'link_path' => 'taxonomy/term/%/edit',
-  'router_path' => 'taxonomy/term/%/edit',
-  'link_title' => 'Edit',
+  'mlid' => '335',
+  'plid' => '0',
+  'link_path' => 'blog',
+  'router_path' => 'blog',
+  'link_title' => 'Blogs',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '176',
-  'p2' => '210',
+  'p1' => '335',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -28553,22 +31209,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '211',
-  'plid' => '176',
-  'link_path' => 'taxonomy/term/%/view',
-  'router_path' => 'taxonomy/term/%/view',
-  'link_title' => 'View',
+  'mlid' => '336',
+  'plid' => '0',
+  'link_path' => 'book',
+  'router_path' => 'book',
+  'link_title' => 'Books',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '176',
-  'p2' => '211',
+  'p1' => '336',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -28581,25 +31237,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '212',
-  'plid' => '180',
-  'link_path' => 'admin/structure/taxonomy/%',
-  'router_path' => 'admin/structure/taxonomy/%',
-  'link_title' => '',
+  'menu_name' => 'navigation',
+  'mlid' => '337',
+  'plid' => '0',
+  'link_path' => 'contact',
+  'router_path' => 'contact',
+  'link_title' => 'Contact',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
+  'p1' => '337',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28610,25 +31266,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '213',
-  'plid' => '180',
-  'link_path' => 'admin/structure/taxonomy/add',
-  'router_path' => 'admin/structure/taxonomy/add',
-  'link_title' => 'Add vocabulary',
+  'menu_name' => 'navigation',
+  'mlid' => '338',
+  'plid' => '0',
+  'link_path' => 'aggregator',
+  'router_path' => 'aggregator',
+  'link_title' => 'Feed aggregator',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '5',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '213',
+  'p1' => '338',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28639,25 +31295,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '214',
-  'plid' => '43',
-  'link_path' => 'admin/config/media/image-styles',
-  'router_path' => 'admin/config/media/image-styles',
-  'link_title' => 'Image styles',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:78:"Configure styles that can be used for resizing or adjusting images on display.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '339',
+  'plid' => '0',
+  'link_path' => 'forum',
+  'router_path' => 'forum',
+  'link_title' => 'Forums',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
+  'p1' => '339',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28668,25 +31324,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '215',
-  'plid' => '180',
-  'link_path' => 'admin/structure/taxonomy/list',
-  'router_path' => 'admin/structure/taxonomy/list',
-  'link_title' => 'List',
+  'menu_name' => 'navigation',
+  'mlid' => '340',
+  'plid' => '0',
+  'link_path' => 'tracker',
+  'router_path' => 'tracker',
+  'link_title' => 'Recent content',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '1',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '215',
+  'p1' => '340',
+  'p2' => '0',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28697,25 +31353,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '216',
-  'plid' => '50',
-  'link_path' => 'admin/config/search/settings',
-  'router_path' => 'admin/config/search/settings',
-  'link_title' => 'Search settings',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:67:"Configure relevance settings for search and other indexing options.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '341',
+  'plid' => '340',
+  'link_path' => 'tracker/all',
+  'router_path' => 'tracker/all',
+  'link_title' => 'All recent content',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '216',
+  'p1' => '340',
+  'p2' => '341',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28726,25 +31382,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '217',
-  'plid' => '57',
-  'link_path' => 'admin/config/user-interface/shortcut',
-  'router_path' => 'admin/config/user-interface/shortcut',
-  'link_title' => 'Shortcuts',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:29:"Add and modify shortcut sets.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '342',
+  'plid' => '338',
+  'link_path' => 'aggregator/categories',
+  'router_path' => 'aggregator/categories',
+  'link_title' => 'Categories',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
+  'p1' => '338',
+  'p2' => '342',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28755,25 +31411,54 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '218',
-  'plid' => '50',
-  'link_path' => 'admin/config/search/path',
-  'router_path' => 'admin/config/search/path',
-  'link_title' => 'URL aliases',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:46:\"Change your site's URL paths by aliasing them.\";}}",
+  'menu_name' => 'navigation',
+  'mlid' => '343',
+  'plid' => '339',
+  'link_path' => 'forum/%',
+  'router_path' => 'forum/%',
+  'link_title' => 'Forums',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '0',
+  'p1' => '339',
+  'p2' => '343',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '344',
+  'plid' => '335',
+  'link_path' => 'blog/%',
+  'router_path' => 'blog/%',
+  'link_title' => 'My blog',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-5',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '218',
+  'p1' => '335',
+  'p2' => '344',
+  'p3' => '0',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -28784,12 +31469,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '219',
-  'plid' => '218',
-  'link_path' => 'admin/config/search/path/add',
-  'router_path' => 'admin/config/search/path/add',
-  'link_title' => 'Add alias',
+  'menu_name' => 'navigation',
+  'mlid' => '345',
+  'plid' => '340',
+  'link_path' => 'tracker/%',
+  'router_path' => 'tracker/%',
+  'link_title' => 'My recent content',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -28797,13 +31482,13 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '218',
-  'p5' => '219',
+  'p1' => '340',
+  'p2' => '345',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28813,26 +31498,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '220',
-  'plid' => '217',
-  'link_path' => 'admin/config/user-interface/shortcut/add-set',
-  'router_path' => 'admin/config/user-interface/shortcut/add-set',
-  'link_title' => 'Add shortcut set',
+  'menu_name' => 'navigation',
+  'mlid' => '346',
+  'plid' => '338',
+  'link_path' => 'aggregator/sources',
+  'router_path' => 'aggregator/sources',
+  'link_title' => 'Sources',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '220',
+  'p1' => '338',
+  'p2' => '346',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28842,26 +31527,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '221',
-  'plid' => '214',
-  'link_path' => 'admin/config/media/image-styles/add',
-  'router_path' => 'admin/config/media/image-styles/add',
-  'link_title' => 'Add style',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:22:"Add a new image style.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '347',
+  'plid' => '342',
+  'link_path' => 'aggregator/categories/%',
+  'router_path' => 'aggregator/categories/%',
+  'link_title' => '',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '221',
+  'p1' => '338',
+  'p2' => '342',
+  'p3' => '347',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28871,26 +31556,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '222',
-  'plid' => '212',
-  'link_path' => 'admin/structure/taxonomy/%/add',
-  'router_path' => 'admin/structure/taxonomy/%/add',
-  'link_title' => 'Add term',
+  'menu_name' => 'navigation',
+  'mlid' => '348',
+  'plid' => '346',
+  'link_path' => 'aggregator/sources/%',
+  'router_path' => 'aggregator/sources/%',
+  'link_title' => '',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '222',
+  'p1' => '338',
+  'p2' => '346',
+  'p3' => '348',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28900,26 +31585,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '223',
-  'plid' => '216',
-  'link_path' => 'admin/config/search/settings/reindex',
-  'router_path' => 'admin/config/search/settings/reindex',
-  'link_title' => 'Clear index',
-  'options' => 'a:0:{}',
+  'menu_name' => 'navigation',
+  'mlid' => '349',
+  'plid' => '6',
+  'link_path' => 'node/add/blog',
+  'router_path' => 'node/add/blog',
+  'link_title' => 'Blog entry',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:58:"Use for multi-user blogs. Every user gets a personal blog.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '216',
-  'p5' => '223',
+  'p1' => '6',
+  'p2' => '349',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28929,26 +31614,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '224',
-  'plid' => '212',
-  'link_path' => 'admin/structure/taxonomy/%/edit',
-  'router_path' => 'admin/structure/taxonomy/%/edit',
-  'link_title' => 'Edit',
-  'options' => 'a:0:{}',
+  'menu_name' => 'navigation',
+  'mlid' => '350',
+  'plid' => '6',
+  'link_path' => 'node/add/book',
+  'router_path' => 'node/add/book',
+  'link_title' => 'Book page',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:87:"<em>Books</em> have a built-in hierarchical navigation. Use for handbooks or tutorials.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '224',
+  'p1' => '6',
+  'p2' => '350',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28959,25 +31644,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '225',
-  'plid' => '217',
-  'link_path' => 'admin/config/user-interface/shortcut/%',
-  'router_path' => 'admin/config/user-interface/shortcut/%',
-  'link_title' => 'Edit shortcuts',
-  'options' => 'a:0:{}',
+  'mlid' => '351',
+  'plid' => '9',
+  'link_path' => 'admin/content/book',
+  'router_path' => 'admin/content/book',
+  'link_title' => 'Books',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:33:\"Manage your site's book outlines.\";}}",
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '225',
+  'p2' => '9',
+  'p3' => '351',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -28987,26 +31672,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '226',
-  'plid' => '212',
-  'link_path' => 'admin/structure/taxonomy/%/list',
-  'router_path' => 'admin/structure/taxonomy/%/list',
-  'link_title' => 'List',
+  'menu_name' => 'navigation',
+  'mlid' => '352',
+  'plid' => '16',
+  'link_path' => 'user/%/contact',
+  'router_path' => 'user/%/contact',
+  'link_title' => 'Contact',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '5',
+  'weight' => '2',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '226',
+  'p1' => '16',
+  'p2' => '352',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29017,25 +31702,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '227',
-  'plid' => '218',
-  'link_path' => 'admin/config/search/path/list',
-  'router_path' => 'admin/config/search/path/list',
-  'link_title' => 'List',
-  'options' => 'a:0:{}',
+  'mlid' => '353',
+  'plid' => '20',
+  'link_path' => 'admin/structure/contact',
+  'router_path' => 'admin/structure/contact',
+  'link_title' => 'Contact form',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:71:"Create a system contact form and set up categories for the form to use.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '218',
-  'p5' => '227',
+  'p2' => '20',
+  'p3' => '353',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29046,25 +31731,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '228',
-  'plid' => '214',
-  'link_path' => 'admin/config/media/image-styles/list',
-  'router_path' => 'admin/config/media/image-styles/list',
-  'link_title' => 'List',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:42:"List the current image styles on the site.";}}',
+  'mlid' => '354',
+  'plid' => '8',
+  'link_path' => 'admin/config/date',
+  'router_path' => 'admin/config/date',
+  'link_title' => 'Date API',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:42:"Settings for modules the use the Date API.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '228',
+  'p3' => '354',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29074,27 +31759,27 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '229',
-  'plid' => '225',
-  'link_path' => 'admin/config/user-interface/shortcut/%/add-link',
-  'router_path' => 'admin/config/user-interface/shortcut/%/add-link',
-  'link_title' => 'Add shortcut',
-  'options' => 'a:0:{}',
+  'menu_name' => 'navigation',
+  'mlid' => '355',
+  'plid' => '6',
+  'link_path' => 'node/add/forum',
+  'router_path' => 'node/add/forum',
+  'link_title' => 'Forum topic',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:69:"A <em>forum topic</em> starts a new discussion thread within a forum.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '225',
-  'p6' => '229',
+  'p1' => '6',
+  'p2' => '355',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29104,25 +31789,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '230',
-  'plid' => '218',
-  'link_path' => 'admin/config/search/path/delete/%',
-  'router_path' => 'admin/config/search/path/delete/%',
-  'link_title' => 'Delete alias',
-  'options' => 'a:0:{}',
+  'mlid' => '356',
+  'plid' => '20',
+  'link_path' => 'admin/structure/forum',
+  'router_path' => 'admin/structure/forum',
+  'link_title' => 'Forums',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"Control forum hierarchy settings.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '218',
-  'p5' => '230',
+  'p2' => '20',
+  'p3' => '356',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29132,27 +31817,27 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '231',
-  'plid' => '225',
-  'link_path' => 'admin/config/user-interface/shortcut/%/delete',
-  'router_path' => 'admin/config/user-interface/shortcut/%/delete',
-  'link_title' => 'Delete shortcut set',
+  'menu_name' => 'navigation',
+  'mlid' => '358',
+  'plid' => '5',
+  'link_path' => 'node/%/outline',
+  'router_path' => 'node/%/outline',
+  'link_title' => 'Outline',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '2',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '225',
-  'p6' => '231',
+  'p1' => '5',
+  'p2' => '358',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29162,25 +31847,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '232',
-  'plid' => '218',
-  'link_path' => 'admin/config/search/path/edit/%',
-  'router_path' => 'admin/config/search/path/edit/%',
-  'link_title' => 'Edit alias',
-  'options' => 'a:0:{}',
+  'mlid' => '359',
+  'plid' => '18',
+  'link_path' => 'admin/reports/hits',
+  'router_path' => 'admin/reports/hits',
+  'link_title' => 'Recent hits',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"View pages that have recently been visited.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '50',
-  'p4' => '218',
-  'p5' => '232',
+  'p2' => '18',
+  'p3' => '359',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29191,26 +31876,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '233',
-  'plid' => '225',
-  'link_path' => 'admin/config/user-interface/shortcut/%/edit',
-  'router_path' => 'admin/config/user-interface/shortcut/%/edit',
-  'link_title' => 'Edit set name',
-  'options' => 'a:0:{}',
+  'mlid' => '360',
+  'plid' => '18',
+  'link_path' => 'admin/reports/pages',
+  'router_path' => 'admin/reports/pages',
+  'link_title' => 'Top pages',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:41:"View pages that have been hit frequently.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '6',
+  'weight' => '1',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '225',
-  'p6' => '233',
+  'p2' => '18',
+  'p3' => '360',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29220,25 +31905,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '234',
-  'plid' => '217',
-  'link_path' => 'admin/config/user-interface/shortcut/link/%',
-  'router_path' => 'admin/config/user-interface/shortcut/link/%',
-  'link_title' => 'Edit shortcut',
-  'options' => 'a:0:{}',
+  'mlid' => '361',
+  'plid' => '18',
+  'link_path' => 'admin/reports/referrers',
+  'router_path' => 'admin/reports/referrers',
+  'link_title' => 'Top referrers',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:19:"View top referrers.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '234',
+  'p2' => '18',
+  'p3' => '361',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29249,25 +31934,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '235',
-  'plid' => '214',
-  'link_path' => 'admin/config/media/image-styles/edit/%',
-  'router_path' => 'admin/config/media/image-styles/edit/%',
-  'link_title' => 'Edit style',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:25:"Configure an image style.";}}',
+  'mlid' => '362',
+  'plid' => '18',
+  'link_path' => 'admin/reports/visitors',
+  'router_path' => 'admin/reports/visitors',
+  'link_title' => 'Top visitors',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"View visitors that hit many pages.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '2',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '235',
+  'p2' => '18',
+  'p3' => '362',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29277,27 +31962,27 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '236',
-  'plid' => '225',
-  'link_path' => 'admin/config/user-interface/shortcut/%/links',
-  'router_path' => 'admin/config/user-interface/shortcut/%/links',
-  'link_title' => 'List links',
+  'menu_name' => 'navigation',
+  'mlid' => '363',
+  'plid' => '5',
+  'link_path' => 'node/%/track',
+  'router_path' => 'node/%/track',
+  'link_title' => 'Track',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '2',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '225',
-  'p6' => '236',
+  'p1' => '5',
+  'p2' => '363',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29306,26 +31991,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '237',
-  'plid' => '214',
-  'link_path' => 'admin/config/media/image-styles/delete/%',
-  'router_path' => 'admin/config/media/image-styles/delete/%',
-  'link_title' => 'Delete style',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:22:"Delete an image style.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '364',
+  'plid' => '16',
+  'link_path' => 'user/%/track',
+  'router_path' => 'user/%/track',
+  'link_title' => 'Track',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '237',
+  'p1' => '16',
+  'p2' => '364',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29335,26 +32020,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '238',
-  'plid' => '214',
-  'link_path' => 'admin/config/media/image-styles/revert/%',
-  'router_path' => 'admin/config/media/image-styles/revert/%',
-  'link_title' => 'Revert style',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:22:"Revert an image style.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '365',
+  'plid' => '5',
+  'link_path' => 'node/%/translate',
+  'router_path' => 'node/%/translate',
+  'link_title' => 'Translate',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '1',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '238',
+  'p1' => '5',
+  'p2' => '365',
+  'p3' => '0',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29365,26 +32050,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '239',
-  'plid' => '234',
-  'link_path' => 'admin/config/user-interface/shortcut/link/%/delete',
-  'router_path' => 'admin/config/user-interface/shortcut/link/%/delete',
-  'link_title' => 'Delete shortcut',
+  'mlid' => '369',
+  'plid' => '175',
+  'link_path' => 'admin/help/aggregator',
+  'router_path' => 'admin/help/aggregator',
+  'link_title' => 'aggregator',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '57',
-  'p4' => '217',
-  'p5' => '234',
-  'p6' => '239',
+  'p2' => '175',
+  'p3' => '369',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29394,26 +32079,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '240',
-  'plid' => '235',
-  'link_path' => 'admin/config/media/image-styles/edit/%/add/%',
-  'router_path' => 'admin/config/media/image-styles/edit/%/add/%',
-  'link_title' => 'Add image effect',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:28:"Add a new effect to a style.";}}',
+  'mlid' => '370',
+  'plid' => '175',
+  'link_path' => 'admin/help/blog',
+  'router_path' => 'admin/help/blog',
+  'link_title' => 'blog',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '235',
-  'p6' => '240',
+  'p2' => '175',
+  'p3' => '370',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29423,26 +32108,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '241',
-  'plid' => '235',
-  'link_path' => 'admin/config/media/image-styles/edit/%/effects/%',
-  'router_path' => 'admin/config/media/image-styles/edit/%/effects/%',
-  'link_title' => 'Edit image effect',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:39:"Edit an existing effect within a style.";}}',
+  'mlid' => '371',
+  'plid' => '175',
+  'link_path' => 'admin/help/book',
+  'router_path' => 'admin/help/book',
+  'link_title' => 'book',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '235',
-  'p6' => '241',
+  'p2' => '175',
+  'p3' => '371',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -29452,27 +32137,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '242',
-  'plid' => '241',
-  'link_path' => 'admin/config/media/image-styles/edit/%/effects/%/delete',
-  'router_path' => 'admin/config/media/image-styles/edit/%/effects/%/delete',
-  'link_title' => 'Delete image effect',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:39:"Delete an existing effect from a style.";}}',
+  'mlid' => '372',
+  'plid' => '175',
+  'link_path' => 'admin/help/contact',
+  'router_path' => 'admin/help/contact',
+  'link_title' => 'contact',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '43',
-  'p4' => '214',
-  'p5' => '235',
-  'p6' => '241',
-  'p7' => '242',
+  'p2' => '175',
+  'p3' => '372',
+  'p4' => '0',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -29480,24 +32165,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'shortcut-set-1',
-  'mlid' => '243',
-  'plid' => '0',
-  'link_path' => 'node/add',
-  'router_path' => 'node/add',
-  'link_title' => 'Add content',
+  'menu_name' => 'management',
+  'mlid' => '373',
+  'plid' => '175',
+  'link_path' => 'admin/help/date',
+  'router_path' => 'admin/help/date',
+  'link_title' => 'date',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-20',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '243',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '373',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -29509,24 +32194,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'shortcut-set-1',
-  'mlid' => '244',
-  'plid' => '0',
-  'link_path' => 'admin/content',
-  'router_path' => 'admin/content',
-  'link_title' => 'Find content',
+  'menu_name' => 'management',
+  'mlid' => '374',
+  'plid' => '175',
+  'link_path' => 'admin/help/forum',
+  'router_path' => 'admin/help/forum',
+  'link_title' => 'forum',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-19',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '244',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '374',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -29538,24 +32223,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'main-menu',
-  'mlid' => '245',
-  'plid' => '0',
-  'link_path' => '<front>',
-  'router_path' => '',
-  'link_title' => 'Home',
+  'menu_name' => 'management',
+  'mlid' => '375',
+  'plid' => '175',
+  'link_path' => 'admin/help/locale',
+  'router_path' => 'admin/help/locale',
+  'link_title' => 'locale',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '245',
-  'p2' => '0',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '375',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -29567,24 +32252,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '246',
-  'plid' => '6',
-  'link_path' => 'node/add/article',
-  'router_path' => 'node/add/article',
-  'link_title' => 'Article',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:89:"Use <em>articles</em> for time-sensitive content like news, press releases or blog posts.";}}',
+  'menu_name' => 'management',
+  'mlid' => '378',
+  'plid' => '175',
+  'link_path' => 'admin/help/statistics',
+  'router_path' => 'admin/help/statistics',
+  'link_title' => 'statistics',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '6',
-  'p2' => '246',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '378',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -29596,24 +32281,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '247',
-  'plid' => '6',
-  'link_path' => 'node/add/page',
-  'router_path' => 'node/add/page',
-  'link_title' => 'Basic page',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:77:\"Use <em>basic pages</em> for your static content, such as an 'About us' page.\";}}",
+  'menu_name' => 'management',
+  'mlid' => '380',
+  'plid' => '175',
+  'link_path' => 'admin/help/tracker',
+  'router_path' => 'admin/help/tracker',
+  'link_title' => 'tracker',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '6',
-  'p2' => '247',
-  'p3' => '0',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '380',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -29626,11 +32311,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '248',
+  'mlid' => '381',
   'plid' => '175',
-  'link_path' => 'admin/help/toolbar',
-  'router_path' => 'admin/help/toolbar',
-  'link_title' => 'toolbar',
+  'link_path' => 'admin/help/translation',
+  'router_path' => 'admin/help/translation',
+  'link_title' => 'translation',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -29642,7 +32327,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '248',
+  'p3' => '381',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -29654,25 +32339,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '287',
-  'plid' => '18',
-  'link_path' => 'admin/reports/updates',
-  'router_path' => 'admin/reports/updates',
-  'link_title' => 'Available updates',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:82:"Get a status report about available updates for your installed modules and themes.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '383',
+  'plid' => '347',
+  'link_path' => 'aggregator/categories/%/categorize',
+  'router_path' => 'aggregator/categories/%/categorize',
+  'link_title' => 'Categorize',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-50',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '18',
-  'p3' => '287',
-  'p4' => '0',
+  'p1' => '338',
+  'p2' => '342',
+  'p3' => '347',
+  'p4' => '383',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29683,25 +32368,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '288',
-  'plid' => '15',
-  'link_path' => 'admin/modules/install',
-  'router_path' => 'admin/modules/install',
-  'link_title' => 'Install new module',
+  'menu_name' => 'navigation',
+  'mlid' => '384',
+  'plid' => '348',
+  'link_path' => 'aggregator/sources/%/categorize',
+  'router_path' => 'aggregator/sources/%/categorize',
+  'link_title' => 'Categorize',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '25',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '15',
-  'p3' => '288',
-  'p4' => '0',
+  'p1' => '338',
+  'p2' => '346',
+  'p3' => '348',
+  'p4' => '384',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29712,25 +32397,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '289',
-  'plid' => '7',
-  'link_path' => 'admin/appearance/install',
-  'router_path' => 'admin/appearance/install',
-  'link_title' => 'Install new theme',
+  'menu_name' => 'navigation',
+  'mlid' => '385',
+  'plid' => '347',
+  'link_path' => 'aggregator/categories/%/configure',
+  'router_path' => 'aggregator/categories/%/configure',
+  'link_title' => 'Configure',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '25',
-  'depth' => '3',
+  'weight' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '7',
-  'p3' => '289',
-  'p4' => '0',
+  'p1' => '338',
+  'p2' => '342',
+  'p3' => '347',
+  'p4' => '385',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29741,25 +32426,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '290',
-  'plid' => '15',
-  'link_path' => 'admin/modules/update',
-  'router_path' => 'admin/modules/update',
-  'link_title' => 'Update',
+  'menu_name' => 'navigation',
+  'mlid' => '386',
+  'plid' => '348',
+  'link_path' => 'aggregator/sources/%/configure',
+  'router_path' => 'aggregator/sources/%/configure',
+  'link_title' => 'Configure',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '3',
+  'weight' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '15',
-  'p3' => '290',
-  'p4' => '0',
+  'p1' => '338',
+  'p2' => '346',
+  'p3' => '348',
+  'p4' => '386',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29770,25 +32455,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '291',
-  'plid' => '7',
-  'link_path' => 'admin/appearance/update',
-  'router_path' => 'admin/appearance/update',
-  'link_title' => 'Update',
+  'menu_name' => 'navigation',
+  'mlid' => '387',
+  'plid' => '347',
+  'link_path' => 'aggregator/categories/%/view',
+  'router_path' => 'aggregator/categories/%/view',
+  'link_title' => 'View',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '3',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '7',
-  'p3' => '291',
-  'p4' => '0',
+  'p1' => '338',
+  'p2' => '342',
+  'p3' => '347',
+  'p4' => '387',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29799,25 +32484,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '292',
-  'plid' => '175',
-  'link_path' => 'admin/help/update',
-  'router_path' => 'admin/help/update',
-  'link_title' => 'update',
+  'menu_name' => 'navigation',
+  'mlid' => '388',
+  'plid' => '348',
+  'link_path' => 'aggregator/sources/%/view',
+  'router_path' => 'aggregator/sources/%/view',
+  'link_title' => 'View',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '292',
-  'p4' => '0',
+  'p1' => '338',
+  'p2' => '346',
+  'p3' => '348',
+  'p4' => '388',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29829,24 +32514,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '293',
-  'plid' => '287',
-  'link_path' => 'admin/reports/updates/list',
-  'router_path' => 'admin/reports/updates/list',
-  'link_title' => 'List',
+  'mlid' => '389',
+  'plid' => '353',
+  'link_path' => 'admin/structure/contact/add',
+  'router_path' => 'admin/structure/contact/add',
+  'link_title' => 'Add category',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '1',
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '287',
-  'p4' => '293',
+  'p2' => '20',
+  'p3' => '353',
+  'p4' => '389',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29858,24 +32543,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '294',
-  'plid' => '287',
-  'link_path' => 'admin/reports/updates/settings',
-  'router_path' => 'admin/reports/updates/settings',
-  'link_title' => 'Settings',
-  'options' => 'a:0:{}',
+  'mlid' => '391',
+  'plid' => '18',
+  'link_path' => 'admin/reports/access/%',
+  'router_path' => 'admin/reports/access/%',
+  'link_title' => 'Details',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:16:"View access log.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '50',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
   'p2' => '18',
-  'p3' => '287',
-  'p4' => '294',
+  'p3' => '391',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29887,24 +32572,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '295',
-  'plid' => '287',
-  'link_path' => 'admin/reports/updates/install',
-  'router_path' => 'admin/reports/updates/install',
-  'link_title' => 'Install new module or theme',
-  'options' => 'a:0:{}',
+  'mlid' => '392',
+  'plid' => '33',
+  'link_path' => 'admin/config/content/email',
+  'router_path' => 'admin/config/content/email',
+  'link_title' => 'Email Contact Form Settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:57:"Administer flood control settings for email contact forms";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '25',
+  'weight' => '0',
   'depth' => '4',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '18',
-  'p3' => '287',
-  'p4' => '295',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '392',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29916,24 +32601,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '296',
-  'plid' => '287',
-  'link_path' => 'admin/reports/updates/update',
-  'router_path' => 'admin/reports/updates/update',
-  'link_title' => 'Update',
-  'options' => 'a:0:{}',
+  'mlid' => '393',
+  'plid' => '60',
+  'link_path' => 'admin/config/services/aggregator',
+  'router_path' => 'admin/config/services/aggregator',
+  'link_title' => 'Feed aggregator',
+  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:116:\"Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.\";}}",
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '10',
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '287',
-  'p4' => '296',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -29945,25 +32630,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '297',
-  'plid' => '212',
-  'link_path' => 'admin/structure/taxonomy/%/display',
-  'router_path' => 'admin/structure/taxonomy/%/display',
-  'link_title' => 'Manage display',
-  'options' => 'a:0:{}',
+  'mlid' => '395',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/language',
+  'router_path' => 'admin/config/regional/language',
+  'link_title' => 'Languages',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:55:"Configure languages for content and the user interface.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '297',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -29974,25 +32659,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '298',
-  'plid' => '66',
-  'link_path' => 'admin/config/people/accounts/display',
-  'router_path' => 'admin/config/people/accounts/display',
-  'link_title' => 'Manage display',
+  'mlid' => '396',
+  'plid' => '351',
+  'link_path' => 'admin/content/book/list',
+  'router_path' => 'admin/content/book/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '298',
+  'p2' => '9',
+  'p3' => '351',
+  'p4' => '396',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -30003,25 +32688,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '299',
-  'plid' => '212',
-  'link_path' => 'admin/structure/taxonomy/%/fields',
-  'router_path' => 'admin/structure/taxonomy/%/fields',
-  'link_title' => 'Manage fields',
+  'mlid' => '398',
+  'plid' => '356',
+  'link_path' => 'admin/structure/forum/list',
+  'router_path' => 'admin/structure/forum/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '299',
+  'p3' => '356',
+  'p4' => '398',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -30031,26 +32716,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '300',
-  'plid' => '66',
-  'link_path' => 'admin/config/people/accounts/fields',
-  'router_path' => 'admin/config/people/accounts/fields',
-  'link_title' => 'Manage fields',
+  'menu_name' => 'navigation',
+  'mlid' => '399',
+  'plid' => '358',
+  'link_path' => 'node/%/outline/remove',
+  'router_path' => 'node/%/outline/remove',
+  'link_title' => 'Remove from outline',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '300',
+  'p1' => '5',
+  'p2' => '358',
+  'p3' => '399',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -30061,26 +32746,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '301',
-  'plid' => '297',
-  'link_path' => 'admin/structure/taxonomy/%/display/default',
-  'router_path' => 'admin/structure/taxonomy/%/display/default',
-  'link_title' => 'Default',
+  'mlid' => '400',
+  'plid' => '351',
+  'link_path' => 'admin/content/book/settings',
+  'router_path' => 'admin/content/book/settings',
+  'link_title' => 'Settings',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '6',
+  'weight' => '8',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '297',
-  'p6' => '301',
+  'p2' => '9',
+  'p3' => '351',
+  'p4' => '400',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30090,26 +32775,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '302',
-  'plid' => '298',
-  'link_path' => 'admin/config/people/accounts/display/default',
-  'router_path' => 'admin/config/people/accounts/display/default',
-  'link_title' => 'Default',
-  'options' => 'a:0:{}',
+  'mlid' => '402',
+  'plid' => '53',
+  'link_path' => 'admin/config/system/statistics',
+  'router_path' => 'admin/config/system/statistics',
+  'link_title' => 'Statistics',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:68:"Control details about what and how your site logs access statistics.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '6',
+  'weight' => '-15',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '298',
-  'p6' => '302',
+  'p3' => '53',
+  'p4' => '402',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30118,26 +32803,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '303',
-  'plid' => '114',
-  'link_path' => 'admin/structure/types/manage/%/display',
-  'router_path' => 'admin/structure/types/manage/%/display',
-  'link_title' => 'Manage display',
+  'menu_name' => 'navigation',
+  'mlid' => '411',
+  'plid' => '364',
+  'link_path' => 'user/%/track/content',
+  'router_path' => 'user/%/track/content',
+  'link_title' => 'Track content',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
+  'p1' => '16',
+  'p2' => '364',
+  'p3' => '411',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -30147,26 +32832,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '304',
-  'plid' => '114',
-  'link_path' => 'admin/structure/types/manage/%/fields',
-  'router_path' => 'admin/structure/types/manage/%/fields',
-  'link_title' => 'Manage fields',
+  'menu_name' => 'navigation',
+  'mlid' => '412',
+  'plid' => '364',
+  'link_path' => 'user/%/track/navigation',
+  'router_path' => 'user/%/track/navigation',
+  'link_title' => 'Track page visits',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '5',
+  'weight' => '2',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '304',
+  'p1' => '16',
+  'p2' => '364',
+  'p3' => '412',
+  'p4' => '0',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -30177,26 +32862,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '305',
-  'plid' => '297',
-  'link_path' => 'admin/structure/taxonomy/%/display/full',
-  'router_path' => 'admin/structure/taxonomy/%/display/full',
-  'link_title' => 'Taxonomy term page',
-  'options' => 'a:0:{}',
+  'mlid' => '413',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/translate',
+  'router_path' => 'admin/config/regional/translate',
+  'link_title' => 'Translate interface',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:59:"Translate the built in interface and optionally other text.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '-5',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '297',
-  'p6' => '305',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30206,26 +32891,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '306',
-  'plid' => '298',
-  'link_path' => 'admin/config/people/accounts/display/full',
-  'router_path' => 'admin/config/people/accounts/display/full',
-  'link_title' => 'User account',
+  'mlid' => '417',
+  'plid' => '356',
+  'link_path' => 'admin/structure/forum/settings',
+  'router_path' => 'admin/structure/forum/settings',
+  'link_title' => 'Settings',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '5',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '298',
-  'p6' => '306',
+  'p2' => '20',
+  'p3' => '356',
+  'p4' => '417',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30235,26 +32920,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '307',
-  'plid' => '299',
-  'link_path' => 'admin/structure/taxonomy/%/fields/%',
-  'router_path' => 'admin/structure/taxonomy/%/fields/%',
-  'link_title' => '',
+  'mlid' => '418',
+  'plid' => '395',
+  'link_path' => 'admin/config/regional/language/add',
+  'router_path' => 'admin/config/regional/language/add',
+  'link_title' => 'Add language',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '5',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '299',
-  'p6' => '307',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '418',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30264,11 +32949,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '308',
-  'plid' => '300',
-  'link_path' => 'admin/config/people/accounts/fields/%',
-  'router_path' => 'admin/config/people/accounts/fields/%',
-  'link_title' => '',
+  'mlid' => '421',
+  'plid' => '353',
+  'link_path' => 'admin/structure/contact/delete/%',
+  'router_path' => 'admin/structure/contact/delete/%',
+  'link_title' => 'Delete contact',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
@@ -30276,14 +32961,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '300',
-  'p6' => '308',
+  'p2' => '20',
+  'p3' => '353',
+  'p4' => '421',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30293,26 +32978,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '309',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/default',
-  'router_path' => 'admin/structure/types/manage/%/display/default',
-  'link_title' => 'Default',
+  'mlid' => '422',
+  'plid' => '395',
+  'link_path' => 'admin/config/regional/language/configure',
+  'router_path' => 'admin/config/regional/language/configure',
+  'link_title' => 'Detection and selection',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '6',
+  'weight' => '10',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
-  'p6' => '309',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '422',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30322,26 +33007,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '310',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/full',
-  'router_path' => 'admin/structure/types/manage/%/display/full',
-  'link_title' => 'Full content',
+  'mlid' => '423',
+  'plid' => '353',
+  'link_path' => 'admin/structure/contact/edit/%',
+  'router_path' => 'admin/structure/contact/edit/%',
+  'link_title' => 'Edit contact category',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
-  'p6' => '310',
+  'p3' => '353',
+  'p4' => '423',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30351,26 +33036,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '311',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/rss',
-  'router_path' => 'admin/structure/types/manage/%/display/rss',
-  'link_title' => 'RSS',
+  'mlid' => '424',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/export',
+  'router_path' => 'admin/config/regional/translate/export',
+  'link_title' => 'Export',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '6',
+  'weight' => '30',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
-  'p6' => '311',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '424',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30380,26 +33065,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '312',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/search_index',
-  'router_path' => 'admin/structure/types/manage/%/display/search_index',
-  'link_title' => 'Search index',
+  'mlid' => '425',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/import',
+  'router_path' => 'admin/config/regional/translate/import',
+  'link_title' => 'Import',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '3',
-  'depth' => '6',
+  'weight' => '20',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
-  'p6' => '312',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '425',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30409,26 +33094,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '313',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/search_result',
-  'router_path' => 'admin/structure/types/manage/%/display/search_result',
-  'link_title' => 'Search result highlighting input',
+  'mlid' => '426',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/list',
+  'router_path' => 'admin/config/services/aggregator/list',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '4',
-  'depth' => '6',
+  'weight' => '-10',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
-  'p6' => '313',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '426',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30438,26 +33123,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '314',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/teaser',
-  'router_path' => 'admin/structure/types/manage/%/display/teaser',
-  'link_title' => 'Teaser',
+  'mlid' => '427',
+  'plid' => '395',
+  'link_path' => 'admin/config/regional/language/overview',
+  'router_path' => 'admin/config/regional/language/overview',
+  'link_title' => 'List',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '6',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '303',
-  'p6' => '314',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '427',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30467,26 +33152,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '315',
-  'plid' => '304',
-  'link_path' => 'admin/structure/types/manage/%/fields/%',
-  'router_path' => 'admin/structure/types/manage/%/fields/%',
-  'link_title' => '',
-  'options' => 'a:0:{}',
+  'mlid' => '429',
+  'plid' => '74',
+  'link_path' => 'admin/config/regional/date-time/locale',
+  'router_path' => 'admin/config/regional/date-time/locale',
+  'link_title' => 'Localize',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Configure date formats for each locale";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '6',
+  'weight' => '-8',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '304',
-  'p6' => '315',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '429',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30496,27 +33181,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '316',
-  'plid' => '307',
-  'link_path' => 'admin/structure/taxonomy/%/fields/%/delete',
-  'router_path' => 'admin/structure/taxonomy/%/fields/%/delete',
-  'link_title' => 'Delete',
+  'mlid' => '430',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/overview',
+  'router_path' => 'admin/config/regional/translate/overview',
+  'link_title' => 'Overview',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '7',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '299',
-  'p6' => '307',
-  'p7' => '316',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '430',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30525,27 +33210,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '317',
-  'plid' => '307',
-  'link_path' => 'admin/structure/taxonomy/%/fields/%/edit',
-  'router_path' => 'admin/structure/taxonomy/%/fields/%/edit',
-  'link_title' => 'Edit',
-  'options' => 'a:0:{}',
+  'mlid' => '432',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/settings',
+  'router_path' => 'admin/config/services/aggregator/settings',
+  'link_title' => 'Settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:129:"Configure the behavior of the feed aggregator, including when to discard feed items and how to present feed items and categories.";}}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '299',
-  'p6' => '307',
-  'p7' => '317',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '432',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30554,27 +33239,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '318',
-  'plid' => '307',
-  'link_path' => 'admin/structure/taxonomy/%/fields/%/field-settings',
-  'router_path' => 'admin/structure/taxonomy/%/fields/%/field-settings',
-  'link_title' => 'Field settings',
+  'mlid' => '433',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/translate',
+  'router_path' => 'admin/config/regional/translate/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '7',
+  'weight' => '10',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '299',
-  'p6' => '307',
-  'p7' => '318',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '433',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30583,11 +33268,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '319',
-  'plid' => '307',
-  'link_path' => 'admin/structure/taxonomy/%/fields/%/widget-type',
-  'router_path' => 'admin/structure/taxonomy/%/fields/%/widget-type',
-  'link_title' => 'Widget type',
+  'mlid' => '435',
+  'plid' => '356',
+  'link_path' => 'admin/structure/forum/add/container',
+  'router_path' => 'admin/structure/forum/add/container',
+  'link_title' => 'Add container',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -30595,15 +33280,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '180',
-  'p4' => '212',
-  'p5' => '299',
-  'p6' => '307',
-  'p7' => '319',
+  'p3' => '356',
+  'p4' => '435',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30612,27 +33297,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '320',
-  'plid' => '308',
-  'link_path' => 'admin/config/people/accounts/fields/%/delete',
-  'router_path' => 'admin/config/people/accounts/fields/%/delete',
-  'link_title' => 'Delete',
+  'mlid' => '436',
+  'plid' => '356',
+  'link_path' => 'admin/structure/forum/add/forum',
+  'router_path' => 'admin/structure/forum/add/forum',
+  'link_title' => 'Add forum',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '7',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '300',
-  'p6' => '308',
-  'p7' => '320',
+  'p2' => '20',
+  'p3' => '356',
+  'p4' => '436',
+  'p5' => '0',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30641,11 +33326,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '321',
-  'plid' => '308',
-  'link_path' => 'admin/config/people/accounts/fields/%/edit',
-  'router_path' => 'admin/config/people/accounts/fields/%/edit',
-  'link_title' => 'Edit',
+  'mlid' => '437',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/add/category',
+  'router_path' => 'admin/config/services/aggregator/add/category',
+  'link_title' => 'Add category',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -30653,15 +33338,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '300',
-  'p6' => '308',
-  'p7' => '321',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '437',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30670,11 +33355,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '322',
-  'plid' => '308',
-  'link_path' => 'admin/config/people/accounts/fields/%/field-settings',
-  'router_path' => 'admin/config/people/accounts/fields/%/field-settings',
-  'link_title' => 'Field settings',
+  'mlid' => '438',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/add/feed',
+  'router_path' => 'admin/config/services/aggregator/add/feed',
+  'link_title' => 'Add feed',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -30682,15 +33367,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '300',
-  'p6' => '308',
-  'p7' => '322',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '438',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30699,27 +33384,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '323',
-  'plid' => '308',
-  'link_path' => 'admin/config/people/accounts/fields/%/widget-type',
-  'router_path' => 'admin/config/people/accounts/fields/%/widget-type',
-  'link_title' => 'Widget type',
+  'mlid' => '440',
+  'plid' => '395',
+  'link_path' => 'admin/config/regional/language/delete/%',
+  'router_path' => 'admin/config/regional/language/delete/%',
+  'link_title' => 'Confirm',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '45',
-  'p4' => '66',
-  'p5' => '300',
-  'p6' => '308',
-  'p7' => '323',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '440',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30728,26 +33413,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '324',
-  'plid' => '161',
-  'link_path' => 'admin/structure/types/manage/%/comment/display/default',
-  'router_path' => 'admin/structure/types/manage/%/comment/display/default',
-  'link_title' => 'Default',
+  'mlid' => '441',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/delete/%',
+  'router_path' => 'admin/config/regional/translate/delete/%',
+  'link_title' => 'Delete string',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '6',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '161',
-  'p6' => '324',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '441',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30757,26 +33442,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '325',
-  'plid' => '161',
-  'link_path' => 'admin/structure/types/manage/%/comment/display/full',
-  'router_path' => 'admin/structure/types/manage/%/comment/display/full',
-  'link_title' => 'Full comment',
+  'mlid' => '442',
+  'plid' => '356',
+  'link_path' => 'admin/structure/forum/edit/container/%',
+  'router_path' => 'admin/structure/forum/edit/container/%',
+  'link_title' => 'Edit container',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '161',
-  'p6' => '325',
+  'p3' => '356',
+  'p4' => '442',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30786,11 +33471,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '326',
-  'plid' => '162',
-  'link_path' => 'admin/structure/types/manage/%/comment/fields/%',
-  'router_path' => 'admin/structure/types/manage/%/comment/fields/%',
-  'link_title' => '',
+  'mlid' => '443',
+  'plid' => '356',
+  'link_path' => 'admin/structure/forum/edit/forum/%',
+  'router_path' => 'admin/structure/forum/edit/forum/%',
+  'link_title' => 'Edit forum',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
@@ -30798,14 +33483,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '162',
-  'p6' => '326',
+  'p3' => '356',
+  'p4' => '443',
+  'p5' => '0',
+  'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -30815,27 +33500,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '327',
-  'plid' => '315',
-  'link_path' => 'admin/structure/types/manage/%/fields/%/delete',
-  'router_path' => 'admin/structure/types/manage/%/fields/%/delete',
-  'link_title' => 'Delete',
+  'mlid' => '444',
+  'plid' => '395',
+  'link_path' => 'admin/config/regional/language/edit/%',
+  'router_path' => 'admin/config/regional/language/edit/%',
+  'link_title' => 'Edit language',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '7',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '304',
-  'p6' => '315',
-  'p7' => '327',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '444',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30844,27 +33529,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '328',
-  'plid' => '315',
-  'link_path' => 'admin/structure/types/manage/%/fields/%/edit',
-  'router_path' => 'admin/structure/types/manage/%/fields/%/edit',
-  'link_title' => 'Edit',
+  'mlid' => '445',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/edit/%',
+  'router_path' => 'admin/config/regional/translate/edit/%',
+  'link_title' => 'Edit string',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '304',
-  'p6' => '315',
-  'p7' => '328',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '445',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30873,11 +33558,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '329',
-  'plid' => '315',
-  'link_path' => 'admin/structure/types/manage/%/fields/%/field-settings',
-  'router_path' => 'admin/structure/types/manage/%/fields/%/field-settings',
-  'link_title' => 'Field settings',
+  'mlid' => '447',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/add/opml',
+  'router_path' => 'admin/config/services/aggregator/add/opml',
+  'link_title' => 'Import OPML',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -30885,15 +33570,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '304',
-  'p6' => '315',
-  'p7' => '329',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '447',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30902,27 +33587,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '330',
-  'plid' => '315',
-  'link_path' => 'admin/structure/types/manage/%/fields/%/widget-type',
-  'router_path' => 'admin/structure/types/manage/%/fields/%/widget-type',
-  'link_title' => 'Widget type',
+  'mlid' => '448',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/remove/%',
+  'router_path' => 'admin/config/services/aggregator/remove/%',
+  'link_title' => 'Remove items',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '304',
-  'p6' => '315',
-  'p7' => '330',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '448',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30931,27 +33616,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '331',
-  'plid' => '326',
-  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/delete',
-  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/delete',
-  'link_title' => 'Delete',
+  'mlid' => '449',
+  'plid' => '422',
+  'link_path' => 'admin/config/regional/language/configure/session',
+  'router_path' => 'admin/config/regional/language/configure/session',
+  'link_title' => 'Session language detection configuration',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '7',
+  'weight' => '0',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '162',
-  'p6' => '326',
-  'p7' => '331',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '422',
+  'p6' => '449',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30960,11 +33645,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '332',
-  'plid' => '326',
-  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/edit',
-  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/edit',
-  'link_title' => 'Edit',
+  'mlid' => '451',
+  'plid' => '422',
+  'link_path' => 'admin/config/regional/language/configure/url',
+  'router_path' => 'admin/config/regional/language/configure/url',
+  'link_title' => 'URL language detection configuration',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -30972,15 +33657,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '162',
-  'p6' => '326',
-  'p7' => '332',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '395',
+  'p5' => '422',
+  'p6' => '451',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -30989,27 +33674,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '333',
-  'plid' => '326',
-  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/field-settings',
-  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/field-settings',
-  'link_title' => 'Field settings',
+  'mlid' => '452',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/update/%',
+  'router_path' => 'admin/config/services/aggregator/update/%',
+  'link_title' => 'Update items',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '162',
-  'p6' => '326',
-  'p7' => '333',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '452',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -31018,27 +33703,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '334',
-  'plid' => '326',
-  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/widget-type',
-  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/widget-type',
-  'link_title' => 'Widget type',
+  'mlid' => '458',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/edit/category/%',
+  'router_path' => 'admin/config/services/aggregator/edit/category/%',
+  'link_title' => 'Edit category',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '7',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '34',
-  'p4' => '114',
-  'p5' => '162',
-  'p6' => '326',
-  'p7' => '334',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '458',
+  'p6' => '0',
+  'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -31046,26 +33731,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '335',
-  'plid' => '0',
-  'link_path' => 'blog',
-  'router_path' => 'blog',
-  'link_title' => 'Blogs',
+  'menu_name' => 'management',
+  'mlid' => '459',
+  'plid' => '393',
+  'link_path' => 'admin/config/services/aggregator/edit/feed/%',
+  'router_path' => 'admin/config/services/aggregator/edit/feed/%',
+  'link_title' => 'Edit feed',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '335',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '60',
+  'p4' => '393',
+  'p5' => '459',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -31075,27 +33760,27 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '336',
-  'plid' => '0',
-  'link_path' => 'book',
-  'router_path' => 'book',
-  'link_title' => 'Books',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '461',
+  'plid' => '429',
+  'link_path' => 'admin/config/regional/date-time/locale/%/edit',
+  'router_path' => 'admin/config/regional/date-time/locale/%/edit',
+  'link_title' => 'Localize date formats',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Configure date formats for each locale";}}',
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '6',
   'customized' => '0',
-  'p1' => '336',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '429',
+  'p6' => '461',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -31104,27 +33789,27 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '337',
-  'plid' => '0',
-  'link_path' => 'contact',
-  'router_path' => 'contact',
-  'link_title' => 'Contact',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '463',
+  'plid' => '429',
+  'link_path' => 'admin/config/regional/date-time/locale/%/reset',
+  'router_path' => 'admin/config/regional/date-time/locale/%/reset',
+  'link_title' => 'Reset date formats',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:47:"Reset localized date formats to global defaults";}}',
   'module' => 'system',
-  'hidden' => '1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '6',
   'customized' => '0',
-  'p1' => '337',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '74',
+  'p5' => '429',
+  'p6' => '463',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -31134,22 +33819,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '338',
-  'plid' => '0',
-  'link_path' => 'aggregator',
-  'router_path' => 'aggregator',
-  'link_title' => 'Feed aggregator',
-  'options' => 'a:0:{}',
+  'mlid' => '465',
+  'plid' => '6',
+  'link_path' => 'node/add/test-content-type',
+  'router_path' => 'node/add/test-content-type',
+  'link_title' => 'Test content type',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:49:"This is the description of the test content type.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '0',
+  'p1' => '6',
+  'p2' => '465',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31162,25 +33847,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '339',
-  'plid' => '0',
-  'link_path' => 'forum',
-  'router_path' => 'forum',
-  'link_title' => 'Forums',
+  'menu_name' => 'management',
+  'mlid' => '466',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/menu-test-menu',
+  'router_path' => 'admin/structure/menu/manage/%',
+  'link_title' => 'Test Menu',
   'options' => 'a:0:{}',
-  'module' => 'system',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
+  'depth' => '4',
   'customized' => '0',
-  'p1' => '339',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '466',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -31191,23 +33876,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '340',
-  'plid' => '0',
-  'link_path' => 'tracker',
-  'router_path' => 'tracker',
-  'link_title' => 'Recent content',
-  'options' => 'a:0:{}',
-  'module' => 'system',
+  'menu_name' => 'menu-test-menu',
+  'mlid' => '467',
+  'plid' => '469',
+  'link_path' => 'http://google.com',
+  'router_path' => '',
+  'link_title' => 'Google',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:6:"Google";}}',
+  'module' => 'menu',
   'hidden' => '0',
-  'external' => '0',
+  'external' => '1',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '1',
-  'customized' => '0',
-  'p1' => '340',
-  'p2' => '0',
+  'weight' => '0',
+  'depth' => '2',
+  'customized' => '1',
+  'p1' => '469',
+  'p2' => '467',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31220,23 +33905,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '341',
-  'plid' => '340',
-  'link_path' => 'tracker/all',
-  'router_path' => 'tracker/all',
-  'link_title' => 'All recent content',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
-  'external' => '0',
+  'menu_name' => 'menu-test-menu',
+  'mlid' => '468',
+  'plid' => '0',
+  'link_path' => 'http://yahoo.com',
+  'router_path' => '',
+  'link_title' => 'Yahoo',
+  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:19:"english description";}s:5:"alter";b:1;}',
+  'module' => 'menu',
+  'hidden' => '0',
+  'external' => '1',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '340',
-  'p2' => '341',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '468',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31245,27 +33930,27 @@
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
+  'language' => 'en',
+  'i18n_tsid' => '1',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '342',
-  'plid' => '338',
-  'link_path' => 'aggregator/categories',
-  'router_path' => 'aggregator/categories',
-  'link_title' => 'Categories',
-  'options' => 'a:0:{}',
-  'module' => 'system',
+  'menu_name' => 'menu-test-menu',
+  'mlid' => '469',
+  'plid' => '0',
+  'link_path' => 'http://bing.com',
+  'router_path' => '',
+  'link_title' => 'Bing',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:4:"Bing";}}',
+  'module' => 'menu',
   'hidden' => '0',
-  'external' => '0',
-  'has_children' => '1',
+  'external' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '338',
-  'p2' => '342',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '469',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31278,23 +33963,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '343',
-  'plid' => '339',
-  'link_path' => 'forum/%',
-  'router_path' => 'forum/%',
-  'link_title' => 'Forums',
+  'menu_name' => 'menu-test-menu',
+  'mlid' => '470',
+  'plid' => '469',
+  'link_path' => 'http://ask.com',
+  'router_path' => '',
+  'link_title' => 'Ask',
   'options' => 'a:0:{}',
-  'module' => 'system',
+  'module' => 'menu',
   'hidden' => '0',
-  'external' => '0',
+  'external' => '1',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '2',
-  'customized' => '0',
-  'p1' => '339',
-  'p2' => '343',
+  'customized' => '1',
+  'p1' => '469',
+  'p2' => '470',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31307,23 +33992,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '344',
-  'plid' => '335',
-  'link_path' => 'blog/%',
-  'router_path' => 'blog/%',
-  'link_title' => 'My blog',
+  'menu_name' => 'shortcut-set-2',
+  'mlid' => '472',
+  'plid' => '0',
+  'link_path' => 'admin/help',
+  'router_path' => 'admin/help',
+  'link_title' => 'Help',
   'options' => 'a:0:{}',
-  'module' => 'system',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-49',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '335',
-  'p2' => '344',
+  'p1' => '472',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31336,23 +34021,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '345',
-  'plid' => '340',
-  'link_path' => 'tracker/%',
-  'router_path' => 'tracker/%',
-  'link_title' => 'My recent content',
+  'menu_name' => 'shortcut-set-2',
+  'mlid' => '473',
+  'plid' => '0',
+  'link_path' => 'admin/people',
+  'router_path' => 'admin/people',
+  'link_title' => 'People',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-50',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '340',
-  'p2' => '345',
+  'p1' => '473',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31366,22 +34051,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '346',
-  'plid' => '338',
-  'link_path' => 'aggregator/sources',
-  'router_path' => 'aggregator/sources',
-  'link_title' => 'Sources',
+  'mlid' => '474',
+  'plid' => '4',
+  'link_path' => 'filter/tips/%',
+  'router_path' => 'filter/tips/%',
+  'link_title' => 'Compose tips',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '346',
+  'p1' => '4',
+  'p2' => '474',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31394,24 +34079,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '347',
-  'plid' => '342',
-  'link_path' => 'aggregator/categories/%',
-  'router_path' => 'aggregator/categories/%',
-  'link_title' => '',
+  'menu_name' => 'management',
+  'mlid' => '475',
+  'plid' => '175',
+  'link_path' => 'admin/help/php',
+  'router_path' => 'admin/help/php',
+  'link_title' => 'php',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '342',
-  'p3' => '347',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '475',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31423,24 +34108,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '348',
-  'plid' => '346',
-  'link_path' => 'aggregator/sources/%',
-  'router_path' => 'aggregator/sources/%',
-  'link_title' => '',
-  'options' => 'a:0:{}',
-  'module' => 'system',
+  'menu_name' => 'management',
+  'mlid' => '478',
+  'plid' => '20',
+  'link_path' => 'admin/content',
+  'router_path' => 'admin/content',
+  'link_title' => 'custom link test',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
-  'customized' => '0',
-  'p1' => '338',
-  'p2' => '346',
-  'p3' => '348',
+  'customized' => '1',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '478',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31453,22 +34138,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '349',
-  'plid' => '6',
-  'link_path' => 'node/add/blog',
-  'router_path' => 'node/add/blog',
-  'link_title' => 'Blog entry',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:58:"Use for multi-user blogs. Every user gets a personal blog.";}}',
-  'module' => 'system',
+  'mlid' => '479',
+  'plid' => '0',
+  'link_path' => 'node/2',
+  'router_path' => 'node/%',
+  'link_title' => 'node link test',
+  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:6:"node 2";}s:5:"query";a:2:{s:4:"name";s:6:"ferret";s:5:"color";s:6:"purple";}}',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '6',
-  'p2' => '349',
+  'weight' => '3',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '479',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31481,23 +34166,23 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '350',
-  'plid' => '6',
-  'link_path' => 'node/add/book',
-  'router_path' => 'node/add/book',
-  'link_title' => 'Book page',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:87:"<em>Books</em> have a built-in hierarchical navigation. Use for handbooks or tutorials.";}}',
-  'module' => 'system',
+  'menu_name' => 'book-toc-1',
+  'mlid' => '480',
+  'plid' => '0',
+  'link_path' => 'node/4',
+  'router_path' => 'node/%',
+  'link_title' => 'Test top book title',
+  'options' => 'a:0:{}',
+  'module' => 'book',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
+  'weight' => '-10',
+  'depth' => '1',
   'customized' => '0',
-  'p1' => '6',
-  'p2' => '350',
+  'p1' => '480',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31510,24 +34195,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '351',
-  'plid' => '9',
-  'link_path' => 'admin/content/book',
-  'router_path' => 'admin/content/book',
-  'link_title' => 'Books',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:33:\"Manage your site's book outlines.\";}}",
-  'module' => 'system',
-  'hidden' => '-1',
+  'menu_name' => 'book-toc-1',
+  'mlid' => '481',
+  'plid' => '480',
+  'link_path' => 'node/6',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1',
+  'options' => 'a:0:{}',
+  'module' => 'book',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '9',
-  'p3' => '351',
+  'p1' => '480',
+  'p2' => '481',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31539,24 +34224,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '352',
-  'plid' => '16',
-  'link_path' => 'user/%/contact',
-  'router_path' => 'user/%/contact',
-  'link_title' => 'Contact',
+  'menu_name' => 'book-toc-1',
+  'mlid' => '482',
+  'plid' => '481',
+  'link_path' => 'node/2',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title child 1.1',
   'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'module' => 'book',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '2',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '352',
-  'p3' => '0',
+  'p1' => '480',
+  'p2' => '481',
+  'p3' => '482',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31568,24 +34253,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '353',
-  'plid' => '20',
-  'link_path' => 'admin/structure/contact',
-  'router_path' => 'admin/structure/contact',
-  'link_title' => 'Contact form',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:71:"Create a system contact form and set up categories for the form to use.";}}',
-  'module' => 'system',
+  'menu_name' => 'book-toc-2',
+  'mlid' => '483',
+  'plid' => '481',
+  'link_path' => 'node/1',
+  'router_path' => 'node/%',
+  'link_title' => 'Test book title 2',
+  'options' => 'a:0:{}',
+  'module' => 'book',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '353',
+  'p1' => '480',
+  'p2' => '481',
+  'p3' => '483',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31597,24 +34282,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '354',
-  'plid' => '8',
-  'link_path' => 'admin/config/date',
-  'router_path' => 'admin/config/date',
-  'link_title' => 'Date API',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:42:"Settings for modules the use the Date API.";}}',
-  'module' => 'system',
+  'menu_name' => 'navigation',
+  'mlid' => '484',
+  'plid' => '0',
+  'link_path' => 'node/2',
+  'router_path' => 'node/%',
+  'link_title' => 'The thing about Deep Space 9',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '354',
+  'weight' => '9',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '484',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31627,22 +34312,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '355',
-  'plid' => '6',
-  'link_path' => 'node/add/forum',
-  'router_path' => 'node/add/forum',
-  'link_title' => 'Forum topic',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:69:"A <em>forum topic</em> starts a new discussion thread within a forum.";}}',
-  'module' => 'system',
+  'mlid' => '485',
+  'plid' => '0',
+  'link_path' => 'node/3',
+  'router_path' => 'node/%',
+  'link_title' => 'is - The thing about Deep Space 9',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '6',
-  'p2' => '355',
+  'weight' => '10',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '485',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31655,24 +34340,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '356',
-  'plid' => '20',
-  'link_path' => 'admin/structure/forum',
-  'router_path' => 'admin/structure/forum',
-  'link_title' => 'Forums',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"Control forum hierarchy settings.";}}',
-  'module' => 'system',
+  'menu_name' => 'navigation',
+  'mlid' => '486',
+  'plid' => '0',
+  'link_path' => 'node/4',
+  'router_path' => 'node/%',
+  'link_title' => 'is - The thing about Firefly',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
+  'module' => 'menu',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '356',
+  'weight' => '11',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '486',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31685,22 +34370,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '358',
-  'plid' => '5',
-  'link_path' => 'node/%/outline',
-  'router_path' => 'node/%/outline',
-  'link_title' => 'Outline',
-  'options' => 'a:0:{}',
-  'module' => 'system',
-  'hidden' => '-1',
+  'mlid' => '487',
+  'plid' => '0',
+  'link_path' => 'node/5',
+  'router_path' => 'node/%',
+  'link_title' => 'en - The thing about Firefly',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
+  'module' => 'menu',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '2',
-  'customized' => '0',
-  'p1' => '5',
-  'p2' => '358',
+  'weight' => '12',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '487',
+  'p2' => '0',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31714,24 +34399,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '359',
-  'plid' => '18',
-  'link_path' => 'admin/reports/hits',
-  'router_path' => 'admin/reports/hits',
-  'link_title' => 'Recent hits',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:43:"View pages that have recently been visited.";}}',
+  'mlid' => '491',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/entity_translation',
+  'router_path' => 'admin/config/regional/entity_translation',
+  'link_title' => 'Entity translation',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:83:"Configure which entities can be translated and enable or disable language fallback.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '359',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '491',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -31742,24 +34427,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '360',
-  'plid' => '18',
-  'link_path' => 'admin/reports/pages',
-  'router_path' => 'admin/reports/pages',
-  'link_title' => 'Top pages',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:41:"View pages that have been hit frequently.";}}',
-  'module' => 'system',
+  'menu_name' => 'menu-test-menu',
+  'mlid' => '700',
+  'plid' => '0',
+  'link_path' => 'http://yahoo.com',
+  'router_path' => '',
+  'link_title' => 'fr - Yahoo',
+  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:16:"fr - description";}s:5:"alter";b:1;}',
+  'module' => 'menu',
   'hidden' => '0',
-  'external' => '0',
+  'external' => '1',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '18',
-  'p3' => '360',
+  'weight' => '0',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '468',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31767,28 +34452,28 @@
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
+  'language' => 'fr',
+  'i18n_tsid' => '1',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '361',
-  'plid' => '18',
-  'link_path' => 'admin/reports/referrers',
-  'router_path' => 'admin/reports/referrers',
-  'link_title' => 'Top referrers',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:19:"View top referrers.";}}',
-  'module' => 'system',
+  'menu_name' => 'menu-test-menu',
+  'mlid' => '701',
+  'plid' => '0',
+  'link_path' => 'http://yahoo.com',
+  'router_path' => '',
+  'link_title' => 'is - Yahoo',
+  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:16:"is - description";}s:5:"alter";b:1;}',
+  'module' => 'menu',
   'hidden' => '0',
-  'external' => '0',
+  'external' => '1',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
-  'customized' => '0',
-  'p1' => '1',
-  'p2' => '18',
-  'p3' => '361',
+  'depth' => '1',
+  'customized' => '1',
+  'p1' => '468',
+  'p2' => '0',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31796,28 +34481,28 @@
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'und',
-  'i18n_tsid' => '0',
+  'language' => 'is',
+  'i18n_tsid' => '1',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '362',
-  'plid' => '18',
-  'link_path' => 'admin/reports/visitors',
-  'router_path' => 'admin/reports/visitors',
-  'link_title' => 'Top visitors',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"View visitors that hit many pages.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '702',
+  'plid' => '6',
+  'link_path' => 'node/add/et',
+  'router_path' => 'node/add/et',
+  'link_title' => 'Entity translation test',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:23:"Entity translation test";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '3',
+  'weight' => '0',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '18',
-  'p3' => '362',
+  'p1' => '6',
+  'p2' => '702',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31830,22 +34515,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '363',
-  'plid' => '5',
-  'link_path' => 'node/%/track',
-  'router_path' => 'node/%/track',
-  'link_title' => 'Track',
+  'mlid' => '703',
+  'plid' => '6',
+  'link_path' => 'node/add/a-thirty-two-character-type-name',
+  'router_path' => 'node/add/a-thirty-two-character-type-name',
+  'link_title' => 'Test long name',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
+  'weight' => '0',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '363',
+  'p1' => '6',
+  'p2' => '703',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31859,22 +34544,22 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '364',
-  'plid' => '16',
-  'link_path' => 'user/%/track',
-  'router_path' => 'user/%/track',
-  'link_title' => 'Track',
+  'mlid' => '704',
+  'plid' => '3',
+  'link_path' => 'comment/%/translate',
+  'router_path' => 'comment/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '1',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '364',
+  'p1' => '3',
+  'p2' => '704',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31888,10 +34573,10 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '365',
-  'plid' => '5',
-  'link_path' => 'node/%/translate',
-  'router_path' => 'node/%/translate',
+  'mlid' => '705',
+  'plid' => '16',
+  'link_path' => 'user/%/translate',
+  'router_path' => 'user/%/translate',
   'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
@@ -31899,11 +34584,11 @@
   'external' => '0',
   'has_children' => '1',
   'expanded' => '0',
-  'weight' => '1',
+  'weight' => '2',
   'depth' => '2',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '365',
+  'p1' => '16',
+  'p2' => '705',
   'p3' => '0',
   'p4' => '0',
   'p5' => '0',
@@ -31917,14 +34602,14 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '366',
-  'plid' => '20',
-  'link_path' => 'admin/structure/trigger',
-  'router_path' => 'admin/structure/trigger',
-  'link_title' => 'Triggers',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"Configure when to execute actions.";}}',
+  'mlid' => '706',
+  'plid' => '175',
+  'link_path' => 'admin/help/i18n',
+  'router_path' => 'admin/help/i18n',
+  'link_title' => 'i18n',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
@@ -31932,8 +34617,8 @@
   'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '366',
+  'p2' => '175',
+  'p3' => '706',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31946,11 +34631,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '369',
+  'mlid' => '707',
   'plid' => '175',
-  'link_path' => 'admin/help/aggregator',
-  'router_path' => 'admin/help/aggregator',
-  'link_title' => 'aggregator',
+  'link_path' => 'admin/help/i18n_block',
+  'router_path' => 'admin/help/i18n_block',
+  'link_title' => 'i18n_block',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -31962,7 +34647,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '369',
+  'p3' => '707',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -31975,11 +34660,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '370',
+  'mlid' => '708',
   'plid' => '175',
-  'link_path' => 'admin/help/blog',
-  'router_path' => 'admin/help/blog',
-  'link_title' => 'blog',
+  'link_path' => 'admin/help/i18n_menu',
+  'router_path' => 'admin/help/i18n_menu',
+  'link_title' => 'i18n_menu',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -31991,7 +34676,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '370',
+  'p3' => '708',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32004,11 +34689,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '371',
+  'mlid' => '709',
   'plid' => '175',
-  'link_path' => 'admin/help/book',
-  'router_path' => 'admin/help/book',
-  'link_title' => 'book',
+  'link_path' => 'admin/help/i18n_string',
+  'router_path' => 'admin/help/i18n_string',
+  'link_title' => 'i18n_string',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32020,7 +34705,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '371',
+  'p3' => '709',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32033,11 +34718,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '372',
+  'mlid' => '710',
   'plid' => '175',
-  'link_path' => 'admin/help/contact',
-  'router_path' => 'admin/help/contact',
-  'link_title' => 'contact',
+  'link_path' => 'admin/help/i18n_sync',
+  'router_path' => 'admin/help/i18n_sync',
+  'link_title' => 'i18n_sync',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32049,7 +34734,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '372',
+  'p3' => '710',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32062,11 +34747,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '373',
+  'mlid' => '711',
   'plid' => '175',
-  'link_path' => 'admin/help/date',
-  'router_path' => 'admin/help/date',
-  'link_title' => 'date',
+  'link_path' => 'admin/help/i18n_taxonomy',
+  'router_path' => 'admin/help/i18n_taxonomy',
+  'link_title' => 'i18n_taxonomy',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32078,7 +34763,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '373',
+  'p3' => '711',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32091,11 +34776,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '374',
+  'mlid' => '712',
   'plid' => '175',
-  'link_path' => 'admin/help/forum',
-  'router_path' => 'admin/help/forum',
-  'link_title' => 'forum',
+  'link_path' => 'admin/help/link',
+  'router_path' => 'admin/help/link',
+  'link_title' => 'link',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32107,7 +34792,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '374',
+  'p3' => '712',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32120,11 +34805,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '375',
+  'mlid' => '713',
   'plid' => '175',
-  'link_path' => 'admin/help/locale',
-  'router_path' => 'admin/help/locale',
-  'link_title' => 'locale',
+  'link_path' => 'admin/help/title',
+  'router_path' => 'admin/help/title',
+  'link_title' => 'title',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32136,7 +34821,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '375',
+  'p3' => '713',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32148,12 +34833,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '377',
-  'plid' => '175',
-  'link_path' => 'admin/help/simpletest',
-  'router_path' => 'admin/help/simpletest',
-  'link_title' => 'simpletest',
+  'menu_name' => 'navigation',
+  'mlid' => '714',
+  'plid' => '25',
+  'link_path' => 'comment/%/edit/%',
+  'router_path' => 'comment/%/edit/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32163,9 +34848,9 @@
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '377',
+  'p1' => '3',
+  'p2' => '25',
+  'p3' => '714',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32177,12 +34862,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '378',
-  'plid' => '175',
-  'link_path' => 'admin/help/statistics',
-  'router_path' => 'admin/help/statistics',
-  'link_title' => 'statistics',
+  'menu_name' => 'navigation',
+  'mlid' => '715',
+  'plid' => '38',
+  'link_path' => 'user/%/edit/%',
+  'router_path' => 'user/%/edit/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32192,9 +34877,9 @@
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '378',
+  'p1' => '16',
+  'p2' => '38',
+  'p3' => '715',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32207,24 +34892,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '379',
-  'plid' => '175',
-  'link_path' => 'admin/help/syslog',
-  'router_path' => 'admin/help/syslog',
-  'link_title' => 'syslog',
-  'options' => 'a:0:{}',
+  'mlid' => '716',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/i18n',
+  'router_path' => 'admin/config/regional/i18n',
+  'link_title' => 'Multilingual settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:69:"Configure extended options for multilingual content and translations.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '379',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '716',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32236,24 +34921,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '380',
-  'plid' => '175',
-  'link_path' => 'admin/help/tracker',
-  'router_path' => 'admin/help/tracker',
-  'link_title' => 'tracker',
-  'options' => 'a:0:{}',
+  'mlid' => '717',
+  'plid' => '33',
+  'link_path' => 'admin/config/content/title',
+  'router_path' => 'admin/config/content/title',
+  'link_title' => 'Title settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:30:"Settings for the Title module.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '380',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '33',
+  'p4' => '717',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32264,24 +34949,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '381',
-  'plid' => '175',
-  'link_path' => 'admin/help/translation',
-  'router_path' => 'admin/help/translation',
-  'link_title' => 'translation',
+  'menu_name' => 'navigation',
+  'mlid' => '718',
+  'plid' => '176',
+  'link_path' => 'taxonomy/term/%/translate',
+  'router_path' => 'taxonomy/term/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '11',
+  'depth' => '2',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '175',
-  'p3' => '381',
+  'p1' => '176',
+  'p2' => '718',
+  'p3' => '0',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32294,24 +34979,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '382',
-  'plid' => '175',
-  'link_path' => 'admin/help/trigger',
-  'router_path' => 'admin/help/trigger',
-  'link_title' => 'trigger',
-  'options' => 'a:0:{}',
+  'mlid' => '719',
+  'plid' => '48',
+  'link_path' => 'admin/config/regional/i18n_translation',
+  'router_path' => 'admin/config/regional/i18n_translation',
+  'link_title' => 'Translation sets',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:26:"Translation sets overview.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '10',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '175',
-  'p3' => '382',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '719',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32323,11 +35008,11 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '383',
-  'plid' => '347',
-  'link_path' => 'aggregator/categories/%/categorize',
-  'router_path' => 'aggregator/categories/%/categorize',
-  'link_title' => 'Categorize',
+  'mlid' => '720',
+  'plid' => '39',
+  'link_path' => 'node/%/edit/%',
+  'router_path' => 'node/%/edit/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32335,12 +35020,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '342',
-  'p3' => '347',
-  'p4' => '383',
+  'p1' => '5',
+  'p2' => '39',
+  'p3' => '720',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32352,24 +35037,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '384',
-  'plid' => '348',
-  'link_path' => 'aggregator/sources/%/categorize',
-  'router_path' => 'aggregator/sources/%/categorize',
-  'link_title' => 'Categorize',
+  'mlid' => '721',
+  'plid' => '704',
+  'link_path' => 'comment/%/translate/delete/%',
+  'router_path' => 'comment/%/translate/delete/%',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '346',
-  'p3' => '348',
-  'p4' => '384',
+  'p1' => '3',
+  'p2' => '704',
+  'p3' => '721',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32381,24 +35066,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '385',
-  'plid' => '347',
-  'link_path' => 'aggregator/categories/%/configure',
-  'router_path' => 'aggregator/categories/%/configure',
-  'link_title' => 'Configure',
+  'mlid' => '722',
+  'plid' => '365',
+  'link_path' => 'node/%/translate/delete/%',
+  'router_path' => 'node/%/translate/delete/%',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '342',
-  'p3' => '347',
-  'p4' => '385',
+  'p1' => '5',
+  'p2' => '365',
+  'p3' => '722',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32410,24 +35095,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '386',
-  'plid' => '348',
-  'link_path' => 'aggregator/sources/%/configure',
-  'router_path' => 'aggregator/sources/%/configure',
-  'link_title' => 'Configure',
+  'mlid' => '723',
+  'plid' => '705',
+  'link_path' => 'user/%/translate/delete/%',
+  'router_path' => 'user/%/translate/delete/%',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '346',
-  'p3' => '348',
-  'p4' => '386',
+  'p1' => '16',
+  'p2' => '705',
+  'p3' => '723',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32439,24 +35124,24 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '387',
-  'plid' => '347',
-  'link_path' => 'aggregator/categories/%/view',
-  'router_path' => 'aggregator/categories/%/view',
-  'link_title' => 'View',
+  'mlid' => '724',
+  'plid' => '210',
+  'link_path' => 'taxonomy/term/%/edit/%',
+  'router_path' => 'taxonomy/term/%/edit/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '10',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '342',
-  'p3' => '347',
-  'p4' => '387',
+  'p1' => '176',
+  'p2' => '210',
+  'p3' => '724',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32467,26 +35152,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '388',
-  'plid' => '348',
-  'link_path' => 'aggregator/sources/%/view',
-  'router_path' => 'aggregator/sources/%/view',
-  'link_title' => 'View',
-  'options' => 'a:0:{}',
+  'menu_name' => 'management',
+  'mlid' => '725',
+  'plid' => '716',
+  'link_path' => 'admin/config/regional/i18n/configure',
+  'router_path' => 'admin/config/regional/i18n/configure',
+  'link_title' => 'Multilingual system',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:69:"Configure extended options for multilingual content and translations.";}}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '338',
-  'p2' => '346',
-  'p3' => '348',
-  'p4' => '388',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '716',
+  'p5' => '725',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32497,25 +35182,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '389',
-  'plid' => '353',
-  'link_path' => 'admin/structure/contact/add',
-  'router_path' => 'admin/structure/contact/add',
-  'link_title' => 'Add category',
-  'options' => 'a:0:{}',
+  'mlid' => '726',
+  'plid' => '716',
+  'link_path' => 'admin/config/regional/i18n/strings',
+  'router_path' => 'admin/config/regional/i18n/strings',
+  'link_title' => 'Strings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"Options for user defined strings.";}}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '1',
-  'depth' => '4',
+  'weight' => '20',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '353',
-  'p4' => '389',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '716',
+  'p5' => '726',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32526,25 +35211,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '391',
-  'plid' => '18',
-  'link_path' => 'admin/reports/access/%',
-  'router_path' => 'admin/reports/access/%',
-  'link_title' => 'Details',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:16:"View access log.";}}',
+  'mlid' => '727',
+  'plid' => '413',
+  'link_path' => 'admin/config/regional/translate/i18n_string',
+  'router_path' => 'admin/config/regional/translate/i18n_string',
+  'link_title' => 'Strings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:29:"Refresh user defined strings.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
+  'weight' => '20',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '18',
-  'p3' => '391',
-  'p4' => '0',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '413',
+  'p5' => '727',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32555,25 +35240,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '392',
-  'plid' => '33',
-  'link_path' => 'admin/config/content/email',
-  'router_path' => 'admin/config/content/email',
-  'link_title' => 'Email Contact Form Settings',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:57:"Administer flood control settings for email contact forms";}}',
+  'mlid' => '728',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/translate',
+  'router_path' => 'admin/structure/taxonomy/%/translate',
+  'link_title' => 'Translate',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '10',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '33',
-  'p4' => '392',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '728',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32584,25 +35269,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '393',
-  'plid' => '60',
-  'link_path' => 'admin/config/services/aggregator',
-  'router_path' => 'admin/config/services/aggregator',
-  'link_title' => 'Feed aggregator',
-  'options' => "a:1:{s:10:\"attributes\";a:1:{s:5:\"title\";s:116:\"Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.\";}}",
+  'mlid' => '729',
+  'plid' => '719',
+  'link_path' => 'admin/config/regional/i18n_translation/configure',
+  'router_path' => 'admin/config/regional/i18n_translation/configure',
+  'link_title' => 'Translation sets',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Overview of existing translation sets.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '0',
+  'p3' => '48',
+  'p4' => '719',
+  'p5' => '729',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32613,24 +35298,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '395',
-  'plid' => '48',
-  'link_path' => 'admin/config/regional/language',
-  'router_path' => 'admin/config/regional/language',
-  'link_title' => 'Languages',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:55:"Configure languages for content and the user interface.";}}',
+  'mlid' => '730',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/manage/translation',
+  'router_path' => 'admin/structure/menu/manage/translation',
+  'link_title' => 'Translation sets',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
+  'weight' => '10',
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '730',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32642,25 +35327,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '396',
-  'plid' => '351',
-  'link_path' => 'admin/content/book/list',
-  'router_path' => 'admin/content/book/list',
-  'link_title' => 'List',
-  'options' => 'a:0:{}',
+  'mlid' => '731',
+  'plid' => '716',
+  'link_path' => 'admin/config/regional/i18n/variable',
+  'router_path' => 'admin/config/regional/i18n/variable',
+  'link_title' => 'Variables',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:33:"Configure multilingual variables.";}}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '9',
-  'p3' => '351',
-  'p4' => '396',
-  'p5' => '0',
+  'p2' => '8',
+  'p3' => '48',
+  'p4' => '716',
+  'p5' => '731',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32670,25 +35355,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '398',
-  'plid' => '356',
-  'link_path' => 'admin/structure/forum/list',
-  'router_path' => 'admin/structure/forum/list',
-  'link_title' => 'List',
+  'menu_name' => 'navigation',
+  'mlid' => '732',
+  'plid' => '25',
+  'link_path' => 'comment/%/edit/add/%/%',
+  'router_path' => 'comment/%/edit/add/%/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '356',
-  'p4' => '398',
+  'p1' => '3',
+  'p2' => '25',
+  'p3' => '732',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32700,23 +35385,23 @@
 ))
 ->values(array(
   'menu_name' => 'navigation',
-  'mlid' => '399',
-  'plid' => '358',
-  'link_path' => 'node/%/outline/remove',
-  'router_path' => 'node/%/outline/remove',
-  'link_title' => 'Remove from outline',
+  'mlid' => '733',
+  'plid' => '38',
+  'link_path' => 'user/%/edit/add/%/%',
+  'router_path' => 'user/%/edit/add/%/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '5',
-  'p2' => '358',
-  'p3' => '399',
+  'p1' => '16',
+  'p2' => '38',
+  'p3' => '733',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -32729,25 +35414,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '400',
-  'plid' => '351',
-  'link_path' => 'admin/content/book/settings',
-  'router_path' => 'admin/content/book/settings',
-  'link_title' => 'Settings',
+  'mlid' => '734',
+  'plid' => '730',
+  'link_path' => 'admin/structure/menu/manage/translation/add',
+  'router_path' => 'admin/structure/menu/manage/translation/add',
+  'link_title' => 'Add translation',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '8',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '9',
-  'p3' => '351',
-  'p4' => '400',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '730',
+  'p5' => '734',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32758,24 +35443,53 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '402',
-  'plid' => '53',
-  'link_path' => 'admin/config/system/statistics',
-  'router_path' => 'admin/config/system/statistics',
-  'link_title' => 'Statistics',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:68:"Control details about what and how your site logs access statistics.";}}',
+  'mlid' => '735',
+  'plid' => '491',
+  'link_path' => 'admin/config/regional/entity_translation/translatable/%',
+  'router_path' => 'admin/config/regional/entity_translation/translatable/%',
+  'link_title' => 'Confirm change in translatability.',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:53:"Confirmation page for changing field translatability.";}}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-15',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '53',
-  'p4' => '402',
+  'p3' => '48',
+  'p4' => '491',
+  'p5' => '735',
+  'p6' => '0',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'navigation',
+  'mlid' => '736',
+  'plid' => '718',
+  'link_path' => 'taxonomy/term/%/translate/delete/%',
+  'router_path' => 'taxonomy/term/%/translate/delete/%',
+  'link_title' => 'Delete',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '0',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '176',
+  'p2' => '718',
+  'p3' => '736',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32786,12 +35500,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '405',
-  'plid' => '366',
-  'link_path' => 'admin/structure/trigger/comment',
-  'router_path' => 'admin/structure/trigger/comment',
-  'link_title' => 'Comment',
+  'menu_name' => 'navigation',
+  'mlid' => '737',
+  'plid' => '39',
+  'link_path' => 'node/%/edit/add/%/%',
+  'router_path' => 'node/%/edit/add/%/%',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32799,12 +35513,12 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '20',
-  'p3' => '366',
-  'p4' => '405',
+  'p1' => '5',
+  'p2' => '39',
+  'p3' => '737',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32816,25 +35530,54 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '407',
-  'plid' => '366',
-  'link_path' => 'admin/structure/trigger/node',
-  'router_path' => 'admin/structure/trigger/node',
-  'link_title' => 'Node',
+  'mlid' => '738',
+  'plid' => '226',
+  'link_path' => 'admin/structure/taxonomy/%/list/list',
+  'router_path' => 'admin/structure/taxonomy/%/list/list',
+  'link_title' => 'Terms',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '-20',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '366',
-  'p4' => '407',
-  'p5' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '226',
+  'p6' => '738',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '739',
+  'plid' => '113',
+  'link_path' => 'admin/structure/menu/manage/%/translate',
+  'router_path' => 'admin/structure/menu/manage/%/translate',
+  'link_title' => 'Translate',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '10',
+  'depth' => '5',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '44',
+  'p4' => '113',
+  'p5' => '739',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32845,24 +35588,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '408',
-  'plid' => '366',
-  'link_path' => 'admin/structure/trigger/system',
-  'router_path' => 'admin/structure/trigger/system',
-  'link_title' => 'System',
+  'mlid' => '740',
+  'plid' => '44',
+  'link_path' => 'admin/structure/menu/item/%/translate',
+  'router_path' => 'admin/structure/menu/item/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '10',
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '366',
-  'p4' => '408',
+  'p3' => '44',
+  'p4' => '740',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32874,11 +35617,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '409',
-  'plid' => '366',
-  'link_path' => 'admin/structure/trigger/taxonomy',
-  'router_path' => 'admin/structure/trigger/taxonomy',
-  'link_title' => 'Taxonomy',
+  'mlid' => '741',
+  'plid' => '226',
+  'link_path' => 'admin/structure/taxonomy/%/list/sets',
+  'router_path' => 'admin/structure/taxonomy/%/list/sets',
+  'link_title' => 'Translation sets',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32886,14 +35629,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '366',
-  'p4' => '409',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '226',
+  'p6' => '741',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -32902,25 +35645,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'management',
-  'mlid' => '410',
-  'plid' => '37',
-  'link_path' => 'admin/config/development/testing',
-  'router_path' => 'admin/config/development/testing',
-  'link_title' => 'Testing',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:122:"Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.";}}',
+  'menu_name' => 'navigation',
+  'mlid' => '742',
+  'plid' => '210',
+  'link_path' => 'taxonomy/term/%/edit/add/%/%',
+  'router_path' => 'taxonomy/term/%/edit/add/%/%',
+  'link_title' => 'Edit',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-5',
-  'depth' => '4',
+  'weight' => '10',
+  'depth' => '3',
   'customized' => '0',
-  'p1' => '1',
-  'p2' => '8',
-  'p3' => '37',
-  'p4' => '410',
+  'p1' => '176',
+  'p2' => '210',
+  'p3' => '742',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -32931,12 +35674,12 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '411',
-  'plid' => '364',
-  'link_path' => 'user/%/track/content',
-  'router_path' => 'user/%/track/content',
-  'link_title' => 'Track content',
+  'menu_name' => 'management',
+  'mlid' => '743',
+  'plid' => '741',
+  'link_path' => 'admin/structure/taxonomy/%/list/sets/add',
+  'router_path' => 'admin/structure/taxonomy/%/list/sets/add',
+  'link_title' => 'Create new translation',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -32944,15 +35687,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '3',
+  'depth' => '7',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '364',
-  'p3' => '411',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '226',
+  'p6' => '741',
+  'p7' => '743',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -32960,26 +35703,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '412',
-  'plid' => '364',
-  'link_path' => 'user/%/track/navigation',
-  'router_path' => 'user/%/track/navigation',
-  'link_title' => 'Track page visits',
+  'menu_name' => 'management',
+  'mlid' => '744',
+  'plid' => '146',
+  'link_path' => 'admin/structure/block/manage/%/%/translate',
+  'router_path' => 'admin/structure/block/manage/%/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '2',
-  'depth' => '3',
+  'weight' => '10',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '16',
-  'p2' => '364',
-  'p3' => '412',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '28',
+  'p4' => '146',
+  'p5' => '744',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -32990,25 +35733,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '413',
-  'plid' => '48',
-  'link_path' => 'admin/config/regional/translate',
-  'router_path' => 'admin/config/regional/translate',
-  'link_title' => 'Translate interface',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:59:"Translate the built in interface and optionally other text.";}}',
+  'mlid' => '745',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/fields/replace/%',
+  'router_path' => 'admin/structure/taxonomy/%/fields/replace/%',
+  'link_title' => 'Replace fields',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-5',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '745',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33019,25 +35762,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '414',
-  'plid' => '366',
-  'link_path' => 'admin/structure/trigger/unassign',
-  'router_path' => 'admin/structure/trigger/unassign',
-  'link_title' => 'Unassign',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"Unassign an action from a trigger.";}}',
+  'mlid' => '746',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/fields/replace/%',
+  'router_path' => 'admin/structure/types/manage/%/fields/replace/%',
+  'link_title' => 'Replace fields',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '366',
-  'p4' => '414',
-  'p5' => '0',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '746',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33048,26 +35791,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '416',
-  'plid' => '366',
-  'link_path' => 'admin/structure/trigger/user',
-  'router_path' => 'admin/structure/trigger/user',
-  'link_title' => 'User',
+  'mlid' => '747',
+  'plid' => '162',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/replace/%',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/replace/%',
+  'link_title' => 'Replace fields',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '366',
-  'p4' => '416',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '747',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33077,24 +35820,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '417',
-  'plid' => '356',
-  'link_path' => 'admin/structure/forum/settings',
-  'router_path' => 'admin/structure/forum/settings',
-  'link_title' => 'Settings',
+  'mlid' => '921',
+  'plid' => '175',
+  'link_path' => 'admin/help/references',
+  'router_path' => 'admin/help/references',
+  'link_title' => 'references',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '4',
+  'weight' => '0',
+  'depth' => '3',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '356',
-  'p4' => '417',
+  'p2' => '175',
+  'p3' => '921',
+  'p4' => '0',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -33106,25 +35849,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '418',
-  'plid' => '395',
-  'link_path' => 'admin/config/regional/language/add',
-  'router_path' => 'admin/config/regional/language/add',
-  'link_title' => 'Add language',
-  'options' => 'a:0:{}',
+  'mlid' => '922',
+  'plid' => '33',
+  'link_path' => 'admin/config/content/link',
+  'router_path' => 'admin/config/content/link',
+  'link_title' => 'Link settings',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:29:"Settings for the link module.";}}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '4',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '418',
+  'p3' => '33',
+  'p4' => '922',
+  'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33135,25 +35878,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '421',
-  'plid' => '353',
-  'link_path' => 'admin/structure/contact/delete/%',
-  'router_path' => 'admin/structure/contact/delete/%',
-  'link_title' => 'Delete contact',
+  'mlid' => '923',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/display',
+  'router_path' => 'admin/structure/taxonomy/%/display',
+  'link_title' => 'Manage display',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '2',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '353',
-  'p4' => '421',
-  'p5' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '923',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33164,25 +35907,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '422',
-  'plid' => '395',
-  'link_path' => 'admin/config/regional/language/configure',
-  'router_path' => 'admin/config/regional/language/configure',
-  'link_title' => 'Detection and selection',
+  'mlid' => '924',
+  'plid' => '66',
+  'link_path' => 'admin/config/people/accounts/display',
+  'router_path' => 'admin/config/people/accounts/display',
+  'link_title' => 'Manage display',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
+  'weight' => '2',
   'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '422',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '924',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33193,25 +35936,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '423',
-  'plid' => '353',
-  'link_path' => 'admin/structure/contact/edit/%',
-  'router_path' => 'admin/structure/contact/edit/%',
-  'link_title' => 'Edit contact category',
+  'mlid' => '925',
+  'plid' => '212',
+  'link_path' => 'admin/structure/taxonomy/%/fields',
+  'router_path' => 'admin/structure/taxonomy/%/fields',
+  'link_title' => 'Manage fields',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '1',
+  'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '353',
-  'p4' => '423',
-  'p5' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33222,25 +35965,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '424',
-  'plid' => '413',
-  'link_path' => 'admin/config/regional/translate/export',
-  'router_path' => 'admin/config/regional/translate/export',
-  'link_title' => 'Export',
+  'mlid' => '926',
+  'plid' => '66',
+  'link_path' => 'admin/config/people/accounts/fields',
+  'router_path' => 'admin/config/people/accounts/fields',
+  'link_title' => 'Manage fields',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '30',
+  'weight' => '1',
   'depth' => '5',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '424',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33251,26 +35994,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '425',
-  'plid' => '413',
-  'link_path' => 'admin/config/regional/translate/import',
-  'router_path' => 'admin/config/regional/translate/import',
-  'link_title' => 'Import',
+  'mlid' => '927',
+  'plid' => '923',
+  'link_path' => 'admin/structure/taxonomy/%/display/default',
+  'router_path' => 'admin/structure/taxonomy/%/display/default',
+  'link_title' => 'Default',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '20',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '425',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '923',
+  'p6' => '927',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33280,11 +36023,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '426',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/list',
-  'router_path' => 'admin/config/services/aggregator/list',
-  'link_title' => 'List',
+  'mlid' => '928',
+  'plid' => '924',
+  'link_path' => 'admin/config/people/accounts/display/default',
+  'router_path' => 'admin/config/people/accounts/display/default',
+  'link_title' => 'Default',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -33292,14 +36035,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '-10',
-  'depth' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '426',
-  'p6' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '924',
+  'p6' => '928',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33309,25 +36052,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '427',
-  'plid' => '395',
-  'link_path' => 'admin/config/regional/language/overview',
-  'router_path' => 'admin/config/regional/language/overview',
-  'link_title' => 'List',
+  'mlid' => '929',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/display',
+  'router_path' => 'admin/structure/types/manage/%/display',
+  'link_title' => 'Manage display',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '2',
   'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '427',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33338,25 +36081,25 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '428',
-  'plid' => '410',
-  'link_path' => 'admin/config/development/testing/list',
-  'router_path' => 'admin/config/development/testing/list',
-  'link_title' => 'List',
+  'mlid' => '930',
+  'plid' => '114',
+  'link_path' => 'admin/structure/types/manage/%/fields',
+  'router_path' => 'admin/structure/types/manage/%/fields',
+  'link_title' => 'Manage fields',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
+  'weight' => '1',
   'depth' => '5',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '37',
-  'p4' => '410',
-  'p5' => '428',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '930',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -33367,26 +36110,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '429',
-  'plid' => '74',
-  'link_path' => 'admin/config/regional/date-time/locale',
-  'router_path' => 'admin/config/regional/date-time/locale',
-  'link_title' => 'Localize',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Configure date formats for each locale";}}',
+  'mlid' => '931',
+  'plid' => '923',
+  'link_path' => 'admin/structure/taxonomy/%/display/full',
+  'router_path' => 'admin/structure/taxonomy/%/display/full',
+  'link_title' => 'Taxonomy term page',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-8',
-  'depth' => '5',
+  'weight' => '0',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '429',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '923',
+  'p6' => '931',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33396,11 +36139,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '430',
-  'plid' => '413',
-  'link_path' => 'admin/config/regional/translate/overview',
-  'router_path' => 'admin/config/regional/translate/overview',
-  'link_title' => 'Overview',
+  'mlid' => '932',
+  'plid' => '924',
+  'link_path' => 'admin/config/people/accounts/display/full',
+  'router_path' => 'admin/config/people/accounts/display/full',
+  'link_title' => 'User account',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -33408,14 +36151,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '430',
-  'p6' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '924',
+  'p6' => '932',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33425,26 +36168,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '431',
-  'plid' => '410',
-  'link_path' => 'admin/config/development/testing/settings',
-  'router_path' => 'admin/config/development/testing/settings',
-  'link_title' => 'Settings',
+  'mlid' => '933',
+  'plid' => '925',
+  'link_path' => 'admin/structure/taxonomy/%/fields/%',
+  'router_path' => 'admin/structure/taxonomy/%/fields/%',
+  'link_title' => '',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '37',
-  'p4' => '410',
-  'p5' => '431',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
+  'p6' => '933',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33454,26 +36197,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '432',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/settings',
-  'router_path' => 'admin/config/services/aggregator/settings',
-  'link_title' => 'Settings',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:129:"Configure the behavior of the feed aggregator, including when to discard feed items and how to present feed items and categories.";}}',
+  'mlid' => '934',
+  'plid' => '926',
+  'link_path' => 'admin/config/people/accounts/fields/%',
+  'router_path' => 'admin/config/people/accounts/fields/%',
+  'link_title' => '',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '-1',
+  'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '432',
-  'p6' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
+  'p6' => '934',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33483,26 +36226,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '433',
-  'plid' => '413',
-  'link_path' => 'admin/config/regional/translate/translate',
-  'router_path' => 'admin/config/regional/translate/translate',
-  'link_title' => 'Translate',
+  'mlid' => '935',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/default',
+  'router_path' => 'admin/structure/types/manage/%/display/default',
+  'link_title' => 'Default',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '433',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '935',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33512,11 +36255,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '435',
-  'plid' => '356',
-  'link_path' => 'admin/structure/forum/add/container',
-  'router_path' => 'admin/structure/forum/add/container',
-  'link_title' => 'Add container',
+  'mlid' => '936',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/full',
+  'router_path' => 'admin/structure/types/manage/%/display/full',
+  'link_title' => 'Full content',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -33524,14 +36267,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '356',
-  'p4' => '435',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '936',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33541,26 +36284,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '436',
-  'plid' => '356',
-  'link_path' => 'admin/structure/forum/add/forum',
-  'router_path' => 'admin/structure/forum/add/forum',
-  'link_title' => 'Add forum',
+  'mlid' => '937',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/print',
+  'router_path' => 'admin/structure/types/manage/%/display/print',
+  'link_title' => 'Print',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '356',
-  'p4' => '436',
-  'p5' => '0',
-  'p6' => '0',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '937',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33570,26 +36313,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '437',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/add/category',
-  'router_path' => 'admin/config/services/aggregator/add/category',
-  'link_title' => 'Add category',
+  'mlid' => '938',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/rss',
+  'router_path' => 'admin/structure/types/manage/%/display/rss',
+  'link_title' => 'RSS',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '2',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '437',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '938',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33599,26 +36342,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '438',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/add/feed',
-  'router_path' => 'admin/config/services/aggregator/add/feed',
-  'link_title' => 'Add feed',
+  'mlid' => '939',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/search_index',
+  'router_path' => 'admin/structure/types/manage/%/display/search_index',
+  'link_title' => 'Search index',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '3',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '438',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '939',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33628,26 +36371,55 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '440',
-  'plid' => '395',
-  'link_path' => 'admin/config/regional/language/delete/%',
-  'router_path' => 'admin/config/regional/language/delete/%',
-  'link_title' => 'Confirm',
+  'mlid' => '940',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/search_result',
+  'router_path' => 'admin/structure/types/manage/%/display/search_result',
+  'link_title' => 'Search result highlighting input',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
+  'has_children' => '0',
+  'expanded' => '0',
+  'weight' => '4',
+  'depth' => '6',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '940',
+  'p7' => '0',
+  'p8' => '0',
+  'p9' => '0',
+  'updated' => '0',
+  'language' => 'und',
+  'i18n_tsid' => '0',
+))
+->values(array(
+  'menu_name' => 'management',
+  'mlid' => '941',
+  'plid' => '929',
+  'link_path' => 'admin/structure/types/manage/%/display/teaser',
+  'router_path' => 'admin/structure/types/manage/%/display/teaser',
+  'link_title' => 'Teaser',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '1',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '440',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '929',
+  'p6' => '941',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33657,11 +36429,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '441',
-  'plid' => '413',
-  'link_path' => 'admin/config/regional/translate/delete/%',
-  'router_path' => 'admin/config/regional/translate/delete/%',
-  'link_title' => 'Delete string',
+  'mlid' => '942',
+  'plid' => '930',
+  'link_path' => 'admin/structure/types/manage/%/fields/%',
+  'router_path' => 'admin/structure/types/manage/%/fields/%',
+  'link_title' => '',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
@@ -33669,14 +36441,14 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '441',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '930',
+  'p6' => '942',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -33686,27 +36458,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '442',
-  'plid' => '356',
-  'link_path' => 'admin/structure/forum/edit/container/%',
-  'router_path' => 'admin/structure/forum/edit/container/%',
-  'link_title' => 'Edit container',
+  'mlid' => '943',
+  'plid' => '933',
+  'link_path' => 'admin/structure/taxonomy/%/fields/%/delete',
+  'router_path' => 'admin/structure/taxonomy/%/fields/%/delete',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '4',
+  'weight' => '10',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '356',
-  'p4' => '442',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
+  'p6' => '933',
+  'p7' => '943',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33715,27 +36487,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '443',
-  'plid' => '356',
-  'link_path' => 'admin/structure/forum/edit/forum/%',
-  'router_path' => 'admin/structure/forum/edit/forum/%',
-  'link_title' => 'Edit forum',
+  'mlid' => '944',
+  'plid' => '933',
+  'link_path' => 'admin/structure/taxonomy/%/fields/%/edit',
+  'router_path' => 'admin/structure/taxonomy/%/fields/%/edit',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '356',
-  'p4' => '443',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
+  'p6' => '933',
+  'p7' => '944',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33744,27 +36516,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '444',
-  'plid' => '395',
-  'link_path' => 'admin/config/regional/language/edit/%',
-  'router_path' => 'admin/config/regional/language/edit/%',
-  'link_title' => 'Edit language',
+  'mlid' => '945',
+  'plid' => '933',
+  'link_path' => 'admin/structure/taxonomy/%/fields/%/field-settings',
+  'router_path' => 'admin/structure/taxonomy/%/fields/%/field-settings',
+  'link_title' => 'Field settings',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '444',
-  'p6' => '0',
-  'p7' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
+  'p6' => '933',
+  'p7' => '945',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33773,27 +36545,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '445',
-  'plid' => '413',
-  'link_path' => 'admin/config/regional/translate/edit/%',
-  'router_path' => 'admin/config/regional/translate/edit/%',
-  'link_title' => 'Edit string',
+  'mlid' => '946',
+  'plid' => '933',
+  'link_path' => 'admin/structure/taxonomy/%/fields/%/translate',
+  'router_path' => 'admin/structure/taxonomy/%/fields/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '413',
-  'p5' => '445',
-  'p6' => '0',
-  'p7' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
+  'p6' => '933',
+  'p7' => '946',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33802,11 +36574,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '447',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/add/opml',
-  'router_path' => 'admin/config/services/aggregator/add/opml',
-  'link_title' => 'Import OPML',
+  'mlid' => '947',
+  'plid' => '933',
+  'link_path' => 'admin/structure/taxonomy/%/fields/%/widget-type',
+  'router_path' => 'admin/structure/taxonomy/%/fields/%/widget-type',
+  'link_title' => 'Widget type',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -33814,15 +36586,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '447',
-  'p6' => '0',
-  'p7' => '0',
+  'p2' => '20',
+  'p3' => '180',
+  'p4' => '212',
+  'p5' => '925',
+  'p6' => '933',
+  'p7' => '947',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33831,27 +36603,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '448',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/remove/%',
-  'router_path' => 'admin/config/services/aggregator/remove/%',
-  'link_title' => 'Remove items',
+  'mlid' => '948',
+  'plid' => '934',
+  'link_path' => 'admin/config/people/accounts/fields/%/delete',
+  'router_path' => 'admin/config/people/accounts/fields/%/delete',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '10',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '448',
-  'p6' => '0',
-  'p7' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
+  'p6' => '934',
+  'p7' => '948',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33860,11 +36632,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '449',
-  'plid' => '422',
-  'link_path' => 'admin/config/regional/language/configure/session',
-  'router_path' => 'admin/config/regional/language/configure/session',
-  'link_title' => 'Session language detection configuration',
+  'mlid' => '949',
+  'plid' => '934',
+  'link_path' => 'admin/config/people/accounts/fields/%/edit',
+  'router_path' => 'admin/config/people/accounts/fields/%/edit',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -33872,15 +36644,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '422',
-  'p6' => '449',
-  'p7' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
+  'p6' => '934',
+  'p7' => '949',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33889,27 +36661,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '450',
-  'plid' => '410',
-  'link_path' => 'admin/config/development/testing/results/%',
-  'router_path' => 'admin/config/development/testing/results/%',
-  'link_title' => 'Test result',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:21:"View result of tests.";}}',
+  'mlid' => '950',
+  'plid' => '934',
+  'link_path' => 'admin/config/people/accounts/fields/%/field-settings',
+  'router_path' => 'admin/config/people/accounts/fields/%/field-settings',
+  'link_title' => 'Field settings',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '37',
-  'p4' => '410',
-  'p5' => '450',
-  'p6' => '0',
-  'p7' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
+  'p6' => '934',
+  'p7' => '950',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33918,11 +36690,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '451',
-  'plid' => '422',
-  'link_path' => 'admin/config/regional/language/configure/url',
-  'router_path' => 'admin/config/regional/language/configure/url',
-  'link_title' => 'URL language detection configuration',
+  'mlid' => '951',
+  'plid' => '934',
+  'link_path' => 'admin/config/people/accounts/fields/%/translate',
+  'router_path' => 'admin/config/people/accounts/fields/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -33930,15 +36702,15 @@
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '48',
-  'p4' => '395',
-  'p5' => '422',
-  'p6' => '451',
-  'p7' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
+  'p6' => '934',
+  'p7' => '951',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33947,27 +36719,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '452',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/update/%',
-  'router_path' => 'admin/config/services/aggregator/update/%',
-  'link_title' => 'Update items',
+  'mlid' => '952',
+  'plid' => '934',
+  'link_path' => 'admin/config/people/accounts/fields/%/widget-type',
+  'router_path' => 'admin/config/people/accounts/fields/%/widget-type',
+  'link_title' => 'Widget type',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '452',
-  'p6' => '0',
-  'p7' => '0',
+  'p3' => '45',
+  'p4' => '66',
+  'p5' => '926',
+  'p6' => '934',
+  'p7' => '952',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -33976,26 +36748,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '458',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/edit/category/%',
-  'router_path' => 'admin/config/services/aggregator/edit/category/%',
-  'link_title' => 'Edit category',
+  'mlid' => '953',
+  'plid' => '161',
+  'link_path' => 'admin/structure/types/manage/%/comment/display/default',
+  'router_path' => 'admin/structure/types/manage/%/comment/display/default',
+  'link_title' => 'Default',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '5',
+  'weight' => '-10',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '458',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '161',
+  'p6' => '953',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -34005,26 +36777,26 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '459',
-  'plid' => '393',
-  'link_path' => 'admin/config/services/aggregator/edit/feed/%',
-  'router_path' => 'admin/config/services/aggregator/edit/feed/%',
-  'link_title' => 'Edit feed',
+  'mlid' => '954',
+  'plid' => '161',
+  'link_path' => 'admin/structure/types/manage/%/comment/display/full',
+  'router_path' => 'admin/structure/types/manage/%/comment/display/full',
+  'link_title' => 'Full comment',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '5',
+  'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '60',
-  'p4' => '393',
-  'p5' => '459',
-  'p6' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '161',
+  'p6' => '954',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -34034,12 +36806,12 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '461',
-  'plid' => '429',
-  'link_path' => 'admin/config/regional/date-time/locale/%/edit',
-  'router_path' => 'admin/config/regional/date-time/locale/%/edit',
-  'link_title' => 'Localize date formats',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:38:"Configure date formats for each locale";}}',
+  'mlid' => '955',
+  'plid' => '162',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/%',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/%',
+  'link_title' => '',
+  'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '0',
   'external' => '0',
@@ -34049,11 +36821,11 @@
   'depth' => '6',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '429',
-  'p6' => '461',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '955',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
@@ -34063,27 +36835,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '462',
-  'plid' => '303',
-  'link_path' => 'admin/structure/types/manage/%/display/print',
-  'router_path' => 'admin/structure/types/manage/%/display/print',
-  'link_title' => 'Print',
+  'mlid' => '956',
+  'plid' => '942',
+  'link_path' => 'admin/structure/types/manage/%/fields/%/delete',
+  'router_path' => 'admin/structure/types/manage/%/fields/%/delete',
+  'link_title' => 'Delete',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '5',
-  'depth' => '6',
+  'weight' => '10',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
   'p3' => '34',
   'p4' => '114',
-  'p5' => '303',
-  'p6' => '462',
-  'p7' => '0',
+  'p5' => '930',
+  'p6' => '942',
+  'p7' => '956',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34092,27 +36864,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '463',
-  'plid' => '429',
-  'link_path' => 'admin/config/regional/date-time/locale/%/reset',
-  'router_path' => 'admin/config/regional/date-time/locale/%/reset',
-  'link_title' => 'Reset date formats',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:47:"Reset localized date formats to global defaults";}}',
+  'mlid' => '957',
+  'plid' => '942',
+  'link_path' => 'admin/structure/types/manage/%/fields/%/edit',
+  'router_path' => 'admin/structure/types/manage/%/fields/%/edit',
+  'link_title' => 'Edit',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '6',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '74',
-  'p5' => '429',
-  'p6' => '463',
-  'p7' => '0',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '930',
+  'p6' => '942',
+  'p7' => '957',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34120,28 +36892,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '465',
-  'plid' => '6',
-  'link_path' => 'node/add/test-content-type',
-  'router_path' => 'node/add/test-content-type',
-  'link_title' => 'Test content type',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:49:"This is the description of the test content type.";}}',
+  'menu_name' => 'management',
+  'mlid' => '958',
+  'plid' => '942',
+  'link_path' => 'admin/structure/types/manage/%/fields/%/field-settings',
+  'router_path' => 'admin/structure/types/manage/%/fields/%/field-settings',
+  'link_title' => 'Field settings',
+  'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '7',
   'customized' => '0',
-  'p1' => '6',
-  'p2' => '465',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '930',
+  'p6' => '942',
+  'p7' => '958',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34150,27 +36922,27 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '466',
-  'plid' => '44',
-  'link_path' => 'admin/structure/menu/manage/menu-test-menu',
-  'router_path' => 'admin/structure/menu/manage/%',
-  'link_title' => 'Test Menu',
+  'mlid' => '959',
+  'plid' => '942',
+  'link_path' => 'admin/structure/types/manage/%/fields/%/translate',
+  'router_path' => 'admin/structure/types/manage/%/fields/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '4',
+  'depth' => '7',
   'customized' => '0',
   'p1' => '1',
   'p2' => '20',
-  'p3' => '44',
-  'p4' => '466',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '930',
+  'p6' => '942',
+  'p7' => '959',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34178,28 +36950,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'menu-test-menu',
-  'mlid' => '467',
-  'plid' => '469',
-  'link_path' => 'http://google.com',
-  'router_path' => '',
-  'link_title' => 'Google',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:6:"Google";}}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
+  'menu_name' => 'management',
+  'mlid' => '960',
+  'plid' => '942',
+  'link_path' => 'admin/structure/types/manage/%/fields/%/widget-type',
+  'router_path' => 'admin/structure/types/manage/%/fields/%/widget-type',
+  'link_title' => 'Widget type',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
-  'customized' => '1',
-  'p1' => '469',
-  'p2' => '467',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'depth' => '7',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '930',
+  'p6' => '942',
+  'p7' => '960',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34207,57 +36979,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'menu-test-menu',
-  'mlid' => '468',
-  'plid' => '0',
-  'link_path' => 'http://yahoo.com',
-  'router_path' => '',
-  'link_title' => 'Yahoo',
-  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:19:"english description";}s:5:"alter";b:1;}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
-  'has_children' => '0',
-  'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '468',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
-  'p8' => '0',
-  'p9' => '0',
-  'updated' => '0',
-  'language' => 'en',
-  'i18n_tsid' => '1',
-))
-->values(array(
-  'menu_name' => 'menu-test-menu',
-  'mlid' => '469',
-  'plid' => '0',
-  'link_path' => 'http://bing.com',
-  'router_path' => '',
-  'link_title' => 'Bing',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:4:"Bing";}}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
+  'menu_name' => 'management',
+  'mlid' => '961',
+  'plid' => '955',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/delete',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/delete',
+  'link_title' => 'Delete',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '469',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'weight' => '10',
+  'depth' => '7',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '955',
+  'p7' => '961',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34265,28 +37008,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'menu-test-menu',
-  'mlid' => '470',
-  'plid' => '469',
-  'link_path' => 'http://ask.com',
-  'router_path' => '',
-  'link_title' => 'Ask',
+  'menu_name' => 'management',
+  'mlid' => '962',
+  'plid' => '955',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/edit',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/edit',
+  'link_title' => 'Edit',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
-  'customized' => '1',
-  'p1' => '469',
-  'p2' => '470',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'depth' => '7',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '955',
+  'p7' => '962',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34294,28 +37037,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'shortcut-set-2',
-  'mlid' => '472',
-  'plid' => '0',
-  'link_path' => 'admin/help',
-  'router_path' => 'admin/help',
-  'link_title' => 'Help',
+  'menu_name' => 'management',
+  'mlid' => '963',
+  'plid' => '955',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/field-settings',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/field-settings',
+  'link_title' => 'Field settings',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-49',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '7',
   'customized' => '0',
-  'p1' => '472',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '955',
+  'p7' => '963',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34323,28 +37066,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'shortcut-set-2',
-  'mlid' => '473',
-  'plid' => '0',
-  'link_path' => 'admin/people',
-  'router_path' => 'admin/people',
-  'link_title' => 'People',
+  'menu_name' => 'management',
+  'mlid' => '964',
+  'plid' => '955',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/translate',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/translate',
+  'link_title' => 'Translate',
   'options' => 'a:0:{}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-50',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '7',
   'customized' => '0',
-  'p1' => '473',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '955',
+  'p7' => '964',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34352,28 +37095,28 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '474',
-  'plid' => '4',
-  'link_path' => 'filter/tips/%',
-  'router_path' => 'filter/tips/%',
-  'link_title' => 'Compose tips',
+  'menu_name' => 'management',
+  'mlid' => '965',
+  'plid' => '955',
+  'link_path' => 'admin/structure/types/manage/%/comment/fields/%/widget-type',
+  'router_path' => 'admin/structure/types/manage/%/comment/fields/%/widget-type',
+  'link_title' => 'Widget type',
   'options' => 'a:0:{}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '7',
   'customized' => '0',
-  'p1' => '4',
-  'p2' => '474',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
-  'p6' => '0',
-  'p7' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '34',
+  'p4' => '114',
+  'p5' => '162',
+  'p6' => '955',
+  'p7' => '965',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
@@ -34382,11 +37125,11 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '475',
+  'mlid' => '984',
   'plid' => '175',
-  'link_path' => 'admin/help/php',
-  'router_path' => 'admin/help/php',
-  'link_title' => 'php',
+  'link_path' => 'admin/help/simpletest',
+  'router_path' => 'admin/help/simpletest',
+  'link_title' => 'simpletest',
   'options' => 'a:0:{}',
   'module' => 'system',
   'hidden' => '-1',
@@ -34398,7 +37141,7 @@
   'customized' => '0',
   'p1' => '1',
   'p2' => '175',
-  'p3' => '475',
+  'p3' => '984',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -34411,24 +37154,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '478',
-  'plid' => '20',
-  'link_path' => 'admin/content',
-  'router_path' => 'admin/content',
-  'link_title' => 'custom link test',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
-  'module' => 'menu',
+  'mlid' => '985',
+  'plid' => '37',
+  'link_path' => 'admin/config/development/testing',
+  'router_path' => 'admin/config/development/testing',
+  'link_title' => 'Testing',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:122:"Run tests against Drupal core and your active modules. These tests help assure that your site code is working as designed.";}}',
+  'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '0',
+  'has_children' => '1',
   'expanded' => '0',
-  'weight' => '0',
-  'depth' => '3',
-  'customized' => '1',
+  'weight' => '-5',
+  'depth' => '4',
+  'customized' => '0',
   'p1' => '1',
-  'p2' => '20',
-  'p3' => '478',
-  'p4' => '0',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '985',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -34439,26 +37182,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '479',
-  'plid' => '0',
-  'link_path' => 'node/2',
-  'router_path' => 'node/%',
-  'link_title' => 'node link test',
-  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:6:"node 2";}s:5:"query";a:2:{s:4:"name";s:6:"ferret";s:5:"color";s:6:"purple";}}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'menu_name' => 'management',
+  'mlid' => '986',
+  'plid' => '985',
+  'link_path' => 'admin/config/development/testing/list',
+  'router_path' => 'admin/config/development/testing/list',
+  'link_title' => 'List',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '3',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '479',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'weight' => '0',
+  'depth' => '5',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '985',
+  'p5' => '986',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -34468,26 +37211,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'book-toc-1',
-  'mlid' => '480',
-  'plid' => '0',
-  'link_path' => 'node/4',
-  'router_path' => 'node/%',
-  'link_title' => 'Test top book title',
+  'menu_name' => 'management',
+  'mlid' => '987',
+  'plid' => '985',
+  'link_path' => 'admin/config/development/testing/settings',
+  'router_path' => 'admin/config/development/testing/settings',
+  'link_title' => 'Settings',
   'options' => 'a:0:{}',
-  'module' => 'book',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
-  'weight' => '-10',
-  'depth' => '1',
+  'weight' => '0',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '480',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '985',
+  'p5' => '987',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -34497,26 +37240,26 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'book-toc-1',
-  'mlid' => '481',
-  'plid' => '480',
-  'link_path' => 'node/6',
-  'router_path' => 'node/%',
-  'link_title' => 'Test book title child 1',
-  'options' => 'a:0:{}',
-  'module' => 'book',
+  'menu_name' => 'management',
+  'mlid' => '988',
+  'plid' => '985',
+  'link_path' => 'admin/config/development/testing/results/%',
+  'router_path' => 'admin/config/development/testing/results/%',
+  'link_title' => 'Test result',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:21:"View result of tests.";}}',
+  'module' => 'system',
   'hidden' => '0',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '2',
+  'depth' => '5',
   'customized' => '0',
-  'p1' => '480',
-  'p2' => '481',
-  'p3' => '0',
-  'p4' => '0',
-  'p5' => '0',
+  'p1' => '1',
+  'p2' => '8',
+  'p3' => '37',
+  'p4' => '985',
+  'p5' => '988',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
@@ -34526,14 +37269,14 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'book-toc-1',
-  'mlid' => '482',
-  'plid' => '481',
-  'link_path' => 'node/2',
-  'router_path' => 'node/%',
-  'link_title' => 'Test book title child 1.1',
-  'options' => 'a:0:{}',
-  'module' => 'book',
+  'menu_name' => 'management',
+  'mlid' => '989',
+  'plid' => '20',
+  'link_path' => 'admin/structure/trigger',
+  'router_path' => 'admin/structure/trigger',
+  'link_title' => 'Triggers',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"Configure when to execute actions.";}}',
+  'module' => 'system',
   'hidden' => '0',
   'external' => '0',
   'has_children' => '0',
@@ -34541,9 +37284,9 @@
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '480',
-  'p2' => '481',
-  'p3' => '482',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '989',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -34555,24 +37298,24 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'book-toc-2',
-  'mlid' => '483',
-  'plid' => '481',
-  'link_path' => 'node/1',
-  'router_path' => 'node/%',
-  'link_title' => 'Test book title 2',
+  'menu_name' => 'management',
+  'mlid' => '990',
+  'plid' => '175',
+  'link_path' => 'admin/help/trigger',
+  'router_path' => 'admin/help/trigger',
+  'link_title' => 'trigger',
   'options' => 'a:0:{}',
-  'module' => 'book',
-  'hidden' => '0',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '3',
   'customized' => '0',
-  'p1' => '480',
-  'p2' => '481',
-  'p3' => '483',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '990',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -34584,25 +37327,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '484',
-  'plid' => '0',
-  'link_path' => 'node/2',
-  'router_path' => 'node/%',
-  'link_title' => 'The thing about Deep Space 9',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'menu_name' => 'management',
+  'mlid' => '991',
+  'plid' => '989',
+  'link_path' => 'admin/structure/trigger/comment',
+  'router_path' => 'admin/structure/trigger/comment',
+  'link_title' => 'Comment',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '9',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '484',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'weight' => '0',
+  'depth' => '4',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '989',
+  'p4' => '991',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -34613,25 +37356,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '485',
-  'plid' => '0',
-  'link_path' => 'node/3',
-  'router_path' => 'node/%',
-  'link_title' => 'is - The thing about Deep Space 9',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'menu_name' => 'management',
+  'mlid' => '992',
+  'plid' => '989',
+  'link_path' => 'admin/structure/trigger/node',
+  'router_path' => 'admin/structure/trigger/node',
+  'link_title' => 'Node',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '10',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '485',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'weight' => '0',
+  'depth' => '4',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '989',
+  'p4' => '992',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -34642,25 +37385,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '486',
-  'plid' => '0',
-  'link_path' => 'node/4',
-  'router_path' => 'node/%',
-  'link_title' => 'is - The thing about Firefly',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'menu_name' => 'management',
+  'mlid' => '993',
+  'plid' => '989',
+  'link_path' => 'admin/structure/trigger/system',
+  'router_path' => 'admin/structure/trigger/system',
+  'link_title' => 'System',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '11',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '486',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'weight' => '0',
+  'depth' => '4',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '989',
+  'p4' => '993',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -34671,25 +37414,25 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'navigation',
-  'mlid' => '487',
-  'plid' => '0',
-  'link_path' => 'node/5',
-  'router_path' => 'node/%',
-  'link_title' => 'en - The thing about Firefly',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:0:"";}}',
-  'module' => 'menu',
-  'hidden' => '0',
+  'menu_name' => 'management',
+  'mlid' => '994',
+  'plid' => '989',
+  'link_path' => 'admin/structure/trigger/taxonomy',
+  'router_path' => 'admin/structure/trigger/taxonomy',
+  'link_title' => 'Taxonomy',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
   'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
-  'weight' => '12',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '487',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'weight' => '0',
+  'depth' => '4',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '989',
+  'p4' => '994',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -34701,24 +37444,24 @@
 ))
 ->values(array(
   'menu_name' => 'management',
-  'mlid' => '491',
-  'plid' => '48',
-  'link_path' => 'admin/config/regional/entity_translation',
-  'router_path' => 'admin/config/regional/entity_translation',
-  'link_title' => 'Entity translation',
-  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:83:"Configure which entities can be translated and enable or disable language fallback.";}}',
+  'mlid' => '995',
+  'plid' => '989',
+  'link_path' => 'admin/structure/trigger/unassign',
+  'router_path' => 'admin/structure/trigger/unassign',
+  'link_title' => 'Unassign',
+  'options' => 'a:1:{s:10:"attributes";a:1:{s:5:"title";s:34:"Unassign an action from a trigger.";}}',
   'module' => 'system',
-  'hidden' => '0',
+  'hidden' => '-1',
   'external' => '0',
-  'has_children' => '1',
+  'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
   'depth' => '4',
   'customized' => '0',
   'p1' => '1',
-  'p2' => '8',
-  'p3' => '48',
-  'p4' => '491',
+  'p2' => '20',
+  'p3' => '989',
+  'p4' => '995',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
@@ -34729,53 +37472,53 @@
   'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'menu-test-menu',
-  'mlid' => '700',
-  'plid' => '0',
-  'link_path' => 'http://yahoo.com',
-  'router_path' => '',
-  'link_title' => 'fr - Yahoo',
-  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:16:"fr - description";}s:5:"alter";b:1;}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
+  'menu_name' => 'management',
+  'mlid' => '996',
+  'plid' => '989',
+  'link_path' => 'admin/structure/trigger/user',
+  'router_path' => 'admin/structure/trigger/user',
+  'link_title' => 'User',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '468',
-  'p2' => '0',
-  'p3' => '0',
-  'p4' => '0',
+  'depth' => '4',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '20',
+  'p3' => '989',
+  'p4' => '996',
   'p5' => '0',
   'p6' => '0',
   'p7' => '0',
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'fr',
-  'i18n_tsid' => '1',
+  'language' => 'und',
+  'i18n_tsid' => '0',
 ))
 ->values(array(
-  'menu_name' => 'menu-test-menu',
-  'mlid' => '701',
-  'plid' => '0',
-  'link_path' => 'http://yahoo.com',
-  'router_path' => '',
-  'link_title' => 'is - Yahoo',
-  'options' => 'a:2:{s:10:"attributes";a:1:{s:5:"title";s:16:"is - description";}s:5:"alter";b:1;}',
-  'module' => 'menu',
-  'hidden' => '0',
-  'external' => '1',
+  'menu_name' => 'management',
+  'mlid' => '997',
+  'plid' => '175',
+  'link_path' => 'admin/help/syslog',
+  'router_path' => 'admin/help/syslog',
+  'link_title' => 'syslog',
+  'options' => 'a:0:{}',
+  'module' => 'system',
+  'hidden' => '-1',
+  'external' => '0',
   'has_children' => '0',
   'expanded' => '0',
   'weight' => '0',
-  'depth' => '1',
-  'customized' => '1',
-  'p1' => '468',
-  'p2' => '0',
-  'p3' => '0',
+  'depth' => '3',
+  'customized' => '0',
+  'p1' => '1',
+  'p2' => '175',
+  'p3' => '997',
   'p4' => '0',
   'p5' => '0',
   'p6' => '0',
@@ -34783,8 +37526,8 @@
   'p8' => '0',
   'p9' => '0',
   'updated' => '0',
-  'language' => 'is',
-  'i18n_tsid' => '1',
+  'language' => 'und',
+  'i18n_tsid' => '0',
 ))
 ->execute();
 $connection->schema()->createTable('menu_router', array(
@@ -35159,7 +37902,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:25:"themes/bartik/bartik.info";s:4:"name";s:6:"bartik";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:25:"themes/bartik/bartik.info";s:4:"name";s:6:"bartik";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:6:"bartik";}',
   'delivery_callback' => '',
@@ -35184,7 +37927,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:7:"garland";}',
   'delivery_callback' => '',
@@ -35234,7 +37977,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:23:"themes/seven/seven.info";s:4:"name";s:5:"seven";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:23:"themes/seven/seven.info";s:4:"name";s:5:"seven";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:5:"seven";}',
   'delivery_callback' => '',
@@ -35259,7 +38002,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_system_themes_access',
-  'access_arguments' => "a:1:{i:0;O:8:\"stdClass\":12:{s:8:\"filename\";s:23:\"themes/stark/stark.info\";s:4:\"name\";s:5:\"stark\";s:4:\"type\";s:5:\"theme\";s:5:\"owner\";s:45:\"themes/engines/phptemplate/phptemplate.engine\";s:6:\"status\";s:1:\"0\";s:9:\"bootstrap\";s:1:\"0\";s:14:\"schema_version\";s:2:\"-1\";s:6:\"weight\";s:1:\"0\";s:4:\"info\";a:17:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1444866674;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}s:6:\"prefix\";s:11:\"phptemplate\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";}}",
+  'access_arguments' => "a:1:{i:0;O:8:\"stdClass\":12:{s:8:\"filename\";s:23:\"themes/stark/stark.info\";s:4:\"name\";s:5:\"stark\";s:4:\"type\";s:5:\"theme\";s:5:\"owner\";s:45:\"themes/engines/phptemplate/phptemplate.engine\";s:6:\"status\";s:1:\"0\";s:9:\"bootstrap\";s:1:\"0\";s:14:\"schema_version\";s:2:\"-1\";s:6:\"weight\";s:1:\"0\";s:4:\"info\";a:15:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.92\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1664863480;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}s:6:\"prefix\";s:11:\"phptemplate\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";}}",
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:21:"system_theme_settings";i:1;s:5:"stark";}',
   'delivery_callback' => '',
@@ -35529,6 +38272,56 @@
   'weight' => '0',
   'include_file' => 'modules/filter/filter.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/config/content/link',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:19:"link_admin_settings";}',
+  'delivery_callback' => '',
+  'fit' => '15',
+  'number_parts' => '4',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/config/content/link',
+  'title' => 'Link settings',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => 'Settings for the link module.',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/link/link.admin.inc',
+))
+->values(array(
+  'path' => 'admin/config/content/title',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:25:"title_admin_settings_form";}',
+  'delivery_callback' => '',
+  'fit' => '15',
+  'number_parts' => '4',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/config/content/title',
+  'title' => 'Title settings',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => 'Settings for the Title module.',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/title/title.admin.inc',
+))
 ->values(array(
   'path' => 'admin/config/date',
   'load_functions' => '',
@@ -36108,8 +38901,8 @@
   'path' => 'admin/config/people/accounts/display',
   'load_functions' => '',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"user";i:2;s:4:"user";i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -36134,7 +38927,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:7:"default";i:3;s:11:"user_access";i:4;s:16:"administer users";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:7:"default";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"user";i:2;s:4:"user";i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -36159,7 +38952,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:4:"full";i:3;s:11:"user_access";i:4;s:16:"administer users";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:4:"full";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"user";i:2;s:4:"user";i:3;s:4:"full";}',
   'delivery_callback' => '',
@@ -36183,8 +38976,8 @@
   'path' => 'admin/config/people/accounts/fields',
   'load_functions' => '',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:3:{i:0;s:28:"field_ui_field_overview_form";i:1;s:4:"user";i:2;s:4:"user";}',
   'delivery_callback' => '',
@@ -36208,8 +39001,8 @@
   'path' => 'admin/config/people/accounts/fields/%',
   'load_functions' => 'a:1:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -36233,8 +39026,8 @@
   'path' => 'admin/config/people/accounts/fields/%/delete',
   'load_functions' => 'a:1:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:26:"field_ui_field_delete_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -36258,8 +39051,8 @@
   'path' => 'admin/config/people/accounts/fields/%/edit',
   'load_functions' => 'a:1:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -36283,8 +39076,8 @@
   'path' => 'admin/config/people/accounts/fields/%/field-settings',
   'load_functions' => 'a:1:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:28:"field_ui_field_settings_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -36305,11 +39098,61 @@
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/config/people/accounts/fields/%/widget-type',
+  'path' => 'admin/config/people/accounts/fields/%/translate',
   'load_functions' => 'a:1:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:1:{i:0;i:5;}',
+  'delivery_callback' => '',
+  'fit' => '125',
+  'number_parts' => '7',
+  'context' => '1',
+  'tab_parent' => 'admin/config/people/accounts/fields/%',
+  'tab_root' => 'admin/config/people/accounts/fields/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/config/people/accounts/fields/%/translate/%',
+  'load_functions' => 'a:2:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}i:7;a:1:{s:18:"i18n_language_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:16:"administer users";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:2:{i:0;i:5;i:1;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '250',
+  'number_parts' => '8',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/config/people/accounts/fields/%/translate/%',
+  'title' => 'Instance',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/config/people/accounts/fields/%/widget-type',
+  'load_functions' => 'a:1:{i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"user";i:1;s:4:"user";i:2;s:1:"0";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:16:"administer users";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:25:"field_ui_widget_type_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -36754,6 +39597,181 @@
   'weight' => '0',
   'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/config/regional/entity_translation/translatable/%',
+  'load_functions' => 'a:1:{i:5;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:28:"toggle field translatability";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:36:"entity_translation_translatable_form";i:1;i:5;}',
+  'delivery_callback' => '',
+  'fit' => '62',
+  'number_parts' => '6',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/config/regional/entity_translation/translatable/%',
+  'title' => 'Confirm change in translatability.',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => 'Confirmation page for changing field translatability.',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
+->values(array(
+  'path' => 'admin/config/regional/i18n',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:20:"variable_module_form";i:1;s:4:"i18n";}',
+  'delivery_callback' => '',
+  'fit' => '15',
+  'number_parts' => '4',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/config/regional/i18n',
+  'title' => 'Multilingual settings',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => 'Configure extended options for multilingual content and translations.',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/config/regional/i18n/configure',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:20:"variable_module_form";i:1;s:4:"i18n";}',
+  'delivery_callback' => '',
+  'fit' => '31',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/config/regional/i18n',
+  'tab_root' => 'admin/config/regional/i18n',
+  'title' => 'Multilingual system',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => 'Configure extended options for multilingual content and translations.',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/config/regional/i18n/strings',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:18:"variable_edit_form";i:1;a:3:{i:0;s:27:"i18n_string_allowed_formats";i:1;s:27:"i18n_string_source_language";i:2;s:39:"i18n_string_textgroup_class_[textgroup]";}}',
+  'delivery_callback' => '',
+  'fit' => '31',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/config/regional/i18n',
+  'tab_root' => 'admin/config/regional/i18n',
+  'title' => 'Strings',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => 'Options for user defined strings.',
+  'position' => '',
+  'weight' => '20',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/config/regional/i18n/variable',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:36:"variable_realm_select_variables_form";i:1;s:8:"language";}',
+  'delivery_callback' => '',
+  'fit' => '31',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/config/regional/i18n',
+  'tab_root' => 'admin/config/regional/i18n',
+  'title' => 'Variables',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => 'Configure multilingual variables.',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/variable/variable_realm/variable_realm.form.inc',
+))
+->values(array(
+  'path' => 'admin/config/regional/i18n_translation',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'i18n_translation_admin_overview',
+  'page_arguments' => 'a:0:{}',
+  'delivery_callback' => '',
+  'fit' => '15',
+  'number_parts' => '4',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/config/regional/i18n_translation',
+  'title' => 'Translation sets',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => 'Translation sets overview.',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => 'sites/all/modules/i18n/i18n_translation/i18n_translation.admin.inc',
+))
+->values(array(
+  'path' => 'admin/config/regional/i18n_translation/configure',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:29:"administer site configuration";}',
+  'page_callback' => 'i18n_translation_admin_overview',
+  'page_arguments' => 'a:0:{}',
+  'delivery_callback' => '',
+  'fit' => '31',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/config/regional/i18n_translation',
+  'tab_root' => 'admin/config/regional/i18n_translation',
+  'title' => 'Translation sets',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => 'Overview of existing translation sets.',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_translation/i18n_translation.admin.inc',
+))
 ->values(array(
   'path' => 'admin/config/regional/language',
   'load_functions' => '',
@@ -37036,7 +40054,7 @@
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:19:"translate interface";}',
   'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:26:"locale_translate_edit_form";i:1;i:5;}',
+  'page_arguments' => 'a:2:{i:0;s:38:"i18n_string_locale_translate_edit_form";i:1;i:5;}',
   'delivery_callback' => '',
   'fit' => '62',
   'number_parts' => '6',
@@ -37052,7 +40070,7 @@
   'description' => '',
   'position' => '',
   'weight' => '0',
-  'include_file' => 'modules/locale/locale.admin.inc',
+  'include_file' => 'sites/all/modules/i18n/i18n_string/i18n_string.pages.inc',
 ))
 ->values(array(
   'path' => 'admin/config/regional/translate/export',
@@ -37079,6 +40097,31 @@
   'weight' => '30',
   'include_file' => 'modules/locale/locale.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/config/regional/translate/i18n_string',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:19:"translate interface";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:30:"i18n_string_admin_refresh_form";}',
+  'delivery_callback' => '',
+  'fit' => '31',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/config/regional/translate',
+  'tab_root' => 'admin/config/regional/translate',
+  'title' => 'Strings',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => 'Refresh user defined strings.',
+  'position' => '',
+  'weight' => '20',
+  'include_file' => 'sites/all/modules/i18n/i18n_string/i18n_string.admin.inc',
+))
 ->values(array(
   'path' => 'admin/config/regional/translate/import',
   'load_functions' => '',
@@ -37135,7 +40178,7 @@
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:19:"translate interface";}',
-  'page_callback' => 'locale_translate_seek_screen',
+  'page_callback' => 'i18n_string_locale_translate_seek_screen',
   'page_arguments' => 'a:0:{}',
   'delivery_callback' => '',
   'fit' => '31',
@@ -37152,7 +40195,7 @@
   'description' => '',
   'position' => '',
   'weight' => '10',
-  'include_file' => 'modules/locale/locale.admin.inc',
+  'include_file' => 'sites/all/modules/i18n/i18n_string/i18n_string.pages.inc',
 ))
 ->values(array(
   'path' => 'admin/config/search',
@@ -38904,6 +41947,156 @@
   'weight' => '0',
   'include_file' => 'modules/help/help.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/help/i18n',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/i18n',
+  'title' => 'i18n',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
+->values(array(
+  'path' => 'admin/help/i18n_block',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/i18n_block',
+  'title' => 'i18n_block',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
+->values(array(
+  'path' => 'admin/help/i18n_menu',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/i18n_menu',
+  'title' => 'i18n_menu',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
+->values(array(
+  'path' => 'admin/help/i18n_string',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/i18n_string',
+  'title' => 'i18n_string',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
+->values(array(
+  'path' => 'admin/help/i18n_sync',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/i18n_sync',
+  'title' => 'i18n_sync',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
+->values(array(
+  'path' => 'admin/help/i18n_taxonomy',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/i18n_taxonomy',
+  'title' => 'i18n_taxonomy',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
 ->values(array(
   'path' => 'admin/help/image',
   'load_functions' => '',
@@ -38929,6 +42122,31 @@
   'weight' => '0',
   'include_file' => 'modules/help/help.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/help/link',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/link',
+  'title' => 'link',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
 ->values(array(
   'path' => 'admin/help/list',
   'load_functions' => '',
@@ -39154,6 +42372,31 @@
   'weight' => '0',
   'include_file' => 'modules/help/help.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/help/references',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/references',
+  'title' => 'references',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
 ->values(array(
   'path' => 'admin/help/search',
   'load_functions' => '',
@@ -39354,6 +42597,31 @@
   'weight' => '0',
   'include_file' => 'modules/help/help.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/help/title',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:27:"access administration pages";}',
+  'page_callback' => 'help_page',
+  'page_arguments' => 'a:1:{i:0;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/help/title',
+  'title' => 'title',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '4',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/help/help.admin.inc',
+))
 ->values(array(
   'path' => 'admin/help/toolbar',
   'load_functions' => '',
@@ -40534,7 +43802,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:25:"themes/bartik/bartik.info";s:4:"name";s:6:"bartik";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:25:"themes/bartik/bartik.info";s:4:"name";s:6:"bartik";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_demo',
   'page_arguments' => 'a:1:{i:0;s:6:"bartik";}',
   'delivery_callback' => '',
@@ -40559,7 +43827,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_demo',
   'page_arguments' => 'a:1:{i:0;s:7:"garland";}',
   'delivery_callback' => '',
@@ -40584,7 +43852,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:23:"themes/seven/seven.info";s:4:"name";s:5:"seven";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:23:"themes/seven/seven.info";s:4:"name";s:5:"seven";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_demo',
   'page_arguments' => 'a:1:{i:0;s:5:"seven";}',
   'delivery_callback' => '',
@@ -40609,7 +43877,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => "a:1:{i:0;O:8:\"stdClass\":12:{s:8:\"filename\";s:23:\"themes/stark/stark.info\";s:4:\"name\";s:5:\"stark\";s:4:\"type\";s:5:\"theme\";s:5:\"owner\";s:45:\"themes/engines/phptemplate/phptemplate.engine\";s:6:\"status\";s:1:\"0\";s:9:\"bootstrap\";s:1:\"0\";s:14:\"schema_version\";s:2:\"-1\";s:6:\"weight\";s:1:\"0\";s:4:\"info\";a:17:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1444866674;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}s:6:\"prefix\";s:11:\"phptemplate\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";}}",
+  'access_arguments' => "a:1:{i:0;O:8:\"stdClass\":12:{s:8:\"filename\";s:23:\"themes/stark/stark.info\";s:4:\"name\";s:5:\"stark\";s:4:\"type\";s:5:\"theme\";s:5:\"owner\";s:45:\"themes/engines/phptemplate/phptemplate.engine\";s:6:\"status\";s:1:\"0\";s:9:\"bootstrap\";s:1:\"0\";s:14:\"schema_version\";s:2:\"-1\";s:6:\"weight\";s:1:\"0\";s:4:\"info\";a:15:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.92\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1664863480;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}s:6:\"prefix\";s:11:\"phptemplate\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";}}",
   'page_callback' => 'block_admin_demo',
   'page_arguments' => 'a:1:{i:0;s:5:"stark";}',
   'delivery_callback' => '',
@@ -40634,7 +43902,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:25:"themes/bartik/bartik.info";s:4:"name";s:6:"bartik";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:25:"themes/bartik/bartik.info";s:4:"name";s:6:"bartik";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:6:"bartik";}',
   'delivery_callback' => '',
@@ -40659,7 +43927,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:27:"themes/garland/garland.info";s:4:"name";s:7:"garland";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"0";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:7:"garland";}',
   'delivery_callback' => '',
@@ -40709,7 +43977,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:23:"themes/seven/seven.info";s:4:"name";s:5:"seven";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:18:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
+  'access_arguments' => 'a:1:{i:0;O:8:"stdClass":12:{s:8:"filename";s:23:"themes/seven/seven.info";s:4:"name";s:5:"seven";s:4:"type";s:5:"theme";s:5:"owner";s:45:"themes/engines/phptemplate/phptemplate.engine";s:6:"status";s:1:"1";s:9:"bootstrap";s:1:"0";s:14:"schema_version";s:2:"-1";s:6:"weight";s:1:"0";s:4:"info";a:16:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}s:6:"prefix";s:11:"phptemplate";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:6:"engine";s:11:"phptemplate";}}',
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:5:"seven";}',
   'delivery_callback' => '',
@@ -40759,7 +44027,7 @@
   'load_functions' => '',
   'to_arg_functions' => '',
   'access_callback' => '_block_themes_access',
-  'access_arguments' => "a:1:{i:0;O:8:\"stdClass\":12:{s:8:\"filename\";s:23:\"themes/stark/stark.info\";s:4:\"name\";s:5:\"stark\";s:4:\"type\";s:5:\"theme\";s:5:\"owner\";s:45:\"themes/engines/phptemplate/phptemplate.engine\";s:6:\"status\";s:1:\"0\";s:9:\"bootstrap\";s:1:\"0\";s:14:\"schema_version\";s:2:\"-1\";s:6:\"weight\";s:1:\"0\";s:4:\"info\";a:17:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1444866674;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}s:6:\"prefix\";s:11:\"phptemplate\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";}}",
+  'access_arguments' => "a:1:{i:0;O:8:\"stdClass\":12:{s:8:\"filename\";s:23:\"themes/stark/stark.info\";s:4:\"name\";s:5:\"stark\";s:4:\"type\";s:5:\"theme\";s:5:\"owner\";s:45:\"themes/engines/phptemplate/phptemplate.engine\";s:6:\"status\";s:1:\"0\";s:9:\"bootstrap\";s:1:\"0\";s:14:\"schema_version\";s:2:\"-1\";s:6:\"weight\";s:1:\"0\";s:4:\"info\";a:15:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.92\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1664863480;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}s:6:\"prefix\";s:11:\"phptemplate\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";}}",
   'page_callback' => 'block_admin_display',
   'page_arguments' => 'a:1:{i:0;s:5:"stark";}',
   'delivery_callback' => '',
@@ -40840,10 +44108,10 @@
   'delivery_callback' => '',
   'fit' => '121',
   'number_parts' => '7',
-  'context' => '2',
+  'context' => '3',
   'tab_parent' => 'admin/structure/block/manage/%/%',
   'tab_root' => 'admin/structure/block/manage/%/%',
-  'title' => 'Configure block',
+  'title' => 'Configure',
   'title_callback' => 't',
   'title_arguments' => '',
   'theme_callback' => '',
@@ -40851,7 +44119,7 @@
   'type' => '140',
   'description' => '',
   'position' => '',
-  'weight' => '0',
+  'weight' => '-100',
   'include_file' => 'modules/block/block.admin.inc',
 ))
 ->values(array(
@@ -40866,19 +44134,69 @@
   'fit' => '121',
   'number_parts' => '7',
   'context' => '0',
-  'tab_parent' => 'admin/structure/block/manage/%/%',
-  'tab_root' => 'admin/structure/block/manage/%/%',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/block/manage/%/%/delete',
   'title' => 'Delete block',
   'title_callback' => 't',
   'title_arguments' => '',
   'theme_callback' => '',
   'theme_arguments' => 'a:0:{}',
-  'type' => '132',
+  'type' => '0',
   'description' => '',
   'position' => '',
   'weight' => '0',
   'include_file' => 'modules/block/block.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/block/manage/%/%/translate',
+  'load_functions' => 'a:2:{i:4;N;i:5;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_block_translate_tab_access',
+  'access_arguments' => 'a:2:{i:0;i:4;i:1;i:5;}',
+  'page_callback' => 'i18n_block_translate_tab_page',
+  'page_arguments' => 'a:2:{i:0;i:4;i:1;i:5;}',
+  'delivery_callback' => '',
+  'fit' => '121',
+  'number_parts' => '7',
+  'context' => '3',
+  'tab_parent' => 'admin/structure/block/manage/%/%',
+  'tab_root' => 'admin/structure/block/manage/%/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/structure/block/manage/%/%/translate/%',
+  'load_functions' => 'a:3:{i:4;N;i:5;N;i:7;s:18:"i18n_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_block_translate_tab_access',
+  'access_arguments' => 'a:2:{i:0;i:4;i:1;i:5;}',
+  'page_callback' => 'i18n_block_translate_tab_page',
+  'page_arguments' => 'a:3:{i:0;i:4;i:1;i:5;i:2;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '242',
+  'number_parts' => '8',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/block/manage/%/%/translate/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => '',
+))
 ->values(array(
   'path' => 'admin/structure/contact',
   'load_functions' => '',
@@ -41204,6 +44522,31 @@
   'weight' => '0',
   'include_file' => 'modules/menu/menu.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/menu/item/%',
+  'load_functions' => 'a:1:{i:4;s:14:"menu_link_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:15:"administer menu";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:14:"menu_edit_item";i:1;s:4:"edit";i:2;i:4;i:3;N;}',
+  'delivery_callback' => '',
+  'fit' => '30',
+  'number_parts' => '5',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/menu/item/%',
+  'title' => 'Edit menu link',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/menu/menu.admin.inc',
+))
 ->values(array(
   'path' => 'admin/structure/menu/item/%/delete',
   'load_functions' => 'a:1:{i:4;s:14:"menu_link_load";}',
@@ -41240,15 +44583,15 @@
   'delivery_callback' => '',
   'fit' => '61',
   'number_parts' => '6',
-  'context' => '0',
-  'tab_parent' => '',
-  'tab_root' => 'admin/structure/menu/item/%/edit',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/menu/item/%',
+  'tab_root' => 'admin/structure/menu/item/%',
   'title' => 'Edit menu link',
   'title_callback' => 't',
   'title_arguments' => '',
   'theme_callback' => '',
   'theme_arguments' => 'a:0:{}',
-  'type' => '6',
+  'type' => '140',
   'description' => '',
   'position' => '',
   'weight' => '0',
@@ -41279,6 +44622,56 @@
   'weight' => '0',
   'include_file' => 'modules/menu/menu.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/menu/item/%/translate',
+  'load_functions' => 'a:1:{i:4;s:14:"menu_link_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:9:"menu_link";i:1;i:4;}',
+  'page_callback' => 'i18n_page_translate_tab',
+  'page_arguments' => 'a:2:{i:0;s:9:"menu_link";i:1;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '61',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/menu/item/%',
+  'tab_root' => 'admin/structure/menu/item/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/menu/item/%/translate/%',
+  'load_functions' => 'a:2:{i:4;s:14:"menu_link_load";i:6;s:18:"i18n_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:9:"menu_link";i:1;i:4;}',
+  'page_callback' => 'i18n_page_translate_tab',
+  'page_arguments' => 'a:3:{i:0;s:9:"menu_link";i:1;i:4;i:2;i:6;}',
+  'delivery_callback' => '',
+  'fit' => '122',
+  'number_parts' => '7',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/menu/item/%/translate/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
 ->values(array(
   'path' => 'admin/structure/menu/list',
   'load_functions' => '',
@@ -41319,7 +44712,7 @@
   'tab_parent' => '',
   'tab_root' => 'admin/structure/menu/manage/%',
   'title' => 'Customize menu',
-  'title_callback' => 'menu_overview_title',
+  'title_callback' => 'i18n_menu_menu_overview_title',
   'title_arguments' => 'a:1:{i:0;i:4;}',
   'theme_callback' => '',
   'theme_arguments' => 'a:0:{}',
@@ -41429,6 +44822,156 @@
   'weight' => '-10',
   'include_file' => 'modules/menu/menu.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/menu/manage/%/translate',
+  'load_functions' => 'a:1:{i:4;s:9:"menu_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:4:"menu";i:1;i:4;}',
+  'page_callback' => 'i18n_page_translate_localize',
+  'page_arguments' => 'a:2:{i:0;s:4:"menu";i:1;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '61',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/menu/manage/%',
+  'tab_root' => 'admin/structure/menu/manage/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/menu/manage/%/translate/%',
+  'load_functions' => 'a:2:{i:4;s:9:"menu_load";i:6;s:18:"i18n_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:4:"menu";i:1;i:4;}',
+  'page_callback' => 'i18n_page_translate_localize',
+  'page_arguments' => 'a:3:{i:0;s:4:"menu";i:1;i:4;i:2;i:6;}',
+  'delivery_callback' => '',
+  'fit' => '122',
+  'number_parts' => '7',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/menu/manage/%/translate/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/menu/manage/translation',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:15:"administer menu";}',
+  'page_callback' => 'i18n_translation_set_list_manage',
+  'page_arguments' => 'a:1:{i:0;s:9:"menu_link";}',
+  'delivery_callback' => '',
+  'fit' => '31',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/menu',
+  'tab_root' => 'admin/structure/menu',
+  'title' => 'Translation sets',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/structure/menu/manage/translation/add',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:15:"administer menu";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:1:{i:0;s:26:"i18n_menu_translation_form";}',
+  'delivery_callback' => '',
+  'fit' => '63',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/menu/manage/translation',
+  'tab_root' => 'admin/structure/menu',
+  'title' => 'Add translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '388',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.admin.inc',
+))
+->values(array(
+  'path' => 'admin/structure/menu/manage/translation/delete/%',
+  'load_functions' => 'a:1:{i:6;s:26:"i18n_menu_translation_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:15:"administer menu";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:35:"i18n_translation_set_delete_confirm";i:1;i:6;}',
+  'delivery_callback' => '',
+  'fit' => '126',
+  'number_parts' => '7',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/menu/manage/translation/delete/%',
+  'title' => 'Delete translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/structure/menu/manage/translation/edit/%',
+  'load_functions' => 'a:1:{i:6;s:26:"i18n_menu_translation_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:15:"administer menu";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:26:"i18n_menu_translation_form";i:1;i:6;}',
+  'delivery_callback' => '',
+  'fit' => '126',
+  'number_parts' => '7',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/menu/manage/translation/edit/%',
+  'title' => 'Edit translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.admin.inc',
+))
 ->values(array(
   'path' => 'admin/structure/menu/parents',
   'load_functions' => '',
@@ -41558,8 +45101,8 @@
   'path' => 'admin/structure/taxonomy/%/display',
   'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:13:"taxonomy_term";i:2;i:3;i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -41584,7 +45127,7 @@
   'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:7:"default";i:3;s:11:"user_access";i:4;s:19:"administer taxonomy";}',
+  'access_arguments' => 'a:6:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:7:"default";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:13:"taxonomy_term";i:2;i:3;i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -41609,7 +45152,7 @@
   'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:4:"full";i:3;s:11:"user_access";i:4;s:19:"administer taxonomy";}',
+  'access_arguments' => 'a:6:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:4:"full";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:13:"taxonomy_term";i:2;i:3;i:3;s:4:"full";}',
   'delivery_callback' => '',
@@ -41658,8 +45201,8 @@
   'path' => 'admin/structure/taxonomy/%/fields',
   'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:3:{i:0;s:28:"field_ui_field_overview_form";i:1;s:13:"taxonomy_term";i:2;i:3;}',
   'delivery_callback' => '',
@@ -41683,8 +45226,8 @@
   'path' => 'admin/structure/taxonomy/%/fields/%',
   'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -41708,8 +45251,8 @@
   'path' => 'admin/structure/taxonomy/%/fields/%/delete',
   'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:26:"field_ui_field_delete_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -41733,8 +45276,8 @@
   'path' => 'admin/structure/taxonomy/%/fields/%/edit',
   'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -41758,8 +45301,8 @@
   'path' => 'admin/structure/taxonomy/%/fields/%/field-settings',
   'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:28:"field_ui_field_settings_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -41780,11 +45323,61 @@
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/structure/taxonomy/%/fields/%/widget-type',
+  'path' => 'admin/structure/taxonomy/%/fields/%/translate',
   'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:1:{i:0;i:5;}',
+  'delivery_callback' => '',
+  'fit' => '117',
+  'number_parts' => '7',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/taxonomy/%/fields/%',
+  'tab_root' => 'admin/structure/taxonomy/%/fields/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/fields/%/translate/%',
+  'load_functions' => 'a:3:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:7;a:1:{s:18:"i18n_language_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:2:{i:0;i:5;i:1;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '234',
+  'number_parts' => '8',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/taxonomy/%/fields/%/translate/%',
+  'title' => 'Instance',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/fields/%/widget-type',
+  'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}i:5;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:13:"taxonomy_term";i:1;i:3;i:2;s:1:"3";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:19:"administer taxonomy";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:25:"field_ui_widget_type_form";i:1;i:5;}',
   'delivery_callback' => '',
@@ -41804,6 +45397,31 @@
   'weight' => '0',
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/fields/replace/%',
+  'load_functions' => 'a:2:{i:3;a:1:{s:37:"taxonomy_vocabulary_machine_name_load";a:0:{}}i:6;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:28:"title_field_replacement_form";i:1;s:13:"taxonomy_term";i:2;i:3;i:3;i:6;}',
+  'delivery_callback' => '',
+  'fit' => '118',
+  'number_parts' => '7',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/taxonomy/%/fields/replace/%',
+  'title' => 'Replace fields',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/title/title.admin.inc',
+))
 ->values(array(
   'path' => 'admin/structure/taxonomy/%/list',
   'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
@@ -41829,6 +45447,181 @@
   'weight' => '-20',
   'include_file' => 'modules/taxonomy/taxonomy.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/list/list',
+  'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:19:"administer taxonomy";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:23:"taxonomy_overview_terms";i:1;i:3;}',
+  'delivery_callback' => '',
+  'fit' => '59',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/taxonomy/%/list',
+  'tab_root' => 'admin/structure/taxonomy/%',
+  'title' => 'Terms',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => '',
+  'position' => '',
+  'weight' => '-20',
+  'include_file' => 'modules/taxonomy/taxonomy.admin.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/list/sets',
+  'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_taxonomy_vocabulary_translation_tab_sets_access',
+  'access_arguments' => 'a:1:{i:0;i:3;}',
+  'page_callback' => 'i18n_taxonomy_translation_sets_overview',
+  'page_arguments' => 'a:1:{i:0;i:3;}',
+  'delivery_callback' => '',
+  'fit' => '59',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/taxonomy/%/list',
+  'tab_root' => 'admin/structure/taxonomy/%',
+  'title' => 'Translation sets',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.admin.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/list/sets/add',
+  'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_taxonomy_vocabulary_translation_tab_sets_access',
+  'access_arguments' => 'a:1:{i:0;i:3;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:35:"i18n_taxonomy_translation_term_form";i:1;i:3;}',
+  'delivery_callback' => '',
+  'fit' => '119',
+  'number_parts' => '7',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/taxonomy/%/list/sets',
+  'tab_root' => 'admin/structure/taxonomy/%',
+  'title' => 'Create new translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '388',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.admin.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/list/sets/delete/%',
+  'load_functions' => 'a:2:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";i:7;s:34:"i18n_taxonomy_translation_set_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_taxonomy_vocabulary_translation_tab_sets_access',
+  'access_arguments' => 'a:1:{i:0;i:3;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:2:{i:0;s:35:"i18n_translation_set_delete_confirm";i:1;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '238',
+  'number_parts' => '8',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/taxonomy/%/list/sets/delete/%',
+  'title' => 'Delete translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/list/sets/edit/%',
+  'load_functions' => 'a:2:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";i:7;s:34:"i18n_taxonomy_translation_set_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_taxonomy_vocabulary_translation_tab_sets_access',
+  'access_arguments' => 'a:1:{i:0;i:3;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:3:{i:0;s:35:"i18n_taxonomy_translation_term_form";i:1;i:3;i:2;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '238',
+  'number_parts' => '8',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/taxonomy/%/list/sets/edit/%',
+  'title' => 'Edit translation',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.admin.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/translate',
+  'load_functions' => 'a:1:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:19:"taxonomy_vocabulary";i:1;i:3;}',
+  'page_callback' => 'i18n_page_translate_localize',
+  'page_arguments' => 'a:2:{i:0;s:19:"taxonomy_vocabulary";i:1;i:3;}',
+  'delivery_callback' => '',
+  'fit' => '29',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/taxonomy/%',
+  'tab_root' => 'admin/structure/taxonomy/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/taxonomy/%/translate/%',
+  'load_functions' => 'a:2:{i:3;s:37:"taxonomy_vocabulary_machine_name_load";i:5;s:18:"i18n_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:19:"taxonomy_vocabulary";i:1;i:3;}',
+  'page_callback' => 'i18n_page_translate_localize',
+  'page_arguments' => 'a:3:{i:0;s:19:"taxonomy_vocabulary";i:1;i:3;i:2;i:5;}',
+  'delivery_callback' => '',
+  'fit' => '58',
+  'number_parts' => '6',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/taxonomy/%/translate/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
 ->values(array(
   'path' => 'admin/structure/taxonomy/add',
   'load_functions' => '',
@@ -42158,8 +45951,8 @@
   'path' => 'admin/structure/types/manage/%/comment/display',
   'load_functions' => 'a:1:{i:4;s:22:"comment_node_type_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:7:"comment";i:2;i:4;i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -42184,7 +45977,7 @@
   'load_functions' => 'a:1:{i:4;s:22:"comment_node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:7:"comment";i:1;i:4;i:2;s:7:"default";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:7:"comment";i:1;i:4;i:2;s:7:"default";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:7:"comment";i:2;i:4;i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -42209,7 +46002,7 @@
   'load_functions' => 'a:1:{i:4;s:22:"comment_node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:7:"comment";i:1;i:4;i:2;s:4:"full";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:7:"comment";i:1;i:4;i:2;s:4:"full";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:7:"comment";i:2;i:4;i:3;s:4:"full";}',
   'delivery_callback' => '',
@@ -42233,8 +46026,8 @@
   'path' => 'admin/structure/types/manage/%/comment/fields',
   'load_functions' => 'a:1:{i:4;s:22:"comment_node_type_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:3:{i:0;s:28:"field_ui_field_overview_form";i:1;s:7:"comment";i:2;i:4;}',
   'delivery_callback' => '',
@@ -42258,8 +46051,8 @@
   'path' => 'admin/structure/types/manage/%/comment/fields/%',
   'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:7;}',
   'delivery_callback' => '',
@@ -42283,8 +46076,8 @@
   'path' => 'admin/structure/types/manage/%/comment/fields/%/delete',
   'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:26:"field_ui_field_delete_form";i:1;i:7;}',
   'delivery_callback' => '',
@@ -42308,8 +46101,8 @@
   'path' => 'admin/structure/types/manage/%/comment/fields/%/edit',
   'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:7;}',
   'delivery_callback' => '',
@@ -42333,8 +46126,8 @@
   'path' => 'admin/structure/types/manage/%/comment/fields/%/field-settings',
   'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:28:"field_ui_field_settings_form";i:1;i:7;}',
   'delivery_callback' => '',
@@ -42355,11 +46148,61 @@
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/structure/types/manage/%/comment/fields/%/widget-type',
+  'path' => 'admin/structure/types/manage/%/comment/fields/%/translate',
+  'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:1:{i:0;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '493',
+  'number_parts' => '9',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/types/manage/%/comment/fields/%',
+  'tab_root' => 'admin/structure/types/manage/%/comment/fields/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/types/manage/%/comment/fields/%/translate/%i18n_language',
   'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:2:{i:0;i:7;i:1;i:9;}',
+  'delivery_callback' => '',
+  'fit' => '493',
+  'number_parts' => '9',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/types/manage/%/comment/fields/%/translate/%i18n_language',
+  'title' => 'Instance',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/types/manage/%/comment/fields/%/widget-type',
+  'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:7;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:7:"comment";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:25:"field_ui_widget_type_form";i:1;i:7;}',
   'delivery_callback' => '',
@@ -42379,6 +46222,31 @@
   'weight' => '0',
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/types/manage/%/comment/fields/replace/%',
+  'load_functions' => 'a:2:{i:4;a:1:{s:22:"comment_node_type_load";a:0:{}}i:8;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:28:"title_field_replacement_form";i:1;s:7:"comment";i:2;i:4;i:3;i:8;}',
+  'delivery_callback' => '',
+  'fit' => '494',
+  'number_parts' => '9',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/types/manage/%/comment/fields/replace/%',
+  'title' => 'Replace fields',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/title/title.admin.inc',
+))
 ->values(array(
   'path' => 'admin/structure/types/manage/%/delete',
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
@@ -42408,8 +46276,8 @@
   'path' => 'admin/structure/types/manage/%/display',
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -42434,7 +46302,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:7:"default";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:7:"default";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:7:"default";}',
   'delivery_callback' => '',
@@ -42459,7 +46327,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:4:"full";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:4:"full";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:4:"full";}',
   'delivery_callback' => '',
@@ -42484,7 +46352,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:5:"print";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:5:"print";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:5:"print";}',
   'delivery_callback' => '',
@@ -42509,7 +46377,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:3:"rss";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:3:"rss";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:3:"rss";}',
   'delivery_callback' => '',
@@ -42534,7 +46402,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:12:"search_index";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:12:"search_index";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:12:"search_index";}',
   'delivery_callback' => '',
@@ -42559,7 +46427,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:13:"search_result";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:13:"search_result";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:13:"search_result";}',
   'delivery_callback' => '',
@@ -42584,7 +46452,7 @@
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
   'access_callback' => '_field_ui_view_mode_menu_access',
-  'access_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:4;i:2;s:6:"teaser";i:3;s:11:"user_access";i:4;s:24:"administer content types";}',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:4;i:2;s:6:"teaser";i:3;s:21:"field_ui_admin_access";i:4;s:11:"user_access";i:5;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:4:{i:0;s:30:"field_ui_display_overview_form";i:1;s:4:"node";i:2;i:4;i:3;s:6:"teaser";}',
   'delivery_callback' => '',
@@ -42633,8 +46501,8 @@
   'path' => 'admin/structure/types/manage/%/fields',
   'load_functions' => 'a:1:{i:4;s:14:"node_type_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:3:{i:0;s:28:"field_ui_field_overview_form";i:1;s:4:"node";i:2;i:4;}',
   'delivery_callback' => '',
@@ -42658,8 +46526,8 @@
   'path' => 'admin/structure/types/manage/%/fields/%',
   'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:6;}',
   'delivery_callback' => '',
@@ -42683,8 +46551,8 @@
   'path' => 'admin/structure/types/manage/%/fields/%/delete',
   'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:26:"field_ui_field_delete_form";i:1;i:6;}',
   'delivery_callback' => '',
@@ -42708,8 +46576,8 @@
   'path' => 'admin/structure/types/manage/%/fields/%/edit',
   'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:24:"field_ui_field_edit_form";i:1;i:6;}',
   'delivery_callback' => '',
@@ -42733,8 +46601,8 @@
   'path' => 'admin/structure/types/manage/%/fields/%/field-settings',
   'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_access',
-  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:28:"field_ui_field_settings_form";i:1;i:6;}',
   'delivery_callback' => '',
@@ -42755,11 +46623,61 @@
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
 ->values(array(
-  'path' => 'admin/structure/types/manage/%/fields/%/widget-type',
+  'path' => 'admin/structure/types/manage/%/fields/%/translate',
   'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:1:{i:0;i:6;}',
+  'delivery_callback' => '',
+  'fit' => '245',
+  'number_parts' => '8',
+  'context' => '1',
+  'tab_parent' => 'admin/structure/types/manage/%/fields/%',
+  'tab_root' => 'admin/structure/types/manage/%/fields/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/types/manage/%/fields/%/translate/%',
+  'load_functions' => 'a:3:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:8;a:1:{s:18:"i18n_language_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'i18n_field_page_translate',
+  'page_arguments' => 'a:2:{i:0;i:6;i:1;i:8;}',
+  'delivery_callback' => '',
+  'fit' => '490',
+  'number_parts' => '9',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/types/manage/%/fields/%/translate/%',
+  'title' => 'Instance',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_field/i18n_field.pages.inc',
+))
+->values(array(
+  'path' => 'admin/structure/types/manage/%/fields/%/widget-type',
+  'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}i:6;a:1:{s:18:"field_ui_menu_load";a:4:{i:0;s:4:"node";i:1;i:4;i:2;s:1:"4";i:3;s:4:"%map";}}}',
+  'to_arg_functions' => '',
+  'access_callback' => 'field_ui_admin_access',
+  'access_arguments' => 'a:2:{i:0;s:11:"user_access";i:1;a:1:{i:0;s:24:"administer content types";}}',
   'page_callback' => 'drupal_get_form',
   'page_arguments' => 'a:2:{i:0;s:25:"field_ui_widget_type_form";i:1;i:6;}',
   'delivery_callback' => '',
@@ -42779,6 +46697,31 @@
   'weight' => '0',
   'include_file' => 'modules/field_ui/field_ui.admin.inc',
 ))
+->values(array(
+  'path' => 'admin/structure/types/manage/%/fields/replace/%',
+  'load_functions' => 'a:2:{i:4;a:1:{s:14:"node_type_load";a:0:{}}i:7;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:24:"administer content types";}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:28:"title_field_replacement_form";i:1;s:4:"node";i:2;i:4;i:3;i:7;}',
+  'delivery_callback' => '',
+  'fit' => '246',
+  'number_parts' => '8',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'admin/structure/types/manage/%/fields/replace/%',
+  'title' => 'Replace fields',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/title/title.admin.inc',
+))
 ->values(array(
   'path' => 'admin/tasks',
   'load_functions' => '',
@@ -43408,10 +47351,10 @@
   'path' => 'comment/%/edit',
   'load_functions' => 'a:1:{i:1;s:12:"comment_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'comment_access',
-  'access_arguments' => 'a:2:{i:0;s:4:"edit";i:1;i:1;}',
-  'page_callback' => 'comment_edit_page',
-  'page_arguments' => 'a:1:{i:0;i:1;}',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:6:{i:0;s:7:"comment";i:1;i:1;i:2;b:0;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:17:"comment_edit_page";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:14:"comment_access";s:16:"access arguments";a:2:{i:0;s:4:"edit";i:1;i:1;}s:4:"type";i:132;s:6:"weight";i:0;s:6:"module";s:7:"comment";}i:4;s:4:"edit";i:5;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:5:{i:0;s:7:"comment";i:1;i:1;i:2;b:0;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:17:"comment_edit_page";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:14:"comment_access";s:16:"access arguments";a:2:{i:0;s:4:"edit";i:1;i:1;}s:4:"type";i:132;s:6:"weight";i:0;s:6:"module";s:7:"comment";}i:4;i:1;}',
   'delivery_callback' => '',
   'fit' => '5',
   'number_parts' => '3',
@@ -43429,6 +47372,106 @@
   'weight' => '0',
   'include_file' => '',
 ))
+->values(array(
+  'path' => 'comment/%/edit/%',
+  'load_functions' => 'a:2:{i:1;s:12:"comment_load";i:3;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:6:{i:0;s:7:"comment";i:1;i:1;i:2;i:3;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:17:"comment_edit_page";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:14:"comment_access";s:16:"access arguments";a:2:{i:0;s:4:"edit";i:1;i:1;}s:4:"type";i:132;s:6:"weight";i:0;s:6:"module";s:7:"comment";}i:4;s:4:"edit";i:5;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:5:{i:0;s:7:"comment";i:1;i:1;i:2;i:3;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:17:"comment_edit_page";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:14:"comment_access";s:16:"access arguments";a:2:{i:0;s:4:"edit";i:1;i:1;}s:4:"type";i:132;s:6:"weight";i:0;s:6:"module";s:7:"comment";}i:4;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '10',
+  'number_parts' => '4',
+  'context' => '1',
+  'tab_parent' => 'comment/%/edit',
+  'tab_root' => 'comment/%',
+  'title' => 'Edit',
+  'title_callback' => 'entity_translation_edit_title',
+  'title_arguments' => 'a:1:{i:0;i:3;}',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'comment/%/edit/add/%/%',
+  'load_functions' => 'a:3:{i:1;s:12:"comment_load";i:4;s:32:"entity_translation_language_load";i:5;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_add_access',
+  'access_arguments' => 'a:7:{i:0;s:7:"comment";i:1;i:1;i:2;i:4;i:3;i:5;i:4;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:17:"comment_edit_page";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:14:"comment_access";s:16:"access arguments";a:2:{i:0;s:4:"edit";i:1;i:1;}s:4:"type";i:132;s:6:"weight";i:0;s:6:"module";s:7:"comment";}i:5;s:4:"edit";i:6;i:1;}',
+  'page_callback' => 'entity_translation_add_page',
+  'page_arguments' => 'a:6:{i:0;s:7:"comment";i:1;i:1;i:2;i:4;i:3;i:5;i:4;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:17:"comment_edit_page";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:14:"comment_access";s:16:"access arguments";a:2:{i:0;s:4:"edit";i:1;i:1;}s:4:"type";i:132;s:6:"weight";i:0;s:6:"module";s:7:"comment";}i:5;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '44',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'comment/%/edit',
+  'tab_root' => 'comment/%',
+  'title' => 'Edit',
+  'title_callback' => 'Add translation',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => '',
+))
+->values(array(
+  'path' => 'comment/%/translate',
+  'load_functions' => 'a:1:{i:1;s:12:"comment_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_tab_access',
+  'access_arguments' => 'a:2:{i:0;s:7:"comment";i:1;i:1;}',
+  'page_callback' => 'entity_translation_overview',
+  'page_arguments' => 'a:2:{i:0;s:7:"comment";i:1;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '5',
+  'number_parts' => '3',
+  'context' => '3',
+  'tab_parent' => 'comment/%',
+  'tab_root' => 'comment/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '1',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
+->values(array(
+  'path' => 'comment/%/translate/delete/%',
+  'load_functions' => 'a:2:{i:1;s:12:"comment_load";i:4;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_tab_access',
+  'access_arguments' => 'a:2:{i:0;s:7:"comment";i:1;i:1;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:33:"entity_translation_delete_confirm";i:1;s:7:"comment";i:2;i:1;i:3;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '22',
+  'number_parts' => '5',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'comment/%/translate/delete/%',
+  'title' => 'Delete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
 ->values(array(
   'path' => 'comment/%/view',
   'load_functions' => 'a:1:{i:1;N;}',
@@ -43754,6 +47797,31 @@
   'weight' => '0',
   'include_file' => '',
 ))
+->values(array(
+  'path' => 'entity_translation/taxonomy_term/autocomplete',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
+  'page_callback' => 'entity_translation_taxonomy_term_autocomplete',
+  'page_arguments' => 'a:0:{}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'entity_translation/taxonomy_term/autocomplete',
+  'title' => 'Entity translation autocomplete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => '',
+))
 ->values(array(
   'path' => 'file/ajax',
   'load_functions' => '',
@@ -43904,6 +47972,81 @@
   'weight' => '0',
   'include_file' => 'modules/forum/forum.pages.inc',
 ))
+->values(array(
+  'path' => 'i18n/taxonomy/autocomplete/language/%',
+  'load_functions' => 'a:1:{i:4;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
+  'page_callback' => 'i18n_taxonomy_autocomplete_language',
+  'page_arguments' => 'a:2:{i:0;i:4;i:1;N;}',
+  'delivery_callback' => '',
+  'fit' => '30',
+  'number_parts' => '5',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'i18n/taxonomy/autocomplete/language/%',
+  'title' => 'Autocomplete taxonomy',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.pages.inc',
+))
+->values(array(
+  'path' => 'i18n/taxonomy/autocomplete/vocabulary/%/%',
+  'load_functions' => 'a:2:{i:4;s:37:"taxonomy_vocabulary_machine_name_load";i:5;N;}',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
+  'page_callback' => 'i18n_taxonomy_autocomplete_language',
+  'page_arguments' => 'a:2:{i:0;i:5;i:1;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '60',
+  'number_parts' => '6',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'i18n/taxonomy/autocomplete/vocabulary/%/%',
+  'title' => 'Autocomplete taxonomy',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.pages.inc',
+))
+->values(array(
+  'path' => 'i18n_string/save',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'user_access',
+  'access_arguments' => 'a:1:{i:0;s:23:"use on-page translation";}',
+  'page_callback' => 'i18n_string_l10n_client_save_string',
+  'page_arguments' => 'a:0:{}',
+  'delivery_callback' => '',
+  'fit' => '3',
+  'number_parts' => '2',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'i18n_string/save',
+  'title' => 'Save string',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n_string/i18n_string.pages.inc',
+))
 ->values(array(
   'path' => 'node',
   'load_functions' => '',
@@ -43983,10 +48126,10 @@
   'path' => 'node/%/edit',
   'load_functions' => 'a:1:{i:1;s:9:"node_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'node_access',
-  'access_arguments' => 'a:2:{i:0;s:6:"update";i:1;i:1;}',
-  'page_callback' => 'node_page_edit',
-  'page_arguments' => 'a:1:{i:0;i:1;}',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:1;i:2;b:0;i:3;a:10:{s:5:"title";s:4:"Edit";s:13:"page callback";s:14:"node_page_edit";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:11:"node_access";s:16:"access arguments";a:2:{i:0;s:6:"update";i:1;i:1;}s:6:"weight";i:0;s:4:"type";i:132;s:7:"context";i:3;s:4:"file";s:14:"node.pages.inc";s:6:"module";s:4:"node";}i:4;s:6:"update";i:5;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:1;i:2;b:0;i:3;a:10:{s:5:"title";s:4:"Edit";s:13:"page callback";s:14:"node_page_edit";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:11:"node_access";s:16:"access arguments";a:2:{i:0;s:6:"update";i:1;i:1;}s:6:"weight";i:0;s:4:"type";i:132;s:7:"context";i:3;s:4:"file";s:14:"node.pages.inc";s:6:"module";s:4:"node";}i:4;i:1;}',
   'delivery_callback' => '',
   'fit' => '5',
   'number_parts' => '3',
@@ -44004,6 +48147,56 @@
   'weight' => '0',
   'include_file' => 'modules/node/node.pages.inc',
 ))
+->values(array(
+  'path' => 'node/%/edit/%',
+  'load_functions' => 'a:2:{i:1;s:9:"node_load";i:3;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:1;i:2;i:3;i:3;a:10:{s:5:"title";s:4:"Edit";s:13:"page callback";s:14:"node_page_edit";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:11:"node_access";s:16:"access arguments";a:2:{i:0;s:6:"update";i:1;i:1;}s:6:"weight";i:0;s:4:"type";i:132;s:7:"context";i:3;s:4:"file";s:14:"node.pages.inc";s:6:"module";s:4:"node";}i:4;s:6:"update";i:5;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:5:{i:0;s:4:"node";i:1;i:1;i:2;i:3;i:3;a:10:{s:5:"title";s:4:"Edit";s:13:"page callback";s:14:"node_page_edit";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:11:"node_access";s:16:"access arguments";a:2:{i:0;s:6:"update";i:1;i:1;}s:6:"weight";i:0;s:4:"type";i:132;s:7:"context";i:3;s:4:"file";s:14:"node.pages.inc";s:6:"module";s:4:"node";}i:4;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '10',
+  'number_parts' => '4',
+  'context' => '3',
+  'tab_parent' => 'node/%/edit',
+  'tab_root' => 'node/%',
+  'title' => 'Edit',
+  'title_callback' => 'entity_translation_edit_title',
+  'title_arguments' => 'a:1:{i:0;i:3;}',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/node/node.pages.inc',
+))
+->values(array(
+  'path' => 'node/%/edit/add/%/%',
+  'load_functions' => 'a:3:{i:1;s:9:"node_load";i:4;s:32:"entity_translation_language_load";i:5;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_add_access',
+  'access_arguments' => 'a:7:{i:0;s:4:"node";i:1;i:1;i:2;i:4;i:3;i:5;i:4;a:10:{s:5:"title";s:4:"Edit";s:13:"page callback";s:14:"node_page_edit";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:11:"node_access";s:16:"access arguments";a:2:{i:0;s:6:"update";i:1;i:1;}s:6:"weight";i:0;s:4:"type";i:132;s:7:"context";i:3;s:4:"file";s:14:"node.pages.inc";s:6:"module";s:4:"node";}i:5;s:6:"update";i:6;i:1;}',
+  'page_callback' => 'entity_translation_add_page',
+  'page_arguments' => 'a:6:{i:0;s:4:"node";i:1;i:1;i:2;i:4;i:3;i:5;i:4;a:10:{s:5:"title";s:4:"Edit";s:13:"page callback";s:14:"node_page_edit";s:14:"page arguments";a:1:{i:0;i:1;}s:15:"access callback";s:11:"node_access";s:16:"access arguments";a:2:{i:0;s:6:"update";i:1;i:1;}s:6:"weight";i:0;s:4:"type";i:132;s:7:"context";i:3;s:4:"file";s:14:"node.pages.inc";s:6:"module";s:4:"node";}i:5;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '44',
+  'number_parts' => '6',
+  'context' => '3',
+  'tab_parent' => 'node/%/edit',
+  'tab_root' => 'node/%',
+  'title' => 'Edit',
+  'title_callback' => 'Add translation',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/node/node.pages.inc',
+))
 ->values(array(
   'path' => 'node/%/outline',
   'load_functions' => 'a:1:{i:1;s:9:"node_load";}',
@@ -44183,14 +48376,14 @@
   'path' => 'node/%/translate',
   'load_functions' => 'a:1:{i:1;s:9:"node_load";}',
   'to_arg_functions' => '',
-  'access_callback' => '_translation_tab_access',
-  'access_arguments' => 'a:1:{i:0;i:1;}',
-  'page_callback' => 'translation_node_overview',
-  'page_arguments' => 'a:1:{i:0;i:1;}',
+  'access_callback' => 'entity_translation_node_tab_access',
+  'access_arguments' => 'a:3:{i:0;i:1;i:1;s:23:"_translation_tab_access";i:2;i:1;}',
+  'page_callback' => 'entity_translation_overview',
+  'page_arguments' => 'a:4:{i:0;s:4:"node";i:1;i:1;i:2;a:3:{s:13:"page callback";s:25:"translation_node_overview";s:4:"file";s:21:"translation.pages.inc";s:6:"module";s:11:"translation";}i:3;i:1;}',
   'delivery_callback' => '',
   'fit' => '5',
   'number_parts' => '3',
-  'context' => '1',
+  'context' => '3',
   'tab_parent' => 'node/%',
   'tab_root' => 'node/%',
   'title' => 'Translate',
@@ -44201,8 +48394,33 @@
   'type' => '132',
   'description' => '',
   'position' => '',
-  'weight' => '2',
-  'include_file' => 'modules/translation/translation.pages.inc',
+  'weight' => '1',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
+->values(array(
+  'path' => 'node/%/translate/delete/%',
+  'load_functions' => 'a:2:{i:1;s:9:"node_load";i:4;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_node_tab_access',
+  'access_arguments' => 'a:1:{i:0;i:1;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:33:"entity_translation_delete_confirm";i:1;s:4:"node";i:2;i:1;i:3;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '22',
+  'number_parts' => '5',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'node/%/translate/delete/%',
+  'title' => 'Delete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
 ))
 ->values(array(
   'path' => 'node/%/view',
@@ -44254,6 +48472,31 @@
   'weight' => '0',
   'include_file' => 'modules/node/node.pages.inc',
 ))
+->values(array(
+  'path' => 'node/add/a-thirty-two-character-type-name',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'node_access',
+  'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:32:"a_thirty_two_character_type_name";}',
+  'page_callback' => 'node_add',
+  'page_arguments' => 'a:1:{i:0;s:32:"a_thirty_two_character_type_name";}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'node/add/a-thirty-two-character-type-name',
+  'title' => 'Test long name',
+  'title_callback' => 'check_plain',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/node/node.pages.inc',
+))
 ->values(array(
   'path' => 'node/add/article',
   'load_functions' => '',
@@ -44329,6 +48572,31 @@
   'weight' => '0',
   'include_file' => 'modules/node/node.pages.inc',
 ))
+->values(array(
+  'path' => 'node/add/et',
+  'load_functions' => '',
+  'to_arg_functions' => '',
+  'access_callback' => 'node_access',
+  'access_arguments' => 'a:2:{i:0;s:6:"create";i:1;s:2:"et";}',
+  'page_callback' => 'node_add',
+  'page_arguments' => 'a:1:{i:0;s:2:"et";}',
+  'delivery_callback' => '',
+  'fit' => '7',
+  'number_parts' => '3',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'node/add/et',
+  'title' => 'Entity translation test',
+  'title_callback' => 'check_plain',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => 'Entity translation test',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/node/node.pages.inc',
+))
 ->values(array(
   'path' => 'node/add/forum',
   'load_functions' => '',
@@ -44529,56 +48797,6 @@
   'weight' => '0',
   'include_file' => 'modules/search/search.pages.inc',
 ))
-->values(array(
-  'path' => 'search/user',
-  'load_functions' => '',
-  'to_arg_functions' => '',
-  'access_callback' => '_search_menu_access',
-  'access_arguments' => 'a:1:{i:0;s:4:"user";}',
-  'page_callback' => 'search_view',
-  'page_arguments' => 'a:2:{i:0;s:4:"user";i:1;s:0:"";}',
-  'delivery_callback' => '',
-  'fit' => '3',
-  'number_parts' => '2',
-  'context' => '1',
-  'tab_parent' => 'search',
-  'tab_root' => 'search',
-  'title' => 'Users',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'theme_callback' => '',
-  'theme_arguments' => 'a:0:{}',
-  'type' => '132',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'include_file' => 'modules/search/search.pages.inc',
-))
-->values(array(
-  'path' => 'search/user/%',
-  'load_functions' => 'a:1:{i:2;a:1:{s:14:"menu_tail_load";a:2:{i:0;s:4:"%map";i:1;s:6:"%index";}}}',
-  'to_arg_functions' => 'a:1:{i:2;s:16:"menu_tail_to_arg";}',
-  'access_callback' => '_search_menu_access',
-  'access_arguments' => 'a:1:{i:0;s:4:"user";}',
-  'page_callback' => 'search_view',
-  'page_arguments' => 'a:2:{i:0;s:4:"user";i:1;i:2;}',
-  'delivery_callback' => '',
-  'fit' => '6',
-  'number_parts' => '3',
-  'context' => '1',
-  'tab_parent' => 'search/node',
-  'tab_root' => 'search/node/%',
-  'title' => 'Users',
-  'title_callback' => 't',
-  'title_arguments' => '',
-  'theme_callback' => '',
-  'theme_arguments' => 'a:0:{}',
-  'type' => '132',
-  'description' => '',
-  'position' => '',
-  'weight' => '0',
-  'include_file' => 'modules/search/search.pages.inc',
-))
 ->values(array(
   'path' => 'sites/default/files/styles/%',
   'load_functions' => 'a:1:{i:4;s:16:"image_style_load";}',
@@ -44735,7 +48953,7 @@
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'taxonomy_autocomplete',
+  'page_callback' => 'i18n_taxonomy_autocomplete_field',
   'page_arguments' => 'a:0:{}',
   'delivery_callback' => '',
   'fit' => '3',
@@ -44752,7 +48970,7 @@
   'description' => '',
   'position' => '',
   'weight' => '0',
-  'include_file' => 'modules/taxonomy/taxonomy.pages.inc',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.pages.inc',
 ))
 ->values(array(
   'path' => 'taxonomy/term/%',
@@ -44760,7 +48978,7 @@
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'taxonomy_term_page',
+  'page_callback' => 'i18n_taxonomy_term_page',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'delivery_callback' => '',
   'fit' => '6',
@@ -44769,7 +48987,7 @@
   'tab_parent' => '',
   'tab_root' => 'taxonomy/term/%',
   'title' => 'Taxonomy term',
-  'title_callback' => 'taxonomy_term_title',
+  'title_callback' => 'i18n_taxonomy_term_name',
   'title_arguments' => 'a:1:{i:0;i:2;}',
   'theme_callback' => '',
   'theme_arguments' => 'a:0:{}',
@@ -44777,16 +48995,16 @@
   'description' => '',
   'position' => '',
   'weight' => '0',
-  'include_file' => 'modules/taxonomy/taxonomy.pages.inc',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.pages.inc',
 ))
 ->values(array(
   'path' => 'taxonomy/term/%/edit',
   'load_functions' => 'a:1:{i:2;s:18:"taxonomy_term_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'taxonomy_term_edit_access',
-  'access_arguments' => 'a:1:{i:0;i:2;}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:5:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;b:0;i:3;a:9:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}s:15:"access callback";s:25:"taxonomy_term_edit_access";s:16:"access arguments";a:1:{i:0;i:2;}s:4:"type";i:132;s:6:"weight";i:10;s:4:"file";s:18:"taxonomy.admin.inc";s:6:"module";s:8:"taxonomy";}i:4;i:2;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:7:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;b:0;i:3;a:9:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}s:15:"access callback";s:25:"taxonomy_term_edit_access";s:16:"access arguments";a:1:{i:0;i:2;}s:4:"type";i:132;s:6:"weight";i:10;s:4:"file";s:18:"taxonomy.admin.inc";s:6:"module";s:8:"taxonomy";}i:4;s:18:"taxonomy_form_term";i:5;i:2;i:6;N;}',
   'delivery_callback' => '',
   'fit' => '13',
   'number_parts' => '4',
@@ -44804,6 +49022,56 @@
   'weight' => '10',
   'include_file' => 'modules/taxonomy/taxonomy.admin.inc',
 ))
+->values(array(
+  'path' => 'taxonomy/term/%/edit/%',
+  'load_functions' => 'a:2:{i:2;s:18:"taxonomy_term_load";i:4;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:5:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;i:4;i:3;a:9:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}s:15:"access callback";s:25:"taxonomy_term_edit_access";s:16:"access arguments";a:1:{i:0;i:2;}s:4:"type";i:132;s:6:"weight";i:10;s:4:"file";s:18:"taxonomy.admin.inc";s:6:"module";s:8:"taxonomy";}i:4;i:2;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:7:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;i:4;i:3;a:9:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}s:15:"access callback";s:25:"taxonomy_term_edit_access";s:16:"access arguments";a:1:{i:0;i:2;}s:4:"type";i:132;s:6:"weight";i:10;s:4:"file";s:18:"taxonomy.admin.inc";s:6:"module";s:8:"taxonomy";}i:4;s:18:"taxonomy_form_term";i:5;i:2;i:6;N;}',
+  'delivery_callback' => '',
+  'fit' => '26',
+  'number_parts' => '5',
+  'context' => '1',
+  'tab_parent' => 'taxonomy/term/%/edit',
+  'tab_root' => 'taxonomy/term/%',
+  'title' => 'Edit',
+  'title_callback' => 'entity_translation_edit_title',
+  'title_arguments' => 'a:1:{i:0;i:4;}',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => 'modules/taxonomy/taxonomy.admin.inc',
+))
+->values(array(
+  'path' => 'taxonomy/term/%/edit/add/%/%',
+  'load_functions' => 'a:3:{i:2;s:18:"taxonomy_term_load";i:5;s:32:"entity_translation_language_load";i:6;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_add_access',
+  'access_arguments' => 'a:6:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;i:5;i:3;i:6;i:4;a:9:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}s:15:"access callback";s:25:"taxonomy_term_edit_access";s:16:"access arguments";a:1:{i:0;i:2;}s:4:"type";i:132;s:6:"weight";i:10;s:4:"file";s:18:"taxonomy.admin.inc";s:6:"module";s:8:"taxonomy";}i:5;i:2;}',
+  'page_callback' => 'entity_translation_add_page',
+  'page_arguments' => 'a:8:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;i:5;i:3;i:6;i:4;a:9:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:3:{i:0;s:18:"taxonomy_form_term";i:1;i:2;i:2;N;}s:15:"access callback";s:25:"taxonomy_term_edit_access";s:16:"access arguments";a:1:{i:0;i:2;}s:4:"type";i:132;s:6:"weight";i:10;s:4:"file";s:18:"taxonomy.admin.inc";s:6:"module";s:8:"taxonomy";}i:5;s:18:"taxonomy_form_term";i:6;i:2;i:7;N;}',
+  'delivery_callback' => '',
+  'fit' => '108',
+  'number_parts' => '7',
+  'context' => '1',
+  'tab_parent' => 'taxonomy/term/%/edit',
+  'tab_root' => 'taxonomy/term/%',
+  'title' => 'Edit',
+  'title_callback' => 'Add translation',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '10',
+  'include_file' => 'modules/taxonomy/taxonomy.admin.inc',
+))
 ->values(array(
   'path' => 'taxonomy/term/%/feed',
   'load_functions' => 'a:1:{i:2;s:18:"taxonomy_term_load";}',
@@ -44829,13 +49097,88 @@
   'weight' => '0',
   'include_file' => 'modules/taxonomy/taxonomy.pages.inc',
 ))
+->values(array(
+  'path' => 'taxonomy/term/%/translate',
+  'load_functions' => 'a:1:{i:2;s:18:"taxonomy_term_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_taxonomy_term_tab_access',
+  'access_arguments' => 'a:4:{i:0;i:2;i:1;s:28:"i18n_object_translate_access";i:2;s:13:"taxonomy_term";i:3;i:2;}',
+  'page_callback' => 'entity_translation_overview',
+  'page_arguments' => 'a:5:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;a:3:{s:13:"page callback";s:23:"i18n_page_translate_tab";s:4:"file";s:14:"i18n.pages.inc";s:6:"module";s:4:"i18n";}i:3;s:13:"taxonomy_term";i:4;i:2;}',
+  'delivery_callback' => '',
+  'fit' => '13',
+  'number_parts' => '4',
+  'context' => '3',
+  'tab_parent' => 'taxonomy/term/%',
+  'tab_root' => 'taxonomy/term/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '11',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
+->values(array(
+  'path' => 'taxonomy/term/%/translate/%',
+  'load_functions' => 'a:2:{i:2;s:18:"taxonomy_term_load";i:4;s:18:"i18n_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'i18n_object_translate_access',
+  'access_arguments' => 'a:2:{i:0;s:13:"taxonomy_term";i:1;i:2;}',
+  'page_callback' => 'i18n_page_translate_tab',
+  'page_arguments' => 'a:3:{i:0;s:13:"taxonomy_term";i:1;i:2;i:2;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '26',
+  'number_parts' => '5',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'taxonomy/term/%/translate/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '0',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/i18n/i18n.pages.inc',
+))
+->values(array(
+  'path' => 'taxonomy/term/%/translate/delete/%',
+  'load_functions' => 'a:2:{i:2;s:18:"taxonomy_term_load";i:5;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_taxonomy_term_tab_access',
+  'access_arguments' => 'a:4:{i:0;i:2;i:1;s:28:"i18n_object_translate_access";i:2;s:13:"taxonomy_term";i:3;i:2;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:33:"entity_translation_delete_confirm";i:1;s:13:"taxonomy_term";i:2;i:2;i:3;i:5;}',
+  'delivery_callback' => '',
+  'fit' => '54',
+  'number_parts' => '6',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'taxonomy/term/%/translate/delete/%',
+  'title' => 'Delete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
 ->values(array(
   'path' => 'taxonomy/term/%/view',
   'load_functions' => 'a:1:{i:2;s:18:"taxonomy_term_load";}',
   'to_arg_functions' => '',
   'access_callback' => 'user_access',
   'access_arguments' => 'a:1:{i:0;s:14:"access content";}',
-  'page_callback' => 'taxonomy_term_page',
+  'page_callback' => 'i18n_taxonomy_term_page',
   'page_arguments' => 'a:1:{i:0;i:2;}',
   'delivery_callback' => '',
   'fit' => '13',
@@ -44852,7 +49195,7 @@
   'description' => '',
   'position' => '',
   'weight' => '0',
-  'include_file' => 'modules/taxonomy/taxonomy.pages.inc',
+  'include_file' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.pages.inc',
 ))
 ->values(array(
   'path' => 'toolbar/toggle',
@@ -45083,10 +49426,10 @@
   'path' => 'user/%/edit',
   'load_functions' => 'a:1:{i:1;s:9:"user_load";}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_edit_access',
-  'access_arguments' => 'a:1:{i:0;i:1;}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:5:{i:0;s:4:"user";i:1;i:1;i:2;b:0;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:4;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:6:{i:0;s:4:"user";i:1;i:1;i:2;b:0;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:4;s:17:"user_profile_form";i:5;i:1;}',
   'delivery_callback' => '',
   'fit' => '5',
   'number_parts' => '3',
@@ -45104,14 +49447,39 @@
   'weight' => '0',
   'include_file' => 'modules/user/user.pages.inc',
 ))
+->values(array(
+  'path' => 'user/%/edit/%',
+  'load_functions' => 'a:2:{i:1;s:9:"user_load";i:3;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:5:{i:0;s:4:"user";i:1;i:1;i:2;i:3;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:4;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:6:{i:0;s:4:"user";i:1;i:1;i:2;i:3;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:4;s:17:"user_profile_form";i:5;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '10',
+  'number_parts' => '4',
+  'context' => '1',
+  'tab_parent' => 'user/%/edit',
+  'tab_root' => 'user/%',
+  'title' => 'Edit',
+  'title_callback' => 'entity_translation_edit_title',
+  'title_arguments' => 'a:1:{i:0;i:3;}',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '140',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/user/user.pages.inc',
+))
 ->values(array(
   'path' => 'user/%/edit/account',
   'load_functions' => 'a:1:{i:1;a:1:{s:18:"user_category_load";a:2:{i:0;s:4:"%map";i:1;s:6:"%index";}}}',
   'to_arg_functions' => '',
-  'access_callback' => 'user_edit_access',
-  'access_arguments' => 'a:1:{i:0;i:1;}',
-  'page_callback' => 'drupal_get_form',
-  'page_arguments' => 'a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}',
+  'access_callback' => 'entity_translation_edit_access',
+  'access_arguments' => 'a:5:{i:0;s:4:"user";i:1;i:1;i:2;b:0;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:4;i:1;}',
+  'page_callback' => 'entity_translation_edit_page',
+  'page_arguments' => 'a:6:{i:0;s:4:"user";i:1;i:1;i:2;b:0;i:3;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:4;s:17:"user_profile_form";i:5;i:1;}',
   'delivery_callback' => '',
   'fit' => '11',
   'number_parts' => '4',
@@ -45129,6 +49497,31 @@
   'weight' => '0',
   'include_file' => 'modules/user/user.pages.inc',
 ))
+->values(array(
+  'path' => 'user/%/edit/add/%/%',
+  'load_functions' => 'a:3:{i:1;s:9:"user_load";i:4;s:32:"entity_translation_language_load";i:5;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_add_access',
+  'access_arguments' => 'a:6:{i:0;s:4:"user";i:1;i:1;i:2;i:4;i:3;i:5;i:4;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:5;i:1;}',
+  'page_callback' => 'entity_translation_add_page',
+  'page_arguments' => 'a:7:{i:0;s:4:"user";i:1;i:1;i:2;i:4;i:3;i:5;i:4;a:8:{s:5:"title";s:4:"Edit";s:13:"page callback";s:15:"drupal_get_form";s:14:"page arguments";a:2:{i:0;s:17:"user_profile_form";i:1;i:1;}s:15:"access callback";s:16:"user_edit_access";s:16:"access arguments";a:1:{i:0;i:1;}s:4:"type";i:132;s:4:"file";s:14:"user.pages.inc";s:6:"module";s:4:"user";}i:5;s:17:"user_profile_form";i:6;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '44',
+  'number_parts' => '6',
+  'context' => '1',
+  'tab_parent' => 'user/%/edit',
+  'tab_root' => 'user/%',
+  'title' => 'Edit',
+  'title_callback' => 'Add translation',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'modules/user/user.pages.inc',
+))
 ->values(array(
   'path' => 'user/%/shortcuts',
   'load_functions' => 'a:1:{i:1;s:9:"user_load";}',
@@ -45229,6 +49622,56 @@
   'weight' => '2',
   'include_file' => 'modules/statistics/statistics.pages.inc',
 ))
+->values(array(
+  'path' => 'user/%/translate',
+  'load_functions' => 'a:1:{i:1;s:9:"user_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_tab_access',
+  'access_arguments' => 'a:2:{i:0;s:4:"user";i:1;i:1;}',
+  'page_callback' => 'entity_translation_overview',
+  'page_arguments' => 'a:2:{i:0;s:4:"user";i:1;i:1;}',
+  'delivery_callback' => '',
+  'fit' => '5',
+  'number_parts' => '3',
+  'context' => '3',
+  'tab_parent' => 'user/%',
+  'tab_root' => 'user/%',
+  'title' => 'Translate',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '132',
+  'description' => '',
+  'position' => '',
+  'weight' => '2',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
+->values(array(
+  'path' => 'user/%/translate/delete/%',
+  'load_functions' => 'a:2:{i:1;s:9:"user_load";i:4;s:32:"entity_translation_language_load";}',
+  'to_arg_functions' => '',
+  'access_callback' => 'entity_translation_tab_access',
+  'access_arguments' => 'a:2:{i:0;s:4:"user";i:1;i:1;}',
+  'page_callback' => 'drupal_get_form',
+  'page_arguments' => 'a:4:{i:0;s:33:"entity_translation_delete_confirm";i:1;s:4:"user";i:2;i:1;i:3;i:4;}',
+  'delivery_callback' => '',
+  'fit' => '22',
+  'number_parts' => '5',
+  'context' => '0',
+  'tab_parent' => '',
+  'tab_root' => 'user/%/translate/delete/%',
+  'title' => 'Delete',
+  'title_callback' => 't',
+  'title_arguments' => '',
+  'theme_callback' => '',
+  'theme_arguments' => 'a:0:{}',
+  'type' => '6',
+  'description' => '',
+  'position' => '',
+  'weight' => '0',
+  'include_file' => 'sites/all/modules/entity_translation/entity_translation.admin.inc',
+))
 ->values(array(
   'path' => 'user/%/view',
   'load_functions' => 'a:1:{i:1;s:9:"user_load";}',
@@ -46406,6 +50849,21 @@
   'disabled' => '0',
   'orig_type' => 'article',
 ))
+->values(array(
+  'type' => 'a_thirty_two_character_type_name',
+  'name' => 'Test long name',
+  'base' => 'node_content',
+  'module' => 'node',
+  'description' => '',
+  'help' => '',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'disabled' => '0',
+  'orig_type' => 'page',
+))
 ->values(array(
   'type' => 'blog',
   'name' => 'Blog entry',
@@ -46436,6 +50894,21 @@
   'disabled' => '0',
   'orig_type' => 'book',
 ))
+->values(array(
+  'type' => 'et',
+  'name' => 'Entity translation test',
+  'base' => 'node_content',
+  'module' => 'node',
+  'description' => 'Entity translation test',
+  'help' => 'Help text foret pages',
+  'has_title' => '1',
+  'title_label' => 'Title',
+  'custom' => '1',
+  'modified' => '1',
+  'locked' => '0',
+  'disabled' => '0',
+  'orig_type' => 'et',
+))
 ->values(array(
   'type' => 'forum',
   'name' => 'Forum topic',
@@ -46481,38 +50954,7 @@
   'disabled' => '0',
   'orig_type' => 'test_content_type',
 ))
-->values(array(
-  'type' => 'et',
-  'name' => 'Entity translation test',
-  'base' => 'node_content',
-  'module' => 'node',
-  'description' => 'Entity translation test',
-  'help' => 'Help text foret pages',
-  'has_title' => '1',
-  'title_label' => 'Title',
-  'custom' => '1',
-  'modified' => '1',
-  'locked' => '0',
-  'disabled' => '0',
-  'orig_type' => 'et',
-))
- ->values(array(
-  'type' => 'a_thirty_two_character_type_name',
-  'name' => 'Test long name',
-  'base' => 'node_content',
-  'module' => 'node',
-  'description' => '',
-  'help' => '',
-  'has_title' => '1',
-  'title_label' => 'Title',
-  'custom' => '1',
-  'modified' => '1',
-  'locked' => '0',
-  'disabled' => '0',
-  'orig_type' => 'page',
-))
 ->execute();
-
 $connection->schema()->createTable('picture_mapping', array(
   'fields' => array(
     'label' => array(
@@ -46556,7 +50998,6 @@
   'mapping' => 'a:2:{s:38:"breakpoints.theme.my_theme_id.computer";a:3:{s:12:"multiplier_1";a:2:{s:12:"mapping_type";s:11:"image_style";s:11:"image_style";s:20:"custom_image_style_1";}s:12:"multiplier_2";a:3:{s:12:"mapping_type";s:5:"sizes";s:5:"sizes";i:2;s:18:"sizes_image_styles";a:2:{i:0;s:20:"custom_image_style_1";i:1;s:20:"custom_image_style_2";}}s:12:"multiplier_3";a:1:{s:12:"mapping_type";s:5:"_none";}}s:41:"breakpoints.theme.my_theme_id.computertwo";a:1:{s:12:"multiplier_2";a:3:{s:12:"mapping_type";s:5:"sizes";s:5:"sizes";i:2;s:18:"sizes_image_styles";a:2:{i:0;s:20:"custom_image_style_1";i:1;s:20:"custom_image_style_2";}}}}',
 ))
 ->execute();
-
 $connection->schema()->createTable('queue', array(
   'fields' => array(
     'item_id' => array(
@@ -46595,6 +51036,22 @@
   'mysql_character_set' => 'utf8',
 ));
 
+$connection->insert('queue')
+->fields(array(
+  'item_id',
+  'name',
+  'data',
+  'expire',
+  'created',
+))
+->values(array(
+  'item_id' => '129',
+  'name' => 'update_fetch_tasks',
+  'data' => 'a:8:{s:4:"name";s:6:"drupal";s:4:"info";a:6:{s:4:"name";s:10:"Aggregator";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:7:"project";s:6:"drupal";s:16:"_info_file_ctime";i:1664863480;s:9:"datestamp";i:0;}s:9:"datestamp";i:0;s:8:"includes";a:41:{s:10:"aggregator";s:10:"Aggregator";s:5:"block";s:5:"Block";s:4:"blog";s:4:"Blog";s:4:"book";s:4:"Book";s:5:"color";s:5:"Color";s:7:"comment";s:7:"Comment";s:7:"contact";s:7:"Contact";s:10:"contextual";s:16:"Contextual links";s:9:"dashboard";s:9:"Dashboard";s:5:"dblog";s:16:"Database logging";s:5:"field";s:5:"Field";s:17:"field_sql_storage";s:17:"Field SQL storage";s:8:"field_ui";s:8:"Field UI";s:4:"file";s:4:"File";s:6:"filter";s:6:"Filter";s:5:"forum";s:5:"Forum";s:4:"help";s:4:"Help";s:5:"image";s:5:"Image";s:4:"list";s:4:"List";s:6:"locale";s:6:"Locale";s:4:"menu";s:4:"Menu";s:4:"node";s:4:"Node";s:6:"number";s:6:"Number";s:7:"options";s:7:"Options";s:7:"overlay";s:7:"Overlay";s:4:"path";s:4:"Path";s:3:"php";s:10:"PHP filter";s:3:"rdf";s:3:"RDF";s:6:"search";s:6:"Search";s:8:"shortcut";s:8:"Shortcut";s:10:"statistics";s:10:"Statistics";s:6:"system";s:6:"System";s:8:"taxonomy";s:8:"Taxonomy";s:4:"text";s:4:"Text";s:7:"toolbar";s:7:"Toolbar";s:7:"tracker";s:7:"Tracker";s:11:"translation";s:19:"Content translation";s:6:"update";s:14:"Update manager";s:4:"user";s:4:"User";s:6:"bartik";s:6:"Bartik";s:5:"seven";s:5:"Seven";}s:12:"project_type";s:4:"core";s:14:"project_status";b:1;s:10:"sub_themes";a:0:{}s:11:"base_themes";a:0:{}}',
+  'expire' => '0',
+  'created' => '1664931778',
+))
+->execute();
 $connection->schema()->createTable('rdf_mapping', array(
   'fields' => array(
     'type' => array(
@@ -46641,16 +51098,16 @@
   'bundle' => 'forum',
   'mapping' => 'a:10:{s:7:"rdftype";a:2:{i:0;s:9:"sioc:Post";i:1;s:15:"sioct:BoardPost";}s:15:"taxonomy_forums";a:2:{s:10:"predicates";a:1:{i:0;s:18:"sioc:has_container";}s:4:"type";s:3:"rel";}s:5:"title";a:1:{s:10:"predicates";a:1:{i:0;s:8:"dc:title";}}s:7:"created";a:3:{s:10:"predicates";a:2:{i:0;s:7:"dc:date";i:1;s:10:"dc:created";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}s:7:"changed";a:3:{s:10:"predicates";a:1:{i:0;s:11:"dc:modified";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}s:4:"body";a:1:{s:10:"predicates";a:1:{i:0;s:15:"content:encoded";}}s:3:"uid";a:2:{s:10:"predicates";a:1:{i:0;s:16:"sioc:has_creator";}s:4:"type";s:3:"rel";}s:4:"name";a:1:{s:10:"predicates";a:1:{i:0;s:9:"foaf:name";}}s:13:"comment_count";a:2:{s:10:"predicates";a:1:{i:0;s:16:"sioc:num_replies";}s:8:"datatype";s:11:"xsd:integer";}s:13:"last_activity";a:3:{s:10:"predicates";a:1:{i:0;s:23:"sioc:last_activity_date";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}}',
 ))
-->values(array(
-  'type' => 'taxonomy_term',
-  'bundle' => 'forums',
-  'mapping' => 'a:5:{s:7:"rdftype";a:2:{i:0;s:14:"sioc:Container";i:1;s:10:"sioc:Forum";}s:4:"name";a:1:{s:10:"predicates";a:2:{i:0;s:10:"rdfs:label";i:1;s:14:"skos:prefLabel";}}s:11:"description";a:1:{s:10:"predicates";a:1:{i:0;s:15:"skos:definition";}}s:3:"vid";a:2:{s:10:"predicates";a:1:{i:0;s:13:"skos:inScheme";}s:4:"type";s:3:"rel";}s:6:"parent";a:2:{s:10:"predicates";a:1:{i:0;s:12:"skos:broader";}s:4:"type";s:3:"rel";}}',
-))
 ->values(array(
   'type' => 'node',
   'bundle' => 'page',
   'mapping' => 'a:9:{s:7:"rdftype";a:1:{i:0;s:13:"foaf:Document";}s:5:"title";a:1:{s:10:"predicates";a:1:{i:0;s:8:"dc:title";}}s:7:"created";a:3:{s:10:"predicates";a:2:{i:0;s:7:"dc:date";i:1;s:10:"dc:created";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}s:7:"changed";a:3:{s:10:"predicates";a:1:{i:0;s:11:"dc:modified";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}s:4:"body";a:1:{s:10:"predicates";a:1:{i:0;s:15:"content:encoded";}}s:3:"uid";a:2:{s:10:"predicates";a:1:{i:0;s:16:"sioc:has_creator";}s:4:"type";s:3:"rel";}s:4:"name";a:1:{s:10:"predicates";a:1:{i:0;s:9:"foaf:name";}}s:13:"comment_count";a:2:{s:10:"predicates";a:1:{i:0;s:16:"sioc:num_replies";}s:8:"datatype";s:11:"xsd:integer";}s:13:"last_activity";a:3:{s:10:"predicates";a:1:{i:0;s:23:"sioc:last_activity_date";}s:8:"datatype";s:12:"xsd:dateTime";s:8:"callback";s:12:"date_iso8601";}}',
 ))
+->values(array(
+  'type' => 'taxonomy_term',
+  'bundle' => 'forums',
+  'mapping' => 'a:5:{s:7:"rdftype";a:2:{i:0;s:14:"sioc:Container";i:1;s:10:"sioc:Forum";}s:4:"name";a:1:{s:10:"predicates";a:2:{i:0;s:10:"rdfs:label";i:1;s:14:"skos:prefLabel";}}s:11:"description";a:1:{s:10:"predicates";a:1:{i:0;s:15:"skos:definition";}}s:3:"vid";a:2:{s:10:"predicates";a:1:{i:0;s:13:"skos:inScheme";}s:4:"type";s:3:"rel";}s:6:"parent";a:2:{s:10:"predicates";a:1:{i:0;s:12:"skos:broader";}s:4:"type";s:3:"rel";}}',
+))
 ->execute();
 $connection->schema()->createTable('registry', array(
   'fields' => array(
@@ -46928,63 +51385,70 @@
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockCacheTestCase',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockHashTestCase',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockHiddenRegionTestCase',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockHTMLIdTestCase',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'BlockInterestCohortTest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/common.test',
+  'module' => 'simpletest',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockInvalidRegionTestCase',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockTemplateSuggestionsUnitTest',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockTestCase',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlockViewModuleDeltaAlterWebTest',
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'BlogTestCase',
@@ -47021,6 +51485,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'BootstrapGetFilenameWebTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/bootstrap.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'BootstrapIPAddressTestCase',
   'type' => 'class',
@@ -47231,6 +51702,13 @@
   'module' => 'color',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'ColorUnitTestCase',
+  'type' => 'class',
+  'filename' => 'modules/color/color.test',
+  'module' => 'color',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'CommentActionsTestCase',
   'type' => 'class',
@@ -47343,6 +51821,13 @@
   'module' => 'comment',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'CommentUninstallTestCase',
+  'type' => 'class',
+  'filename' => 'modules/comment/comment.test',
+  'module' => 'comment',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'CommentUpgradePathTestCase',
   'type' => 'class',
@@ -47364,6 +51849,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'CommonURLWebTest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/common.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'CommonXssUnitTest',
   'type' => 'class',
@@ -47434,25 +51926,11 @@
   'module' => 'phone',
   'weight' => '0',
 ))
-->values(array(
-  'name' => 'CtoolsContextIDTestCase',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/tests/context.test',
-  'module' => 'ctools',
-  'weight' => '0',
-))
 ->values(array(
   'name' => 'CtoolsContextKeywordsSubstitutionTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/ctools/tests/context.test',
-  'module' => 'ctools',
-  'weight' => '0',
-))
-->values(array(
-  'name' => 'CtoolsContextUnitTestCase',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/tests/context.test',
-  'module' => 'ctools',
+  'module' => 'ctools_plugin_test',
   'weight' => '0',
 ))
 ->values(array(
@@ -47462,18 +51940,11 @@
   'module' => 'ctools',
   'weight' => '0',
 ))
-->values(array(
-  'name' => 'CtoolsCSSObjectCache',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/tests/css_cache.test',
-  'module' => 'ctools',
-  'weight' => '0',
-))
 ->values(array(
   'name' => 'CtoolsCssTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/ctools/tests/css.test',
-  'module' => 'ctools',
+  'module' => 'ctools_plugin_test',
   'weight' => '0',
 ))
 ->values(array(
@@ -47487,49 +51958,28 @@
   'name' => 'CtoolsMathExpressionStackTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/ctools/tests/math_expression_stack.test',
-  'module' => 'ctools',
+  'module' => 'ctools_plugin_test',
   'weight' => '0',
 ))
 ->values(array(
   'name' => 'CtoolsMathExpressionTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/ctools/tests/math_expression.test',
-  'module' => 'ctools',
-  'weight' => '0',
-))
-->values(array(
-  'name' => 'CtoolsModuleTestCase',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/tests/ctools.test',
-  'module' => 'ctools',
+  'module' => 'ctools_plugin_test',
   'weight' => '0',
 ))
 ->values(array(
   'name' => 'CtoolsObjectCache',
   'type' => 'class',
   'filename' => 'sites/all/modules/ctools/tests/object_cache.test',
-  'module' => 'ctools',
-  'weight' => '0',
-))
-->values(array(
-  'name' => 'CtoolsPageTokens',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/tests/page_tokens.test',
-  'module' => 'ctools',
+  'module' => 'ctools_plugin_test',
   'weight' => '0',
 ))
 ->values(array(
   'name' => 'CtoolsPluginsGetInfoTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/ctools/tests/ctools.plugins.test',
-  'module' => 'ctools',
-  'weight' => '0',
-))
-->values(array(
-  'name' => 'CtoolsUnitObjectCachePlugins',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/tests/object_cache_unit.test',
-  'module' => 'ctools',
+  'module' => 'ctools_plugin_test',
   'weight' => '0',
 ))
 ->values(array(
@@ -47777,6 +52227,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DatabaseReservedKeywordTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/database_test.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DatabaseSchema',
   'type' => 'class',
@@ -47917,6 +52374,13 @@
   'module' => '',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DatabaseTablePrefixTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/database_test.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DatabaseTaggingTestCase',
   'type' => 'class',
@@ -48044,37 +52508,58 @@
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'DateAPITestCase',
+  'name' => 'DateAllDayUiTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_all_day/tests/DateAllDayUiTestCase.test',
+  'module' => 'date_all_day',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DateApiTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_api/tests/DateApiTestCase.test',
+  'module' => 'date_api',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DateApiUnitTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_api/tests/DateApiUnitTestCase.test',
+  'module' => 'date_api',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DateEmwTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_api.test',
+  'filename' => 'sites/all/modules/date/tests/DateEmwTestCase.test',
   'module' => 'date',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'DateFieldBasic',
+  'name' => 'DateFieldTestBase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_field.test',
+  'filename' => 'sites/all/modules/date/tests/DateFieldTestBase.test',
   'module' => 'date',
   'weight' => '0',
 ))
 ->values(array(
   'name' => 'DateFieldTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_field.test',
+  'filename' => 'sites/all/modules/date/tests/DateFieldTestCase.test',
   'module' => 'date',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'DateFormTestCase',
+  'name' => 'DateFormatTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_form.test',
-  'module' => 'date',
+  'filename' => 'modules/system/system.test',
+  'module' => 'system',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'DateMigrateExampleUnitTest',
+  'name' => 'DateFormTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_migrate.test',
+  'filename' => 'sites/all/modules/date/tests/DateFormTestCase.test',
   'module' => 'date',
   'weight' => '0',
 ))
@@ -48085,6 +52570,20 @@
   'module' => 'date',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DateMigrateTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/tests/DateMigrateTestCase.test',
+  'module' => 'date',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DateNowUnitTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/tests/DateNowUnitTestCase.test',
+  'module' => 'date',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DateObject',
   'type' => 'class',
@@ -48092,6 +52591,34 @@
   'module' => 'date_api',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DatePopupFieldTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_popup/tests/DatePopupFieldTestCase.test',
+  'module' => 'date_popup',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DatePopupValidationTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_popup/tests/DatePopupValidationTestCase.test',
+  'module' => 'date_popup',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DatePopupWithViewsTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_popup/tests/DatePopupWithViewsTestCase.test',
+  'module' => 'date_popup',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'DateRepeatFieldTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/date/date_repeat_field/tests/DateRepeatFieldTestCase.test',
+  'module' => 'date_repeat_field',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DateRepeatFormTestCase',
   'type' => 'class',
@@ -48116,36 +52643,36 @@
 ->values(array(
   'name' => 'DateTimezoneTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_timezone.test',
+  'filename' => 'sites/all/modules/date/tests/DateTimezoneTestCase.test',
   'module' => 'date',
   'weight' => '0',
 ))
 ->values(array(
   'name' => 'DateToolsTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/date_tools/tests/date_tools.test',
+  'filename' => 'sites/all/modules/date/date_tools/tests/DateToolsTestCase.test',
   'module' => 'date_tools',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'DateUITestCase',
+  'name' => 'DateUiTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date.test',
+  'filename' => 'sites/all/modules/date/tests/DateUiTestCase.test',
   'module' => 'date',
   'weight' => '0',
 ))
 ->values(array(
   'name' => 'DateValidationTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_validation.test',
+  'filename' => 'sites/all/modules/date/tests/DateValidationTestCase.test',
   'module' => 'date',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'DateViewsPopupTestCase',
+  'name' => 'DateViewsFilterTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_views_popup.test',
-  'module' => 'date',
+  'filename' => 'sites/all/modules/date/date_views/tests/date_views_filter.test',
+  'module' => 'date_views',
   'weight' => '0',
 ))
 ->values(array(
@@ -48197,6 +52724,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DrupalAddHtmlHeadLinkTest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/common.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DrupalAlterTestCase',
   'type' => 'class',
@@ -48309,6 +52843,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DrupalHTTPRedirectTest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/common.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DrupalHTTPRequestTestCase',
   'type' => 'class',
@@ -48328,14 +52869,14 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/i18n/i18n.test',
   'module' => 'i18n',
-  'weight' => '10',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'Drupali18nTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/i18n/i18n.test',
   'module' => 'i18n',
-  'weight' => '10',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'DrupalJSONTest',
@@ -48400,6 +52941,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'DrupalRequestSanitizer',
+  'type' => 'class',
+  'filename' => 'includes/request-sanitizer.inc',
+  'module' => '',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'DrupalSetContentTestCase',
   'type' => 'class',
@@ -48813,6 +53361,13 @@
   'module' => 'entityreference',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'EntityReferenceFieldTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entityreference/tests/entityreference.field.test',
+  'module' => 'entityreference',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'EntityReferenceHandlersTestCase',
   'type' => 'class',
@@ -48944,49 +53499,126 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.comment.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationCommentTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationContentTranslationTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityTranslationDefaultHandler',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityTranslationHandlerFactory',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler_factory.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityTranslationHandlerInterface',
   'type' => 'interface',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationHierarchyTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationHookTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationIntegrationTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationMenuTranslationTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.test',
+  'module' => 'entity_translation_i18n_menu',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityTranslationNodeHandler',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.node.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationTaxonomyAutocompleteTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityTranslationTaxonomyTermHandler',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.taxonomy_term.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationToggleFieldsTranslatabilityTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationTranslationTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'module' => 'entity_translation',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'EntityTranslationUpgradeTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/entity_translation/entity_translation_upgrade/entity_translation_upgrade.test',
+  'module' => 'entity_translation_upgrade',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityTranslationUserHandler',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.user.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'EntityValueWrapper',
@@ -49007,49 +53639,49 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_field_field.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_translation_handler_field_label',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_field_label.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_translation_handler_field_translate_link',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_field_translate_link.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_translation_handler_filter_entity_type',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_filter_entity_type.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_translation_handler_filter_language',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_filter_language.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_translation_handler_filter_translation_exists',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_filter_translation_exists.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_translation_handler_relationship',
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_relationship.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'entity_views_handler_area_entity',
@@ -49359,6 +53991,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'FileFieldAnonymousSubmission',
+  'type' => 'class',
+  'filename' => 'modules/file/tests/file.test',
+  'module' => 'file',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'FileFieldDisplayTestCase',
   'type' => 'class',
@@ -49471,6 +54110,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'FileScanDirectory',
+  'type' => 'class',
+  'filename' => 'modules/file/tests/file.test',
+  'module' => 'file',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'FileScanDirectoryTest',
   'type' => 'class',
@@ -49499,6 +54145,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'FileThemeImplementationsTestCase',
+  'type' => 'class',
+  'filename' => 'modules/file/tests/file.test',
+  'module' => 'file',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'FileTokenReplaceTestCase',
   'type' => 'class',
@@ -49786,6 +54439,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'FormsFormCacheTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/form.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'FormsFormStoragePageCacheTestCase',
   'type' => 'class',
@@ -49856,6 +54516,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'FormTextareaTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/form.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'FormValidationTestCase',
   'type' => 'class',
@@ -49898,13 +54565,6 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
-->values(array(
-  'name' => 'HeadLinksTestCase',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/ctools/page_manager/tests/head_links.test',
-  'module' => 'page_manager',
-  'weight' => '0',
-))
 ->values(array(
   'name' => 'HelpTestCase',
   'type' => 'class',
@@ -49926,6 +54586,13 @@
   'module' => 'system',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'HtaccessTest',
+  'type' => 'class',
+  'filename' => 'modules/system/system.test',
+  'module' => 'system',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'HTMLIdTestCase',
   'type' => 'class',
@@ -49940,6 +54607,195 @@
   'module' => 'phone',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'i18nBlocksTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_block/i18n_block.test',
+  'module' => 'i18n_block',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nFieldTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.test',
+  'module' => 'i18n_field',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nForumTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_forum/i18n_forum.test',
+  'module' => 'i18n_forum',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nMenuTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.test',
+  'module' => 'i18n_menu',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'I18nNodeTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_node/i18n_node.test',
+  'module' => 'i18n_node',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nPathTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_path/i18n_path.test',
+  'module' => 'i18n_path',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'I18NSelectAdminViewsAjax',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_select/i18n_select.test',
+  'module' => 'i18n_select',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nSelectTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_select/i18n_select.test',
+  'module' => 'i18n_select',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nStringTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.test',
+  'module' => 'i18n_string',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nSyncTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_sync/i18n_sync.test',
+  'module' => 'i18n_sync',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nTaxonomyTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.test',
+  'module' => 'i18n_taxonomy',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'I18nVariableLanguageRealm',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_variable/i18n_variable.class.inc',
+  'module' => 'i18n_variable',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18nVariableTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_variable/i18n_variable.test',
+  'module' => 'i18n_variable',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_block_object',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_block/i18n_block.inc',
+  'module' => 'i18n_block',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_field',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.inc',
+  'module' => 'i18n_field',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_field_base',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.inc',
+  'module' => 'i18n_field',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_field_instance',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.inc',
+  'module' => 'i18n_field',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_menu_link',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.inc',
+  'module' => 'i18n_menu',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_menu_link_translation_set',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.inc',
+  'module' => 'i18n_menu',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_object_wrapper',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_object.inc',
+  'module' => 'i18n',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_string_object',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.inc',
+  'module' => 'i18n_string',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_string_object_wrapper',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.inc',
+  'module' => 'i18n_string',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_string_textgroup_cached',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.inc',
+  'module' => 'i18n_string',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_string_textgroup_default',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.inc',
+  'module' => 'i18n_string',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_taxonomy_term',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.inc',
+  'module' => 'i18n_taxonomy',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_taxonomy_translation_set',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.inc',
+  'module' => 'i18n_taxonomy',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'i18n_translation_set',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/i18n/i18n_translation/i18n_translation.inc',
+  'module' => 'i18n_translation',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'ILPhoneNumberTestCase',
   'type' => 'class',
@@ -50108,6 +54964,13 @@
   'module' => '',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'InvalidQueryConditionOperatorException',
+  'type' => 'class',
+  'filename' => 'includes/database/database.inc',
+  'module' => '',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'IPAddressBlockingTestCase',
   'type' => 'class',
@@ -50137,72 +55000,86 @@
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkAttributeCrudTest',
+  'name' => 'LinkBaseTestClass',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.attribute.test',
+  'filename' => 'sites/all/modules/link/tests/LinkBaseTestClass.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkBaseTestClass',
+  'name' => 'LinkConvertInternalPathsTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.test',
+  'filename' => 'sites/all/modules/link/tests/LinkConvertInternalPathsTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkContentCrudTest',
+  'name' => 'LinkDefaultProtocolTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.crud.test',
+  'filename' => 'sites/all/modules/link/tests/LinkDefaultProtocolTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkTokenTest',
+  'name' => 'LinkEntityTokenTest',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/link/tests/LinkEntityTokenTest.test',
+  'module' => 'link',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'LinkFieldAttributesTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.token.test',
+  'filename' => 'sites/all/modules/link/tests/LinkFieldAttributesTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkUITest',
+  'name' => 'LinkFieldCrudTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.crud_browser.test',
+  'filename' => 'sites/all/modules/link/tests/LinkFieldCrudTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkValidateSpecificURL',
+  'name' => 'LinkFieldValidateTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.validate.test',
+  'filename' => 'sites/all/modules/link/tests/LinkFieldValidateTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkValidateTest',
+  'name' => 'LinkPathPrefixesTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.validate.test',
+  'filename' => 'sites/all/modules/link/tests/LinkPathPrefixesTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkValidateTestCase',
+  'name' => 'LinkSanitizeTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.validate.test',
+  'filename' => 'sites/all/modules/link/tests/LinkSanitizeTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkValidateTestNews',
+  'name' => 'LinkTokenTest',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/link/tests/LinkTokenTest.test',
+  'module' => 'link',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'LinkUnitTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.validate.test',
+  'filename' => 'sites/all/modules/link/tests/LinkUnitTestCase.test',
   'module' => 'link',
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'LinkValidateUrlLight',
+  'name' => 'LinkValidationApiTest',
   'type' => 'class',
-  'filename' => 'sites/all/modules/link/tests/link.validate.test',
+  'filename' => 'sites/all/modules/link/tests/LinkValidationApiTest.test',
   'module' => 'link',
   'weight' => '0',
 ))
@@ -50360,6 +55237,13 @@
   'module' => 'locale',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'LocaleStringIsSafeTest',
+  'type' => 'class',
+  'filename' => 'modules/locale/locale.test',
+  'module' => 'locale',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'LocaleTranslationFunctionalTest',
   'type' => 'class',
@@ -50451,6 +55335,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'MenuDataIntegrityTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/menu.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'MenuLinksUnitTestCase',
   'type' => 'class',
@@ -50528,6 +55419,13 @@
   'module' => '',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'MFWTestCase',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/multiupload_filefield_widget/multiupload_filefield_widget.test',
+  'module' => 'multiupload_filefield_widget',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'MigrateEmailFieldHandler',
   'type' => 'class',
@@ -50568,7 +55466,7 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/entity_translation/includes/translation.migrate.inc',
   'module' => 'entity_translation',
-  'weight' => '11',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'MockTestConnection',
@@ -50598,6 +55496,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'ModuleProvidedThemeEngineTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/theme.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'ModuleRequiredTestCase',
   'type' => 'class',
@@ -50652,7 +55557,7 @@
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'NLPhoneNumberTestCase',
@@ -50787,6 +55692,13 @@
   'module' => 'node',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'NodeMultiByteUtf8Test',
+  'type' => 'class',
+  'filename' => 'modules/node/node.test',
+  'module' => 'node',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'NodePageCacheTest',
   'type' => 'class',
@@ -50808,6 +55720,13 @@
   'module' => 'node',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'NodeReferenceFormTest',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/references/node_reference/node_reference.test',
+  'module' => 'node_reference',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'NodeRevisionPermissionsTestCase',
   'type' => 'class',
@@ -50897,7 +55816,7 @@
   'type' => 'class',
   'filename' => 'modules/block/block.test',
   'module' => 'block',
-  'weight' => '-5',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'NumberFieldTestCase',
@@ -51368,6 +56287,41 @@
   'module' => 'rdf',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'references_handler_argument',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/references/views/references_handler_argument.inc',
+  'module' => 'references',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'references_handler_relationship',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/references/views/references_handler_relationship.inc',
+  'module' => 'references',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'references_plugin_display',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/references/views/references_plugin_display.inc',
+  'module' => 'references',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'references_plugin_row_fields',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/references/views/references_plugin_row_fields.inc',
+  'module' => 'references',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'references_plugin_style',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/references/views/references_plugin_style.inc',
+  'module' => 'references',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'RegistryParseFilesTestCase',
   'type' => 'class',
@@ -51459,6 +56413,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'RequestSanitizerTest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/request_sanitizer.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'RetrieveFileTestCase',
   'type' => 'class',
@@ -51473,6 +56434,13 @@
   'module' => 'phone',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'SanitizerTestRequest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/request_sanitizer.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'SchemaCache',
   'type' => 'class',
@@ -51704,6 +56672,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'SessionUnitTestCase',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/session.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'SGPhoneNumberTestCase',
   'type' => 'class',
@@ -51893,6 +56868,13 @@
   'module' => 'system',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'SystemArchiverTest',
+  'type' => 'class',
+  'filename' => 'modules/system/system.test',
+  'module' => 'system',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'SystemAuthorizeCase',
   'type' => 'class',
@@ -51991,6 +56973,20 @@
   'module' => 'taxonomy',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'TaxonomyPrivateFileTestCase',
+  'type' => 'class',
+  'filename' => 'modules/taxonomy/taxonomy.test',
+  'module' => 'taxonomy',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'TaxonomyQueryAlterTestCase',
+  'type' => 'class',
+  'filename' => 'modules/taxonomy/taxonomy.test',
+  'module' => 'taxonomy',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'TaxonomyRSSTestCase',
   'type' => 'class',
@@ -51998,6 +56994,13 @@
   'module' => 'taxonomy',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'TaxonomyTermCacheUsageTestCase',
+  'type' => 'class',
+  'filename' => 'modules/taxonomy/taxonomy.test',
+  'module' => 'taxonomy',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'TaxonomyTermController',
   'type' => 'class',
@@ -52192,21 +57195,21 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/title/tests/TitleAdminSettingsTestCase.test',
   'module' => 'title',
-  'weight' => '100',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'TitleFieldReplacementTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/title/tests/TitleFieldReplacementTestCase.test',
   'module' => 'title',
-  'weight' => '100',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'TitleTranslationTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/title/tests/TitleTranslationTestCase.test',
   'module' => 'title',
-  'weight' => '100',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'TokenReplaceTestCase',
@@ -52418,6 +57421,13 @@
   'module' => '',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'UpdateQuery_mysql',
+  'type' => 'class',
+  'filename' => 'includes/database/mysql/query.inc',
+  'module' => '',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'UpdateQuery_pgsql',
   'type' => 'class',
@@ -52516,6 +57526,13 @@
   'module' => 'simpletest',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'UrlIsExternalUnitTest',
+  'type' => 'class',
+  'filename' => 'modules/simpletest/tests/common.test',
+  'module' => 'simpletest',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'UserAccountLinksUnitTests',
   'type' => 'class',
@@ -52579,6 +57596,13 @@
   'module' => 'user',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'UserEditRebuildTestCase',
+  'type' => 'class',
+  'filename' => 'modules/user/user.test',
+  'module' => 'user',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'UserEditTestCase',
   'type' => 'class',
@@ -52724,63 +57748,63 @@
   'type' => 'interface',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableRealmDefaultController',
   'type' => 'class',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableRealmDefaultStore',
   'type' => 'class',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableRealmGlobalStore',
   'type' => 'class',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableRealmHooks',
   'type' => 'interface',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableRealmStoreInterface',
   'type' => 'interface',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableRealmUnionController',
   'type' => 'class',
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm_union.class.inc',
   'module' => 'variable_realm',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableStoreRealmStore',
   'type' => 'class',
   'filename' => 'sites/all/modules/variable/variable_store/variable_store.class.inc',
   'module' => 'variable_store',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableStoreTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/variable/variable_store/variable_store.test',
   'module' => 'variable_store',
-  'weight' => '-1000',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'VariableTestCase',
@@ -52801,7 +57825,7 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/views/tests/views_ajax.test',
   'module' => 'views',
-  'weight' => '10',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'ViewsAnalyzeTest',
@@ -52838,6 +57862,13 @@
   'module' => 'views',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'ViewsCloneTest',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/views/tests/views_clone.test',
+  'module' => 'views',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'ViewsExposedFormTest',
   'type' => 'class',
@@ -52887,13 +57918,6 @@
   'module' => 'views',
   'weight' => '0',
 ))
-->values(array(
-  'name' => 'ViewsHandlerArgumentStringTest',
-  'type' => 'class',
-  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_argument_string.test',
-  'module' => 'views',
-  'weight' => '0',
-))
 ->values(array(
   'name' => 'ViewsHandlerFieldBooleanTest',
   'type' => 'class',
@@ -52955,7 +57979,7 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_file_extension.test',
   'module' => 'views',
-  'weight' => '10',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'ViewsHandlerFilterCombineTest',
@@ -53013,6 +58037,20 @@
   'module' => 'views',
   'weight' => '0',
 ))
+->values(array(
+  'name' => 'ViewsHandlerFilterTest',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/views/tests/views_handler_filter.test',
+  'module' => 'views',
+  'weight' => '0',
+))
+->values(array(
+  'name' => 'ViewsHandlerManyToOneTest',
+  'type' => 'class',
+  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_manytoone.test',
+  'module' => 'views',
+  'weight' => '0',
+))
 ->values(array(
   'name' => 'ViewsHandlerRelationshipNodeTermDataTest',
   'type' => 'class',
@@ -53053,7 +58091,7 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/views/tests/handlers/views_handlers.test',
   'module' => 'views',
-  'weight' => '10',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'ViewsHandlerTestFileSize',
@@ -53093,8 +58131,8 @@
 ->values(array(
   'name' => 'ViewsPagerTestCase',
   'type' => 'class',
-  'filename' => 'sites/all/modules/date/tests/date_views_pager.test',
-  'module' => 'date',
+  'filename' => 'sites/all/modules/date/date_views/tests/date_views_pager.test',
+  'module' => 'date_views',
   'weight' => '0',
 ))
 ->values(array(
@@ -53168,7 +58206,7 @@
   'weight' => '0',
 ))
 ->values(array(
-  'name' => 'viewsUiGroupbyTestCase',
+  'name' => 'ViewsUiGroupbyTestCase',
   'type' => 'class',
   'filename' => 'sites/all/modules/views/tests/views_groupby.test',
   'module' => 'views',
@@ -53277,7 +58315,7 @@
   'type' => 'class',
   'filename' => 'sites/all/modules/title/views/views_handler_title_field.inc',
   'module' => 'title',
-  'weight' => '100',
+  'weight' => '0',
 ))
 ->values(array(
   'name' => 'XMLRPCBasicTestCase',
@@ -53338,7 +58376,7 @@
 ))
 ->values(array(
   'filename' => 'includes/ajax.inc',
-  'hash' => 'a22c8f7345c1f714ea40bbaa1385fa0e3763b389c82656cf6ff3e4d051532ee4',
+  'hash' => '8d5ebead219c48d5929ee6a5a178a331471ee6ceb38653094514c952457eaebd',
 ))
 ->values(array(
   'filename' => 'includes/archiver.inc',
@@ -53346,11 +58384,11 @@
 ))
 ->values(array(
   'filename' => 'includes/authorize.inc',
-  'hash' => '6d64d8c21aa01eb12fc29918732e4df6b871ed06e5d41373cb95c197ed661d13',
+  'hash' => '3eb984facfe9e0228e4d01ece6345cf33dfcd2fcc9c291b15f2e4f782a6029a9',
 ))
 ->values(array(
   'filename' => 'includes/batch.inc',
-  'hash' => '1fe00f9a25481cd43e19fbd6bd37b7ff9dca79f8405ec3e55ffb011be12ec2c3',
+  'hash' => '756b66e69a05b74629dee0ff175385813b27eb635aa49380edd4a65532998825',
 ))
 ->values(array(
   'filename' => 'includes/batch.queue.inc',
@@ -53358,7 +58396,7 @@
 ))
 ->values(array(
   'filename' => 'includes/bootstrap.inc',
-  'hash' => '245deaa370fa492dae401e2eee215f771f9ffbba14c1ff50631a6a4b2b3c771e',
+  'hash' => '7a9ea059e58578df97a205f0b3f0929cfe469e68addb4331a8dd4b54c2c407ec',
 ))
 ->values(array(
   'filename' => 'includes/cache-install.inc',
@@ -53366,15 +58404,15 @@
 ))
 ->values(array(
   'filename' => 'includes/cache.inc',
-  'hash' => 'ee0bf13c7e067695dffcb9ade3b79fea82a3a8db9e9a422ebfcc91c383aa4b4c',
+  'hash' => '033c9bf2555dba29382b077f78cc00c82fd7f42a959ba31b710adddf6fdf24fe',
 ))
 ->values(array(
   'filename' => 'includes/common.inc',
-  'hash' => 'd64557e1027136d80e66c329133336412c8301b48c6703943494cff1309f934c',
+  'hash' => '3b30067db24a5ba03a5a2151c6616590ffb8aba4073f15d2398268ac860d8083',
 ))
 ->values(array(
   'filename' => 'includes/database/database.inc',
-  'hash' => '27f874fb21e1a85c86e0317669e2e26c1c6611a5e913c5bbce4c7aa62734edfe',
+  'hash' => '9f79732882753fda10b4c0a3fc9fe1cb7f4cdacef743a28664d8af6a855ac8b7',
 ))
 ->values(array(
   'filename' => 'includes/database/log.inc',
@@ -53382,7 +58420,7 @@
 ))
 ->values(array(
   'filename' => 'includes/database/mysql/database.inc',
-  'hash' => 'f021edd0e2b5e315336eb6b5e481b9516c12de78dff2c468be3d7fd0d3672665',
+  'hash' => 'fb808762239838f920ffeb74a89db5894fb46131d8bb4c65a0caff82358562c6',
 ))
 ->values(array(
   'filename' => 'includes/database/mysql/install.inc',
@@ -53390,51 +58428,51 @@
 ))
 ->values(array(
   'filename' => 'includes/database/mysql/query.inc',
-  'hash' => '0212a871646c223bf77aa26b945c77a8974855373967b5fb9fdc09f8a1de88a6',
+  'hash' => 'cddf695f7dbd483591f93af805e7118a04eac3f21c0105326642c6463587670c',
 ))
 ->values(array(
   'filename' => 'includes/database/mysql/schema.inc',
-  'hash' => '6f43ac87508f868fe38ee09994fc18d69915bada0237f8ac3b717cafe8f22c6b',
+  'hash' => 'c34aa7b7d2cb4662965497ff86f242224116bbd9b72ca6287c12039a65feb72e',
 ))
 ->values(array(
   'filename' => 'includes/database/pgsql/database.inc',
-  'hash' => 'd737f95947d78eb801e8ec8ca8b01e72d2e305924efce8abca0a98c1b5264cff',
+  'hash' => 'f53cb5779d702dde7aefacf8ee25d67cac48d3b94cd8d64057d42c61c5713526',
 ))
 ->values(array(
   'filename' => 'includes/database/pgsql/install.inc',
-  'hash' => '585b80c5bbd6f134bff60d06397f15154657a577d4da8d1b181858905f09dea5',
+  'hash' => '39587f26a9e054afaab2064d996af910f1b201ef1c6b82938ef130e4ff8c6aab',
 ))
 ->values(array(
   'filename' => 'includes/database/pgsql/query.inc',
-  'hash' => '0df57377686c921e722a10b49d5e433b131176c8059a4ace4680964206fc14b4',
+  'hash' => 'bb04ae9239c2179aeb3ef0a55596ee5ae0ddfb5dfd701896c41bf8c42a62280b',
 ))
 ->values(array(
   'filename' => 'includes/database/pgsql/schema.inc',
-  'hash' => '1588daadfa53506aa1f5d94572162a45a46dc3ceabdd0e2f224532ded6508403',
+  'hash' => '0eb77d1d8b30988ba89cbacbcbbc3b66d8ab98b8be8dfa4208a50a45ee77b6e2',
 ))
 ->values(array(
   'filename' => 'includes/database/pgsql/select.inc',
-  'hash' => 'fd4bba7887c1dc6abc8f080fc3a76c01d92ea085434e355dc1ecb50d8743c22d',
+  'hash' => '1e509bc97c58223750e8ea735145b316827e36f43c07b946003e41f5bca23659',
 ))
 ->values(array(
   'filename' => 'includes/database/prefetch.inc',
-  'hash' => 'b5b207a66a69ecb52ee4f4459af16a7b5eabedc87254245f37cc33bebb61c0fb',
+  'hash' => '026b6b272a91bae5d9325477530167e737b29bf988553a28cdf72fc1d1ea57ed',
 ))
 ->values(array(
   'filename' => 'includes/database/query.inc',
-  'hash' => '4016a397f10f071cac338fd0a9b004296106e42ab2b9db8c7ff0db341658e88f',
+  'hash' => 'f4792f623339ba9097e2af5a4785a3d7d836c831af3894506ddacaa124dd892c',
 ))
 ->values(array(
   'filename' => 'includes/database/schema.inc',
-  'hash' => '9fecfd13fc1d4056a62d385840dccd052ea0e184dc47101f4bd8f57f10b68174',
+  'hash' => 'da9d48f26c3a47a91f1eb2fa216e9deab2ec42ba10c76039623ce7b6bc984a06',
 ))
 ->values(array(
   'filename' => 'includes/database/select.inc',
-  'hash' => '5e9cdc383564ba86cb9dcad0046990ce15415a3000e4f617d6e0f30a205b852c',
+  'hash' => '72eeb85a2739c56d25e359c17847d3094e1a67164a2eb85e70b5260cb7d5c79d',
 ))
 ->values(array(
   'filename' => 'includes/database/sqlite/database.inc',
-  'hash' => '4281c6e80932560ecbeb07d1757efd133e8699a6fccf58c27a55df0f71794622',
+  'hash' => '22e80c5a02c143eace3628e196dded78552e6f2889d1989d052e2a37f46e7f0f',
 ))
 ->values(array(
   'filename' => 'includes/database/sqlite/install.inc',
@@ -53442,11 +58480,11 @@
 ))
 ->values(array(
   'filename' => 'includes/database/sqlite/query.inc',
-  'hash' => 'f33ab1b6350736a231a4f3f93012d3aac4431ac4e5510fb3a015a5aa6cab8303',
+  'hash' => '5d4dc3ac34cb2dbc0293471e85e37c890da3da6cd8c0c540c6f33313e4c0cbe9',
 ))
 ->values(array(
   'filename' => 'includes/database/sqlite/schema.inc',
-  'hash' => 'cd829700205a8574f8b9d88cd1eaf909519c64754c6f84d6c62b5d21f5886f8d',
+  'hash' => '7bf3af0a255f374ba0c5db175548e836d953b903d31e1adb1e4d3df40d6fdb98',
 ))
 ->values(array(
   'filename' => 'includes/database/sqlite/select.inc',
@@ -53454,27 +58492,31 @@
 ))
 ->values(array(
   'filename' => 'includes/date.inc',
-  'hash' => '18c047be64f201e16d189f1cc47ed9dcf0a145151b1ee187e90511b24e5d2b36',
+  'hash' => '1de2c25e3b67a9919fc6c8061594442b6fb2cdd3a48ddf1591ee3aa98484b737',
 ))
 ->values(array(
   'filename' => 'includes/entity.inc',
-  'hash' => 'e4fc9ff21b165a804d7ac4f036b3b5bd1d3c73da7029bf3f761d4bdee9ae3c96',
+  'hash' => 'd548abea63b68b5f59bbb59cf9ceeda53a7e96949cbbfe25ba3fce08f0a7c0e9',
 ))
 ->values(array(
   'filename' => 'includes/errors.inc',
-  'hash' => '72cc29840b24830df98a5628286b4d82738f2abbb78e69b4980310ff12062668',
+  'hash' => '577e66843ac3ac0d6cb9d0808ff48d9e83acad0faeffad5dfe1ba09bf2631b97',
 ))
 ->values(array(
   'filename' => 'includes/file.inc',
-  'hash' => '9de0398940bf2db560902736f1832d8b72b3e8b49dbbaba5f94c9331425ee04a',
+  'hash' => 'd0b26c57edd76096e28e3bb98a24129bf6070de1523106b03b53803ed883382b',
 ))
 ->values(array(
   'filename' => 'includes/file.mimetypes.inc',
   'hash' => '33266e837f4ce076378e7e8cef6c5af46446226ca4259f83e13f605856a7f147',
 ))
+->values(array(
+  'filename' => 'includes/file.phar.inc',
+  'hash' => '544df23f736ce49f458033d6515a301a8ca1c7a7d1bfd3f388caef910534abb3',
+))
 ->values(array(
   'filename' => 'includes/filetransfer/filetransfer.inc',
-  'hash' => 'fdea8ae48345ec91885ac48a9bc53daf87616271472bb7c29b7e3ce219b22034',
+  'hash' => '48a9cbcd6651a7fbf9fca9707ebc9fc79be36c33cd2f8c272b375123ce3f4dc3',
 ))
 ->values(array(
   'filename' => 'includes/filetransfer/ftp.inc',
@@ -53490,7 +58532,7 @@
 ))
 ->values(array(
   'filename' => 'includes/form.inc',
-  'hash' => '9b37fe7e5d04b25604bbc63abb6b6d332be14926011533b4449de52d45a86765',
+  'hash' => 'c6f9db191716ae0ea71bd79951e55344825fbc600e8e07057557593d614f6f9c',
 ))
 ->values(array(
   'filename' => 'includes/graph.inc',
@@ -53502,15 +58544,15 @@
 ))
 ->values(array(
   'filename' => 'includes/install.core.inc',
-  'hash' => '733ec6fac8e51747d1c83f266a42e4a0cb6bf31ac50f17f06e37c9e0865f4a38',
+  'hash' => 'b6f3e5d9bd4154f840253e34aed131bb401deb4fcb3421b379851231b8b4c149',
 ))
 ->values(array(
   'filename' => 'includes/install.inc',
-  'hash' => '781c54771c14b067bb38d222096f981121d479222fbdea9c433405de561a2881',
+  'hash' => 'dc7b5c97803df3e8e80e62984fe820de53ebc4141b645f66f6344f51ef4d5b19',
 ))
 ->values(array(
   'filename' => 'includes/iso.inc',
-  'hash' => '0ce4c225edcfa9f037703bc7dd09d4e268a69bcc90e55da0a3f04c502bd2f349',
+  'hash' => '09f14cce40153fa48e24a7daa44185c09ec9f56a638b5e56e9390c67ec5aaec8',
 ))
 ->values(array(
   'filename' => 'includes/json-encode.inc',
@@ -53522,7 +58564,7 @@
 ))
 ->values(array(
   'filename' => 'includes/locale.inc',
-  'hash' => 'f8a3ba7868698e9b43c2ceaebe2cbdcb92d6c68427e817a6e10a76b937b5a127',
+  'hash' => '3161313aaab94a956f855a2635d738806142b33f06734cdc3df81a3f3854fbdb',
 ))
 ->values(array(
   'filename' => 'includes/lock.inc',
@@ -53530,19 +58572,19 @@
 ))
 ->values(array(
   'filename' => 'includes/mail.inc',
-  'hash' => 'd9fb2b99025745cbb73ebcfc7ac12df100508b9273ce35c433deacf12dd6a13a',
+  'hash' => 'a7bef724e057f7410e42c8f33b00c9a0246a2ca2e856a113c9e20eecc49fc069',
 ))
 ->values(array(
   'filename' => 'includes/menu.inc',
-  'hash' => '2ecc6f990dc2d987425c680e27a4ddeec2e8376a2be408b00a144131f41a59ea',
+  'hash' => '9cbc6636d5c5f9c681eea9fd9c09973e2e29b66bca38420883b657f9e1c0800a',
 ))
 ->values(array(
   'filename' => 'includes/module.inc',
-  'hash' => 'a18bc92e5fc1f2a31a79eace8c6f2436bc15c8f0b332c8b7aaafa3a223746861',
+  'hash' => '75720e119c7fdc82bdefdd43e36661c990da6f69c1008e6f7997a6081590c8db',
 ))
 ->values(array(
   'filename' => 'includes/pager.inc',
-  'hash' => '6f9494b85c07a2cc3be4e54aff2d2757485238c476a7da084d25bde1d88be6d8',
+  'hash' => 'a596da575268e116c140b65e4ec98e4006c04a188f65a1c48b766b6ee276853f',
 ))
 ->values(array(
   'filename' => 'includes/password.inc',
@@ -53550,19 +58592,23 @@
 ))
 ->values(array(
   'filename' => 'includes/path.inc',
-  'hash' => '74bf05f3c68b0218730abf3e539fcf08b271959c8f4611940d05124f34a6a66f',
+  'hash' => 'e399fc0af1f25cebda4b6c471ab203db8abe1a0fe15e632f19e614f32d71821e',
 ))
 ->values(array(
   'filename' => 'includes/registry.inc',
-  'hash' => 'f47b20859f0fc80bf4bb2849a1282d6c54006957b69da0e5f4691de585ca4cdf',
+  'hash' => '2067cc87973e7af23428d3f41b8f8739d80092bc3c9e20b5a8858e481d03f22c',
+))
+->values(array(
+  'filename' => 'includes/request-sanitizer.inc',
+  'hash' => '770e8ece7b53d13e2b5ef99da02adb9a3d18071c6cd29eb01af30927cf749a73',
 ))
 ->values(array(
   'filename' => 'includes/session.inc',
-  'hash' => '7548621ae4c273179a76eba41aa58b740100613bc015ad388a5c30132b61e34b',
+  'hash' => '9981d139191b6a983f837e867058a376b62ae7cf5df607aee29e3e322a927b50',
 ))
 ->values(array(
   'filename' => 'includes/stream_wrappers.inc',
-  'hash' => '4f1feb774a8dbc04ca382fa052f59e58039c7261625f3df29987d6b31f08d92d',
+  'hash' => '3244dae1fa57557f8d0d805fc163830ac1263914587f652f009594a0fa51eeaf',
 ))
 ->values(array(
   'filename' => 'includes/tablesort.inc',
@@ -53570,7 +58616,7 @@
 ))
 ->values(array(
   'filename' => 'includes/theme.inc',
-  'hash' => '507932af124871dd2639ab8eafbbd68f962ef70f44ef1c4fd1a14daf04c53b5e',
+  'hash' => 'ae46daba6419ca613bc6a08ba4d7f9bbab9b19889937099d2e4c1737e9e7b2df',
 ))
 ->values(array(
   'filename' => 'includes/theme.maintenance.inc',
@@ -53586,11 +58632,11 @@
 ))
 ->values(array(
   'filename' => 'includes/unicode.inc',
-  'hash' => 'e18772dafe0f80eb139fcfc582fef1704ba9f730647057d4f4841d6a6e4066ca',
+  'hash' => '89636ce5847340fd19be319839b4203b0d4bbc3487973413d6de9b5f6f839222',
 ))
 ->values(array(
   'filename' => 'includes/update.inc',
-  'hash' => '77403195059de797422d9d9202f18548a38558995120c7f9ffb9bd044730a3bc',
+  'hash' => '25c30f1e61ef9c91a7bdeb37791c2215d9dc2ae07dba124722d783ca31bb01e7',
 ))
 ->values(array(
   'filename' => 'includes/updater.inc',
@@ -53606,11 +58652,11 @@
 ))
 ->values(array(
   'filename' => 'includes/xmlrpcs.inc',
-  'hash' => '741aa8d6fcc6c45a9409064f52351f7999b7c702d73def8da44de2567946598a',
+  'hash' => '925c4d5bf429ad9650f059a8862a100bd394dce887933f5b3e7e32309a51fd8e',
 ))
 ->values(array(
   'filename' => 'modules/aggregator/aggregator.test',
-  'hash' => '1288945ead1e0b250cb0f2d8bc5486ab1c67295b78b5f1ba0f77ade7bf1243b4',
+  'hash' => '6219c2fd0469320614567b1229c994bfb3ef8b321c04316df542d1ba936c9c1d',
 ))
 ->values(array(
   'filename' => 'modules/block/block.test',
@@ -53622,23 +58668,23 @@
 ))
 ->values(array(
   'filename' => 'modules/book/book.test',
-  'hash' => 'a75a4ec12f930d85adbf7c46d6a1a4ed1356657466874f21e9cc931b6cd41aa0',
+  'hash' => '6cec3afcb077db3d3fe4bcbfe2011555b69d5588f0c01f181c86305d20a33eae',
 ))
 ->values(array(
   'filename' => 'modules/color/color.test',
-  'hash' => '013806279bd47ceb2f82ca854b57f880ba21058f7a2592c422afae881a7f5d15',
+  'hash' => '9e05a4bbd51092c7fabe821fa1950a03347c4b2c0d15cdab91db0407b6e24b75',
 ))
 ->values(array(
   'filename' => 'modules/comment/comment.module',
-  'hash' => 'db858137ff6ce06d87cb3b8f5275bed90c33a6d9aa7d46e7a74524cc2f052309',
+  'hash' => '6fa14cedb32d94a5c23ead69bc59ebd3dea04ccde583dc429c38097ca5ff39cc',
 ))
 ->values(array(
   'filename' => 'modules/comment/comment.test',
-  'hash' => '0443a4dbc5aef3d64405a7cabf462c8c5e0b24517d89410d261027b85292cd4b',
+  'hash' => '570e35408ad9ca04d881bf2a4f1da6b28668dbb761e7616e8309b2d153d90e03',
 ))
 ->values(array(
   'filename' => 'modules/contact/contact.test',
-  'hash' => 'd49eedd71859fbb6ffa26b87226f640db56694c8f43c863c83d920cf3632f9ad',
+  'hash' => '655e8d5fe7536a972c2233e438a142166b15a118cc644e94b756c2814c375634',
 ))
 ->values(array(
   'filename' => 'modules/contextual/contextual.test',
@@ -53650,7 +58696,7 @@
 ))
 ->values(array(
   'filename' => 'modules/dblog/dblog.test',
-  'hash' => '11fbb8522b1c9dc7c85edba3aed7308a8891f26fc7292008822bea1b54722912',
+  'hash' => '87a38f90f57c8a7069e9b34d461049d41388981fe1e16a8c437f0ff12753702e',
 ))
 ->values(array(
   'filename' => 'modules/field/field.attach.inc',
@@ -53658,47 +58704,47 @@
 ))
 ->values(array(
   'filename' => 'modules/field/field.info.class.inc',
-  'hash' => 'cf18178e119d43897d3abd882ba3acc0cf59d1ad747663437c57b1ec4d0a4322',
+  'hash' => '31deca748d873bf78cc6b8c064fdecc5a3451a9d2e9a131bc8c204905029e31f',
 ))
 ->values(array(
   'filename' => 'modules/field/field.module',
-  'hash' => 'e9359f8cac64b2d81ac067d7da22972116dc10b9b346752a8ef8292943a958c9',
+  'hash' => '48b5b83f214a8d19e446f46c5d7a1cd35faa656ccb7b540f9f02462a440cacdd',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/field_sql_storage/field_sql_storage.test',
-  'hash' => '315eedaf2022afc884c35efd3b7c400eddab6ea30bec91924bc82ab5cd3e79f2',
+  'hash' => '9eb6699cbaf9d8af5879551135ac3acf13b2c356c3792666a38e237db297a97c',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/list/tests/list.test',
-  'hash' => '97e55bd49f6f4b0562d04aa3773b5ab9b35063aee05c8c7231780cdcf9c97714',
+  'hash' => '27dbff6becf419aab9652892e4ddcdf53000aa8699c3d5fc72c19af9a0ae52e6',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/number/number.test',
-  'hash' => '9ccf835bbf80ff31b121286f6fbcf59cc42b622a51ab56b22362b2f55c656e18',
+  'hash' => '4392f6fadf67c7533725e12bbe15ee2624cd54158e153f42f6cad3c28144395e',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/options/options.test',
-  'hash' => 'c71441020206b1587dece7296cca306a9f0fbd6e8f04dae272efc15ed3a38383',
+  'hash' => '9691cd4352c380e8dff0985b539bb3d69c20bc43663427a3d291c59395a87eed',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/text/text.test',
-  'hash' => 'a1e5cb0fa8c0651c68d560d9bb7781463a84200f701b00b6e797a9ca792a7e42',
+  'hash' => 'e93177e4fdf4dda8958822410470cfe3c68eca413f1e0eba12e8c03b42acf634',
 ))
 ->values(array(
   'filename' => 'modules/field/tests/field.test',
-  'hash' => '5eaad7a933ef8ea05b958056492ce17858cd542111f0fe81dd1a5949ad8f966e',
+  'hash' => 'bb3abf8be54272b4e374bbfcd408694022a58a31354a4dfc99166846a68edbb4',
 ))
 ->values(array(
   'filename' => 'modules/field_ui/field_ui.test',
-  'hash' => 'ded58a83a37cf111834f68fde9c34cddc7f4d36b91f31281e41ed5220c65dac4',
+  'hash' => 'f535e5627c969e9083a63aaf72d4ac645e30709d7b87af15c6c3b870481f283a',
 ))
 ->values(array(
   'filename' => 'modules/file/tests/file.test',
-  'hash' => '51d79794cbe647b2f5635ca9193b4d63bb9f99db4d9074676a80c55582b02985',
+  'hash' => '6abb9228cc7caae3d1661f389377d3bbd2f590abed2214a1bc5e0860e857aaf3',
 ))
 ->values(array(
   'filename' => 'modules/filter/filter.test',
-  'hash' => '268488be9d8e6a4bfa906bbb5bbf1f0df5881c04a421cbefcd7aa4f05fb63ba0',
+  'hash' => 'b8aa5e6b832422c6ad5fe963898ec9526c814614f27ecccb67107ce194997d6a',
 ))
 ->values(array(
   'filename' => 'modules/forum/forum.test',
@@ -53710,31 +58756,31 @@
 ))
 ->values(array(
   'filename' => 'modules/image/image.test',
-  'hash' => '19459f5be2fb58058a984ef302d6f6defca20207324db25726d06a7743cc2960',
+  'hash' => '09bc6e4e69eb11a12abc1ab4823227c528d9a72d2d3651626d129d4700fbaac6',
 ))
 ->values(array(
   'filename' => 'modules/locale/locale.test',
-  'hash' => '61c6a80ba44ff92e6ba4a350b7c95890368e2f9e029b8f84563df2490a8e93b1',
+  'hash' => '0b54695190fe24e5024e4a445a8028dd51211852d63147ca8a907b87260275b1',
 ))
 ->values(array(
   'filename' => 'modules/menu/menu.test',
-  'hash' => '51817d6c591c28cf268145c2d39b41f66e453edf42c86472e61b7081da1d86bb',
+  'hash' => 'db0600ff4e9d2159ecf26c991cbb81931edb32513a0bb7716964ee84006dd912',
 ))
 ->values(array(
   'filename' => 'modules/node/node.module',
-  'hash' => 'b594aa316e7d74024d633fb95a6e89a2c6c14cb108a481fd0b2521ec0e3316de',
+  'hash' => 'a0431f275b291779ffd1061d7d98b6942106235350b807828e94c6929ad04a41',
 ))
 ->values(array(
   'filename' => 'modules/node/node.test',
-  'hash' => 'e2e485fde00796305fd6926c8b4e9c4e1919020a3ec00819aa5cc1d2b3ebcc5c',
+  'hash' => '5d6e2853efb3f596525508e76f7f44d15621180f9ef51aaf957fc042fb21df1e',
 ))
 ->values(array(
   'filename' => 'modules/openid/openid.test',
-  'hash' => '3decf7faf3a9396671d52c6065a31f0ef81828015e0348a0ba9358b618e737a1',
+  'hash' => 'a9de8727e9411002c28c0caee7fc347780ecebf18959c800683166b7f313416d',
 ))
 ->values(array(
   'filename' => 'modules/path/path.test',
-  'hash' => '2004183b2c7c86028bf78c519c6a7afc4397a8267874462b0c2b49b0f8c20322',
+  'hash' => 'e7dabb4bbb7afd1b09adf1e64438b74726fc122422b31c7ae6d8e0ed2f7df6b6',
 ))
 ->values(array(
   'filename' => 'modules/php/php.test',
@@ -53742,11 +58788,11 @@
 ))
 ->values(array(
   'filename' => 'modules/poll/poll.test',
-  'hash' => 'cc8486dc337471d13014954e1c1e4e5ad4956e4a0cbd395adbd064f8e5849c72',
+  'hash' => '7030be7dee36cc35f62a35770287919ca0451362a86dbd8ddd44fd180c176ea3',
 ))
 ->values(array(
   'filename' => 'modules/profile/profile.test',
-  'hash' => 'afc23aa58769a84d94c4a6cef7b0ea2c9aa0edfdf2563a34757a1fb4d3d58233',
+  'hash' => 'de3e5807b3dc5f658270194f6ef012b5ad858ca9ad79f2782a69531754b442a3',
 ))
 ->values(array(
   'filename' => 'modules/rdf/rdf.test',
@@ -53754,11 +58800,11 @@
 ))
 ->values(array(
   'filename' => 'modules/search/search.extender.inc',
-  'hash' => '013a6a841cc48a6dc991153fb692b8d1546e56b78d9c95e97e0d7e92296d3481',
+  'hash' => '1a92d28913cd9d7cd0d2ec007848e079c14e84a8bcb9423e70ad97309ac14eb6',
 ))
 ->values(array(
   'filename' => 'modules/search/search.test',
-  'hash' => '6512521f8de3a54238c8f337ae0aa105cab2bbc9a1addb5b1ccb755842656913',
+  'hash' => 'e43c21510d510885dfad6484afa931382083b75b7e67286bda56a6aafe265f28',
 ))
 ->values(array(
   'filename' => 'modules/shortcut/shortcut.test',
@@ -53766,11 +58812,11 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/drupal_web_test_case.php',
-  'hash' => 'a4c07ab08d578cc9c4adfb39aaa98270cacc58885c1d61f3a71f207142f4fc0b',
+  'hash' => '1083284bccd3bdd544892448225be6bd50ee5756a5c6f1d0b2d1402a5c2b58c5',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/simpletest.test',
-  'hash' => '8112284b928297e326a2cb2a029a8ee35490732ce73ab0b54a91e9613a84e951',
+  'hash' => '6277067fd886ab815b43166f7fc2d7d612c1e74250ef2c6d37409231e915cc7a',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/actions.test',
@@ -53790,7 +58836,7 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/bootstrap.test',
-  'hash' => '4ccb0841905a34438e5b3acd712d0a1b52b6aa41535d3a64d3e50eff355a5dbe',
+  'hash' => 'b899f759b13e991e1a7da7872ccac11d033b7ede9fd1247f75c5c1ba2964869e',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/cache.test',
@@ -53798,15 +58844,15 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/common.test',
-  'hash' => 'aa2449d4ce5109bc9593901f34f74ce9caeea6450539a120afdf7a71f1e35276',
+  'hash' => '93c11263dbe597216dd5d5ac4079d302df2de3325c875c24f1f9ea4d69654655',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/database_test.test',
-  'hash' => '64baa1520d815e049310ae697fa79390b6b0a02fb03d47c64d3caec8d40ab8e9',
+  'hash' => '202ce3146c44b7cd074e25ecb508c83d9ae8c824f919dcdbb7f384e45181205b',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/entity_crud.test',
-  'hash' => '0db2e08cb15ef287ed622fa56cee85e6a61b6e7a8547c77531a80a9ec1379d87',
+  'hash' => '5f37e407d2f9da2d13bb09250d8410f0b754da49067e1e52c3ff80bc304a7d1c',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/entity_crud_hook_test.test',
@@ -53818,19 +58864,19 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/error.test',
-  'hash' => 'df8360738a4b3c946209a560ae83065728ae1aa56744cd8aaee398325a7cda60',
+  'hash' => '8bc733264d5be80534e5b9b2d20c88f5c3990c49c09d66d6331b3acaa4912e39',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/file.test',
-  'hash' => '25fdee40ceb8c84f08677224db941e251906f2caa185b351de80eba76f20c90b',
+  'hash' => 'a868d9ac5c41f9a502660d3edba32159d3ab0fb813d27b1fb51bfaa1eb046d59',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/filetransfer.test',
-  'hash' => 'a5ae7e24c43f994968d059c93d56be0dfd580699e2cb884afb074b9ae5895fd9',
+  'hash' => '827431af2bb0359633c39a4748bc9b593759a260d1493445940e35a9fb04ca15',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/form.test',
-  'hash' => '1d932031c1b2e33947c1cb480457f9f6c95b1ee93bab6eab785c2cde290fd9d7',
+  'hash' => '7c1249cb1dd9af5937c54b30345ad98e6c98df5c8d852264d9b02d157aeea1ff',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/graph.test',
@@ -53838,7 +58884,7 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/image.test',
-  'hash' => 'fbad58b83e40aec654bf66835e30f81b83a76714efc560d73e7be3841ab5e996',
+  'hash' => '2481007d8c75d450c26112e3c333f2e4af9fd580d9cfb150e8aaa7e85a711ecc',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/lock.test',
@@ -53846,19 +58892,19 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/mail.test',
-  'hash' => '9f772652385048639264f64147eab2675e9e76be2258e70bbefc2f6f753d047f',
+  'hash' => '3ed6b251f5c3926699f0b680f65489e619067ea6e4de920305b7a11c03d00efa',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/menu.test',
-  'hash' => 'b7602b23403271fd404646cd5f4970ce278eb3c014ed30676f1ba680cfd749a1',
+  'hash' => 'd69a66ded52e5012a25a816c4bf6994705b395db82328885ac31335e430fedc9',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/module.test',
-  'hash' => '056de988f33d43c39e62f067af8f449f5192cd27bbbcf358a6e3b0d34d94167c',
+  'hash' => '3fd14d8d64c3af3dd95e93e4fc3283803becd3702ce8bcd0e4cfb58bba39401d',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/pager.test',
-  'hash' => '9586bc07f5ed2791ae69e8cacf1a257ffe85dde3be7769ce6e84435a001bc296',
+  'hash' => '999bda0384620ff7fdf8e4c150e0ca40d08c063b0ba4f3c0e6cff896b75de561',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/password.test',
@@ -53866,19 +58912,23 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/path.test',
-  'hash' => '814b32c225e1a73f225b52c0e5a9579a754dd9f597cb71189fa0b62c5ce821ad',
+  'hash' => '4d1212854ad28515c354d8855ed7feddce95fe0ab25049af5219020c3e3ac966',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/registry.test',
   'hash' => 'eadaa4f04ffbe49656ee9c8d477a4855de12f5f7fd6923894ab6565b86fde28f',
 ))
+->values(array(
+  'filename' => 'modules/simpletest/tests/request_sanitizer.test',
+  'hash' => '7d0e607eff78a19a90f35264816d67e8b7247cfab3cc70acbe83c0eafba8ec32',
+))
 ->values(array(
   'filename' => 'modules/simpletest/tests/schema.test',
-  'hash' => '14a7975e040ae8d3a7c8bb82c9e26dabe78978f6371dec22ae8c81b71cf3e4bb',
+  'hash' => 'dab8762069f1f39d732285e63e816ff74adf039e3afd490e3aaa12fe593341f4',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/session.test',
-  'hash' => '6416694ef7c79680f99e405468401567357c38abead1e0ce9e232a15e7dcd823',
+  'hash' => '4a17c93fb504286398cce49043c525a52308bed909ff85c2f898e7e363a12270',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/tablesort.test',
@@ -53886,7 +58936,7 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/theme.test',
-  'hash' => 'f542bdf4efc342609b8804767b793521c6641ab5cd31a7130865feeef5f2cfa1',
+  'hash' => 'd2dae5c529c910ab08b60895115a6b1a7625774ef728fc48a06ade83544afdf0',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/unicode.test',
@@ -53898,7 +58948,7 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/update.aggregator.test',
-  'hash' => 'a2b6a574993591e93dacbd303a300b852775a3beea1343fb1f11578a8cdd26e1',
+  'hash' => 'fb4c04c020722ff2a430f68b1d5b4248fd200d0c46757f467c55082909c64e7e',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/update.field.test',
@@ -53914,59 +58964,59 @@
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.comment.test',
-  'hash' => 'a20a8b44b46a6bc1cc0f0a18e67a12933d0b101d463bcdc21212e5f35d93c379',
+  'hash' => '4680ff86eac44b815f09cb5761cd05269531234a9cdd32173f4cf1796b15e8e5',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.filter.test',
-  'hash' => '0485b6d466476a85e7591eb4bdaf303b1b75a871038f1d5669a3f6d4cd81ecd0',
+  'hash' => 'a73a708aaca2354f3383f488dcdc9594fd2f39c9babb60cc61a4e1f87e113713',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.forum.test',
-  'hash' => '6330fe5d85a81d7d5686da5a40cf18b275bef4c5819afb334f8fc0b043532bb4',
+  'hash' => '5c323b21b20413adeadb994f002e85d4ee01b9f318a0a2ab4fea2ba25b9f9884',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.locale.test',
-  'hash' => 'ec2d285222dd85022a16daed2b3a3e951dba97ab4de9fd46d89d2064f5db7595',
+  'hash' => '81f91bc55599124feada7754a9b33de32b9f489117e914a3daa2634b612f2fca',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.menu.test',
-  'hash' => 'fa6e46dcb1028e6c3faad86c50d3d9296d7a4095115ffb8d39b627dbd31996d7',
+  'hash' => 'bbe507a367a7080dc4c32f89d54f1fab2559ab99aa2957fb657cc9b36f252d76',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.node.test',
-  'hash' => 'f16f1ae5b5b3584e4d1d119473a962112fb28796efb5283aaa8df2db0ddec364',
+  'hash' => 'd5f34bd6e218a9fd1a6df4a9ceb5893ead12566fc5be516aaed5892f05fd2d76',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.taxonomy.test',
-  'hash' => '805528f81162014479d94e70bcaf234f818a1898d057e05d08b148a9120743b9',
+  'hash' => '338bcfaa484637ac2d24289624b46e9ef836f8392a20bcbb13cf205ef7781bdc',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.test',
-  'hash' => '877364dd82e5e1ed28e1ee93c48fbec083237012f44038a8fef39d9c6cb8b4f9',
+  'hash' => 'bbdf974735711a97f9a774d94470aedd1db9ff3e18fea5668b080233d1accd27',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.translatable.test',
-  'hash' => '7a53241c9df9c671fb1da2789fe32c0e0425267f1647293a89adadbfa49bc4ac',
+  'hash' => 'e215bb35f01262678c066b088a7d817ebfa69c1ac96abbfc9f69660b7748c993',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.trigger.test',
-  'hash' => '4ba820349ef89f6eaa73f429c053e09f937d36808149a00563efa5b551e8669d',
+  'hash' => '290da2f6349227bb0e031bdbb3087a1df1d4833926e50f959754079c6363ca34',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.upload.test',
-  'hash' => '8fc15f53a5ef54b48133a8525fcd384729563ba2d9bd49ab035549d07fabf3c4',
+  'hash' => '4c49a9221403f8b2b857c7df85a402459c40600ebe6dd8251954f7fdfc57e8a0',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/upgrade/upgrade.user.test',
-  'hash' => '9c11a51f2bd262f957e6c609ec84b26ac9d1fa00feeb0078b7a12beb450daab3',
+  'hash' => 'b63c413ea1c77d87b5bcca26a3fc1b6ad50ad6733bbf0ceae02b6182915d033e',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/xmlrpc.test',
-  'hash' => '1d9b1fe51d31722473478087d50ed09b180748047205cea936db49a74ade82e7',
+  'hash' => '6a4f2fec0c3b8027655069ac71c41d9ee7ec7838257081ede18a4647d7dacec4',
 ))
 ->values(array(
   'filename' => 'modules/statistics/statistics.test',
-  'hash' => '3fd921d3cc26f9363bba0d6f29efb96c49c88ca51e2e2376b6554afaff8ceeb5',
+  'hash' => '7abe4cce7ef548637d709e22cf340f9973b6d77615a470949d20a6426f5b08f2',
 ))
 ->values(array(
   'filename' => 'modules/syslog/syslog.test',
@@ -53974,39 +59024,39 @@
 ))
 ->values(array(
   'filename' => 'modules/system/system.archiver.inc',
-  'hash' => 'faa849f3e646a910ab82fd6c8bbf0a4e6b8c60725d7ba81ec0556bd716616cd1',
+  'hash' => '05caceec7b3baecfebd053959c513f134a5ae4070749339495274a81bebb904a',
 ))
 ->values(array(
   'filename' => 'modules/system/system.mail.inc',
-  'hash' => 'd31e1769f5defbe5f27dc68f641ab80fb8d3de92f6e895f4c654ec05fc7e5f0f',
+  'hash' => 'd2f4fca46269981db5edb6316176b7b8161de59d4c24c514b63fe3c536ebb4d6',
 ))
 ->values(array(
   'filename' => 'modules/system/system.queue.inc',
-  'hash' => 'a60cff401fc410cd81dc1d105ed66f79396ed7b15fdc3a5c5b80593ad5d4352a',
+  'hash' => 'a77a5913d84368092805ac551ca63737c1d829455504fcccb95baa2932f28009',
 ))
 ->values(array(
   'filename' => 'modules/system/system.tar.inc',
-  'hash' => '8a31d91f7b3cd7eac25b3fa46e1ed9a8527c39718ba76c3f8c0bbbeaa3aa4086',
+  'hash' => '2dd9560bddab659f0379ef9eca095fc65a364128420d9d9e540ef81ca649a7d6',
 ))
 ->values(array(
   'filename' => 'modules/system/system.test',
-  'hash' => 'b53fdc9f28a49d9bdd819721a6bc4ae0e8a7b023a415e98672a99453187c1f1e',
+  'hash' => 'f815c9be6f3059a891147aca5dd6f45a857cd608db78d683c529a29ebd5ab7a0',
 ))
 ->values(array(
   'filename' => 'modules/system/system.updater.inc',
-  'hash' => '338cf14cb691ba16ee551b3b9e0fa4f579a2f25c964130658236726d17563b6a',
+  'hash' => '9433fa8d39500b8c59ab05f41c0aac83b2586a43be4aa949821380e36c4d3c48',
 ))
 ->values(array(
   'filename' => 'modules/taxonomy/taxonomy.module',
-  'hash' => '45d6d5652a464318f3eccf8bad6220cc5784e7ffdb0c7b732bf4d540e1effe83',
+  'hash' => 'b246e538820cbd80b972e8a16b488b8974eb5dcfc16578f5405927c9727441a6',
 ))
 ->values(array(
   'filename' => 'modules/taxonomy/taxonomy.test',
-  'hash' => '8525035816906e327ad48bd48bb071597f4c58368a692bcec401299a86699e6e',
+  'hash' => '4db45ebdc63089e79cce177221ffc50658554688c9b467226b7afb2da7e35940',
 ))
 ->values(array(
   'filename' => 'modules/tracker/tracker.test',
-  'hash' => 'bea7303dfe934afeb271506da43bcf24a51d7d5546181796d7f9f70b6283ed67',
+  'hash' => '5669b4d8f6ea7f652a4dd47f31de6b68f2cbc087e30fedbf7db0df5bef1470c2',
 ))
 ->values(array(
   'filename' => 'modules/translation/translation.test',
@@ -54014,19 +59064,23 @@
 ))
 ->values(array(
   'filename' => 'modules/trigger/trigger.test',
-  'hash' => '662f1a55e62832d7d5258965ca70ebe9d36ce8ae34e05fda2a2f9dc72418978b',
+  'hash' => '589376e9ce183c4dcb6c8ef49fd8c0295247fd1cf49c5237d770bf73058ef725',
 ))
 ->values(array(
   'filename' => 'modules/update/update.test',
-  'hash' => '1ea3e22bd4d47afb8b2799057cdbdfbb57ce09013d9d5f2de7e61ef9c2ebc72d',
+  'hash' => '994b66b737f16eb98ee18c9e9ecd62e86de2792159e70b36982e95b48f2746a3',
 ))
 ->values(array(
   'filename' => 'modules/user/user.module',
-  'hash' => '88bb508e0eb658281b085cd07c81808bd9634bba8a2271515c1d68079d58817d',
+  'hash' => '6762ef76e12db1f48e2856d0f5c420ecdaa29fff26775275c1ff9d7e357e7b4d',
 ))
 ->values(array(
   'filename' => 'modules/user/user.test',
-  'hash' => '178320fdb9a0c8754f1fa7272f68f536dcb94ae82ce7d0fc6a0f8a476c1f6922',
+  'hash' => '09b1d7ade399e4fc65ce86e39ed33ee62f36e51cda5c25687eb7fa1e51cc06b8',
+))
+->values(array(
+  'filename' => 'sites/all/modules/breakpoints/breakpoints.test',
+  'hash' => '3d0dae6143ff9903554128f599a4156d852e57d5665e5cebc2ecc55f5eaef962',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/includes/context.inc',
@@ -54082,59 +59136,99 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date.migrate.inc',
-  'hash' => '47ffb48daf97c13ef154cf2ffff577018f02a7091b85dfb39e9c2c89e1da6a5d',
+  'hash' => '3fec62a1b4d4860bb56f65834f210f7eaf88834fa3eace42ca23e758366c3d0c',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_all_day/tests/DateAllDayUiTestCase.test',
+  'hash' => '77fccf66c797453a1c2c47901aaba102a02037ac91076d5a1c9674dd73c8ad43',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_api/date_api.module',
-  'hash' => 'af2124c5727d839871309b31fe288fe3945d6ef67eb469ddcc02839be98860dc',
+  'hash' => 'dd47bba4cda203e53a59ae3a0fceee0f2142af27247cd5cf9a572d534628940b',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_api/date_api_sql.inc',
-  'hash' => '5a484b487c13fd6094348e2011c19e72d6c6c9ceb0b0a4143ef5542cd1c495fa',
+  'hash' => '75d63062024609e31649d71564d488e4dc4c58600af5e0d31418482c61282b2f',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_api/tests/DateApiTestCase.test',
+  'hash' => 'b5c1b3f1ec0d5ff3b1daa1d28fccf185b7bd9c8baafb15432a6188a678b97711',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_api/tests/DateApiUnitTestCase.test',
+  'hash' => '941b4fb0ab683801a3baa41c8da5987e0772892934659df5c53d705fb46e2507',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_popup/tests/DatePopupFieldTestCase.test',
+  'hash' => '91a40fbbfa9d764a9fe64a9cf7a6ec918125201689f2729bb15c2cf4d3272047',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_popup/tests/DatePopupValidationTestCase.test',
+  'hash' => '77106bb5dbfb3e5bb19a8c1b48ef3b08defa0f8c784836a6587f1d264e0be146',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_popup/tests/DatePopupWithViewsTestCase.test',
+  'hash' => '86ca5fa9f4ae198b39b5416945922909f72ac1dd136d5b4e4ea32bee7cfc386f',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_repeat/tests/date_repeat.test',
-  'hash' => '3702268fa89aa7ed9bcae025f0fb21bd67f90e89d53122049854de60a5316d4a',
+  'hash' => '1bdd55de5ffa1928c97bb34ef730c8737a2c9b014c125a4944734613a239c771',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_repeat/tests/date_repeat_form.test',
-  'hash' => '2ec4e5d57d5b9f1adf81505d40890c63dc684f2d0f00669b9c8c12518eb3bf4a',
+  'hash' => '43378ddf7bafcee0d1edff8ee6fe25e7feeef00f62d74aed32799860d7dc6ebc',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_repeat_field/tests/DateRepeatFieldTestCase.test',
+  'hash' => '3f80bd729f487ae583c35c4c02283d0f017acab5e166ada327feb1dcaaf6e07e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_tools/tests/DateToolsTestCase.test',
+  'hash' => '2ec6ea450536c7732a816b98bfdd071e6f6102ef913b7279e511d079a09f76ea',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_views/tests/date_views_filter.test',
+  'hash' => '67f89e36fac1ed70ff7415c04570cfd8fe4760b9d14e5bc823e4727341b4085e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_views/tests/date_views_pager.test',
+  'hash' => 'd933a4ef64f2dd4a7bca5bc898a178befd6c820279890698767c400806f8db74',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/date_tools/tests/date_tools.test',
-  'hash' => 'bdb9b310295207ce2284b23556810296e1477b9604e98a3d0fb21aba7da04394',
+  'filename' => 'sites/all/modules/date/tests/DateEmwTestCase.test',
+  'hash' => 'd9d1b6a3700327a99599e0385a4d4acb16ba9a0d66ed004bfa75d56fa589a4e1',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date.test',
-  'hash' => '6cb38e9ed60bfdfa268051b47fcad699f1c8104accc7286abafbeddbbc9d143c',
+  'filename' => 'sites/all/modules/date/tests/DateFieldTestBase.test',
+  'hash' => '901a2a2127ccc5190590277246acf06a7d9af7db1f4de3afa5962764c52b62e4',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_api.test',
-  'hash' => '280148ca742592a1e22f663fe4d810532b95d09975db0182347a0bbd6917f996',
+  'filename' => 'sites/all/modules/date/tests/DateFieldTestCase.test',
+  'hash' => '06868eeb56be6956da92a60e7b9b8bfc179a8d041af1cd45e76442f1c92046cc',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_field.test',
-  'hash' => 'bae59aee63ed204e27909709e59eeae1a6192e5f7456de2ce2cce06c49732dc4',
+  'filename' => 'sites/all/modules/date/tests/DateFormTestCase.test',
+  'hash' => '8f43dff86e8b79ce5fd08be4332322a47bb78bf61af94d7019cfc3793460077b',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_migrate.test',
-  'hash' => 'a43f448732d474c5136d89ff560b7e14c1ff5622f9c35a1998aa0570cd0c536c',
+  'filename' => 'sites/all/modules/date/tests/DateMigrateTestCase.test',
+  'hash' => '58f3d573f004199b2ce4bfe4c30aea457659115f8b6ee959c07a21cac1cd976e',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_timezone.test',
-  'hash' => '598ac52aa82f79fe90faa401c2c6dc7114295c0321800ea9a9b4058717d00409',
+  'filename' => 'sites/all/modules/date/tests/DateNowUnitTestCase.test',
+  'hash' => 'd2e17e5a49c56c84bf115cabeccc9c0f8b735ae95433a08962eb790633efd4b6',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_validation.test',
-  'hash' => '2e4d27c29192c9d55eb27b985d7e9838702c4324d36ed6e3a85999e9f25ada99',
+  'filename' => 'sites/all/modules/date/tests/DateTimezoneTestCase.test',
+  'hash' => '55bf0f1bc26cf54f95fd74c9fe0e91b5278e4fab27e28b86c36047da28d00f62',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_views_pager.test',
-  'hash' => 'aceff66e11dd3ea418e9905b28384432f4fe7cf9746e711cf56add73e64336dd',
+  'filename' => 'sites/all/modules/date/tests/DateUiTestCase.test',
+  'hash' => 'c118dbbf38a96407a539d214f9833a6ecad1ff4644820fa56b80d2f99eeae22b',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/tests/date_views_popup.test',
-  'hash' => '0684ad4977093fd7338eb045f85ceda195e82f50bd33fecbf0dca00e42b0385e',
+  'filename' => 'sites/all/modules/date/tests/DateValidationTestCase.test',
+  'hash' => '675c3dce13d95e424364de4db2c49d88cba19ce8eb86530341374c82a3b1292f',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/email/email.migrate.inc',
@@ -54142,7 +59236,7 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/entity.features.inc',
-  'hash' => '47261e1f4f39ac3707a16fdea8a8147c09df1281bcb4b9e46b0c8120603137e8',
+  'hash' => '53f537caf6ad9355fb92b2c6db019959abdf399d80764151dd976b0891f37436',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/entity.i18n.inc',
@@ -54158,35 +59252,35 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/entity.test',
-  'hash' => 'df253128e41f152b45ef30b5674009c51cf4112450e5dad8e815f39ced280db5',
+  'hash' => 'aba6490cd2041438d832dc8f63b213e0d171a5a218f6d51a9fe00c51e95069ce',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/includes/entity.controller.inc',
-  'hash' => '342db185e6170b63c59a9b360a196eb322edb9a5b8c7819f66b0eae48ed13ebd',
+  'hash' => 'b85d1882fae38ee8a0e82bf75952f44f65a58fd95e3bf0c3cb2a1321cf4d308a',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/includes/entity.inc',
-  'hash' => '57411fa3d7b5cd2afe8b84f20c1741f48c32673a9da07bd2c35d4a11c50c640e',
+  'hash' => '02c3c8b1d4b7230f875c4fae8e6ba3bd57431e01f312b32f3ed305a7be734774',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/includes/entity.ui.inc',
-  'hash' => '65739b31af0e6b422919c17805799dc99143fd89cacfb56b9186e26ece2d0df2',
+  'hash' => '49653cbbccc4b4e51f957727aa95803c149fac9565f53ed553e2cd1c1c3580ff',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/includes/entity.wrapper.inc',
-  'hash' => '0db08cbb6b730035e3e9a483e6e5c06a744a73f19e4ca83936446b44f0c3d158',
+  'hash' => 'c728444ea73d4d5a7f0ec4cc80c7b749ab3134e1d0b973f8c001936c3dd5b861',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/views/entity.views.inc',
-  'hash' => 'de657f42389ed6832df787e4b618d8d7117b60d145d34ce5dcf3a5b65db29df9',
+  'hash' => '089b8ed3103f62778be3395a99ddfbd84da4235f5ad431392f8984eaa4bf349f',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/views/handlers/entity_views_field_handler_helper.inc',
-  'hash' => '4ec395881109a71327ab8d7c5b5702bef30288ca66557e44e8539cc15a2135bb',
+  'hash' => '88e4cbbbeab9bbaa4c928118bdefb158ea99f343f813cf88cce01ed7fbf8bf6a',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/views/handlers/entity_views_handler_area_entity.inc',
-  'hash' => '7b7bb88e53861739b7279f705f0492fc83ce95f5b20d89339480f546422ebf25',
+  'hash' => '39ac643c4365394ac54190c4d130ea5787de423b9dadc14a470687a64cfbc8ab',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/views/handlers/entity_views_handler_field_boolean.inc',
@@ -54234,11 +59328,11 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/views/plugins/entity_views_plugin_row_entity_view.inc',
-  'hash' => 'ba557790215f2658146424d933e0d17787a0b15180c5815f23428448ccf056a0',
+  'hash' => 'e489ca209c66b76228383864b8267067e7cf3a1e375d9a195339f89932fed71f',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/entityreference.migrate.inc',
-  'hash' => '617c6c49e6e0fa4d106cfb49b61a6994b5520934ac3b64a8400a9d969eab7c59',
+  'hash' => '6dfe7be97f3198bff6c145dce9a0f521c3695c380d24fe6d3feb97362363407d',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/plugins/behavior/abstract.inc',
@@ -54246,15 +59340,15 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/plugins/behavior/EntityReferenceBehavior_TaxonomyIndex.class.php',
-  'hash' => '92fa0cf46ecdf6200659646e6666c562ea506c40efa41a8edd4758dc0c551b92',
+  'hash' => '29e0f80ac52c1c313455a531404a3040c9160ecd173afd2e200ff99ffbab491c',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/plugins/selection/abstract.inc',
-  'hash' => '7ecf94f5dc3456e4a5c87117d19deb98c368617fb07d610505b1dfa351f14a0b',
+  'hash' => '9c8cdf704c8e42cc2a63d4c8271d28c7b0aa7e0b1ec081ed7bd84712631e3e72',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php',
-  'hash' => 'e9a8a3c693ed24218d00c10c445cdb21daed10a26e6b55e5c9d6a8c616cfd871',
+  'hash' => '3516c65d6048e182dcd1b7209ccf6838e17b1d342617d06e7a07ffed8bd549c6',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/plugins/selection/views.inc',
@@ -54262,23 +59356,27 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/tests/entityreference.admin.test',
-  'hash' => 'bcd6516be3099ae87a4c3d41add08edd17eafb4244db8442c5dc15f19ebde7ae',
+  'hash' => 'f9e581f0fd8481b12ae74779f28942b26d29b0df828ba092b7be87cab29e1172',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/tests/entityreference.feeds.test',
-  'hash' => '320c7480b1758e4d80e91c0a6ea3d43b6b35d1adfe00b6155b61ef786510bb7c',
+  'hash' => 'b19193542031d2e1a247ffac8852e9219e5f7f0ed38298207ffe27cd1af9352a',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entityreference/tests/entityreference.field.test',
+  'hash' => '33483dbc58b1bfab047ae640bcf59a9a3e197cdb2d93240ef3bcb939cd4a2862',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/tests/entityreference.handlers.test',
-  'hash' => '2fa170925ac5303c519378f1763e918cc2f111205220d90998b547a08db90d8c',
+  'hash' => 'be2ea3fab2b6a5116a5ff1292ec3d916fb48ae36001e064503ef3db952c99b99',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/tests/entityreference.taxonomy.test',
-  'hash' => '8e4f7d9ae621df0f587b6fcbf139adea2a35c69305ef018ced88447a41164c5f',
+  'hash' => '28aed16bd109189d6b2bfc8f59d914c8e237190738fa23d81dbd6cf2c2bced9b',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/views/entityreference_plugin_display.inc',
-  'hash' => '9216a065ea4fdb2daacb1280e5c9549e3400b8553b5293534cf65a0d703ab189',
+  'hash' => 'f70ee264eec52af076bea73e525bb09fa0fdb7bfe59353d7241ccc2673799a66',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/views/entityreference_plugin_row_fields.inc',
@@ -54286,47 +59384,247 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/views/entityreference_plugin_style.inc',
-  'hash' => 'ad9a7ea5a37c2d9658c2b1d19ade3011c27ed5d9959423ebf7a390372507e6b0',
+  'hash' => 'fef62f9375cbcadbfd1918227434193f45e4cc62964cb4fee22ab1d8d3b3bb26',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.test',
+  'hash' => '5bae8493da737121bdc9e24654c3ef1fadb9998e031533f6c46d407f5ba2ddb5',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/entity_translation_upgrade/entity_translation_upgrade.test',
+  'hash' => 'a7bff85b8ef693c394b387e3588cc4eaa730623df3f2505bc9a6e62e29de009a',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.comment.inc',
+  'hash' => 'c1667be0bdea8805be52b10bad904f60a278213b749d4c9903e3887b6165448c',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.inc',
+  'hash' => 'd470382679e75b63f370e7d476a737eb104e7bae0937668d912873bc2c94ce89',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.node.inc',
+  'hash' => '255963e0d0a38349e1c5cb3ff072819b9c39cb5760a71b312ddaac1dd2edbb82',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.taxonomy_term.inc',
+  'hash' => '587417ed1ba9debd4caef9b32722ca003be28c325d12f3fcb82b70384c095814',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.handler.user.inc',
+  'hash' => '4574d55fc756f566bc10f574231ee7900a181fbaa68d647ae973d9e06b4167ac',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.handler_factory.inc',
+  'hash' => '80ed7658c3d685bc18e7d29129893b2fb48dcda029e730241c1d0f53db7ad367',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/includes/translation.migrate.inc',
+  'hash' => 'e5c56971c44ad5352089481e48e01fb83bfefbb5359c8033949ce5227a917d42',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/tests/entity_translation.test',
+  'hash' => 'b3aa79b5d0805999336c000aafa63c9384303bd5018ca57d78cb94fa380eb854',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_field_field.inc',
+  'hash' => '4681a5b5e8963b562e6fbb39c3385024034f392162eb4ff7f52a1684db628ea8',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_field_label.inc',
+  'hash' => 'd31ea1af45150832df052fad29af729c6c028a54fa44d62a023a861bbeba744d',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_field_translate_link.inc',
+  'hash' => '78cfa9c4e9b074e5d45d887fe8f69a8966fc0112d95a6abc74b9b13421b58047',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_filter_entity_type.inc',
+  'hash' => 'd86bb73731c60f8ebaa3d8c29f837403935e91fe062c5ab6293901aa253da3e7',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_filter_language.inc',
+  'hash' => '44c3a6928b8f7cde5fea6ae7cff973982d6c7781a3c8be663838ff770435c939',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_filter_translation_exists.inc',
+  'hash' => '25d8ee7f5d45a5e3984572d00816368902121574f04277a67bbabd004b67f39a',
+))
+->values(array(
+  'filename' => 'sites/all/modules/entity_translation/views/entity_translation_handler_relationship.inc',
+  'hash' => 'aac136a9eab8c4b832edd73b942e124c3fdf1f48b6c8a8d0bf5383ba1d32259c',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n.test',
+  'hash' => 'c52b5076bfd40ec8820a1f58dd9ea6f8d0098c771f65d740298143137d52866e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_block/i18n_block.inc',
+  'hash' => '73eb3b7ba1e14cd12b51c7a94dcd2e5d701d1cee5aaf24d907aa282dbc9212c1',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_block/i18n_block.test',
+  'hash' => 'b2608274dae333577514565b54b14f2ad8f84c3928fb0ea0ed848aa8db7375e6',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.inc',
+  'hash' => 'b8c9b97f9dbc510e0e3b478e8fe21e86278a19ac5b8ddcf2da15c37d14afcc03',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.test',
+  'hash' => '933758375305519b97501c2479834620d258881088cdbabb4a493f4e0054d068',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_forum/i18n_forum.test',
+  'hash' => '90b38124594fea145afac37b8343cee5a08b0db5e4f4adfcdd5cd5da9231f263',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.inc',
+  'hash' => '932080f89ff854073641d565e46d82b8ecb9221640ce63192ff080527fa89f6e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.test',
+  'hash' => 'c907c0cf68dec26504ede662d8afa254b3903d9a964e3099011d680de87acf0b',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_node/i18n_node.test',
+  'hash' => '0009235387b1fb0a15ae46cea8e00539128f8a807c4e5f6c8abf27929ec28ff6',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_object.inc',
+  'hash' => '13118a2525f7ef27040f1c4824fcd05258154fcba128bdb5802c0aac471293c8',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_path/i18n_path.test',
+  'hash' => 'd625f7e36e653d8d55cf68e4366a647f5efc20689d3905d6fc77657752ac7584',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_select/i18n_select.test',
+  'hash' => 'bfb4267be987278f079382f218433a191973f13f4f8c06077e719ca90fd744ed',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.admin.inc',
+  'hash' => 'ace6c13b12cbb5379c803def1f4c4ba073457aa7fe84d1f87a4a4693e28b216c',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.inc',
+  'hash' => '35569a693d0bb7df4035acefddc026087676f5671f0957ec56bbdd63eadd1fbc',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.test',
+  'hash' => '5127520c1b08f78d3314d6df948b6a59eeb5a889c74687a196bfa3244c33f6d8',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_sync/i18n_sync.install',
+  'hash' => '12b053b45d9f2741afd2eccae8fc5e267c0319319976b08125a789d8df76abca',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_sync/i18n_sync.module',
+  'hash' => '24aed1c28846be9333241c6c84ef18cea642ad13c220e043112f9dbd7ec081b2',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_sync/i18n_sync.node.inc',
+  'hash' => 'eeb55d7fca17c7b8396053a31d7a14e1a40643f87549648617c005115ef480c1',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_sync/i18n_sync.test',
+  'hash' => '3da6de303a0d0443d312c44f72c6e346acb52688ffd1349b615640abb7a93ca5',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.admin.inc',
+  'hash' => '5b609efc7ae96ddf4129dc9ee59a4a17fd522c8f9c6e148ffb1ac6eb24700246',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.inc',
+  'hash' => '7bc643c59e25c8a00491bc70258821793bbcb232a70510eff071a02bb1e4343e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.pages.inc',
+  'hash' => 'cd0cb343cbfe113a13583450618163b90e6bee8778f79b6dc76ce12dfd13a2f4',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.test',
+  'hash' => '29fc8c69345e4d2b8eda25ae5d7775772ff1432452f07d51d66b727857ba3690',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_translation/i18n_translation.inc',
+  'hash' => 'e7e38105a080efcb1d947e7e6d2f1487127b166905b2722c516582827ddaf143',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_variable/i18n_variable.class.inc',
+  'hash' => '8803cd58f313f348b08afb953c6ebcfc6ea2203e9751bee09326b882b346edc6',
+))
+->values(array(
+  'filename' => 'sites/all/modules/i18n/i18n_variable/i18n_variable.test',
+  'hash' => 'b511aa2d4275a7464cb0aef90e308568a08ff523c80d6a63567cbeba94918e01',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/link/link.migrate.inc',
-  'hash' => '0a17ff0daa79813174fff92e9db787e75e710fe757b6924eec193c66fe13f3df',
+  'hash' => '329488d6a88a0cbcd68ebeffbb88cc12da3518b61e28744cd612474cf8e8a165',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/link.module',
-  'hash' => '3fdf23f9f409b80df5eee57207a5045c566422cef14128306835f7b1b03a5e66',
+  'filename' => 'sites/all/modules/link/tests/LinkBaseTestClass.test',
+  'hash' => 'eb3ab4b3a547e0b06e98ec09ede36438b47a64db079a2c55a4e0bb6368218271',
+))
+->values(array(
+  'filename' => 'sites/all/modules/link/tests/LinkConvertInternalPathsTest.test',
+  'hash' => '5696b4cdaaf8253659a11395f79673a26c9596de58a6552532638807cf632050',
+))
+->values(array(
+  'filename' => 'sites/all/modules/link/tests/LinkDefaultProtocolTest.test',
+  'hash' => 'b35360a8c21e242b5c8e34bb9b83e39e84f93d58aca8cc5513a42b95cec5cf3b',
+))
+->values(array(
+  'filename' => 'sites/all/modules/link/tests/LinkEntityTokenTest.test',
+  'hash' => '37efc9d5193f71decc36c29779580c79d54abbfecad2caf14bd05b710176204b',
+))
+->values(array(
+  'filename' => 'sites/all/modules/link/tests/LinkFieldAttributesTest.test',
+  'hash' => '0682b64eb37a6020d81d1049c0ca53c0243fefc3cee3ec3e5b55970e6e1b5e86',
+))
+->values(array(
+  'filename' => 'sites/all/modules/link/tests/LinkFieldCrudTest.test',
+  'hash' => '1ebd9285f414f56c80a0dc454a3193c0829f6fea40ec62a1fd69f6246a73d6c3',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/tests/link.attribute.test',
-  'hash' => '8c21045dbcf346edf8dc70c157d02074dd87372d4f60e7f5a4ae11683cd79399',
+  'filename' => 'sites/all/modules/link/tests/LinkFieldValidateTest.test',
+  'hash' => '46281a764f666d6edbc6f7efcd2d2e166fa35fe59e7a41d3c4a12eeca8995165',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/tests/link.crud.test',
-  'hash' => 'de19e2c5e8c6cb02f25d7051bdd1db77852379ac59ce8185c25b4bf927478f22',
+  'filename' => 'sites/all/modules/link/tests/LinkPathPrefixesTest.test',
+  'hash' => '85e24764e755d960f10111b2697836243b08b68f0be2b92e3968e0114ab0a5d5',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/tests/link.crud_browser.test',
-  'hash' => '07794771164033e14a635625ad08fdbcdc4dafa154db2ec0bd9a95ca30202eb5',
+  'filename' => 'sites/all/modules/link/tests/LinkSanitizeTest.test',
+  'hash' => '6a662005fa4370c7584b35d78c5989aeb5a4dcf6537a095cb3fb5c29ec49e07a',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/tests/link.test',
-  'hash' => 'fe5d8cd577fbfc07929e7216e115530a28777ace9b7135fbc853a3a78d550456',
+  'filename' => 'sites/all/modules/link/tests/LinkTokenTest.test',
+  'hash' => '04523630d058b3ceb0509dbc4cacc90b81f3c8d1c04cafeb8d1db20606969fa7',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/tests/link.token.test',
-  'hash' => '930af3b64ccabd58a14c8f596ee4b908596b4bee64174bfa34d55fbab7173da4',
+  'filename' => 'sites/all/modules/link/tests/LinkUnitTestCase.test',
+  'hash' => '57cbcc85ae344b38c1a374df68b8b1864af4eba82246a345a5355bf321fce668',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/link/tests/link.validate.test',
-  'hash' => '4fb3d9124767f43332f2e40bcca3aba98575dd1f6a286adfc8831607823986c5',
+  'filename' => 'sites/all/modules/link/tests/LinkValidationApiTest.test',
+  'hash' => '1bc0ad1d140be70511ad6082efb8ea0770593a692100c18e362f6925d29945a9',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/link/views/link_views_handler_argument_target.inc',
-  'hash' => 'd77c23c6b085382c63e7dbce3d95afc9756517edcdc4cd455892d8333520d4c9',
+  'hash' => '99203a8b7c5a6e39c75104836aada6d4034ab010c95f4dbdc28b020f32383da7',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/link/views/link_views_handler_filter_protocol.inc',
-  'hash' => 'e10a0d2de73bfa9a56fadbac023c6ac16022ced40c0444ab6ffed1b5d7ea7358',
+  'hash' => '7135d542a2f9bb7263870024324d5398208e3b6f1ddff7e3142e6b0de757d5ad',
+))
+->values(array(
+  'filename' => 'sites/all/modules/multiupload_filefield_widget/multiupload_filefield_widget.module',
+  'hash' => '184be72d9c2b74973019acc74df64be6e5c5fdab2d2bcff5111f83cf5210865a',
+))
+->values(array(
+  'filename' => 'sites/all/modules/multiupload_filefield_widget/multiupload_filefield_widget.test',
+  'hash' => 'd206793dfb93a72a82ddaf3dbc408e5944d0f2c47edbf838b037b594aa1fb8fe',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/phone/phone.migrate.inc',
@@ -54448,81 +59746,177 @@
   'filename' => 'sites/all/modules/phone/tests/phone.za.test',
   'hash' => 'c5491ab663972aa23ae2f917a0fc605a6136f02e1b207d3fc650ed1f251359ee',
 ))
+->values(array(
+  'filename' => 'sites/all/modules/references/node_reference/node_reference.test',
+  'hash' => '5746afcbdfe47cfe75cce38c9690759cc2ab762bf2ae88d560aa0634dc671076',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/views/references_handler_argument.inc',
+  'hash' => '8548d8cd4676fc24bb26d0cf1a81640bbb8e8528c4b5a49195ff6c3d1fc53c41',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/views/references_handler_relationship.inc',
+  'hash' => '8fbf980fc3c9300ccb95e5efc4fa402233e4c9d4ed7a6d26b70264e37008c6e4',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/views/references_plugin_display.inc',
+  'hash' => 'eba22fcf16dff09cebd7f0864e8c7a51e1d1041e048dfda6160f6f7836741857',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/views/references_plugin_row_fields.inc',
+  'hash' => '061ea853c8d82b60aa472f23fdbe050e089d52ea0ede9567ecb0fc21b0135f5b',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/views/references_plugin_style.inc',
+  'hash' => 'b1761b3fdcb1fed613799011f148358b2a618d3f32126ca1c0465191d9885f74',
+))
 ->values(array(
   'filename' => 'sites/all/modules/telephone/telephone.migrate.inc',
   'hash' => '14561d51028bcf5b9e2f18654c3ba76eda444feb12ea6ac4e88fdbf4c1a35650',
 ))
+->values(array(
+  'filename' => 'sites/all/modules/title/tests/TitleAdminSettingsTestCase.test',
+  'hash' => '1aa98eb4a80966ccefb2378bcbd842f4aef2235c53a087fbbc4c7e103b7c84e7',
+))
+->values(array(
+  'filename' => 'sites/all/modules/title/tests/TitleFieldReplacementTestCase.test',
+  'hash' => '265bfc71f96b08e6ccd3c65286c218bed315d441e8b138ed03f6a18b139aa464',
+))
+->values(array(
+  'filename' => 'sites/all/modules/title/tests/TitleTranslationTestCase.test',
+  'hash' => '1df6a3f30ac41bece9a7a95ce0007827f3a6ebd6748ed1507bb5e71ce2ff9d3c',
+))
+->values(array(
+  'filename' => 'sites/all/modules/title/views/views_handler_title_field.inc',
+  'hash' => '683a24b01764154d49c1822233af47b196f48fe158acd9abe85449db4d743333',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/forum.variable.inc',
+  'hash' => '84ab5992d648c704b2ae6d680cf8e02d3150cccd8939170f7e8fd82ac054b516',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/locale.variable.inc',
+  'hash' => '27173d9c9e526a8ba88c5f48bf516aaac59ad932b64ef654621bc11f1ccd9f7a',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/menu.variable.inc',
+  'hash' => 'bc776840ee32060a9fda616ca154d3fd315461fbe07ce822d7969b79fccd8160',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/node.variable.inc',
+  'hash' => '596064101f8fbd3affdb61ca1240354ce0b51778601a8b02c021a1150bbf4e06',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/system.variable.inc',
+  'hash' => '909bae0f1e3a4d85c32c385a92a58c559576fb60fd13a0e4f71127eee27afd3e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/taxonomy.variable.inc',
+  'hash' => '7792f07f8ea088cd8c3350e16f4cacef262c319c2e605dd911f17999a872f09e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/translation.variable.inc',
+  'hash' => '3e4e82f779986bfb32987d6b27bdab9f907ba5e18841847f138a20c42cf725d4',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/includes/user.variable.inc',
+  'hash' => 'b80094c1db0037f396f197bdd70c19e87afe76f4378c5c6089c4199af3bcb03a',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/variable.test',
+  'hash' => 'a6614814c24aee5ae1d2f2f8c23c08138466c41a82e57ee670e070d7cdd6e4b2',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.class.inc',
+  'hash' => 'ba523237a0e0116b3fdb3c86390fd2adc51b1cc50bab25d42995cd40a5b582bf',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/variable_realm/variable_realm_union.class.inc',
+  'hash' => 'e9597edd9bac66e6b7f078cee37c3ced317b2768821cdac77b8d4c2f68b2adcc',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/variable_store/variable_store.class.inc',
+  'hash' => '16870479d9464f0453d573e1384c808bae8319944fdf466e67ebdb53f6f8f54c',
+))
+->values(array(
+  'filename' => 'sites/all/modules/variable/variable_store/variable_store.test',
+  'hash' => '1546243a6be757de0fd7f9fe1428152fb0e53a91453c53c72aebb06f6cef4311',
+))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/comment/views_handler_argument_comment_user_uid.test',
-  'hash' => 'b8b417ef0e05806a88bd7d5e2f7dcb41339fbf5b66f39311defc9fb65476d561',
+  'hash' => 'ec9e9668eb1ae33364125feae864e2984b731cc6d6f66874f9b56c5729a42cc3',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/comment/views_handler_filter_comment_user_uid.test',
-  'hash' => '347c6ffd4383706dbde844235aaf31cff44a22e95d2e6d8ef4da34a41b70edd1',
+  'hash' => 'd62fe3f3257efc0eaf742e3c177ea3f1bd5efb9fc8f91dc1bc5e9e6196085bd7',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/field/views_fieldapi.test',
-  'hash' => '53e6d57c2d1d6cd0cd92e15ca4077ba532214daf41e9c7c0f940c7c8dbd86a66',
+  'hash' => 'a85c1dddb1c128b40dabbcb02c7013ae96b2da15a2df766b5317483fd4484aba',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_area_text.test',
-  'hash' => 'af74a74a3357567b844606add76d7ca1271317778dd7bd245a216cf963c738b4',
+  'filename' => 'sites/all/modules/views/tests/handlers/views_handlers.test',
+  'hash' => '44f3dd30909d43e250c726e312290a522131c7f0d3048fc5f8583fc8c5986f72',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_argument_null.test',
-  'hash' => '1d174e1f467b905d67217bd755100d78ffeca4aa4ada5c4be40270cd6d30b721',
+  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_area_text.test',
+  'hash' => '3553a85c6d86992a17029eac182b486940393cee0c06380cf9f60ed208a57b5f',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_argument_string.test',
-  'hash' => '3d0213af0041146abb61dcdc750869ed773d0ac80cfa74ffbadfdd03b1f11c52',
+  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_argument_null.test',
+  'hash' => 'e9adbe3e322cc8b536d79b5b915cab97102199abf2a14ad7a6374cfd18246372',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field.test',
-  'hash' => 'af552bf825ab77486b3d0d156779b7c4806ce5a983c6116ad68b633daf9bb927',
+  'hash' => 'd4a833179c4f9aa57c42ef951b9e6d5a9304281e7aeb8c7dbe92ed6b24251cb4',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_boolean.test',
-  'hash' => 'd334b12a850f36b41fe89ab30a9d758fd3ce434286bd136404344b7b288460ae',
+  'hash' => 'c9f409147fe545a413b365ee37e0758a47291165effc76f0ae8743f84915053d',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_counter.test',
-  'hash' => '75b31942adf06b107f5ffd3c97545fde8cd1040b1d00f682e3c7c1320026e26c',
+  'hash' => '86f4514cfa72192034db1ef70723cb2b2b1ffde6e4e5fb4212ec959cd5697ba6',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_custom.test',
-  'hash' => '1446bc3d5a6b1180a79edfa46a5268dbf7f089836aa3bc45df00ddaff9dd0ce1',
+  'hash' => '57d1f7d01e57f8e2a9694340684344f5e7d6d5c90bad8679aba591192c1f6a2d',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_date.test',
-  'hash' => '6f45326d7f74127956d9d8e4d7ad96a4beb0f66175fa40daf1d618d1a5fa996d',
+  'hash' => '27f9b23bc31068a3f2a2f5b6678388dd4175b66f758b60e9a996e061a2e3a789',
+))
+->values(array(
+  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_file_extension.test',
+  'hash' => '0f9c376f31ca47ecc0f01548d451c548ef7bebe8a07974def77e6725badda4e6',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_file_size.test',
-  'hash' => '49184db68af398a54e81c8a76261acd861da8fd7846b9d51dcf476d61396bfb9',
+  'hash' => '9c951d86dad9df3fca72b20abcb1345a0473578324a454c75d8a5a22e8b68015',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_math.test',
-  'hash' => '6e39e4f782e6b36151ceafb41a5509f7c661be79b393b24f6f5496d724535887',
+  'hash' => 'bbf418c1be15c20d4ddf09add1620f19ff91dc66611e8426a5528900ad9baf60',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_url.test',
-  'hash' => 'b41f762a71594b438a2e60a79c8260ba54e6305635725b0747e29f0d3ffe08c9',
+  'hash' => '0c0e54a93ffd5890b81807e0d0440d061f771fafc6d99943d5d9dfc4a1702686',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_field_xss.test',
-  'hash' => 'f129ee16c03f84673e33990cbb2da5aa88c362f46e9ba1620b2a842ffd1c9cd2',
+  'hash' => '17f33ec5473f0ddf8fbce6a3dfe3e65c0e51b7b13a0afc1b6d3dcf3667d4d83b',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_filter_combine.test',
-  'hash' => '05842d83a11822afe7d566835f5db9f0f94fdb27ddfc388d38138767bdf36f8b',
+  'hash' => '40dd1c5db7f8f225999dd1f7acd616269ad6d67155dcb8f843349597ac5a0a13',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_filter_date.test',
-  'hash' => '045cc449b68bbd5526071bf38c505b6d44f6c91868273c3120705c3bad250aee',
+  'hash' => 'a26c239c803507d2716ad35c4b3ee6b5339628f45d46dcd2a5d505769309c503',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_filter_equality.test',
-  'hash' => 'c88f21c9cbf1aae83393b26616908f8020c18fe378d76256c7ba192df2ec17af',
+  'hash' => 'df783f081546df2f3f77ac69665cd95a5725bdccc5673ab35a79a59aca08ce1a',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_filter_in_operator.test',
@@ -54530,35 +59924,39 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_filter_numeric.test',
-  'hash' => '35ac7a34e696b979e86ef7209b6697098d9abe218e30a02cc4fe39fb11f2a852',
+  'hash' => '818f73baea9d062dbc7e4ef35444c6cbb26b4b60ed3972c6d9e697162c755d05',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_filter_string.test',
-  'hash' => 'b7d090780748faad478e619fd55673d746d4a0cf343d9e40ea96881324c34cbd',
+  'hash' => '33eec214b52abf24b54fa7eae0758f9f0cd59468c11829f87f575baa2017b84e',
+))
+->values(array(
+  'filename' => 'sites/all/modules/views/tests/handlers/views_handler_manytoone.test',
+  'hash' => '378fed0a25f7466666441a8d1f6692b9434c026d8b31c1a8659d54f1026fbbf6',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_sort.test',
-  'hash' => 'f4ff79e6bc54e83c4eb2777811f33702b7e9fe7416ef70ae00d100fa54d44fec',
+  'hash' => 'ace33efab99798d8221871038b2298b9e645f22278dd015dda5fac6688ee54ee',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_sort_date.test',
-  'hash' => 'f548584d7c6a71cabd3ce07e04053a38df3f3e1685210ce8114238fd05344c10',
+  'hash' => '4f997b2d2afdb64747b087c7e118287bc58872d72740e5004e17e5ee6ef643c7',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/handlers/views_handler_sort_random.test',
-  'hash' => '4fdba9bf05a26720ffa97e7a37da65ddc9044bd2832f8c89007b82feb062f182',
+  'hash' => '9ff72485303fd209ef748c65d0cb52078400985b54f256b82f1b3bb28a323a1f',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/node/views_node_revision_relations.test',
-  'hash' => '9467497a6d693615b48c8f57611a850002317bcb091b926d2efbbe56a4e61480',
+  'hash' => '108f56a3381d1c9a72f85d5a681ebeff66c587d032d13ed229dfc32c7d0195d7',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/plugins/views_plugin_display.test',
-  'hash' => '4a6b136543a60999604c54125fa9d4f5aa61a5dcc71e2133d89325d81bc0fc2d',
+  'hash' => 'fb9399398d003056fe5b7d79f67de93b6a79a2a651f1041c73d5beedf632bfde',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/styles/views_plugin_style.test',
-  'hash' => 'fb6c3279645fbcc1126acb3e1c908189e5240c647f81dcfd9b0761570c99d269',
+  'hash' => 'ec6258fd8ae26ac1832cf2ad9d0f5625965168126413ed6dc7798d09b658db03',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/styles/views_plugin_style_base.test',
@@ -54566,103 +59964,115 @@
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/styles/views_plugin_style_jump_menu.test',
-  'hash' => 'b88baa8aebe183943a6e4cf2df314fef13ac41b5844cd5fa4aa91557dd624895',
+  'hash' => 'a78de0a289d2813b8b0c4a841c147d8e9c4a2dd6f6b8a7c89b7a62a9daee2520',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/styles/views_plugin_style_mapping.test',
-  'hash' => 'a4e68bc8cfbeff4a1d9b8085fd115bfe7a8c4b84c049573fa0409b0dc8c2f053',
+  'hash' => 'c0e4768100d803b5f1e48c2883ebb9951e538bd72cf4a7325a7c5c7970c2967a',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/styles/views_plugin_style_unformatted.test',
-  'hash' => '033ca29d41af47cd7bd12d50fea6c956dde247202ebda9df7f637111481bb51d',
+  'hash' => 'd22239d0812c2f28df86b1742a0968c8ce76f120072a7bf5631b839967ff757a',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/taxonomy/views_handler_relationship_node_term_data.test',
-  'hash' => '6074f5c7ae63225ea0cd26626ace6c017740e226f4d3c234e39869c31308223d',
+  'hash' => '6c4b72146690700987abca3f746e01278c0866438d5324263766fc4493802e12',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/user/views_handler_field_user_name.test',
-  'hash' => '69641b6da26d8daee9a2ceb2d0df56668bf09b86db1d4071c275b6e8d0885f9e',
+  'hash' => 'fa92b2055c02ea2c3cd5f9619848f299cc83a3d21638a7dd44804ea9e0644ad0',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/user/views_user.test',
-  'hash' => 'fbb63b42a0b7051bd4d33cf36841f39d7cc13a63b0554eca431b2a08c19facae',
+  'hash' => '59c88fe311319773d8d2e9d76b4f6b6f5731c86797e47760ec585295c376853c',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/user/views_user_argument_default.test',
-  'hash' => '6423f2db7673763991b1fd0c452a7d84413c7dd888ca6c95545fadc531cfaaf4',
+  'hash' => 'a2026a55bec3bfd84601f4c03ba5a284732f9797c61c175a906b11a8fbe8effc',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/user/views_user_argument_validate.test',
-  'hash' => 'c88c9e5d162958f8924849758486a0d83822ada06088f5cf71bfbe76932d8d84',
+  'hash' => '954b4b5886e74f20a113032734dfca6e5c1cfc068d31a5b9ba428337659a44e3',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_access.test',
-  'hash' => 'f8b9d04b43c09a67ec722290a30408c1df8c163cf6e5863b41468bb4e381ee6f',
+  'hash' => '3f17cc9257c3c12f24197106b27654e811801fc5d5639022e23a98c7b45e4d7f',
+))
+->values(array(
+  'filename' => 'sites/all/modules/views/tests/views_ajax.test',
+  'hash' => '9741ae5e85382066f5a6401d1d85b333dedd741d13194c4dafcdc0ca81441e7b',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_analyze.test',
-  'hash' => '5548e36c99bb626209d63e5cddbc31f49ad83865c983d2662c6826b328d24ffb',
+  'hash' => 'f521c5e3c781d6eaf1ad58536a875c2c8cefc973a23087073653f397b7de89df',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_argument_default.test',
-  'hash' => '5950937aae4608bba5b86f366ef3a56cc6518bbccfeaeacda79fa13246d220e4',
+  'hash' => 'de7a8eb60e71b6bc2996d636bb91aa6c9c3adca6f857300b13c1e650d07ad66e',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_argument_validator.test',
-  'hash' => '31f8f49946c8aa3b03d6d9a2281bdfb11c54071b28e83fb3e827ca6ff5e38c88',
+  'hash' => '8fe3d99942cd98f981a08ab49b09eb8bb2cf1e2fb09b53dc1030abb59611edba',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_basic.test',
-  'hash' => '655bd33983f84bbea68a3f24bfab545d2c02f36a478566edf35a98a58ff0c6cf',
+  'hash' => 'e3715a9df468b1c2decb4d8a068a68ca6a3f8bd467066634075ee643d6cabb60',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_cache.test',
-  'hash' => '76316e1f026c2ab81ef91450b9d6d5985cbfab087f839ea0edd112209bf84fd9',
+  'hash' => '325ac3e8100fe1c9aa065a72bdd238c863bf51da269d2a686a36060d05ede112',
+))
+->values(array(
+  'filename' => 'sites/all/modules/views/tests/views_clone.test',
+  'hash' => '99176a985b8e7ce8a83214f2a98a66394a2ebe7a852192e82f50d359bee89052',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_exposed_form.test',
-  'hash' => '2b2b16373af8ecade91d7c77bd8c2da8286a33bde554874f5d81399d201c3228',
+  'hash' => '0427bd048cab45f3f07aca9f96e8e8f083f464ca61975c107f63988ec9fbc9a1',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_glossary.test',
-  'hash' => '118d50177a68a6f88e3727e10f8bcc6f95176282cc42fbd604458eeb932a36e8',
+  'hash' => '777f21f55146c0f54a8fc3326a40cda1d47cfb8c4267c646ad38c76c9b1eb226',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_groupby.test',
-  'hash' => 'ac6ca55f084f4884c06437815ccfa5c4d10bfef808c3f6f17a4f69537794a992',
+  'hash' => 'db01e228395517ed4d0d8fa234a63a14781068f60e54d07e40ae7ef12052394d',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_handlers.test',
-  'hash' => 'a696e3d6b1748da03a04ac532f403700d07c920b9c405c628a6c94ea6764f501',
+  'hash' => '87f9e7bd3afa75f79bb1f3cdfff0b76fc4199174e197459b7c3f985c8256ffcd',
+))
+->values(array(
+  'filename' => 'sites/all/modules/views/tests/views_handler_filter.test',
+  'hash' => '39f2aade9f7d32ca2dd3d22fe3c36eb973695e315e8bca6dd76cb72fd5734779',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_module.test',
-  'hash' => '3939798f2f679308903d4845f5625dd60df6110aec2615e33ab81e854d0b7e73',
+  'hash' => '2640ac503d4a832258f8836459b9228a6ce39849d199d407f85ff4a9d939c7a8',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_pager.test',
-  'hash' => '6f448c8c13c5177afb35103119d6281958a2d6dbdfb96ae5f4ee77cb3b44adc5',
+  'hash' => 'fd1e54a66c8f4c4b7bc811cf0466ea1c7bb8d961b8b592d2101ae168dbc8f613',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_query.test',
-  'hash' => '1ab587994dc43b1315e9a534d005798aecaa14182ba23a2b445e56516b9528cb',
+  'hash' => 'e7f5b1449539805086fd2b10239c8f702851a3dbefe8e93a89d85ab75361e9ff',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_translatable.test',
-  'hash' => '6899c7b09ab72c262480cf78d200ecddfb683e8f2495438a55b35ae0e103a1b3',
+  'hash' => '09e2091a84268085a75992b30b761c76a58b8ca2c1612e41d899c180ff8d9066',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_ui.test',
-  'hash' => 'f9687a363d7cc2828739583e3eedeb68c99acd505ff4e3036c806a42b93a2688',
+  'hash' => 'fbd2f7ed1320f28dc7ac17949296199218f9f10ee18bdc6c35c75c75e68876fb',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_upgrade.test',
-  'hash' => 'c48bd74b85809dd78d963e525e38f3b6dd7e12aa249f73bd6a20247a40d6713a',
+  'hash' => 'ebebe64dc1fd8b70908e11e6ad4e7b81c4ab472d3da4773fd6f46932764fc60e',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_view.test',
-  'hash' => 'a52e010d27cc2eb29804a3acd30f574adf11fad1f5860e431178b61cddbdbb69',
+  'hash' => '9fc3e62bfa6ad01bbf71b9b2ff065466290de378bd7adc28943dba1c1364fc83',
 ))
 ->execute();
 $connection->schema()->createTable('role', array(
@@ -54749,39 +60159,64 @@
   'module',
 ))
 ->values(array(
-  'rid' => '3',
-  'permission' => 'access administration pages',
-  'module' => 'system',
+  'rid' => '1',
+  'permission' => 'access comments',
+  'module' => 'comment',
 ))
 ->values(array(
-  'rid' => '3',
-  'permission' => 'access all views',
-  'module' => 'views',
+  'rid' => '1',
+  'permission' => 'access content',
+  'module' => 'node',
 ))
 ->values(array(
   'rid' => '1',
+  'permission' => 'use text format filtered_html',
+  'module' => 'filter',
+))
+->values(array(
+  'rid' => '2',
   'permission' => 'access comments',
   'module' => 'comment',
 ))
 ->values(array(
   'rid' => '2',
-  'permission' => 'access comments',
+  'permission' => 'access content',
+  'module' => 'node',
+))
+->values(array(
+  'rid' => '2',
+  'permission' => 'post comments',
   'module' => 'comment',
 ))
 ->values(array(
-  'rid' => '3',
-  'permission' => 'access comments',
+  'rid' => '2',
+  'permission' => 'skip comment approval',
   'module' => 'comment',
 ))
 ->values(array(
-  'rid' => '1',
-  'permission' => 'access content',
-  'module' => 'node',
+  'rid' => '2',
+  'permission' => 'use text format custom_text_format',
+  'module' => 'filter',
 ))
 ->values(array(
   'rid' => '2',
-  'permission' => 'access content',
-  'module' => 'node',
+  'permission' => 'use text format filtered_html',
+  'module' => 'filter',
+))
+->values(array(
+  'rid' => '3',
+  'permission' => 'access administration pages',
+  'module' => 'system',
+))
+->values(array(
+  'rid' => '3',
+  'permission' => 'access all views',
+  'module' => 'views',
+))
+->values(array(
+  'rid' => '3',
+  'permission' => 'access comments',
+  'module' => 'comment',
 ))
 ->values(array(
   'rid' => '3',
@@ -54798,21 +60233,11 @@
   'permission' => 'access contextual links',
   'module' => 'contextual',
 ))
-->values(array(
-  'rid' => '3',
-  'permission' => 'access dashboard',
-  'module' => 'dashboard',
-))
 ->values(array(
   'rid' => '3',
   'permission' => 'access news feeds',
   'module' => 'aggregator',
 ))
-->values(array(
-  'rid' => '3',
-  'permission' => 'access overlay',
-  'module' => 'overlay',
-))
 ->values(array(
   'rid' => '3',
   'permission' => 'access printer-friendly version',
@@ -54888,6 +60313,11 @@
   'permission' => 'administer content types',
   'module' => 'node',
 ))
+->values(array(
+  'rid' => '3',
+  'permission' => 'administer fields',
+  'module' => 'field',
+))
 ->values(array(
   'rid' => '3',
   'permission' => 'administer filters',
@@ -55093,11 +60523,6 @@
   'permission' => 'edit terms in 1',
   'module' => 'taxonomy',
 ))
-->values(array(
-  'rid' => '2',
-  'permission' => 'post comments',
-  'module' => 'comment',
-))
 ->values(array(
   'rid' => '3',
   'permission' => 'post comments',
@@ -55118,11 +60543,6 @@
   'permission' => 'select account cancellation method',
   'module' => 'user',
 ))
-->values(array(
-  'rid' => '2',
-  'permission' => 'skip comment approval',
-  'module' => 'comment',
-))
 ->values(array(
   'rid' => '3',
   'permission' => 'skip comment approval',
@@ -55168,26 +60588,11 @@
   'permission' => 'use PHP for settings',
   'module' => 'php',
 ))
-->values(array(
-  'rid' => '2',
-  'permission' => 'use text format custom_text_format',
-  'module' => 'filter',
-))
 ->values(array(
   'rid' => '3',
   'permission' => 'use text format custom_text_format',
   'module' => 'filter',
 ))
-->values(array(
-  'rid' => '1',
-  'permission' => 'use text format filtered_html',
-  'module' => 'filter',
-))
-->values(array(
-  'rid' => '2',
-  'permission' => 'use text format filtered_html',
-  'module' => 'filter',
-))
 ->values(array(
   'rid' => '3',
   'permission' => 'use text format filtered_html',
@@ -55357,6 +60762,12 @@
   'type' => 'node',
   'score' => '1',
 ))
+->values(array(
+  'word' => '9',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '26',
+))
 ->values(array(
   'word' => '99999999',
   'sid' => '1',
@@ -55369,6 +60780,18 @@
   'type' => 'node',
   'score' => '1',
 ))
+->values(array(
+  'word' => 'about',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '26',
+))
+->values(array(
+  'word' => 'absolute',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '1',
+))
 ->values(array(
   'word' => 'admin',
   'sid' => '1',
@@ -55381,6 +60804,18 @@
   'type' => 'node',
   'score' => '11',
 ))
+->values(array(
+  'word' => 'benjamin',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '11',
+))
+->values(array(
+  'word' => 'best',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '1',
+))
 ->values(array(
   'word' => 'click',
   'sid' => '1',
@@ -55399,12 +60834,24 @@
   'type' => 'node',
   'score' => '1',
 ))
+->values(array(
+  'word' => 'deep',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '26',
+))
 ->values(array(
   'word' => 'default',
   'sid' => '1',
   'type' => 'node',
   'score' => '11',
 ))
+->values(array(
+  'word' => 'ever',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '1',
+))
 ->values(array(
   'word' => 'examplecom',
   'sid' => '1',
@@ -55423,6 +60870,12 @@
   'type' => 'node',
   'score' => '2',
 ))
+->values(array(
+  'word' => 'know',
+  'sid' => '2',
+  'type' => 'node',
+  'score' => '1',
+))
 ->values(array(
   'word' => 'monday',
   'sid' => '1',
@@ -55460,134 +60913,86 @@
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'register',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '2',
-))
-->values(array(
-  'word' => 'some',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '1',
-))
-->values(array(
-  'word' => 'submitted',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '1',
-))
-->values(array(
-  'word' => 'text',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '1',
-))
-->values(array(
-  'word' => 'this',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '1',
-))
-->values(array(
-  'word' => 'value',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '1',
-))
-->values(array(
-  'word' => 'value120suffix',
-  'sid' => '1',
-  'type' => 'node',
-  'score' => '1',
-))
-->values(array(
-  'word' => '9',
+  'word' => 'quark',
   'sid' => '2',
   'type' => 'node',
-  'score' => '26',
+  'score' => '11',
 ))
 ->values(array(
-  'word' => 'about',
-  'sid' => '2',
+  'word' => 'register',
+  'sid' => '1',
   'type' => 'node',
-  'score' => '26',
+  'score' => '2',
 ))
 ->values(array(
-  'word' => 'absolute',
+  'word' => 'show',
   'sid' => '2',
   'type' => 'node',
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'benjamin',
+  'word' => 'sisko',
   'sid' => '2',
   'type' => 'node',
   'score' => '11',
 ))
 ->values(array(
-  'word' => 'best',
-  'sid' => '2',
+  'word' => 'some',
+  'sid' => '1',
   'type' => 'node',
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'deep',
+  'word' => 'space',
   'sid' => '2',
   'type' => 'node',
   'score' => '26',
 ))
 ->values(array(
-  'word' => 'ever',
-  'sid' => '2',
+  'word' => 'submitted',
+  'sid' => '1',
   'type' => 'node',
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'know',
-  'sid' => '2',
+  'word' => 'text',
+  'sid' => '1',
   'type' => 'node',
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'quark',
-  'sid' => '2',
-  'type' => 'node',
-  'score' => '11',
-))
-->values(array(
-  'word' => 'show',
+  'word' => 'that',
   'sid' => '2',
   'type' => 'node',
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'sisko',
+  'word' => 'thing',
   'sid' => '2',
   'type' => 'node',
-  'score' => '11',
+  'score' => '26',
 ))
 ->values(array(
-  'word' => 'space',
-  'sid' => '2',
+  'word' => 'this',
+  'sid' => '1',
   'type' => 'node',
-  'score' => '26',
+  'score' => '1',
 ))
 ->values(array(
-  'word' => 'that',
+  'word' => 'trust',
   'sid' => '2',
   'type' => 'node',
   'score' => '1',
 ))
 ->values(array(
-  'word' => 'thing',
-  'sid' => '2',
+  'word' => 'value',
+  'sid' => '1',
   'type' => 'node',
-  'score' => '26',
+  'score' => '1',
 ))
 ->values(array(
-  'word' => 'trust',
-  'sid' => '2',
+  'word' => 'value120suffix',
+  'sid' => '1',
   'type' => 'node',
   'score' => '1',
 ))
@@ -55892,7 +61297,7 @@
   'value',
 ))
 ->values(array(
-  'value' => '2',
+  'value' => '7',
 ))
 ->execute();
 $connection->schema()->createTable('sessions', array(
@@ -56070,6 +61475,32 @@
   'primary key' => array(
     'message_id',
   ),
+  'indexes' => array(
+    'reporter' => array(
+      'test_class',
+      'message_id',
+    ),
+  ),
+  'mysql_character_set' => 'utf8',
+));
+
+$connection->schema()->createTable('simpletest_test_id', array(
+  'fields' => array(
+    'test_id' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'size' => 'normal',
+    ),
+    'last_prefix' => array(
+      'type' => 'varchar',
+      'not null' => FALSE,
+      'length' => '60',
+      'default' => '',
+    ),
+  ),
+  'primary key' => array(
+    'test_id',
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -56156,7 +61587,7 @@
   'bootstrap' => '0',
   'schema_version' => '7004',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:10:"Aggregator";s:11:"description";s:57:"Aggregates syndicated content (RSS, RDF, and Atom feeds).";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"aggregator.test";}s:9:"configure";s:41:"admin/config/services/aggregator/settings";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:14:"aggregator.css";s:33:"modules/aggregator/aggregator.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:10:"Aggregator";s:11:"description";s:57:"Aggregates syndicated content (RSS, RDF, and Atom feeds).";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"aggregator.test";}s:9:"configure";s:41:"admin/config/services/aggregator/settings";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:14:"aggregator.css";s:33:"modules/aggregator/aggregator.css";}}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/aggregator/tests/aggregator_test.module',
@@ -56167,7 +61598,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:23:"Aggregator module tests";s:11:"description";s:46:"Support module for aggregator related testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:23:"Aggregator module tests";s:11:"description";s:46:"Support module for aggregator related testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/block/block.module',
@@ -56178,7 +61609,7 @@
   'bootstrap' => '0',
   'schema_version' => '7009',
   'weight' => '-5',
-  'info' => 'a:13:{s:4:"name";s:5:"Block";s:11:"description";s:140:"Controls the visual building blocks a page is constructed with. Blocks are boxes of content rendered into an area, or region, of a web page.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"block.test";}s:9:"configure";s:21:"admin/structure/block";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:5:"Block";s:11:"description";s:140:"Controls the visual building blocks a page is constructed with. Blocks are boxes of content rendered into an area, or region, of a web page.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"block.test";}s:9:"configure";s:21:"admin/structure/block";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/block/tests/block_test.module',
@@ -56189,7 +61620,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Block test";s:11:"description";s:21:"Provides test blocks.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Block test";s:11:"description";s:21:"Provides test blocks.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/blog/blog.module',
@@ -56200,7 +61631,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:4:"Blog";s:11:"description";s:25:"Enables multi-user blogs.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"blog.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:4:"Blog";s:11:"description";s:25:"Enables multi-user blogs.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"blog.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/book/book.module',
@@ -56211,7 +61642,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:4:"Book";s:11:"description";s:66:"Allows users to create and organize related content in an outline.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"book.test";}s:9:"configure";s:27:"admin/content/book/settings";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"book.css";s:21:"modules/book/book.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:4:"Book";s:11:"description";s:66:"Allows users to create and organize related content in an outline.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"book.test";}s:9:"configure";s:27:"admin/content/book/settings";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"book.css";s:21:"modules/book/book.css";}}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/color/color.module',
@@ -56222,7 +61653,7 @@
   'bootstrap' => '0',
   'schema_version' => '7001',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:5:"Color";s:11:"description";s:70:"Allows administrators to change the color scheme of compatible themes.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"color.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:5:"Color";s:11:"description";s:70:"Allows administrators to change the color scheme of compatible themes.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"color.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/comment/comment.module',
@@ -56233,7 +61664,7 @@
   'bootstrap' => '0',
   'schema_version' => '7009',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:7:"Comment";s:11:"description";s:57:"Allows users to comment on and discuss published content.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:4:"text";}s:5:"files";a:2:{i:0;s:14:"comment.module";i:1;s:12:"comment.test";}s:9:"configure";s:21:"admin/content/comment";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:11:"comment.css";s:27:"modules/comment/comment.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:7:"Comment";s:11:"description";s:57:"Allows users to comment on and discuss published content.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:4:"text";}s:5:"files";a:2:{i:0;s:14:"comment.module";i:1;s:12:"comment.test";}s:9:"configure";s:21:"admin/content/comment";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:11:"comment.css";s:27:"modules/comment/comment.css";}}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/contact/contact.module',
@@ -56244,7 +61675,7 @@
   'bootstrap' => '0',
   'schema_version' => '7003',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:7:"Contact";s:11:"description";s:61:"Enables the use of both personal and site-wide contact forms.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"contact.test";}s:9:"configure";s:23:"admin/structure/contact";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:7:"Contact";s:11:"description";s:61:"Enables the use of both personal and site-wide contact forms.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"contact.test";}s:9:"configure";s:23:"admin/structure/contact";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/contextual/contextual.module',
@@ -56255,7 +61686,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:16:"Contextual links";s:11:"description";s:75:"Provides contextual links to perform actions related to elements on a page.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"contextual.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:16:"Contextual links";s:11:"description";s:75:"Provides contextual links to perform actions related to elements on a page.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"contextual.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/dashboard/dashboard.module',
@@ -56264,9 +61695,9 @@
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '0',
+  'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:9:"Dashboard";s:11:"description";s:136:"Provides a dashboard page in the administrative interface for organizing administrative tasks and tracking information within your site.";s:4:"core";s:3:"7.x";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:5:"files";a:1:{i:0;s:14:"dashboard.test";}s:12:"dependencies";a:1:{i:0;s:5:"block";}s:9:"configure";s:25:"admin/dashboard/customize";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:9:"Dashboard";s:11:"description";s:136:"Provides a dashboard page in the administrative interface for organizing administrative tasks and tracking information within your site.";s:4:"core";s:3:"7.x";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:5:"files";a:1:{i:0;s:14:"dashboard.test";}s:12:"dependencies";a:1:{i:0;s:5:"block";}s:9:"configure";s:25:"admin/dashboard/customize";s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/dblog/dblog.module',
@@ -56275,9 +61706,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '1',
-  'schema_version' => '7002',
+  'schema_version' => '7003',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:16:"Database logging";s:11:"description";s:47:"Logs and records system events to the database.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"dblog.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:16:"Database logging";s:11:"description";s:47:"Logs and records system events to the database.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"dblog.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/field/field.module',
@@ -56286,9 +61717,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7003',
+  'schema_version' => '7004',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:5:"Field";s:11:"description";s:57:"Field API to add fields to entities like nodes and users.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:4:{i:0;s:12:"field.module";i:1;s:16:"field.attach.inc";i:2;s:20:"field.info.class.inc";i:3;s:16:"tests/field.test";}s:12:"dependencies";a:1:{i:0;s:17:"field_sql_storage";}s:8:"required";b:1;s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:15:"theme/field.css";s:29:"modules/field/theme/field.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:5:"Field";s:11:"description";s:57:"Field API to add fields to entities like nodes and users.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:4:{i:0;s:12:"field.module";i:1;s:16:"field.attach.inc";i:2;s:20:"field.info.class.inc";i:3;s:16:"tests/field.test";}s:12:"dependencies";a:1:{i:0;s:17:"field_sql_storage";}s:8:"required";b:1;s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:15:"theme/field.css";s:29:"modules/field/theme/field.css";}}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/field_sql_storage/field_sql_storage.module',
@@ -56299,7 +61730,7 @@
   'bootstrap' => '0',
   'schema_version' => '7002',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:17:"Field SQL storage";s:11:"description";s:37:"Stores field data in an SQL database.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:22:"field_sql_storage.test";}s:8:"required";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:17:"Field SQL storage";s:11:"description";s:37:"Stores field data in an SQL database.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:22:"field_sql_storage.test";}s:8:"required";b:1;s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/list/list.module',
@@ -56310,7 +61741,7 @@
   'bootstrap' => '0',
   'schema_version' => '7002',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:4:"List";s:11:"description";s:69:"Defines list field types. Use with Options to create selection lists.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:7:"options";}s:5:"files";a:1:{i:0;s:15:"tests/list.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:12:{s:4:"name";s:4:"List";s:11:"description";s:69:"Defines list field types. Use with Options to create selection lists.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:7:"options";}s:5:"files";a:1:{i:0;s:15:"tests/list.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/list/tests/list_test.module',
@@ -56321,7 +61752,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:9:"List test";s:11:"description";s:41:"Support module for the List module tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:9:"List test";s:11:"description";s:41:"Support module for the List module tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/number/number.module',
@@ -56332,7 +61763,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:6:"Number";s:11:"description";s:28:"Defines numeric field types.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:11:"number.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:12:{s:4:"name";s:6:"Number";s:11:"description";s:28:"Defines numeric field types.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:11:"number.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/options/options.module',
@@ -56343,7 +61774,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:7:"Options";s:11:"description";s:82:"Defines selection, check box and radio button widgets for text and numeric fields.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:12:"options.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:7:"Options";s:11:"description";s:82:"Defines selection, check box and radio button widgets for text and numeric fields.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:12:"options.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/field/modules/text/text.module',
@@ -56354,7 +61785,7 @@
   'bootstrap' => '0',
   'schema_version' => '7000',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:4:"Text";s:11:"description";s:32:"Defines simple text field types.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:9:"text.test";}s:8:"required";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:12:{s:4:"name";s:4:"Text";s:11:"description";s:32:"Defines simple text field types.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:9:"text.test";}s:8:"required";b:1;s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'modules/field/tests/field_test.module',
@@ -56365,7 +61796,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:14:"Field API Test";s:11:"description";s:39:"Support module for the Field API tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:5:"files";a:1:{i:0;s:21:"field_test.entity.inc";}s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:14:"Field API Test";s:11:"description";s:39:"Support module for the Field API tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:5:"files";a:1:{i:0;s:21:"field_test.entity.inc";}s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/field_ui/field_ui.module',
@@ -56376,7 +61807,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:8:"Field UI";s:11:"description";s:33:"User interface for the Field API.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:13:"field_ui.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:8:"Field UI";s:11:"description";s:33:"User interface for the Field API.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:13:"field_ui.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/file/file.module',
@@ -56387,7 +61818,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:4:"File";s:11:"description";s:26:"Defines a file field type.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:15:"tests/file.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:12:{s:4:"name";s:4:"File";s:11:"description";s:26:"Defines a file field type.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:15:"tests/file.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'modules/file/tests/file_module_test.module',
@@ -56398,7 +61829,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:9:"File test";s:11:"description";s:53:"Provides hooks for testing File module functionality.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:9:"File test";s:11:"description";s:53:"Provides hooks for testing File module functionality.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/filter/filter.module',
@@ -56409,7 +61840,7 @@
   'bootstrap' => '0',
   'schema_version' => '7010',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:6:"Filter";s:11:"description";s:43:"Filters content in preparation for display.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"filter.test";}s:8:"required";b:1;s:9:"configure";s:28:"admin/config/content/formats";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:6:"Filter";s:11:"description";s:43:"Filters content in preparation for display.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"filter.test";}s:8:"required";b:1;s:9:"configure";s:28:"admin/config/content/formats";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/forum/forum.module',
@@ -56420,7 +61851,7 @@
   'bootstrap' => '0',
   'schema_version' => '7012',
   'weight' => '1',
-  'info' => 'a:14:{s:4:"name";s:5:"Forum";s:11:"description";s:27:"Provides discussion forums.";s:12:"dependencies";a:2:{i:0;s:8:"taxonomy";i:1;s:7:"comment";}s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"forum.test";}s:9:"configure";s:21:"admin/structure/forum";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"forum.css";s:23:"modules/forum/forum.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:5:"Forum";s:11:"description";s:27:"Provides discussion forums.";s:12:"dependencies";a:2:{i:0;s:8:"taxonomy";i:1;s:7:"comment";}s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:10:"forum.test";}s:9:"configure";s:21:"admin/structure/forum";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:9:"forum.css";s:23:"modules/forum/forum.css";}}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/help/help.module',
@@ -56431,7 +61862,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:4:"Help";s:11:"description";s:35:"Manages the display of online help.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"help.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:4:"Help";s:11:"description";s:35:"Manages the display of online help.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"help.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/image/image.module',
@@ -56442,7 +61873,18 @@
   'bootstrap' => '0',
   'schema_version' => '7005',
   'weight' => '0',
-  'info' => 'a:15:{s:4:"name";s:5:"Image";s:11:"description";s:34:"Provides image manipulation tools.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:4:"file";}s:5:"files";a:1:{i:0;s:10:"image.test";}s:9:"configure";s:31:"admin/config/media/image-styles";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:13:{s:4:"name";s:5:"Image";s:11:"description";s:34:"Provides image manipulation tools.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:4:"file";}s:5:"files";a:1:{i:0;s:10:"image.test";}s:9:"configure";s:31:"admin/config/media/image-styles";s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+))
+->values(array(
+  'filename' => 'modules/image/tests/image_module_styles_test.module',
+  'name' => 'image_module_styles_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:17:"Image Styles test";s:11:"description";s:80:"Provides additional hook implementations for testing Image Styles functionality.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:31:"image_module_styles_test.module";}s:12:"dependencies";a:1:{i:0;s:17:"image_module_test";}s:6:"hidden";b:1;s:5:"mtime";i:1664871879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/image/tests/image_module_test.module',
@@ -56453,7 +61895,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Image test";s:11:"description";s:69:"Provides hook implementations for testing Image module functionality.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:24:"image_module_test.module";}s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Image test";s:11:"description";s:69:"Provides hook implementations for testing Image module functionality.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:24:"image_module_test.module";}s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/locale/locale.module',
@@ -56464,7 +61906,7 @@
   'bootstrap' => '0',
   'schema_version' => '7005',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:6:"Locale";s:11:"description";s:119:"Adds language handling functionality and enables the translation of the user interface to languages other than English.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"locale.test";}s:9:"configure";s:30:"admin/config/regional/language";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:6:"Locale";s:11:"description";s:119:"Adds language handling functionality and enables the translation of the user interface to languages other than English.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"locale.test";}s:9:"configure";s:30:"admin/config/regional/language";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/locale/tests/locale_test.module',
@@ -56475,7 +61917,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"Locale Test";s:11:"description";s:42:"Support module for the locale layer tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Locale Test";s:11:"description";s:42:"Support module for the locale layer tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/menu/menu.module',
@@ -56486,7 +61928,7 @@
   'bootstrap' => '0',
   'schema_version' => '7003',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:4:"Menu";s:11:"description";s:60:"Allows administrators to customize the site navigation menu.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"menu.test";}s:9:"configure";s:20:"admin/structure/menu";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:4:"Menu";s:11:"description";s:60:"Allows administrators to customize the site navigation menu.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"menu.test";}s:9:"configure";s:20:"admin/structure/menu";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/node/node.module',
@@ -56495,9 +61937,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7015',
+  'schema_version' => '7016',
   'weight' => '0',
-  'info' => 'a:15:{s:4:"name";s:4:"Node";s:11:"description";s:66:"Allows content to be submitted to the site and displayed on pages.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:11:"node.module";i:1;s:9:"node.test";}s:8:"required";b:1;s:9:"configure";s:21:"admin/structure/types";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"node.css";s:21:"modules/node/node.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:13:{s:4:"name";s:4:"Node";s:11:"description";s:66:"Allows content to be submitted to the site and displayed on pages.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:11:"node.module";i:1;s:9:"node.test";}s:8:"required";b:1;s:9:"configure";s:21:"admin/structure/types";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"node.css";s:21:"modules/node/node.css";}}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/node/tests/node_access_test.module',
@@ -56508,7 +61950,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:24:"Node module access tests";s:11:"description";s:43:"Support module for node permission testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:24:"Node module access tests";s:11:"description";s:43:"Support module for node permission testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/node/tests/node_test.module',
@@ -56519,7 +61961,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:17:"Node module tests";s:11:"description";s:40:"Support module for node related testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:17:"Node module tests";s:11:"description";s:40:"Support module for node related testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/node/tests/node_test_exception.module',
@@ -56530,7 +61972,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:27:"Node module exception tests";s:11:"description";s:50:"Support module for node related exception testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:27:"Node module exception tests";s:11:"description";s:50:"Support module for node related exception testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/openid/openid.module',
@@ -56539,9 +61981,9 @@
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '7000',
+  'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:6:"OpenID";s:11:"description";s:48:"Allows users to log into your site using OpenID.";s:7:"version";s:4:"7.40";s:7:"package";s:4:"Core";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"openid.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:6:"OpenID";s:11:"description";s:48:"Allows users to log into your site using OpenID.";s:7:"version";s:4:"7.92";s:7:"package";s:4:"Core";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"openid.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/openid/tests/openid_test.module',
@@ -56552,7 +61994,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:21:"OpenID dummy provider";s:11:"description";s:33:"OpenID provider used for testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"openid";}s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:21:"OpenID dummy provider";s:11:"description";s:33:"OpenID provider used for testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"openid";}s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/overlay/overlay.module',
@@ -56561,9 +62003,9 @@
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '0',
+  'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:7:"Overlay";s:11:"description";s:59:"Displays the Drupal administration interface in an overlay.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:7:"Overlay";s:11:"description";s:59:"Displays the Drupal administration interface in an overlay.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/path/path.module',
@@ -56574,7 +62016,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:4:"Path";s:11:"description";s:28:"Allows users to rename URLs.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"path.test";}s:9:"configure";s:24:"admin/config/search/path";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:4:"Path";s:11:"description";s:28:"Allows users to rename URLs.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"path.test";}s:9:"configure";s:24:"admin/config/search/path";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/php/php.module',
@@ -56585,7 +62027,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:10:"PHP filter";s:11:"description";s:50:"Allows embedded PHP code/snippets to be evaluated.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:8:"php.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:10:"PHP filter";s:11:"description";s:50:"Allows embedded PHP code/snippets to be evaluated.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:8:"php.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/poll/poll.module',
@@ -56596,7 +62038,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:4:"Poll";s:11:"description";s:95:"Allows your site to capture votes on different topics in the form of multiple choice questions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"poll.test";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"poll.css";s:21:"modules/poll/poll.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:4:"Poll";s:11:"description";s:95:"Allows your site to capture votes on different topics in the form of multiple choice questions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:9:"poll.test";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"poll.css";s:21:"modules/poll/poll.css";}}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/profile/profile.module',
@@ -56607,7 +62049,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:7:"Profile";s:11:"description";s:36:"Supports configurable user profiles.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"profile.test";}s:9:"configure";s:27:"admin/config/people/profile";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:7:"Profile";s:11:"description";s:36:"Supports configurable user profiles.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"profile.test";}s:9:"configure";s:27:"admin/config/people/profile";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/rdf/rdf.module',
@@ -56618,7 +62060,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:3:"RDF";s:11:"description";s:148:"Enriches your content with metadata to let other applications (e.g. search engines, aggregators) better understand its relationships and attributes.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:8:"rdf.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:3:"RDF";s:11:"description";s:148:"Enriches your content with metadata to let other applications (e.g. search engines, aggregators) better understand its relationships and attributes.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:8:"rdf.test";}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/rdf/tests/rdf_test.module',
@@ -56629,7 +62071,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:16:"RDF module tests";s:11:"description";s:38:"Support module for RDF module testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:16:"RDF module tests";s:11:"description";s:38:"Support module for RDF module testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:4:"blog";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/search/search.module',
@@ -56640,7 +62082,7 @@
   'bootstrap' => '0',
   'schema_version' => '7000',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:6:"Search";s:11:"description";s:36:"Enables site-wide keyword searching.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:19:"search.extender.inc";i:1;s:11:"search.test";}s:9:"configure";s:28:"admin/config/search/settings";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:10:"search.css";s:25:"modules/search/search.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:6:"Search";s:11:"description";s:36:"Enables site-wide keyword searching.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:19:"search.extender.inc";i:1;s:11:"search.test";}s:9:"configure";s:28:"admin/config/search/settings";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:10:"search.css";s:25:"modules/search/search.css";}}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/search/tests/search_embedded_form.module',
@@ -56651,7 +62093,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:20:"Search embedded form";s:11:"description";s:59:"Support module for search module testing of embedded forms.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:20:"Search embedded form";s:11:"description";s:59:"Support module for search module testing of embedded forms.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/search/tests/search_extra_type.module',
@@ -56662,7 +62104,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:16:"Test search type";s:11:"description";s:41:"Support module for search module testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:16:"Test search type";s:11:"description";s:41:"Support module for search module testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/search/tests/search_node_tags.module',
@@ -56673,7 +62115,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:21:"Test search node tags";s:11:"description";s:44:"Support module for Node search tags testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:21:"Test search node tags";s:11:"description";s:44:"Support module for Node search tags testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/shortcut/shortcut.module',
@@ -56684,7 +62126,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:8:"Shortcut";s:11:"description";s:60:"Allows users to manage customizable lists of shortcut links.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:13:"shortcut.test";}s:9:"configure";s:36:"admin/config/user-interface/shortcut";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:8:"Shortcut";s:11:"description";s:60:"Allows users to manage customizable lists of shortcut links.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:13:"shortcut.test";}s:9:"configure";s:36:"admin/config/user-interface/shortcut";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/simpletest.module',
@@ -56695,7 +62137,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:7:"Testing";s:11:"description";s:53:"Provides a framework for unit and functional testing.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:50:{i:0;s:15:"simpletest.test";i:1;s:24:"drupal_web_test_case.php";i:2;s:18:"tests/actions.test";i:3;s:15:"tests/ajax.test";i:4;s:16:"tests/batch.test";i:5;s:15:"tests/boot.test";i:6;s:20:"tests/bootstrap.test";i:7;s:16:"tests/cache.test";i:8;s:17:"tests/common.test";i:9;s:24:"tests/database_test.test";i:10;s:22:"tests/entity_crud.test";i:11;s:32:"tests/entity_crud_hook_test.test";i:12;s:23:"tests/entity_query.test";i:13;s:16:"tests/error.test";i:14;s:15:"tests/file.test";i:15;s:23:"tests/filetransfer.test";i:16;s:15:"tests/form.test";i:17;s:16:"tests/graph.test";i:18;s:16:"tests/image.test";i:19;s:15:"tests/lock.test";i:20;s:15:"tests/mail.test";i:21;s:15:"tests/menu.test";i:22;s:17:"tests/module.test";i:23;s:16:"tests/pager.test";i:24;s:19:"tests/password.test";i:25;s:15:"tests/path.test";i:26;s:19:"tests/registry.test";i:27;s:17:"tests/schema.test";i:28;s:18:"tests/session.test";i:29;s:20:"tests/tablesort.test";i:30;s:16:"tests/theme.test";i:31;s:18:"tests/unicode.test";i:32;s:17:"tests/update.test";i:33;s:17:"tests/xmlrpc.test";i:34;s:26:"tests/upgrade/upgrade.test";i:35;s:34:"tests/upgrade/upgrade.comment.test";i:36;s:33:"tests/upgrade/upgrade.filter.test";i:37;s:32:"tests/upgrade/upgrade.forum.test";i:38;s:33:"tests/upgrade/upgrade.locale.test";i:39;s:31:"tests/upgrade/upgrade.menu.test";i:40;s:31:"tests/upgrade/upgrade.node.test";i:41;s:35:"tests/upgrade/upgrade.taxonomy.test";i:42;s:34:"tests/upgrade/upgrade.trigger.test";i:43;s:39:"tests/upgrade/upgrade.translatable.test";i:44;s:33:"tests/upgrade/upgrade.upload.test";i:45;s:31:"tests/upgrade/upgrade.user.test";i:46;s:36:"tests/upgrade/update.aggregator.test";i:47;s:33:"tests/upgrade/update.trigger.test";i:48;s:31:"tests/upgrade/update.field.test";i:49;s:30:"tests/upgrade/update.user.test";}s:9:"configure";s:41:"admin/config/development/testing/settings";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:7:"Testing";s:11:"description";s:53:"Provides a framework for unit and functional testing.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:51:{i:0;s:15:"simpletest.test";i:1;s:24:"drupal_web_test_case.php";i:2;s:18:"tests/actions.test";i:3;s:15:"tests/ajax.test";i:4;s:16:"tests/batch.test";i:5;s:15:"tests/boot.test";i:6;s:20:"tests/bootstrap.test";i:7;s:16:"tests/cache.test";i:8;s:17:"tests/common.test";i:9;s:24:"tests/database_test.test";i:10;s:22:"tests/entity_crud.test";i:11;s:32:"tests/entity_crud_hook_test.test";i:12;s:23:"tests/entity_query.test";i:13;s:16:"tests/error.test";i:14;s:15:"tests/file.test";i:15;s:23:"tests/filetransfer.test";i:16;s:15:"tests/form.test";i:17;s:16:"tests/graph.test";i:18;s:16:"tests/image.test";i:19;s:15:"tests/lock.test";i:20;s:15:"tests/mail.test";i:21;s:15:"tests/menu.test";i:22;s:17:"tests/module.test";i:23;s:16:"tests/pager.test";i:24;s:19:"tests/password.test";i:25;s:15:"tests/path.test";i:26;s:19:"tests/registry.test";i:27;s:28:"tests/request_sanitizer.test";i:28;s:17:"tests/schema.test";i:29;s:18:"tests/session.test";i:30;s:20:"tests/tablesort.test";i:31;s:16:"tests/theme.test";i:32;s:18:"tests/unicode.test";i:33;s:17:"tests/update.test";i:34;s:17:"tests/xmlrpc.test";i:35;s:26:"tests/upgrade/upgrade.test";i:36;s:34:"tests/upgrade/upgrade.comment.test";i:37;s:33:"tests/upgrade/upgrade.filter.test";i:38;s:32:"tests/upgrade/upgrade.forum.test";i:39;s:33:"tests/upgrade/upgrade.locale.test";i:40;s:31:"tests/upgrade/upgrade.menu.test";i:41;s:31:"tests/upgrade/upgrade.node.test";i:42;s:35:"tests/upgrade/upgrade.taxonomy.test";i:43;s:34:"tests/upgrade/upgrade.trigger.test";i:44;s:39:"tests/upgrade/upgrade.translatable.test";i:45;s:33:"tests/upgrade/upgrade.upload.test";i:46;s:31:"tests/upgrade/upgrade.user.test";i:47;s:36:"tests/upgrade/update.aggregator.test";i:48;s:33:"tests/upgrade/update.trigger.test";i:49;s:31:"tests/upgrade/update.field.test";i:50;s:30:"tests/upgrade/update.user.test";}s:9:"configure";s:41:"admin/config/development/testing/settings";s:5:"mtime";i:1664871879;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/actions_loop_test.module',
@@ -56706,7 +62148,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:17:"Actions loop test";s:11:"description";s:39:"Support module for action loop testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:17:"Actions loop test";s:11:"description";s:39:"Support module for action loop testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/ajax_forms_test.module',
@@ -56717,7 +62159,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:26:"AJAX form test mock module";s:11:"description";s:25:"Test for AJAX form calls.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:26:"AJAX form test mock module";s:11:"description";s:25:"Test for AJAX form calls.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/ajax_test.module',
@@ -56728,7 +62170,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:9:"AJAX Test";s:11:"description";s:40:"Support module for AJAX framework tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:9:"AJAX Test";s:11:"description";s:40:"Support module for AJAX framework tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/batch_test.module',
@@ -56739,7 +62181,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:14:"Batch API test";s:11:"description";s:35:"Support module for Batch API tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:14:"Batch API test";s:11:"description";s:35:"Support module for Batch API tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/boot_test_1.module',
@@ -56750,7 +62192,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:21:"Early bootstrap tests";s:11:"description";s:39:"A support module for hook_boot testing.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:21:"Early bootstrap tests";s:11:"description";s:39:"A support module for hook_boot testing.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/boot_test_2.module',
@@ -56761,7 +62203,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:21:"Early bootstrap tests";s:11:"description";s:44:"A support module for hook_boot hook testing.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:21:"Early bootstrap tests";s:11:"description";s:44:"A support module for hook_boot hook testing.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/common_test.module',
@@ -56772,7 +62214,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:11:"Common Test";s:11:"description";s:32:"Support module for Common tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:15:"common_test.css";s:40:"modules/simpletest/tests/common_test.css";}s:5:"print";a:1:{s:21:"common_test.print.css";s:46:"modules/simpletest/tests/common_test.print.css";}}s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:11:"Common Test";s:11:"description";s:32:"Support module for Common tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:15:"common_test.css";s:40:"modules/simpletest/tests/common_test.css";}s:5:"print";a:1:{s:21:"common_test.print.css";s:46:"modules/simpletest/tests/common_test.print.css";}}s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/common_test_cron_helper.module',
@@ -56783,7 +62225,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:23:"Common Test Cron Helper";s:11:"description";s:56:"Helper module for CronRunTestCase::testCronExceptions().";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:23:"Common Test Cron Helper";s:11:"description";s:56:"Helper module for CronRunTestCase::testCronExceptions().";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/database_test.module',
@@ -56794,7 +62236,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:13:"Database Test";s:11:"description";s:40:"Support module for Database layer tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:13:"Database Test";s:11:"description";s:40:"Support module for Database layer tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/drupal_autoload_test/drupal_autoload_test.module',
@@ -56805,7 +62247,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:25:"Drupal code registry test";s:11:"description";s:45:"Support module for testing the code registry.";s:5:"files";a:2:{i:0;s:34:"drupal_autoload_test_interface.inc";i:1;s:30:"drupal_autoload_test_class.inc";}s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:25:"Drupal code registry test";s:11:"description";s:45:"Support module for testing the code registry.";s:5:"files";a:2:{i:0;s:34:"drupal_autoload_test_interface.inc";i:1;s:30:"drupal_autoload_test_class.inc";}s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/drupal_system_listing_compatible_test/drupal_system_listing_compatible_test.module',
@@ -56816,7 +62258,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:37:"Drupal system listing compatible test";s:11:"description";s:62:"Support module for testing the drupal_system_listing function.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:37:"Drupal system listing compatible test";s:11:"description";s:62:"Support module for testing the drupal_system_listing function.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/drupal_system_listing_incompatible_test/drupal_system_listing_incompatible_test.module',
@@ -56827,7 +62269,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:39:"Drupal system listing incompatible test";s:11:"description";s:62:"Support module for testing the drupal_system_listing function.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:39:"Drupal system listing incompatible test";s:11:"description";s:62:"Support module for testing the drupal_system_listing function.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/entity_cache_test.module',
@@ -56838,7 +62280,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:17:"Entity cache test";s:11:"description";s:40:"Support module for testing entity cache.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:28:"entity_cache_test_dependency";}s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:17:"Entity cache test";s:11:"description";s:40:"Support module for testing entity cache.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:28:"entity_cache_test_dependency";}s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/entity_cache_test_dependency.module',
@@ -56849,7 +62291,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:28:"Entity cache test dependency";s:11:"description";s:51:"Support dependency module for testing entity cache.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:28:"Entity cache test dependency";s:11:"description";s:51:"Support dependency module for testing entity cache.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/entity_crud_hook_test.module',
@@ -56860,7 +62302,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:22:"Entity CRUD Hooks Test";s:11:"description";s:35:"Support module for CRUD hook tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:22:"Entity CRUD Hooks Test";s:11:"description";s:35:"Support module for CRUD hook tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/entity_query_access_test.module',
@@ -56871,7 +62313,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:24:"Entity query access test";s:11:"description";s:49:"Support module for checking entity query results.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:24:"Entity query access test";s:11:"description";s:49:"Support module for checking entity query results.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/error_test.module',
@@ -56882,7 +62324,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Error test";s:11:"description";s:47:"Support module for error and exception testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Error test";s:11:"description";s:47:"Support module for error and exception testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/file_test.module',
@@ -56893,7 +62335,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:9:"File test";s:11:"description";s:39:"Support module for file handling tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:16:"file_test.module";}s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:9:"File test";s:11:"description";s:39:"Support module for file handling tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:16:"file_test.module";}s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/filter_test.module',
@@ -56904,7 +62346,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:18:"Filter test module";s:11:"description";s:33:"Tests filter hooks and functions.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:18:"Filter test module";s:11:"description";s:33:"Tests filter hooks and functions.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/form_test.module',
@@ -56915,7 +62357,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:12:"FormAPI Test";s:11:"description";s:34:"Support module for Form API tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:12:"FormAPI Test";s:11:"description";s:34:"Support module for Form API tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/image_test.module',
@@ -56926,7 +62368,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Image test";s:11:"description";s:39:"Support module for image toolkit tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Image test";s:11:"description";s:39:"Support module for image toolkit tests.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/menu_test.module',
@@ -56937,7 +62379,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"Hook menu tests";s:11:"description";s:37:"Support module for menu hook testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"Hook menu tests";s:11:"description";s:37:"Support module for menu hook testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/module_test.module',
@@ -56948,7 +62390,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"Module test";s:11:"description";s:41:"Support module for module system testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Module test";s:11:"description";s:41:"Support module for module system testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/path_test.module',
@@ -56959,7 +62401,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"Hook path tests";s:11:"description";s:37:"Support module for path hook testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"Hook path tests";s:11:"description";s:37:"Support module for path hook testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/psr_0_test/psr_0_test.module',
@@ -56970,7 +62412,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:16:"PSR-0 Test cases";s:11:"description";s:44:"Test classes to be discovered by simpletest.";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:16:"PSR-0 Test cases";s:11:"description";s:44:"Test classes to be discovered by simpletest.";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"package";s:7:"Testing";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/psr_4_test/psr_4_test.module',
@@ -56981,7 +62423,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:16:"PSR-4 Test cases";s:11:"description";s:44:"Test classes to be discovered by simpletest.";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:16:"PSR-4 Test cases";s:11:"description";s:44:"Test classes to be discovered by simpletest.";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"package";s:7:"Testing";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/requirements1_test.module',
@@ -56992,7 +62434,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => "a:13:{s:4:\"name\";s:19:\"Requirements 1 Test\";s:11:\"description\";s:80:\"Tests that a module is not installed when it fails hook_requirements('install').\";s:7:\"package\";s:7:\"Testing\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:6:\"hidden\";b:1;s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:5:\"mtime\";i:1444866674;s:12:\"dependencies\";a:0:{}s:3:\"php\";s:5:\"5.2.4\";s:5:\"files\";a:0:{}s:9:\"bootstrap\";i:0;}",
+  'info' => "a:11:{s:4:\"name\";s:19:\"Requirements 1 Test\";s:11:\"description\";s:80:\"Tests that a module is not installed when it fails hook_requirements('install').\";s:7:\"package\";s:7:\"Testing\";s:7:\"version\";s:4:\"7.92\";s:4:\"core\";s:3:\"7.x\";s:6:\"hidden\";b:1;s:5:\"mtime\";i:1664863480;s:12:\"dependencies\";a:0:{}s:3:\"php\";s:5:\"5.2.4\";s:5:\"files\";a:0:{}s:9:\"bootstrap\";i:0;}",
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/requirements2_test.module',
@@ -57003,7 +62445,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => "a:13:{s:4:\"name\";s:19:\"Requirements 2 Test\";s:11:\"description\";s:98:\"Tests that a module is not installed when the one it depends on fails hook_requirements('install).\";s:12:\"dependencies\";a:2:{i:0;s:18:\"requirements1_test\";i:1;s:7:\"comment\";}s:7:\"package\";s:7:\"Testing\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:6:\"hidden\";b:1;s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:5:\"mtime\";i:1444866674;s:3:\"php\";s:5:\"5.2.4\";s:5:\"files\";a:0:{}s:9:\"bootstrap\";i:0;}",
+  'info' => "a:11:{s:4:\"name\";s:19:\"Requirements 2 Test\";s:11:\"description\";s:98:\"Tests that a module is not installed when the one it depends on fails hook_requirements('install).\";s:12:\"dependencies\";a:2:{i:0;s:18:\"requirements1_test\";i:1;s:7:\"comment\";}s:7:\"package\";s:7:\"Testing\";s:7:\"version\";s:4:\"7.92\";s:4:\"core\";s:3:\"7.x\";s:6:\"hidden\";b:1;s:5:\"mtime\";i:1664863480;s:3:\"php\";s:5:\"5.2.4\";s:5:\"files\";a:0:{}s:9:\"bootstrap\";i:0;}",
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/session_test.module',
@@ -57014,7 +62456,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:12:"Session test";s:11:"description";s:40:"Support module for session data testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:12:"Session test";s:11:"description";s:40:"Support module for session data testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/simpletest/tests/system_admin_test.module',
+  'name' => 'system_admin_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:12:{s:4:"name";s:17:"System Admin Test";s:11:"description";s:44:"Support module for testing system.admin.inc.";s:7:"package";s:16:"Only For Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:0;s:9:"configure";s:13:"config/broken";s:5:"mtime";i:1664871879;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_dependencies_test.module',
@@ -57025,7 +62478,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:22:"System dependency test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:19:"_missing_dependency";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:22:"System dependency test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:19:"_missing_dependency";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_incompatible_core_version_dependencies_test.module',
@@ -57036,7 +62489,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:50:"System incompatible core version dependencies test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:37:"system_incompatible_core_version_test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:50:"System incompatible core version dependencies test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:37:"system_incompatible_core_version_test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_incompatible_core_version_test.module',
@@ -57047,7 +62500,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:37:"System incompatible core version test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"5.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:37:"System incompatible core version test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"5.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_incompatible_module_version_dependencies_test.module',
@@ -57058,7 +62511,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:52:"System incompatible module version dependencies test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:46:"system_incompatible_module_version_test (>2.0)";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:52:"System incompatible module version dependencies test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:46:"system_incompatible_module_version_test (>2.0)";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_incompatible_module_version_test.module',
@@ -57069,7 +62522,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:39:"System incompatible module version test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:39:"System incompatible module version test";s:11:"description";s:47:"Support module for testing system dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:3:"1.0";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/simpletest/tests/system_null_version_test.module',
+  'name' => 'system_null_version_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:24:"System null version test";s:11:"description";s:47:"Support module for testing with a null version.";s:7:"package";s:16:"Only For Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:0;s:5:"mtime";i:1664871879;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_project_namespace_test.module',
@@ -57080,7 +62544,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:29:"System project namespace test";s:11:"description";s:58:"Support module for testing project namespace dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:13:"drupal:filter";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:29:"System project namespace test";s:11:"description";s:58:"Support module for testing project namespace dependencies.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:13:"drupal:filter";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/simpletest/tests/system_requires_null_version_test.module',
+  'name' => 'system_requires_null_version_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:33:"System requires null version test";s:11:"description";s:44:"Support module for testing system_modules().";s:7:"package";s:16:"Only For Testing";s:4:"core";s:3:"7.x";s:7:"version";s:4:"7.92";s:6:"hidden";b:0;s:12:"dependencies";a:1:{i:0;s:24:"system_null_version_test";}s:5:"mtime";i:1664871879;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/system_test.module',
@@ -57091,7 +62566,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"System test";s:11:"description";s:34:"Support module for system testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:18:"system_test.module";}s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"System test";s:11:"description";s:34:"Support module for system testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:18:"system_test.module";}s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/simpletest/tests/taxonomy_nodes_test.module',
+  'name' => 'taxonomy_nodes_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:31:"Taxonomy module node list tests";s:11:"description";s:54:"Support module for taxonomy node list related testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664871879;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/taxonomy_test.module',
@@ -57102,7 +62588,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:20:"Taxonomy test module";s:11:"description";s:45:""Tests functions and hooks not used in core".";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:8:"taxonomy";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:20:"Taxonomy test module";s:11:"description";s:45:""Tests functions and hooks not used in core".";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:8:"taxonomy";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/theme_test.module',
@@ -57113,7 +62599,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Theme test";s:11:"description";s:40:"Support module for theme system testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Theme test";s:11:"description";s:40:"Support module for theme system testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/update_script_test.module',
@@ -57124,7 +62610,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:18:"Update script test";s:11:"description";s:41:"Support module for update script testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:18:"Update script test";s:11:"description";s:41:"Support module for update script testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/update_test_1.module',
@@ -57135,7 +62621,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"Update test";s:11:"description";s:34:"Support module for update testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Update test";s:11:"description";s:34:"Support module for update testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/update_test_2.module',
@@ -57146,7 +62632,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"Update test";s:11:"description";s:34:"Support module for update testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Update test";s:11:"description";s:34:"Support module for update testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/update_test_3.module',
@@ -57157,7 +62643,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"Update test";s:11:"description";s:34:"Support module for update testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Update test";s:11:"description";s:34:"Support module for update testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/url_alter_test.module',
@@ -57168,7 +62654,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"Url_alter tests";s:11:"description";s:45:"A support modules for url_alter hook testing.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"Url_alter tests";s:11:"description";s:45:"A support modules for url_alter hook testing.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/simpletest/tests/xmlrpc_test.module',
@@ -57179,7 +62665,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:12:"XML-RPC Test";s:11:"description";s:75:"Support module for XML-RPC tests according to the validator1 specification.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:12:"XML-RPC Test";s:11:"description";s:75:"Support module for XML-RPC tests according to the validator1 specification.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/statistics/statistics.module',
@@ -57190,7 +62676,7 @@
   'bootstrap' => '1',
   'schema_version' => '7000',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Statistics";s:11:"description";s:37:"Logs access statistics for your site.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"statistics.test";}s:9:"configure";s:30:"admin/config/system/statistics";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Statistics";s:11:"description";s:37:"Logs access statistics for your site.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"statistics.test";}s:9:"configure";s:30:"admin/config/system/statistics";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/syslog/syslog.module',
@@ -57201,7 +62687,7 @@
   'bootstrap' => '1',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:6:"Syslog";s:11:"description";s:41:"Logs and records system events to syslog.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"syslog.test";}s:9:"configure";s:32:"admin/config/development/logging";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:6:"Syslog";s:11:"description";s:41:"Logs and records system events to syslog.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"syslog.test";}s:9:"configure";s:32:"admin/config/development/logging";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/system/system.module',
@@ -57209,10 +62695,10 @@
   'type' => 'module',
   'owner' => '',
   'status' => '1',
-  'bootstrap' => '1',
-  'schema_version' => '7080',
+  'bootstrap' => '0',
+  'schema_version' => '7084',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:6:"System";s:11:"description";s:54:"Handles general site configuration for administrators.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:6:{i:0;s:19:"system.archiver.inc";i:1;s:15:"system.mail.inc";i:2;s:16:"system.queue.inc";i:3;s:14:"system.tar.inc";i:4;s:18:"system.updater.inc";i:5;s:11:"system.test";}s:8:"required";b:1;s:9:"configure";s:19:"admin/config/system";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:6:"System";s:11:"description";s:54:"Handles general site configuration for administrators.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:6:{i:0;s:19:"system.archiver.inc";i:1;s:15:"system.mail.inc";i:2;s:16:"system.queue.inc";i:3;s:14:"system.tar.inc";i:4;s:18:"system.updater.inc";i:5;s:11:"system.test";}s:8:"required";b:1;s:9:"configure";s:19:"admin/config/system";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/system/tests/cron_queue_test.module',
@@ -57223,7 +62709,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"Cron Queue test";s:11:"description";s:41:"Support module for the cron queue runner.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"Cron Queue test";s:11:"description";s:41:"Support module for the cron queue runner.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/system/tests/system_cron_test.module',
+  'name' => 'system_cron_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:16:"System Cron Test";s:11:"description";s:45:"Support module for testing the system_cron().";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/taxonomy/taxonomy.module',
@@ -57234,7 +62731,7 @@
   'bootstrap' => '0',
   'schema_version' => '7011',
   'weight' => '0',
-  'info' => 'a:15:{s:4:"name";s:8:"Taxonomy";s:11:"description";s:38:"Enables the categorization of content.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:7:"options";}s:5:"files";a:2:{i:0;s:15:"taxonomy.module";i:1;s:13:"taxonomy.test";}s:9:"configure";s:24:"admin/structure/taxonomy";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:13:{s:4:"name";s:8:"Taxonomy";s:11:"description";s:38:"Enables the categorization of content.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:7:"options";}s:5:"files";a:2:{i:0;s:15:"taxonomy.module";i:1;s:13:"taxonomy.test";}s:9:"configure";s:24:"admin/structure/taxonomy";s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'modules/toolbar/toolbar.module',
@@ -57245,7 +62742,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:7:"Toolbar";s:11:"description";s:99:"Provides a toolbar that shows the top-level administration menu items and links from other modules.";s:4:"core";s:3:"7.x";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:7:"Toolbar";s:11:"description";s:99:"Provides a toolbar that shows the top-level administration menu items and links from other modules.";s:4:"core";s:3:"7.x";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/tracker/tracker.module',
@@ -57256,7 +62753,7 @@
   'bootstrap' => '0',
   'schema_version' => '7000',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:7:"Tracker";s:11:"description";s:45:"Enables tracking of recent content for users.";s:12:"dependencies";a:1:{i:0;s:7:"comment";}s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"tracker.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:7:"Tracker";s:11:"description";s:45:"Enables tracking of recent content for users.";s:12:"dependencies";a:1:{i:0;s:7:"comment";}s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"tracker.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/translation/tests/translation_test.module',
@@ -57267,7 +62764,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:24:"Content Translation Test";s:11:"description";s:49:"Support module for the content translation tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:24:"Content Translation Test";s:11:"description";s:49:"Support module for the content translation tests.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/translation/translation.module',
@@ -57278,7 +62775,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:19:"Content translation";s:11:"description";s:57:"Allows content to be translated into different languages.";s:12:"dependencies";a:1:{i:0;s:6:"locale";}s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:16:"translation.test";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:19:"Content translation";s:11:"description";s:57:"Allows content to be translated into different languages.";s:12:"dependencies";a:1:{i:0;s:6:"locale";}s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:16:"translation.test";}s:5:"mtime";i:1664863480;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/trigger/tests/trigger_test.module',
@@ -57289,7 +62786,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:12:"Trigger Test";s:11:"description";s:33:"Support module for Trigger tests.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:12:"Trigger Test";s:11:"description";s:33:"Support module for Trigger tests.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/trigger/trigger.module',
@@ -57300,7 +62797,7 @@
   'bootstrap' => '0',
   'schema_version' => '7002',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:7:"Trigger";s:11:"description";s:90:"Enables actions to be fired on certain system events, such as when new content is created.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"trigger.test";}s:9:"configure";s:23:"admin/structure/trigger";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:7:"Trigger";s:11:"description";s:90:"Enables actions to be fired on certain system events, such as when new content is created.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:12:"trigger.test";}s:9:"configure";s:23:"admin/structure/trigger";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/update/tests/aaa_update_test.module',
@@ -57311,7 +62808,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"AAA Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"AAA Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/update/tests/bbb_update_test.module',
@@ -57322,7 +62819,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"BBB Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"BBB Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/update/tests/ccc_update_test.module',
@@ -57333,7 +62830,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:15:"CCC Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"version";s:4:"7.40";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:15:"CCC Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/update/tests/update_test.module',
@@ -57344,7 +62841,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:11:"Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Update test";s:11:"description";s:41:"Support module for update module testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/update/update.module',
@@ -57355,7 +62852,18 @@
   'bootstrap' => '0',
   'schema_version' => '7001',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:14:"Update manager";s:11:"description";s:104:"Checks for available updates, and can securely install or update modules and themes via a web interface.";s:7:"version";s:4:"7.40";s:7:"package";s:4:"Core";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"update.test";}s:9:"configure";s:30:"admin/reports/updates/settings";s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:14:"Update manager";s:11:"description";s:104:"Checks for available updates, and can securely install or update modules and themes via a web interface.";s:7:"version";s:4:"7.92";s:7:"package";s:4:"Core";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:11:"update.test";}s:9:"configure";s:30:"admin/reports/updates/settings";s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/user/tests/user_flood_test.module',
+  'name' => 'user_flood_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:31:"User module flood control tests";s:11:"description";s:46:"Support module for user flood control testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664871879;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/user/tests/user_form_test.module',
@@ -57366,7 +62874,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:22:"User module form tests";s:11:"description";s:37:"Support module for user form testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:22:"User module form tests";s:11:"description";s:37:"Support module for user form testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'modules/user/tests/user_session_test.module',
+  'name' => 'user_session_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:25:"User module session tests";s:11:"description";s:40:"Support module for user session testing.";s:7:"package";s:7:"Testing";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664871879;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'modules/user/user.module',
@@ -57375,9 +62894,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7018',
+  'schema_version' => '7020',
   'weight' => '0',
-  'info' => 'a:15:{s:4:"name";s:4:"User";s:11:"description";s:47:"Manages the user registration and login system.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:11:"user.module";i:1;s:9:"user.test";}s:8:"required";b:1;s:9:"configure";s:19:"admin/config/people";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"user.css";s:21:"modules/user/user.css";}}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:5:"mtime";i:1444866674;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:13:{s:4:"name";s:4:"User";s:11:"description";s:47:"Manages the user registration and login system.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:11:"user.module";i:1;s:9:"user.test";}s:8:"required";b:1;s:9:"configure";s:19:"admin/config/people";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"user.css";s:21:"modules/user/user.css";}}s:5:"mtime";i:1664863480;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'profiles/standard/standard.profile',
@@ -57388,7 +62907,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '1000',
-  'info' => 'a:13:{s:4:"name";s:8:"Standard";s:11:"description";s:51:"Install with commonly used features pre-configured.";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:12:"dependencies";a:21:{i:0;s:5:"block";i:1;s:5:"color";i:2;s:7:"comment";i:3;s:10:"contextual";i:4;s:9:"dashboard";i:5;s:4:"help";i:6;s:5:"image";i:7;s:4:"list";i:8;s:4:"menu";i:9;s:6:"number";i:10;s:7:"options";i:11;s:4:"path";i:12;s:8:"taxonomy";i:13;s:5:"dblog";i:14;s:6:"search";i:15;s:8:"shortcut";i:16;s:7:"toolbar";i:17;s:7:"overlay";i:18;s:8:"field_ui";i:19;s:4:"file";i:20;s:3:"rdf";}s:5:"mtime";i:1535762879;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;s:6:"hidden";b:1;s:8:"required";b:1;s:17:"distribution_name";s:6:"Drupal";}',
+  'info' => 'a:13:{s:4:"name";s:8:"Standard";s:11:"description";s:51:"Install with commonly used features pre-configured.";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:12:"dependencies";a:21:{i:0;s:5:"block";i:1;s:5:"color";i:2;s:7:"comment";i:3;s:10:"contextual";i:4;s:9:"dashboard";i:5;s:4:"help";i:6;s:5:"image";i:7;s:4:"list";i:8;s:4:"menu";i:9;s:6:"number";i:10;s:7:"options";i:11;s:4:"path";i:12;s:8:"taxonomy";i:13;s:5:"dblog";i:14;s:6:"search";i:15;s:8:"shortcut";i:16;s:7:"toolbar";i:17;s:7:"overlay";i:18;s:8:"field_ui";i:19;s:4:"file";i:20;s:3:"rdf";}s:5:"mtime";i:1664863480;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;s:6:"hidden";b:1;s:8:"required";b:1;s:17:"distribution_name";s:6:"Drupal";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/breakpoints/breakpoints.module',
@@ -57397,9 +62916,9 @@
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '-1',
+  'schema_version' => '7102',
   'weight' => '0',
-  'info' => 'a:11:{s:4:"name";s:11:"Breakpoints";s:11:"description";s:18:"Manage breakpoints";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"files";a:2:{i:0;s:18:"breakpoints.module";i:1;s:16:"breakpoints.test";}s:9:"configure";s:30:"admin/config/media/breakpoints";s:5:"mtime";i:1544938132;s:7:"package";s:5:"Other";s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:11:"Breakpoints";s:11:"description";s:18:"Manage breakpoints";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"files";a:2:{i:0;s:18:"breakpoints.module";i:1;s:16:"breakpoints.test";}s:9:"configure";s:30:"admin/config/media/breakpoints";s:5:"mtime";i:1664870344;s:7:"package";s:5:"Other";s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/breakpoints/tests/breakpoints_theme_test.module',
@@ -57410,29 +62929,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:11:{s:4:"name";s:22:"Breakpoints Theme Test";s:11:"description";s:35:"Test breakpoints provided by themes";s:7:"package";s:5:"Other";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1544938132;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
-))
-->values(array(
-  'filename' => 'sites/all/modules/multiupload_filefield_widget/multiupload_filefield_widget.module',
-  'name' => 'multiupload_filefield_widget',
-  'type' => 'module',
-  'owner' => '',
-  'status' => '1',
-  'bootstrap' => '0',
-  'schema_version' => '0',
-  'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:28:"Multiupload Filefield Widget";s:11:"description";s:76:"Creates a widget for filefield to upload multiple files at once using html5.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:4:"file";}s:5:"files";a:2:{i:0;s:35:"multiupload_filefield_widget.module";i:1;s:33:"multiupload_filefield_widget.test";}s:7:"version";s:8:"7.x-1.13";s:7:"project";s:28:"multiupload_filefield_widget";s:9:"datestamp";s:10:"1388873905";s:5:"mtime";i:1388873905;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
-))
-->values(array(
-  'filename' => 'sites/all/modules/multiupload_imagefield_widget/multiupload_imagefield_widget.module',
-  'name' => 'multiupload_imagefield_widget',
-  'type' => 'module',
-  'owner' => '',
-  'status' => '1',
-  'bootstrap' => '0',
-  'schema_version' => '0',
-  'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:29:"Multiupload Imagefield Widget";s:11:"description";s:77:"Creates a widget for imagefield to upload multiple files at once using html5.";s:7:"package";s:6:"Fields";s:12:"dependencies";a:2:{i:0;s:28:"multiupload_filefield_widget";i:1;s:5:"image";}s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-1.3";s:7:"project";s:29:"multiupload_imagefield_widget";s:9:"datestamp";s:10:"1388874206";s:5:"mtime";i:1388874206;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:22:"Breakpoints Theme Test";s:11:"description";s:35:"Test breakpoints provided by themes";s:7:"package";s:5:"Other";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664870344;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/bulk_export/bulk_export.module',
@@ -57443,7 +62940,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:11:"Bulk Export";s:11:"description";s:67:"Performs bulk exporting of data objects known about by Chaos tools.";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:11:"Bulk Export";s:11:"description";s:67:"Performs bulk exporting of data objects known about by Chaos tools.";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/ctools.module',
@@ -57452,9 +62949,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '6008',
+  'schema_version' => '7001',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:11:"Chaos tools";s:11:"description";s:46:"A library of helpful tools by Merlin of Chaos.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:5:"files";a:3:{i:0;s:20:"includes/context.inc";i:1;s:22:"includes/math-expr.inc";i:2;s:21:"includes/stylizer.inc";}s:7:"version";s:7:"7.x-1.4";s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1392220730";s:5:"mtime";i:1392220730;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:11:"Chaos tools";s:11:"description";s:46:"A library of helpful tools by Merlin of Chaos.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:5:"files";a:5:{i:0;s:20:"includes/context.inc";i:1;s:22:"includes/css-cache.inc";i:2;s:22:"includes/math-expr.inc";i:3;s:21:"includes/stylizer.inc";i:4;s:20:"tests/css_cache.test";}s:5:"mtime";i:1664871889;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/ctools_access_ruleset/ctools_access_ruleset.module',
@@ -57465,7 +62962,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:15:"Custom rulesets";s:11:"description";s:81:"Create custom, exportable, reusable access rulesets for applications like Panels.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:15:"Custom rulesets";s:11:"description";s:81:"Create custom, exportable, reusable access rulesets for applications like Panels.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/ctools_ajax_sample/ctools_ajax_sample.module',
@@ -57476,7 +62973,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:33:"Chaos Tools (CTools) AJAX Example";s:11:"description";s:41:"Shows how to use the power of Chaos AJAX.";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:4:"core";s:3:"7.x";s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:33:"Chaos Tools (CTools) AJAX Example";s:11:"description";s:41:"Shows how to use the power of Chaos AJAX.";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:4:"core";s:3:"7.x";s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/ctools_custom_content/ctools_custom_content.module',
@@ -57487,7 +62984,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:20:"Custom content panes";s:11:"description";s:79:"Create custom, exportable, reusable content panes for applications like Panels.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:20:"Custom content panes";s:11:"description";s:79:"Create custom, exportable, reusable content panes for applications like Panels.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/ctools_plugin_example/ctools_plugin_example.module',
@@ -57498,7 +62995,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:35:"Chaos Tools (CTools) Plugin Example";s:11:"description";s:75:"Shows how an external module can provide ctools plugins (for Panels, etc.).";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:4:{i:0;s:6:"ctools";i:1;s:6:"panels";i:2;s:12:"page_manager";i:3;s:13:"advanced_help";}s:4:"core";s:3:"7.x";s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:35:"Chaos Tools (CTools) Plugin Example";s:11:"description";s:75:"Shows how an external module can provide ctools plugins (for Panels, etc.).";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:4:{i:0;s:6:"ctools";i:1;s:6:"panels";i:2;s:12:"page_manager";i:3;s:13:"advanced_help";}s:4:"core";s:3:"7.x";s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/page_manager/page_manager.module',
@@ -57509,7 +63006,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:12:"Page manager";s:11:"description";s:54:"Provides a UI and API to manage pages within the site.";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:12:"Page manager";s:11:"description";s:54:"Provides a UI and API to manage pages within the site.";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/stylizer/stylizer.module',
@@ -57520,7 +63017,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:8:"Stylizer";s:11:"description";s:53:"Create custom styles for applications such as Panels.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:2:{i:0;s:6:"ctools";i:1;s:5:"color";}s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:8:"Stylizer";s:11:"description";s:53:"Create custom styles for applications such as Panels.";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:2:{i:0;s:6:"ctools";i:1;s:5:"color";}s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/term_depth/term_depth.module',
@@ -57531,7 +63028,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:17:"Term Depth access";s:11:"description";s:48:"Controls access to context based upon term depth";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:17:"Term Depth access";s:11:"description";s:48:"Controls access to context based upon term depth";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/tests/ctools_export_test/ctools_export_test.module',
@@ -57542,7 +63039,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:18:"CTools export test";s:11:"description";s:25:"CTools export test module";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:6:"hidden";b:1;s:5:"files";a:1:{i:0;s:18:"ctools_export.test";}s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:18:"CTools export test";s:11:"description";s:25:"CTools export test module";s:4:"core";s:3:"7.x";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:6:"hidden";b:1;s:5:"files";a:1:{i:0;s:18:"ctools_export.test";}s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/tests/ctools_plugin_test.module',
@@ -57553,7 +63050,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:24:"Chaos tools plugins test";s:11:"description";s:42:"Provides hooks for testing ctools plugins.";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"files";a:6:{i:0;s:19:"ctools.plugins.test";i:1;s:17:"object_cache.test";i:2;s:8:"css.test";i:3;s:12:"context.test";i:4;s:20:"math_expression.test";i:5;s:26:"math_expression_stack.test";}s:6:"hidden";b:1;s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:24:"Chaos tools plugins test";s:11:"description";s:42:"Provides hooks for testing ctools plugins.";s:7:"package";s:16:"Chaos tool suite";s:7:"version";s:7:"7.x-1.9";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"files";a:6:{i:0;s:19:"ctools.plugins.test";i:1;s:17:"object_cache.test";i:2;s:8:"css.test";i:3;s:12:"context.test";i:4;s:20:"math_expression.test";i:5;s:26:"math_expression_stack.test";}s:6:"hidden";b:1;s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/ctools/views_content/views_content.module',
@@ -57564,7 +63061,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:19:"Views content panes";s:11:"description";s:104:"Allows Views content to be used in Panels, Dashboard and other modules which use the CTools Content API.";s:7:"package";s:16:"Chaos tool suite";s:12:"dependencies";a:2:{i:0;s:6:"ctools";i:1;s:5:"views";}s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-1.9";s:5:"files";a:3:{i:0;s:61:"plugins/views/views_content_plugin_display_ctools_context.inc";i:1;s:57:"plugins/views/views_content_plugin_display_panel_pane.inc";i:2;s:59:"plugins/views/views_content_plugin_style_ctools_context.inc";}s:7:"project";s:6:"ctools";s:9:"datestamp";s:10:"1440020680";s:5:"mtime";i:1440020680;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:19:"Views content panes";s:11:"description";s:104:"Allows Views content to be used in Panels, Dashboard and other modules which use the CTools Content API.";s:7:"package";s:16:"Chaos tool suite";s:12:"dependencies";a:2:{i:0;s:6:"ctools";i:1;s:5:"views";}s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-1.9";s:5:"files";a:3:{i:0;s:61:"plugins/views/views_content_plugin_display_ctools_context.inc";i:1;s:57:"plugins/views/views_content_plugin_display_panel_pane.inc";i:2;s:59:"plugins/views/views_content_plugin_style_ctools_context.inc";}s:5:"mtime";i:1664871889;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date.module',
@@ -57573,9 +63070,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7004',
+  'schema_version' => '7200',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:4:"Date";s:11:"description";s:33:"Makes date/time fields available.";s:12:"dependencies";a:1:{i:0;s:8:"date_api";}s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:3:"php";s:3:"5.2";s:5:"files";a:9:{i:0;s:16:"date.migrate.inc";i:1;s:19:"tests/date_api.test";i:2;s:15:"tests/date.test";i:3;s:21:"tests/date_field.test";i:4;s:23:"tests/date_migrate.test";i:5;s:26:"tests/date_validation.test";i:6;s:24:"tests/date_timezone.test";i:7;s:27:"tests/date_views_pager.test";i:8;s:27:"tests/date_views_popup.test";}s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:13:{s:4:"name";s:4:"Date";s:11:"description";s:33:"Makes date/time fields available.";s:12:"dependencies";a:1:{i:0;s:13:"date:date_api";}s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:5:"files";a:10:{i:0;s:16:"date.migrate.inc";i:1;s:26:"tests/DateEmwTestCase.test";i:2;s:27:"tests/DateFormTestCase.test";i:3;s:30:"tests/DateMigrateTestCase.test";i:4;s:30:"tests/DateNowUnitTestCase.test";i:5;s:28:"tests/DateFieldTestBase.test";i:6;s:28:"tests/DateFieldTestCase.test";i:7;s:31:"tests/DateTimezoneTestCase.test";i:8;s:25:"tests/DateUiTestCase.test";i:9;s:33:"tests/DateValidationTestCase.test";}s:17:"test_dependencies";a:4:{i:0;s:13:"entity:entity";i:1;s:23:"features:features (2.x)";i:2;s:15:"migrate:migrate";i:3;s:11:"views:views";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_all_day/date_all_day.module',
@@ -57586,7 +63083,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => "a:12:{s:4:\"name\";s:12:\"Date All Day\";s:11:\"description\";s:142:\"Adds 'All Day' functionality to date fields, including an 'All Day' theme and 'All Day' checkboxes for the Date select and Date popup widgets.\";s:12:\"dependencies\";a:2:{i:0;s:8:\"date_api\";i:1;s:4:\"date\";}s:7:\"package\";s:9:\"Date/Time\";s:4:\"core\";s:3:\"7.x\";s:7:\"version\";s:7:\"7.x-2.9\";s:7:\"project\";s:4:\"date\";s:9:\"datestamp\";s:10:\"1441727353\";s:5:\"mtime\";i:1441727353;s:3:\"php\";s:5:\"5.2.4\";s:5:\"files\";a:0:{}s:9:\"bootstrap\";i:0;}",
+  'info' => "a:10:{s:4:\"name\";s:12:\"Date All Day\";s:11:\"description\";s:142:\"Adds 'All Day' functionality to date fields, including an 'All Day' theme and 'All Day' checkboxes for the Date select and Date popup widgets.\";s:7:\"package\";s:9:\"Date/Time\";s:4:\"core\";s:3:\"7.x\";s:12:\"dependencies\";a:2:{i:0;s:13:\"date:date_api\";i:1;s:9:\"date:date\";}s:5:\"files\";a:2:{i:0;s:31:\"tests/DateAllDayUiTestCase.test\";i:1;s:32:\"tests/DateAllDayUpdatesTest.test\";}s:5:\"mtime\";i:1664867418;s:7:\"version\";N;s:3:\"php\";s:5:\"5.2.4\";s:9:\"bootstrap\";i:0;}",
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/date_all_day/tests/date_all_day_test_feature/date_all_day_test_feature.module',
+  'name' => 'date_all_day_test_feature',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:12:{s:4:"name";s:25:"Date All Day Test Feature";s:11:"description";s:57:"Example content type for testing the Date All Day module.";s:4:"core";s:3:"7.x";s:7:"package";s:9:"Date/Time";s:12:"dependencies";a:3:{i:0;s:9:"date:date";i:1;s:17:"date:date_all_day";i:2;s:17:"features:features";}s:8:"features";a:4:{s:12:"features_api";a:1:{i:0;s:5:"api:2";}s:10:"field_base";a:2:{i:0;s:4:"body";i:1;s:18:"field_date_all_day";}s:14:"field_instance";a:2:{i:0;s:27:"node-date_all_day_test-body";i:1;s:41:"node-date_all_day_test-field_date_all_day";}s:4:"node";a:1:{i:0;s:17:"date_all_day_test";}}s:6:"hidden";s:1:"1";s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_api/date_api.module',
@@ -57597,7 +63105,7 @@
   'bootstrap' => '0',
   'schema_version' => '7001',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:8:"Date API";s:11:"description";s:45:"A Date API that can be used by other modules.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:3:"php";s:3:"5.2";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:8:"date.css";s:40:"sites/all/modules/date/date_api/date.css";}}s:5:"files";a:2:{i:0;s:15:"date_api.module";i:1;s:16:"date_api_sql.inc";}s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:12:"dependencies";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:8:"Date API";s:11:"description";s:45:"A Date API that can be used by other modules.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:5:"files";a:4:{i:0;s:15:"date_api.module";i:1;s:16:"date_api_sql.inc";i:2;s:26:"tests/DateApiTestCase.test";i:3;s:30:"tests/DateApiUnitTestCase.test";}s:5:"mtime";i:1664867418;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_context/date_context.module',
@@ -57608,7 +63116,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:12:"Date Context";s:11:"description";s:99:"Adds an option to the Context module to set a context condition based on the value of a date field.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:4:"date";i:1;s:7:"context";}s:5:"files";a:2:{i:0;s:19:"date_context.module";i:1;s:39:"plugins/date_context_date_condition.inc";}s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:12:"Date Context";s:11:"description";s:99:"Adds an option to the Context module to set a context condition based on the value of a date field.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:9:"date:date";i:1;s:15:"context:context";}s:5:"files";a:1:{i:0;s:39:"plugins/date_context_date_condition.inc";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_migrate/date_migrate.module',
@@ -57619,51 +63127,51 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:14:"Date Migration";s:11:"description";s:73:"Obsolete data migration module. Disable if no other modules depend on it.";s:4:"core";s:3:"7.x";s:7:"package";s:9:"Date/Time";s:6:"hidden";b:1;s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:14:"Date Migration";s:11:"description";s:73:"Obsolete data migration module. Disable if no other modules depend on it.";s:4:"core";s:3:"7.x";s:7:"package";s:9:"Date/Time";s:6:"hidden";b:1;s:5:"mtime";i:1664867418;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/date_migrate/date_migrate_example/date_migrate_example.module',
-  'name' => 'date_migrate_example',
+  'filename' => 'sites/all/modules/date/date_popup/date_popup.module',
+  'name' => 'date_popup',
   'type' => 'module',
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"core";s:3:"7.x";s:12:"dependencies";a:5:{i:0;s:4:"date";i:1;s:11:"date_repeat";i:2;s:17:"date_repeat_field";i:3;s:8:"features";i:4;s:7:"migrate";}s:11:"description";s:42:"Examples of migrating with the Date module";s:8:"features";a:2:{s:5:"field";a:8:{i:0;s:30:"node-date_migrate_example-body";i:1;s:36:"node-date_migrate_example-field_date";i:2;s:42:"node-date_migrate_example-field_date_range";i:3;s:43:"node-date_migrate_example-field_date_repeat";i:4;s:41:"node-date_migrate_example-field_datestamp";i:5;s:47:"node-date_migrate_example-field_datestamp_range";i:6;s:40:"node-date_migrate_example-field_datetime";i:7;s:46:"node-date_migrate_example-field_datetime_range";}s:4:"node";a:1:{i:0;s:20:"date_migrate_example";}}s:5:"files";a:1:{i:0;s:32:"date_migrate_example.migrate.inc";}s:4:"name";s:22:"Date Migration Example";s:7:"package";s:8:"Features";s:7:"project";s:4:"date";s:7:"version";s:7:"7.x-2.9";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Date Popup";s:11:"description";s:84:"Enables jquery popup calendars and time entry widgets for selecting dates and times.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:9:"configure";s:28:"admin/config/date/date_popup";s:12:"dependencies";a:1:{i:0;s:13:"date:date_api";}s:5:"files";a:3:{i:0;s:33:"tests/DatePopupFieldTestCase.test";i:1;s:38:"tests/DatePopupValidationTestCase.test";i:2;s:37:"tests/DatePopupWithViewsTestCase.test";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/date_popup/date_popup.module',
-  'name' => 'date_popup',
+  'filename' => 'sites/all/modules/date/date_repeat/date_repeat.module',
+  'name' => 'date_repeat',
   'type' => 'module',
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:10:"Date Popup";s:11:"description";s:84:"Enables jquery popup calendars and time entry widgets for selecting dates and times.";s:12:"dependencies";a:1:{i:0;s:8:"date_api";}s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:9:"configure";s:28:"admin/config/date/date_popup";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:25:"themes/datepicker.1.7.css";s:59:"sites/all/modules/date/date_popup/themes/datepicker.1.7.css";}}s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:15:"Date Repeat API";s:11:"description";s:73:"A Date Repeat API to calculate repeating dates and times from iCal rules.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:13:"date:date_api";}s:5:"files";a:2:{i:0;s:22:"tests/date_repeat.test";i:1;s:27:"tests/date_repeat_form.test";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/date_repeat/date_repeat.module',
-  'name' => 'date_repeat',
+  'filename' => 'sites/all/modules/date/date_repeat_field/date_repeat_field.module',
+  'name' => 'date_repeat_field',
   'type' => 'module',
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:15:"Date Repeat API";s:11:"description";s:73:"A Date Repeat API to calculate repeating dates and times from iCal rules.";s:12:"dependencies";a:1:{i:0;s:8:"date_api";}s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:3:"php";s:3:"5.2";s:5:"files";a:2:{i:0;s:22:"tests/date_repeat.test";i:1;s:27:"tests/date_repeat_form.test";}s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:17:"Date Repeat Field";s:11:"description";s:97:"Creates the option of Repeating date fields and manages Date fields that use the Date Repeat API.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:13:"date:date_api";i:1;s:9:"date:date";i:2;s:16:"date:date_repeat";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:21:"date_repeat_field.css";s:62:"sites/all/modules/date/date_repeat_field/date_repeat_field.css";}}s:5:"files";a:1:{i:0;s:34:"tests/DateRepeatFieldTestCase.test";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/date/date_repeat_field/date_repeat_field.module',
-  'name' => 'date_repeat_field',
+  'filename' => 'sites/all/modules/date/date_repeat_field/tests/date_repeat_test_feature/date_repeat_test_feature.module',
+  'name' => 'date_repeat_test_feature',
   'type' => 'module',
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:17:"Date Repeat Field";s:11:"description";s:97:"Creates the option of Repeating date fields and manages Date fields that use the Date Repeat API.";s:12:"dependencies";a:3:{i:0;s:8:"date_api";i:1;s:4:"date";i:2;s:11:"date_repeat";}s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:21:"date_repeat_field.css";s:62:"sites/all/modules/date/date_repeat_field/date_repeat_field.css";}}s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-2.9";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1441727353";s:5:"mtime";i:1441727353;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:24:"Date Repeat Test Feature";s:11:"description";s:44:"Examples for testing the Date Repeat module.";s:4:"core";s:3:"7.x";s:7:"package";s:9:"Date/Time";s:6:"hidden";b:1;s:12:"dependencies";a:4:{i:0;s:9:"date:date";i:1;s:16:"date:date_repeat";i:2;s:22:"date:date_repeat_field";i:3;s:17:"features:features";}s:8:"features";a:4:{s:12:"features_api";a:1:{i:0;s:5:"api:2";}s:10:"field_base";a:2:{i:0;s:4:"body";i:1;s:17:"field_date_repeat";}s:14:"field_instance";a:2:{i:0;s:26:"node-date_repeat_test-body";i:1;s:39:"node-date_repeat_test-field_date_repeat";}s:4:"node";a:1:{i:0;s:16:"date_repeat_test";}}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_tools/date_tools.module',
@@ -57674,7 +63182,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Date Tools";s:11:"description";s:52:"Tools to import and auto-create dates and calendars.";s:12:"dependencies";a:1:{i:0;s:4:"date";}s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:9:"configure";s:23:"admin/config/date/tools";s:5:"files";a:1:{i:0;s:21:"tests/date_tools.test";}s:7:"version";s:8:"7.x-2.10";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1491562090";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Date Tools";s:11:"description";s:52:"Tools to import and auto-create dates and calendars.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:9:"configure";s:23:"admin/config/date/tools";s:12:"dependencies";a:1:{i:0;s:9:"date:date";}s:5:"files";a:1:{i:0;s:28:"tests/DateToolsTestCase.test";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/date_views/date_views.module',
@@ -57685,7 +63193,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:10:"Date Views";s:11:"description";s:57:"Views integration for date fields and date functionality.";s:7:"package";s:9:"Date/Time";s:12:"dependencies";a:2:{i:0;s:8:"date_api";i:1;s:5:"views";}s:4:"core";s:3:"7.x";s:3:"php";s:3:"5.2";s:5:"files";a:6:{i:0;s:40:"includes/date_views_argument_handler.inc";i:1;s:47:"includes/date_views_argument_handler_simple.inc";i:2;s:38:"includes/date_views_filter_handler.inc";i:3;s:45:"includes/date_views_filter_handler_simple.inc";i:4;s:29:"includes/date_views.views.inc";i:5;s:36:"includes/date_views_plugin_pager.inc";}s:7:"version";s:8:"7.x-2.10";s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1491562090";s:5:"mtime";i:1535762879;s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:10:"Date Views";s:11:"description";s:57:"Views integration for date fields and date functionality.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:13:"date:date_api";i:1;s:11:"views:views";}s:5:"files";a:7:{i:0;s:40:"includes/date_views_argument_handler.inc";i:1;s:47:"includes/date_views_argument_handler_simple.inc";i:2;s:38:"includes/date_views_filter_handler.inc";i:3;s:45:"includes/date_views_filter_handler_simple.inc";i:4;s:36:"includes/date_views_plugin_pager.inc";i:5;s:28:"tests/date_views_filter.test";i:6;s:27:"tests/date_views_pager.test";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/tests/date_migrate_test/date_migrate_test.module',
+  'name' => 'date_migrate_test',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => "a:11:{s:4:\"name\";s:26:\"Date Migration Test Helper\";s:11:\"description\";s:53:\"Helper for the Date module's Migrate API integration.\";s:7:\"package\";s:9:\"Date/Time\";s:4:\"core\";s:3:\"7.x\";s:6:\"hidden\";b:1;s:12:\"dependencies\";a:2:{i:0;s:22:\"date:date_test_feature\";i:1;s:15:\"migrate:migrate\";}s:5:\"files\";a:1:{i:0;s:29:\"date_migrate_test.migrate.inc\";}s:5:\"mtime\";i:1664867418;s:7:\"version\";N;s:3:\"php\";s:5:\"5.2.4\";s:9:\"bootstrap\";i:0;}",
 ))
 ->values(array(
   'filename' => 'sites/all/modules/date/tests/date_test/date_test.module',
@@ -57696,7 +63215,18 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:17:"Date module tests";s:11:"description";s:40:"Support module for date related testing.";s:7:"package";s:9:"Date/Time";s:7:"version";s:8:"7.x-2.10";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:4:"date";}s:7:"project";s:4:"date";s:9:"datestamp";s:10:"1491562090";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:17:"Date module tests";s:11:"description";s:40:"Support module for date related testing.";s:7:"package";s:9:"Date/Time";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:9:"date:date";}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/date/tests/date_test_feature/date_test_feature.module',
+  'name' => 'date_test_feature',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:12:{s:4:"name";s:17:"Date Test Feature";s:11:"description";s:73:"Examples of migrating with the Date module, primarily for use with tests.";s:4:"core";s:3:"7.x";s:7:"package";s:9:"Date/Time";s:6:"hidden";b:1;s:12:"dependencies";a:4:{i:0;s:9:"date:date";i:1;s:16:"date:date_repeat";i:2;s:22:"date:date_repeat_field";i:3;s:17:"features:features";}s:8:"features";a:4:{s:12:"features_api";a:1:{i:0;s:5:"api:2";}s:10:"field_base";a:8:{i:0;s:4:"body";i:1;s:10:"field_date";i:2;s:16:"field_date_range";i:3;s:17:"field_date_repeat";i:4;s:15:"field_datestamp";i:5;s:21:"field_datestamp_range";i:6;s:14:"field_datetime";i:7;s:20:"field_datetime_range";}s:14:"field_instance";a:8:{i:0;s:19:"node-date_test-body";i:1;s:25:"node-date_test-field_date";i:2;s:31:"node-date_test-field_date_range";i:3;s:32:"node-date_test-field_date_repeat";i:4;s:30:"node-date_test-field_datestamp";i:5;s:36:"node-date_test-field_datestamp_range";i:6;s:29:"node-date_test-field_datetime";i:7;s:35:"node-date_test-field_datetime_range";}s:4:"node";a:1:{i:0;s:9:"date_test";}}s:5:"mtime";i:1664867418;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/email/email.module',
@@ -57707,7 +63237,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:5:"Email";s:11:"description";s:28:"Defines an email field type.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:5:"files";a:1:{i:0;s:17:"email.migrate.inc";}s:7:"version";s:7:"7.x-1.3";s:7:"project";s:5:"email";s:9:"datestamp";s:10:"1397134155";s:5:"mtime";i:1397134155;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:12:{s:4:"name";s:5:"Email";s:11:"description";s:28:"Defines an email field type.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:5:"files";a:1:{i:0;s:17:"email.migrate.inc";}s:5:"mtime";i:1664867555;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/entity.module',
@@ -57718,7 +63248,7 @@
   'bootstrap' => '0',
   'schema_version' => '7003',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:10:"Entity API";s:11:"description";s:69:"Enables modules to work with any entity type and to provide entities.";s:4:"core";s:3:"7.x";s:5:"files";a:24:{i:0;s:19:"entity.features.inc";i:1;s:15:"entity.i18n.inc";i:2;s:15:"entity.info.inc";i:3;s:16:"entity.rules.inc";i:4;s:11:"entity.test";i:5;s:19:"includes/entity.inc";i:6;s:30:"includes/entity.controller.inc";i:7;s:22:"includes/entity.ui.inc";i:8;s:27:"includes/entity.wrapper.inc";i:9;s:22:"views/entity.views.inc";i:10;s:52:"views/handlers/entity_views_field_handler_helper.inc";i:11;s:51:"views/handlers/entity_views_handler_area_entity.inc";i:12;s:53:"views/handlers/entity_views_handler_field_boolean.inc";i:13;s:50:"views/handlers/entity_views_handler_field_date.inc";i:14;s:54:"views/handlers/entity_views_handler_field_duration.inc";i:15;s:52:"views/handlers/entity_views_handler_field_entity.inc";i:16;s:51:"views/handlers/entity_views_handler_field_field.inc";i:17;s:53:"views/handlers/entity_views_handler_field_numeric.inc";i:18;s:53:"views/handlers/entity_views_handler_field_options.inc";i:19;s:50:"views/handlers/entity_views_handler_field_text.inc";i:20;s:49:"views/handlers/entity_views_handler_field_uri.inc";i:21;s:62:"views/handlers/entity_views_handler_relationship_by_bundle.inc";i:22;s:52:"views/handlers/entity_views_handler_relationship.inc";i:23;s:53:"views/plugins/entity_views_plugin_row_entity_view.inc";}s:7:"version";s:7:"7.x-1.6";s:7:"project";s:6:"entity";s:9:"datestamp";s:10:"1424876582";s:5:"mtime";i:1424876582;s:12:"dependencies";a:0:{}s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:10:"Entity API";s:11:"description";s:69:"Enables modules to work with any entity type and to provide entities.";s:4:"core";s:3:"7.x";s:5:"files";a:24:{i:0;s:19:"entity.features.inc";i:1;s:15:"entity.i18n.inc";i:2;s:15:"entity.info.inc";i:3;s:16:"entity.rules.inc";i:4;s:11:"entity.test";i:5;s:19:"includes/entity.inc";i:6;s:30:"includes/entity.controller.inc";i:7;s:22:"includes/entity.ui.inc";i:8;s:27:"includes/entity.wrapper.inc";i:9;s:22:"views/entity.views.inc";i:10;s:52:"views/handlers/entity_views_field_handler_helper.inc";i:11;s:51:"views/handlers/entity_views_handler_area_entity.inc";i:12;s:53:"views/handlers/entity_views_handler_field_boolean.inc";i:13;s:50:"views/handlers/entity_views_handler_field_date.inc";i:14;s:54:"views/handlers/entity_views_handler_field_duration.inc";i:15;s:52:"views/handlers/entity_views_handler_field_entity.inc";i:16;s:51:"views/handlers/entity_views_handler_field_field.inc";i:17;s:53:"views/handlers/entity_views_handler_field_numeric.inc";i:18;s:53:"views/handlers/entity_views_handler_field_options.inc";i:19;s:50:"views/handlers/entity_views_handler_field_text.inc";i:20;s:49:"views/handlers/entity_views_handler_field_uri.inc";i:21;s:62:"views/handlers/entity_views_handler_relationship_by_bundle.inc";i:22;s:52:"views/handlers/entity_views_handler_relationship.inc";i:23;s:53:"views/plugins/entity_views_plugin_row_entity_view.inc";}s:5:"mtime";i:1664868240;s:12:"dependencies";a:0:{}s:7:"package";s:5:"Other";s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/entity_token.module',
@@ -57729,7 +63259,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:13:"Entity tokens";s:11:"description";s:99:"Provides token replacements for all properties that have no tokens and are known to the entity API.";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:23:"entity_token.tokens.inc";i:1;s:19:"entity_token.module";}s:12:"dependencies";a:1:{i:0;s:6:"entity";}s:7:"version";s:7:"7.x-1.6";s:7:"project";s:6:"entity";s:9:"datestamp";s:10:"1424876582";s:5:"mtime";i:1424876582;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:13:"Entity tokens";s:11:"description";s:99:"Provides token replacements for all properties that have no tokens and are known to the entity API.";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:23:"entity_token.tokens.inc";i:1;s:19:"entity_token.module";}s:12:"dependencies";a:1:{i:0;s:6:"entity";}s:5:"mtime";i:1664868240;s:7:"package";s:5:"Other";s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/tests/entity_feature.module',
@@ -57740,7 +63270,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:21:"Entity feature module";s:11:"description";s:31:"Provides some entities in code.";s:7:"version";s:7:"7.x-1.6";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:21:"entity_feature.module";}s:12:"dependencies";a:1:{i:0;s:11:"entity_test";}s:6:"hidden";b:1;s:7:"project";s:6:"entity";s:9:"datestamp";s:10:"1424876582";s:5:"mtime";i:1424876582;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:21:"Entity feature module";s:11:"description";s:31:"Provides some entities in code.";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:21:"entity_feature.module";}s:12:"dependencies";a:1:{i:0;s:11:"entity_test";}s:6:"hidden";b:1;s:5:"mtime";i:1664868240;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/tests/entity_test.module',
@@ -57751,7 +63281,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:23:"Entity CRUD test module";s:11:"description";s:46:"Provides entity types based upon the CRUD API.";s:7:"version";s:7:"7.x-1.6";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:18:"entity_test.module";i:1;s:19:"entity_test.install";}s:12:"dependencies";a:1:{i:0;s:6:"entity";}s:6:"hidden";b:1;s:7:"project";s:6:"entity";s:9:"datestamp";s:10:"1424876582";s:5:"mtime";i:1424876582;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:23:"Entity CRUD test module";s:11:"description";s:46:"Provides entity types based upon the CRUD API.";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:18:"entity_test.module";i:1;s:19:"entity_test.install";}s:12:"dependencies";a:1:{i:0;s:6:"entity";}s:6:"hidden";b:1;s:5:"mtime";i:1664868240;s:7:"package";s:5:"Other";s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity/tests/entity_test_i18n.module',
@@ -57762,7 +63292,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:28:"Entity-test type translation";s:11:"description";s:37:"Allows translating entity-test types.";s:12:"dependencies";a:2:{i:0;s:11:"entity_test";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"version";s:7:"7.x-1.6";s:7:"project";s:6:"entity";s:9:"datestamp";s:10:"1424876582";s:5:"mtime";i:1424876582;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:28:"Entity-test type translation";s:11:"description";s:37:"Allows translating entity-test types.";s:12:"dependencies";a:2:{i:0;s:11:"entity_test";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:5:"mtime";i:1664868240;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/entityreference.module',
@@ -57771,9 +63301,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7002',
+  'schema_version' => '7100',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:16:"Entity Reference";s:11:"description";s:51:"Provides a field that can reference other entities.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:12:"dependencies";a:2:{i:0;s:6:"entity";i:1;s:6:"ctools";}s:5:"files";a:11:{i:0;s:27:"entityreference.migrate.inc";i:1;s:30:"plugins/selection/abstract.inc";i:2;s:27:"plugins/selection/views.inc";i:3;s:29:"plugins/behavior/abstract.inc";i:4;s:40:"views/entityreference_plugin_display.inc";i:5;s:38:"views/entityreference_plugin_style.inc";i:6;s:43:"views/entityreference_plugin_row_fields.inc";i:7;s:35:"tests/entityreference.handlers.test";i:8;s:35:"tests/entityreference.taxonomy.test";i:9;s:32:"tests/entityreference.admin.test";i:10;s:32:"tests/entityreference.feeds.test";}s:7:"version";s:7:"7.x-1.1";s:7:"project";s:15:"entityreference";s:9:"datestamp";s:10:"1384973110";s:5:"mtime";i:1384973110;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:13:{s:4:"name";s:16:"Entity Reference";s:11:"description";s:51:"Provides a field that can reference other entities.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:6:"entity";i:1;s:6:"ctools";}s:17:"test_dependencies";a:2:{i:0;s:5:"feeds";i:1;s:5:"views";}s:5:"files";a:13:{i:0;s:27:"entityreference.migrate.inc";i:1;s:30:"plugins/selection/abstract.inc";i:2;s:27:"plugins/selection/views.inc";i:3;s:29:"plugins/behavior/abstract.inc";i:4;s:40:"views/entityreference_plugin_display.inc";i:5;s:38:"views/entityreference_plugin_style.inc";i:6;s:43:"views/entityreference_plugin_row_fields.inc";i:7;s:35:"tests/entityreference.handlers.test";i:8;s:35:"tests/entityreference.taxonomy.test";i:9;s:32:"tests/entityreference.admin.test";i:10;s:32:"tests/entityreference.feeds.test";i:11;s:32:"tests/entityreference.field.test";i:12;s:45:"tests/entityreference.entity_translation.test";}s:5:"mtime";i:1664867650;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.module',
@@ -57784,7 +63314,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:33:"Entity Reference Behavior Example";s:11:"description";s:71:"Provides some example code for implementing Entity Reference behaviors.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:12:"dependencies";a:1:{i:0;s:15:"entityreference";}s:7:"version";s:7:"7.x-1.1";s:7:"project";s:15:"entityreference";s:9:"datestamp";s:10:"1384973110";s:5:"mtime";i:1384973110;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:33:"Entity Reference Behavior Example";s:11:"description";s:71:"Provides some example code for implementing Entity Reference behaviors.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:12:"dependencies";a:1:{i:0;s:15:"entityreference";}s:5:"mtime";i:1664867650;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.module',
@@ -57795,7 +63325,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:41:"Entityreference - Feeds integration tests";s:11:"description";s:65:"Support module for the Entityreference - Feeds integration tests.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:3:{i:0;s:5:"feeds";i:1;s:8:"feeds_ui";i:2;s:15:"entityreference";}s:7:"version";s:7:"7.x-1.1";s:7:"project";s:15:"entityreference";s:9:"datestamp";s:10:"1384973110";s:5:"mtime";i:1384973110;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:41:"Entityreference - Feeds integration tests";s:11:"description";s:65:"Support module for the Entityreference - Feeds integration tests.";s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:12:"dependencies";a:3:{i:0;s:5:"feeds";i:1;s:8:"feeds_ui";i:2;s:15:"entityreference";}s:5:"mtime";i:1664867650;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity_translation/entity_translation.module',
@@ -57806,7 +63336,7 @@
   'bootstrap' => '0',
   'schema_version' => '7009',
   'weight' => '11',
-  'info' => 'a:14:{s:4:"name";s:18:"Entity Translation";s:11:"description";s:58:"Allows entities to be translated into different languages.";s:7:"package";s:33:"Multilingual - Entity Translation";s:4:"core";s:3:"7.x";s:9:"configure";s:40:"admin/config/regional/entity_translation";s:12:"dependencies";a:1:{i:0;s:14:"locale (>7.14)";}s:17:"test_dependencies";a:2:{i:0;s:17:"pathauto:pathauto";i:1;s:5:"title";}s:5:"files";a:15:{i:0;s:40:"includes/translation.handler_factory.inc";i:1;s:32:"includes/translation.handler.inc";i:2;s:40:"includes/translation.handler.comment.inc";i:3;s:37:"includes/translation.handler.node.inc";i:4;s:46:"includes/translation.handler.taxonomy_term.inc";i:5;s:37:"includes/translation.handler.user.inc";i:6;s:32:"includes/translation.migrate.inc";i:7;s:29:"tests/entity_translation.test";i:8;s:49:"views/entity_translation_handler_relationship.inc";i:9;s:57:"views/entity_translation_handler_field_translate_link.inc";i:10;s:48:"views/entity_translation_handler_field_label.inc";i:11;s:55:"views/entity_translation_handler_filter_entity_type.inc";i:12;s:52:"views/entity_translation_handler_filter_language.inc";i:13;s:62:"views/entity_translation_handler_filter_translation_exists.inc";i:14;s:48:"views/entity_translation_handler_field_field.inc";}s:7:"version";s:7:"7.x-1.0";s:7:"project";s:18:"entity_translation";s:9:"datestamp";s:10:"1522600694";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:18:"Entity Translation";s:11:"description";s:58:"Allows entities to be translated into different languages.";s:7:"package";s:33:"Multilingual - Entity Translation";s:4:"core";s:3:"7.x";s:9:"configure";s:40:"admin/config/regional/entity_translation";s:12:"dependencies";a:1:{i:0;s:14:"locale (>7.14)";}s:17:"test_dependencies";a:2:{i:0;s:17:"pathauto:pathauto";i:1;s:11:"title:title";}s:5:"files";a:15:{i:0;s:40:"includes/translation.handler_factory.inc";i:1;s:32:"includes/translation.handler.inc";i:2;s:40:"includes/translation.handler.comment.inc";i:3;s:37:"includes/translation.handler.node.inc";i:4;s:46:"includes/translation.handler.taxonomy_term.inc";i:5;s:37:"includes/translation.handler.user.inc";i:6;s:32:"includes/translation.migrate.inc";i:7;s:29:"tests/entity_translation.test";i:8;s:49:"views/entity_translation_handler_relationship.inc";i:9;s:57:"views/entity_translation_handler_field_translate_link.inc";i:10;s:48:"views/entity_translation_handler_field_label.inc";i:11;s:55:"views/entity_translation_handler_filter_entity_type.inc";i:12;s:52:"views/entity_translation_handler_filter_language.inc";i:13;s:62:"views/entity_translation_handler_filter_translation_exists.inc";i:14;s:48:"views/entity_translation_handler_field_field.inc";}s:5:"mtime";i:1664867622;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity_translation/entity_translation_i18n_menu/entity_translation_i18n_menu.module',
@@ -57817,7 +63347,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:23:"Entity Translation Menu";s:11:"description";s:54:"Allows menu items to be translated on the entity form.";s:7:"package";s:33:"Multilingual - Entity Translation";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:18:"entity_translation";i:1;s:4:"i18n";i:2;s:9:"i18n_menu";}s:5:"files";a:1:{i:0;s:33:"entity_translation_i18n_menu.test";}s:7:"version";s:7:"7.x-1.0";s:7:"project";s:18:"entity_translation";s:9:"datestamp";s:10:"1522600694";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:23:"Entity Translation Menu";s:11:"description";s:54:"Allows menu items to be translated on the entity form.";s:7:"package";s:33:"Multilingual - Entity Translation";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:18:"entity_translation";i:1;s:4:"i18n";i:2;s:9:"i18n_menu";}s:5:"files";a:1:{i:0;s:33:"entity_translation_i18n_menu.test";}s:5:"mtime";i:1664867622;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity_translation/entity_translation_upgrade/entity_translation_upgrade.module',
@@ -57828,7 +63358,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:26:"Entity Translation Upgrade";s:11:"description";s:80:"Provides an upgrade path from node-based translation to field-based translation.";s:7:"package";s:33:"Multilingual - Entity Translation";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:18:"entity_translation";}s:5:"files";a:1:{i:0;s:31:"entity_translation_upgrade.test";}s:7:"version";s:7:"7.x-1.0";s:7:"project";s:18:"entity_translation";s:9:"datestamp";s:10:"1522600694";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:26:"Entity Translation Upgrade";s:11:"description";s:80:"Provides an upgrade path from node-based translation to field-based translation.";s:7:"package";s:33:"Multilingual - Entity Translation";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:18:"entity_translation";}s:5:"files";a:1:{i:0;s:31:"entity_translation_upgrade.test";}s:5:"mtime";i:1664867622;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/entity_translation/tests/entity_translation_test.module',
@@ -57839,7 +63369,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:26:"Entity Translation testing";s:11:"description";s:61:"Tests Entity Translation module functionality. Do not enable.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:18:"entity_translation";}s:5:"files";a:1:{i:0;s:30:"entity_translation_test.module";}s:7:"version";s:7:"7.x-1.0";s:7:"project";s:18:"entity_translation";s:9:"datestamp";s:10:"1522600694";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:26:"Entity Translation testing";s:11:"description";s:61:"Tests Entity Translation module functionality. Do not enable.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:6:"hidden";b:1;s:12:"dependencies";a:1:{i:0;s:18:"entity_translation";}s:5:"files";a:1:{i:0;s:30:"entity_translation_test.module";}s:5:"mtime";i:1664867622;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n.module',
@@ -57850,7 +63380,7 @@
   'bootstrap' => '1',
   'schema_version' => '7001',
   'weight' => '10',
-  'info' => 'a:13:{s:4:"name";s:20:"Internationalization";s:11:"description";s:49:"Extends Drupal support for multilingual features.";s:12:"dependencies";a:2:{i:0;s:6:"locale";i:1;s:8:"variable";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:15:"i18n_object.inc";i:1;s:9:"i18n.test";}s:9:"configure";s:26:"admin/config/regional/i18n";s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:20:"Internationalization";s:11:"description";s:49:"Extends Drupal support for multilingual features.";s:12:"dependencies";a:2:{i:0;s:6:"locale";i:1;s:8:"variable";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:15:"i18n_object.inc";i:1;s:9:"i18n.test";}s:9:"configure";s:26:"admin/config/regional/i18n";s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_block/i18n_block.module',
@@ -57861,7 +63391,7 @@
   'bootstrap' => '0',
   'schema_version' => '7001',
   'weight' => '100',
-  'info' => 'a:12:{s:4:"name";s:15:"Block languages";s:11:"description";s:68:"Enables language selector for blocks and optional block translation.";s:12:"dependencies";a:2:{i:0;s:5:"block";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:14:"i18n_block.inc";i:1;s:15:"i18n_block.test";}s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747250;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:15:"Block languages";s:11:"description";s:68:"Enables language selector for blocks and optional block translation.";s:12:"dependencies";a:2:{i:0;s:5:"block";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:14:"i18n_block.inc";i:1;s:15:"i18n_block.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_contact/i18n_contact.module',
@@ -57872,7 +63402,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:19:"Contact translation";s:11:"description";s:63:"Makes contact categories and replies available for translation.";s:12:"dependencies";a:2:{i:0;s:7:"contact";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747250;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:19:"Contact translation";s:11:"description";s:63:"Makes contact categories and replies available for translation.";s:12:"dependencies";a:2:{i:0;s:7:"contact";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_field/i18n_field.module',
@@ -57881,9 +63411,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '-1',
+  'schema_version' => '7000',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:17:"Field translation";s:11:"description";s:26:"Translate field properties";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:14:"i18n_field.inc";i:1;s:15:"i18n_field.test";}s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747250;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:17:"Field translation";s:11:"description";s:26:"Translate field properties";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:14:"i18n_field.inc";i:1;s:15:"i18n_field.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_forum/i18n_forum.module',
@@ -57894,7 +63424,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:18:"Multilingual forum";s:11:"description";s:60:"Enables multilingual forum, translates names and containers.";s:12:"dependencies";a:3:{i:0;s:5:"forum";i:1;s:13:"i18n_taxonomy";i:2;s:9:"i18n_node";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"i18n_forum.test";}s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:18:"Multilingual forum";s:11:"description";s:60:"Enables multilingual forum, translates names and containers.";s:12:"dependencies";a:3:{i:0;s:5:"forum";i:1;s:13:"i18n_taxonomy";i:2;s:9:"i18n_node";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:15:"i18n_forum.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_menu/i18n_menu.module',
@@ -57905,7 +63435,7 @@
   'bootstrap' => '0',
   'schema_version' => '7001',
   'weight' => '5',
-  'info' => 'a:10:{s:4:"name";s:16:"Menu translation";s:11:"description";s:40:"Supports translatable custom menu items.";s:12:"dependencies";a:4:{i:0;s:4:"i18n";i:1;s:4:"menu";i:2;s:11:"i18n_string";i:3;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:13:"i18n_menu.inc";i:1;s:14:"i18n_menu.test";}s:5:"mtime";i:1569454741;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:16:"Menu translation";s:11:"description";s:40:"Supports translatable custom menu items.";s:12:"dependencies";a:4:{i:0;s:4:"i18n";i:1;s:4:"menu";i:2;s:11:"i18n_string";i:3;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:13:"i18n_menu.inc";i:1;s:14:"i18n_menu.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_node/i18n_node.module',
@@ -57916,7 +63446,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:20:"Multilingual content";s:11:"description";s:46:"Extended node options for multilingual content";s:12:"dependencies";a:3:{i:0;s:11:"translation";i:1;s:4:"i18n";i:2;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:9:"configure";s:31:"admin/config/regional/i18n/node";s:5:"files";a:2:{i:0;s:14:"i18n_node.test";i:1;s:22:"i18n_node.variable.inc";}s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:20:"Multilingual content";s:11:"description";s:46:"Extended node options for multilingual content";s:12:"dependencies";a:3:{i:0;s:11:"translation";i:1;s:4:"i18n";i:2;s:11:"i18n_string";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:9:"configure";s:31:"admin/config/regional/i18n/node";s:5:"files";a:2:{i:0;s:14:"i18n_node.test";i:1;s:22:"i18n_node.variable.inc";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_path/i18n_path.module',
@@ -57927,7 +63457,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:16:"Path translation";s:11:"description";s:37:"Define translations for generic paths";s:12:"dependencies";a:1:{i:0;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:13:"i18n_path.inc";i:1;s:14:"i18n_path.test";}s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:16:"Path translation";s:11:"description";s:37:"Define translations for generic paths";s:12:"dependencies";a:1:{i:0;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:2:{i:0;s:13:"i18n_path.inc";i:1;s:14:"i18n_path.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_redirect/i18n_redirect.module',
@@ -57938,7 +63468,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:20:"Translation redirect";s:11:"description";s:71:"Redirect to translated page when available. SEO for multilingual sites.";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:20:"Translation redirect";s:11:"description";s:71:"Redirect to translated page when available. SEO for multilingual sites.";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_select/i18n_select.module',
@@ -57949,7 +63479,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:19:"Multilingual select";s:11:"description";s:45:"API module for multilingual content selection";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:9:"configure";s:33:"admin/config/regional/i18n/select";s:5:"files";a:1:{i:0;s:16:"i18n_select.test";}s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747251;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:19:"Multilingual select";s:11:"description";s:45:"API module for multilingual content selection";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:9:"configure";s:33:"admin/config/regional/i18n/select";s:5:"files";a:1:{i:0;s:16:"i18n_select.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_string/i18n_string.module',
@@ -57958,9 +63488,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '-1',
-  'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:18:"String translation";s:11:"description";s:57:"Provides support for translation of user defined strings.";s:12:"dependencies";a:2:{i:0;s:6:"locale";i:1;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:3:{i:0;s:21:"i18n_string.admin.inc";i:1;s:15:"i18n_string.inc";i:2;s:16:"i18n_string.test";}s:9:"configure";s:34:"admin/config/regional/i18n/strings";s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747251;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'schema_version' => '7004',
+  'weight' => '10',
+  'info' => 'a:11:{s:4:"name";s:18:"String translation";s:11:"description";s:57:"Provides support for translation of user defined strings.";s:12:"dependencies";a:2:{i:0;s:6:"locale";i:1;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:3:{i:0;s:21:"i18n_string.admin.inc";i:1;s:15:"i18n_string.inc";i:2;s:16:"i18n_string.test";}s:9:"configure";s:34:"admin/config/regional/i18n/strings";s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_sync/i18n_sync.module',
@@ -57969,9 +63499,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '-1',
-  'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:24:"Synchronize translations";s:11:"description";s:73:"Synchronizes taxonomy and fields across translations of the same content.";s:12:"dependencies";a:2:{i:0;s:4:"i18n";i:1;s:11:"translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:5:{i:0;s:16:"i18n_sync.module";i:1;s:17:"i18n_sync.install";i:2;s:20:"i18n_sync.module.inc";i:3;s:18:"i18n_sync.node.inc";i:4;s:14:"i18n_sync.test";}s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747251;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'schema_version' => '7000',
+  'weight' => '100',
+  'info' => 'a:10:{s:4:"name";s:24:"Synchronize translations";s:11:"description";s:73:"Synchronizes taxonomy and fields across translations of the same content.";s:12:"dependencies";a:2:{i:0;s:4:"i18n";i:1;s:11:"translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:5:{i:0;s:16:"i18n_sync.module";i:1;s:17:"i18n_sync.install";i:2;s:20:"i18n_sync.module.inc";i:3;s:18:"i18n_sync.node.inc";i:4;s:14:"i18n_sync.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_taxonomy/i18n_taxonomy.module',
@@ -57982,7 +63512,7 @@
   'bootstrap' => '0',
   'schema_version' => '7004',
   'weight' => '5',
-  'info' => 'a:12:{s:4:"name";s:20:"Taxonomy translation";s:11:"description";s:30:"Enables multilingual taxonomy.";s:12:"dependencies";a:3:{i:0;s:8:"taxonomy";i:1;s:11:"i18n_string";i:2;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:4:{i:0;s:17:"i18n_taxonomy.inc";i:1;s:23:"i18n_taxonomy.pages.inc";i:2;s:23:"i18n_taxonomy.admin.inc";i:3;s:18:"i18n_taxonomy.test";}s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747251;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:20:"Taxonomy translation";s:11:"description";s:30:"Enables multilingual taxonomy.";s:12:"dependencies";a:3:{i:0;s:8:"taxonomy";i:1;s:11:"i18n_string";i:2;s:16:"i18n_translation";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:4:{i:0;s:17:"i18n_taxonomy.inc";i:1;s:23:"i18n_taxonomy.pages.inc";i:2;s:23:"i18n_taxonomy.admin.inc";i:3;s:18:"i18n_taxonomy.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_translation/i18n_translation.module',
@@ -57991,9 +63521,9 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '-1',
+  'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:16:"Translation sets";s:11:"description";s:47:"Simple translation sets API for generic objects";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:20:"i18n_translation.inc";}s:7:"version";s:8:"7.x-1.25";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1531342125";s:5:"mtime";i:1537747251;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:16:"Translation sets";s:11:"description";s:47:"Simple translation sets API for generic objects";s:12:"dependencies";a:1:{i:0;s:4:"i18n";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:20:"i18n_translation.inc";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_user/i18n_user.module',
@@ -58004,7 +63534,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:21:"User mail translation";s:11:"description";s:43:"Translate emails sent from the User module.";s:4:"core";s:3:"7.x";s:7:"package";s:35:"Multilingual - Internationalization";s:12:"dependencies";a:1:{i:0;s:13:"i18n_variable";}s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:21:"User mail translation";s:11:"description";s:43:"Translate emails sent from the User module.";s:4:"core";s:3:"7.x";s:7:"package";s:35:"Multilingual - Internationalization";s:12:"dependencies";a:1:{i:0;s:13:"i18n_variable";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/i18n_variable/i18n_variable.module',
@@ -58015,7 +63545,7 @@
   'bootstrap' => '1',
   'schema_version' => '7004',
   'weight' => '-900',
-  'info' => 'a:13:{s:4:"name";s:20:"Variable translation";s:11:"description";s:71:"Multilingual variables that switch language depending on page language.";s:12:"dependencies";a:3:{i:0;s:4:"i18n";i:1;s:24:"variable_store (7.x-2.x)";i:2;s:24:"variable_realm (7.x-2.x)";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:9:"configure";s:35:"admin/config/regional/i18n/variable";s:5:"files";a:2:{i:0;s:23:"i18n_variable.class.inc";i:1;s:18:"i18n_variable.test";}s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:20:"Variable translation";s:11:"description";s:71:"Multilingual variables that switch language depending on page language.";s:12:"dependencies";a:3:{i:0;s:4:"i18n";i:1;s:24:"variable_store (7.x-2.x)";i:2;s:24:"variable_realm (7.x-2.x)";}s:7:"package";s:35:"Multilingual - Internationalization";s:4:"core";s:3:"7.x";s:9:"configure";s:35:"admin/config/regional/i18n/variable";s:5:"files";a:2:{i:0;s:23:"i18n_variable.class.inc";i:1;s:18:"i18n_variable.test";}s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/i18n/tests/i18n_test.module',
@@ -58026,7 +63556,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:26:"Internationalization tests";s:11:"description";s:55:"Helper module for testing i18n (do not enable manually)";s:12:"dependencies";a:3:{i:0;s:6:"locale";i:1;s:11:"translation";i:2;s:4:"i18n";}s:7:"package";s:7:"Testing";s:4:"core";s:3:"7.x";s:6:"hidden";b:1;s:7:"version";s:8:"7.x-1.26";s:7:"project";s:4:"i18n";s:9:"datestamp";s:10:"1534531985";s:5:"mtime";i:1534531985;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:26:"Internationalization tests";s:11:"description";s:55:"Helper module for testing i18n (do not enable manually)";s:12:"dependencies";a:3:{i:0;s:6:"locale";i:1;s:11:"translation";i:2;s:4:"i18n";}s:7:"package";s:7:"Testing";s:4:"core";s:3:"6.x";s:6:"hidden";b:1;s:5:"mtime";i:1664867462;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/link/link.module',
@@ -58035,86 +63565,108 @@
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7001',
+  'schema_version' => '7100',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:4:"Link";s:11:"description";s:32:"Defines simple link field types.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:5:"files";a:10:{i:0;s:11:"link.module";i:1;s:16:"link.migrate.inc";i:2;s:15:"tests/link.test";i:3;s:25:"tests/link.attribute.test";i:4;s:20:"tests/link.crud.test";i:5;s:28:"tests/link.crud_browser.test";i:6;s:21:"tests/link.token.test";i:7;s:24:"tests/link.validate.test";i:8;s:44:"views/link_views_handler_argument_target.inc";i:9;s:44:"views/link_views_handler_filter_protocol.inc";}s:7:"version";s:7:"7.x-1.3";s:7:"project";s:4:"link";s:9:"datestamp";s:10:"1413924830";s:5:"mtime";i:1413924830;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:14:{s:4:"name";s:4:"Link";s:11:"description";s:32:"Defines simple link field types.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:9:"configure";s:25:"admin/config/content/link";s:5:"files";a:15:{i:0;s:16:"link.migrate.inc";i:1;s:44:"views/link_views_handler_argument_target.inc";i:2;s:44:"views/link_views_handler_filter_protocol.inc";i:3;s:28:"tests/LinkBaseTestClass.test";i:4;s:39:"tests/LinkConvertInternalPathsTest.test";i:5;s:34:"tests/LinkDefaultProtocolTest.test";i:6;s:30:"tests/LinkEntityTokenTest.test";i:7;s:34:"tests/LinkFieldAttributesTest.test";i:8;s:28:"tests/LinkFieldCrudTest.test";i:9;s:32:"tests/LinkFieldValidateTest.test";i:10;s:31:"tests/LinkPathPrefixesTest.test";i:11;s:27:"tests/LinkSanitizeTest.test";i:12;s:24:"tests/LinkTokenTest.test";i:13;s:32:"tests/LinkValidationApiTest.test";i:14;s:27:"tests/LinkUnitTestCase.test";}s:17:"test_dependencies";a:2:{i:0;s:13:"entity:entity";i:1;s:11:"token:token";}s:5:"mtime";i:1664867467;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/phone/phone.module',
-  'name' => 'phone',
+  'filename' => 'sites/all/modules/multiupload_filefield_widget/multiupload_filefield_widget.module',
+  'name' => 'multiupload_filefield_widget',
   'type' => 'module',
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:14:{s:4:"name";s:5:"Phone";s:11:"description";s:80:"The phone module allows administrators to define a field type for phone numbers.";s:7:"package";s:6:"Fields";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:30:{i:0;s:17:"phone.migrate.inc";i:1;s:19:"tests/phone.au.test";i:2;s:19:"tests/phone.be.test";i:3;s:19:"tests/phone.br.test";i:4;s:19:"tests/phone.ca.test";i:5;s:19:"tests/phone.ch.test";i:6;s:19:"tests/phone.cl.test";i:7;s:19:"tests/phone.cn.test";i:8;s:19:"tests/phone.cr.test";i:9;s:19:"tests/phone.cs.test";i:10;s:19:"tests/phone.eg.test";i:11;s:19:"tests/phone.es.test";i:12;s:19:"tests/phone.fr.test";i:13;s:19:"tests/phone.hu.test";i:14;s:19:"tests/phone.il.test";i:15;s:20:"tests/phone.int.test";i:16;s:19:"tests/phone.it.test";i:17;s:19:"tests/phone.jo.test";i:18;s:19:"tests/phone.nl.test";i:19;s:19:"tests/phone.nz.test";i:20;s:19:"tests/phone.pa.test";i:21;s:19:"tests/phone.ph.test";i:22;s:19:"tests/phone.pk.test";i:23;s:19:"tests/phone.pl.test";i:24;s:19:"tests/phone.ru.test";i:25;s:19:"tests/phone.se.test";i:26;s:19:"tests/phone.sg.test";i:27;s:19:"tests/phone.ua.test";i:28;s:19:"tests/phone.uk.test";i:29;s:19:"tests/phone.za.test";}s:4:"core";s:3:"7.x";s:7:"version";s:13:"7.x-1.0-beta1";s:7:"project";s:5:"phone";s:9:"datestamp";s:10:"1389732224";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+  'info' => 'a:10:{s:4:"name";s:28:"Multiupload Filefield Widget";s:11:"description";s:76:"Creates a widget for filefield to upload multiple files at once using html5.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:4:"file";}s:5:"files";a:2:{i:0;s:35:"multiupload_filefield_widget.module";i:1;s:33:"multiupload_filefield_widget.test";}s:5:"mtime";i:1664867583;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/references/node_reference/node_reference.module',
-  'name' => 'node_reference',
+  'filename' => 'sites/all/modules/multiupload_imagefield_widget/multiupload_imagefield_widget.module',
+  'name' => 'multiupload_imagefield_widget',
   'type' => 'module',
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '7000',
+  'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:14:"Node Reference";s:11:"description";s:59:"Defines a field type for referencing one node from another.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:5:"field";i:1;s:10:"references";i:2;s:7:"options";}s:5:"files";a:1:{i:0;s:19:"node_reference.test";}s:7:"version";s:7:"7.x-2.2";s:7:"project";s:10:"references";s:9:"datestamp";s:10:"1492534745";s:5:"mtime";i:1492534745;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:29:"Multiupload Imagefield Widget";s:11:"description";s:77:"Creates a widget for imagefield to upload multiple files at once using html5.";s:7:"package";s:6:"Fields";s:12:"dependencies";a:2:{i:0;s:28:"multiupload_filefield_widget";i:1;s:5:"image";}s:4:"core";s:3:"7.x";s:5:"mtime";i:1664867591;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/references/references.module',
-  'name' => 'references',
+  'filename' => 'sites/all/modules/phone/phone.module',
+  'name' => 'phone',
   'type' => 'module',
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:10:"References";s:11:"description";s:67:"Defines common base features for the various reference field types.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:7:"options";}s:5:"files";a:5:{i:0;s:41:"views/references_handler_relationship.inc";i:1;s:37:"views/references_handler_argument.inc";i:2;s:35:"views/references_plugin_display.inc";i:3;s:33:"views/references_plugin_style.inc";i:4;s:38:"views/references_plugin_row_fields.inc";}s:7:"version";s:7:"7.x-2.2";s:7:"project";s:10:"references";s:9:"datestamp";s:10:"1492534745";s:5:"mtime";i:1492534745;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:5:"Phone";s:11:"description";s:80:"The phone module allows administrators to define a field type for phone numbers.";s:7:"package";s:6:"Fields";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:30:{i:0;s:17:"phone.migrate.inc";i:1;s:19:"tests/phone.au.test";i:2;s:19:"tests/phone.be.test";i:3;s:19:"tests/phone.br.test";i:4;s:19:"tests/phone.ca.test";i:5;s:19:"tests/phone.ch.test";i:6;s:19:"tests/phone.cl.test";i:7;s:19:"tests/phone.cn.test";i:8;s:19:"tests/phone.cr.test";i:9;s:19:"tests/phone.cs.test";i:10;s:19:"tests/phone.eg.test";i:11;s:19:"tests/phone.es.test";i:12;s:19:"tests/phone.fr.test";i:13;s:19:"tests/phone.hu.test";i:14;s:19:"tests/phone.il.test";i:15;s:20:"tests/phone.int.test";i:16;s:19:"tests/phone.it.test";i:17;s:19:"tests/phone.jo.test";i:18;s:19:"tests/phone.nl.test";i:19;s:19:"tests/phone.nz.test";i:20;s:19:"tests/phone.pa.test";i:21;s:19:"tests/phone.ph.test";i:22;s:19:"tests/phone.pk.test";i:23;s:19:"tests/phone.pl.test";i:24;s:19:"tests/phone.ru.test";i:25;s:19:"tests/phone.se.test";i:26;s:19:"tests/phone.sg.test";i:27;s:19:"tests/phone.ua.test";i:28;s:19:"tests/phone.uk.test";i:29;s:19:"tests/phone.za.test";}s:4:"core";s:3:"7.x";s:5:"mtime";i:1664867472;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/references/references_uuid/references_uuid.module',
-  'name' => 'references_uuid',
+  'filename' => 'sites/all/modules/picture/flexslider_picture/flexslider_picture.module',
+  'name' => 'flexslider_picture',
   'type' => 'module',
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:15:"References UUID";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:12:"dependencies";a:2:{i:0;s:10:"references";i:1;s:4:"uuid";}s:7:"version";s:7:"7.x-2.2";s:7:"project";s:10:"references";s:9:"datestamp";s:10:"1492534745";s:5:"mtime";i:1492534745;s:11:"description";s:0:"";s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:18:"FlexSlider Picture";s:11:"description";s:87:"Integrates the Picture module with the FlexSlider module for a truly responsive slider.";s:7:"package";s:7:"Picture";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:7:"picture";i:1;s:16:"flexslider (2.x)";i:2;s:23:"flexslider_fields (2.x)";}s:5:"mtime";i:1664870250;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/references/user_reference/user_reference.module',
-  'name' => 'user_reference',
+  'filename' => 'sites/all/modules/picture/picture.module',
+  'name' => 'picture',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '7203',
+  'weight' => '0',
+  'info' => 'a:12:{s:4:"name";s:7:"Picture";s:11:"description";s:15:"Picture element";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:6:"ctools";i:1;s:5:"image";i:2;s:11:"breakpoints";}s:5:"files";a:1:{i:0;s:27:"includes/PictureMapping.php";}s:9:"configure";s:26:"admin/config/media/picture";s:7:"package";s:7:"Picture";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:19:"picture_wysiwyg.css";s:45:"sites/all/modules/picture/picture_wysiwyg.css";}}s:5:"mtime";i:1664870250;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/node_reference/node_reference.module',
+  'name' => 'node_reference',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'bootstrap' => '0',
+  'schema_version' => '7000',
+  'weight' => '0',
+  'info' => 'a:12:{s:4:"name";s:14:"Node Reference";s:11:"description";s:59:"Defines a field type for referencing one node from another.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:5:"field";i:1;s:10:"references";i:2;s:7:"options";}s:5:"files";a:1:{i:0;s:19:"node_reference.test";}s:5:"mtime";i:1664867628;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
+))
+->values(array(
+  'filename' => 'sites/all/modules/references/references.module',
+  'name' => 'references',
   'type' => 'module',
   'owner' => '',
   'status' => '1',
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:14:"User Reference";s:11:"description";s:56:"Defines a field type for referencing a user from a node.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:5:"field";i:1;s:10:"references";i:2;s:7:"options";}s:7:"version";s:7:"7.x-2.2";s:7:"project";s:10:"references";s:9:"datestamp";s:10:"1492534745";s:5:"mtime";i:1492534745;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:10:"References";s:11:"description";s:67:"Defines common base features for the various reference field types.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:2:{i:0;s:5:"field";i:1;s:7:"options";}s:5:"files";a:5:{i:0;s:41:"views/references_handler_relationship.inc";i:1;s:37:"views/references_handler_argument.inc";i:2;s:35:"views/references_plugin_display.inc";i:3;s:33:"views/references_plugin_style.inc";i:4;s:38:"views/references_plugin_row_fields.inc";}s:5:"mtime";i:1664867628;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/picture/flexslider_picture/flexslider_picture.module',
-  'name' => 'flexslider_picture',
+  'filename' => 'sites/all/modules/references/references_uuid/references_uuid.module',
+  'name' => 'references_uuid',
   'type' => 'module',
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:10:{s:4:"name";s:18:"FlexSlider Picture";s:11:"description";s:87:"Integrates the Picture module with the FlexSlider module for a truly responsive slider.";s:7:"package";s:7:"Picture";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:7:"picture";i:1;s:16:"flexslider (2.x)";i:2;s:23:"flexslider_fields (2.x)";}s:5:"mtime";i:1544936288;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:15:"References UUID";s:11:"description";s:28:"UUID for References project.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:12:"dependencies";a:2:{i:0;s:10:"references";i:1;s:4:"uuid";}s:5:"mtime";i:1664867628;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
-  'filename' => 'sites/all/modules/picture/picture.module',
-  'name' => 'picture',
+  'filename' => 'sites/all/modules/references/user_reference/user_reference.module',
+  'name' => 'user_reference',
   'type' => 'module',
   'owner' => '',
-  'status' => '0',
+  'status' => '1',
   'bootstrap' => '0',
-  'schema_version' => '-1',
+  'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:7:"Picture";s:11:"description";s:15:"Picture element";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:6:"ctools";i:1;s:5:"image";i:2;s:11:"breakpoints";}s:5:"files";a:1:{i:0;s:27:"includes/PictureMapping.php";}s:9:"configure";s:26:"admin/config/media/picture";s:7:"package";s:7:"Picture";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:19:"picture_wysiwyg.css";s:45:"sites/all/modules/picture/picture_wysiwyg.css";}}s:5:"mtime";i:1544936288;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:14:"User Reference";s:11:"description";s:56:"Defines a field type for referencing a user from a node.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:3:{i:0;s:5:"field";i:1;s:10:"references";i:2;s:7:"options";}s:5:"mtime";i:1664867628;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/telephone/telephone.module',
@@ -58125,7 +63677,7 @@
   'bootstrap' => '0',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:9:"Telephone";s:11:"description";s:43:"Defines a field type for telephone numbers.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:21:"telephone.migrate.inc";}s:7:"version";s:14:"7.x-1.0-alpha1";s:7:"project";s:9:"telephone";s:9:"datestamp";s:10:"1389736105";s:5:"mtime";i:1389736105;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:9:"Telephone";s:11:"description";s:43:"Defines a field type for telephone numbers.";s:7:"package";s:6:"Fields";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"field";}s:5:"files";a:1:{i:0;s:21:"telephone.migrate.inc";}s:5:"mtime";i:1664867478;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;s:8:"required";b:1;s:11:"explanation";s:73:"Field type(s) in use - see <a href="/admin/reports/fields">Field list</a>";}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/title/tests/title_test.module',
@@ -58136,7 +63688,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:11:{s:4:"name";s:10:"Title Test";s:11:"description";s:61:"Testing module for Title module functionality. Do not enable.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:6:"hidden";b:1;s:12:"dependencies";a:4:{i:0;s:5:"title";i:1;s:8:"taxonomy";i:2;s:6:"entity";i:3;s:18:"entity_translation";}s:5:"mtime";i:1544915724;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Title Test";s:11:"description";s:61:"Testing module for Title module functionality. Do not enable.";s:4:"core";s:3:"7.x";s:7:"package";s:7:"Testing";s:6:"hidden";b:1;s:12:"dependencies";a:4:{i:0;s:5:"title";i:1;s:8:"taxonomy";i:2;s:6:"entity";i:3;s:18:"entity_translation";}s:5:"mtime";i:1664867487;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/title/title.module',
@@ -58147,7 +63699,7 @@
   'bootstrap' => '0',
   'schema_version' => '7002',
   'weight' => '100',
-  'info' => 'a:13:{s:4:"name";s:5:"Title";s:11:"description";s:50:"Replaces entity legacy fields with regular fields.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:9:"configure";s:26:"admin/config/content/title";s:12:"dependencies";a:1:{i:0;s:14:"system (>7.14)";}s:5:"files";a:3:{i:0;s:12:"title.module";i:1;s:35:"views/views_handler_title_field.inc";i:2;s:16:"tests/title.test";}s:7:"version";s:14:"7.x-1.0-alpha9";s:7:"project";s:5:"title";s:9:"datestamp";s:10:"1484302985";s:5:"mtime";i:1484302985;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:12:{s:4:"name";s:5:"Title";s:11:"description";s:50:"Replaces entity legacy fields with regular fields.";s:4:"core";s:3:"7.x";s:7:"package";s:6:"Fields";s:9:"configure";s:26:"admin/config/content/title";s:12:"dependencies";a:1:{i:0;s:14:"system (>7.14)";}s:5:"files";a:4:{i:0;s:35:"views/views_handler_title_field.inc";i:1;s:37:"tests/TitleAdminSettingsTestCase.test";i:2;s:40:"tests/TitleFieldReplacementTestCase.test";i:3;s:35:"tests/TitleTranslationTestCase.test";}s:17:"test_dependencies";a:2:{i:0;s:6:"entity";i:1;s:18:"entity_translation";}s:5:"mtime";i:1664867487;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/variable/variable.module',
@@ -58158,7 +63710,7 @@
   'bootstrap' => '1',
   'schema_version' => '0',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:8:"Variable";s:11:"description";s:43:"Variable Information and basic variable API";s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:5:"files";a:9:{i:0;s:27:"includes/forum.variable.inc";i:1;s:28:"includes/locale.variable.inc";i:2;s:26:"includes/menu.variable.inc";i:3;s:26:"includes/node.variable.inc";i:4;s:28:"includes/system.variable.inc";i:5;s:30:"includes/taxonomy.variable.inc";i:6;s:33:"includes/translation.variable.inc";i:7;s:26:"includes/user.variable.inc";i:8;s:13:"variable.test";}s:7:"version";s:7:"7.x-2.5";s:7:"project";s:8:"variable";s:9:"datestamp";s:10:"1398250128";s:5:"mtime";i:1398250128;s:12:"dependencies";a:0:{}s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:8:"Variable";s:11:"description";s:43:"Variable Information and basic variable API";s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:5:"files";a:9:{i:0;s:27:"includes/forum.variable.inc";i:1;s:28:"includes/locale.variable.inc";i:2;s:26:"includes/menu.variable.inc";i:3;s:26:"includes/node.variable.inc";i:4;s:28:"includes/system.variable.inc";i:5;s:30:"includes/taxonomy.variable.inc";i:6;s:33:"includes/translation.variable.inc";i:7;s:26:"includes/user.variable.inc";i:8;s:13:"variable.test";}s:5:"mtime";i:1664867493;s:12:"dependencies";a:0:{}s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/variable/variable_admin/variable_admin.module',
@@ -58169,7 +63721,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:14:"Variable admin";s:11:"description";s:26:"Variable Administration UI";s:12:"dependencies";a:1:{i:0;s:8:"variable";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-2.5";s:7:"project";s:8:"variable";s:9:"datestamp";s:10:"1398250128";s:5:"mtime";i:1398250128;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:14:"Variable admin";s:11:"description";s:26:"Variable Administration UI";s:12:"dependencies";a:1:{i:0;s:8:"variable";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:5:"mtime";i:1664867493;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/variable/variable_example/variable_example.module',
@@ -58180,7 +63732,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:16:"Variable example";s:11:"description";s:83:"An example module showing how to use the Variable API and providing some variables.";s:12:"dependencies";a:2:{i:0;s:8:"variable";i:1;s:14:"variable_store";}s:7:"package";s:15:"Example modules";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:29:"variable_example.variable.inc";}s:7:"version";s:7:"7.x-2.5";s:7:"project";s:8:"variable";s:9:"datestamp";s:10:"1398250128";s:5:"mtime";i:1398250128;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:16:"Variable example";s:11:"description";s:83:"An example module showing how to use the Variable API and providing some variables.";s:12:"dependencies";a:2:{i:0;s:8:"variable";i:1;s:14:"variable_store";}s:7:"package";s:15:"Example modules";s:4:"core";s:3:"7.x";s:5:"files";a:1:{i:0;s:29:"variable_example.variable.inc";}s:5:"mtime";i:1664867493;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/variable/variable_realm/variable_realm.module',
@@ -58191,7 +63743,7 @@
   'bootstrap' => '1',
   'schema_version' => '7000',
   'weight' => '-1000',
-  'info' => 'a:12:{s:4:"name";s:14:"Variable realm";s:11:"description";s:49:"API to use variable realms from different modules";s:12:"dependencies";a:1:{i:0;s:8:"variable";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-2.5";s:5:"files";a:2:{i:0;s:24:"variable_realm.class.inc";i:1;s:30:"variable_realm_union.class.inc";}s:7:"project";s:8:"variable";s:9:"datestamp";s:10:"1398250128";s:5:"mtime";i:1398250128;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:14:"Variable realm";s:11:"description";s:49:"API to use variable realms from different modules";s:12:"dependencies";a:1:{i:0;s:8:"variable";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-2.x";s:5:"files";a:2:{i:0;s:24:"variable_realm.class.inc";i:1;s:30:"variable_realm_union.class.inc";}s:5:"mtime";i:1664867493;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/variable/variable_store/variable_store.module',
@@ -58202,7 +63754,7 @@
   'bootstrap' => '1',
   'schema_version' => '7000',
   'weight' => '-1000',
-  'info' => 'a:12:{s:4:"name";s:14:"Variable store";s:11:"description";s:60:"Database storage for variable realms. This is an API module.";s:12:"dependencies";a:1:{i:0;s:8:"variable";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-2.5";s:5:"files";a:2:{i:0;s:24:"variable_store.class.inc";i:1;s:19:"variable_store.test";}s:7:"project";s:8:"variable";s:9:"datestamp";s:10:"1398250128";s:5:"mtime";i:1398250128;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:14:"Variable store";s:11:"description";s:60:"Database storage for variable realms. This is an API module.";s:12:"dependencies";a:1:{i:0;s:8:"variable";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:7:"version";s:7:"7.x-2.x";s:5:"files";a:2:{i:0;s:24:"variable_store.class.inc";i:1;s:19:"variable_store.test";}s:5:"mtime";i:1664867493;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/variable/variable_views/variable_views.module',
@@ -58213,7 +63765,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:12:{s:4:"name";s:14:"Variable views";s:11:"description";s:78:"Provides views integration for variable, included a default variable argument.";s:12:"dependencies";a:2:{i:0;s:8:"variable";i:1;s:5:"views";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:5:"files";a:3:{i:0;s:51:"includes/views_plugin_argument_default_variable.inc";i:1;s:47:"includes/views_handler_field_variable_title.inc";i:2;s:47:"includes/views_handler_field_variable_value.inc";}s:7:"version";s:7:"7.x-2.5";s:7:"project";s:8:"variable";s:9:"datestamp";s:10:"1398250128";s:5:"mtime";i:1398250128;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => 'a:10:{s:4:"name";s:14:"Variable views";s:11:"description";s:78:"Provides views integration for variable, included a default variable argument.";s:12:"dependencies";a:2:{i:0;s:8:"variable";i:1;s:5:"views";}s:7:"package";s:8:"Variable";s:4:"core";s:3:"7.x";s:5:"files";a:3:{i:0;s:51:"includes/views_plugin_argument_default_variable.inc";i:1;s:47:"includes/views_handler_field_variable_title.inc";i:2;s:47:"includes/views_handler_field_variable_value.inc";}s:5:"mtime";i:1664867493;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/tests/views_test.module',
@@ -58224,7 +63776,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:10:"Views Test";s:11:"description";s:22:"Test module for Views.";s:7:"package";s:5:"Views";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:6:"hidden";b:1;s:7:"version";s:8:"7.x-3.20";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1523668093";s:5:"mtime";i:1535762879;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
+  'info' => 'a:11:{s:4:"name";s:10:"Views Test";s:11:"description";s:22:"Test module for Views.";s:7:"package";s:5:"Views";s:4:"core";s:3:"7.x";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:6:"hidden";b:1;s:5:"mtime";i:1664867501;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:5:"files";a:0:{}s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/views.module',
@@ -58233,9 +63785,9 @@
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '7301',
-  'weight' => '10',
-  'info' => 'a:13:{s:4:"name";s:5:"Views";s:11:"description";s:55:"Create customized lists and queries from your database.";s:7:"package";s:5:"Views";s:4:"core";s:3:"7.x";s:3:"php";s:3:"5.2";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:13:"css/views.css";s:37:"sites/all/modules/views/css/views.css";}}s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"files";a:297:{i:0;s:31:"handlers/views_handler_area.inc";i:1;s:38:"handlers/views_handler_area_result.inc";i:2;s:36:"handlers/views_handler_area_text.inc";i:3;s:43:"handlers/views_handler_area_text_custom.inc";i:4;s:36:"handlers/views_handler_area_view.inc";i:5;s:35:"handlers/views_handler_argument.inc";i:6;s:40:"handlers/views_handler_argument_date.inc";i:7;s:43:"handlers/views_handler_argument_formula.inc";i:8;s:47:"handlers/views_handler_argument_many_to_one.inc";i:9;s:40:"handlers/views_handler_argument_null.inc";i:10;s:43:"handlers/views_handler_argument_numeric.inc";i:11;s:42:"handlers/views_handler_argument_string.inc";i:12;s:52:"handlers/views_handler_argument_group_by_numeric.inc";i:13;s:32:"handlers/views_handler_field.inc";i:14;s:40:"handlers/views_handler_field_counter.inc";i:15;s:40:"handlers/views_handler_field_boolean.inc";i:16;s:49:"handlers/views_handler_field_contextual_links.inc";i:17;s:39:"handlers/views_handler_field_custom.inc";i:18;s:37:"handlers/views_handler_field_date.inc";i:19;s:39:"handlers/views_handler_field_entity.inc";i:20;s:39:"handlers/views_handler_field_markup.inc";i:21;s:37:"handlers/views_handler_field_math.inc";i:22;s:40:"handlers/views_handler_field_numeric.inc";i:23;s:47:"handlers/views_handler_field_prerender_list.inc";i:24;s:46:"handlers/views_handler_field_time_interval.inc";i:25;s:43:"handlers/views_handler_field_serialized.inc";i:26;s:45:"handlers/views_handler_field_machine_name.inc";i:27;s:36:"handlers/views_handler_field_url.inc";i:28;s:33:"handlers/views_handler_filter.inc";i:29;s:50:"handlers/views_handler_filter_boolean_operator.inc";i:30;s:57:"handlers/views_handler_filter_boolean_operator_string.inc";i:31;s:41:"handlers/views_handler_filter_combine.inc";i:32;s:38:"handlers/views_handler_filter_date.inc";i:33;s:42:"handlers/views_handler_filter_equality.inc";i:34;s:47:"handlers/views_handler_filter_entity_bundle.inc";i:35;s:50:"handlers/views_handler_filter_group_by_numeric.inc";i:36;s:45:"handlers/views_handler_filter_in_operator.inc";i:37;s:45:"handlers/views_handler_filter_many_to_one.inc";i:38;s:41:"handlers/views_handler_filter_numeric.inc";i:39;s:40:"handlers/views_handler_filter_string.inc";i:40;s:39:"handlers/views_handler_relationship.inc";i:41;s:53:"handlers/views_handler_relationship_groupwise_max.inc";i:42;s:31:"handlers/views_handler_sort.inc";i:43;s:36:"handlers/views_handler_sort_date.inc";i:44;s:39:"handlers/views_handler_sort_formula.inc";i:45;s:48:"handlers/views_handler_sort_group_by_numeric.inc";i:46;s:46:"handlers/views_handler_sort_menu_hierarchy.inc";i:47;s:38:"handlers/views_handler_sort_random.inc";i:48;s:17:"includes/base.inc";i:49;s:21:"includes/handlers.inc";i:50;s:20:"includes/plugins.inc";i:51;s:17:"includes/view.inc";i:52;s:60:"modules/aggregator/views_handler_argument_aggregator_fid.inc";i:53;s:60:"modules/aggregator/views_handler_argument_aggregator_iid.inc";i:54;s:69:"modules/aggregator/views_handler_argument_aggregator_category_cid.inc";i:55;s:64:"modules/aggregator/views_handler_field_aggregator_title_link.inc";i:56;s:62:"modules/aggregator/views_handler_field_aggregator_category.inc";i:57;s:70:"modules/aggregator/views_handler_field_aggregator_item_description.inc";i:58;s:57:"modules/aggregator/views_handler_field_aggregator_xss.inc";i:59;s:67:"modules/aggregator/views_handler_filter_aggregator_category_cid.inc";i:60;s:54:"modules/aggregator/views_plugin_row_aggregator_rss.inc";i:61;s:56:"modules/book/views_plugin_argument_default_book_root.inc";i:62;s:59:"modules/comment/views_handler_argument_comment_user_uid.inc";i:63;s:47:"modules/comment/views_handler_field_comment.inc";i:64;s:53:"modules/comment/views_handler_field_comment_depth.inc";i:65;s:52:"modules/comment/views_handler_field_comment_link.inc";i:66;s:60:"modules/comment/views_handler_field_comment_link_approve.inc";i:67;s:59:"modules/comment/views_handler_field_comment_link_delete.inc";i:68;s:57:"modules/comment/views_handler_field_comment_link_edit.inc";i:69;s:58:"modules/comment/views_handler_field_comment_link_reply.inc";i:70;s:57:"modules/comment/views_handler_field_comment_node_link.inc";i:71;s:56:"modules/comment/views_handler_field_comment_username.inc";i:72;s:61:"modules/comment/views_handler_field_ncs_last_comment_name.inc";i:73;s:56:"modules/comment/views_handler_field_ncs_last_updated.inc";i:74;s:52:"modules/comment/views_handler_field_node_comment.inc";i:75;s:57:"modules/comment/views_handler_field_node_new_comments.inc";i:76;s:62:"modules/comment/views_handler_field_last_comment_timestamp.inc";i:77;s:57:"modules/comment/views_handler_filter_comment_user_uid.inc";i:78;s:57:"modules/comment/views_handler_filter_ncs_last_updated.inc";i:79;s:53:"modules/comment/views_handler_filter_node_comment.inc";i:80;s:53:"modules/comment/views_handler_sort_comment_thread.inc";i:81;s:60:"modules/comment/views_handler_sort_ncs_last_comment_name.inc";i:82;s:55:"modules/comment/views_handler_sort_ncs_last_updated.inc";i:83;s:48:"modules/comment/views_plugin_row_comment_rss.inc";i:84;s:49:"modules/comment/views_plugin_row_comment_view.inc";i:85;s:52:"modules/contact/views_handler_field_contact_link.inc";i:86;s:43:"modules/field/views_handler_field_field.inc";i:87;s:59:"modules/field/views_handler_relationship_entity_reverse.inc";i:88;s:51:"modules/field/views_handler_argument_field_list.inc";i:89;s:58:"modules/field/views_handler_argument_field_list_string.inc";i:90;s:49:"modules/field/views_handler_filter_field_list.inc";i:91;s:57:"modules/filter/views_handler_field_filter_format_name.inc";i:92;s:52:"modules/locale/views_handler_field_node_language.inc";i:93;s:53:"modules/locale/views_handler_filter_node_language.inc";i:94;s:54:"modules/locale/views_handler_argument_locale_group.inc";i:95;s:57:"modules/locale/views_handler_argument_locale_language.inc";i:96;s:51:"modules/locale/views_handler_field_locale_group.inc";i:97;s:54:"modules/locale/views_handler_field_locale_language.inc";i:98;s:55:"modules/locale/views_handler_field_locale_link_edit.inc";i:99;s:52:"modules/locale/views_handler_filter_locale_group.inc";i:100;s:55:"modules/locale/views_handler_filter_locale_language.inc";i:101;s:54:"modules/locale/views_handler_filter_locale_version.inc";i:102;s:53:"modules/node/views_handler_argument_dates_various.inc";i:103;s:53:"modules/node/views_handler_argument_node_language.inc";i:104;s:48:"modules/node/views_handler_argument_node_nid.inc";i:105;s:49:"modules/node/views_handler_argument_node_type.inc";i:106;s:48:"modules/node/views_handler_argument_node_vid.inc";i:107;s:57:"modules/node/views_handler_argument_node_uid_revision.inc";i:108;s:59:"modules/node/views_handler_field_history_user_timestamp.inc";i:109;s:41:"modules/node/views_handler_field_node.inc";i:110;s:46:"modules/node/views_handler_field_node_link.inc";i:111;s:53:"modules/node/views_handler_field_node_link_delete.inc";i:112;s:51:"modules/node/views_handler_field_node_link_edit.inc";i:113;s:50:"modules/node/views_handler_field_node_revision.inc";i:114;s:55:"modules/node/views_handler_field_node_revision_link.inc";i:115;s:62:"modules/node/views_handler_field_node_revision_link_delete.inc";i:116;s:62:"modules/node/views_handler_field_node_revision_link_revert.inc";i:117;s:46:"modules/node/views_handler_field_node_path.inc";i:118;s:46:"modules/node/views_handler_field_node_type.inc";i:119;s:60:"modules/node/views_handler_filter_history_user_timestamp.inc";i:120;s:49:"modules/node/views_handler_filter_node_access.inc";i:121;s:49:"modules/node/views_handler_filter_node_status.inc";i:122;s:47:"modules/node/views_handler_filter_node_type.inc";i:123;s:55:"modules/node/views_handler_filter_node_uid_revision.inc";i:124;s:51:"modules/node/views_plugin_argument_default_node.inc";i:125;s:52:"modules/node/views_plugin_argument_validate_node.inc";i:126;s:42:"modules/node/views_plugin_row_node_rss.inc";i:127;s:43:"modules/node/views_plugin_row_node_view.inc";i:128;s:52:"modules/profile/views_handler_field_profile_date.inc";i:129;s:52:"modules/profile/views_handler_field_profile_list.inc";i:130;s:58:"modules/profile/views_handler_filter_profile_selection.inc";i:131;s:48:"modules/search/views_handler_argument_search.inc";i:132;s:51:"modules/search/views_handler_field_search_score.inc";i:133;s:46:"modules/search/views_handler_filter_search.inc";i:134;s:50:"modules/search/views_handler_sort_search_score.inc";i:135;s:47:"modules/search/views_plugin_row_search_view.inc";i:136;s:57:"modules/statistics/views_handler_field_accesslog_path.inc";i:137;s:50:"modules/system/views_handler_argument_file_fid.inc";i:138;s:43:"modules/system/views_handler_field_file.inc";i:139;s:53:"modules/system/views_handler_field_file_extension.inc";i:140;s:52:"modules/system/views_handler_field_file_filemime.inc";i:141;s:47:"modules/system/views_handler_field_file_uri.inc";i:142;s:50:"modules/system/views_handler_field_file_status.inc";i:143;s:51:"modules/system/views_handler_filter_file_status.inc";i:144;s:52:"modules/taxonomy/views_handler_argument_taxonomy.inc";i:145;s:57:"modules/taxonomy/views_handler_argument_term_node_tid.inc";i:146;s:63:"modules/taxonomy/views_handler_argument_term_node_tid_depth.inc";i:147;s:72:"modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc";i:148;s:58:"modules/taxonomy/views_handler_argument_vocabulary_vid.inc";i:149;s:67:"modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc";i:150;s:49:"modules/taxonomy/views_handler_field_taxonomy.inc";i:151;s:54:"modules/taxonomy/views_handler_field_term_node_tid.inc";i:152;s:55:"modules/taxonomy/views_handler_field_term_link_edit.inc";i:153;s:55:"modules/taxonomy/views_handler_filter_term_node_tid.inc";i:154;s:61:"modules/taxonomy/views_handler_filter_term_node_tid_depth.inc";i:155;s:56:"modules/taxonomy/views_handler_filter_vocabulary_vid.inc";i:156;s:65:"modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc";i:157;s:62:"modules/taxonomy/views_handler_relationship_node_term_data.inc";i:158;s:65:"modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc";i:159;s:63:"modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc";i:160;s:67:"modules/tracker/views_handler_argument_tracker_comment_user_uid.inc";i:161;s:65:"modules/tracker/views_handler_filter_tracker_comment_user_uid.inc";i:162;s:65:"modules/tracker/views_handler_filter_tracker_boolean_operator.inc";i:163;s:51:"modules/system/views_handler_filter_system_type.inc";i:164;s:56:"modules/translation/views_handler_argument_node_tnid.inc";i:165;s:63:"modules/translation/views_handler_field_node_link_translate.inc";i:166;s:65:"modules/translation/views_handler_field_node_translation_link.inc";i:167;s:54:"modules/translation/views_handler_filter_node_tnid.inc";i:168;s:60:"modules/translation/views_handler_filter_node_tnid_child.inc";i:169;s:62:"modules/translation/views_handler_relationship_translation.inc";i:170;s:48:"modules/user/views_handler_argument_user_uid.inc";i:171;s:55:"modules/user/views_handler_argument_users_roles_rid.inc";i:172;s:41:"modules/user/views_handler_field_user.inc";i:173;s:50:"modules/user/views_handler_field_user_language.inc";i:174;s:46:"modules/user/views_handler_field_user_link.inc";i:175;s:53:"modules/user/views_handler_field_user_link_cancel.inc";i:176;s:51:"modules/user/views_handler_field_user_link_edit.inc";i:177;s:46:"modules/user/views_handler_field_user_mail.inc";i:178;s:46:"modules/user/views_handler_field_user_name.inc";i:179;s:53:"modules/user/views_handler_field_user_permissions.inc";i:180;s:49:"modules/user/views_handler_field_user_picture.inc";i:181;s:47:"modules/user/views_handler_field_user_roles.inc";i:182;s:50:"modules/user/views_handler_filter_user_current.inc";i:183;s:47:"modules/user/views_handler_filter_user_name.inc";i:184;s:54:"modules/user/views_handler_filter_user_permissions.inc";i:185;s:48:"modules/user/views_handler_filter_user_roles.inc";i:186;s:59:"modules/user/views_plugin_argument_default_current_user.inc";i:187;s:51:"modules/user/views_plugin_argument_default_user.inc";i:188;s:52:"modules/user/views_plugin_argument_validate_user.inc";i:189;s:43:"modules/user/views_plugin_row_user_view.inc";i:190;s:31:"plugins/views_plugin_access.inc";i:191;s:36:"plugins/views_plugin_access_none.inc";i:192;s:36:"plugins/views_plugin_access_perm.inc";i:193;s:36:"plugins/views_plugin_access_role.inc";i:194;s:41:"plugins/views_plugin_argument_default.inc";i:195;s:45:"plugins/views_plugin_argument_default_php.inc";i:196;s:47:"plugins/views_plugin_argument_default_fixed.inc";i:197;s:45:"plugins/views_plugin_argument_default_raw.inc";i:198;s:42:"plugins/views_plugin_argument_validate.inc";i:199;s:50:"plugins/views_plugin_argument_validate_numeric.inc";i:200;s:46:"plugins/views_plugin_argument_validate_php.inc";i:201;s:30:"plugins/views_plugin_cache.inc";i:202;s:35:"plugins/views_plugin_cache_none.inc";i:203;s:35:"plugins/views_plugin_cache_time.inc";i:204;s:32:"plugins/views_plugin_display.inc";i:205;s:43:"plugins/views_plugin_display_attachment.inc";i:206;s:38:"plugins/views_plugin_display_block.inc";i:207;s:40:"plugins/views_plugin_display_default.inc";i:208;s:38:"plugins/views_plugin_display_embed.inc";i:209;s:41:"plugins/views_plugin_display_extender.inc";i:210;s:37:"plugins/views_plugin_display_feed.inc";i:211;s:37:"plugins/views_plugin_display_page.inc";i:212;s:43:"plugins/views_plugin_exposed_form_basic.inc";i:213;s:37:"plugins/views_plugin_exposed_form.inc";i:214;s:52:"plugins/views_plugin_exposed_form_input_required.inc";i:215;s:42:"plugins/views_plugin_localization_core.inc";i:216;s:37:"plugins/views_plugin_localization.inc";i:217;s:42:"plugins/views_plugin_localization_none.inc";i:218;s:30:"plugins/views_plugin_pager.inc";i:219;s:35:"plugins/views_plugin_pager_full.inc";i:220;s:35:"plugins/views_plugin_pager_mini.inc";i:221;s:35:"plugins/views_plugin_pager_none.inc";i:222;s:35:"plugins/views_plugin_pager_some.inc";i:223;s:30:"plugins/views_plugin_query.inc";i:224;s:38:"plugins/views_plugin_query_default.inc";i:225;s:28:"plugins/views_plugin_row.inc";i:226;s:35:"plugins/views_plugin_row_fields.inc";i:227;s:39:"plugins/views_plugin_row_rss_fields.inc";i:228;s:30:"plugins/views_plugin_style.inc";i:229;s:38:"plugins/views_plugin_style_default.inc";i:230;s:35:"plugins/views_plugin_style_grid.inc";i:231;s:35:"plugins/views_plugin_style_list.inc";i:232;s:40:"plugins/views_plugin_style_jump_menu.inc";i:233;s:38:"plugins/views_plugin_style_mapping.inc";i:234;s:34:"plugins/views_plugin_style_rss.inc";i:235;s:38:"plugins/views_plugin_style_summary.inc";i:236;s:48:"plugins/views_plugin_style_summary_jump_menu.inc";i:237;s:50:"plugins/views_plugin_style_summary_unformatted.inc";i:238;s:36:"plugins/views_plugin_style_table.inc";i:239;s:43:"tests/handlers/views_handler_area_text.test";i:240;s:47:"tests/handlers/views_handler_argument_null.test";i:241;s:49:"tests/handlers/views_handler_argument_string.test";i:242;s:39:"tests/handlers/views_handler_field.test";i:243;s:47:"tests/handlers/views_handler_field_boolean.test";i:244;s:46:"tests/handlers/views_handler_field_custom.test";i:245;s:47:"tests/handlers/views_handler_field_counter.test";i:246;s:44:"tests/handlers/views_handler_field_date.test";i:247;s:49:"tests/handlers/views_handler_field_file_size.test";i:248;s:44:"tests/handlers/views_handler_field_math.test";i:249;s:43:"tests/handlers/views_handler_field_url.test";i:250;s:43:"tests/handlers/views_handler_field_xss.test";i:251;s:48:"tests/handlers/views_handler_filter_combine.test";i:252;s:45:"tests/handlers/views_handler_filter_date.test";i:253;s:49:"tests/handlers/views_handler_filter_equality.test";i:254;s:52:"tests/handlers/views_handler_filter_in_operator.test";i:255;s:48:"tests/handlers/views_handler_filter_numeric.test";i:256;s:47:"tests/handlers/views_handler_filter_string.test";i:257;s:45:"tests/handlers/views_handler_sort_random.test";i:258;s:43:"tests/handlers/views_handler_sort_date.test";i:259;s:38:"tests/handlers/views_handler_sort.test";i:260;s:60:"tests/test_plugins/views_test_plugin_access_test_dynamic.inc";i:261;s:59:"tests/test_plugins/views_test_plugin_access_test_static.inc";i:262;s:59:"tests/test_plugins/views_test_plugin_style_test_mapping.inc";i:263;s:39:"tests/plugins/views_plugin_display.test";i:264;s:46:"tests/styles/views_plugin_style_jump_menu.test";i:265;s:36:"tests/styles/views_plugin_style.test";i:266;s:41:"tests/styles/views_plugin_style_base.test";i:267;s:44:"tests/styles/views_plugin_style_mapping.test";i:268;s:48:"tests/styles/views_plugin_style_unformatted.test";i:269;s:23:"tests/views_access.test";i:270;s:24:"tests/views_analyze.test";i:271;s:22:"tests/views_basic.test";i:272;s:33:"tests/views_argument_default.test";i:273;s:35:"tests/views_argument_validator.test";i:274;s:29:"tests/views_exposed_form.test";i:275;s:31:"tests/field/views_fieldapi.test";i:276;s:25:"tests/views_glossary.test";i:277;s:24:"tests/views_groupby.test";i:278;s:25:"tests/views_handlers.test";i:279;s:23:"tests/views_module.test";i:280;s:22:"tests/views_pager.test";i:281;s:40:"tests/views_plugin_localization_test.inc";i:282;s:29:"tests/views_translatable.test";i:283;s:22:"tests/views_query.test";i:284;s:24:"tests/views_upgrade.test";i:285;s:34:"tests/views_test.views_default.inc";i:286;s:58:"tests/comment/views_handler_argument_comment_user_uid.test";i:287;s:56:"tests/comment/views_handler_filter_comment_user_uid.test";i:288;s:45:"tests/node/views_node_revision_relations.test";i:289;s:61:"tests/taxonomy/views_handler_relationship_node_term_data.test";i:290;s:45:"tests/user/views_handler_field_user_name.test";i:291;s:43:"tests/user/views_user_argument_default.test";i:292;s:44:"tests/user/views_user_argument_validate.test";i:293;s:26:"tests/user/views_user.test";i:294;s:22:"tests/views_cache.test";i:295;s:21:"tests/views_view.test";i:296;s:19:"tests/views_ui.test";}s:7:"version";s:7:"7.x-3.7";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1365499236";s:5:"mtime";i:1365499236;s:9:"bootstrap";i:0;}',
+  'schema_version' => '-1',
+  'weight' => '0',
+  'info' => 'a:11:{s:4:"name";s:5:"Views";s:11:"description";s:55:"Create customized lists and queries from your database.";s:7:"package";s:5:"Views";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:3:"all";a:1:{s:13:"css/views.css";s:37:"sites/all/modules/views/css/views.css";}}s:12:"dependencies";a:1:{i:0;s:6:"ctools";}s:5:"files";a:316:{i:0;s:31:"handlers/views_handler_area.inc";i:1;s:40:"handlers/views_handler_area_messages.inc";i:2;s:38:"handlers/views_handler_area_result.inc";i:3;s:36:"handlers/views_handler_area_text.inc";i:4;s:43:"handlers/views_handler_area_text_custom.inc";i:5;s:36:"handlers/views_handler_area_view.inc";i:6;s:35:"handlers/views_handler_argument.inc";i:7;s:40:"handlers/views_handler_argument_date.inc";i:8;s:43:"handlers/views_handler_argument_formula.inc";i:9;s:47:"handlers/views_handler_argument_many_to_one.inc";i:10;s:40:"handlers/views_handler_argument_null.inc";i:11;s:43:"handlers/views_handler_argument_numeric.inc";i:12;s:42:"handlers/views_handler_argument_string.inc";i:13;s:52:"handlers/views_handler_argument_group_by_numeric.inc";i:14;s:32:"handlers/views_handler_field.inc";i:15;s:40:"handlers/views_handler_field_counter.inc";i:16;s:40:"handlers/views_handler_field_boolean.inc";i:17;s:49:"handlers/views_handler_field_contextual_links.inc";i:18;s:48:"handlers/views_handler_field_ctools_dropdown.inc";i:19;s:39:"handlers/views_handler_field_custom.inc";i:20;s:37:"handlers/views_handler_field_date.inc";i:21;s:39:"handlers/views_handler_field_entity.inc";i:22;s:38:"handlers/views_handler_field_links.inc";i:23;s:39:"handlers/views_handler_field_markup.inc";i:24;s:37:"handlers/views_handler_field_math.inc";i:25;s:40:"handlers/views_handler_field_numeric.inc";i:26;s:47:"handlers/views_handler_field_prerender_list.inc";i:27;s:46:"handlers/views_handler_field_time_interval.inc";i:28;s:43:"handlers/views_handler_field_serialized.inc";i:29;s:45:"handlers/views_handler_field_machine_name.inc";i:30;s:36:"handlers/views_handler_field_url.inc";i:31;s:33:"handlers/views_handler_filter.inc";i:32;s:50:"handlers/views_handler_filter_boolean_operator.inc";i:33;s:57:"handlers/views_handler_filter_boolean_operator_string.inc";i:34;s:41:"handlers/views_handler_filter_combine.inc";i:35;s:38:"handlers/views_handler_filter_date.inc";i:36;s:42:"handlers/views_handler_filter_equality.inc";i:37;s:47:"handlers/views_handler_filter_entity_bundle.inc";i:38;s:50:"handlers/views_handler_filter_group_by_numeric.inc";i:39;s:45:"handlers/views_handler_filter_in_operator.inc";i:40;s:45:"handlers/views_handler_filter_many_to_one.inc";i:41;s:41:"handlers/views_handler_filter_numeric.inc";i:42;s:40:"handlers/views_handler_filter_string.inc";i:43;s:48:"handlers/views_handler_filter_fields_compare.inc";i:44;s:39:"handlers/views_handler_relationship.inc";i:45;s:53:"handlers/views_handler_relationship_groupwise_max.inc";i:46;s:31:"handlers/views_handler_sort.inc";i:47;s:36:"handlers/views_handler_sort_date.inc";i:48;s:39:"handlers/views_handler_sort_formula.inc";i:49;s:48:"handlers/views_handler_sort_group_by_numeric.inc";i:50;s:46:"handlers/views_handler_sort_menu_hierarchy.inc";i:51;s:38:"handlers/views_handler_sort_random.inc";i:52;s:17:"includes/base.inc";i:53;s:21:"includes/handlers.inc";i:54;s:20:"includes/plugins.inc";i:55;s:17:"includes/view.inc";i:56;s:60:"modules/aggregator/views_handler_argument_aggregator_fid.inc";i:57;s:60:"modules/aggregator/views_handler_argument_aggregator_iid.inc";i:58;s:69:"modules/aggregator/views_handler_argument_aggregator_category_cid.inc";i:59;s:64:"modules/aggregator/views_handler_field_aggregator_title_link.inc";i:60;s:62:"modules/aggregator/views_handler_field_aggregator_category.inc";i:61;s:70:"modules/aggregator/views_handler_field_aggregator_item_description.inc";i:62;s:57:"modules/aggregator/views_handler_field_aggregator_xss.inc";i:63;s:67:"modules/aggregator/views_handler_filter_aggregator_category_cid.inc";i:64;s:54:"modules/aggregator/views_plugin_row_aggregator_rss.inc";i:65;s:56:"modules/book/views_plugin_argument_default_book_root.inc";i:66;s:59:"modules/comment/views_handler_argument_comment_user_uid.inc";i:67;s:47:"modules/comment/views_handler_field_comment.inc";i:68;s:53:"modules/comment/views_handler_field_comment_depth.inc";i:69;s:52:"modules/comment/views_handler_field_comment_link.inc";i:70;s:60:"modules/comment/views_handler_field_comment_link_approve.inc";i:71;s:59:"modules/comment/views_handler_field_comment_link_delete.inc";i:72;s:57:"modules/comment/views_handler_field_comment_link_edit.inc";i:73;s:58:"modules/comment/views_handler_field_comment_link_reply.inc";i:74;s:57:"modules/comment/views_handler_field_comment_node_link.inc";i:75;s:56:"modules/comment/views_handler_field_comment_username.inc";i:76;s:61:"modules/comment/views_handler_field_ncs_last_comment_name.inc";i:77;s:56:"modules/comment/views_handler_field_ncs_last_updated.inc";i:78;s:52:"modules/comment/views_handler_field_node_comment.inc";i:79;s:57:"modules/comment/views_handler_field_node_new_comments.inc";i:80;s:62:"modules/comment/views_handler_field_last_comment_timestamp.inc";i:81;s:57:"modules/comment/views_handler_filter_comment_user_uid.inc";i:82;s:57:"modules/comment/views_handler_filter_ncs_last_updated.inc";i:83;s:53:"modules/comment/views_handler_filter_node_comment.inc";i:84;s:53:"modules/comment/views_handler_sort_comment_thread.inc";i:85;s:60:"modules/comment/views_handler_sort_ncs_last_comment_name.inc";i:86;s:55:"modules/comment/views_handler_sort_ncs_last_updated.inc";i:87;s:48:"modules/comment/views_plugin_row_comment_rss.inc";i:88;s:49:"modules/comment/views_plugin_row_comment_view.inc";i:89;s:52:"modules/contact/views_handler_field_contact_link.inc";i:90;s:43:"modules/field/views_handler_field_field.inc";i:91;s:59:"modules/field/views_handler_relationship_entity_reverse.inc";i:92;s:51:"modules/field/views_handler_argument_field_list.inc";i:93;s:57:"modules/field/views_handler_filter_field_list_boolean.inc";i:94;s:58:"modules/field/views_handler_argument_field_list_string.inc";i:95;s:49:"modules/field/views_handler_filter_field_list.inc";i:96;s:57:"modules/filter/views_handler_field_filter_format_name.inc";i:97;s:52:"modules/locale/views_handler_field_node_language.inc";i:98;s:53:"modules/locale/views_handler_filter_node_language.inc";i:99;s:54:"modules/locale/views_handler_argument_locale_group.inc";i:100;s:57:"modules/locale/views_handler_argument_locale_language.inc";i:101;s:51:"modules/locale/views_handler_field_locale_group.inc";i:102;s:54:"modules/locale/views_handler_field_locale_language.inc";i:103;s:55:"modules/locale/views_handler_field_locale_link_edit.inc";i:104;s:52:"modules/locale/views_handler_filter_locale_group.inc";i:105;s:55:"modules/locale/views_handler_filter_locale_language.inc";i:106;s:54:"modules/locale/views_handler_filter_locale_version.inc";i:107;s:51:"modules/locale/views_handler_sort_node_language.inc";i:108;s:53:"modules/node/views_handler_argument_dates_various.inc";i:109;s:53:"modules/node/views_handler_argument_node_language.inc";i:110;s:48:"modules/node/views_handler_argument_node_nid.inc";i:111;s:49:"modules/node/views_handler_argument_node_type.inc";i:112;s:48:"modules/node/views_handler_argument_node_vid.inc";i:113;s:57:"modules/node/views_handler_argument_node_uid_revision.inc";i:114;s:59:"modules/node/views_handler_field_history_user_timestamp.inc";i:115;s:41:"modules/node/views_handler_field_node.inc";i:116;s:46:"modules/node/views_handler_field_node_link.inc";i:117;s:53:"modules/node/views_handler_field_node_link_delete.inc";i:118;s:51:"modules/node/views_handler_field_node_link_edit.inc";i:119;s:50:"modules/node/views_handler_field_node_revision.inc";i:120;s:55:"modules/node/views_handler_field_node_revision_link.inc";i:121;s:62:"modules/node/views_handler_field_node_revision_link_delete.inc";i:122;s:62:"modules/node/views_handler_field_node_revision_link_revert.inc";i:123;s:46:"modules/node/views_handler_field_node_path.inc";i:124;s:46:"modules/node/views_handler_field_node_type.inc";i:125;s:55:"modules/node/views_handler_field_node_version_count.inc";i:126;s:60:"modules/node/views_handler_filter_history_user_timestamp.inc";i:127;s:49:"modules/node/views_handler_filter_node_access.inc";i:128;s:49:"modules/node/views_handler_filter_node_status.inc";i:129;s:47:"modules/node/views_handler_filter_node_type.inc";i:130;s:55:"modules/node/views_handler_filter_node_uid_revision.inc";i:131;s:56:"modules/node/views_handler_filter_node_version_count.inc";i:132;s:54:"modules/node/views_handler_sort_node_version_count.inc";i:133;s:51:"modules/node/views_plugin_argument_default_node.inc";i:134;s:52:"modules/node/views_plugin_argument_validate_node.inc";i:135;s:42:"modules/node/views_plugin_row_node_rss.inc";i:136;s:43:"modules/node/views_plugin_row_node_view.inc";i:137;s:52:"modules/profile/views_handler_field_profile_date.inc";i:138;s:52:"modules/profile/views_handler_field_profile_list.inc";i:139;s:58:"modules/profile/views_handler_filter_profile_selection.inc";i:140;s:48:"modules/search/views_handler_argument_search.inc";i:141;s:51:"modules/search/views_handler_field_search_score.inc";i:142;s:46:"modules/search/views_handler_filter_search.inc";i:143;s:50:"modules/search/views_handler_sort_search_score.inc";i:144;s:47:"modules/search/views_plugin_row_search_view.inc";i:145;s:57:"modules/statistics/views_handler_field_accesslog_path.inc";i:146;s:65:"modules/statistics/views_handler_field_node_counter_timestamp.inc";i:147;s:61:"modules/statistics/views_handler_field_statistics_numeric.inc";i:148;s:50:"modules/system/views_handler_argument_file_fid.inc";i:149;s:43:"modules/system/views_handler_field_file.inc";i:150;s:53:"modules/system/views_handler_field_file_extension.inc";i:151;s:52:"modules/system/views_handler_field_file_filemime.inc";i:152;s:47:"modules/system/views_handler_field_file_uri.inc";i:153;s:50:"modules/system/views_handler_field_file_status.inc";i:154;s:51:"modules/system/views_handler_filter_file_status.inc";i:155;s:52:"modules/taxonomy/views_handler_argument_taxonomy.inc";i:156;s:57:"modules/taxonomy/views_handler_argument_term_node_tid.inc";i:157;s:63:"modules/taxonomy/views_handler_argument_term_node_tid_depth.inc";i:158;s:68:"modules/taxonomy/views_handler_argument_term_node_tid_depth_join.inc";i:159;s:72:"modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc";i:160;s:58:"modules/taxonomy/views_handler_argument_vocabulary_vid.inc";i:161;s:67:"modules/taxonomy/views_handler_argument_vocabulary_machine_name.inc";i:162;s:49:"modules/taxonomy/views_handler_field_taxonomy.inc";i:163;s:54:"modules/taxonomy/views_handler_field_term_node_tid.inc";i:164;s:55:"modules/taxonomy/views_handler_field_term_link_edit.inc";i:165;s:55:"modules/taxonomy/views_handler_filter_term_node_tid.inc";i:166;s:61:"modules/taxonomy/views_handler_filter_term_node_tid_depth.inc";i:167;s:66:"modules/taxonomy/views_handler_filter_term_node_tid_depth_join.inc";i:168;s:56:"modules/taxonomy/views_handler_filter_vocabulary_vid.inc";i:169;s:65:"modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc";i:170;s:62:"modules/taxonomy/views_handler_relationship_node_term_data.inc";i:171;s:65:"modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc";i:172;s:63:"modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc";i:173;s:67:"modules/tracker/views_handler_argument_tracker_comment_user_uid.inc";i:174;s:65:"modules/tracker/views_handler_filter_tracker_comment_user_uid.inc";i:175;s:65:"modules/tracker/views_handler_filter_tracker_boolean_operator.inc";i:176;s:51:"modules/system/views_handler_filter_system_type.inc";i:177;s:56:"modules/translation/views_handler_argument_node_tnid.inc";i:178;s:63:"modules/translation/views_handler_field_node_link_translate.inc";i:179;s:65:"modules/translation/views_handler_field_node_translation_link.inc";i:180;s:54:"modules/translation/views_handler_filter_node_tnid.inc";i:181;s:60:"modules/translation/views_handler_filter_node_tnid_child.inc";i:182;s:62:"modules/translation/views_handler_relationship_translation.inc";i:183;s:48:"modules/user/views_handler_argument_user_uid.inc";i:184;s:55:"modules/user/views_handler_argument_users_roles_rid.inc";i:185;s:41:"modules/user/views_handler_field_user.inc";i:186;s:50:"modules/user/views_handler_field_user_language.inc";i:187;s:46:"modules/user/views_handler_field_user_link.inc";i:188;s:53:"modules/user/views_handler_field_user_link_cancel.inc";i:189;s:51:"modules/user/views_handler_field_user_link_edit.inc";i:190;s:46:"modules/user/views_handler_field_user_mail.inc";i:191;s:46:"modules/user/views_handler_field_user_name.inc";i:192;s:53:"modules/user/views_handler_field_user_permissions.inc";i:193;s:49:"modules/user/views_handler_field_user_picture.inc";i:194;s:47:"modules/user/views_handler_field_user_roles.inc";i:195;s:50:"modules/user/views_handler_filter_user_current.inc";i:196;s:47:"modules/user/views_handler_filter_user_name.inc";i:197;s:54:"modules/user/views_handler_filter_user_permissions.inc";i:198;s:48:"modules/user/views_handler_filter_user_roles.inc";i:199;s:59:"modules/user/views_plugin_argument_default_current_user.inc";i:200;s:51:"modules/user/views_plugin_argument_default_user.inc";i:201;s:52:"modules/user/views_plugin_argument_validate_user.inc";i:202;s:43:"modules/user/views_plugin_row_user_view.inc";i:203;s:31:"plugins/views_plugin_access.inc";i:204;s:36:"plugins/views_plugin_access_none.inc";i:205;s:36:"plugins/views_plugin_access_perm.inc";i:206;s:36:"plugins/views_plugin_access_role.inc";i:207;s:41:"plugins/views_plugin_argument_default.inc";i:208;s:45:"plugins/views_plugin_argument_default_php.inc";i:209;s:47:"plugins/views_plugin_argument_default_fixed.inc";i:210;s:45:"plugins/views_plugin_argument_default_raw.inc";i:211;s:42:"plugins/views_plugin_argument_validate.inc";i:212;s:50:"plugins/views_plugin_argument_validate_numeric.inc";i:213;s:46:"plugins/views_plugin_argument_validate_php.inc";i:214;s:30:"plugins/views_plugin_cache.inc";i:215;s:35:"plugins/views_plugin_cache_none.inc";i:216;s:35:"plugins/views_plugin_cache_time.inc";i:217;s:32:"plugins/views_plugin_display.inc";i:218;s:43:"plugins/views_plugin_display_attachment.inc";i:219;s:38:"plugins/views_plugin_display_block.inc";i:220;s:40:"plugins/views_plugin_display_default.inc";i:221;s:38:"plugins/views_plugin_display_embed.inc";i:222;s:41:"plugins/views_plugin_display_extender.inc";i:223;s:37:"plugins/views_plugin_display_feed.inc";i:224;s:37:"plugins/views_plugin_display_page.inc";i:225;s:43:"plugins/views_plugin_exposed_form_basic.inc";i:226;s:37:"plugins/views_plugin_exposed_form.inc";i:227;s:52:"plugins/views_plugin_exposed_form_input_required.inc";i:228;s:42:"plugins/views_plugin_localization_core.inc";i:229;s:37:"plugins/views_plugin_localization.inc";i:230;s:42:"plugins/views_plugin_localization_none.inc";i:231;s:30:"plugins/views_plugin_pager.inc";i:232;s:35:"plugins/views_plugin_pager_full.inc";i:233;s:35:"plugins/views_plugin_pager_mini.inc";i:234;s:35:"plugins/views_plugin_pager_none.inc";i:235;s:35:"plugins/views_plugin_pager_some.inc";i:236;s:30:"plugins/views_plugin_query.inc";i:237;s:38:"plugins/views_plugin_query_default.inc";i:238;s:28:"plugins/views_plugin_row.inc";i:239;s:35:"plugins/views_plugin_row_fields.inc";i:240;s:39:"plugins/views_plugin_row_rss_fields.inc";i:241;s:30:"plugins/views_plugin_style.inc";i:242;s:38:"plugins/views_plugin_style_default.inc";i:243;s:35:"plugins/views_plugin_style_grid.inc";i:244;s:35:"plugins/views_plugin_style_list.inc";i:245;s:40:"plugins/views_plugin_style_jump_menu.inc";i:246;s:38:"plugins/views_plugin_style_mapping.inc";i:247;s:34:"plugins/views_plugin_style_rss.inc";i:248;s:38:"plugins/views_plugin_style_summary.inc";i:249;s:48:"plugins/views_plugin_style_summary_jump_menu.inc";i:250;s:50:"plugins/views_plugin_style_summary_unformatted.inc";i:251;s:36:"plugins/views_plugin_style_table.inc";i:252;s:34:"tests/handlers/views_handlers.test";i:253;s:43:"tests/handlers/views_handler_area_text.test";i:254;s:47:"tests/handlers/views_handler_argument_null.test";i:255;s:39:"tests/handlers/views_handler_field.test";i:256;s:47:"tests/handlers/views_handler_field_boolean.test";i:257;s:46:"tests/handlers/views_handler_field_custom.test";i:258;s:47:"tests/handlers/views_handler_field_counter.test";i:259;s:44:"tests/handlers/views_handler_field_date.test";i:260;s:54:"tests/handlers/views_handler_field_file_extension.test";i:261;s:49:"tests/handlers/views_handler_field_file_size.test";i:262;s:44:"tests/handlers/views_handler_field_math.test";i:263;s:43:"tests/handlers/views_handler_field_url.test";i:264;s:43:"tests/handlers/views_handler_field_xss.test";i:265;s:48:"tests/handlers/views_handler_filter_combine.test";i:266;s:45:"tests/handlers/views_handler_filter_date.test";i:267;s:49:"tests/handlers/views_handler_filter_equality.test";i:268;s:52:"tests/handlers/views_handler_filter_in_operator.test";i:269;s:48:"tests/handlers/views_handler_filter_numeric.test";i:270;s:47:"tests/handlers/views_handler_filter_string.test";i:271;s:43:"tests/handlers/views_handler_manytoone.test";i:272;s:45:"tests/handlers/views_handler_sort_random.test";i:273;s:43:"tests/handlers/views_handler_sort_date.test";i:274;s:38:"tests/handlers/views_handler_sort.test";i:275;s:46:"tests/test_handlers/views_test_area_access.inc";i:276;s:60:"tests/test_plugins/views_test_plugin_access_test_dynamic.inc";i:277;s:59:"tests/test_plugins/views_test_plugin_access_test_static.inc";i:278;s:59:"tests/test_plugins/views_test_plugin_style_test_mapping.inc";i:279;s:39:"tests/plugins/views_plugin_display.test";i:280;s:46:"tests/styles/views_plugin_style_jump_menu.test";i:281;s:36:"tests/styles/views_plugin_style.test";i:282;s:41:"tests/styles/views_plugin_style_base.test";i:283;s:44:"tests/styles/views_plugin_style_mapping.test";i:284;s:48:"tests/styles/views_plugin_style_unformatted.test";i:285;s:23:"tests/views_access.test";i:286;s:24:"tests/views_analyze.test";i:287;s:22:"tests/views_basic.test";i:288;s:21:"tests/views_ajax.test";i:289;s:33:"tests/views_argument_default.test";i:290;s:35:"tests/views_argument_validator.test";i:291;s:29:"tests/views_exposed_form.test";i:292;s:31:"tests/field/views_fieldapi.test";i:293;s:25:"tests/views_glossary.test";i:294;s:24:"tests/views_groupby.test";i:295;s:31:"tests/views_handler_filter.test";i:296;s:25:"tests/views_handlers.test";i:297;s:23:"tests/views_module.test";i:298;s:22:"tests/views_pager.test";i:299;s:40:"tests/views_plugin_localization_test.inc";i:300;s:29:"tests/views_translatable.test";i:301;s:22:"tests/views_query.test";i:302;s:24:"tests/views_upgrade.test";i:303;s:34:"tests/views_test.views_default.inc";i:304;s:58:"tests/comment/views_handler_argument_comment_user_uid.test";i:305;s:56:"tests/comment/views_handler_filter_comment_user_uid.test";i:306;s:45:"tests/node/views_node_revision_relations.test";i:307;s:61:"tests/taxonomy/views_handler_relationship_node_term_data.test";i:308;s:45:"tests/user/views_handler_field_user_name.test";i:309;s:43:"tests/user/views_user_argument_default.test";i:310;s:44:"tests/user/views_user_argument_validate.test";i:311;s:26:"tests/user/views_user.test";i:312;s:22:"tests/views_cache.test";i:313;s:22:"tests/views_clone.test";i:314;s:21:"tests/views_view.test";i:315;s:19:"tests/views_ui.test";}s:5:"mtime";i:1664867501;s:7:"version";N;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
 ))
 ->values(array(
   'filename' => 'sites/all/modules/views/views_ui.module',
@@ -58244,9 +63796,9 @@
   'owner' => '',
   'status' => '0',
   'bootstrap' => '0',
-  'schema_version' => '0',
+  'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:13:{s:4:"name";s:8:"Views UI";s:11:"description";s:93:"Administrative interface to views. Without this module, you cannot create or edit your views.";s:7:"package";s:5:"Views";s:4:"core";s:3:"7.x";s:9:"configure";s:21:"admin/structure/views";s:12:"dependencies";a:1:{i:0;s:5:"views";}s:5:"files";a:2:{i:0;s:15:"views_ui.module";i:1;s:57:"plugins/views_wizard/views_ui_base_views_wizard.class.php";}s:7:"version";s:7:"7.x-3.7";s:7:"project";s:5:"views";s:9:"datestamp";s:10:"1365499236";s:5:"mtime";i:1365499236;s:3:"php";s:5:"5.2.4";s:9:"bootstrap";i:0;}',
+  'info' => "a:12:{s:4:\"name\";s:8:\"Views UI\";s:11:\"description\";s:93:\"Administrative interface to views. Without this module, you cannot create or edit your views.\";s:7:\"package\";s:5:\"Views\";s:4:\"core\";s:3:\"7.x\";s:9:\"configure\";s:21:\"admin/structure/views\";s:12:\"dependencies\";a:1:{i:0;s:5:\"views\";}s:34:\"# @codingStandardsIgnoreLine\nfiles\";a:1:{i:0;s:15:\"views_ui.module\";}s:5:\"files\";a:1:{i:0;s:57:\"plugins/views_wizard/views_ui_base_views_wizard.class.php\";}s:5:\"mtime\";i:1664867501;s:7:\"version\";N;s:3:\"php\";s:5:\"5.2.4\";s:9:\"bootstrap\";i:0;}",
 ))
 ->values(array(
   'filename' => 'themes/bartik/bartik.info',
@@ -58257,7 +63809,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:18:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}',
+  'info' => 'a:16:{s:4:"name";s:6:"Bartik";s:11:"description";s:48:"A flexible, recolorable theme with many regions.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:3:{s:14:"css/layout.css";s:28:"themes/bartik/css/layout.css";s:13:"css/style.css";s:27:"themes/bartik/css/style.css";s:14:"css/colors.css";s:28:"themes/bartik/css/colors.css";}s:5:"print";a:1:{s:13:"css/print.css";s:27:"themes/bartik/css/print.css";}}s:7:"regions";a:17:{s:6:"header";s:6:"Header";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:11:"highlighted";s:11:"Highlighted";s:8:"featured";s:8:"Featured";s:7:"content";s:7:"Content";s:13:"sidebar_first";s:13:"Sidebar first";s:14:"sidebar_second";s:14:"Sidebar second";s:14:"triptych_first";s:14:"Triptych first";s:15:"triptych_middle";s:15:"Triptych middle";s:13:"triptych_last";s:13:"Triptych last";s:18:"footer_firstcolumn";s:19:"Footer first column";s:19:"footer_secondcolumn";s:20:"Footer second column";s:18:"footer_thirdcolumn";s:19:"Footer third column";s:19:"footer_fourthcolumn";s:20:"Footer fourth column";s:6:"footer";s:6:"Footer";}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"0";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:28:"themes/bartik/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}',
 ))
 ->values(array(
   'filename' => 'themes/garland/garland.info',
@@ -58268,7 +63820,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:18:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}',
+  'info' => 'a:16:{s:4:"name";s:7:"Garland";s:11:"description";s:111:"A multi-column theme which can be configured to modify colors and switch between fixed and fluid width layouts.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:2:{s:3:"all";a:1:{s:9:"style.css";s:24:"themes/garland/style.css";}s:5:"print";a:1:{s:9:"print.css";s:24:"themes/garland/print.css";}}s:8:"settings";a:1:{s:13:"garland_width";s:5:"fluid";}s:6:"engine";s:11:"phptemplate";s:7:"regions";a:9:{s:13:"sidebar_first";s:12:"Left sidebar";s:14:"sidebar_second";s:13:"Right sidebar";s:7:"content";s:7:"Content";s:6:"header";s:6:"Header";s:6:"footer";s:6:"Footer";s:11:"highlighted";s:11:"Highlighted";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";}s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:29:"themes/garland/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:14:"regions_hidden";a:2:{i:0;s:8:"page_top";i:1;s:11:"page_bottom";}s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}',
 ))
 ->values(array(
   'filename' => 'themes/seven/seven.info',
@@ -58279,7 +63831,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => 'a:18:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.40";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:7:"project";s:6:"drupal";s:9:"datestamp";s:10:"1444866674";s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1444866674;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}',
+  'info' => 'a:16:{s:4:"name";s:5:"Seven";s:11:"description";s:65:"A simple one-column, tableless, fluid width administration theme.";s:7:"package";s:4:"Core";s:7:"version";s:4:"7.92";s:4:"core";s:3:"7.x";s:11:"stylesheets";a:1:{s:6:"screen";a:2:{s:9:"reset.css";s:22:"themes/seven/reset.css";s:9:"style.css";s:22:"themes/seven/style.css";}}s:8:"settings";a:1:{s:20:"shortcut_module_link";s:1:"1";}s:7:"regions";a:5:{s:7:"content";s:7:"Content";s:4:"help";s:4:"Help";s:8:"page_top";s:8:"Page top";s:11:"page_bottom";s:11:"Page bottom";s:13:"sidebar_first";s:13:"First sidebar";}s:14:"regions_hidden";a:3:{i:0;s:13:"sidebar_first";i:1;s:8:"page_top";i:2;s:11:"page_bottom";}s:6:"engine";s:11:"phptemplate";s:8:"features";a:9:{i:0;s:4:"logo";i:1;s:7:"favicon";i:2;s:4:"name";i:3;s:6:"slogan";i:4;s:17:"node_user_picture";i:5;s:20:"comment_user_picture";i:6;s:25:"comment_user_verification";i:7;s:9:"main_menu";i:8;s:14:"secondary_menu";}s:10:"screenshot";s:27:"themes/seven/screenshot.png";s:3:"php";s:5:"5.2.4";s:7:"scripts";a:0:{}s:5:"mtime";i:1664863480;s:28:"overlay_supplemental_regions";a:1:{i:0;s:8:"page_top";}}',
 ))
 ->values(array(
   'filename' => 'themes/stark/stark.info',
@@ -58290,7 +63842,7 @@
   'bootstrap' => '0',
   'schema_version' => '-1',
   'weight' => '0',
-  'info' => "a:17:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.40\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:7:\"project\";s:6:\"drupal\";s:9:\"datestamp\";s:10:\"1444866674\";s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1444866674;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}",
+  'info' => "a:15:{s:4:\"name\";s:5:\"Stark\";s:11:\"description\";s:208:\"This theme demonstrates Drupal's default HTML markup and CSS styles. To learn how to build your own theme and override Drupal's default code, see the <a href=\"http://drupal.org/theme-guide\">Theming Guide</a>.\";s:7:\"package\";s:4:\"Core\";s:7:\"version\";s:4:\"7.92\";s:4:\"core\";s:3:\"7.x\";s:11:\"stylesheets\";a:1:{s:3:\"all\";a:1:{s:10:\"layout.css\";s:23:\"themes/stark/layout.css\";}}s:6:\"engine\";s:11:\"phptemplate\";s:7:\"regions\";a:9:{s:13:\"sidebar_first\";s:12:\"Left sidebar\";s:14:\"sidebar_second\";s:13:\"Right sidebar\";s:7:\"content\";s:7:\"Content\";s:6:\"header\";s:6:\"Header\";s:6:\"footer\";s:6:\"Footer\";s:11:\"highlighted\";s:11:\"Highlighted\";s:4:\"help\";s:4:\"Help\";s:8:\"page_top\";s:8:\"Page top\";s:11:\"page_bottom\";s:11:\"Page bottom\";}s:8:\"features\";a:9:{i:0;s:4:\"logo\";i:1;s:7:\"favicon\";i:2;s:4:\"name\";i:3;s:6:\"slogan\";i:4;s:17:\"node_user_picture\";i:5;s:20:\"comment_user_picture\";i:6;s:25:\"comment_user_verification\";i:7;s:9:\"main_menu\";i:8;s:14:\"secondary_menu\";}s:10:\"screenshot\";s:27:\"themes/stark/screenshot.png\";s:3:\"php\";s:5:\"5.2.4\";s:7:\"scripts\";a:0:{}s:5:\"mtime\";i:1664863480;s:14:\"regions_hidden\";a:2:{i:0;s:8:\"page_top\";i:1;s:11:\"page_bottom\";}s:28:\"overlay_supplemental_regions\";a:1:{i:0;s:8:\"page_top\";}}",
 ))
 ->execute();
 $connection->schema()->createTable('taxonomy_index', array(
@@ -58312,7 +63864,7 @@
     'sticky' => array(
       'type' => 'int',
       'not null' => FALSE,
-      'size' => 'normal',
+      'size' => 'tiny',
       'default' => '0',
     ),
     'created' => array(
@@ -58322,6 +63874,16 @@
       'default' => '0',
     ),
   ),
+  'indexes' => array(
+    'term_node' => array(
+      'tid',
+      'sticky',
+      'created',
+    ),
+    'nid' => array(
+      'nid',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -58340,7 +63902,7 @@
 ))
 ->values(array(
   'nid' => '1',
-  'tid' => '4',
+  'tid' => '15',
   'sticky' => '0',
   'created' => '1421727515',
 ))
@@ -58351,22 +63913,40 @@
   'created' => '1421727515',
 ))
 ->values(array(
-  'nid' => '1',
-  'tid' => '15',
+  'nid' => '2',
+  'tid' => '9',
   'sticky' => '0',
-  'created' => '1421727515',
+  'created' => '1441306772',
 ))
 ->values(array(
-  'nid' => '6',
-  'tid' => '1',
+  'nid' => '2',
+  'tid' => '14',
   'sticky' => '0',
-  'created' => '1504715414',
+  'created' => '1441306772',
 ))
 ->values(array(
-  'nid' => '7',
-  'tid' => '1',
+  'nid' => '2',
+  'tid' => '17',
   'sticky' => '0',
-  'created' => '1504715432',
+  'created' => '1441306772',
+))
+->values(array(
+  'nid' => '2',
+  'tid' => '20',
+  'sticky' => '0',
+  'created' => '1441306772',
+))
+->values(array(
+  'nid' => '2',
+  'tid' => '21',
+  'sticky' => '0',
+  'created' => '1441306772',
+))
+->values(array(
+  'nid' => '2',
+  'tid' => '24',
+  'sticky' => '0',
+  'created' => '1441306772',
 ))
 ->values(array(
   'nid' => '3',
@@ -58399,40 +63979,16 @@
   'created' => '1471428152',
 ))
 ->values(array(
-  'nid' => '2',
-  'tid' => '9',
-  'sticky' => '0',
-  'created' => '1441306772',
-))
-->values(array(
-  'nid' => '2',
-  'tid' => '14',
-  'sticky' => '0',
-  'created' => '1441306772',
-))
-->values(array(
-  'nid' => '2',
-  'tid' => '17',
-  'sticky' => '0',
-  'created' => '1441306772',
-))
-->values(array(
-  'nid' => '2',
-  'tid' => '20',
-  'sticky' => '0',
-  'created' => '1441306772',
-))
-->values(array(
-  'nid' => '2',
-  'tid' => '21',
+  'nid' => '6',
+  'tid' => '1',
   'sticky' => '0',
-  'created' => '1441306772',
+  'created' => '1504715414',
 ))
 ->values(array(
-  'nid' => '2',
-  'tid' => '24',
+  'nid' => '7',
+  'tid' => '1',
   'sticky' => '0',
-  'created' => '1441306772',
+  'created' => '1504715432',
 ))
 ->execute();
 $connection->schema()->createTable('taxonomy_term_data', array(
@@ -58795,6 +64351,10 @@
   'tid' => '3',
   'parent' => '0',
 ))
+->values(array(
+  'tid' => '4',
+  'parent' => '3',
+))
 ->values(array(
   'tid' => '5',
   'parent' => '0',
@@ -58803,6 +64363,14 @@
   'tid' => '6',
   'parent' => '0',
 ))
+->values(array(
+  'tid' => '7',
+  'parent' => '6',
+))
+->values(array(
+  'tid' => '8',
+  'parent' => '6',
+))
 ->values(array(
   'tid' => '9',
   'parent' => '0',
@@ -58867,18 +64435,6 @@
   'tid' => '24',
   'parent' => '0',
 ))
-->values(array(
-  'tid' => '4',
-  'parent' => '3',
-))
-->values(array(
-  'tid' => '7',
-  'parent' => '6',
-))
-->values(array(
-  'tid' => '8',
-  'parent' => '6',
-))
 ->values(array(
   'tid' => '25',
   'parent' => '0',
@@ -59168,18 +64724,6 @@
   'mysql_character_set' => 'utf8',
 ));
 
-$connection->insert('trigger_assignments')
-->fields(array(
-  'hook',
-  'aid',
-  'weight',
-))
-->values(array(
-  'hook' => 'comment_presave',
-  'aid' => 'comment_publish_action',
-  'weight' => '1',
-))
-->execute();
 $connection->schema()->createTable('url_alias', array(
   'fields' => array(
     'pid' => array(
@@ -59353,10 +64897,21 @@
       'not null' => FALSE,
       'size' => 'normal',
     ),
+    'changed' => array(
+      'type' => 'int',
+      'not null' => TRUE,
+      'size' => 'normal',
+      'default' => '0',
+    ),
   ),
   'primary key' => array(
     'uid',
   ),
+  'indexes' => array(
+    'changed' => array(
+      'changed',
+    ),
+  ),
   'mysql_character_set' => 'utf8',
 ));
 
@@ -59378,6 +64933,7 @@
   'picture',
   'init',
   'data',
+  'changed',
 ))
 ->values(array(
   'uid' => '1',
@@ -59388,14 +64944,15 @@
   'signature' => '',
   'signature_format' => NULL,
   'created' => '0',
-  'access' => '1444945097',
-  'login' => '1444945097',
+  'access' => '1664938970',
+  'login' => '1664931778',
   'status' => '1',
   'timezone' => NULL,
   'language' => '',
   'picture' => '0',
   'init' => '',
   'data' => 'a:1:{s:7:"contact";i:1;}',
+  'changed' => '0',
 ))
 ->values(array(
   'uid' => '2',
@@ -59414,6 +64971,7 @@
   'picture' => '0',
   'init' => 'odo@local.host',
   'data' => 'a:1:{s:7:"contact";i:1;}',
+  'changed' => '1440532218',
 ))
 ->values(array(
   'uid' => '3',
@@ -59432,6 +64990,7 @@
   'picture' => '0',
   'init' => 'bob@local.host',
   'data' => 'a:1:{s:7:"contact";i:1;}',
+  'changed' => '1440532218',
 ))
 ->execute();
 $connection->schema()->createTable('users_roles', array(
@@ -59601,41 +65160,49 @@
   'name' => 'cache',
   'value' => 'i:0;',
 ))
+->values(array(
+  'name' => 'cache_class_cache_ctools_css',
+  'value' => 's:14:"CToolsCssCache";',
+))
 ->values(array(
   'name' => 'cache_flush_cache',
   'value' => 'i:0;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_block',
-  'value' => 'i:0;',
+  'value' => 'i:1664938978;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_field',
-  'value' => 'i:0;',
+  'value' => 'i:1664931769;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_filter',
-  'value' => 'i:1444944970;',
+  'value' => 'i:1664931769;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_form',
-  'value' => 'i:1444944970;',
+  'value' => 'i:0;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_image',
-  'value' => 'i:1444944970;',
+  'value' => 'i:1664931769;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_menu',
-  'value' => 'i:1444944970;',
+  'value' => 'i:0;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_page',
-  'value' => 'i:0;',
+  'value' => 'i:1664938978;',
 ))
 ->values(array(
   'name' => 'cache_flush_cache_path',
-  'value' => 'i:1444944970;',
+  'value' => 'i:0;',
+))
+->values(array(
+  'name' => 'cache_flush_cache_variable',
+  'value' => 'i:0;',
 ))
 ->values(array(
   'name' => 'cache_lifetime',
@@ -59875,7 +65442,7 @@
 ))
 ->values(array(
   'name' => 'cron_last',
-  'value' => 'i:1444944970;',
+  'value' => 'i:1664931769;',
 ))
 ->values(array(
   'name' => 'cron_threshold_error',
@@ -59887,15 +65454,11 @@
 ))
 ->values(array(
   'name' => 'css_js_query_string',
-  'value' => 's:6:"nwa6nq";',
+  'value' => 's:6:"rj9f4y";',
 ))
 ->values(array(
   'name' => 'ctools_last_cron',
-  'value' => 'i:1421720834;',
-))
-->values(array(
-  'name' => 'dashboard_stashed_blocks',
-  'value' => 'a:5:{i:0;a:3:{s:6:"module";s:4:"node";s:5:"delta";s:6:"recent";s:6:"region";s:14:"dashboard_main";}i:1;a:3:{s:6:"module";s:4:"user";s:5:"delta";s:3:"new";s:6:"region";s:17:"dashboard_sidebar";}i:2;a:3:{s:6:"module";s:6:"search";s:5:"delta";s:4:"form";s:6:"region";s:17:"dashboard_sidebar";}i:3;a:3:{s:6:"module";s:7:"comment";s:5:"delta";s:6:"recent";s:6:"region";s:18:"dashboard_inactive";}i:4;a:3:{s:6:"module";s:4:"user";s:5:"delta";s:6:"online";s:6:"region";s:18:"dashboard_inactive";}}',
+  'value' => 'i:1664864749;',
 ))
 ->values(array(
   'name' => 'date_api_version',
@@ -59919,7 +65482,7 @@
 ))
 ->values(array(
   'name' => 'drupal_css_cache_files',
-  'value' => 'a:10:{s:64:"823ba1006db72809515d2221cd02ec1075d7b49b0c07f49307b3a7930bfdd9e4";s:64:"public://css/css_xE-rWrJf-fncB6ztZfd2huxqgxu4WO-qwma6Xer30m4.css";s:64:"039ba69b25efd672767c5ee21b686a2cdaa496c5fb210693b88f81cc556db518";s:64:"public://css/css_M8BpLSgFJ1ipHW-ZwVd6p7yRHsT3q23ohYErZrFJ1xA.css";s:64:"568f3bca87830de88c7b44e71808ac7f33f4cdf273ed3bf3d2532bd48f084b06";s:64:"public://css/css_NRg0AX3iY_x0OX3_WzcWp90JnwurHRvZn6i75GL0rRI.css";s:64:"586e4d641f74d0fbdea2ecffe62294e983c5961df8d0128aab1c561505f6b35a";s:64:"public://css/css_2THG1eGiBIizsWFeexsNe1iDifJ00QRS9uSd03rY9co.css";s:64:"cb9f93e666a396bb3eb14c5fd16f7ebd1cdd0067733eb0a2ab1b294b6f14f76f";s:64:"public://css/css_1kF33EODTO5gDyEbdpAfYzMKbjG3ottD1s5np0BNI8U.css";s:64:"35337ea541d4968f58917d83eaa9e495d5a38bb0aaf23bc714650d3c71fc275a";s:64:"public://css/css_LJ87GFKz9ZFt2bWZ4pMV8e2o8w_790Mbwcd7C-RKri0.css";s:64:"592db66916e1dd3416cbe95bcb34a5a68775eb0b7cf95e4c858671de35290cc9";s:64:"public://css/css_LS9OUalDR9-d_lCAvF3yUWjNU6yF8ZBm84jEPRvoyuQ.css";s:64:"fe9fca5a618e55058e69458a65b2edb4e958c16c13e1d1526c4dc0c0e782b483";s:64:"public://css/css_WWafHiT44xXp69Ucog34hgXKsZRScJzl3S17Xg7evtM.css";s:64:"ebb3f433ad4107b1ac31e9d7de0f9a5d399040e9f82b6364211dcfaadea158c0";s:64:"public://css/css_Nv0ct-zkzztuah_LbaPFF8ZkdSEk-LxBtTWMm9mN_F8.css";s:64:"032d72e2b3124645b11e59c23005327dc2b450af6aaa6bf3cad34a6a65a9d774";s:64:"public://css/css_ZDWl28hdmeinIcKg-HMrN6uKD0nTMld5NlXLmm5MH2U.css";}',
+  'value' => 'a:6:{s:64:"823ba1006db72809515d2221cd02ec1075d7b49b0c07f49307b3a7930bfdd9e4";s:64:"public://css/css_xE-rWrJf-fncB6ztZfd2huxqgxu4WO-qwma6Xer30m4.css";s:64:"592db66916e1dd3416cbe95bcb34a5a68775eb0b7cf95e4c858671de35290cc9";s:64:"public://css/css_LS9OUalDR9-d_lCAvF3yUWjNU6yF8ZBm84jEPRvoyuQ.css";s:64:"81935fa696766294f7d725dbd56e753cf2b6daabd7cb948171830648d35be3f1";s:64:"public://css/css_ELXvY8pQ9Dhp7LiF1Gra7jv5X_cMGOmgGfJ6go69M0w.css";s:64:"8366be3a82d83db4ec0cd63fdb2977a1145c38937190ceb866dd8b9322c159a6";s:64:"public://css/css_BAlE_6v49tysdATXG1mLraYC8i0QUkmM-SZc1C0dkU0.css";s:64:"f3f74dcad951a1a986b64eeabc10d3141b1f70cd67b02447398b004b5706789c";s:64:"public://css/css_Hex-pwCTDDfQD41aRswi2OFNCxosYgUEBnZsKNQ5BWo.css";s:64:"ebb3f433ad4107b1ac31e9d7de0f9a5d399040e9f82b6364211dcfaadea158c0";s:64:"public://css/css_Nv0ct-zkzztuah_LbaPFF8ZkdSEk-LxBtTWMm9mN_F8.css";}',
 ))
 ->values(array(
   'name' => 'drupal_http_request_fails',
@@ -59945,6 +65508,10 @@
   'name' => 'entityreference:base-tables',
   'value' => 'a:7:{s:4:"node";a:2:{i:0;s:4:"node";i:1;s:3:"nid";}s:13:"taxonomy_term";a:2:{i:0;s:18:"taxonomy_term_data";i:1;s:3:"tid";}s:7:"comment";a:2:{i:0;s:7:"comment";i:1;s:3:"cid";}s:16:"i18n_translation";a:2:{i:0;s:20:"i18n_translation_set";i:1;s:4:"tsid";}s:4:"file";a:2:{i:0;s:12:"file_managed";i:1;s:3:"fid";}s:19:"taxonomy_vocabulary";a:2:{i:0;s:19:"taxonomy_vocabulary";i:1;s:3:"vid";}s:4:"user";a:2:{i:0;s:5:"users";i:1;s:3:"uid";}}',
 ))
+->values(array(
+  'name' => 'entity_cache_tables_created',
+  'value' => 'N;',
+))
 ->values(array(
   'name' => 'entity_translation_entity_types',
   'value' => 'a:4:{s:7:"comment";s:7:"comment";s:4:"node";s:4:"node";s:13:"taxonomy_term";s:13:"taxonomy_term";s:4:"user";s:4:"user";}',
@@ -60131,7 +65698,7 @@
 ))
 ->values(array(
   'name' => 'javascript_parsed',
-  'value' => 'a:17:{i:0;s:14:"misc/drupal.js";i:1;s:14:"misc/jquery.js";i:2;s:19:"misc/jquery.once.js";i:3;s:32:"modules/contextual/contextual.js";i:4;s:21:"misc/jquery.cookie.js";i:5;s:26:"modules/toolbar/toolbar.js";i:6;s:19:"misc/tableheader.js";i:7;s:12:"misc/form.js";i:8;s:16:"misc/collapse.js";i:9;s:17:"misc/tabledrag.js";s:10:"refresh:is";s:7:"waiting";i:10;s:20:"misc/machine-name.js";i:11;s:16:"misc/textarea.js";i:12;s:36:"modules/comment/comment-node-form.js";i:13;s:26:"modules/menu/menu.admin.js";i:14;s:21:"misc/vertical-tabs.js";i:15;s:29:"modules/node/content_types.js";}',
+  'value' => 'a:12:{i:0;s:14:"misc/drupal.js";i:1;s:14:"misc/jquery.js";i:2;s:27:"misc/jquery-extend-3.4.0.js";i:3;s:44:"misc/jquery-html-prefilter-3.5.0-backport.js";i:4;s:19:"misc/jquery.once.js";i:5;s:19:"misc/tableheader.js";i:6;s:12:"misc/form.js";i:7;s:16:"misc/collapse.js";i:8;s:21:"misc/jquery.cookie.js";i:9;s:26:"modules/toolbar/toolbar.js";s:10:"refresh:fr";s:7:"waiting";s:10:"refresh:is";s:7:"waiting";}',
 ))
 ->values(array(
   'name' => 'language_content_type_article',
@@ -60203,7 +65770,7 @@
 ))
 ->values(array(
   'name' => 'maintenance_mode',
-  'value' => 'i:0;',
+  'value' => 'b:0;',
 ))
 ->values(array(
   'name' => 'maintenance_mode_message',
@@ -60215,7 +65782,7 @@
 ))
 ->values(array(
   'name' => 'menu_masks',
-  'value' => 'a:47:{i:0;i:501;i:1;i:493;i:2;i:490;i:3;i:250;i:4;i:247;i:5;i:246;i:6;i:245;i:7;i:242;i:8;i:238;i:9;i:234;i:10;i:126;i:11;i:125;i:12;i:123;i:13;i:122;i:14;i:121;i:15;i:119;i:16;i:117;i:17;i:108;i:18;i:63;i:19;i:62;i:20;i:61;i:21;i:60;i:22;i:59;i:23;i:58;i:24;i:56;i:25;i:54;i:26;i:44;i:27;i:31;i:28;i:30;i:29;i:29;i:30;i:26;i:31;i:24;i:32;i:22;i:33;i:21;i:34;i:15;i:35;i:14;i:36;i:13;i:37;i:12;i:38;i:11;i:39;i:10;i:40;i:8;i:41;i:7;i:42;i:6;i:43;i:5;i:44;i:3;i:45;i:2;i:46;i:1;}',
+  'value' => 'a:49:{i:0;i:501;i:1;i:494;i:2;i:493;i:3;i:490;i:4;i:250;i:5;i:247;i:6;i:246;i:7;i:245;i:8;i:242;i:9;i:238;i:10;i:234;i:11;i:126;i:12;i:125;i:13;i:123;i:14;i:122;i:15;i:121;i:16;i:119;i:17;i:118;i:18;i:117;i:19;i:108;i:20;i:63;i:21;i:62;i:22;i:61;i:23;i:60;i:24;i:59;i:25;i:58;i:26;i:56;i:27;i:54;i:28;i:44;i:29;i:31;i:30;i:30;i:31;i:29;i:32;i:26;i:33;i:24;i:34;i:22;i:35;i:21;i:36;i:15;i:37;i:14;i:38;i:13;i:39;i:12;i:40;i:11;i:41;i:10;i:42;i:8;i:43;i:7;i:44;i:6;i:45;i:5;i:46;i:3;i:47;i:2;i:48;i:1;}',
 ))
 ->values(array(
   'name' => 'menu_options_article',
@@ -60279,7 +65846,7 @@
 ))
 ->values(array(
   'name' => 'node_cron_last',
-  'value' => 's:10:"1441306832";',
+  'value' => 's:10:"1564543706";',
 ))
 ->values(array(
   'name' => 'node_options_article',
@@ -60389,6 +65956,10 @@
   'name' => 'path_alias_whitelist',
   'value' => 'a:3:{s:8:"taxonomy";b:1;s:4:"node";b:1;s:5:"admin";b:1;}',
 ))
+->values(array(
+  'name' => 'picture_updated_to_file_entity_2',
+  'value' => 'b:0;',
+))
 ->values(array(
   'name' => 'preprocess_css',
   'value' => 'i:1;',
@@ -60479,7 +66050,7 @@
 ))
 ->values(array(
   'name' => 'statistics_day_timestamp',
-  'value' => 'i:1444944970;',
+  'value' => 'i:1664864749;',
 ))
 ->values(array(
   'name' => 'statistics_enable_access_log',
@@ -60547,7 +66118,7 @@
 ))
 ->values(array(
   'name' => 'update_last_check',
-  'value' => 'i:1444944973;',
+  'value' => 'i:1664931769;',
 ))
 ->values(array(
   'name' => 'update_max_fetch_attempts',
@@ -60774,100 +66345,100 @@
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'anonymous',
-  'value' => 'is - anonymous',
+  'realm_key' => 'en',
+  'name' => 'user_default_timezone',
+  'value' => '2',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'maintenance_mode_message',
-  'value' => 'is - This is a custom maintenance mode message.',
+  'realm_key' => 'fr',
+  'name' => 'site_403',
+  'value' => 'node',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'fr',
-  'name' => 'site_403',
+  'name' => 'site_404',
   'value' => 'node',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'site_403',
-  'value' => 'node/1',
+  'realm_key' => 'fr',
+  'name' => 'site_frontpage',
+  'value' => 'node',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'fr',
-  'name' => 'site_404',
-  'value' => 'node',
+  'name' => 'site_name',
+  'value' => 'The Site Name',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'is',
-  'name' => 'site_404',
-  'value' => 'node/6',
+  'realm_key' => 'fr',
+  'name' => 'site_slogan',
+  'value' => 'fr - The Slogan',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'fr',
-  'name' => 'site_frontpage',
-  'value' => 'node',
+  'name' => 'user_default_timezone',
+  'value' => '0',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'site_frontpage',
-  'value' => 'node/4',
+  'name' => 'anonymous',
+  'value' => 'is - anonymous',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'fr',
-  'name' => 'site_name',
-  'value' => 'The Site Name',
+  'realm_key' => 'is',
+  'name' => 'maintenance_mode_message',
+  'value' => 'is - This is a custom maintenance mode message.',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'site_name',
-  'value' => 'is - The Site Name',
+  'name' => 'site_403',
+  'value' => 'node/1',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'fr',
-  'name' => 'site_slogan',
-  'value' => 'fr - The Slogan',
+  'realm_key' => 'is',
+  'name' => 'site_404',
+  'value' => 'node/6',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
   'realm_key' => 'is',
-  'name' => 'site_slogan',
-  'value' => 'is - The Slogan',
+  'name' => 'site_frontpage',
+  'value' => 'node/4',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'en',
-  'name' => 'user_default_timezone',
-  'value' => '2',
+  'realm_key' => 'is',
+  'name' => 'site_name',
+  'value' => 'is - The Site Name',
   'serialized' => '0',
 ))
 ->values(array(
   'realm' => 'language',
-  'realm_key' => 'fr',
-  'name' => 'user_default_timezone',
-  'value' => '0',
+  'realm_key' => 'is',
+  'name' => 'site_slogan',
+  'value' => 'is - The Slogan',
   'serialized' => '0',
 ))
 ->values(array(
@@ -61053,3 +66624,8 @@
   ),
   'mysql_character_set' => 'utf8',
 ));
+
+// Reset the SQL mode.
+if ($connection->databaseType() === 'mysql') {
+  $connection->query("SET sql_mode = '$sql_mode'");
+}
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php
index 0bd05a3b5..da831fe10 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/StateFileExistsTest.php
@@ -77,6 +77,7 @@ class StateFileExistsTest extends MigrateDrupalTestBase {
     'taxonomy',
     'telephone',
     'text',
+    // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     'tracker',
     'update',
     'user',
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
index 45fa0dc0b..25277fc84 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/EntityContentBaseTest.php
@@ -57,8 +57,9 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests overwriting all mapped properties in the destination entity (default
-   * behavior).
+   * Tests overwriting all mapped properties in the destination entity.
+   *
+   * This is the default behavior.
    */
   public function testOverwriteAllMappedProperties() {
     $this->executeMigration('d6_user');
@@ -70,8 +71,9 @@ public function testOverwriteAllMappedProperties() {
   }
 
   /**
-   * Tests overwriting selected properties in the destination entity, specified
-   * in the destination configuration.
+   * Tests overwriting selected properties in the destination entity.
+   *
+   * The selected properties are specified in the destination configuration.
    */
   public function testOverwriteProperties() {
     // Execute the migration in migrate_overwrite_test, which documents how
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
index 7085fa723..d29d763ea 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/FieldDiscoveryTest.php
@@ -89,6 +89,7 @@ public function testAddAllFieldProcesses() {
       'field_company',
       'field_company_2',
       'field_company_3',
+      'field_company_4',
       'field_sync',
       'field_multivalue',
       'field_test_text_single_checkbox',
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
index 78a50f732..49f21abb9 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d6/MigrateDrupal6AuditIdsTest.php
@@ -39,6 +39,7 @@ protected function setUp(): void {
     $this->installSchema('node', ['node_access']);
     $this->installSchema('search', ['search_dataset']);
     $this->installSchema('system', ['sequences']);
+    // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     $this->installSchema('tracker', ['tracker_node', 'tracker_user']);
 
     // Enable content moderation for nodes of type page.
diff --git a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
index 09b1247f7..245f85c50 100644
--- a/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Kernel/d7/MigrateDrupal7AuditIdsTest.php
@@ -39,6 +39,7 @@ protected function setUp(): void {
     $this->installSchema('node', ['node_access']);
     $this->installSchema('search', ['search_dataset']);
     $this->installSchema('system', ['sequences']);
+    // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     $this->installSchema('tracker', ['tracker_node', 'tracker_user']);
 
     // Enable content moderation for nodes of type page.
diff --git a/web/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php b/web/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php
index a08fd8393..75180de69 100644
--- a/web/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php
+++ b/web/core/modules/migrate_drupal/tests/src/Unit/FieldDiscoveryTest.php
@@ -178,7 +178,7 @@ public function getBundleFieldsData() {
         'entity_type_id' => 'user',
         'bundle' => 'user',
         'expected_fields' => [
-            'user_field_1' => ['field_info_key' => 'user_field_1_data'],
+          'user_field_1' => ['field_info_key' => 'user_field_1_data'],
         ],
       ],
       'Comment - Content Type 1' => [
diff --git a/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml b/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml
index 438c8aabc..9da6cfb1d 100644
--- a/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml
+++ b/web/core/modules/migrate_drupal_ui/migrate_drupal_ui.routing.yml
@@ -47,7 +47,7 @@ migrate_drupal_ui.upgrade_review:
 migrate_drupal_ui.log:
   path: '/admin/reports/upgrade'
   defaults:
-      _controller: '\Drupal\migrate_drupal_ui\Controller\MigrateController::showLog'
+    _controller: '\Drupal\migrate_drupal_ui\Controller\MigrateController::showLog'
   requirements:
     _custom_access: '\Drupal\migrate_drupal_ui\MigrateAccessCheck::checkAccess'
   options:
diff --git a/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php b/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
index 5345db3e8..93d285c2f 100644
--- a/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
+++ b/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
@@ -232,10 +232,10 @@ public static function run($initial_ids, $config, &$context) {
         $migration = \Drupal::service('plugin.manager.migration')->createInstance($migration_id);
         $migration_name = $migration->label() ? $migration->label() : $migration_id;
         $context['message'] = (string) new TranslatableMarkup('Currently upgrading @migration (@current of @max total tasks)', [
-            '@migration' => $migration_name,
-            '@current' => $context['sandbox']['current'],
-            '@max' => $context['sandbox']['max'],
-          ]) . "<br />\n" . $context['message'];
+          '@migration' => $migration_name,
+          '@current' => $context['sandbox']['current'],
+          '@max' => $context['sandbox']['max'],
+        ]) . "<br />\n" . $context['message'];
       }
     }
     else {
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/CredentialForm.php b/web/core/modules/migrate_drupal_ui/src/Form/CredentialForm.php
index 8900a5076..87e57604b 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/CredentialForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/CredentialForm.php
@@ -5,8 +5,10 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Config\ConfigFactoryInterface;
 use Drupal\Core\Database\Connection;
+use Drupal\Core\Database\Database;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\State\StateInterface;
+use Drupal\Core\Site\Settings;
 use Drupal\Core\TempStore\PrivateTempStoreFactory;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\Exception\BadPluginDefinitionException;
@@ -99,19 +101,42 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#description' => $this->t('Provide the information to access the Drupal site you want to upgrade. Files can be imported into the upgraded site as well.  See the <a href=":url">Upgrade documentation for more detailed instructions</a>.', [':url' => 'https://www.drupal.org/upgrade/migrate']),
     ];
 
+    $migrate_source_version = Settings::get('migrate_source_version') == '6' ? '6' : '7';
     $form['version'] = [
       '#type' => 'radios',
-      '#default_value' => 7,
+      '#default_value' => $migrate_source_version,
       '#title' => $this->t('Drupal version of the source site'),
       '#options' => ['6' => $this->t('Drupal 6'), '7' => $this->t('Drupal 7')],
       '#required' => TRUE,
     ];
 
+    $available_connections = array_diff(array_keys(Database::getAllConnectionInfo()), ['default']);
+    $options = array_combine($available_connections, $available_connections);
+    $migrate_source_connection = Settings::get('migrate_source_connection');
+    $preferred_connections = $migrate_source_connection
+      ? ['migrate', $migrate_source_connection]
+      : ['migrate'];
+    $default_options = array_intersect($preferred_connections, $available_connections);
+    $form['source_connection'] = [
+      '#type' => 'select',
+      '#title' => $this->t('Source connection'),
+      '#options' => $options,
+      '#default_value' => array_pop($default_options),
+      '#empty_option' => $this->t('- User defined -'),
+      '#description' => $this->t('Choose one of the keys from the $databases array or else select "User defined" and enter database credentials.'),
+      '#access' => !empty($options),
+    ];
+
     $form['database'] = [
       '#type' => 'details',
       '#title' => $this->t('Source database'),
       '#description' => $this->t('Provide credentials for the database of the Drupal site you want to upgrade.'),
       '#open' => TRUE,
+      '#states' => [
+        'visible' => [
+          ':input[name=source_connection]' => ['value' => ''],
+        ],
+      ],
     ];
 
     $form['database']['driver'] = [
@@ -119,6 +144,11 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#title' => $this->t('Database type'),
       '#required' => TRUE,
       '#default_value' => $default_driver,
+      '#states' => [
+        'required' => [
+          ':input[name=source_connection]' => ['value' => ''],
+        ],
+      ],
     ];
     if (count($drivers) == 1) {
       $form['database']['driver']['#disabled'] = TRUE;
@@ -136,6 +166,27 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       // for mysql and pgsql must not be required.
       $form['database']['settings'][$key]['database']['#required'] = FALSE;
       $form['database']['settings'][$key]['username']['#required'] = FALSE;
+      $form['database']['settings'][$key]['database']['#states'] = [
+        'required' => [
+          ':input[name=source_connection]' => ['value' => ''],
+          ':input[name=driver]' => ['value' => $key],
+        ],
+      ];
+      if ($key != 'sqlite') {
+        $form['database']['settings'][$key]['username']['#states'] = [
+          'required' => [
+            ':input[name=source_connection]' => ['value' => ''],
+            ':input[name=driver]' => ['value' => $key],
+          ],
+        ];
+        $form['database']['settings'][$key]['password']['#states'] = [
+          'required' => [
+            ':input[name=source_connection]' => ['value' => ''],
+            ':input[name=driver]' => ['value' => $key],
+          ],
+        ];
+      }
+
       $form['database']['settings'][$key]['#prefix'] = '<h2 class="js-hide">' . $this->t('@driver_name settings', ['@driver_name' => $driver->name()]) . '</h2>';
       $form['database']['settings'][$key]['#type'] = 'container';
       $form['database']['settings'][$key]['#tree'] = TRUE;
@@ -164,6 +215,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['source']['d6_source_base_path'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Document root for files'),
+      '#default_value' => Settings::get('migrate_file_public_path') ?? '',
       '#description' => $this->t('To import files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),
       '#states' => [
         'visible' => [
@@ -176,6 +228,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['source']['source_base_path'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Document root for public files'),
+      '#default_value' => Settings::get('migrate_file_public_path') ?? '',
       '#description' => $this->t('To import public files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot), or your site address (for example http://example.com).'),
       '#states' => [
         'visible' => [
@@ -188,7 +241,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['source']['source_private_file_path'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Document root for private files'),
-      '#default_value' => '',
+      '#default_value' => Settings::get('migrate_file_private_path') ?? '',
       '#description' => $this->t('To import private files from your current Drupal site, enter a local file directory containing your site (e.g. /var/www/docroot). Leave blank to use the same value as Public files directory.'),
       '#states' => [
         'visible' => [
@@ -205,29 +258,36 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    // Retrieve the database driver from the form, use reflection to get the
-    // namespace, and then construct a valid database array the same as in
-    // settings.php.
-    $driver = $form_state->getValue('driver');
-    $drivers = $this->getDatabaseTypes();
-    $reflection = new \ReflectionClass($drivers[$driver]);
-    $install_namespace = $reflection->getNamespaceName();
-
-    $database = $form_state->getValue($driver);
-    // Cut the trailing \Install from namespace.
-    $database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\'));
-    $database['driver'] = $driver;
-
-    // Validate the driver settings and just end here if we have any issues.
-    $connection = NULL;
-    $error_key = $database['driver'] . '][database';
-    if ($errors = $drivers[$driver]->validateDatabaseSettings($database)) {
-      foreach ($errors as $name => $message) {
-        $this->errors[$name] = $message;
+    $source_connection = $form_state->getValue('source_connection');
+    if ($source_connection) {
+      $info = Database::getConnectionInfo($source_connection);
+      $database = reset($info);
+    }
+    else {
+      // Retrieve the database driver from the form, use reflection to get the
+      // namespace, and then construct a valid database array the same as in
+      // settings.php.
+      $driver = $form_state->getValue('driver');
+      $drivers = $this->getDatabaseTypes();
+      $reflection = new \ReflectionClass($drivers[$driver]);
+      $install_namespace = $reflection->getNamespaceName();
+
+      $database = $form_state->getValue($driver);
+      // Cut the trailing \Install from namespace.
+      $database['namespace'] = substr($install_namespace, 0, strrpos($install_namespace, '\\'));
+      $database['driver'] = $driver;
+
+      // Validate the driver settings and just end here if we have any issues.
+      $connection = NULL;
+      if ($errors = $drivers[$driver]->validateDatabaseSettings($database)) {
+        foreach ($errors as $name => $message) {
+          $this->errors[$name] = $message;
+        }
       }
     }
 
     // Get the Drupal version of the source database so it can be validated.
+    $error_key = $database['driver'] . '][database';
     if (!$this->errors) {
       try {
         $connection = $this->getConnection($database);
@@ -283,6 +343,17 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
    * Ensures that entered path can be read.
    */
   public function validatePaths($element, FormStateInterface $form_state) {
+    $version = $form_state->getValue('version');
+    // Only validate the paths relevant to the legacy Drupal version.
+    if (($version !== '7')
+      && ($element['#name'] == 'source_base_path' || $element['#name'] == 'source_private_file_path')) {
+      return;
+    }
+
+    if ($version !== '6' && ($element['#name'] == 'd6_source_base_path')) {
+      return;
+    }
+
     if ($source = $element['#value']) {
       $msg = $this->t('Failed to read from @title.', ['@title' => $element['#title']]);
       if (UrlHelper::isExternal($source)) {
diff --git a/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php b/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php
index 162c7686c..e9c29e306 100644
--- a/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php
+++ b/web/core/modules/migrate_drupal_ui/src/Form/OverviewForm.php
@@ -35,9 +35,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['info_header'] = [
       '#markup' => '<p>' . $this->t('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal @version. See the <a href=":url">Drupal site upgrades handbook</a> for more information.', [
-          '@version' => $this->destinationSiteVersion,
-          ':url' => 'https://www.drupal.org/upgrade/migrate',
-        ]),
+        '@version' => $this->destinationSiteVersion,
+        ':url' => 'https://www.drupal.org/upgrade/migrate',
+      ]),
     ];
 
     $form['legend']['#markup'] = '';
diff --git a/web/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_no_annotation.yml b/web/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_no_annotation.yml
index bdc906660..02f95ed3d 100644
--- a/web/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_no_annotation.yml
+++ b/web/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migrations/migration_provider_no_annotation.yml
@@ -4,7 +4,7 @@ migration_tags:
   - Drupal 6
   - Drupal 7
 source:
-# Test plugin without a source_module annotation
+  # Test plugin without a source_module annotation
   plugin: no_source_module
 process:
   message: site_offline_message
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
index baa9fac76..241c72964 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
@@ -29,6 +29,7 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
     'forum',
     'statistics',
     'syslog',
+    // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     'tracker',
     'update',
     // Test migrations states.
@@ -106,6 +107,7 @@ protected function getAvailablePaths() {
       'Menu translation',
       'Node',
       'Node Reference',
+      'Node Reference URL Widget',
       'Nodeaccess',
       'Number',
       'OpenID',
@@ -127,6 +129,7 @@ protected function getAvailablePaths() {
       'Taxonomy',
       'Text',
       'Throttle',
+      // @todo Remove Tracker in https://www.drupal.org/project/drupal/issues/3261452
       'Tracker',
       'Trigger',
       'Update status',
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
index c315ce7fb..7fa0e2177 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
@@ -27,6 +27,7 @@ class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase {
     'forum',
     'statistics',
     'syslog',
+    // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
     'tracker',
     'update',
     // Test migrations states.
@@ -98,6 +99,7 @@ protected function getAvailablePaths() {
       'Node',
       'Nodeaccess',
       'Node Reference',
+      'Node Reference URL Widget',
       'Number',
       'OpenID',
       'PHP filter',
@@ -113,6 +115,7 @@ protected function getAvailablePaths() {
       'Taxonomy',
       'Text',
       'Throttle',
+      // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
       'Tracker',
       'Trigger',
       'Update status',
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
index d14d64ca5..1da8b95b4 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -53,9 +53,6 @@ protected function setUp(): void {
     $this->nodeStorage->delete($this->nodeStorage->loadMultiple());
 
     $this->loadFixture($this->getModulePath('migrate_drupal') . '/tests/fixtures/drupal6.php');
-
-    // @todo Remove this in https://www.drupal.org/node/3267515
-    \Drupal::service('module_installer')->uninstall(['rdf']);
   }
 
   /**
@@ -81,8 +78,8 @@ protected function getEntityCounts() {
       'contact_message' => 0,
       'configurable_language' => 5,
       'editor' => 2,
-      'field_config' => 103,
-      'field_storage_config' => 71,
+      'field_config' => 104,
+      'field_storage_config' => 72,
       'file' => 7,
       'filter_format' => 7,
       'image_style' => 6,
@@ -155,6 +152,7 @@ protected function getAvailablePaths() {
       'Menu translation',
       'Node',
       'Node Reference',
+      'Node Reference URL Widget',
       'Option Widgets',
       'Path',
       'Profile translation',
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
index 784618bae..b47cad02c 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
@@ -28,7 +28,6 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
     'forum',
     'statistics',
     'syslog',
-    'tracker',
     'update',
     // Test migrations states.
     'migrate_state_finished_test',
@@ -41,9 +40,6 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
   protected function setUp(): void {
     parent::setUp();
     $this->loadFixture($this->getModulePath('migrate_drupal') . '/tests/fixtures/drupal7.php');
-
-    // @todo Remove this in https://www.drupal.org/node/3267515
-    \Drupal::service('module_installer')->uninstall(['rdf']);
   }
 
   /**
@@ -134,7 +130,6 @@ protected function getAvailablePaths() {
       'Text',
       'Title',
       'Toolbar',
-      'Tracker',
       'Trigger',
       'Update manager',
       'User',
@@ -173,6 +168,8 @@ protected function getMissingPaths() {
       'RDF',
       'References',
       'References UUID',
+      // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
+      'Tracker',
       'Translation redirect',
       'Translation sets',
       'User mail translation',
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php
index 6b587a444..7600cf318 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualReviewPageTest.php
@@ -37,9 +37,6 @@ class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase {
   protected function setUp(): void {
     parent::setUp();
     $this->loadFixture($this->getModulePath('migrate_drupal') . '/tests/fixtures/drupal7.php');
-
-    // @todo Remove this in https://www.drupal.org/node/3267515
-    \Drupal::service('module_installer')->uninstall(['rdf']);
   }
 
   /**
@@ -184,6 +181,7 @@ protected function getMissingPaths() {
       // These modules are in the missing path list because they are installed
       // on the source site but they are not installed on the destination site.
       'Syslog',
+      // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
       'Tracker',
       'Update manager',
     ];
diff --git a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
index fa601ee9d..bcbbfbd52 100644
--- a/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
+++ b/web/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -56,9 +56,6 @@ protected function setUp(): void {
     $this->nodeStorage->delete($this->nodeStorage->loadMultiple());
 
     $this->loadFixture($this->getModulePath('migrate_drupal') . '/tests/fixtures/drupal7.php');
-
-    // @todo Remove this in https://www.drupal.org/node/3267515
-    \Drupal::service('module_installer')->uninstall(['rdf']);
   }
 
   /**
@@ -216,6 +213,7 @@ protected function getMissingPaths() {
       // These modules are in the missing path list because they are installed
       // on the source site but they are not installed on the destination site.
       'Syslog',
+      // @todo Remove tracker in https://www.drupal.org/project/drupal/issues/3261452
       'Tracker',
       'Update manager',
     ];
diff --git a/web/core/modules/mysql/src/Driver/Database/mysql/Connection.php b/web/core/modules/mysql/src/Driver/Database/mysql/Connection.php
index 1edfdfd1e..024f631da 100644
--- a/web/core/modules/mysql/src/Driver/Database/mysql/Connection.php
+++ b/web/core/modules/mysql/src/Driver/Database/mysql/Connection.php
@@ -305,7 +305,7 @@ protected function getMariaDbVersionMatch(): ?string {
    */
   protected function getServerVersion(): string {
     if (!$this->serverVersion) {
-      $this->serverVersion = $this->connection->query('SELECT VERSION()')->fetchColumn();
+      $this->serverVersion = $this->query('SELECT VERSION()')->fetchField();
     }
     return $this->serverVersion;
   }
diff --git a/web/core/modules/mysql/src/Driver/Database/mysql/Schema.php b/web/core/modules/mysql/src/Driver/Database/mysql/Schema.php
index cdadb045d..6a0cb188a 100644
--- a/web/core/modules/mysql/src/Driver/Database/mysql/Schema.php
+++ b/web/core/modules/mysql/src/Driver/Database/mysql/Schema.php
@@ -44,7 +44,7 @@ class Schema extends DatabaseSchema {
   /**
    * Get information about the table and database name from the prefix.
    *
-   * @return
+   * @return array
    *   A keyed array with information about the database, table name and prefix.
    */
   protected function getPrefixInfo($table = 'default', $add_prefix = TRUE) {
@@ -88,7 +88,7 @@ protected function buildTableNameCondition($table_name, $operator = '=', $add_pr
    * @param $table
    *   A Schema API table definition array.
    *
-   * @return
+   * @return string[]
    *   An array of SQL statements to create the table.
    */
   protected function createTableSql($name, $table) {
diff --git a/web/core/modules/mysql/tests/src/Unit/ConnectionTest.php b/web/core/modules/mysql/tests/src/Unit/ConnectionTest.php
index ed682c55f..bb8bebbcb 100644
--- a/web/core/modules/mysql/tests/src/Unit/ConnectionTest.php
+++ b/web/core/modules/mysql/tests/src/Unit/ConnectionTest.php
@@ -4,6 +4,7 @@
 
 use Drupal\mysql\Driver\Database\mysql\Connection;
 use Drupal\Tests\UnitTestCase;
+use Prophecy\Argument;
 
 /**
  * Tests MySQL database connections.
@@ -41,6 +42,21 @@ public function setUp(): void {
    * @return \Drupal\mysql\Driver\Database\mysql\Connection
    */
   private function createConnection(): Connection {
+    $this->pdoStatement
+      ->setFetchMode(Argument::any())
+      ->shouldBeCalled()
+      ->willReturn(TRUE);
+
+    $this->pdoStatement
+      ->execute(Argument::any())
+      ->shouldBeCalled()
+      ->willReturn(TRUE);
+
+    $this->pdoConnection
+      ->prepare('SELECT VERSION()', Argument::any())
+      ->shouldBeCalled()
+      ->willReturn($this->pdoStatement->reveal());
+
     /** @var \PDO $pdo_connection */
     $pdo_connection = $this->pdoConnection->reveal();
 
@@ -48,6 +64,7 @@ private function createConnection(): Connection {
 
       public function __construct(\PDO $connection) {
         $this->connection = $connection;
+        $this->setPrefix('');
       }
 
     };
@@ -60,15 +77,10 @@ public function __construct(\PDO $connection) {
    */
   public function testVersionAndIsMariaDb(bool $expected_is_mariadb, string $server_version, string $expected_version): void {
     $this->pdoStatement
-      ->fetchColumn()
+      ->fetchColumn(Argument::any())
       ->shouldBeCalled()
       ->willReturn($server_version);
 
-    $this->pdoConnection
-      ->query('SELECT VERSION()')
-      ->shouldBeCalled()
-      ->willReturn($this->pdoStatement->reveal());
-
     $connection = $this->createConnection();
 
     $is_mariadb = $connection->isMariaDb();
diff --git a/web/core/modules/node/content_types.es6.js b/web/core/modules/node/content_types.es6.js
index b7650d1ef..c663db8ef 100644
--- a/web/core/modules/node/content_types.es6.js
+++ b/web/core/modules/node/content_types.es6.js
@@ -17,30 +17,30 @@
       const $context = $(context);
       // Provide the vertical tab summaries.
       $context.find('#edit-submission').drupalSetSummary((context) => {
-        const vals = [];
-        vals.push(
+        const values = [];
+        values.push(
           Drupal.checkPlain($(context).find('#edit-title-label')[0].value) ||
             Drupal.t('Requires a title'),
         );
-        return vals.join(', ');
+        return values.join(', ');
       });
       $context.find('#edit-workflow').drupalSetSummary((context) => {
-        const vals = [];
+        const values = [];
         $(context)
           .find('input[name^="options"]:checked')
           .next('label')
           .each(function () {
-            vals.push(Drupal.checkPlain(this.textContent));
+            values.push(Drupal.checkPlain(this.textContent));
           });
         if (!$(context).find('#edit-options-status').is(':checked')) {
-          vals.unshift(Drupal.t('Not published'));
+          values.unshift(Drupal.t('Not published'));
         }
-        return vals.join(', ');
+        return values.join(', ');
       });
       $('#edit-language', context).drupalSetSummary((context) => {
-        const vals = [];
+        const values = [];
 
-        vals.push(
+        values.push(
           $(
             '.js-form-item-language-configuration-langcode select option:selected',
             context,
@@ -50,24 +50,24 @@
         $('input:checked', context)
           .next('label')
           .each(function () {
-            vals.push(Drupal.checkPlain(this.textContent));
+            values.push(Drupal.checkPlain(this.textContent));
           });
 
-        return vals.join(', ');
+        return values.join(', ');
       });
       $context.find('#edit-display').drupalSetSummary((context) => {
-        const vals = [];
+        const values = [];
         const $editContext = $(context);
         $editContext
           .find('input:checked')
           .next('label')
           .each(function () {
-            vals.push(Drupal.checkPlain(this.textContent));
+            values.push(Drupal.checkPlain(this.textContent));
           });
         if (!$editContext.find('#edit-display-submitted').is(':checked')) {
-          vals.unshift(Drupal.t("Don't display post information"));
+          values.unshift(Drupal.t("Don't display post information"));
         }
-        return vals.join(', ');
+        return values.join(', ');
       });
     },
   };
diff --git a/web/core/modules/node/content_types.js b/web/core/modules/node/content_types.js
index e2034ebcc..c76061262 100644
--- a/web/core/modules/node/content_types.js
+++ b/web/core/modules/node/content_types.js
@@ -4,48 +4,43 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.contentTypes = {
     attach: function attach(context) {
       var $context = $(context);
       $context.find('#edit-submission').drupalSetSummary(function (context) {
-        var vals = [];
-        vals.push(Drupal.checkPlain($(context).find('#edit-title-label')[0].value) || Drupal.t('Requires a title'));
-        return vals.join(', ');
+        var values = [];
+        values.push(Drupal.checkPlain($(context).find('#edit-title-label')[0].value) || Drupal.t('Requires a title'));
+        return values.join(', ');
       });
       $context.find('#edit-workflow').drupalSetSummary(function (context) {
-        var vals = [];
+        var values = [];
         $(context).find('input[name^="options"]:checked').next('label').each(function () {
-          vals.push(Drupal.checkPlain(this.textContent));
+          values.push(Drupal.checkPlain(this.textContent));
         });
-
         if (!$(context).find('#edit-options-status').is(':checked')) {
-          vals.unshift(Drupal.t('Not published'));
+          values.unshift(Drupal.t('Not published'));
         }
-
-        return vals.join(', ');
+        return values.join(', ');
       });
       $('#edit-language', context).drupalSetSummary(function (context) {
-        var vals = [];
-        vals.push($('.js-form-item-language-configuration-langcode select option:selected', context)[0].textContent);
+        var values = [];
+        values.push($('.js-form-item-language-configuration-langcode select option:selected', context)[0].textContent);
         $('input:checked', context).next('label').each(function () {
-          vals.push(Drupal.checkPlain(this.textContent));
+          values.push(Drupal.checkPlain(this.textContent));
         });
-        return vals.join(', ');
+        return values.join(', ');
       });
       $context.find('#edit-display').drupalSetSummary(function (context) {
-        var vals = [];
+        var values = [];
         var $editContext = $(context);
         $editContext.find('input:checked').next('label').each(function () {
-          vals.push(Drupal.checkPlain(this.textContent));
+          values.push(Drupal.checkPlain(this.textContent));
         });
-
         if (!$editContext.find('#edit-display-submitted').is(':checked')) {
-          vals.unshift(Drupal.t("Don't display post information"));
+          values.unshift(Drupal.t("Don't display post information"));
         }
-
-        return vals.join(', ');
+        return values.join(', ');
       });
     }
   };
diff --git a/web/core/modules/node/node.api.php b/web/core/modules/node/node.api.php
index b0006cf8c..8b01c6632 100644
--- a/web/core/modules/node/node.api.php
+++ b/web/core/modules/node/node.api.php
@@ -22,11 +22,8 @@
  * "realms". In hook_node_access_records(), the realms and grant IDs are
  * associated with permission to view, edit, and delete individual nodes.
  *
- * The realms and grant IDs can be arbitrarily defined by your node access
- * module; it is common to use role IDs as grant IDs, but that is not required.
- * Your module could instead maintain its own list of users, where each list has
- * an ID. In that case, the return value of this hook would be an array of the
- * list IDs that this user is a member of.
+ * Grant IDs can be arbitrarily defined by a node access module using a list of
+ * integer IDs associated with users.
  *
  * A node access module may implement as many realms as necessary to properly
  * define the access privileges for the nodes. Note that the system makes no
@@ -63,8 +60,6 @@
  * sure to restore your {node_access} record after node_access_rebuild() is
  * called.
  *
- * For a detailed example, see node_access_example.module.
- *
  * @param \Drupal\Core\Session\AccountInterface $account
  *   The account object whose grants are requested.
  * @param string $op
@@ -147,7 +142,7 @@ function hook_node_grants(\Drupal\Core\Session\AccountInterface $account, $op) {
  * @param \Drupal\node\NodeInterface $node
  *   The node that has just been saved.
  *
- * @return
+ * @return array|null
  *   An array of grants as defined above.
  *
  * @see hook_node_access_records_alter()
diff --git a/web/core/modules/node/node.es6.js b/web/core/modules/node/node.es6.js
index c9ed55068..74047c9ab 100644
--- a/web/core/modules/node/node.es6.js
+++ b/web/core/modules/node/node.es6.js
@@ -38,16 +38,16 @@
 
       $context.find('.node-form-options').drupalSetSummary((context) => {
         const $optionsContext = $(context);
-        const vals = [];
+        const values = [];
 
         if ($optionsContext.find('input').is(':checked')) {
           $optionsContext
             .find('input:checked')
             .next('label')
             .each(function () {
-              vals.push(Drupal.checkPlain(this.textContent.trim()));
+              values.push(Drupal.checkPlain(this.textContent.trim()));
             });
-          return vals.join(', ');
+          return values.join(', ');
         }
 
         return Drupal.t('Not promoted');
diff --git a/web/core/modules/node/node.js b/web/core/modules/node/node.js
index a7e70ca44..f16634ec3 100644
--- a/web/core/modules/node/node.js
+++ b/web/core/modules/node/node.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.nodeDetailsSummaries = {
     attach: function attach(context) {
@@ -14,20 +13,17 @@
         var name = nameElement && nameElement.value;
         var dateElement = context.querySelector('.field--name-created input');
         var date = dateElement && dateElement.value;
-
         if (name && date) {
           return Drupal.t('By @name on @date', {
             '@name': name,
             '@date': date
           });
         }
-
         if (name) {
           return Drupal.t('By @name', {
             '@name': name
           });
         }
-
         if (date) {
           return Drupal.t('Authored on @date', {
             '@date': date
@@ -36,15 +32,13 @@
       });
       $context.find('.node-form-options').drupalSetSummary(function (context) {
         var $optionsContext = $(context);
-        var vals = [];
-
+        var values = [];
         if ($optionsContext.find('input').is(':checked')) {
           $optionsContext.find('input:checked').next('label').each(function () {
-            vals.push(Drupal.checkPlain(this.textContent.trim()));
+            values.push(Drupal.checkPlain(this.textContent.trim()));
           });
-          return vals.join(', ');
+          return values.join(', ');
         }
-
         return Drupal.t('Not promoted');
       });
     }
diff --git a/web/core/modules/node/node.module b/web/core/modules/node/node.module
index 7e194d91b..a09af6f03 100644
--- a/web/core/modules/node/node.module
+++ b/web/core/modules/node/node.module
@@ -330,7 +330,7 @@ function node_entity_extra_field_info() {
  * @param string $new_id
  *   The new node type of the nodes.
  *
- * @return
+ * @return int
  *   The number of nodes whose node type field was modified.
  */
 function node_type_update_nodes($old_id, $new_id) {
@@ -554,9 +554,11 @@ function template_preprocess_node(&$variables) {
         // 'compact' view mode on the User entity. Note that the 'compact'
         // view mode might not be configured, so remember to always check the
         // theme setting first.
-        $variables['author_picture'] = \Drupal::entityTypeManager()
-          ->getViewBuilder('user')
-          ->view($node->getOwner(), 'compact');
+        if ($node_owner = $node->getOwner()) {
+          $variables['author_picture'] = \Drupal::entityTypeManager()
+            ->getViewBuilder('user')
+            ->view($node_owner, 'compact');
+        }
       }
     }
   }
@@ -814,9 +816,6 @@ function node_form_system_themes_admin_form_submit($form, FormStateInterface $fo
  * Note also that access to create nodes is handled by
  * hook_ENTITY_TYPE_create_access().
  *
- * To see how to write a node access module of your own, see
- * node_access_example.module.
- *
  * @see \Drupal\node\NodeAccessControlHandler
  */
 
@@ -894,7 +893,7 @@ function node_access_grants($op, AccountInterface $account) {
  *   (optional) The user object for the user whose access is being checked. If
  *   omitted, the current user is used. Defaults to NULL.
  *
- * @return
+ * @return bool
  *   TRUE if 'view' access to all nodes is granted, FALSE otherwise.
  *
  * @see hook_node_grants()
diff --git a/web/core/modules/node/node.preview.js b/web/core/modules/node/node.preview.js
index 669dada2e..0596997fd 100644
--- a/web/core/modules/node/node.preview.js
+++ b/web/core/modules/node/node.preview.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.nodePreviewDestroyLinks = {
     attach: function attach(context) {
@@ -28,11 +27,9 @@
           }).showModal();
         }
       }
-
       if (!context.querySelector('.node-preview-container')) {
         return;
       }
-
       if (once('node-preview', 'html').length) {
         $(document).on('click.preview', 'a:not([href^="#"], .node-preview-container a)', clickPreviewModal);
       }
@@ -48,7 +45,6 @@
   Drupal.behaviors.nodePreviewSwitchViewMode = {
     attach: function attach(context) {
       var autosubmit = once('autosubmit', '[data-drupal-autosubmit]', context);
-
       if (autosubmit.length) {
         $(autosubmit).on('formUpdated.preview', function () {
           $(this.form).trigger('submit');
@@ -56,7 +52,6 @@
       }
     }
   };
-
   Drupal.theme.nodePreviewModal = function () {
     return "<p>".concat(Drupal.t('Leaving the preview will cause unsaved changes to be lost. Are you sure you want to leave the preview?'), "</p><small class=\"description\">").concat(Drupal.t('CTRL+Left click will prevent this dialog from showing and proceed to the clicked link.'), "</small>");
   };
diff --git a/web/core/modules/node/src/Controller/NodeController.php b/web/core/modules/node/src/Controller/NodeController.php
index ed80d7ced..f5449802d 100644
--- a/web/core/modules/node/src/Controller/NodeController.php
+++ b/web/core/modules/node/src/Controller/NodeController.php
@@ -230,8 +230,8 @@ public function revisionOverview(NodeInterface $node) {
             $links['revert'] = [
               'title' => $vid < $node->getRevisionId() ? $this->t('Revert') : $this->t('Set as current revision'),
               'url' => $has_translations ?
-                Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) :
-                Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
+              Url::fromRoute('node.revision_revert_translation_confirm', ['node' => $node->id(), 'node_revision' => $vid, 'langcode' => $langcode]) :
+              Url::fromRoute('node.revision_revert_confirm', ['node' => $node->id(), 'node_revision' => $vid]),
             ];
           }
 
diff --git a/web/core/modules/node/src/NodeGrantDatabaseStorage.php b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
index 4718a7c87..66ab73f69 100644
--- a/web/core/modules/node/src/NodeGrantDatabaseStorage.php
+++ b/web/core/modules/node/src/NodeGrantDatabaseStorage.php
@@ -256,13 +256,13 @@ public function delete() {
   public function writeDefault() {
     $this->database->insert('node_access')
       ->fields([
-          'nid' => 0,
-          'realm' => 'all',
-          'gid' => 0,
-          'grant_view' => 1,
-          'grant_update' => 0,
-          'grant_delete' => 0,
-        ])
+        'nid' => 0,
+        'realm' => 'all',
+        'gid' => 0,
+        'grant_view' => 1,
+        'grant_update' => 0,
+        'grant_delete' => 0,
+      ])
       ->execute();
   }
 
diff --git a/web/core/modules/node/src/NodePermissions.php b/web/core/modules/node/src/NodePermissions.php
index 2ba3502ca..c55546c04 100644
--- a/web/core/modules/node/src/NodePermissions.php
+++ b/web/core/modules/node/src/NodePermissions.php
@@ -43,12 +43,14 @@ protected function buildPermissions(NodeType $type) {
       ],
       "edit own $type_id content" => [
         'title' => $this->t('%type_name: Edit own content', $type_params),
+        'description' => $this->t('Note that anonymous users with this permission are able to edit any content created by any anonymous user.'),
       ],
       "edit any $type_id content" => [
         'title' => $this->t('%type_name: Edit any content', $type_params),
       ],
       "delete own $type_id content" => [
         'title' => $this->t('%type_name: Delete own content', $type_params),
+        'description' => $this->t('Note that anonymous users with this permission are able to delete any content created by any anonymous user.'),
       ],
       "delete any $type_id content" => [
         'title' => $this->t('%type_name: Delete any content', $type_params),
diff --git a/web/core/modules/node/src/NodeTypeListBuilder.php b/web/core/modules/node/src/NodeTypeListBuilder.php
index 870729891..c99f3a545 100644
--- a/web/core/modules/node/src/NodeTypeListBuilder.php
+++ b/web/core/modules/node/src/NodeTypeListBuilder.php
@@ -56,8 +56,8 @@ public function getDefaultOperations(EntityInterface $entity) {
   public function render() {
     $build = parent::render();
     $build['table']['#empty'] = $this->t('No content types available. <a href=":link">Add content type</a>.', [
-        ':link' => Url::fromRoute('node.type_add')->toString(),
-      ]);
+      ':link' => Url::fromRoute('node.type_add')->toString(),
+    ]);
     return $build;
   }
 
diff --git a/web/core/modules/node/src/NodeViewsData.php b/web/core/modules/node/src/NodeViewsData.php
index e47dc03d8..2f3a83727 100644
--- a/web/core/modules/node/src/NodeViewsData.php
+++ b/web/core/modules/node/src/NodeViewsData.php
@@ -27,13 +27,10 @@ public function getViewsData() {
     ];
 
     $data['node_field_data']['title']['field']['default_formatter_settings'] = ['link_to_entity' => TRUE];
-
     $data['node_field_data']['title']['field']['link_to_node default'] = TRUE;
 
     $data['node_field_data']['type']['argument']['id'] = 'node_type';
 
-    $data['node_field_data']['langcode']['help'] = $this->t('The language of the content or translation.');
-
     $data['node_field_data']['status']['filter']['label'] = $this->t('Published status');
     $data['node_field_data']['status']['filter']['type'] = 'yes-no';
     // Use status = 1 instead of status <> 0 in WHERE statement.
diff --git a/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php b/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php
index ae9a7402b..287dcb018 100644
--- a/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php
+++ b/web/core/modules/node/src/Plugin/Action/AssignOwnerNode.php
@@ -76,7 +76,7 @@ public function defaultConfiguration() {
    * {@inheritdoc}
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
-    $description = t('The username of the user to which you would like to assign ownership.');
+    $description = $this->t('The username of the user to which you would like to assign ownership.');
     $count = $this->connection->query("SELECT COUNT(*) FROM {users}")->fetchField();
 
     // Use dropdown for fewer than 200 users; textbox for more than that.
@@ -88,7 +88,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
       }
       $form['owner_uid'] = [
         '#type' => 'select',
-        '#title' => t('Username'),
+        '#title' => $this->t('Username'),
         '#default_value' => $this->configuration['owner_uid'],
         '#options' => $options,
         '#description' => $description,
@@ -97,7 +97,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     else {
       $form['owner_uid'] = [
         '#type' => 'entity_autocomplete',
-        '#title' => t('Username'),
+        '#title' => $this->t('Username'),
         '#target_type' => 'user',
         '#selection_settings' => [
           'include_anonymous' => FALSE,
@@ -119,7 +119,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
   public function validateConfigurationForm(array &$form, FormStateInterface $form_state) {
     $exists = (bool) $this->connection->queryRange('SELECT 1 FROM {users_field_data} WHERE [uid] = :uid AND [default_langcode] = 1', 0, 1, [':uid' => $form_state->getValue('owner_uid')])->fetchField();
     if (!$exists) {
-      $form_state->setErrorByName('owner_uid', t('Enter a valid username.'));
+      $form_state->setErrorByName('owner_uid', $this->t('Enter a valid username.'));
     }
   }
 
diff --git a/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php b/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
index 94abf8b63..42f344d52 100644
--- a/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
+++ b/web/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
@@ -49,9 +49,9 @@ public function defaultConfiguration() {
    */
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['keywords'] = [
-      '#title' => t('Keywords'),
+      '#title' => $this->t('Keywords'),
       '#type' => 'textarea',
-      '#description' => t('The content will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'),
+      '#description' => $this->t('The content will be unpublished if it contains any of the phrases above. Use a case-sensitive, comma-separated list of phrases. Example: funny, bungee jumping, "Company, Inc."'),
       '#default_value' => Tags::implode($this->configuration['keywords']),
     ];
     return $form;
diff --git a/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php b/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php
index 118021f9e..90af1d54b 100644
--- a/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php
+++ b/web/core/modules/node/src/Plugin/Block/SyndicateBlock.php
@@ -78,7 +78,7 @@ protected function blockAccess(AccountInterface $account) {
    * {@inheritdoc}
    */
   public function build() {
-    $title = $this->configFactory->get('system.site')->get('name');
+    $title = $this->configuration['label'];
     return [
       '#theme' => 'feed_icon',
       '#url' => Url::fromUri('internal:/rss.xml'),
diff --git a/web/core/modules/node/src/Plugin/Search/NodeSearch.php b/web/core/modules/node/src/Plugin/Search/NodeSearch.php
index 0342c5f01..1f6e16653 100644
--- a/web/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/web/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -584,14 +584,14 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
     // Add advanced search keyword-related boxes.
     $form['advanced'] = [
       '#type' => 'details',
-      '#title' => t('Advanced search'),
+      '#title' => $this->t('Advanced search'),
       '#attributes' => ['class' => ['search-advanced']],
       '#access' => $this->account && $this->account->hasPermission('use advanced search'),
       '#open' => $used_advanced,
     ];
     $form['advanced']['keywords-fieldset'] = [
       '#type' => 'fieldset',
-      '#title' => t('Keywords'),
+      '#title' => $this->t('Keywords'),
     ];
 
     $form['advanced']['keywords'] = [
@@ -601,7 +601,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
 
     $form['advanced']['keywords-fieldset']['keywords']['or'] = [
       '#type' => 'textfield',
-      '#title' => t('Containing any of the words'),
+      '#title' => $this->t('Containing any of the words'),
       '#size' => 30,
       '#maxlength' => 255,
       '#default_value' => $defaults['or'] ?? '',
@@ -609,7 +609,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
 
     $form['advanced']['keywords-fieldset']['keywords']['phrase'] = [
       '#type' => 'textfield',
-      '#title' => t('Containing the phrase'),
+      '#title' => $this->t('Containing the phrase'),
       '#size' => 30,
       '#maxlength' => 255,
       '#default_value' => $defaults['phrase'] ?? '',
@@ -617,7 +617,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
 
     $form['advanced']['keywords-fieldset']['keywords']['negative'] = [
       '#type' => 'textfield',
-      '#title' => t('Containing none of the words'),
+      '#title' => $this->t('Containing none of the words'),
       '#size' => 30,
       '#maxlength' => 255,
       '#default_value' => $defaults['negative'] ?? '',
@@ -627,11 +627,11 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
     $types = array_map(['\Drupal\Component\Utility\Html', 'escape'], node_type_get_names());
     $form['advanced']['types-fieldset'] = [
       '#type' => 'fieldset',
-      '#title' => t('Types'),
+      '#title' => $this->t('Types'),
     ];
     $form['advanced']['types-fieldset']['type'] = [
       '#type' => 'checkboxes',
-      '#title' => t('Only of the type(s)'),
+      '#title' => $this->t('Only of the type(s)'),
       '#prefix' => '<div class="criterion">',
       '#suffix' => '</div>',
       '#options' => $types,
@@ -640,7 +640,7 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
 
     $form['advanced']['submit'] = [
       '#type' => 'submit',
-      '#value' => t('Advanced search'),
+      '#value' => $this->t('Advanced search'),
       '#prefix' => '<div class="action">',
       '#suffix' => '</div>',
       '#weight' => 100,
@@ -651,16 +651,16 @@ public function searchFormAlter(array &$form, FormStateInterface $form_state) {
     $language_list = $this->languageManager->getLanguages(LanguageInterface::STATE_ALL);
     foreach ($language_list as $langcode => $language) {
       // Make locked languages appear special in the list.
-      $language_options[$langcode] = $language->isLocked() ? t('- @name -', ['@name' => $language->getName()]) : $language->getName();
+      $language_options[$langcode] = $language->isLocked() ? $this->t('- @name -', ['@name' => $language->getName()]) : $language->getName();
     }
     if (count($language_options) > 1) {
       $form['advanced']['lang-fieldset'] = [
         '#type' => 'fieldset',
-        '#title' => t('Languages'),
+        '#title' => $this->t('Languages'),
       ];
       $form['advanced']['lang-fieldset']['language'] = [
         '#type' => 'checkboxes',
-        '#title' => t('Languages'),
+        '#title' => $this->t('Languages'),
         '#prefix' => '<div class="criterion">',
         '#suffix' => '</div>',
         '#options' => $language_options,
@@ -823,7 +823,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     // Output form for defining rank factor weights.
     $form['content_ranking'] = [
       '#type' => 'details',
-      '#title' => t('Content ranking'),
+      '#title' => $this->t('Content ranking'),
       '#open' => TRUE,
     ];
     $form['content_ranking']['info'] = [
diff --git a/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
index a8fa1d0bb..b5fdc54a9 100644
--- a/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
+++ b/web/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Drupal\migrate_drupal\FieldDiscoveryInterface;
@@ -15,6 +16,7 @@
  */
 class D6NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
   use MigrationDeriverTrait;
+  use StringTranslationTrait;
 
   /**
    * The base plugin ID this derivative is for.
@@ -89,7 +91,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         $node_type = $row->getSourceProperty('type');
         $values = $base_plugin_definition;
 
-        $values['label'] = t("@label (@type)", [
+        $values['label'] = $this->t("@label (@type)", [
           '@label' => $values['label'],
           '@type' => $node_type,
         ]);
diff --git a/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php b/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
index 380aab81e..59b071413 100644
--- a/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
+++ b/web/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Drupal\migrate_drupal\FieldDiscoveryInterface;
@@ -15,6 +16,7 @@
  */
 class D7NodeDeriver extends DeriverBase implements ContainerDeriverInterface {
   use MigrationDeriverTrait;
+  use StringTranslationTrait;
 
   /**
    * The base plugin ID this derivative is for.
@@ -89,7 +91,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         $node_type = $row->getSourceProperty('type');
         $values = $base_plugin_definition;
 
-        $values['label'] = t('@label (@type)', [
+        $values['label'] = $this->t('@label (@type)', [
           '@label' => $values['label'],
           '@type' => $row->getSourceProperty('name'),
         ]);
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php
index a1a316642..e3f5a9b0e 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -107,19 +107,19 @@ public function query() {
     $this->handleTranslations($query);
 
     $query->fields('n', [
-        'nid',
-        'type',
-        'language',
-        'status',
-        'created',
-        'changed',
-        'comment',
-        'promote',
-        'moderate',
-        'sticky',
-        'tnid',
-        'translate',
-      ])
+      'nid',
+      'type',
+      'language',
+      'status',
+      'created',
+      'changed',
+      'comment',
+      'promote',
+      'moderate',
+      'sticky',
+      'tnid',
+      'translate',
+    ])
       ->fields('nr', [
         'title',
         'body',
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
index a3420165e..810c157b5 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php
@@ -30,7 +30,7 @@ class NodeRevision extends Node {
   public function fields() {
     // Use all the node fields plus the vid that identifies the version.
     return parent::fields() + [
-      'vid' => t('The primary identifier for this version.'),
+      'vid' => $this->t('The primary identifier for this version.'),
       'log' => $this->t('Revision Log message'),
       'timestamp' => $this->t('Revision timestamp'),
     ];
diff --git a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php
index 1b13b7bbf..5be6ac3b3 100644
--- a/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php
+++ b/web/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php
@@ -28,7 +28,7 @@ class NodeRevision extends Node {
   public function fields() {
     // Use all the node fields plus the vid that identifies the version.
     return parent::fields() + [
-      'vid' => t('The primary identifier for this version.'),
+      'vid' => $this->t('The primary identifier for this version.'),
       'log' => $this->t('Revision Log message'),
       'timestamp' => $this->t('Revision timestamp'),
     ];
diff --git a/web/core/modules/node/src/Plugin/views/argument/Type.php b/web/core/modules/node/src/Plugin/views/argument/Type.php
index 135e3952c..625aef6ab 100644
--- a/web/core/modules/node/src/Plugin/views/argument/Type.php
+++ b/web/core/modules/node/src/Plugin/views/argument/Type.php
@@ -52,16 +52,14 @@ public static function create(ContainerInterface $container, array $configuratio
   }
 
   /**
-   * Override the behavior of summaryName(). Get the user friendly version
-   * of the node type.
+   * {@inheritdoc}
    */
   public function summaryName($data) {
     return $this->node_type($data->{$this->name_alias});
   }
 
   /**
-   * Override the behavior of title(). Get the user friendly version of the
-   * node type.
+   * {@inheritdoc}
    */
   public function title() {
     return $this->node_type($this->argument);
diff --git a/web/core/modules/node/src/Plugin/views/field/Node.php b/web/core/modules/node/src/Plugin/views/field/Node.php
index f81777e42..94cb1a244 100644
--- a/web/core/modules/node/src/Plugin/views/field/Node.php
+++ b/web/core/modules/node/src/Plugin/views/field/Node.php
@@ -11,8 +11,10 @@
 
 /**
  * Field handler to provide simple renderer that allows linking to a node.
+ *
  * Definition terms:
- * - link_to_node default: Should this field have the checkbox "link to node" enabled by default.
+ * - link_to_node default: Should this field have the checkbox "link to node"
+ *   enabled by default.
  *
  * @ingroup views_field_handlers
  *
diff --git a/web/core/modules/node/src/Plugin/views/row/Rss.php b/web/core/modules/node/src/Plugin/views/row/Rss.php
index 2d2dbaa00..b20cfde77 100644
--- a/web/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/web/core/modules/node/src/Plugin/views/row/Rss.php
@@ -120,15 +120,6 @@ public function render($row) {
     if (!empty($node->rss_namespaces)) {
       $this->view->style_plugin->namespaces = array_merge($this->view->style_plugin->namespaces, $node->rss_namespaces);
     }
-    elseif (function_exists('rdf_get_namespaces')) {
-      // Merge RDF namespaces in the XML namespaces in case they are used
-      // further in the RSS content.
-      $xml_rdf_namespaces = [];
-      foreach (rdf_get_namespaces() as $prefix => $uri) {
-        $xml_rdf_namespaces['xmlns:' . $prefix] = $uri;
-      }
-      $this->view->style_plugin->namespaces += $xml_rdf_namespaces;
-    }
 
     $item = new \stdClass();
     if ($display_mode != 'title') {
diff --git a/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.info.yml b/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.info.yml
index 29daa2216..a827774b6 100644
--- a/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.info.yml
+++ b/web/core/modules/node/tests/modules/node_access_test_language/node_access_test_language.info.yml
@@ -4,4 +4,4 @@ description: 'Support module for language-aware node access testing.'
 package: Testing
 version: VERSION
 dependencies:
-- drupal:options
+  - drupal:options
diff --git a/web/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml b/web/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml
deleted file mode 100644
index dd6535c30..000000000
--- a/web/core/modules/node/tests/modules/node_display_configurable_test/config/install/rdf.mapping.node.page.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.page
-  module:
-    - node
-id: node.page
-targetEntityType: node
-bundle: page
-types:
-  - 'schema:WebPage'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  comment_count:
-    properties:
-      - 'schema:interactionCount'
-    datatype_callback:
-      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
-      arguments:
-        interaction_type: UserComments
diff --git a/web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.info.yml b/web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.info.yml
deleted file mode 100644
index 3ad5d2158..000000000
--- a/web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Node configurable display module tests'
-type: module
-description: 'Support module for node \Drupal\Core\Field\BaseFieldDefinition::setDisplayConfigurable() testing.'
-package: Testing
-version: VERSION
diff --git a/web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.module b/web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.module
deleted file mode 100644
index df645c8b8..000000000
--- a/web/core/modules/node/tests/modules/node_display_configurable_test/node_display_configurable_test.module
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * @file
- * A module for testing making node base fields' displays configurable.
- */
-
-use Drupal\Core\Entity\EntityTypeInterface;
-
-/**
- * Implements hook_entity_base_field_info_alter().
- */
-function node_display_configurable_test_entity_base_field_info_alter(&$base_field_definitions, EntityTypeInterface $entity_type) {
-  if ($entity_type->id() == 'node') {
-    foreach (['created', 'uid', 'title'] as $field) {
-      /** @var \Drupal\Core\Field\BaseFieldDefinition[] $base_field_definitions */
-      $base_field_definitions[$field]->setDisplayConfigurable('view', TRUE);
-    }
-  }
-}
-
-/**
- * Implements hook_entity_type_build().
- */
-function node_display_configurable_test_entity_type_build(array &$entity_types) {
-  // Allow skipping of extra preprocessing for configurable display.
-  $entity_types['node']->set('enable_base_field_custom_preprocess_skipping', TRUE);
-  $entity_types['node']->set('enable_page_title_template', TRUE);
-}
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
index ac042c114..8081babaf 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessBaseTableTest.php
@@ -2,7 +2,11 @@
 
 namespace Drupal\Tests\node\Functional;
 
+use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\Language\LanguageInterface;
 use Drupal\node\Entity\NodeType;
+use Drupal\taxonomy\Entity\Vocabulary;
+use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
 
 /**
  * Tests behavior of the node access subsystem if the base table is not node.
@@ -11,27 +15,25 @@
  */
 class NodeAccessBaseTableTest extends NodeTestBase {
 
+  use EntityReferenceTestTrait;
+
   /**
    * Modules to enable.
    *
    * @var array
    */
-  protected static $modules = ['node_access_test', 'views'];
+  protected static $modules = [
+    'node_access_test',
+    'views',
+    'taxonomy',
+    'search',
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected $defaultTheme = 'stark';
 
-  /**
-   * The installation profile to use with this test.
-   *
-   * This test class requires the "tags" taxonomy field.
-   *
-   * @var string
-   */
-  protected $profile = 'standard';
-
   /**
    * Nodes by user.
    *
@@ -65,9 +67,39 @@ class NodeAccessBaseTableTest extends NodeTestBase {
    */
   protected $nidsVisible;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
+    // Create the vocabulary for the tag field.
+    $vocabulary = Vocabulary::create([
+      'name' => 'Tags',
+      'vid' => 'tags',
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ]);
+    $vocabulary->save();
+    $field_name = 'field_' . $vocabulary->id();
+
+    $handler_settings = [
+      'target_bundles' => [
+        $vocabulary->id() => $vocabulary->id(),
+      ],
+      'auto_create' => TRUE,
+    ];
+
+    $this->createEntityReferenceField('node', 'article', $field_name, 'Tags', 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
+    $entity_type_manager = $this->container->get('entity_type.manager');
+    $entity_type_manager
+      ->getStorage('entity_form_display')
+      ->load('node.article.default')
+      ->setComponent($field_name, [
+        'type' => 'entity_reference_autocomplete_tags',
+        'weight' => -4,
+      ])
+      ->save();
+
     node_access_test_add_field(NodeType::load('article'));
 
     node_access_rebuild();
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
index 08c567448..51a94a1ca 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessFieldTest.php
@@ -45,6 +45,9 @@ class NodeAccessFieldTest extends NodeTestBase {
    */
   protected $fieldName;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
index d003f0651..7650968e9 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessMenuLinkTest.php
@@ -30,6 +30,9 @@ class NodeAccessMenuLinkTest extends NodeTestBase {
    */
   protected $contentAdminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
index 771edbd80..b260f51e9 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessPagerTest.php
@@ -35,6 +35,9 @@ class NodeAccessPagerTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php b/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
index 31fee1ccd..50e5e62eb 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAccessRebuildNodeGrantsTest.php
@@ -5,8 +5,7 @@
 use Drupal\node\Entity\NodeType;
 
 /**
- * Ensures that node access rebuild functions work correctly even
- * when other modules implements hook_node_grants().
+ * Tests node access rebuild functions with multiple node access modules.
  *
  * @group node
  */
diff --git a/web/core/modules/node/tests/src/Functional/NodeAdminTest.php b/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
index c5719eb9a..6b01df12a 100644
--- a/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeAdminTest.php
@@ -52,6 +52,9 @@ class NodeAdminTest extends NodeTestBase {
    */
   protected static $modules = ['views'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php b/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
index 3fa78eb20..7ace0d500 100644
--- a/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeBlockFunctionalTest.php
@@ -44,6 +44,9 @@ class NodeBlockFunctionalTest extends NodeTestBase {
    */
   protected static $modules = ['block', 'views', 'node_block_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeCreationTest.php b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
index 2cbb0fd3c..fd041cb9b 100644
--- a/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeCreationTest.php
@@ -35,6 +35,9 @@ class NodeCreationTest extends NodeTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php b/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
deleted file mode 100644
index f80a51866..000000000
--- a/web/core/modules/node/tests/src/Functional/NodeDisplayConfigurableTest.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace Drupal\Tests\node\Functional;
-
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
-use Drupal\node\NodeInterface;
-use Drupal\user\UserInterface;
-
-/**
- * Tests making node base fields' displays configurable.
- *
- * @group node
- */
-class NodeDisplayConfigurableTest extends NodeTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  protected static $modules = ['rdf', 'block'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-    $data = $this->getProvidedData();
-    $theme = reset($data);
-    \Drupal::service('theme_installer')->install([$theme]);
-    $this->config('system.theme')->set('default', $theme)->save();
-    $settings = [
-      'theme' => $theme,
-      'region' => 'content',
-      'weight' => -100,
-    ];
-    $this->drupalPlaceBlock('page_title_block', $settings);
-  }
-
-  /**
-   * Sets base fields to configurable display and check settings are respected.
-   *
-   * @param string $theme
-   *   The name of the theme being tested.
-   * @param string $metadata_region
-   *   The region of the node html content where meta data is expected.
-   * @param bool $field_classes
-   *   If TRUE, check for field--name-XXX classes.
-   *
-   * @dataProvider provideThemes
-   */
-  public function testDisplayConfigurable(string $theme, string $metadata_region, bool $field_classes) {
-    // Change the node type setting to show submitted by information.
-    $node_type = \Drupal::entityTypeManager()->getStorage('node_type')->load('page');
-    $node_type->setDisplaySubmitted(TRUE);
-    $node_type->save();
-
-    $user = $this->drupalCreateUser([
-      'administer nodes',
-    ], $this->randomMachineName(14));
-    $this->drupalLogin($user);
-    $node = $this->drupalCreateNode(['uid' => $user->id()]);
-    $assert = $this->assertSession();
-
-    // Check the node with Drupal default non-configurable display.
-    $this->drupalGet($node->toUrl());
-    $this->assertNodeHtml($node, $user, TRUE, $metadata_region, $field_classes, $field_classes);
-
-    // Enable module to make base fields' displays configurable.
-    \Drupal::service('module_installer')->install(['node_display_configurable_test']);
-
-    // Configure display.
-    $display = EntityViewDisplay::load('node.page.default');
-    $display->setComponent('uid',
-      [
-        'type' => 'entity_reference_label',
-        'label' => 'above',
-        'settings' => ['link' => FALSE],
-      ])
-      ->removeComponent('title')
-      ->save();
-
-    // Recheck the node with configurable display.
-    $this->drupalGet($node->toUrl());
-
-    $this->assertNodeHtml($node, $user, FALSE, $metadata_region, $field_classes, FALSE);
-
-    $assert->elementExists('css', 'div[rel="schema:author"]');
-
-    // Remove from display.
-    $display->removeComponent('uid')
-      ->removeComponent('created')
-      ->save();
-
-    $this->drupalGet($node->toUrl());
-    $assert->elementNotExists('css', 'div[rel="schema:author"]');
-    $assert->elementTextNotContains('css', 'article', $user->getAccountName());
-  }
-
-  /**
-   * Asserts that the node HTML is as expected.
-   *
-   * @param \Drupal\node\NodeInterface $node
-   *   The node being tested.
-   * @param \Drupal\user\UserInterface $user
-   *   The logged in user.
-   * @param bool $is_inline
-   *   Whether the fields are rendered inline or not.
-   * @param string $metadata_region
-   *   The region of the node html content where meta data is expected.
-   * @param bool $field_classes
-   *   If TRUE, check for field--name-XXX classes on created/uid fields.
-   * @param bool $title_classes
-   *   If TRUE, check for field--name-XXX classes on title field.
-   *
-   * @internal
-   */
-  protected function assertNodeHtml(NodeInterface $node, UserInterface $user, bool $is_inline, string $metadata_region, bool $field_classes, bool $title_classes): void {
-    $assert = $this->assertSession();
-
-    $html_element = $is_inline ? 'span' : 'div';
-    $title_selector = 'h1 span' . ($title_classes ? '.field--name-title' : '');
-    $assert->elementTextContains('css', $title_selector, $node->getTitle());
-
-    // With field classes, the selector can be very specific.
-    if ($field_classes) {
-      $created_selector = 'article ' . $html_element . '.field--name-created';
-      $assert->elementTextContains('css', $created_selector, \Drupal::service('date.formatter')->format($node->getCreatedTime()));
-    }
-    else {
-      // When field classes aren't available, use HTML elements for testing.
-      $formatted_time = \Drupal::service('date.formatter')->format($node->getCreatedTime());
-      if ($is_inline) {
-        $created_selector = sprintf('//article//%s//%s[text()="%s"]', $metadata_region, $html_element, $formatted_time);
-      }
-      else {
-        $created_selector = sprintf('//article//%s[text()="%s"]', $html_element, $formatted_time);
-      }
-      $assert->elementExists('xpath', $created_selector);
-    }
-
-    $uid_selector = 'article ' . $html_element . ($field_classes ? '.field--name-uid' : '');
-    if (!$is_inline) {
-      $field_classes_selector = $field_classes ? "[contains(concat(' ', normalize-space(@class), ' '), ' field--name-uid ')]" : '';
-      $assert->elementExists('xpath', sprintf('//article//%s//*%s//%s[text()="Authored by"]', $html_element, $field_classes_selector, $html_element));
-      $assert->elementTextContains('css', "$uid_selector $html_element" . '[rel="schema:author"]', $user->getAccountName());
-      $assert->elementNotExists('css', "$uid_selector a");
-      $assert->elementExists('css', 'span[property="schema:dateCreated"]');
-    }
-    else {
-      $assert->elementTextContains('css', $uid_selector . ' a[property="schema:name"]', $user->getAccountName());
-      $assert->elementTextContains('css', 'article ' . $metadata_region, 'Submitted by');
-    }
-  }
-
-  /**
-   * Data provider for ::testDisplayConfigurable().
-   *
-   * @return array
-   */
-  public function provideThemes() {
-    return [
-      ['bartik', 'header', TRUE],
-      ['claro', 'footer', TRUE],
-      // @todo Remove Classy from data provider in
-      // https://www.drupal.org/project/drupal/issues/3110137.
-      ['classy', 'footer', TRUE],
-      // @todo Add coverage for olivero after fixing
-      // https://www.drupal.org/project/drupal/issues/3215220.
-      // ['olivero', 'footer', TRUE],
-      ['seven', 'footer', TRUE],
-      ['stable', 'footer', FALSE],
-      ['stable9', 'footer', FALSE],
-    ];
-  }
-
-}
diff --git a/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php b/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php
index 73311dbe7..1601f9deb 100644
--- a/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeEditFormTest.php
@@ -45,6 +45,9 @@ class NodeEditFormTest extends NodeTestBase {
    */
   protected static $modules = ['block', 'node', 'datetime'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php b/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
index 8683c4c16..55ac77fda 100644
--- a/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeFieldMultilingualTest.php
@@ -27,6 +27,9 @@ class NodeFieldMultilingualTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
index a9a670d62..ba22129b3 100644
--- a/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodePostSettingsTest.php
@@ -3,8 +3,7 @@
 namespace Drupal\Tests\node\Functional;
 
 /**
- * Tests that the post information (submitted by Username on date) text displays
- * appropriately.
+ * Tests the node setting for displaying author and date information.
  *
  * @group node
  */
@@ -15,6 +14,9 @@ class NodePostSettingsTest extends NodeTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php b/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
index 3619afcc5..ef82a0b7b 100644
--- a/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeQueryAlterTest.php
@@ -40,6 +40,9 @@ class NodeQueryAlterTest extends NodeTestBase {
    */
   protected $noAccessUser2;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php b/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
index a7a1ad4e8..6d77f2ac9 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
@@ -27,6 +27,9 @@ class NodeRSSContentTest extends NodeTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
index 18f7b761b..1dcc16c94 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionPermissionsTest.php
@@ -55,6 +55,9 @@ class NodeRevisionPermissionsTest extends NodeTestBase {
     'delete' => 'delete page revisions',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
index 151bff2e0..eb8072343 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsAllTest.php
@@ -6,8 +6,7 @@
 use Drupal\node\NodeInterface;
 
 /**
- * Create a node with revisions and test viewing, saving, reverting, and
- * deleting revisions for user with access to all.
+ * Tests global node CRUD operation permissions.
  *
  * @group node
  */
@@ -21,7 +20,7 @@ class NodeRevisionsAllTest extends NodeTestBase {
   /**
    * A list of nodes created to be used as starting point of different tests.
    *
-   * @var Drupal\node\NodeInterface[]
+   * @var \Drupal\node\NodeInterface[]
    */
   protected $nodes;
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php b/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
index f22cc6691..8bda0c21b 100644
--- a/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeRevisionsTest.php
@@ -12,8 +12,7 @@
 use Drupal\Component\Serialization\Json;
 
 /**
- * Create a node with revisions and test viewing, saving, reverting, and
- * deleting revisions for users with access for this content type.
+ * Tests per-content-type node CRUD operation permissions.
  *
  * @group node
  */
diff --git a/web/core/modules/node/tests/src/Functional/NodeSaveTest.php b/web/core/modules/node/tests/src/Functional/NodeSaveTest.php
index 8377b2205..dd1060d0f 100644
--- a/web/core/modules/node/tests/src/Functional/NodeSaveTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeSaveTest.php
@@ -30,6 +30,9 @@ class NodeSaveTest extends NodeTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php b/web/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
index 18430e79b..e2fc7a213 100644
--- a/web/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeSyndicateBlockTest.php
@@ -21,6 +21,9 @@ class NodeSyndicateBlockTest extends NodeTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -34,12 +37,12 @@ protected function setUp(): void {
    */
   public function testSyndicateBlock() {
     // Place the "Syndicate" block and confirm that it is rendered.
-    $this->drupalPlaceBlock('node_syndicate_block', ['id' => 'test_syndicate_block']);
+    $this->drupalPlaceBlock('node_syndicate_block', ['id' => 'test_syndicate_block', 'label' => 'Subscribe to RSS Feed']);
     $this->drupalGet('');
     $this->assertSession()->elementExists('xpath', '//div[@id="block-test-syndicate-block"]/*');
 
     // Verify syndicate block title.
-    $this->assertSession()->pageTextContains('Subscribe to Drupal');
+    $this->assertSession()->pageTextContains('Subscribe to RSS Feed');
     // Tests the syndicate block RSS link rendered at non-front pages.
     $this->drupalGet('user');
     $this->clickLink('Subscribe to');
diff --git a/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php b/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
index dcbac6a1e..87d36e2c4 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTitleXSSTest.php
@@ -5,8 +5,7 @@
 use Drupal\Component\Utility\Html;
 
 /**
- * Create a node with dangerous tags in its title and test that they are
- * escaped.
+ * Tests that dangerous tags in the node title are escaped.
  *
  * @group node
  */
diff --git a/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index 8934c958d..307277919 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -61,6 +61,9 @@ class NodeTranslationUITest extends ContentTranslationUITestBase {
    */
   protected $profile = 'standard';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->entityTypeId = 'node';
     $this->bundle = 'article';
@@ -252,16 +255,16 @@ public function testTranslationLinkTheme() {
     $this->drupalLogin($this->administrator);
     $article = $this->drupalCreateNode(['type' => 'article', 'langcode' => $this->langcodes[0]]);
 
-    // Set up Seven as the admin theme and use it for node editing.
-    $this->container->get('theme_installer')->install(['seven']);
+    // Set up the default admin theme and use it for node editing.
+    $this->container->get('theme_installer')->install(['claro']);
     $edit = [];
-    $edit['admin_theme'] = 'seven';
+    $edit['admin_theme'] = 'claro';
     $edit['use_admin_theme'] = TRUE;
     $this->drupalGet('admin/appearance');
     $this->submitForm($edit, 'Save configuration');
     $this->drupalGet('node/' . $article->id() . '/translations');
     // Verify that translation uses the admin theme if edit is admin.
-    $this->assertSession()->responseContains('core/themes/seven/css/base/elements.css');
+    $this->assertSession()->responseContains('core/themes/claro/css/base/elements.css');
 
     // Turn off admin theme for editing, assert inheritance to translations.
     $edit['use_admin_theme'] = FALSE;
@@ -269,7 +272,7 @@ public function testTranslationLinkTheme() {
     $this->submitForm($edit, 'Save configuration');
     $this->drupalGet('node/' . $article->id() . '/translations');
     // Verify that translation uses the frontend theme if edit is frontend.
-    $this->assertSession()->responseNotContains('core/themes/seven/css/base/elements.css');
+    $this->assertSession()->responseNotContains('core/themes/claro/css/base/elements.css');
 
     // Assert presence of translation page itself (vs. DisabledBundle below).
     $this->assertSession()->statusCodeEquals(200);
diff --git a/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
index f7cc1589a..fba16f1e0 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeInitialLanguageTest.php
@@ -23,6 +23,9 @@ class NodeTypeInitialLanguageTest extends NodeTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php b/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
index 07dd0af2a..e7dfe0188 100644
--- a/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeTypeTranslationTest.php
@@ -54,6 +54,9 @@ class NodeTypeTranslationTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Functional/NodeViewTest.php b/web/core/modules/node/tests/src/Functional/NodeViewTest.php
index 689426597..72f0c3afc 100644
--- a/web/core/modules/node/tests/src/Functional/NodeViewTest.php
+++ b/web/core/modules/node/tests/src/Functional/NodeViewTest.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\Tests\node\Functional;
 
-use Drupal\Component\Utility\Html;
-
 /**
  * Tests the node/{node} page.
  *
@@ -37,16 +35,8 @@ public function testHtmlHeadLinks() {
    */
   public function testLinkHeader() {
     $node = $this->drupalCreateNode();
-
-    $expected = [
-      '<' . Html::escape($node->toUrl('canonical')->setAbsolute()->toString()) . '>; rel="canonical"',
-      '<' . Html::escape($node->toUrl('canonical', ['alias' => TRUE])->setAbsolute()->toString()) . '>; rel="shortlink"',
-    ];
-
     $this->drupalGet($node->toUrl());
-
-    $links = $this->getSession()->getResponseHeaders()['Link'];
-    $this->assertEquals($expected, $links);
+    $this->assertArrayNotHasKey('Link', $this->getSession()->getResponseHeaders());
   }
 
   /**
diff --git a/web/core/modules/node/tests/src/Functional/PagePreviewTest.php b/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
index d815a5360..b28fd12ce 100644
--- a/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
+++ b/web/core/modules/node/tests/src/Functional/PagePreviewTest.php
@@ -48,15 +48,8 @@ class PagePreviewTest extends NodeTestBase {
    * The theme to install as the default for testing.
    *
    * @var string
-   *
-   * @todo The fact that PagePreviewTest::testPagePreview() makes assertions
-   *   related to the node type being used for a body class makes Stark a bad
-   *   fit as a base theme. Change the default theme to Starterkit once it is
-   *   stable.
-   *
-   * @see https://www.drupal.org/project/drupal/issues/3274077
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The name of the created field.
@@ -72,6 +65,9 @@ class PagePreviewTest extends NodeTestBase {
    */
   protected $term;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->addDefaultCommentField('node', 'page');
diff --git a/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php b/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
index cdbd7b63c..c4eada729 100644
--- a/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
@@ -68,7 +68,7 @@ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views
       foreach ($langcodes as $langcode) {
         if (!$node->hasTranslation($langcode)) {
           $title = $this->randomMachineName() . ' [' . $node->id() . ':' . $langcode . ']';
-          $translation = $node->addTranslation($langcode, ['title' => $title, 'promote' => FALSE]);
+          $node->addTranslation($langcode, ['title' => $title, 'promote' => FALSE]);
         }
       }
       $node->save();
@@ -78,7 +78,7 @@ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views
     $node = $this->nodes[2];
     $langcode = 'en';
     $title = $this->randomMachineName() . ' [' . $node->id() . ':' . $langcode . ']';
-    $translation = $node->addTranslation($langcode, ['title' => $title]);
+    $node->addTranslation($langcode, ['title' => $title]);
     $node->save();
 
     // Check that all created translations are selected by the test view.
diff --git a/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php b/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
index 9b3e1ce2a..ac17825ab 100644
--- a/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
@@ -301,12 +301,11 @@ protected function doTestFrontPageViewCacheTags($do_assert_views_caches) {
     $cache_context_tags = \Drupal::service('cache_contexts_manager')->convertTokensToKeys($cache_contexts)->getCacheTags();
     $first_page_output_cache_tags = Cache::mergeTags($first_page_result_cache_tags, $cache_context_tags);
     $first_page_output_cache_tags = Cache::mergeTags($first_page_output_cache_tags, [
-        'config:filter.format.plain_text',
-        'node_view',
-        'user_view',
-        'user:0',
-      ]
-    );
+      'config:filter.format.plain_text',
+      'node_view',
+      'user_view',
+      'user:0',
+    ]);
     $view->setDisplay('page_1');
     $view->setCurrentPage(0);
     $this->assertViewsCacheTags(
diff --git a/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php b/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
index 8645a6cdd..9eee667a6 100644
--- a/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
+++ b/web/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
@@ -33,7 +33,7 @@ class PathPluginTest extends NodeTestBase {
   /**
    * Contains all nodes used by this test.
    *
-   * @var Node[]
+   * @var \Drupal\node\Entity\Node[]
    */
   protected $nodes;
 
diff --git a/web/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php b/web/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php
deleted file mode 100644
index ef1d92361..000000000
--- a/web/core/modules/node/tests/src/FunctionalJavascript/TestSettingSummariesContentType.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Drupal\Tests\node\FunctionalJavascript;
-
-use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
-
-/**
- * Tests the JavaScript updating of summaries on content type form.
- *
- * @group node
- */
-class TestSettingSummariesContentType extends WebDriverTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['node'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp(): void {
-    parent::setUp();
-
-    $admin_user = $this->drupalCreateUser(['administer content types']);
-    $this->drupalLogin($admin_user);
-    $this->drupalCreateContentType(['type' => 'test']);
-  }
-
-  /**
-   * Tests a vertical tab 'Workflow' summary.
-   */
-  public function testWorkflowSummary() {
-    $this->drupalGet('admin/structure/types/manage/test');
-    $page = $this->getSession()->getPage();
-    $page->find('css', 'a[href="#edit-workflow"]')->click();
-    $this->assertSession()->waitForElementVisible('css', '[name="options[status]"]');
-    $page->findField('options[status]')->uncheck();
-    $page->findField('options[sticky]')->check();
-    $page->findField('options[promote]')->check();
-    $page->findField('options[revision]')->check();
-    $locator = '[href="#edit-workflow"] .vertical-tabs__menu-item-summary';
-    $page->waitFor(10, function () use ($page, $locator) {
-      $summary = $page->find('css', $locator)->getText();
-      return strpos('Not published', $summary) !== FALSE;
-    });
-    $summary = $page->find('css', $locator)->getText();
-    $this->assertEquals('Not published, Promoted to front page, Sticky at top of lists, Create new revision', $summary);
-  }
-
-}
diff --git a/web/core/modules/node/tests/src/Kernel/Action/UnpublishByKeywordActionTest.php b/web/core/modules/node/tests/src/Kernel/Action/UnpublishByKeywordActionTest.php
index ff28d41fb..c2a69bbba 100644
--- a/web/core/modules/node/tests/src/Kernel/Action/UnpublishByKeywordActionTest.php
+++ b/web/core/modules/node/tests/src/Kernel/Action/UnpublishByKeywordActionTest.php
@@ -18,6 +18,9 @@ class UnpublishByKeywordActionTest extends KernelTestBase {
    */
   protected static $modules = ['action', 'node', 'system', 'user', 'field'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('node');
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php
index dc1966815..a3202cfc5 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareCombinationTest.php
@@ -11,8 +11,7 @@
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
- * Tests node access functionality with multiple languages and two node access
- * modules.
+ * Tests node access with multiple languages and two node access modules.
  *
  * @group node
  */
@@ -50,6 +49,9 @@ class NodeAccessLanguageAwareCombinationTest extends NodeAccessTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -175,7 +177,7 @@ protected function setUp(): void {
     $this->nodes['public_no_language_private'] = $this->drupalCreateNode([
       'field_private' => [['value' => 1]],
       'private' => FALSE,
-        'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+      'langcode' => LanguageInterface::LANGCODE_NOT_SPECIFIED,
     ]);
     $this->nodes['public_no_language_public'] = $this->drupalCreateNode([
       'field_private' => [['value' => 0]],
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php
index e4ec70f98..c4afd4d31 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageAwareTest.php
@@ -10,8 +10,7 @@
 use Drupal\field\Entity\FieldStorageConfig;
 
 /**
- * Tests node_access and select queries with node_access tag functionality with
- * multiple languages with node_access_test_language which is language-aware.
+ * Tests multilingual node access with a language-aware module.
  *
  * @group node
  */
@@ -45,6 +44,9 @@ class NodeAccessLanguageAwareTest extends NodeAccessTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
index 7e9f88730..29a2e96a5 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeAccessLanguageTest.php
@@ -9,8 +9,7 @@
 use Drupal\user\Entity\User;
 
 /**
- * Tests node_access and select queries with node_access tag functionality with
- * multiple languages with a test node access module that is not language-aware.
+ * Tests multilingual node access with a module that is not language-aware.
  *
  * @group node
  */
diff --git a/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php b/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
index b47394bdf..7c973fc7e 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php
@@ -28,6 +28,9 @@ class NodeBodyFieldStorageTest extends KernelTestBase {
     'filter',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installSchema('system', 'sequences');
diff --git a/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php b/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php
index 2aa4f0dfb..87adc800c 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeConditionTest.php
@@ -16,6 +16,9 @@ class NodeConditionTest extends EntityKernelTestBase {
 
   protected static $modules = ['node'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php b/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
index 0f54c38ec..4e62f087c 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php
@@ -49,11 +49,11 @@ public function testAccessToAdministrativeFields() {
     // Create the page node type with revisions disabled.
     $page = NodeType::create([
       'type' => 'page',
-        'new_revision' => FALSE,
+      'new_revision' => FALSE,
     ]);
     $page->save();
 
-    // Create the article node type with revisions disabled.
+    // Create the article node type with revisions enabled.
     $article = NodeType::create([
       'type' => 'article',
       'new_revision' => TRUE,
diff --git a/web/core/modules/node/tests/src/Kernel/NodeListBuilderTest.php b/web/core/modules/node/tests/src/Kernel/NodeListBuilderTest.php
index 11f1a2864..0f1933da2 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeListBuilderTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeListBuilderTest.php
@@ -17,6 +17,9 @@ class NodeListBuilderTest extends KernelTestBase {
    */
   protected static $modules = ['node', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php b/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php
index 537f816ce..1edd85376 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeOwnerTest.php
@@ -22,6 +22,9 @@ class NodeOwnerTest extends EntityKernelTestBase {
    */
   protected static $modules = ['node', 'language'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php b/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
index 61b889834..0b005f1cf 100644
--- a/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
+++ b/web/core/modules/node/tests/src/Kernel/NodeTokenReplaceTest.php
@@ -10,8 +10,7 @@
 use Drupal\Tests\system\Kernel\Token\TokenReplaceKernelTestBase;
 
 /**
- * Generates text using placeholders for dummy content to check node token
- * replacement.
+ * Tests node token replacement.
  *
  * @group node
  */
diff --git a/web/core/modules/node/tests/src/Unit/NodeOperationAccessTest.php b/web/core/modules/node/tests/src/Unit/NodeOperationAccessTest.php
index 694590fec..f33c6159e 100644
--- a/web/core/modules/node/tests/src/Unit/NodeOperationAccessTest.php
+++ b/web/core/modules/node/tests/src/Unit/NodeOperationAccessTest.php
@@ -71,7 +71,7 @@ public function testRevisionOperations($operation, array $hasPermissionMap, $ass
     $language = $this->createMock(LanguageInterface::class);
     $language->expects($this->any())
       ->method('getId')
-      ->will($this->returnValue('de'));
+      ->willReturn('de');
 
     $nid = 333;
     /** @var \Drupal\node\NodeInterface|\PHPUnit\Framework\MockObject\MockObject $node */
diff --git a/web/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php b/web/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php
index 8970654b2..674deab0b 100644
--- a/web/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php
+++ b/web/core/modules/node/tests/src/Unit/PageCache/DenyNodePreviewTest.php
@@ -42,6 +42,9 @@ class DenyNodePreviewTest extends UnitTestCase {
    */
   protected $routeMatch;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->routeMatch = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $this->policy = new DenyNodePreview($this->routeMatch);
@@ -58,7 +61,7 @@ protected function setUp(): void {
   public function testPrivateImageStyleDownloadPolicy($expected_result, $route_name) {
     $this->routeMatch->expects($this->once())
       ->method('getRouteName')
-      ->will($this->returnValue($route_name));
+      ->willReturn($route_name);
 
     $actual_result = $this->policy->check($this->response, $this->request);
     $this->assertSame($expected_result, $actual_result);
diff --git a/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php b/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
index cd421f167..4f3f98b57 100644
--- a/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
+++ b/web/core/modules/node/tests/src/Unit/Plugin/views/field/NodeBulkFormTest.php
@@ -33,26 +33,26 @@ public function testConstructor() {
       $action = $this->createMock('\Drupal\system\ActionConfigEntityInterface');
       $action->expects($this->any())
         ->method('getType')
-        ->will($this->returnValue('node'));
+        ->willReturn('node');
       $actions[$i] = $action;
     }
 
     $action = $this->createMock('\Drupal\system\ActionConfigEntityInterface');
     $action->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('user'));
+      ->willReturn('user');
     $actions[] = $action;
 
     $entity_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $entity_storage->expects($this->any())
       ->method('loadMultiple')
-      ->will($this->returnValue($actions));
+      ->willReturn($actions);
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->once())
       ->method('getStorage')
       ->with('action')
-      ->will($this->returnValue($entity_storage));
+      ->willReturn($entity_storage);
 
     $entity_repository = $this->createMock(EntityRepositoryInterface::class);
 
@@ -66,7 +66,7 @@ public function testConstructor() {
     $views_data->expects($this->any())
       ->method('get')
       ->with('node')
-      ->will($this->returnValue(['table' => ['entity type' => 'node']]));
+      ->willReturn(['table' => ['entity type' => 'node']]);
     $container = new ContainerBuilder();
     $container->set('views.views_data', $views_data);
     $container->set('string_translation', $this->getStringTranslationStub());
@@ -76,7 +76,7 @@ public function testConstructor() {
     $storage->expects($this->any())
       ->method('get')
       ->with('base_table')
-      ->will($this->returnValue('node'));
+      ->willReturn('node');
 
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
index 855d5b46c..a09152d50 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListFloatItem.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Field\FieldFilteredMarkup;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
@@ -25,7 +26,7 @@ class ListFloatItem extends ListItemBase {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('float')
-      ->setLabel(t('Float value'))
+      ->setLabel(new TranslatableMarkup('Float value'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -51,12 +52,12 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
    * {@inheritdoc}
    */
   protected function allowedValuesDescription() {
-    $description = '<p>' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
-    $description .= '<br/>' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
-    $description .= '<br/>' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
-    $description .= '<br/>' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
+    $description = '<p>' . $this->t('The possible values this field can contain. Enter one value per line, in the format key|label.');
+    $description .= '<br/>' . $this->t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
+    $description .= '<br/>' . $this->t('The label is optional: if a line contains a single number, it will be used as key and label.');
+    $description .= '<br/>' . $this->t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
     $description .= '</p>';
-    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '</p>';
+    $description .= '<p>' . $this->t('Allowed HTML tags in labels: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '</p>';
     return $description;
   }
 
@@ -83,7 +84,7 @@ protected static function extractAllowedValues($string, $has_data) {
    */
   protected static function validateAllowedValue($option) {
     if (!is_numeric($option)) {
-      return t('Allowed values list: each key must be a valid integer or decimal.');
+      return new TranslatableMarkup('Allowed values list: each key must be a valid integer or decimal.');
     }
   }
 
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
index 8a9600751..eabec6f02 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListIntegerItem.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Field\FieldFilteredMarkup;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
@@ -25,7 +26,7 @@ class ListIntegerItem extends ListItemBase {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('integer')
-      ->setLabel(t('Integer value'))
+      ->setLabel(new TranslatableMarkup('Integer value'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -51,12 +52,12 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
    * {@inheritdoc}
    */
   protected function allowedValuesDescription() {
-    $description = '<p>' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
-    $description .= '<br/>' . t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
-    $description .= '<br/>' . t('The label is optional: if a line contains a single number, it will be used as key and label.');
-    $description .= '<br/>' . t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
+    $description = '<p>' . $this->t('The possible values this field can contain. Enter one value per line, in the format key|label.');
+    $description .= '<br/>' . $this->t('The key is the stored value, and must be numeric. The label will be used in displayed values and edit forms.');
+    $description .= '<br/>' . $this->t('The label is optional: if a line contains a single number, it will be used as key and label.');
+    $description .= '<br/>' . $this->t('Lists of labels are also accepted (one label per line), only if the field does not hold any values yet. Numeric keys will be automatically generated from the positions in the list.');
     $description .= '</p>';
-    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '</p>';
+    $description .= '<p>' . $this->t('Allowed HTML tags in labels: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '</p>';
     return $description;
   }
 
@@ -65,7 +66,7 @@ protected function allowedValuesDescription() {
    */
   protected static function validateAllowedValue($option) {
     if (!preg_match('/^-?\d+$/', $option)) {
-      return t('Allowed values list: keys must be integers.');
+      return new TranslatableMarkup('Allowed values list: keys must be integers.');
     }
   }
 
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
index 7c3675894..6229b931d 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Form\OptGroup;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\OptionsProviderInterface;
 
 /**
@@ -64,6 +65,10 @@ public function getSettableOptions(AccountInterface $account = NULL) {
    */
   public static function generateSampleValue(FieldDefinitionInterface $field_definition) {
     $allowed_options = options_allowed_values($field_definition->getFieldStorageDefinition());
+    if (empty($allowed_options)) {
+      $values['value'] = NULL;
+      return $values;
+    }
     $values['value'] = array_rand($allowed_options);
     return $values;
   }
@@ -84,7 +89,7 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['allowed_values'] = [
       '#type' => 'textarea',
-      '#title' => t('Allowed values list'),
+      '#title' => $this->t('Allowed values list'),
       '#default_value' => $this->allowedValuesString($allowed_values),
       '#rows' => 10,
       '#access' => empty($allowed_values_function),
@@ -99,8 +104,8 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['allowed_values_function'] = [
       '#type' => 'item',
-      '#title' => t('Allowed values list'),
-      '#markup' => t('The value of this field is being determined by the %function function and may not be changed.', ['%function' => $allowed_values_function]),
+      '#title' => $this->t('Allowed values list'),
+      '#markup' => $this->t('The value of this field is being determined by the %function function and may not be changed.', ['%function' => $allowed_values_function]),
       '#access' => !empty($allowed_values_function),
       '#value' => $allowed_values_function,
     ];
@@ -131,7 +136,7 @@ public static function validateAllowedValues($element, FormStateInterface $form_
     $values = static::extractAllowedValues($element['#value'], $element['#field_has_data']);
 
     if (!is_array($values)) {
-      $form_state->setError($element, t('Allowed values list: invalid input.'));
+      $form_state->setError($element, new TranslatableMarkup('Allowed values list: invalid input.'));
     }
     else {
       // Check that keys are valid for the field type.
@@ -146,7 +151,7 @@ public static function validateAllowedValues($element, FormStateInterface $form_
       if ($element['#field_has_data']) {
         $lost_keys = array_keys(array_diff_key($element['#allowed_values'], $values));
         if (_options_values_in_use($element['#entity_type'], $element['#field_name'], $lost_keys)) {
-          $form_state->setError($element, t('Allowed values list: some values are being removed while currently in use.'));
+          $form_state->setError($element, new TranslatableMarkup('Allowed values list: some values are being removed while currently in use.'));
         }
       }
 
diff --git a/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php b/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
index 555030764..acd86c0fa 100644
--- a/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
+++ b/web/core/modules/options/src/Plugin/Field/FieldType/ListStringItem.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Field\FieldFilteredMarkup;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\TypedData\DataDefinition;
 
 /**
@@ -25,7 +26,7 @@ class ListStringItem extends ListItemBase {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('string')
-      ->setLabel(t('Text value'))
+      ->setLabel(new TranslatableMarkup('Text value'))
       ->addConstraint('Length', ['max' => 255])
       ->setRequired(TRUE);
 
@@ -53,11 +54,11 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
    * {@inheritdoc}
    */
   protected function allowedValuesDescription() {
-    $description = '<p>' . t('The possible values this field can contain. Enter one value per line, in the format key|label.');
-    $description .= '<br/>' . t('The key is the stored value. The label will be used in displayed values and edit forms.');
-    $description .= '<br/>' . t('The label is optional: if a line contains a single string, it will be used as key and label.');
+    $description = '<p>' . $this->t('The possible values this field can contain. Enter one value per line, in the format key|label.');
+    $description .= '<br/>' . $this->t('The key is the stored value. The label will be used in displayed values and edit forms.');
+    $description .= '<br/>' . $this->t('The label is optional: if a line contains a single string, it will be used as key and label.');
     $description .= '</p>';
-    $description .= '<p>' . t('Allowed HTML tags in labels: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '</p>';
+    $description .= '<p>' . $this->t('Allowed HTML tags in labels: @tags', ['@tags' => FieldFilteredMarkup::displayAllowedTags()]) . '</p>';
     return $description;
   }
 
@@ -66,7 +67,7 @@ protected function allowedValuesDescription() {
    */
   protected static function validateAllowedValue($option) {
     if (mb_strlen($option) > 255) {
-      return t('Allowed values list: each key must be a string at most 255 characters long.');
+      return new TranslatableMarkup('Allowed values list: each key must be a string at most 255 characters long.');
     }
   }
 
diff --git a/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
index 4b3b7be25..bc5935771 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsDynamicValuesTestBase.php
@@ -22,7 +22,7 @@ abstract class OptionsDynamicValuesTestBase extends FieldTestBase {
   /**
    * The created entity.
    *
-   * @var \Drupal\Core\Entity\Entity
+   * @var \Drupal\Core\Entity\EntityInterface
    */
   protected $entity;
 
@@ -45,6 +45,9 @@ abstract class OptionsDynamicValuesTestBase extends FieldTestBase {
    */
   protected $test;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
index 23e965bd4..75cd7fb17 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFieldUITest.php
@@ -59,6 +59,9 @@ class OptionsFieldUITest extends FieldTestBase {
    */
   protected $adminPath;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -344,9 +347,7 @@ public function testNodeDisplay() {
     $on = $this->randomMachineName();
     $off = $this->randomMachineName();
     $edit = [
-      'settings[allowed_values]' =>
-        "1|$on
-        0|$off",
+      'settings[allowed_values]' => "1|$on" . PHP_EOL . "0|$off",
     ];
 
     $this->drupalGet($this->adminPath);
diff --git a/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
index e70ba1ac8..8365d3f16 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsFloatFieldImportTest.php
@@ -31,6 +31,9 @@ class OptionsFloatFieldImportTest extends FieldTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
index 486c0b21c..dcbdc12e9 100644
--- a/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
+++ b/web/core/modules/options/tests/src/Functional/OptionsWidgetsTest.php
@@ -54,6 +54,9 @@ class OptionsWidgetsTest extends FieldTestBase {
    */
   protected $float;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php b/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
index 001a04e17..b0ba80f22 100644
--- a/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
+++ b/web/core/modules/options/tests/src/Kernel/OptionsFieldTest.php
@@ -98,4 +98,14 @@ public function testUpdateAllowedValues() {
     $this->entityValidateAndSave($entity);
   }
 
+  /**
+   * Tests that ::generateSampleItems does not fail with empty allowed values.
+   */
+  public function testGenerateSampleItemsWithNoAllowedValues() {
+    $this->fieldStorage->setSetting('allowed_values', [])->save();
+    $entity = EntityTest::create();
+    $value = $entity->{$this->fieldName}->generateSampleItems();
+    $this->assertNull($value);
+  }
+
 }
diff --git a/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php b/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
index 8be66d1c2..a8395e4b8 100644
--- a/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
+++ b/web/core/modules/options/tests/src/Kernel/Views/OptionsTestBase.php
@@ -48,6 +48,9 @@ abstract class OptionsTestBase extends ViewsKernelTestBase {
    */
   protected $fieldNames;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
     $this->mockStandardInstall();
diff --git a/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php b/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
index 5164c5794..a4d9bacb0 100644
--- a/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
+++ b/web/core/modules/page_cache/tests/src/Functional/PageCacheTest.php
@@ -117,8 +117,9 @@ public function testPageCacheTagsIndependentFromCacheabilityHeaders() {
   }
 
   /**
-   * Tests support for different cache items with different request formats
-   * specified via a query parameter.
+   * Tests support for different cache items with different request formats.
+   *
+   * The request formats are specified via a query parameter.
    */
   public function testQueryParameterFormatRequests() {
     $config = $this->config('system.performance');
diff --git a/web/core/modules/path/path.js b/web/core/modules/path/path.js
index 500fd5cbe..ea241ae68 100644
--- a/web/core/modules/path/path.js
+++ b/web/core/modules/path/path.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.pathDetailsSummaries = {
     attach: function attach(context) {
diff --git a/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php b/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php
index 441c65c94..088ef784e 100644
--- a/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php
+++ b/web/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php
@@ -44,7 +44,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element['source'] = [
       '#type' => 'value',
       '#value' => !$entity->isNew() ? '/' . $entity->toUrl()->getInternalPath() : NULL,
-     ];
+    ];
     $element['langcode'] = [
       '#type' => 'value',
       '#value' => $items[$delta]->langcode,
@@ -56,7 +56,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     if (isset($form['advanced'])) {
       $element += [
         '#type' => 'details',
-        '#title' => t('URL path settings'),
+        '#title' => $this->t('URL path settings'),
         '#open' => !empty($items[$delta]->alias),
         '#group' => 'advanced',
         '#access' => $entity->get('path')->access('edit'),
diff --git a/web/core/modules/path/tests/src/Functional/PathAdminTest.php b/web/core/modules/path/tests/src/Functional/PathAdminTest.php
index b3228d400..d48a791ed 100644
--- a/web/core/modules/path/tests/src/Functional/PathAdminTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAdminTest.php
@@ -21,6 +21,9 @@ class PathAdminTest extends PathTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/path/tests/src/Functional/PathAliasTest.php b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
index 4a5c8d6cc..79523459a 100644
--- a/web/core/modules/path/tests/src/Functional/PathAliasTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathAliasTest.php
@@ -7,8 +7,7 @@
 use Drupal\Core\Url;
 
 /**
- * Add, edit, delete, and change alias and verify its consistency in the
- * database.
+ * Tests modifying path aliases from the UI.
  *
  * @group path
  */
@@ -26,6 +25,9 @@ class PathAliasTest extends PathTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -148,13 +150,13 @@ public function testAdminAlias() {
     $this->submitForm($edit, 'Save');
 
     // Confirm no duplicate was created.
-    $this->assertSession()->pageTextContains("The alias {$edit['alias[0][value]']} is already in use in this language.");
+    $this->assertSession()->statusMessageContains("The alias {$edit['alias[0][value]']} is already in use in this language.", 'error');
 
     $edit_upper = $edit;
     $edit_upper['alias[0][value]'] = mb_strtoupper($edit['alias[0][value]']);
     $this->drupalGet('admin/config/search/path/add');
     $this->submitForm($edit_upper, 'Save');
-    $this->assertSession()->pageTextContains("The alias {$edit_upper['alias[0][value]']} could not be added because it is already in use in this language with different capitalization: {$edit['alias[0][value]']}.");
+    $this->assertSession()->statusMessageContains("The alias {$edit_upper['alias[0][value]']} could not be added because it is already in use in this language with different capitalization: {$edit['alias[0][value]']}.", 'error');
 
     // Delete alias.
     $this->drupalGet('admin/config/search/path/edit/' . $pid);
@@ -215,7 +217,7 @@ public function testAdminAlias() {
     $edit['path[0][value]'] = '/node/' . $node2->id();
     $this->drupalGet('admin/config/search/path/edit/' . $pid);
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains('The alias has been saved.');
+    $this->assertSession()->statusMessageContains('The alias has been saved.', 'status');
     $this->drupalGet($edit['alias[0][value]']);
     // Previous alias should no longer work.
     $this->assertSession()->pageTextNotContains($node4->label());
@@ -230,7 +232,7 @@ public function testAdminAlias() {
     $edit['path[0][value]'] = '/node/' . $node3->id();
     $this->drupalGet('admin/config/search/path/edit/' . $pid);
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains("The alias {$edit['alias[0][value]']} is already in use in this language.");
+    $this->assertSession()->statusMessageContains("The alias {$edit['alias[0][value]']} is already in use in this language.", 'error');
 
     // Create an alias without a starting slash.
     $node5 = $this->drupalCreateNode();
@@ -243,8 +245,8 @@ public function testAdminAlias() {
     $this->submitForm($edit, 'Save');
 
     $this->assertSession()->addressEquals('admin/config/search/path/add');
-    $this->assertSession()->pageTextContains('The source path has to start with a slash.');
-    $this->assertSession()->pageTextContains('The alias path has to start with a slash.');
+    $this->assertSession()->statusMessageContains('The source path has to start with a slash.', 'error');
+    $this->assertSession()->statusMessageContains('The alias path has to start with a slash.', 'error');
   }
 
   /**
@@ -310,7 +312,7 @@ public function testNodeAlias() {
     $this->submitForm($edit, 'Save');
 
     // Confirm that the alias didn't make a duplicate.
-    $this->assertSession()->pageTextContains("The alias {$edit['path[0][alias]']} is already in use in this language.");
+    $this->assertSession()->statusMessageContains("The alias {$edit['path[0][alias]']} is already in use in this language.", 'error');
 
     // Delete alias.
     $this->drupalGet('node/' . $node1->id() . '/edit');
@@ -367,7 +369,7 @@ public function testNodeAlias() {
     $edit = ['path[0][alias]' => '0'];
     $this->drupalGet($node6->toUrl('edit-form'));
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains('The alias path has to start with a slash.');
+    $this->assertSession()->statusMessageContains('The alias path has to start with a slash.', 'error');
 
     // Create an invalid alias with two leading slashes and verify that the
     // extra slash is removed when the link is generated. This ensures that URL
@@ -426,7 +428,7 @@ public function testDuplicateNodeAlias() {
     $node_two = $this->drupalCreateNode();
     $this->drupalGet('node/' . $node_two->id() . '/edit');
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains("The alias {$edit['path[0][alias]']} is already in use in this language.");
+    $this->assertSession()->statusMessageContains("The alias {$edit['path[0][alias]']} is already in use in this language.", 'error');
     $path_alias = $this->assertSession()->fieldExists('path[0][alias]');
     $this->assertSession()->fieldValueEquals('path[0][alias]', $edit['path[0][alias]']);
     $this->assertTrue($path_alias->hasClass('error'));
@@ -442,7 +444,7 @@ public function testDuplicateNodeAlias() {
     // This error should still be present next to the field.
     $this->assertSession()->pageTextContains("The alias {$edit['path[0][alias]']} is already in use in this language.");
     // The validation error set for the page should include this text.
-    $this->assertSession()->pageTextContains('1 error has been found: URL alias');
+    $this->assertSession()->statusMessageContains('1 error has been found: URL alias', 'error');
     // The text 'URL alias' should be a link.
     $this->assertSession()->linkExists('URL alias');
     // The link should be to the ID of the URL alias field.
diff --git a/web/core/modules/path/tests/src/Functional/PathContentModerationTest.php b/web/core/modules/path/tests/src/Functional/PathContentModerationTest.php
index 46e9a92d2..445772769 100644
--- a/web/core/modules/path/tests/src/Functional/PathContentModerationTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathContentModerationTest.php
@@ -94,7 +94,7 @@ public function testNodePathAlias() {
       'path[0][alias]' => '/moderated-content',
       'moderation_state[0][state]' => 'draft',
     ], 'Save');
-    $this->assertSession()->pageTextNotContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageNotContains('You can only change the URL alias for the published version of this content.');
 
     // Create some moderated content with no path alias.
     $this->drupalGet('node/add/moderated');
@@ -114,7 +114,7 @@ public function testNodePathAlias() {
       'path[0][alias]' => '/pending-revision',
       'moderation_state[0][state]' => 'draft',
     ], 'Save');
-    $this->assertSession()->pageTextContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageContains('You can only change the URL alias for the published version of this content.', 'error');
 
     // Create some moderated content with no path alias.
     $this->drupalGet('node/add/moderated');
@@ -134,7 +134,7 @@ public function testNodePathAlias() {
       'path[0][alias]' => '',
       'moderation_state[0][state]' => 'draft',
     ], 'Save');
-    $this->assertSession()->pageTextNotContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageNotContains('You can only change the URL alias for the published version of this content.');
   }
 
   /**
@@ -176,7 +176,7 @@ public function testTranslatedModeratedNodeAlias() {
     $this->drupalGet('fr/node/' . $default_node->id() . '/edit');
     $this->submitForm($edit_new_translation_draft_with_alias, 'Save (this translation)');
     // Confirm the expected error.
-    $this->assertSession()->pageTextContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageContains('You can only change the URL alias for the published version of this content.', 'error');
 
     // Create new draft revision for translation without changing path alias.
     $edit_new_translation_draft = [
@@ -186,7 +186,7 @@ public function testTranslatedModeratedNodeAlias() {
     $this->drupalGet('fr/node/' . $default_node->id() . '/edit');
     $this->submitForm($edit_new_translation_draft, 'Save (this translation)');
     // Confirm that the new draft revision was created.
-    $this->assertSession()->pageTextNotContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageNotContains('You can only change the URL alias for the published version of this content.');
     $this->assertSession()->pageTextContains($edit_new_translation_draft['body[0][value]']);
     $this->assertPathsAreAccessible([$default_path, $translation_path]);
 
@@ -199,7 +199,7 @@ public function testTranslatedModeratedNodeAlias() {
     $this->drupalGet('fr/node/' . $default_node->id() . '/edit');
     $this->submitForm($edit_new_translation_draft_with_defaults_alias, 'Save (this translation)');
     // Verify the expected error.
-    $this->assertSession()->pageTextContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageContains('You can only change the URL alias for the published version of this content.', 'error');
 
     // Try to create new draft revision for translation with deleted (empty)
     // path alias.
@@ -211,7 +211,7 @@ public function testTranslatedModeratedNodeAlias() {
     $this->drupalGet('fr/node/' . $default_node->id() . '/edit');
     $this->submitForm($edit_new_translation_draft_empty_alias, 'Save (this translation)');
     // Confirm the expected error.
-    $this->assertSession()->pageTextContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageContains('You can only change the URL alias for the published version of this content.', 'error');
 
     // Create new default (published) revision for translation with new path
     // alias.
@@ -223,7 +223,7 @@ public function testTranslatedModeratedNodeAlias() {
     $this->drupalGet('fr/node/' . $default_node->id() . '/edit');
     $this->submitForm($edit_new_translation, 'Save (this translation)');
     // Confirm that the new published revision was created.
-    $this->assertSession()->pageTextNotContains('You can only change the URL alias for the published version of this content.');
+    $this->assertSession()->statusMessageNotContains('You can only change the URL alias for the published version of this content.');
     $this->assertSession()->pageTextContains($edit_new_translation['body[0][value]']);
     $this->assertSession()->addressEquals('fr' . $edit_new_translation['path[0][alias]']);
     $this->assertPathsAreAccessible([$default_path]);
diff --git a/web/core/modules/path/tests/src/Functional/PathLanguageTest.php b/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
index bbf2cd62f..d6d62f6a8 100644
--- a/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathLanguageTest.php
@@ -33,6 +33,9 @@ class PathLanguageTest extends PathTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php b/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
index f49788f9e..5ca4e94fa 100644
--- a/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php
@@ -23,6 +23,9 @@ class PathLanguageUiTest extends PathTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/path/tests/src/Functional/PathMediaFormTest.php b/web/core/modules/path/tests/src/Functional/PathMediaFormTest.php
index aa6b9555e..3f66691f8 100644
--- a/web/core/modules/path/tests/src/Functional/PathMediaFormTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathMediaFormTest.php
@@ -19,7 +19,7 @@ class PathMediaFormTest extends PathTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * {@inheritdoc}
@@ -53,7 +53,7 @@ public function testMediaForm() {
     $this->drupalGet('media/add/' . $media_type_id);
 
     // Make sure we have a vertical tab fieldset and 'Path' field.
-    $assert_session->elementContains('css', '.form-type-vertical-tabs #edit-path-0 summary', 'URL alias');
+    $assert_session->elementContains('css', '.js-form-type-vertical-tabs #edit-path-0 summary', 'URL alias');
     $assert_session->fieldExists('path[0][alias]');
 
     // Disable the 'Path' field for this content type.
@@ -64,7 +64,7 @@ public function testMediaForm() {
     $this->drupalGet('media/add/' . $media_type_id);
 
     // See if the whole fieldset is gone now.
-    $assert_session->elementNotExists('css', '.form-type-vertical-tabs #edit-path-0');
+    $assert_session->elementNotExists('css', '.js-form-type-vertical-tabs #edit-path-0');
     $assert_session->fieldNotExists('path[0][alias]');
   }
 
diff --git a/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php b/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
index d1db2ee3c..cca9e55f6 100644
--- a/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathNodeFormTest.php
@@ -19,8 +19,11 @@ class PathNodeFormTest extends PathTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -41,7 +44,7 @@ public function testNodeForm() {
     $this->drupalGet('node/add/page');
 
     // Make sure we have a vertical tab fieldset and 'Path' fields.
-    $assert_session->elementContains('css', '.form-type-vertical-tabs #edit-path-0 summary', 'URL alias');
+    $assert_session->elementContains('css', '.js-form-type-vertical-tabs #edit-path-0 summary', 'URL alias');
     $assert_session->fieldExists('path[0][alias]');
 
     // Disable the 'Path' field for this content type.
@@ -52,7 +55,7 @@ public function testNodeForm() {
     $this->drupalGet('node/add/page');
 
     // See if the whole fieldset is gone now.
-    $assert_session->elementNotExists('css', '.form-type-vertical-tabs #edit-path-0');
+    $assert_session->elementNotExists('css', '.js-form-type-vertical-tabs #edit-path-0');
     $assert_session->fieldNotExists('path[0][alias]');
   }
 
diff --git a/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
index 6c90c63ed..f49d702de 100644
--- a/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
+++ b/web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php
@@ -23,6 +23,9 @@ class PathTaxonomyTermTest extends PathTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/path/tests/src/Functional/PathTestBase.php b/web/core/modules/path/tests/src/Functional/PathTestBase.php
index 3e448f256..2bffb4a4f 100644
--- a/web/core/modules/path/tests/src/Functional/PathTestBase.php
+++ b/web/core/modules/path/tests/src/Functional/PathTestBase.php
@@ -19,6 +19,9 @@ abstract class PathTestBase extends BrowserTestBase {
    */
   protected static $modules = ['node', 'path'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php b/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
index 5ef693cac..2b5257b95 100644
--- a/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
+++ b/web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php
@@ -27,6 +27,9 @@ class PathNoCanonicalLinkTest extends KernelTestBase {
     'system',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/path_alias/src/AliasManager.php b/web/core/modules/path_alias/src/AliasManager.php
index fb695dd34..57eb23466 100644
--- a/web/core/modules/path_alias/src/AliasManager.php
+++ b/web/core/modules/path_alias/src/AliasManager.php
@@ -221,7 +221,7 @@ public function getAliasByPath($path, $langcode = NULL) {
       if (!empty($this->preloadedPathLookups[$langcode])) {
         $this->lookupMap[$langcode] = $this->pathAliasRepository->preloadPathAlias($this->preloadedPathLookups[$langcode], $langcode);
         // Keep a record of paths with no alias to avoid querying twice.
-        $this->noAlias[$langcode] = array_flip(array_diff_key($this->preloadedPathLookups[$langcode], array_keys($this->lookupMap[$langcode])));
+        $this->noAlias[$langcode] = array_flip(array_diff($this->preloadedPathLookups[$langcode], array_keys($this->lookupMap[$langcode])));
       }
     }
 
@@ -275,9 +275,6 @@ public function cacheClear($source = NULL) {
    *
    * @param string $path
    *   An optional path for which an alias is being inserted.
-   *
-   * @return
-   *   An array containing a white list of path aliases.
    */
   protected function pathAliasWhitelistRebuild($path = NULL) {
     // When paths are inserted, only rebuild the whitelist if the path has a top
diff --git a/web/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php b/web/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
index 0e76f07a1..a03417c35 100644
--- a/web/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
+++ b/web/core/modules/path_alias/tests/src/Unit/AliasManagerTest.php
@@ -91,12 +91,12 @@ public function testGetPathByAliasNoMatch() {
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
       ->with(LanguageInterface::TYPE_URL)
-      ->will($this->returnValue($language));
+      ->willReturn($language);
 
     $this->aliasRepository->expects($this->once())
       ->method('lookupByAlias')
       ->with($alias, $language->getId())
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->assertEquals($alias, $this->aliasManager->getPathByAlias($alias));
     // Call it twice to test the static cache.
@@ -117,7 +117,7 @@ public function testGetPathByAliasMatch() {
     $this->aliasRepository->expects($this->once())
       ->method('lookupByAlias')
       ->with($alias, $language->getId())
-      ->will($this->returnValue(['path' => $path]));
+      ->willReturn(['path' => $path]);
 
     $this->assertEquals($path, $this->aliasManager->getPathByAlias($alias));
     // Call it twice to test the static cache.
@@ -139,7 +139,7 @@ public function testGetPathByAliasLangcode() {
     $this->aliasRepository->expects($this->once())
       ->method('lookupByAlias')
       ->with($alias, 'de')
-      ->will($this->returnValue(['path' => $path]));
+      ->willReturn(['path' => $path]);
 
     $this->assertEquals($path, $this->aliasManager->getPathByAlias($alias, 'de'));
     // Call it twice to test the static cache.
@@ -161,7 +161,7 @@ public function testGetAliasByPathWhitelist() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     // The whitelist returns FALSE for that path part, so the storage should
     // never be called.
@@ -188,12 +188,12 @@ public function testGetAliasByPathNoMatch() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->aliasRepository->expects($this->once())
       ->method('lookupBySystemPath')
       ->with($path, $language->getId())
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->assertEquals($path, $this->aliasManager->getAliasByPath($path));
     // Call it twice to test the static cache.
@@ -226,12 +226,12 @@ public function testGetAliasByPathMatch() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->aliasRepository->expects($this->once())
       ->method('lookupBySystemPath')
       ->with($path, $language->getId())
-      ->will($this->returnValue(['alias' => $alias]));
+      ->willReturn(['alias' => $alias]);
 
     $this->assertEquals($alias, $this->aliasManager->getAliasByPath($path));
     // Call it twice to test the static cache.
@@ -259,11 +259,18 @@ public function testGetAliasByPathCachedMatch() {
 
     $language = $this->setUpCurrentLanguage();
 
-    $cached_paths = [$language->getId() => [$path]];
+    // Use a set of cached paths where the tested path is in any position, not
+    // only in the first one.
+    $cached_paths = [
+      $language->getId() => [
+        '/another/path',
+        $path,
+      ],
+    ];
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) ['data' => $cached_paths]));
+      ->willReturn((object) ['data' => $cached_paths]);
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -271,12 +278,12 @@ public function testGetAliasByPathCachedMatch() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->aliasRepository->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue([$path => $alias]));
+      ->willReturn([$path => $alias]);
 
     // LookupPathAlias should not be called.
     $this->aliasRepository->expects($this->never())
@@ -311,7 +318,7 @@ public function testGetAliasByPathCachedMissLanguage() {
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) ['data' => $cached_paths]));
+      ->willReturn((object) ['data' => $cached_paths]);
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -319,7 +326,7 @@ public function testGetAliasByPathCachedMissLanguage() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     // The requested language is different than the cached, so this will
     // need to load.
@@ -328,7 +335,7 @@ public function testGetAliasByPathCachedMissLanguage() {
     $this->aliasRepository->expects($this->once())
       ->method('lookupBySystemPath')
       ->with($path, $language->getId())
-      ->will($this->returnValue(['alias' => $alias]));
+      ->willReturn(['alias' => $alias]);
 
     $this->assertEquals($alias, $this->aliasManager->getAliasByPath($path));
     // Call it twice to test the static cache.
@@ -360,7 +367,7 @@ public function testGetAliasByPathCachedMissNoAlias() {
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) ['data' => $cached_paths]));
+      ->willReturn((object) ['data' => $cached_paths]);
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -368,12 +375,12 @@ public function testGetAliasByPathCachedMissNoAlias() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->aliasRepository->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue([$cached_path => $cached_alias]));
+      ->willReturn([$cached_path => $cached_alias]);
 
     // LookupPathAlias() should not be called.
     $this->aliasRepository->expects($this->never())
@@ -408,7 +415,7 @@ public function testGetAliasByPathUncachedMissNoAlias() {
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) ['data' => $cached_paths]));
+      ->willReturn((object) ['data' => $cached_paths]);
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -416,17 +423,17 @@ public function testGetAliasByPathUncachedMissNoAlias() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->aliasRepository->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue([$cached_path => $cached_alias]));
+      ->willReturn([$cached_path => $cached_alias]);
 
     $this->aliasRepository->expects($this->once())
       ->method('lookupBySystemPath')
       ->with($path, $language->getId())
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->assertEquals($path, $this->aliasManager->getAliasByPath($path));
     // Call it twice to test the static cache.
@@ -494,7 +501,7 @@ public function testGetAliasByPathUncachedMissWithAlias() {
     $this->cache->expects($this->once())
       ->method('get')
       ->with($this->cacheKey)
-      ->will($this->returnValue((object) ['data' => $cached_paths]));
+      ->willReturn((object) ['data' => $cached_paths]);
 
     // Simulate a request so that the preloaded paths are fetched.
     $this->aliasManager->setCacheKey($this->path);
@@ -502,17 +509,17 @@ public function testGetAliasByPathUncachedMissWithAlias() {
     $this->aliasWhitelist->expects($this->any())
       ->method('get')
       ->with($path_part1)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->aliasRepository->expects($this->once())
       ->method('preloadPathAlias')
       ->with($cached_paths[$language->getId()], $language->getId())
-      ->will($this->returnValue([$cached_path => $cached_alias]));
+      ->willReturn([$cached_path => $cached_alias]);
 
     $this->aliasRepository->expects($this->once())
       ->method('lookupBySystemPath')
       ->with($path, $language->getId())
-      ->will($this->returnValue(['alias' => $new_alias]));
+      ->willReturn(['alias' => $new_alias]);
 
     $this->assertEquals($new_alias, $this->aliasManager->getAliasByPath($path));
     // Call it twice to test the static cache.
@@ -537,7 +544,7 @@ protected function setUpCurrentLanguage() {
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
       ->with(LanguageInterface::TYPE_URL)
-      ->will($this->returnValue($language));
+      ->willReturn($language);
 
     return $language;
   }
diff --git a/web/core/modules/path_alias/tests/src/Unit/PathProcessor/AliasPathProcessorTest.php b/web/core/modules/path_alias/tests/src/Unit/PathProcessor/AliasPathProcessorTest.php
index 5da232eb4..43cbc5387 100644
--- a/web/core/modules/path_alias/tests/src/Unit/PathProcessor/AliasPathProcessorTest.php
+++ b/web/core/modules/path_alias/tests/src/Unit/PathProcessor/AliasPathProcessorTest.php
@@ -29,6 +29,9 @@ class AliasPathProcessorTest extends UnitTestCase {
    */
   protected $pathProcessor;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->aliasManager = $this->createMock('Drupal\path_alias\AliasManagerInterface');
     $this->pathProcessor = new AliasPathProcessor($this->aliasManager);
diff --git a/web/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php b/web/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php
index 8df056b6f..efd86a4a2 100644
--- a/web/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php
+++ b/web/core/modules/pgsql/src/Driver/Database/pgsql/Connection.php
@@ -368,7 +368,7 @@ public function rollbackSavepoint($savepoint_name = 'mimic_implicit_commit') {
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public function hasJson(): bool {
     try {
diff --git a/web/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php b/web/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php
index ecf514018..d904a1f33 100644
--- a/web/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php
+++ b/web/core/modules/pgsql/src/Driver/Database/pgsql/Schema.php
@@ -329,8 +329,7 @@ protected function createTableSql($name, $table) {
   }
 
   /**
-   * Create an SQL string for a field to be used in table creation or
-   * alteration.
+   * Creates a safe SQL string for a field for table creation or alteration.
    *
    * @param $name
    *   Name of the field.
@@ -461,7 +460,7 @@ public function getFieldTypeMap() {
       'serial:medium' => 'serial',
       'serial:big' => 'bigserial',
       'serial:normal' => 'serial',
-      ];
+    ];
     return $map;
   }
 
@@ -1044,8 +1043,9 @@ public function getComment($table, $column = NULL) {
   }
 
   /**
-   * Calculates a base-64 encoded, PostgreSQL-safe sha-256 hash per PostgreSQL
-   * documentation: 4.1. Lexical Structure.
+   * Calculates a base-64 encoded PostgreSQL-safe sha-256 hash.
+   *
+   * The hash is modified to according to  @link https://www.postgresql.org/docs/current/sql-syntax-lexical.html PostgreSQL Lexical Structure@endlink.
    *
    * @param $data
    *   String to be hashed.
diff --git a/web/core/modules/pgsql/tests/src/Unit/SchemaTest.php b/web/core/modules/pgsql/tests/src/Unit/SchemaTest.php
index 767363814..3b9192fde 100644
--- a/web/core/modules/pgsql/tests/src/Unit/SchemaTest.php
+++ b/web/core/modules/pgsql/tests/src/Unit/SchemaTest.php
@@ -74,7 +74,7 @@ public function providerComputedConstraintName() {
     return [
       ['user_field_data', 'pkey', 'user_field_data____pkey'],
       ['user_field_data', 'name__key', 'user_field_data__name__key'],
-      ['user_field_data', 'a_veeeery_veery_very_super_long_field_name__key', 'drupal_BGGYAXgbqlAF1rMOyFTdZGj9zIMXZtSvEjMAKZ9wGIk_key'],
+      ['user_field_data', 'a_very_very_very_very_super_long_field_name__key', 'drupal_WW_a8TlbZ3UQi20UTtRlJFaIeSa6FEtQS5h4NRA3UeU_key'],
     ];
   }
 
diff --git a/web/core/modules/quickedit/js/editors/formEditor.js b/web/core/modules/quickedit/js/editors/formEditor.js
index 9eec92394..0777872b7 100644
--- a/web/core/modules/quickedit/js/editors/formEditor.js
+++ b/web/core/modules/quickedit/js/editors/formEditor.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, _) {
   Drupal.quickedit.editors.form = Drupal.quickedit.EditorView.extend({
     $formContainer: null,
@@ -12,41 +11,30 @@
     stateChange: function stateChange(fieldModel, state) {
       var from = fieldModel.previous('state');
       var to = state;
-
       switch (to) {
         case 'inactive':
           break;
-
         case 'candidate':
           if (from !== 'inactive') {
             this.removeForm();
           }
-
           break;
-
         case 'highlighted':
           break;
-
         case 'activating':
           if (from !== 'invalid') {
             this.loadForm();
           }
-
           break;
-
         case 'active':
           break;
-
         case 'changed':
           break;
-
         case 'saving':
           this.save();
           break;
-
         case 'saved':
           break;
-
         case 'invalid':
           this.showValidationErrors();
           break;
@@ -69,7 +57,6 @@
       }));
       this.$formContainer = $formContainer;
       $formContainer.find('.quickedit-form').addClass('quickedit-editable quickedit-highlighted quickedit-editing').attr('role', 'dialog');
-
       if (this.$el.css('display') === 'inline') {
         $formContainer.prependTo(this.$el.offsetParent());
         var pos = this.$el.position();
@@ -77,7 +64,6 @@
       } else {
         $formContainer.insertBefore(this.$el);
       }
-
       var formOptions = {
         fieldID: fieldModel.get('fieldID'),
         $el: this.$el,
@@ -91,7 +77,6 @@
         });
         $formContainer.on('formUpdated.quickedit', ':input', function (event) {
           var state = fieldModel.get('state');
-
           if (state === 'invalid') {
             fieldModel.set('state', 'activating');
           } else {
@@ -109,7 +94,6 @@
       if (this.$formContainer === null) {
         return;
       }
-
       delete this.formSaveAjax;
       Drupal.detachBehaviors(this.$formContainer.get(0), null, 'unload');
       this.$formContainer.off('change.quickedit', ':input').off('keypress.quickedit', 'input').remove();
@@ -124,34 +108,28 @@
         nocssjs: false,
         other_view_modes: fieldModel.findOtherViewModes()
       }, $submit);
-
       function cleanUpAjax() {
         Drupal.quickedit.util.form.unajaxifySaving(formSaveAjax);
         formSaveAjax = null;
       }
-
       formSaveAjax.commands.quickeditFieldFormSaved = function (ajax, response, status) {
         cleanUpAjax();
         fieldModel.set('state', 'saved');
         fieldModel.set('htmlForOtherViewModes', response.other_view_modes);
-
         _.defer(function () {
           fieldModel.set('html', response.data);
         });
       };
-
       formSaveAjax.commands.quickeditFieldFormValidationErrors = function (ajax, response, status) {
         editorModel.set('validationErrors', response.data);
         fieldModel.set('state', 'invalid');
       };
-
       formSaveAjax.commands.quickeditFieldForm = function (ajax, response, status) {
         Drupal.AjaxCommands.prototype.insert(ajax, {
           data: response.data,
           selector: "#".concat($formContainer.attr('id'), " form")
         });
       };
-
       $submit.trigger('click.quickedit');
     },
     showValidationErrors: function showValidationErrors() {
diff --git a/web/core/modules/quickedit/js/editors/image.js b/web/core/modules/quickedit/js/editors/image.js
index 9f798849c..ac3b66f44 100644
--- a/web/core/modules/quickedit/js/editors/image.js
+++ b/web/core/modules/quickedit/js/editors/image.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _, Drupal) {
   Drupal.quickedit.editors.image = Drupal.quickedit.EditorView.extend({
     initialize: function initialize(options) {
@@ -12,12 +11,10 @@
       this.model.set('originalValue', this.$el.html().trim());
       this.model.set('currentValue', function (index, value) {
         var matches = $(this).attr('name').match(/(alt|title)]$/);
-
         if (matches) {
           var name = matches[1];
           var $toolgroup = $("#".concat(options.fieldModel.toolbarView.getMainWysiwygToolgroupId()));
           var $input = $toolgroup.find(".quickedit-image-field-info input[name=\"".concat(name, "\"]"));
-
           if ($input.length) {
             return $input[0].value;
           }
@@ -26,33 +23,25 @@
     },
     stateChange: function stateChange(fieldModel, state, options) {
       var from = fieldModel.previous('state');
-
       switch (state) {
         case 'inactive':
           break;
-
         case 'candidate':
           if (from !== 'inactive') {
             this.$el.find('.quickedit-image-dropzone').remove();
             this.$el.removeClass('quickedit-image-element');
           }
-
           if (from === 'invalid') {
             this.removeValidationErrors();
           }
-
           break;
-
         case 'highlighted':
           break;
-
         case 'activating':
           _.defer(function () {
             fieldModel.set('state', 'active');
           });
-
           break;
-
         case 'active':
           {
             var self = this;
@@ -84,21 +73,16 @@
             this.renderToolbar(fieldModel);
             break;
           }
-
         case 'changed':
           break;
-
         case 'saving':
           if (from === 'invalid') {
             this.removeValidationErrors();
           }
-
           this.save(options);
           break;
-
         case 'saved':
           break;
-
         case 'invalid':
           this.showValidationErrors();
           break;
@@ -140,27 +124,22 @@
       };
       var ajaxOptions = $.extend(defaultOptions, options);
       var successCallback = ajaxOptions.success;
-
       ajaxOptions.success = function (response) {
         if (response.main_error) {
           this.renderDropzone('error', response.main_error);
-
           if (response.errors.length) {
             this.model.set('validationErrors', response.errors);
           }
-
           this.showValidationErrors();
         } else {
           successCallback(response);
         }
       };
-
       $.ajax(ajaxOptions);
     },
     renderToolbar: function renderToolbar(fieldModel) {
       var $toolgroup = $("#".concat(fieldModel.toolbarView.getMainWysiwygToolgroupId()));
       var $toolbar = $toolgroup.find('.quickedit-image-field-info');
-
       if ($toolbar.length === 0) {
         var fieldID = fieldModel.get('fieldID');
         var url = Drupal.quickedit.util.buildUrl(fieldID, Drupal.url('quickedit/image/info/!entity_type/!id/!field_name/!langcode/!view_mode'));
@@ -181,7 +160,6 @@
     },
     renderDropzone: function renderDropzone(state, text) {
       var $dropzone = this.$el.find('.quickedit-image-dropzone');
-
       if ($dropzone.length) {
         $dropzone.removeClass('upload error hover loading').addClass(".quickedit-image-dropzone ".concat(state)).children('.quickedit-image-text').html(text);
       } else {
@@ -191,7 +169,6 @@
         }));
         this.$el.append($dropzone);
       }
-
       return $dropzone;
     },
     revert: function revert() {
diff --git a/web/core/modules/quickedit/js/editors/plainTextEditor.js b/web/core/modules/quickedit/js/editors/plainTextEditor.js
index cee3a1a6e..6e0c7953b 100644
--- a/web/core/modules/quickedit/js/editors/plainTextEditor.js
+++ b/web/core/modules/quickedit/js/editors/plainTextEditor.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _, Drupal) {
   Drupal.quickedit.editors.plain_text = Drupal.quickedit.EditorView.extend({
     $textElement: null,
@@ -19,7 +18,6 @@
       var previousText = editorModel.get('originalValue');
       $textElement.on('keyup paste', function (event) {
         var currentText = $textElement[0].textContent.trim();
-
         if (previousText !== currentText) {
           previousText = currentText;
           editorModel.set('currentValue', currentText);
@@ -33,50 +31,37 @@
     stateChange: function stateChange(fieldModel, state, options) {
       var from = fieldModel.previous('state');
       var to = state;
-
       switch (to) {
         case 'inactive':
           break;
-
         case 'candidate':
           if (from !== 'inactive') {
             this.$textElement.removeAttr('contenteditable');
           }
-
           if (from === 'invalid') {
             this.removeValidationErrors();
           }
-
           break;
-
         case 'highlighted':
           break;
-
         case 'activating':
           _.defer(function () {
             fieldModel.set('state', 'active');
           });
-
           break;
-
         case 'active':
           this.$textElement.attr('contenteditable', 'true');
           break;
-
         case 'changed':
           break;
-
         case 'saving':
           if (from === 'invalid') {
             this.removeValidationErrors();
           }
-
           this.save(options);
           break;
-
         case 'saved':
           break;
-
         case 'invalid':
           this.showValidationErrors();
           break;
diff --git a/web/core/modules/quickedit/js/models/AppModel.js b/web/core/modules/quickedit/js/models/AppModel.js
index 21232d763..6bebad66f 100644
--- a/web/core/modules/quickedit/js/models/AppModel.js
+++ b/web/core/modules/quickedit/js/models/AppModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Backbone, Drupal) {
   Drupal.quickedit.AppModel = Backbone.Model.extend({
     defaults: {
diff --git a/web/core/modules/quickedit/js/models/BaseModel.js b/web/core/modules/quickedit/js/models/BaseModel.js
index 6f1c60a26..8d3461bce 100644
--- a/web/core/modules/quickedit/js/models/BaseModel.js
+++ b/web/core/modules/quickedit/js/models/BaseModel.js
@@ -4,9 +4,7 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 (function (Drupal, Backbone) {
   Drupal.quickedit.BaseModel = Backbone.Model.extend({
     initialize: function initialize(options) {
@@ -21,11 +19,9 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
           if (!options) {
             options = {};
           }
-
           options.validate = true;
         }
       }
-
       return Backbone.Model.prototype.set.call(this, key, val, options);
     }
   });
diff --git a/web/core/modules/quickedit/js/models/EditorModel.js b/web/core/modules/quickedit/js/models/EditorModel.js
index ab9f555e1..983ea5c05 100644
--- a/web/core/modules/quickedit/js/models/EditorModel.js
+++ b/web/core/modules/quickedit/js/models/EditorModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Backbone, Drupal) {
   Drupal.quickedit.EditorModel = Backbone.Model.extend({
     defaults: {
diff --git a/web/core/modules/quickedit/js/models/EntityModel.js b/web/core/modules/quickedit/js/models/EntityModel.js
index 9776a9c61..2f617046b 100644
--- a/web/core/modules/quickedit/js/models/EntityModel.js
+++ b/web/core/modules/quickedit/js/models/EntityModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_, $, Backbone, Drupal) {
   Drupal.quickedit.EntityModel = Drupal.quickedit.BaseModel.extend({
     defaults: {
@@ -30,7 +29,6 @@
     },
     stateChange: function stateChange(entityModel, state, options) {
       var to = state;
-
       switch (to) {
         case 'closed':
           this.set({
@@ -39,20 +37,16 @@
             isDirty: false
           });
           break;
-
         case 'launching':
           break;
-
         case 'opening':
           entityModel.get('fields').each(function (fieldModel) {
             fieldModel.set('state', 'candidate', options);
           });
           break;
-
         case 'opened':
           this.set('isActive', true);
           break;
-
         case 'committing':
           {
             var fields = this.get('fields');
@@ -68,18 +62,15 @@
             });
             break;
           }
-
         case 'deactivating':
           {
             var changedFields = this.get('fields').filter(function (fieldModel) {
               return _.intersection([fieldModel.get('state')], ['changed', 'invalid']).length;
             });
-
             if ((changedFields.length || this.get('fieldsInTempStore').length) && !options.saved && !options.confirmed) {
               this.set('state', 'opened', {
                 confirming: true
               });
-
               _.defer(function () {
                 Drupal.quickedit.app.confirmEntityDeactivation(entityModel);
               });
@@ -96,10 +87,8 @@
                 }
               });
             }
-
             break;
           }
-
         case 'closing':
           options.reason = 'stop';
           this.get('fields').each(function (fieldModel) {
@@ -115,7 +104,6 @@
       var current = fieldModel.get('state');
       var previous = fieldModel.previous('state');
       var fieldsInTempStore = entityModel.get('fieldsInTempStore');
-
       if (current === 'saved') {
         entityModel.set('inTempStore', true);
         fieldModel.set('inTempStore', true);
@@ -129,30 +117,24 @@
     fieldStateChange: function fieldStateChange(fieldModel, state) {
       var entityModel = this;
       var fieldState = state;
-
       switch (this.get('state')) {
         case 'closed':
         case 'launching':
           break;
-
         case 'opening':
           _.defer(function () {
             entityModel.set('state', 'opened', {
               'accept-field-states': Drupal.quickedit.app.readyFieldStates
             });
           });
-
           break;
-
         case 'opened':
           if (fieldState === 'changed') {
             entityModel.set('isDirty', true);
           } else {
             this._updateInTempStoreAttributes(entityModel, fieldModel);
           }
-
           break;
-
         case 'committing':
           {
             if (fieldState === 'invalid') {
@@ -164,11 +146,9 @@
             } else {
               this._updateInTempStoreAttributes(entityModel, fieldModel);
             }
-
             var options = {
               'accept-field-states': Drupal.quickedit.app.readyFieldStates
             };
-
             if (entityModel.set('isCommitting', true, options)) {
               entityModel.save({
                 success: function success() {
@@ -191,26 +171,21 @@
                 }
               });
             }
-
             break;
           }
-
         case 'deactivating':
           _.defer(function () {
             entityModel.set('state', 'closing', {
               'accept-field-states': Drupal.quickedit.app.readyFieldStates
             });
           });
-
           break;
-
         case 'closing':
           _.defer(function () {
             entityModel.set('state', 'closed', {
               'accept-field-states': ['inactive']
             });
           });
-
           break;
       }
     },
@@ -222,19 +197,16 @@
           options.error.call(entityModel);
         }
       });
-
       entitySaverAjax.commands.quickeditEntitySaved = function (ajax, response, status) {
         entityModel.get('fields').each(function (fieldModel) {
           fieldModel.set('inTempStore', false);
         });
         entityModel.set('inTempStore', false);
         entityModel.set('fieldsInTempStore', []);
-
         if (options.success) {
           options.success.call(entityModel);
         }
       };
-
       entitySaverAjax.options.headers = entitySaverAjax.options.headers || {};
       entitySaverAjax.options.headers['X-Drupal-Quickedit-CSRF-Token'] = drupalSettings.quickedit.csrf_token;
       entitySaverAjax.execute();
@@ -243,24 +215,19 @@
       var acceptedFieldStates = options['accept-field-states'] || [];
       var currentState = this.get('state');
       var nextState = attrs.state;
-
       if (currentState !== nextState) {
         if (_.indexOf(this.constructor.states, nextState) === -1) {
           return "\"".concat(nextState, "\" is an invalid state");
         }
-
         if (!this._acceptStateChange(currentState, nextState, options)) {
           return 'state change not accepted';
         }
-
         if (!this._fieldsHaveAcceptableStates(acceptedFieldStates)) {
           return 'state change not accepted because fields are not in acceptable state';
         }
       }
-
       var currentIsCommitting = this.get('isCommitting');
       var nextIsCommitting = attrs.isCommitting;
-
       if (currentIsCommitting === false && nextIsCommitting === true) {
         if (!this._fieldsHaveAcceptableStates(acceptedFieldStates)) {
           return 'isCommitting change not accepted because fields are not in acceptable state';
@@ -271,10 +238,8 @@
     },
     _acceptStateChange: function _acceptStateChange(from, to, context) {
       var accept = true;
-
       if (!this.constructor.followsStateSequence(from, to)) {
         accept = false;
-
         if (from === 'closing' && to === 'closed') {
           accept = true;
         } else if (from === 'committing' && to === 'opened' && context.reason && (context.reason === 'invalid' || context.reason === 'networkerror')) {
@@ -285,20 +250,16 @@
           accept = true;
         }
       }
-
       return accept;
     },
     _fieldsHaveAcceptableStates: function _fieldsHaveAcceptableStates(acceptedFieldStates) {
       var accept = true;
-
       if (acceptedFieldStates.length > 0) {
         var fieldStates = this.get('fields').pluck('state') || [];
-
         if (_.difference(fieldStates, acceptedFieldStates).length) {
           accept = false;
         }
       }
-
       return accept;
     },
     destroy: function destroy(options) {
diff --git a/web/core/modules/quickedit/js/models/FieldModel.js b/web/core/modules/quickedit/js/models/FieldModel.js
index 76037ede0..733130684 100644
--- a/web/core/modules/quickedit/js/models/FieldModel.js
+++ b/web/core/modules/quickedit/js/models/FieldModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_, Backbone, Drupal) {
   Drupal.quickedit.FieldModel = Drupal.quickedit.BaseModel.extend({
     defaults: {
@@ -31,19 +30,16 @@
       if (this.get('state') !== 'inactive') {
         throw new Error('FieldModel cannot be destroyed if it is not inactive state.');
       }
-
       Drupal.quickedit.BaseModel.prototype.destroy.call(this, options);
     },
     sync: function sync() {},
     validate: function validate(attrs, options) {
       var current = this.get('state');
       var next = attrs.state;
-
       if (current !== next) {
         if (_.indexOf(this.constructor.states, next) === -1) {
           return "\"".concat(next, "\" is an invalid state");
         }
-
         if (!this.get('acceptStateChange')(current, next, options, this)) {
           return 'state change not accepted';
         }
diff --git a/web/core/modules/quickedit/js/quickedit.es6.js b/web/core/modules/quickedit/js/quickedit.es6.js
index fe0dc6a8b..d399a1323 100644
--- a/web/core/modules/quickedit/js/quickedit.es6.js
+++ b/web/core/modules/quickedit/js/quickedit.es6.js
@@ -180,16 +180,9 @@
       url: Drupal.url('quickedit/attachments'),
       submit: { 'editors[]': missingEditors },
     });
-    // Implement a scoped insert AJAX command: calls the callback after all AJAX
-    // command functions have been executed (hence the deferred calling).
-    const realInsert = Drupal.AjaxCommands.prototype.insert;
-    loadEditorsAjax.commands.insert = function (ajax, response, status) {
-      _.defer(callback);
-      realInsert(ajax, response, status);
-    };
     // Trigger the AJAX request, which will should return AJAX commands to
     // insert any missing attachments.
-    loadEditorsAjax.execute();
+    loadEditorsAjax.execute().then(callback);
   }
 
   /**
diff --git a/web/core/modules/quickedit/js/quickedit.js b/web/core/modules/quickedit/js/quickedit.js
index 2e0f21551..992cd5bda 100644
--- a/web/core/modules/quickedit/js/quickedit.js
+++ b/web/core/modules/quickedit/js/quickedit.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _, Backbone, Drupal, drupalSettings, JSON, storage) {
   var options = $.extend(drupalSettings.quickedit, {
     strings: {
@@ -15,7 +14,6 @@
   var fieldsAvailableQueue = [];
   var contextualLinksQueue = [];
   var entityInstancesTracker = {};
-
   function initQuickEdit(bodyElement) {
     Drupal.quickedit.collections.entities = new Drupal.quickedit.EntityCollection();
     Drupal.quickedit.collections.fields = new Drupal.quickedit.FieldCollection();
@@ -26,20 +24,16 @@
       fieldsCollection: Drupal.quickedit.collections.fields
     });
   }
-
   function processEntity(entityElement) {
     var entityID = entityElement.getAttribute('data-quickedit-entity-id');
-
     if (!entityInstancesTracker.hasOwnProperty(entityID)) {
       entityInstancesTracker[entityID] = 0;
     } else {
       entityInstancesTracker[entityID]++;
     }
-
     var entityInstanceID = entityInstancesTracker[entityID];
     entityElement.setAttribute('data-quickedit-entity-instance-id', entityInstanceID);
   }
-
   function initializeField(fieldElement, fieldID, entityID, entityInstanceID) {
     var entity = Drupal.quickedit.collections.entities.findWhere({
       entityID: entityID,
@@ -56,73 +50,51 @@
     });
     Drupal.quickedit.collections.fields.add(field);
   }
-
   function loadMissingEditors(callback) {
     var loadedEditors = _.keys(Drupal.quickedit.editors);
-
     var missingEditors = [];
     Drupal.quickedit.collections.fields.each(function (fieldModel) {
       var metadata = Drupal.quickedit.metadata.get(fieldModel.get('fieldID'));
-
       if (metadata.access && _.indexOf(loadedEditors, metadata.editor) === -1) {
         missingEditors.push(metadata.editor);
         Drupal.quickedit.editors[metadata.editor] = false;
       }
     });
     missingEditors = _.uniq(missingEditors);
-
     if (missingEditors.length === 0) {
       callback();
       return;
     }
-
     var loadEditorsAjax = Drupal.ajax({
       url: Drupal.url('quickedit/attachments'),
       submit: {
         'editors[]': missingEditors
       }
     });
-    var realInsert = Drupal.AjaxCommands.prototype.insert;
-
-    loadEditorsAjax.commands.insert = function (ajax, response, status) {
-      _.defer(callback);
-
-      realInsert(ajax, response, status);
-    };
-
-    loadEditorsAjax.execute();
+    loadEditorsAjax.execute().then(callback);
   }
-
   function initializeEntityContextualLink(contextualLink) {
     var metadata = Drupal.quickedit.metadata;
-
     function hasFieldWithPermission(fieldIDs) {
       for (var i = 0; i < fieldIDs.length; i++) {
         var fieldID = fieldIDs[i];
-
         if (metadata.get(fieldID, 'access') === true) {
           return true;
         }
       }
-
       return false;
     }
-
     function allMetadataExists(fieldIDs) {
       return fieldIDs.length === metadata.intersection(fieldIDs).length;
     }
-
     var fields = _.where(fieldsAvailableQueue, {
       entityID: contextualLink.entityID,
       entityInstanceID: contextualLink.entityInstanceID
     });
-
     var fieldIDs = _.pluck(fields, 'fieldID');
-
     if (fieldIDs.length === 0) {
       return false;
     }
-
     if (hasFieldWithPermission(fieldIDs)) {
       var entityModel = new Drupal.quickedit.EntityModel({
         el: contextualLink.region,
@@ -137,13 +109,10 @@
         model: entityModel
       });
       entityModel.set('entityDecorationView', entityDecorationView);
-
       _.each(fields, function (field) {
         initializeField(field.el, field.fieldID, contextualLink.entityID, contextualLink.entityInstanceID);
       });
-
       fieldsAvailableQueue = _.difference(fieldsAvailableQueue, fields);
-
       var initContextualLink = _.once(function () {
         var $links = $(contextualLink.el).find('.contextual-links');
         var contextualLinkView = new Drupal.quickedit.ContextualLinkView($.extend({
@@ -153,42 +122,32 @@
         }, options));
         entityModel.set('contextualLinkView', contextualLinkView);
       });
-
       loadMissingEditors(initContextualLink);
       return true;
     }
-
     if (allMetadataExists(fieldIDs)) {
       return true;
     }
-
     return false;
   }
-
   function extractEntityID(fieldID) {
     return fieldID.split('/').slice(0, 2).join('/');
   }
-
   function processField(fieldElement) {
     var metadata = Drupal.quickedit.metadata;
     var fieldID = fieldElement.getAttribute('data-quickedit-field-id');
     var entityID = extractEntityID(fieldID);
     var entityElementSelector = "[data-quickedit-entity-id=\"".concat(entityID, "\"]");
     var $entityElement = $(entityElementSelector);
-
     if (!$entityElement.length) {
       throw new Error("Quick Edit could not associate the rendered entity field markup (with [data-quickedit-field-id=\"".concat(fieldID, "\"]) with the corresponding rendered entity markup: no parent DOM node found with [data-quickedit-entity-id=\"").concat(entityID, "\"]. This is typically caused by the theme's template for this entity type forgetting to print the attributes."));
     }
-
     var entityElement = $(fieldElement).closest($entityElement);
-
     if (entityElement.length === 0) {
       var $lowestCommonParent = $entityElement.parents().has(fieldElement).first();
       entityElement = $lowestCommonParent.find($entityElement);
     }
-
     var entityInstanceID = entityElement.get(0).getAttribute('data-quickedit-entity-instance-id');
-
     if (!metadata.has(fieldID)) {
       fieldsMetadataQueue.push({
         el: fieldElement,
@@ -198,11 +157,9 @@
       });
       return;
     }
-
     if (metadata.get(fieldID, 'access') !== true) {
       return;
     }
-
     if (Drupal.quickedit.collections.entities.findWhere({
       entityID: entityID,
       entityInstanceID: entityInstanceID
@@ -217,13 +174,11 @@
       });
     }
   }
-
   function deleteContainedModelsAndQueues($context) {
     $context.find('[data-quickedit-entity-id]').addBack('[data-quickedit-entity-id]').each(function (index, entityElement) {
       var entityModel = Drupal.quickedit.collections.entities.findWhere({
         el: entityElement
       });
-
       if (entityModel) {
         var contextualLinkView = entityModel.get('contextualLinkView');
         contextualLinkView.undelegateEvents();
@@ -231,35 +186,27 @@
         entityModel.get('entityDecorationView').remove();
         entityModel.destroy();
       }
-
       function hasOtherRegion(contextualLink) {
         return contextualLink.region !== entityElement;
       }
-
       contextualLinksQueue = _.filter(contextualLinksQueue, hasOtherRegion);
     });
     $context.find('[data-quickedit-field-id]').addBack('[data-quickedit-field-id]').each(function (index, fieldElement) {
       Drupal.quickedit.collections.fields.chain().filter(function (fieldModel) {
         return fieldModel.get('el') === fieldElement;
       }).invoke('destroy');
-
       function hasOtherFieldElement(field) {
         return field.el !== fieldElement;
       }
-
       fieldsMetadataQueue = _.filter(fieldsMetadataQueue, hasOtherFieldElement);
       fieldsAvailableQueue = _.filter(fieldsAvailableQueue, hasOtherFieldElement);
     });
   }
-
   function fetchMissingMetadata(callback) {
     if (fieldsMetadataQueue.length) {
       var fieldIDs = _.pluck(fieldsMetadataQueue, 'fieldID');
-
       var fieldElementsWithoutMetadata = _.pluck(fieldsMetadataQueue, 'el');
-
       var entityIDs = _.uniq(_.pluck(fieldsMetadataQueue, 'entityID'), true);
-
       entityIDs = _.difference(entityIDs, Drupal.quickedit.metadata.intersection(entityIDs));
       fieldsMetadataQueue = [];
       $.ajax({
@@ -274,22 +221,18 @@
           _.each(results, function (fieldMetadata, fieldID) {
             Drupal.quickedit.metadata.add(fieldID, fieldMetadata);
           });
-
           callback(fieldElementsWithoutMetadata);
         }
       });
     }
   }
-
   Drupal.behaviors.quickedit = {
     attach: function attach(context) {
       once('quickedit-init', 'body').forEach(initQuickEdit);
       var fields = once('quickedit', '[data-quickedit-field-id]', context);
-
       if (fields.length === 0) {
         return;
       }
-
       once('quickedit', '[data-quickedit-entity-id]', context).forEach(processEntity);
       fields.forEach(processField);
       contextualLinksQueue = _.filter(contextualLinksQueue, function (contextualLink) {
@@ -297,7 +240,6 @@
       });
       fetchMissingMetadata(function (fieldElementsWithFreshMetadata) {
         _.each(fieldElementsWithFreshMetadata, processField);
-
         contextualLinksQueue = _.filter(contextualLinksQueue, function (contextualLink) {
           return !initializeEntityContextualLink(contextualLink);
         });
@@ -335,19 +277,14 @@
       },
       intersection: function intersection(fieldIDs) {
         var prefixedFieldIDs = _.map(fieldIDs, this._prefixFieldID);
-
         var intersection = _.intersection(prefixedFieldIDs, _.keys(sessionStorage));
-
         return _.map(intersection, this._unprefixFieldID);
       }
     }
   };
-
   var permissionsHashKey = Drupal.quickedit.metadata._prefixFieldID('permissionsHash');
-
   var permissionsHashValue = storage.getItem(permissionsHashKey);
   var permissionsHash = drupalSettings.user.permissionsHash;
-
   if (permissionsHashValue !== permissionsHash) {
     if (typeof permissionsHash === 'string') {
       _.chain(storage).keys().each(function (key) {
@@ -356,24 +293,20 @@
         }
       });
     }
-
     storage.setItem(permissionsHashKey, permissionsHash);
   }
-
   $(document).on('drupalContextualLinkAdded', function (event, data) {
     if (data.$region.is('[data-quickedit-entity-id]')) {
       if (!data.$region.is('[data-quickedit-entity-instance-id]')) {
         once('quickedit', data.$region);
         processEntity(data.$region.get(0));
       }
-
       var contextualLink = {
         entityID: data.$region.attr('data-quickedit-entity-id'),
         entityInstanceID: data.$region.attr('data-quickedit-entity-instance-id'),
         el: data.$el[0],
         region: data.$region[0]
       };
-
       if (!initializeEntityContextualLink(contextualLink)) {
         contextualLinksQueue.push(contextualLink);
       }
diff --git a/web/core/modules/quickedit/js/theme.js b/web/core/modules/quickedit/js/theme.js
index 2e9723f72..44211e3ff 100644
--- a/web/core/modules/quickedit/js/theme.js
+++ b/web/core/modules/quickedit/js/theme.js
@@ -4,14 +4,12 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.theme.quickeditBackstage = function (settings) {
     var html = '';
     html += "<div id=\"".concat(settings.id, "\"></div>");
     return html;
   };
-
   Drupal.theme.quickeditEntityToolbar = function (settings) {
     var html = '';
     html += "<div id=\"".concat(settings.id, "\" class=\"quickedit quickedit-toolbar-container clearfix\">");
@@ -24,29 +22,23 @@
     html += '</div><div class="quickedit-toolbar-lining"></div></div>';
     return html;
   };
-
   Drupal.theme.quickeditEntityToolbarLabel = function (settings) {
     return "<span class=\"field\">".concat(Drupal.checkPlain(settings.fieldLabel), "</span>").concat(Drupal.checkPlain(settings.entityLabel));
   };
-
   Drupal.theme.quickeditEntityToolbarFence = function () {
     return '<div id="quickedit-toolbar-fence"></div>';
   };
-
   Drupal.theme.quickeditFieldToolbar = function (settings) {
     return "<div id=\"".concat(settings.id, "\"></div>");
   };
-
   Drupal.theme.quickeditToolgroup = function (settings) {
     var classes = settings.classes || [];
     classes.unshift('quickedit-toolgroup');
     var html = '';
     html += "<div class=\"".concat(classes.join(' '), "\"");
-
     if (settings.id) {
       html += " id=\"".concat(settings.id, "\"");
     }
-
     html += '>';
     html += Drupal.theme('quickeditButtons', {
       buttons: settings.buttons
@@ -54,17 +46,13 @@
     html += '</div>';
     return html;
   };
-
   Drupal.theme.quickeditButtons = function (settings) {
     var html = '';
-
     var _loop = function _loop(i) {
       var button = settings.buttons[i];
-
       if (!button.hasOwnProperty('type')) {
         button.type = 'button';
       }
-
       var attributes = [];
       var attrMap = settings.buttons[i].attributes || {};
       Object.keys(attrMap).forEach(function (attr) {
@@ -72,14 +60,11 @@
       });
       html += "<button type=\"".concat(button.type, "\" class=\"").concat(button.classes, "\" ").concat(attributes.join(' '), ">").concat(button.label, "</button>");
     };
-
     for (var i = 0; i < settings.buttons.length; i++) {
       _loop(i);
     }
-
     return html;
   };
-
   Drupal.theme.quickeditFormContainer = function (settings) {
     var html = '';
     html += "<div id=\"".concat(settings.id, "\" class=\"quickedit-form-container\">");
@@ -91,26 +76,20 @@
     html += '</div>';
     return html;
   };
-
   Drupal.theme.quickeditImageErrors = function (settings) {
     return "<div class=\"quickedit-image-errors\">".concat(settings.errors, "</div>");
   };
-
   Drupal.theme.quickeditImageDropzone = function (settings) {
     return "<div class=\"quickedit-image-dropzone ".concat(settings.state, "\">") + '  <i class="quickedit-image-icon"></i>' + "  <span class=\"quickedit-image-text\">".concat(settings.text, "</span>") + '</div>';
   };
-
   Drupal.theme.quickeditImageToolbar = function (settings) {
     var html = '<form class="quickedit-image-field-info">';
-
     if (settings.alt_field) {
       html += "<div><label for=\"alt\" class=\"".concat(settings.alt_field_required ? 'required' : '', "\">").concat(Drupal.t('Alternative text'), "</label>") + "<input type=\"text\" placeholder=\"".concat(settings.alt, "\" value=\"").concat(settings.alt, "\" name=\"alt\" ").concat(settings.alt_field_required ? 'required' : '', "/>") + '  </div>';
     }
-
     if (settings.title_field) {
       html += "<div><label for=\"title\" class=\"".concat(settings.title_field_required ? 'form-required' : '', "\">").concat(Drupal.t('Title'), "</label>") + "<input type=\"text\" placeholder=\"".concat(settings.title, "\" value=\"").concat(settings.title, "\" name=\"title\" ").concat(settings.title_field_required ? 'required' : '', "/>") + '</div>';
     }
-
     html += '</form>';
     return html;
   };
diff --git a/web/core/modules/quickedit/js/util.js b/web/core/modules/quickedit/js/util.js
index 7c3e80d2d..6f6fbcbc0 100644
--- a/web/core/modules/quickedit/js/util.js
+++ b/web/core/modules/quickedit/js/util.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.quickedit.util = Drupal.quickedit.util || {};
   Drupal.quickedit.util.constants = {};
   Drupal.quickedit.util.constants.transitionEnd = 'transitionEnd.quickedit webkitTransitionEnd.quickedit transitionend.quickedit msTransitionEnd.quickedit oTransitionEnd.quickedit';
-
   Drupal.quickedit.util.buildUrl = function (id, urlFormat) {
     var parts = id.split('/');
     return Drupal.formatString(decodeURIComponent(urlFormat), {
@@ -20,7 +18,6 @@
       '!view_mode': parts[4]
     });
   };
-
   Drupal.quickedit.util.networkErrorModal = function (title, message) {
     var $message = $("<div>".concat(message, "</div>"));
     var networkErrorModal = Drupal.dialog($message.get(0), {
@@ -42,7 +39,6 @@
     });
     networkErrorModal.showModal();
   };
-
   Drupal.quickedit.util.form = {
     load: function load(options, callback) {
       var fieldID = options.fieldID;
@@ -62,12 +58,10 @@
           fieldModel.set('state', 'candidate');
         }
       });
-
       formLoaderAjax.commands.quickeditFieldForm = function (ajax, response, status) {
         callback(response.data, ajax);
         Drupal.ajax.instances[this.instanceIndex] = null;
       };
-
       formLoaderAjax.execute();
     },
     ajaxifySaving: function ajaxifySaving(options, $submit) {
@@ -82,7 +76,6 @@
         },
         success: function success(response, status) {
           var _this = this;
-
           Object.keys(response || {}).forEach(function (i) {
             if (response[i].command && _this.commands[response[i].command]) {
               _this.commands[response[i].command](_this, response[i], status);
diff --git a/web/core/modules/quickedit/js/views/AppView.js b/web/core/modules/quickedit/js/views/AppView.js
index 26aabbd61..b29023584 100644
--- a/web/core/modules/quickedit/js/views/AppView.js
+++ b/web/core/modules/quickedit/js/views/AppView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _, Backbone, Drupal) {
   var reload = false;
   Drupal.quickedit.AppView = Backbone.View.extend({
@@ -24,7 +23,6 @@
     appStateChange: function appStateChange(entityModel, state) {
       var app = this;
       var entityToolbarView;
-
       switch (state) {
         case 'launching':
           reload = false;
@@ -36,35 +34,28 @@
           entityModel.get('fields').each(function (fieldModel) {
             app.setupEditor(fieldModel);
           });
-
           _.defer(function () {
             entityModel.set('state', 'opening');
           });
-
           break;
-
         case 'closed':
           entityToolbarView = entityModel.toolbarView;
           entityModel.get('fields').each(function (fieldModel) {
             app.teardownEditor(fieldModel);
           });
-
           if (entityToolbarView) {
             entityToolbarView.remove();
             delete entityModel.toolbarView;
           }
-
           if (reload) {
             reload = false;
             window.location.reload();
           }
-
           break;
       }
     },
     acceptEditorStateChange: function acceptEditorStateChange(from, to, context, fieldModel) {
       var accept = true;
-
       if (context && (context.reason === 'stop' || context.reason === 'rerender')) {
         if (from === 'candidate' && to === 'inactive') {
           accept = true;
@@ -72,7 +63,6 @@
       } else {
         if (!Drupal.quickedit.FieldModel.followsStateSequence(from, to)) {
           accept = false;
-
           if (_.indexOf(this.activeFieldStates, from) !== -1 && to === 'candidate') {
             accept = true;
           } else if ((from === 'changed' || from === 'invalid') && to === 'candidate') {
@@ -87,23 +77,18 @@
             accept = true;
           }
         }
-
         if (accept) {
           var activeField;
           var activeFieldState;
-
           if ((this.readyFieldStates.indexOf(from) !== -1 || from === 'invalid') && this.activeFieldStates.indexOf(to) !== -1) {
             activeField = this.model.get('activeField');
-
             if (activeField && activeField !== fieldModel) {
               activeFieldState = activeField.get('state');
-
               if (this.activeFieldStates.indexOf(activeFieldState) !== -1) {
                 activeField.set('state', 'candidate');
               } else if (activeFieldState === 'changed' || activeFieldState === 'invalid') {
                 activeField.set('state', 'saving');
               }
-
               if (from === 'invalid') {
                 this.model.set('activeField', fieldModel);
                 accept = false;
@@ -122,7 +107,6 @@
           }
         }
       }
-
       return accept;
     },
     setupEditor: function setupEditor(fieldModel) {
@@ -156,7 +140,6 @@
       if (typeof fieldModel.editorView === 'undefined') {
         return;
       }
-
       fieldModel.toolbarView.remove();
       delete fieldModel.toolbarView;
       fieldModel.decorationView.remove();
@@ -167,11 +150,9 @@
     confirmEntityDeactivation: function confirmEntityDeactivation(entityModel) {
       var that = this;
       var discardDialog;
-
       function closeDiscardDialog(action) {
         discardDialog.close(action);
         that.model.set('activeModal', null);
-
         if (action === 'save') {
           entityModel.set('state', 'committing', {
             confirmed: true
@@ -180,14 +161,12 @@
           entityModel.set('state', 'deactivating', {
             confirmed: true
           });
-
           if (entityModel.get('reload')) {
             reload = true;
             entityModel.set('reload', false);
           }
         }
       }
-
       if (!this.model.get('activeModal')) {
         var $unsavedChanges = $("<div>".concat(Drupal.t('You have unsaved changes'), "</div>"));
         discardDialog = Drupal.dialog($unsavedChanges.get(0), {
@@ -222,37 +201,31 @@
     editorStateChange: function editorStateChange(fieldModel, state) {
       var from = fieldModel.previous('state');
       var to = state;
-
       if (_.indexOf(this.singleFieldStates, to) !== -1 && this.model.get('highlightedField') !== fieldModel) {
         this.model.set('highlightedField', fieldModel);
       } else if (this.model.get('highlightedField') === fieldModel && to === 'candidate') {
         this.model.set('highlightedField', null);
       }
-
       if (_.indexOf(this.activeFieldStates, to) !== -1 && this.model.get('activeField') !== fieldModel) {
         this.model.set('activeField', fieldModel);
       } else if (this.model.get('activeField') === fieldModel && to === 'candidate') {
         if (from === 'changed' || from === 'invalid') {
           fieldModel.editorView.revert();
         }
-
         this.model.set('activeField', null);
       }
     },
     renderUpdatedField: function renderUpdatedField(fieldModel, html, options) {
       var $fieldWrapper = $(fieldModel.get('el'));
       var $context = $fieldWrapper.parent();
-
       var renderField = function renderField() {
         fieldModel.destroy();
         $fieldWrapper.replaceWith(html);
         Drupal.attachBehaviors($context.get(0));
       };
-
       if (!options.propagation) {
         _.defer(function () {
           fieldModel.set('state', 'candidate');
-
           _.defer(function () {
             fieldModel.set('state', 'inactive', {
               reason: 'rerender'
@@ -268,7 +241,6 @@
       if (options.propagation) {
         return;
       }
-
       var htmlForOtherViewModes = updatedField.get('htmlForOtherViewModes');
       Drupal.quickedit.collections.fields.where({
         logicalFieldID: updatedField.get('logicalFieldID')
@@ -286,11 +258,9 @@
       var activeEntity = Drupal.quickedit.collections.entities.findWhere({
         isActive: true
       });
-
       if (!activeEntity) {
         return;
       }
-
       if (fieldModel.get('entity') === activeEntity) {
         this.setupEditor(fieldModel);
         fieldModel.set('state', 'candidate');
@@ -300,7 +270,6 @@
       if (changedEntityModel.get('isActive') === false) {
         return;
       }
-
       changedEntityModel.collection.chain().filter(function (entityModel) {
         return entityModel.get('isActive') === true && entityModel !== changedEntityModel;
       }).each(function (entityModel) {
diff --git a/web/core/modules/quickedit/js/views/ContextualLinkView.js b/web/core/modules/quickedit/js/views/ContextualLinkView.js
index ecc563c1b..f788c4898 100644
--- a/web/core/modules/quickedit/js/views/ContextualLinkView.js
+++ b/web/core/modules/quickedit/js/views/ContextualLinkView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Backbone, Drupal) {
   Drupal.quickedit.ContextualLinkView = Backbone.View.extend({
     events: function events() {
@@ -12,7 +11,6 @@
         event.preventDefault();
         event.target.click();
       }
-
       return {
         'click a': function clickA(event) {
           event.preventDefault();
diff --git a/web/core/modules/quickedit/js/views/EditorView.js b/web/core/modules/quickedit/js/views/EditorView.js
index 29b9fdc9c..848da7267 100644
--- a/web/core/modules/quickedit/js/views/EditorView.js
+++ b/web/core/modules/quickedit/js/views/EditorView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Backbone, Drupal) {
   Drupal.quickedit.EditorView = Backbone.View.extend({
     initialize: function initialize(options) {
@@ -29,50 +28,38 @@
     stateChange: function stateChange(fieldModel, state) {
       var from = fieldModel.previous('state');
       var to = state;
-
       switch (to) {
         case 'inactive':
           break;
-
         case 'candidate':
           if (from === 'invalid') {
             this.removeValidationErrors();
           }
-
           break;
-
         case 'highlighted':
           break;
-
         case 'activating':
           {
             var loadDependencies = function loadDependencies(callback) {
               callback();
             };
-
             loadDependencies(function () {
               fieldModel.set('state', 'active');
             });
             break;
           }
-
         case 'active':
           break;
-
         case 'changed':
           break;
-
         case 'saving':
           if (from === 'invalid') {
             this.removeValidationErrors();
           }
-
           this.save();
           break;
-
         case 'saved':
           break;
-
         case 'invalid':
           this.showValidationErrors();
           break;
@@ -83,13 +70,11 @@
       var fieldModel = this.fieldModel;
       var editorModel = this.model;
       var backstageId = "quickedit_backstage-".concat(this.fieldModel.id.replace(/[/[\]_\s]/g, '-'));
-
       function fillAndSubmitForm(value) {
         var $form = $("#".concat(backstageId)).find('form');
         $form.find(':input[type!="hidden"][type!="submit"]:not(select)').not('[name$="\\[summary\\]"]').val(value);
         $form.find('.quickedit-form-submit').trigger('click.quickedit');
       }
-
       var formOptions = {
         fieldID: this.fieldModel.get('fieldID'),
         $el: this.$el,
@@ -106,28 +91,23 @@
         $form.prop('novalidate', true);
         var $submit = $form.find('.quickedit-form-submit');
         self.formSaveAjax = Drupal.quickedit.util.form.ajaxifySaving(formOptions, $submit);
-
         function removeHiddenForm() {
           Drupal.quickedit.util.form.unajaxifySaving(self.formSaveAjax);
           delete self.formSaveAjax;
           $backstage.remove();
         }
-
         self.formSaveAjax.commands.quickeditFieldFormSaved = function (ajax, response, status) {
           removeHiddenForm();
           fieldModel.set('state', 'saved');
           fieldModel.set('htmlForOtherViewModes', response.other_view_modes);
           fieldModel.set('html', response.data);
         };
-
         self.formSaveAjax.commands.quickeditFieldFormValidationErrors = function (ajax, response, status) {
           removeHiddenForm();
           editorModel.set('validationErrors', response.data);
           fieldModel.set('state', 'invalid');
         };
-
         self.formSaveAjax.commands.quickeditFieldForm = function () {};
-
         fillAndSubmitForm(editorModel.get('currentValue'));
       });
     },
diff --git a/web/core/modules/quickedit/js/views/EntityDecorationView.js b/web/core/modules/quickedit/js/views/EntityDecorationView.js
index aeaf6e365..93c4aa27d 100644
--- a/web/core/modules/quickedit/js/views/EntityDecorationView.js
+++ b/web/core/modules/quickedit/js/views/EntityDecorationView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, $, Backbone) {
   Drupal.quickedit.EntityDecorationView = Backbone.View.extend({
     initialize: function initialize() {
diff --git a/web/core/modules/quickedit/js/views/EntityToolbarView.js b/web/core/modules/quickedit/js/views/EntityToolbarView.js
index be9b8a070..de5679d5e 100644
--- a/web/core/modules/quickedit/js/views/EntityToolbarView.js
+++ b/web/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _, Backbone, Drupal, debounce, Popper) {
   Drupal.quickedit.EntityToolbarView = Backbone.View.extend({
     _fieldToolbarRoot: null,
@@ -37,39 +36,31 @@
     render: function render() {
       if (this.model.get('isActive')) {
         var $body = $('body');
-
         if ($body.children('#quickedit-entity-toolbar').length === 0) {
           $body.append(this.$el);
         }
-
         if ($body.children('#quickedit-toolbar-fence').length === 0) {
           this.$fence = $(Drupal.theme('quickeditEntityToolbarFence')).css(Drupal.displace()).appendTo($body);
         }
-
         this.label();
         this.show('ops');
         this.position();
       }
-
       var $button = this.$el.find('.quickedit-button.action-save');
       var isDirty = this.model.get('isDirty');
-
       switch (this.model.get('state')) {
         case 'opened':
           $button[0].textContent = Drupal.t('Save');
           $button.removeClass('action-saving icon-throbber icon-end').removeAttr('disabled').attr('aria-hidden', !isDirty);
           break;
-
         case 'committing':
           $button[0].textContent = Drupal.t('Saving');
           $button.addClass('action-saving icon-throbber icon-end').attr('disabled', 'disabled');
           break;
-
         default:
           $button.attr('aria-hidden', true);
           break;
       }
-
       return this;
     },
     remove: function remove() {
@@ -86,7 +77,6 @@
         case 'active':
           this.render();
           break;
-
         case 'invalid':
           this.render();
           break;
@@ -102,70 +92,56 @@
       var of;
       var activeField;
       var highlightedField;
-
       do {
         switch (check) {
           case 0:
             of = element;
             break;
-
           case 1:
             activeField = Drupal.quickedit.app.model.get('activeField');
             of = activeField && activeField.editorView && activeField.editorView.$formContainer && activeField.editorView.$formContainer.find('.quickedit-form');
             break;
-
           case 2:
             of = activeField && activeField.editorView && activeField.editorView.getEditedElement();
-
             if (activeField && activeField.editorView && activeField.editorView.getQuickEditUISettings().padding) {
               horizontalPadding = 5;
             }
-
             break;
-
           case 3:
             highlightedField = Drupal.quickedit.app.model.get('highlightedField');
             of = highlightedField && highlightedField.editorView && highlightedField.editorView.getEditedElement();
             delay = 250;
             break;
-
           default:
             {
               var fieldModels = this.model.get('fields').models;
               var topMostPosition = 1000000;
               var topMostField = null;
-
               for (var i = 0; i < fieldModels.length; i++) {
                 var pos = fieldModels[i].get('el').getBoundingClientRect().top;
-
                 if (pos < topMostPosition) {
                   topMostPosition = pos;
                   topMostField = fieldModels[i];
                 }
               }
-
               of = topMostField.get('el');
               delay = 50;
               break;
             }
         }
-
         check++;
       } while (!of);
-
       function refinePopper(_ref) {
         var state = _ref.state;
         var isBelow = state.placement.split('-')[0] === 'bottom';
         var classListMethod = isBelow ? 'add' : 'remove';
         state.elements.popper.classList[classListMethod]('quickedit-toolbar-pointer-top');
       }
-
       function positionToolbar() {
         var popperElement = that.el;
         var referenceElement = of;
         var boundariesElement = that.$fence[0];
         var popperedge = edge === 'left' ? 'start' : 'end';
-
         if (referenceElement !== undefined) {
           if (!popperElement.classList.contains('js-popper-processed')) {
             that.popper = Popper.createPopper(referenceElement, popperElement, {
@@ -204,14 +180,12 @@
             that.popper.forceUpdate();
           }
         }
-
         that.$el.css({
           'max-width': document.documentElement.clientWidth < 450 ? document.documentElement.clientWidth : 450,
           'min-width': document.documentElement.clientWidth < 240 ? document.documentElement.clientWidth : 240,
           width: '100%'
         });
       }
-
       this.timer = setTimeout(function () {
         _.defer(positionToolbar);
       }, delay);
@@ -262,7 +236,6 @@
       var activeFieldLabel = activeField && activeField.get('metadata').label;
       var highlightedField = Drupal.quickedit.app.model.get('highlightedField');
       var highlightedFieldLabel = highlightedField && highlightedField.get('metadata').label;
-
       if (activeFieldLabel) {
         label = Drupal.theme('quickeditEntityToolbarLabel', {
           entityLabel: entityLabel,
@@ -276,7 +249,6 @@
       } else {
         label = Drupal.checkPlain(entityLabel);
       }
-
       this.$el.find('.quickedit-toolbar-label').html(label);
     },
     addClass: function addClass(toolgroup, classes) {
diff --git a/web/core/modules/quickedit/js/views/FieldDecorationView.js b/web/core/modules/quickedit/js/views/FieldDecorationView.js
index 5d4e80431..58bcf1a33 100644
--- a/web/core/modules/quickedit/js/views/FieldDecorationView.js
+++ b/web/core/modules/quickedit/js/views/FieldDecorationView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Backbone, Drupal) {
   Drupal.quickedit.FieldDecorationView = Backbone.View.extend({
     _widthAttributeIsEmpty: null,
@@ -27,57 +26,42 @@
     stateChange: function stateChange(model, state) {
       var from = model.previous('state');
       var to = state;
-
       switch (to) {
         case 'inactive':
           this.undecorate();
           break;
-
         case 'candidate':
           this.decorate();
-
           if (from !== 'inactive') {
             this.stopHighlight();
-
             if (from !== 'highlighted') {
               this.model.set('isChanged', false);
               this.stopEdit();
             }
           }
-
           this._unpad();
-
           break;
-
         case 'highlighted':
           this.startHighlight();
           break;
-
         case 'activating':
           this.prepareEdit();
           break;
-
         case 'active':
           if (from !== 'activating') {
             this.prepareEdit();
           }
-
           if (this.editorView.getQuickEditUISettings().padding) {
             this._pad();
           }
-
           break;
-
         case 'changed':
           this.model.set('isChanged', true);
           break;
-
         case 'saving':
           break;
-
         case 'saved':
           break;
-
         case 'invalid':
           break;
       }
@@ -117,34 +101,27 @@
     },
     prepareEdit: function prepareEdit() {
       this.$el.addClass('quickedit-editing');
-
       if (this.editorView.getQuickEditUISettings().popup) {
         this.$el.addClass('quickedit-editor-is-popup');
       }
     },
     stopEdit: function stopEdit() {
       this.$el.removeClass('quickedit-highlighted quickedit-editing');
-
       if (this.editorView.getQuickEditUISettings().popup) {
         this.$el.removeClass('quickedit-editor-is-popup');
       }
-
       $('.quickedit-candidate').addClass('quickedit-editable');
     },
     _pad: function _pad() {
       if (this.$el.data('quickedit-padded')) {
         return;
       }
-
       var self = this;
-
       if (this.$el[0].style.width === '') {
         this._widthAttributeIsEmpty = true;
         this.$el.addClass('quickedit-animate-disable-width').css('width', this.$el.width());
       }
-
       var posProp = this._getPositionProperties(this.$el);
-
       setTimeout(function () {
         self.$el.removeClass('quickedit-animate-disable-width');
         self.$el.css({
@@ -163,15 +140,11 @@
       if (!this.$el.data('quickedit-padded')) {
         return;
       }
-
       var self = this;
-
       if (this._widthAttributeIsEmpty) {
         this.$el.addClass('quickedit-animate-disable-width').css('width', '');
       }
-
       var posProp = this._getPositionProperties(this.$el);
-
       setTimeout(function () {
         self.$el.removeClass('quickedit-animate-disable-width');
         self.$el.css({
@@ -192,19 +165,16 @@
       var r = {};
       var props = ['top', 'left', 'bottom', 'right', 'padding-top', 'padding-left', 'padding-right', 'padding-bottom', 'margin-bottom'];
       var propCount = props.length;
-
       for (var i = 0; i < propCount; i++) {
         p = props[i];
         r[p] = parseInt(this._replaceBlankPosition($e.css(p)), 10);
       }
-
       return r;
     },
     _replaceBlankPosition: function _replaceBlankPosition(pos) {
       if (pos === 'auto' || !pos) {
         pos = '0px';
       }
-
       return pos;
     }
   });
diff --git a/web/core/modules/quickedit/js/views/FieldToolbarView.js b/web/core/modules/quickedit/js/views/FieldToolbarView.js
index ac2958163..eb32281ab 100644
--- a/web/core/modules/quickedit/js/views/FieldToolbarView.js
+++ b/web/core/modules/quickedit/js/views/FieldToolbarView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _, Backbone, Drupal) {
   Drupal.quickedit.FieldToolbarView = Backbone.View.extend({
     $editedElement: null,
@@ -27,47 +26,34 @@
     stateChange: function stateChange(model, state) {
       var from = model.previous('state');
       var to = state;
-
       switch (to) {
         case 'inactive':
           break;
-
         case 'candidate':
           if (from !== 'inactive' && from !== 'highlighted') {
             this.$el.remove();
             this.setElement();
           }
-
           break;
-
         case 'highlighted':
           break;
-
         case 'activating':
           this.render();
-
           if (this.editorView.getQuickEditUISettings().fullWidthToolbar) {
             this.$el.addClass('quickedit-toolbar-fullwidth');
           }
-
           if (this.editorView.getQuickEditUISettings().unifiedToolbar) {
             this.insertWYSIWYGToolGroups();
           }
-
           break;
-
         case 'active':
           break;
-
         case 'changed':
           break;
-
         case 'saving':
           break;
-
         case 'saved':
           break;
-
         case 'invalid':
           break;
       }
@@ -99,7 +85,6 @@
     },
     show: function show(toolgroup) {
       var $group = this._find(toolgroup);
-
       $group.on(Drupal.quickedit.util.constants.transitionEnd, function (event) {
         $group.off(Drupal.quickedit.util.constants.transitionEnd);
       });
diff --git a/web/core/modules/quickedit/quickedit.api.php b/web/core/modules/quickedit/quickedit.api.php
index daebe6c95..ff9a179f8 100644
--- a/web/core/modules/quickedit/quickedit.api.php
+++ b/web/core/modules/quickedit/quickedit.api.php
@@ -64,7 +64,7 @@ function hook_quickedit_editor_alter(&$editors) {
  * @param string $langcode
  *   (Optional) The language code the field values are to be shown in.
  *
- * @return
+ * @return array
  *   A renderable array for the field value.
  *
  * @see \Drupal\Core\Field\FieldItemListInterface::view()
diff --git a/web/core/modules/quickedit/quickedit.info.yml b/web/core/modules/quickedit/quickedit.info.yml
index 12a3084a4..b778482d0 100644
--- a/web/core/modules/quickedit/quickedit.info.yml
+++ b/web/core/modules/quickedit/quickedit.info.yml
@@ -1,6 +1,8 @@
 name: Quick Edit
 type: module
 description: 'In-place content editing.'
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/node/3223395#s-quick-edit
 package: Core
 version: VERSION
 dependencies:
diff --git a/web/core/modules/quickedit/quickedit.libraries.yml b/web/core/modules/quickedit/quickedit.libraries.yml
index 8e8d998bc..11ac057d0 100644
--- a/web/core/modules/quickedit/quickedit.libraries.yml
+++ b/web/core/modules/quickedit/quickedit.libraries.yml
@@ -49,6 +49,26 @@ quickedit.inPlaceEditor.form:
   dependencies:
     - quickedit/quickedit
 
+quickedit.ckeditor5-temporary-work-around:
+  # "Temporary work-around until https://www.drupal.org/project/drupal/issues/3196689 lands."
+  css:
+    theme:
+      css/editors/formattedText/ckeditor5.workaround.css: { }
+
+quickedit.inPlaceEditor.formattedText:
+  version: VERSION
+  css:
+    component:
+      css/editors/formattedText.ckeditor.css: {}
+      css/editors/formattedText.ckeditor5.css: {}
+  js:
+    js/editors/formattedTextEditor.js: { attributes: { defer: true } }
+  dependencies:
+    - quickedit/quickedit
+    - editor/drupal.editor
+    - core/drupal.ajax
+    - core/drupalSettings
+
 quickedit.inPlaceEditor.plainText:
   version: VERSION
   js:
diff --git a/web/core/modules/quickedit/quickedit.module b/web/core/modules/quickedit/quickedit.module
index 219b975eb..a9511e2c4 100644
--- a/web/core/modules/quickedit/quickedit.module
+++ b/web/core/modules/quickedit/quickedit.module
@@ -100,6 +100,11 @@ function quickedit_library_info_alter(&$libraries, $extension) {
 
     $alter_library($libraries['quickedit'], $theme);
   }
+
+  $moduleHandler = \Drupal::moduleHandler();
+  if ($moduleHandler->moduleExists('ckeditor5')) {
+    $libraries['internal.drupal.ckeditor5']['dependencies'][] = 'quickedit/quickedit.ckeditor5-temporary-work-around';
+  }
 }
 
 /**
@@ -118,6 +123,16 @@ function quickedit_field_formatter_info_alter(&$info) {
       $info[$key]['quickedit'] = ['editor' => 'form'];
     }
   }
+
+  $info['basic_string']['quickedit'] = ['editor' => 'plain_text'];
+  $info['string']['quickedit'] = ['editor' => 'plain_text'];
+
+  // Update \Drupal\text\Plugin\Field\FieldFormatter\TextDefaultFormatter's
+  // annotation to indicate that it supports the 'editor' in-place editor
+  // provided by this module, if enabled.
+  if (\Drupal::moduleHandler()->moduleExists('editor')) {
+    $info['text_default']['quickedit'] = ['editor' => 'editor'];
+  }
 }
 
 /**
diff --git a/web/core/modules/quickedit/quickedit.routing.yml b/web/core/modules/quickedit/quickedit.routing.yml
index b63b8a2f1..35723d5ae 100644
--- a/web/core/modules/quickedit/quickedit.routing.yml
+++ b/web/core/modules/quickedit/quickedit.routing.yml
@@ -61,3 +61,15 @@ quickedit.image_info:
     _permission: 'access in-place editing'
     _access_quickedit_entity_field: 'TRUE'
     _method: 'GET'
+
+quickedit.field_untransformed_text:
+  path: '/quickedit/{entity_type}/{entity}/{field_name}/{langcode}/{view_mode_id}'
+  defaults:
+    _controller: '\Drupal\quickedit\QuickEditController::getUntransformedText'
+  options:
+    parameters:
+      entity:
+        type: entity:{entity_type}
+  requirements:
+    _permission: 'access in-place editing'
+    _access_quickedit_entity_field: 'TRUE'
diff --git a/web/core/modules/quickedit/src/Ajax/EntitySavedCommand.php b/web/core/modules/quickedit/src/Ajax/EntitySavedCommand.php
index a0366515e..11d19efd2 100644
--- a/web/core/modules/quickedit/src/Ajax/EntitySavedCommand.php
+++ b/web/core/modules/quickedit/src/Ajax/EntitySavedCommand.php
@@ -5,8 +5,7 @@
 use Drupal\Core\Ajax\BaseCommand;
 
 /**
- * AJAX command to indicate the entity was loaded from PrivateTempStore and
- * saved into the database.
+ * Indicates the entity was loaded from PrivateTempStore and saved.
  */
 class EntitySavedCommand extends BaseCommand {
 
diff --git a/web/core/modules/quickedit/src/Ajax/FieldFormCommand.php b/web/core/modules/quickedit/src/Ajax/FieldFormCommand.php
index 03faecfe9..cebe66982 100644
--- a/web/core/modules/quickedit/src/Ajax/FieldFormCommand.php
+++ b/web/core/modules/quickedit/src/Ajax/FieldFormCommand.php
@@ -5,8 +5,7 @@
 use Drupal\Core\Ajax\BaseCommand;
 
 /**
- * AJAX command for passing a rendered field form to Quick Edit's JavaScript
- * app.
+ * Passes a rendered field form to Quick Edit's JavaScript app.
  */
 class FieldFormCommand extends BaseCommand {
 
diff --git a/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php b/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php
index 1e84b0eb1..319f250a0 100644
--- a/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php
+++ b/web/core/modules/quickedit/src/Ajax/FieldFormSavedCommand.php
@@ -5,9 +5,7 @@
 use Drupal\Core\Ajax\BaseCommand;
 
 /**
- * AJAX command to indicate a field was saved into PrivateTempStore without
- * validation errors and pass the rerendered field to Quick Edit's JavaScript
- * app.
+ * Indicates a field was saved and passes the rerendered field to Quick Edit.
  */
 class FieldFormSavedCommand extends BaseCommand {
 
diff --git a/web/core/modules/quickedit/src/Ajax/FieldFormValidationErrorsCommand.php b/web/core/modules/quickedit/src/Ajax/FieldFormValidationErrorsCommand.php
index cbabb47c0..93ad1627e 100644
--- a/web/core/modules/quickedit/src/Ajax/FieldFormValidationErrorsCommand.php
+++ b/web/core/modules/quickedit/src/Ajax/FieldFormValidationErrorsCommand.php
@@ -5,8 +5,7 @@
 use Drupal\Core\Ajax\BaseCommand;
 
 /**
- * AJAX command to indicate a field form was attempted to be saved but failed
- * validation and pass the validation errors.
+ * Passes validation errors when saving a form field failed.
  */
 class FieldFormValidationErrorsCommand extends BaseCommand {
 
diff --git a/web/core/modules/quickedit/src/QuickEditController.php b/web/core/modules/quickedit/src/QuickEditController.php
index 6a2a794ea..05c204748 100644
--- a/web/core/modules/quickedit/src/QuickEditController.php
+++ b/web/core/modules/quickedit/src/QuickEditController.php
@@ -8,6 +8,7 @@
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\TempStore\PrivateTempStoreFactory;
+use Drupal\filter\Plugin\FilterInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -20,6 +21,7 @@
 use Drupal\quickedit\Ajax\FieldFormSavedCommand;
 use Drupal\quickedit\Ajax\FieldFormValidationErrorsCommand;
 use Drupal\quickedit\Ajax\EntitySavedCommand;
+use Drupal\quickedit\Ajax\GetUntransformedTextCommand;
 
 /**
  * Returns responses for Quick Edit module routes.
@@ -356,4 +358,34 @@ public function entitySave(EntityInterface $entity) {
     return $response;
   }
 
+  /**
+   * Returns Ajax response to render text field without transformation filters.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity of which a formatted text field is being rerendered.
+   * @param string $field_name
+   *   The name of the (formatted text) field that is being rerendered.
+   * @param string $langcode
+   *   The name of the language for which the formatted text field is being
+   *   rerendered.
+   * @param string $view_mode_id
+   *   The view mode the formatted text field should be rerendered in.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   The Ajax response.
+   */
+  public function getUntransformedText(EntityInterface $entity, $field_name, $langcode, $view_mode_id) {
+    $response = new AjaxResponse();
+
+    // Direct text editing is only supported for single-valued fields.
+    $field = $entity->getTranslation($langcode)->$field_name;
+    $editable_text = check_markup($field->value, $field->format, $langcode, [
+      FilterInterface::TYPE_TRANSFORM_REVERSIBLE,
+      FilterInterface::TYPE_TRANSFORM_IRREVERSIBLE,
+    ]);
+    $response->addCommand(new GetUntransformedTextCommand($editable_text));
+
+    return $response;
+  }
+
 }
diff --git a/web/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php b/web/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php
index bce74ceec..75f7f7e93 100644
--- a/web/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/EditorIntegrationLoadingTest.php
@@ -11,6 +11,7 @@
  * Tests Quick Edit module integration endpoints.
  *
  * @group quickedit
+ * @group legacy
  */
 class EditorIntegrationLoadingTest extends BrowserTestBase {
 
@@ -24,7 +25,7 @@ class EditorIntegrationLoadingTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The basic permissions necessary to view content and use in-place editing.
@@ -33,6 +34,9 @@ class EditorIntegrationLoadingTest extends BrowserTestBase {
    */
   protected static $basicPermissions = ['access content', 'create article content', 'use text format filtered_html', 'access contextual links'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -93,7 +97,7 @@ public function testUsersWithoutPermission() {
 
       // Retrieving the untransformed text should result in a 403 response and
       // return a different error message depending of the missing permission.
-      $response = $client->post($this->buildUrl('editor/node/1/body/en/full'), [
+      $response = $client->post($this->buildUrl('quickedit/node/1/body/en/full'), [
         'query' => http_build_query([MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']),
         'cookies' => $this->getSessionCookies(),
         'headers' => [
@@ -127,7 +131,7 @@ public function testUserWithPermission() {
     // Ensure the text is transformed.
     $this->assertSession()->responseContains('<p>Do you also love Drupal?</p><figure role="group" class="caption caption-img"><img src="druplicon.png" /><figcaption>Druplicon</figcaption></figure>');
     $client = $this->getHttpClient();
-    $response = $client->post($this->buildUrl('editor/node/1/body/en/full'), [
+    $response = $client->post($this->buildUrl('quickedit/node/1/body/en/full'), [
       'query' => http_build_query([MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']),
       'cookies' => $this->getSessionCookies(),
       'headers' => [
diff --git a/web/core/modules/quickedit/tests/src/Functional/Jsonapi/QuickEditLayoutBuilderEntityViewDisplayTest.php b/web/core/modules/quickedit/tests/src/Functional/Jsonapi/QuickEditLayoutBuilderEntityViewDisplayTest.php
index 0e1509b2a..1e9fe10c1 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Jsonapi/QuickEditLayoutBuilderEntityViewDisplayTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Jsonapi/QuickEditLayoutBuilderEntityViewDisplayTest.php
@@ -10,6 +10,7 @@
  * @group jsonapi
  * @group layout_builder
  * @group quickedit
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayTest extends LayoutBuilderEntityViewDisplayTest {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php b/web/core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php
index e9be41eb8..db564fbec 100644
--- a/web/core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/LayoutBuilderQuickEditTest.php
@@ -2,12 +2,14 @@
 
 namespace Drupal\Tests\quickedit\Functional;
 
+use Drupal\layout_builder\Entity\LayoutBuilderEntityViewDisplay;
 use Drupal\Tests\BrowserTestBase;
 
 /**
  * Tests Layout Builder integration with Quick Edit.
  *
  * @group quickedit
+ * @group legacy
  */
 class LayoutBuilderQuickEditTest extends BrowserTestBase {
 
@@ -39,6 +41,10 @@ protected function setUp(): void {
     $this->createNode([
       'type' => 'bundle_with_section_field',
     ]);
+    LayoutBuilderEntityViewDisplay::load('node.bundle_with_section_field.default')
+      ->enableLayoutBuilder()
+      ->setOverridable()
+      ->save();
   }
 
   /**
@@ -49,15 +55,9 @@ public function testPlaceFieldBlockFromDifferentEntityType() {
 
     $this->drupalLogin($this->drupalCreateUser([
       'configure any layout',
-      'administer node display',
       'access in-place editing',
     ]));
 
-    // From the manage display page, go to manage the layout.
-    $this->drupalGet('admin/structure/types/manage/bundle_with_section_field/display/default');
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $this->submitForm(['layout[allow_custom]' => TRUE], 'Save');
-
     // Place a field block for a user entity field.
     $this->drupalGet('node/1/layout');
     $page->clickLink('Add block');
diff --git a/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php b/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
index e4cc514c2..e044672b0 100644
--- a/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/QuickEditCustomPipelineTest.php
@@ -10,6 +10,7 @@
  * Tests using a custom pipeline with Quick Edit.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditCustomPipelineTest extends BrowserTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/QuickEditEndPointAccessTest.php b/web/core/modules/quickedit/tests/src/Functional/QuickEditEndPointAccessTest.php
index dbff08aa2..cd367e0a0 100644
--- a/web/core/modules/quickedit/tests/src/Functional/QuickEditEndPointAccessTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/QuickEditEndPointAccessTest.php
@@ -11,6 +11,7 @@
  * Tests accessing the Quick Edit endpoints.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditEndPointAccessTest extends BrowserTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php b/web/core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php
index a1e3932c6..d01c915e1 100644
--- a/web/core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/QuickEditImageControllerTest.php
@@ -11,6 +11,7 @@
  * Tests the endpoints used by the "image" in-place editor.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditImageControllerTest extends BrowserTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/QuickEditMinimalTest.php b/web/core/modules/quickedit/tests/src/Functional/QuickEditMinimalTest.php
index 2242e97a2..0b9557835 100644
--- a/web/core/modules/quickedit/tests/src/Functional/QuickEditMinimalTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/QuickEditMinimalTest.php
@@ -8,6 +8,7 @@
  * Tests Quick Edit can be installed with Minimal.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditMinimalTest extends BrowserTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonAnonTest.php b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonAnonTest.php
index c138148ae..5dedd754f 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonAnonTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonAnonTest.php
@@ -8,6 +8,7 @@
  * @group quickedit
  * @group layout_builder
  * @group rest
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayJsonAnonTest extends LayoutBuilderEntityViewDisplayJsonAnonTest {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonBasicAuthTest.php b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonBasicAuthTest.php
index a3acf46ee..dfda667c8 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonBasicAuthTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonBasicAuthTest.php
@@ -8,6 +8,7 @@
  * @group quickedit
  * @group layout_builder
  * @group rest
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayJsonBasicAuthTest extends LayoutBuilderEntityViewDisplayJsonBasicAuthTest {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonCookieTest.php b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonCookieTest.php
index ffd07b021..7e6253842 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonCookieTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayJsonCookieTest.php
@@ -8,6 +8,7 @@
  * @group quickedit
  * @group layout_builder
  * @group rest
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayJsonCookieTest extends LayoutBuilderEntityViewDisplayJsonCookieTest {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlAnonTest.php b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlAnonTest.php
index 87c6a7263..b192703fa 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlAnonTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlAnonTest.php
@@ -8,6 +8,7 @@
  * @group quickedit
  * @group layout_builder
  * @group rest
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayXmlAnonTest extends LayoutBuilderEntityViewDisplayXmlAnonTest {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlBasicAuthTest.php b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlBasicAuthTest.php
index 864066630..f90c32f89 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlBasicAuthTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlBasicAuthTest.php
@@ -8,6 +8,7 @@
  * @group quickedit
  * @group layout_builder
  * @group rest
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayXmlBasicAuthTest extends LayoutBuilderEntityViewDisplayXmlBasicAuthTest {
 
diff --git a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlCookieTest.php b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlCookieTest.php
index 699efe177..ea08d6364 100644
--- a/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlCookieTest.php
+++ b/web/core/modules/quickedit/tests/src/Functional/Rest/QuickEditLayoutBuilderEntityViewDisplayXmlCookieTest.php
@@ -8,6 +8,7 @@
  * @group quickedit
  * @group layout_builder
  * @group rest
+ * @group legacy
  */
 class QuickEditLayoutBuilderEntityViewDisplayXmlCookieTest extends LayoutBuilderEntityViewDisplayXmlCookieTest {
 
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/CKEditor5IntegrationTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/CKEditor5IntegrationTest.php
index 5cd9797ff..7d4e1e380 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/CKEditor5IntegrationTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/CKEditor5IntegrationTest.php
@@ -12,6 +12,7 @@
  * Tests that Quick Edit can load CKEditor 5.
  *
  * @group quickedit
+ * @group legacy
  * @internal
  */
 class CKEditor5IntegrationTest extends QuickEditJavascriptTestBase {
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php
index 6896f04a3..557133adb 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/FieldTest.php
@@ -13,6 +13,7 @@
  * Tests quickedit.
  *
  * @group quickedit
+ * @group legacy
  */
 class FieldTest extends WebDriverTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php
index fbaaa0a0c..f5d96de1c 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/InlineFormErrorsIntegrationTest.php
@@ -9,6 +9,7 @@
  * Tests Inline Form Errors compatibility with Quick Edit.
  *
  * @group quickedit
+ * @group legacy
  */
 class InlineFormErrorsIntegrationTest extends WebDriverTestBase {
 
@@ -26,7 +27,7 @@ class InlineFormErrorsIntegrationTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * An editor user with permissions to access the in-place editor.
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderIntegrationTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderIntegrationTest.php
index ab8f1f0a1..f16c4c097 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderIntegrationTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderIntegrationTest.php
@@ -13,6 +13,7 @@
 
 /**
  * @group quickedit
+ * @group legacy
  */
 class LayoutBuilderIntegrationTest extends QuickEditJavascriptTestBase {
 
@@ -34,7 +35,7 @@ class LayoutBuilderIntegrationTest extends QuickEditJavascriptTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * A user with permissions to edit Articles and use Quick Edit.
@@ -286,7 +287,6 @@ public function testArticleNode() {
    * Tests if a custom can be in-place edited with Quick Edit.
    */
   public function testCustomBlock() {
-    $this->markTestSkipped('This test fails pretty consistently on the latest Chromedriver');
     $block_content_type = BlockContentType::create([
       'id' => 'basic',
       'label' => 'basic',
@@ -321,6 +321,13 @@ public function testCustomBlock() {
     $this->assertEntityInstanceStates([
       'block_content/1[0]' => 'opened',
     ]);
+
+    // The label 'body' will only be shown when the pointer hovers over the
+    // body. This can't be guaranteed by "just" opening the block in QuickEdit.
+    // We explicitly move the pointer first over the page title and afterwards
+    // over the block body to be sure.
+    $this->movePointerTo('.page-title');
+    $this->movePointerTo('[data-quickedit-field-id="block_content/1/body/en/full"]');
     $this->assertQuickEditEntityToolbar((string) $block_content->label(), 'Body');
     $this->assertEntityInstanceFieldStates('block_content', 1, 0, [
       'block_content/1/body/en/full' => 'highlighted',
@@ -340,4 +347,16 @@ public function testCustomBlock() {
     $this->assertSession()->elementExists('css', '#quickedit-entity-toolbar .quickedit-toolgroup.wysiwyg-main > .cke_chrome .cke_top[role="presentation"] .cke_toolbar[role="toolbar"] .cke_toolgroup[role="presentation"] > .cke_button[title~="Bold"][role="button"]');
   }
 
+  /**
+   * Moves mouse pointer to location of $selector.
+   *
+   * @param string $selector
+   *   CSS selector.
+   */
+  protected function movePointerTo($selector) {
+    $driver_session = $this->getSession()->getDriver()->getWebDriverSession();
+    $element = $driver_session->element('css selector', $selector);
+    $driver_session->moveto(['element' => $element->getID()]);
+  }
+
 }
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php
index 05744d77e..f97daa3dc 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/LayoutBuilderQuickEditTest.php
@@ -13,6 +13,7 @@
  * @covers layout_builder_quickedit_render_field()
  *
  * @group quickedit
+ * @group legacy
  */
 class LayoutBuilderQuickEditTest extends QuickEditJavascriptTestBase {
 
@@ -25,12 +26,13 @@ class LayoutBuilderQuickEditTest extends QuickEditJavascriptTestBase {
   protected static $modules = [
     'node',
     'layout_builder',
+    'field_ui',
   ];
 
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The article node under test.
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php
index 241d9376d..34dec11f8 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditAutocompleteTermTest.php
@@ -14,6 +14,7 @@
  * Tests in-place editing of autocomplete tags.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditAutocompleteTermTest extends WebDriverTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php
index dac348073..f3b4635ba 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditFileTest.php
@@ -10,6 +10,7 @@
 
 /**
  * @group quickedit
+ * @group legacy
  */
 class QuickEditFileTest extends QuickEditJavascriptTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php
index 8db8293b9..a7bef2541 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditImageTest.php
@@ -9,6 +9,7 @@
 /**
  * @coversDefaultClass \Drupal\quickedit\Plugin\InPlaceEditor\Image
  * @group quickedit
+ * @group legacy
  */
 class QuickEditImageTest extends QuickEditJavascriptTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
index 71eca0c6a..e4ddcd3be 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/QuickEditLoadingTest.php
@@ -15,10 +15,10 @@
 use Drupal\Tests\TestFileCreationTrait;
 
 /**
- * Tests loading of in-place editing functionality and lazy loading of its
- * in-place editors.
+ * Tests loading of in-place editing and lazy loading of in-place editors.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditLoadingTest extends WebDriverTestBase {
 
@@ -44,7 +44,7 @@ class QuickEditLoadingTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * A user with permissions to create and edit articles.
@@ -248,8 +248,7 @@ public function testTitleBaseField() {
   }
 
   /**
-   * Tests that Quick Edit doesn't make fields rendered with display options
-   * editable.
+   * Tests rendering of fields with editable display options.
    */
   public function testDisplayOptions() {
     $node = Node::load('1');
@@ -262,8 +261,7 @@ public function testDisplayOptions() {
   }
 
   /**
-   * Tests Quick Edit on a node that was concurrently edited on the full node
-   * form.
+   * Tests concurrent node edit.
    */
   public function testConcurrentEdit() {
     $nid = $this->testNode->id();
diff --git a/web/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php b/web/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
index 9020ddf1f..4cb1ea56f 100644
--- a/web/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
+++ b/web/core/modules/quickedit/tests/src/FunctionalJavascript/SettingsTrayIntegrationTest.php
@@ -11,6 +11,7 @@
  * Test Settings Tray and Quick Edit modules integration.
  *
  * @group quickedit
+ * @group legacy
  */
 class SettingsTrayIntegrationTest extends SettingsTrayTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php b/web/core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php
index 6852bafdb..6f53e6766 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/EditorIntegrationTest.php
@@ -8,8 +8,8 @@
 use Drupal\editor\Entity\Editor;
 use Drupal\entity_test\Entity\EntityTest;
 use Drupal\quickedit\MetadataGenerator;
+use Drupal\quickedit\QuickEditController;
 use Drupal\quickedit_test\MockQuickEditEntityFieldAccessCheck;
-use Drupal\editor\EditorController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -19,6 +19,7 @@
  * Tests Edit module integration (Editor module's inline editing support).
  *
  * @group quickedit
+ * @group legacy
  */
 class EditorIntegrationTest extends QuickEditTestBase {
 
@@ -56,12 +57,15 @@ class EditorIntegrationTest extends QuickEditTestBase {
   protected $accessChecker;
 
   /**
-   * The name of the field ued for tests.
+   * The name of the field used for tests.
    *
    * @var string
    */
   protected $fieldName;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -147,7 +151,8 @@ public function testEditorSelection() {
     $entity->{$this->fieldName}->format = 'filtered_html';
     $entity->save();
 
-    // Editor selection w/ cardinality 1, text format w/o associated text editor.
+    // Editor selection with cardinality 1, text format without associated text
+    // editor.
     $this->assertEquals('form', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality 1, and the filtered_html text format, the 'form' editor is selected.");
 
     // Editor selection w/ cardinality 1, text format w/ associated text editor.
@@ -155,7 +160,7 @@ public function testEditorSelection() {
     $entity->save();
     $this->assertEquals('editor', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality 1, and the full_html text format, the 'editor' editor is selected.");
 
-    // Editor selection with text processing, cardinality >1
+    // Editor selection with text processing, cardinality > 1.
     $this->fields->field_textarea_field_storage->setCardinality(2);
     $this->fields->field_textarea_field_storage->save();
     $this->assertEquals('form', $this->getSelectedEditor($entity->id(), $this->fieldName), "With cardinality >1, and both items using the full_html text format, the 'form' editor is selected.");
@@ -205,13 +210,18 @@ public function testAttachments() {
 
     $editors = ['editor'];
     $attachments = $this->editorSelector->getEditorAttachments($editors);
-    $this->assertSame(['library' => ['editor/quickedit.inPlaceEditor.formattedText']], $attachments, "Expected attachments for Editor module's in-place editor found.");
+    $this->assertSame(['library' => ['quickedit/quickedit.inPlaceEditor.formattedText']], $attachments, "Expected attachments for Editor module's in-place editor found.");
   }
 
   /**
    * Tests GetUntransformedTextCommand AJAX command.
    */
   public function testGetUntransformedTextCommand() {
+    $this->accessChecker = new MockQuickEditEntityFieldAccessCheck();
+    $this->editorSelector = $this->container->get('quickedit.editor.selector');
+    $this->editorManager = $this->container->get('plugin.manager.quickedit.editor');
+    $this->metadataGenerator = new MetadataGenerator($this->accessChecker, $this->editorSelector, $this->editorManager);
+
     // Create an entity with values for the field.
     $entity = EntityTest::create();
     $entity->{$this->fieldName}->value = 'Test';
@@ -220,7 +230,14 @@ public function testGetUntransformedTextCommand() {
     $entity = EntityTest::load($entity->id());
 
     // Verify AJAX response.
-    $controller = new EditorController();
+    $controller = new QuickEditController(
+      $this->container->get('tempstore.private'),
+      $this->metadataGenerator,
+      $this->editorSelector,
+      $this->container->get('renderer'),
+      $this->container->get('entity_display.repository'),
+      $this->container->get('entity.repository'),
+    );
     $request = new Request();
     $response = $controller->getUntransformedText($entity, $this->fieldName, LanguageInterface::LANGCODE_DEFAULT, 'default');
     $expected = [
diff --git a/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php b/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
index 09deda66f..53bde403e 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/EditorSelectionTest.php
@@ -9,6 +9,7 @@
  * Tests in-place field editor selection.
  *
  * @group quickedit
+ * @group legacy
  */
 class EditorSelectionTest extends QuickEditTestBase {
 
@@ -26,6 +27,9 @@ class EditorSelectionTest extends QuickEditTestBase {
    */
   protected $editorSelector;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -80,6 +84,8 @@ public function testText() {
   }
 
   /**
+   * Tests a textual field with varying text format compatibility.
+   *
    * Tests a textual field, with text filtering, with cardinality 1 and >1,
    * always with an Editor plugin present that supports textual fields with text
    * filtering, but with varying text format compatibility.
diff --git a/web/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php b/web/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
index 27cd3830a..341cb2763 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/MediaEmbedFilterDisabledIntegrationsTest.php
@@ -9,6 +9,7 @@
  *
  * @coversDefaultClass \Drupal\media\Plugin\Filter\MediaEmbed
  * @group quickedit
+ * @group legacy
  */
 class MediaEmbedFilterDisabledIntegrationsTest extends MediaEmbedFilterTestBase {
 
diff --git a/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php b/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
index 880c9c167..6dbde6cc0 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/MetadataGeneratorTest.php
@@ -12,6 +12,7 @@
  * Tests in-place field editing metadata.
  *
  * @group quickedit
+ * @group legacy
  */
 class MetadataGeneratorTest extends QuickEditTestBase {
 
@@ -48,6 +49,9 @@ class MetadataGeneratorTest extends QuickEditTestBase {
    */
   protected $accessChecker;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/quickedit/tests/src/Kernel/QuickEditLoadingTest.php b/web/core/modules/quickedit/tests/src/Kernel/QuickEditLoadingTest.php
index 0066ca949..fe246b586 100644
--- a/web/core/modules/quickedit/tests/src/Kernel/QuickEditLoadingTest.php
+++ b/web/core/modules/quickedit/tests/src/Kernel/QuickEditLoadingTest.php
@@ -9,10 +9,10 @@
 use Drupal\Tests\user\Traits\UserCreationTrait;
 
 /**
- * Tests loading of in-place editing functionality and lazy loading of its
- * in-place editors.
+ * Tests loading of in-place editing and lazy loading of in-place editors.
  *
  * @group quickedit
+ * @group legacy
  */
 class QuickEditLoadingTest extends KernelTestBase {
 
@@ -66,8 +66,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests that Quick Edit doesn't make fields rendered with display options
-   * editable.
+   * Tests that fields rendered with display options are not editable.
    */
   public function testDisplayOptions() {
     $node = Node::load(1);
diff --git a/web/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php b/web/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php
index da94752cf..ea48f3fcc 100644
--- a/web/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php
+++ b/web/core/modules/quickedit/tests/src/Unit/Access/QuickEditEntityFieldAccessCheckTest.php
@@ -13,6 +13,7 @@
  * @coversDefaultClass \Drupal\quickedit\Access\QuickEditEntityFieldAccessCheck
  * @group Access
  * @group quickedit
+ * @group legacy
  */
 class QuickEditEntityFieldAccessCheckTest extends UnitTestCase {
 
@@ -82,11 +83,11 @@ public function testAccess($entity_is_editable, $field_storage_is_accessible, Ac
     $entity_with_field->expects($this->any())
       ->method('get')
       ->with($field_name)
-      ->will($this->returnValue($field_storage));
+      ->willReturn($field_storage);
     $entity_with_field->expects($this->once())
       ->method('hasTranslation')
       ->with(LanguageInterface::LANGCODE_NOT_SPECIFIED)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $account = $this->createMock('Drupal\Core\Session\AccountInterface');
     $access = $this->editAccessCheck->access($entity_with_field, $field_name, LanguageInterface::LANGCODE_NOT_SPECIFIED, $account);
diff --git a/web/core/modules/rdf/rdf.info.yml b/web/core/modules/rdf/rdf.info.yml
index 8f71af475..a4ff35ea0 100644
--- a/web/core/modules/rdf/rdf.info.yml
+++ b/web/core/modules/rdf/rdf.info.yml
@@ -2,4 +2,6 @@ name: RDF
 type: module
 description: 'Enriches your content with metadata to let other applications (e.g. search engines, aggregators) better understand its relationships and attributes.'
 package: Core
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/docs/core-modules-and-themes/deprecated-and-obsolete-modules-and-themes#s-rdf
 version: VERSION
diff --git a/web/core/modules/rdf/rdf.module b/web/core/modules/rdf/rdf.module
index ad8af35be..09211ba40 100644
--- a/web/core/modules/rdf/rdf.module
+++ b/web/core/modules/rdf/rdf.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Url;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Template\Attribute;
+use Drupal\node\NodeInterface;
 use Drupal\rdf\Entity\RdfMapping;
 
 /**
@@ -228,6 +229,23 @@ function rdf_entity_prepare_view($entity_type, array $entities, array $displays)
   }
 }
 
+/**
+ * Implements hook_ENTITY_TYPE_build_defaults_alter().
+ */
+function rdf_node_build_defaults_alter(array &$build, NodeInterface $node) {
+  // Ensure that RSS views define the RDF namespaces.
+  // @see \Drupal\node\Plugin\views\row\Rss::render()
+  if (!isset($node->rss_namespaces)) {
+    $node->rss_namespaces = [];
+  }
+  foreach (rdf_get_namespaces() as $prefix => $uri) {
+    if ($prefix === 'dc') {
+      continue;
+    }
+    $node->rss_namespaces["xmlns:$prefix"] = $uri;
+  }
+}
+
 /**
  * Implements hook_ENTITY_TYPE_storage_load() for comment entities.
  */
diff --git a/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
index b8b8e95b7..89c2d2f50 100644
--- a/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/CommentAttributesTest.php
@@ -15,6 +15,7 @@
  * Tests the RDFa markup of comments.
  *
  * @group rdf
+ * @group legacy
  */
 class CommentAttributesTest extends CommentTestBase {
 
@@ -52,6 +53,9 @@ class CommentAttributesTest extends CommentTestBase {
    */
   protected $nodeUri;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
index 89231017d..66fee7f82 100644
--- a/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/EntityReferenceFieldAttributesTest.php
@@ -11,6 +11,7 @@
  * Tests RDFa markup generation for taxonomy term fields.
  *
  * @group rdf
+ * @group legacy
  */
 class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
 
@@ -49,6 +50,9 @@ class EntityReferenceFieldAttributesTest extends TaxonomyTestBase {
    */
   protected $vocabulary;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
index 28ffb6b26..8ebfdf560 100644
--- a/web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/FileFieldAttributesTest.php
@@ -11,6 +11,7 @@
  * Tests the RDFa markup of filefields.
  *
  * @group rdf
+ * @group legacy
  */
 class FileFieldAttributesTest extends FileFieldTestBase {
 
@@ -56,6 +57,9 @@ class FileFieldAttributesTest extends FileFieldTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $node_storage = $this->container->get('entity_type.manager')->getStorage('node');
diff --git a/web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php b/web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
index b2951615b..9f044da19 100644
--- a/web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/GetRdfNamespacesTest.php
@@ -8,6 +8,7 @@
  * Tests hook_rdf_namespaces().
  *
  * @group rdf
+ * @group legacy
  */
 class GetRdfNamespacesTest extends BrowserTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
index 5c2f67fa9..a7c96b100 100644
--- a/web/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/ImageFieldAttributesTest.php
@@ -14,6 +14,7 @@
  * Tests the RDFa markup of imagefields.
  *
  * @group rdf
+ * @group legacy
  */
 class ImageFieldAttributesTest extends ImageFieldTestBase {
 
@@ -63,6 +64,9 @@ class ImageFieldAttributesTest extends ImageFieldTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Migrate/NoMultilingualReviewPageTest.php b/web/core/modules/rdf/tests/src/Functional/Migrate/NoMultilingualReviewPageTest.php
index 34bd011c5..383f56edd 100644
--- a/web/core/modules/rdf/tests/src/Functional/Migrate/NoMultilingualReviewPageTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Migrate/NoMultilingualReviewPageTest.php
@@ -10,6 +10,7 @@
  * The test method is provided by the MigrateUpgradeTestBase class.
  *
  * @group rdf
+ * @group legacy
  */
 class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php b/web/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php
index 0edf193c9..b3c9c617f 100644
--- a/web/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php
+++ b/web/core/modules/rdf/tests/src/Functional/Migrate/Upgrade7Test.php
@@ -10,6 +10,7 @@
  * The test method is provided by the MigrateUpgradeTestBase class.
  *
  * @group rdf
+ * @group legacy
  */
 class Upgrade7Test extends MigrateUpgradeTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
index 3463d3965..640111c6a 100644
--- a/web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/NodeAttributesTest.php
@@ -10,6 +10,7 @@
  * Tests the RDFa markup of Nodes.
  *
  * @group rdf
+ * @group legacy
  */
 class NodeAttributesTest extends NodeTestBase {
 
@@ -34,6 +35,9 @@ class NodeAttributesTest extends NodeTestBase {
    */
   protected $baseUri;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonAnonTest.php b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonAnonTest.php
index faed79506..e9f3f4bfa 100644
--- a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonAnonTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonAnonTest.php
@@ -6,6 +6,7 @@
 
 /**
  * @group rest
+ * @group legacy
  */
 class RdfMappingJsonAnonTest extends RdfMappingResourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonBasicAuthTest.php b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonBasicAuthTest.php
index e5d4c202a..db3776d1f 100644
--- a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonBasicAuthTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonBasicAuthTest.php
@@ -6,6 +6,7 @@
 
 /**
  * @group rest
+ * @group legacy
  */
 class RdfMappingJsonBasicAuthTest extends RdfMappingResourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonCookieTest.php b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonCookieTest.php
index 768aab6b9..94024201e 100644
--- a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonCookieTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingJsonCookieTest.php
@@ -6,6 +6,7 @@
 
 /**
  * @group rest
+ * @group legacy
  */
 class RdfMappingJsonCookieTest extends RdfMappingResourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlAnonTest.php b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlAnonTest.php
index a1970f6bd..4b94394ad 100644
--- a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlAnonTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlAnonTest.php
@@ -7,6 +7,7 @@
 
 /**
  * @group rest
+ * @group legacy
  */
 class RdfMappingXmlAnonTest extends RdfMappingResourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlBasicAuthTest.php b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlBasicAuthTest.php
index d4bbc3b17..d8c3623cb 100644
--- a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlBasicAuthTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlBasicAuthTest.php
@@ -7,6 +7,7 @@
 
 /**
  * @group rest
+ * @group legacy
  */
 class RdfMappingXmlBasicAuthTest extends RdfMappingResourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlCookieTest.php b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlCookieTest.php
index c84fdc075..e606398d1 100644
--- a/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlCookieTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/Rest/RdfMappingXmlCookieTest.php
@@ -7,6 +7,7 @@
 
 /**
  * @group rest
+ * @group legacy
  */
 class RdfMappingXmlCookieTest extends RdfMappingResourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php b/web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
index efe1f847d..1d7fb0013 100644
--- a/web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/StandardProfileTest.php
@@ -13,9 +13,10 @@
 use Drupal\Tests\rdf\Traits\RdfParsingTrait;
 
 /**
- * Tests the RDF mappings and RDFa markup of the standard profile.
+ * Tests the RDF mappings and RDFa markup on top of the standard profile.
  *
  * @group rdf
+ * @group legacy
  */
 class StandardProfileTest extends BrowserTestBase {
 
@@ -24,7 +25,7 @@ class StandardProfileTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The profile used during tests.
@@ -36,80 +37,118 @@ class StandardProfileTest extends BrowserTestBase {
   public $profile = 'standard';
 
   /**
+   * {@inheritdoc}
+   */
+  protected static $modules = ['rdf'];
+
+  /**
+   * The base URI.
+   *
    * @var string
    */
   protected $baseUri;
 
   /**
+   * The admin user.
+   *
    * @var \Drupal\user\UserInterface
    */
   protected $adminUser;
 
   /**
+   * The web user.
+   *
    * @var \Drupal\user\UserInterface
    */
   protected $webUser;
 
   /**
+   * The term to test.
+   *
    * @var \Drupal\taxonomy\TermInterface
    */
   protected $term;
 
   /**
+   * The image to test.
+   *
    * @var \Drupal\file\FileInterface
    */
   protected $image;
 
   /**
+   * The article to test.
+   *
    * @var \Drupal\node\NodeInterface
    */
   protected $article;
 
   /**
+   * The comment on the article to test.
+   *
    * @var \Drupal\comment\CommentInterface
    */
   protected $articleComment;
 
   /**
+   * The page to test.
+   *
    * @var \Drupal\node\NodeInterface
    */
   protected $page;
 
   /**
+   * The URI of the image to test.
+   *
    * @var string
    */
   protected $imageUri;
 
   /**
+   * The URI of the term to test.
+   *
    * @var string
    */
   protected $termUri;
 
   /**
+   * The URI of the article to test.
+   *
    * @var string
    */
   protected $articleUri;
 
   /**
+   * The URI of the page to test.
+   *
    * @var string
    */
   protected $pageUri;
 
   /**
+   * The URI of the author of the article to test.
+   *
    * @var string
    */
   protected $authorUri;
 
   /**
+   * The URI of the comment on the article to test.
+   *
    * @var string
    */
   protected $articleCommentUri;
 
   /**
+   * The URI of the author of the comment to test.
+   *
    * @var string
    */
   protected $commenterUri;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -161,7 +200,10 @@ protected function setUp(): void {
     ];
     $this->article = $this->drupalCreateNode($article_settings);
     // Create second article to test teaser list.
-    $this->drupalCreateNode(['type' => 'article', 'promote' => NodeInterface::PROMOTED]);
+    $this->drupalCreateNode([
+      'type' => 'article',
+      'promote' => NodeInterface::PROMOTED,
+    ]);
 
     // Create article comment.
     $this->articleComment = $this->saveComment($this->article->id(), $this->webUser->id(), NULL, 0);
@@ -212,7 +254,6 @@ protected function doFrontPageRdfaTests() {
     $this->drupalGet(Url::fromRoute('<front>'));
 
     // Ensure that both articles are listed.
-    // $this->assertCount(2, $this->getRdfGraph(Url::fromRoute('<front>'), $this->baseUri)->allOfType('http://schema.org/Article'), 'Two articles found on front page.');
     $this->assertEquals(2, $this->getElementByRdfTypeCount(Url::fromRoute('<front>'), $this->baseUri, 'http://schema.org/Article'), 'Two articles found on front page.');
 
     // Test interaction count.
@@ -455,10 +496,9 @@ protected function assertRdfaNodeCommentProperties(): void {
     $text = $this->articleComment->get('comment_body')->value;
     $expected_value = [
       'type' => 'literal',
-      // There is an extra carriage return in the when parsing comments as
+      // There is an extra carriage return in the value when parsing comments as
       // output by Bartik, so it must be added to the expected value.
-      'value' => "$text
-",
+      'value' => "$text" . PHP_EOL,
       'lang' => 'en',
     ];
     $this->assertTrue($this->hasRdfProperty($this->getSession()->getPage()->getContent(), $this->baseUri, $this->articleCommentUri, 'http://schema.org/text', $expected_value), "Article comment body was found (schema:text).");
diff --git a/web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
index 465a45915..4ddf5b428 100644
--- a/web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/TaxonomyAttributesTest.php
@@ -10,6 +10,7 @@
  * Tests the RDFa markup of Taxonomy terms.
  *
  * @group rdf
+ * @group legacy
  */
 class TaxonomyAttributesTest extends TaxonomyTestBase {
 
@@ -41,6 +42,9 @@ class TaxonomyAttributesTest extends TaxonomyTestBase {
    */
   protected $vocabulary;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php b/web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
index 9df37f11e..1771971f3 100644
--- a/web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Functional/UserAttributesTest.php
@@ -10,6 +10,7 @@
  * Tests the RDFa markup of Users.
  *
  * @group rdf
+ * @group legacy
  */
 class UserAttributesTest extends BrowserTestBase {
 
@@ -34,6 +35,9 @@ class UserAttributesTest extends BrowserTestBase {
    */
   protected $baseUri;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     rdf_get_mapping('user', 'user')
diff --git a/web/core/modules/rdf/tests/src/Kernel/CrudTest.php b/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
index aa4174eb2..8e63751f8 100644
--- a/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/CrudTest.php
@@ -8,6 +8,7 @@
  * Tests the RDF mapping CRUD functions.
  *
  * @group rdf
+ * @group legacy
  */
 class CrudTest extends KernelTestBase {
 
@@ -33,6 +34,9 @@ class CrudTest extends KernelTestBase {
    */
   protected $bundle;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->prefix = 'rdf.mapping';
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
index 6616d2d8d..18ac64b9d 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa output by datetime field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -28,6 +29,9 @@ class DateTimeFieldRdfaTest extends FieldRdfaTestBase {
    */
   protected static $modules = ['datetime'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
index 7330ef0e4..3bcf36980 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/EmailFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa output by email field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class EmailFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -21,6 +22,9 @@ class EmailFieldRdfaTest extends FieldRdfaTestBase {
    */
   protected static $modules = ['text'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
index f4c85ab46..02a87b782 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/EntityReferenceRdfaTest.php
@@ -10,6 +10,7 @@
  * Tests the RDFa output of the entity reference field formatter.
  *
  * @group rdf
+ * @group legacy
  */
 class EntityReferenceRdfaTest extends FieldRdfaTestBase {
 
@@ -46,6 +47,9 @@ class EntityReferenceRdfaTest extends FieldRdfaTestBase {
    */
   protected static $modules = ['text', 'filter'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
index 59af0b67f..a1f8f8f14 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaDatatypeCallbackTest.php
@@ -8,6 +8,7 @@
  * Tests the RDFa output of a text field formatter with a datatype callback.
  *
  * @group rdf
+ * @group legacy
  */
 class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase {
 
@@ -21,6 +22,9 @@ class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase {
    */
   protected static $modules = ['text', 'filter', 'rdf_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
index 96f85c745..fe54d4d66 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests the placement of RDFa in link field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class LinkFieldRdfaTest extends FieldRdfaTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
index fc566cc49..a4d9eb3f6 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/NumberFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa output by number field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class NumberFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -30,8 +31,8 @@ public function testIntegerFormatter() {
    * Tests the integer formatter with settings.
    */
   public function testIntegerFormatterWithSettings() {
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
     $this->fieldType = 'integer';
     $formatter = [
       'type' => 'number_integer',
@@ -73,8 +74,8 @@ public function testFloatFormatter() {
    * Tests the float formatter with settings.
    */
   public function testFloatFormatterWithSettings() {
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
     $this->fieldType = 'float';
     $formatter = [
       'type' => 'number_decimal',
@@ -123,8 +124,8 @@ public function testFloatFormatterWithScale() {
    * Tests the float formatter with a scale. Scale is exercised.
    */
   public function testFloatFormatterWithScaleExercised() {
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
     $this->fieldType = 'float';
     $formatter = [
       'type' => 'number_decimal',
@@ -161,8 +162,8 @@ public function testDecimalFormatter() {
    * Tests the decimal formatter with settings.
    */
   public function testDecimalFormatterWithSettings() {
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
     $this->fieldType = 'decimal';
     $formatter = [
       'type' => 'number_decimal',
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
index c0e9ddfd1..6ded2483e 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/StringFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa output by text field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class StringFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -30,6 +31,9 @@ class StringFieldRdfaTest extends FieldRdfaTestBase {
    */
   protected $testSummary = 'test_summary_value';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
index fec2227b5..99eb3c811 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/TelephoneFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa output by telephone field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -28,6 +29,9 @@ class TelephoneFieldRdfaTest extends FieldRdfaTestBase {
    */
   protected static $modules = ['telephone', 'text'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php b/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
index 5f807448f..73cf5da7c 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Field/TextFieldRdfaTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa output by text field formatters.
  *
  * @group rdf
+ * @group legacy
  */
 class TextFieldRdfaTest extends FieldRdfaTestBase {
 
@@ -35,6 +36,9 @@ class TextFieldRdfaTest extends FieldRdfaTestBase {
    */
   protected static $modules = ['text', 'filter'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Migrate/d7/MigrateRdfMappingTest.php b/web/core/modules/rdf/tests/src/Kernel/Migrate/d7/MigrateRdfMappingTest.php
index e676d3344..99095de34 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Migrate/d7/MigrateRdfMappingTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Migrate/d7/MigrateRdfMappingTest.php
@@ -9,6 +9,7 @@
  * Tests RDF mappings migration from Drupal 7 to 8.
  *
  * @group rdf
+ * @group legacy
  */
 class MigrateRdfMappingTest extends MigrateDrupalTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/Plugin/migrate/source/d7/RdfMappingTest.php b/web/core/modules/rdf/tests/src/Kernel/Plugin/migrate/source/d7/RdfMappingTest.php
index 08ad4be55..6b746d6c0 100644
--- a/web/core/modules/rdf/tests/src/Kernel/Plugin/migrate/source/d7/RdfMappingTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/Plugin/migrate/source/d7/RdfMappingTest.php
@@ -12,6 +12,7 @@
  * @covers \Drupal\rdf\Plugin\migrate\source\d7\RdfMapping
  *
  * @group rdf
+ * @group legacy
  */
 class RdfMappingTest extends MigrateSqlSourceTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/RdfCommentStorageLoadTest.php b/web/core/modules/rdf/tests/src/Kernel/RdfCommentStorageLoadTest.php
index 011676c32..b1ace5969 100644
--- a/web/core/modules/rdf/tests/src/Kernel/RdfCommentStorageLoadTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/RdfCommentStorageLoadTest.php
@@ -11,6 +11,7 @@
  * Tests rdf_comment_storage_load.
  *
  * @group rdf
+ * @group legacy
  */
 class RdfCommentStorageLoadTest extends EntityKernelTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php b/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
index 812ffeaf0..ade7b93c1 100644
--- a/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
+++ b/web/core/modules/rdf/tests/src/Kernel/RdfaAttributesTest.php
@@ -8,6 +8,7 @@
  * Tests RDFa attribute generation from RDF mapping.
  *
  * @group rdf
+ * @group legacy
  */
 class RdfaAttributesTest extends KernelTestBase {
 
diff --git a/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php b/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
index 1df305686..7b709d09a 100644
--- a/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
+++ b/web/core/modules/rdf/tests/src/Unit/RdfMappingConfigEntityUnitTest.php
@@ -10,6 +10,7 @@
 /**
  * @coversDefaultClass \Drupal\rdf\Entity\RdfMapping
  * @group rdf
+ * @group legacy
  */
 class RdfMappingConfigEntityUnitTest extends UnitTestCase {
 
@@ -50,7 +51,7 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('entity'));
+      ->willReturn('entity');
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
 
@@ -72,14 +73,14 @@ public function testCalculateDependencies() {
     $target_entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('test_module'));
+      ->willReturn('test_module');
     $values = ['targetEntityType' => $target_entity_type_id];
     $target_entity_type->expects($this->any())
       ->method('getBundleEntityType')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(['type' => 'module', 'name' => 'test_module']));
+      ->willReturn(['type' => 'module', 'name' => 'test_module']);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
@@ -102,13 +103,16 @@ public function testCalculateDependenciesWithEntityBundle() {
     $target_entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('test_module'));
+      ->willReturn('test_module');
     $bundle_id = $this->randomMachineName(10);
     $values = ['targetEntityType' => $target_entity_type_id , 'bundle' => $bundle_id];
 
     $target_entity_type->expects($this->any())
       ->method('getBundleConfigDependency')
-      ->will($this->returnValue(['type' => 'config', 'name' => 'test_module.type.' . $bundle_id]));
+      ->willReturn([
+        'type' => 'config',
+        'name' => 'test_module.type.' . $bundle_id,
+      ]);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
diff --git a/web/core/modules/responsive_image/js/responsive_image.ajax.js b/web/core/modules/responsive_image/js/responsive_image.ajax.js
index 145adcf00..5c8955985 100644
--- a/web/core/modules/responsive_image/js/responsive_image.ajax.js
+++ b/web/core/modules/responsive_image/js/responsive_image.ajax.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.behaviors.responsiveImageAJAX = {
     attach: function attach() {
diff --git a/web/core/modules/responsive_image/migrations/d7_responsive_image_styles.yml b/web/core/modules/responsive_image/migrations/d7_responsive_image_styles.yml
index 2ed283c2e..af4ac522b 100644
--- a/web/core/modules/responsive_image/migrations/d7_responsive_image_styles.yml
+++ b/web/core/modules/responsive_image/migrations/d7_responsive_image_styles.yml
@@ -11,8 +11,8 @@ process:
   image_style_mappings:
     plugin: image_style_mappings
     source:
-     - mapping
-     - breakpoint_group
+      - mapping
+      - breakpoint_group
   breakpoint_group: breakpoint_group
 destination:
   plugin: entity:responsive_image_style
diff --git a/web/core/modules/responsive_image/responsive_image.module b/web/core/modules/responsive_image/responsive_image.module
index 6bd0e51f2..9a5620458 100644
--- a/web/core/modules/responsive_image/responsive_image.module
+++ b/web/core/modules/responsive_image/responsive_image.module
@@ -348,8 +348,8 @@ function template_preprocess_responsive_image(&$variables) {
  * @param array $multipliers
  *   An array with multipliers as keys and image style mappings as values.
  *
- * @return \Drupal\Core\Template\Attribute[]
- *   An array of attributes for the source tag.
+ * @return \Drupal\Core\Template\Attribute
+ *   An object of attributes for the source tag.
  */
 function _responsive_image_build_source_attributes(array $variables, BreakpointInterface $breakpoint, array $multipliers) {
   if ((empty($variables['width']) || empty($variables['height']))) {
diff --git a/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php b/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
index 331c278e0..0afb59ee6 100644
--- a/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
+++ b/web/core/modules/responsive_image/src/Plugin/Field/FieldFormatter/ResponsiveImageFormatter.php
@@ -137,7 +137,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     }
 
     $elements['responsive_image_style'] = [
-      '#title' => t('Responsive image style'),
+      '#title' => $this->t('Responsive image style'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('responsive_image_style') ?: NULL,
       '#required' => TRUE,
@@ -145,18 +145,18 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
       '#description' => [
         '#markup' => $this->linkGenerator->generate($this->t('Configure Responsive Image Styles'), new Url('entity.responsive_image_style.collection')),
         '#access' => $this->currentUser->hasPermission('administer responsive image styles'),
-        ],
+      ],
     ];
 
     $link_types = [
-      'content' => t('Content'),
-      'file' => t('File'),
+      'content' => $this->t('Content'),
+      'file' => $this->t('File'),
     ];
     $elements['image_link'] = [
-      '#title' => t('Link image to'),
+      '#title' => $this->t('Link image to'),
       '#type' => 'select',
       '#default_value' => $this->getSetting('image_link'),
-      '#empty_option' => t('Nothing'),
+      '#empty_option' => $this->t('Nothing'),
       '#options' => $link_types,
     ];
 
@@ -171,11 +171,11 @@ public function settingsSummary() {
 
     $responsive_image_style = $this->responsiveImageStyleStorage->load($this->getSetting('responsive_image_style'));
     if ($responsive_image_style) {
-      $summary[] = t('Responsive image style: @responsive_image_style', ['@responsive_image_style' => $responsive_image_style->label()]);
+      $summary[] = $this->t('Responsive image style: @responsive_image_style', ['@responsive_image_style' => $responsive_image_style->label()]);
 
       $link_types = [
-        'content' => t('Linked to content'),
-        'file' => t('Linked to file'),
+        'content' => $this->t('Linked to content'),
+        'file' => $this->t('Linked to file'),
       ];
       // Display this setting only if image is linked.
       if (isset($link_types[$this->getSetting('image_link')])) {
@@ -183,7 +183,7 @@ public function settingsSummary() {
       }
     }
     else {
-      $summary[] = t('Select a responsive image style.');
+      $summary[] = $this->t('Select a responsive image style.');
     }
 
     return $summary;
diff --git a/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php b/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
index 7bceff174..4700229c5 100644
--- a/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
+++ b/web/core/modules/responsive_image/src/ResponsiveImageStyleForm.php
@@ -225,6 +225,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
       if ($form_state->getValue('breakpoint_group') != $form_state->getCompleteForm()['breakpoint_group']['#default_value']) {
         // Remove the image style mappings since the breakpoint ID has changed.
         $form_state->unsetValue('keyed_styles');
+        return;
       }
 
       // Check that at least 1 image style has been selected when using sizes.
diff --git a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
index 9cbbad433..974c5c6c5 100644
--- a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
+++ b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageAdminUITest.php
@@ -55,7 +55,7 @@ public function testResponsiveImageAdmin() {
     $edit = [
       'label' => 'Style One',
       'id' => 'style_one',
-      'breakpoint_group' => 'responsive_image_test_module',
+      'breakpoint_group' => 'responsive_image',
       'fallback_image_style' => 'thumbnail',
     ];
     $this->drupalGet('admin/config/media/responsive-image-style/add');
@@ -67,6 +67,15 @@ public function testResponsiveImageAdmin() {
     $this->assertSession()->pageTextNotContains('There are no responsive image styles yet.');
     $this->assertSession()->pageTextContains('Style One');
 
+    // Edit the breakpoint_group.
+    $this->drupalGet('admin/config/media/responsive-image-style/style_one');
+    $this->assertSession()->fieldValueEquals('label', 'Style One');
+    $this->assertSession()->fieldValueEquals('breakpoint_group', 'responsive_image');
+    $edit = [
+      'breakpoint_group' => 'responsive_image_test_module',
+    ];
+    $this->submitForm($edit, 'Save');
+
     // Edit the group.
     $this->drupalGet('admin/config/media/responsive-image-style/style_one');
     $this->assertSession()->fieldValueEquals('label', 'Style One');
diff --git a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
index e865b0ee2..8abca68b2 100644
--- a/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
+++ b/web/core/modules/responsive_image/tests/src/Functional/ResponsiveImageFieldDisplayTest.php
@@ -426,9 +426,9 @@ public function testResponsiveImageFieldFormattersOneSource() {
         'image_mapping' => 'medium',
       ])
       ->addImageStyleMapping('responsive_image_test_module.empty', '2x', [
-          'image_mapping_type' => 'image_style',
-          'image_mapping' => 'large',
-        ])
+        'image_mapping_type' => 'image_style',
+        'image_mapping' => 'large',
+      ])
       ->save();
     $node_storage = $this->container->get('entity_type.manager')->getStorage('node');
     $field_name = mb_strtolower($this->randomMachineName());
diff --git a/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php b/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
index 125c48e00..0e6255f60 100644
--- a/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
+++ b/web/core/modules/responsive_image/tests/src/Unit/ResponsiveImageStyleConfigEntityUnitTest.php
@@ -42,13 +42,13 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('responsive_image'));
+      ->willReturn('responsive_image');
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with('responsive_image_style')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->breakpointManager = $this->createMock('\Drupal\breakpoint\BreakpointManagerInterface');
 
@@ -106,13 +106,13 @@ public function testCalculateDependencies() {
     $this->breakpointManager->expects($this->any())
       ->method('getGroupProviders')
       ->with('test_group')
-      ->willReturn(['bartik' => 'theme', 'toolbar' => 'module']);
+      ->willReturn(['olivero' => 'theme', 'toolbar' => 'module']);
 
     \Drupal::getContainer()->set('entity_type.repository', $entity_type_repository);
 
     $dependencies = $entity->calculateDependencies()->getDependencies();
     $this->assertEquals(['toolbar'], $dependencies['module']);
-    $this->assertEquals(['bartik'], $dependencies['theme']);
+    $this->assertEquals(['olivero'], $dependencies['theme']);
     $this->assertEquals(['image.style.fallback', 'image.style.large', 'image.style.medium', 'image.style.small'], $dependencies['config']);
   }
 
@@ -124,45 +124,45 @@ public function testHasImageStyleMappings() {
     $entity = new ResponsiveImageStyle([]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->addImageStyleMapping('test_breakpoint', '1x', [
-        'image_mapping_type' => 'image_style',
-        'image_mapping' => '',
+      'image_mapping_type' => 'image_style',
+      'image_mapping' => '',
     ]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
     $entity->addImageStyleMapping('test_breakpoint', '1x', [
-        'image_mapping_type' => 'sizes',
-        'image_mapping' => [
-          'sizes' => '(min-width:700px) 700px, 100vw',
-          'sizes_image_styles' => [],
-        ],
+      'image_mapping_type' => 'sizes',
+      'image_mapping' => [
+        'sizes' => '(min-width:700px) 700px, 100vw',
+        'sizes_image_styles' => [],
+      ],
     ]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
     $entity->addImageStyleMapping('test_breakpoint', '1x', [
-        'image_mapping_type' => 'sizes',
-        'image_mapping' => [
-          'sizes' => '',
-          'sizes_image_styles' => [
-            'large' => 'large',
-          ],
+      'image_mapping_type' => 'sizes',
+      'image_mapping' => [
+        'sizes' => '',
+        'sizes_image_styles' => [
+          'large' => 'large',
         ],
+      ],
     ]);
     $this->assertFalse($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
     $entity->addImageStyleMapping('test_breakpoint', '1x', [
-        'image_mapping_type' => 'image_style',
-        'image_mapping' => 'large',
+      'image_mapping_type' => 'image_style',
+      'image_mapping' => 'large',
     ]);
     $this->assertTrue($entity->hasImageStyleMappings());
     $entity->removeImageStyleMappings();
     $entity->addImageStyleMapping('test_breakpoint', '1x', [
-        'image_mapping_type' => 'sizes',
-        'image_mapping' => [
-          'sizes' => '(min-width:700px) 700px, 100vw',
-          'sizes_image_styles' => [
-            'large' => 'large',
-          ],
+      'image_mapping_type' => 'sizes',
+      'image_mapping' => [
+        'sizes' => '(min-width:700px) 700px, 100vw',
+        'sizes_image_styles' => [
+          'large' => 'large',
         ],
+      ],
     ]);
     $this->assertTrue($entity->hasImageStyleMappings());
   }
diff --git a/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php b/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
index 47ea8800a..9b5d24836 100644
--- a/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
+++ b/web/core/modules/rest/src/EventSubscriber/ResourceResponseSubscriber.php
@@ -122,7 +122,7 @@ public function getResponseFormat(RouteMatchInterface $route_match, Request $req
       return $acceptable_formats[0];
     }
 
-    // Sometimes, there are no acceptable formats, e.g. DELETE routes.
+    // Sometimes, there are no acceptable formats.
     return NULL;
   }
 
@@ -141,8 +141,7 @@ public function getResponseFormat(RouteMatchInterface $route_match, Request $req
    * @param \Symfony\Component\Serializer\SerializerInterface $serializer
    *   The serializer to use.
    * @param string|null $format
-   *   The response format, or NULL in case the response does not need a format,
-   *   for example for the response to a DELETE request.
+   *   The response format, or NULL in case the response does not need a format.
    *
    * @todo Add test coverage for language negotiation contexts in
    *   https://www.drupal.org/node/2135829.
diff --git a/web/core/modules/rest/src/Routing/ResourceRoutes.php b/web/core/modules/rest/src/Routing/ResourceRoutes.php
index f8ebbff15..83096eb44 100644
--- a/web/core/modules/rest/src/Routing/ResourceRoutes.php
+++ b/web/core/modules/rest/src/Routing/ResourceRoutes.php
@@ -116,7 +116,7 @@ protected function getRoutesForResourceConfig(RestResourceConfigInterface $rest_
         // - set the allowed request body content types/formats for methods that
         //   allow request bodies to be sent (unless hardcoded by the plugin)
         // - set the allowed authentication providers
-        if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'PATCH'], TRUE) && !$route->hasRequirement('_format')) {
+        if (in_array($method, ['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'], TRUE) && !$route->hasRequirement('_format')) {
           $route->addRequirements(['_format' => implode('|', $rest_resource_config->getFormats($method))]);
         }
         if (in_array($method, ['POST', 'PATCH', 'PUT'], TRUE) && !$route->hasRequirement('_content_type_format')) {
diff --git a/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml b/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml
index 85b418a6c..4ccb316c4 100644
--- a/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml
+++ b/web/core/modules/rest/tests/modules/rest_test/rest_test.services.yml
@@ -8,10 +8,10 @@ services:
     tags:
       - { name: authentication_provider, provider_id: 'rest_test_auth_global', global: TRUE }
   rest_test.page_cache_request_policy.deny_test_auth_requests:
-      class: Drupal\rest_test\PageCache\RequestPolicy\DenyTestAuthRequests
-      public: false
-      tags:
-        - { name: page_cache_request_policy }
+    class: Drupal\rest_test\PageCache\RequestPolicy\DenyTestAuthRequests
+    public: false
+    tags:
+      - { name: page_cache_request_policy }
   rest_test.encoder.foobar:
     class: Drupal\serialization\Encoder\JsonEncoder
     tags:
diff --git a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
index 8b9add719..bea7a29fa 100644
--- a/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
+++ b/web/core/modules/rest/tests/src/Functional/EntityResource/EntityResourceTestBase.php
@@ -24,6 +24,8 @@
 use Psr\Http\Message\ResponseInterface;
 
 /**
+ * Defines a base class for testing all entity resources.
+ *
  * Even though there is the generic EntityResource, it's necessary for every
  * entity type to have its own test, because they each have different fields,
  * validation constraints, et cetera. It's not because the generic case works,
@@ -85,16 +87,18 @@ abstract class EntityResourceTestBase extends ResourceTestBase {
   protected static $patchProtectedFieldNames;
 
   /**
-   * The fields that need a different (random) value for each new entity created
-   * by a POST request.
+   * A list of fields that need a unique value.
+   *
+   * This is for each new each entity created by a POST request.
    *
    * @var string[]
    */
   protected static $uniqueFieldNames = [];
 
   /**
-   * Optionally specify which field is the 'label' field. Some entities do not
-   * specify a 'label' entity key. For example: User.
+   * Optionally specify which field is the 'label' field.
+   *
+   * Some entities do not specify a 'label' entity key. For example: User.
    *
    * @see ::getInvalidNormalizedEntityToCreate
    *
@@ -519,19 +523,18 @@ public function testGet() {
     // @see \Drupal\rest\EventSubscriber\ResourceResponseSubscriber::flattenResponse()
     $cache_items = $this->container->get('database')
       ->select('cache_dynamic_page_cache', 'c')
-      ->fields('c', ['cid', 'data'])
+      ->fields('c', ['data'])
       ->condition('c.cid', '%[route]=rest.%', 'LIKE')
       ->execute()
-      ->fetchAllAssoc('cid');
+      ->fetchAll();
     if (!$is_cacheable_by_dynamic_page_cache) {
       $this->assertCount(0, $cache_items);
     }
     else {
-      $this->assertCount(2, $cache_items);
-      $found_cache_redirect = FALSE;
+      $this->assertLessThanOrEqual(2, count($cache_items));
       $found_cached_200_response = FALSE;
       $other_cached_responses_are_4xx = TRUE;
-      foreach ($cache_items as $cid => $cache_item) {
+      foreach ($cache_items as $cache_item) {
         $cached_data = unserialize($cache_item->data);
         if (!isset($cached_data['#cache_redirect'])) {
           $cached_response = $cached_data['#response'];
@@ -544,11 +547,7 @@ public function testGet() {
           $this->assertNotInstanceOf(ResourceResponseInterface::class, $cached_response);
           $this->assertInstanceOf(CacheableResponseInterface::class, $cached_response);
         }
-        else {
-          $found_cache_redirect = TRUE;
-        }
       }
-      $this->assertTrue($found_cache_redirect);
       $this->assertTrue($found_cached_200_response);
       $this->assertTrue($other_cached_responses_are_4xx);
     }
diff --git a/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php b/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
index f83369b21..7360f4d86 100644
--- a/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
+++ b/web/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
@@ -70,6 +70,9 @@ class StyleSerializerTest extends ViewTestBase {
    */
   protected $renderer;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['rest_test_views']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php b/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
index b5c390d4d..8e60baa9b 100644
--- a/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
+++ b/web/core/modules/rest/tests/src/Unit/CollectRoutesTest.php
@@ -85,7 +85,7 @@ protected function setUp(): void {
     $container->set('authentication_collector', $authentication_collector);
     $authentication_collector->expects($this->any())
       ->method('getSortedProviders')
-      ->will($this->returnValue(['basic_auth' => 'data', 'cookie' => 'data']));
+      ->willReturn(['basic_auth' => 'data', 'cookie' => 'data']);
 
     $container->setParameter('serializer.format_providers', ['json']);
 
@@ -105,7 +105,7 @@ protected function setUp(): void {
 
     $display_manager->expects($this->once())
       ->method('getDefinition')
-      ->will($this->returnValue(['id' => 'test', 'provider' => 'test']));
+      ->willReturn(['id' => 'test', 'provider' => 'test']);
 
     $none = $this->getMockBuilder('\Drupal\views\Plugin\views\access\None')
       ->disableOriginalConstructor()
@@ -113,7 +113,7 @@ protected function setUp(): void {
 
     $access_manager->expects($this->once())
       ->method('createInstance')
-      ->will($this->returnValue($none));
+      ->willReturn($none);
 
     $style_plugin = $this->getMockBuilder('\Drupal\rest\Plugin\views\style\Serializer')
       ->onlyMethods(['getFormats', 'init'])
@@ -122,16 +122,16 @@ protected function setUp(): void {
 
     $style_plugin->expects($this->once())
       ->method('getFormats')
-      ->will($this->returnValue(['json']));
+      ->willReturn(['json']);
 
     $style_plugin->expects($this->once())
       ->method('init')
       ->with($view_executable)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $style_manager->expects($this->once())
       ->method('createInstance')
-      ->will($this->returnValue($style_plugin));
+      ->willReturn($style_plugin);
 
     $this->routes = new RouteCollection();
     $this->routes->add('test_1', new Route('/test/1'));
diff --git a/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php b/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php
index 17d512e41..99bd36db1 100644
--- a/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php
+++ b/web/core/modules/rest/tests/src/Unit/EntityResourceValidationTraitTest.php
@@ -56,7 +56,7 @@ public function testFailedValidate() {
 
     $violations->expects($this->once())
       ->method('filterByFieldAccess')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $entity->validate()->willReturn($violations);
 
diff --git a/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php b/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
index 8ff2eae36..47625ace3 100644
--- a/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
+++ b/web/core/modules/rest/tests/src/Unit/EventSubscriber/ResourceResponseSubscriberTest.php
@@ -136,7 +136,7 @@ public function testOnResponseWithCacheableResponse($methods, array $supported_r
       $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => $this->randomMachineName()], $route_requirements));
 
       // The RequestHandler must return a ResourceResponseInterface object.
-      $handler_response = new ResourceResponse($method !== 'DELETE' ? ['REST' => 'Drupal'] : NULL);
+      $handler_response = new ResourceResponse(['REST' => 'Drupal']);
       $this->assertInstanceOf(ResourceResponseInterface::class, $handler_response);
       $this->assertInstanceOf(CacheableResponseInterface::class, $handler_response);
 
@@ -186,7 +186,7 @@ public function testOnResponseWithUncacheableResponse($methods, array $supported
       $route_match = new RouteMatch('test', new Route('/rest/test', ['_rest_resource_config' => $this->randomMachineName()], $route_requirements));
 
       // The RequestHandler must return a ResourceResponseInterface object.
-      $handler_response = new ModifiedResourceResponse($method !== 'DELETE' ? ['REST' => 'Drupal'] : NULL);
+      $handler_response = new ModifiedResourceResponse(['REST' => 'Drupal']);
       $this->assertInstanceOf(ResourceResponseInterface::class, $handler_response);
       $this->assertNotInstanceOf(CacheableResponseInterface::class, $handler_response);
 
@@ -344,7 +344,7 @@ public function providerTestResponseFormat() {
     ];
 
     $unsafe_method_bodyless_test_cases = [
-      'unsafe methods without response bodies (DELETE): client requested no format, response should have no format' => [
+      'unsafe methods without request bodies (DELETE): client requested no format, response should have the first acceptable format' => [
         ['DELETE'],
         ['xml', 'json'],
         ['xml', 'json'],
@@ -352,10 +352,10 @@ public function providerTestResponseFormat() {
         ['Content-Type' => 'application/json'],
         NULL,
         'xml',
-        NULL,
-        '',
+        'text/xml',
+        $xml_encoded,
       ],
-      'unsafe methods without response bodies (DELETE): client requested format (XML), response should have no format' => [
+      'unsafe methods without request bodies (DELETE): client requested format (XML), response should have xml format' => [
         ['DELETE'],
         ['xml', 'json'],
         ['xml', 'json'],
@@ -363,10 +363,10 @@ public function providerTestResponseFormat() {
         ['Content-Type' => 'application/json'],
         NULL,
         'xml',
-        NULL,
-        '',
+        'text/xml',
+        $xml_encoded,
       ],
-      'unsafe methods without response bodies (DELETE): client requested format (JSON), response should have no format' => [
+      'unsafe methods without request bodies (DELETE): client requested format (JSON), response should have json format' => [
         ['DELETE'],
         ['xml', 'json'],
         ['xml', 'json'],
@@ -374,8 +374,8 @@ public function providerTestResponseFormat() {
         ['Content-Type' => 'application/json'],
         NULL,
         'json',
-        NULL,
-        '',
+        'application/json',
+        $json_encoded,
       ],
     ];
 
diff --git a/web/core/modules/search/src/SearchPageListBuilder.php b/web/core/modules/search/src/SearchPageListBuilder.php
index 1ee866c34..8b844a6b5 100644
--- a/web/core/modules/search/src/SearchPageListBuilder.php
+++ b/web/core/modules/search/src/SearchPageListBuilder.php
@@ -369,8 +369,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Form submission handler for the reindex button on the search admin settings
-   * form.
+   * Form submission handler for reindex button on search admin settings form.
    */
   public function searchAdminReindexSubmit(array &$form, FormStateInterface $form_state) {
     // Send the user to the confirmation page.
diff --git a/web/core/modules/search/src/SearchQuery.php b/web/core/modules/search/src/SearchQuery.php
index 6869da434..ec8587892 100644
--- a/web/core/modules/search/src/SearchQuery.php
+++ b/web/core/modules/search/src/SearchQuery.php
@@ -110,7 +110,7 @@ class SearchQuery extends SelectExtender {
    * This is always used for the second step in the query, but is not part of
    * the preparation step unless $this->simple is FALSE.
    *
-   * @var Drupal\Core\Database\Query\ConditionInterface[]
+   * @var \Drupal\Core\Database\Query\ConditionInterface[]
    */
   protected $conditions;
 
diff --git a/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php b/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
index 4c6765f62..5726e247f 100644
--- a/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
+++ b/web/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
@@ -92,16 +92,16 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     // Output form for defining rank factor weights.
     $form['extra_type_settings'] = [
       '#type' => 'fieldset',
-      '#title' => t('Extra type settings'),
+      '#title' => $this->t('Extra type settings'),
       '#tree' => TRUE,
     ];
 
     $form['extra_type_settings']['boost'] = [
       '#type' => 'select',
-      '#title' => t('Boost method'),
+      '#title' => $this->t('Boost method'),
       '#options' => [
-        'bi' => t('Bistro mathematics'),
-        'ii' => t('Infinite Improbability'),
+        'bi' => $this->t('Bistro mathematics'),
+        'ii' => $this->t('Infinite Improbability'),
       ],
       '#default_value' => $this->configuration['boost'],
     ];
diff --git a/web/core/modules/search/tests/modules/search_langcode_test/search_langcode_test.module b/web/core/modules/search/tests/modules/search_langcode_test/search_langcode_test.module
index 38330602a..53015fa43 100644
--- a/web/core/modules/search/tests/modules/search_langcode_test/search_langcode_test.module
+++ b/web/core/modules/search/tests/modules/search_langcode_test/search_langcode_test.module
@@ -2,9 +2,10 @@
 
 /**
  * @file
- * Test module setting up two tests, one for checking if the entity $langcode is
- * being passed on and another one sets up the alternate verb forms for the
- * stemming test.
+ * Tests the preprocessing of search text.
+ *
+ * Preprocessing is tested when the language code is passed to the preprocess
+ * hook and also when with alternate verb forms for the stemming test.
  */
 
 /**
diff --git a/web/core/modules/search/tests/src/Functional/SearchAdminThemeTest.php b/web/core/modules/search/tests/src/Functional/SearchAdminThemeTest.php
index 5f6c12ea7..0443f48ed 100644
--- a/web/core/modules/search/tests/src/Functional/SearchAdminThemeTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchAdminThemeTest.php
@@ -30,7 +30,7 @@ class SearchAdminThemeTest extends BrowserTestBase {
    *
    * @var string
    */
-  protected $adminTheme = 'seven';
+  protected $adminTheme = 'claro';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php b/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
index 1189a5e93..e1b330cb5 100644
--- a/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchAdvancedSearchFormTest.php
@@ -28,6 +28,9 @@ class SearchAdvancedSearchFormTest extends BrowserTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchBlockTest.php b/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
index ba5d6988f..6ac385fe4 100644
--- a/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchBlockTest.php
@@ -20,7 +20,7 @@ class SearchBlockTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * The administrative user.
@@ -53,7 +53,7 @@ public function testSearchFormBlock() {
     // Test availability of the search block in the admin "Place blocks" list.
     $this->drupalGet('admin/structure/block');
     $this->getSession()->getPage()->findLink('Place block')->click();
-    $this->assertSession()->linkByHrefExists('/admin/structure/block/add/search_form_block/classy', 0,
+    $this->assertSession()->linkByHrefExists('/admin/structure/block/add/search_form_block/stark', 0,
       'Did not find the search block in block candidate list.');
 
     $block = $this->drupalPlaceBlock('search_form_block');
@@ -102,7 +102,7 @@ public function testSearchFormBlock() {
     $this->drupalGet('');
     $this->submitForm($terms, 'Search');
     $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->pageTextContains('Please enter some keywords');
+    $this->assertSession()->statusMessageContains('Please enter some keywords', 'error');
 
     // Confirm that the user is redirected to the search page, when form is
     // submitted empty.
@@ -116,17 +116,17 @@ public function testSearchFormBlock() {
     // search again with a longer keyword. First test using the block form.
     $this->drupalGet('node');
     $this->submitForm(['keys' => $this->randomMachineName(1)], 'Search');
-    $this->assertSession()->pageTextContains('You must include at least one keyword to match in the content');
-    $this->assertSession()->pageTextNotContains('Please enter some keywords');
+    $this->assertSession()->statusMessageContains('You must include at least one keyword to match in the content', 'warning');
+    $this->assertSession()->statusMessageNotContains('Please enter some keywords');
     $this->submitForm(['keys' => $this->randomMachineName()], 'Search', 'search-block-form');
-    $this->assertSession()->pageTextNotContains('You must include at least one keyword to match in the content');
+    $this->assertSession()->statusMessageNotContains('You must include at least one keyword to match in the content');
 
     // Same test again, using the search page form for the second search this
     // time.
     $this->drupalGet('node');
     $this->submitForm(['keys' => $this->randomMachineName(1)], 'Search');
     $this->submitForm(['keys' => $this->randomMachineName()], 'Search', 'search-form');
-    $this->assertSession()->pageTextNotContains('You must include at least one keyword to match in the content');
+    $this->assertSession()->statusMessageNotContains('You must include at least one keyword to match in the content');
 
     // Edit the block configuration so that it searches users instead of nodes,
     // and test.
diff --git a/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php b/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
index b95a74ec5..27c537d60 100644
--- a/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchCommentCountToggleTest.php
@@ -46,6 +46,9 @@ class SearchCommentCountToggleTest extends BrowserTestBase {
    */
   protected $searchableNodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchCommentTest.php b/web/core/modules/search/tests/src/Functional/SearchCommentTest.php
index 25142d894..dd61a161a 100644
--- a/web/core/modules/search/tests/src/Functional/SearchCommentTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchCommentTest.php
@@ -59,6 +59,9 @@ class SearchCommentTest extends BrowserTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php b/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
index a5d4a7f71..451a1accc 100644
--- a/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchConfigSettingsFormTest.php
@@ -29,7 +29,7 @@ class SearchConfigSettingsFormTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'stark';
 
   /**
    * User who can search and administer search.
@@ -45,6 +45,9 @@ class SearchConfigSettingsFormTest extends BrowserTestBase {
    */
   protected $searchNode;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -77,7 +80,7 @@ protected function setUp(): void {
 
     // Enable the search block.
     $this->drupalPlaceBlock('search_form_block');
-    $this->drupalPlaceBlock('local_tasks_block');
+    $this->drupalPlaceBlock('local_tasks_block', ['id' => 'local_tasks']);
     $this->drupalPlaceBlock('page_title_block');
   }
 
@@ -96,14 +99,14 @@ public function testSearchSettingsPage() {
     $this->assertSession()->pageTextContains('Are you sure you want to re-index the site');
     $this->drupalGet('admin/config/search/pages/reindex');
     $this->submitForm([], 'Re-index site');
-    $this->assertSession()->pageTextContains('All search indexes will be rebuilt');
+    $this->assertSession()->statusMessageContains('All search indexes will be rebuilt', 'status');
     $this->drupalGet('admin/config/search/pages');
     $this->assertSession()->pageTextContains('There is 1 item left to index.');
 
     // Test that the form saves with the default values.
     $this->drupalGet('admin/config/search/pages');
     $this->submitForm([], 'Save configuration');
-    $this->assertSession()->pageTextContains('The configuration options have been saved.');
+    $this->assertSession()->statusMessageContains('The configuration options have been saved.', 'status');
 
     // Test that the form does not save with an invalid word length.
     $edit = [
@@ -111,7 +114,8 @@ public function testSearchSettingsPage() {
     ];
     $this->drupalGet('admin/config/search/pages');
     $this->submitForm($edit, 'Save configuration');
-    $this->assertSession()->pageTextNotContains('The configuration options have been saved.');
+    $this->assertSession()->statusMessageNotContains('The configuration options have been saved.');
+    $this->assertSession()->statusMessageContains('Minimum word length to index must be a number.', 'error');
 
     // Test logging setting. It should be off by default.
     $text = $this->randomMachineName(5);
@@ -149,7 +153,7 @@ public function testSearchModuleSettingsPage() {
     $this->submitForm($edit, 'Save search page');
 
     // Ensure that the modifications took effect.
-    $this->assertSession()->pageTextContains("The Dummy search type search page has been updated.");
+    $this->assertSession()->statusMessageContains("The Dummy search type search page has been updated.", 'status');
     $this->drupalGet('admin/config/search/pages/manage/dummy_search_type');
     $this->assertTrue($this->assertSession()->optionExists('edit-extra-type-settings-boost', 'ii')->isSelected());
   }
@@ -197,7 +201,7 @@ public function testSearchModuleDisabling() {
       foreach ($plugins as $other) {
         if ($other != $entity_id) {
           $path = 'search/' . $entities[$other]->getPath();
-          $this->assertSession()->elementNotExists('xpath', '//ul[@class="tabs primary"]/li/a[@data-drupal-link-system-path="' . $path . '"]');
+          $this->assertSession()->elementNotExists('xpath', '//div[@id="block-local-tasks"]//li/a[@data-drupal-link-system-path="' . $path . '"]');
         }
       }
 
@@ -238,7 +242,7 @@ public function testSearchModuleDisabling() {
       foreach ($plugins as $entity_id) {
         $path = 'search/' . $entities[$entity_id]->getPath();
         $label = $entities[$entity_id]->label();
-        $this->assertSession()->elementTextContains('xpath', '//ul[@class="tabs primary"]/li/a[@data-drupal-link-system-path="' . $path . '"]', $label);
+        $this->assertSession()->elementTextContains('xpath', '//div[@id="block-local-tasks"]//li/a[@data-drupal-link-system-path="' . $path . '"]', $label);
       }
     }
   }
@@ -248,7 +252,7 @@ public function testSearchModuleDisabling() {
    */
   public function testDefaultSearchPageOrdering() {
     $this->drupalGet('search');
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => 'tabs primary']);
+    $elements = $this->xpath('//div[@id="block-local-tasks"]//a');
     $this->assertSame(Url::fromRoute('search.view_node_search')->toString(), $elements[0]->getAttribute('href'));
     $this->assertSame(Url::fromRoute('search.view_dummy_search_type')->toString(), $elements[1]->getAttribute('href'));
     $this->assertSame(Url::fromRoute('search.view_user_search')->toString(), $elements[2]->getAttribute('href'));
@@ -280,7 +284,7 @@ public function testMultipleSearchPages() {
     $first['path'] = strtolower($this->randomMachineName(8));
     $this->submitForm($first, 'Save');
     $this->assertDefaultSearch($first_id, 'The default page matches the only search page.');
-    $this->assertSession()->pageTextContains("The {$first['label']} search page has been added.");
+    $this->assertSession()->statusMessageContains("The {$first['label']} search page has been added.", 'status');
 
     // Attempt to add a search page with an existing path.
     $edit = [];
@@ -291,7 +295,7 @@ public function testMultipleSearchPages() {
     $edit['id'] = strtolower($this->randomMachineName(8));
     $edit['path'] = $first['path'];
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains('The search page path must be unique.');
+    $this->assertSession()->statusMessageContains('The search page path must be unique.', 'error');
 
     // Add a second search page.
     $second = [];
@@ -303,7 +307,7 @@ public function testMultipleSearchPages() {
 
     // Ensure both search pages have their tabs displayed.
     $this->drupalGet('search');
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => 'tabs primary']);
+    $elements = $this->xpath('//div[@id="block-local-tasks"]//a');
     $this->assertSame(Url::fromRoute('search.view_' . $first_id)->toString(), $elements[0]->getAttribute('href'));
     $this->assertSame(Url::fromRoute('search.view_' . $second_id)->toString(), $elements[1]->getAttribute('href'));
 
@@ -315,7 +319,7 @@ public function testMultipleSearchPages() {
     $this->drupalGet('admin/config/search/pages');
     $this->submitForm($edit, 'Save configuration');
     $this->drupalGet('search');
-    $elements = $this->xpath('//*[contains(@class, :class)]//a', [':class' => 'tabs primary']);
+    $elements = $this->xpath('//div[@id="block-local-tasks"]//a');
     $this->assertSame(Url::fromRoute('search.view_' . $second_id)->toString(), $elements[0]->getAttribute('href'));
     $this->assertSame(Url::fromRoute('search.view_' . $first_id)->toString(), $elements[1]->getAttribute('href'));
 
@@ -326,7 +330,7 @@ public function testMultipleSearchPages() {
 
     // Change the default search page.
     $this->clickLink('Set as default');
-    $this->assertSession()->pageTextContains("The default search page is now {$second['label']}. Be sure to check the ordering of your search pages.");
+    $this->assertSession()->statusMessageContains("The default search page is now {$second['label']}. Be sure to check the ordering of your search pages.", 'status');
     $this->verifySearchPageOperations($first_id, TRUE, TRUE, TRUE, FALSE);
     $this->verifySearchPageOperations($second_id, TRUE, FALSE, FALSE, FALSE);
 
@@ -347,7 +351,7 @@ public function testMultipleSearchPages() {
     $this->clickLink('Delete');
     $this->assertSession()->pageTextContains("Are you sure you want to delete the search page {$first['label']}?");
     $this->submitForm([], 'Delete');
-    $this->assertSession()->pageTextContains("The search page {$first['label']} has been deleted.");
+    $this->assertSession()->statusMessageContains("The search page {$first['label']} has been deleted.", 'status');
     $this->verifySearchPageOperations($first_id, FALSE, FALSE, FALSE, FALSE);
   }
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
index 4f52f322b..e7ecdf8e4 100644
--- a/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchDateIntervalTest.php
@@ -27,6 +27,9 @@ class SearchDateIntervalTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php b/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
index 22fac2017..ddba079a2 100644
--- a/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchEmbedFormTest.php
@@ -35,6 +35,9 @@ class SearchEmbedFormTest extends BrowserTestBase {
    */
   protected $submitCount = 0;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
index ac6f74522..07ab8fcc7 100644
--- a/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchKeywordsConditionsTest.php
@@ -38,6 +38,9 @@ class SearchKeywordsConditionsTest extends BrowserTestBase {
    */
   protected $searchingUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php b/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
index 24d5d2cb8..e66a2f5d1 100644
--- a/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchLanguageTest.php
@@ -31,6 +31,9 @@ class SearchLanguageTest extends BrowserTestBase {
    */
   protected $searchableNodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
index a8dbc5d13..b6a939b0b 100644
--- a/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchMultilingualEntityTest.php
@@ -45,6 +45,9 @@ class SearchMultilingualEntityTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php b/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
index 09d9db2c7..b3830a6d8 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodeDiacriticsTest.php
@@ -28,6 +28,9 @@ class SearchNodeDiacriticsTest extends BrowserTestBase {
    */
   public $testUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php b/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
index 52a482744..6320cb193 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodePunctuationTest.php
@@ -28,6 +28,9 @@ class SearchNodePunctuationTest extends BrowserTestBase {
    */
   public $testUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -73,13 +76,13 @@ public function testPhraseSearchPunctuation() {
     $this->drupalGet('search/node');
     $this->submitForm($edit, 'Search');
     $this->assertSession()->responseNotContains('<strong>&</strong>amp;');
-    $this->assertSession()->pageTextContains('You must include at least one keyword');
+    $this->assertSession()->statusMessageContains('You must include at least one keyword', 'warning');
 
     $edit = ['keys' => '&amp;'];
     $this->drupalGet('search/node');
     $this->submitForm($edit, 'Search');
     $this->assertSession()->responseNotContains('<strong>&</strong>amp;');
-    $this->assertSession()->pageTextContains('You must include at least one keyword');
+    $this->assertSession()->statusMessageContains('You must include at least one keyword', 'warning');
   }
 
 }
diff --git a/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php b/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php
index 66e90b399..c01a42f34 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNodeUpdateAndDeletionTest.php
@@ -30,6 +30,9 @@ class SearchNodeUpdateAndDeletionTest extends BrowserTestBase {
    */
   public $testUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php b/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
index f2aab18ea..f6f0acf0b 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNumberMatchingTest.php
@@ -59,6 +59,9 @@ class SearchNumberMatchingTest extends BrowserTestBase {
    */
   protected $nodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php b/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php
index d8c335b1e..1e10e21c0 100644
--- a/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchNumbersTest.php
@@ -65,6 +65,9 @@ class SearchNumbersTest extends BrowserTestBase {
    */
   protected $nodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php b/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
index 60699409a..d1dc9cc02 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageOverrideTest.php
@@ -31,6 +31,9 @@ class SearchPageOverrideTest extends BrowserTestBase {
    */
   public $searchUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php b/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
index 4e4a64b14..93c30114a 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPageTextTest.php
@@ -135,16 +135,16 @@ public function testSearchText() {
     $edit['keys'] = implode(' ', $keys);
     $this->drupalGet('search/node');
     $this->submitForm($edit, 'Search');
-    $this->assertSession()->pageTextContains("Your search used too many AND/OR expressions. Only the first {$limit} terms were included in this search.");
+    $this->assertSession()->statusMessageContains("Your search used too many AND/OR expressions. Only the first {$limit} terms were included in this search.", 'warning');
 
     // Test that a search on Node or User with no keywords entered generates
     // the "Please enter some keywords" message.
     $this->drupalGet('search/node');
     $this->submitForm([], 'Search');
-    $this->assertSession()->pageTextContains('Please enter some keywords');
+    $this->assertSession()->statusMessageContains('Please enter some keywords', 'error');
     $this->drupalGet('search/user');
     $this->submitForm([], 'Search');
-    $this->assertSession()->pageTextContains('Please enter some keywords');
+    $this->assertSession()->statusMessageContains('Please enter some keywords', 'error');
 
     // Make sure the "Please enter some keywords" message is NOT displayed if
     // you use "or" words or phrases in Advanced Search.
@@ -152,22 +152,22 @@ public function testSearchText() {
     $this->submitForm([
       'or' => $this->randomMachineName() . ' ' . $this->randomMachineName(),
     ], 'edit-submit--2');
-    $this->assertSession()->pageTextNotContains('Please enter some keywords');
+    $this->assertSession()->statusMessageNotContains('Please enter some keywords');
     $this->drupalGet('search/node');
     $this->submitForm([
       'phrase' => '"' . $this->randomMachineName() . '" "' . $this->randomMachineName() . '"',
     ], 'edit-submit--2');
-    $this->assertSession()->pageTextNotContains('Please enter some keywords');
+    $this->assertSession()->statusMessageNotContains('Please enter some keywords');
 
     // Verify that if you search for a too-short keyword, you get the right
     // message, and that if after that you search for a longer keyword, you
     // do not still see the message.
     $this->drupalGet('search/node');
     $this->submitForm(['keys' => $this->randomMachineName(1)], 'Search');
-    $this->assertSession()->pageTextContains('You must include at least one keyword');
-    $this->assertSession()->pageTextNotContains('Please enter some keywords');
+    $this->assertSession()->statusMessageContains('You must include at least one keyword', 'warning');
+    $this->assertSession()->statusMessageNotContains('Please enter some keywords');
     $this->submitForm(['keys' => $this->randomMachineName()], 'Search');
-    $this->assertSession()->pageTextNotContains('You must include at least one keyword');
+    $this->assertSession()->statusMessageNotContains('You must include at least one keyword');
 
     // Test that if you search for a URL with .. in it, you still end up at
     // the search page. See issue https://www.drupal.org/node/890058.
diff --git a/web/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php b/web/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
index 8413f8e65..2f57b6a44 100644
--- a/web/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchPreprocessLangcodeTest.php
@@ -28,6 +28,9 @@ class SearchPreprocessLangcodeTest extends BrowserTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchRankingTest.php b/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
index d444d3e2f..30fb78ff1 100644
--- a/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchRankingTest.php
@@ -40,6 +40,9 @@ class SearchRankingTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php b/web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
index 650fb8d85..95dba20b3 100644
--- a/web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
+++ b/web/core/modules/search/tests/src/Functional/SearchSetLocaleTest.php
@@ -28,6 +28,9 @@ class SearchSetLocaleTest extends BrowserTestBase {
    */
   protected $nodeSearchPlugin;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php b/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php
index d12bd8d3f..686129b5a 100644
--- a/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php
+++ b/web/core/modules/search/tests/src/Unit/SearchPageRepositoryTest.php
@@ -55,13 +55,13 @@ protected function setUp(): void {
     $this->storage = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityStorageInterface');
     $this->storage->expects($this->any())
       ->method('getQuery')
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
 
     /** @var \Drupal\Core\Entity\EntityTypeManagerInterface|\PHPUnit\Framework\MockObject\MockObject $entity_type_manager */
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->any())
       ->method('getStorage')
-      ->will($this->returnValue($this->storage));
+      ->willReturn($this->storage);
 
     $this->configFactory = $this->createMock('Drupal\Core\Config\ConfigFactoryInterface');
     $this->searchPageRepository = new SearchPageRepository($this->configFactory, $entity_type_manager);
@@ -74,10 +74,10 @@ public function testGetActiveSearchPages() {
     $this->query->expects($this->once())
       ->method('condition')
       ->with('status', TRUE)
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test' => 'test', 'other_test' => 'other_test']));
+      ->willReturn(['test' => 'test', 'other_test' => 'other_test']);
 
     $entities = [];
     $entities['test'] = $this->createMock('Drupal\search\SearchPageInterface');
@@ -85,7 +85,7 @@ public function testGetActiveSearchPages() {
     $this->storage->expects($this->once())
       ->method('loadMultiple')
       ->with(['test' => 'test', 'other_test' => 'other_test'])
-      ->will($this->returnValue($entities));
+      ->willReturn($entities);
 
     $result = $this->searchPageRepository->getActiveSearchPages();
     $this->assertSame($entities, $result);
@@ -98,14 +98,14 @@ public function testIsSearchActive() {
     $this->query->expects($this->once())
       ->method('condition')
       ->with('status', TRUE)
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
     $this->query->expects($this->once())
       ->method('range')
       ->with(0, 1)
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test' => 'test']));
+      ->willReturn(['test' => 'test']);
 
     $this->assertTrue($this->searchPageRepository->isSearchActive());
   }
@@ -117,24 +117,24 @@ public function testGetIndexableSearchPages() {
     $this->query->expects($this->once())
       ->method('condition')
       ->with('status', TRUE)
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test' => 'test', 'other_test' => 'other_test']));
+      ->willReturn(['test' => 'test', 'other_test' => 'other_test']);
 
     $entities = [];
     $entities['test'] = $this->createMock('Drupal\search\SearchPageInterface');
     $entities['test']->expects($this->once())
       ->method('isIndexable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $entities['other_test'] = $this->createMock('Drupal\search\SearchPageInterface');
     $entities['other_test']->expects($this->once())
       ->method('isIndexable')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->storage->expects($this->once())
       ->method('loadMultiple')
       ->with(['test' => 'test', 'other_test' => 'other_test'])
-      ->will($this->returnValue($entities));
+      ->willReturn($entities);
 
     $result = $this->searchPageRepository->getIndexableSearchPages();
     $this->assertCount(1, $result);
@@ -151,11 +151,11 @@ public function testClearDefaultSearchPage() {
     $config->expects($this->once())
       ->method('clear')
       ->with('default_page')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $this->configFactory->expects($this->once())
       ->method('getEditable')
       ->with('search.settings')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $this->searchPageRepository->clearDefaultSearchPage();
   }
 
@@ -166,10 +166,10 @@ public function testGetDefaultSearchPageWithActiveDefault() {
     $this->query->expects($this->once())
       ->method('condition')
       ->with('status', TRUE)
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test' => 'test', 'other_test' => 'other_test']));
+      ->willReturn(['test' => 'test', 'other_test' => 'other_test']);
 
     $config = $this->getMockBuilder('Drupal\Core\Config\Config')
       ->disableOriginalConstructor()
@@ -177,11 +177,11 @@ public function testGetDefaultSearchPageWithActiveDefault() {
     $config->expects($this->once())
       ->method('get')
       ->with('default_page')
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
     $this->configFactory->expects($this->once())
       ->method('get')
       ->with('search.settings')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
 
     $this->assertSame('test', $this->searchPageRepository->getDefaultSearchPage());
   }
@@ -193,10 +193,10 @@ public function testGetDefaultSearchPageWithInactiveDefault() {
     $this->query->expects($this->once())
       ->method('condition')
       ->with('status', TRUE)
-      ->will($this->returnValue($this->query));
+      ->willReturn($this->query);
     $this->query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test' => 'test']));
+      ->willReturn(['test' => 'test']);
 
     $config = $this->getMockBuilder('Drupal\Core\Config\Config')
       ->disableOriginalConstructor()
@@ -204,11 +204,11 @@ public function testGetDefaultSearchPageWithInactiveDefault() {
     $config->expects($this->once())
       ->method('get')
       ->with('default_page')
-      ->will($this->returnValue('other_test'));
+      ->willReturn('other_test');
     $this->configFactory->expects($this->once())
       ->method('get')
       ->with('search.settings')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
 
     $this->assertSame('test', $this->searchPageRepository->getDefaultSearchPage());
   }
@@ -224,25 +224,25 @@ public function testSetDefaultSearchPage() {
     $config->expects($this->once())
       ->method('set')
       ->with('default_page', $id)
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $config->expects($this->once())
       ->method('save')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
     $this->configFactory->expects($this->once())
       ->method('getEditable')
       ->with('search.settings')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
 
     $search_page = $this->createMock('Drupal\search\SearchPageInterface');
     $search_page->expects($this->once())
       ->method('id')
-      ->will($this->returnValue($id));
+      ->willReturn($id);
     $search_page->expects($this->once())
       ->method('enable')
-      ->will($this->returnValue($search_page));
+      ->willReturn($search_page);
     $search_page->expects($this->once())
       ->method('save')
-      ->will($this->returnValue($search_page));
+      ->willReturn($search_page);
     $this->searchPageRepository->setDefaultSearchPage($search_page);
   }
 
@@ -253,10 +253,10 @@ public function testSortSearchPages() {
     $entity_type = $this->createMock('Drupal\Core\Entity\EntityTypeInterface');
     $entity_type->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\Tests\search\Unit\TestSearchPage'));
+      ->willReturn('Drupal\Tests\search\Unit\TestSearchPage');
     $this->storage->expects($this->once())
       ->method('getEntityType')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     // Declare entities out of their expected order so we can be sure they were
     // sorted. We cannot mock these because of uasort(), see
diff --git a/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php b/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php
index 1e6d74adc..0f2369bda 100644
--- a/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php
+++ b/web/core/modules/search/tests/src/Unit/SearchPluginCollectionTest.php
@@ -47,7 +47,7 @@ public function testGet() {
     $plugin = $this->createMock('Drupal\search\Plugin\SearchInterface');
     $this->pluginManager->expects($this->once())
       ->method('createInstance')
-      ->will($this->returnValue($plugin));
+      ->willReturn($plugin);
     $this->assertSame($plugin, $this->searchPluginCollection->get('banana'));
   }
 
@@ -59,11 +59,11 @@ public function testGetWithConfigurablePlugin() {
     $plugin->expects($this->once())
       ->method('setSearchPageId')
       ->with('fruit_stand')
-      ->will($this->returnValue($plugin));
+      ->willReturn($plugin);
 
     $this->pluginManager->expects($this->once())
       ->method('createInstance')
-      ->will($this->returnValue($plugin));
+      ->willReturn($plugin);
 
     $this->assertSame($plugin, $this->searchPluginCollection->get('banana'));
   }
diff --git a/web/core/modules/serialization/serialization.services.yml b/web/core/modules/serialization/serialization.services.yml
index 44a4b416a..a5c6f67a7 100644
--- a/web/core/modules/serialization/serialization.services.yml
+++ b/web/core/modules/serialization/serialization.services.yml
@@ -71,14 +71,14 @@ services:
       # Priority must be higher than serializer.normalizer.primitive_data.
       - { name: normalizer, priority: 20 }
   serializer.normalizer.password_field_item:
-      class: Drupal\serialization\Normalizer\NullNormalizer
-      arguments: ['Drupal\Core\Field\Plugin\Field\FieldType\PasswordItem']
-      tags:
-        - { name: normalizer, priority: 20 }
+    class: Drupal\serialization\Normalizer\NullNormalizer
+    arguments: ['Drupal\Core\Field\Plugin\Field\FieldType\PasswordItem']
+    tags:
+      - { name: normalizer, priority: 20 }
   serializer.normalizer.safe_string:
-      class: Drupal\serialization\Normalizer\MarkupNormalizer
-      tags:
-        - { name: normalizer }
+    class: Drupal\serialization\Normalizer\MarkupNormalizer
+    tags:
+      - { name: normalizer }
   serializer.normalizer.typed_data:
     class: Drupal\serialization\Normalizer\TypedDataNormalizer
     tags:
diff --git a/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
index 6e997dd01..fd88ef3e5 100644
--- a/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/EntitySerializationTest.php
@@ -70,6 +70,9 @@ class EntitySerializationTest extends NormalizerTestBase {
    */
   protected $entityClass = 'Drupal\entity_test\Entity\EntityTest';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -187,8 +190,9 @@ public function testNormalize() {
   }
 
   /**
-   * Tests user normalization, using the entity_serialization_test module to
-   * override some default access controls.
+   * Tests user normalization with some default access controls overridden.
+   *
+   * @see entity_serialization_test.module
    */
   public function testUserNormalize() {
     // Test password isn't available.
@@ -324,7 +328,7 @@ public function testDenormalizeInvalidCustomSerializedField() {
     $this->serializer->denormalize([
       'serialized_long' => [
         [
-         'value' => 'boo',
+          'value' => 'boo',
         ],
       ],
       'type' => 'entity_test_serialized_field',
diff --git a/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php b/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
index 7e7d55474..8941394ea 100644
--- a/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
+++ b/web/core/modules/serialization/tests/src/Kernel/NormalizerTestBase.php
@@ -26,6 +26,9 @@ abstract class NormalizerTestBase extends KernelTestBase {
     'user',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php b/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php
index 700b48ac2..b46e82d3d 100644
--- a/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php
+++ b/web/core/modules/serialization/tests/src/Kernel/SerializationTest.php
@@ -26,6 +26,9 @@ class SerializationTest extends KernelTestBase {
    */
   protected $serializer;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->serializer = $this->container->get('serializer');
diff --git a/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php b/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php
index 6ccac1369..0c8c7df86 100644
--- a/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Encoder/XmlEncoderTest.php
@@ -33,6 +33,9 @@ class XmlEncoderTest extends UnitTestCase {
    */
   protected $testArray = ['test' => 'test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->baseEncoder = $this->createMock(BaseXmlEncoder::class);
     $this->encoder = new XmlEncoder();
@@ -62,7 +65,7 @@ public function testEncode() {
     $this->baseEncoder->expects($this->once())
       ->method('encode')
       ->with($this->testArray, 'test', [])
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
 
     $this->assertEquals('test', $this->encoder->encode($this->testArray, 'test'));
   }
@@ -74,7 +77,7 @@ public function testDecode() {
     $this->baseEncoder->expects($this->once())
       ->method('decode')
       ->with('test', 'test', [])
-      ->will($this->returnValue($this->testArray));
+      ->willReturn($this->testArray);
 
     $this->assertEquals($this->testArray, $this->encoder->decode('test', 'test'));
   }
diff --git a/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php b/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
index 76800296d..7e85502c7 100644
--- a/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/EntityResolver/ChainEntityResolverTest.php
@@ -140,7 +140,7 @@ protected function createEntityResolverMock($return = NULL, $called = TRUE) {
       $mock->expects($this->once())
         ->method('resolve')
         ->with($this->testNormalizer, $this->testData, $this->testEntityType)
-        ->will($this->returnValue($return));
+        ->willReturn($return);
     }
     else {
       $mock->expects($this->never())
diff --git a/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php b/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php
index 9094e8060..0d6c0a1d3 100644
--- a/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/EntityResolver/UuidResolverTest.php
@@ -57,7 +57,7 @@ public function testResolveNoUuid() {
     $normalizer->expects($this->once())
       ->method('getUuid')
       ->with([])
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
     $this->assertNull($this->resolver->resolve($normalizer, [], 'test_type'));
   }
 
@@ -70,13 +70,13 @@ public function testResolveNoEntity() {
     $this->entityRepository->expects($this->once())
       ->method('loadEntityByUuid')
       ->with('test_type')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $normalizer = $this->createMock('Drupal\serialization\EntityResolver\UuidReferenceInterface');
     $normalizer->expects($this->once())
       ->method('getUuid')
       ->with([])
-      ->will($this->returnValue($uuid));
+      ->willReturn($uuid);
 
     $this->assertNull($this->resolver->resolve($normalizer, [], 'test_type'));
   }
@@ -90,18 +90,18 @@ public function testResolveWithEntity() {
     $entity = $this->createMock('Drupal\Core\Entity\EntityInterface');
     $entity->expects($this->once())
       ->method('id')
-      ->will($this->returnValue(1));
+      ->willReturn(1);
 
     $this->entityRepository->expects($this->once())
       ->method('loadEntityByUuid')
       ->with('test_type', $uuid)
-      ->will($this->returnValue($entity));
+      ->willReturn($entity);
 
     $normalizer = $this->createMock('Drupal\serialization\EntityResolver\UuidReferenceInterface');
     $normalizer->expects($this->once())
       ->method('getUuid')
       ->with([])
-      ->will($this->returnValue($uuid));
+      ->willReturn($uuid);
     $this->assertSame(1, $this->resolver->resolve($normalizer, [], 'test_type'));
   }
 
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
index c3ff3fc16..69d58a22a 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/ConfigEntityNormalizerTest.php
@@ -42,7 +42,7 @@ public function testNormalize() {
     $config_entity = $this->createMock('Drupal\Core\Config\Entity\ConfigEntityInterface');
     $config_entity->expects($this->once())
       ->method('toArray')
-      ->will($this->returnValue($test_export_properties));
+      ->willReturn($test_export_properties);
 
     $this->assertSame(['test' => 'test'], $normalizer->normalize($config_entity));
   }
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php
index 888499c4f..9daf73066 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/ContentEntityNormalizerTest.php
@@ -67,7 +67,7 @@ public function testNormalize() {
     $this->serializer->expects($this->any())
       ->method('normalize')
       ->with($this->containsOnlyInstancesOf('Drupal\Core\Field\FieldItemListInterface'), 'test_format', ['account' => NULL])
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
 
     $definitions = [
       'field_accessible_external' => $this->createMockFieldListItem(TRUE, FALSE),
@@ -101,7 +101,7 @@ public function testNormalizeWithAccountContext() {
     $this->serializer->expects($this->any())
       ->method('normalize')
       ->with($this->containsOnlyInstancesOf('Drupal\Core\Field\FieldItemListInterface'), 'test_format', $context)
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
 
     // The mock account should get passed directly into the access() method on
     // field items from $context['account'].
@@ -137,7 +137,7 @@ public function createMockForContentEntity($definitions) {
       ->shouldBeCalled();
     $content_entity_mock->expects($this->any())
       ->method('getTypedData')
-      ->will($this->returnValue($typed_data->reveal()));
+      ->willReturn($typed_data->reveal());
 
     return $content_entity_mock;
   }
@@ -159,7 +159,7 @@ protected function createMockFieldListItem($access, $internal, AccountInterface
     $mock = $this->createMock('Drupal\Core\Field\FieldItemListInterface');
     $mock->expects($this->once())
       ->method('getDataDefinition')
-      ->will($this->returnValue($data_definition->reveal()));
+      ->willReturn($data_definition->reveal());
     $data_definition->isInternal()
       ->willReturn($internal)
       ->shouldBeCalled();
@@ -167,7 +167,7 @@ protected function createMockFieldListItem($access, $internal, AccountInterface
       $mock->expects($this->once())
         ->method('access')
         ->with('view', $user_context)
-        ->will($this->returnValue($access));
+        ->willReturn($access);
     }
     return $mock;
   }
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php
index 322223ec8..98ca2ac7d 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeIso8601NormalizerTest.php
@@ -256,6 +256,8 @@ public function testDenormalizeNoTargetInstanceOrFieldDefinitionException() {
 }
 
 /**
+ * Provides a test class for testing DrupalDateTime.
+ *
  * Note: Prophecy does not support magic methods. By subclassing and specifying
  * an explicit method, Prophecy works.
  * @see https://github.com/phpspec/prophecy/issues/338
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php
index fe503e01a..0d270d5e8 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/DateTimeNormalizerTest.php
@@ -178,6 +178,8 @@ public function testDenormalizeException() {
 
 
 /**
+ * Provides a test class for testing DrupalDateTime.
+ *
  * Note: Prophecy does not support magic methods. By subclassing and specifying
  * an explicit method, Prophecy works.
  * @see https://github.com/phpspec/prophecy/issues/338
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
index 06d280a9b..453f52757 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/EntityNormalizerTest.php
@@ -87,7 +87,7 @@ public function testNormalize() {
       ->getMockForAbstractClass();
     $content_entity->expects($this->once())
       ->method('getFields')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $serializer = $this->getMockBuilder('Symfony\Component\Serializer\Serializer')
       ->disableOriginalConstructor()
@@ -137,11 +137,11 @@ public function testDenormalizeWithValidBundle() {
     $entity_type->expects($this->once())
       ->method('hasKey')
       ->with('bundle')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $entity_type->expects($this->once())
       ->method('getKey')
       ->with('bundle')
-      ->will($this->returnValue('test_type'));
+      ->willReturn('test_type');
     $entity_type->expects($this->once())
       ->method('entityClassImplements')
       ->with(FieldableEntityInterface::class)
@@ -149,17 +149,17 @@ public function testDenormalizeWithValidBundle() {
 
     $entity_type->expects($this->once())
       ->method('getBundleEntityType')
-      ->will($this->returnValue('test_bundle'));
+      ->willReturn('test_bundle');
 
     $entity_type_storage_definition = $this->createMock('Drupal\Core\Field\FieldStorageDefinitionInterface');
     $entity_type_storage_definition->expects($this->once())
       ->method('getMainPropertyName')
-      ->will($this->returnValue('name'));
+      ->willReturn('name');
 
     $entity_type_definition = $this->createMock('Drupal\Core\Field\FieldDefinitionInterface');
     $entity_type_definition->expects($this->once())
       ->method('getFieldStorageDefinition')
-      ->will($this->returnValue($entity_type_storage_definition));
+      ->willReturn($entity_type_storage_definition);
 
     $base_definitions = [
       'test_type' => $entity_type_definition,
@@ -168,21 +168,21 @@ public function testDenormalizeWithValidBundle() {
     $this->entityTypeManager->expects($this->once())
       ->method('getDefinition')
       ->with('test')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
     $this->entityFieldManager->expects($this->once())
       ->method('getBaseFieldDefinitions')
       ->with('test')
-      ->will($this->returnValue($base_definitions));
+      ->willReturn($base_definitions);
 
     $entity_query_mock = $this->createMock('Drupal\Core\Entity\Query\QueryInterface');
     $entity_query_mock->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test_bundle' => 'test_bundle']));
+      ->willReturn(['test_bundle' => 'test_bundle']);
 
     $entity_type_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $entity_type_storage->expects($this->once())
       ->method('getQuery')
-      ->will($this->returnValue($entity_query_mock));
+      ->willReturn($entity_query_mock);
 
     $key_1 = $this->createMock(FieldItemListInterface::class);
     $key_2 = $this->createMock(FieldItemListInterface::class);
@@ -204,7 +204,7 @@ public function testDenormalizeWithValidBundle() {
     $storage->expects($this->once())
       ->method('create')
       ->with($expected_test_data)
-      ->will($this->returnValue($entity));
+      ->willReturn($entity);
 
     $this->entityTypeManager->expects($this->exactly(2))
       ->method('getStorage')
@@ -253,11 +253,11 @@ public function testDenormalizeWithInvalidBundle() {
     $entity_type->expects($this->once())
       ->method('hasKey')
       ->with('bundle')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $entity_type->expects($this->once())
       ->method('getKey')
       ->with('bundle')
-      ->will($this->returnValue('test_type'));
+      ->willReturn('test_type');
     $entity_type->expects($this->once())
       ->method('entityClassImplements')
       ->with(FieldableEntityInterface::class)
@@ -265,17 +265,17 @@ public function testDenormalizeWithInvalidBundle() {
 
     $entity_type->expects($this->once())
       ->method('getBundleEntityType')
-      ->will($this->returnValue('test_bundle'));
+      ->willReturn('test_bundle');
 
     $entity_type_storage_definition = $this->createMock('Drupal\Core\Field\FieldStorageDefinitionInterface');
     $entity_type_storage_definition->expects($this->once())
       ->method('getMainPropertyName')
-      ->will($this->returnValue('name'));
+      ->willReturn('name');
 
     $entity_type_definition = $this->createMock('Drupal\Core\Field\FieldDefinitionInterface');
     $entity_type_definition->expects($this->once())
       ->method('getFieldStorageDefinition')
-      ->will($this->returnValue($entity_type_storage_definition));
+      ->willReturn($entity_type_storage_definition);
 
     $base_definitions = [
       'test_type' => $entity_type_definition,
@@ -284,26 +284,26 @@ public function testDenormalizeWithInvalidBundle() {
     $this->entityTypeManager->expects($this->once())
       ->method('getDefinition')
       ->with('test')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
     $this->entityFieldManager->expects($this->once())
       ->method('getBaseFieldDefinitions')
       ->with('test')
-      ->will($this->returnValue($base_definitions));
+      ->willReturn($base_definitions);
 
     $entity_query_mock = $this->createMock('Drupal\Core\Entity\Query\QueryInterface');
     $entity_query_mock->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue(['test_bundle_other' => 'test_bundle_other']));
+      ->willReturn(['test_bundle_other' => 'test_bundle_other']);
 
     $entity_type_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $entity_type_storage->expects($this->once())
       ->method('getQuery')
-      ->will($this->returnValue($entity_query_mock));
+      ->willReturn($entity_query_mock);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with('test_bundle')
-      ->will($this->returnValue($entity_type_storage));
+      ->willReturn($entity_type_storage);
 
     $this->expectException(UnexpectedValueException::class);
     $this->entityNormalizer->denormalize($test_data, 'Drupal\Core\Entity\ContentEntityBase', NULL, ['entity_type' => 'test']);
@@ -328,14 +328,14 @@ public function testDenormalizeWithNoBundle() {
     $entity_type->expects($this->once())
       ->method('hasKey')
       ->with('bundle')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $entity_type->expects($this->never())
       ->method('getKey');
 
     $this->entityTypeManager->expects($this->once())
       ->method('getDefinition')
       ->with('test')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $key_1 = $this->createMock(FieldItemListInterface::class);
     $key_2 = $this->createMock(FieldItemListInterface::class);
@@ -352,12 +352,12 @@ public function testDenormalizeWithNoBundle() {
     $storage->expects($this->once())
       ->method('create')
       ->with([])
-      ->will($this->returnValue($entity));
+      ->willReturn($entity);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with('test')
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $this->entityFieldManager->expects($this->never())
       ->method('getBaseFieldDefinitions');
@@ -403,18 +403,18 @@ public function testDenormalizeWithNoFieldableEntityType() {
     $this->entityTypeManager->expects($this->once())
       ->method('getDefinition')
       ->with('test')
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $storage->expects($this->once())
       ->method('create')
       ->with($test_data)
-      ->will($this->returnValue($this->createMock('Drupal\Core\Entity\EntityInterface')));
+      ->willReturn($this->createMock('Drupal\Core\Entity\EntityInterface'));
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with('test')
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $this->entityFieldManager->expects($this->never())
       ->method('getBaseFieldDefinitions');
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php
index 525d9cd40..f57818f80 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/ListNormalizerTest.php
@@ -43,13 +43,16 @@ class ListNormalizerTest extends UnitTestCase {
    */
   protected $typedData;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     // Mock the TypedDataManager to return a TypedDataInterface mock.
     $this->typedData = $this->createMock('Drupal\Core\TypedData\TypedDataInterface');
     $typed_data_manager = $this->createMock(TypedDataManagerInterface::class);
     $typed_data_manager->expects($this->any())
       ->method('getPropertyInstance')
-      ->will($this->returnValue($this->typedData));
+      ->willReturn($this->typedData);
 
     // Set up a mock container as ItemList() will call for the 'typed_data_manager'
     // service.
@@ -59,7 +62,7 @@ protected function setUp(): void {
     $container->expects($this->any())
       ->method('get')
       ->with($this->equalTo('typed_data_manager'))
-      ->will($this->returnValue($typed_data_manager));
+      ->willReturn($typed_data_manager);
 
     \Drupal::setContainer($container);
 
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php
index b1851ab9e..750d9d299 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/TimestampNormalizerTest.php
@@ -133,6 +133,8 @@ public function testDenormalizeException() {
 }
 
 /**
+ * Provides a test class for testing DrupalDateTime.
+ *
  * Note: Prophecy does not support magic methods. By subclassing and specifying
  * an explicit method, Prophecy works.
  * @see https://github.com/phpspec/prophecy/issues/338
diff --git a/web/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php b/web/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php
index 0387a7e94..142da8b97 100644
--- a/web/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php
+++ b/web/core/modules/serialization/tests/src/Unit/Normalizer/TypedDataNormalizerTest.php
@@ -25,6 +25,9 @@ class TypedDataNormalizerTest extends UnitTestCase {
    */
   protected $typedData;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->normalizer = new TypedDataNormalizer();
     $this->typedData = $this->createMock('Drupal\Core\TypedData\TypedDataInterface');
@@ -45,7 +48,7 @@ public function testSupportsNormalization() {
   public function testNormalize() {
     $this->typedData->expects($this->once())
       ->method('getValue')
-      ->will($this->returnValue('test'));
+      ->willReturn('test');
 
     $this->assertEquals('test', $this->normalizer->normalize($this->typedData));
   }
diff --git a/web/core/modules/settings_tray/js/settings_tray.js b/web/core/modules/settings_tray/js/settings_tray.js
index db383efee..0f917ef0a 100644
--- a/web/core/modules/settings_tray/js/settings_tray.js
+++ b/web/core/modules/settings_tray/js/settings_tray.js
@@ -4,62 +4,49 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   var blockConfigureSelector = '[data-settings-tray-edit]';
   var toggleEditSelector = '[data-drupal-settingstray="toggle"]';
   var itemsToToggleSelector = '[data-off-canvas-main-canvas], #toolbar-bar, [data-drupal-settingstray="editable"] a, [data-drupal-settingstray="editable"] button';
   var contextualItemsSelector = '[data-contextual-id] a, [data-contextual-id] button';
   var quickEditItemSelector = '[data-quickedit-entity-id]';
-
   function preventClick(event) {
     if ($(event.target).closest('.contextual-links').length) {
       return;
     }
-
     event.preventDefault();
   }
-
   function closeToolbarTrays() {
     $(Drupal.toolbar.models.toolbarModel.get('activeTab')).trigger('click');
   }
-
   function disableQuickEdit() {
     $('.quickedit-toolbar button.action-cancel').trigger('click');
   }
-
   function closeOffCanvas() {
     $('.ui-dialog-off-canvas .ui-dialog-titlebar-close').trigger('click');
   }
-
   function getItemsToToggle() {
     return $(itemsToToggleSelector).not(contextualItemsSelector);
   }
-
   function setEditModeState(editMode) {
     if (!document.querySelector('[data-off-canvas-main-canvas]')) {
       throw new Error('data-off-canvas-main-canvas is missing from settings-tray-page-wrapper.html.twig');
     }
-
     editMode = !!editMode;
     var $editables;
     var editButton = document.querySelector(toggleEditSelector);
-
     if (editMode) {
       if (editButton) {
         editButton.textContent = Drupal.t('Editing');
       }
-
       closeToolbarTrays();
       $editables = $(once('settingstray', '[data-drupal-settingstray="editable"]'));
-
       if ($editables.length) {
         document.querySelector('[data-off-canvas-main-canvas]').addEventListener('click', preventClick, true);
         $editables.not(contextualItemsSelector).on('click.settingstray', function (e) {
           if ($(e.target).closest('.contextual').length || !localStorage.getItem('Drupal.contextualToolbar.isViewing')) {
             return;
           }
-
           $(e.currentTarget).find(blockConfigureSelector).trigger('click');
           disableQuickEdit();
         });
@@ -67,43 +54,34 @@
           if (!$(e.target).parent().hasClass('contextual') || $(e.target).parent().hasClass('quickedit')) {
             closeOffCanvas();
           }
-
           if ($(e.target).parent().hasClass('contextual') || $(e.target).parent().hasClass('quickedit')) {
             return;
           }
-
           $(e.currentTarget).find('li.quickedit a').trigger('click');
         });
       }
     } else {
       $editables = $(once.remove('settingstray', '[data-drupal-settingstray="editable"]'));
-
       if ($editables.length) {
         document.querySelector('[data-off-canvas-main-canvas]').removeEventListener('click', preventClick, true);
         $editables.off('.settingstray');
         $(quickEditItemSelector).off('.settingstray');
       }
-
       if (editButton) {
         editButton.textContent = Drupal.t('Edit');
       }
-
       closeOffCanvas();
       disableQuickEdit();
     }
-
     getItemsToToggle().toggleClass('js-settings-tray-edit-mode', editMode);
     $('.edit-mode-inactive').toggleClass('visually-hidden', editMode);
   }
-
   function isInEditMode() {
     return $('#toolbar-bar').hasClass('js-settings-tray-edit-mode');
   }
-
   function toggleEditMode() {
     setEditModeState(!isInEditMode());
   }
-
   function prepareAjaxLinks() {
     Drupal.ajax.instances.filter(function (instance) {
       return instance && $(instance.element).attr('data-dialog-renderer') === 'off_canvas';
@@ -111,19 +89,16 @@
       if (!instance.options.data.hasOwnProperty('dialogOptions')) {
         instance.options.data.dialogOptions = {};
       }
-
       instance.options.data.dialogOptions.settingsTrayActiveEditableId = $(instance.element).parents('.settings-tray-editable').attr('id');
       instance.progress = {
         type: 'fullscreen'
       };
     });
   }
-
   $(document).on('drupalContextualLinkAdded', function (event, data) {
     prepareAjaxLinks();
     once('settings_tray.edit_mode_init', 'body').forEach(function () {
       var editMode = localStorage.getItem('Drupal.contextualToolbar.isViewing') === 'false';
-
       if (editMode) {
         setEditModeState(true);
       }
@@ -132,7 +107,6 @@
       if (!isInEditMode()) {
         $(toggleEditSelector).trigger('click').trigger('click.settings_tray');
       }
-
       disableQuickEdit();
     });
   });
@@ -152,7 +126,6 @@
       if ($element.is('#drupal-off-canvas')) {
         $('body .settings-tray-active-editable').removeClass('settings-tray-active-editable');
         var $activeElement = $("#".concat(settings.settingsTrayActiveEditableId));
-
         if ($activeElement.length) {
           $activeElement.addClass('settings-tray-active-editable');
         }
diff --git a/web/core/modules/settings_tray/tests/modules/settings_tray_test_css/settings_tray_test_css.info.yml b/web/core/modules/settings_tray/tests/modules/settings_tray_test_css/settings_tray_test_css.info.yml
index 90155770b..9e8f45e64 100644
--- a/web/core/modules/settings_tray/tests/modules/settings_tray_test_css/settings_tray_test_css.info.yml
+++ b/web/core/modules/settings_tray/tests/modules/settings_tray_test_css/settings_tray_test_css.info.yml
@@ -4,4 +4,4 @@ description: 'Provides CSS fixes for tests.'
 package: Testing
 version: VERSION
 dependencies:
-- drupal:settings_tray
+  - drupal:settings_tray
diff --git a/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php b/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
index 29ed1541d..3204dd083 100644
--- a/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
+++ b/web/core/modules/settings_tray/tests/src/FunctionalJavascript/SettingsTrayTestBase.php
@@ -156,10 +156,10 @@ protected function assertOffCanvasBlockFormIsValid() {
    * {@inheritdoc}
    */
   protected function getTestThemes() {
-    // Remove 'seven' theme. Settings Tray "Edit Mode" will not work with
-    // 'seven' because it removes all contextual links.
+    // Remove 'claro' theme. Settings Tray "Edit Mode" will not work with this
+    // theme because it removes all contextual links.
     return array_filter(parent::getTestThemes(), function ($theme) {
-      return $theme !== 'seven';
+      return ($theme !== 'claro');
     });
   }
 
diff --git a/web/core/modules/shortcut/migrations/d7_shortcut.yml b/web/core/modules/shortcut/migrations/d7_shortcut.yml
index f6670e5d1..58e532986 100644
--- a/web/core/modules/shortcut/migrations/d7_shortcut.yml
+++ b/web/core/modules/shortcut/migrations/d7_shortcut.yml
@@ -9,9 +9,9 @@ source:
     uri_scheme: 'internal:/'
 process:
   shortcut_set:
-     plugin: migration_lookup
-     migration: d7_shortcut_set
-     source: menu_name
+    plugin: migration_lookup
+    migration: d7_shortcut_set
+    source: menu_name
   title: link_title
   weight: weight
   link:
diff --git a/web/core/modules/shortcut/shortcut.module b/web/core/modules/shortcut/shortcut.module
index 85905c98b..e86bf622f 100644
--- a/web/core/modules/shortcut/shortcut.module
+++ b/web/core/modules/shortcut/shortcut.module
@@ -123,7 +123,7 @@ function shortcut_set_switch_access($account = NULL) {
  *   (optional) The user account whose shortcuts will be returned. Defaults to
  *   the currently logged-in user.
  *
- * @return
+ * @return \Drupal\shortcut\ShortcutSetInterface
  *   An object representing the shortcut set that should be displayed to the
  *   current user. If the user does not have an explicit shortcut set defined,
  *   the default set is returned.
@@ -163,7 +163,7 @@ function shortcut_current_displayed_set($account = NULL) {
  *   If not provided, the function will return the currently logged-in user's
  *   default shortcut set.
  *
- * @return
+ * @return \Drupal\shortcut\ShortcutSetInterface|null
  *   An object representing the default shortcut set.
  */
 function shortcut_default_set($account = NULL) {
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
index 4dc879b38..70c56de30 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutLinksTest.php
@@ -148,8 +148,8 @@ public function testShortcutLinkAdd() {
    * Tests that the "add to shortcut" and "remove from shortcut" links work.
    */
   public function testShortcutQuickLink() {
-    \Drupal::service('theme_installer')->install(['seven']);
-    $this->config('system.theme')->set('admin', 'seven')->save();
+    \Drupal::service('theme_installer')->install(['claro']);
+    $this->config('system.theme')->set('admin', 'claro')->save();
     $this->config('node.settings')->set('use_admin_theme', '1')->save();
     $this->container->get('router.builder')->rebuild();
 
@@ -197,7 +197,7 @@ public function testShortcutQuickLink() {
     $this->clickLink('Add to Default shortcuts');
     $this->assertSession()->pageTextContains('Added a shortcut for Create Article.');
 
-    $this->config('system.theme')->set('default', 'seven')->save();
+    $this->config('system.theme')->set('default', 'claro')->save();
     $this->drupalGet('node/' . $this->node->id());
     $title = $this->node->getTitle();
 
@@ -315,9 +315,9 @@ public function testShortcutLinkDelete() {
    */
   public function testNoShortcutLink() {
     // Change to a theme that displays shortcuts.
-    \Drupal::service('theme_installer')->install(['seven']);
+    \Drupal::service('theme_installer')->install(['claro']);
     $this->config('system.theme')
-      ->set('default', 'seven')
+      ->set('default', 'claro')
       ->save();
 
     $this->drupalGet('page-that-does-not-exist');
@@ -343,9 +343,9 @@ public function testNoShortcutLink() {
    */
   public function testAccessShortcutsPermission() {
     // Change to a theme that displays shortcuts.
-    \Drupal::service('theme_installer')->install(['seven']);
+    \Drupal::service('theme_installer')->install(['claro']);
     $this->config('system.theme')
-      ->set('default', 'seven')
+      ->set('default', 'claro')
       ->save();
 
     // Add cron to the default shortcut set.
@@ -403,8 +403,7 @@ public function testShortcutLinkOrder() {
   }
 
   /**
-   * Tests that the 'access shortcuts' permission is required for shortcut set
-   * administration page access.
+   * Tests the 'access shortcuts' permission for shortcut set administration.
    */
   private function verifyAccessShortcutsPermissionForEditPages() {
     // Create a user with customize links and switch sets permissions  but
@@ -427,8 +426,7 @@ private function verifyAccessShortcutsPermissionForEditPages() {
   }
 
   /**
-   * Tests that the 'access shortcuts' permission is required to access the
-   * shortcut block.
+   * Tests the 'access shortcuts' permission with the shortcut block.
    */
   public function testShortcutBlockAccess() {
     // Creates a block instance and place in a region through api.
diff --git a/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php b/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
index bdec9903d..282ee3a44 100644
--- a/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
+++ b/web/core/modules/shortcut/tests/src/Functional/ShortcutTestBase.php
@@ -47,6 +47,9 @@ abstract class ShortcutTestBase extends BrowserTestBase {
    */
   protected $set;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php b/web/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php
deleted file mode 100644
index 2e43bf700..000000000
--- a/web/core/modules/shortcut/tests/src/Kernel/ShortcutSevenIntegrationTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Drupal\Tests\shortcut\Kernel;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests shortcut_install() and shortcut_uninstall().
- *
- * @group shortcut
- */
-class ShortcutSevenIntegrationTest extends KernelTestBase {
-
-  protected static $modules = ['system'];
-
-  /**
-   * Tests shortcut_install() and shortcut_uninstall().
-   */
-  public function testInstallUninstall() {
-    // Install seven.
-    \Drupal::service('theme_installer')->install(['seven']);
-    $this->assertNull($this->config('seven.settings')->get('third_party_settings.shortcut'), 'There are no shortcut settings in seven.settings.');
-
-    \Drupal::service('module_installer')->install(['shortcut']);
-    $this->assertTrue($this->config('seven.settings')->get('third_party_settings.shortcut.module_link'), 'The shortcut module_link setting is in seven.settings.');
-
-    \Drupal::service('module_installer')->uninstall(['shortcut']);
-    $this->assertNull($this->config('seven.settings')->get('third_party_settings.shortcut'), 'There are no shortcut settings in seven.settings.');
-  }
-
-}
diff --git a/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php b/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php
index b400cbee3..1bbe28f2d 100644
--- a/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php
+++ b/web/core/modules/shortcut/tests/src/Unit/Menu/ShortcutLocalTasksTest.php
@@ -12,6 +12,9 @@
  */
 class ShortcutLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = [
       'shortcut' => 'core/modules/shortcut',
@@ -23,7 +26,7 @@ protected function setUp(): void {
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->container->set('entity_type.manager', $entity_type_manager);
     $this->container->set('string_translation', $this->getStringTranslationStub());
   }
diff --git a/web/core/modules/sqlite/src/Driver/Database/sqlite/Schema.php b/web/core/modules/sqlite/src/Driver/Database/sqlite/Schema.php
index ff893d275..02e28976a 100644
--- a/web/core/modules/sqlite/src/Driver/Database/sqlite/Schema.php
+++ b/web/core/modules/sqlite/src/Driver/Database/sqlite/Schema.php
@@ -51,7 +51,7 @@ public function fieldExists($table, $column) {
    * @param $table
    *   A Schema API table definition array.
    *
-   * @return
+   * @return array
    *   An array of SQL statements to create the table.
    */
   public function createTableSql($name, $table) {
@@ -475,7 +475,7 @@ protected function alterTable($table, $old_schema, $new_schema, array $mapping =
    * @param $table
    *   Name of the table.
    *
-   * @return
+   * @return array
    *   An array representing the schema.
    *
    * @throws \Exception
diff --git a/web/core/modules/sqlite/src/Driver/Database/sqlite/Statement.php b/web/core/modules/sqlite/src/Driver/Database/sqlite/Statement.php
index 5de75a5de..8151108ca 100644
--- a/web/core/modules/sqlite/src/Driver/Database/sqlite/Statement.php
+++ b/web/core/modules/sqlite/src/Driver/Database/sqlite/Statement.php
@@ -106,45 +106,6 @@ public function execute($args = [], $options = []) {
       }
     }
 
-    // In some weird cases, SQLite will prefix some column names by the name
-    // of the table. We post-process the data, by renaming the column names
-    // using the same convention as MySQL and PostgreSQL.
-    $rename_columns = [];
-    foreach ($this->columnNames as $k => $column) {
-      // In some SQLite versions, SELECT DISTINCT(field) will return "(field)"
-      // instead of "field".
-      if (preg_match("/^\((.*)\)$/", $column, $matches)) {
-        $rename_columns[$column] = $matches[1];
-        $this->columnNames[$k] = $matches[1];
-        $column = $matches[1];
-      }
-
-      // Remove "table." prefixes.
-      if (preg_match("/^.*\.(.*)$/", $column, $matches)) {
-        $rename_columns[$column] = $matches[1];
-        $this->columnNames[$k] = $matches[1];
-      }
-    }
-    if ($rename_columns) {
-      // DatabaseStatementPrefetch already extracted the first row,
-      // put it back into the result set.
-      if (isset($this->currentRow)) {
-        $this->data[0] = &$this->currentRow;
-      }
-
-      // Then rename all the columns across the result set.
-      foreach ($this->data as $k => $row) {
-        foreach ($rename_columns as $old_column => $new_column) {
-          $this->data[$k][$new_column] = $this->data[$k][$old_column];
-          unset($this->data[$k][$old_column]);
-        }
-      }
-
-      // Finally, extract the first row again.
-      $this->currentRow = $this->data[0];
-      unset($this->data[0]);
-    }
-
     return $return;
   }
 
diff --git a/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php b/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
index 53e39c333..072c72736 100644
--- a/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
+++ b/web/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
@@ -116,11 +116,11 @@ public function blockForm($form, FormStateInterface $form_state) {
     $numbers = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40];
     $numbers = ['0' => $this->t('Disabled')] + array_combine($numbers, $numbers);
     $form['statistics_block_top_day_num'] = [
-     '#type' => 'select',
-     '#title' => $this->t("Number of day's top views to display"),
-     '#default_value' => $this->configuration['top_day_num'],
-     '#options' => $numbers,
-     '#description' => $this->t('How many content items to display in "day" list.'),
+      '#type' => 'select',
+      '#title' => $this->t("Number of day's top views to display"),
+      '#default_value' => $this->configuration['top_day_num'],
+      '#options' => $numbers,
+      '#description' => $this->t('How many content items to display in "day" list.'),
     ];
     $form['statistics_block_top_all_num'] = [
       '#type' => 'select',
diff --git a/web/core/modules/statistics/statistics.js b/web/core/modules/statistics/statistics.js
index 44c1e8e98..edbc27647 100644
--- a/web/core/modules/statistics/statistics.js
+++ b/web/core/modules/statistics/statistics.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   $(document).ready(function () {
     $.ajax({
diff --git a/web/core/modules/statistics/statistics.views.inc b/web/core/modules/statistics/statistics.views.inc
index e9ce16442..01e6d1efd 100644
--- a/web/core/modules/statistics/statistics.views.inc
+++ b/web/core/modules/statistics/statistics.views.inc
@@ -24,7 +24,7 @@ function statistics_views_data() {
     'field' => [
       'id' => 'statistics_numeric',
       'click sortable' => TRUE,
-     ],
+    ],
     'filter' => [
       'id' => 'numeric',
     ],
@@ -42,7 +42,7 @@ function statistics_views_data() {
     'field' => [
       'id' => 'statistics_numeric',
       'click sortable' => TRUE,
-     ],
+    ],
     'filter' => [
       'id' => 'numeric',
     ],
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
index d943bcecf..4c68a24e1 100644
--- a/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsAdminTest.php
@@ -48,6 +48,9 @@ class StatisticsAdminTest extends BrowserTestBase {
    */
   protected $client;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
index ebef68373..0c21cd07a 100644
--- a/web/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsLoggingTest.php
@@ -56,6 +56,9 @@ class StatisticsLoggingTest extends BrowserTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php b/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
index d55db1845..5f1e10da6 100644
--- a/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsTestBase.php
@@ -17,12 +17,15 @@ abstract class StatisticsTestBase extends BrowserTestBase {
   protected static $modules = ['node', 'block', 'ban', 'statistics'];
 
   /**
-   * User with permissions to ban IP's.
+   * User with permissions to ban IPs.
    *
    * @var \Drupal\user\UserInterface
    */
   protected $blockingUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php b/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
index 879f16cc9..4b81e983f 100644
--- a/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/StatisticsTokenReplaceTest.php
@@ -5,8 +5,7 @@
 use Drupal\Component\Render\FormattableMarkup;
 
 /**
- * Generates text using placeholders for dummy content to check statistics token
- * replacement.
+ * Tests statistics token replacement.
  *
  * @group statistics
  */
diff --git a/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php b/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
index eb9d87cd8..6bb642b44 100644
--- a/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
+++ b/web/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
@@ -53,6 +53,9 @@ class IntegrationTest extends ViewTestBase {
    */
   public static $testViews = ['test_statistics_integration'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['statistics_test_views']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/statistics/tests/themes/statistics_test_attached/statistics_test_attached.info.yml b/web/core/modules/statistics/tests/themes/statistics_test_attached/statistics_test_attached.info.yml
index 415631843..f1a5436b8 100644
--- a/web/core/modules/statistics/tests/themes/statistics_test_attached/statistics_test_attached.info.yml
+++ b/web/core/modules/statistics/tests/themes/statistics_test_attached/statistics_test_attached.info.yml
@@ -1,5 +1,5 @@
 name: 'Statistics test attached theme'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Theme for testing attached library'
 version: VERSION
diff --git a/web/core/modules/syslog/syslog.module b/web/core/modules/syslog/syslog.module
index 28d57f7b0..b13af5090 100644
--- a/web/core/modules/syslog/syslog.module
+++ b/web/core/modules/syslog/syslog.module
@@ -49,7 +49,7 @@ function syslog_form_system_logging_settings_alter(&$form, FormStateInterface $f
       '#default_value' => $config->get('facility'),
       '#options'       => syslog_facility_list(),
       '#description'   => t('Depending on the system configuration, Syslog and other logging tools use this code to identify or filter messages from within the entire system log.') . $help,
-     ];
+    ];
   }
   $form['syslog_format'] = [
     '#type'          => 'textarea',
diff --git a/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php b/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
index fcc4895ae..9651fbc33 100644
--- a/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
+++ b/web/core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php
@@ -24,6 +24,11 @@ class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase {
    */
   protected function setUp(): void {
     parent::setUp();
+    // Enable syslog in the source database so that requirements are met.
+    $this->sourceDatabase->update('system')
+      ->condition('name', 'syslog')
+      ->fields(['status' => '1'])
+      ->execute();
     $this->executeMigration('d6_syslog_settings');
   }
 
diff --git a/web/core/modules/system/config/install/system.mail.yml b/web/core/modules/system/config/install/system.mail.yml
index a7147a7bd..0ea09c381 100644
--- a/web/core/modules/system/config/install/system.mail.yml
+++ b/web/core/modules/system/config/install/system.mail.yml
@@ -1,2 +1,2 @@
 interface:
- default: 'php_mail'
+  default: 'php_mail'
diff --git a/web/core/modules/system/config/schema/system.schema.yml b/web/core/modules/system/config/schema/system.schema.yml
index c0f6a87e4..3e61a0036 100644
--- a/web/core/modules/system/config/schema/system.schema.yml
+++ b/web/core/modules/system/config/schema/system.schema.yml
@@ -350,3 +350,10 @@ condition.plugin.request_path:
   mapping:
     pages:
       type: string
+
+condition.plugin.current_theme:
+  type: condition.plugin
+  mapping:
+    theme:
+      type: string
+      label: Theme
diff --git a/web/core/modules/system/css/components/tabledrag.module.css b/web/core/modules/system/css/components/tabledrag.module.css
index 8f93e8529..41b9b4398 100644
--- a/web/core/modules/system/css/components/tabledrag.module.css
+++ b/web/core/modules/system/css/components/tabledrag.module.css
@@ -41,11 +41,21 @@ a.tabledrag-handle .handle {
   height: 14px;
   margin: -0.4em 0.5em 0;
   padding: 0.42em 0.5em;
-  background: url(../../../../misc/icons/787878/move.svg) no-repeat 6px 7px;
+  background: #787878;
+  -webkit-mask: url(../../../../misc/icons/787878/move.svg) no-repeat 6px 7px;
+  mask: url(../../../../misc/icons/787878/move.svg) no-repeat 6px 7px;
 }
 a.tabledrag-handle:hover .handle,
 a.tabledrag-handle:focus .handle {
-  background-image: url(../../../../misc/icons/000000/move.svg);
+  background: #000;
+}
+
+@media (forced-colors: active) {
+  a.tabledrag-handle .handle,
+  a.tabledrag-handle:hover .handle,
+  a.tabledrag-handle:focus .handle {
+    background: canvastext;
+  }
 }
 .touchevents .draggable td {
   padding: 0 10px;
diff --git a/web/core/modules/system/js/system.date.js b/web/core/modules/system/js/system.date.js
index 42138f420..84b8c0b87 100644
--- a/web/core/modules/system/js/system.date.js
+++ b/web/core/modules/system/js/system.date.js
@@ -4,18 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   var dateFormats = drupalSettings.dateFormats;
   Drupal.behaviors.dateFormat = {
     attach: function attach(context) {
       var source = once('dateFormat', '[data-drupal-date-formatter="source"]', context);
       var target = once('dateFormat', '[data-drupal-date-formatter="preview"]', context);
-
       if (!source.length || !target.length) {
         return;
       }
-
       function dateFormatHandler(e) {
         var baseValue = e.target.value || '';
         var dateString = baseValue.replace(/\\?(.?)/gi, function (key, value) {
@@ -28,7 +25,6 @@
         });
         $(target).toggleClass('js-hide', !dateString.length);
       }
-
       $(source).on('keyup.dateFormat change.dateFormat input.dateFormat', dateFormatHandler).trigger('keyup');
     }
   };
diff --git a/web/core/modules/system/js/system.js b/web/core/modules/system/js/system.js
index e92564b80..bd812797c 100644
--- a/web/core/modules/system/js/system.js
+++ b/web/core/modules/system/js/system.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   var ids = [];
   Drupal.behaviors.copyFieldValue = {
@@ -12,7 +11,6 @@
       Object.keys(drupalSettings.copyFieldValue || {}).forEach(function (element) {
         ids.push(element);
       });
-
       if (ids.length) {
         $(once('copy-field-values', 'body')).on('value:copy', this.valueTargetCopyHandler);
         $(once('copy-field-values', "#".concat(ids.join(', #')))).on('blur', this.valueSourceBlurHandler);
@@ -26,7 +24,6 @@
     },
     valueTargetCopyHandler: function valueTargetCopyHandler(e, value) {
       var target = e.target;
-
       if (target.value === '') {
         target.value = value;
       }
diff --git a/web/core/modules/system/js/system.modules.js b/web/core/modules/system/js/system.modules.js
index f4451e5ab..c4a734751 100644
--- a/web/core/modules/system/js/system.modules.js
+++ b/web/core/modules/system/js/system.modules.js
@@ -4,46 +4,34 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 (function ($, Drupal, debounce) {
   Drupal.behaviors.tableFilterByText = {
     attach: function attach(context, settings) {
       var _once = once('table-filter-text', 'input.table-filter-text'),
-          _once2 = _slicedToArray(_once, 1),
-          input = _once2[0];
-
+        _once2 = _slicedToArray(_once, 1),
+        input = _once2[0];
       if (!input) {
         return;
       }
-
       var $table = $(input.getAttribute('data-table'));
       var $rowsAndDetails;
       var $rows;
       var $details;
       var searching = false;
-
       function hidePackageDetails(index, element) {
         var $packDetails = $(element);
         var $visibleRows = $packDetails.find('tbody tr:visible');
         $packDetails.toggle($visibleRows.length > 0);
       }
-
       function filterModuleList(e) {
         var query = e.target.value;
         var re = new RegExp("\\b".concat(query), 'i');
-
         function showModuleRow(index, row) {
           var sources = row.querySelectorAll('.table-filter-text-source, .module-name, .module-description');
           var sourcesConcat = '';
@@ -53,9 +41,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
           var textMatch = sourcesConcat.search(re) !== -1;
           $(row).closest('tr').toggle(textMatch);
         }
-
         $rowsAndDetails.show();
-
         if (query.length >= 2) {
           searching = true;
           $rows.each(showModuleRow);
@@ -70,14 +56,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
           $details.filter('[data-drupal-system-state="forced-open"]').removeAttr('data-drupal-system-state').attr('open', false);
         }
       }
-
       function preventEnterKey(event) {
         if (event.which === 13) {
           event.preventDefault();
           event.stopPropagation();
         }
       }
-
       if ($table.length) {
         $rowsAndDetails = $table.find('tr, details');
         $rows = $table.find('tbody tr');
diff --git a/web/core/modules/system/migrations/d7_theme_settings.yml b/web/core/modules/system/migrations/d7_theme_settings.yml
index ad789fae8..ef08585eb 100644
--- a/web/core/modules/system/migrations/d7_theme_settings.yml
+++ b/web/core/modules/system/migrations/d7_theme_settings.yml
@@ -10,7 +10,7 @@ source:
 process:
   # Build the configuration name from the variable name, i.e.
   # theme_bartik_settings becomes bartik.settings.
-  theme_name:
+  legacy_theme_name:
     -
       plugin: explode
       source: name
@@ -19,6 +19,13 @@ process:
       plugin: extract
       index:
         - 1
+  theme_name:
+    plugin: static_map
+    source: '@legacy_theme_name'
+    bypass: true
+    map:
+      bartik: olivero
+      seven: claro
   configuration_name:
     plugin: concat
     source:
diff --git a/web/core/modules/system/migrations/state/system.migrate_drupal.yml b/web/core/modules/system/migrations/state/system.migrate_drupal.yml
index 92e9bd747..1c0f60651 100644
--- a/web/core/modules/system/migrations/state/system.migrate_drupal.yml
+++ b/web/core/modules/system/migrations/state/system.migrate_drupal.yml
@@ -5,7 +5,7 @@ finished:
       - menu_link_content
       - menu_ui
     system: system
-# An upgrade path is not needed for jquery_ui.
+    # An upgrade path is not needed for jquery_ui.
     jquery_ui: core
   7:
     menu:
diff --git a/web/core/modules/system/migrations/system_maintenance.yml b/web/core/modules/system/migrations/system_maintenance.yml
index cf1de5346..7caa7c5e3 100644
--- a/web/core/modules/system/migrations/system_maintenance.yml
+++ b/web/core/modules/system/migrations/system_maintenance.yml
@@ -12,15 +12,15 @@ source:
   source_module: system
 process:
   message:
-  -
-    plugin: callback
-    callable: array_filter
-    source:
-      - maintenance_mode_message
-      - site_offline_message
-  -
-    plugin: callback
-    callable: current
+    -
+      plugin: callback
+      callable: array_filter
+      source:
+        - maintenance_mode_message
+        - site_offline_message
+    -
+      plugin: callback
+      callable: current
 destination:
   plugin: config
   config_name: system.maintenance
diff --git a/web/core/modules/system/src/Controller/TimezoneController.php b/web/core/modules/system/src/Controller/TimezoneController.php
index 069113247..98db99246 100644
--- a/web/core/modules/system/src/Controller/TimezoneController.php
+++ b/web/core/modules/system/src/Controller/TimezoneController.php
@@ -5,33 +5,48 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
- * Provides a callback for finding out a timezone name.
+ * Provides a callback for finding a time zone identifier.
  */
 class TimezoneController {
 
   /**
-   * Retrieve a JSON object containing a time zone name given a timezone
-   * abbreviation.
+   * Returns a time zone identifier given a time zone abbreviation.
    *
    * @param string $abbreviation
    *   Time zone abbreviation.
    * @param int $offset
    *   Offset from GMT in seconds. Defaults to -1 which means that first found
-   *   time zone corresponding to abbr is returned. Otherwise exact offset is
-   *   searched and only if not found then the first time zone with any offset
-   *   is returned.
-   * @param null|bool $is_daylight_saving_time
-   *   Daylight saving time indicator. If abbr does not exist then the time
-   *   zone is searched solely by offset and isdst.
+   *   time zone corresponding to abbreviation is returned. Otherwise exact
+   *   offset is searched and only if not found then the first time zone with
+   *   any offset is returned.
+   * @param null|int $is_daylight_saving_time
+   *   Daylight saving time indicator. If abbreviation does not exist then the
+   *   time zone is searched solely by offset and is DST.
    *
    * @return \Symfony\Component\HttpFoundation\JsonResponse
-   *   The timezone name in JsonResponse object.
+   *   The time zone identifier or 'false' in JsonResponse object.
    */
   public function getTimezone($abbreviation = '', $offset = -1, $is_daylight_saving_time = NULL) {
+    $offset = intval($offset);
+    // Out of bounds check for offset. Offset +/- UTC is typically no
+    // smaller/larger than -12/+14.
+    if ($offset < -60000 || $offset > 60000) {
+      return new JsonResponse(FALSE);
+    }
+
+    if (isset($is_daylight_saving_time)) {
+      $original = intval($is_daylight_saving_time);
+      $is_daylight_saving_time = min(1, max(-1, intval($is_daylight_saving_time)));
+      // Catch if out of boundary.
+      if ($original !== $is_daylight_saving_time) {
+        return new JsonResponse(FALSE);
+      }
+    }
+
     // An abbreviation of "0" passed in the callback arguments should be
     // interpreted as the empty string.
     $abbreviation = $abbreviation ? $abbreviation : '';
-    $timezone = timezone_name_from_abbr($abbreviation, intval($offset), $is_daylight_saving_time);
+    $timezone = timezone_name_from_abbr($abbreviation, $offset, $is_daylight_saving_time);
     return new JsonResponse($timezone);
   }
 
diff --git a/web/core/modules/system/src/FileDownloadController.php b/web/core/modules/system/src/FileDownloadController.php
index cb9071bc1..e2f9132e2 100644
--- a/web/core/modules/system/src/FileDownloadController.php
+++ b/web/core/modules/system/src/FileDownloadController.php
@@ -69,7 +69,7 @@ public static function create(ContainerInterface $container) {
   public function download(Request $request, $scheme = 'private') {
     $target = $request->query->get('file');
     // Merge remaining path arguments into relative file path.
-    $uri = $scheme . '://' . $target;
+    $uri = $this->streamWrapperManager->normalizeUri($scheme . '://' . $target);
 
     if ($this->streamWrapperManager->isValidScheme($scheme) && is_file($uri)) {
       // Let other modules provide headers and controls access to the file.
diff --git a/web/core/modules/system/src/Form/CronForm.php b/web/core/modules/system/src/Form/CronForm.php
index 177d973e6..4e7827d11 100644
--- a/web/core/modules/system/src/Form/CronForm.php
+++ b/web/core/modules/system/src/Form/CronForm.php
@@ -65,6 +65,7 @@ class CronForm extends FormBase {
    *   The module handler service.
    */
   public function __construct(ConfigFactoryInterface $config_factory, StateInterface $state, CronInterface $cron, DateFormatterInterface $date_formatter, ModuleHandlerInterface $module_handler) {
+    $this->configFactory = $config_factory;
     $this->state = $state;
     $this->cron = $cron;
     $this->dateFormatter = $date_formatter;
diff --git a/web/core/modules/system/src/Form/ModulesListForm.php b/web/core/modules/system/src/Form/ModulesListForm.php
index d0ec6f5b0..8df4971db 100644
--- a/web/core/modules/system/src/Form/ModulesListForm.php
+++ b/web/core/modules/system/src/Form/ModulesListForm.php
@@ -263,7 +263,7 @@ protected function buildRow(array $modules, Extension $module, $distribution) {
           Url::fromUri($module->info[ExtensionLifecycle::LIFECYCLE_LINK_IDENTIFIER], [
             'attributes' =>
               [
-                'class' => 'module-link--non-stable',
+                'class' => ['module-link--non-stable'],
                 'aria-label' => $this->t('View information on the @lifecycle status of the module @module', [
                   '@lifecycle' => ucfirst($lifecycle),
                   '@module' => $module->info['name'],
diff --git a/web/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php b/web/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php
index 4ccf3b65c..217c81803 100644
--- a/web/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php
+++ b/web/core/modules/system/src/Form/ModulesListNonStableConfirmForm.php
@@ -184,9 +184,7 @@ protected function buildNonStableInfo(): void {
         Url::fromUri($data[$machine_name]->info[ExtensionLifecycle::LIFECYCLE_LINK_IDENTIFIER], [
           'attributes' =>
             [
-              'aria-label' => ' ' . $this->t('about the status of the @name module', [
-                  '@name' => $name,
-                ]),
+              'aria-label' => ' ' . $this->t('about the status of the @name module', ['@name' => $name]),
             ],
         ])
       )->toString();
diff --git a/web/core/modules/system/src/Form/ModulesUninstallForm.php b/web/core/modules/system/src/Form/ModulesUninstallForm.php
index 82c014c23..483959410 100644
--- a/web/core/modules/system/src/Form/ModulesUninstallForm.php
+++ b/web/core/modules/system/src/Form/ModulesUninstallForm.php
@@ -146,8 +146,22 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       return $form;
     }
 
-    // Sort all modules by their name.
-    uasort($uninstallable, [ModuleExtensionList::class, 'sortByName']);
+    // Deprecated and obsolete modules should appear at the top of the
+    // uninstallation list.
+    $unstable_lifecycle = array_flip([
+      ExtensionLifecycle::DEPRECATED,
+      ExtensionLifecycle::OBSOLETE,
+    ]);
+
+    // Sort all modules by their lifecycle identifier and name.
+    uasort($uninstallable, function ($a, $b) use ($unstable_lifecycle) {
+      $lifecycle_a = isset($unstable_lifecycle[$a->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]]) ? -1 : 1;
+      $lifecycle_b = isset($unstable_lifecycle[$b->info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]]) ? -1 : 1;
+      if ($lifecycle_a === $lifecycle_b) {
+        return ModuleExtensionList::sortByName($a, $b);
+      }
+      return $lifecycle_a <=> $lifecycle_b;
+    });
     $validation_reasons = $this->moduleInstaller->validateUninstall(array_keys($uninstallable));
 
     $form['uninstall'] = ['#tree' => TRUE];
diff --git a/web/core/modules/system/src/Form/ThemeSettingsForm.php b/web/core/modules/system/src/Form/ThemeSettingsForm.php
index a07e9e6a8..c0bd9ae32 100644
--- a/web/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/web/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -235,7 +235,6 @@ public function buildForm(array $form, FormStateInterface $form_state, $theme =
       $form['logo']['settings']['logo_upload'] = [
         '#type' => 'file',
         '#title' => $this->t('Upload logo image'),
-        '#maxlength' => 40,
         '#description' => $this->t("If you don't have direct file access to the server, use this field to upload your logo."),
         '#upload_validators' => [
           'file_validate_is_image' => [],
diff --git a/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php b/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
index 609ffd515..517a57171 100644
--- a/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
+++ b/web/core/modules/system/src/PathBasedBreadcrumbBuilder.php
@@ -26,7 +26,9 @@
 use Symfony\Component\Routing\Matcher\RequestMatcherInterface;
 
 /**
- * Class to define the menu_link breadcrumb builder.
+ * Defines a class to build path-based breadcrumbs.
+ *
+ * @see \Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface
  */
 class PathBasedBreadcrumbBuilder implements BreadcrumbBuilderInterface {
   use StringTranslationTrait;
@@ -39,7 +41,7 @@ class PathBasedBreadcrumbBuilder implements BreadcrumbBuilderInterface {
   protected $context;
 
   /**
-   * The menu link access service.
+   * The access check service.
    *
    * @var \Drupal\Core\Access\AccessManagerInterface
    */
@@ -100,7 +102,7 @@ class PathBasedBreadcrumbBuilder implements BreadcrumbBuilderInterface {
    * @param \Drupal\Core\Routing\RequestContext $context
    *   The router request context.
    * @param \Drupal\Core\Access\AccessManagerInterface $access_manager
-   *   The menu link access service.
+   *   The access check service.
    * @param \Symfony\Component\Routing\Matcher\RequestMatcherInterface $router
    *   The dynamic router service.
    * @param \Drupal\Core\PathProcessor\InboundPathProcessorInterface $path_processor
diff --git a/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php b/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
index ed2406034..463b6800b 100644
--- a/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
+++ b/web/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
@@ -85,7 +85,7 @@ public function blockForm($form, FormStateInterface $form_state) {
       '#title' => $this->t('Menu levels'),
       // Open if not set to defaults.
       '#open' => $defaults['level'] !== $config['level'] || $defaults['depth'] !== $config['depth'],
-      '#process' => [[get_class(), 'processMenuLevelParents']],
+      '#process' => [[self::class, 'processMenuLevelParents']],
     ];
 
     $options = range(0, $this->menuTree->maxDepth());
diff --git a/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index 9218ae3ce..cc0993f76 100644
--- a/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/web/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -168,12 +168,12 @@ public function getResource() {
   public function buildConfigurationForm(array $form, FormStateInterface $form_state) {
     $form['image_jpeg_quality'] = [
       '#type' => 'number',
-      '#title' => t('JPEG quality'),
-      '#description' => t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.'),
+      '#title' => $this->t('JPEG quality'),
+      '#description' => $this->t('Define the image quality for JPEG manipulations. Ranges from 0 to 100. Higher values mean better image quality but bigger files.'),
       '#min' => 0,
       '#max' => 100,
       '#default_value' => $this->configFactory->getEditable('system.image.gd')->get('jpeg_quality', FALSE),
-      '#field_suffix' => t('%'),
+      '#field_suffix' => $this->t('%'),
     ];
     return $form;
   }
@@ -395,14 +395,14 @@ public function getRequirements() {
 
     $info = gd_info();
     $requirements['version'] = [
-      'title' => t('GD library'),
+      'title' => $this->t('GD library'),
       'value' => $info['GD Version'],
     ];
 
     // Check for filter and rotate support.
     if (!function_exists('imagefilter') || !function_exists('imagerotate')) {
       $requirements['version']['severity'] = REQUIREMENT_WARNING;
-      $requirements['version']['description'] = t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See <a href="http://php.net/manual/book.image.php">the PHP manual</a>.');
+      $requirements['version']['description'] = $this->t('The GD Library for PHP is enabled, but was compiled without support for functions used by the rotate and desaturate effects. It was probably compiled using the official GD libraries from http://www.libgd.org instead of the GD library bundled with PHP. You should recompile PHP --with-gd using the bundled GD library. See <a href="http://php.net/manual/book.image.php">the PHP manual</a>.');
     }
 
     return $requirements;
diff --git a/web/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php b/web/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php
index 511cec9ce..ee1567457 100644
--- a/web/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php
+++ b/web/core/modules/system/src/Plugin/migrate/destination/d7/ThemeSettings.php
@@ -67,6 +67,7 @@ public function import(Row $row, array $old_destination_id_values = []) {
     // Remove keys not in theme settings.
     unset($theme_settings['configuration_name']);
     unset($theme_settings['theme_name']);
+    unset($theme_settings['legacy_theme_name']);
     if (isset($theme_settings)) {
       theme_settings_convert_to_config($theme_settings, $config);
       $config->save();
diff --git a/web/core/modules/system/src/SystemManager.php b/web/core/modules/system/src/SystemManager.php
index 89b2e7abf..7c88d95c3 100644
--- a/web/core/modules/system/src/SystemManager.php
+++ b/web/core/modules/system/src/SystemManager.php
@@ -107,6 +107,7 @@ public function listRequirements() {
 
     // Check run-time requirements and status information.
     $requirements = $this->moduleHandler->invokeAll('requirements', ['runtime']);
+    $this->moduleHandler->alter('requirements', $requirements);
     uasort($requirements, function ($a, $b) {
       if (!isset($a['weight'])) {
         if (!isset($b['weight'])) {
@@ -127,7 +128,7 @@ public function listRequirements() {
    *   An array of requirements, in the same format as is returned by
    *   hook_requirements().
    *
-   * @return
+   * @return int
    *   The highest severity in the array.
    */
   public function getMaxSeverity(&$requirements) {
diff --git a/web/core/modules/system/src/Theme/BatchNegotiator.php b/web/core/modules/system/src/Theme/BatchNegotiator.php
index ceb6c9607..074e4f897 100644
--- a/web/core/modules/system/src/Theme/BatchNegotiator.php
+++ b/web/core/modules/system/src/Theme/BatchNegotiator.php
@@ -43,7 +43,7 @@ public function __construct(BatchStorageInterface $batch_storage, RequestStack $
    * {@inheritdoc}
    */
   public function applies(RouteMatchInterface $route_match) {
-    return $route_match->getRouteName() == 'system.batch_page';
+    return $route_match->getRouteName() == 'system.batch_page.html';
   }
 
   /**
diff --git a/web/core/modules/system/system.install b/web/core/modules/system/system.install
index cc9b994af..274a90597 100644
--- a/web/core/modules/system/system.install
+++ b/web/core/modules/system/system.install
@@ -311,34 +311,25 @@ function system_requirements($phase) {
     // during installation or update.
     $requirements['php']['severity'] = ($phase === 'runtime') ? REQUIREMENT_ERROR : REQUIREMENT_WARNING;
   }
-  // @todo Remove this when \Drupal::MINIMUM_PHP is at least 8.1.6 in
-  //   https://www.drupal.org/i/3305726.
-  elseif ($phase === 'runtime' && version_compare($phpversion, '8.1.0', '>=') && version_compare($phpversion, '8.1.6', '<')) {
-    $requirements['php']['description'] = t('PHP %version has <a href=":bug_url">an OPcache bug that can cause fatal errors with class autoloading</a>. This can be fixed by upgrading to PHP 8.1.6 or later. See <a href="http://php.net/supported-versions.php">PHP\'s version support documentation</a> and the <a href=":php_requirements">Drupal PHP requirements</a> page for more information.', [
-      '%version' => $phpversion,
-      ':bug_url' => 'https://github.com/php/php-src/issues/8164',
-      ':php_requirements' => 'https://www.drupal.org/docs/system-requirements/php-requirements',
-    ]);
-    $requirements['php']['severity'] = REQUIREMENT_WARNING;
-  }
   // For PHP versions that are still supported but no longer recommended,
   // inform users of what's recommended, allowing them to take action before it
   // becomes urgent.
   elseif ($phase === 'runtime' && version_compare($phpversion, \Drupal::RECOMMENDED_PHP) < 0) {
     $requirements['php']['description'] = t('It is recommended to upgrade to PHP version %recommended or higher for the best ongoing support.  See <a href="http://php.net/supported-versions.php">PHP\'s version support documentation</a> and the <a href=":php_requirements">Drupal PHP requirements</a> page for more information.', ['%recommended' => \Drupal::RECOMMENDED_PHP, ':php_requirements' => 'https://www.drupal.org/docs/system-requirements/php-requirements']);
-  }
-  // If we're not on PHP 8.1 yet, warn about an OPcache bug in PHP 8.1.0 through
-  // 8.1.5, so that users know to avoid to those versions.
-  // @todo Remove this when \Drupal::MINIMUM_PHP is at least 8.1.6 in
-  //   https://www.drupal.org/i/3305726.
-  if ($phase === 'runtime' && version_compare($phpversion, '8.1.0', 'lt')) {
-    // Append the notice about the broken PHP versions to the existing
-    // description (if there is one), so that the existing translatable string
-    // is preserved untouched.
-    $requirements['php']['description'] = t('<p>@requirement</p><p>PHP versions 8.1.0 to 8.1.5 have <a href=":bug_url">an OPcache bug that can cause fatal errors with class autoloading</a>. It can be avoided by using PHP 8.1.6 or later.</p>', [
-      '@requirement' => $requirements['php']['description'] ?? '',
-      ':bug_url' => 'https://github.com/php/php-src/issues/8164',
-    ]);
+    $requirements['php']['severity'] = REQUIREMENT_INFO;
+
+    // PHP 8.1.0 to 8.1.5 has a known OPcache bug that can cause fatal errors,
+    // so warn about that if Drupal is running on one of those broken versions.
+    // @todo Remove this when \Drupal::MINIMUM_PHP is at least 8.1.6 in
+    //   https://www.drupal.org/i/3305726.
+    if (version_compare($phpversion, '8.1.0', 'ge') && version_compare($phpversion, '8.1.6', 'lt')) {
+      $requirements['php']['description'] = t('PHP %version has <a href=":bug_url">an OPcache bug that can cause fatal errors with class autoloading</a>. This can be fixed by upgrading to PHP 8.1.6 or later. See <a href="http://php.net/supported-versions.php">PHP\'s version support documentation</a> and the <a href=":php_requirements">Drupal PHP requirements</a> page for more information.', [
+        '%version' => $phpversion,
+        ':bug_url' => 'https://github.com/php/php-src/issues/8164',
+        ':php_requirements' => 'https://www.drupal.org/docs/system-requirements/php-requirements',
+      ]);
+      $requirements['php']['severity'] = REQUIREMENT_WARNING;
+    }
   }
 
   // Test for PHP extensions.
@@ -748,10 +739,11 @@ function system_requirements($phase) {
 
     // Determine severity based on time since cron last ran.
     $severity = REQUIREMENT_INFO;
-    if (REQUEST_TIME - $cron_last > $threshold_error) {
+    $request_time = \Drupal::time()->getRequestTime();
+    if ($request_time - $cron_last > $threshold_error) {
       $severity = REQUIREMENT_ERROR;
     }
-    elseif (REQUEST_TIME - $cron_last > $threshold_warning) {
+    elseif ($request_time - $cron_last > $threshold_warning) {
       $severity = REQUIREMENT_WARNING;
     }
 
@@ -770,7 +762,7 @@ function system_requirements($phase) {
           '#suffix' => ' ',
         ],
         [
-          '#markup' => t('For more information, see the online handbook entry for <a href=":cron-handbook">configuring cron jobs</a>.', [':cron-handbook' => 'https://www.drupal.org/cron']),
+          '#markup' => t('For more information, see the online handbook entry for <a href=":cron-handbook">configuring cron jobs</a>.', [':cron-handbook' => 'https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks/cron-automated-tasks-overview']),
           '#suffix' => ' ',
         ],
       ];
@@ -1066,7 +1058,8 @@ function system_requirements($phase) {
         // Check for an incompatible version.
         $required_file = $files[$required_module];
         $required_name = $required_file->info['name'];
-        $version = str_replace(\Drupal::CORE_COMPATIBILITY . '-', '', $required_file->info['version'] ?? '');
+        // Remove CORE_COMPATIBILITY- only from the start of the string.
+        $version = preg_replace('/^(' . \Drupal::CORE_COMPATIBILITY . '\-)/', '', $required_file->info['version'] ?? '');
         if (!$requirement->isCompatible($version)) {
           $requirements["$extension_name-$required_module"] = [
             'title' => t('Unresolved dependency'),
@@ -1259,7 +1252,7 @@ function system_requirements($phase) {
       $requirements['trusted_host_patterns'] = [
         'title' => t('Trusted Host Settings'),
         'value' => t('Not enabled'),
-        'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is <strong>highly recommended</strong> that you configure this. See <a href=":url">Protecting against HTTP HOST Header attacks</a> for more information.', [':url' => 'https://www.drupal.org/docs/8/install/trusted-host-settings']),
+        'description' => t('The trusted_host_patterns setting is not configured in settings.php. This can lead to security vulnerabilities. It is <strong>highly recommended</strong> that you configure this. See <a href=":url">Protecting against HTTP HOST Header attacks</a> for more information.', [':url' => 'https://www.drupal.org/docs/installing-drupal/trusted-host-settings']),
         'severity' => REQUIREMENT_ERROR,
       ];
     }
@@ -1279,7 +1272,7 @@ function system_requirements($phase) {
     $provider = $connection->getProvider();
     if ($provider !== 'core' && !\Drupal::moduleHandler()->moduleExists($provider)) {
       $autoload = $connection->getConnectionOptions()['autoload'] ?? '';
-      if (($pos = strpos($autoload, 'src/Driver/Database/')) !== FALSE) {
+      if (strpos($autoload, 'src/Driver/Database/') !== FALSE) {
         $post_update_registry = \Drupal::service('update.post_update_registry');
         $pending_updates = $post_update_registry->getPendingUpdateInformation();
         if (!in_array('enable_provider_database_driver', array_keys($pending_updates['system']['pending'] ?? []), TRUE)) {
@@ -1487,7 +1480,7 @@ function system_schema() {
         'unsigned' => TRUE,
         'not null' => TRUE,
       ],
-     ],
+    ],
     'primary key' => ['value'],
   ];
 
diff --git a/web/core/modules/system/system.module b/web/core/modules/system/system.module
index deba8f16a..89f68ddb4 100644
--- a/web/core/modules/system/system.module
+++ b/web/core/modules/system/system.module
@@ -28,6 +28,7 @@ use Drupal\Core\Queue\QueueGarbageCollectionInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Routing\StackedRouteMatchInterface;
 use Drupal\Core\Site\Settings;
+use Drupal\Core\StreamWrapper\LocalStream;
 use Drupal\Core\StreamWrapper\StreamWrapperManager;
 use Drupal\Core\Url;
 use GuzzleHttp\Exception\TransferException;
@@ -88,7 +89,7 @@ function system_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dt>' . t('Configuring for performance') . '</dt>';
       $output .= '<dd>' . t('On the <a href=":performance-page">Performance page</a>, the site can be configured to aggregate CSS and JavaScript files, making the total request size smaller. Note that, for small- to medium-sized websites, the <a href=":page-cache">Internal Page Cache module</a> should be installed so that pages are efficiently cached and reused for anonymous users. Finally, for websites of all sizes, the <a href=":dynamic-page-cache">Dynamic Page Cache module</a> should also be installed so that the non-personalized parts of pages are efficiently cached (for all users).', [':performance-page' => Url::fromRoute('system.performance_settings')->toString(), ':page-cache' => (\Drupal::moduleHandler()->moduleExists('page_cache')) ? Url::fromRoute('help.page', ['name' => 'page_cache'])->toString() : '#', ':dynamic-page-cache' => (\Drupal::moduleHandler()->moduleExists('dynamic_page_cache')) ? Url::fromRoute('help.page', ['name' => 'dynamic_page_cache'])->toString() : '#']) . '</dd>';
       $output .= '<dt>' . t('Configuring cron') . '</dt>';
-      $output .= '<dd>' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as <em>cron</em> tasks. On the <a href=":cron">Cron page</a>, you can configure cron to run periodically as part of server responses by installing the <em>Automated Cron</em> module, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the <a href=":status">Status report page</a>. For more information, see the <a href=":handbook">online documentation for configuring cron jobs</a>.', [':status' => Url::fromRoute('system.status')->toString(), ':handbook' => 'https://www.drupal.org/cron', ':cron' => Url::fromRoute('system.cron_settings')->toString()]) . '</dd>';
+      $output .= '<dd>' . t('In order for the site and its modules to continue to operate well, a set of routine administrative operations must run on a regular basis; these operations are known as <em>cron</em> tasks. On the <a href=":cron">Cron page</a>, you can configure cron to run periodically as part of server responses by installing the <em>Automated Cron</em> module, or you can turn this off and trigger cron from an outside process on your web server. You can verify the status of cron tasks by visiting the <a href=":status">Status report page</a>. For more information, see the <a href=":handbook">online documentation for configuring cron jobs</a>.', [':status' => Url::fromRoute('system.status')->toString(), ':handbook' => 'https://www.drupal.org/docs/administering-a-drupal-site/cron-automated-tasks/cron-automated-tasks-overview', ':cron' => Url::fromRoute('system.cron_settings')->toString()]) . '</dd>';
       $output .= '<dt>' . t('Configuring the file system') . '</dt>';
       $output .= '<dd>' . t('Your site has several file directories, which are used to store and process uploaded and generated files. The <em>public</em> file directory, which is configured in your settings.php file, is the default place for storing uploaded files. Links to files in this directory contain the direct file URL, so when the files are requested, the web server will send them directly without invoking your site code. This means that the files can be downloaded by anyone with the file URL, so requests are not access-controlled but they are efficient. The <em>private</em> file directory, also configured in your settings.php file and ideally located outside the site web root, is access controlled. Links to files in this directory are not direct, so requests to these files are mediated by your site code. This means that your site can check file access permission for each file before deciding to fulfill the request, so the requests are more secure, but less efficient. You should only use the private storage for files that need access control, not for files like your site logo and background images used on every page. The <em>temporary</em> file directory is used internally by your site code for various operations, and is configured on the <a href=":file-system">File system settings</a> page. You can also see the configured public and private file directories on this page, and choose whether public or private should be the default for uploaded files.', [':file-system' => Url::fromRoute('system.file_system_settings')->toString()]) . '</dd>';
       $output .= '<dt>' . t('Configuring the image toolkit') . '</dt>';
@@ -458,9 +459,6 @@ function template_preprocess_entity_add_list(&$variables) {
  *   object created by authorize.php when the user authorizes the operation.
  * @param $page_title
  *   Optional string to use as the page title once redirected to authorize.php.
- *
- * @return
- *   Nothing, this function just initializes variables in the user's session.
  */
 function system_authorized_init($callback, $file, $arguments = [], $page_title = NULL) {
   $session = \Drupal::request()->getSession();
@@ -877,7 +875,7 @@ function system_check_directory($form_element, FormStateInterface $form_state) {
  *   Possible values: REGIONS_ALL or REGIONS_VISIBLE. Visible excludes hidden
  *   regions.
  *
- * @return
+ * @return string[]
  *   An array of regions in the form $region['name'] = 'description'.
  */
 function system_region_list($theme, $show = REGIONS_ALL) {
@@ -949,7 +947,7 @@ function system_system_info_alter(&$info, Extension $file, $type) {
  * @param $theme
  *   The name of a theme.
  *
- * @return
+ * @return string
  *   A string that is the region name.
  */
 function system_default_region($theme) {
@@ -1392,6 +1390,26 @@ function system_page_top() {
  * Implements hook_file_download().
  */
 function system_file_download($uri) {
+  $stream_wrapper_manager = \Drupal::service('stream_wrapper_manager');
+  $scheme = $stream_wrapper_manager->getScheme($uri);
+  if ($stream_wrapper_manager->isValidScheme($scheme)) {
+    $target = $stream_wrapper_manager->getTarget($uri);
+    if ($target !== FALSE) {
+      if (!in_array($scheme, Settings::get('file_sa_core_2023_005_schemes', []))) {
+        if (DIRECTORY_SEPARATOR !== '/') {
+          $class = $stream_wrapper_manager->getClass($scheme);
+          if (is_subclass_of($class, LocalStream::class)) {
+            $target = str_replace(DIRECTORY_SEPARATOR, '/', $target);
+          }
+        }
+        $parts = explode('/', $target);
+        if (array_intersect($parts, ['.', '..'])) {
+          return -1;
+        }
+      }
+    }
+  }
+
   $core_schemes = ['public', 'private', 'temporary'];
   $additional_public_schemes = array_diff(Settings::get('file_additional_public_schemes', []), $core_schemes);
   if ($additional_public_schemes) {
diff --git a/web/core/modules/system/system.routing.yml b/web/core/modules/system/system.routing.yml
index 00eddce6b..f5335c48c 100644
--- a/web/core/modules/system/system.routing.yml
+++ b/web/core/modules/system/system.routing.yml
@@ -455,6 +455,9 @@ system.timezone:
     is_daylight_saving_time: NULL
   requirements:
     _access: 'TRUE'
+    abbreviation: '0|([A-Z]{3,5})'
+    offset: '\-?\d+'
+    is_daylight_saving_time: '\-1|0|1'
 
 system.admin_config:
   path: '/admin/config'
diff --git a/web/core/modules/system/system.tokens.inc b/web/core/modules/system/system.tokens.inc
index 4c0a83e43..8076c4aba 100644
--- a/web/core/modules/system/system.tokens.inc
+++ b/web/core/modules/system/system.tokens.inc
@@ -54,17 +54,18 @@ function system_token_info() {
   $date_formatter = \Drupal::service('date.formatter');
 
   // Date related tokens.
+  $request_time = \Drupal::time()->getRequestTime();
   $date['short'] = [
     'name' => t("Short format"),
-    'description' => t("A date in 'short' format. (%date)", ['%date' => $date_formatter->format(REQUEST_TIME, 'short')]),
+    'description' => t("A date in 'short' format. (%date)", ['%date' => $date_formatter->format($request_time, 'short')]),
   ];
   $date['medium'] = [
     'name' => t("Medium format"),
-    'description' => t("A date in 'medium' format. (%date)", ['%date' => $date_formatter->format(REQUEST_TIME, 'medium')]),
+    'description' => t("A date in 'medium' format. (%date)", ['%date' => $date_formatter->format($request_time, 'medium')]),
   ];
   $date['long'] = [
     'name' => t("Long format"),
-    'description' => t("A date in 'long' format. (%date)", ['%date' => $date_formatter->format(REQUEST_TIME, 'long')]),
+    'description' => t("A date in 'long' format. (%date)", ['%date' => $date_formatter->format($request_time, 'long')]),
   ];
   $date['custom'] = [
     'name' => t("Custom format"),
@@ -72,11 +73,11 @@ function system_token_info() {
   ];
   $date['since'] = [
     'name' => t("Time-since"),
-    'description' => t("A date in 'time-since' format. (%date)", ['%date' => $date_formatter->formatTimeDiffSince(REQUEST_TIME - 360)]),
+    'description' => t("A date in 'time-since' format. (%date)", ['%date' => $date_formatter->formatTimeDiffSince($request_time - 360)]),
   ];
   $date['raw'] = [
     'name' => t("Raw timestamp"),
-    'description' => t("A date in UNIX timestamp format (%date)", ['%date' => REQUEST_TIME]),
+    'description' => t("A date in UNIX timestamp format (%date)", ['%date' => $request_time]),
   ];
 
   return [
@@ -157,7 +158,7 @@ function system_tokens($type, $tokens, array $data, array $options, BubbleableMe
 
   elseif ($type == 'date') {
     if (empty($data['date'])) {
-      $date = REQUEST_TIME;
+      $date = \Drupal::time()->getRequestTime();
       // We depend on the current request time, so the tokens are not cacheable
       // at all.
       $bubbleable_metadata->setCacheMaxAge(0);
diff --git a/web/core/modules/system/templates/block--system-menu-block.html.twig b/web/core/modules/system/templates/block--system-menu-block.html.twig
index 6113bc2ed..1e6c3e020 100644
--- a/web/core/modules/system/templates/block--system-menu-block.html.twig
+++ b/web/core/modules/system/templates/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/modules/system/tests/modules/accept_header_routing_test/src/AcceptHeaderMiddleware.php b/web/core/modules/system/tests/modules/accept_header_routing_test/src/AcceptHeaderMiddleware.php
index 0f60fbe72..d62f0a859 100644
--- a/web/core/modules/system/tests/modules/accept_header_routing_test/src/AcceptHeaderMiddleware.php
+++ b/web/core/modules/system/tests/modules/accept_header_routing_test/src/AcceptHeaderMiddleware.php
@@ -11,6 +11,11 @@
  */
 class AcceptHeaderMiddleware implements HttpKernelInterface {
 
+  /**
+   * The app kernel.
+   */
+  protected $app;
+
   /**
    * Constructs a new AcceptHeaderMiddleware instance.
    *
diff --git a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php
index 41a9b6d92..2e774f31f 100644
--- a/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php
+++ b/web/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestAjaxElementsForm.php
@@ -7,8 +7,7 @@
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Form builder: Builds a form that has each FAPI elements triggering a simple
- * Ajax callback.
+ * Builds a form where each Form API element triggers a simple Ajax callback.
  *
  * @internal
  */
diff --git a/web/core/modules/system/tests/modules/ajax_test/ajax_test.libraries.yml b/web/core/modules/system/tests/modules/ajax_test/ajax_test.libraries.yml
index 9d390854b..155638376 100644
--- a/web/core/modules/system/tests/modules/ajax_test/ajax_test.libraries.yml
+++ b/web/core/modules/system/tests/modules/ajax_test/ajax_test.libraries.yml
@@ -4,19 +4,19 @@ ajax_insert:
   dependencies:
     - core/drupal.ajax
 order:
- drupalSettings:
-   ajax: test
- dependencies:
-   - ajax_test/order-css-command
-   - ajax_test/order-footer-js-command
-   - ajax_test/order-header-js-command
+  drupalSettings:
+    ajax: test
+  dependencies:
+    - ajax_test/order-css-command
+    - ajax_test/order-footer-js-command
+    - ajax_test/order-header-js-command
 
 order-css-command:
   css:
-     theme:
-       # Two CSS files (order should remain the same).
-       a.css: {}
-       b.css: {}
+    theme:
+      # Two CSS files (order should remain the same).
+      a.css: {}
+      b.css: {}
 
 order-footer-js-command:
   js:
@@ -33,3 +33,19 @@ focus.first:
   dependencies:
     - core/drupal
     - core/once
+
+command_promise:
+  version: VERSION
+  js:
+    js/command_promise-ajax.js: {}
+  dependencies:
+    - core/jquery
+    - core/drupal
+    - core/drupal.ajax
+    - core/es6-promise
+
+global_events:
+  js:
+    js/global_events.js: {}
+  dependencies:
+    - core/drupal.ajax
diff --git a/web/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml b/web/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml
index 01bf512ad..a90279ea9 100644
--- a/web/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml
+++ b/web/core/modules/system/tests/modules/ajax_test/ajax_test.routing.yml
@@ -93,3 +93,25 @@ ajax_test.focus_first_form:
     _form: '\Drupal\ajax_test\Form\AjaxTestFocusFirstForm'
   requirements:
     _access: 'TRUE'
+
+ajax_test.promise:
+  path: '/ajax-test/promise-form'
+  defaults:
+    _title: 'Ajax Form Command Promise'
+    _form: '\Drupal\ajax_test\Form\AjaxTestFormPromise'
+  requirements:
+    _access: 'TRUE'
+
+ajax_test.global_events:
+  path: '/ajax-test/global-events'
+  defaults:
+    _controller: '\Drupal\ajax_test\Controller\AjaxTestController::globalEvents'
+  requirements:
+    _access: 'TRUE'
+
+ajax_test.global_events_clear_log:
+  path: '/ajax-test/global-events/clear-log'
+  defaults:
+    _controller: '\Drupal\ajax_test\Controller\AjaxTestController::globalEventsClearLog'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/ajax_test/js/focus-ajax.js b/web/core/modules/system/tests/modules/ajax_test/js/focus-ajax.js
index 9cc0da866..64fae3f8d 100644
--- a/web/core/modules/system/tests/modules/ajax_test/js/focus-ajax.js
+++ b/web/core/modules/system/tests/modules/ajax_test/js/focus-ajax.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.behaviors.focusFirstTest = {
     attach: function attach() {
diff --git a/web/core/modules/system/tests/modules/ajax_test/js/insert-ajax.js b/web/core/modules/system/tests/modules/ajax_test/js/insert-ajax.js
index 2c3db6a61..7e2a2dc32 100644
--- a/web/core/modules/system/tests/modules/ajax_test/js/insert-ajax.js
+++ b/web/core/modules/system/tests/modules/ajax_test/js/insert-ajax.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, window, Drupal) {
   Drupal.behaviors.insertTest = {
     attach: function attach(context) {
diff --git a/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php b/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
index d02d26a49..efa9f6a91 100644
--- a/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
+++ b/web/core/modules/system/tests/modules/ajax_test/src/Controller/AjaxTestController.php
@@ -354,4 +354,37 @@ protected function getRenderTypes() {
     return $render_info;
   }
 
+  /**
+   * Returns a page from which to test Ajax global events.
+   *
+   * @return array
+   *   The render array.
+   */
+  public function globalEvents() {
+    return [
+      '#attached' => [
+        'library' => [
+          'ajax_test/global_events',
+        ],
+      ],
+      '#markup' => implode('', [
+        '<div id="test_global_events_log"></div>',
+        '<a id="test_global_events_drupal_ajax_link" class="use-ajax" href="' . Url::fromRoute('ajax_test.global_events_clear_log')->toString() . '">Drupal Ajax</a>',
+        '<div id="test_global_events_log2"></div>',
+      ]),
+    ];
+  }
+
+  /**
+   * Returns an AjaxResponse with command to clear the 'test_global_events_log'.
+   *
+   * @return \Drupal\Core\Ajax\AjaxResponse
+   *   The JSON response object.
+   */
+  public function globalEventsClearLog() {
+    $response = new AjaxResponse();
+    $response->addCommand(new HtmlCommand('#test_global_events_log', ''));
+    return $response;
+  }
+
 }
diff --git a/web/core/modules/system/tests/modules/common_test/common_test.libraries.yml b/web/core/modules/system/tests/modules/common_test/common_test.libraries.yml
index 9406493b4..eb45eac81 100644
--- a/web/core/modules/system/tests/modules/common_test/common_test.libraries.yml
+++ b/web/core/modules/system/tests/modules/common_test/common_test.libraries.yml
@@ -1,12 +1,7 @@
-jquery.farbtastic:
+loadjs:
   version: 0.1
   js:
-    assets/vendor/farbtastic/farbtastic.js: {}
-  css:
-    component:
-      assets/vendor/farbtastic/farbtastic.css: {}
-  dependencies:
-    - core/jquery
+    assets/vendor/loadjs/loadjs.min.js: { }
 
 # Library to test CSS and JS file assets.
 files:
diff --git a/web/core/modules/system/tests/modules/common_test/common_test.module b/web/core/modules/system/tests/modules/common_test/common_test.module
index 3f25250ab..94702a814 100644
--- a/web/core/modules/system/tests/modules/common_test/common_test.module
+++ b/web/core/modules/system/tests/modules/common_test/common_test.module
@@ -52,7 +52,7 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
  * Same as common_test_drupal_alter_alter(), but here, we verify that themes
  * can also alter and come last.
  */
-function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
+function olivero_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
   // Alter first argument.
   if (is_array($data)) {
     $data['foo'] .= ' theme';
@@ -170,15 +170,15 @@ function common_test_library_info_build() {
  * Implements hook_library_info_alter().
  */
 function common_test_library_info_alter(&$libraries, $module) {
-  if ($module == 'core' && isset($libraries['jquery.farbtastic'])) {
-    // Change the version of Farbtastic to 0.0.
-    $libraries['jquery.farbtastic']['version'] = '0.0';
-    // Make Farbtastic depend on jQuery Form to test library dependencies.
-    $libraries['jquery.farbtastic']['dependencies'][] = 'core/internal.jquery.form';
+  if ($module === 'core' && isset($libraries['loadjs'])) {
+    // Change the version of loadjs to 0.0.
+    $libraries['loadjs']['version'] = '0.0';
+    // Make loadjs depend on jQuery Form to test library dependencies.
+    $libraries['loadjs']['dependencies'][] = 'core/internal.jquery.form';
   }
 
   // Alter the dynamically registered library definition.
-  if ($module == 'common_test' && isset($libraries['dynamic_library'])) {
+  if ($module === 'common_test' && isset($libraries['dynamic_library'])) {
     $libraries['dynamic_library']['dependencies'] = [
       'core/jquery',
     ];
@@ -217,6 +217,12 @@ function common_test_page_attachments(array &$page) {
       '#markup' => 'test',
     ];
   }
+
+  if (\Drupal::state()->get('common_test.hook_page_attachments.early_rendering', FALSE)) {
+    // Do some early rendering.
+    $element = ['#markup' => '123'];
+    \Drupal::service('renderer')->render($element);
+  }
 }
 
 /**
diff --git a/web/core/modules/system/tests/modules/common_test/common_test.routing.yml b/web/core/modules/system/tests/modules/common_test/common_test.routing.yml
index 8062d063e..f62c58de2 100644
--- a/web/core/modules/system/tests/modules/common_test/common_test.routing.yml
+++ b/web/core/modules/system/tests/modules/common_test/common_test.routing.yml
@@ -20,3 +20,11 @@ common_test.js_and_css_querystring:
     _controller: '\Drupal\common_test\Controller\CommonTestController::jsAndCssQuerystring'
   requirements:
     _access: 'TRUE'
+
+common_test.page_attachments:
+  path: '/common/attachments-test'
+  defaults:
+    _title: 'Attachments test'
+    _controller: '\Drupal\common_test\Controller\CommonTestController::attachments'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php b/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
index 1fbba00a1..57977d2a1 100644
--- a/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
+++ b/web/core/modules/system/tests/modules/common_test/src/Controller/CommonTestController.php
@@ -92,4 +92,19 @@ public function destination() {
     return new Response($output);
   }
 
+  /**
+   * Returns a response with early rendering in common_test_page_attachments.
+   *
+   * @return \Symfony\Component\HttpFoundation\Response
+   *   A new Response object.
+   */
+  public function attachments() {
+    \Drupal::state()->set('common_test.hook_page_attachments.early_rendering', TRUE);
+    $build = [
+      '#title' => 'A title',
+      'content' => ['#markup' => 'Some content'],
+    ];
+    return \Drupal::service('main_content_renderer.html')->renderResponse($build, \Drupal::requestStack()->getCurrentRequest(), \Drupal::routeMatch());
+  }
+
 }
diff --git a/web/core/modules/system/tests/modules/condition_test/src/FormController.php b/web/core/modules/system/tests/modules/condition_test/src/FormController.php
index 04e3eff9a..076646f48 100644
--- a/web/core/modules/system/tests/modules/condition_test/src/FormController.php
+++ b/web/core/modules/system/tests/modules/condition_test/src/FormController.php
@@ -5,12 +5,15 @@
 use Drupal\Core\Form\FormInterface;
 use Drupal\Core\Condition\ConditionManager;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Form\SubformState;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\node\Entity\Node;
 
 /**
  * Routing controller class for condition_test testing of condition forms.
  */
 class FormController implements FormInterface {
+  use StringTranslationTrait;
 
   /**
    * The condition plugin we will be working with.
@@ -19,6 +22,13 @@ class FormController implements FormInterface {
    */
   protected $condition;
 
+  /**
+   * The condition plugin current_theme.
+   *
+   * @var \Drupal\Core\Condition\ConditionInterface
+   */
+  protected $condition_current_theme;
+
   /**
    * {@inheritdoc}
    */
@@ -32,16 +42,25 @@ public function getFormId() {
   public function __construct() {
     $manager = new ConditionManager(\Drupal::service('container.namespaces'), \Drupal::cache('discovery'), \Drupal::moduleHandler());
     $this->condition = $manager->createInstance('entity_bundle:node');
+    $this->condition_current_theme = $manager->createInstance('current_theme');
   }
 
   /**
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $form = $this->condition->buildConfigurationForm($form, $form_state);
+    $form['#tree'] = TRUE;
+    $form['entity_bundle'] = [];
+    $subformState = SubformState::createForSubform($form['entity_bundle'], $form, $form_state);
+    $form['entity_bundle'] = $this->condition->buildConfigurationForm($form['entity_bundle'], $subformState);
+
+    $form['current_theme'] = [];
+    $subformState = SubformState::createForSubform($form['current_theme'], $form, $form_state);
+    $form['current_theme'] = $this->condition_current_theme->buildConfigurationForm($form['current_theme'], $subformState);
+
     $form['actions']['submit'] = [
       '#type' => 'submit',
-      '#value' => t('Submit'),
+      '#value' => $this->t('Submit'),
     ];
     return $form;
   }
@@ -50,14 +69,19 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    * Implements \Drupal\Core\Form\FormInterface::validateForm().
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
-    $this->condition->validateConfigurationForm($form, $form_state);
+    $subformState = SubformState::createForSubform($form['entity_bundle'], $form, $form_state);
+    $this->condition->validateConfigurationForm($form['entity_bundle'], $subformState);
   }
 
   /**
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->condition->submitConfigurationForm($form, $form_state);
+    $subformState = SubformState::createForSubform($form['entity_bundle'], $form, $form_state);
+    $this->condition->submitConfigurationForm($form['entity_bundle'], $subformState);
+    $subformState = SubformState::createForSubform($form['current_theme'], $form, $form_state);
+
+    $this->condition_current_theme->submitConfigurationForm($form['current_theme'], $subformState);
     $config = $this->condition->getConfig();
     foreach ($config['bundles'] as $bundle) {
       \Drupal::messenger()->addStatus('Bundle: ' . $bundle);
@@ -66,7 +90,10 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $article = Node::load(1);
     $this->condition->setContextValue('node', $article);
     if ($this->condition->execute()) {
-      \Drupal::messenger()->addStatus(t('Executed successfully.'));
+      \Drupal::messenger()->addStatus($this->t('Executed successfully.'));
+    }
+    if ($this->condition_current_theme->execute()) {
+      \Drupal::messenger()->addStatus($this->condition_current_theme->summary());
     }
   }
 
diff --git a/web/core/modules/system/tests/modules/css_disable_transitions_test/js/disable_transitions.theme.js b/web/core/modules/system/tests/modules/css_disable_transitions_test/js/disable_transitions.theme.js
index d8040df5b..7aae231d7 100644
--- a/web/core/modules/system/tests/modules/css_disable_transitions_test/js/disable_transitions.theme.js
+++ b/web/core/modules/system/tests/modules/css_disable_transitions_test/js/disable_transitions.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 if (window.jQuery) {
   jQuery.fx.off = true;
 }
\ No newline at end of file
diff --git a/web/core/modules/system/tests/modules/database_test/database_test.install b/web/core/modules/system/tests/modules/database_test/database_test.install
index 855a51803..a388f3fe6 100644
--- a/web/core/modules/system/tests/modules/database_test/database_test.install
+++ b/web/core/modules/system/tests/modules/database_test/database_test.install
@@ -170,7 +170,7 @@ function database_test_schema() {
       ],
     ],
     'primary key' => ['id'],
-    ];
+  ];
 
   $schema['test_two_blobs'] = [
     'description' => 'A simple test table with two BLOB fields.',
@@ -190,7 +190,7 @@ function database_test_schema() {
       ],
     ],
     'primary key' => ['id'],
-    ];
+  ];
 
   $schema['test_task'] = [
     'description' => 'A task list for people in the test table.',
diff --git a/web/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.services.yml b/web/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.services.yml
index 4be467310..332a261c5 100644
--- a/web/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.services.yml
+++ b/web/core/modules/system/tests/modules/dialog_renderer_test/dialog_renderer_test.services.yml
@@ -1,6 +1,6 @@
 services:
-# Provide 2 main content renderer services that use the same class but
-# behave differently depending on the 2nd argument.
+  # Provide 2 main content renderer services that use the same class but behave
+  # differently depending on the 2nd argument.
   main_content_renderer.wide_modal:
     class: Drupal\dialog_renderer_test\Render\MainContent\WideModalRenderer
     arguments: ['@title_resolver', '@renderer', 'wide']
diff --git a/web/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php b/web/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php
index 4280cd416..cd2b0f458 100644
--- a/web/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php
+++ b/web/core/modules/system/tests/modules/display_variant_test/src/Plugin/DisplayVariant/TestDisplayVariant.php
@@ -67,6 +67,7 @@ public function setContexts(array $contexts) {
    * {@inheritdoc}
    */
   public function setMainContent(array $main_content) {
+    assert(!empty($this->getConfiguration()['required_configuration']), 'Ensure that ::setMainContent() is called with the variant configuration');
     $this->mainContent = $main_content;
     return $this;
   }
@@ -75,6 +76,7 @@ public function setMainContent(array $main_content) {
    * {@inheritdoc}
    */
   public function setTitle($title) {
+    assert(!empty($this->getConfiguration()['required_configuration']), 'Ensure that ::setTitle() is called with the variant configuration');
     $this->title = $title;
     return $this;
   }
diff --git a/web/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php b/web/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php
index 00f3ef984..40b9bc823 100644
--- a/web/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php
+++ b/web/core/modules/system/tests/modules/early_rendering_controller_test/src/EarlyRenderingTestController.php
@@ -60,10 +60,11 @@ protected function earlyRenderContent() {
 
   public function renderArray() {
     return [
-      '#pre_render' => [function () {
-        $elements = $this->earlyRenderContent();
-        return $elements;
-      },
+      '#pre_render' => [
+        function () {
+          $elements = $this->earlyRenderContent();
+          return $elements;
+        },
       ],
     ];
   }
diff --git a/web/core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml b/web/core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml
index 9222b57c3..88ae649dd 100644
--- a/web/core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml
+++ b/web/core/modules/system/tests/modules/entity_reference_test_views/entity_reference_test_views.info.yml
@@ -4,4 +4,4 @@ description: 'Provides default views for views entity reference tests.'
 package: Testing
 version: VERSION
 dependencies:
- - drupal:views
+  - drupal:views
diff --git a/web/core/modules/system/tests/modules/entity_test/entity_test.module b/web/core/modules/system/tests/modules/entity_test/entity_test.module
index 68b33b2ff..5644ef696 100644
--- a/web/core/modules/system/tests/modules/entity_test/entity_test.module
+++ b/web/core/modules/system/tests/modules/entity_test/entity_test.module
@@ -693,14 +693,18 @@ function entity_test_entity_prepare_view($entity_type, array $entities, array $d
     foreach ($entities as $entity) {
       /** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
 
-      // Add a dummy field item attribute on field_test_text if it exists.
+      // Add field item attributes on field_test_text if it exists.
+      // See \Drupal\Tests\system\Functional\Entity\EntityViewControllerTest::testFieldItemAttributes().
       if ($entity->hasField('field_test_text') && $displays[$entity->bundle()]->getComponent('field_test_text')) {
         foreach ($entity->get('field_test_text') as $item) {
-          $item->_attributes += ['data-field-item-attr' => 'foobar'];
+          $item->_attributes += [
+            'data-field-item-attr' => 'foobar',
+            'property' => 'schema:text',
+          ];
         }
       }
 
-      // Add a dummy field item attribute on daterange fields if they exist.
+      // Add an item attribute on daterange fields if they exist.
       $fields = $entity->getFieldDefinitions();
       foreach ($fields as $field) {
         if ($field->getType() === 'daterange') {
@@ -773,6 +777,12 @@ function entity_test_entity_create_access(AccountInterface $account, $context, $
   \Drupal::state()->set('entity_test_entity_create_access', TRUE);
   \Drupal::state()->set('entity_test_entity_create_access_context', $context);
 
+  if ($entity_bundle === 'forbidden_access_bundle') {
+    // We need to cover a case in which a bundle is specifically forbidden
+    // from creation (as opposed to neutral access).
+    return AccessResult::forbidden();
+  }
+
   // No opinion.
   return AccessResult::neutral();
 }
diff --git a/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php b/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
index 4e7b4dc2a..7aab7849b 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/EntityTestAccessControlHandler.php
@@ -55,6 +55,9 @@ protected function checkAccess(EntityInterface $entity, $operation, AccountInter
           return AccessResult::allowedIfHasPermission($account, 'view test entity translations');
         }
       }
+      if ($entity instanceof EntityPublishedInterface && !$entity->isPublished()) {
+        return AccessResult::neutral('Unpublished entity');
+      }
       return AccessResult::allowedIfHasPermission($account, 'view test entity');
     }
     elseif (in_array($operation, ['update', 'delete'])) {
diff --git a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
index da2dc4624..1549978b4 100644
--- a/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
+++ b/web/core/modules/system/tests/modules/entity_test/src/Plugin/Field/FieldType/FieldTestItem.php
@@ -32,8 +32,6 @@ class FieldTestItem extends FieldItemBase {
    * {@inheritdoc}
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
-    // This is called very early by the user entity roles field. Prevent
-    // early t() calls by using the TranslatableMarkup.
     $properties['value'] = DataDefinition::create('string')
       ->setLabel(new TranslatableMarkup('Test value'))
       ->setRequired(TRUE);
diff --git a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
index af57bb04d..1c4911082 100644
--- a/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
+++ b/web/core/modules/system/tests/modules/entity_test/tests/src/Functional/Rest/EntityTestResourceTestBase.php
@@ -76,15 +76,15 @@ protected function createEntity() {
     $entity_test = \Drupal::entityTypeManager()
       ->getStorage(static::$entityTypeId)
       ->create([
-      'name' => 'Llama',
-      'type' => static::$entityTypeId,
-      // Set a value for the internal field to confirm that it will not be
-      // returned in normalization.
-      // @see entity_test_entity_base_field_info().
-      'internal_string_field' => [
-        'value' => 'This value shall not be internal!',
-      ],
-    ]);
+        'name' => 'Llama',
+        'type' => static::$entityTypeId,
+        // Set a value for the internal field to confirm that it will not be
+        // returned in normalization.
+        // @see entity_test_entity_base_field_info().
+        'internal_string_field' => [
+          'value' => 'This value shall not be internal!',
+        ],
+      ]);
     $entity_test->setOwnerId(0);
     $entity_test->save();
 
diff --git a/web/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php b/web/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php
index 4946417a4..a6f4f4128 100644
--- a/web/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php
+++ b/web/core/modules/system/tests/modules/error_service_test/src/Controller/LonelyMonkeyController.php
@@ -12,6 +12,11 @@
  */
 class LonelyMonkeyController extends ControllerBase implements ContainerInjectionInterface {
 
+  /**
+   * The lonely monkey class.
+   */
+  protected $class;
+
   public function __construct(LonelyMonkeyClass $class) {
     $this->class = $class;
   }
diff --git a/web/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php b/web/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php
index bbe1d6a19..b881f6cde 100644
--- a/web/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php
+++ b/web/core/modules/system/tests/modules/error_service_test/src/LonelyMonkeyClass.php
@@ -9,6 +9,11 @@
  */
 class LonelyMonkeyClass {
 
+  /**
+   * The database connection.
+   */
+  protected $connection;
+
   public function __construct(Connection $connection) {
     $this->connection = $connection;
   }
diff --git a/web/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php b/web/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
index 304d8ed93..8ce223a46 100644
--- a/web/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
+++ b/web/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php
@@ -21,6 +21,11 @@ class MonkeysInTheControlRoom implements HttpKernelInterface {
    */
   protected $app;
 
+  /**
+   * The settings.
+   */
+  protected $settings;
+
   /**
    * MonkeysInTheControlRoom constructor.
    *
diff --git a/web/core/modules/system/tests/modules/form_test/form_test.routing.yml b/web/core/modules/system/tests/modules/form_test/form_test.routing.yml
index 1f1379dd4..a39d924d9 100644
--- a/web/core/modules/system/tests/modules/form_test/form_test.routing.yml
+++ b/web/core/modules/system/tests/modules/form_test/form_test.routing.yml
@@ -164,6 +164,14 @@ form_test.tableselect_js:
   requirements:
     _access: 'TRUE'
 
+form_test.tableselect_disabled_rows:
+  path: '/form_test/tableselect/disabled-rows/{test_action}'
+  defaults:
+    _form: '\Drupal\form_test\Form\FormTestTableSelectDisabledRowsForm'
+    _title: 'Tableselect disabled rows tests'
+  requirements:
+    _access: 'TRUE'
+
 form_test.vertical_tabs:
   path: '/form_test/vertical-tabs'
   defaults:
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php
index 7a29d7d7e..3e47c908c 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/FormTestGroupVerticalTabsForm.php
@@ -44,9 +44,22 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#type' => 'textfield',
       '#title' => 'Second nested element in details element',
     ];
+    $form['submit'] = [
+      '#type' => 'submit',
+      '#value' => 'Save',
+    ];
     return $form;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function validateForm(array &$form, FormStateInterface $form_state) {
+    if ($form_state->getValue('element_2') === 'bad') {
+      $form_state->setErrorByName('element_2', $this->t('there was an error'));
+    }
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/system/tests/modules/form_test/src/Form/JavascriptStatesForm.php b/web/core/modules/system/tests/modules/form_test/src/Form/JavascriptStatesForm.php
index 4d589d349..408dfc103 100644
--- a/web/core/modules/system/tests/modules/form_test/src/Form/JavascriptStatesForm.php
+++ b/web/core/modules/system/tests/modules/form_test/src/Form/JavascriptStatesForm.php
@@ -31,6 +31,52 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#type' => 'textfield',
       '#title' => 'Textfield trigger',
     ];
+    $form['radios_opposite1'] = [
+      '#type' => 'radios',
+      '#title' => 'Radios opposite 1',
+      '#options' => [
+        0 => 'zero',
+        1 => 'one',
+      ],
+      '#default_value' => 0,
+      0 => [
+        '#states' => [
+          'checked' => [
+            ':input[name="radios_opposite2"]' => ['value' => 1],
+          ],
+        ],
+      ],
+      1 => [
+        '#states' => [
+          'checked' => [
+            ':input[name="radios_opposite2"]' => ['value' => 0],
+          ],
+        ],
+      ],
+    ];
+    $form['radios_opposite2'] = [
+      '#type' => 'radios',
+      '#title' => 'Radios opposite 2',
+      '#options' => [
+        0 => 'zero',
+        1 => 'one',
+      ],
+      '#default_value' => 1,
+      0 => [
+        '#states' => [
+          'checked' => [
+            ':input[name="radios_opposite1"]' => ['value' => 1],
+          ],
+        ],
+      ],
+      1 => [
+        '#states' => [
+          'checked' => [
+            ':input[name="radios_opposite1"]' => ['value' => 0],
+          ],
+        ],
+      ],
+    ];
     $form['radios_trigger'] = [
       '#type' => 'radios',
       '#title' => 'Radios trigger',
@@ -60,6 +106,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#empty_value' => '_none',
       '#empty_option' => '- None -',
     ];
+    $form['number_trigger'] = [
+      '#type' => 'number',
+      '#title' => 'Number trigger',
+    ];
 
     // Tested fields.
     // Checkbox trigger.
@@ -130,6 +180,123 @@ public function buildForm(array $form, FormStateInterface $form_state) {
         ],
       ],
     ];
+    $form['checkboxes_all_checked_when_checkbox_trigger_checked'] = [
+      '#type' => 'checkboxes',
+      '#title' => 'Checkboxes: all checked when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+        'value3' => 'Value 3',
+      ],
+      '#states' => [
+        'checked' => [
+          ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $form['checkboxes_some_checked_when_checkbox_trigger_checked'] = [
+      '#type' => 'checkboxes',
+      '#title' => 'Checkboxes: some checked when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+        'value3' => 'Value 3',
+      ],
+      'value1' => [
+        '#states' => [
+          'checked' => [
+            ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+      'value3' => [
+        '#states' => [
+          'checked' => [
+            ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+    ];
+    $form['checkboxes_all_disabled_when_checkbox_trigger_checked'] = [
+      '#type' => 'checkboxes',
+      '#title' => 'Checkboxes: all disabled when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+        'value3' => 'Value 3',
+      ],
+      '#states' => [
+        'disabled' => [
+          ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $form['checkboxes_some_disabled_when_checkbox_trigger_checked'] = [
+      '#type' => 'checkboxes',
+      '#title' => 'Checkboxes: some disabled when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+        'value3' => 'Value 3',
+      ],
+      'value1' => [
+        '#states' => [
+          'disabled' => [
+            ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+      'value3' => [
+        '#states' => [
+          'disabled' => [
+            ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+    ];
+    $form['radios_checked_when_checkbox_trigger_checked'] = [
+      '#type' => 'radios',
+      '#title' => 'Radios checked when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+      ],
+      'value1' => [
+        '#states' => [
+          'checked' => [
+            ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+    ];
+    $form['radios_all_disabled_when_checkbox_trigger_checked'] = [
+      '#type' => 'radios',
+      '#title' => 'Radios: all disabled when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+      ],
+      '#states' => [
+        'disabled' => [
+          ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+        ],
+      ],
+    ];
+    $form['radios_some_disabled_when_checkbox_trigger_checked'] = [
+      '#type' => 'radios',
+      '#title' => 'Radios: some disabled when checkbox trigger checked',
+      '#options' => [
+        'value1' => 'Value 1',
+        'value2' => 'Value 2',
+      ],
+      'value1' => [
+        '#states' => [
+          'disabled' => [
+            ':input[name="checkbox_trigger"]' => ['checked' => TRUE],
+          ],
+        ],
+      ],
+    ];
 
     // Checkboxes trigger.
     $form['textfield_visible_when_checkboxes_trigger_value2_checked'] = [
@@ -328,6 +495,17 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       ],
     ];
 
+    // Number triggers.
+    $form['item_visible_when_number_trigger_filled_by_spinner'] = [
+      '#type' => 'item',
+      '#title' => 'Item visible when number trigger filled by spinner widget',
+      '#states' => [
+        'visible' => [
+          ':input[name="number_trigger"]' => ['filled' => TRUE],
+        ],
+      ],
+    ];
+
     $form['select'] = [
       '#type' => 'select',
       '#title' => 'select 1',
diff --git a/web/core/modules/system/tests/modules/image_lazy_load_test/src/Controller/ImageLazyLoadController.php b/web/core/modules/system/tests/modules/image_lazy_load_test/src/Controller/ImageLazyLoadController.php
index 39a3f2cb6..3877ad1c8 100644
--- a/web/core/modules/system/tests/modules/image_lazy_load_test/src/Controller/ImageLazyLoadController.php
+++ b/web/core/modules/system/tests/modules/image_lazy_load_test/src/Controller/ImageLazyLoadController.php
@@ -18,7 +18,7 @@ class ImageLazyLoadController extends ControllerBase {
   public function renderImage() {
     $images['with-dimensions'] = [
       '#theme' => 'image',
-      '#uri' => '/core/themes/bartik/logo.svg',
+      '#uri' => '/core/themes/olivero/logo.svg',
       '#alt' => 'Image lazy load testing image',
       '#prefix' => '<div id="with-dimensions">',
       '#suffix' => '</div>',
@@ -28,7 +28,7 @@ public function renderImage() {
 
     $images['without-dimensions'] = [
       '#theme' => 'image',
-      '#uri' => '/core/themes/bartik/logo.svg',
+      '#uri' => '/core/themes/olivero/logo.svg',
       '#alt' => 'Image lazy load testing image without dimensions',
       '#prefix' => '<div id="without-dimensions">',
       '#suffix' => '</div>',
@@ -36,7 +36,7 @@ public function renderImage() {
 
     $images['override-loading-attribute'] = [
       '#theme' => 'image',
-      '#uri' => '/core/themes/bartik/logo.svg',
+      '#uri' => '/core/themes/olivero/logo.svg',
       '#alt' => 'Image lazy load test loading attribute can be overridden',
       '#prefix' => '<div id="override-loading-attribute">',
       '#suffix' => '</div>',
diff --git a/web/core/modules/system/tests/modules/jquery_keyevent_polyfilll_test/js/jquery.keyevent.polyfill.js b/web/core/modules/system/tests/modules/jquery_keyevent_polyfilll_test/js/jquery.keyevent.polyfill.js
index 94b411605..110678569 100644
--- a/web/core/modules/system/tests/modules/jquery_keyevent_polyfilll_test/js/jquery.keyevent.polyfill.js
+++ b/web/core/modules/system/tests/modules/jquery_keyevent_polyfilll_test/js/jquery.keyevent.polyfill.js
@@ -4,33 +4,26 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($) {
   jQuery.event.addProp('which', function (event) {
     var keyEventRegex = /^key/;
     var mouseEventRegex = /^(?:mouse|pointer|contextmenu|drag|drop)|click/;
     var button = event.button;
-
     if (event.which == null && keyEventRegex.test(event.type)) {
       return event.charCode != null ? event.charCode : event.keyCode;
     }
-
     if (!event.which && button !== undefined && mouseEventRegex.test(event.type)) {
       if (button && 1) {
         return 1;
       }
-
       if (button && 2) {
         return 3;
       }
-
       if (button && 4) {
         return 2;
       }
-
       return 0;
     }
-
     return event.which;
   });
 })(jQuery);
\ No newline at end of file
diff --git a/web/core/modules/system/tests/modules/js_ajax_test/js/js_ajax_test.ajax.js b/web/core/modules/system/tests/modules/js_ajax_test/js/js_ajax_test.ajax.js
index 4d71a2f38..edea0ceec 100644
--- a/web/core/modules/system/tests/modules/js_ajax_test/js/js_ajax_test.ajax.js
+++ b/web/core/modules/system/tests/modules/js_ajax_test/js/js_ajax_test.ajax.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.AjaxCommands.prototype.jsAjaxTestCommand = function (ajax, response) {
     var $domElement = $(response.selector);
diff --git a/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js b/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js
index 2a7a3fd19..7203717a3 100644
--- a/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js
+++ b/web/core/modules/system/tests/modules/js_cookie_test/js/js_cookie_shim_test.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_ref, $) {
   var behaviors = _ref.behaviors;
   behaviors.jqueryCookie = {
diff --git a/web/core/modules/system/tests/modules/js_deprecation_test/js/js_deprecation_test.js b/web/core/modules/system/tests/modules/js_deprecation_test/js/js_deprecation_test.js
index 48ccbad18..e6c6299c8 100644
--- a/web/core/modules/system/tests/modules/js_deprecation_test/js/js_deprecation_test.js
+++ b/web/core/modules/system/tests/modules/js_deprecation_test/js/js_deprecation_test.js
@@ -4,18 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_ref) {
   var deprecationError = _ref.deprecationError,
-      deprecatedProperty = _ref.deprecatedProperty,
-      behaviors = _ref.behaviors;
-
+    deprecatedProperty = _ref.deprecatedProperty,
+    behaviors = _ref.behaviors;
   var deprecatedFunction = function deprecatedFunction() {
     deprecationError({
       message: 'This function is deprecated for testing purposes.'
     });
   };
-
   var objectWithDeprecatedProperty = deprecatedProperty({
     target: {
       deprecatedProperty: 'Kitten'
diff --git a/web/core/modules/system/tests/modules/js_errors_test/js/js_errors_test.js b/web/core/modules/system/tests/modules/js_errors_test/js/js_errors_test.js
index a3357d06f..13b8a5ee4 100644
--- a/web/core/modules/system/tests/modules/js_errors_test/js/js_errors_test.js
+++ b/web/core/modules/system/tests/modules/js_errors_test/js/js_errors_test.js
@@ -4,10 +4,9 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_ref) {
   var throwError = _ref.throwError,
-      behaviors = _ref.behaviors;
+    behaviors = _ref.behaviors;
   behaviors.testErrors = {
     attach: function attach() {
       throwError(new Error('A manually thrown error.'));
diff --git a/web/core/modules/system/tests/modules/js_interaction_test/js/js_interaction_test.trigger_link.js b/web/core/modules/system/tests/modules/js_interaction_test/js/js_interaction_test.trigger_link.js
index c6b1618bb..d0494d916 100644
--- a/web/core/modules/system/tests/modules/js_interaction_test/js/js_interaction_test.trigger_link.js
+++ b/web/core/modules/system/tests/modules/js_interaction_test/js/js_interaction_test.trigger_link.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_ref) {
   var behaviors = _ref.behaviors;
   behaviors.js_interaction_test_trigger_link = {
diff --git a/web/core/modules/system/tests/modules/js_interaction_test/src/Controller/JSInteractionTestForm.php b/web/core/modules/system/tests/modules/js_interaction_test/src/Controller/JSInteractionTestForm.php
index 1439ec16b..026b341d4 100644
--- a/web/core/modules/system/tests/modules/js_interaction_test/src/Controller/JSInteractionTestForm.php
+++ b/web/core/modules/system/tests/modules/js_interaction_test/src/Controller/JSInteractionTestForm.php
@@ -12,7 +12,7 @@
 class JSInteractionTestForm extends FormBase {
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function getFormId() {
     return __CLASS__;
diff --git a/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js b/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js
index e4f2ce8a0..2fdafa318 100644
--- a/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js
+++ b/web/core/modules/system/tests/modules/js_message_test/js/js_message_test.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, _ref, _ref2) {
   var behaviors = _ref.behaviors;
   var testMessages = _ref2.testMessages;
@@ -34,7 +33,6 @@
         var area = $target.closest('[data-drupal-messages-area]').attr('data-drupal-messages-area') || 'default';
         var message = messageObjects[area].zone;
         var action = $target.attr('data-action');
-
         if (action === 'add') {
           messageObjects[area].indexes[type].push(message.add("This is a message of the type, ".concat(type, ". You be the judge of its importance."), {
             type: type
diff --git a/web/core/modules/system/tests/modules/js_testing_log_test/js/js_testing_log.js b/web/core/modules/system/tests/modules/js_testing_log_test/js/js_testing_log.js
index 2a5348723..a2734e2a7 100644
--- a/web/core/modules/system/tests/modules/js_testing_log_test/js/js_testing_log.js
+++ b/web/core/modules/system/tests/modules/js_testing_log_test/js/js_testing_log.js
@@ -4,20 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   if (typeof console !== 'undefined' && console.warn) {
     var originalWarnFunction = console.warn;
-
     console.warn = function (warning) {
       var warnings = JSON.parse(sessionStorage.getItem('js_testing_log_test.warnings') || JSON.stringify([]));
       warnings.push(warning);
       sessionStorage.setItem('js_testing_log_test.warnings', JSON.stringify(warnings));
       originalWarnFunction(warning);
     };
-
     var originalThrowFunction = Drupal.throwError;
-
     Drupal.throwError = function (error) {
       var errors = JSON.parse(sessionStorage.getItem('js_testing_log_test.errors') || JSON.stringify([]));
       errors.push(error.stack);
diff --git a/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.no_element_after_wait.js b/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.no_element_after_wait.js
index 8237f7a38..ed7924ba3 100644
--- a/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.no_element_after_wait.js
+++ b/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.no_element_after_wait.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.js_webassert_test_wait_for_ajax_request = {
     attach: function attach() {
diff --git a/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_ajax_request.js b/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_ajax_request.js
index 7e65949bc..64cd61db9 100644
--- a/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_ajax_request.js
+++ b/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_ajax_request.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, drupalSettings) {
   Drupal.behaviors.js_webassert_test_wait_for_ajax_request = {
     attach: function attach(context) {
       var waitAjaxInput = document.querySelector('input[name="test_assert_wait_on_ajax_input"]');
-
       if (waitAjaxInput) {
         waitAjaxInput.value = 'js_webassert_test';
       }
diff --git a/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_element.js b/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_element.js
index 4ab7ba4e7..327c7f9bb 100644
--- a/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_element.js
+++ b/web/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_element.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.js_webassert_test_wait_for_element = {
     attach: function attach(context) {
diff --git a/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig
index 2207e3c71..ab03efabc 100644
--- a/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig
+++ b/web/core/modules/system/tests/modules/layout_test/templates/layout-test-1col.html.twig
@@ -5,6 +5,9 @@
  */
 #}
 <div{{ attributes.addClass('layout-example-1col', 'clearfix') }}>
+  {% if in_preview %}
+    This is a preview, indeed
+  {% endif %}
   <div {{ region_attributes.top.addClass('region-top') }}>
     {{ content.top }}
   </div>
diff --git a/web/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml b/web/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml
index 284959243..2b633b910 100644
--- a/web/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml
+++ b/web/core/modules/system/tests/modules/menu_test/menu_test.links.contextual.yml
@@ -3,6 +3,7 @@ menu_test.contextual_hidden_manage:
   group: menu_test_menu
   route_name: menu_test.contextual_hidden_manage
   class: '\Drupal\menu_test\Plugin\Menu\ContextualLink\TestContextualLink'
+  weight: 2
 
 menu_test.contextual_hidden_manage_edit:
   title: 'Edit menu - contextual'
@@ -13,8 +14,10 @@ menu_test.contextual_hidden_manage_edit:
       class: ['use-ajax']
       data-dialog-type: 'modal'
       data-is-something: TRUE
+  weight: 1
 
 menu_test.hidden_block_configure:
   title: 'Configure block'
   group: menu_test_block
   route_name: menu_test.hidden_block_configure
+  weight: 0
diff --git a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php
index 822224c1a..60d992311 100644
--- a/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php
+++ b/web/core/modules/system/tests/modules/menu_test/src/Plugin/Derivative/MenuLinkTestWithUnsafeTitle.php
@@ -14,9 +14,9 @@ class MenuLinkTestWithUnsafeTitle extends DeriverBase {
    */
   public function getDerivativeDefinitions($base_plugin_definition) {
     $this->derivatives['unsafe'] = [
-        'title' => '<script>alert("Even more wild animals")</script>',
-        'menu_name' => 'tools',
-      ] + $base_plugin_definition;
+      'title' => '<script>alert("Even more wild animals")</script>',
+      'menu_name' => 'tools',
+    ] + $base_plugin_definition;
 
     return $this->derivatives;
   }
diff --git a/web/core/modules/system/tests/modules/modernizr_deprecation_test/js/access-unsupported-property.js b/web/core/modules/system/tests/modules/modernizr_deprecation_test/js/access-unsupported-property.js
index b16393ed4..257b2bf0a 100644
--- a/web/core/modules/system/tests/modules/modernizr_deprecation_test/js/access-unsupported-property.js
+++ b/web/core/modules/system/tests/modules/modernizr_deprecation_test/js/access-unsupported-property.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once, Modernizr) {
   Drupal.behaviors.unsupportedModernizrProperty = {
     attach: function attach() {
diff --git a/web/core/modules/system/tests/modules/module_install_class_loader_test1/src/EventSubscriber.php b/web/core/modules/system/tests/modules/module_install_class_loader_test1/src/EventSubscriber.php
index ce0ef4981..ecb945acf 100644
--- a/web/core/modules/system/tests/modules/module_install_class_loader_test1/src/EventSubscriber.php
+++ b/web/core/modules/system/tests/modules/module_install_class_loader_test1/src/EventSubscriber.php
@@ -5,8 +5,10 @@
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
- * An event subscriber that does different things depending on whether classes
- * exist.
+ * Defines an event subscriber that conditionally unsets the event list.
+ *
+ * @see Drupal\module_install_class_loader_test2\EventSubscriber
+ * @see Drupal\Tests\system\Functional\Module\ClassLoaderTest::testMultipleModules()
  */
 class EventSubscriber implements EventSubscriberInterface {
 
diff --git a/web/core/modules/system/tests/modules/module_test/module_test.module b/web/core/modules/system/tests/modules/module_test/module_test.module
index d3731e25e..9ae069cb4 100644
--- a/web/core/modules/system/tests/modules/module_test/module_test.module
+++ b/web/core/modules/system/tests/modules/module_test/module_test.module
@@ -51,7 +51,7 @@ function module_test_system_info_alter(&$info, Extension $file, $type) {
       $info['version'] = '8.x-1.0';
     }
   }
-  if ($file->getName() == 'seven' && $type == 'theme') {
+  if ($file->getName() == 'stark' && $type == 'theme') {
     $info['regions']['test_region'] = 'Test region';
   }
 }
diff --git a/web/core/modules/system/tests/modules/module_test/module_test.permissions.yml b/web/core/modules/system/tests/modules/module_test/module_test.permissions.yml
index d5f58692c..c26e65a2d 100644
--- a/web/core/modules/system/tests/modules/module_test/module_test.permissions.yml
+++ b/web/core/modules/system/tests/modules/module_test/module_test.permissions.yml
@@ -1,2 +1,2 @@
 module_test perm:
-   title: 'example perm for module_test module'
+  title: 'example perm for module_test module'
diff --git a/web/core/modules/system/tests/modules/off_canvas_test/js/resize-helper.js b/web/core/modules/system/tests/modules/off_canvas_test/js/resize-helper.js
index ee3677656..b566be702 100644
--- a/web/core/modules/system/tests/modules/off_canvas_test/js/resize-helper.js
+++ b/web/core/modules/system/tests/modules/off_canvas_test/js/resize-helper.js
@@ -4,11 +4,9 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (_ref) {
   var offCanvas = _ref.offCanvas;
   var originalResetSize = offCanvas.resetSize;
-
   offCanvas.resetSize = function (event) {
     originalResetSize(event);
     event.data.$element.attr('data-resize-done', 'true');
diff --git a/web/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml b/web/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml
index a0333f736..15cc3308b 100644
--- a/web/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml
+++ b/web/core/modules/system/tests/modules/olivero_test/config/install/core.entity_form_display.node.article.default.yml
@@ -20,7 +20,7 @@ mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 1
+    weight: 2
     region: content
     settings:
       rows: 9
@@ -42,7 +42,7 @@ content:
     third_party_settings: {  }
   field_image:
     type: image_image
-    weight: 4
+    weight: 1
     region: content
     settings:
       progress_indicator: throbber
diff --git a/web/core/modules/system/tests/modules/olivero_test/js/log-errors.js b/web/core/modules/system/tests/modules/olivero_test/js/log-errors.js
index 28057970e..1c1721ba1 100644
--- a/web/core/modules/system/tests/modules/olivero_test/js/log-errors.js
+++ b/web/core/modules/system/tests/modules/olivero_test/js/log-errors.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 Drupal.errorLog = [];
 window.addEventListener('error', function (e) {
   Drupal.errorLog.push(e);
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
index 766aa7a8d..d53901f6b 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
@@ -8,12 +8,15 @@
 use Drupal\Component\Plugin\Factory\ReflectionFactory;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Context\EntityContextDefinition;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Defines a plugin manager used by Plugin API derivative unit tests.
  */
 class MockBlockManager extends PluginManagerBase {
 
+  use StringTranslationTrait;
+
   public function __construct() {
 
     // Create the object that can be used to return definitions for all the
@@ -38,7 +41,7 @@ public function __construct() {
     // A simple plugin: the user login block.
     $this->discovery->setDefinition('user_login', [
       'id' => 'user_login',
-      'label' => t('User login'),
+      'label' => $this->t('User login'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserLoginBlock',
     ]);
 
@@ -56,7 +59,7 @@ public function __construct() {
     // A plugin defining itself as a derivative.
     $this->discovery->setDefinition('menu:foo', [
       'id' => 'menu',
-      'label' => t('Base label'),
+      'label' => $this->t('Base label'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockMenuBlock',
     ]);
 
@@ -68,7 +71,7 @@ public function __construct() {
     // derivatives are available to the system.
     $this->discovery->setDefinition('layout', [
       'id' => 'layout',
-      'label' => t('Layout'),
+      'label' => $this->t('Layout'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlock',
       'deriver' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockLayoutBlockDeriver',
     ]);
@@ -77,38 +80,38 @@ public function __construct() {
     // user object in order to return the user name from the getTitle() method.
     $this->discovery->setDefinition('user_name', [
       'id' => 'user_name',
-      'label' => t('User name'),
+      'label' => $this->t('User name'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
       'context_definitions' => [
-        'user' => $this->createContextDefinition('entity:user', t('User')),
+        'user' => $this->createContextDefinition('entity:user', $this->t('User')),
       ],
     ]);
 
     // An optional context version of the previous block plugin.
     $this->discovery->setDefinition('user_name_optional', [
       'id' => 'user_name_optional',
-      'label' => t('User name optional'),
+      'label' => $this->t('User name optional'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockUserNameBlock',
       'context_definitions' => [
-        'user' => $this->createContextDefinition('entity:user', t('User'), FALSE),
+        'user' => $this->createContextDefinition('entity:user', $this->t('User'), FALSE),
       ],
     ]);
 
     // A block plugin that requires a typed data string context to function.
     $this->discovery->setDefinition('string_context', [
       'id' => 'string_context',
-      'label' => t('String typed data'),
+      'label' => $this->t('String typed data'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\TypedDataStringBlock',
     ]);
 
     // A complex context plugin that requires both a user and node for context.
     $this->discovery->setDefinition('complex_context', [
       'id' => 'complex_context',
-      'label' => t('Complex context'),
+      'label' => $this->t('Complex context'),
       'class' => 'Drupal\plugin_test\Plugin\plugin_test\mock_block\MockComplexContextBlock',
       'context_definitions' => [
-        'user' => $this->createContextDefinition('entity:user', t('User')),
-        'node' => $this->createContextDefinition('entity:node', t('Node')),
+        'user' => $this->createContextDefinition('entity:user', $this->t('User')),
+        'node' => $this->createContextDefinition('entity:node', $this->t('Node')),
       ],
     ]);
 
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
index 8ea1fc383..c575dd0b5 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockLayoutBlockDeriver.php
@@ -3,6 +3,7 @@
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
 
 use Drupal\Component\Plugin\Derivative\DeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Mock implementation of DeriverInterface for the mock layout block plugin.
@@ -11,6 +12,8 @@
  */
 class MockLayoutBlockDeriver implements DeriverInterface {
 
+  use StringTranslationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -42,7 +45,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
       // customized one, but in a real implementation, this would be fetched
       // from some \Drupal::config() object.
       'foo' => [
-        'label' => t('Layout Foo'),
+        'label' => $this->t('Layout Foo'),
       ] + $base_plugin_definition,
     ];
 
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
index 9195c333a..d8031a7cf 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/MockMenuBlockDeriver.php
@@ -3,6 +3,7 @@
 namespace Drupal\plugin_test\Plugin\plugin_test\mock_block;
 
 use Drupal\Component\Plugin\Derivative\DeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 
 /**
  * Mock implementation of DeriverInterface for the mock menu block plugin.
@@ -11,6 +12,8 @@
  */
 class MockMenuBlockDeriver implements DeriverInterface {
 
+  use StringTranslationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -37,16 +40,16 @@ public function getDerivativeDefinitions($base_plugin_definition) {
     // Drupal's configuration to find out which menus actually exist.
     $derivatives = [
       'main_menu' => [
-        'label' => t('Main menu'),
+        'label' => $this->t('Main menu'),
       ] + $base_plugin_definition,
       'navigation' => [
-        'label' => t('Navigation'),
+        'label' => $this->t('Navigation'),
       ] + $base_plugin_definition,
       'foo' => [
         // Instead of the derivative label, the specific label will be used.
-        'label' => t('Derivative label'),
+        'label' => $this->t('Derivative label'),
         // This setting will be merged in.
-         'setting' => 'default',
+        'setting' => 'default',
       ] + $base_plugin_definition,
     ];
 
diff --git a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php
index 5658cbf42..8ddf23093 100644
--- a/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php
+++ b/web/core/modules/system/tests/modules/plugin_test/src/Plugin/plugin_test/mock_block/TypedDataStringBlock.php
@@ -7,10 +7,10 @@
 use Drupal\Core\Plugin\PluginBase;
 
 /**
- * Implementation of a String TypedData contextual block plugin used by Plugin
- * API context test.
+ * Implements a String TypedData contextual block plugin.
  *
  * @see \Drupal\plugin_test\Plugin\MockBlockManager
+ * @see \Drupal\KernelTests\Core\Plugin\PluginTestBase
  */
 class TypedDataStringBlock extends PluginBase implements ContextAwarePluginInterface {
 
diff --git a/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install b/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
index e8121617a..611d2d49b 100644
--- a/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
+++ b/web/core/modules/system/tests/modules/requirements1_test/requirements1_test.install
@@ -20,5 +20,17 @@ function requirements1_test_requirements($phase) {
     ];
   }
 
+  $requirements['requirements1_test_alterable'] = [
+    'title' => t('Requirements 1 Test Alterable'),
+    'severity' => REQUIREMENT_ERROR,
+    'description' => t('A requirement that will be altered.'),
+  ];
+
+  $requirements['requirements1_test_deletable'] = [
+    'title' => t('Requirements 1 Test Deletable'),
+    'severity' => REQUIREMENT_INFO,
+    'description' => t('A requirement that will be deleted.'),
+  ];
+
   return $requirements;
 }
diff --git a/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php b/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
index 7acc00dfd..41a964230 100644
--- a/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
+++ b/web/core/modules/system/tests/modules/session_test/src/Controller/SessionTestController.php
@@ -89,8 +89,7 @@ public function set($test_value) {
   }
 
   /**
-   * Turns off session saving and then tries to save a value
-   * anyway.
+   * Turns off session saving and then tries to save a value anyway.
    *
    * @param string $test_value
    *   A session value.
diff --git a/web/core/modules/system/tests/modules/tabledrag_test/js/tabledrag_test.js b/web/core/modules/system/tests/modules/tabledrag_test/js/tabledrag_test.js
index 6eb1d1ebc..668c5ee10 100644
--- a/web/core/modules/system/tests/modules/tabledrag_test/js/tabledrag_test.js
+++ b/web/core/modules/system/tests/modules/tabledrag_test/js/tabledrag_test.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.tableDragTest = {
     attach: function attach(context) {
diff --git a/web/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php b/web/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php
index 06cca02af..ce2065358 100644
--- a/web/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php
+++ b/web/core/modules/system/tests/modules/theme_test/src/Theme/HighPriorityThemeNegotiator.php
@@ -21,7 +21,7 @@ public function applies(RouteMatchInterface $route_match) {
    * {@inheritdoc}
    */
   public function determineActiveTheme(RouteMatchInterface $route_match) {
-    return 'classy';
+    return 'starterkit_theme';
   }
 
 }
diff --git a/web/core/modules/system/tests/modules/theme_test/theme_test.module b/web/core/modules/system/tests/modules/theme_test/theme_test.module
index 2e88a4abf..1dafdaba0 100644
--- a/web/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/web/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -5,6 +5,7 @@
  * Test module.
  */
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Extension\Extension;
 
 /**
@@ -172,3 +173,18 @@ function theme_test_theme_suggestions_node(array $variables) {
  */
 function template_preprocess_theme_test_registered_by_module() {
 }
+
+/**
+ * Implements hook_library_info_alter().
+ */
+function theme_test_library_info_alter(array &$libraries, string $extension): void {
+  // Allow test code to simulate library changes in a particular extension by
+  // setting a state key in the form `theme_test_library_info_alter $extension`,
+  // whose values is an array containing everything that should be recursively
+  // merged into the given extension's library definitions.
+  $info = \Drupal::state()->get(__FUNCTION__ . " $extension");
+
+  if (is_array($info)) {
+    $libraries = NestedArray::mergeDeep($libraries, $info);
+  }
+}
diff --git a/web/core/modules/system/tests/modules/token_test/token_test.info.yml b/web/core/modules/system/tests/modules/token_test/token_test.info.yml
index 67a433eae..b966049c5 100644
--- a/web/core/modules/system/tests/modules/token_test/token_test.info.yml
+++ b/web/core/modules/system/tests/modules/token_test/token_test.info.yml
@@ -3,5 +3,5 @@ type: module
 package: Testing
 version: VERSION
 dependencies:
- - drupal:user
- - drupal:node
+  - drupal:user
+  - drupal:node
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php b/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
index 3311b2c3d..1ef74306b 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
+++ b/web/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php
@@ -111,4 +111,11 @@ public function embedTagRender() {
     return ['#theme' => 'twig_theme_test_embed_tag'];
   }
 
+  /**
+   * Renders for testing drupal_dump function.
+   */
+  public function dump() {
+    return ['#theme' => 'twig_theme_test_dump'];
+  }
+
 }
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.attach_library.html.twig b/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.attach_library.html.twig
index 0784ab918..dceaed846 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.attach_library.html.twig
+++ b/web/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.attach_library.html.twig
@@ -1 +1 @@
-{{ attach_library('core/ckeditor') }}
+{{ attach_library('core/ckeditor5') }}
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
index 31a1a4693..e28769678 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
+++ b/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module
@@ -77,6 +77,10 @@ function twig_theme_test_theme($existing, $type, $theme, $path) {
     'variables' => [],
     'template' => 'twig_theme_test.embed_tag',
   ];
+  $items['twig_theme_test_dump'] = [
+    'variables' => [],
+    'template' => 'twig_theme_test.dump',
+  ];
   return $items;
 }
 
diff --git a/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml b/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
index e671d70fb..1ecab44e1 100644
--- a/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
+++ b/web/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.routing.yml
@@ -76,3 +76,10 @@ twig_theme_test_embed_tag:
     _controller: '\Drupal\twig_theme_test\TwigThemeTestController::embedTagRender'
   requirements:
     _access: 'TRUE'
+
+twig_theme_test_dump:
+  path: '/twig-theme-test/dump'
+  defaults:
+    _controller: '\Drupal\twig_theme_test\TwigThemeTestController::dump'
+  requirements:
+    _access: 'TRUE'
diff --git a/web/core/modules/system/tests/modules/update_test_description/update_test_description.install b/web/core/modules/system/tests/modules/update_test_description/update_test_description.install
index 1ed00ccad..bbfe494e3 100644
--- a/web/core/modules/system/tests/modules/update_test_description/update_test_description.install
+++ b/web/core/modules/system/tests/modules/update_test_description/update_test_description.install
@@ -11,9 +11,11 @@
 function update_test_description_update_8001() {
 }
 
+// phpcs:disable Drupal.Commenting.DocComment.ShortSingleLine
 /**
  * Update test with multiline description, the quick brown fox jumped over the
  * lazy dog.
  */
+// phpcs:enable
 function update_test_description_update_8002() {
 }
diff --git a/web/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php b/web/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php
index de95fb576..669037f82 100644
--- a/web/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php
+++ b/web/core/modules/system/tests/src/Functional/Ajax/FrameworkTest.php
@@ -4,10 +4,9 @@
 
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\Ajax\AddCssCommand;
+use Drupal\Core\Ajax\AddJsCommand;
 use Drupal\Core\Ajax\AlertCommand;
-use Drupal\Core\Ajax\AppendCommand;
 use Drupal\Core\Ajax\HtmlCommand;
-use Drupal\Core\Ajax\PrependCommand;
 use Drupal\Core\Ajax\SettingsCommand;
 use Drupal\Core\Asset\AttachedAssets;
 use Drupal\Core\EventSubscriber\MainContentViewSubscriber;
@@ -61,8 +60,8 @@ public function testOrder() {
     [$js_assets_header, $js_assets_footer] = $asset_resolver->getJsAssets($assets, FALSE);
     $js_header_render_array = $js_collection_renderer->render($js_assets_header);
     $js_footer_render_array = $js_collection_renderer->render($js_assets_footer);
-    $expected_commands[2] = new PrependCommand('head', $js_header_render_array);
-    $expected_commands[3] = new AppendCommand('body', $js_footer_render_array);
+    $expected_commands[2] = new AddJsCommand(array_column($js_header_render_array, '#attributes'), 'head');
+    $expected_commands[3] = new AddJsCommand(array_column($js_footer_render_array, '#attributes'));
     $expected_commands[4] = new HtmlCommand('body', 'Hello, world!');
 
     // Verify AJAX command order — this should always be the order:
diff --git a/web/core/modules/system/tests/src/Functional/Batch/PageTest.php b/web/core/modules/system/tests/src/Functional/Batch/PageTest.php
index 1d1854dc0..5261d15ae 100644
--- a/web/core/modules/system/tests/src/Functional/Batch/PageTest.php
+++ b/web/core/modules/system/tests/src/Functional/Batch/PageTest.php
@@ -29,10 +29,10 @@ class PageTest extends BrowserTestBase {
   public function testBatchProgressPageTheme() {
     // Make sure that the page which starts the batch (an administrative page)
     // is using a different theme than would normally be used by the batch API.
-    $this->container->get('theme_installer')->install(['seven', 'bartik']);
+    $this->container->get('theme_installer')->install(['claro', 'olivero']);
     $this->config('system.theme')
-      ->set('default', 'bartik')
-      ->set('admin', 'seven')
+      ->set('default', 'olivero')
+      ->set('admin', 'claro')
       ->save();
 
     // Log in as an administrator who can see the administrative theme.
@@ -45,7 +45,7 @@ public function testBatchProgressPageTheme() {
     $this->drupalGet('admin/batch-test/test-theme');
     // The stack should contain the name of the theme used on the progress
     // page.
-    $this->assertEquals(['seven'], batch_test_stack(), 'A progressive batch correctly uses the theme of the page that started the batch.');
+    $this->assertEquals(['claro'], batch_test_stack(), 'A progressive batch correctly uses the theme of the page that started the batch.');
   }
 
   /**
diff --git a/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php b/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
index 430883e7c..c30fd51ee 100644
--- a/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
+++ b/web/core/modules/system/tests/src/Functional/Batch/ProcessingTest.php
@@ -22,7 +22,7 @@ class ProcessingTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tests batches triggered outside of form submission.
diff --git a/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php b/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
index 08c4db5e8..007ae8736 100644
--- a/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Cache/CacheTestBase.php
@@ -23,7 +23,7 @@ abstract class CacheTestBase extends BrowserTestBase {
    * @param $bin
    *   The bin the cache item was stored in.
    *
-   * @return
+   * @return bool
    *   TRUE on pass, FALSE on fail.
    */
   protected function checkCacheExists($cid, $var, $bin = NULL) {
diff --git a/web/core/modules/system/tests/src/Functional/Cache/ClearTest.php b/web/core/modules/system/tests/src/Functional/Cache/ClearTest.php
index aee7ae674..1b0125d2e 100644
--- a/web/core/modules/system/tests/src/Functional/Cache/ClearTest.php
+++ b/web/core/modules/system/tests/src/Functional/Cache/ClearTest.php
@@ -17,6 +17,9 @@ class ClearTest extends CacheTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->defaultBin = 'render';
     $this->defaultValue = $this->randomMachineName(10);
diff --git a/web/core/modules/system/tests/src/Functional/Common/AlterTest.php b/web/core/modules/system/tests/src/Functional/Common/AlterTest.php
index 14122c8bc..1c9e7de89 100644
--- a/web/core/modules/system/tests/src/Functional/Common/AlterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Common/AlterTest.php
@@ -27,10 +27,10 @@ class AlterTest extends BrowserTestBase {
    * Tests if the theme has been altered.
    */
   public function testDrupalAlter() {
-    // This test depends on Bartik, so make sure that it is always the current
+    // This test depends on Olivero, so make sure that it is always the current
     // active theme.
-    \Drupal::service('theme_installer')->install(['bartik']);
-    \Drupal::theme()->setActiveTheme(\Drupal::service('theme.initialization')->initTheme('bartik'));
+    \Drupal::service('theme_installer')->install(['olivero']);
+    \Drupal::theme()->setActiveTheme(\Drupal::service('theme.initialization')->initTheme('olivero'));
 
     $array = ['foo' => 'bar'];
     $entity = new \stdClass();
diff --git a/web/core/modules/system/tests/src/Functional/Condition/ConditionFormTest.php b/web/core/modules/system/tests/src/Functional/Condition/ConditionFormTest.php
index 2d07e9990..4be4c5baf 100644
--- a/web/core/modules/system/tests/src/Functional/Condition/ConditionFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Condition/ConditionFormTest.php
@@ -37,13 +37,21 @@ public function testConfigForm() {
     $article->save();
 
     $this->drupalGet('condition_test');
-    $this->assertSession()->fieldExists('bundles[article]');
-    $this->assertSession()->fieldExists('bundles[page]');
-    $this->submitForm(['bundles[page]' => 'page', 'bundles[article]' => 'article'], 'Submit');
+    $this->assertSession()->fieldExists('entity_bundle[bundles][article]');
+    $this->assertSession()->fieldExists('entity_bundle[bundles][page]');
+    $this->submitForm(['entity_bundle[bundles][page]' => 'page', 'entity_bundle[bundles][article]' => 'article'], 'Submit');
     // @see \Drupal\condition_test\FormController::submitForm()
     $this->assertSession()->pageTextContains('Bundle: page');
     $this->assertSession()->pageTextContains('Bundle: article');
     $this->assertSession()->pageTextContains('Executed successfully.');
+
+    $this->assertSession()->pageTextContains('The current theme is stark');
+    /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
+    $theme_installer = $this->container->get('theme_installer');
+    $theme_installer->install(['olivero']);
+    $this->drupalGet('condition_test');
+    $this->submitForm(['current_theme[theme]' => 'olivero', 'current_theme[negate]' => TRUE], 'Submit');
+    $this->assertSession()->pageTextContains('The current theme is not olivero');
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Functional/Database/DatabaseTestBase.php b/web/core/modules/system/tests/src/Functional/Database/DatabaseTestBase.php
index 9193ee103..b10bb6f62 100644
--- a/web/core/modules/system/tests/src/Functional/Database/DatabaseTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Database/DatabaseTestBase.php
@@ -2,7 +2,8 @@
 
 namespace Drupal\Tests\system\Functional\Database;
 
-use Drupal\KernelTests\Core\Database\DatabaseTestBase as DatabaseKernelTestBase;
+use Drupal\Core\Database\Database;
+use Drupal\KernelTests\Core\Database\DatabaseTestSchemaDataTrait;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -10,6 +11,13 @@
  */
 abstract class DatabaseTestBase extends BrowserTestBase {
 
+  use DatabaseTestSchemaDataTrait;
+
+  /**
+   * The database connection for testing.
+   */
+  protected $connection;
+
   /**
    * {@inheritdoc}
    */
@@ -20,8 +28,8 @@ abstract class DatabaseTestBase extends BrowserTestBase {
    */
   protected function setUp() {
     parent::setUp();
-
-    DatabaseKernelTestBase::addSampleData();
+    $this->connection = Database::getConnection();
+    $this->addSampleData();
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php b/web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
index d2120571a..a319b2131 100644
--- a/web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Datetime/DrupalDateTimeTest.php
@@ -31,20 +31,6 @@ protected function setUp(): void {
 
   }
 
-  /**
-   * Tests that the AJAX Timezone Callback can deal with various formats.
-   */
-  public function testSystemTimezone() {
-    $options = [
-      'query' => [
-        'date' => 'Tue+Sep+17+2013+21%3A35%3A31+GMT%2B0100+(BST)#',
-      ],
-    ];
-    // Query the AJAX Timezone Callback with a long-format date.
-    $response = $this->drupalGet('system/timezone/BST/3600/1', $options);
-    $this->assertEquals('"Europe\\/London"', $response, 'Timezone AJAX callback successfully identifies and responds to a long-format date.');
-  }
-
   /**
    * Tests that DrupalDateTime can detect the right timezone to use.
    *
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
index bab3d7760..3e8670981 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityAddUITest.php
@@ -92,9 +92,19 @@ public function testAddPageWithBundleEntities() {
       'label' => 'Test3 label',
       'description' => 'My test3 description',
     ])->save();
+
+    // Create a bundle that the user is forbidden from creating (always).
+    EntityTestBundle::create([
+      'id' => 'forbidden_access_bundle',
+      'label' => 'Forbidden to create bundle',
+      'description' => 'A bundle that can never be created',
+    ])->save();
+
     $this->drupalGet('/entity_test_with_bundle/add');
+    $this->assertSession()->statusCodeEquals(200);
     $this->assertSession()->linkExists('Test label');
     $this->assertSession()->linkExists('Test2 label');
+    $this->assertSession()->linkNotExists('Forbidden to create bundle');
     $this->assertSession()->linkNotExists('Test3 label');
     $this->clickLink('Test label');
     $this->assertSession()->statusCodeEquals(200);
@@ -114,6 +124,7 @@ public function testAddPageWithBundleEntities() {
     // does not have bundle specific permissions. The add bundle message is
     // present as the user has bundle create permissions.
     $this->drupalGet('/entity_test_with_bundle/add');
+    $this->assertSession()->linkNotExists('Forbidden to create bundle');
     $this->assertSession()->linkNotExists('Test label');
     $this->assertSession()->linkNotExists('Test2 label');
     $this->assertSession()->linkNotExists('Test3 label');
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
index a140b8e3a..5c1b02c56 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityFormTest.php
@@ -28,6 +28,9 @@ class EntityFormTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $web_user = $this->drupalCreateUser([
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
index a3d5b2152..866570e64 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityOperationsTest.php
@@ -24,6 +24,9 @@ class EntityOperationsTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php
index ed0e74d31..099ae3767 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityRevisionsTest.php
@@ -10,8 +10,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Create a entity with revisions and test viewing, saving, reverting, and
- * deleting revisions.
+ * Tests modifying an entity with revisions.
  *
  * @group Entity
  */
@@ -36,6 +35,9 @@ class EntityRevisionsTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
index 1f5cb69bd..b8efbea1c 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityTranslationFormTest.php
@@ -29,6 +29,9 @@ class EntityTranslationFormTest extends BrowserTestBase {
 
   protected $langcodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Enable translations for the test entity type.
diff --git a/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php b/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
index 8ec23e044..6c0f802f6 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
@@ -22,7 +22,7 @@ class EntityViewControllerTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Array of test entities.
@@ -31,6 +31,9 @@ class EntityViewControllerTest extends BrowserTestBase {
    */
   protected $entities = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create some dummy entity_test entities.
@@ -104,22 +107,6 @@ public function testFieldItemAttributes() {
     // Browse to the entity and verify that the attribute is rendered in the
     // field item HTML markup.
     $this->drupalGet('entity_test/' . $entity->id());
-    $this->assertSession()->elementTextEquals('xpath', '//div[@data-field-item-attr="foobar"]/p', $test_value);
-
-    // Enable the RDF module to ensure that two modules can add attributes to
-    // the same field item.
-    \Drupal::service('module_installer')->install(['rdf']);
-    $this->resetAll();
-
-    // Set an RDF mapping for the field_test_text field. This RDF mapping will
-    // be turned into RDFa attributes in the field item output.
-    $mapping = rdf_get_mapping('entity_test', 'entity_test');
-    $mapping->setFieldMapping('field_test_text', [
-      'properties' => ['schema:text'],
-    ])->save();
-    // Browse to the entity and verify that the attributes from both modules
-    // are rendered in the field item HTML markup.
-    $this->drupalGet('entity_test/' . $entity->id());
     $this->assertSession()->elementTextEquals('xpath', '//div[@data-field-item-attr="foobar" and @property="schema:text"]/p', $test_value);
   }
 
diff --git a/web/core/modules/system/tests/src/Functional/Entity/Traits/EntityDefinitionTestTrait.php b/web/core/modules/system/tests/src/Functional/Entity/Traits/EntityDefinitionTestTrait.php
index 206bf394b..fb8912f07 100644
--- a/web/core/modules/system/tests/src/Functional/Entity/Traits/EntityDefinitionTestTrait.php
+++ b/web/core/modules/system/tests/src/Functional/Entity/Traits/EntityDefinitionTestTrait.php
@@ -200,8 +200,7 @@ protected function updateEntityTypeToNotTranslatable($perform_update = FALSE) {
   }
 
   /**
-   * Updates the 'entity_test_update' entity type to revisionable and
-   * translatable.
+   * Updates the test entity type to be revisionable and translatable.
    *
    * @param bool $perform_update
    *   (optional) Whether the change should be performed by the entity
diff --git a/web/core/modules/system/tests/src/Functional/File/ConfigTest.php b/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
index 3fb94889f..b63f89d53 100644
--- a/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
+++ b/web/core/modules/system/tests/src/Functional/File/ConfigTest.php
@@ -16,6 +16,9 @@ class ConfigTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser([
diff --git a/web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php b/web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
index ec2c52259..998963854 100644
--- a/web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
+++ b/web/core/modules/system/tests/src/Functional/FileTransfer/FileTransferTest.php
@@ -7,8 +7,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests that the jail is respected and that protocols using recursive file move
- * operations work.
+ * Tests recursive file copy operations with the file transfer jail.
  *
  * @group FileTransfer
  */
@@ -28,6 +27,9 @@ class FileTransferTest extends BrowserTestBase {
    */
   protected $testConnection;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->testConnection = TestFileTransfer::factory($this->root, ['hostname' => $this->hostname, 'username' => $this->username, 'password' => $this->password, 'port' => $this->port]);
diff --git a/web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php b/web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
index 1860812ba..2794ea98b 100644
--- a/web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
+++ b/web/core/modules/system/tests/src/Functional/FileTransfer/TestFileTransfer.php
@@ -45,8 +45,9 @@ public static function factory($jail, $settings) {
   }
 
   public function connect() {
-    $this->connection = new MockTestConnection();
-    $this->connection->connectionString = 'test://' . urlencode($this->username) . ':' . urlencode($this->password) . "@$this->host:$this->port/";
+    $connection = new MockTestConnection();
+    $connection->connectionString = 'test://' . urlencode($this->username) . ':' . urlencode($this->password) . "@$this->host:$this->port/";
+    $this->connection = $connection;
   }
 
   public function copyFileJailed($source, $destination) {
diff --git a/web/core/modules/system/tests/src/Functional/Form/ArbitraryRebuildTest.php b/web/core/modules/system/tests/src/Functional/Form/ArbitraryRebuildTest.php
index 9d060f84f..cd3fa57e3 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ArbitraryRebuildTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ArbitraryRebuildTest.php
@@ -25,6 +25,9 @@ class ArbitraryRebuildTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php b/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
index c28112383..735417ffe 100644
--- a/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/CheckboxTest.php
@@ -6,8 +6,9 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests form API checkbox handling of various combinations of #default_value
- * and #return_value.
+ * Tests the form API checkbox element.
+ *
+ * Various combinations of #default_value and #return_value are used.
  *
  * @group Form
  */
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementTest.php
index f943dfa4c..3513d7deb 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementTest.php
@@ -21,7 +21,7 @@ class ElementTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tests placeholder text for elements that support placeholders.
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
index 21771b872..fd462b423 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementsLabelsTest.php
@@ -25,8 +25,13 @@ class ElementsLabelsTest extends BrowserTestBase {
   protected $defaultTheme = 'stark';
 
   /**
-   * Tests form elements, labels, title attributes and required marks output
-   * correctly and have the correct label option class if needed.
+   * Tests form element rendering.
+   *
+   * This method provides test coverage for:
+   * - Form label rendering with different form elements.
+   * - Rendering of the "Required" field marker.
+   * - Prefix and suffix render element placement.
+   * - Form element title attributes.
    */
   public function testFormLabels() {
     $this->drupalGet('form_test/form-labels');
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
index 6ca381f56..bb6fa38ec 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementsTableSelectTest.php
@@ -150,8 +150,7 @@ public function testAdvancedSelect() {
   }
 
   /**
-   * Tests the whether the option checker gives an error on invalid
-   * tableselect values for checkboxes.
+   * Tests error handling for invalid tableselect values with checkboxes.
    */
   public function testMultipleTrueOptionchecker() {
 
@@ -174,8 +173,7 @@ public function testMultipleTrueOptionchecker() {
   }
 
   /**
-   * Tests the whether the option checker gives an error on invalid
-   * tableselect values for radios.
+   * Tests error handling for invalid tableselect values with radio buttons.
    */
   public function testMultipleFalseOptionchecker() {
 
diff --git a/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php b/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php
index 9beabcaf6..a52f57696 100644
--- a/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/ElementsVerticalTabsTest.php
@@ -39,6 +39,9 @@ class ElementsVerticalTabsTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Form/FormTest.php b/web/core/modules/system/tests/src/Functional/Form/FormTest.php
index 505bc76db..5599bf9df 100644
--- a/web/core/modules/system/tests/src/Functional/Form/FormTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/FormTest.php
@@ -31,8 +31,11 @@ class FormTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -308,7 +311,7 @@ public function testInputWithInvalidToken() {
     $this->assertSession()->pageTextContains('The form has become outdated.');
     $this->assertSession()->fieldValueEquals('integer_step', 5);
 
-    // Check a form with a Url field
+    // Check a form with a URL field
     $this->drupalGet(Url::fromRoute('form_test.url'));
     $this->assertSession()
       ->elementExists('css', 'input[name="form_token"]')
@@ -416,27 +419,27 @@ public function testSelect() {
     // Posting without any values should throw validation errors.
     $this->submitForm([], 'Submit');
     $no_errors = [
-        'select',
-        'select_required',
-        'select_optional',
-        'empty_value',
-        'empty_value_one',
-        'no_default_optional',
-        'no_default_empty_option_optional',
-        'no_default_empty_value_optional',
-        'multiple',
-        'multiple_no_default',
+      'select',
+      'select_required',
+      'select_optional',
+      'empty_value',
+      'empty_value_one',
+      'no_default_optional',
+      'no_default_empty_option_optional',
+      'no_default_empty_value_optional',
+      'multiple',
+      'multiple_no_default',
     ];
     foreach ($no_errors as $key) {
       $this->assertSession()->pageTextNotContains($form[$key]['#title'] . ' field is required.');
     }
 
     $expected_errors = [
-        'no_default',
-        'no_default_empty_option',
-        'no_default_empty_value',
-        'no_default_empty_value_one',
-        'multiple_no_default_required',
+      'no_default',
+      'no_default_empty_option',
+      'no_default_empty_value',
+      'no_default_empty_value_one',
+      'multiple_no_default_required',
     ];
     foreach ($expected_errors as $key) {
       $this->assertSession()->pageTextContains($form[$key]['#title'] . ' field is required.');
@@ -714,6 +717,7 @@ public function testColorValidation() {
     }
 
     // Tests invalid values are rejected.
+    // cspell:ignore fffffg
     $values = ['#0008', '#1234', '#fffffg', '#abcdef22', '17', '#uaa'];
     foreach ($values as $input) {
       $edit = [
diff --git a/web/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php b/web/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php
index fa6239924..26fe1df96 100644
--- a/web/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/LanguageSelectElementTest.php
@@ -8,8 +8,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests that the language select form element prints and submits the right
- * options.
+ * Tests the language selection form element.
  *
  * @group Form
  */
@@ -47,10 +46,10 @@ public function testLanguageSelectElementOptions() {
     $this->drupalGet('form-test/language_select');
     // Check that the language fields were rendered on the page.
     $ids = [
-        'edit-languages-all' => LanguageInterface::STATE_ALL,
-        'edit-languages-configurable' => LanguageInterface::STATE_CONFIGURABLE,
-        'edit-languages-locked' => LanguageInterface::STATE_LOCKED,
-        'edit-languages-config-and-locked' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED,
+      'edit-languages-all' => LanguageInterface::STATE_ALL,
+      'edit-languages-configurable' => LanguageInterface::STATE_CONFIGURABLE,
+      'edit-languages-locked' => LanguageInterface::STATE_LOCKED,
+      'edit-languages-config-and-locked' => LanguageInterface::STATE_CONFIGURABLE | LanguageInterface::STATE_LOCKED,
     ];
     foreach ($ids as $id => $flags) {
       $this->assertSession()->fieldExists($id);
diff --git a/web/core/modules/system/tests/src/Functional/Form/RebuildTest.php b/web/core/modules/system/tests/src/Functional/Form/RebuildTest.php
index 061eb2c3f..e98ec55d0 100644
--- a/web/core/modules/system/tests/src/Functional/Form/RebuildTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/RebuildTest.php
@@ -30,6 +30,9 @@ class RebuildTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php b/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
index b6aea0ead..90e24029f 100644
--- a/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanAdvancedTest.php
@@ -6,9 +6,7 @@
 use Drupal\Tests\TestFileCreationTrait;
 
 /**
- * Tests proper removal of submitted form values using
- * \Drupal\Core\Form\FormState::cleanValues() when having forms with elements
- * containing buttons like "managed_file".
+ * Tests the removal of internal Form API elements from submitted form values.
  *
  * @group Form
  */
diff --git a/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanTest.php b/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanTest.php
index 473f98ee5..4a2fc2a6a 100644
--- a/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/StateValuesCleanTest.php
@@ -7,8 +7,9 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests proper removal of submitted form values using
- * \Drupal\Core\Form\FormState::cleanValues().
+ * Tests the proper removal of submitted form values.
+ *
+ * @see \Drupal\Core\Form\FormState::cleanValues()
  *
  * @group Form
  */
diff --git a/web/core/modules/system/tests/src/Functional/Form/StorageTest.php b/web/core/modules/system/tests/src/Functional/Form/StorageTest.php
index 385ca2039..2d3199f48 100644
--- a/web/core/modules/system/tests/src/Functional/Form/StorageTest.php
+++ b/web/core/modules/system/tests/src/Functional/Form/StorageTest.php
@@ -7,8 +7,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests a multistep form using form storage and makes sure validation and
- * caching works right.
+ * Tests a multistep form using form storage.
  *
  * The tested form puts data into the storage during the initial form
  * construction. These tests verify that there are no duplicate form
@@ -147,8 +146,7 @@ public function testCachedFormStorageValidation() {
   }
 
   /**
-   * Verifies that form build-id is regenerated when loading an immutable form
-   * from the cache.
+   * Tests form build ID regeneration when loading a cached immutable form.
    */
   public function testImmutableForm() {
     // Request the form with 'cache' query parameter to enable form caching.
diff --git a/web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php b/web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
index ecb9e2605..892761da6 100644
--- a/web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
+++ b/web/core/modules/system/tests/src/Functional/Mail/HtmlToTextTest.php
@@ -25,7 +25,7 @@ class HtmlToTextTest extends BrowserTestBase {
    * @param $text
    *   The text string to convert.
    *
-   * @return
+   * @return string
    *   An HTML representation of the text string that, when displayed in a
    *   browser, represents the PHP source code equivalent of $text.
    */
@@ -194,7 +194,7 @@ public function testDrupalHtmlToTextArgs() {
   /**
    * Tests that whitespace is collapsed.
    */
-  public function testDrupalHtmltoTextCollapsesWhitespace() {
+  public function testDrupalHtmlToTextCollapsesWhitespace() {
     $input = "<p>Drupal  Drupal\n\nDrupal<pre>Drupal  Drupal\n\nDrupal</pre>Drupal  Drupal\n\nDrupal</p>";
     // @todo The whitespace should be collapsed.
     $collapsed = "Drupal  Drupal\n\nDrupalDrupal  Drupal\n\nDrupalDrupal  Drupal\n\nDrupal\n\n";
@@ -207,8 +207,7 @@ public function testDrupalHtmltoTextCollapsesWhitespace() {
   }
 
   /**
-   * Tests that text separated by block-level tags in HTML get separated by
-   * (at least) a newline in the plaintext version.
+   * Tests the conversion of block-level HTML tags to plaintext with newlines.
    */
   public function testDrupalHtmlToTextBlockTagToNewline() {
     $input = <<<'EOT'
@@ -298,15 +297,14 @@ public function testFootnoteReferences() {
   }
 
   /**
-   * Tests that combinations of paragraph breaks, line breaks, linefeeds,
-   * and spaces are properly handled.
+   * Tests the plaintext conversion of different whitespace combinations.
    */
   public function testDrupalHtmlToTextParagraphs() {
     $tests = [];
     $tests[] = [
-        'html' => "<p>line 1<br />\nline 2<br />line 3\n<br />line 4</p><p>paragraph</p>",
+      'html' => "<p>line 1<br />\nline 2<br />line 3\n<br />line 4</p><p>paragraph</p>",
         // @todo Trailing line breaks should be trimmed.
-        'text' => "line 1\nline 2\nline 3\nline 4\n\nparagraph\n\n",
+      'text' => "line 1\nline 2\nline 3\nline 4\n\nparagraph\n\n",
     ];
     $tests[] = [
       'html' => "<p>line 1<br /> line 2</p> <p>line 4<br /> line 5</p> <p>0</p>",
@@ -352,7 +350,7 @@ public function testVeryLongLineWrap() {
    * @see \Drupal\Core\Mail\MailFormatHelper::wrapMail()
    */
   public function testRemoveTrailingWhitespace() {
-    $text = "Hi there! \nHerp Derp";
+    $text = "Hi there! \nEarth";
     $mail_lines = explode("\n", MailFormatHelper::wrapMail($text));
     $this->assertNotEquals(" ", substr($mail_lines[0], -1), 'Trailing whitespace removed.');
   }
@@ -366,11 +364,11 @@ public function testRemoveTrailingWhitespace() {
    * @see \Drupal\Core\Mail\MailFormatHelper::wrapMail()
    */
   public function testUsenetSignature() {
-    $text = "Hi there!\n-- \nHerp Derp";
+    $text = "Hi there!\n-- \nEarth";
     $mail_lines = explode("\n", MailFormatHelper::wrapMail($text));
     $this->assertEquals("-- ", $mail_lines[1], 'Trailing whitespace not removed for dash-dash-space signatures.');
 
-    $text = "Hi there!\n--  \nHerp Derp";
+    $text = "Hi there!\n--  \nEarth";
     $mail_lines = explode("\n", MailFormatHelper::wrapMail($text));
     $this->assertEquals("--", $mail_lines[1], 'Trailing whitespace removed for incorrect dash-dash-space signatures.');
   }
diff --git a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php
index c553381e5..51c9835ad 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbFrontCacheContextsTest.php
@@ -28,7 +28,7 @@ class BreadcrumbFrontCacheContextsTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * A test node with path alias.
diff --git a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
index 4a7d095a6..bd918db59 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/BreadcrumbTest.php
@@ -46,6 +46,9 @@ class BreadcrumbTest extends BrowserTestBase {
    */
   protected $profile = 'standard';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php b/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
index dde5d52cc..c29438b2f 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/LocalTasksTest.php
@@ -23,7 +23,7 @@ class LocalTasksTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The local tasks block under testing.
diff --git a/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
index 2208cf5b1..446ba5111 100644
--- a/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Menu/MenuRouterTest.php
@@ -31,6 +31,9 @@ class MenuRouterTest extends BrowserTestBase {
    */
   protected $adminTheme;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     // Enable dummy module that implements hook_menu.
     parent::setUp();
@@ -221,8 +224,10 @@ public function testMaintenanceModeLoginPaths() {
   }
 
   /**
-   * Tests that an authenticated user hitting 'user/login' gets redirected to
-   * 'user' and 'user/register' gets redirected to the user edit page.
+   * Tests authenticated user login redirects.
+   *
+   * An authenticated user hitting 'user/login' should be redirected to 'user',
+   * and 'user/register' should be redirected to the user edit page.
    */
   public function testAuthUserUserLogin() {
     $web_user = $this->drupalCreateUser([]);
@@ -241,8 +246,8 @@ public function testAuthUserUserLogin() {
    * Tests theme integration.
    */
   public function testThemeIntegration() {
-    $this->defaultTheme = 'bartik';
-    $this->adminTheme = 'seven';
+    $this->defaultTheme = 'olivero';
+    $this->adminTheme = 'claro';
 
     /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
     $theme_installer = $this->container->get('theme_installer');
@@ -264,13 +269,12 @@ public function testThemeIntegration() {
   }
 
   /**
-   * Tests the theme negotiation when it is set to use an administrative
-   * theme.
+   * Tests theme negotiation for an administrative theme.
    */
   protected function doTestThemeCallbackAdministrative() {
     $this->drupalGet('menu-test/theme-callback/use-admin-theme');
-    $this->assertSession()->pageTextContains('Active theme: seven. Actual theme: seven.');
-    $this->assertSession()->responseContains('seven/css/base/elements.css');
+    $this->assertSession()->pageTextContains('Active theme: claro. Actual theme: claro.');
+    $this->assertSession()->responseContains('claro/css/base/elements.css');
   }
 
   /**
@@ -283,15 +287,15 @@ protected function doTestThemeCallbackMaintenanceMode() {
     // we expect the theme callback system to be bypassed entirely.
     $this->drupalGet('menu-test/theme-callback/use-admin-theme');
     // Check that the maintenance theme's CSS appears on the page.
-    $this->assertSession()->responseContains('bartik/css/base/elements.css');
+    $this->assertSession()->responseContains('olivero/css/base/base.css');
 
     // An administrator, however, should continue to see the requested theme.
     $admin_user = $this->drupalCreateUser(['access site in maintenance mode']);
     $this->drupalLogin($admin_user);
     $this->drupalGet('menu-test/theme-callback/use-admin-theme');
-    $this->assertSession()->pageTextContains('Active theme: seven. Actual theme: seven.');
+    $this->assertSession()->pageTextContains('Active theme: claro. Actual theme: claro.');
     // Check that the administrative theme's CSS appears on the page.
-    $this->assertSession()->responseContains('seven/css/base/elements.css');
+    $this->assertSession()->responseContains('claro/css/base/elements.css');
 
     $this->container->get('state')->set('system.maintenance_mode', FALSE);
   }
@@ -302,9 +306,9 @@ protected function doTestThemeCallbackMaintenanceMode() {
   protected function doTestThemeCallbackOptionalTheme() {
     // Request a theme that is not installed.
     $this->drupalGet('menu-test/theme-callback/use-test-theme');
-    $this->assertSession()->pageTextContains('Active theme: bartik. Actual theme: bartik.');
+    $this->assertSession()->pageTextContains('Active theme: olivero. Actual theme: olivero.');
     // Check that the default theme's CSS appears on the page.
-    $this->assertSession()->responseContains('bartik/css/base/elements.css');
+    $this->assertSession()->responseContains('olivero/css/base/base.css');
 
     // Now install the theme and request it again.
     /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
@@ -324,9 +328,9 @@ protected function doTestThemeCallbackOptionalTheme() {
    */
   protected function doTestThemeCallbackFakeTheme() {
     $this->drupalGet('menu-test/theme-callback/use-fake-theme');
-    $this->assertSession()->pageTextContains('Active theme: bartik. Actual theme: bartik.');
+    $this->assertSession()->pageTextContains('Active theme: olivero. Actual theme: olivero.');
     // Check that the default theme's CSS appears on the page.
-    $this->assertSession()->responseContains('bartik/css/base/elements.css');
+    $this->assertSession()->responseContains('olivero/css/base/base.css');
   }
 
   /**
@@ -334,9 +338,9 @@ protected function doTestThemeCallbackFakeTheme() {
    */
   protected function doTestThemeCallbackNoThemeRequested() {
     $this->drupalGet('menu-test/theme-callback/no-theme-requested');
-    $this->assertSession()->pageTextContains('Active theme: bartik. Actual theme: bartik.');
+    $this->assertSession()->pageTextContains('Active theme: olivero. Actual theme: olivero.');
     // Check that the default theme's CSS appears on the page.
-    $this->assertSession()->responseContains('bartik/css/base/elements.css');
+    $this->assertSession()->responseContains('olivero/css/base/base.css');
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php b/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php
index ebf0b7dd8..78f659744 100644
--- a/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/DependencyTest.php
@@ -73,8 +73,7 @@ public function testMissingModules() {
   }
 
   /**
-   * Tests enabling a module that depends on an incompatible version of a
-   * module.
+   * Tests enabling a module with an incompatible dependency version.
    */
   public function testIncompatibleModuleVersionDependency() {
     // Test that the system_incompatible_module_version_dependencies_test is
@@ -112,16 +111,36 @@ public function testNoVersionInfo() {
     mkdir($path, 0777, TRUE);
     file_put_contents("$path/system_no_module_version_dependency_test.info.yml", Yaml::encode($info));
 
+    // Include a version in the dependency definition, to test the 'incompatible
+    // with version' message when no version is given in the required module.
     $info = [
       'type' => 'module',
       'core_version_requirement' => '*',
       'name' => 'System no module version test',
-      'dependencies' => ['system_no_module_version_dependency_test'],
+      'dependencies' => ['system_no_module_version_dependency_test(>1.x)'],
     ];
     $path = $this->siteDirectory . '/modules/system_no_module_version_test';
     mkdir($path, 0777, TRUE);
     file_put_contents("$path/system_no_module_version_test.info.yml", Yaml::encode($info));
 
+    // Ensure that the module list page is displayed without errors.
+    $this->drupalGet('admin/modules');
+    $this->assertSession()->pageTextContains('System no module version test');
+    $this->assertSession()->pageTextContains('System no module version dependency test (>1.x) (incompatible with version');
+    $this->assertSession()->fieldEnabled('modules[system_no_module_version_dependency_test][enable]');
+    $this->assertSession()->fieldDisabled('modules[system_no_module_version_test][enable]');
+
+    // Remove the version requirement from the the dependency definition
+    $info = [
+      'type' => 'module',
+      'core_version_requirement' => '*',
+      'name' => 'System no module version test',
+      'dependencies' => ['system_no_module_version_dependency_test'],
+    ];
+
+    $path = $this->siteDirectory . '/modules/system_no_module_version_test';
+    file_put_contents("$path/system_no_module_version_test.info.yml", Yaml::encode($info));
+
     $this->drupalGet('admin/modules');
     $this->assertSession()->pageTextContains('System no module version dependency test');
     $this->assertSession()->pageTextContains('System no module version test');
@@ -171,6 +190,21 @@ public function testCoreCompatibility() {
     $this->assertModules(['common_test', 'system_core_semver_test'], TRUE);
   }
 
+  /**
+   * Tests the dependency checks when core version contains '8.x' within it.
+   */
+  public function testCoreVersionContains8X() {
+    // Enable the helper module that alters the version and dependencies.
+    \Drupal::service('module_installer')->install(['dependency_version_test']);
+
+    // Check that the above module installed OK.
+    $this->drupalGet('admin/modules');
+    $this->assertModules(['dependency_version_test'], TRUE);
+
+    // Check that test_module dependencies are met and the box is not greyed.
+    $this->assertSession()->fieldEnabled('modules[test_module][enable]');
+  }
+
   /**
    * Tests enabling a module that depends on a module which fails hook_requirements().
    */
diff --git a/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php b/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
index 9917e6333..4f4d3e769 100644
--- a/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
+++ b/web/core/modules/system/tests/src/Functional/Module/ModuleTestBase.php
@@ -24,6 +24,9 @@ abstract class ModuleTestBase extends BrowserTestBase {
 
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php b/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
index a5ecb9c24..1fb8c5234 100644
--- a/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
+++ b/web/core/modules/system/tests/src/Functional/Module/UninstallTest.php
@@ -82,6 +82,20 @@ public function testUninstallPage() {
     $this->assertSession()->elementExists('xpath', "//a[contains(@aria-label, 'View information on the Obsolete status of the module System obsolete status test')]");
     $this->assertSession()->elementExists('xpath', "//a[contains(@href, 'https://example.com/obsolete')]");
 
+    $form = $this->assertSession()->elementExists('xpath', "//form[@id='system-modules-uninstall']");
+    $form_html = $form->getOuterHtml();
+
+    // Select the first stable module on the uninstall list.
+    $module_stable = $this->assertSession()->elementExists('xpath', "//label[contains(@class, 'module-name') and not(./a[contains(@class, 'module-link--non-stable')])]")->getOuterHtml();
+
+    // Select the unstable modules (deprecated, and obsolete).
+    $module_unstable_1 = $this->assertSession()->elementExists('xpath', "//label[./a[contains(@aria-label, 'View information on the Deprecated status of the module Deprecated module')]]")->getOuterHtml();
+    $module_unstable_2 = $this->assertSession()->elementExists('xpath', "//label[./a[contains(@aria-label, 'View information on the Obsolete status of the module System obsolete status test')]]")->getOuterHtml();
+
+    // Check that all unstable modules appear before the first stable module.
+    $this->assertGreaterThan(strpos($form_html, $module_unstable_1), strpos($form_html, $module_stable));
+    $this->assertGreaterThan(strpos($form_html, $module_unstable_2), strpos($form_html, $module_stable));
+
     foreach (\Drupal::service('extension.list.module')->getAllInstalledInfo() as $module => $info) {
       $field_name = "uninstall[$module]";
       if (!empty($info['required'])) {
diff --git a/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php b/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php
index d6f09f217..02f6263d5 100644
--- a/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php
+++ b/web/core/modules/system/tests/src/Functional/Pager/PagerTest.php
@@ -36,6 +36,9 @@ class PagerTest extends BrowserTestBase {
 
   protected $profile = 'testing';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -79,8 +82,7 @@ public function testActiveClass() {
   }
 
   /**
-   * Tests proper functioning of the query parameters and the pager cache
-   * context.
+   * Tests pager query parameters and cache context.
    */
   public function testPagerQueryParametersAndCacheContext() {
     // First page.
diff --git a/web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php b/web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
index 76e7e39fe..c5b383e8d 100644
--- a/web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
+++ b/web/core/modules/system/tests/src/Functional/ParamConverter/UpcastingTest.php
@@ -6,7 +6,7 @@
 use Drupal\language\Entity\ConfigurableLanguage;
 
 /**
- * Tests upcasting of url arguments to entities.
+ * Tests upcasting of URL arguments to entities.
  *
  * @group ParamConverter
  */
diff --git a/web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php b/web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php
index d13f90f9c..005769d38 100644
--- a/web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Render/AjaxPageStateTest.php
@@ -30,6 +30,9 @@ class AjaxPageStateTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create an administrator with all permissions.
diff --git a/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php b/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
index b95d17ead..885443ec1 100644
--- a/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Render/HtmlResponseAttachmentsTest.php
@@ -63,13 +63,14 @@ public function testAttachments() {
     // Test ['#attached']['html_head_link'] when outputted as HTTP header.
     $this->drupalGet('/render_attached_test/html_header_link');
     $expected_link_headers = [
-      '</foo?bar=&lt;baz&gt;&amp;baz=false>; rel="alternate"',
+      '</foo?bar=<baz>&baz=false>; rel="alternate"',
       '</foo/bar>; hreflang="nl"; rel="alternate"',
       '</foo/bar>; hreflang="de"; rel="alternate"',
     ];
     $this->assertEquals($expected_link_headers, $this->getSession()->getResponseHeaders()['Link']);
 
-    // Check that duplicate alternate URLs with different hreflangs are allowed.
+    // Check that duplicate alternate URLs with different hreflang attributes
+    // are allowed.
     $this->assertSession()->elementsCount('xpath', '//head/link[@rel="alternate"][@href="/foo/bar"]', 2);
   }
 
diff --git a/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php b/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php
index b11a6bb6b..4fce0be47 100644
--- a/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Routing/RouterTest.php
@@ -230,7 +230,7 @@ public function testControllerResolutionPage() {
   }
 
   /**
-   * Checks the generate method on the url generator using the front router.
+   * Checks the generate method on the URL generator using the front router.
    */
   public function testUrlGeneratorFront() {
     $front_url = Url::fromRoute('<front>', [], ['absolute' => TRUE]);
@@ -323,17 +323,18 @@ public function testRouterUninstallInstall() {
   }
 
   /**
-   * Ensure that multiple leading slashes are redirected.
+   * Ensure that multiple successive slashes are redirected.
    */
-  public function testLeadingSlashes() {
+  public function testSuccessiveSlashes() {
     $request = $this->container->get('request_stack')->getCurrentRequest();
-    $url = $request->getUriForPath('//router_test/test1');
+
+    // Test a simple path with successive leading slashes.
+    $url = $request->getUriForPath('//////router_test/test1');
     $this->drupalGet($url);
     $this->assertSession()->addressEquals($request->getUriForPath('/router_test/test1'));
 
-    // It should not matter how many leading slashes are used and query strings
-    // should be preserved.
-    $url = $request->getUriForPath('/////////////////////////////////////////////////router_test/test1') . '?qs=test';
+    // Test successive slashes in the middle.
+    $url = $request->getUriForPath('/router_test//////test1') . '?qs=test';
     $this->drupalGet($url);
     $this->assertSession()->addressEquals($request->getUriForPath('/router_test/test1') . '?qs=test');
 
diff --git a/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php b/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php
index 8b123f088..a300f3c44 100644
--- a/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php
+++ b/web/core/modules/system/tests/src/Functional/Session/SessionHttpsTest.php
@@ -271,7 +271,7 @@ protected function assertSessionIds(string $sid, string $assertion_text): void {
    * @param $url
    *   A Drupal path such as 'user/login'.
    *
-   * @return
+   * @return string
    *   URL prepared for the https.php mock front controller.
    */
   protected function httpsUrl($url) {
@@ -284,7 +284,7 @@ protected function httpsUrl($url) {
    * @param $url
    *   A Drupal path such as 'user/login'.
    *
-   * @return
+   * @return string
    *   URL prepared for the http.php mock front controller.
    */
   protected function httpUrl($url) {
diff --git a/web/core/modules/system/tests/src/Functional/Session/SessionTest.php b/web/core/modules/system/tests/src/Functional/Session/SessionTest.php
index 497f02743..e8ecf1d2f 100644
--- a/web/core/modules/system/tests/src/Functional/Session/SessionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Session/SessionTest.php
@@ -25,8 +25,11 @@ class SessionTest extends BrowserTestBase {
   protected $defaultTheme = 'stark';
 
   /**
-   * Tests for \Drupal\Core\Session\WriteSafeSessionHandler::setSessionWritable()
-   * ::isSessionWritable and \Drupal\Core\Session\SessionManager::regenerate().
+   * Tests session writing and regeneration.
+   *
+   * @covers \Drupal\Core\Session\WriteSafeSessionHandler::setSessionWritable
+   * @covers \Drupal\Core\Session\WriteSafeSessionHandler::isSessionWritable
+   * @covers \Drupal\Core\Session\SessionManager::regenerate
    */
   public function testSessionSaveRegenerate() {
     $session_handler = $this->container->get('session_handler.write_safe');
diff --git a/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php b/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
index c06d93aa1..2a2a730e8 100644
--- a/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AccessDeniedTest.php
@@ -29,6 +29,9 @@ class AccessDeniedTest extends BrowserTestBase {
 
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/System/AdminTest.php b/web/core/modules/system/tests/src/Functional/System/AdminTest.php
index 07cd6fa16..261b4b00a 100644
--- a/web/core/modules/system/tests/src/Functional/System/AdminTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/AdminTest.php
@@ -38,6 +38,9 @@ class AdminTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     // testAdminPages() requires Locale module.
     parent::setUp();
diff --git a/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
index 44aebf2b0..5ba373205 100644
--- a/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DateTimeTest.php
@@ -7,8 +7,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Configure date and time settings. Test date formatting and time zone
- * handling, including daylight saving time.
+ * Test date formatting and time zone handling, including daylight saving time.
  *
  * @group system
  */
@@ -34,6 +33,9 @@ class DateTimeTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -173,7 +175,7 @@ public function testDateFormatConfiguration() {
       'id' => 'xss_short',
       'label' => 'XSS format',
       'pattern' => '\<\s\c\r\i\p\t\>\a\l\e\r\t\(\'\X\S\S\'\)\;\<\/\s\c\r\i\p\t\>',
-      ]);
+    ]);
     $date_format->save();
 
     $this->drupalGet(Url::fromRoute('entity.date_format.collection'));
diff --git a/web/core/modules/system/tests/src/Functional/System/DefaultMobileMetaTagsTest.php b/web/core/modules/system/tests/src/Functional/System/DefaultMobileMetaTagsTest.php
index 3bdb19224..5fb7ca245 100644
--- a/web/core/modules/system/tests/src/Functional/System/DefaultMobileMetaTagsTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/DefaultMobileMetaTagsTest.php
@@ -23,6 +23,9 @@ class DefaultMobileMetaTagsTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->defaultMetaTags = [
diff --git a/web/core/modules/system/tests/src/Functional/System/FrontPageTest.php b/web/core/modules/system/tests/src/Functional/System/FrontPageTest.php
index 75714c38e..32de72dd0 100644
--- a/web/core/modules/system/tests/src/Functional/System/FrontPageTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/FrontPageTest.php
@@ -30,6 +30,9 @@ class FrontPageTest extends BrowserTestBase {
    */
   protected $nodePath;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php b/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php
index e932fa3b3..09046c446 100644
--- a/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/HtaccessTest.php
@@ -91,6 +91,10 @@ protected function getProtectedFiles() {
     $file_paths["$path/composer.json"] = 403;
     $file_paths["$path/composer.lock"] = 403;
 
+    // Ensure package.json and yarn.lock cannot be accessed.
+    $file_paths["$path/package.json"] = 403;
+    $file_paths["$path/yarn.lock"] = 403;
+
     // Ensure web server configuration files cannot be accessed.
     $file_paths["$path/.htaccess"] = 403;
     $file_paths["$path/web.config"] = 403;
diff --git a/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php b/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
index d1e101ba7..bd42c3a43 100644
--- a/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/IndexPhpTest.php
@@ -16,6 +16,9 @@ class IndexPhpTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
   }
diff --git a/web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php b/web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
index 492ae0a2a..acd4da299 100644
--- a/web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/MainContentFallbackTest.php
@@ -26,6 +26,9 @@ class MainContentFallbackTest extends BrowserTestBase {
   protected $adminUser;
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
index 47afe0917..6e7027f30 100644
--- a/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PageNotFoundTest.php
@@ -29,6 +29,9 @@ class PageNotFoundTest extends BrowserTestBase {
 
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php b/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php
index d2060157e..441110332 100644
--- a/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PageTitleTest.php
@@ -24,7 +24,7 @@ class PageTitleTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   protected $contentUser;
   protected $savedTitle;
diff --git a/web/core/modules/system/tests/src/Functional/System/PhpRequirementTest.php b/web/core/modules/system/tests/src/Functional/System/PhpRequirementTest.php
index 11c5f594e..cd36cb200 100644
--- a/web/core/modules/system/tests/src/Functional/System/PhpRequirementTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/PhpRequirementTest.php
@@ -72,26 +72,22 @@ public function testStatusPage() {
     // There should be an informational message if the PHP version is below the
     // recommended version.
     if (version_compare($phpversion, \Drupal::RECOMMENDED_PHP) < 0) {
-      $this->assertSession()->pageTextContains('It is recommended to upgrade to PHP version ' . \Drupal::RECOMMENDED_PHP . ' or higher');
+      // If running a PHP version affected by a known OPcache bug, warn about
+      // that.
+      // @todo Remove this when \Drupal::MINIMUM_PHP is at least 8.1.6 in
+      //   https://www.drupal.org/i/3305726.
+      if (version_compare($phpversion, '8.1.0', 'ge') && version_compare($phpversion, '8.1.6', 'lt')) {
+        $this->assertSession()->pageTextContains("PHP $phpversion has an OPcache bug that can cause fatal errors with class autoloading. This can be fixed by upgrading to PHP 8.1.6 or later.");
+        $this->assertSession()->linkExists('an OPcache bug that can cause fatal errors with class autoloading');
+      }
+      else {
+        $this->assertSession()->pageTextContains('It is recommended to upgrade to PHP version ' . \Drupal::RECOMMENDED_PHP . ' or higher');
+      }
     }
     // Otherwise, the message should not be there.
     else {
       $this->assertSession()->pageTextNotContains('It is recommended to upgrade to PHP version ' . \Drupal::RECOMMENDED_PHP . ' or higher');
     }
-
-    // If running Drupal on a PHP version with a known OPcache bug, ensure that
-    // we warn the user about it.
-    // @todo Remove these blocks when \Drupal::MINIMUM_PHP is at least 8.1.6 in
-    //   https://www.drupal.org/i/3305726.
-    if (version_compare($phpversion, '8.1.0', 'ge') && version_compare($phpversion, '8.1.6', 'lt')) {
-      $this->assertSession()->pageTextContains("PHP $phpversion has an OPcache bug that can cause fatal errors with class autoloading. This can be fixed by upgrading to PHP 8.1.6 or later.");
-      $this->assertSession()->linkExists('an OPcache bug that can cause fatal errors with class autoloading');
-    }
-    // If we're on a PHP version older than 8.1, warn about the broken versions.
-    if (version_compare($phpversion, '8.1.0', 'lt')) {
-      $this->assertSession()->pageTextContains('PHP versions 8.1.0 to 8.1.5 have an OPcache bug that can cause fatal errors with class autoloading. It can be avoided by using PHP 8.1.6 or later.');
-      $this->assertSession()->linkExists('an OPcache bug that can cause fatal errors with class autoloading');
-    }
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Functional/System/ShutdownFunctionsTest.php b/web/core/modules/system/tests/src/Functional/System/ShutdownFunctionsTest.php
index 2059714e9..6d7798721 100644
--- a/web/core/modules/system/tests/src/Functional/System/ShutdownFunctionsTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/ShutdownFunctionsTest.php
@@ -23,6 +23,9 @@ class ShutdownFunctionsTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function tearDown(): void {
     // This test intentionally throws an exception in a PHP shutdown function.
     // Prevent it from being interpreted as an actual test failure.
diff --git a/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php b/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
index 6d9a96409..4b73ff7cd 100644
--- a/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SiteMaintenanceTest.php
@@ -38,6 +38,9 @@ class SiteMaintenanceTest extends BrowserTestBase {
    */
   protected $user;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -153,11 +156,11 @@ public function testSiteMaintenance() {
     $this->submitForm([], 'Log in');
     $this->assertSession()->pageTextContains($user_message);
 
-    // Regression test to check if title displays in Bartik on maintenance page.
-    \Drupal::service('theme_installer')->install(['bartik']);
-    $this->config('system.theme')->set('default', 'bartik')->save();
+    // Check if title displays in Olivero on maintenance page.
+    \Drupal::service('theme_installer')->install(['olivero']);
+    $this->config('system.theme')->set('default', 'olivero')->save();
 
-    // Logout and verify that offline message is displayed in Bartik.
+    // Logout and verify that offline message is displayed in Olivero.
     $this->drupalLogout();
     $this->drupalGet('');
     $this->assertEquals('Site under maintenance', $this->cssSelect('main h1')[0]->getText());
diff --git a/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
index 376ae4248..a43c52017 100644
--- a/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/SystemAuthorizeTest.php
@@ -23,6 +23,9 @@ class SystemAuthorizeTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Functional/System/ThemeTest.php b/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
index 081904483..6afe81c42 100644
--- a/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/System/ThemeTest.php
@@ -8,8 +8,7 @@
 use Drupal\Tests\TestFileCreationTrait;
 
 /**
- * Tests the theme interface functionality by enabling and switching themes, and
- * using an administration theme.
+ * Tests the theme administration user interface.
  *
  * @group system
  */
@@ -36,7 +35,7 @@ class ThemeTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * A test node.
@@ -45,6 +44,9 @@ class ThemeTest extends BrowserTestBase {
    */
   protected $node;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -67,20 +69,20 @@ protected function setUp(): void {
    */
   public function testThemeSettings() {
     // Ensure a disabled theme settings form URL returns 404.
-    $this->drupalGet('admin/appearance/settings/bartik');
+    $this->drupalGet('admin/appearance/settings/olivero');
     $this->assertSession()->statusCodeEquals(404);
     // Ensure a non existent theme settings form URL returns 404.
     $this->drupalGet('admin/appearance/settings/' . $this->randomMachineName());
     $this->assertSession()->statusCodeEquals(404);
     // Ensure a hidden theme settings form URL returns 404.
-    $this->assertTrue(\Drupal::service('theme_installer')->install(['stable']));
-    $this->drupalGet('admin/appearance/settings/stable');
+    $this->assertTrue(\Drupal::service('theme_installer')->install(['stable9']));
+    $this->drupalGet('admin/appearance/settings/stable9');
     $this->assertSession()->statusCodeEquals(404);
 
     // Specify a filesystem path to be used for the logo.
     $file = current($this->drupalGetTestFiles('image'));
     $file_relative = strtr($file->uri, ['public:/' => PublicStream::basePath()]);
-    $default_theme_path = 'core/themes/classy';
+    $default_theme_path = 'core/themes/starterkit_theme';
 
     /** @var \Drupal\Core\File\FileUrlGeneratorInterface $file_url_generator */
     $file_url_generator = \Drupal::service('file_url_generator');
@@ -201,23 +203,23 @@ public function testThemeSettings() {
     $this->drupalGet('');
     $this->assertSession()->elementAttributeContains('xpath', '//header//a[@rel="home"]/img', 'src', $file_url_generator->generateString($uploaded_filename));
 
-    $this->container->get('theme_installer')->install(['bartik']);
+    $this->container->get('theme_installer')->install(['olivero']);
 
     // Ensure only valid themes are listed in the local tasks.
     $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header']);
     $this->drupalGet('admin/appearance/settings');
     $theme_handler = \Drupal::service('theme_handler');
-    $this->assertSession()->linkExists($theme_handler->getName('classy'));
-    $this->assertSession()->linkExists($theme_handler->getName('bartik'));
-    $this->assertSession()->linkNotExists($theme_handler->getName('stable'));
+    $this->assertSession()->linkExists($theme_handler->getName('starterkit_theme'));
+    $this->assertSession()->linkExists($theme_handler->getName('olivero'));
+    $this->assertSession()->linkNotExists($theme_handler->getName('stable9'));
 
     // If a hidden theme is an admin theme it should be viewable.
-    \Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable')->save();
+    \Drupal::configFactory()->getEditable('system.theme')->set('admin', 'stable9')->save();
     \Drupal::service('router.builder')->rebuildIfNeeded();
-    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable']);
+    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header', 'theme' => 'stable9']);
     $this->drupalGet('admin/appearance/settings');
-    $this->assertSession()->linkExists($theme_handler->getName('stable'));
-    $this->drupalGet('admin/appearance/settings/stable');
+    $this->assertSession()->linkExists($theme_handler->getName('stable9'));
+    $this->drupalGet('admin/appearance/settings/stable9');
     $this->assertSession()->statusCodeEquals(200);
 
     // Ensure default logo and favicons are not triggering custom path
@@ -238,14 +240,14 @@ public function testThemeSettings() {
    * Tests the theme settings logo form.
    */
   public function testThemeSettingsLogo() {
-    // Visit Bartik's theme settings page to replace the logo.
-    $this->container->get('theme_installer')->install(['bartik']);
-    $this->drupalGet('admin/appearance/settings/bartik');
+    // Visit Olivero's theme settings page to replace the logo.
+    $this->container->get('theme_installer')->install(['olivero']);
+    $this->drupalGet('admin/appearance/settings/olivero');
     $edit = [
       'default_logo' => FALSE,
       'logo_path' => 'core/misc/druplicon.png',
     ];
-    $this->drupalGet('admin/appearance/settings/bartik');
+    $this->drupalGet('admin/appearance/settings/olivero');
     $this->submitForm($edit, 'Save configuration');
     $this->assertSession()->fieldValueEquals('default_logo', FALSE);
     $this->assertSession()->fieldValueEquals('logo_path', 'core/misc/druplicon.png');
@@ -262,7 +264,7 @@ public function testThemeSettingsLogo() {
    * Tests the 'rendered' cache tag is cleared when saving theme settings.
    */
   public function testThemeSettingsRenderCacheClear() {
-    $this->container->get('theme_installer')->install(['bartik']);
+    $this->container->get('theme_installer')->install(['olivero']);
     // Ensure the frontpage is cached for anonymous users. The render cache will
     // cleared by installing a theme.
     $this->drupalLogout();
@@ -272,9 +274,9 @@ public function testThemeSettingsRenderCacheClear() {
     $this->assertSession()->responseHeaderEquals('X-Drupal-Cache', 'HIT');
 
     $this->drupalLogin($this->adminUser);
-    // Save Bartik's theme settings which should invalidate the 'rendered' cache
+    // Save Olivero's theme settings which should invalidate the 'rendered' cache
     // tag in \Drupal\system\EventSubscriber\ConfigCacheTag.
-    $this->drupalGet('admin/appearance/settings/bartik');
+    $this->drupalGet('admin/appearance/settings/olivero');
     $this->submitForm([], 'Save configuration');
     $this->drupalLogout();
     $this->drupalGet('');
@@ -285,11 +287,11 @@ public function testThemeSettingsRenderCacheClear() {
    * Tests the administration theme functionality.
    */
   public function testAdministrationTheme() {
-    $this->container->get('theme_installer')->install(['seven']);
+    $this->container->get('theme_installer')->install(['claro']);
 
     // Install an administration theme and show it on the node admin pages.
     $edit = [
-      'admin_theme' => 'seven',
+      'admin_theme' => 'claro',
       'use_admin_theme' => TRUE,
     ];
     $this->drupalGet('admin/appearance');
@@ -306,19 +308,19 @@ public function testAdministrationTheme() {
 
     // Check that the administration theme is used on an administration page.
     $this->drupalGet('admin/config');
-    $this->assertSession()->responseContains('core/themes/seven');
+    $this->assertSession()->responseContains('core/themes/claro');
 
     // Check that the site default theme used on node page.
     $this->drupalGet('node/' . $this->node->id());
-    $this->assertSession()->responseContains('core/themes/classy');
+    $this->assertSession()->responseContains('core/themes/starterkit_theme');
 
     // Check that the administration theme is used on the add content page.
     $this->drupalGet('node/add');
-    $this->assertSession()->responseContains('core/themes/seven');
+    $this->assertSession()->responseContains('core/themes/claro');
 
     // Check that the administration theme is used on the edit content page.
     $this->drupalGet('node/' . $this->node->id() . '/edit');
-    $this->assertSession()->responseContains('core/themes/seven');
+    $this->assertSession()->responseContains('core/themes/claro');
 
     // Disable the admin theme on the node admin pages.
     $edit = [
@@ -333,7 +335,7 @@ public function testAdministrationTheme() {
 
     // Check that the administration theme is used on an administration page.
     $this->drupalGet('admin/config');
-    $this->assertSession()->responseContains('core/themes/seven');
+    $this->assertSession()->responseContains('core/themes/claro');
 
     // Ensure that the admin theme is also visible on the 403 page.
     $normal_user = $this->drupalCreateUser(['view the administration theme']);
@@ -341,12 +343,12 @@ public function testAdministrationTheme() {
     // Check that the administration theme is used on an administration page.
     $this->drupalGet('admin/config');
     $this->assertSession()->statusCodeEquals(403);
-    $this->assertSession()->responseContains('core/themes/seven');
+    $this->assertSession()->responseContains('core/themes/claro');
     $this->drupalLogin($this->adminUser);
 
     // Check that the site default theme used on the add content page.
     $this->drupalGet('node/add');
-    $this->assertSession()->responseContains('core/themes/classy');
+    $this->assertSession()->responseContains('core/themes/starterkit_theme');
 
     // Reset to the default theme settings.
     $edit = [
@@ -358,11 +360,11 @@ public function testAdministrationTheme() {
 
     // Check that the site default theme used on administration page.
     $this->drupalGet('admin');
-    $this->assertSession()->responseContains('core/themes/classy');
+    $this->assertSession()->responseContains('core/themes/starterkit_theme');
 
     // Check that the site default theme used on the add content page.
     $this->drupalGet('node/add');
-    $this->assertSession()->responseContains('core/themes/classy');
+    $this->assertSession()->responseContains('core/themes/starterkit_theme');
   }
 
   /**
@@ -376,15 +378,15 @@ public function testSwitchDefaultTheme() {
     $this->config('system.theme')->set('default', 'stark')->save();
     $this->drupalPlaceBlock('local_tasks_block');
 
-    // Install Bartik and set it as the default theme.
-    $theme_installer->install(['bartik']);
+    // Install Olivero and set it as the default theme.
+    $theme_installer->install(['olivero']);
     $this->drupalGet('admin/appearance');
     $this->clickLink('Set as default');
-    $this->assertEquals('bartik', $this->config('system.theme')->get('default'));
+    $this->assertEquals('olivero', $this->config('system.theme')->get('default'));
 
     // Test the default theme on the secondary links (blocks admin page).
     $this->drupalGet('admin/structure/block');
-    $this->assertSession()->pageTextContains('Bartik(active tab)');
+    $this->assertSession()->pageTextContains('Olivero(active tab)');
     // Switch back to Stark and test again to test that the menu cache is cleared.
     $this->drupalGet('admin/appearance');
     // Stark is the first 'Set as default' link.
@@ -420,26 +422,23 @@ public function testInvalidTheme() {
    * Tests uninstalling of themes works.
    */
   public function testUninstallingThemes() {
-    // Install Bartik and set it as the default theme.
-    \Drupal::service('theme_installer')->install(['bartik']);
-    // Set up seven as the admin theme.
-    \Drupal::service('theme_installer')->install(['seven']);
+    // Install olivero.
+    \Drupal::service('theme_installer')->install(['olivero']);
+    // Set up Claro as the admin theme.
+    \Drupal::service('theme_installer')->install(['claro']);
     $edit = [
-      'admin_theme' => 'seven',
+      'admin_theme' => 'claro',
       'use_admin_theme' => TRUE,
     ];
     $this->drupalGet('admin/appearance');
     $this->submitForm($edit, 'Save configuration');
-    $this->drupalGet('admin/appearance');
-    $this->clickLink('Set as default');
 
-    // Check that seven cannot be uninstalled as it is the admin theme.
-    $this->assertSession()->responseNotContains('Uninstall Seven theme');
-    // Check that bartik cannot be uninstalled as it is the default theme.
-    $this->assertSession()->responseNotContains('Uninstall Bartik theme');
-    // Check that the classy theme cannot be uninstalled as it is a base theme
-    // of seven and bartik.
-    $this->assertSession()->responseNotContains('Uninstall Classy theme');
+    // Set olivero as the default theme.
+    $this->cssSelect('a[title="Set Olivero as default theme"]')[0]->click();
+    // Check that claro cannot be uninstalled as it is the admin theme.
+    $this->assertSession()->responseNotContains('Uninstall claro theme');
+    // Check that olivero cannot be uninstalled as it is the default theme.
+    $this->assertSession()->responseNotContains('Uninstall Olivero theme');
 
     // Install Stark and set it as the default theme.
     \Drupal::service('theme_installer')->install(['stark']);
@@ -451,31 +450,20 @@ public function testUninstallingThemes() {
     $this->drupalGet('admin/appearance');
     $this->submitForm($edit, 'Save configuration');
 
-    // Check that seven can be uninstalled now.
-    $this->assertSession()->responseContains('Uninstall Seven theme');
-    // Check that the classy theme still cannot be uninstalled as it is a
-    // base theme of bartik.
-    $this->assertSession()->responseNotContains('Uninstall Classy theme');
+    // Check that claro can be uninstalled now.
+    $this->assertSession()->responseContains('Uninstall claro theme');
 
     // Change the default theme to stark, stark is second in the list.
     $this->clickLink('Set as default', 1);
 
-    // Check that bartik can be uninstalled now.
-    $this->assertSession()->responseContains('Uninstall Bartik theme');
-
-    // Check that the classy theme still can't be uninstalled as neither of its
-    // base themes have been.
-    $this->assertSession()->responseNotContains('Uninstall Classy theme');
-
-    // Uninstall each of the three themes starting with Bartik.
-    $this->clickLink('Uninstall');
-    $this->assertSession()->responseContains('The <em class="placeholder">Bartik</em> theme has been uninstalled');
-    // Seven is the second in the list.
-    $this->clickLink('Uninstall');
-    $this->assertSession()->responseContains('The <em class="placeholder">Seven</em> theme has been uninstalled');
+    // Check that olivero can be uninstalled now.
+    $this->assertSession()->responseContains('Uninstall Olivero theme');
 
-    // Check that the classy theme still can't be uninstalled as it is hidden.
-    $this->assertSession()->responseNotContains('Uninstall Classy theme');
+    // Uninstall each of the two themes starting with Olivero.
+    $this->cssSelect('a[title="Uninstall Olivero theme"]')[0]->click();
+    $this->assertSession()->responseContains('The <em class="placeholder">Olivero</em> theme has been uninstalled');
+    $this->cssSelect('a[title="Uninstall Claro theme"]')[0]->click();
+    $this->assertSession()->responseContains('The <em class="placeholder">Claro</em> theme has been uninstalled');
   }
 
   /**
@@ -483,7 +471,7 @@ public function testUninstallingThemes() {
    */
   public function testInstallAndSetAsDefault() {
     $themes = [
-      'bartik' => 'Bartik',
+      'olivero' => 'Olivero',
       'test_core_semver' => 'Theme test with semver core version',
     ];
     foreach ($themes as $theme_machine_name => $theme_name) {
diff --git a/web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php b/web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php
index 0b8269a2c..40b2bc00e 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/EngineNyanCatTest.php
@@ -23,6 +23,9 @@ class EngineNyanCatTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['test_theme_nyan_cat_engine']);
diff --git a/web/core/modules/system/tests/src/Functional/Theme/EngineTwigTest.php b/web/core/modules/system/tests/src/Functional/Theme/EngineTwigTest.php
index c358a92f7..a0c16db8a 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/EngineTwigTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/EngineTwigTest.php
@@ -28,6 +28,9 @@ class EngineTwigTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['test_theme']);
@@ -144,7 +147,7 @@ public function testTwigFileUrls() {
    */
   public function testTwigAttachLibrary() {
     $this->drupalGet('/twig-theme-test/attach-library');
-    $this->assertSession()->responseContains('ckeditor.js');
+    $this->assertSession()->responseContains('ckeditor5-dll.js');
   }
 
   /**
diff --git a/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php b/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
index 820554fa0..155c62e29 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/EntityFilteringThemeTest.php
@@ -6,14 +6,14 @@
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\comment\CommentInterface;
 use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
+use Drupal\Core\Extension\ExtensionLifecycle;
 use Drupal\node\NodeInterface;
 use Drupal\comment\Entity\Comment;
 use Drupal\taxonomy\Entity\Term;
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests themed output for each entity type in all available themes to ensure
- * entity labels are filtered for XSS.
+ * Tests XSS filtering for themed output for each entity type in all themes.
  *
  * @group Theme
  */
@@ -46,7 +46,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test user.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\Entity\User
    */
   protected $user;
 
@@ -54,7 +54,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test node.
    *
-   * @var \Drupal\node\Node
+   * @var \Drupal\node\Entity\Node
    */
   protected $node;
 
@@ -62,7 +62,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test taxonomy term.
    *
-   * @var \Drupal\taxonomy\Term
+   * @var \Drupal\taxonomy\Entity\Term
    */
   protected $term;
 
@@ -70,7 +70,7 @@ class EntityFilteringThemeTest extends BrowserTestBase {
   /**
    * A test comment.
    *
-   * @var \Drupal\comment\Comment
+   * @var \Drupal\comment\Entity\Comment
    */
   protected $comment;
 
@@ -81,12 +81,24 @@ class EntityFilteringThemeTest extends BrowserTestBase {
    */
   protected $xssLabel = "string with <em>HTML</em> and <script>alert('JS');</script>";
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
     // Install all available non-testing themes.
     $listing = new ExtensionDiscovery(\Drupal::root());
     $this->themes = $listing->scan('theme', FALSE);
+    /** @var \Drupal\Core\Extension\ThemeHandlerInterface $theme_handler */
+    $theme_data = \Drupal::service('theme_handler')->rebuildThemeData();
+    foreach (array_keys($this->themes) as $theme) {
+      // Skip obsolete and deprecated themes.
+      $info = $theme_data[$theme]->info;
+      if ($info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] === ExtensionLifecycle::OBSOLETE || $info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] === ExtensionLifecycle::DEPRECATED) {
+        unset($this->themes[$theme]);
+      }
+    }
     \Drupal::service('theme_installer')->install(array_keys($this->themes));
 
     // Create a test user.
diff --git a/web/core/modules/system/tests/src/Functional/Theme/FastTest.php b/web/core/modules/system/tests/src/Functional/Theme/FastTest.php
index b7b0021b8..621fa4be4 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/FastTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/FastTest.php
@@ -30,6 +30,9 @@ class FastTest extends BrowserTestBase {
    */
   protected $account;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->account = $this->drupalCreateUser(['access user profiles']);
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php
index d492ddc22..4dab6c2de 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeEarlyInitializationTest.php
@@ -5,8 +5,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests that the theme system can be correctly initialized early in the page
- * request.
+ * Tests theme system initialization early in the page request.
  *
  * @group Theme
  */
@@ -22,7 +21,7 @@ class ThemeEarlyInitializationTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tests that the theme system can generate output in a request listener.
@@ -33,7 +32,7 @@ public function testRequestListener() {
     $this->assertSession()->responseContains('Themed output generated in a KernelEvents::REQUEST listener');
     // Verify that the default theme's CSS still appears even though the theme
     // system was initialized early.
-    $this->assertSession()->responseContains('classy/css/components/action-links.css');
+    $this->assertSession()->responseContains('starterkit_theme/css/components/action-links.css');
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
index 4cf969cf3..22d00616e 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php
@@ -95,13 +95,13 @@ public function testChanges() {
     $active_theme = $this->themeManager->getActiveTheme();
     // Make sure we are not testing the wrong theme.
     $this->assertEquals('test_theme', $active_theme->getName());
-    $this->assertEquals(['classy/base', 'classy/messages', 'core/normalize', 'test_theme/global-styling'], $active_theme->getLibraries());
+    $this->assertEquals(['starterkit_theme/base', 'starterkit_theme/messages', 'core/normalize', 'test_theme/global-styling'], $active_theme->getLibraries());
 
     // @see theme_test_system_info_alter()
     $this->state->set('theme_test.modify_info_files', TRUE);
     $this->resetAll();
     $active_theme = $this->themeManager->getActiveTheme();
-    $this->assertEquals(['classy/base', 'classy/messages', 'core/normalize', 'test_theme/global-styling', 'core/once'], $active_theme->getLibraries());
+    $this->assertEquals(['starterkit_theme/base', 'starterkit_theme/messages', 'core/normalize', 'test_theme/global-styling', 'core/once'], $active_theme->getLibraries());
   }
 
 }
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php
index f7323059d..18b679b0c 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeLegacyTest.php
@@ -26,6 +26,9 @@ class ThemeLegacyTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['test_legacy_theme']);
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php
index 4188e2963..db0aeba7f 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeSuggestionsAlterTest.php
@@ -24,6 +24,9 @@ class ThemeSuggestionsAlterTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['test_theme']);
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
index 3d27b2794..96d154f23 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeTest.php
@@ -23,7 +23,7 @@ class ThemeTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
index 44308f4f7..fc924a6f7 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeTokenTest.php
@@ -46,12 +46,12 @@ public function testThemeToken() {
     $settings = $this->getDrupalSettings();
     $this->assertNull($settings['ajaxPageState']['theme_token']);
 
-    // Install 'seven' and configure it as administrative theme.
-    $this->container->get('theme_installer')->install(['seven']);
-    $this->config('system.theme')->set('admin', 'seven')->save();
+    // Install 'claro' and configure it as administrative theme.
+    $this->container->get('theme_installer')->install(['claro']);
+    $this->config('system.theme')->set('admin', 'claro')->save();
 
-    // Revisit the page. This time the page is displayed using the 'seven' theme
-    // and that is different from the default theme ('classy').
+    // Revisit the page. This time the page is displayed using the 'claro' theme
+    // and that is different from the default theme ('stark').
     $this->drupalGet('admin/structure/block');
     $settings = $this->getDrupalSettings();
     $this->assertNotNull($settings['ajaxPageState']['theme_token']);
diff --git a/web/core/modules/system/tests/src/Functional/Theme/ThemeUpdateTest.php b/web/core/modules/system/tests/src/Functional/Theme/ThemeUpdateTest.php
index fbcd137b3..38e70b8e3 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/ThemeUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/ThemeUpdateTest.php
@@ -16,7 +16,7 @@ class ThemeUpdateTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Ensures preprocess functions run even for suggestion implementations.
diff --git a/web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
index 7442e53ec..8b5d16a6f 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigExtensionTest.php
@@ -17,13 +17,16 @@ class TwigExtensionTest extends BrowserTestBase {
    *
    * @var array
    */
-  protected static $modules = ['theme_test', 'twig_extension_test'];
+  protected static $modules = ['theme_test', 'twig_extension_test', 'twig_theme_test'];
 
   /**
    * {@inheritdoc}
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['test_theme']);
@@ -92,4 +95,35 @@ public function testsRenderZeroValue() {
     $this->assertSame(0, $extension->renderVar(0.0), 'TwigExtension::renderVar() renders zero correctly when provided as a double.');
   }
 
+  /**
+   * Tests the dump function.
+   */
+  public function testDump() {
+    // Test Twig Debug disabled.
+    $this->drupalGet('/twig-theme-test/dump');
+    $this->assertSession()->elementsCount('css', '.sf-dump', 0);
+
+    // Test Twig Debug enabled.
+    $parameters = $this->container->getParameter('twig.config');
+    $parameters['debug'] = TRUE;
+    $this->setContainerParameter('twig.config', $parameters);
+    $this->resetAll();
+
+    $this->drupalGet('/twig-theme-test/dump');
+    $dumps = $this->getSession()->getPage()->findAll('css', '.sf-dump');
+    $this->assertEquals(4, count($dumps));
+
+    // Test dumping single variable.
+    $this->assertStringContainsString('💩', $dumps[0]->getText());
+    $this->assertStringNotContainsString('🐣', $dumps[0]->getText());
+
+    // Test dumping context.
+    $this->assertStringContainsString('"bar" => "🐣"', $dumps[1]->getText());
+
+    // Test dump as a variadic.
+    $this->assertStringContainsString('💩', $dumps[2]->getText());
+    $this->assertStringContainsString('☄️', $dumps[3]->getText());
+
+  }
+
 }
diff --git a/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php b/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
index d2eab6684..3399be42a 100644
--- a/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
+++ b/web/core/modules/system/tests/src/Functional/Theme/TwigRegistryLoaderTest.php
@@ -29,6 +29,9 @@ class TwigRegistryLoaderTest extends BrowserTestBase {
    */
   protected $twig;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     \Drupal::service('theme_installer')->install(['test_theme_twig_registry_loader', 'test_theme_twig_registry_loader_theme', 'test_theme_twig_registry_loader_subtheme']);
diff --git a/web/core/modules/system/tests/src/Functional/Update/ClassyUninstallUpdateTest.php b/web/core/modules/system/tests/src/Functional/Update/ClassyUninstallUpdateTest.php
index a59229958..5e8e9e89c 100644
--- a/web/core/modules/system/tests/src/Functional/Update/ClassyUninstallUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Update/ClassyUninstallUpdateTest.php
@@ -8,6 +8,7 @@
  * Ensures that update hook uninstalls Classy when it's no longer needed.
  *
  * @group Update
+ * @group legacy
  * @see system_post_update_uninstall_classy()
  */
 class ClassyUninstallUpdateTest extends UpdatePathTestBase {
@@ -76,7 +77,7 @@ public function testUpdateClassyNeeded() {
     $theme_handler = $this->container->get('theme_handler');
     /** @var \Drupal\Core\Extension\ThemeInstallerInterface $theme_installer */
     $theme_installer = $this->container->get('theme_installer');
-    $theme_installer->install(['test_theme']);
+    $theme_installer->install(['test_legacy_stylesheets_remove']);
     $this->assertTrue($theme_handler->themeExists('classy'));
 
     $this->runUpdates();
diff --git a/web/core/modules/system/tests/src/Functional/Update/StableUninstallUpdateTest.php b/web/core/modules/system/tests/src/Functional/Update/StableUninstallUpdateTest.php
index efe02dec7..bdbab15f0 100644
--- a/web/core/modules/system/tests/src/Functional/Update/StableUninstallUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/Update/StableUninstallUpdateTest.php
@@ -8,6 +8,7 @@
  * Ensures that update hook uninstalls Stable when it's no longer needed.
  *
  * @group Update
+ * @group legacy
  * @see system_post_update_uninstall_stable()
  */
 class StableUninstallUpdateTest extends UpdatePathTestBase {
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php
index 2250b1ba9..23c864d44 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/BrokenCacheUpdateTest.php
@@ -46,7 +46,7 @@ public function testUpdate() {
       'checksum' => 0,
     ];
     $insert->fields($fields);
-    $fields['cid'] = 'element_info_build:seven';
+    $fields['cid'] = 'element_info_build:claro';
     $fields['tags'] = 'element_info_build';
     $insert->values(array_values($fields));
     $fields['cid'] = 'element_info_build:stark';
@@ -56,7 +56,7 @@ public function testUpdate() {
     $this->runUpdates();
     // Caches should have been cleared at this point.
     $count = (int) $connection->select('cache_discovery')
-      ->condition('cid', ['element_info', 'element_info_build:seven', 'element_info_build:stark'], 'IN')
+      ->condition('cid', ['element_info', 'element_info_build:claro', 'element_info_build:stark'], 'IN')
       ->countQuery()
       ->execute()
       ->fetchField();
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php
index 42e772e70..561ff795a 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyHookInvocationTest.php
@@ -5,8 +5,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests that the hook invocation for determining update dependencies works
- * correctly.
+ * Tests the hook invocation for determining update dependencies.
  *
  * @group Update
  */
@@ -28,6 +27,9 @@ class DependencyHookInvocationTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     require_once $this->root . '/core/includes/update.inc';
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php
index 7d1cb1565..a2eaa8c39 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyMissingTest.php
@@ -23,6 +23,9 @@ class DependencyMissingTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     // Only install update_test_2.module, even though its updates have a
     // dependency on update_test_3.module.
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php
index 8576e7eae..3e47c9e88 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/DependencyOrderingTest.php
@@ -28,6 +28,9 @@ class DependencyOrderingTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     require_once $this->root . '/core/includes/update.inc';
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
index 2400d4697..0d79aa906 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/InvalidUpdateHookTest.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\Tests\system\Functional\UpdateSystem;
 
+use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\RequirementsPageTrait;
 
 /**
- * Tests that a module implementing hook_update_8000() causes an error to be
- * displayed on update.
+ * Tests that hook_update_8000() is disallowed.
  *
  * @group Update
  */
@@ -45,11 +45,14 @@ class InvalidUpdateHookTest extends BrowserTestBase {
    */
   private $updateUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     require_once $this->root . '/core/includes/update.inc';
 
-    $this->updateUrl = $GLOBALS['base_url'] . '/update.php';
+    $this->updateUrl = Url::fromRoute('system.db_update')->setAbsolute()->toString();
     $this->updateUser = $this->drupalCreateUser([
       'administer software updates',
     ]);
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php
index fd9b155bf..d36fc941d 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/NoPreExistingSchemaUpdateTest.php
@@ -20,6 +20,9 @@ class NoPreExistingSchemaUpdateTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $connection = Database::getConnection();
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
index f4439cd12..6bfe6d68d 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdateScriptTest.php
@@ -58,6 +58,9 @@ class UpdateScriptTest extends BrowserTestBase {
    */
   private $updateUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->updateUrl = Url::fromRoute('system.db_update');
@@ -590,9 +593,9 @@ public function testSuccessfulMultilingualUpdateFunctionality() {
     // Add some custom languages.
     foreach (['aa', 'bb'] as $language_code) {
       ConfigurableLanguage::create([
-          'id' => $language_code,
-          'label' => $this->randomMachineName(),
-        ])->save();
+        'id' => $language_code,
+        'label' => $this->randomMachineName(),
+      ])->save();
     }
 
     $config = \Drupal::service('config.factory')->getEditable('language.negotiation');
diff --git a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
index d624c2993..2364e99bd 100644
--- a/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
+++ b/web/core/modules/system/tests/src/Functional/UpdateSystem/UpdatesWith7xTest.php
@@ -2,12 +2,12 @@
 
 namespace Drupal\Tests\system\Functional\UpdateSystem;
 
+use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\RequirementsPageTrait;
 
 /**
- * Tests that the minimum schema version is correct even if only 7.x update
- * hooks are retained .
+ * Tests the minimum schema version when only 7.x update hooks are retained.
  *
  * @group Update
  */
@@ -39,10 +39,13 @@ class UpdatesWith7xTest extends BrowserTestBase {
    */
   private $updateUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     require_once $this->root . '/core/includes/update.inc';
-    $this->updateUrl = $GLOBALS['base_url'] . '/update.php';
+    $this->updateUrl = Url::fromRoute('system.db_update')->setAbsolute()->toString();
     $this->updateUser = $this->drupalCreateUser([
       'administer software updates',
     ]);
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/Form/ElementsTableSelectTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/Form/ElementsTableSelectTest.php
index c38627553..2cfb76dbd 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/Form/ElementsTableSelectTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/Form/ElementsTableSelectTest.php
@@ -60,4 +60,52 @@ public function testAjax() {
     }
   }
 
+  /**
+   * Tests table select with disabled rows.
+   */
+  public function testDisabledRows() {
+    // Asserts that a row number (1 based) is enabled.
+    $assert_row_enabled = function ($delta) {
+      $row = $this->assertSession()->elementExists('xpath', "//table/tbody/tr[$delta]");
+      $this->assertFalse($row->hasClass('disabled'));
+      $input = $row->find('css', 'input[value="row' . $delta . '"]');
+      $this->assertFalse($input->hasAttribute('disabled'));
+    };
+    // Asserts that a row number (1 based) is disabled.
+    $assert_row_disabled = function ($delta) {
+      $row = $this->assertSession()->elementExists('xpath', "//table/tbody/tr[$delta]");
+      $this->assertTrue($row->hasClass('disabled'));
+      $input = $row->find('css', 'input[value="row' . $delta . '"]');
+      $this->assertTrue($input->hasAttribute('disabled'));
+      $this->assertEquals('disabled', $input->getAttribute('disabled'));
+    };
+
+    // Test radios (#multiple == FALSE).
+    $this->drupalGet('form_test/tableselect/disabled-rows/multiple-false');
+
+    // Check that only 'row2' is disabled.
+    $assert_row_enabled(1);
+    $assert_row_disabled(2);
+    $assert_row_enabled(3);
+
+    // Test checkboxes (#multiple == TRUE).
+    $this->drupalGet('form_test/tableselect/disabled-rows/multiple-true');
+
+    // Check that only 'row2' is disabled.
+    $assert_row_enabled(1);
+    $assert_row_disabled(2);
+    $assert_row_enabled(3);
+
+    // Table select with checkboxes allow selection of all options.
+    $select_all_checkbox = $this->assertSession()->elementExists('xpath', '//table/thead/tr/th/input');
+    $select_all_checkbox->check();
+
+    // Check that the disabled option was not enabled or selected.
+    $page = $this->getSession()->getPage();
+    $page->hasCheckedField('row1');
+    $page->hasUncheckedField('row2');
+    $assert_row_disabled(2);
+    $page->hasCheckedField('row3');
+  }
+
 }
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php b/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php
index b9b4384b5..cbf5b13c5 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/FrameworkTest.php
@@ -20,7 +20,7 @@ class FrameworkTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tests that new JavaScript and CSS files are lazy-loaded on an AJAX request.
diff --git a/web/core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php b/web/core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php
index 782df4540..482c8738e 100644
--- a/web/core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php
+++ b/web/core/modules/system/tests/src/FunctionalJavascript/OffCanvasTestBase.php
@@ -109,7 +109,7 @@ protected function getOffCanvasDialog() {
    *   Theme names to test.
    */
   protected function getTestThemes() {
-    return ['bartik', 'classy', 'olivero', 'seven', 'stable', 'stark'];
+    return ['claro', 'olivero', 'stable9', 'stark'];
   }
 
   /**
diff --git a/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php b/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php
index 30575f2ab..8872978fe 100644
--- a/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Block/SystemMenuBlockTest.php
@@ -208,7 +208,7 @@ public function testConfigLevelDepth() {
       'test.example2' => [],
       'test.example5' => [
         'test.example7' => [],
-       ],
+      ],
       'test.example6' => [],
       'test.example8' => [],
     ];
diff --git a/web/core/modules/system/tests/src/Kernel/Common/FormElementsRenderTest.php b/web/core/modules/system/tests/src/Kernel/Common/FormElementsRenderTest.php
index f5f79c1d2..b0780f54f 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/FormElementsRenderTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/FormElementsRenderTest.php
@@ -19,8 +19,9 @@ class FormElementsRenderTest extends KernelTestBase {
   protected static $modules = ['common_test', 'system'];
 
   /**
-   * Tests rendering form elements without passing through
-   * \Drupal::formBuilder()->doBuildForm().
+   * Tests rendering form elements without using doBuildForm().
+   *
+   * @see \Drupal\Core\Form\FormBuilderInterface::doBuildForm()
    */
   public function testDrupalRenderFormElements() {
     // Define a series of form elements.
diff --git a/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php b/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
index a7842b480..e7c0dc726 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/PageRenderTest.php
@@ -3,6 +3,8 @@
 namespace Drupal\Tests\system\Kernel\Common;
 
 use Drupal\KernelTests\KernelTestBase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * Test page rendering hooks.
@@ -77,4 +79,17 @@ public function assertPageRenderHookExceptions(string $module, string $hook): vo
     \Drupal::state()->set($module . '.' . $hook . '.render_array', FALSE);
   }
 
+  /**
+   * Tests HtmlRenderer::invokePageAttachmentHooks in a render context.
+   */
+  public function testHtmlRendererAttachmentsRenderContext(): void {
+    $this->enableModules(['common_test', 'system']);
+    \Drupal::state()->set('common_test.hook_page_attachments.render_url', TRUE);
+    $uri = '/common/attachments-test';
+    $request = new Request([], [], [], [], [], ['REQUEST_URI' => $uri, 'SCRIPT_NAME' => $uri]);
+    $response = \Drupal::service('http_kernel')->handle($request);
+
+    $this->assertEquals(Response::HTTP_OK, $response->getStatusCode());
+  }
+
 }
diff --git a/web/core/modules/system/tests/src/Kernel/Common/UrlTest.php b/web/core/modules/system/tests/src/Kernel/Common/UrlTest.php
index 76c5ffc45..085ac3557 100644
--- a/web/core/modules/system/tests/src/Kernel/Common/UrlTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Common/UrlTest.php
@@ -12,11 +12,10 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Confirm that \Drupal\Core\Url,
- * \Drupal\Component\Utility\UrlHelper::filterQueryParameters(),
- * \Drupal\Component\Utility\UrlHelper::buildQuery(), and
- * \Drupal\Core\Utility\LinkGeneratorInterface::generate()
- * work correctly with various input.
+ * Tests the Url object.
+ *
+ * @covers \Drupal\Component\Utility\UrlHelper::filterQueryParameters
+ * @covers \Drupal\Core\Utility\LinkGenerator::generate
  *
  * @group Common
  */
diff --git a/web/core/modules/system/tests/src/Kernel/DecoratedServiceTest.php b/web/core/modules/system/tests/src/Kernel/DecoratedServiceTest.php
index 854662df1..f1bc1bd88 100644
--- a/web/core/modules/system/tests/src/Kernel/DecoratedServiceTest.php
+++ b/web/core/modules/system/tests/src/Kernel/DecoratedServiceTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\system\Kernel;
 
+use Drupal\Component\DependencyInjection\ReverseContainer;
 use Drupal\decorated_service_test\TestServiceDecorator;
 use Drupal\KernelTests\KernelTestBase;
 
@@ -22,12 +23,12 @@ class DecoratedServiceTest extends KernelTestBase {
   public function testDecoratedServiceId() {
     // Service decorated once.
     $test_service = $this->container->get('test_service');
-    $this->assertEquals('test_service', $test_service->_serviceId);
+    $this->assertEquals('test_service', $this->container->get(ReverseContainer::class)->getId($test_service));
     $this->assertInstanceOf(TestServiceDecorator::class, $test_service);
 
     // Service decorated twice.
     $test_service2 = $this->container->get('test_service2');
-    $this->assertEquals('test_service2', $test_service2->_serviceId);
+    $this->assertEquals('test_service2', $this->container->get(ReverseContainer::class)->getId($test_service2));
     $this->assertInstanceOf(TestServiceDecorator::class, $test_service2);
   }
 
diff --git a/web/core/modules/system/tests/src/Kernel/Entity/ConfigEntityImportTest.php b/web/core/modules/system/tests/src/Kernel/Entity/ConfigEntityImportTest.php
index a970c3025..0b3495dec 100644
--- a/web/core/modules/system/tests/src/Kernel/Entity/ConfigEntityImportTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Entity/ConfigEntityImportTest.php
@@ -39,7 +39,7 @@ class ConfigEntityImportTest extends KernelTestBase {
    */
   public function testConfigUpdateImport() {
     $this->installConfig(['action', 'block', 'filter', 'image']);
-    $this->container->get('theme_installer')->install(['bartik']);
+    $this->container->get('theme_installer')->install(['olivero']);
     $config_storage = $this->container->get('config.storage');
     // Ensure the 'system.site' config.
     $config_storage->write('system.site', ['uuid' => (new Php())->generate()]);
@@ -83,7 +83,7 @@ protected function doBlockUpdate() {
     $block = $this->placeBlock('system_powered_by_block', [
       'id' => 'apple',
       'label' => 'Red Delicious',
-      'theme' => 'bartik',
+      'theme' => 'olivero',
     ]);
 
     $this->checkSinglePluginConfigSync($block, 'settings', 'label', 'Red Delicious');
diff --git a/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php b/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
index a0e5bc687..44c79b602 100644
--- a/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
@@ -89,8 +89,9 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests values returned by SelectionInterface::getReferenceableEntities()
-   * when the target entity type has no 'label' key.
+   * Tests referenceable entities with no target entity type 'label' key.
+   *
+   * @see \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface::getReferenceableEntities()
    *
    * @param mixed $match
    *   The input text to be checked.
diff --git a/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php b/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
index ffd891cd1..347d43822 100644
--- a/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Extension/ModuleHandlerTest.php
@@ -332,10 +332,10 @@ public function testModuleStreamWrappers() {
   public function testThemeMetaData() {
     // Generate the list of available themes.
     $themes = \Drupal::service('theme_handler')->rebuildThemeData();
-    // Check that the mtime field exists for the bartik theme.
-    $this->assertNotEmpty($themes['bartik']->info['mtime'], 'The bartik.info.yml file modification time field is present.');
+    // Check that the mtime field exists for the olivero theme.
+    $this->assertNotEmpty($themes['olivero']->info['mtime'], 'The olivero.info.yml file modification time field is present.');
     // Use 0 if mtime isn't present, to avoid an array index notice.
-    $test_mtime = !empty($themes['bartik']->info['mtime']) ? $themes['bartik']->info['mtime'] : 0;
+    $test_mtime = !empty($themes['olivero']->info['mtime']) ? $themes['olivero']->info['mtime'] : 0;
     // Ensure the mtime field contains a number that is greater than zero.
     $this->assertIsNumeric($test_mtime);
     $this->assertGreaterThan(0, $test_mtime);
diff --git a/web/core/modules/system/tests/src/Kernel/Form/FormObjectTest.php b/web/core/modules/system/tests/src/Kernel/Form/FormObjectTest.php
index 939590e11..ecf7c5047 100644
--- a/web/core/modules/system/tests/src/Kernel/Form/FormObjectTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Form/FormObjectTest.php
@@ -19,6 +19,9 @@ class FormObjectTest extends ConfigFormTestBase {
    */
   protected static $modules = ['form_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/system/tests/src/Kernel/Form/ProgrammaticTest.php b/web/core/modules/system/tests/src/Kernel/Form/ProgrammaticTest.php
index 4cb67b542..535ed462a 100644
--- a/web/core/modules/system/tests/src/Kernel/Form/ProgrammaticTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Form/ProgrammaticTest.php
@@ -57,8 +57,7 @@ public function testSubmissionWorkflow() {
   }
 
   /**
-   * Helper function used to programmatically submit the form defined in
-   * form_test.module with the given values.
+   * Programmatically submits the form_test.module form with the given values.
    *
    * @param $values
    *   An array of field values to be submitted.
diff --git a/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php b/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php
index 1eed7c500..76167feaa 100644
--- a/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Mail/MailTest.php
@@ -40,6 +40,12 @@ protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('file');
+
+    // Set required site configuration.
+    $this->config('system.site')
+      ->set('mail', 'mailtest@example.com')
+      ->set('name', 'Drupal')
+      ->save();
   }
 
   /**
@@ -115,12 +121,6 @@ public function testCancelMessage() {
   public function testFromAndReplyToHeader() {
     $language = \Drupal::languageManager()->getCurrentLanguage();
 
-    // Set required site configuration.
-    $this->config('system.site')
-      ->set('mail', 'mailtest@example.com')
-      ->set('name', 'Drupal')
-      ->save();
-
     // Reset the state variable that holds sent messages.
     \Drupal::state()->set('system.test_mail_collector', []);
     // Send an email with a reply-to address specified.
@@ -153,6 +153,15 @@ public function testFromAndReplyToHeader() {
     // Errors-to header must not be set, it is deprecated.
     $this->assertFalse(isset($sent_message['headers']['Errors-To']));
 
+    // Test that From names containing commas work as expected.
+    $this->config('system.site')->set('name', 'Foo, Bar, and Baz')->save();
+    // Send an email and check that the From-header contains the site name.
+    \Drupal::service('plugin.manager.mail')->mail('mail_cancel_test', 'from_test', 'from_test@example.com', $language);
+    $captured_emails = \Drupal::state()->get('system.test_mail_collector');
+    $sent_message = end($captured_emails);
+    // From header contains the quoted site name with commas.
+    $this->assertEquals('"Foo, Bar, and Baz" <mailtest@example.com>', $sent_message['headers']['From']);
+
     // Test RFC-2822 rules are respected for 'display-name' component of
     // 'From:' header. Specials characters are not allowed, so randomly add one
     // of them to the site name and check the string is wrapped in quotes. Also
diff --git a/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateThemeSettingsTest.php b/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateThemeSettingsTest.php
index f1c77017f..4faf62732 100644
--- a/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateThemeSettingsTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateThemeSettingsTest.php
@@ -17,8 +17,8 @@ class MigrateThemeSettingsTest extends MigrateDrupal7TestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    // Install bartik and seven themes.
-    \Drupal::service('theme_installer')->install(['bartik', 'seven']);
+    // Install Olivero and Claro themes.
+    \Drupal::service('theme_installer')->install(['olivero', 'claro']);
     $this->executeMigration('d7_theme_settings');
   }
 
@@ -26,7 +26,7 @@ protected function setUp(): void {
    * Tests migration of theme settings to variables to configuration.
    */
   public function testMigrateThemeSettings() {
-    $config = $this->config('bartik.settings');
+    $config = $this->config('olivero.settings');
 
     $this->assertSame('', $config->get('favicon.path'));
     $this->assertTrue($config->get('favicon.use_default'));
@@ -40,7 +40,7 @@ public function testMigrateThemeSettings() {
     $this->assertSame('public://gnu.png', $config->get('logo.path'));
     $this->assertFalse($config->get('logo.use_default'));
 
-    $config = $this->config('seven.settings');
+    $config = $this->config('claro.settings');
     $this->assertSame('', $config->get('favicon.path'));
     $this->assertTrue($config->get('favicon.use_default'));
     $this->assertFalse($config->get('features.comment_user_picture'));
diff --git a/web/core/modules/system/tests/src/Kernel/Plugin/migrate/source/d7/ThemeSettingsTest.php b/web/core/modules/system/tests/src/Kernel/Plugin/migrate/source/d7/ThemeSettingsTest.php
index 482e4ddf6..8aa69be39 100644
--- a/web/core/modules/system/tests/src/Kernel/Plugin/migrate/source/d7/ThemeSettingsTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Plugin/migrate/source/d7/ThemeSettingsTest.php
@@ -46,7 +46,7 @@ public function providerSource() {
 
     $tests[0]['source_data']['variable'] = [
       [
-        'name' => 'theme_bartik_settings',
+        'name' => 'theme_olivero_settings',
         'value' => serialize($value),
       ],
     ];
@@ -54,7 +54,7 @@ public function providerSource() {
     // The expected results are nearly identical to the source data.
     $tests[0]['expected_data'] = [
       [
-        'name' => 'theme_bartik_settings',
+        'name' => 'theme_olivero_settings',
         'value' => $value,
       ],
     ];
diff --git a/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php b/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php
deleted file mode 100644
index 8adb4ebd9..000000000
--- a/web/core/modules/system/tests/src/Kernel/Render/ClassyTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Drupal\Tests\system\Kernel\Render;
-
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests the Classy theme.
- *
- * @group Theme
- */
-class ClassyTest extends KernelTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['system', 'twig_theme_test'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function setUp(): void {
-    parent::setUp();
-
-    // Use the classy theme.
-    $this->container->get('theme_installer')->install(['classy']);
-    $this->container->get('config.factory')
-      ->getEditable('system.theme')
-      ->set('default', 'classy')
-      ->save();
-    // Clear the theme registry.
-    $this->container->set('theme.registry', NULL);
-
-  }
-
-  /**
-   * Tests the classy theme.
-   */
-  public function testClassyTheme() {
-    \Drupal::messenger()->addError('An error occurred');
-    \Drupal::messenger()->addStatus('But then something nice happened');
-    $messages = [
-      '#type' => 'status_messages',
-    ];
-    $this->render($messages);
-    $this->assertNoText('custom-test-messages-class', 'The custom class attribute value added in the status messages preprocess function is not displayed as page content.');
-  }
-
-}
diff --git a/web/core/modules/system/tests/src/Kernel/System/FloodTest.php b/web/core/modules/system/tests/src/Kernel/System/FloodTest.php
index 97b78aa97..cc7b04bb4 100644
--- a/web/core/modules/system/tests/src/Kernel/System/FloodTest.php
+++ b/web/core/modules/system/tests/src/Kernel/System/FloodTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\system\Kernel\System;
 
 use Drupal\Core\Flood\DatabaseBackend;
-use Drupal\Core\Flood\MemoryBackend;
 use Drupal\KernelTests\KernelTestBase;
 
 /**
@@ -46,46 +45,6 @@ public function testCleanUp() {
     $this->assertFalse($flood->isAllowed($name, $threshold));
   }
 
-  /**
-   * Tests flood control memory backend.
-   */
-  public function testMemoryBackend() {
-    $threshold = 1;
-    $window_expired = -1;
-    $name = 'flood_test_cleanup';
-
-    $request_stack = \Drupal::service('request_stack');
-    $flood = new MemoryBackend($request_stack);
-    $this->assertTrue($flood->isAllowed($name, $threshold));
-    // Register expired event.
-    $flood->register($name, $window_expired);
-    // Verify event is not allowed.
-    $this->assertFalse($flood->isAllowed($name, $threshold));
-    // Run cron and verify event is now allowed.
-    $flood->garbageCollection();
-    $this->assertTrue($flood->isAllowed($name, $threshold));
-
-    // Register unexpired event.
-    $flood->register($name);
-    // Verify event is not allowed.
-    $this->assertFalse($flood->isAllowed($name, $threshold));
-    // Run cron and verify event is still not allowed.
-    $flood->garbageCollection();
-    $this->assertFalse($flood->isAllowed($name, $threshold));
-  }
-
-  /**
-   * Tests memory backend records events to the nearest microsecond.
-   */
-  public function testMemoryBackendThreshold() {
-    $request_stack = \Drupal::service('request_stack');
-    $flood = new MemoryBackend($request_stack);
-    $flood->register('new event');
-    $this->assertTrue($flood->isAllowed('new event', '2'));
-    $flood->register('new event');
-    $this->assertFalse($flood->isAllowed('new event', '2'));
-  }
-
   /**
    * Tests flood control database backend.
    */
diff --git a/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php b/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php
index 067c7ff89..a621a95ee 100644
--- a/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Theme/FunctionsTest.php
@@ -30,9 +30,9 @@ class FunctionsTest extends KernelTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    // Enable the Classy theme.
-    $this->container->get('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    // Enable the Starterkit theme.
+    $this->container->get('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
   }
 
   /**
@@ -227,13 +227,13 @@ public function testLinks() {
 
     $expected_links = '';
     $expected_links .= '<ul id="somelinks">';
-    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
-    $expected_links .= '<li class="plain-text">' . Html::escape('Plain "text"') . '</li>';
-    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
-    $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
-    $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
+    $expected_links .= '<li><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li>' . Html::escape('Plain "text"') . '</li>';
+    $expected_links .= '<li><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
     $query = ['key' => 'value'];
-    $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
     $expected_links .= '</ul>';
 
     // Verify that passing a string as heading works.
@@ -267,13 +267,13 @@ public function testLinks() {
     ];
     $expected_links = '';
     $expected_links .= '<ul id="somelinks">';
-    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
-    $expected_links .= '<li class="plain-text"><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
-    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
-    $expected_links .= '<li class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
-    $expected_links .= '<li class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
+    $expected_links .= '<li><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
+    $expected_links .= '<li><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li><a href="' . Url::fromRoute('<front>')->toString() . '">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '">' . Html::escape('Test route') . '</a></li>';
     $query = ['key' => 'value'];
-    $expected_links .= '<li class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '<li><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '">' . Html::escape('Query test route') . '</a></li>';
     $expected_links .= '</ul>';
     $expected = $expected_heading . $expected_links;
     $this->assertThemeOutput('links', $variables, $expected);
@@ -283,14 +283,14 @@ public function testLinks() {
     $variables['set_active_class'] = TRUE;
     $expected_links = '';
     $expected_links .= '<ul id="somelinks">';
-    $expected_links .= '<li class="a-link"><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
-    $expected_links .= '<li class="plain-text"><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
-    $expected_links .= '<li class="html-text"><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
-    $expected_links .= '<li data-drupal-link-system-path="&lt;front&gt;" class="front-page"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="&lt;front&gt;">' . Html::escape('Front page') . '</a></li>';
-    $expected_links .= '<li data-drupal-link-system-path="router_test/test1" class="router-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Test route') . '</a></li>';
+    $expected_links .= '<li><a href="' . Url::fromUri('base:a/link')->toString() . '">' . Html::escape('A <link>') . '</a></li>';
+    $expected_links .= '<li><span class="a/class">' . Html::escape('Plain "text"') . '</span></li>';
+    $expected_links .= '<li><span class="unescaped">' . Html::escape('potentially unsafe text that <should> be escaped') . '</span></li>';
+    $expected_links .= '<li data-drupal-link-system-path="&lt;front&gt;"><a href="' . Url::fromRoute('<front>')->toString() . '" data-drupal-link-system-path="&lt;front&gt;">' . Html::escape('Front page') . '</a></li>';
+    $expected_links .= '<li data-drupal-link-system-path="router_test/test1"><a href="' . \Drupal::urlGenerator()->generate('router_test.1') . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Test route') . '</a></li>';
     $query = ['key' => 'value'];
     $encoded_query = Html::escape(Json::encode($query));
-    $expected_links .= '<li data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1" class="query-test"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Query test route') . '</a></li>';
+    $expected_links .= '<li data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1"><a href="' . \Drupal::urlGenerator()->generate('router_test.1', $query) . '" data-drupal-link-query="' . $encoded_query . '" data-drupal-link-system-path="router_test/test1">' . Html::escape('Query test route') . '</a></li>';
     $expected_links .= '</ul>';
     $expected = $expected_heading . $expected_links;
     $this->assertThemeOutput('links', $variables, $expected);
diff --git a/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php b/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php
index f758ddd28..cf67b4f5a 100644
--- a/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Theme/TwigNamespaceTest.php
@@ -29,9 +29,12 @@ class TwigNamespaceTest extends KernelTestBase {
    */
   protected $twig;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
-    \Drupal::service('theme_installer')->install(['test_theme', 'bartik']);
+    \Drupal::service('theme_installer')->install(['test_theme', 'olivero']);
     $this->twig = \Drupal::service('twig');
   }
 
@@ -52,7 +55,7 @@ public function testTemplateDiscovery() {
     $this->assertTwigTemplate($this->twig->load('@node/node.html.twig'), 'Found node.html.twig in node module.');
 
     // Tests resolving namespaced templates in themes.
-    $this->assertTwigTemplate($this->twig->load('@bartik/page.html.twig'), 'Found page.html.twig in Bartik theme.');
+    $this->assertTwigTemplate($this->twig->load('@olivero/layout/page.html.twig'), 'Found page.html.twig in Olivero theme.');
   }
 
   /**
diff --git a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
index e875c0101..ef27d0905 100644
--- a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTest.php
@@ -9,8 +9,7 @@
 use Drupal\Core\Render\BubbleableMetadata;
 
 /**
- * Generates text using placeholders for dummy content to check token
- * replacement.
+ * Tests token replacement.
  *
  * @group system
  */
diff --git a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php
index 10c30616d..469c2b91f 100644
--- a/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php
+++ b/web/core/modules/system/tests/src/Kernel/Token/TokenReplaceKernelTestBase.php
@@ -30,6 +30,9 @@ abstract class TokenReplaceKernelTestBase extends EntityKernelTestBase {
    */
   protected static $modules = ['system'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     // Install default system configuration.
diff --git a/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php b/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
index e69f2c20c..bc1c6acbd 100644
--- a/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
+++ b/web/core/modules/system/tests/src/Unit/Breadcrumbs/PathBasedBreadcrumbBuilderTest.php
@@ -164,7 +164,7 @@ public function testBuildOnFrontpage() {
   public function testBuildWithOnePathElement() {
     $this->context->expects($this->once())
       ->method('getPathInfo')
-      ->will($this->returnValue('/example'));
+      ->willReturn('/example');
 
     $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
     $this->assertEquals([0 => new Link('Home', new Url('<front>'))], $breadcrumb->getLinks());
@@ -182,7 +182,7 @@ public function testBuildWithOnePathElement() {
   public function testBuildWithTwoPathElements() {
     $this->context->expects($this->once())
       ->method('getPathInfo')
-      ->will($this->returnValue('/example/baz'));
+      ->willReturn('/example/baz');
     $this->setupStubPathProcessor();
 
     $route_1 = new Route('/example');
@@ -221,7 +221,7 @@ public function testBuildWithTwoPathElements() {
   public function testBuildWithThreePathElements() {
     $this->context->expects($this->once())
       ->method('getPathInfo')
-      ->will($this->returnValue('/example/bar/baz'));
+      ->willReturn('/example/bar/baz');
     $this->setupStubPathProcessor();
 
     $route_1 = new Route('/example/bar');
@@ -279,7 +279,7 @@ public function testBuildWithThreePathElements() {
   public function testBuildWithException($exception_class, $exception_argument) {
     $this->context->expects($this->once())
       ->method('getPathInfo')
-      ->will($this->returnValue('/example/bar'));
+      ->willReturn('/example/bar');
     $this->setupStubPathProcessor();
 
     $this->requestMatcher->expects($this->any())
@@ -320,15 +320,15 @@ public function providerTestBuildWithException() {
   public function testBuildWithNonProcessedPath() {
     $this->context->expects($this->once())
       ->method('getPathInfo')
-      ->will($this->returnValue('/example/bar'));
+      ->willReturn('/example/bar');
 
     $this->pathProcessor->expects($this->once())
       ->method('processInbound')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->requestMatcher->expects($this->any())
       ->method('matchRequest')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
 
@@ -357,7 +357,7 @@ public function testApplies() {
   public function testBuildWithUserPath() {
     $this->context->expects($this->once())
       ->method('getPathInfo')
-      ->will($this->returnValue('/user/1/edit'));
+      ->willReturn('/user/1/edit');
     $this->setupStubPathProcessor();
 
     $route_1 = new Route('/user/1');
@@ -378,7 +378,7 @@ public function testBuildWithUserPath() {
     $this->titleResolver->expects($this->once())
       ->method('getTitle')
       ->with($this->anything(), $route_1)
-      ->will($this->returnValue('Admin'));
+      ->willReturn('Admin');
 
     $breadcrumb = $this->builder->build($this->createMock('Drupal\Core\Routing\RouteMatchInterface'));
     $this->assertEquals([0 => new Link('Home', new Url('<front>')), 1 => new Link('Admin', new Url('user_page'))], $breadcrumb->getLinks());
diff --git a/web/core/modules/system/tests/src/Unit/Event/SecurityFileUploadEventSubscriberTest.php b/web/core/modules/system/tests/src/Unit/Event/SecurityFileUploadEventSubscriberTest.php
index ffeaa0de1..8b6b8de50 100644
--- a/web/core/modules/system/tests/src/Unit/Event/SecurityFileUploadEventSubscriberTest.php
+++ b/web/core/modules/system/tests/src/Unit/Event/SecurityFileUploadEventSubscriberTest.php
@@ -86,6 +86,9 @@ public function provideFilenames() {
       'null bytes are removed' => ['foo' . chr(0) . '.txt' . chr(0), '', 'foo.txt'],
       'dot files are renamed' => ['.git', '', 'git'],
       'htaccess files are renamed even if allowed' => ['.htaccess', 'htaccess txt', '.htaccess_.txt', '.htaccess'],
+      '.phtml extension allowed with .phtml file' => ['foo.phtml', 'phtml', 'foo.phtml'],
+      '.phtml, .txt extension allowed with .phtml file' => ['foo.phtml', 'phtml txt', 'foo.phtml_.txt', 'foo.phtml'],
+      'All extensions allowed with .phtml file' => ['foo.phtml', '', 'foo.phtml_.txt', 'foo.phtml'],
     ];
   }
 
diff --git a/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php b/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php
index 9c59b4c48..55d79ec9f 100644
--- a/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php
+++ b/web/core/modules/system/tests/src/Unit/Menu/SystemLocalTasksTest.php
@@ -31,17 +31,17 @@ protected function setUp(): void {
 
     $this->themeHandler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
 
-    $theme = new Extension($this->root, 'theme', 'core/themes/bartik', 'bartik.info.yml');
+    $theme = new Extension($this->root, 'theme', 'core/themes/olivero', 'olivero.info.yml');
     $theme->status = 1;
-    $theme->info = ['name' => 'bartik'];
+    $theme->info = ['name' => 'olivero'];
     $this->themeHandler->expects($this->any())
       ->method('listInfo')
-      ->will($this->returnValue([
-        'bartik' => $theme,
-      ]));
+      ->willReturn([
+        'olivero' => $theme,
+      ]);
     $this->themeHandler->expects($this->any())
       ->method('hasUi')
-      ->with('bartik')
+      ->with('olivero')
       ->willReturn(TRUE);
     $this->container->set('theme_handler', $this->themeHandler);
   }
@@ -65,7 +65,7 @@ public function getSystemAdminRoutes() {
         'system.theme_settings_theme',
         [
           ['system.themes_page', 'system.theme_settings'],
-          ['system.theme_settings_global', 'system.theme_settings_theme:bartik'],
+          ['system.theme_settings_global', 'system.theme_settings_theme:olivero'],
         ],
       ],
     ];
diff --git a/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php b/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
index af8954e80..a5fbf2562 100644
--- a/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
+++ b/web/core/modules/system/tests/src/Unit/Transliteration/MachineNameControllerTest.php
@@ -33,6 +33,9 @@ class MachineNameControllerTest extends UnitTestCase {
    */
   protected $tokenGenerator;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create the machine name controller.
diff --git a/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml b/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
index 7c6dccd01..ad03c934e 100644
--- a/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
+++ b/web/core/modules/system/tests/themes/test_basetheme/test_basetheme.info.yml
@@ -11,15 +11,14 @@ libraries-override:
   core/drupal.dialog:
     js:
       misc/dialog/dialog.js: false
-  core/jquery.farbtastic:
-    css:
-      component:
-        assets/vendor/farbtastic/farbtastic.css: css/farbtastic.css
+  core/loadjs:
+    js:
+      assets/vendor/loadjs/loadjs.min.js: js/loadjs.min.js
   theme_test/theme_stylesheets_override_and_remove_test:
     css:
       base:
         css/base-remove.css: false
 
 libraries-extend:
-  classy/base:
+  starterkit_theme/base:
     - test_basetheme/global-styling
diff --git a/web/core/modules/system/tests/themes/test_core_semver/test_core_semver.info.yml b/web/core/modules/system/tests/themes/test_core_semver/test_core_semver.info.yml
index fae63ead7..8cc62edb6 100644
--- a/web/core/modules/system/tests/themes/test_core_semver/test_core_semver.info.yml
+++ b/web/core/modules/system/tests/themes/test_core_semver/test_core_semver.info.yml
@@ -1,6 +1,6 @@
 name: 'Theme test with semver core version'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Test theme which has semver core version.'
 version: VERSION
 core_version_requirement: ^8 || ^9 || ^10
diff --git a/web/core/modules/system/tests/themes/test_invalid_core_semver/test_invalid_core_semver.info.yml b/web/core/modules/system/tests/themes/test_invalid_core_semver/test_invalid_core_semver.info.yml
index 21630e401..1c571af7e 100644
--- a/web/core/modules/system/tests/themes/test_invalid_core_semver/test_invalid_core_semver.info.yml
+++ b/web/core/modules/system/tests/themes/test_invalid_core_semver/test_invalid_core_semver.info.yml
@@ -1,6 +1,6 @@
 name: 'Theme test with invalid semver core version'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Test theme which has an invalid semver core version.'
 version: VERSION
 core_version_requirement: ^7
diff --git a/web/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml b/web/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml
index 95be361a2..95524e3b5 100644
--- a/web/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml
+++ b/web/core/modules/system/tests/themes/test_invalid_region/test_invalid_region.info.yml
@@ -1,6 +1,6 @@
 name: 'Theme test with missing content region'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Test theme which has a non-existent content region.'
 version: VERSION
 regions:
diff --git a/web/core/modules/system/tests/themes/test_messages/test_messages.info.yml b/web/core/modules/system/tests/themes/test_messages/test_messages.info.yml
index 30c0a61b6..efa4c3b9b 100644
--- a/web/core/modules/system/tests/themes/test_messages/test_messages.info.yml
+++ b/web/core/modules/system/tests/themes/test_messages/test_messages.info.yml
@@ -2,4 +2,4 @@ name: 'Theme test messages'
 type: theme
 description: 'Test theme which provides another div for messages.'
 version: VERSION
-base theme: classy
+base theme: starterkit_theme
diff --git a/web/core/modules/system/tests/themes/test_subseven/test_subseven.info.yml b/web/core/modules/system/tests/themes/test_subseven/test_subseven.info.yml
deleted file mode 100644
index 05264eef0..000000000
--- a/web/core/modules/system/tests/themes/test_subseven/test_subseven.info.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-name: 'Theme test subseven'
-type: theme
-description: 'Test theme which uses seven as the base theme.'
-version: VERSION
-base theme: seven
diff --git a/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml b/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
index 9c59c60b7..919436f47 100644
--- a/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
+++ b/web/core/modules/system/tests/themes/test_subtheme/test_subtheme.info.yml
@@ -15,5 +15,5 @@ libraries-override:
       base:
         base-add.sub-remove.css: false
 libraries-extend:
-  classy/base:
+  starterkit_theme/base:
     - test_subtheme/global-styling
diff --git a/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml b/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml
index d91109656..854c5b4e6 100644
--- a/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme/test_theme.info.yml
@@ -12,7 +12,7 @@ name: '<strong>Test theme</strong>'
 type: theme
 description: 'Theme for testing the theme system'
 version: VERSION
-base theme: classy
+base theme: starterkit_theme
 logo: images/logo2.svg
 libraries:
   - test_theme/global-styling
@@ -22,7 +22,7 @@ libraries-override:
   # Remove an entire library.
   core/drupal.progress: false
   # Replace particular library assets.
-  classy/base:
+  starterkit_theme/base:
     css:
       component:
         css/components/button.css: css/my-button.css
@@ -30,14 +30,14 @@ libraries-override:
         css/components/container-inline.css: /themes/my_theme/css/my-container-inline.css
         css/components/details.css: /themes/my_theme/css/my-details.css
   # Remove particular library assets.
-  classy/dialog:
+  starterkit_theme/dialog:
     css:
       component:
         css/components/dialog.css: false
   system/base:
     css:
       component:
-        /core/themes/stable/css/system/components/js.module.css: false
+        /core/themes/stable9/css/system/components/js.module.css: false
   # It works for JS as well.
   core/jquery:
     js:
@@ -46,21 +46,20 @@ libraries-override:
   core/drupal.dropbutton:
     css:
       component:
-        /core/themes/stable/css/core/dropbutton/dropbutton.css: /themes/my_theme/css/dropbutton.css
+        /core/themes/stable9/css/core/dropbutton/dropbutton.css: /themes/my_theme/css/dropbutton.css
   # Use stream wrappers.
   core/drupal.vertical-tabs:
     css:
       component:
-        /core/themes/stable/css/core/vertical-tabs.css: public://my_css/vertical-tabs.css
+        /core/themes/stable9/css/core/vertical-tabs.css: public://my_css/vertical-tabs.css
   # Use a protocol-relative URI.
   core/drupal.displace:
     js:
       misc/displace.js: //my-server/my_theme/js/overridden.js
   # Use an absolute URI.
-  core/jquery.farbtastic:
-    css:
-      component:
-        assets/vendor/farbtastic/farbtastic.css: http://example.com/my_theme/css/farbtastic.css
+  core/loadjs:
+    js:
+      assets/vendor/loadjs/loadjs.min.js: http://example.com/my_theme/js/loadjs.min.js
 
 regions:
   content: Content
diff --git a/web/core/modules/system/tests/themes/test_theme_having_veery_long_name_which_is_too_long/test_theme_having_veery_long_name_which_is_too_long.info.yml b/web/core/modules/system/tests/themes/test_theme_having_veery_long_name_which_is_too_long/test_theme_having_veery_long_name_which_is_too_long.info.yml
index 06aaca063..3ee5fb729 100644
--- a/web/core/modules/system/tests/themes/test_theme_having_veery_long_name_which_is_too_long/test_theme_having_veery_long_name_which_is_too_long.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_having_veery_long_name_which_is_too_long/test_theme_having_veery_long_name_which_is_too_long.info.yml
@@ -1,4 +1,4 @@
 type: theme
-base theme: stable
+base theme: stable9
 name: 'Test theme with a too long name'
 version: VERSION
diff --git a/web/core/modules/system/tests/themes/test_theme_libraries_empty/test_theme_libraries_empty.info.yml b/web/core/modules/system/tests/themes/test_theme_libraries_empty/test_theme_libraries_empty.info.yml
index 759e42015..f6b660a8f 100644
--- a/web/core/modules/system/tests/themes/test_theme_libraries_empty/test_theme_libraries_empty.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_libraries_empty/test_theme_libraries_empty.info.yml
@@ -2,5 +2,5 @@ name: 'Test theme libraries empty'
 type: theme
 description: 'Test theme with empty libraries in theme.info.yml'
 version: VERSION
-base theme: classy
+base theme: starterkit_theme
 libraries:
diff --git a/web/core/modules/system/tests/themes/test_theme_libraries_extend/test_theme_libraries_extend.info.yml b/web/core/modules/system/tests/themes/test_theme_libraries_extend/test_theme_libraries_extend.info.yml
index 6a92fe3f5..6e3d545b1 100644
--- a/web/core/modules/system/tests/themes/test_theme_libraries_extend/test_theme_libraries_extend.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_libraries_extend/test_theme_libraries_extend.info.yml
@@ -2,9 +2,9 @@ name: 'Test theme libraries-extend'
 type: theme
 description: 'Test Theme with libraries-extend'
 version: VERSION
-base theme: classy
+base theme: starterkit_theme
 libraries-extend:
-  classy/book-navigation:
+  starterkit_theme/book-navigation:
     - test_theme_libraries_extend/extend_one
     - test_theme_libraries_extend/extend_two
   core/drupal.dialog:
diff --git a/web/core/modules/system/tests/themes/test_theme_libraries_override_with_drupal_settings/test_theme_libraries_override_with_drupal_settings.info.yml b/web/core/modules/system/tests/themes/test_theme_libraries_override_with_drupal_settings/test_theme_libraries_override_with_drupal_settings.info.yml
index 48971e443..fbf432648 100644
--- a/web/core/modules/system/tests/themes/test_theme_libraries_override_with_drupal_settings/test_theme_libraries_override_with_drupal_settings.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_libraries_override_with_drupal_settings/test_theme_libraries_override_with_drupal_settings.info.yml
@@ -2,7 +2,7 @@ name: 'Test theme libraries-override'
 type: theme
 description: 'Theme with drupalSettings libraries-override'
 version: VERSION
-base theme: classy
+base theme: starterkit_theme
 libraries-override:
   # drupalSettings libraries override. Should throw a
   # \Drupal\Core\Asset\Exception\InvalidLibrariesOverrideSpecificationException.
diff --git a/web/core/modules/system/tests/themes/test_theme_libraries_override_with_invalid_asset/test_theme_libraries_override_with_invalid_asset.info.yml b/web/core/modules/system/tests/themes/test_theme_libraries_override_with_invalid_asset/test_theme_libraries_override_with_invalid_asset.info.yml
index 347301999..06c17df97 100644
--- a/web/core/modules/system/tests/themes/test_theme_libraries_override_with_invalid_asset/test_theme_libraries_override_with_invalid_asset.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_libraries_override_with_invalid_asset/test_theme_libraries_override_with_invalid_asset.info.yml
@@ -2,7 +2,7 @@ name: 'Test theme libraries-override'
 type: theme
 description: 'Theme with invalid libraries-override asset spec.'
 version: VERSION
-base theme: classy
+base theme: starterkit_theme
 libraries-override:
   # A malformed library asset name. Should throw a
   # \Drupal\Core\Asset\Exception\InvalidLibrariesOverrideSpecificationException.
diff --git a/web/core/modules/system/tests/themes/test_theme_settings_features/test_theme_settings_features.info.yml b/web/core/modules/system/tests/themes/test_theme_settings_features/test_theme_settings_features.info.yml
index fd71868fd..892a3cebc 100644
--- a/web/core/modules/system/tests/themes/test_theme_settings_features/test_theme_settings_features.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_settings_features/test_theme_settings_features.info.yml
@@ -1,6 +1,6 @@
 name: Test features
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Test theme to test theme settings with limited features.'
 features:
   - node_user_picture
diff --git a/web/core/modules/system/tests/themes/test_theme_twig_registry_loader/test_theme_twig_registry_loader.info.yml b/web/core/modules/system/tests/themes/test_theme_twig_registry_loader/test_theme_twig_registry_loader.info.yml
index 0f8bdc89e..c72e21d1c 100644
--- a/web/core/modules/system/tests/themes/test_theme_twig_registry_loader/test_theme_twig_registry_loader.info.yml
+++ b/web/core/modules/system/tests/themes/test_theme_twig_registry_loader/test_theme_twig_registry_loader.info.yml
@@ -1,5 +1,5 @@
 name: 'Twig registry loader test'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Support module for Twig registry loader testing.'
 version: VERSION
diff --git a/web/core/modules/system/tests/themes/test_wild_west/test_wild_west.info.yml b/web/core/modules/system/tests/themes/test_wild_west/test_wild_west.info.yml
index bf9298a65..9bfb5c848 100644
--- a/web/core/modules/system/tests/themes/test_wild_west/test_wild_west.info.yml
+++ b/web/core/modules/system/tests/themes/test_wild_west/test_wild_west.info.yml
@@ -1,5 +1,5 @@
 name: Test Wild West
 type: theme
-description: A theme that doesn't use Stable as its base. It tests the wild west instead.
+description: A theme that doesn't use Stable 9 as its base. It tests the wild west instead.
 version: VERSION
 base theme: false
diff --git a/web/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml b/web/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
index 321b5713a..8aa9ac664 100644
--- a/web/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
+++ b/web/core/modules/taxonomy/migrations/d6_vocabulary_field_instance.yml
@@ -60,12 +60,12 @@ process:
     plugin: target_bundle
   'settings/handler_settings/auto_create': 'constants/auto_create'
   required: required
-   # Get the i18n taxonomy translation setting for this vocabulary.
-   #  0 - No multilingual options
-   #  1 - Localizable terms. Run through the localization system.
-   #  2 - Predefined language for a vocabulary and its terms.
-   #  3 - Per-language terms, translatable (referencing terms with different
-   #  languages) but not localizable.
+  # Get the i18n taxonomy translation setting for this vocabulary.
+  #  0 - No multilingual options
+  #  1 - Localizable terms. Run through the localization system.
+  #  2 - Predefined language for a vocabulary and its terms.
+  #  3 - Per-language terms, translatable (referencing terms with different
+  #  languages) but not localizable.
   translatable:
     plugin: static_map
     source: i18ntaxonomy_vocabulary
diff --git a/web/core/modules/taxonomy/src/Entity/Term.php b/web/core/modules/taxonomy/src/Entity/Term.php
index 87f428aba..5b4d8dbdb 100644
--- a/web/core/modules/taxonomy/src/Entity/Term.php
+++ b/web/core/modules/taxonomy/src/Entity/Term.php
@@ -267,7 +267,7 @@ public function setName($name) {
    * {@inheritdoc}
    */
   public function getWeight() {
-    return $this->get('weight')->value;
+    return (int) $this->get('weight')->value;
   }
 
   /**
diff --git a/web/core/modules/taxonomy/src/Form/OverviewTerms.php b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
index ebc9e5933..d199c8b10 100644
--- a/web/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/web/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -231,7 +231,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular
     // error. Ensure the form is rebuilt in the same order as the user
     // submitted.
     $user_input = $form_state->getUserInput();
-    if (!empty($user_input)) {
+    if (!empty($user_input['terms'])) {
       // Get the POST order.
       $order = array_flip(array_keys($user_input['terms']));
       // Update our form with the new order.
diff --git a/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php b/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
index c116f813e..2306b87f4 100644
--- a/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
+++ b/web/core/modules/taxonomy/src/Plugin/migrate/D7TaxonomyTermDeriver.php
@@ -5,6 +5,7 @@
 use Drupal\Component\Plugin\Derivative\DeriverBase;
 use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\migrate\Exception\RequirementsException;
 use Drupal\migrate\Plugin\MigrationDeriverTrait;
 use Drupal\migrate_drupal\FieldDiscoveryInterface;
@@ -15,6 +16,7 @@
  */
 class D7TaxonomyTermDeriver extends DeriverBase implements ContainerDeriverInterface {
   use MigrationDeriverTrait;
+  use StringTranslationTrait;
 
   /**
    * The base plugin ID this derivative is for.
@@ -74,7 +76,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
         $bundle = $row->getSourceProperty('machine_name');
         $values = $base_plugin_definition;
 
-        $values['label'] = t('@label (@type)', [
+        $values['label'] = $this->t('@label (@type)', [
           '@label' => $values['label'],
           '@type' => $row->getSourceProperty('name'),
         ]);
diff --git a/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php b/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
index 805f56b8c..dc145a0e0 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/field/TaxonomyIndexTid.php
@@ -135,11 +135,11 @@ public function preRender(&$values) {
     }
 
     if ($nids) {
-      $vocabs = array_filter($this->options['vids']);
+      $vids = array_filter($this->options['vids']);
       if (empty($this->options['limit'])) {
-        $vocabs = [];
+        $vids = [];
       }
-      $result = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->getNodeTerms($nids, $vocabs);
+      $result = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->getNodeTerms($nids, $vids);
 
       foreach ($result as $node_nid => $data) {
         foreach ($data as $tid => $term) {
diff --git a/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php b/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php
index eefc3e3d3..18c7f353b 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/field/TermName.php
@@ -23,9 +23,10 @@ public function getItems(ResultRow $values) {
     if ($this->options['convert_spaces']) {
       foreach ($items as &$item) {
         // Replace spaces with hyphens.
-        $name = $item['raw']->get('value')->getValue();
-        // @todo Add link support https://www.drupal.org/node/2567745
-        $item['rendered']['#context']['value'] = str_replace(' ', '-', $name);
+        $name = str_replace(' ', '-', $item['raw']->get('value')->getValue());
+        empty($this->options['settings']['link_to_entity']) ?
+          $item['rendered']['#context']['value'] = $name :
+          $item['rendered']['#title']['#context']['value'] = $name;
       }
     }
     return $items;
diff --git a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
index 76c963555..7710bae69 100644
--- a/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/web/core/modules/taxonomy/src/Plugin/views/filter/TaxonomyIndexTid.php
@@ -284,7 +284,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
       $this->helper->buildOptionsForm($form, $form_state);
 
       // Show help text if not exposed to end users.
-      $form['value']['#description'] = t('Leave blank for all. Otherwise, the first selected term will be the default instead of "Any".');
+      $form['value']['#description'] = $this->t('Leave blank for all. Otherwise, the first selected term will be the default instead of "Any".');
     }
   }
 
diff --git a/web/core/modules/taxonomy/src/TermForm.php b/web/core/modules/taxonomy/src/TermForm.php
index c1388a2cd..ee84dd699 100644
--- a/web/core/modules/taxonomy/src/TermForm.php
+++ b/web/core/modules/taxonomy/src/TermForm.php
@@ -23,12 +23,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $taxonomy_storage = $this->entityTypeManager->getStorage('taxonomy_term');
     $vocabulary = $vocab_storage->load($term->bundle());
 
-    $parent = [];
-    // Get the parent directly from the term as
-    // \Drupal\taxonomy\TermStorageInterface::loadParents() excludes the root.
-    foreach ($term->get('parent') as $item) {
-      $parent[] = (int) $item->target_id;
-    }
+    $parent = $this->getParentIds($term);
     $form_state->set(['taxonomy', 'parent'], $parent);
     $form_state->set(['taxonomy', 'vocabulary'], $vocabulary);
 
@@ -114,6 +109,7 @@ protected function actions(array $form, FormStateInterface $form_state) {
         '#value' => $this->t('Save and go to list'),
         '#weight' => 20,
         '#submit' => array_merge($element['submit']['#submit'], ['::overview']),
+        '#access' => $this->currentUser()->hasPermission('access taxonomy overview'),
       ];
     }
 
@@ -205,6 +201,7 @@ public function save(array $form, FormStateInterface $form_state) {
       case SAVED_UPDATED:
         $this->messenger()->addStatus($this->t('Updated term %term.', ['%term' => $view_link]));
         $this->logger('taxonomy')->notice('Updated term %term.', ['%term' => $term->getName(), 'link' => $edit_link]);
+        $form_state->setRedirect('entity.taxonomy_term.canonical', ['taxonomy_term' => $term->id()]);
         break;
     }
 
@@ -218,4 +215,23 @@ public function save(array $form, FormStateInterface $form_state) {
     $form_state->set('tid', $term->id());
   }
 
+  /**
+   * Returns term parent IDs, including the root.
+   *
+   * @param \Drupal\taxonomy\TermInterface $term
+   *   The taxonomy term entity.
+   *
+   * @return array
+   *   A list if parent term IDs.
+   */
+  protected function getParentIds(TermInterface $term): array {
+    $parent = [];
+    // Get the parent directly from the term as
+    // \Drupal\taxonomy\TermStorageInterface::loadParents() excludes the root.
+    foreach ($term->get('parent') as $item) {
+      $parent[] = (int) $item->target_id;
+    }
+    return $parent;
+  }
+
 }
diff --git a/web/core/modules/taxonomy/src/TermStorage.php b/web/core/modules/taxonomy/src/TermStorage.php
index 696be8ff7..04c2cfc09 100644
--- a/web/core/modules/taxonomy/src/TermStorage.php
+++ b/web/core/modules/taxonomy/src/TermStorage.php
@@ -40,8 +40,7 @@ class TermStorage extends SqlContentEntityStorage implements TermStorageInterfac
   protected $trees = [];
 
   /**
-   * Array of all loaded term ancestry keyed by ancestor term ID, keyed by term
-   * ID.
+   * Term ancestry keyed by ancestor term ID, keyed by term ID.
    *
    * @var \Drupal\taxonomy\TermInterface[][]
    */
@@ -340,7 +339,7 @@ public function resetWeights($vid) {
   /**
    * {@inheritdoc}
    */
-  public function getNodeTerms(array $nids, array $vocabs = [], $langcode = NULL) {
+  public function getNodeTerms(array $nids, array $vids = [], $langcode = NULL) {
     $query = $this->database->select($this->getDataTable(), 'td');
     $query->innerJoin('taxonomy_index', 'tn', '[td].[tid] = [tn].[tid]');
     $query->fields('td', ['tid']);
@@ -349,8 +348,8 @@ public function getNodeTerms(array $nids, array $vocabs = [], $langcode = NULL)
     $query->orderby('td.name');
     $query->condition('tn.nid', $nids, 'IN');
     $query->addTag('taxonomy_term_access');
-    if (!empty($vocabs)) {
-      $query->condition('td.vid', $vocabs, 'IN');
+    if (!empty($vids)) {
+      $query->condition('td.vid', $vids, 'IN');
     }
     if (!empty($langcode)) {
       $query->condition('td.langcode', $langcode);
diff --git a/web/core/modules/taxonomy/src/TermStorageInterface.php b/web/core/modules/taxonomy/src/TermStorageInterface.php
index 29401868d..338e6d675 100644
--- a/web/core/modules/taxonomy/src/TermStorageInterface.php
+++ b/web/core/modules/taxonomy/src/TermStorageInterface.php
@@ -116,16 +116,16 @@ public function resetWeights($vid);
    *
    * @param array $nids
    *   Node IDs to retrieve terms for.
-   * @param array $vocabs
-   *   (optional) A vocabularies array to restrict the term search. Defaults to
-   *   empty array.
+   * @param array $vids
+   *   (optional) an array of vocabulary IDs to restrict the term search.
+   *   Defaults to empty array.
    * @param string $langcode
    *   (optional) A language code to restrict the term search. Defaults to NULL.
    *
    * @return array
    *   An array of nids and the term entities they were tagged with.
    */
-  public function getNodeTerms(array $nids, array $vocabs = [], $langcode = NULL);
+  public function getNodeTerms(array $nids, array $vids = [], $langcode = NULL);
 
   /**
    * Returns the hierarchy type for a specific vocabulary ID.
diff --git a/web/core/modules/taxonomy/taxonomy.js b/web/core/modules/taxonomy/taxonomy.js
index 0fe952bf0..511182e2e 100644
--- a/web/core/modules/taxonomy/taxonomy.js
+++ b/web/core/modules/taxonomy/taxonomy.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.termDrag = {
     attach: function attach(context, settings) {
@@ -13,27 +12,22 @@
       var tableDrag = Drupal.tableDrag.taxonomy;
       var $table = $('#taxonomy');
       var rows = $table.find('tr').length;
-
       tableDrag.row.prototype.onSwap = function (swappedRow) {
         $table.find('tr.taxonomy-term-preview').removeClass('taxonomy-term-preview');
         $table.find('tr.taxonomy-term-divider-top').removeClass('taxonomy-term-divider-top');
         $table.find('tr.taxonomy-term-divider-bottom').removeClass('taxonomy-term-divider-bottom');
         var tableBody = $table[0].tBodies[0];
-
         if (backStep) {
           for (var n = 0; n < backStep; n++) {
             $(tableBody.rows[n]).addClass('taxonomy-term-preview');
           }
-
           $(tableBody.rows[backStep - 1]).addClass('taxonomy-term-divider-top');
           $(tableBody.rows[backStep]).addClass('taxonomy-term-divider-bottom');
         }
-
         if (forwardStep) {
           for (var k = rows - forwardStep - 1; k < rows - 1; k++) {
             $(tableBody.rows[k]).addClass('taxonomy-term-preview');
           }
-
           $(tableBody.rows[rows - forwardStep - 2]).addClass('taxonomy-term-divider-top');
           $(tableBody.rows[rows - forwardStep - 1]).addClass('taxonomy-term-divider-bottom');
         }
diff --git a/web/core/modules/taxonomy/taxonomy.module b/web/core/modules/taxonomy/taxonomy.module
index c221d7c4a..52e7e69f7 100644
--- a/web/core/modules/taxonomy/taxonomy.module
+++ b/web/core/modules/taxonomy/taxonomy.module
@@ -209,7 +209,7 @@ function taxonomy_vocabulary_get_names() {
  * @param $vocabulary
  *   (optional) Vocabulary machine name to limit the search. Defaults to NULL.
  *
- * @return
+ * @return \Drupal\taxonomy\TermInterface[]
  *   An array of matching term objects.
  *
  * @deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use
@@ -259,7 +259,7 @@ function taxonomy_implode_tags($tags, $vid = NULL) {
  * @param \Drupal\taxonomy\Entity\Term $term
  *   A taxonomy term entity.
  *
- * @return
+ * @return string
  *   The term name to be used as the page title.
  *
  * @deprecated in drupal:9.3.0 and is removed from drupal:10.0.0. Use
diff --git a/web/core/modules/taxonomy/taxonomy.services.yml b/web/core/modules/taxonomy/taxonomy.services.yml
index b724d27e5..43818281c 100644
--- a/web/core/modules/taxonomy/taxonomy.services.yml
+++ b/web/core/modules/taxonomy/taxonomy.services.yml
@@ -5,7 +5,7 @@ services:
     tags:
       - { name: breadcrumb_builder, priority: 1002 }
   taxonomy_term.taxonomy_term_route_context:
-      class: Drupal\taxonomy\ContextProvider\TermRouteContext
-      arguments: ['@current_route_match']
-      tags:
-        - { name: 'context_provider' }
+    class: Drupal\taxonomy\ContextProvider\TermRouteContext
+    arguments: ['@current_route_match']
+    tags:
+      - { name: 'context_provider' }
diff --git a/web/core/modules/taxonomy/tests/modules/taxonomy_term_display_configurable_test/taxonomy_term_display_configurable_test.module b/web/core/modules/taxonomy/tests/modules/taxonomy_term_display_configurable_test/taxonomy_term_display_configurable_test.module
index 6114a9c45..3d0607894 100644
--- a/web/core/modules/taxonomy/tests/modules/taxonomy_term_display_configurable_test/taxonomy_term_display_configurable_test.module
+++ b/web/core/modules/taxonomy/tests/modules/taxonomy_term_display_configurable_test/taxonomy_term_display_configurable_test.module
@@ -2,8 +2,7 @@
 
 /**
  * @file
- * A module for testing making taxonomy_term base fields' displays
- * configurable.
+ * Tests configurable displays for taxonomy_term base fields.
  */
 
 use Drupal\Core\Entity\EntityTypeInterface;
diff --git a/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php b/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php
index deed0d403..17a7d992c 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/EarlyDateTest.php
@@ -25,6 +25,9 @@ class EarlyDateTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php b/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
index a746a5ceb..3278db9ed 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/LoadMultipleTest.php
@@ -17,14 +17,16 @@ class LoadMultipleTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser(['administer taxonomy']));
   }
 
   /**
-   * Create a vocabulary and some taxonomy terms, ensuring they're loaded
-   * correctly using entity_load_multiple().
+   * Tests entity_load_multiple().
    */
   public function testTaxonomyTermMultipleLoad() {
     // Create a vocabulary.
diff --git a/web/core/modules/taxonomy/tests/src/Functional/RssTest.php b/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
index 784df3747..f379df646 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/RssTest.php
@@ -6,8 +6,7 @@
 use Drupal\views\Views;
 
 /**
- * Ensure that data added as terms appears in RSS feeds if "RSS Category" format
- * is selected.
+ * Tests the taxonomy RSS display.
  *
  * @group taxonomy
  */
@@ -39,6 +38,9 @@ class RssTest extends TaxonomyTestBase {
    */
   protected $fieldName;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
deleted file mode 100644
index 38f5be61c..000000000
--- a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyImageTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Drupal\Tests\taxonomy\Functional;
-
-use Drupal\field\Entity\FieldConfig;
-use Drupal\Tests\TestFileCreationTrait;
-use Drupal\user\RoleInterface;
-use Drupal\file\Entity\File;
-use Drupal\field\Entity\FieldStorageConfig;
-
-/**
- * Tests access checks of private image fields.
- *
- * @group taxonomy
- */
-class TaxonomyImageTest extends TaxonomyTestBase {
-
-  use TestFileCreationTrait {
-    getTestFiles as drupalGetTestFiles;
-    compareFiles as drupalCompareFiles;
-  }
-
-  /**
-   * Used taxonomy vocabulary.
-   *
-   * @var \Drupal\taxonomy\VocabularyInterface
-   */
-  protected $vocabulary;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  protected static $modules = ['image'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  protected function setUp(): void {
-    parent::setUp();
-
-    // Remove access content permission from registered users.
-    user_role_revoke_permissions(RoleInterface::AUTHENTICATED_ID, ['access content']);
-
-    $this->vocabulary = $this->createVocabulary();
-    // Add a field to the vocabulary.
-    $entity_type = 'taxonomy_term';
-    $name = 'field_test';
-    FieldStorageConfig::create([
-      'field_name' => $name,
-      'entity_type' => $entity_type,
-      'type' => 'image',
-      'settings' => [
-        'uri_scheme' => 'private',
-      ],
-    ])->save();
-    FieldConfig::create([
-      'field_name' => $name,
-      'entity_type' => $entity_type,
-      'bundle' => $this->vocabulary->id(),
-      'settings' => [],
-    ])->save();
-    /** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
-    $display_repository = \Drupal::service('entity_display.repository');
-    $display_repository->getViewDisplay($entity_type, $this->vocabulary->id())
-      ->setComponent($name, [
-        'type' => 'image',
-        'settings' => [],
-      ])
-      ->save();
-    $display_repository->getFormDisplay($entity_type, $this->vocabulary->id())
-      ->setComponent($name, [
-        'type' => 'image_image',
-        'settings' => [],
-      ])
-      ->save();
-  }
-
-  public function testTaxonomyImageAccess() {
-    $user = $this->drupalCreateUser([
-      'administer site configuration',
-      'administer taxonomy',
-      'access user profiles',
-    ]);
-    $this->drupalLogin($user);
-
-    // Create a term and upload the image.
-    $files = $this->drupalGetTestFiles('image');
-    $image = array_pop($files);
-    $edit['name[0][value]'] = $this->randomMachineName();
-    $edit['files[field_test_0]'] = \Drupal::service('file_system')->realpath($image->uri);
-    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
-    $this->submitForm($edit, 'Save');
-    $this->submitForm(['field_test[0][alt]' => $this->randomMachineName()], 'Save');
-    $terms = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadByProperties(['name' => $edit['name[0][value]']]);
-    $term = reset($terms);
-    $this->assertSession()->pageTextContains('Created new term ' . $term->getName() . '.');
-
-    // Create a user that should have access to the file and one that doesn't.
-    $access_user = $this->drupalCreateUser(['access content']);
-    $no_access_user = $this->drupalCreateUser();
-    $image = File::load($term->field_test->target_id);
-
-    // Ensure a user that should be able to access the file can access it.
-    $this->drupalLogin($access_user);
-    $this->drupalGet($image->createFileUrl(FALSE));
-    $this->assertSession()->statusCodeEquals(200);
-
-    // Ensure a user that should not be able to access the file cannot access
-    // it.
-    $this->drupalLogin($no_access_user);
-    $this->drupalGet($image->createFileUrl(FALSE));
-    $this->assertSession()->statusCodeEquals(403);
-  }
-
-}
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
index 85b25ffe9..79ccce9ed 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TaxonomyTermIndentationTest.php
@@ -28,6 +28,9 @@ class TaxonomyTermIndentationTest extends TaxonomyTestBase {
    */
   protected $vocabulary;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser([
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
index f64a0af32..5e4b9784b 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermAutocompleteTest.php
@@ -149,7 +149,7 @@ protected function setUp(): void {
    * @param string|\Drupal\Core\Url $path
    *   Drupal path or URL to load into Mink controlled browser.
    * @param array $options
-   *   (optional) Options to be forwarded to the url generator.
+   *   (optional) Options to be forwarded to the URL generator.
    * @param string[] $headers
    *   (optional) An array containing additional HTTP request headers.
    *
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
index cf011b157..c5f708782 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermIndexTest.php
@@ -46,6 +46,9 @@ class TermIndexTest extends TaxonomyTestBase {
    */
   protected $fieldName2;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -62,7 +65,7 @@ protected function setUp(): void {
     $handler_settings = [
       'target_bundles' => [
         $this->vocabulary->id() => $this->vocabulary->id(),
-       ],
+      ],
       'auto_create' => TRUE,
     ];
     $this->createEntityReferenceField('node', 'article', $this->fieldName1, NULL, 'taxonomy_term', 'default', $handler_settings, FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED);
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
index 442de2318..974f14877 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermLanguageTest.php
@@ -26,6 +26,9 @@ class TermLanguageTest extends TaxonomyTestBase {
    */
   protected $vocabulary;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
index 087980f0c..186d4be40 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTest.php
@@ -56,6 +56,7 @@ protected function setUp(): void {
 
     $this->drupalLogin($this->drupalCreateUser([
       'administer taxonomy',
+      'access taxonomy overview',
       'bypass node access',
     ]));
     $this->vocabulary = $this->createVocabulary();
@@ -349,6 +350,9 @@ public function testTermInterface() {
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
     $this->submitForm($edit, 'Save');
 
+    // Ensure form redirected back to term add page.
+    $this->assertSession()->addressEquals('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
+
     $terms = \Drupal::entityTypeManager()->getStorage('taxonomy_term')->loadByProperties([
       'name' => $edit['name[0][value]'],
     ]);
@@ -373,6 +377,9 @@ public function testTermInterface() {
     $this->drupalGet('taxonomy/term/' . $term->id() . '/edit');
     $this->submitForm($edit, 'Save');
 
+    // Ensure form redirected back to term view.
+    $this->assertSession()->addressEquals('taxonomy/term/' . $term->id());
+
     // Check that the term is still present at admin UI after edit.
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/overview');
     $this->assertSession()->pageTextContains($edit['name[0][value]']);
@@ -431,6 +438,15 @@ public function testTermInterface() {
     // parameter is present.
     $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add', ['query' => ['destination' => 'node/add']]);
     $this->assertSession()->pageTextNotContains('Save and go to list');
+
+    // Validate that "Save and go to list" doesn't exist when missing permission
+    // 'access taxonomy overview'.
+    $this->drupalLogin($this->drupalCreateUser([
+      'administer taxonomy',
+      'bypass node access',
+    ]));
+    $this->drupalGet('admin/structure/taxonomy/manage/' . $this->vocabulary->id() . '/add');
+    $this->assertSession()->pageTextNotContains('Save and go to list');
   }
 
   /**
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
index a710b0c68..00ad913fa 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationFieldViewTest.php
@@ -46,6 +46,9 @@ class TermTranslationFieldViewTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->setupLanguages();
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
index 179b4adea..2b4ad7536 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php
@@ -43,6 +43,9 @@ class TermTranslationUITest extends ContentTranslationUITestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->entityTypeId = 'taxonomy_term';
     $this->bundle = 'tags';
diff --git a/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php b/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
index f3dc3dd59..b1f5abfa8 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/ThemeTest.php
@@ -14,6 +14,9 @@ class ThemeTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
index 38ae70bec..5df9d3920 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/TokenReplaceTest.php
@@ -7,8 +7,7 @@
 use Drupal\Core\Render\BubbleableMetadata;
 
 /**
- * Generates text using placeholders for dummy content to check taxonomy token
- * replacement.
+ * Tests taxonomy token replacement.
  *
  * @group taxonomy
  */
@@ -33,6 +32,9 @@ class TokenReplaceTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser([
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
index 201a0ed3f..6f646c109 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
@@ -57,6 +57,9 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
    */
   public $termNames = [];
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/Views/TermNameFieldTest.php b/web/core/modules/taxonomy/tests/src/Functional/Views/TermNameFieldTest.php
index 3baa27862..f49493cca 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/Views/TermNameFieldTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/Views/TermNameFieldTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\taxonomy\Functional\Views;
 
+use Drupal\Core\Link;
 use Drupal\views\Views;
 
 /**
@@ -48,6 +49,19 @@ public function testTermNameField() {
 
     $this->assertEquals(str_replace(' ', '-', $this->term1->getName()), $view->getStyle()->getField(0, 'name'));
     $this->assertEquals($this->term2->getName(), $view->getStyle()->getField(1, 'name'));
+
+    // Enable link_to_entity option and ensure that title is displayed properly.
+    $view = Views::getView('test_taxonomy_term_name');
+    $display =& $view->storage->getDisplay('default');
+    $display['display_options']['fields']['name']['convert_spaces'] = TRUE;
+    $display['display_options']['fields']['name']['settings']['link_to_entity'] = TRUE;
+    $view->storage->invalidateCaches();
+    $this->executeView($view);
+
+    $expected_link1 = Link::fromTextAndUrl(str_replace(' ', '-', $this->term1->getName()), $this->term1->toUrl());
+    $expected_link2 = Link::fromTextAndUrl($this->term2->getName(), $this->term2->toUrl());
+    $this->assertEquals($expected_link1->toString(), $view->getStyle()->getField(0, 'name'));
+    $this->assertEquals($expected_link2->toString(), $view->getStyle()->getField(1, 'name'));
   }
 
 }
diff --git a/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
index a706ab94b..1dad37e3b 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyLanguageTest.php
@@ -19,6 +19,9 @@ class VocabularyLanguageTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
index 1794ecde3..0cc633f5d 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyPermissionsTest.php
@@ -23,6 +23,9 @@ class VocabularyPermissionsTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php b/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
index 47bdfdb62..562111d7e 100644
--- a/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
+++ b/web/core/modules/taxonomy/tests/src/Functional/VocabularyUiTest.php
@@ -24,6 +24,9 @@ class VocabularyUiTest extends TaxonomyTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->drupalLogin($this->drupalCreateUser(['administer taxonomy']));
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
index c2afbe1f3..21a35daad 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php
@@ -84,7 +84,7 @@ protected function assertEntity(int $id, string $expected_language, string $expe
     $this->assertSame($expected_vid, $entity->bundle());
     $this->assertSame($expected_description, $entity->getDescription());
     $this->assertSame($expected_format, $entity->getFormat());
-    $this->assertSame($expected_weight, (int) $entity->getWeight());
+    $this->assertSame($expected_weight, $entity->getWeight());
     $this->assertHierarchy($expected_vid, $id, $expected_parents);
   }
 
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
index 01ed3550d..f602a7a4a 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTest.php
@@ -49,8 +49,7 @@ public function testTermNode() {
   }
 
   /**
-   * Tests that term associations are ignored when they belong to nodes which
-   * were not migrated.
+   * Tests that term relationships are ignored for un-migrated nodes.
    */
   public function testSkipNonExistentNode() {
     // Node 2 is migrated by d6_node__story, but we need to pretend that it
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
index 39c91d517..3a26b1bfc 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php
@@ -90,7 +90,7 @@ protected function assertEntity(int $id, string $expected_language, string $expe
     $this->assertEquals($expected_vid, $entity->bundle());
     $this->assertEquals($expected_description, $entity->getDescription());
     $this->assertEquals($expected_format, $entity->getFormat());
-    $this->assertEquals($expected_weight, (int) $entity->getWeight());
+    $this->assertEquals($expected_weight, $entity->getWeight());
     $this->assertEquals($expected_parents, $this->getParentIDs($id));
     $this->assertHierarchy($expected_vid, $id, $expected_parents);
     if (!is_null($expected_field_integer_value)) {
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php
index bd37bf6e3..f8acceff8 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php
@@ -95,7 +95,7 @@ protected function assertEntity(int $id, string $expected_language, string $expe
     $this->assertSame($expected_vid, $entity->bundle());
     $this->assertSame($expected_description, $entity->getDescription());
     $this->assertSame($expected_format, $entity->getFormat());
-    $this->assertSame($expected_weight, (int) $entity->getWeight());
+    $this->assertSame($expected_weight, $entity->getWeight());
     $this->assertHierarchy($expected_vid, $id, $expected_parents);
   }
 
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php
index fb0d80b1b..16f01ab7e 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php
@@ -80,7 +80,7 @@ protected function assertEntity(int $id, string $expected_language, string $expe
     $this->assertSame($expected_vid, $entity->bundle());
     $this->assertSame($expected_description, $entity->getDescription());
     $this->assertSame($expected_format, $entity->getFormat());
-    $this->assertSame($expected_weight, (int) $entity->getWeight());
+    $this->assertSame($expected_weight, $entity->getWeight());
     $this->assertHierarchy($expected_vid, $id, $expected_parents);
   }
 
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php b/web/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php
index f04788b9d..cf8c969da 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/Plugin/migrate/source/d7/TermLocalizedTranslationTest.php
@@ -153,7 +153,7 @@ public function providerSource() {
         'property' => 'description',
         'objectindex' => '5',
         'format' => 0,
-       ]);
+      ]);
     array_push($tests[1]['source_data']['locales_target'],
       [
         'lid' => 10,
@@ -170,7 +170,7 @@ public function providerSource() {
         'plid' => 0,
         'plural' => 0,
         'i18n_status' => 0,
-    ]);
+      ]);
 
     // The expected results.
     array_push($tests[1]['expected_data'],
@@ -225,7 +225,7 @@ public function providerSource() {
         'translation' => 'fr - description value 5',
         'name_translated' => 'fr - name value 5',
         'description_translated' => 'fr - description value 5',
-    ]);
+      ]);
 
     $tests[1]['expected_count'] = NULL;
     // Empty configuration will return terms for all vocabularies.
diff --git a/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php b/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
index 29e43b72b..5717ec762 100644
--- a/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
+++ b/web/core/modules/taxonomy/tests/src/Kernel/TermKernelTest.php
@@ -155,7 +155,7 @@ public function testTermPreview() {
     // Create a unsaved term.
     $term = $entity_manager->getStorage('taxonomy_term')->create([
       'vid' => $vocabulary->id(),
-      'name' => 'Inator',
+      'name' => 'Foo',
     ]);
 
     // Confirm we can get the view of unsaved term.
diff --git a/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php b/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
index 5bf7dd353..c90533fbe 100644
--- a/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
+++ b/web/core/modules/taxonomy/tests/src/Unit/Menu/TaxonomyLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class TaxonomyLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = ['taxonomy' => 'core/modules/taxonomy'];
     parent::setUp();
diff --git a/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php b/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
index 60ee25cbc..875f47ffa 100644
--- a/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
+++ b/web/core/modules/telephone/src/Plugin/Field/FieldFormatter/TelephoneLinkFormatter.php
@@ -35,7 +35,7 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $elements['title'] = [
       '#type' => 'textfield',
-      '#title' => t('Title to replace basic numeric telephone number display'),
+      '#title' => $this->t('Title to replace basic numeric telephone number display'),
       '#default_value' => $this->getSetting('title'),
     ];
 
@@ -50,10 +50,10 @@ public function settingsSummary() {
     $settings = $this->getSettings();
 
     if (!empty($settings['title'])) {
-      $summary[] = t('Link using text: @title', ['@title' => $settings['title']]);
+      $summary[] = $this->t('Link using text: @title', ['@title' => $settings['title']]);
     }
     else {
-      $summary[] = t('Link using provided telephone number.');
+      $summary[] = $this->t('Link using provided telephone number.');
     }
 
     return $summary;
diff --git a/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php b/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php
index 17fc9d5e4..3cec35805 100644
--- a/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php
+++ b/web/core/modules/telephone/src/Plugin/Field/FieldType/TelephoneItem.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Plugin implementation of the 'telephone' field type.
@@ -21,6 +22,11 @@
  */
 class TelephoneItem extends FieldItemBase {
 
+  /**
+   * The maximum length for a telephone value.
+   */
+  const MAX_LENGTH = 256;
+
   /**
    * {@inheritdoc}
    */
@@ -29,7 +35,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
       'columns' => [
         'value' => [
           'type' => 'varchar',
-          'length' => 256,
+          'length' => self::MAX_LENGTH,
         ],
       ],
     ];
@@ -40,7 +46,7 @@ public static function schema(FieldStorageDefinitionInterface $field_definition)
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('string')
-      ->setLabel(t('Telephone number'))
+      ->setLabel(new TranslatableMarkup('Telephone number'))
       ->setRequired(TRUE);
 
     return $properties;
@@ -61,12 +67,11 @@ public function getConstraints() {
     $constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
     $constraints = parent::getConstraints();
 
-    $max_length = 256;
     $constraints[] = $constraint_manager->create('ComplexData', [
       'value' => [
         'Length' => [
-          'max' => $max_length,
-          'maxMessage' => t('%name: the telephone number may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
+          'max' => self::MAX_LENGTH,
+          'maxMessage' => $this->t('%name: the telephone number may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => self::MAX_LENGTH]),
         ],
       ],
     ]);
diff --git a/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php b/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php
index 99db3c13f..688929e9f 100644
--- a/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php
+++ b/web/core/modules/telephone/src/Plugin/Field/FieldWidget/TelephoneDefaultWidget.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\telephone\Plugin\Field\FieldType\TelephoneItem;
 
 /**
  * Plugin implementation of the 'telephone_default' widget.
@@ -34,9 +35,9 @@ public static function defaultSettings() {
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['placeholder'] = [
       '#type' => 'textfield',
-      '#title' => t('Placeholder'),
+      '#title' => $this->t('Placeholder'),
       '#default_value' => $this->getSetting('placeholder'),
-      '#description' => t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
+      '#description' => $this->t('Text that will be shown inside the field until a value is entered. This hint is usually a sample value or a brief description of the expected format.'),
     ];
     return $element;
   }
@@ -49,10 +50,10 @@ public function settingsSummary() {
 
     $placeholder = $this->getSetting('placeholder');
     if (!empty($placeholder)) {
-      $summary[] = t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
+      $summary[] = $this->t('Placeholder: @placeholder', ['@placeholder' => $placeholder]);
     }
     else {
-      $summary[] = t('No placeholder');
+      $summary[] = $this->t('No placeholder');
     }
 
     return $summary;
@@ -66,6 +67,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
       '#type' => 'tel',
       '#default_value' => $items[$delta]->value ?? NULL,
       '#placeholder' => $this->getSetting('placeholder'),
+      '#maxlength' => TelephoneItem::MAX_LENGTH,
     ];
     return $element;
   }
diff --git a/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php b/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
index fcb5a4c0f..3c4e75065 100644
--- a/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
+++ b/web/core/modules/telephone/tests/src/Functional/TelephoneFieldTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\Tests\telephone\Functional;
 
 use Drupal\field\Entity\FieldConfig;
+use Drupal\telephone\Plugin\Field\FieldType\TelephoneItem;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 
@@ -89,6 +90,7 @@ protected function setUp(): void {
   public function testTelephoneWidget() {
     $this->drupalGet('node/add/article');
     $this->assertSession()->fieldValueEquals("field_telephone[0][value]", '');
+    $this->assertSession()->elementAttributeContains('css', 'input[name="field_telephone[0][value]"]', 'maxlength', TelephoneItem::MAX_LENGTH);
     $this->assertSession()->responseContains('placeholder="123-456-7890"');
   }
 
diff --git a/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php b/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
index 0dd6be6a2..0b793f93c 100644
--- a/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
+++ b/web/core/modules/telephone/tests/src/Kernel/TelephoneItemTest.php
@@ -23,6 +23,9 @@ class TelephoneItemTest extends FieldKernelTestBase {
    */
   protected static $modules = ['telephone'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php b/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
index 35dc4f70d..de10c9746 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldFormatter/TextTrimmedFormatter.php
@@ -44,11 +44,11 @@ public static function defaultSettings() {
    */
   public function settingsForm(array $form, FormStateInterface $form_state) {
     $element['trim_length'] = [
-      '#title' => t('Trimmed limit'),
+      '#title' => $this->t('Trimmed limit'),
       '#type' => 'number',
-      '#field_suffix' => t('characters'),
+      '#field_suffix' => $this->t('characters'),
       '#default_value' => $this->getSetting('trim_length'),
-      '#description' => t('If the summary is not set, the trimmed %label field will end at the last full sentence before this character limit.', ['%label' => $this->fieldDefinition->getLabel()]),
+      '#description' => $this->t('If the summary is not set, the trimmed %label field will end at the last full sentence before this character limit.', ['%label' => $this->fieldDefinition->getLabel()]),
       '#min' => 1,
       '#required' => TRUE,
     ];
@@ -60,7 +60,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
    */
   public function settingsSummary() {
     $summary = [];
-    $summary[] = t('Trimmed limit: @trim_length characters', ['@trim_length' => $this->getSetting('trim_length')]);
+    $summary[] = $this->t('Trimmed limit: @trim_length characters', ['@trim_length' => $this->getSetting('trim_length')]);
     return $summary;
   }
 
diff --git a/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php b/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
index dcee58346..47a23dcf7 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldType/TextItem.php
@@ -61,7 +61,7 @@ public function getConstraints() {
         'value' => [
           'Length' => [
             'max' => $max_length,
-            'maxMessage' => t('%name: the text may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
+            'maxMessage' => $this->t('%name: the text may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
           ],
         ],
       ]);
@@ -78,10 +78,10 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
 
     $element['max_length'] = [
       '#type' => 'number',
-      '#title' => t('Maximum length'),
+      '#title' => $this->t('Maximum length'),
       '#default_value' => $this->getSetting('max_length'),
       '#required' => TRUE,
-      '#description' => t('The maximum length of the field in characters.'),
+      '#description' => $this->t('The maximum length of the field in characters.'),
       '#min' => 1,
       '#disabled' => $has_data,
     ];
diff --git a/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php b/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
index 9c9a160e2..9437c381f 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldType/TextWithSummaryItem.php
@@ -5,6 +5,7 @@
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\TypedData\DataDefinition;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Plugin implementation of the 'text_with_summary' field type.
@@ -37,11 +38,11 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel
     $properties = parent::propertyDefinitions($field_definition);
 
     $properties['summary'] = DataDefinition::create('string')
-      ->setLabel(t('Summary'));
+      ->setLabel(new TranslatableMarkup('Summary'));
 
     $properties['summary_processed'] = DataDefinition::create('string')
-      ->setLabel(t('Processed summary'))
-      ->setDescription(t('The summary text with the text format applied.'))
+      ->setLabel(new TranslatableMarkup('Processed summary'))
+      ->setDescription(new TranslatableMarkup('The summary text with the text format applied.'))
       ->setComputed(TRUE)
       ->setClass('\Drupal\text\TextProcessed')
       ->setSetting('text source', 'summary');
@@ -91,15 +92,15 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
 
     $element['display_summary'] = [
       '#type' => 'checkbox',
-      '#title' => t('Summary input'),
+      '#title' => $this->t('Summary input'),
       '#default_value' => $settings['display_summary'],
-      '#description' => t('This allows authors to input an explicit summary, to be displayed instead of the automatically trimmed text when using the "Summary or trimmed" display type.'),
+      '#description' => $this->t('This allows authors to input an explicit summary, to be displayed instead of the automatically trimmed text when using the "Summary or trimmed" display type.'),
     ];
 
     $element['required_summary'] = [
       '#type' => 'checkbox',
-      '#title' => t('Require summary'),
-      '#description' => t('The summary will also be visible when marked as required.'),
+      '#title' => $this->t('Require summary'),
+      '#description' => $this->t('The summary will also be visible when marked as required.'),
       '#default_value' => $settings['required_summary'],
     ];
 
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
index 11e84f1c3..fc02ac1e9 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
@@ -46,7 +46,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    * {@inheritdoc}
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
-    if ($violation->arrayPropertyPath == ['format'] && isset($element['format']['#access']) && !$element['format']['#access']) {
+    if (isset($element['format']['#access']) && !$element['format']['#access'] && preg_match('/^[0-9]*\.format$/', $violation->getPropertyPath())) {
       // Ignore validation errors for formats if formats may not be changed,
       // such as when existing formats become invalid.
       // See \Drupal\filter\Element\TextFormat::processFormat().
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php
index 1dcb00b96..3b1f541d7 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWithSummaryWidget.php
@@ -38,7 +38,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     $element = parent::settingsForm($form, $form_state);
     $element['summary_rows'] = [
       '#type' => 'number',
-      '#title' => t('Summary rows'),
+      '#title' => $this->t('Summary rows'),
       '#default_value' => $this->getSetting('summary_rows'),
       '#description' => $element['rows']['#description'],
       '#required' => TRUE,
@@ -46,7 +46,7 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
     ];
     $element['show_summary'] = [
       '#type' => 'checkbox',
-      '#title' => t('Always show the summary field'),
+      '#title' => $this->t('Always show the summary field'),
       '#default_value' => $this->getSetting('show_summary'),
     ];
     return $element;
@@ -58,9 +58,9 @@ public function settingsForm(array $form, FormStateInterface $form_state) {
   public function settingsSummary() {
     $summary = parent::settingsSummary();
 
-    $summary[] = t('Number of summary rows: @rows', ['@rows' => $this->getSetting('summary_rows')]);
+    $summary[] = $this->t('Number of summary rows: @rows', ['@rows' => $this->getSetting('summary_rows')]);
     if ($this->getSetting('show_summary')) {
-      $summary[] = t('Summary field will always be visible');
+      $summary[] = $this->t('Summary field will always be visible');
     }
 
     return $summary;
@@ -78,10 +78,10 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     $element['summary'] = [
       '#type' => $display_summary ? 'textarea' : 'value',
       '#default_value' => $items[$delta]->summary,
-      '#title' => t('Summary'),
+      '#title' => $this->t('Summary'),
       '#rows' => $this->getSetting('summary_rows'),
       '#description' => !$required ? $this->t('Leave blank to use trimmed value of full text as the summary.') : '',
-      '#attributes' => ['class' => ['js-text-summary', 'text-summary']],
+      '#attributes' => ['class' => ['text-summary']],
       '#prefix' => '<div class="js-text-summary-wrapper text-summary-wrapper">',
       '#suffix' => '</div>',
       '#weight' => -10,
@@ -89,6 +89,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     ];
 
     if (!$this->getSetting('show_summary') && !$required) {
+      $element['summary']['#attributes']['class'][] = 'js-text-summary';
       $element['summary']['#attached']['library'][] = 'text/drupal.text';
     }
 
@@ -100,7 +101,8 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
     $element = parent::errorElement($element, $violation, $form, $form_state);
-    return ($element === FALSE) ? FALSE : $element[$violation->arrayPropertyPath[0]];
+    $property_path_array = explode('.', $violation->getPropertyPath());
+    return ($element === FALSE) ? FALSE : $element[$property_path_array[1]];
   }
 
 }
diff --git a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
index e6954cc1d..29934378f 100644
--- a/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
+++ b/web/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
@@ -37,7 +37,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    * {@inheritdoc}
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
-    if ($violation->arrayPropertyPath == ['format'] && isset($element['format']['#access']) && !$element['format']['#access']) {
+    if (isset($element['format']['#access']) && !$element['format']['#access'] && preg_match('/^[0-9]*\.format$/', $violation->getPropertyPath())) {
       // Ignore validation errors for formats that may not be changed,
       // such as when existing formats become invalid.
       // See \Drupal\filter\Element\TextFormat::processFormat().
diff --git a/web/core/modules/text/tests/src/Functional/TextFieldTest.php b/web/core/modules/text/tests/src/Functional/TextFieldTest.php
index 00d687fe6..b68c0d1f3 100644
--- a/web/core/modules/text/tests/src/Functional/TextFieldTest.php
+++ b/web/core/modules/text/tests/src/Functional/TextFieldTest.php
@@ -33,6 +33,9 @@ class TextFieldTest extends StringFieldTest {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php b/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php
index 12f8b9dc2..0867f962c 100644
--- a/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php
+++ b/web/core/modules/text/tests/src/FunctionalJavascript/TextareaWithSummaryTest.php
@@ -94,10 +94,50 @@ public function testTextSummaryBehavior() {
     ]);
 
     $this->drupalGet('node/' . $node->id() . '/edit');
+    $summary_field = $this->getSession()->getPage()->findField('edit-body-0-summary');
+
+    $this->assertEquals(TRUE, $summary_field->isVisible());
+  }
+
+  /**
+   * Tests that the textSummary behavior is not run for required summary fields.
+   */
+  public function testTextSummaryRequiredBehavior() {
+    // Test with field defaults.
+    $this->assertSummaryToggle();
+
+    // Create a second field with a required summary.
+    $field_name = mb_strtolower($this->randomMachineName());
+    $field_storage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'node',
+      'type' => 'text_with_summary',
+    ]);
+    $field_storage->save();
+    FieldConfig::create([
+      'field_storage' => $field_storage,
+      'bundle' => 'page',
+      'label' => $this->randomMachineName() . '_label',
+      'settings' => [
+        'display_summary' => TRUE,
+        'required_summary' => TRUE,
+      ],
+    ])->save();
+
+    /** @var \Drupal\Core\Entity\EntityDisplayRepositoryInterface $display_repository */
+    $display_repository = \Drupal::service('entity_display.repository');
+
+    $display_repository->getFormDisplay('node', 'page')
+      ->setComponent($field_name, [
+        'type' => 'text_textarea_with_summary',
+      ])
+      ->save();
+
+    $this->drupalGet('node/add/page');
     $page = $this->getSession()->getPage();
-    $summary_field = $page->findField('edit-body-0-summary');
+    $summary_field = $page->findField('edit-' . $field_name . '-0-summary');
 
-    $this->assertEquals(TRUE, $summary_field->isVisible(), 'Non-empty summary field is shown by default.');
+    $this->assertEquals(TRUE, $summary_field->isVisible());
   }
 
 }
diff --git a/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php b/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php
index acac900bf..c377c2e38 100644
--- a/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php
+++ b/web/core/modules/text/tests/src/Kernel/TextSummaryTest.php
@@ -30,6 +30,9 @@ class TextSummaryTest extends KernelTestBase {
     'entity_test',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -37,9 +40,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests an edge case where the first sentence is a question and
-   * subsequent sentences are not. This edge case is documented at
-   * https://www.drupal.org/node/180425.
+   * Tests text summaries for a question followed by a sentence.
    */
   public function testFirstSentenceQuestion() {
     $text = 'A question? A sentence. Another sentence.';
@@ -228,8 +229,9 @@ public function testLength() {
   }
 
   /**
-   * Tests text_summary() returns an empty string without any error when
-   * called with an invalid format.
+   * Tests text summaries with an invalid filter format.
+   *
+   * @see text_summary()
    */
   public function testInvalidFilterFormat() {
 
diff --git a/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php b/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
index 3a1ca9c4d..6630330bd 100644
--- a/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
+++ b/web/core/modules/text/tests/src/Kernel/TextWithSummaryItemTest.php
@@ -37,6 +37,9 @@ class TextWithSummaryItemTest extends FieldKernelTestBase {
    */
   protected $field;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php b/web/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
index af2ce704c..b3d0afb15 100644
--- a/web/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
+++ b/web/core/modules/text/tests/src/Unit/Migrate/d6/TextFieldTest.php
@@ -126,25 +126,25 @@ public function getFieldTypeProvider() {
     return [
       ['string_long', 'text_textfield', ['text_processing' => FALSE]],
       ['string', 'text_textfield', [
-          'text_processing' => FALSE,
-          'max_length' => 128,
-        ],
+        'text_processing' => FALSE,
+        'max_length' => 128,
+      ],
       ],
       ['string_long', 'text_textfield', [
-          'text_processing' => FALSE,
-          'max_length' => 4096,
-        ],
+        'text_processing' => FALSE,
+        'max_length' => 4096,
+      ],
       ],
       ['text_long', 'text_textfield', ['text_processing' => TRUE]],
       ['text', 'text_textfield', [
-          'text_processing' => TRUE,
-          'max_length' => 128,
-        ],
+        'text_processing' => TRUE,
+        'max_length' => 128,
+      ],
       ],
       ['text_long', 'text_textfield', [
-          'text_processing' => TRUE,
-          'max_length' => 4096,
-        ],
+        'text_processing' => TRUE,
+        'max_length' => 4096,
+      ],
       ],
       ['list_string', 'optionwidgets_buttons'],
       ['list_string', 'optionwidgets_select'],
diff --git a/web/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php b/web/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php
index ccc677b22..616a16e07 100644
--- a/web/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php
+++ b/web/core/modules/text/tests/src/Unit/Plugin/migrate/field/d6/TextFieldTest.php
@@ -126,25 +126,25 @@ public function getFieldTypeProvider() {
     return [
       ['string_long', 'text_textfield', ['text_processing' => FALSE]],
       ['string', 'text_textfield', [
-          'text_processing' => FALSE,
-          'max_length' => 128,
-        ],
+        'text_processing' => FALSE,
+        'max_length' => 128,
+      ],
       ],
       ['string_long', 'text_textfield', [
-          'text_processing' => FALSE,
-          'max_length' => 4096,
-        ],
+        'text_processing' => FALSE,
+        'max_length' => 4096,
+      ],
       ],
       ['text_long', 'text_textfield', ['text_processing' => TRUE]],
       ['text', 'text_textfield', [
-          'text_processing' => TRUE,
-          'max_length' => 128,
-        ],
+        'text_processing' => TRUE,
+        'max_length' => 128,
+      ],
       ],
       ['text_long', 'text_textfield', [
-          'text_processing' => TRUE,
-          'max_length' => 4096,
-        ],
+        'text_processing' => TRUE,
+        'max_length' => 4096,
+      ],
       ],
       ['list_string', 'optionwidgets_buttons'],
       ['list_string', 'optionwidgets_select'],
diff --git a/web/core/modules/text/text.js b/web/core/modules/text/text.js
index 8b8074cb5..7b54605af 100644
--- a/web/core/modules/text/text.js
+++ b/web/core/modules/text/text.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.textSummary = {
     attach: function attach(context, settings) {
@@ -14,18 +13,15 @@
         var $summaryLabel = $summary.find('label').eq(0);
         var $full = $widget.children('.js-form-type-textarea');
         var $fullLabel = $full.find('label').eq(0);
-
         if ($fullLabel.length === 0) {
           $fullLabel = $('<label></label>').prependTo($full);
         }
-
         if ($fullLabel.hasClass('visually-hidden')) {
           $fullLabel.html(function (index, oldHtml) {
             return "<span class=\"visually-hidden\">".concat(oldHtml, "</span>");
           });
           $fullLabel.removeClass('visually-hidden');
         }
-
         var $link = $("<span class=\"field-edit-link\"> (<button type=\"button\" class=\"link link-edit-summary\">".concat(Drupal.t('Hide summary'), "</button>)</span>"));
         var $button = $link.find('button');
         var toggleClick = true;
@@ -39,11 +35,9 @@
             $button.html(Drupal.t('Hide summary'));
             $link.appendTo($summaryLabel);
           }
-
           e.preventDefault();
           toggleClick = !toggleClick;
         }).appendTo($summaryLabel);
-
         if (summary.value === '') {
           $link.trigger('click');
         }
diff --git a/web/core/modules/text/text.module b/web/core/modules/text/text.module
index 509b3b724..c0a03c62f 100644
--- a/web/core/modules/text/text.module
+++ b/web/core/modules/text/text.module
@@ -58,7 +58,7 @@ function text_help($route_name, RouteMatchInterface $route_match) {
  *   The desired character length of the summary. If omitted, the default value
  *   will be used. Ignored if the special delimiter is present in $text.
  *
- * @return
+ * @return string
  *   The generated summary.
  */
 function text_summary($text, $format = NULL, $size = NULL) {
diff --git a/web/core/modules/toolbar/css/toolbar.theme.css b/web/core/modules/toolbar/css/toolbar.theme.css
index 0416c056a..bdc6c3f18 100644
--- a/web/core/modules/toolbar/css/toolbar.theme.css
+++ b/web/core/modules/toolbar/css/toolbar.theme.css
@@ -85,7 +85,8 @@
 .toolbar .toolbar-tray-horizontal .toolbar-tray {
   background-color: #f5f5f5;
 }
-.toolbar-tray a {
+.toolbar-tray a,
+.toolbar-tray a:visited {
   padding: 1em 1.3333em;
   cursor: pointer;
   text-decoration: none;
diff --git a/web/core/modules/toolbar/js/escapeAdmin.js b/web/core/modules/toolbar/js/escapeAdmin.js
index 9d51e33b9..d1fd80b94 100644
--- a/web/core/modules/toolbar/js/escapeAdmin.js
+++ b/web/core/modules/toolbar/js/escapeAdmin.js
@@ -4,20 +4,16 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   var pathInfo = drupalSettings.path;
   var escapeAdminPath = sessionStorage.getItem('escapeAdminPath');
   var windowLocation = window.location;
-
   if (!pathInfo.currentPathIsAdmin && !/destination=/.test(windowLocation.search)) {
     sessionStorage.setItem('escapeAdminPath', windowLocation);
   }
-
   Drupal.behaviors.escapeAdmin = {
     attach: function attach() {
       var toolbarEscape = once('escapeAdmin', '[data-toolbar-escape-admin]');
-
       if (toolbarEscape.length && pathInfo.currentPathIsAdmin) {
         if (escapeAdminPath !== null) {
           $(toolbarEscape).attr('href', escapeAdminPath);
diff --git a/web/core/modules/toolbar/js/models/MenuModel.js b/web/core/modules/toolbar/js/models/MenuModel.js
index e3217fff9..277c29a7a 100644
--- a/web/core/modules/toolbar/js/models/MenuModel.js
+++ b/web/core/modules/toolbar/js/models/MenuModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Backbone, Drupal) {
   Drupal.toolbar.MenuModel = Backbone.Model.extend({
     defaults: {
diff --git a/web/core/modules/toolbar/js/models/ToolbarModel.js b/web/core/modules/toolbar/js/models/ToolbarModel.js
index 8bf91dafa..393ab91dc 100644
--- a/web/core/modules/toolbar/js/models/ToolbarModel.js
+++ b/web/core/modules/toolbar/js/models/ToolbarModel.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Backbone, Drupal) {
   Drupal.toolbar.ToolbarModel = Backbone.Model.extend({
     defaults: {
diff --git a/web/core/modules/toolbar/js/toolbar.js b/web/core/modules/toolbar/js/toolbar.js
index 53e052ba6..47177120d 100644
--- a/web/core/modules/toolbar/js/toolbar.js
+++ b/web/core/modules/toolbar/js/toolbar.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   var options = $.extend({
     breakpoints: {
@@ -23,7 +22,6 @@
       if (!window.matchMedia('only screen').matches) {
         return;
       }
-
       once('toolbar', '#toolbar-administration', context).forEach(function (toolbar) {
         var model = new Drupal.toolbar.ToolbarModel({
           locked: JSON.parse(localStorage.getItem('Drupal.toolbar.trayVerticalLocked')),
@@ -78,18 +76,15 @@
         }).on('change:activeTray', function (model, tray) {
           $(document).trigger('drupalToolbarTrayChange', tray);
         });
-
         if (Drupal.toolbar.models.toolbarModel.get('orientation') === 'horizontal' && Drupal.toolbar.models.toolbarModel.get('activeTab') === null) {
           Drupal.toolbar.models.toolbarModel.set({
             activeTab: $('.toolbar-bar .toolbar-tab:not(.home-toolbar-tab) a').get(0)
           });
         }
-
         $(window).on({
           'dialog:aftercreate': function dialogAftercreate(event, dialog, $element, settings) {
             var $toolbar = $('#toolbar-bar');
             $toolbar.css('margin-top', '0');
-
             if (settings.drupalOffCanvasPosition === 'top') {
               var height = Drupal.offCanvas.getContainer($element).outerHeight();
               $toolbar.css('margin-top', "".concat(height, "px"));
@@ -118,7 +113,6 @@
             isOriented: mql.matches,
             isTrayToggleVisible: false
           });
-
           if (!mql.matches || !model.get('orientation')) {
             model.set({
               orientation: 'vertical'
@@ -126,15 +120,12 @@
               validate: true
             });
           }
-
           break;
-
         case 'toolbar.standard':
           model.set({
             isFixed: mql.matches
           });
           break;
-
         case 'toolbar.wide':
           model.set({
             orientation: mql.matches && !model.get('locked') ? 'horizontal' : 'vertical'
@@ -145,17 +136,14 @@
             isTrayToggleVisible: mql.matches
           });
           break;
-
         default:
           break;
       }
     }
   };
-
   Drupal.theme.toolbarOrientationToggle = function () {
     return '<div class="toolbar-toggle-orientation"><div class="toolbar-lining">' + '<button class="toolbar-icon" type="button"></button>' + '</div></div>';
   };
-
   Drupal.AjaxCommands.prototype.setToolbarSubtrees = function (ajax, response, status) {
     Drupal.toolbar.setSubtrees.resolve(response.subtrees);
   };
diff --git a/web/core/modules/toolbar/js/toolbar.menu.js b/web/core/modules/toolbar/js/toolbar.menu.js
index 9e22f3a1a..2d5645218 100644
--- a/web/core/modules/toolbar/js/toolbar.menu.js
+++ b/web/core/modules/toolbar/js/toolbar.menu.js
@@ -4,16 +4,13 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   var activeItem = Drupal.url(drupalSettings.path.currentPath);
-
   $.fn.drupalToolbarMenu = function () {
     var ui = {
       handleOpen: Drupal.t('Extend'),
       handleClose: Drupal.t('Collapse')
     };
-
     function toggleList($item, switcher) {
       var $toggle = $item.children('.toolbar-box').children('.toolbar-handle');
       switcher = typeof switcher !== 'undefined' ? switcher : !$item.hasClass('open');
@@ -23,7 +20,6 @@
         element.textContent = switcher ? ui.handleClose : ui.handleOpen;
       });
     }
-
     function toggleClickHandler(event) {
       var $toggle = $(event.target);
       var $item = $toggle.closest('li');
@@ -31,15 +27,12 @@
       var $openItems = $item.siblings().filter('.open');
       toggleList($openItems, false);
     }
-
     function linkClickHandler(event) {
       if (!Drupal.toolbar.models.toolbarModel.get('isFixed')) {
         Drupal.toolbar.models.toolbarModel.set('activeTab', null);
       }
-
       event.stopPropagation();
     }
-
     function initItems($menu) {
       var options = {
         class: 'toolbar-icon toolbar-handle',
@@ -49,7 +42,6 @@
       $menu.find('li > a').wrap('<div class="toolbar-box">');
       $menu.find('li').each(function (index, element) {
         var $item = $(element);
-
         if ($item.children('ul.toolbar-menu').length) {
           var $box = $item.children('.toolbar-box');
           var $link = $box.find('a');
@@ -60,34 +52,27 @@
         }
       });
     }
-
     function markListLevels($lists, level) {
       level = !level ? 1 : level;
       var $lis = $lists.children('li').addClass("level-".concat(level));
       $lists = $lis.children('ul');
-
       if ($lists.length) {
         markListLevels($lists, level + 1);
       }
     }
-
     function openActiveItem($menu) {
       var pathItem = $menu.find("a[href=\"".concat(window.location.pathname, "\"]"));
-
       if (pathItem.length && !activeItem) {
         activeItem = window.location.pathname;
       }
-
       if (activeItem) {
         var $activeItem = $menu.find("a[href=\"".concat(activeItem, "\"]")).addClass('menu-item--active');
         var $activeTrail = $activeItem.parentsUntil('.root', 'li').addClass('menu-item--active-trail');
         toggleList($activeTrail, true);
       }
     }
-
     return this.each(function (selector) {
       var menu = once('toolbar-menu', this);
-
       if (menu.length) {
         var $menu = $(menu);
         $menu.on('click.toolbar', '.toolbar-box', toggleClickHandler).on('click.toolbar', '.toolbar-box a', linkClickHandler);
@@ -98,7 +83,6 @@
       }
     });
   };
-
   Drupal.theme.toolbarMenuItemToggle = function (options) {
     return "<button class=\"".concat(options.class, "\"><span class=\"action\">").concat(options.action, "</span> <span class=\"label\">").concat(options.text, "</span></button>");
   };
diff --git a/web/core/modules/toolbar/js/views/BodyVisualView.js b/web/core/modules/toolbar/js/views/BodyVisualView.js
index 71293844f..fd1982836 100644
--- a/web/core/modules/toolbar/js/views/BodyVisualView.js
+++ b/web/core/modules/toolbar/js/views/BodyVisualView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, Backbone) {
   Drupal.toolbar.BodyVisualView = Backbone.View.extend({
     initialize: function initialize() {
diff --git a/web/core/modules/toolbar/js/views/MenuVisualView.js b/web/core/modules/toolbar/js/views/MenuVisualView.js
index 2cbd95067..5b8f6dc28 100644
--- a/web/core/modules/toolbar/js/views/MenuVisualView.js
+++ b/web/core/modules/toolbar/js/views/MenuVisualView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Backbone, Drupal) {
   Drupal.toolbar.MenuVisualView = Backbone.View.extend({
     initialize: function initialize() {
@@ -12,12 +11,10 @@
     },
     render: function render() {
       var _this = this;
-
       var subtrees = this.model.get('subtrees');
       Object.keys(subtrees || {}).forEach(function (id) {
         $(once('toolbar-subtrees', _this.$el.find("#toolbar-link-".concat(id)))).after(subtrees[id]);
       });
-
       if ('drupalToolbarMenu' in $.fn) {
         this.$el.children('.toolbar-menu').drupalToolbarMenu();
       }
diff --git a/web/core/modules/toolbar/js/views/ToolbarAuralView.js b/web/core/modules/toolbar/js/views/ToolbarAuralView.js
index fae40f334..d7297ec04 100644
--- a/web/core/modules/toolbar/js/views/ToolbarAuralView.js
+++ b/web/core/modules/toolbar/js/views/ToolbarAuralView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Backbone, Drupal) {
   Drupal.toolbar.ToolbarAuralView = Backbone.View.extend({
     initialize: function initialize(options) {
@@ -19,15 +18,12 @@
     },
     onActiveTrayChange: function onActiveTrayChange(model, tray) {
       var relevantTray = tray === null ? model.previous('activeTray') : tray;
-
       if (!relevantTray) {
         return;
       }
-
       var action = tray === null ? Drupal.t('closed') : Drupal.t('opened');
       var trayNameElement = relevantTray.querySelector('.toolbar-tray-name');
       var text;
-
       if (trayNameElement !== null) {
         text = Drupal.t('Tray "@tray" @action.', {
           '@tray': trayNameElement.textContent,
@@ -38,7 +34,6 @@
           '@action': action
         });
       }
-
       Drupal.announce(text);
     }
   });
diff --git a/web/core/modules/toolbar/js/views/ToolbarVisualView.js b/web/core/modules/toolbar/js/views/ToolbarVisualView.js
index c9f109dcb..1b354ea2a 100644
--- a/web/core/modules/toolbar/js/views/ToolbarVisualView.js
+++ b/web/core/modules/toolbar/js/views/ToolbarVisualView.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings, Backbone) {
   Drupal.toolbar.ToolbarVisualView = Backbone.View.extend({
     events: function events() {
@@ -12,7 +11,6 @@
         event.preventDefault();
         event.target.click();
       };
-
       return {
         'click .toolbar-bar .toolbar-tab .trigger': 'onTabClick',
         'click .toolbar-toggle-orientation button': 'onOrientationToggleClick',
@@ -51,11 +49,9 @@
       this.updateTrayOrientation();
       this.updateBarAttributes();
       $('body').removeClass('toolbar-loading');
-
       if (this.model.changed.orientation === 'vertical' || this.model.changed.activeTab) {
         this.loadSubtrees();
       }
-
       return this;
     },
     onTabClick: function onTabClick(event) {
@@ -71,13 +67,11 @@
       var orientation = this.model.get('orientation');
       var antiOrientation = orientation === 'vertical' ? 'horizontal' : 'vertical';
       var locked = antiOrientation === 'vertical';
-
       if (locked) {
         localStorage.setItem('Drupal.toolbar.trayVerticalLocked', 'true');
       } else {
         localStorage.removeItem('Drupal.toolbar.trayVerticalLocked');
       }
-
       this.model.set({
         locked: locked,
         orientation: antiOrientation
@@ -92,18 +86,14 @@
       var $tab = $(this.model.get('activeTab'));
       $(this.model.previous('activeTab')).removeClass('is-active').prop('aria-pressed', false);
       $(this.model.previous('activeTray')).removeClass('is-active');
-
       if ($tab.length > 0) {
         $tab.addClass('is-active').prop('aria-pressed', true);
         var name = $tab.attr('data-toolbar-tray');
         var id = $tab.get(0).id;
-
         if (id) {
           localStorage.setItem('Drupal.toolbar.activeTabID', JSON.stringify(id));
         }
-
         var $tray = this.$el.find("[data-toolbar-tray=\"".concat(name, "\"].toolbar-tray"));
-
         if ($tray.length) {
           $tray.addClass('is-active');
           this.model.set('activeTray', $tray.get(0));
@@ -117,13 +107,11 @@
     },
     updateBarAttributes: function updateBarAttributes() {
       var isOriented = this.model.get('isOriented');
-
       if (isOriented) {
         this.$el.find('.toolbar-bar').attr('data-offset-top', '');
       } else {
         this.$el.find('.toolbar-bar').removeAttr('data-offset-top');
       }
-
       this.$el.toggleClass('toolbar-oriented', isOriented);
     },
     updateTrayOrientation: function updateTrayOrientation() {
@@ -147,7 +135,6 @@
     },
     adjustPlacement: function adjustPlacement() {
       var $trays = this.$el.find('.toolbar-tray');
-
       if (!this.model.get('isOriented')) {
         $trays.removeClass('toolbar-tray-horizontal').addClass('toolbar-tray-vertical');
       }
@@ -155,7 +142,6 @@
     loadSubtrees: function loadSubtrees() {
       var $activeTab = $(this.model.get('activeTab'));
       var orientation = this.model.get('orientation');
-
       if (!this.model.get('areSubtreesLoaded') && typeof $activeTab.data('drupal-subtrees') !== 'undefined' && orientation === 'vertical') {
         var subtreesHash = drupalSettings.toolbar.subtreesHash;
         var theme = drupalSettings.ajaxPageState.theme;
@@ -163,7 +149,6 @@
         var cachedSubtreesHash = localStorage.getItem("Drupal.toolbar.subtreesHash.".concat(theme));
         var cachedSubtrees = JSON.parse(localStorage.getItem("Drupal.toolbar.subtrees.".concat(theme)));
         var isVertical = this.model.get('orientation') === 'vertical';
-
         if (isVertical && subtreesHash === cachedSubtreesHash && cachedSubtrees) {
           Drupal.toolbar.setSubtrees.resolve(cachedSubtrees);
         } else if (isVertical) {
diff --git a/web/core/modules/toolbar/src/Controller/ToolbarController.php b/web/core/modules/toolbar/src/Controller/ToolbarController.php
index f3a3f2f6a..c683494f5 100644
--- a/web/core/modules/toolbar/src/Controller/ToolbarController.php
+++ b/web/core/modules/toolbar/src/Controller/ToolbarController.php
@@ -108,7 +108,7 @@ public static function preRenderGetRenderedSubtrees(array $data) {
     $tree = $menu_tree->transform($tree, $manipulators);
     $subtrees = [];
     // Calculated the combined cacheability of all subtrees.
-    $cacheability = new CacheableMetadata();
+    $cacheability = CacheableMetadata::createFromRenderArray($data);
     foreach ($tree as $element) {
       /** @var \Drupal\Core\Menu\MenuLinkInterface $link */
       $link = $element->link;
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
index 2b2ef5a3c..2d69089d6 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarAdminMenuTest.php
@@ -72,6 +72,9 @@ class ToolbarAdminMenuTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -111,8 +114,10 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests the toolbar_modules_installed() and toolbar_modules_uninstalled() hook
-   * implementations.
+   * Tests Toolbar's responses to installing and uninstalling modules.
+   *
+   * @see toolbar_modules_installed()
+   * @see toolbar_modules_uninstalled()
    */
   public function testModuleStatusChangeSubtreesHashCacheClear() {
     // Use an admin role to ensure the user has all available permissions. This
@@ -171,8 +176,10 @@ public function testMenuLinkUpdateSubtreesHashCacheClear() {
   }
 
   /**
-   * Exercises the toolbar_user_role_update() and toolbar_user_update() hook
-   * implementations.
+   * Tests Toolbar's responses to user data updates.
+   *
+   * @see toolbar_user_role_update()
+   * @see toolbar_user_update()
    */
   public function testUserRoleUpdateSubtreesHashCacheClear() {
     // Find the new role ID.
@@ -237,8 +244,7 @@ public function testUserRoleUpdateSubtreesHashCacheClear() {
   }
 
   /**
-   * Tests that changes to a user account by another user clears the changed
-   * account's toolbar cached, not the user's who took the action.
+   * Tests cache invalidation when one user modifies another user.
    */
   public function testNonCurrentUserAccountUpdates() {
     $admin_user_id = $this->adminUser->id();
@@ -451,8 +457,10 @@ private function getSubtreesHash() {
   }
 
   /**
-   * Asserts the subtrees hash on a fresh page GET is different from the hash
-   * from the previous page GET.
+   * Checks the subtree hash of the current page with that of the previous page.
+   *
+   * Asserts that the subtrees hash on a fresh page GET is different from the
+   * subtree hash from the previous page GET.
    *
    * @internal
    */
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
index d04042a9e..3600efb19 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarHookToolbarTest.php
@@ -30,6 +30,9 @@ class ToolbarHookToolbarTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php b/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
index 0fb7fbeb2..3079352f8 100644
--- a/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
+++ b/web/core/modules/toolbar/tests/src/Functional/ToolbarMenuTranslationTest.php
@@ -35,6 +35,9 @@ class ToolbarMenuTranslationTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php b/web/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php
index 287c0b4d7..279578bbb 100644
--- a/web/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php
+++ b/web/core/modules/toolbar/tests/src/Unit/PageCache/AllowToolbarPathTest.php
@@ -20,6 +20,9 @@ class AllowToolbarPathTest extends UnitTestCase {
    */
   protected $policy;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->policy = new AllowToolbarPath();
   }
diff --git a/web/core/modules/toolbar/toolbar.api.php b/web/core/modules/toolbar/toolbar.api.php
index 34be7a815..bf2ddf362 100644
--- a/web/core/modules/toolbar/toolbar.api.php
+++ b/web/core/modules/toolbar/toolbar.api.php
@@ -36,7 +36,7 @@
  *
  * This hook is invoked in Toolbar::preRenderToolbar().
  *
- * @return
+ * @return array
  *   An array of toolbar items, keyed by unique identifiers such as 'home' or
  *   'administration', or the short name of the module implementing the hook.
  *   The corresponding value is a render element of type 'toolbar_item'.
diff --git a/web/core/modules/tour/js/tour.js b/web/core/modules/tour/js/tour.js
index c9bf7798c..162288dfb 100644
--- a/web/core/modules/tour/js/tour.js
+++ b/web/core/modules/tour/js/tour.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Backbone, Drupal, settings, document, Shepherd) {
   var queryString = decodeURI(window.location.search);
   Drupal.behaviors.tour = {
@@ -18,11 +17,9 @@
         model.on('change:isActive', function (tourModel, isActive) {
           $(document).trigger(isActive ? 'drupalTourStarted' : 'drupalTourStopped');
         });
-
         if (settings._tour_internal) {
           model.set('tour', settings._tour_internal);
         }
-
         if (/tour=?/i.test(queryString)) {
           model.set('isActive', true);
         }
@@ -57,10 +54,8 @@
     toggleTour: function toggleTour() {
       if (this.model.get('isActive')) {
         this._removeIrrelevantTourItems(this._getTour());
-
         var tourItems = this.model.get('tour');
         var that = this;
-
         if (tourItems.length) {
           settings.tourShepherdConfig.defaultStepOptions.popperOptions.modifiers.push({
             name: 'moveArrowJoyridePosition',
@@ -70,7 +65,6 @@
               var state = _ref.state;
               var arrow = state.elements.arrow;
               var placement = state.placement;
-
               if (arrow && /^top|bottom/.test(placement) && /-start|-end$/.test(placement)) {
                 var horizontalPosition = placement.split('-')[1];
                 var offset = horizontalPosition === 'start' ? 28 : state.elements.popper.clientWidth - 56;
@@ -100,7 +94,6 @@
               show: function show() {
                 var nextButton = shepherdTour.currentStep.el.querySelector('footer button');
                 nextButton.focus();
-
                 if (Drupal.tour.hasOwnProperty('convertToJoyrideMarkup')) {
                   Drupal.tour.convertToJoyrideMarkup(shepherdTour);
                 }
@@ -136,17 +129,14 @@
         if (tips && tourItem.hasOwnProperty('classes') && tourItem.classes.indexOf(tips[1]) === -1) {
           return false;
         }
-
         return !(tourItem.selector && !document.querySelector(tourItem.selector));
       });
-
       if (tourItems.length !== filteredTour.length) {
         filteredTour.forEach(function (filteredTourItem, filteredTourItemId) {
           filteredTour[filteredTourItemId].counter = Drupal.t('!tour_item of !total', {
             '!tour_item': filteredTourItemId + 1,
             '!total': filteredTour.length
           });
-
           if (filteredTourItemId === filteredTour.length - 1) {
             filteredTour[filteredTourItemId].cancelText = Drupal.t('End tour');
           }
@@ -155,7 +145,6 @@
       }
     }
   });
-
   Drupal.tour.nextButton = function (shepherdTour, tourStepConfig) {
     return {
       classes: 'button button--primary',
@@ -163,7 +152,6 @@
       action: tourStepConfig.cancelText ? shepherdTour.cancel : shepherdTour.next
     };
   };
-
   Drupal.theme.tourItemContent = function (tourStepConfig) {
     return "".concat(tourStepConfig.body, "<div class=\"tour-progress\">").concat(tourStepConfig.counter, "</div>");
   };
diff --git a/web/core/modules/tour/src/TourViewBuilder.php b/web/core/modules/tour/src/TourViewBuilder.php
index d9b7c658f..105563ad5 100644
--- a/web/core/modules/tour/src/TourViewBuilder.php
+++ b/web/core/modules/tour/src/TourViewBuilder.php
@@ -60,7 +60,7 @@ public function viewMultiple(array $entities = [], $view_mode = 'full', $langcod
           $body = (string) \Drupal::service('renderer')->renderPlain($body_render_array);
           $output = [
             'body' => $body,
-            'title' => Html::escape($tip->getLabel()),
+            'title' => $tip->getLabel(),
           ];
 
           $selector = $tip->getSelector();
@@ -111,8 +111,8 @@ public function viewMultiple(array $entities = [], $view_mode = 'full', $langcod
               '@total' => $total_tips,
             ]),
             'attachTo' => [
-               'element' => $selector,
-               'on' => $location ?? 'bottom-start',
+              'element' => $selector,
+              'on' => $location ?? 'bottom-start',
             ],
             // Shepherd expects classes to be provided as a string.
             'classes' => implode(' ', $classes),
diff --git a/web/core/modules/tour/tests/src/Functional/TourTest.php b/web/core/modules/tour/tests/src/Functional/TourTest.php
index c15d00f95..aaf2a781a 100644
--- a/web/core/modules/tour/tests/src/Functional/TourTest.php
+++ b/web/core/modules/tour/tests/src/Functional/TourTest.php
@@ -56,7 +56,7 @@ protected function setUp(): void {
     parent::setUp();
 
     $this->drupalPlaceBlock('local_actions_block', [
-      'theme' => 'seven',
+      'theme' => 'claro',
       'region' => 'content',
     ]);
   }
@@ -158,7 +158,7 @@ public function testTourFunctionality() {
         'tour-test-1' => [
           'id' => 'tour-code-test-1',
           'plugin' => 'text',
-          'label' => 'The rain in spain',
+          'label' => 'The rain in spain is <strong>strong</strong>',
           'body' => 'Falls mostly on the plain.',
           'weight' => '100',
           'selector' => '#tour-code-test-1',
@@ -194,7 +194,7 @@ public function testTourFunctionality() {
 
     $elements = $this->findTip([
       'id' => 'tour-code-test-1',
-      'title' => 'The rain in spain',
+      'title' => 'The rain in spain is <strong>strong</strong>',
     ]);
     $this->assertCount(1, $elements, 'Found the required tip markup for tip 4');
 
diff --git a/web/core/modules/tour/tests/src/Functional/TourTestBase.php b/web/core/modules/tour/tests/src/Functional/TourTestBase.php
index 21b6f3fe1..8a55f1e4f 100644
--- a/web/core/modules/tour/tests/src/Functional/TourTestBase.php
+++ b/web/core/modules/tour/tests/src/Functional/TourTestBase.php
@@ -11,8 +11,7 @@
 abstract class TourTestBase extends BrowserTestBase {
 
   /**
-   * Assert function to determine if tips rendered to the page
-   * have a corresponding page element.
+   * Asserts the presence of page elements for tour tips.
    *
    * @code
    * // Basic example.
diff --git a/web/core/modules/tour/tests/src/Functional/TourTestBasic.php b/web/core/modules/tour/tests/src/Functional/TourTestBasic.php
index 2f4d9674d..fb2fec7a0 100644
--- a/web/core/modules/tour/tests/src/Functional/TourTestBasic.php
+++ b/web/core/modules/tour/tests/src/Functional/TourTestBasic.php
@@ -39,15 +39,18 @@ abstract class TourTestBasic extends TourTestBase {
    */
   protected $permissions = ['access tour'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
     // Make sure we are using distinct default and administrative themes for
     // the duration of these tests.
-    $this->container->get('theme_installer')->install(['bartik', 'seven']);
+    $this->container->get('theme_installer')->install(['olivero', 'claro']);
     $this->config('system.theme')
-      ->set('default', 'bartik')
-      ->set('admin', 'seven')
+      ->set('default', 'olivero')
+      ->set('admin', 'claro')
       ->save();
 
     $this->permissions[] = 'view the administration theme';
diff --git a/web/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php b/web/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php
index eefdc4d52..2217f73bd 100644
--- a/web/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php
+++ b/web/core/modules/tour/tests/src/FunctionalJavascript/TourLegacyTest.php
@@ -135,9 +135,9 @@ private function assertToolTipMarkup(int $index, string $nub_position, string $j
    */
   public function providerTestTourTipMarkup() {
     return [
-      'Using the the deprecated TipPlugin with Stable theme' => ['tour-test-legacy'],
+      'Using the deprecated TipPlugin with Stable theme' => ['tour-test-legacy'],
       'Using current TourTipPlugin with Stable theme' => ['tour-test-1'],
-      'Using the the deprecated TipPlugin with Stable 9 theme' => ['tour-test-legacy', 'stable9'],
+      'Using the deprecated TipPlugin with Stable 9 theme' => ['tour-test-legacy', 'stable9'],
       'Using current TourTipPlugin with Stable 9 theme' => ['tour-test-1', 'stable9'],
     ];
   }
diff --git a/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php b/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php
index 214317528..b1f3db0bb 100644
--- a/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php
+++ b/web/core/modules/tour/tests/src/Unit/Entity/TourTest.php
@@ -34,7 +34,7 @@ public function testHasMatchingRoute($routes, $route_name, $route_params, $resul
 
     $tour->expects($this->any())
       ->method('getRoutes')
-      ->will($this->returnValue($routes));
+      ->willReturn($routes);
 
     $this->assertSame($result, $tour->hasMatchingRoute($route_name, $route_params));
 
diff --git a/web/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php b/web/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
index 763b76b6a..a54a19541 100644
--- a/web/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
+++ b/web/core/modules/tour/tests/tour_test/src/Plugin/tour/tip/TipPluginImage.php
@@ -19,10 +19,10 @@
 class TipPluginImage extends TipPluginBase implements ContainerFactoryPluginInterface, TourTipPluginInterface {
 
   /**
-   * The url which is used for the image in this Tip.
+   * The URL which is used for the image in this Tip.
    *
    * @var string
-   *   A url used for the image.
+   *   A URL used for the image.
    */
   protected $url;
 
diff --git a/web/core/modules/tour/tour.libraries.yml b/web/core/modules/tour/tour.libraries.yml
index 280eb1e59..e70419927 100644
--- a/web/core/modules/tour/tour.libraries.yml
+++ b/web/core/modules/tour/tour.libraries.yml
@@ -9,7 +9,7 @@ tour:
     - core/drupal
     # @todo Remove this in https://www.drupal.org/project/drupal/issues/3204011
     - core/internal.backbone
-    - core/shepherd
+    - core/internal.shepherd
     - tour/tour-styling
 
 tour-styling:
diff --git a/web/core/modules/tracker/help_topics/tracker.tracking_changed_content.html.twig b/web/core/modules/tracker/help_topics/tracker.tracking_changed_content.html.twig
index 67cf5dac2..1422ee8e1 100644
--- a/web/core/modules/tracker/help_topics/tracker.tracking_changed_content.html.twig
+++ b/web/core/modules/tracker/help_topics/tracker.tracking_changed_content.html.twig
@@ -5,11 +5,14 @@ related:
   - statistics.tracking_popular_content
   - history.tracking_user_content
 ---
-{% set recent = render_var(url('tracker.page')) %}
+{% set recent_link_text %}
+{% trans %}Recent content{% endtrans %}
+{% endset %}
+{% set recent_link = render_var(help_route_link(recent_link_text, 'tracker.page')) %}
 <h2>{% trans %}What displays of recently-updated content are available?{% endtrans %}</h2>
 <p>{% trans %}Assuming that you have the core Activity Tracker module installed, these pages that show recently-updated content are available:{% endtrans %}</p>
 <ul>
-  <li>{% trans %}<a href="{{ recent }}"><em>Recent content</em></a>: Shows the content that has been most recently added, updated, or commented on.{% endtrans %}</li>
+  <li>{% trans %}{{ recent_link }}: Shows the content that has been most recently added, updated, or commented on.{% endtrans %}</li>
   <li>{% trans %}The <em>My recent content</em> tab on the <em>Recent content</em> page (for logged-in users) limits the list to content created or commented on by the user viewing the page.{% endtrans %}</li>
   <li>{% trans %}The <em>Activity</em> tab on a user profile shows the same list for the user whose profile is being viewed.{% endtrans %}</li>
 </ul>
diff --git a/web/core/modules/tracker/js/tracker-history.js b/web/core/modules/tracker/js/tracker-history.js
index 74ac73302..053566f6d 100644
--- a/web/core/modules/tracker/js/tracker-history.js
+++ b/web/core/modules/tracker/js/tracker-history.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, window) {
   function processNodeNewIndicators(placeholders) {
     var newNodeString = Drupal.t('new');
@@ -13,31 +12,26 @@
       var timestamp = parseInt(placeholder.getAttribute('data-history-node-timestamp'), 10);
       var nodeID = placeholder.getAttribute('data-history-node-id');
       var lastViewTimestamp = Drupal.history.getLastRead(nodeID);
-
       if (timestamp > lastViewTimestamp) {
         var message = lastViewTimestamp === 0 ? newNodeString : updatedNodeString;
         $(placeholder).append("<span class=\"marker\">".concat(message, "</span>"));
       }
     });
   }
-
   function processNewRepliesIndicators(placeholders) {
     var placeholdersToUpdate = {};
     placeholders.forEach(function (placeholder) {
       var timestamp = parseInt(placeholder.getAttribute('data-history-node-last-comment-timestamp'), 10);
       var nodeID = placeholder.previousSibling.previousSibling.getAttribute('data-history-node-id');
       var lastViewTimestamp = Drupal.history.getLastRead(nodeID);
-
       if (timestamp > lastViewTimestamp) {
         placeholdersToUpdate[nodeID] = placeholder;
       }
     });
     var nodeIDs = Object.keys(placeholdersToUpdate);
-
     if (nodeIDs.length === 0) {
       return;
     }
-
     $.ajax({
       url: Drupal.url('comments/render_new_comments_node_links'),
       type: 'POST',
@@ -56,46 +50,36 @@
       }
     });
   }
-
   Drupal.behaviors.trackerHistory = {
     attach: function attach(context) {
       var nodeIDs = [];
       var nodeNewPlaceholders = once('history', '[data-history-node-timestamp]', context).filter(function (placeholder) {
         var nodeTimestamp = parseInt(placeholder.getAttribute('data-history-node-timestamp'), 10);
         var nodeID = placeholder.getAttribute('data-history-node-id');
-
         if (Drupal.history.needsServerCheck(nodeID, nodeTimestamp)) {
           nodeIDs.push(nodeID);
           return true;
         }
-
         return false;
       });
       var newRepliesPlaceholders = once('history', '[data-history-node-last-comment-timestamp]', context).filter(function (placeholder) {
         var lastCommentTimestamp = parseInt(placeholder.getAttribute('data-history-node-last-comment-timestamp'), 10);
         var nodeTimestamp = parseInt(placeholder.previousSibling.previousSibling.getAttribute('data-history-node-timestamp'), 10);
-
         if (lastCommentTimestamp === nodeTimestamp) {
           return false;
         }
-
         var nodeID = placeholder.previousSibling.previousSibling.getAttribute('data-history-node-id');
-
         if (Drupal.history.needsServerCheck(nodeID, lastCommentTimestamp)) {
           if (nodeIDs.indexOf(nodeID) === -1) {
             nodeIDs.push(nodeID);
           }
-
           return true;
         }
-
         return false;
       });
-
       if (nodeNewPlaceholders.length === 0 && newRepliesPlaceholders.length === 0) {
         return;
       }
-
       Drupal.history.fetchTimestamps(nodeIDs, function () {
         processNodeNewIndicators(nodeNewPlaceholders);
         processNewRepliesIndicators(newRepliesPlaceholders);
diff --git a/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
index e06fd4cd1..8cf4badf3 100644
--- a/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
@@ -33,6 +33,9 @@ class TrackerNodeAccessTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     node_access_rebuild();
diff --git a/web/core/modules/tracker/tests/src/Functional/TrackerTest.php b/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
index 404053838..d40a23ed7 100644
--- a/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
+++ b/web/core/modules/tracker/tests/src/Functional/TrackerTest.php
@@ -55,6 +55,9 @@ class TrackerTest extends BrowserTestBase {
    */
   protected $otherUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
index 5d25d2471..c42002446 100644
--- a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
+++ b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerNodeTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
 
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\Core\Database\Database;
 
 /**
@@ -10,7 +9,7 @@
  *
  * @group tracker
  */
-class MigrateTrackerNodeTest extends MigrateDrupal7TestBase {
+class MigrateTrackerNodeTest extends MigrateDrupalTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
index fa3b1daa1..c74005444 100644
--- a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
+++ b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerSettingsTest.php
@@ -2,14 +2,12 @@
 
 namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
 
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
-
 /**
  * Tests migration of Tracker settings to configuration.
  *
  * @group tracker
  */
-class MigrateTrackerSettingsTest extends MigrateDrupal7TestBase {
+class MigrateTrackerSettingsTest extends MigrateDrupalTestBase {
 
   protected static $modules = ['tracker'];
 
diff --git a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
index 7774a18ea..c43667296 100644
--- a/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
+++ b/web/core/modules/tracker/tests/src/Kernel/Migrate/d7/MigrateTrackerUserTest.php
@@ -2,7 +2,6 @@
 
 namespace Drupal\Tests\tracker\Kernel\Migrate\d7;
 
-use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 use Drupal\Core\Database\Database;
 
 /**
@@ -10,7 +9,7 @@
  *
  * @group tracker
  */
-class MigrateTrackerUserTest extends MigrateDrupal7TestBase {
+class MigrateTrackerUserTest extends MigrateDrupalTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/update/src/UpdateFetcher.php b/web/core/modules/update/src/UpdateFetcher.php
index b103f25c7..47298d5b0 100644
--- a/web/core/modules/update/src/UpdateFetcher.php
+++ b/web/core/modules/update/src/UpdateFetcher.php
@@ -21,7 +21,7 @@ class UpdateFetcher implements UpdateFetcherInterface {
   const UPDATE_DEFAULT_URL = 'https://updates.drupal.org/release-history';
 
   /**
-   * The fetch url configured in the update settings.
+   * The fetch URL configured in the update settings.
    *
    * @var string
    */
diff --git a/web/core/modules/update/src/UpdateProcessor.php b/web/core/modules/update/src/UpdateProcessor.php
index 3f6b24ffb..ccb8f2eb4 100644
--- a/web/core/modules/update/src/UpdateProcessor.php
+++ b/web/core/modules/update/src/UpdateProcessor.php
@@ -78,6 +78,11 @@ class UpdateProcessor implements UpdateProcessorInterface {
    */
   protected $privateKey;
 
+  /**
+   * The queue for fetching release history data.
+   */
+  protected $fetchTasks;
+
   /**
    * Constructs an UpdateProcessor.
    *
diff --git a/web/core/modules/update/templates/update-version.html.twig b/web/core/modules/update/templates/update-version.html.twig
index decc9df6e..7c18ea15f 100644
--- a/web/core/modules/update/templates/update-version.html.twig
+++ b/web/core/modules/update/templates/update-version.html.twig
@@ -34,11 +34,6 @@
     </div>
     <div class="layout-column layout-column--half">
       <ul class="project-update__version-links">
-        {% if version.core_compatible is not defined or version.core_compatible %}
-          <li class="project-update__download-link">
-            <a href="{{ version.download_link }}">{{ 'Download'|t }}</a>
-          </li>
-        {% endif %}
         <li class="project-update__release-notes-link">
           <a href="{{ version.release_link }}">{{ 'Release notes'|t }}</a>
         </li>
diff --git a/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php b/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
index 20d48d93b..3da6d527f 100644
--- a/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
+++ b/web/core/modules/update/tests/src/Functional/FileTransferAuthorizeFormTest.php
@@ -21,6 +21,9 @@ class FileTransferAuthorizeFormTest extends UpdateUploaderTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $admin_user = $this->drupalCreateUser([
diff --git a/web/core/modules/update/tests/src/Functional/UpdateContribTest.php b/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
index 6b732f0eb..294074c59 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateContribTest.php
@@ -6,8 +6,7 @@
 use Drupal\update\UpdateManagerInterface;
 
 /**
- * Tests how the Update Manager module handles contributed modules and themes in
- * a series of functional tests using mock XML data.
+ * Tests how the Update Manager handles contributed modules and themes.
  *
  * @group update
  */
@@ -41,6 +40,9 @@ class UpdateContribTest extends UpdateTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $admin_user = $this->drupalCreateUser(['administer site configuration']);
@@ -876,25 +878,18 @@ protected function assertCoreCompatibilityMessage(string $version, string $expec
     $this->assertStringContainsString("Requires Drupal core: $expected_range", $compatibility_details->getText());
     $details_summary_element = $compatibility_details->find('css', 'summary');
     if ($is_compatible) {
-      $download_version = str_replace('.', '-', $version);
       // If an update is compatible with the installed version of Drupal core,
-      // it should have a download link and the details element should be closed
-      // by default.
+      // the details element should be closed by default.
       $this->assertFalse($compatibility_details->hasAttribute('open'));
       $this->assertSame('Compatible', $details_summary_element->getText());
-      $this->assertEquals(
-        "http://example.com/{$this->updateProject}-$download_version.tar.gz",
-        $update_element->findLink('Download')->getAttribute('href')
-      );
     }
     else {
       // If an update is not compatible with the installed version of Drupal
-      // core, it should not have a download link and the details element should
-      // be open by default.
+      // core, the details element should be open by default.
       $this->assertTrue($compatibility_details->hasAttribute('open'));
       $this->assertSame('Not compatible', $details_summary_element->getText());
-      $this->assertFalse($update_element->hasLink('Download'));
     }
+    $this->assertFalse($update_element->hasLink('Download'));
   }
 
 }
diff --git a/web/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php b/web/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php
index d740425fb..829b68dd7 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateSemverCoreTest.php
@@ -5,8 +5,7 @@
 use Drupal\Core\Url;
 
 /**
- * Tests the Update Manager module through a series of functional tests using
- * mock XML data.
+ * Tests the semantic version handling in the Update Manager.
  *
  * @group update
  */
diff --git a/web/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php b/web/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
index 63a45da41..d5e102dd4 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateSemverTestBase.php
@@ -37,12 +37,15 @@ abstract class UpdateSemverTestBase extends UpdateTestBase {
    */
   protected $projectTitle;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $admin_user = $this->drupalCreateUser([
       'administer site configuration',
       'view update notifications',
-      ]);
+    ]);
     $this->drupalLogin($admin_user);
     $this->drupalPlaceBlock('local_actions_block');
   }
@@ -156,7 +159,6 @@ public function testMajorUpdateAvailable() {
           $this->standardTests();
           $this->assertUpdateTableTextNotContains('Security update required!');
           $this->assertUpdateTableElementContains(Link::fromTextAndUrl('9.0.0', Url::fromUri("http://example.com/{$this->updateProject}-9-0-0-release"))->toString());
-          $this->assertUpdateTableElementContains(Link::fromTextAndUrl('Download', Url::fromUri("http://example.com/{$this->updateProject}-9-0-0.tar.gz"))->toString());
           $this->assertUpdateTableElementContains(Link::fromTextAndUrl('Release notes', Url::fromUri("http://example.com/{$this->updateProject}-9-0-0-release"))->toString());
           $this->assertUpdateTableTextNotContains('Up to date');
           $this->assertUpdateTableTextContains('Not supported!');
@@ -425,16 +427,6 @@ public function testUnsupportedRelease() {
     }
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function assertVersionUpdateLinks($label, $version, $download_version = NULL) {
-    // Test XML files for Drupal core use '-' in the version number for the
-    // download link.
-    $download_version = str_replace('.', '-', $version);
-    parent::assertVersionUpdateLinks($label, $version, $download_version);
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/update/tests/src/Functional/UpdateTestBase.php b/web/core/modules/update/tests/src/Functional/UpdateTestBase.php
index 8ab357424..c0e57cee3 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateTestBase.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateTestBase.php
@@ -87,13 +87,15 @@ protected function standardTests() {
     $this->assertSession()->linkByHrefExists('http://example.com/project/drupal');
     $this->assertSession()->pageTextNotContains('No available releases found');
     $this->assertSession()->pageTextContains('Last checked:');
+    // No download URLs should be present.
+    $this->assertSession()->responseNotContains('.tar.gz');
   }
 
   /**
    * Asserts the expected security updates are displayed correctly on the page.
    *
    * @param string $project_path_part
-   *   The project path part needed for the download and release links.
+   *   The project path part needed for the release link.
    * @param string[] $expected_security_releases
    *   The security releases, if any, that the status report should recommend.
    * @param string $expected_update_message_type
@@ -109,11 +111,7 @@ protected function assertSecurityUpdates($project_path_part, array $expected_sec
     $all_security_release_urls = array_map(function ($link) {
       return $link->getAttribute('href');
     }, $page->findAll('css', "$update_element_css_locator .version-security a[href$='-release']"));
-    $all_security_download_urls = array_map(function ($link) {
-      return $link->getAttribute('href');
-    }, $page->findAll('css', "$update_element_css_locator .version-security a[href$='.tar.gz']"));
     if ($expected_security_releases) {
-      $expected_download_urls = [];
       $expected_release_urls = [];
       if ($expected_update_message_type === static::SECURITY_UPDATE_REQUIRED) {
         $assert_session->elementTextNotContains('css', $update_element_css_locator, 'Update available');
@@ -129,23 +127,18 @@ protected function assertSecurityUpdates($project_path_part, array $expected_sec
       foreach ($expected_security_releases as $expected_security_release) {
         $expected_url_version = str_replace('.', '-', $expected_security_release);
         $release_url = "http://example.com/$project_path_part-$expected_url_version-release";
-        $download_url = "http://example.com/$project_path_part-$expected_url_version.tar.gz";
+        $assert_session->responseNotContains("http://example.com/$project_path_part-$expected_url_version.tar.gz");
         $expected_release_urls[] = $release_url;
-        $expected_download_urls[] = $download_url;
         // Ensure the expected links are security links.
         $this->assertContains($release_url, $all_security_release_urls, "Release $release_url is a security release link.");
-        $this->assertContains($download_url, $all_security_download_urls, "Release $download_url is a security download link.");
         $assert_session->linkByHrefExists($release_url);
-        $assert_session->linkByHrefExists($download_url);
       }
       // Ensure no other links are shown as security releases.
       $this->assertEquals([], array_diff($all_security_release_urls, $expected_release_urls));
-      $this->assertEquals([], array_diff($all_security_download_urls, $expected_download_urls));
     }
     else {
       // Ensure there were no security links.
       $this->assertEquals([], $all_security_release_urls);
-      $this->assertEquals([], $all_security_download_urls);
       $assert_session->pageTextNotContains('Security update required!');
       if ($expected_update_message_type === static::UPDATE_AVAILABLE) {
         $assert_session->elementTextContains('css', $update_element_css_locator, 'Update available');
@@ -168,18 +161,14 @@ protected function assertSecurityUpdates($project_path_part, array $expected_sec
    *   The label for the update.
    * @param string $version
    *   The project version.
-   * @param string|null $download_version
-   *   (optional) The version number as it appears in the download link. If
-   *   $download_version is not provided then $version will be used.
    */
-  protected function assertVersionUpdateLinks($label, $version, $download_version = NULL) {
-    $download_version = $download_version ?? $version;
+  protected function assertVersionUpdateLinks($label, $version) {
     $update_element = $this->findUpdateElementByLabel($label);
     // In the release notes URL the periods are replaced with dashes.
     $url_version = str_replace('.', '-', $version);
 
     $this->assertEquals($update_element->findLink($version)->getAttribute('href'), "http://example.com/{$this->updateProject}-$url_version-release");
-    $this->assertEquals($update_element->findLink('Download')->getAttribute('href'), "http://example.com/{$this->updateProject}-$download_version.tar.gz");
+    $this->assertStringNotContainsString("http://example.com/{$this->updateProject}-$version.tar.gz", $update_element->getOuterHtml());
     $this->assertEquals($update_element->findLink('Release notes')->getAttribute('href'), "http://example.com/{$this->updateProject}-$url_version-release");
   }
 
diff --git a/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
index c3212f5f5..fd2643b27 100644
--- a/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
+++ b/web/core/modules/update/tests/src/Functional/UpdateUploadTest.php
@@ -30,6 +30,9 @@ class UpdateUploadTest extends UpdateUploaderTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $admin_user = $this->drupalCreateUser([
diff --git a/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php b/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php
index 7b05601dc..c345f3551 100644
--- a/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php
+++ b/web/core/modules/update/tests/src/Unit/Menu/UpdateLocalTasksTest.php
@@ -11,6 +11,9 @@
  */
 class UpdateLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = ['update' => 'core/modules/update'];
     parent::setUp();
diff --git a/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php b/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
index c530848a2..bc00afe68 100644
--- a/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
+++ b/web/core/modules/update/tests/src/Unit/UpdateFetcherTest.php
@@ -91,7 +91,7 @@ protected function setUp(): void {
     $container->expects($this->any())
       ->method('get')
       ->with('logger.factory')
-      ->will($this->returnValue($logger_factory));
+      ->willReturn($logger_factory);
     \Drupal::setContainer($container);
   }
 
@@ -104,7 +104,7 @@ protected function setUp(): void {
    * @param string $site_key
    *   A string to mimic an anonymous site key hash.
    * @param string $expected
-   *   The expected url returned from UpdateFetcher::buildFetchUrl()
+   *   The expected URL returned from UpdateFetcher::buildFetchUrl()
    *
    * @dataProvider providerTestUpdateBuildFetchUrl
    *
@@ -123,7 +123,7 @@ public function testUpdateBuildFetchUrl(array $project, $site_key, $expected) {
    *   An array of arrays, each containing:
    *   - 'project' - An array matching a project's .info file structure.
    *   - 'site_key' - An arbitrary site key.
-   *   - 'expected' - The expected url from UpdateFetcher::buildFetchUrl().
+   *   - 'expected' - The expected URL from UpdateFetcher::buildFetchUrl().
    */
   public function providerTestUpdateBuildFetchUrl() {
     $data = [];
diff --git a/web/core/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info.yml b/web/core/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info.yml
index 6ebe04176..337a35986 100644
--- a/web/core/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info.yml
+++ b/web/core/modules/update/tests/themes/update_test_basetheme/update_test_basetheme.info.yml
@@ -1,5 +1,5 @@
 name: 'Update test base theme'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Test theme which acts as a base theme for other test subthemes.'
 version: VERSION
diff --git a/web/core/modules/update/update.api.php b/web/core/modules/update/update.api.php
index 1a6e0ef00..18ff68f9d 100644
--- a/web/core/modules/update/update.api.php
+++ b/web/core/modules/update/update.api.php
@@ -114,7 +114,7 @@ function hook_update_status_alter(&$projects) {
  * @param string $directory
  *   The directory that the archive was extracted into.
  *
- * @return
+ * @return array
  *   If there are any problems, return an array of error messages. If there are
  *   no problems, return an empty array.
  *
diff --git a/web/core/modules/update/update.compare.inc b/web/core/modules/update/update.compare.inc
index f4dfb70d2..1d3aa580c 100644
--- a/web/core/modules/update/update.compare.inc
+++ b/web/core/modules/update/update.compare.inc
@@ -77,7 +77,7 @@ function update_process_project_info(&$projects) {
  * @param array $available
  *   Data about available project releases.
  *
- * @return
+ * @return array
  *   An array of installed projects with current update status information.
  *
  * @see update_get_available()
diff --git a/web/core/modules/update/update.fetch.inc b/web/core/modules/update/update.fetch.inc
index b1ab41966..4ae279da2 100644
--- a/web/core/modules/update/update.fetch.inc
+++ b/web/core/modules/update/update.fetch.inc
@@ -33,6 +33,7 @@ function _update_cron_notify() {
     $notify_list = $update_config->get('notification.emails');
     if (!empty($notify_list)) {
       $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
+      $request_time = \Drupal::time()->getRequestTime();
       foreach ($notify_list as $target) {
         if ($target_user = user_load_by_mail($target)) {
           $target_langcode = $target_user->getPreferredLangcode();
@@ -44,7 +45,7 @@ function _update_cron_notify() {
         // Track when the last mail was successfully sent to avoid sending
         // too many emails.
         if ($message['result']) {
-          \Drupal::state()->set('update.last_email_notification', REQUEST_TIME);
+          \Drupal::state()->set('update.last_email_notification', $request_time);
         }
       }
     }
diff --git a/web/core/modules/update/update.install b/web/core/modules/update/update.install
index ed845df6f..f3b9e64f1 100644
--- a/web/core/modules/update/update.install
+++ b/web/core/modules/update/update.install
@@ -101,7 +101,7 @@ function update_uninstall() {
  * @param $type
  *   What kind of project this is ('core' or 'contrib').
  *
- * @return
+ * @return array
  *   An array to be included in the nested $requirements array.
  *
  * @see hook_requirements()
diff --git a/web/core/modules/update/update.manager.inc b/web/core/modules/update/update.manager.inc
index 7895b5599..0de8675ad 100644
--- a/web/core/modules/update/update.manager.inc
+++ b/web/core/modules/update/update.manager.inc
@@ -79,7 +79,7 @@ function update_manager_download_batch_finished($success, $results) {
  *   The update manager operation we're in the middle of. Can be either 'update'
  *   or 'install'. Use to provide operation-specific interface text.
  *
- * @return
+ * @return bool
  *   TRUE if the update manager should continue to the next step in the
  *   workflow, or FALSE if we've hit a fatal configuration and must halt the
  *   workflow.
@@ -307,7 +307,7 @@ function update_manager_batch_project_get($project, $url, &$context) {
  * it. However, it is supported here because it is a common configuration on
  * shared hosting, and there is nothing Drupal can do to prevent it.
  *
- * @return
+ * @return bool
  *   TRUE if local file transfers are allowed on this server, or FALSE if not.
  *
  * @see install_check_requirements()
diff --git a/web/core/modules/update/update.module b/web/core/modules/update/update.module
index b3e1a5896..4e24834e4 100644
--- a/web/core/modules/update/update.module
+++ b/web/core/modules/update/update.module
@@ -131,7 +131,7 @@ function update_page_top() {
  * It both enforces the 'administer software updates' permission and the global
  * kill switch for the authorize.php script.
  *
- * @return
+ * @return bool
  *   TRUE if the current user can access the updater menu items; FALSE
  *   otherwise.
  */
@@ -177,7 +177,8 @@ function update_cron() {
   $frequency = $update_config->get('check.interval_days');
   $interval = 60 * 60 * 24 * $frequency;
   $last_check = \Drupal::state()->get('update.last_check', 0);
-  if ((REQUEST_TIME - $last_check) > $interval) {
+  $request_time = \Drupal::time()->getRequestTime();
+  if (($request_time - $last_check) > $interval) {
     // If the configured update interval has elapsed, we want to invalidate
     // the data for all projects, attempt to re-fetch, and trigger any
     // configured notifications about the new status.
@@ -190,7 +191,7 @@ function update_cron() {
     update_get_available(TRUE);
   }
   $last_email_notice = \Drupal::state()->get('update.last_email_notification', 0);
-  if ((REQUEST_TIME - $last_email_notice) > $interval) {
+  if (($request_time - $last_email_notice) > $interval) {
     // If configured time between notifications elapsed, send email about
     // updates possibly available.
     \Drupal::moduleHandler()->loadInclude('update', 'inc', 'update.fetch');
@@ -267,7 +268,7 @@ function _update_no_data() {
  *   (optional) Boolean to indicate if this method should refresh automatically
  *   if there's no data. Defaults to FALSE.
  *
- * @return
+ * @return array
  *   Array of data about available releases, keyed by project shortname.
  *
  * @see update_refresh()
@@ -428,7 +429,7 @@ function update_mail($key, &$message, $params) {
  * @param $langcode
  *   (optional) A language code to use. Defaults to NULL.
  *
- * @return
+ * @return \Drupal\Core\StringTranslation\TranslatableMarkup
  *   The properly translated error message for the given key.
  */
 function _update_message_text($msg_type, $msg_reason, $langcode = NULL) {
@@ -603,7 +604,7 @@ function update_storage_clear() {
 /**
  * Returns a short unique identifier for this Drupal installation.
  *
- * @return
+ * @return string
  *   An eight character string uniquely identifying this Drupal installation.
  */
 function _update_manager_unique_identifier() {
@@ -621,7 +622,7 @@ function _update_manager_unique_identifier() {
  *   (optional) Whether to attempt to create the directory if it does not
  *   already exist. Defaults to TRUE.
  *
- * @return
+ * @return string
  *   The full path to the temporary directory where update file archives should
  *   be extracted.
  */
@@ -643,7 +644,7 @@ function _update_manager_extract_directory($create = TRUE) {
  *   (optional) Whether to attempt to create the directory if it does not
  *   already exist. Defaults to TRUE.
  *
- * @return
+ * @return string
  *   The full path to the temporary directory where update file archives should
  *   be cached.
  */
@@ -702,8 +703,8 @@ function update_delete_file_if_stale($path) {
   if (file_exists($path)) {
     $filectime = filectime($path);
     $max_age = \Drupal::config('system.file')->get('temporary_maximum_age');
-
-    if (REQUEST_TIME - $filectime > $max_age || (preg_match('/.*-dev\.(tar\.gz|zip)/i', $path) && REQUEST_TIME - $filectime > 300)) {
+    $request_time = \Drupal::time()->getRequestTime();
+    if ($request_time - $filectime > $max_age || (preg_match('/.*-dev\.(tar\.gz|zip)/i', $path) && $request_time - $filectime > 300)) {
       try {
         \Drupal::service('file_system')->deleteRecursive($path);
         return TRUE;
diff --git a/web/core/modules/user/config/optional/rdf.mapping.user.user.yml b/web/core/modules/user/config/optional/rdf.mapping.user.user.yml
deleted file mode 100644
index 4c6825a5f..000000000
--- a/web/core/modules/user/config/optional/rdf.mapping.user.user.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-id: user.user
-targetEntityType: user
-bundle: user
-types:
-  - 'schema:Person'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
diff --git a/web/core/modules/user/config/schema/user.schema.yml b/web/core/modules/user/config/schema/user.schema.yml
index 2f9bda44f..b778163bf 100644
--- a/web/core/modules/user/config/schema/user.schema.yml
+++ b/web/core/modules/user/config/schema/user.schema.yml
@@ -52,36 +52,36 @@ user.settings:
       label: 'Enable password strength indicator'
 
 user.mail:
- type: config_object
- label: 'Email settings'
- mapping:
-  cancel_confirm:
-    type: mail
-    label: 'Account cancellation confirmation'
-  password_reset:
-    type: mail
-    label: 'Password recovery'
-  register_admin_created:
-    type: mail
-    label: 'Account created by administrator'
-  register_no_approval_required:
-    type: mail
-    label: 'Registration confirmation (No approval required)'
-  register_pending_approval:
-    type: mail
-    label: 'Registration confirmation (Pending approval)'
-  register_pending_approval_admin:
-    type: mail
-    label: 'Admin (user awaiting approval)'
-  status_activated:
-    type: mail
-    label: 'Account activation'
-  status_blocked:
-    type: mail
-    label: 'Account blocked'
-  status_canceled:
-    type: mail
-    label: 'Account cancelled'
+  type: config_object
+  label: 'Email settings'
+  mapping:
+    cancel_confirm:
+      type: mail
+      label: 'Account cancellation confirmation'
+    password_reset:
+      type: mail
+      label: 'Password recovery'
+    register_admin_created:
+      type: mail
+      label: 'Account created by administrator'
+    register_no_approval_required:
+      type: mail
+      label: 'Registration confirmation (No approval required)'
+    register_pending_approval:
+      type: mail
+      label: 'Registration confirmation (Pending approval)'
+    register_pending_approval_admin:
+      type: mail
+      label: 'Admin (user awaiting approval)'
+    status_activated:
+      type: mail
+      label: 'Account activation'
+    status_blocked:
+      type: mail
+      label: 'Account blocked'
+    status_canceled:
+      type: mail
+      label: 'Account cancelled'
 
 user.flood:
   type: config_object
@@ -122,6 +122,7 @@ user.role.*:
     permissions:
       type: sequence
       label: 'Permissions'
+      orderby: value
       sequence:
         type: string
         label: 'Permission'
diff --git a/web/core/modules/user/migrations/d7_user_mail.yml b/web/core/modules/user/migrations/d7_user_mail.yml
index d7b25149c..c9209e1ac 100644
--- a/web/core/modules/user/migrations/d7_user_mail.yml
+++ b/web/core/modules/user/migrations/d7_user_mail.yml
@@ -22,20 +22,20 @@ source:
     - user_mail_status_blocked_body
   source_module: user
 process:
-   'status_activated/subject': user_mail_status_activated_subject
-   'status_activated/body': user_mail_status_activated_body
-   'password_reset/subject': user_mail_password_reset_subject
-   'password_reset/body': user_mail_password_reset_body
-   'cancel_confirm/subject': user_mail_status_canceled_subject
-   'cancel_confirm/body': user_mail_status_canceled_body
-   'register_admin_created/subject': user_mail_register_admin_created_subject
-   'register_admin_created/body': user_mail_register_admin_created_body
-   'register_no_approval_required/subject': user_mail_register_no_approval_required_subject
-   'register_no_approval_required/body': user_mail_register_no_approval_required_body
-   'register_pending_approval/subject': user_mail_register_pending_approval_subject
-   'register_pending_approval/body': user_mail_register_pending_approval_body
-   'status_blocked/subject': user_mail_status_blocked_subject
-   'status_blocked/body': user_mail_status_blocked_body
+  'status_activated/subject': user_mail_status_activated_subject
+  'status_activated/body': user_mail_status_activated_body
+  'password_reset/subject': user_mail_password_reset_subject
+  'password_reset/body': user_mail_password_reset_body
+  'cancel_confirm/subject': user_mail_status_canceled_subject
+  'cancel_confirm/body': user_mail_status_canceled_body
+  'register_admin_created/subject': user_mail_register_admin_created_subject
+  'register_admin_created/body': user_mail_register_admin_created_body
+  'register_no_approval_required/subject': user_mail_register_no_approval_required_subject
+  'register_no_approval_required/body': user_mail_register_no_approval_required_body
+  'register_pending_approval/subject': user_mail_register_pending_approval_subject
+  'register_pending_approval/body': user_mail_register_pending_approval_body
+  'status_blocked/subject': user_mail_status_blocked_subject
+  'status_blocked/body': user_mail_status_blocked_body
 destination:
   plugin: config
   config_name: user.mail
diff --git a/web/core/modules/user/src/AccountForm.php b/web/core/modules/user/src/AccountForm.php
index b157be34d..c74619fdd 100644
--- a/web/core/modules/user/src/AccountForm.php
+++ b/web/core/modules/user/src/AccountForm.php
@@ -96,7 +96,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $form['account']['mail'] = [
       '#type' => 'email',
       '#title' => $this->t('Email address'),
-      '#description' => $this->t('A valid email address. All emails from the system will be sent to this address. The email address is not made public and will only be used if you wish to receive a new password or wish to receive certain news or notifications by email.'),
+      '#description' => $this->t('The email address is not made public. It will only be used if you need to be contacted about your account or for opted-in notifications.'),
       '#required' => !(!$account->getEmail() && $user->hasPermission('administer users')),
       '#default_value' => (!$register ? $account->getEmail() : ''),
     ];
diff --git a/web/core/modules/user/src/Authentication/Provider/Cookie.php b/web/core/modules/user/src/Authentication/Provider/Cookie.php
index aea58f67e..9de2638dc 100644
--- a/web/core/modules/user/src/Authentication/Provider/Cookie.php
+++ b/web/core/modules/user/src/Authentication/Provider/Cookie.php
@@ -134,8 +134,8 @@ public function addCheckToUrl(ResponseEvent $event) {
         $options = UrlHelper::parse($url);
         $options['query']['check_logged_in'] = '1';
         $url = $options['path'] . '?' . UrlHelper::buildQuery($options['query']);
-        if (!empty($options['#fragment'])) {
-          $url .= '#' . $options['#fragment'];
+        if (!empty($options['fragment'])) {
+          $url .= '#' . $options['fragment'];
         }
         // In the case of trusted redirect, we have to update the list of
         // trusted URLs because here we've just modified its target URL
diff --git a/web/core/modules/user/src/Controller/UserController.php b/web/core/modules/user/src/Controller/UserController.php
index d6c298d30..1a5fa550d 100644
--- a/web/core/modules/user/src/Controller/UserController.php
+++ b/web/core/modules/user/src/Controller/UserController.php
@@ -14,6 +14,7 @@
 use Drupal\user\UserStorageInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
@@ -149,6 +150,12 @@ public function resetPass(Request $request, $uid, $timestamp, $hash) {
       }
     }
 
+    /** @var \Drupal\user\UserInterface $reset_link_user */
+    $reset_link_user = $this->userStorage->load($uid);
+    if ($redirect = $this->determineErrorRedirect($reset_link_user, $timestamp, $hash)) {
+      return $redirect;
+    }
+
     $session = $request->getSession();
     $session->set('pass_reset_hash', $hash);
     $session->set('pass_reset_timeout', $timestamp);
@@ -222,11 +229,65 @@ public function getResetPassForm(Request $request, $uid) {
    *   If $uid is for a blocked user or invalid user ID.
    */
   public function resetPassLogin($uid, $timestamp, $hash, Request $request) {
-    // The current user is not logged in, so check the parameters.
-    $current = REQUEST_TIME;
     /** @var \Drupal\user\UserInterface $user */
     $user = $this->userStorage->load($uid);
+    if ($redirect = $this->determineErrorRedirect($user, $timestamp, $hash)) {
+      return $redirect;
+    }
+
+    $flood_config = $this->config('user.flood');
+    if ($flood_config->get('uid_only')) {
+      $identifier = $user->id();
+    }
+    else {
+      $identifier = $user->id() . '-' . $request->getClientIP();
+    }
 
+    $this->flood->clear('user.failed_login_user', $identifier);
+    $this->flood->clear('user.http_login', $identifier);
+
+    user_login_finalize($user);
+    $this->logger->notice('User %name used one-time login link at time %timestamp.', ['%name' => $user->getDisplayName(), '%timestamp' => $timestamp]);
+    $this->messenger()->addStatus($this->t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please set your password.'));
+    // Let the user's password be changed without the current password
+    // check.
+    $token = Crypt::randomBytesBase64(55);
+    $request->getSession()->set('pass_reset_' . $user->id(), $token);
+    // Clear any flood events for this user.
+    $this->flood->clear('user.password_request_user', $uid);
+    return $this->redirect(
+      'entity.user.edit_form',
+      ['user' => $user->id()],
+      [
+        'query' => ['pass-reset-token' => $token],
+        'absolute' => TRUE,
+      ]
+    );
+  }
+
+  /**
+   * Validates user, hash, and timestamp.
+   *
+   * This method allows the 'user.reset' and 'user.reset.login' routes to use
+   * the same logic to check the user, timestamp and hash and redirect to the
+   * same location with the same messages.
+   *
+   * @param \Drupal\user\UserInterface|null $user
+   *   User requesting reset. NULL if the user does not exist.
+   * @param int $timestamp
+   *   The current timestamp.
+   * @param string $hash
+   *   Login link hash.
+   *
+   * @return \Symfony\Component\HttpFoundation\RedirectResponse|null
+   *   Returns a redirect if the information is incorrect. It redirects to
+   *   'user.pass' route with a message for the user.
+   *
+   * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
+   *   If $uid is for a blocked user or invalid user ID.
+   */
+  protected function determineErrorRedirect(?UserInterface $user, int $timestamp, string $hash): ?RedirectResponse {
+    $current = REQUEST_TIME;
     // Verify that the user exists and is active.
     if ($user === NULL || !$user->isActive()) {
       // Blocked or invalid user ID, so deny access. The parameters will be in
@@ -242,23 +303,8 @@ public function resetPassLogin($uid, $timestamp, $hash, Request $request) {
       return $this->redirect('user.pass');
     }
     elseif ($user->isAuthenticated() && ($timestamp >= $user->getLastLoginTime()) && ($timestamp <= $current) && hash_equals($hash, user_pass_rehash($user, $timestamp))) {
-      user_login_finalize($user);
-      $this->logger->notice('User %name used one-time login link at time %timestamp.', ['%name' => $user->getDisplayName(), '%timestamp' => $timestamp]);
-      $this->messenger()->addStatus($this->t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
-      // Let the user's password be changed without the current password
-      // check.
-      $token = Crypt::randomBytesBase64(55);
-      $request->getSession()->set('pass_reset_' . $user->id(), $token);
-      // Clear any flood events for this user.
-      $this->flood->clear('user.password_request_user', $uid);
-      return $this->redirect(
-        'entity.user.edit_form',
-        ['user' => $user->id()],
-        [
-          'query' => ['pass-reset-token' => $token],
-          'absolute' => TRUE,
-        ]
-      );
+      // The information provided is valid.
+      return NULL;
     }
 
     $this->messenger()->addError($this->t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'));
@@ -283,15 +329,14 @@ public function userPage() {
    * Redirects users to their profile edit page.
    *
    * This controller assumes that it is only invoked for authenticated users.
-   * This is enforced for the 'user.well-known.change_password' route with the
-   * '_user_is_logged_in' requirement.
+   * This is typically enforced with the '_user_is_logged_in' requirement.
    *
    * @return \Symfony\Component\HttpFoundation\RedirectResponse
    *   Returns a redirect to the profile edit form of the currently logged in
    *   user.
    */
   public function userEditPage() {
-    return $this->redirect('entity.user.edit_form', ['user' => $this->currentUser()->id()], [], 301);
+    return $this->redirect('entity.user.edit_form', ['user' => $this->currentUser()->id()], [], 302);
   }
 
   /**
diff --git a/web/core/modules/user/src/Entity/Role.php b/web/core/modules/user/src/Entity/Role.php
index 97b015571..17742db35 100644
--- a/web/core/modules/user/src/Entity/Role.php
+++ b/web/core/modules/user/src/Entity/Role.php
@@ -186,9 +186,10 @@ public function preSave(EntityStorageInterface $storage) {
       $this->weight = $max + 1;
     }
 
-    if (!$this->isSyncing()) {
+    if (!$this->isSyncing() && $this->hasTrustedData()) {
       // Permissions are always ordered alphabetically to avoid conflicts in the
-      // exported configuration.
+      // exported configuration. If the save is not trusted then the
+      // configuration will be sorted by StorableConfigBase.
       sort($this->permissions);
     }
   }
diff --git a/web/core/modules/user/src/EntityOwnerInterface.php b/web/core/modules/user/src/EntityOwnerInterface.php
index 1feb4951d..214429442 100644
--- a/web/core/modules/user/src/EntityOwnerInterface.php
+++ b/web/core/modules/user/src/EntityOwnerInterface.php
@@ -9,6 +9,8 @@
  * owners in Unix file system access. This may or may not be the entity's
  * original author. The owner may also have less permissions than other users,
  * such as administrators.
+ *
+ * @ingroup entity_type_characteristics
  */
 interface EntityOwnerInterface {
 
diff --git a/web/core/modules/user/src/Form/RoleSettingsForm.php b/web/core/modules/user/src/Form/RoleSettingsForm.php
index ecf6836fc..a62dc0f7e 100644
--- a/web/core/modules/user/src/Form/RoleSettingsForm.php
+++ b/web/core/modules/user/src/Form/RoleSettingsForm.php
@@ -70,7 +70,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#empty_value' => '',
       '#default_value' => $default_value,
       '#options' => $roles,
-      '#description' => $this->t('This role will be automatically assigned new permissions whenever a module is enabled. Changing this setting will not affect existing permissions.'),
+      '#description' => $this->t('This role will be automatically granted all permissions.'),
       // Don't allow to select a single admin role in case multiple roles got
       // marked as admin role already.
       '#access' => count($admin_roles) <= 1,
diff --git a/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php b/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
index e496e1f9f..43dd5b30a 100644
--- a/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
+++ b/web/core/modules/user/src/Plugin/Action/ChangeUserRoleBase.php
@@ -62,7 +62,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
     unset($roles[RoleInterface::AUTHENTICATED_ID]);
     $form['rid'] = [
       '#type' => 'radios',
-      '#title' => t('Role'),
+      '#title' => $this->t('Role'),
       '#options' => $roles,
       '#default_value' => $this->configuration['rid'],
       '#required' => TRUE,
diff --git a/web/core/modules/user/src/Plugin/views/field/Roles.php b/web/core/modules/user/src/Plugin/views/field/Roles.php
index ad504200b..cf36ba7f4 100644
--- a/web/core/modules/user/src/Plugin/views/field/Roles.php
+++ b/web/core/modules/user/src/Plugin/views/field/Roles.php
@@ -85,7 +85,7 @@ public function preRender(&$values) {
         $sorted_keys = array_intersect_key($ordered_roles, $user_roles);
         // Merge with the unsorted array of role information which has the
         // effect of sorting it.
-        $user_roles = array_merge($sorted_keys, $user_roles);
+        $user_roles = array_replace($sorted_keys, $user_roles);
       }
     }
   }
diff --git a/web/core/modules/user/src/Plugin/views/filter/Name.php b/web/core/modules/user/src/Plugin/views/filter/Name.php
index 3ad018fa5..9398d6812 100644
--- a/web/core/modules/user/src/Plugin/views/filter/Name.php
+++ b/web/core/modules/user/src/Plugin/views/filter/Name.php
@@ -18,6 +18,11 @@ class Name extends InOperator {
 
   protected $alwaysMultiple = TRUE;
 
+  /**
+   * The validated exposed input.
+   */
+  protected $validated_exposed_input;
+
   protected function valueForm(&$form, FormStateInterface $form_state) {
     $users = $this->value ? User::loadMultiple($this->value) : [];
     $default_value = EntityAutocomplete::getEntityLabels($users);
diff --git a/web/core/modules/user/src/RoleStorage.php b/web/core/modules/user/src/RoleStorage.php
index f37acc06e..8db6dfc5d 100644
--- a/web/core/modules/user/src/RoleStorage.php
+++ b/web/core/modules/user/src/RoleStorage.php
@@ -13,16 +13,14 @@ class RoleStorage extends ConfigEntityStorage implements RoleStorageInterface {
    * {@inheritdoc}
    */
   public function isPermissionInRoles($permission, array $rids) {
-    $has_permission = FALSE;
     foreach ($this->loadMultiple($rids) as $role) {
       /** @var \Drupal\user\RoleInterface $role */
-      if ($role->isAdmin() || $role->hasPermission($permission)) {
-        $has_permission = TRUE;
-        break;
+      if ($role->hasPermission($permission)) {
+        return TRUE;
       }
     }
 
-    return $has_permission;
+    return FALSE;
   }
 
 }
diff --git a/web/core/modules/user/src/UserInterface.php b/web/core/modules/user/src/UserInterface.php
index 64cbc19b9..e6a522c71 100644
--- a/web/core/modules/user/src/UserInterface.php
+++ b/web/core/modules/user/src/UserInterface.php
@@ -91,8 +91,8 @@ public function setUsername($username);
   /**
    * Returns the hashed password.
    *
-   * @return string
-   *   The hashed password.
+   * @return string|null
+   *   The hashed password, or NULL if a password is not set.
    */
   public function getPassword();
 
diff --git a/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php b/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
index 3b01a626a..88d6d7532 100644
--- a/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
+++ b/web/core/modules/user/tests/src/Functional/Rest/UserResourceTestBase.php
@@ -288,12 +288,12 @@ public function testPatchSecurityOtherUser() {
 
     // Try changing user 1's email.
     $user1 = [
-        'mail' => [['value' => 'another_email_address@example.com']],
-        'uid' => [['value' => 1]],
-        'name' => [['value' => 'another_user_name']],
-        'pass' => [['existing' => $this->account->passRaw]],
-        'uuid' => [['value' => '2e9403a4-d8af-4096-a116-624710140be0']],
-      ] + $original_normalization;
+      'mail' => [['value' => 'another_email_address@example.com']],
+      'uid' => [['value' => 1]],
+      'name' => [['value' => 'another_user_name']],
+      'pass' => [['existing' => $this->account->passRaw]],
+      'uuid' => [['value' => '2e9403a4-d8af-4096-a116-624710140be0']],
+    ] + $original_normalization;
     $request_options[RequestOptions::BODY] = $this->serializer->encode($user1, static::$format);
     $response = $this->request('PATCH', $url, $request_options);
     // Ensure the email address has not changed.
diff --git a/web/core/modules/user/tests/src/Functional/Update/UserUpdateRoleDependenciesTest.php b/web/core/modules/user/tests/src/Functional/Update/UserUpdateRoleDependenciesTest.php
index c865a05b2..9140a06b9 100644
--- a/web/core/modules/user/tests/src/Functional/Update/UserUpdateRoleDependenciesTest.php
+++ b/web/core/modules/user/tests/src/Functional/Update/UserUpdateRoleDependenciesTest.php
@@ -47,7 +47,7 @@ public function testRolePermissions() {
     $this->drupalLogin($this->createUser(['access site reports']));
     $this->drupalGet('admin/reports/dblog', ['query' => ['type[]' => 'update']]);
     $this->clickLink('The role Authenticated user has had the following non-…');
-    $this->assertSession()->pageTextContains('The role Authenticated user has had the following non-existent permission(s) removed: use text format plain_text, does_not_exist.');
+    $this->assertSession()->pageTextContains('The role Authenticated user has had the following non-existent permission(s) removed: does_not_exist, use text format plain_text.');
     $this->getSession()->back();
     $this->clickLink('The role Anonymous user has had the following non-…');
     $this->assertSession()->pageTextContains('The role Anonymous user has had the following non-existent permission(s) removed: use text format plain_text.');
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php b/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
index 04810597e..2b29e802e 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminLanguageTest.php
@@ -38,6 +38,9 @@ class UserAdminLanguageTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // User to add and remove language.
diff --git a/web/core/modules/user/tests/src/Functional/UserAdminTest.php b/web/core/modules/user/tests/src/Functional/UserAdminTest.php
index 8fedf64f7..32f9673b7 100644
--- a/web/core/modules/user/tests/src/Functional/UserAdminTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserAdminTest.php
@@ -125,10 +125,10 @@ public function testUserAdmin() {
       ->set('notify.status_blocked', TRUE)
       ->save();
     $this->drupalGet('admin/people', [
-    // Sort the table by username so that we know reliably which user will be
-    // targeted with the blocking action.
-    'query' => ['order' => 'name', 'sort' => 'asc'],
-]);
+      // Sort the table by username so that we know reliably which user will be
+      // targeted with the blocking action.
+      'query' => ['order' => 'name', 'sort' => 'asc'],
+    ]);
     $this->submitForm($edit, 'Apply to selected items');
     $site_name = $this->config('system.site')->get('name');
     $this->assertMailString('body', 'Your account on ' . $site_name . ' has been blocked.', 1, 'Blocked message found in the mail sent to user C.');
@@ -147,10 +147,10 @@ public function testUserAdmin() {
     $editunblock['action'] = 'user_unblock_user_action';
     $editunblock['user_bulk_form[4]'] = TRUE;
     $this->drupalGet('admin/people', [
-    // Sort the table by username so that we know reliably which user will be
-    // targeted with the blocking action.
-    'query' => ['order' => 'name', 'sort' => 'asc'],
-]);
+      // Sort the table by username so that we know reliably which user will be
+      // targeted with the blocking action.
+      'query' => ['order' => 'name', 'sort' => 'asc'],
+    ]);
     $this->submitForm($editunblock, 'Apply to selected items');
     $user_storage->resetCache([$user_c->id()]);
     $account = $user_storage->load($user_c->id());
diff --git a/web/core/modules/user/tests/src/Functional/UserBlocksTest.php b/web/core/modules/user/tests/src/Functional/UserBlocksTest.php
index b89a6ff67..59f96ffa6 100644
--- a/web/core/modules/user/tests/src/Functional/UserBlocksTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserBlocksTest.php
@@ -32,6 +32,9 @@ class UserBlocksTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/user/tests/src/Functional/UserCancelTest.php b/web/core/modules/user/tests/src/Functional/UserCancelTest.php
index 57b703e40..d9a2f709e 100644
--- a/web/core/modules/user/tests/src/Functional/UserCancelTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCancelTest.php
@@ -32,6 +32,9 @@ class UserCancelTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/user/tests/src/Functional/UserCreateTest.php b/web/core/modules/user/tests/src/Functional/UserCreateTest.php
index dee27b705..d3f62030a 100644
--- a/web/core/modules/user/tests/src/Functional/UserCreateTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserCreateTest.php
@@ -31,8 +31,7 @@ class UserCreateTest extends BrowserTestBase {
   protected $defaultTheme = 'stark';
 
   /**
-   * Create a user through the administration interface and ensure that it
-   * displays in the user list.
+   * Tests user creation and display from the administration interface.
    */
   public function testUserAdd() {
     $user = $this->drupalCreateUser(['administer users']);
diff --git a/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php b/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
index 94d86b492..4f3478542 100644
--- a/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLanguageCreationTest.php
@@ -6,8 +6,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests whether proper language is stored for new users and access to language
- * selector.
+ * Tests preferred language configuration and language selector access.
  *
  * @group user
  */
diff --git a/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php b/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
index b2f87f28d..0760d50b1 100644
--- a/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
@@ -106,6 +106,8 @@ public function testLogin() {
 
     // Enable serialization so we have access to additional formats.
     $this->container->get('module_installer')->install(['serialization']);
+    $this->rebuildAll();
+
     $this->doTestLogin('json');
     $this->doTestLogin('xml');
   }
@@ -243,6 +245,7 @@ public function testPasswordReset() {
 
     // Enable serialization so we have access to additional formats.
     $this->container->get('module_installer')->install(['serialization']);
+    $this->rebuildAll();
 
     $this->doTestPasswordReset('json', $account);
     $this->doTestPasswordReset('xml', $account);
@@ -572,6 +575,7 @@ protected function loginFromResetEmail() {
     $resetURL = $urls[0];
     $this->drupalGet($resetURL);
     $this->submitForm([], 'Log in');
+    $this->assertSession()->pageTextContains('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please set your password.');
   }
 
 }
diff --git a/web/core/modules/user/tests/src/Functional/UserLoginTest.php b/web/core/modules/user/tests/src/Functional/UserLoginTest.php
index d2a892fe3..3284dc9ce 100644
--- a/web/core/modules/user/tests/src/Functional/UserLoginTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserLoginTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\user\Functional;
 
+use Drupal\Core\Test\AssertMailTrait;
 use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 use Drupal\user\Entity\User;
@@ -14,6 +15,10 @@
  */
 class UserLoginTest extends BrowserTestBase {
 
+  use AssertMailTrait {
+    getMails as drupalGetMails;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -75,6 +80,13 @@ public function testGlobalLoginFloodControl() {
     // A login with the correct password should also result in a flood error
     // message.
     $this->assertFailedLogin($user1, 'ip');
+
+    // A login attempt after resetting the password should still fail, since the
+    // IP-based flood control count is not cleared after a password reset.
+    $this->resetUserPassword($user1);
+    $this->drupalLogout();
+    $this->assertFailedLogin($user1, 'ip');
+    $this->assertSession()->responseContains('Too many failed login attempts from your IP address.');
   }
 
   /**
@@ -98,7 +110,8 @@ public function testPerUserLoginFloodControl() {
       $this->assertFailedLogin($incorrect_user1);
     }
 
-    // A successful login will reset the per-user flood control count.
+    // We're not going to test resetting the password which should clear the
+    // flood table and allow the user to log in again.
     $this->drupalLogin($user1);
     $this->drupalLogout();
 
@@ -115,6 +128,12 @@ public function testPerUserLoginFloodControl() {
     // Try one more attempt for user 1, it should be rejected, even if the
     // correct password has been used.
     $this->assertFailedLogin($user1, 'user');
+    $this->resetUserPassword($user1);
+    $this->drupalLogout();
+
+    // Try to log in as user 1, it should be successful.
+    $this->drupalLogin($user1);
+    $this->assertSession()->responseContains('Member for');
   }
 
   /**
@@ -300,4 +319,23 @@ public function assertFailedLogin(User $account, string $flood_trigger = NULL):
     }
   }
 
+  /**
+   * Reset user password.
+   *
+   * @param object $user
+   *   A user object.
+   */
+  public function resetUserPassword($user) {
+    $this->drupalGet('user/password');
+    $edit['name'] = $user->getDisplayName();
+    $this->submitForm($edit, 'Submit');
+    $_emails = $this->drupalGetMails();
+    $email = end($_emails);
+    $urls = [];
+    preg_match('#.+user/reset/.+#', $email['body'], $urls);
+    $resetURL = $urls[0];
+    $this->drupalGet($resetURL);
+    $this->submitForm([], 'Log in');
+  }
+
 }
diff --git a/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php b/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
index e984c466e..5bb8f3fe9 100644
--- a/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPasswordResetTest.php
@@ -31,7 +31,7 @@ class UserPasswordResetTest extends BrowserTestBase {
   /**
    * Language manager object.
    *
-   * @var \Drupal\language\LanguageManagerInterface
+   * @var \Drupal\Core\Language\LanguageManagerInterface
    */
   protected $languageManager;
 
@@ -151,7 +151,8 @@ public function testUserPasswordReset() {
     // Log out, and try to log in again using the same one-time link.
     $this->drupalLogout();
     $this->drupalGet($resetURL);
-    $this->submitForm([], 'Log in');
+    $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
+    $this->drupalGet($resetURL . '/login');
     $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
 
     // Request a new password again, this time using the email address.
@@ -177,7 +178,8 @@ public function testUserPasswordReset() {
     $bogus_timestamp = REQUEST_TIME - $timeout - 60;
     $_uid = $this->account->id();
     $this->drupalGet("user/reset/$_uid/$bogus_timestamp/" . user_pass_rehash($this->account, $bogus_timestamp));
-    $this->submitForm([], 'Log in');
+    $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has expired. Please request a new one using the form below.');
+    $this->drupalGet("user/reset/$_uid/$bogus_timestamp/" . user_pass_rehash($this->account, $bogus_timestamp) . '/login');
     $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has expired. Please request a new one using the form below.');
 
     // Create a user, block the account, and verify that a login link is denied.
@@ -186,6 +188,8 @@ public function testUserPasswordReset() {
     $blocked_account->save();
     $this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account, $timestamp));
     $this->assertSession()->statusCodeEquals(403);
+    $this->drupalGet("user/reset/" . $blocked_account->id() . "/$timestamp/" . user_pass_rehash($blocked_account, $timestamp) . '/login');
+    $this->assertSession()->statusCodeEquals(403);
 
     // Verify a blocked user can not request a new password.
     $this->drupalGet('user/password');
@@ -203,7 +207,8 @@ public function testUserPasswordReset() {
     $this->account->setEmail("1" . $this->account->getEmail());
     $this->account->save();
     $this->drupalGet($old_email_reset_link);
-    $this->submitForm([], 'Log in');
+    $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
+    $this->drupalGet($old_email_reset_link . '/login');
     $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
 
     // Verify a password reset link will automatically log a user when /login is
@@ -563,7 +568,11 @@ public function testResetImpersonation() {
     $reset_url = user_pass_reset_url($user1);
     $attack_reset_url = str_replace("user/reset/{$user1->id()}", "user/reset/{$user2->id()}", $reset_url);
     $this->drupalGet($attack_reset_url);
-    $this->submitForm([], 'Log in');
+    // Verify that the invalid password reset page does not show the user name.
+    $this->assertSession()->pageTextNotContains($user2->getAccountName());
+    $this->assertSession()->addressEquals('user/password');
+    $this->assertSession()->pageTextContains('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.');
+    $this->drupalGet($attack_reset_url . '/login');
     // Verify that the invalid password reset page does not show the user name.
     $this->assertSession()->pageTextNotContains($user2->getAccountName());
     $this->assertSession()->addressEquals('user/password');
diff --git a/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php b/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php
index 236505037..7986c03f4 100644
--- a/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPermissionsTest.php
@@ -7,8 +7,7 @@
 use Drupal\user\Entity\Role;
 
 /**
- * Verify that role permissions can be added and removed via the permissions
- * pages.
+ * Verifies role permissions can be added and removed via the permissions page.
  *
  * @group user
  */
@@ -33,6 +32,9 @@ class UserPermissionsTest extends BrowserTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/user/tests/src/Functional/UserPictureTest.php b/web/core/modules/user/tests/src/Functional/UserPictureTest.php
index dd8c63442..6d8fb5c10 100644
--- a/web/core/modules/user/tests/src/Functional/UserPictureTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserPictureTest.php
@@ -43,6 +43,9 @@ class UserPictureTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -116,7 +119,7 @@ public function testPictureOnNodeComment() {
 
     $image_style_id = $this->config('core.entity_view_display.user.user.compact')->get('content.user_picture.settings.image_style');
     $style = ImageStyle::load($image_style_id);
-    $image_url = \Drupal::service('file_url_generator')->transformRelative($style->buildUrl($file->getfileUri()));
+    $image_url = \Drupal::service('file_url_generator')->transformRelative($style->buildUrl($file->getFileUri()));
     $alt_text = 'Profile picture for user ' . $this->webUser->getAccountName();
 
     // Verify that the image is displayed on the node page.
diff --git a/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
index 208f00bf9..87986ef3e 100644
--- a/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
@@ -11,6 +11,9 @@
  */
 class UserRolesAssignmentTest extends BrowserTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $admin_user = $this->drupalCreateUser([
@@ -26,8 +29,7 @@ protected function setUp(): void {
   protected $defaultTheme = 'stark';
 
   /**
-   * Tests that a user can be assigned a role and that the role can be removed
-   * again.
+   * Test that user can be assigned role and that the role can be removed again.
    */
   public function testAssignAndRemoveRole() {
     $rid = $this->drupalCreateRole(['administer users']);
@@ -49,8 +51,7 @@ public function testAssignAndRemoveRole() {
   }
 
   /**
-   * Tests that when creating a user the role can be assigned. And that it can
-   * be removed again.
+   * Tests assigning a role at user creation and removing the role.
    */
   public function testCreateUserWithRole() {
     $rid = $this->drupalCreateRole(['administer users']);
diff --git a/web/core/modules/user/tests/src/Functional/UserSearchTest.php b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
index 973dc2602..5c013cdbf 100644
--- a/web/core/modules/user/tests/src/Functional/UserSearchTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserSearchTest.php
@@ -5,8 +5,7 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * Tests the user search page and verifies that sensitive information is hidden
- * from unauthorized users.
+ * Verifies that sensitive information is hidden from unauthorized users.
  *
  * @group user
  */
diff --git a/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php b/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
index 4ea4a29c8..c745b0a36 100644
--- a/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
+++ b/web/core/modules/user/tests/src/Functional/UserTokenReplaceTest.php
@@ -10,8 +10,7 @@
 use Drupal\user\Entity\User;
 
 /**
- * Generates text using placeholders for dummy content to check user token
- * replacement.
+ * Tests the replacement of user tokens.
  *
  * @group user
  */
diff --git a/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php b/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php
index 4b0c70f43..a1220381c 100644
--- a/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php
+++ b/web/core/modules/user/tests/src/Functional/UserTranslationUITest.php
@@ -46,6 +46,9 @@ class UserTranslationUITest extends ContentTranslationUITestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->entityTypeId = 'user';
     $this->testLanguageSelector = FALSE;
diff --git a/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php b/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
index 9a02687c5..fd6898098 100644
--- a/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
@@ -31,6 +31,9 @@ class FilterPermissionUiTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php b/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
index ab365cde5..5fddb8a90 100644
--- a/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
@@ -55,6 +55,9 @@ class HandlerFilterUserNameTest extends ViewTestBase {
     'uid' => 'uid',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php b/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
index ae9ebdd97..64beb93b4 100644
--- a/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
@@ -30,6 +30,9 @@ class UserChangedTest extends ViewTestBase {
    */
   public static $testViews = ['test_user_changed'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php b/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
index d96e94521..24ac5553b 100644
--- a/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
+++ b/web/core/modules/user/tests/src/Functional/Views/UserFieldsAccessChangeTest.php
@@ -55,7 +55,9 @@ public function testUserFieldAccess() {
   }
 
   /**
-   * Tests the user name formatter shows a link to the user when there is
+   * Test user name link.
+   *
+   * Tests that the user name formatter shows a link to the user when there is
    * access but not otherwise.
    */
   public function testUserNameLink() {
diff --git a/web/core/modules/user/tests/src/Functional/Views/UserTestBase.php b/web/core/modules/user/tests/src/Functional/Views/UserTestBase.php
index 9538a273b..f860acad2 100644
--- a/web/core/modules/user/tests/src/Functional/Views/UserTestBase.php
+++ b/web/core/modules/user/tests/src/Functional/Views/UserTestBase.php
@@ -31,6 +31,9 @@ abstract class UserTestBase extends ViewTestBase {
    */
   protected $nodes = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']) {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php b/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
index cc00ab67c..c33dc1a4a 100644
--- a/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Condition/UserRoleConditionTest.php
@@ -39,7 +39,7 @@ class UserRoleConditionTest extends KernelTestBase {
   /**
    * A custom role for testing purposes.
    *
-   * @var \Drupal\user\Entity\RoleInterface
+   * @var \Drupal\user\RoleInterface
    */
   protected $role;
 
diff --git a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
index ea6f94635..9e929f098 100644
--- a/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserRoleTest.php
@@ -46,8 +46,7 @@ protected function assertRole(string $id, array $permissions, int $lookupId, Mig
   }
 
   /**
-   * Helper function to test the migration of the user roles. The user roles
-   * will be re-imported and the tests here will be repeated.
+   * Helper to assert the user roles.
    *
    * @param \Drupal\migrate\Plugin\MigrateIdMapInterface $id_map
    *   The map table plugin.
diff --git a/web/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php b/web/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php
index 1f29505a5..9dc0c72ea 100644
--- a/web/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php
+++ b/web/core/modules/user/tests/src/Kernel/Plugin/migrate/source/ProfileFieldTest.php
@@ -25,7 +25,7 @@ public function providerSource() {
       [
         'source_data' => [],
         'expected_data' => [],
-       ],
+      ],
     ];
 
     $profile_fields = [
diff --git a/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php b/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
index 1aabea79a..dbc618534 100644
--- a/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserAccountFormFieldsTest.php
@@ -6,8 +6,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Verifies that the field order in user account forms is compatible with
- * password managers of web browsers.
+ * Verifies the field order in user account forms.
  *
  * @group user
  */
diff --git a/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php b/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php
index 527db24aa..8767c92e1 100644
--- a/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserActionConfigSchemaTest.php
@@ -7,8 +7,7 @@
 use Drupal\user\Entity\Role;
 
 /**
- * Ensures the user action for adding and removing roles have valid config
- * schema.
+ * Tests that the config schema is valid when roles are added or removed.
  *
  * @group user
  */
diff --git a/web/core/modules/user/tests/src/Kernel/UserMailNotifyTest.php b/web/core/modules/user/tests/src/Kernel/UserMailNotifyTest.php
index 2038d18c0..a8ac68248 100644
--- a/web/core/modules/user/tests/src/Kernel/UserMailNotifyTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserMailNotifyTest.php
@@ -82,6 +82,7 @@ public function userMailsProvider() {
    */
   public function testUserMailsSent($op, array $mail_keys) {
     $this->installConfig('user');
+    $this->config('system.site')->set('mail', 'test@example.com')->save();
     $this->config('user.settings')->set('notify.' . $op, TRUE)->save();
     $return = _user_mail_notify($op, $this->createUser());
     $this->assertTrue($return);
@@ -173,6 +174,7 @@ public function testUserRecoveryMailLanguage() {
 
     // Recovery email should respect user preferred langcode by default if
     // langcode not set.
+    $this->config('system.site')->set('mail', 'test@example.com')->save();
     $params['account'] = $user;
     $default_email = \Drupal::service('plugin.manager.mail')->mail('user', 'password_reset', $user->getEmail(), $preferredLangcode, $params);
     $this->assertTrue($default_email['result']);
diff --git a/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php b/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php
index 48128b0e6..7fa680f62 100644
--- a/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserRoleDeleteTest.php
@@ -22,6 +22,9 @@ class UserRoleDeleteTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'user', 'field'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
diff --git a/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php b/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php
index 5d85147ca..aa6f9c4ac 100644
--- a/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserRoleEntityTest.php
@@ -46,4 +46,16 @@ public function testGrantingNonExistentPermission() {
       ->save();
   }
 
+  public function testPermissionRevokeAndConfigSync() {
+    $role = Role::create(['id' => 'test_role', 'label' => 'Test role']);
+    $role->setSyncing(TRUE);
+    $role->grantPermission('a')
+      ->grantPermission('b')
+      ->grantPermission('c')
+      ->save();
+    $this->assertSame(['a', 'b', 'c'], $role->getPermissions());
+    $role->revokePermission('b')->save();
+    $this->assertSame(['a', 'c'], $role->getPermissions());
+  }
+
 }
diff --git a/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php b/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php
index 8432a8da0..987039f26 100644
--- a/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php
+++ b/web/core/modules/user/tests/src/Kernel/UserSaveStatusTest.php
@@ -19,6 +19,9 @@ class UserSaveStatusTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'user', 'field'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
diff --git a/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php b/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
index 5180caa28..5f359956f 100644
--- a/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
+++ b/web/core/modules/user/tests/src/Kernel/Views/UserKernelTestBase.php
@@ -38,6 +38,9 @@ abstract class UserKernelTestBase extends ViewsKernelTestBase {
    */
   protected $userStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE) {
     parent::setUp();
 
diff --git a/web/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php b/web/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
index 90551a75c..d7d7856a3 100644
--- a/web/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
+++ b/web/core/modules/user/tests/src/Kernel/WhosOnlineBlockTest.php
@@ -21,7 +21,7 @@ class WhosOnlineBlockTest extends KernelTestBase {
   /**
    * The block being tested.
    *
-   * @var \Drupal\block\Entity\BlockInterface
+   * @var \Drupal\block\BlockInterface
    */
   protected $block;
 
diff --git a/web/core/modules/user/tests/src/Traits/UserCreationTrait.php b/web/core/modules/user/tests/src/Traits/UserCreationTrait.php
index 5f9fe1e52..a73fbf832 100644
--- a/web/core/modules/user/tests/src/Traits/UserCreationTrait.php
+++ b/web/core/modules/user/tests/src/Traits/UserCreationTrait.php
@@ -13,8 +13,7 @@
 use Drupal\user\RoleInterface;
 
 /**
- * Provides methods to create additional test users and switch the currently
- * logged in one.
+ * Provides test methods for user creation and authentication.
  *
  * This trait is meant to be used only by test classes.
  */
diff --git a/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php b/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
index 88a167d24..a6dc74eb8 100644
--- a/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
+++ b/web/core/modules/user/tests/src/Unit/Menu/UserLocalTasksTest.php
@@ -12,6 +12,9 @@
  */
 class UserLocalTasksTest extends LocalTaskIntegrationTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->directoryList = ['user' => 'core/modules/user'];
     parent::setUp();
@@ -20,7 +23,7 @@ protected function setUp(): void {
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->container->set('entity_type.manager', $entity_type_manager);
     $this->container->set('string_translation', $this->getStringTranslationStub());
   }
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php
index 1f460517d..a2c91e302 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Action/AddRoleUserTest.php
@@ -20,7 +20,7 @@ public function testExecuteAddExistingRole() {
     $this->account->expects($this->any())
       ->method('hasRole')
       ->with($this->equalTo('test_role_1'))
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $config = ['rid' => 'test_role_1'];
     $add_role_plugin = new AddRoleUser($config, 'user_add_role_action', ['type' => 'user'], $this->userRoleEntityType);
@@ -38,7 +38,7 @@ public function testExecuteAddNonExistingRole() {
     $this->account->expects($this->any())
       ->method('hasRole')
       ->with($this->equalTo('test_role_1'))
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $config = ['rid' => 'test_role_1'];
     $add_role_plugin = new AddRoleUser($config, 'user_add_role_action', ['type' => 'user'], $this->userRoleEntityType);
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php
index 878b4baad..476afe94d 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Action/RemoveRoleUserTest.php
@@ -20,7 +20,7 @@ public function testExecuteRemoveExistingRole() {
     $this->account->expects($this->any())
       ->method('hasRole')
       ->with($this->equalTo('test_role_1'))
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $config = ['rid' => 'test_role_1'];
     $remove_role_plugin = new RemoveRoleUser($config, 'user_remove_role_action', ['type' => 'user'], $this->userRoleEntityType);
@@ -38,7 +38,7 @@ public function testExecuteRemoveNonExistingRole() {
     $this->account->expects($this->any())
       ->method('hasRole')
       ->with($this->equalTo('test_role_1'))
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $config = ['rid' => 'test_role_1'];
     $remove_role_plugin = new RemoveRoleUser($config, 'user_remove_role_action', ['type' => 'user'], $this->userRoleEntityType);
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php
index 966276bc4..f96d126e6 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Core/Entity/UserTest.php
@@ -22,7 +22,7 @@ protected function createUserSession(array $rids = [], $authenticated = FALSE) {
     $user->expects($this->any())
       ->method('id')
       // @todo Also test the uid = 1 handling.
-      ->will($this->returnValue($authenticated ? 2 : 0));
+      ->willReturn($authenticated ? 2 : 0);
     $roles = [];
     foreach ($rids as $rid) {
       $roles[] = (object) [
@@ -32,7 +32,7 @@ protected function createUserSession(array $rids = [], $authenticated = FALSE) {
     $user->expects($this->any())
       ->method('get')
       ->with('roles')
-      ->will($this->returnValue($roles));
+      ->willReturn($roles);
     return $user;
   }
 
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/Derivative/UserLocalTaskTest.php b/web/core/modules/user/tests/src/Unit/Plugin/Derivative/UserLocalTaskTest.php
index ac4902d85..654aa92b5 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/Derivative/UserLocalTaskTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/Derivative/UserLocalTaskTest.php
@@ -22,6 +22,9 @@ class UserLocalTaskTest extends UnitTestCase {
    */
   protected $deriver;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php b/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
index cdd6ec685..c530ad796 100644
--- a/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
+++ b/web/core/modules/user/tests/src/Unit/Plugin/views/field/UserBulkFormTest.php
@@ -33,26 +33,26 @@ public function testConstructor() {
       $action = $this->createMock('\Drupal\system\ActionConfigEntityInterface');
       $action->expects($this->any())
         ->method('getType')
-        ->will($this->returnValue('user'));
+        ->willReturn('user');
       $actions[$i] = $action;
     }
 
     $action = $this->createMock('\Drupal\system\ActionConfigEntityInterface');
     $action->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('node'));
+      ->willReturn('node');
     $actions[] = $action;
 
     $entity_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
     $entity_storage->expects($this->any())
       ->method('loadMultiple')
-      ->will($this->returnValue($actions));
+      ->willReturn($actions);
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->once())
       ->method('getStorage')
       ->with('action')
-      ->will($this->returnValue($entity_storage));
+      ->willReturn($entity_storage);
 
     $entity_repository = $this->createMock(EntityRepositoryInterface::class);
 
@@ -66,7 +66,7 @@ public function testConstructor() {
     $views_data->expects($this->any())
       ->method('get')
       ->with('users')
-      ->will($this->returnValue(['table' => ['entity type' => 'user']]));
+      ->willReturn(['table' => ['entity type' => 'user']]);
     $container = new ContainerBuilder();
     $container->set('views.views_data', $views_data);
     $container->set('string_translation', $this->getStringTranslationStub());
@@ -76,7 +76,7 @@ public function testConstructor() {
     $storage->expects($this->any())
       ->method('get')
       ->with('base_table')
-      ->will($this->returnValue('users'));
+      ->willReturn('users');
 
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
diff --git a/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php b/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php
index ddbba3aa5..e4bcd038b 100644
--- a/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php
+++ b/web/core/modules/user/tests/src/Unit/Theme/AdminNegotiatorTest.php
@@ -35,7 +35,7 @@ public function testDetermineActiveTheme($admin_theme, $expected) {
    */
   public function getThemes() {
     return [
-      ['seven', 'seven'],
+      ['claro', 'claro'],
       [NULL, NULL],
       ['', NULL],
     ];
diff --git a/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php b/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
index 0fea2899a..333d7bcff 100644
--- a/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
+++ b/web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
@@ -77,11 +77,11 @@ protected function setUp(): void {
     $this->viewer
       ->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->viewer
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(1));
+      ->willReturn(1);
 
     $this->owner = $this->createMock('\Drupal\Core\Session\AccountInterface');
     $this->owner
@@ -95,13 +95,13 @@ protected function setUp(): void {
     $this->owner
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(2));
+      ->willReturn(2);
 
     $this->admin = $this->createMock('\Drupal\Core\Session\AccountInterface');
     $this->admin
       ->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->emailViewer = $this->createMock('\Drupal\Core\Session\AccountInterface');
     $this->emailViewer
@@ -113,7 +113,7 @@ protected function setUp(): void {
     $this->emailViewer
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(3));
+      ->willReturn(3);
 
     $entity_type = $this->createMock('Drupal\Core\Entity\EntityTypeInterface');
 
@@ -127,7 +127,7 @@ protected function setUp(): void {
     $this->items
       ->expects($this->any())
       ->method('defaultAccess')
-      ->will($this->returnValue(AccessResult::allowed()));
+      ->willReturn(AccessResult::allowed());
   }
 
   /**
@@ -139,12 +139,12 @@ public function assertFieldAccess(string $field, string $viewer, string $target,
     $field_definition = $this->createMock('Drupal\Core\Field\FieldDefinitionInterface');
     $field_definition->expects($this->any())
       ->method('getName')
-      ->will($this->returnValue($field));
+      ->willReturn($field);
 
     $this->items
       ->expects($this->any())
       ->method('getEntity')
-      ->will($this->returnValue($this->{$target}));
+      ->willReturn($this->{$target});
 
     foreach (['view' => $view, 'edit' => $edit] as $operation => $result) {
       $result_text = !isset($result) ? 'null' : ($result ? 'true' : 'false');
diff --git a/web/core/modules/user/tests/src/Unit/UserAuthTest.php b/web/core/modules/user/tests/src/Unit/UserAuthTest.php
index 10526a403..899799f1f 100644
--- a/web/core/modules/user/tests/src/Unit/UserAuthTest.php
+++ b/web/core/modules/user/tests/src/Unit/UserAuthTest.php
@@ -72,7 +72,7 @@ protected function setUp(): void {
     $entity_type_manager->expects($this->any())
       ->method('getStorage')
       ->with('user')
-      ->will($this->returnValue($this->userStorage));
+      ->willReturn($this->userStorage);
 
     $this->passwordService = $this->createMock('Drupal\Core\Password\PasswordInterface');
 
@@ -121,7 +121,7 @@ public function testAuthenticateWithNoAccountReturned() {
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
       ->with(['name' => $this->username])
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->assertFalse($this->userAuth->authenticate($this->username, $this->password));
   }
@@ -135,12 +135,12 @@ public function testAuthenticateWithIncorrectPassword() {
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
       ->with(['name' => $this->username])
-      ->will($this->returnValue([$this->testUser]));
+      ->willReturn([$this->testUser]);
 
     $this->passwordService->expects($this->once())
       ->method('check')
       ->with($this->password, $this->testUser->getPassword())
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->assertFalse($this->userAuth->authenticate($this->username, $this->password));
   }
@@ -153,17 +153,17 @@ public function testAuthenticateWithIncorrectPassword() {
   public function testAuthenticateWithCorrectPassword() {
     $this->testUser->expects($this->once())
       ->method('id')
-      ->will($this->returnValue(1));
+      ->willReturn(1);
 
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
       ->with(['name' => $this->username])
-      ->will($this->returnValue([$this->testUser]));
+      ->willReturn([$this->testUser]);
 
     $this->passwordService->expects($this->once())
       ->method('check')
       ->with($this->password, $this->testUser->getPassword())
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->assertSame(1, $this->userAuth->authenticate($this->username, $this->password));
   }
@@ -180,17 +180,17 @@ public function testAuthenticateWithCorrectPassword() {
   public function testAuthenticateWithZeroPassword() {
     $this->testUser->expects($this->once())
       ->method('id')
-      ->will($this->returnValue(2));
+      ->willReturn(2);
 
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
       ->with(['name' => $this->username])
-      ->will($this->returnValue([$this->testUser]));
+      ->willReturn([$this->testUser]);
 
     $this->passwordService->expects($this->once())
       ->method('check')
       ->with(0, 0)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->assertSame(2, $this->userAuth->authenticate($this->username, 0));
   }
@@ -203,7 +203,7 @@ public function testAuthenticateWithZeroPassword() {
   public function testAuthenticateWithCorrectPasswordAndNewPasswordHash() {
     $this->testUser->expects($this->once())
       ->method('id')
-      ->will($this->returnValue(1));
+      ->willReturn(1);
     $this->testUser->expects($this->once())
       ->method('setPassword')
       ->with($this->password);
@@ -213,16 +213,16 @@ public function testAuthenticateWithCorrectPasswordAndNewPasswordHash() {
     $this->userStorage->expects($this->once())
       ->method('loadByProperties')
       ->with(['name' => $this->username])
-      ->will($this->returnValue([$this->testUser]));
+      ->willReturn([$this->testUser]);
 
     $this->passwordService->expects($this->once())
       ->method('check')
       ->with($this->password, $this->testUser->getPassword())
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->passwordService->expects($this->once())
       ->method('needsRehash')
       ->with($this->testUser->getPassword())
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->assertSame(1, $this->userAuth->authenticate($this->username, $this->password));
   }
@@ -280,4 +280,57 @@ public function testAddCheckToUrlForTrustedRedirectResponse(): void {
     $this->assertSame("$frontend_url?check_logged_in=1", $response->getTargetUrl());
   }
 
+  /**
+   * Tests the auth that ends in a redirect from subdomain with a fragment to TLD.
+   */
+  public function testAddCheckToUrlForTrustedRedirectResponseWithFragment(): void {
+    $site_domain = 'site.com';
+    $frontend_url = "https://$site_domain";
+    $backend_url = "https://api.$site_domain";
+    $request = Request::create($backend_url);
+    $response = new TrustedRedirectResponse($frontend_url . '#a_fragment');
+
+    $request_context = $this->createMock(RequestContext::class);
+    $request_context
+      ->method('getCompleteBaseUrl')
+      ->willReturn($backend_url);
+
+    $container = new ContainerBuilder();
+    $container->set('router.request_context', $request_context);
+    \Drupal::setContainer($container);
+
+    $session_mock = $this->createMock(SessionInterface::class);
+    $session_mock
+      ->expects($this->once())
+      ->method('has')
+      ->with('check_logged_in')
+      ->willReturn(TRUE);
+    $session_mock
+      ->expects($this->once())
+      ->method('remove')
+      ->with('check_logged_in');
+
+    $event_mock = $this->createMock(ResponseEvent::class);
+    $event_mock
+      ->expects($this->once())
+      ->method('getResponse')
+      ->willReturn($response);
+    $event_mock
+      ->expects($this->exactly(3))
+      ->method('getRequest')
+      ->willReturn($request);
+
+    $request
+      ->setSession($session_mock);
+
+    $this
+      ->getMockBuilder(Cookie::class)
+      ->disableOriginalConstructor()
+      ->onlyMethods([])
+      ->getMock()
+      ->addCheckToUrl($event_mock);
+
+    $this->assertSame("$frontend_url?check_logged_in=1#a_fragment", $response->getTargetUrl());
+  }
+
 }
diff --git a/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php b/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
index dc1f9eae9..8e18649ee 100644
--- a/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
+++ b/web/core/modules/user/tests/src/Unit/Views/Argument/RolesRidTest.php
@@ -46,19 +46,19 @@ public function testTitleQuery() {
     $entity_type->expects($this->any())
       ->method('getKey')
       ->with('label')
-      ->will($this->returnValue('label'));
+      ->willReturn('label');
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->any())
       ->method('getDefinition')
       ->with($this->equalTo('user_role'))
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     $entity_type_manager
       ->expects($this->once())
       ->method('getStorage')
       ->with($this->equalTo('user_role'))
-      ->will($this->returnValue($role_storage));
+      ->willReturn($role_storage);
 
     // Set up a minimal container to satisfy Drupal\Core\Entity\EntityBase's
     // dependency on it.
diff --git a/web/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js b/web/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js
index 06c010857..33a1a0648 100644
--- a/web/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js
+++ b/web/core/modules/user/tests/themes/password_theme_function_test/js/password-theme-functions.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.passwordStrength = function (_ref) {
     var strengthTitle = _ref.strengthTitle;
@@ -12,18 +11,15 @@
     var strengthText = '<span class="password-strength__text js-password-strength__text the-prior-class-is-deprecated" data-drupal-selector="a-distinct-absence-of-password-strength-text"></span>';
     return "\n      <div class=\"password-strength\">\n        <div class=\"password-strength__meter\" data-drupal-selector=\"password-strength-meter\">".concat(strengthIndicator, "</div>\n        <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n      </div>\n    ");
   };
-
   Drupal.theme.passwordSuggestions = function (_ref2, tips) {
     var hasWeaknesses = _ref2.hasWeaknesses;
     return "<div class=\"password-suggestions\">Overridden passwordSuggestions: ".concat(tips.length ? "".concat(hasWeaknesses, "<ul><li>").concat(tips.join('</li><li>'), "</li></ul>") : '', "</div>");
   };
-
   Drupal.theme.passwordConfirmMessage = function (_ref3) {
     var confirmTitle = _ref3.confirmTitle;
     var confirmTextWrapper = '<span>Overridden passwordConfirmMessage:</span><span data-drupal-selector="a-distinct-absence-of-password-match-status-text"></span>';
     return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
   };
-
   Drupal.behaviors.passwordThemeFunctionTest = {
     attach: function attach(context, settings) {
       var strength = Drupal.evaluatePasswordStrength('password', settings.password);
diff --git a/web/core/modules/user/tests/themes/user_test_theme/user_test_theme.info.yml b/web/core/modules/user/tests/themes/user_test_theme/user_test_theme.info.yml
index 827d183d2..51629fb62 100644
--- a/web/core/modules/user/tests/themes/user_test_theme/user_test_theme.info.yml
+++ b/web/core/modules/user/tests/themes/user_test_theme/user_test_theme.info.yml
@@ -1,5 +1,5 @@
 name: 'User Test theme'
 type: theme
-base theme: stable
+base theme: stable9
 description: 'Theme for testing the available fields in user twig template'
 version: VERSION
diff --git a/web/core/modules/user/user.install b/web/core/modules/user/user.install
index 7f209f5cb..8a3bf63e2 100644
--- a/web/core/modules/user/user.install
+++ b/web/core/modules/user/user.install
@@ -142,3 +142,7 @@ function user_update_9301(&$sandbox) {
     $connection->query("ALTER SEQUENCE " . $seq . " RESTART WITH " . ($maximum_uid + 1) . " OWNED BY {users}.uid");
   }
 }
+
+// Do not add further hook_update_N() implementations to this file.
+// user_update_10000() has been added to 10.0.x which makes adding new updates
+// extremely complex.
diff --git a/web/core/modules/user/user.js b/web/core/modules/user/user.js
index 659db32c2..6824d2d71 100644
--- a/web/core/modules/user/user.js
+++ b/web/core/modules/user/user.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.user = {
     password: {
@@ -34,82 +33,66 @@
         var $confirmInput = $passwordWidget.find('input.js-password-confirm');
         var $passwordConfirmMessage = $(Drupal.theme('passwordConfirmMessage', settings.password));
         var $passwordMatchStatus = $passwordConfirmMessage.find('[data-drupal-selector="password-match-status-text"]').first();
-
         if ($passwordMatchStatus.length === 0) {
           $passwordMatchStatus = $passwordConfirmMessage.find('span').first();
           Drupal.deprecationError({
             message: 'Returning <span> without data-drupal-selector="password-match-status-text" attribute is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. See https://www.drupal.org/node/3152101'
           });
         }
-
         var $confirmInputParent = $confirmInput.parent().addClass('confirm-parent').append($passwordConfirmMessage);
         var passwordStrengthBarClassesToRemove = [cssClasses.passwordWeak || '', cssClasses.passwordFair || '', cssClasses.passwordGood || '', cssClasses.passwordStrong || ''].join(' ').trim();
         var confirmTextWrapperClassesToRemove = [cssClasses.passwordsMatch || '', cssClasses.passwordsNotMatch || ''].join(' ').trim();
         var widgetClassesToRemove = [cssClasses.widgetInitial || '', cssClasses.passwordEmpty || '', cssClasses.passwordFilled || '', cssClasses.confirmEmpty || '', cssClasses.confirmFilled || ''].join(' ').trim();
         var password = {};
-
         if (settings.password.showStrengthIndicator) {
           var $passwordStrength = $(Drupal.theme('passwordStrength', settings.password));
           password.$strengthBar = $passwordStrength.find('[data-drupal-selector="password-strength-indicator"]').first();
-
           if (password.$strengthBar.length === 0) {
             password.$strengthBar = $passwordStrength.find('.js-password-strength__indicator').first();
             Drupal.deprecationError({
               message: 'The js-password-strength__indicator class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__indicator with a data-drupal-selector="password-strength-indicator" attribute. See https://www.drupal.org/node/3152101'
             });
           }
-
           password.$strengthTextWrapper = $passwordStrength.find('[data-drupal-selector="password-strength-text"]').first();
-
           if (password.$strengthTextWrapper.length === 0) {
             password.$strengthTextWrapper = $passwordStrength.find('.js-password-strength__text').first();
             Drupal.deprecationError({
               message: 'The js-password-strength__text class is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Replace js-password-strength__text with a data-drupal-selector="password-strength-text" attribute. See https://www.drupal.org/node/3152101'
             });
           }
-
           password.$suggestions = $(Drupal.theme('passwordSuggestions', settings.password, []));
           password.$suggestions.hide();
           $mainInputParent.append($passwordStrength);
           $confirmInputParent.after(password.$suggestions);
         }
-
         var addWidgetClasses = function addWidgetClasses() {
           $passwordWidget.addClass($mainInput[0].value ? cssClasses.passwordFilled : cssClasses.passwordEmpty).addClass($confirmInput[0].value ? cssClasses.confirmFilled : cssClasses.confirmEmpty);
         };
-
         var passwordCheckMatch = function passwordCheckMatch(confirmInputVal) {
           var passwordsAreMatching = $mainInput[0].value === confirmInputVal;
           var confirmClass = passwordsAreMatching ? cssClasses.passwordsMatch : cssClasses.passwordsNotMatch;
           var confirmMessage = passwordsAreMatching ? settings.password.confirmSuccess : settings.password.confirmFailure;
-
           if (!$passwordMatchStatus.hasClass(confirmClass) || !$passwordMatchStatus.html() === confirmMessage) {
             if (confirmTextWrapperClassesToRemove) {
               $passwordMatchStatus.removeClass(confirmTextWrapperClassesToRemove);
             }
-
             $passwordMatchStatus.html(confirmMessage).addClass(confirmClass);
           }
         };
-
         var passwordCheck = function passwordCheck() {
           if (settings.password.showStrengthIndicator) {
             var result = Drupal.evaluatePasswordStrength($mainInput[0].value, settings.password);
             var $currentPasswordSuggestions = $(Drupal.theme('passwordSuggestions', settings.password, result.messageTips));
-
             if (password.$suggestions.html() !== $currentPasswordSuggestions.html()) {
               password.$suggestions.replaceWith($currentPasswordSuggestions);
               password.$suggestions = $currentPasswordSuggestions.toggle(result.strength !== 100);
             }
-
             if (passwordStrengthBarClassesToRemove) {
               password.$strengthBar.removeClass(passwordStrengthBarClassesToRemove);
             }
-
             password.$strengthBar.css('width', "".concat(result.strength, "%")).addClass(result.indicatorClass);
             password.$strengthTextWrapper.html(result.indicatorText);
           }
-
           if ($confirmInput[0].value) {
             passwordCheckMatch($confirmInput[0].value);
             $passwordConfirmMessage.css({
@@ -120,23 +103,19 @@
               visibility: 'hidden'
             });
           }
-
           if (widgetClassesToRemove) {
             $passwordWidget.removeClass(widgetClassesToRemove);
             addWidgetClasses();
           }
         };
-
         if (widgetClassesToRemove) {
           addWidgetClasses();
         }
-
         $mainInput.on('input', passwordCheck);
         $confirmInput.on('input', passwordCheck);
       });
     }
   };
-
   Drupal.evaluatePasswordStrength = function (password, passwordSettings) {
     password = password.trim();
     var indicatorText;
@@ -150,54 +129,43 @@
     var hasPunctuation = /[^a-zA-Z0-9]/.test(password);
     var $usernameBox = $('input.username');
     var username = $usernameBox.length > 0 ? $usernameBox[0].value : passwordSettings.username;
-
     if (password.length < 12) {
       msg.push(passwordSettings.tooShort);
       strength -= (12 - password.length) * 5 + 30;
     }
-
     if (!hasLowercase) {
       msg.push(passwordSettings.addLowerCase);
       weaknesses += 1;
     }
-
     if (!hasUppercase) {
       msg.push(passwordSettings.addUpperCase);
       weaknesses += 1;
     }
-
     if (!hasNumbers) {
       msg.push(passwordSettings.addNumbers);
       weaknesses += 1;
     }
-
     if (!hasPunctuation) {
       msg.push(passwordSettings.addPunctuation);
       weaknesses += 1;
     }
-
     switch (weaknesses) {
       case 1:
         strength -= 12.5;
         break;
-
       case 2:
         strength -= 25;
         break;
-
       case 3:
       case 4:
         strength -= 40;
         break;
     }
-
     if (password !== '' && password.toLowerCase() === username.toLowerCase()) {
       msg.push(passwordSettings.sameAsUsername);
       strength = 5;
     }
-
     var cssClasses = Drupal.user.password.css;
-
     if (strength < 60) {
       indicatorText = passwordSettings.weak;
       indicatorClass = cssClasses.passwordWeak;
@@ -211,7 +179,6 @@
       indicatorText = passwordSettings.strong;
       indicatorClass = cssClasses.passwordStrong;
     }
-
     var messageTips = msg;
     msg = "".concat(passwordSettings.hasWeaknesses, "<ul><li>").concat(msg.join('</li><li>'), "</li></ul>");
     return Drupal.deprecatedProperty({
diff --git a/web/core/modules/user/user.libraries.yml b/web/core/modules/user/user.libraries.yml
index e4971f98d..c145ce03d 100644
--- a/web/core/modules/user/user.libraries.yml
+++ b/web/core/modules/user/user.libraries.yml
@@ -29,6 +29,7 @@ drupal.user.permissions:
     - core/drupal
     - core/drupalSettings
     - user/drupal.user.admin
+    - core/drupal.checkbox
 
 drupal.user.icons:
   version: VERSION
diff --git a/web/core/modules/user/user.module b/web/core/modules/user/user.module
index 6a37e07e0..6b2d73332 100644
--- a/web/core/modules/user/user.module
+++ b/web/core/modules/user/user.module
@@ -60,7 +60,7 @@ function user_help($route_name, RouteMatchInterface $route_match) {
       return '<p>' . t("This web page allows administrators to register new users. Users' email addresses and usernames must be unique.") . '</p>';
 
     case 'user.admin_permissions':
-      return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href=":role">Roles</a> page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. From the <a href=":settings">Account settings</a> page, you can make any role into an Administrator role for the site, meaning that role will be granted all new permissions automatically. You should be careful to ensure that only trusted users are given this access and level of control of your site.', [':role' => Url::fromRoute('entity.user_role.collection')->toString(), ':settings' => Url::fromRoute('entity.user.admin_form')->toString()]) . '</p>';
+      return '<p>' . t('Permissions let you control what users can do and see on your site. You can define a specific set of permissions for each role. (See the <a href=":role">Roles</a> page to create a role.) Any permissions granted to the Authenticated user role will be given to any user who is logged in to your site. On the <a href=":settings">Role settings</a> page, you can make any role into an Administrator role for the site, meaning that role will be granted all permissions. You should be careful to ensure that only trusted users are given this access and level of control of your site.', [':role' => Url::fromRoute('entity.user_role.collection')->toString(), ':settings' => Url::fromRoute('user.role.settings')->toString()]) . '</p>';
 
     case 'entity.user_role.collection':
       return '<p>' . t('A role defines a group of users that have certain privileges. These privileges are defined on the <a href=":permissions">Permissions page</a>. Here, you can define the names and the display sort order of the roles on your site. It is recommended to order roles from least permissive (for example, Anonymous user) to most permissive (for example, Administrator user). Users who are not logged in have the Anonymous user role. Users who are logged in have the Authenticated user role, plus any other roles granted to their user account.', [':permissions' => Url::fromRoute('user.admin_permissions')->toString()]) . '</p>';
@@ -167,7 +167,7 @@ function user_user_presave(UserInterface $account) {
  * @param string $mail
  *   String with the account's email address.
  *
- * @return object|bool
+ * @return \Drupal\user\UserInterface|false
  *   A fully-loaded $user object upon successful user load or FALSE if user
  *   cannot be loaded.
  *
@@ -185,7 +185,7 @@ function user_load_by_mail($mail) {
  * @param string $name
  *   String with the account's user name.
  *
- * @return object|bool
+ * @return \Drupal\user\UserInterface|false
  *   A fully-loaded $user object upon successful user load or FALSE if user
  *   cannot be loaded.
  *
@@ -459,7 +459,7 @@ function user_login_finalize(UserInterface $account) {
   \Drupal::logger('user')->notice('Session opened for %name.', ['%name' => $account->getAccountName()]);
   // Update the user table timestamp noting user has logged in.
   // This is also used to invalidate one-time login links.
-  $account->setLastLoginTime(REQUEST_TIME);
+  $account->setLastLoginTime(\Drupal::time()->getRequestTime());
   \Drupal::entityTypeManager()
     ->getStorage('user')
     ->updateLastLoginTimestamp($account);
@@ -521,7 +521,7 @@ function user_user_logout(AccountInterface $account) {
  *   they can change their password.
  */
 function user_pass_reset_url($account, $options = []) {
-  $timestamp = REQUEST_TIME;
+  $timestamp = \Drupal::time()->getRequestTime();
   $langcode = $options['langcode'] ?? $account->getPreferredLangcode();
   return Url::fromRoute('user.reset',
     [
@@ -554,7 +554,7 @@ function user_pass_reset_url($account, $options = []) {
  * @see \Drupal\user\Controller\UserController::confirmCancel()
  */
 function user_cancel_url(UserInterface $account, $options = []) {
-  $timestamp = REQUEST_TIME;
+  $timestamp = \Drupal::time()->getRequestTime();
   $langcode = $options['langcode'] ?? $account->getPreferredLangcode();
   $url_options = ['absolute' => TRUE, 'language' => \Drupal::languageManager()->getLanguage($langcode)];
   return Url::fromRoute('user.cancel_confirm', [
@@ -579,7 +579,7 @@ function user_cancel_url(UserInterface $account, $options = []) {
  * @param \Drupal\user\UserInterface $account
  *   An object containing the user account.
  * @param int $timestamp
- *   A UNIX timestamp, typically REQUEST_TIME.
+ *   A UNIX timestamp, typically \Drupal::time()->getRequestTime().
  *
  * @return string
  *   A string that is safe for use in URLs and SQL statements.
@@ -1018,8 +1018,7 @@ function user_role_revoke_permissions($rid, array $permissions = []) {
 }
 
 /**
- * Conditionally create and send a notification email when a certain
- * operation happens on the given user account.
+ * Creates and sends a notification email following a change to a user account.
  *
  * @param string $op
  *   The operation being performed on the account. Possible values:
@@ -1141,9 +1140,10 @@ function user_modules_uninstalled($modules) {
  *   An array of key/value pairs to be saved into a cookie.
  */
 function user_cookie_save(array $values) {
+  $request_time = \Drupal::time()->getRequestTime();
   foreach ($values as $field => $value) {
     // Set cookie for 365 days.
-    setrawcookie('Drupal.visitor.' . $field, rawurlencode($value), REQUEST_TIME + 31536000, '/');
+    setrawcookie('Drupal.visitor.' . $field, rawurlencode($value), $request_time + 31536000, '/');
   }
 }
 
@@ -1154,7 +1154,7 @@ function user_cookie_save(array $values) {
  *   A cookie name such as 'homepage'.
  */
 function user_cookie_delete($cookie_name) {
-  setrawcookie('Drupal.visitor.' . $cookie_name, '', REQUEST_TIME - 3600, '/');
+  setrawcookie('Drupal.visitor.' . $cookie_name, '', \Drupal::time()->getRequestTime() - 3600, '/');
 }
 
 /**
diff --git a/web/core/modules/user/user.permissions.js b/web/core/modules/user/user.permissions.js
index e6d4ea469..dea3a16f5 100644
--- a/web/core/modules/user/user.permissions.js
+++ b/web/core/modules/user/user.permissions.js
@@ -4,17 +4,14 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.permissions = {
     attach: function attach(context) {
       var _this = this;
-
       once('permissions', 'table#permissions').forEach(function (table) {
         var $table = $(table);
         var $ancestor;
         var method;
-
         if ($table.prev().length) {
           $ancestor = $table.prev();
           method = 'after';
@@ -22,7 +19,6 @@
           $ancestor = $table.parent();
           method = 'append';
         }
-
         $table.detach();
         var $dummy = $(Drupal.theme('checkbox')).removeClass('form-checkbox').addClass('dummy-checkbox js-dummy-checkbox').attr('disabled', 'disabled').attr('checked', 'checked').attr('title', Drupal.t('This permission is inherited from the authenticated user role.')).hide();
         $table.find('input[type="checkbox"]').not('.js-rid-anonymous, .js-rid-authenticated').addClass('real-checkbox js-real-checkbox').after($dummy);
diff --git a/web/core/modules/user/user.post_update.php b/web/core/modules/user/user.post_update.php
index 14662df8e..74f7b5b27 100644
--- a/web/core/modules/user/user.post_update.php
+++ b/web/core/modules/user/user.post_update.php
@@ -47,3 +47,20 @@ function user_post_update_update_roles(&$sandbox = NULL) {
     );
   }
 }
+
+/**
+ * No-op update.
+ */
+function user_post_update_sort_permissions(&$sandbox = NULL) {
+}
+
+/**
+ * Ensure permissions stored in role configuration are sorted using the schema.
+ */
+function user_post_update_sort_permissions_again(&$sandbox = NULL) {
+  \Drupal::classResolver(ConfigEntityUpdater::class)->update($sandbox, 'user_role', function (Role $role) {
+    $permissions = $role->getPermissions();
+    sort($permissions);
+    return $permissions !== $role->getPermissions();
+  });
+}
diff --git a/web/core/modules/user/user.routing.yml b/web/core/modules/user/user.routing.yml
index 04a094abc..d47991784 100644
--- a/web/core/modules/user/user.routing.yml
+++ b/web/core/modules/user/user.routing.yml
@@ -146,6 +146,14 @@ user.page:
   requirements:
     _user_is_logged_in: 'TRUE'
 
+user.edit:
+  path: '/user/edit'
+  defaults:
+    _controller: '\Drupal\user\Controller\UserController::userEditPage'
+    _title: 'Edit account'
+  requirements:
+    _user_is_logged_in: 'TRUE'
+
 user.login:
   path: '/user/login'
   defaults:
diff --git a/web/core/modules/user/user.theme.js b/web/core/modules/user/user.theme.js
index 2a3ae1eea..0b58c45a3 100644
--- a/web/core/modules/user/user.theme.js
+++ b/web/core/modules/user/user.theme.js
@@ -4,21 +4,18 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.passwordConfirmMessage = function (_ref) {
     var confirmTitle = _ref.confirmTitle;
     var confirmTextWrapper = '<span data-drupal-selector="password-match-status-text"></span>';
     return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
   };
-
   Drupal.theme.passwordStrength = function (_ref2) {
     var strengthTitle = _ref2.strengthTitle;
     var strengthIndicator = '<div class="password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
     var strengthText = '<span class="password-strength__text" data-drupal-selector="password-strength-text"></span>';
     return "\n      <div class=\"password-strength\">\n        <div class=\"password-strength__meter\" data-drupal-selector=\"password-strength-meter\">".concat(strengthIndicator, "</div>\n        <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n      </div>\n    ");
   };
-
   Drupal.theme.passwordSuggestions = function (_ref3, tips) {
     var hasWeaknesses = _ref3.hasWeaknesses;
     return "<div class=\"password-suggestions\">".concat(tips.length ? "".concat(hasWeaknesses, "<ul><li>").concat(tips.join('</li><li>'), "</li></ul>") : '', "</div>");
diff --git a/web/core/modules/views/config/schema/views.display.schema.yml b/web/core/modules/views/config/schema/views.display.schema.yml
index 3e696143f..725b0d072 100644
--- a/web/core/modules/views/config/schema/views.display.schema.yml
+++ b/web/core/modules/views/config/schema/views.display.schema.yml
@@ -87,8 +87,8 @@ views.display.block:
       label: 'Allow'
       mapping:
         items_per_page:
-         type: boolean
-         label: 'Items per page'
+          type: boolean
+          label: 'Items per page'
 
 views.display.feed:
   type: views_display_path
diff --git a/web/core/modules/views/js/ajax_view.js b/web/core/modules/views/js/ajax_view.js
index 225836f4f..d82425071 100644
--- a/web/core/modules/views/js/ajax_view.js
+++ b/web/core/modules/views/js/ajax_view.js
@@ -4,10 +4,8 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.behaviors.ViewsAjaxView = {};
-
   Drupal.behaviors.ViewsAjaxView.attach = function (context, settings) {
     if (settings && settings.views && settings.views.ajaxViews) {
       var ajaxViews = settings.views.ajaxViews;
@@ -16,14 +14,12 @@
       });
     }
   };
-
   Drupal.behaviors.ViewsAjaxView.detach = function (context, settings, trigger) {
     if (trigger === 'unload') {
       if (settings && settings.views && settings.views.ajaxViews) {
         var ajaxViews = settings.views.ajaxViews;
         Object.keys(ajaxViews || {}).forEach(function (i) {
           var selector = ".js-view-dom-id-".concat(ajaxViews[i].view_dom_id);
-
           if ($(selector, context).length) {
             delete Drupal.views.instances[i];
             delete settings.views.ajaxViews[i];
@@ -32,29 +28,22 @@
       }
     }
   };
-
   Drupal.views = {};
   Drupal.views.instances = {};
-
   Drupal.views.ajaxView = function (settings) {
     var selector = ".js-view-dom-id-".concat(settings.view_dom_id);
     this.$view = $(selector);
     var ajaxPath = drupalSettings.views.ajax_path;
-
     if (ajaxPath.constructor.toString().indexOf('Array') !== -1) {
       ajaxPath = ajaxPath[0];
     }
-
     var queryString = window.location.search || '';
-
     if (queryString !== '') {
       queryString = queryString.slice(1).replace(/q=[^&]+&?|&?render=[^&]+/, '');
-
       if (queryString !== '') {
         queryString = (/\?/.test(ajaxPath) ? '&' : '?') + queryString;
       }
     }
-
     this.element_settings = {
       url: ajaxPath + queryString,
       submit: settings,
@@ -76,7 +65,6 @@
     });
     this.refreshViewAjax = Drupal.ajax(selfSettings);
   };
-
   Drupal.views.ajaxView.prototype.attachExposedFormAjax = function () {
     var that = this;
     this.exposedFormAjax = [];
@@ -88,15 +76,12 @@
       that.exposedFormAjax[index] = Drupal.ajax(selfSettings);
     });
   };
-
   Drupal.views.ajaxView.prototype.filterNestedViews = function () {
     return !this.$view.parents('.view').length;
   };
-
   Drupal.views.ajaxView.prototype.attachPagerAjax = function () {
     this.$view.find('ul.js-pager__items > li > a, th.views-field a, .attachment .views-summary a').each($.proxy(this.attachPagerLinkAjax, this));
   };
-
   Drupal.views.ajaxView.prototype.attachPagerLinkAjax = function (id, link) {
     var $link = $(link);
     var viewData = {};
@@ -109,15 +94,12 @@
     });
     this.pagerAjax = Drupal.ajax(selfSettings);
   };
-
   Drupal.AjaxCommands.prototype.viewsScrollTop = function (ajax, response) {
     var offset = $(response.selector).offset();
     var scrollTarget = response.selector;
-
     while ($(scrollTarget).scrollTop() === 0 && $(scrollTarget).parent()) {
       scrollTarget = $(scrollTarget).parent();
     }
-
     if (offset.top - 10 < $(scrollTarget).scrollTop()) {
       $(scrollTarget).animate({
         scrollTop: offset.top - 10
diff --git a/web/core/modules/views/js/base.js b/web/core/modules/views/js/base.js
index 4f434ecc7..d1361e3e0 100644
--- a/web/core/modules/views/js/base.js
+++ b/web/core/modules/views/js/base.js
@@ -4,71 +4,53 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.Views = {};
-
   Drupal.Views.parseQueryString = function (query) {
     var args = {};
     var pos = query.indexOf('?');
-
     if (pos !== -1) {
       query = query.substring(pos + 1);
     }
-
     var pair;
     var pairs = query.split('&');
-
     for (var i = 0; i < pairs.length; i++) {
       pair = pairs[i].split('=');
-
       if (pair[0] !== 'q' && pair[1]) {
         args[decodeURIComponent(pair[0].replace(/\+/g, ' '))] = decodeURIComponent(pair[1].replace(/\+/g, ' '));
       }
     }
-
     return args;
   };
-
   Drupal.Views.parseViewArgs = function (href, viewPath) {
     var returnObj = {};
     var path = Drupal.Views.getPath(href);
     var viewHref = Drupal.url(viewPath).substring(drupalSettings.path.baseUrl.length);
-
     if (viewHref && path.substring(0, viewHref.length + 1) === "".concat(viewHref, "/")) {
       returnObj.view_args = decodeURIComponent(path.substring(viewHref.length + 1, path.length));
       returnObj.view_path = path;
     }
-
     return returnObj;
   };
-
   Drupal.Views.pathPortion = function (href) {
     var protocol = window.location.protocol;
-
     if (href.substring(0, protocol.length) === protocol) {
       href = href.substring(href.indexOf('/', protocol.length + 2));
     }
-
     return href;
   };
-
   Drupal.Views.getPath = function (href) {
     href = Drupal.Views.pathPortion(href);
     href = href.substring(drupalSettings.path.baseUrl.length, href.length);
-
     if (href.substring(0, 3) === '?q=') {
       href = href.substring(3, href.length);
     }
-
     var chars = ['#', '?', '&'];
-
     for (var i = 0; i < chars.length; i++) {
       if (href.indexOf(chars[i]) > -1) {
         href = href.substr(0, href.indexOf(chars[i]));
       }
     }
-
     return href;
   };
 })(jQuery, Drupal, drupalSettings);
\ No newline at end of file
diff --git a/web/core/modules/views/src/Controller/ViewAjaxController.php b/web/core/modules/views/src/Controller/ViewAjaxController.php
index d765629d8..fd1da93f7 100644
--- a/web/core/modules/views/src/Controller/ViewAjaxController.php
+++ b/web/core/modules/views/src/Controller/ViewAjaxController.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\UrlHelper;
+use Drupal\Core\Ajax\PrependCommand;
 use Drupal\Core\Ajax\ReplaceCommand;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
@@ -136,17 +137,17 @@ public function ajaxView(Request $request) {
       // @todo Remove this parsing once these are removed from the request in
       //   https://www.drupal.org/node/2504709.
       foreach ([
-          'view_name',
-          'view_display_id',
-          'view_args',
-          'view_path',
-          'view_dom_id',
-          'pager_element',
-          'view_base_path',
-          AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER,
-          FormBuilderInterface::AJAX_FORM_REQUEST,
-          MainContentViewSubscriber::WRAPPER_FORMAT,
-        ] as $key) {
+        'view_name',
+        'view_display_id',
+        'view_args',
+        'view_path',
+        'view_dom_id',
+        'pager_element',
+        'view_base_path',
+        AjaxResponseSubscriber::AJAX_REQUEST_PARAMETER,
+        FormBuilderInterface::AJAX_FORM_REQUEST,
+        MainContentViewSubscriber::WRAPPER_FORMAT,
+      ] as $key) {
         $request->query->remove($key);
         $request->request->remove($key);
       }
@@ -200,6 +201,7 @@ public function ajaxView(Request $request) {
             ->applyTo($preview);
         }
         $response->addCommand(new ReplaceCommand(".js-view-dom-id-$dom_id", $preview));
+        $response->addCommand(new PrependCommand(".js-view-dom-id-$dom_id", ['#type' => 'status_messages']));
 
         return $response;
       }
diff --git a/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php b/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
index fbd9f4855..af4230320 100644
--- a/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
+++ b/web/core/modules/views/src/EventSubscriber/ViewsEntitySchemaSubscriber.php
@@ -83,6 +83,13 @@ class ViewsEntitySchemaSubscriber implements EntityTypeListenerInterface, EventS
    */
   protected $logger;
 
+  /**
+   * Array of views that need to be saved, indexed by view name.
+   *
+   * @var \Drupal\views\ViewEntityInterface[]
+   */
+  protected $viewsToSave = [];
+
   /**
    * Constructs a ViewsEntitySchemaSubscriber.
    *
@@ -208,17 +215,12 @@ public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeI
       }
     }
 
-    // Filter the list of views that needs to be updated.
-    $views_to_update = array_filter($all_views, function (ViewEntityInterface $view) {
-      return $view->get('_updated') === TRUE;
-    });
-    foreach ($views_to_update as $view) {
+    foreach ($this->viewsToSave as $view) {
       try {
         // All changes done to the views here can be trusted and this might be
         // called during updates, when it is not safe to rely on configuration
         // containing valid schema. Trust the data and disable schema validation
         // and casting.
-        $view->set('_updated', NULL);
         $view->trustData()->save();
       }
       catch (\Exception $e) {
@@ -231,6 +233,7 @@ public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeI
         ]);
       }
     }
+    $this->viewsToSave = [];
   }
 
   /**
@@ -300,14 +303,14 @@ protected function baseTableRename($all_views, $entity_type_id, $old_base_table,
     foreach ($all_views as $view) {
       if ($view->get('base_table') == $old_base_table) {
         $view->set('base_table', $new_base_table);
-        $view->set('_updated', TRUE);
+        $this->viewsToSave[$view->id()] = $view;
       }
     }
 
     $this->processHandlers($all_views, function (&$handler_config, ViewEntityInterface $view) use ($entity_type_id, $old_base_table, $new_base_table) {
       if (isset($handler_config['entity_type']) && $handler_config['entity_type'] == $entity_type_id && $handler_config['table'] == $old_base_table) {
         $handler_config['table'] = $new_base_table;
-        $view->set('_updated', TRUE);
+        $this->viewsToSave[$view->id()] = $view;
       }
     });
   }
@@ -328,14 +331,14 @@ protected function dataTableRename($all_views, $entity_type_id, $old_data_table,
     foreach ($all_views as $view) {
       if ($view->get('base_table') == $old_data_table) {
         $view->set('base_table', $new_data_table);
-        $view->set('_updated', TRUE);
+        $this->viewsToSave[$view->id()] = $view;
       }
     }
 
     $this->processHandlers($all_views, function (&$handler_config, ViewEntityInterface $view) use ($entity_type_id, $old_data_table, $new_data_table) {
       if (isset($handler_config['entity_type']) && $handler_config['entity_type'] == $entity_type_id && $handler_config['table'] == $old_data_table) {
         $handler_config['table'] = $new_data_table;
-        $view->set('_updated', TRUE);
+        $this->viewsToSave[$view->id()] = $view;
       }
     });
   }
@@ -368,7 +371,7 @@ protected function dataTableAddition($all_views, EntityTypeInterface $entity_typ
         // Move all fields which just exists on the data table.
         if ($handler_config['table'] == $base_table && in_array($handler_config['entity_field'], $data_table_fields) && !in_array($handler_config['entity_field'], $base_table_fields)) {
           $handler_config['table'] = $data_table;
-          $view->set('_updated', TRUE);
+          $this->viewsToSave[$view->id()] = $view;
         }
       }
     });
@@ -392,7 +395,7 @@ protected function dataTableRemoval($all_views, $entity_type_id, $old_data_table
       if (isset($handler_config['entity_type']) && $handler_config['entity_type'] == $entity_type_id) {
         if ($handler_config['table'] == $old_data_table) {
           $handler_config['table'] = $base_table;
-          $view->set('_updated', TRUE);
+          $this->viewsToSave[$view->id()] = $view;
         }
       }
     });
@@ -414,7 +417,7 @@ protected function revisionRemoval($all_views, EntityTypeInterface $original) {
       if (in_array($view->get('base_table'), [$revision_base_table, $revision_data_table])) {
         // Let's disable the views as we no longer support revisions.
         $view->setStatus(FALSE);
-        $view->set('_updated', TRUE);
+        $this->viewsToSave[$view->id()] = $view;
       }
 
       // For any kind of field, let's rely on the broken handler functionality.
diff --git a/web/core/modules/views/src/Form/ViewsExposedForm.php b/web/core/modules/views/src/Form/ViewsExposedForm.php
index bbeb4db27..bd6a9edd9 100644
--- a/web/core/modules/views/src/Form/ViewsExposedForm.php
+++ b/web/core/modules/views/src/Form/ViewsExposedForm.php
@@ -145,6 +145,9 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['#action'] = $form_action;
     $form['#theme'] = $view->buildThemeFunctions('views_exposed_form');
     $form['#id'] = Html::cleanCssIdentifier('views_exposed_form-' . $view->storage->id() . '-' . $display['id']);
+    // Labels are built too late for inline form errors to work, resulting
+    // in duplicated messages.
+    $form['#disable_inline_form_errors'] = TRUE;
 
     /** @var \Drupal\views\Plugin\views\exposed_form\ExposedFormPluginInterface $exposed_form_plugin */
     $exposed_form_plugin = $view->display_handler->getPlugin('exposed_form');
diff --git a/web/core/modules/views/src/Form/ViewsForm.php b/web/core/modules/views/src/Form/ViewsForm.php
index e2bfb1585..766e366d1 100644
--- a/web/core/modules/views/src/Form/ViewsForm.php
+++ b/web/core/modules/views/src/Form/ViewsForm.php
@@ -40,7 +40,7 @@ class ViewsForm implements FormInterface, ContainerInjectionInterface {
   protected $requestStack;
 
   /**
-   * The url generator to generate the form action.
+   * The URL generator to generate the form action.
    *
    * @var \Drupal\Core\Routing\UrlGeneratorInterface
    */
diff --git a/web/core/modules/views/src/ManyToOneHelper.php b/web/core/modules/views/src/ManyToOneHelper.php
index 6d47212a8..8b1051105 100644
--- a/web/core/modules/views/src/ManyToOneHelper.php
+++ b/web/core/modules/views/src/ManyToOneHelper.php
@@ -113,8 +113,10 @@ public function getJoin() {
   }
 
   /**
-   * Provide the proper join for summary queries. This is important in part because
-   * it will cooperate with other arguments if possible.
+   * Provides the proper join for summary queries.
+   *
+   * This is important in part because it will cooperate with other arguments if
+   * possible.
    */
   public function summaryJoin() {
     $field = $this->handler->relationship . '_' . $this->handler->table . '.' . $this->handler->field;
diff --git a/web/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php b/web/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
index d877277d7..299964e82 100644
--- a/web/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
+++ b/web/core/modules/views/src/Plugin/Block/ViewsExposedFilterBlock.php
@@ -32,12 +32,12 @@ public function getCacheContexts() {
    *   context of current view and display ID.
    */
   public function build() {
-    $output = $this->view->display_handler->viewExposedFormBlocks();
+    $output = $this->view->display_handler->viewExposedFormBlocks() ?? [];
     // Provide the context for block build and block view alter hooks.
     // \Drupal\views\Plugin\Block\ViewsBlock::build() adds the same context in
     // \Drupal\views\ViewExecutable::buildRenderable() using
     // \Drupal\views\Plugin\views\display\DisplayPluginBase::buildRenderable().
-    if (is_array($output) && !empty($output)) {
+    if (!empty($output)) {
       $output += [
         '#view' => $this->view,
         '#display_id' => $this->displayID,
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php b/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
index 4d9d0f23f..3706e39ed 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsBlock.php
@@ -95,7 +95,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
             else {
               // Allow translators to control the punctuation. Plugin
               // definitions get cached, so use TranslatableMarkup() instead of
-              // t() to avoid double escaping when $admin_label is rendered
+              // $this->t() to avoid double escaping when $admin_label is rendered
               // during requests that use the cached definition.
               $admin_label = new TranslatableMarkup('@view: @display', ['@view' => $view->label(), '@display' => $display->display['display_title']]);
             }
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php b/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php
index 8dd537cc0..757b57418 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsEntityRow.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\views\ViewsData;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -16,6 +17,8 @@
  */
 class ViewsEntityRow implements ContainerDeriverInterface {
 
+  use StringTranslationTrait;
+
   /**
    * Stores all entity row plugin information.
    *
@@ -93,7 +96,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           'id' => 'entity:' . $entity_type_id,
           'provider' => 'views',
           'title' => $entity_type->getLabel(),
-          'help' => t('Display the @label', ['@label' => $entity_type->getLabel()]),
+          'help' => $this->t('Display the @label', ['@label' => $entity_type->getLabel()]),
           'base' => [$entity_type->getDataTable() ?: $entity_type->getBaseTable()],
           'entity_type' => $entity_type_id,
           'display_types' => ['normal'],
diff --git a/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php b/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
index 0dcf62ee3..57ac710c2 100644
--- a/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
+++ b/web/core/modules/views/src/Plugin/Derivative/ViewsExposedFilterBlock.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Plugin\Discovery\ContainerDeriverInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -13,6 +14,8 @@
  */
 class ViewsExposedFilterBlock implements ContainerDeriverInterface {
 
+  use StringTranslationTrait;
+
   /**
    * List of derivative definitions.
    *
@@ -85,7 +88,7 @@ public function getDerivativeDefinitions($base_plugin_definition) {
           // Add a block definition for the block.
           if ($display->usesExposedFormInBlock()) {
             $delta = $view->id() . '-' . $display->display['id'];
-            $desc = t('Exposed form: @view-@display_id', ['@view' => $view->id(), '@display_id' => $display->display['id']]);
+            $desc = $this->t('Exposed form: @view-@display_id', ['@view' => $view->id(), '@display_id' => $display->display['id']]);
             $this->derivatives[$delta] = [
               'admin_label' => $desc,
               'config_dependencies' => [
diff --git a/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php b/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
index cf80704f6..3d3444374 100644
--- a/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
+++ b/web/core/modules/views/src/Plugin/EntityReferenceSelection/ViewsSelection.php
@@ -8,8 +8,10 @@
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Render\Element;
 use Drupal\Core\Render\RendererInterface;
 use Drupal\Core\Session\AccountInterface;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\Core\Url;
 use Drupal\views\Render\ViewsRenderPipelineMarkup;
 use Drupal\views\Views;
@@ -282,10 +284,10 @@ protected function stripAdminAndAnchorTagsFromResults(array $results) {
     }
 
     $stripped_results = [];
-    foreach ($results as $id => $row) {
-      $entity = $row['#row']->_entity;
+    foreach (Element::children($results) as $id) {
+      $entity = $results[$id]['#row']->_entity;
       $stripped_results[$entity->bundle()][$id] = ViewsRenderPipelineMarkup::create(
-        Xss::filter($this->renderer->renderPlain($row), $allowed_tags)
+        Xss::filter($this->renderer->renderPlain($results[$id]), $allowed_tags)
       );
     }
 
@@ -321,7 +323,7 @@ public static function settingsFormValidate($element, FormStateInterface $form_s
       [$view, $display] = explode(':', $element['view_and_display']['#value']);
     }
     else {
-      $form_state->setError($element, t('The views entity selection mode requires a view.'));
+      $form_state->setError($element, new TranslatableMarkup('The views entity selection mode requires a view.'));
       return;
     }
 
diff --git a/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php b/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
index 992e8e252..2b0d2d12b 100644
--- a/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
+++ b/web/core/modules/views/src/Plugin/views/BrokenHandlerTrait.php
@@ -16,7 +16,7 @@ trait BrokenHandlerTrait {
    * @see \Drupal\views\Plugin\views\PluginBase::defineOptions()
    */
   public function adminLabel($short = FALSE) {
-    return t('Broken/missing handler');
+    return $this->t('Broken/missing handler');
   }
 
   /**
@@ -29,8 +29,7 @@ public function defineOptions() {
   }
 
   /**
-   * Ensure the main table for this handler is in the query. This is used
-   * a lot.
+   * Ensures that the main table for this handler is in the query.
    *
    * @see \Drupal\views\Plugin\views\HandlerBase::ensureMyTable()
    */
@@ -51,7 +50,7 @@ public function query($group_by = FALSE) {
    * @see \Drupal\views\Plugin\views\PluginBase::defineOptions()
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
-    $description_top = t('The handler for this item is broken or missing. The following details are available:');
+    $description_top = $this->t('The handler for this item is broken or missing. The following details are available:');
 
     foreach ($this->definition['original_configuration'] as $key => $value) {
       if (is_scalar($value)) {
@@ -59,7 +58,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
       }
     }
 
-    $description_bottom = t('Enabling the appropriate module may solve this issue. Otherwise, check to see if there is a module update available.');
+    $description_bottom = $this->t('Enabling the appropriate module may solve this issue. Otherwise, check to see if there is a module update available.');
 
     $form['description'] = [
       '#type' => 'container',
diff --git a/web/core/modules/views/src/Plugin/views/HandlerBase.php b/web/core/modules/views/src/Plugin/views/HandlerBase.php
index 582e77f57..dc33462db 100644
--- a/web/core/modules/views/src/Plugin/views/HandlerBase.php
+++ b/web/core/modules/views/src/Plugin/views/HandlerBase.php
@@ -45,6 +45,8 @@ abstract class HandlerBase extends PluginBase implements ViewsHandlerInterface {
   public $tableAlias;
 
   /**
+   * The real field.
+   *
    * The actual field in the database table, maybe different
    * on other kind of query plugins/special handlers.
    *
@@ -358,6 +360,8 @@ public function submitGroupByForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
+   * Determines if the handler has extra options.
+   *
    * If a handler has 'extra options' it will get a little settings widget and
    * another form called extra_options.
    */
@@ -395,8 +399,7 @@ public function canExpose() {
   }
 
   /**
-   * Set new exposed option defaults when exposed setting is flipped
-   * on.
+   * Set new exposed option defaults when exposed setting is flipped on.
    */
   public function defaultExposeOptions() {}
 
@@ -551,8 +554,9 @@ public function ensureMyTable() {
   public function adminSummary() {}
 
   /**
-   * Determine if this item is 'exposed', meaning it provides form elements
-   * to let users modify the view.
+   * Determine if this item is 'exposed'.
+   *
+   * Exposed means it provides form elements to let users modify the view.
    *
    * @return bool
    */
@@ -785,6 +789,8 @@ public function displayExposedForm($form, FormStateInterface $form_state) {
   }
 
   /**
+   * Submits a temporary form.
+   *
    * A submit handler that is used for storing temporary items when using
    * multi-step changes, such as ajax requests.
    */
diff --git a/web/core/modules/views/src/Plugin/views/PluginBase.php b/web/core/modules/views/src/Plugin/views/PluginBase.php
index 0069beee7..8709a550b 100644
--- a/web/core/modules/views/src/Plugin/views/PluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/PluginBase.php
@@ -39,6 +39,7 @@
  *
  * @ingroup views_plugins
  */
+#[\AllowDynamicProperties]
 abstract class PluginBase extends ComponentPluginBase implements ContainerFactoryPluginInterface, ViewsPluginInterface, DependentPluginInterface, TrustedCallbackInterface {
 
   /**
@@ -88,7 +89,7 @@ abstract class PluginBase extends ComponentPluginBase implements ContainerFactor
   public $displayHandler;
 
   /**
-   * Plugins's definition.
+   * Plugins' definition.
    *
    * @var array
    */
@@ -136,6 +137,7 @@ public static function create(ContainerInterface $container, array $configuratio
    */
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     $this->view = $view;
+    $this->options = $this->options ?? [];
     $this->setOptionDefaults($this->options, $this->defineOptions());
     $this->displayHandler = $display;
 
@@ -340,8 +342,9 @@ public function globalTokenReplace($string = '', array $options = []) {
   }
 
   /**
-   * Replaces Views' tokens in a given string. The resulting string will be
-   * sanitized with Xss::filterAdmin.
+   * Replaces Views' tokens in a given string.
+   *
+   * The resulting string will be sanitized with Xss::filterAdmin.
    *
    * @param $text
    *   Unsanitized string with possible tokens.
diff --git a/web/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php b/web/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
index f86a877c9..8a61d5654 100644
--- a/web/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
+++ b/web/core/modules/views/src/Plugin/views/ViewsHandlerInterface.php
@@ -30,14 +30,16 @@ public function preQuery();
   public function getEntityType();
 
   /**
-   * Determines if the handler is considered 'broken', meaning it's a
-   * placeholder used when a handler can't be found.
+   * Determines if the handler is considered 'broken'.
+   *
+   * Broken means it's a placeholder used when a handler can't be found.
    */
   public function broken();
 
   /**
-   * Ensure the main table for this handler is in the query. This is used
-   * a lot.
+   * Ensures that the main table for this handler is in the query.
+   *
+   * This is used a lot.
    */
   public function ensureMyTable();
 
@@ -111,8 +113,9 @@ public function postExecute(&$values);
   public function showExposeForm(&$form, FormStateInterface $form_state);
 
   /**
-   * Called just prior to query(), this lets a handler set up any relationship
-   * it needs.
+   * Sets up any needed relationship.
+   *
+   * This is called just prior to query().
    */
   public function setRelationship();
 
diff --git a/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php b/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php
index ddc5341f0..93d75c997 100644
--- a/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php
+++ b/web/core/modules/views/src/Plugin/views/ViewsPluginInterface.php
@@ -151,7 +151,7 @@ public function destroy();
   /**
    * Validate that the plugin is correct and can be saved.
    *
-   * @return
+   * @return array|null
    *   An array of error strings to tell the user what is wrong with this
    *   plugin.
    */
@@ -163,8 +163,10 @@ public function validate();
   public function query();
 
   /**
-   * Unpack options over our existing defaults, drilling down into arrays
-   * so that defaults don't get totally blown away.
+   * Unpacks options over our existing defaults.
+   *
+   * This will drill down into arrays so that defaults don't get totally blown
+   * away.
    */
   public function unpackOptions(&$storage, $options, $definition = NULL, $all = TRUE, $check = TRUE);
 
diff --git a/web/core/modules/views/src/Plugin/views/area/DisplayLink.php b/web/core/modules/views/src/Plugin/views/area/DisplayLink.php
index 02f2e7480..c7c1968ba 100644
--- a/web/core/modules/views/src/Plugin/views/area/DisplayLink.php
+++ b/web/core/modules/views/src/Plugin/views/area/DisplayLink.php
@@ -129,10 +129,10 @@ public function validate() {
     // recommend keeping the display options equal, we do not want to enforce
     // this.
     $unequal_options = [
-      'filters' => t('Filter criteria'),
-      'sorts' => t('Sort criteria'),
-      'pager' => t('Pager'),
-      'arguments' => t('Contextual filters'),
+      'filters' => $this->t('Filter criteria'),
+      'sorts' => $this->t('Sort criteria'),
+      'pager' => $this->t('Pager'),
+      'arguments' => $this->t('Contextual filters'),
     ];
     foreach (array_keys($unequal_options) as $option) {
       if ($this->hasEqualOptions($linked_display_id, $option)) {
diff --git a/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php b/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
index 0b05e173a..02533c719 100644
--- a/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/area/TokenizeAreaPluginBase.php
@@ -48,8 +48,8 @@ public function tokenForm(&$form, FormStateInterface $form_state) {
 
     // Get a list of the available fields and arguments for token replacement.
     $options = [];
-    $optgroup_arguments = (string) t('Arguments');
-    $optgroup_fields = (string) t('Fields');
+    $optgroup_arguments = (string) $this->t('Arguments');
+    $optgroup_fields = (string) $this->t('Fields');
     foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) {
       $options[$optgroup_fields]["{{ $field }}"] = $handler->adminLabel();
     }
diff --git a/web/core/modules/views/src/Plugin/views/area/View.php b/web/core/modules/views/src/Plugin/views/area/View.php
index 0f2d5bc91..6dae7802f 100644
--- a/web/core/modules/views/src/Plugin/views/area/View.php
+++ b/web/core/modules/views/src/Plugin/views/area/View.php
@@ -118,7 +118,7 @@ public function render($empty = FALSE) {
       // Check if the view is part of the parent views of this view
       $search = "$view_name:$display_id";
       if (in_array($search, $this->view->parent_views)) {
-        \Drupal::messenger()->addError(t("Recursion detected in view @view display @display.", ['@view' => $view_name, '@display' => $display_id]));
+        \Drupal::messenger()->addError($this->t("Recursion detected in view @view display @display.", ['@view' => $view_name, '@display' => $display_id]));
       }
       else {
         if (!empty($this->options['inherit_arguments']) && !empty($this->view->args)) {
diff --git a/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 210609003..259fcb2fd 100644
--- a/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -66,9 +66,11 @@ abstract class ArgumentPluginBase extends HandlerBase implements CacheableDepend
   public $name_table;
 
   /**
-   * The field to use for the name to use in the summary, which is
-   * the displayed output. For example, for the node: nid argument,
-   * the argument itself is the nid, but node.title is displayed.
+   * The field to use for the name to display in the summary.
+   *
+   * For example, for the node: nid argument, the argument itself is the nid,
+   * but node.title is displayed.
+   *
    * @var string
    */
   public $name_field;
@@ -380,8 +382,8 @@ protected function getTokenHelp() {
 
     foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
       /** @var \Drupal\views\Plugin\views\argument\ArgumentPluginBase $handler */
-      $options[(string) t('Arguments')]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
-      $options[(string) t('Arguments')]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
+      $options[(string) $this->t('Arguments')]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
+      $options[(string) $this->t('Arguments')]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
     }
 
     // We have some options, so make a list.
@@ -491,6 +493,8 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
+   * Default actions.
+   *
    * Provide a list of default behaviors for this argument if the argument
    * is not present.
    *
@@ -547,8 +551,9 @@ protected function defaultActions($which = NULL) {
   }
 
   /**
-   * Provide a form for selecting the default argument when the
-   * default action is set to provide default argument.
+   * Provides a form for selecting the default argument.
+   *
+   * This is used when the default action provides a default argument.
    */
   public function defaultArgumentForm(&$form, FormStateInterface $form_state) {
     $plugins = Views::pluginManager('argument_default')->getDefinitions();
@@ -612,8 +617,9 @@ public function defaultArgumentForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Provide a form for selecting further summary options when the
-   * default action is set to display one.
+   * Provides a form for selecting summary options.
+   *
+   * This is used when the default action displays a summary.
    */
   public function defaultSummaryForm(&$form, FormStateInterface $form_state) {
     $style_plugins = Views::pluginManager('style')->getDefinitions();
@@ -701,7 +707,7 @@ public function defaultSummaryForm(&$form, FormStateInterface $form_state) {
    *
    * Override this method only with extreme care.
    *
-   * @return
+   * @return bool
    *   A boolean value; if TRUE, continue building this view. If FALSE,
    *   building the view will be aborted here.
    */
@@ -778,8 +784,7 @@ public function defaultEmpty() {
   }
 
   /**
-   * This just returns true. The view argument builder will know where
-   * to find the argument from.
+   * Returns true, since the argument builder knows where to find the argument.
    */
   protected function defaultDefault() {
     return TRUE;
@@ -854,9 +859,6 @@ protected function defaultSummary() {
    * - addField: add a 'num_nodes' field for the count. Usually it will
    *   be a count on $view->base_field
    * - setCountField: Reset the count field so we get the right paging.
-   *
-   * @return
-   *   The alias used to get the number of records (count) for this entry.
    */
   protected function summaryQuery() {
     $this->ensureMyTable();
@@ -864,11 +866,12 @@ protected function summaryQuery() {
     $this->base_alias = $this->query->addField($this->tableAlias, $this->realField);
 
     $this->summaryNameField();
-    return $this->summaryBasics();
+    $this->summaryBasics();
   }
 
   /**
-   * Add the name field, which is the field displayed in summary queries.
+   * Adds the name field, which is the field displayed in summary queries.
+   *
    * This is often used when the argument is numeric.
    */
   protected function summaryNameField() {
@@ -903,6 +906,8 @@ protected function summaryNameField() {
   }
 
   /**
+   * Adds basic information to the summary query.
+   *
    * Some basic summary behavior that doesn't need to be repeated as much as
    * code that goes into summaryQuery()
    */
@@ -921,8 +926,9 @@ public function summaryBasics($count_field = TRUE) {
   }
 
   /**
-   * Sorts the summary based upon the user's selection. The base variant of
-   * this is usually adequate.
+   * Sorts the summary based upon the user's selection.
+   *
+   * The base variant of this is usually adequate.
    *
    * @param $order
    *   The order selected in the UI.
@@ -935,8 +941,9 @@ public function summarySort($order, $by = NULL) {
   }
 
   /**
-   * Provide the argument to use to link from the summary to the next level;
-   * this will be called once per row of a summary, and used as part of
+   * Provides the argument to use to link from the summary to the next level.
+   *
+   * This will be called once per row of a summary, and used as part of
    * $view->getUrl().
    *
    * @param $data
@@ -947,8 +954,7 @@ public function summaryArgument($data) {
   }
 
   /**
-   * Provides the name to use for the summary. By default this is just
-   * the name field.
+   * Provides the name to use for the summary, defaults to the name field.
    *
    * @param $data
    *   The query results for the row.
@@ -981,8 +987,10 @@ public function title() {
   }
 
   /**
-   * Called by the view object to get the title. This may be set by a
-   * validator so we don't necessarily call through to title().
+   * Determines the title to use for the view.
+   *
+   * This may be set by a validator so we don't necessarily call through to
+   * title().
    */
   public function getTitle() {
     if (isset($this->validated_title)) {
diff --git a/web/core/modules/views/src/Plugin/views/argument/Date.php b/web/core/modules/views/src/Plugin/views/argument/Date.php
index 97918df9a..1090f5bb3 100644
--- a/web/core/modules/views/src/Plugin/views/argument/Date.php
+++ b/web/core/modules/views/src/Plugin/views/argument/Date.php
@@ -102,8 +102,7 @@ public function defaultArgumentForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Set the empty argument value to the current date,
-   * formatted appropriately for this argument.
+   * Gets the date default argument, formatted appropriately for this argument.
    */
   public function getDefaultArgument($raw = FALSE) {
     if (!$raw && $this->options['default_argument_type'] == 'date') {
diff --git a/web/core/modules/views/src/Plugin/views/argument/NullArgument.php b/web/core/modules/views/src/Plugin/views/argument/NullArgument.php
index 7fadf1688..2c8723810 100644
--- a/web/core/modules/views/src/Plugin/views/argument/NullArgument.php
+++ b/web/core/modules/views/src/Plugin/views/argument/NullArgument.php
@@ -20,8 +20,7 @@ protected function defineOptions() {
   }
 
   /**
-   * Override buildOptionsForm() so that only the relevant options
-   * are displayed to the user.
+   * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
@@ -37,8 +36,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Override defaultActions() to remove actions that don't
-   * make sense for a null argument.
+   * {@inheritdoc}
    */
   protected function defaultActions($which = NULL) {
     if ($which) {
@@ -54,8 +52,7 @@ protected function defaultActions($which = NULL) {
   }
 
   /**
-   * Override the behavior of query() to prevent the query
-   * from being changed in any way.
+   * {@inheritdoc}
    */
   public function query($group_by = FALSE) {}
 
diff --git a/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
index 4f91e6a16..bd392b989 100644
--- a/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
@@ -84,6 +84,8 @@ public function access() {
   }
 
   /**
+   * Disables the given option if the user does not have access.
+   *
    * If we don't have access to the form but are showing it anyway, ensure that
    * the form is safe and cannot be changed from user input.
    *
diff --git a/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php b/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php
index b864b603e..5370e4e14 100644
--- a/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php
+++ b/web/core/modules/views/src/Plugin/views/argument_default/QueryParameter.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\views\Plugin\views\argument_default;
 
+use Drupal\Component\Utility\NestedArray;
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableDependencyInterface;
 use Drupal\Core\Form\FormStateInterface;
@@ -64,9 +65,12 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    */
   public function getArgument() {
     $current_request = $this->view->getRequest();
+    // Convert a[b][c][d] into ['a', 'b', 'c', 'd'].
+    $path = array_filter(preg_split('#(\[|\]\[|\])#', $this->options['query_param']));
 
-    if ($current_request->query->has($this->options['query_param'])) {
-      $param = $current_request->query->all()[$this->options['query_param']];
+    if ($current_request->query->has($path[0])) {
+      $query = $current_request->query->all();
+      $param = NestedArray::getValue($query, $path);
       if (is_array($param)) {
         $conjunction = ($this->options['multiple'] == 'and') ? ',' : '+';
         $param = implode($conjunction, $param);
diff --git a/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php b/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
index 09205f227..d372baedc 100644
--- a/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/cache/CachePluginBase.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheableMetadata;
 use Drupal\views\Plugin\views\PluginBase;
-use Drupal\Core\Database\Query\Select;
+use Drupal\Core\Database\Query\SelectInterface;
 use Drupal\views\ResultRow;
 
 /**
@@ -62,8 +62,7 @@ public function getResultsKey() {
   }
 
   /**
-   * Return a string to display as the clickable title for the
-   * access control.
+   * Returns a string to display as the clickable title for the access control.
    */
   public function summaryTitle() {
     return $this->t('Unknown');
@@ -201,7 +200,7 @@ public function generateResultsKey() {
       foreach (['query', 'count_query'] as $index) {
         // If the default query back-end is used generate SQL query strings from
         // the query objects.
-        if ($build_info[$index] instanceof Select) {
+        if ($build_info[$index] instanceof SelectInterface) {
           $query = clone $build_info[$index];
           $query->preExecute();
           $build_info[$index] = [
diff --git a/web/core/modules/views/src/Plugin/views/display/Attachment.php b/web/core/modules/views/src/Plugin/views/display/Attachment.php
index 288696d21..e6e73fbd8 100644
--- a/web/core/modules/views/src/Plugin/views/display/Attachment.php
+++ b/web/core/modules/views/src/Plugin/views/display/Attachment.php
@@ -274,11 +274,11 @@ public function attachTo(ViewExecutable $view, $display_id, array &$build) {
   }
 
   /**
-   * Attachment displays only use exposed widgets if
-   * they are set to inherit the exposed filter settings
-   * of their parent display.
+   * {@inheritdoc}
    */
   public function usesExposed() {
+    // Attachment displays only use exposed widgets if they are set to inherit
+    // the exposed filter settings of their parent display.
     if (!empty($this->options['inherit_exposed_filters']) && parent::usesExposed()) {
       return TRUE;
     }
@@ -286,11 +286,12 @@ public function usesExposed() {
   }
 
   /**
-   * If an attachment is set to inherit the exposed filter
-   * settings from its parent display, then don't render and
-   * display a second set of exposed filter widgets.
+   * {@inheritdoc}
    */
   public function displaysExposed() {
+    // If an attachment is set to inherit the exposed filter settings from its
+    // parent display, then don't render and display a second set of exposed
+    // filter widgets.
     return $this->options['inherit_exposed_filters'] ? FALSE : TRUE;
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 1803a150a..c404d1c86 100644
--- a/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -182,7 +182,7 @@ public function initDisplay(ViewExecutable $view, array &$display, array &$optio
 
     $skip_cache = \Drupal::config('views.settings')->get('skip_cache');
 
-    if (empty($view->editing) || !$skip_cache) {
+    if (!$skip_cache) {
       $cid = 'views:unpack_options:' . hash('sha256', serialize([$this->options, $options])) . ':' . \Drupal::languageManager()->getCurrentLanguage()->getId();
       if (empty(static::$unpackOptions[$cid])) {
         $cache = \Drupal::cache('data')->get($cid);
@@ -561,21 +561,21 @@ protected function defineOptions() {
         'contains' => [
           'type' => ['default' => 'views_query'],
           'options' => ['default' => []],
-         ],
+        ],
         'merge_defaults' => [$this, 'mergePlugin'],
       ],
       'exposed_form' => [
         'contains' => [
           'type' => ['default' => 'basic'],
           'options' => ['default' => []],
-         ],
+        ],
         'merge_defaults' => [$this, 'mergePlugin'],
       ],
       'pager' => [
         'contains' => [
           'type' => ['default' => 'mini'],
           'options' => ['default' => []],
-         ],
+        ],
         'merge_defaults' => [$this, 'mergePlugin'],
       ],
       'style' => [
@@ -1028,16 +1028,16 @@ public function optionLink($text, $section, $class = '', $title = '') {
     }
 
     return Link::fromTextAndUrl($text, Url::fromRoute('views_ui.form_display', [
-        'js' => 'nojs',
-        'view' => $this->view->storage->id(),
-        'display_id' => $this->display['id'],
-        'type' => $section,
-      ], [
-        'attributes' => [
-          'class' => ['views-ajax-link', $class],
-          'title' => $title,
-          'id' => Html::getUniqueId('views-' . $this->display['id'] . '-' . $section),
-        ],
+      'js' => 'nojs',
+      'view' => $this->view->storage->id(),
+      'display_id' => $this->display['id'],
+      'type' => $section,
+    ], [
+      'attributes' => [
+        'class' => ['views-ajax-link', $class],
+        'title' => $title,
+        'id' => Html::getUniqueId('views-' . $this->display['id'] . '-' . $section),
+      ],
     ]))->toString();
   }
 
@@ -1730,7 +1730,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
         ];
 
         $options = [];
-        $optgroup_arguments = (string) t('Arguments');
+        $optgroup_arguments = (string) $this->t('Arguments');
         foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
           $options[$optgroup_arguments]["{{ arguments.$arg }}"] = $this->t('@argument title', ['@argument' => $handler->adminLabel()]);
           $options[$optgroup_arguments]["{{ raw_arguments.$arg }}"] = $this->t('@argument input', ['@argument' => $handler->adminLabel()]);
@@ -2231,7 +2231,7 @@ public function elementPreRender(array $element) {
     $element['#feed_icons'] = !empty($view->feedIcons) ? $view->feedIcons : [];
 
     if ($view->display_handler->renderPager()) {
-      $exposed_input = $view->exposed_raw_input ?? NULL;
+      $exposed_input = $view->getExposedInput();
       $element['#pager'] = $view->renderPager($exposed_input);
     }
 
@@ -2521,7 +2521,12 @@ public function validate() {
     foreach (ViewExecutable::getHandlerTypes() as $type => $handler_type_info) {
       foreach ($this->getHandlers($type) as $handler) {
         if (!empty($handler->options['relationship']) && $handler->options['relationship'] != 'none' && !in_array($handler->options['relationship'], $relationships)) {
-          $errors[] = $this->t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => $handler_type_info['lstitle'], '%handler' => $handler->adminLabel()]);
+          $errors[] = $this->t('The %relationship_name relationship used in %handler_type %handler is not present in the %display_name display.', [
+            '%relationship_name' => $handler->options['relationship'],
+            '%handler_type' => $handler_type_info['lstitle'],
+            '%handler' => $handler->adminLabel(),
+            '%display_name' => $this->display['display_title'],
+          ]);
         }
       }
     }
diff --git a/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index abf16ebe8..abc03be58 100644
--- a/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/web/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -247,7 +247,7 @@ public function getUrl();
   /**
    * Determines if an option is set to use the default or current display.
    *
-   * @return
+   * @return bool
    *   TRUE for the default display.
    */
   public function isDefaulted($option);
@@ -516,7 +516,7 @@ public function getType();
   /**
    * Make sure the display and all associated handlers are valid.
    *
-   * @return
+   * @return array
    *   Empty array if the display is valid; an array of error strings if it is
    *   not.
    */
diff --git a/web/core/modules/views/src/Plugin/views/display/EntityReference.php b/web/core/modules/views/src/Plugin/views/display/EntityReference.php
index 47c372bc3..3cfce3e34 100644
--- a/web/core/modules/views/src/Plugin/views/display/EntityReference.php
+++ b/web/core/modules/views/src/Plugin/views/display/EntityReference.php
@@ -155,7 +155,18 @@ public function query() {
     $id_table = $this->view->storage->get('base_table');
     $this->id_field_alias = $this->view->query->addField($id_table, $id_field);
 
-    $options = $this->getOption('entity_reference_options');
+    $options = $this->getOption('entity_reference_options') ?? [];
+    // The entity_reference_options are typically set during a call to
+    // Drupal\views\Plugin\EntityReferenceSelection\ViewsSelection::initializeView().
+    // If any entity_reference_options are not yet set, we apply the same
+    // default values that would typically be added by that method.
+    $default_options = [
+      'match' => NULL,
+      'match_operator' => 'CONTAINS',
+      'limit' => 0,
+      'ids' => NULL,
+    ];
+    $options += $default_options;
 
     // Restrict the autocomplete options based on what's been typed already.
     if (isset($options['match'])) {
diff --git a/web/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/web/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php
index 630c0f0a1..979adf458 100644
--- a/web/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/display_extender/DisplayExtenderPluginBase.php
@@ -71,8 +71,7 @@ public function query() {}
   public function optionsSummary(&$categories, &$options) {}
 
   /**
-   * Static member function to list which sections are defaultable
-   * and what items each section contains.
+   * Gets a list of defaultable sections and the items they contain.
    */
   public function defaultableSections(&$sections, $section = NULL) {}
 
diff --git a/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 0892bce15..d986a97d0 100644
--- a/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -54,7 +54,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     ];
 
     $form['reset_button_label'] = [
-     '#type' => 'textfield',
+      '#type' => 'textfield',
       '#title' => $this->t('Reset button label'),
       '#description' => $this->t('Text to display in the reset button of the exposed form.'),
       '#default_value' => $this->options['reset_button_label'],
diff --git a/web/core/modules/views/src/Plugin/views/field/Boolean.php b/web/core/modules/views/src/Plugin/views/field/Boolean.php
index ec542fc52..817230cb3 100644
--- a/web/core/modules/views/src/Plugin/views/field/Boolean.php
+++ b/web/core/modules/views/src/Plugin/views/field/Boolean.php
@@ -49,15 +49,15 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
     parent::init($view, $display, $options);
 
     $default_formats = [
-      'yes-no' => [t('Yes'), $this->t('No')],
-      'true-false' => [t('True'), $this->t('False')],
-      'on-off' => [t('On'), $this->t('Off')],
-      'enabled-disabled' => [t('Enabled'), $this->t('Disabled')],
+      'yes-no' => [$this->t('Yes'), $this->t('No')],
+      'true-false' => [$this->t('True'), $this->t('False')],
+      'on-off' => [$this->t('On'), $this->t('Off')],
+      'enabled-disabled' => [$this->t('Enabled'), $this->t('Disabled')],
       'boolean' => [1, 0],
       'unicode-yes-no' => ['✔', '✖'],
     ];
     $output_formats = $this->definition['output formats'] ?? [];
-    $custom_format = ['custom' => [t('Custom')]];
+    $custom_format = ['custom' => [$this->t('Custom')]];
     $this->formats = array_merge($default_formats, $output_formats, $custom_format);
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/field/EntityField.php b/web/core/modules/views/src/Plugin/views/field/EntityField.php
index d697d5203..972703ec5 100644
--- a/web/core/modules/views/src/Plugin/views/field/EntityField.php
+++ b/web/core/modules/views/src/Plugin/views/field/EntityField.php
@@ -749,7 +749,7 @@ protected function prepareItemsByDelta(array $all_values) {
         $offset = 0;
       }
       else {
-        $delta_limit = $this->options['delta_limit'];
+        $delta_limit = (int) $this->options['delta_limit'];
         $offset = intval($this->options['delta_offset']);
 
         // We should only get here in this case if there is an offset, and in
diff --git a/web/core/modules/views/src/Plugin/views/field/EntityOperations.php b/web/core/modules/views/src/Plugin/views/field/EntityOperations.php
index e08cd8cad..5818a0cd6 100644
--- a/web/core/modules/views/src/Plugin/views/field/EntityOperations.php
+++ b/web/core/modules/views/src/Plugin/views/field/EntityOperations.php
@@ -127,7 +127,13 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    * {@inheritdoc}
    */
   public function render(ResultRow $values) {
-    $entity = $this->getEntityTranslation($this->getEntity($values), $values);
+    $entity = $this->getEntity($values);
+    // Allow for the case where there is no entity, if we are on a non-required
+    // relationship.
+    if (empty($entity)) {
+      return '';
+    }
+    $entity = $this->getEntityTranslation($entity, $values);
     $operations = $this->entityTypeManager->getListBuilder($entity->getEntityTypeId())->getOperations($entity);
     if ($this->options['destination']) {
       foreach ($operations as &$operation) {
diff --git a/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php b/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
index f332e4b7b..d9997318e 100644
--- a/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
+++ b/web/core/modules/views/src/Plugin/views/field/FieldHandlerInterface.php
@@ -136,8 +136,7 @@ public function getEntity(ResultRow $values);
   public function getValue(ResultRow $values, $field = NULL);
 
   /**
-   * Determines if this field will be available as an option to group the result
-   * by in the style settings.
+   * Determines if this field can be grouped in the results.
    *
    * @return bool
    *   TRUE if this field handler is groupable, otherwise FALSE.
diff --git a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index 98351f05c..9a4acc145 100644
--- a/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -14,6 +14,7 @@
 use Drupal\views\ResultRow;
 use Drupal\views\ViewExecutable;
 use Twig\Environment;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * @defgroup views_field_handlers Views field handler plugins
@@ -517,8 +518,7 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Default options form that provides the label widget that all fields
-   * should have.
+   * Default option form that provides label widget that all fields should have.
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
@@ -589,7 +589,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
 
     $form['element_class_enable'] = [
       '#type' => 'checkbox',
-      '#title' => $this->t('Create a CSS class'),
+      '#title' => $this->t('Add HTML class'),
       '#states' => [
         'visible' => [
           ':input[name="options[element_type_enable]"]' => ['checked' => TRUE],
@@ -633,7 +633,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     ];
     $form['element_label_class_enable'] = [
       '#type' => 'checkbox',
-      '#title' => $this->t('Create a CSS class'),
+      '#title' => $this->t('Add HTML class'),
       '#states' => [
         'visible' => [
           ':input[name="options[element_label_type_enable]"]' => ['checked' => TRUE],
@@ -678,7 +678,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
 
     $form['element_wrapper_class_enable'] = [
       '#type' => 'checkbox',
-      '#title' => $this->t('Create a CSS class'),
+      '#title' => $this->t('Add HTML class'),
       '#states' => [
         'visible' => [
           ':input[name="options[element_wrapper_type_enable]"]' => ['checked' => TRUE],
@@ -876,8 +876,8 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
 
       // Setup the tokens for fields.
       $previous = $this->getPreviousFieldLabels();
-      $optgroup_arguments = (string) t('Arguments');
-      $optgroup_fields = (string) t('Fields');
+      $optgroup_arguments = (string) $this->t('Arguments');
+      $optgroup_fields = (string) $this->t('Fields');
       foreach ($previous as $id => $label) {
         $options[$optgroup_fields]["{{ $id }}"] = substr(strrchr($label, ":"), 2);
       }
@@ -1383,8 +1383,7 @@ protected function renderTrimText($alter, $value) {
   }
 
   /**
-   * Render this field as a link, with the info from a fieldset set by
-   * the user.
+   * Render this field as a link, with the info from a fieldset set by the user.
    */
   protected function renderAsLink($alter, $text, $tokens) {
     $options = [
@@ -1429,7 +1428,7 @@ protected function renderAsLink($alter, $text, $tokens) {
       }
 
       // If no scheme is provided in the $path, assign the default 'http://'.
-      // This allows a url of 'www.example.com' to be converted to
+      // This allows a URL of 'www.example.com' to be converted to
       // 'http://www.example.com'.
       // Only do this when flag for external has been set, $path doesn't contain
       // a scheme and $path doesn't have a leading /.
@@ -1477,7 +1476,7 @@ protected function renderAsLink($alter, $text, $tokens) {
       return $text;
     }
 
-    // If we get to here we have a path from the url parsing. So assign that to
+    // If we get to here we have a path from the URL parsing. So assign that to
     // $path now so we don't get query strings or fragments in the path.
     $path = $url['path'];
 
@@ -1561,7 +1560,7 @@ protected function renderAsLink($alter, $text, $tokens) {
       $options['language'] = $alter['language'];
     }
 
-    // If the url came from entity_uri(), pass along the required options.
+    // If the URL came from entity_uri(), pass along the required options.
     if (isset($alter['entity'])) {
       $options['entity'] = $alter['entity'];
     }
@@ -1685,7 +1684,7 @@ protected function getFieldTokenPlaceholder() {
    * @param $parent_keys
    *   An array of parent keys. This will represent the array depth.
    *
-   * @return
+   * @return array
    *   An array of available tokens, with nested keys representative of the array structure.
    */
   protected function getTokenValuesRecursive(array $array, array $parent_keys = []) {
@@ -1819,7 +1818,7 @@ public static function trimText($alter, $value) {
       $value = rtrim(preg_replace('/(?:<(?!.+>)|&(?!.+;)).*$/us', '', $value));
 
       if (!empty($alter['ellipsis'])) {
-        $value .= t('…');
+        $value .= new TranslatableMarkup('…');
       }
     }
     if (!empty($alter['html'])) {
diff --git a/web/core/modules/views/src/Plugin/views/field/LinkBase.php b/web/core/modules/views/src/Plugin/views/field/LinkBase.php
index dfbf50c41..ed8e0ca10 100644
--- a/web/core/modules/views/src/Plugin/views/field/LinkBase.php
+++ b/web/core/modules/views/src/Plugin/views/field/LinkBase.php
@@ -227,7 +227,7 @@ protected function addLangcode(ResultRow $row) {
   /**
    * Returns the default label for this link.
    *
-   * @return string
+   * @return \Drupal\Core\StringTranslation\TranslatableMarkup
    *   The default link label.
    */
   protected function getDefaultLabel() {
diff --git a/web/core/modules/views/src/Plugin/views/field/TimeInterval.php b/web/core/modules/views/src/Plugin/views/field/TimeInterval.php
index 3c288fe61..c3eba5438 100644
--- a/web/core/modules/views/src/Plugin/views/field/TimeInterval.php
+++ b/web/core/modules/views/src/Plugin/views/field/TimeInterval.php
@@ -82,7 +82,10 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
    */
   public function render(ResultRow $values) {
     $value = $values->{$this->field_alias};
-    return $this->dateFormatter->formatInterval((int) $value, $this->options['granularity'] ?? 2);
+    if ($value != NULL) {
+      return $this->dateFormatter->formatInterval((int) $value, $this->options['granularity'] ?? 2);
+    }
+    return '';
   }
 
 }
diff --git a/web/core/modules/views/src/Plugin/views/filter/Combine.php b/web/core/modules/views/src/Plugin/views/filter/Combine.php
index 36dab819e..bffce7a89 100644
--- a/web/core/modules/views/src/Plugin/views/filter/Combine.php
+++ b/web/core/modules/views/src/Plugin/views/filter/Combine.php
@@ -14,7 +14,7 @@
 class Combine extends StringFilter {
 
   /**
-   * @var views_plugin_query_default
+   * @var \Drupal\views\Plugin\views\query\QueryPluginBase
    */
   public $query;
 
@@ -71,7 +71,7 @@ public function query() {
       $field = $this->view->field[$id];
       // Always add the table of the selected fields to be sure a table alias exists.
       $field->ensureMyTable();
-      if (!empty($field->field_alias) && !empty($field->field_alias)) {
+      if (!empty($field->tableAlias) && !empty($field->realField)) {
         $fields[] = "$field->tableAlias.$field->realField";
       }
     }
@@ -128,12 +128,13 @@ public function validate() {
   }
 
   /**
-   * By default things like opEqual uses add_where, that doesn't support
-   * complex expressions, so override opEqual (and all operators below).
+   * {@inheritdoc}
    */
   public function opEqual($expression) {
+    // By default, things like opEqual uses add_where, that doesn't support
+    // complex expressions, so override opEqual (and all operators below).
     $placeholder = $this->placeholder();
-    $operator = $this->getConditionOperator('LIKE');
+    $operator = $this->getConditionOperator($this->operator());
     $this->query->addWhereExpression($this->options['group'], "$expression $operator $placeholder", [$placeholder => $this->value]);
   }
 
diff --git a/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php b/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
index 06be34617..f95ad61c2 100644
--- a/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/filter/FilterPluginBase.php
@@ -46,6 +46,8 @@
 abstract class FilterPluginBase extends HandlerBase implements CacheableDependencyInterface {
 
   /**
+   * The value.
+   *
    * Contains the actual value of the field,either configured in the views ui
    * or entered in the exposed filters.
    */
@@ -849,8 +851,10 @@ protected function buildGroupOptions() {
   }
 
   /**
-   * Build a form containing a group of operator | values to apply as a
-   * single filter.
+   * Builds a group form.
+   *
+   * The form contains a group of operator or values to apply as a single
+   * filter.
    */
   public function groupForm(&$form, FormStateInterface $form_state) {
     if (!empty($this->options['group_info']['optional']) && !$this->multipleExposedInput()) {
@@ -1272,8 +1276,7 @@ public function addGroupForm($form, FormStateInterface $form_state) {
   }
 
   /**
-   * Make some translations to a form item to make it more suitable to
-   * exposing.
+   * Make some translations to a form item to make it more suitable to exposing.
    */
   protected function exposedTranslate(&$form, $type) {
     if (!isset($form['#type'])) {
@@ -1337,8 +1340,10 @@ protected function prepareFilterSelectOptions(&$options) {
   }
 
   /**
-   * Tell the renderer about our exposed form. This only needs to be
-   * overridden for particularly complex forms. And maybe not even then.
+   * Tell the renderer about our exposed form.
+   *
+   * This only needs to be overridden for particularly complex forms. And maybe
+   * not even then.
    *
    * @return array|null
    *   For standard exposed filters. An array with the following keys:
@@ -1398,13 +1403,17 @@ public function convertExposedInput(&$input, $selected_group_id = NULL) {
         return FALSE;
       }
       if (isset($selected_group) && isset($this->options['group_info']['group_items'][$selected_group])) {
-        $input[$this->options['expose']['operator']] = $this->options['group_info']['group_items'][$selected_group]['operator'];
+        $selected_group_options = $this->options['group_info']['group_items'][$selected_group];
+
+        $operator_id = $this->options['expose']['operator'];
+        $input[$operator_id] = $selected_group_options['operator'];
+        $this->options['expose']['operator_id'] = $operator_id;
+        $this->options['expose']['use_operator'] = TRUE;
 
         // Value can be optional, For example for 'empty' and 'not empty' filters.
-        if (isset($this->options['group_info']['group_items'][$selected_group]['value']) && $this->options['group_info']['group_items'][$selected_group]['value'] !== '') {
-          $input[$this->options['group_info']['identifier']] = $this->options['group_info']['group_items'][$selected_group]['value'];
+        if (isset($selected_group_options['value']) && $selected_group_options['value'] !== '') {
+          $input[$this->options['group_info']['identifier']] = $selected_group_options['value'];
         }
-        $this->options['expose']['use_operator'] = TRUE;
 
         $this->group_info = $input[$this->options['group_info']['identifier']];
         return TRUE;
@@ -1416,6 +1425,8 @@ public function convertExposedInput(&$input, $selected_group_id = NULL) {
   }
 
   /**
+   * Group multiple exposed input.
+   *
    * Returns the options available for a grouped filter that users checkboxes
    * as widget, and therefore has to be applied several times, one per
    * item selected.
@@ -1428,6 +1439,8 @@ public function groupMultipleExposedInput(&$input) {
   }
 
   /**
+   * Multiple exposed input.
+   *
    * Returns TRUE if users can select multiple groups items of a
    * grouped exposed filter.
    */
@@ -1507,7 +1520,7 @@ public function acceptExposedInput($input) {
         }
 
         if ($this->operator != 'empty' && $this->operator != 'not empty') {
-          if ($value == 'All' || $value === []) {
+          if ($value == 'All' || $value === 0 || $value === []) {
             return FALSE;
           }
 
diff --git a/web/core/modules/views/src/Plugin/views/filter/InOperator.php b/web/core/modules/views/src/Plugin/views/filter/InOperator.php
index 5fdeeb958..52c198ce0 100644
--- a/web/core/modules/views/src/Plugin/views/filter/InOperator.php
+++ b/web/core/modules/views/src/Plugin/views/filter/InOperator.php
@@ -48,6 +48,8 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
   }
 
   /**
+   * Gets the value options.
+   *
    * Child classes should be used to override this function and set the
    * 'value options', unless 'options callback' is defined as a valid function
    * or static public method to generate these values.
@@ -72,7 +74,7 @@ public function getValueOptions() {
       }
     }
     else {
-      $this->valueOptions = [t('Yes'), $this->t('No')];
+      $this->valueOptions = [$this->t('Yes'), $this->t('No')];
     }
 
     return $this->valueOptions;
@@ -105,6 +107,8 @@ protected function defineOptions() {
   }
 
   /**
+   * Gets the operators.
+   *
    * This kind of construct makes it relatively easy for a child class
    * to add or remove functionality by overriding this function and
    * adding/removing items from this array.
diff --git a/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php b/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php
index 6c876bcbf..313cfe016 100644
--- a/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php
+++ b/web/core/modules/views/src/Plugin/views/filter/ManyToOne.php
@@ -114,8 +114,7 @@ protected function valueForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Override ensureMyTable so we can control how this joins in.
-   * The operator actually has influence over joining.
+   * {@inheritdoc}
    */
   public function ensureMyTable() {
     // Defer to helper if the operator specifies it.
diff --git a/web/core/modules/views/src/Plugin/views/filter/StringFilter.php b/web/core/modules/views/src/Plugin/views/filter/StringFilter.php
index a4cc9eb76..948acb675 100644
--- a/web/core/modules/views/src/Plugin/views/filter/StringFilter.php
+++ b/web/core/modules/views/src/Plugin/views/filter/StringFilter.php
@@ -97,6 +97,8 @@ public function buildExposeForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
+   * Get the operators.
+   *
    * This kind of construct makes it relatively easy for a child class
    * to add or remove functionality by overriding this function and
    * adding/removing items from this array.
@@ -346,6 +348,9 @@ public function query() {
     }
   }
 
+  /**
+   * Adds a where clause for the operation, 'equals'.
+   */
   public function opEqual($field) {
     $this->query->addWhere($this->options['group'], $field, $this->value, $this->operator());
   }
diff --git a/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php b/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
index 57c18eeee..14137a8c4 100644
--- a/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -150,6 +150,7 @@
  *
  * Extensions of this class can be used to create more interesting joins.
  */
+#[\AllowDynamicProperties]
 class JoinPluginBase extends PluginBase implements JoinPluginInterface {
 
   /**
diff --git a/web/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php b/web/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php
index d02f67034..f72cf11d3 100644
--- a/web/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/pager/PagerPluginBase.php
@@ -122,8 +122,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {}
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {}
 
   /**
-   * Return a string to display as the clickable title for the
-   * pager plugin.
+   * Returns a string to display as the clickable title for the pager plugin.
    */
   public function summaryTitle() {
     return $this->t('Unknown');
@@ -148,8 +147,9 @@ public function useCountQuery() {
   }
 
   /**
-   * Execute the count query, which will be done just prior to the query
-   * itself being executed.
+   * Executes the count query.
+   *
+   * This will be done just prior to the query itself being executed.
    */
   public function executeCountQuery(&$count_query) {
     $this->total_items = $count_query->execute()->fetchField();
@@ -163,6 +163,8 @@ public function executeCountQuery(&$count_query) {
   }
 
   /**
+   * Updates the pager information.
+   *
    * If there are pagers that need global values set, this method can
    * be used to set them. It will be called after the query is run.
    */
diff --git a/web/core/modules/views/src/Plugin/views/pager/SqlBase.php b/web/core/modules/views/src/Plugin/views/pager/SqlBase.php
index a3f8a0a4c..c3b1d9992 100644
--- a/web/core/modules/views/src/Plugin/views/pager/SqlBase.php
+++ b/web/core/modules/views/src/Plugin/views/pager/SqlBase.php
@@ -260,7 +260,7 @@ public function query() {
     if ($this->itemsPerPageExposed()) {
       $query = $this->view->getRequest()->query;
       $items_per_page = $query->get('items_per_page');
-      if ($items_per_page > 0) {
+      if ((int) $items_per_page > 0) {
         $this->options['items_per_page'] = $items_per_page;
       }
       elseif ($items_per_page == 'All' && $this->options['expose']['items_per_page_options_all']) {
diff --git a/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index 27277a5e3..2d049ad5b 100644
--- a/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -36,7 +36,7 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
   /**
    * A pager plugin that should be provided by the display.
    *
-   * @var views_plugin_pager
+   * @var \Drupal\views\Plugin\views\pager\PagerPluginBase|null
    */
   public $pager = NULL;
 
@@ -48,8 +48,14 @@ abstract class QueryPluginBase extends PluginBase implements CacheableDependency
   protected $limit;
 
   /**
-   * Generate a query and a countquery from all of the information supplied
-   * to the object.
+   * Controls how the WHERE and HAVING groups are put together.
+   *
+   * @var string
+   */
+  protected $groupOperator;
+
+  /**
+   * Generate a query and a countquery from all of the information supplied.
    *
    * @param $get_count
    *   Provide a countquery if this is true, otherwise provide a normal query.
@@ -73,8 +79,7 @@ public function alter(ViewExecutable $view) {}
   public function build(ViewExecutable $view) {}
 
   /**
-   * Executes the query and fills the associated view object with according
-   * values.
+   * Executes query and fills associated view object with according values.
    *
    * Values to set: $view->result, $view->total_rows, $view->execute_time,
    * $view->pager['current_page'].
@@ -160,7 +165,7 @@ public function getLimit() {
    * @param $where
    *   'where' or 'having'.
    *
-   * @return
+   * @return int|string
    *   The group ID generated.
    */
   public function setWhereGroup($type = 'AND', $group = NULL, $where = 'where') {
diff --git a/web/core/modules/views/src/Plugin/views/query/Sql.php b/web/core/modules/views/src/Plugin/views/query/Sql.php
index b9f48cf09..12c55e85a 100644
--- a/web/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/web/core/modules/views/src/Plugin/views/query/Sql.php
@@ -41,30 +41,28 @@ class Sql extends QueryPluginBase {
   public $tables = [];
 
   /**
-   * Holds an array of relationships, which are aliases of the primary
-   * table that represent different ways to join the same table in.
+   * Holds an array of relationships.
+   *
+   * These are aliases of the primary table that represent different ways to
+   * join the same table in.
    */
   public $relationships = [];
 
   /**
-   * An array of sections of the WHERE query. Each section is in itself
-   * an array of pieces and a flag as to whether or not it should be AND
-   * or OR.
+   * An array of sections of the WHERE query.
+   *
+   * Each section is in itself an array of pieces and a flag as to whether or
+   * not it should be AND or OR.
    */
+
   public $where = [];
   /**
-   * An array of sections of the HAVING query. Each section is in itself
-   * an array of pieces and a flag as to whether or not it should be AND
-   * or OR.
-   */
-  public $having = [];
-  /**
-   * The default operator to use when connecting the WHERE groups. May be
-   * AND or OR.
+   * An array of sections of the HAVING query.
    *
-   * @var string
+   * Each section is in itself an array of pieces and a flag as to whether or
+   * not it should be AND or OR.
    */
-  protected $groupOperator = 'AND';
+  public $having = [];
 
   /**
    * A simple array of order by clauses.
@@ -154,6 +152,9 @@ class Sql extends QueryPluginBase {
    *   The messenger.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager, DateSqlInterface $date_sql, MessengerInterface $messenger) {
+    // By default, use AND operator to connect WHERE groups.
+    $this->groupOperator = 'AND';
+
     parent::__construct($configuration, $plugin_id, $plugin_definition);
 
     $this->entityTypeManager = $entity_type_manager;
@@ -338,6 +339,8 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
+   * Adds a relationship to the query.
+   *
    * A relationship is an alternative endpoint to a series of table
    * joins. Relationships must be aliases of the primary table and
    * they must join either to the primary table or to a pre-existing
@@ -566,9 +569,11 @@ protected function markTable($table, $relationship, $alias) {
   }
 
   /**
-   * Ensure a table exists in the queue; if it already exists it won't
-   * do anything, but if it doesn't it will add the table queue. It will ensure
-   * a path leads back to the relationship table.
+   * Ensures a table exists in the queue.
+   *
+   * If it already exists it won't do anything, but if it doesn't it will add
+   * the table queue. It will ensure a path leads back to the relationship
+   * table.
    *
    * @param $table
    *   The unaliased name of the table to ensure.
@@ -579,7 +584,7 @@ protected function markTable($table, $relationship, $alias) {
    * @param \Drupal\views\Plugin\views\join\JoinPluginBase $join
    *   A Join object (or derived object) to join the alias in.
    *
-   * @return
+   * @return string|null
    *   The alias used to refer to this specific table, or NULL if the table
    *   cannot be ensured.
    */
@@ -656,11 +661,11 @@ public function ensureTable($table, $relationship = NULL, JoinPluginBase $join =
   }
 
   /**
-   * Make sure that the specified table can be properly linked to the primary
-   * table in the JOINs. This function uses recursion. If the tables
-   * needed to complete the path back to the primary table are not in the
-   * query they will be added, but additional copies will NOT be added
-   * if the table is already there.
+   * Ensures the given table can be linked to the primary table in the JOINs.
+   *
+   * This function uses recursion. If the tables needed to complete the path
+   * back to the primary table are not in the query they will be added, but
+   * additional copies will NOT be added if the table is already there.
    */
   protected function ensurePath($table, $relationship = NULL, $join = NULL, $traced = [], $add = []) {
     if (!isset($relationship)) {
@@ -711,8 +716,10 @@ protected function ensurePath($table, $relationship = NULL, $join = NULL, $trace
   }
 
   /**
-   * Fix a join to adhere to the proper relationship; the left table can vary
-   * based upon what relationship items are joined in on.
+   * Fixes a join to adhere to the proper relationship.
+   *
+   * The left table can vary based upon what relationship items are joined in
+   * on.
    */
   protected function adjustJoin($join, $relationship) {
     if (!empty($join->adjusted)) {
@@ -797,8 +804,9 @@ public function getTableInfo($table) {
   }
 
   /**
-   * Add a field to the query table, possibly with an alias. This will
-   * automatically call ensureTable to make sure the required table
+   * Adds a field to the query table, possibly with an alias.
+   *
+   * This will automatically call ensureTable to make sure the required table
    * exists, *unless* $table is unset.
    *
    * @param $table
@@ -873,17 +881,20 @@ public function addField($table, $field, $alias = '', $params = []) {
   }
 
   /**
-   * Remove all fields that may have been added; primarily used for summary mode
-   * where we're changing the query because we didn't get data we needed.
+   * Removes all fields that may have been added.
+   *
+   * Primarily used for summary mode where we're changing the query because
+   * we didn't get data we needed.
    */
   public function clearFields() {
     $this->fields = [];
   }
 
   /**
-   * Add a simple WHERE clause to the query. The caller is responsible for
-   * ensuring that all fields are fully qualified (TABLE.FIELD) and that
-   * the table already exists in the query.
+   * Adds a simple WHERE clause to the query.
+   *
+   * The caller is responsible for ensuring that all fields are fully qualified
+   * (TABLE.FIELD) and that the table already exists in the query.
    *
    * The $field, $value and $operator arguments can also be passed in with a
    * single DatabaseCondition object, like this:
@@ -934,7 +945,7 @@ public function addWhere($group, $field, $value = NULL, $operator = NULL) {
   }
 
   /**
-   * Add a complex WHERE clause to the query.
+   * Adds a complex WHERE clause to the query.
    *
    * The caller is responsible for ensuring that all fields are fully qualified
    * (TABLE.FIELD) and that the table already exists in the query.
@@ -1056,9 +1067,10 @@ public function addOrderBy($table, $field = NULL, $order = 'ASC', $alias = '', $
   }
 
   /**
-   * Add a simple GROUP BY clause to the query. The caller is responsible
-   * for ensuring that the fields are fully qualified and the table is properly
-   * added.
+   * Add a simple GROUP BY clause to the query.
+   *
+   * The caller is responsible for ensuring that the fields are fully qualified
+   * and the table is properly added.
    */
   public function addGroupBy($clause) {
     // Only add it if it's not already in there.
@@ -1276,8 +1288,7 @@ public function getConnection() {
   }
 
   /**
-   * Generate a query and a countquery from all of the information supplied
-   * to the object.
+   * Generates a query and a countquery from all of the information supplied.
    *
    * @param $get_count
    *   Provide a countquery if this is true, otherwise provide a normal query.
@@ -1455,8 +1466,7 @@ public function build(ViewExecutable $view) {
   }
 
   /**
-   * Executes the query and fills the associated view object with according
-   * values.
+   * Executes the query and fills associated view object with according values.
    *
    * Values to set: $view->result, $view->total_rows, $view->execute_time,
    * $view->current_page.
diff --git a/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php b/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
index 05d675509..8774b81ce 100644
--- a/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/relationship/RelationshipPluginBase.php
@@ -23,6 +23,8 @@
  */
 
 /**
+ * Relationship plugin base.
+ *
  * Simple relationship handler that allows a new version of the primary table
  * to be linked in.
  *
diff --git a/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php b/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php
index 0a3e091ac..e1aa9ad42 100644
--- a/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/row/RowPluginBase.php
@@ -155,8 +155,10 @@ public function query() {
   public function preRender($result) {}
 
   /**
-   * Render a row object. This usually passes through to a theme template
-   * of some form, but not always.
+   * Renders a row object.
+   *
+   * This usually passes through to a theme template of some form, but not
+   * always.
    *
    * @param object $row
    *   A single row of the query result, so an element of $view->result.
diff --git a/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php b/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
index 5308439e6..33bc78cc2 100644
--- a/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
+++ b/web/core/modules/views/src/Plugin/views/sort/GroupByNumeric.php
@@ -13,6 +13,11 @@
  */
 class GroupByNumeric extends SortPluginBase {
 
+  /**
+   * The original handler.
+   */
+  protected $handler;
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/modules/views/src/Plugin/views/style/Opml.php b/web/core/modules/views/src/Plugin/views/style/Opml.php
index 02b1e3d90..ad8c30dfe 100644
--- a/web/core/modules/views/src/Plugin/views/style/Opml.php
+++ b/web/core/modules/views/src/Plugin/views/style/Opml.php
@@ -55,10 +55,6 @@ public function attachTo(array &$build, $display_id, Url $feed_url, $title) {
    * {@inheritdoc}
    */
   public function render() {
-    if (empty($this->view->rowPlugin)) {
-      trigger_error('Drupal\views\Plugin\views\style\Opml: Missing row plugin', E_WARNING);
-      return [];
-    }
     $rows = [];
 
     foreach ($this->view->result as $row_index => $row) {
diff --git a/web/core/modules/views/src/Plugin/views/style/Rss.php b/web/core/modules/views/src/Plugin/views/style/Rss.php
index 6693c4863..3bd5fb94d 100644
--- a/web/core/modules/views/src/Plugin/views/style/Rss.php
+++ b/web/core/modules/views/src/Plugin/views/style/Rss.php
@@ -74,7 +74,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
   /**
    * Return an array of additional XHTML elements to add to the channel.
    *
-   * @return
+   * @return array
    *   A render array.
    */
   protected function getChannelElements() {
@@ -97,10 +97,6 @@ public function getDescription() {
   }
 
   public function render() {
-    if (empty($this->view->rowPlugin)) {
-      trigger_error('Drupal\views\Plugin\views\style\Rss: Missing row plugin', E_WARNING);
-      return [];
-    }
     $rows = [];
 
     // This will be filled in by the row plugin and is used later on in the
diff --git a/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 33c8af36e..d05a34d5c 100644
--- a/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -246,8 +246,7 @@ public function tokenizeValue($value, $row_index) {
   }
 
   /**
-   * Should the output of the style plugin be rendered even if it's an empty
-   * view.
+   * Determines if the style plugin is rendered even if the view is empty.
    */
   public function evenEmpty() {
     return !empty($this->definition['even empty']);
@@ -416,6 +415,8 @@ public function wizardSubmit(&$form, FormStateInterface $form_state, WizardInter
   }
 
   /**
+   * Determines if the style handler should interfere with sorts.
+   *
    * Called by the view builder to see if this style handler wants to
    * interfere with the sorts. If so it should build; if it returns
    * any non-TRUE value, normal sorting will NOT be added to the query.
@@ -425,6 +426,8 @@ public function buildSort() {
   }
 
   /**
+   * Allows the view builder to build a second set of sorts.
+   *
    * Called by the view builder to let the style build a second set of
    * sorts that will come after any other sorts in the view.
    */
@@ -463,11 +466,6 @@ protected function renderRowGroup(array $rows = []) {
    * Render the display in this style.
    */
   public function render() {
-    if ($this->usesRowPlugin() && empty($this->view->rowPlugin)) {
-      trigger_error('Drupal\views\Plugin\views\style\StylePluginBase: Missing row plugin', E_WARNING);
-      return [];
-    }
-
     // Group the rows according to the grouping instructions, if specified.
     $sets = $this->renderGrouping(
       $this->view->result,
@@ -545,7 +543,7 @@ public function renderGroupingSets($sets) {
    *   $groupings is an old-style string or if the rendered option is missing
    *   for a grouping instruction.
    *
-   * @return
+   * @return array
    *   The grouped record set.
    *   A nested set structure is generated if multiple grouping fields are used.
    *
diff --git a/web/core/modules/views/src/Plugin/views/style/Table.php b/web/core/modules/views/src/Plugin/views/style/Table.php
index fb75b0ded..10f7db58c 100644
--- a/web/core/modules/views/src/Plugin/views/style/Table.php
+++ b/web/core/modules/views/src/Plugin/views/style/Table.php
@@ -140,6 +140,8 @@ public function buildSortPost() {
   }
 
   /**
+   * Sanitizes the columns.
+   *
    * Normalize a list of columns based upon the fields that are
    * available. This compares the fields stored in the style handler
    * to the list of fields actually in the view, removing fields that
@@ -336,7 +338,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
           'views-align-left' => $this->t('Left', [], ['context' => 'Text alignment']),
           'views-align-center' => $this->t('Center', [], ['context' => 'Text alignment']),
           'views-align-right' => $this->t('Right', [], ['context' => 'Text alignment']),
-          ],
+        ],
         '#states' => [
           'visible' => [
             $column_selector => ['value' => $field],
diff --git a/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 2aa71a94a..41fa43126 100644
--- a/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/web/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -518,7 +518,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    *   An array representing the current version of the #select element within
    *   the form.
    *
-   * @return
+   * @return array|string
    *   The current value of the #select element. A common use for this is to feed
    *   it back into $element['#default_value'] so that the form will be rendered
    *   with the correct value selected.
@@ -1048,7 +1048,7 @@ protected function defaultDisplaySortsUser($form, FormStateInterface $form_state
           'entity_type' => $data['table']['entity type'] ?? NULL,
           'entity_field' => $data[$column]['entity field'] ?? NULL,
           'plugin_id' => $data[$column]['sort']['id'],
-       ];
+        ];
       }
     }
 
diff --git a/web/core/modules/views/src/ResultRow.php b/web/core/modules/views/src/ResultRow.php
index 30814bf62..2399f6998 100644
--- a/web/core/modules/views/src/ResultRow.php
+++ b/web/core/modules/views/src/ResultRow.php
@@ -5,6 +5,7 @@
 /**
  * A class representing a view result row.
  */
+#[\AllowDynamicProperties]
 class ResultRow {
 
   /**
diff --git a/web/core/modules/views/src/ViewExecutable.php b/web/core/modules/views/src/ViewExecutable.php
index c9b0459ad..359c9159a 100644
--- a/web/core/modules/views/src/ViewExecutable.php
+++ b/web/core/modules/views/src/ViewExecutable.php
@@ -24,6 +24,7 @@
  * @see https://www.drupal.org/node/2849674
  * @see https://bugs.php.net/bug.php?id=66052
  */
+#[\AllowDynamicProperties]
 class ViewExecutable {
 
   /**
@@ -236,7 +237,7 @@ class ViewExecutable {
   public $row_index;
 
   /**
-   * Allow to override the url of the current view.
+   * Allow to override the \Drupal\Core\Url of the current view.
    *
    * @var \Drupal\Core\Url
    */
@@ -701,15 +702,16 @@ public function getExposedInput() {
       }
 
       // If we have no input at all, check for remembered input via session.
-
-      // If filters are not overridden, store the 'remember' settings on the
-      // default display. If they are, store them on this display. This way,
-      // multiple displays in the same view can share the same filters and
-      // remember settings.
-      $display_id = ($this->display_handler->isDefaulted('filters')) ? 'default' : $this->current_display;
-
-      if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->storage->id()][$display_id])) {
-        $this->exposed_input = $_SESSION['views'][$this->storage->id()][$display_id];
+      if (empty($this->exposed_input) && $this->request->hasSession()) {
+        $session = \Drupal::request()->getSession();
+        // If filters are not overridden, store the 'remember' settings on the
+        // default display. If they are, store them on this display. This way,
+        // multiple displays in the same view can share the same filters and
+        // remember settings.
+        $display_id = ($this->display_handler->isDefaulted('filters')) ? 'default' : $this->current_display;
+        if (!empty($session->get('views')[$this->storage->id()][$display_id])) {
+          $this->exposed_input = $session->get('views')[$this->storage->id()][$display_id];
+        }
       }
     }
 
diff --git a/web/core/modules/views/src/Views.php b/web/core/modules/views/src/Views.php
index 730449f70..2373ebbc2 100644
--- a/web/core/modules/views/src/Views.php
+++ b/web/core/modules/views/src/Views.php
@@ -137,7 +137,7 @@ public static function getView($id) {
    * @param array $base
    *   An array of possible base tables.
    *
-   * @return
+   * @return array
    *   A keyed array of in the form of 'base_table' => 'Description'.
    */
   public static function fetchPluginNames($type, $key = NULL, array $base = []) {
@@ -188,6 +188,8 @@ public static function getEnabledDisplayExtenders() {
   }
 
   /**
+   * Gets view and display IDs for a given setting in display plugin settings.
+   *
    * Return a list of all view IDs and display IDs that have a particular
    * setting in their display's plugin settings.
    *
@@ -276,8 +278,9 @@ public static function getDisabledViews() {
   }
 
   /**
-   * Returns an array of view as options array, that can be used by select,
-   * checkboxes and radios as #options.
+   * Returns an array of view as options array.
+   *
+   * This array can be used by select, checkboxes and radios as #options.
    *
    * @param bool $views_only
    *   If TRUE, only return views, not displays.
@@ -308,7 +311,7 @@ public static function getViewsAsOptions($views_only = FALSE, $filter = 'all', $
       case 'disabled':
       case 'enabled':
         $filter = ucfirst($filter);
-        $views = call_user_func("static::get{$filter}Views");
+        $views = call_user_func(static::class . "::get{$filter}Views");
         break;
 
       default:
@@ -409,8 +412,9 @@ public static function pluginList() {
   }
 
   /**
-   * Provide a list of views handler types used in a view, with some information
-   * about them.
+   * Provide a list of views handler types used in a view.
+   *
+   * Also provides some information about them.
    *
    * @return array
    *   An array of associative arrays containing:
diff --git a/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php b/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
index 97138f1c4..4e19ebc46 100644
--- a/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
+++ b/web/core/modules/views/tests/modules/views_config_entity_test/src/ViewsConfigEntityTestViewsData.php
@@ -18,7 +18,7 @@ public function getViewsData() {
   }
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   public function getViewsTableForEntityType(EntityTypeInterface $entity_type) {
     return 'views_config_entity_test';
diff --git a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml
index 31cdb9571..6c898e74b 100644
--- a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml
+++ b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_area_order.yml
@@ -19,14 +19,14 @@ display:
           field: entity_block
           id: entity_block
           table: views
-          target: 'bartik_powered'
+          target: 'id_olivero_powered'
           view_mode: full
           plugin_id: entity
         entity_block_1:
           field: entity_block
           id: entity_block
           table: views
-          target: 'bartik_branding'
+          target: 'id_olivero_branding'
           view_mode: full
           plugin_id: entity
       fields:
diff --git a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_pager.yml b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_pager.yml
index a580bc18b..d4324f180 100644
--- a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_pager.yml
+++ b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_pager.yml
@@ -2,9 +2,9 @@ langcode: en
 status: true
 dependencies:
   config:
-  - core.entity_view_mode.node.teaser
+    - core.entity_view_mode.node.teaser
   module:
-  - node
+    - node
 id: test_exposed_form_pager
 label: ''
 module: views
@@ -149,10 +149,10 @@ display:
     cache_metadata:
       max-age: -1
       contexts:
-      - 'languages:language_interface'
-      - url
-      - url.query_args
-      - 'user.node_grants:view'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
       tags: {  }
   page_1:
     display_options:
@@ -165,8 +165,8 @@ display:
     cache_metadata:
       max-age: -1
       contexts:
-      - 'languages:language_interface'
-      - url
-      - url.query_args
-      - 'user.node_grants:view'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - 'user.node_grants:view'
       tags: {  }
diff --git a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
index a43402680..66edf1fd8 100644
--- a/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
+++ b/web/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_page_display.yml
@@ -23,6 +23,9 @@ display:
           relationship: none
           table: views_test_data
           plugin_id: numeric
+      use_more: true
+      use_more_always: true
+      use_more_text: more
     display_plugin: default
     display_title: Default
     id: default
diff --git a/web/core/modules/views/tests/modules/views_test_config/views_test_config.module b/web/core/modules/views/tests/modules/views_test_config/views_test_config.module
index b631c47a9..88cbdbcaa 100644
--- a/web/core/modules/views/tests/modules/views_test_config/views_test_config.module
+++ b/web/core/modules/views/tests/modules/views_test_config/views_test_config.module
@@ -5,6 +5,9 @@
  * Contains the "views_test_config" module main functionality.
  */
 
+use Drupal\views\Plugin\views\cache\CachePluginBase;
+use Drupal\views\ViewExecutable;
+
 /**
  * Implements hook_ENTITY_TYPE_load().
  */
@@ -17,3 +20,15 @@ function views_test_config_view_load(array $views) {
     $display['display_options']['fields']['id_broken'] = NULL;
   }
 }
+
+/**
+ * Implements hook_views_post_render().
+ */
+function views_test_config_views_post_render(ViewExecutable $view, &$output, CachePluginBase $cache) {
+  if (\Drupal::state()->get('views_test_config.views_post_render_cache_tag')) {
+    \Drupal::state()->set('views_test_config.views_post_render_called', TRUE);
+    // Set a cache key on output to ensure ViewsSelection::stripAdminAndAnchorTagsFromResults
+    // correctly handles elements that aren't result rows.
+    $output['#cache']['tags'][] = 'foo';
+  }
+}
diff --git a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php
index 2367981ad..1e81e51e2 100644
--- a/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php
+++ b/web/core/modules/views/tests/modules/views_test_data/src/Plugin/views/field/FieldFormButtonTest.php
@@ -46,7 +46,7 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
     foreach ($this->view->result as $row_index => $row) {
       $form[$this->options['id']][$row_index] = [
         '#type' => 'submit',
-        '#value' => t('Test Button'),
+        '#value' => $this->t('Test Button'),
         '#name' => 'test-button-' . $row_index,
         '#test_button' => TRUE,
         '#row_index' => $row_index,
diff --git a/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php b/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php
index 8a623e3e3..4717b3f24 100644
--- a/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php
+++ b/web/core/modules/views/tests/src/Functional/DefaultViewsTest.php
@@ -56,6 +56,9 @@ class DefaultViewsTest extends ViewTestBase {
     'glossary' => ['all'],
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php b/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
index c62e2fd45..366f3a87b 100644
--- a/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
+++ b/web/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
@@ -26,7 +26,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php b/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
index f09bc1caa..38aadfbc1 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/AreaTest.php
@@ -34,6 +34,9 @@ class AreaTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
index 10307b2b1..3d3ba8c50 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
@@ -33,6 +33,9 @@ class FieldEntityOperationsTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index 17c7ee0f3..bd589fe96 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -48,6 +48,9 @@ class FieldWebTest extends ViewTestBase {
     'views_test_data_name' => 'name',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
@@ -308,11 +311,11 @@ public function testAlterUrl() {
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
       return $id_field->theme($row);
     });
-    // The url has a space in it, so to check we have to decode the url output.
+    // The URL has a space in it, so to check we have to decode the URL output.
     $this->assertSubString(urldecode($output), $path);
 
     // Tests the external flag.
-    // Switch on the external flag should output an external url as well.
+    // Switch on the external flag should output an external URL as well.
     $id_field->options['alter']['external'] = TRUE;
     $id_field->options['alter']['path'] = $path = 'www.drupal.org';
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
@@ -320,7 +323,7 @@ public function testAlterUrl() {
     });
     $this->assertSubString($output, 'http://www.drupal.org');
 
-    // Setup a not external url, which shouldn't lead to an external url.
+    // Setup a not external URL, which shouldn't lead to an external URL.
     $id_field->options['alter']['external'] = FALSE;
     $id_field->options['alter']['path'] = $path = 'www.drupal.org';
     $output = $renderer->executeInRenderContext(new RenderContext(), function () use ($id_field, $row) {
diff --git a/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php b/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
index ed2a6de76..1634fb3fa 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
@@ -34,7 +34,7 @@ class FilterDateTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * The date formatter.
@@ -53,6 +53,9 @@ class FilterDateTest extends ViewTestBase {
    */
   protected $map;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
     $this->dateFormatter = $this->container->get('date.formatter');
diff --git a/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php b/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
index 984495939..9d1589798 100644
--- a/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
+++ b/web/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
@@ -39,6 +39,9 @@ class HandlerTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
     $this->drupalCreateContentType(['type' => 'page']);
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php b/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
index 80630bfc5..b42ca4e12 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
@@ -48,6 +48,9 @@ class AccessTest extends ViewTestBase {
    */
   protected $normalUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index d4867336b..fc92ce624 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -28,7 +28,7 @@ class ArgumentDefaultTest extends ViewTestBase {
     'test_argument_default_current_user',
     'test_argument_default_node',
     'test_argument_default_query_param',
-    ];
+  ];
 
   /**
    * {@inheritdoc}
@@ -42,6 +42,9 @@ class ArgumentDefaultTest extends ViewTestBase {
    */
   protected static $modules = ['node', 'views_ui', 'block'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
@@ -145,7 +148,7 @@ public function testArgumentDefaultNode() {
       'bypass node access',
       'access user profiles',
       'view all revisions',
-      ];
+    ];
     $views_admin = $this->drupalCreateUser($permissions);
     $this->drupalLogin($views_admin);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php b/web/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
index 8fb8ab3c4..290fd59dd 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
@@ -76,6 +76,9 @@ class CacheTagTest extends ViewTestBase {
    */
   protected $user;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
index d71c85509..d79c1c5ba 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
@@ -31,7 +31,7 @@ class ContextualFiltersBlockContextTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Views used by this test.
@@ -103,7 +103,7 @@ public function testBlockContext() {
 
     // Place test block via block UI to check if contexts are correctly exposed.
     $this->drupalGet(
-      'admin/structure/block/add/views_block:test_view_block_with_context-block_1/classy',
+      'admin/structure/block/add/views_block:test_view_block_with_context-block_1/starterkit_theme',
       ['query' => ['region' => 'content']]
     );
     $edit = [
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php
index 2cdff6fff..dee517418 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php
@@ -24,7 +24,7 @@ class ContextualFiltersStringTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Views used by this test.
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
index 046e04fbe..54548cb95 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
@@ -29,8 +29,11 @@ class DisabledDisplayTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
index 3b02dbf76..38f154172 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
@@ -30,8 +30,11 @@ class DisplayAttachmentTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
index ebacfc5c2..f6639dce1 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
@@ -275,6 +275,23 @@ public function testEntityReferenceDisplay() {
     $view->setDisplay('entity_reference_1');
     $render = $view->display_handler->render();
     $this->assertSame([], $render, 'Render returned empty array');
+
+    // Execute the View without setting the 'entity_reference_options'.
+    // This is equivalent to using the following as entity_reference_options.
+    // @code
+    // $options = [
+    //   'match' => NULL,
+    //   'match_operator' => 'CONTAINS',
+    //   'limit' => 0,
+    //   'ids' => NULL,
+    // ];
+    // @endcode
+    // Assert that this view returns a row for each test entity.
+    $view->destroy();
+    $view = Views::getView('test_display_entity_reference');
+    $view->setDisplay('entity_reference_1');
+    $this->executeView($view);
+    $this->assertCount(13, $view->result, 'Search returned thirteen rows');
   }
 
 }
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
index 2ab8c88b6..f2510c690 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
@@ -34,8 +34,11 @@ class DisplayFeedTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
index d5ceed177..985952eae 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
@@ -48,6 +48,9 @@ class DisplayFeedTranslationTest extends ViewTestBase {
    */
   protected $langcodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
index c0f43960a..e6b97da7c 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
@@ -32,7 +32,7 @@ class DisplayPageWebTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
index 21412d4fe..2e99e8f56 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Functional\Plugin;
 
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\language\Entity\ConfigurableLanguage;
 use Drupal\Tests\views\Functional\ViewTestBase;
 use Drupal\views\Views;
@@ -33,6 +34,9 @@ class DisplayTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
@@ -362,8 +366,8 @@ public function testMissingRelationship() {
     $errors = $view->validate();
     // Check that the error messages are shown.
     $this->assertCount(2, $errors['default'], 'Error messages found for required relationship');
-    $this->assertEquals(t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => 'field', '%handler' => 'User: Last login']), $errors['default'][0]);
-    $this->assertEquals(t('The %handler_type %handler uses a relationship that has been removed.', ['%handler_type' => 'field', '%handler' => 'User: Created']), $errors['default'][1]);
+    $this->assertEquals(new FormattableMarkup('The %relationship_name relationship used in %handler_type %handler is not present in the %display_name display.', ['%relationship_name' => 'uid', '%handler_type' => 'field', '%handler' => 'User: Last login', '%display_name' => 'Default']), $errors['default'][0]);
+    $this->assertEquals(new FormattableMarkup('The %relationship_name relationship used in %handler_type %handler is not present in the %display_name display.', ['%relationship_name' => 'uid', '%handler_type' => 'field', '%handler' => 'User: Created', '%display_name' => 'Default']), $errors['default'][1]);
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
index f0616d58a..b653c3527 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
@@ -24,7 +24,7 @@ class ExposedFormTest extends ViewTestBase {
    *
    * @var array
    */
-  public static $testViews = ['test_exposed_form_buttons', 'test_exposed_block', 'test_exposed_form_sort_items_per_page', 'test_exposed_form_pager'];
+  public static $testViews = ['test_exposed_form_buttons', 'test_exposed_block', 'test_exposed_form_sort_items_per_page', 'test_exposed_form_pager', 'test_remember_selected'];
 
   /**
    * Modules to enable.
@@ -36,7 +36,7 @@ class ExposedFormTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Nodes to test.
@@ -45,6 +45,9 @@ class ExposedFormTest extends ViewTestBase {
    */
   protected $nodes = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
@@ -507,4 +510,17 @@ protected function assertNodesExist(array $bundles): void {
     }
   }
 
+  /**
+   * Tests the "Remember the last selection" functionality.
+   */
+  public function testRememberSelected() {
+    $this->drupalGet('test_remember_selected');
+    $this->getSession()->getPage()->fillField('type', 'page');
+    $this->getSession()->getPage()->pressButton('Apply');
+
+    // Reload the page and ensure the filter is selected.
+    $this->drupalGet('test_remember_selected');
+    $this->assertTrue($this->assertSession()->optionExists('type', 'page')->isSelected());
+  }
+
 }
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php b/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
index 7b1c85949..5d9501c59 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
@@ -34,6 +34,9 @@ class FilterTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
@@ -150,8 +153,7 @@ public function testFilterQuery() {
   }
 
   /**
-   * Tests no error message is displayed when all options are selected in an
-   * exposed filter.
+   * Tests an exposed filter when all options are selected.
    */
   public function testInOperatorSelectAllOptions() {
     $row['row[type]'] = 'fields';
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php b/web/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
index 05a6aac21..5b51d971f 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
@@ -39,6 +39,9 @@ class MiniPagerTest extends ViewTestBase {
    */
   protected $nodes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php b/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
index d9e4099f0..3f0624977 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
@@ -33,6 +33,9 @@ class NumericFormatPluralTest extends ViewTestBase {
    */
   public static $testViews = ['numeric_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php b/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
index 43bf66a4a..c7f326c46 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
@@ -20,7 +20,7 @@ class StyleSummaryTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -60,7 +60,7 @@ public function testSummaryView() {
     $this->drupalGet('test-summary');
 
     // Ensure styles are properly added for summary views.
-    $this->assertSession()->responseContains('stable/css/views/views.module.css');
+    $this->assertSession()->responseContains('stable9/css/views/views.module.css');
 
     $summary_list = $this->cssSelect('ul.views-summary li');
     $this->assertCount(4, $summary_list);
diff --git a/web/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php b/web/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
index f9b92e1d2..ba2075411 100644
--- a/web/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
+++ b/web/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
@@ -30,6 +30,9 @@ class ViewsBulkTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/RenderCacheWebTest.php b/web/core/modules/views/tests/src/Functional/RenderCacheWebTest.php
index 2d15924e7..9ea9069c5 100644
--- a/web/core/modules/views/tests/src/Functional/RenderCacheWebTest.php
+++ b/web/core/modules/views/tests/src/Functional/RenderCacheWebTest.php
@@ -19,7 +19,7 @@ class RenderCacheWebTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/modules/views/tests/src/Functional/UserBatchActionTest.php b/web/core/modules/views/tests/src/Functional/UserBatchActionTest.php
index 8a19ae0fa..4db2f4223 100644
--- a/web/core/modules/views/tests/src/Functional/UserBatchActionTest.php
+++ b/web/core/modules/views/tests/src/Functional/UserBatchActionTest.php
@@ -34,7 +34,7 @@ class UserBatchActionTest extends BrowserTestBase {
    * Tests user admin batch.
    */
   public function testUserAction() {
-    $themes = ['bartik', 'classy', 'olivero', 'seven', 'test_subseven'];
+    $themes = ['stark', 'olivero', 'claro'];
     $this->container->get('theme_installer')->install($themes);
 
     $this->drupalLogin($this->rootUser);
diff --git a/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php b/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php
index bb525f53f..1ea37e1fe 100644
--- a/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php
+++ b/web/core/modules/views/tests/src/Functional/ViewAjaxTest.php
@@ -23,6 +23,9 @@ class ViewAjaxTest extends ViewTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/ViewElementTest.php b/web/core/modules/views/tests/src/Functional/ViewElementTest.php
index 438927ad4..b068a4bbd 100644
--- a/web/core/modules/views/tests/src/Functional/ViewElementTest.php
+++ b/web/core/modules/views/tests/src/Functional/ViewElementTest.php
@@ -21,7 +21,7 @@ class ViewElementTest extends ViewTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
@@ -73,8 +73,7 @@ public function testViewElement() {
   }
 
   /**
-   * Tests the rendered output and form output of a view element, using the
-   * embed display plugin.
+   * Tests the rendered output and form output of the "embed" display plugin.
    */
   public function testViewElementEmbed() {
     $view = Views::getView('test_view_embed');
diff --git a/web/core/modules/views/tests/src/Functional/ViewTestBase.php b/web/core/modules/views/tests/src/Functional/ViewTestBase.php
index c4aab18b7..86eec8c09 100644
--- a/web/core/modules/views/tests/src/Functional/ViewTestBase.php
+++ b/web/core/modules/views/tests/src/Functional/ViewTestBase.php
@@ -29,6 +29,16 @@ abstract class ViewTestBase extends BrowserTestBase {
    */
   protected static $modules = ['views', 'views_test_config'];
 
+  /**
+   * Sets up the test.
+   *
+   * @param bool $import_test_views
+   *   Should the views specified on the test class be imported. If you need
+   *   to setup some additional stuff, like fields, you need to call false and
+   *   then call createTestViews for your own.
+   * @param array $modules
+   *   The module directories to look in for test views.
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']) {
     parent::setUp();
     if ($import_test_views) {
diff --git a/web/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php b/web/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
index 17dc3f78b..7412be3e9 100644
--- a/web/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
+++ b/web/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
@@ -45,8 +45,7 @@ protected function setUp($import_test_views = TRUE, $modules = ['views_test_conf
   }
 
   /**
-   * Tests for exceptions and successful execution of hook_views_pre_render()
-   * and hook_views_post_render() in theme and subtheme.
+   * Tests pre_render and post_render hooks in a theme and sub-theme.
    */
   public function testThemedViewPage() {
 
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php b/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
index fbbd32060..61921c0c1 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
@@ -18,6 +18,9 @@ class BasicTest extends WizardTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php b/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
index 7bddee93d..61da043cf 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
@@ -3,8 +3,7 @@
 namespace Drupal\Tests\views\Functional\Wizard;
 
 /**
- * Tests the ability of the views wizard to specify the number of items per
- * page.
+ * Tests that the views wizard can specify the number of items per page.
  *
  * @group views
  */
@@ -15,6 +14,9 @@ class ItemsPerPageTest extends WizardTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php b/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
index 51d67a988..52d8f96c2 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
@@ -14,6 +14,9 @@ class SortingTest extends WizardTestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php b/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
index 06e8b501b..ffcdf1f49 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
@@ -71,6 +71,9 @@ class TaggedWithTest extends WizardTestBase {
    */
   protected $tagField;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php b/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
index 84aa44bc4..e85540a79 100644
--- a/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
+++ b/web/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
@@ -16,6 +16,9 @@ abstract class WizardTestBase extends ViewTestBase {
    */
   protected static $modules = ['node', 'views_ui', 'block', 'rest'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []) {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
index 24873e674..2e312269e 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/ExposedFilterAJAXTest.php
@@ -5,6 +5,7 @@
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
+use Drupal\views\Tests\ViewTestData;
 
 /**
  * Tests the basic AJAX functionality of Views exposed forms.
@@ -19,13 +20,25 @@ class ExposedFilterAJAXTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected static $modules = ['node', 'views', 'views_test_modal'];
+  protected static $modules = [
+    'node',
+    'views',
+    'views_test_modal',
+    'user_test_views',
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * Views used by this test.
+   *
+   * @var array
+   */
+  public static $testViews = ['test_user_name'];
+
   /**
    * {@inheritdoc}
    */
@@ -37,6 +50,12 @@ protected function setUp(): void {
       ->set('display.default.display_options.use_ajax', TRUE)
       ->save();
 
+    // Import user_test_views and set it to use ajax.
+    ViewTestData::createTestViews(get_class($this), ['user_test_views']);
+    \Drupal::configFactory()->getEditable('views.view.test_user_name')
+      ->set('display.default.display_options.use_ajax', TRUE)
+      ->save();
+
     // Create a Content type and two test nodes.
     $this->createContentType(['type' => 'page']);
     $this->createNode(['title' => 'Page One']);
@@ -194,4 +213,25 @@ public function testExposedFilteringWithButtonElement() {
     $this->assertSame($ajax_views_before, $ajax_views_after);
   }
 
+  /**
+   * Tests that errors messages are displayed for exposed filters via ajax.
+   */
+  public function testExposedFilterErrorMessages(): void {
+    $this->drupalGet('test_user_name');
+    // Submit an invalid name, triggering validation errors.
+    $name = $this->randomMachineName();
+    $this->submitForm(['uid' => $name], 'Apply');
+    $this->assertSession()->waitForElement('css', 'div[aria-label="Error message"]');
+    $this->assertSession()->pageTextContainsOnce(sprintf('There are no users matching "%s"', $name));
+
+    \Drupal::service('module_installer')->install(['inline_form_errors']);
+
+    $this->drupalGet('test_user_name');
+    // Submit an invalid name, triggering validation errors.
+    $name = $this->randomMachineName();
+    $this->submitForm(['uid' => $name], 'Apply');
+    $this->assertSession()->waitForElement('css', 'div[aria-label="Error message"]');
+    $this->assertSession()->pageTextContainsOnce(sprintf('There are no users matching "%s"', $name));
+  }
+
 }
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
index 9ecfd4d84..c296a7f89 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/GlossaryViewTest.php
@@ -32,7 +32,7 @@ class GlossaryViewTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * @var array
diff --git a/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php b/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
index f96b468e3..00454912a 100644
--- a/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
+++ b/web/core/modules/views/tests/src/FunctionalJavascript/PaginationAJAXTest.php
@@ -99,7 +99,7 @@ public function testBasicPagination() {
     $this->assertStringContainsString('Node 6 content', $rows[0]->getHtml());
     $link = $page->findLink('Go to page 3');
     // Test that no unwanted parameters are added to the URL.
-    $this->assertEquals('?status=All&type=All&langcode=All&items_per_page=5&order=changed&sort=asc&title=&page=2', $link->getAttribute('href'));
+    $this->assertEquals('?status=All&type=All&langcode=All&items_per_page=5&order=changed&sort=asc&page=2', $link->getAttribute('href'));
     $this->assertNoDuplicateAssetsOnPage();
 
     $this->clickLink('Go to page 3');
diff --git a/web/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php b/web/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php
index c96792e93..6fc3c673d 100644
--- a/web/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Entity/EntityViewsDataTest.php
@@ -418,7 +418,8 @@ public function testBaseTableFields() {
     $this->assertEquals([
       'left_field' => 'id',
       'field' => 'entity_id',
-      'extra' => [[
+      'extra' => [
+        [
           'field' => 'deleted',
           'value' => 0,
           'numeric' => TRUE,
@@ -506,7 +507,8 @@ public function testDataTableFields() {
     $this->assertEquals([
       'left_field' => 'id',
       'field' => 'entity_id',
-      'extra' => [[
+      'extra' => [
+        [
           'field' => 'deleted',
           'value' => 0,
           'numeric' => TRUE,
@@ -636,7 +638,8 @@ public function testRevisionTableFields() {
     $this->assertEquals([
       'left_field' => 'id',
       'field' => 'entity_id',
-      'extra' => [[
+      'extra' => [
+        [
           'field' => 'deleted',
           'value' => 0,
           'numeric' => TRUE,
@@ -649,7 +652,8 @@ public function testRevisionTableFields() {
     $this->assertEquals([
       'left_field' => 'revision_id',
       'field' => 'entity_id',
-      'extra' => [[
+      'extra' => [
+        [
           'field' => 'deleted',
           'value' => 0,
           'numeric' => TRUE,
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
index f81def4de..786ebbb7a 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaEntityTest.php
@@ -46,8 +46,8 @@ protected function setUp($import_test_views = TRUE): void {
    */
   protected function setUpFixtures() {
     // Install the themes used for this test.
-    $this->container->get('theme_installer')->install(['bartik']);
-    $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'bartik')->save();
+    $this->container->get('theme_installer')->install(['olivero']);
+    $this->container->get('config.factory')->getEditable('system.theme')->set('default', 'olivero')->save();
 
     $this->installEntitySchema('user');
     $this->installEntitySchema('entity_test');
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php
index d95975dfb..613f03444 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaOrderTest.php
@@ -35,18 +35,18 @@ class AreaOrderTest extends ViewsKernelTestBase {
    */
   protected function setUpFixtures() {
     // Install the themes used for this test.
-    $this->container->get('theme_installer')->install(['bartik']);
+    $this->container->get('theme_installer')->install(['olivero']);
 
     $this->placeBlock('system_branding_block', [
-      'id' => 'bartik_branding',
-      'theme' => 'bartik',
+      'id' => 'id_olivero_branding',
+      'theme' => 'olivero',
       'plugin' => 'system_branding_block',
       'weight' => 1,
     ]);
 
     $this->placeBlock('system_powered_by_block', [
-      'id' => 'bartik_powered',
-      'theme' => 'bartik',
+      'id' => 'id_olivero_powered',
+      'theme' => 'olivero',
       'weight' => 2,
     ]);
 
@@ -61,11 +61,11 @@ public function testAreaOrder() {
     $renderable = $view->buildRenderable();
     $output = $this->render($renderable);
 
-    $position_powered = strpos($output, 'block-bartik-powered');
-    $position_branding = strpos($output, 'block-bartik-branding');
+    $position_powered = strpos($output, 'block-id-olivero-powered');
+    $position_branding = strpos($output, 'block-id-olivero-branding');
 
-    $this->assertNotEquals(0, $position_powered, 'ID bartik-powered found.');
-    $this->assertNotEquals(0, $position_branding, 'ID bartik-branding found');
+    $this->assertNotEquals(0, $position_powered, 'ID olivero-powered found.');
+    $this->assertNotEquals(0, $position_branding, 'ID olivero-branding found');
 
     // Make sure "powered" is before "branding", so it reflects the position
     // in the configuration, and not the weight of the blocks.
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php b/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
index 9941e11b5..6a1c062b2 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/AreaTextTest.php
@@ -22,6 +22,9 @@ class AreaTextTest extends ViewsKernelTestBase {
    */
   public static $testViews = ['test_view'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
index 162895a78..c68346855 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FieldUrlTest.php
@@ -47,7 +47,7 @@ public function testFieldUrl() {
 
     $this->assertEquals('John', $view->field['name']->advancedRender($view->result[0]));
 
-    // Make the url a link.
+    // Make the URL a link.
     $view->destroy();
     $view->setDisplay();
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
index 88c3de207..66bac02a6 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterBooleanOperatorStringTest.php
@@ -6,8 +6,7 @@
 use Drupal\views\Views;
 
 /**
- * Tests the core Drupal\views\Plugin\views\filter\BooleanOperatorString
- * handler.
+ * Tests core's BooleanOperatorString views filter handler.
  *
  * @group views
  * @see \Drupal\views\Plugin\views\filter\BooleanOperatorString
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
index 7a748f485..3eaa70af2 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterCombineTest.php
@@ -9,6 +9,8 @@
  * Tests the combine filter handler.
  *
  * @group views
+ *
+ * @coversDefaultClass \Drupal\views\Plugin\views\filter\Combine
  */
 class FilterCombineTest extends ViewsKernelTestBase {
 
@@ -104,13 +106,13 @@ public function testFilterCombineWord() {
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
     $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
-        'job' => [
-          'id' => 'job',
-          'table' => 'views_test_data',
-          'field' => 'job',
-          'relationship' => 'none',
-        ],
-      ]);
+      'job' => [
+        'id' => 'job',
+        'table' => 'views_test_data',
+        'field' => 'job',
+        'relationship' => 'none',
+      ],
+    ]);
 
     // Change the filtering.
     $view->displayHandlers->get('default')->overrideOption('filters', [
@@ -155,13 +157,13 @@ public function testFilterCombineAllWords() {
 
     $fields = $view->displayHandlers->get('default')->getOption('fields');
     $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
-        'job' => [
-          'id' => 'job',
-          'table' => 'views_test_data',
-          'field' => 'job',
-          'relationship' => 'none',
-        ],
-      ]);
+      'job' => [
+        'id' => 'job',
+        'table' => 'views_test_data',
+        'field' => 'job',
+        'relationship' => 'none',
+      ],
+    ]);
 
     // Set the filtering to allwords and simulate searching for a phrase.
     $view->displayHandlers->get('default')->overrideOption('filters', [
@@ -243,8 +245,7 @@ public function testFilterCombineContainsFieldsOverwritten() {
   }
 
   /**
-   * Tests that the combine field filter is not valid on displays that don't use
-   * fields.
+   * Tests that the "combine" filter is only valid on displays that use fields.
    */
   public function testNonFieldsRow() {
     $view = Views::getView('entity_test_fields');
@@ -283,6 +284,8 @@ public function testNonFieldsRow() {
 
   /**
    * Tests the Combine field filter using the 'equal' operator.
+   *
+   * @covers::opEqual
    */
   public function testFilterCombineEqual() {
     $view = Views::getView('test_view');
@@ -327,6 +330,60 @@ public function testFilterCombineEqual() {
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
+  /**
+   * Tests the Combine field filter using the 'not equal' operator.
+   *
+   * @covers::opEqual
+   */
+  public function testFilterCombineNotEqual(): void {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $fields = $view->displayHandlers->get('default')->getOption('fields');
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+      'job' => [
+        'id' => 'job',
+        'table' => 'views_test_data',
+        'field' => 'job',
+        'relationship' => 'none',
+      ],
+    ]);
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
+        'id' => 'combine',
+        'table' => 'views',
+        'field' => 'combine',
+        'relationship' => 'none',
+        'operator' => '!=',
+        'fields' => [
+          'job',
+        ],
+        // The 'I' in 'sInger' is capitalized deliberately because we are
+        // testing that search filters are case-insensitive.
+        'value' => 'sInger',
+      ],
+    ]);
+
+    $this->executeView($view);
+    $result_set = [
+      [
+        'name' => 'Ringo',
+        'job' => 'Drummer',
+      ],
+      [
+        'name' => 'Paul',
+        'job' => 'Songwriter',
+      ],
+      [
+        'name' => 'Meredith',
+        'job' => 'Speaker',
+      ],
+    ];
+    $this->assertIdenticalResultset($view, $result_set, $this->columnMap);
+  }
+
   /**
    * Tests the Combine field filter using the 'starts' operator.
    */
@@ -569,6 +626,61 @@ public function testFilterCombineNot() {
     $this->assertIdenticalResultset($view, $resultset, $this->columnMap);
   }
 
+  /**
+   * Tests the combine filter when no realName is used.
+   */
+  public function testFilterCombineNoRealName() {
+    $view = Views::getView('test_view');
+    $view->setDisplay();
+
+    $fields = $view->displayHandlers->get('default')->getOption('fields');
+    $view->displayHandlers->get('default')->overrideOption('fields', $fields + [
+      'name_no_id' => [
+        'id' => 'name_no_id',
+        'table' => 'views_test_data',
+        'field' => 'name_fail',
+        'relationship' => 'none',
+      ],
+    ]);
+
+    // Change the filtering.
+    $view->displayHandlers->get('default')->overrideOption('filters', [
+      'age' => [
+        'id' => 'combine',
+        'table' => 'views',
+        'field' => 'combine',
+        'relationship' => 'none',
+        'operator' => 'contains',
+        'fields' => [
+          'name_no_id',
+          'job',
+        ],
+        'value' => 'iNg',
+      ],
+    ]);
+
+    $this->executeView($view);
+    $resultset = [
+      [
+        'name' => 'John',
+        'job' => 'Singer',
+      ],
+      [
+        'name' => 'George',
+        'job' => 'Singer',
+      ],
+      [
+        'name' => 'Ringo',
+        'job' => 'Drummer',
+      ],
+      [
+        'name' => 'Ginger',
+        'job' => NULL,
+      ],
+    ];
+    $this->assertNotIdenticalResultset($view, $resultset, $this->columnMap);
+  }
+
   /**
    * Additional data to test the NULL issue.
    */
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php b/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
index a2c2fe6f5..4c3741b30 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/FilterNumericTest.php
@@ -275,8 +275,9 @@ public function testFilterNumericRegularExpression() {
   }
 
   /**
-   * Tests the numeric filter handler with the 'regular_expression' operator
-   * to grouped exposed filters.
+   * Tests the "numeric" filter with grouped exposed filters.
+   *
+   * The tests are performed with the 'regular_expression' operator.
    */
   public function testFilterNumericExposedGroupedRegularExpression() {
     $filters = $this->getGroupedExposedFilters();
@@ -338,7 +339,7 @@ public function testFilterNumericEmpty() {
 
     $this->executeView($view);
     $resultset = [
-    [
+      [
         'name' => 'John',
         'age' => 25,
       ],
@@ -391,7 +392,7 @@ public function testFilterNumericExposedGroupedNotEmpty() {
 
     $this->executeView($view);
     $resultset = [
-    [
+      [
         'name' => 'John',
         'age' => 25,
       ],
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php b/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
index bcbcc4a53..6ac117d9a 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/HandlerAliasTest.php
@@ -21,6 +21,9 @@ class HandlerAliasTest extends ViewsKernelTestBase {
    */
   public static $testViews = ['test_filter', 'test_alias'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php b/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
index a27e1b5c5..ef33882f0 100644
--- a/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Handler/SortDateTest.php
@@ -104,7 +104,7 @@ protected function expectedResultSet($granularity, $reverse = TRUE) {
             ['name' => 'Meredith'],
             ['name' => 'Paul'],
             ['name' => 'John'],
-           ];
+          ];
           break;
 
         case 'hour':
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
index 7bab5e5c5..36495b734 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/CacheTest.php
@@ -366,7 +366,7 @@ public function testCacheContextIntegration() {
     // Update the entry in the DB to ensure that result caching works.
     \Drupal::database()->update('views_test_data')
       ->condition('name', 'George')
-      ->fields(['name' => 'egroeG'])
+      ->fields(['name' => 'notGeorge'])
       ->execute();
 
     $view = Views::getView('test_cache');
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
index d21d3a5dd..d596ea333 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/DisplayPageTest.php
@@ -244,7 +244,7 @@ public function testEmptyRow() {
       'html_list' => '//div[@class="item-list"]//li',
     ];
 
-    $themes = ['bartik', 'classy', 'olivero', 'seven', 'stable', 'stark'];
+    $themes = ['olivero', 'stable9', 'stark', 'claro'];
 
     foreach ($themes as $theme) {
       \Drupal::service('theme_installer')->install([$theme]);
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
index fd546473b..7bb940267 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/JoinTest.php
@@ -30,6 +30,9 @@ class JoinTest extends RelationshipJoinTestBase {
    */
   protected $manager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php
index 7b485d3da..d02e657a8 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/PluginBaseTest.php
@@ -24,6 +24,9 @@ class PluginBaseTest extends KernelTestBase {
    */
   protected $testPluginBase;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->testPluginBase = new TestPluginBase();
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
index ecb90a7f3..aaaa78df8 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/RelationshipJoinTestBase.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Kernel\Plugin;
 
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 use Drupal\user\Entity\User;
 use Drupal\views\Views;
 
@@ -69,8 +70,8 @@ protected function schemaDefinition() {
   protected function viewsData() {
     $data = parent::viewsData();
     $data['views_test_data']['uid'] = [
-      'title' => t('UID'),
-      'help' => t('The test data UID'),
+      'title' => new TranslatableMarkup('UID'),
+      'help' => new TranslatableMarkup('The test data UID'),
       'relationship' => [
         'id' => 'standard',
         'base' => 'users_field_data',
diff --git a/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php b/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
index d653413ee..32dcfc665 100644
--- a/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Plugin/ViewsBlockTest.php
@@ -40,7 +40,7 @@ protected function setUp($import_test_views = TRUE): void {
   /**
    * Tests that ViewsBlock::getMachineNameSuggestion() produces the right value.
    *
-   * @see \Drupal\views\Plugin\Block::getmachineNameSuggestion()
+   * @see \Drupal\views\Plugin\Block::getMachineNameSuggestion()
    */
   public function testMachineNameSuggestion() {
     $plugin_definition = [
diff --git a/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php b/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
index d5d1dd600..ee8865d99 100644
--- a/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
+++ b/web/core/modules/views/tests/src/Kernel/PluginInstanceTest.php
@@ -53,6 +53,9 @@ class PluginInstanceTest extends ViewsKernelTestBase {
    */
   protected $definitions;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php b/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
index 171688321..20a55769f 100644
--- a/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
+++ b/web/core/modules/views/tests/src/Kernel/QueryGroupByTest.php
@@ -230,7 +230,7 @@ public function testGroupByBaseField() {
     $view->displayHandlers->get('default')->options['fields']['name']['group_type'] = 'min';
     unset($view->displayHandlers->get('default')->options['fields']['id']['group_type']);
     $this->executeView($view);
-    $this->assertStringContainsString('GROUP BY entity_test.id', (string) $view->build_info['query'], 'GROUP BY field includes the base table name when grouping on the base field.');
+    $this->assertMatchesRegularExpression('/GROUP BY .*[^\w\s]entity_test[^\w\s]\.[^\w\s]id[^\w\s]/', (string) $view->build_info['query'], 'GROUP BY field includes the base table name when grouping on the base field.');
   }
 
   /**
diff --git a/web/core/modules/views/tests/src/Kernel/ViewElementTest.php b/web/core/modules/views/tests/src/Kernel/ViewElementTest.php
index 186794bd1..a62ce8597 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewElementTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewElementTest.php
@@ -70,8 +70,7 @@ public function testViewElement() {
   }
 
   /**
-   * Tests the rendered output and form output of a view element, using the
-   * embed display plugin.
+   * Tests the rendered output and form output of the "embed" display plugin.
    */
   public function testViewElementEmbed() {
     /** @var \Drupal\Core\Render\RendererInterface $renderer */
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php b/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
index bbca39f28..95942b2f6 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsHooksTest.php
@@ -52,6 +52,9 @@ class ViewsHooksTest extends ViewsKernelTestBase {
    */
   protected $moduleHandler;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php b/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
index b8edc39f8..350c0acfe 100644
--- a/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
+++ b/web/core/modules/views/tests/src/Kernel/ViewsTemplateTest.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\Tests\views\Kernel;
 
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\views\Views;
 
 /**
@@ -16,7 +17,18 @@ class ViewsTemplateTest extends ViewsKernelTestBase {
   /**
    * {@inheritdoc}
    */
-  public static $testViews = ['test_view_display_template'];
+  public static $testViews = ['test_page_display', 'test_view_display_template'];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function register(ContainerBuilder $container) {
+    parent::register($container);
+    // Enable Twig debugging.
+    $parameters = $container->getParameter('twig.config');
+    $parameters['debug'] = TRUE;
+    $container->setParameter('twig.config', $parameters);
+  }
 
   /**
    * Tests render functionality.
@@ -30,4 +42,28 @@ public function testTemplate() {
     $this->assertStringContainsString('This module defines its own display template.', (string) $renderer->renderRoot($output));
   }
 
+  /**
+   * @covers views_theme_suggestions_container_alter().
+   * @throws \Exception
+   */
+  public function testThemeSuggestionsContainerAlter() {
+    $build = [
+      '#type' => 'view',
+      '#name' => 'test_page_display',
+      '#display_id' => 'default',
+      '#arguments' => [],
+    ];
+
+    $output = $this->render($build);
+    $extension = '.html.twig';
+    $expected = '<!-- FILE NAME SUGGESTIONS:' . PHP_EOL
+      . '   * container--more-link--test-page-display--default' . $extension . PHP_EOL
+      . '   * container--more-link--default' . $extension . PHP_EOL
+      . '   * container--more-link--test-page-display' . $extension . PHP_EOL
+      . '   * container--more-link' . $extension . PHP_EOL
+      . '   x container' . $extension . PHP_EOL
+      . '-->' . PHP_EOL;
+    $this->assertStringContainsString($expected, $output, 'Views more link container suggestions found in Twig debug output');
+  }
+
 }
diff --git a/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php b/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
index 5b2a38525..81c596e06 100644
--- a/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
+++ b/web/core/modules/views/tests/src/Kernel/Wizard/WizardPluginBaseKernelTest.php
@@ -29,6 +29,9 @@ class WizardPluginBaseKernelTest extends ViewsKernelTestBase {
    */
   protected $wizard;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php b/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
index 429e71e3e..d14f6ac53 100644
--- a/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
+++ b/web/core/modules/views/tests/src/Unit/Controller/ViewAjaxControllerTest.php
@@ -74,7 +74,7 @@ protected function setUp(): void {
       ->getMock();
     $this->renderer = $this->createMock('\Drupal\Core\Render\RendererInterface');
     $this->renderer->expects($this->any())
-      ->method('render')
+      ->method('renderRoot')
       ->willReturnCallback(function (array &$elements) {
         $elements['#attached'] = [];
 
@@ -93,6 +93,10 @@ protected function setUp(): void {
     $this->viewAjaxController = new ViewAjaxController($this->viewStorage, $this->executableFactory, $this->renderer, $this->currentPath, $this->redirectDestination);
 
     $element_info_manager = $this->createMock('\Drupal\Core\Render\ElementInfoManagerInterface');
+    $element_info_manager->expects($this->any())
+      ->method('getInfo')
+      ->with('status_messages')
+      ->willReturn([]);
     $request_stack = new RequestStack();
     $request_stack->push(new Request());
     $this->renderer = new Renderer(
@@ -134,7 +138,7 @@ public function testMissingView() {
     $this->viewStorage->expects($this->once())
       ->method('load')
       ->with('test_view')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->expectException(NotFoundHttpException::class);
     $this->viewAjaxController->ajaxView($request);
@@ -155,19 +159,19 @@ public function testAccessDeniedView() {
     $this->viewStorage->expects($this->once())
       ->method('load')
       ->with('test_view')
-      ->will($this->returnValue($view));
+      ->willReturn($view);
 
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
       ->getMock();
     $executable->expects($this->once())
       ->method('access')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->executableFactory->expects($this->once())
       ->method('get')
       ->with($view)
-      ->will($this->returnValue($executable));
+      ->willReturn($executable);
 
     $this->expectException(AccessDeniedHttpException::class);
     $this->viewAjaxController->ajaxView($request);
@@ -336,7 +340,7 @@ public function testAjaxViewWithPager() {
     $display_collection->expects($this->any())
       ->method('get')
       ->with('page_1')
-      ->will($this->returnValue($display_handler));
+      ->willReturn($display_handler);
     $executable->displayHandlers = $display_collection;
 
     $response = $this->viewAjaxController->ajaxView($request);
@@ -367,25 +371,25 @@ protected function setupValidMocks($use_ajax = self::USE_AJAX) {
     $this->viewStorage->expects($this->once())
       ->method('load')
       ->with('test_view')
-      ->will($this->returnValue($view));
+      ->willReturn($view);
 
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
       ->getMock();
     $executable->expects($this->once())
       ->method('access')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $executable->expects($this->any())
       ->method('setDisplay')
       ->willReturn(TRUE);
     $executable->expects($this->atMost(1))
       ->method('preview')
-      ->will($this->returnValue(['#markup' => 'View result']));
+      ->willReturn(['#markup' => 'View result']);
 
     $this->executableFactory->expects($this->once())
       ->method('get')
       ->with($view)
-      ->will($this->returnValue($executable));
+      ->willReturn($executable);
 
     $display_handler = $this->getMockBuilder('Drupal\views\Plugin\views\display\DisplayPluginBase')
       ->disableOriginalConstructor()
@@ -403,7 +407,7 @@ protected function setupValidMocks($use_ajax = self::USE_AJAX) {
     $display_collection->expects($this->any())
       ->method('get')
       ->with('page_1')
-      ->will($this->returnValue($display_handler));
+      ->willReturn($display_handler);
 
     $executable->display_handler = $display_handler;
     $executable->displayHandlers = $display_collection;
diff --git a/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index 8a4661824..20a7b36db 100644
--- a/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/web/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -30,7 +30,7 @@ class RouteSubscriberTest extends UnitTestCase {
   /**
    * The mocked view storage.
    *
-   * @var \Drupal\views\ViewStorage|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Tests\views\Kernel\ViewStorageTest|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $viewStorage;
 
@@ -48,6 +48,9 @@ class RouteSubscriberTest extends UnitTestCase {
    */
   protected $state;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->viewStorage = $this->getMockBuilder('Drupal\Core\Config\Entity\ConfigEntityStorage')
@@ -56,7 +59,7 @@ protected function setUp(): void {
     $this->entityTypeManager->expects($this->any())
       ->method('getStorage')
       ->with('view')
-      ->will($this->returnValue($this->viewStorage));
+      ->willReturn($this->viewStorage);
     $this->state = $this->createMock('\Drupal\Core\State\StateInterface');
     $this->routeSubscriber = new TestRouteSubscriber($this->entityTypeManager, $this->state);
   }
@@ -69,10 +72,10 @@ public function testRouteRebuildFinished() {
 
     $display_1->expects($this->once())
       ->method('collectRoutes')
-      ->will($this->returnValue(['test_id.page_1' => 'views.test_id.page_1']));
+      ->willReturn(['test_id.page_1' => 'views.test_id.page_1']);
     $display_2->expects($this->once())
       ->method('collectRoutes')
-      ->will($this->returnValue(['test_id.page_2' => 'views.test_id.page_2']));
+      ->willReturn(['test_id.page_2' => 'views.test_id.page_2']);
 
     $this->routeSubscriber->routes();
 
@@ -152,14 +155,14 @@ protected function setupMocks() {
       ->getMock();
     $this->viewStorage->expects($this->any())
       ->method('load')
-      ->will($this->returnValue($view));
+      ->willReturn($view);
 
     $view->expects($this->any())
       ->method('getExecutable')
-      ->will($this->returnValue($executable));
+      ->willReturn($executable);
     $view->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('test_id'));
+      ->willReturn('test_id');
     $executable->storage = $view;
 
     $executable->expects($this->any())
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php b/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
index 446dbc8be..796c3c87a 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/Block/ViewsBlockTest.php
@@ -63,7 +63,7 @@ protected function setUp(): void {
     $condition_plugin_manager = $this->createMock('Drupal\Core\Executable\ExecutableManagerInterface');
     $condition_plugin_manager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $container = new ContainerBuilder();
     $container->set('plugin.manager.condition', $condition_plugin_manager);
     \Drupal::setContainer($container);
@@ -75,7 +75,7 @@ protected function setUp(): void {
     $this->executable->expects($this->any())
       ->method('setDisplay')
       ->with('block_1')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->executable->expects($this->any())
       ->method('getShowAdminLinks')
       ->willReturn(FALSE);
@@ -99,7 +99,7 @@ protected function setUp(): void {
     $this->executableFactory->expects($this->any())
       ->method('get')
       ->with($this->view)
-      ->will($this->returnValue($this->executable));
+      ->willReturn($this->executable);
 
     $this->displayHandler = $this->getMockBuilder('Drupal\views\Plugin\views\display\Block')
       ->disableOriginalConstructor()
@@ -126,7 +126,7 @@ protected function setUp(): void {
     $this->storage->expects($this->any())
       ->method('load')
       ->with('test_view')
-      ->will($this->returnValue($this->view));
+      ->willReturn($this->view);
     $this->account = $this->createMock('Drupal\Core\Session\AccountInterface');
   }
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php b/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php
index d2b921c4a..d875c01a0 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/Derivative/ViewsLocalTaskTest.php
@@ -49,6 +49,9 @@ class ViewsLocalTaskTest extends UnitTestCase {
    */
   protected $localTaskDerivative;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->routeProvider = $this->createMock('Drupal\Core\Routing\RouteProviderInterface');
     $this->state = $this->createMock('Drupal\Core\State\StateInterface');
@@ -84,7 +87,7 @@ public function testGetDerivativeDefinitionsWithoutLocalTask() {
     $display_plugin->expects($this->once())
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(['type' => 'normal']));
+      ->willReturn(['type' => 'normal']);
     $executable->display_handler = $display_plugin;
 
     $storage = $this->getMockBuilder('Drupal\views\Entity\View')
@@ -92,7 +95,7 @@ public function testGetDerivativeDefinitionsWithoutLocalTask() {
       ->getMock();
     $storage->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('example_view'));
+      ->willReturn('example_view');
     $storage->expects($this->any())
       ->method('getExecutable')
       ->willReturn($executable);
@@ -121,7 +124,7 @@ public function testGetDerivativeDefinitionsWithLocalTask() {
       ->getMock();
     $storage->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('example_view'));
+      ->willReturn('example_view');
     $storage->expects($this->any())
       ->method('getExecutable')
       ->willReturn($executable);
@@ -139,7 +142,11 @@ public function testGetDerivativeDefinitionsWithLocalTask() {
     $display_plugin->expects($this->once())
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(['type' => 'tab', 'weight' => 12, 'title' => 'Example title']));
+      ->willReturn([
+        'type' => 'tab',
+        'weight' => 12,
+        'title' => 'Example title',
+      ]);
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
@@ -151,7 +158,7 @@ public function testGetDerivativeDefinitionsWithLocalTask() {
     $this->state->expects($this->once())
       ->method('get')
       ->with('views.view_route_names')
-      ->will($this->returnValue($view_route_names));
+      ->willReturn($view_route_names);
 
     $definitions = $this->localTaskDerivative->getDerivativeDefinitions($this->baseDefinition);
     $this->assertCount(1, $definitions);
@@ -174,7 +181,7 @@ public function testGetDerivativeDefinitionsWithOverrideRoute() {
       ->getMock();
     $storage->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('example_view'));
+      ->willReturn('example_view');
     $storage->expects($this->any())
       ->method('getExecutable')
       ->willReturn($executable);
@@ -192,7 +199,7 @@ public function testGetDerivativeDefinitionsWithOverrideRoute() {
     $display_plugin->expects($this->once())
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(['type' => 'tab', 'weight' => 12]));
+      ->willReturn(['type' => 'tab', 'weight' => 12]);
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
@@ -205,7 +212,7 @@ public function testGetDerivativeDefinitionsWithOverrideRoute() {
     $this->state->expects($this->once())
       ->method('get')
       ->with('views.view_route_names')
-      ->will($this->returnValue($view_route_names));
+      ->willReturn($view_route_names);
 
     $definitions = $this->localTaskDerivative->getDerivativeDefinitions($this->baseDefinition);
     $this->assertCount(0, $definitions);
@@ -223,7 +230,7 @@ public function testGetDerivativeDefinitionsWithDefaultLocalTask() {
       ->getMock();
     $storage->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('example_view'));
+      ->willReturn('example_view');
     $storage->expects($this->any())
       ->method('getExecutable')
       ->willReturn($executable);
@@ -241,7 +248,11 @@ public function testGetDerivativeDefinitionsWithDefaultLocalTask() {
     $display_plugin->expects($this->exactly(2))
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(['type' => 'default tab', 'weight' => 12, 'title' => 'Example title']));
+      ->willReturn([
+        'type' => 'default tab',
+        'weight' => 12,
+        'title' => 'Example title',
+      ]);
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
@@ -253,7 +264,7 @@ public function testGetDerivativeDefinitionsWithDefaultLocalTask() {
     $this->state->expects($this->exactly(2))
       ->method('get')
       ->with('views.view_route_names')
-      ->will($this->returnValue($view_route_names));
+      ->willReturn($view_route_names);
 
     $definitions = $this->localTaskDerivative->getDerivativeDefinitions($this->baseDefinition);
     $this->assertCount(1, $definitions);
@@ -292,7 +303,7 @@ public function testGetDerivativeDefinitionsWithExistingLocalTask() {
       ->getMock();
     $storage->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('example_view'));
+      ->willReturn('example_view');
     $storage->expects($this->any())
       ->method('getExecutable')
       ->willReturn($executable);
@@ -310,10 +321,14 @@ public function testGetDerivativeDefinitionsWithExistingLocalTask() {
     $display_plugin->expects($this->exactly(2))
       ->method('getOption')
       ->with('menu')
-      ->will($this->returnValue(['type' => 'tab', 'weight' => 12, 'title' => 'Example title']));
+      ->willReturn([
+        'type' => 'tab',
+        'weight' => 12,
+        'title' => 'Example title',
+      ]);
     $display_plugin->expects($this->once())
       ->method('getPath')
-      ->will($this->returnValue('path/example'));
+      ->willReturn('path/example');
     $executable->display_handler = $display_plugin;
 
     $result = [['example_view', 'page_1']];
@@ -325,7 +340,7 @@ public function testGetDerivativeDefinitionsWithExistingLocalTask() {
     $this->state->expects($this->exactly(2))
       ->method('get')
       ->with('views.view_route_names')
-      ->will($this->returnValue($view_route_names));
+      ->willReturn($view_route_names);
 
     // Mock the route provider.
     $route_collection = new RouteCollection();
@@ -333,7 +348,7 @@ public function testGetDerivativeDefinitionsWithExistingLocalTask() {
     $this->routeProvider->expects($this->any())
       ->method('getRoutesByPattern')
       ->with('/path')
-      ->will($this->returnValue($route_collection));
+      ->willReturn($route_collection);
 
     // Setup the existing local task of the test_route.
     $definitions['test_route_tab'] = $other_tab = [
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php b/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
index 19b9eb951..5f85d8947 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/area/ResultTest.php
@@ -32,6 +32,9 @@ class ResultTest extends UnitTestCase {
    */
   protected $resultHandler;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php b/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
index 1d0ff2207..4f095fb44 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/area/ViewTest.php
@@ -55,7 +55,7 @@ public function testCalculateDependencies() {
       ->willReturnMap([
         ['this', $view_this],
         ['other', $view_other],
-    ]);
+      ]);
     $this->viewHandler->view->storage = $view_this;
 
     $this->viewHandler->options['view_to_insert'] = 'other:default';
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
index 8d7aa0f02..3d86373b8 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/QueryParameterTest.php
@@ -69,6 +69,24 @@ public function providerGetArgument() {
       'blub',
     ];
 
+    $data[] = [
+      ['query_param' => 'test[tier1][tier2][tier3]'],
+      new Request(['test' => ['tier1' => ['tier2' => ['tier3' => 'foo']]]]),
+      'foo',
+    ];
+
+    $data[] = [
+      ['query_param' => 'test[tier1][tier2]'],
+      new Request(['test' => ['tier1' => ['tier2' => ['foo', 'bar']]]]),
+      'foo,bar',
+    ];
+
+    $data[] = [
+      ['query_param' => 'test[tier1][tier2]'],
+      new Request(['test' => 'foo']),
+      NULL,
+    ];
+
     return $data;
   }
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
index a153c09a9..66c5c9772 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/argument_default/RawTest.php
@@ -33,7 +33,7 @@ public function testGetArgument() {
     $current_path->setPath('/test/example', $request);
     $view->expects($this->any())
       ->method('getRequest')
-      ->will($this->returnValue($request));
+      ->willReturn($request);
     $alias_manager = $this->createMock(AliasManagerInterface::class);
     $alias_manager->expects($this->never())
       ->method('getAliasByPath');
@@ -76,7 +76,7 @@ public function testGetArgument() {
     $alias_manager->expects($this->any())
       ->method('getAliasByPath')
       ->with($this->equalTo('/test/example'))
-      ->will($this->returnValue('/other/example'));
+      ->willReturn('/other/example');
 
     $raw = new Raw([], 'raw', [], $alias_manager, $current_path);
     $options = [
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php b/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php
index 74eb8d5c4..b7ccfa001 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/argument_validator/EntityTest.php
@@ -60,7 +60,7 @@ protected function setUp(): void {
     $mock_entity = $this->getMockForAbstractClass('Drupal\Core\Entity\EntityBase', [], '', FALSE, TRUE, TRUE, ['bundle', 'access']);
     $mock_entity->expects($this->any())
       ->method('bundle')
-      ->will($this->returnValue('test_bundle'));
+      ->willReturn('test_bundle');
     $mock_entity->expects($this->any())
       ->method('access')
       ->willReturnMap([
@@ -72,7 +72,7 @@ protected function setUp(): void {
     $mock_entity_bundle_2 = $this->getMockForAbstractClass('Drupal\Core\Entity\EntityBase', [], '', FALSE, TRUE, TRUE, ['bundle', 'access']);
     $mock_entity_bundle_2->expects($this->any())
       ->method('bundle')
-      ->will($this->returnValue('test_bundle_2'));
+      ->willReturn('test_bundle_2');
     $mock_entity_bundle_2->expects($this->any())
       ->method('access')
       ->willReturnMap([
@@ -100,7 +100,7 @@ protected function setUp(): void {
     $this->entityTypeManager->expects($this->any())
       ->method('getStorage')
       ->with('entity_test')
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $this->executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php b/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
index 17369481a..e4a24f611 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/display/PathPluginBaseTest.php
@@ -546,7 +546,7 @@ protected function setupViewExecutableAccessPlugin() {
       ->getMock();
     $view_entity->expects($this->any())
       ->method('id')
-      ->will($this->returnValue('test_id'));
+      ->willReturn('test_id');
 
     $view = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
@@ -554,15 +554,12 @@ protected function setupViewExecutableAccessPlugin() {
 
     $view->storage = $view_entity;
 
-    // Skip views options caching.
-    $view->editing = TRUE;
-
     $access_plugin = $this->getMockBuilder('Drupal\views\Plugin\views\access\AccessPluginBase')
       ->disableOriginalConstructor()
       ->getMockForAbstractClass();
     $this->accessPluginManager->expects($this->any())
       ->method('createInstance')
-      ->will($this->returnValue($access_plugin));
+      ->willReturn($access_plugin);
 
     return [$view, $view_entity, $access_plugin];
   }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php b/web/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
index 8517215b5..fe1597039 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/field/FieldPluginBaseTest.php
@@ -86,7 +86,7 @@ class FieldPluginBaseTest extends UnitTestCase {
   protected $display;
 
   /**
-   * The mocked url generator.
+   * The mocked URL generator.
    *
    * @var \Drupal\Core\Routing\UrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
    */
@@ -100,7 +100,7 @@ class FieldPluginBaseTest extends UnitTestCase {
   protected $pathValidator;
 
   /**
-   * The unrouted url assembler service.
+   * The unrouted URL assembler service.
    *
    * @var \Drupal\Core\Utility\UnroutedUrlAssemblerInterface|\PHPUnit\Framework\MockObject\MockObject
    */
@@ -170,7 +170,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Sets up the unrouted url assembler and the link generator.
+   * Sets up the unrouted URL assembler and the link generator.
    */
   protected function setUpUrlIntegrationServices() {
     $this->pathProcessor = $this->createMock('Drupal\Core\PathProcessor\OutboundPathProcessorInterface');
@@ -235,7 +235,7 @@ public function testRenderAsLinkWithoutPath() {
    * @param string $path
    *   An internal or external path.
    * @param string $url
-   *   The final url used by the more link.
+   *   The final URL used by the more link.
    *
    * @dataProvider providerTestRenderTrimmedWithMoreLinkAndPath
    * @covers ::renderText
@@ -434,7 +434,7 @@ public function providerTestRenderAsLinkWithUrlAndOptions() {
     $url = Url::fromRoute('test_route');
     $data[] = [$url, [], clone $url, '/test-path', clone $url, '<a href="/test-path">value</a>'];
 
-    // Simple url with parameters.
+    // Simple URL with parameters.
     $url_parameters = Url::fromRoute('test_route', ['key' => 'value']);
     $data[] = [$url_parameters, [], clone $url_parameters, '/test-path/value', clone $url_parameters, '<a href="/test-path/value">value</a>'];
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php b/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
index f3549c462..c60e91447 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/field/FieldTest.php
@@ -649,6 +649,11 @@ public function providerTestPrepareItemsByDelta() {
     $data[] = [['group_rows' => TRUE, 'delta_limit' => 1, 'delta_first_last' => TRUE], [3]];
     $data[] = [['group_rows' => TRUE, 'delta_offset' => 1, 'delta_first_last' => TRUE], [1, 9]];
 
+    // Test with string values where we would expect integers to be provided.
+    $data[] = [['group_rows' => TRUE, 'delta_limit' => 'All'], [3, 1, 4, 1, 5, 9]];
+    $data[] = [['group_rows' => TRUE, 'delta_limit' => 'three'], [3, 1, 4, 1, 5, 9]];
+    $data[] = [['group_rows' => TRUE, 'delta_limit' => 'three', 'delta_offset' => 'two'], [3, 1, 4, 1, 5, 9]];
+
     return $data;
   }
 
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php b/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
index d1a3c1af6..e2c7c9208 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/pager/PagerPluginBaseTest.php
@@ -24,6 +24,9 @@ class PagerPluginBaseTest extends UnitTestCase {
    */
   protected $pager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->pager = $this->getMockBuilder('Drupal\views\Plugin\views\pager\PagerPluginBase')
       ->disableOriginalConstructor()
@@ -210,7 +213,7 @@ public function testExecuteCountQueryWithoutOffset() {
 
     $statement->expects($this->once())
       ->method('fetchField')
-      ->will($this->returnValue(3));
+      ->willReturn(3);
 
     $query = $this->getMockBuilder('\Drupal\Core\Database\Query\Select')
       ->disableOriginalConstructor()
@@ -218,7 +221,7 @@ public function testExecuteCountQueryWithoutOffset() {
 
     $query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue($statement));
+      ->willReturn($statement);
 
     $this->pager->setOffset(0);
     $this->assertEquals(3, $this->pager->executeCountQuery($query));
@@ -234,7 +237,7 @@ public function testExecuteCountQueryWithOffset() {
 
     $statement->expects($this->once())
       ->method('fetchField')
-      ->will($this->returnValue(3));
+      ->willReturn(3);
 
     $query = $this->getMockBuilder('\Drupal\Core\Database\Query\Select')
       ->disableOriginalConstructor()
@@ -242,7 +245,7 @@ public function testExecuteCountQueryWithOffset() {
 
     $query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue($statement));
+      ->willReturn($statement);
 
     $this->pager->setOffset(2);
     $this->assertEquals(1, $this->pager->executeCountQuery($query));
@@ -258,7 +261,7 @@ public function testExecuteCountQueryWithOffsetLargerThanResult() {
 
     $statement->expects($this->once())
       ->method('fetchField')
-      ->will($this->returnValue(2));
+      ->willReturn(2);
 
     $query = $this->getMockBuilder(Select::class)
       ->disableOriginalConstructor()
@@ -266,7 +269,7 @@ public function testExecuteCountQueryWithOffsetLargerThanResult() {
 
     $query->expects($this->once())
       ->method('execute')
-      ->will($this->returnValue($statement));
+      ->willReturn($statement);
 
     $this->pager->setOffset(3);
     $this->assertEquals(0, $this->pager->executeCountQuery($query));
@@ -275,6 +278,8 @@ public function testExecuteCountQueryWithOffsetLargerThanResult() {
 }
 
 /**
+ * Creates StatementInterface for testing.
+ *
  * As StatementInterface extends \Traversable, which though always needs
  * an additional interface. The Statement class itself can't be mocked because
  * of its __wakeup function.
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php b/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php
index 5cea3d915..bc1910182 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/views/display/BlockTest.php
@@ -44,7 +44,7 @@ protected function setUp(): void {
     $this->executable->expects($this->any())
       ->method('setDisplay')
       ->with('block_1')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->blockDisplay = $this->executable->display_handler = $this->getMockBuilder('Drupal\views\Plugin\views\display\Block')
       ->disableOriginalConstructor()
@@ -67,7 +67,7 @@ public function testBuildNoOverride() {
 
     $this->blockPlugin->expects($this->once())
       ->method('getConfiguration')
-      ->will($this->returnValue(['items_per_page' => 'none']));
+      ->willReturn(['items_per_page' => 'none']);
 
     $this->blockDisplay->preBlockBuild($this->blockPlugin);
   }
@@ -82,7 +82,7 @@ public function testBuildOverride() {
 
     $this->blockPlugin->expects($this->once())
       ->method('getConfiguration')
-      ->will($this->returnValue(['items_per_page' => 5]));
+      ->willReturn(['items_per_page' => 5]);
 
     $this->blockDisplay->preBlockBuild($this->blockPlugin);
   }
diff --git a/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php b/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
index b5daf4ab1..160a87eef 100644
--- a/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
+++ b/web/core/modules/views/tests/src/Unit/Plugin/views/field/EntityOperationsUnitTest.php
@@ -101,7 +101,7 @@ public function testRenderWithDestination() {
       ->getMock();
     $entity->expects($this->any())
       ->method('getEntityTypeId')
-      ->will($this->returnValue($entity_type_id));
+      ->willReturn($entity_type_id);
 
     $operations = [
       'foo' => [
@@ -112,12 +112,12 @@ public function testRenderWithDestination() {
     $list_builder->expects($this->once())
       ->method('getOperations')
       ->with($entity)
-      ->will($this->returnValue($operations));
+      ->willReturn($operations);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getListBuilder')
       ->with($entity_type_id)
-      ->will($this->returnValue($list_builder));
+      ->willReturn($list_builder);
 
     $this->plugin->options['destination'] = TRUE;
 
@@ -143,7 +143,7 @@ public function testRenderWithoutDestination() {
       ->getMock();
     $entity->expects($this->any())
       ->method('getEntityTypeId')
-      ->will($this->returnValue($entity_type_id));
+      ->willReturn($entity_type_id);
 
     $operations = [
       'foo' => [
@@ -154,12 +154,12 @@ public function testRenderWithoutDestination() {
     $list_builder->expects($this->once())
       ->method('getOperations')
       ->with($entity)
-      ->will($this->returnValue($operations));
+      ->willReturn($operations);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getListBuilder')
       ->with($entity_type_id)
-      ->will($this->returnValue($list_builder));
+      ->willReturn($list_builder);
 
     $this->plugin->options['destination'] = FALSE;
 
@@ -174,4 +174,18 @@ public function testRenderWithoutDestination() {
     $this->assertSame($expected_build, $build);
   }
 
+  /**
+   * @covers ::render
+   */
+  public function testRenderWithoutEntity() {
+    $entity = NULL;
+
+    $result = new ResultRow();
+    $result->_entity = $entity;
+
+    $expected_build = '';
+    $build = $this->plugin->render($result);
+    $this->assertSame($expected_build, $build);
+  }
+
 }
diff --git a/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php b/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
index 56bd12351..456954b35 100644
--- a/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
+++ b/web/core/modules/views/tests/src/Unit/Routing/ViewPageControllerTest.php
@@ -35,6 +35,9 @@ class ViewPageControllerTest extends UnitTestCase {
     '#view_display_show_admin_links' => NULL,
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->pageController = new ViewPageController();
   }
@@ -131,7 +134,7 @@ public function testHandleWithArgumentsOnOverriddenRoute() {
       '#cache' => [
         'keys' => ['view', 'test_page_view', 'display', 'page_1', 'args', 'test-argument'],
       ],
-      ] + $this->defaultRenderArray;
+    ] + $this->defaultRenderArray;
 
     $this->assertEquals($build, $result);
   }
@@ -170,7 +173,7 @@ public function testHandleWithArgumentsOnOverriddenRouteWithUpcasting() {
       '#cache' => [
         'keys' => ['view', 'test_page_view', 'display', 'page_1', 'args', 'example_id'],
       ],
-      ] + $this->defaultRenderArray;
+    ] + $this->defaultRenderArray;
 
     $this->assertEquals($build, $result);
   }
diff --git a/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php b/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
index 6dbfd3c94..e481bb3fa 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsDataHelperTest.php
@@ -44,7 +44,7 @@ public function testFetchFields() {
       ->getMock();
     $views_data->expects($this->once())
       ->method('getAll')
-      ->will($this->returnValue($this->viewsData()));
+      ->willReturn($this->viewsData());
 
     $data_helper = new ViewsDataHelper($views_data);
 
diff --git a/web/core/modules/views/tests/src/Unit/ViewsDataTest.php b/web/core/modules/views/tests/src/Unit/ViewsDataTest.php
index fb97fb3d4..0177af2b7 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsDataTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsDataTest.php
@@ -70,7 +70,7 @@ protected function setUp(): void {
     $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(['id' => 'en'])));
+      ->willReturn(new Language(['id' => 'en']));
 
     $this->viewsData = new ViewsData($this->cacheBackend, $this->configFactory, $this->moduleHandler, $this->languageManager);
   }
@@ -190,7 +190,7 @@ public function testGetOnFirstCall() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with("views_data:en")
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $expected_views_data = $this->viewsDataWithProvider();
     $views_data = $this->viewsData->getAll();
@@ -279,7 +279,7 @@ public function testFullGetCache() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with("views_data:en")
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $views_data = $this->viewsData->getAll();
     $this->assertSame($expected_views_data, $views_data);
@@ -402,7 +402,7 @@ public function testCacheCallsWithSameTableMultipleTimesAndWarmCache() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with('views_data:views_test_data:en')
-      ->will($this->returnValue((object) ['data' => $expected_views_data['views_test_data']]));
+      ->willReturn((object) ['data' => $expected_views_data['views_test_data']]);
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
@@ -510,7 +510,7 @@ public function testCacheCallsWithWarmCacheForInvalidTable() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with("views_data:$non_existing_table:en")
-      ->will($this->returnValue((object) ['data' => []]));
+      ->willReturn((object) ['data' => []]);
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
@@ -563,7 +563,7 @@ public function testCacheCallsWithWarmCacheAndGetAllTables() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with("views_data:en")
-      ->will($this->returnValue((object) ['data' => $expected_views_data]));
+      ->willReturn((object) ['data' => $expected_views_data]);
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
diff --git a/web/core/modules/views/tests/src/Unit/ViewsTest.php b/web/core/modules/views/tests/src/Unit/ViewsTest.php
index 813c88d98..5eb36e4c0 100644
--- a/web/core/modules/views/tests/src/Unit/ViewsTest.php
+++ b/web/core/modules/views/tests/src/Unit/ViewsTest.php
@@ -58,13 +58,13 @@ public function testGetView() {
     $view_storage->expects($this->once())
       ->method('load')
       ->with('test_view')
-      ->will($this->returnValue($view));
+      ->willReturn($view);
 
     $entity_type_manager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface');
     $entity_type_manager->expects($this->once())
       ->method('getStorage')
       ->with('view')
-      ->will($this->returnValue($view_storage));
+      ->willReturn($view_storage);
     $this->container->set('entity_type.manager', $entity_type_manager);
 
     $executable = Views::getView('test_view');
@@ -168,13 +168,17 @@ public function testGetApplicableViews($applicable_type, $expected) {
     $view_storage->expects($this->once())
       ->method('loadMultiple')
       ->with(['test_view_1', 'test_view_2', 'test_view_3'])
-      ->will($this->returnValue(['test_view_1' => $view_1, 'test_view_2' => $view_2, 'test_view_3' => $view_3]));
+      ->willReturn([
+        'test_view_1' => $view_1,
+        'test_view_2' => $view_2,
+        'test_view_3' => $view_3,
+      ]);
 
     $entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
     $entity_type_manager->expects($this->exactly(2))
       ->method('getStorage')
       ->with('view')
-      ->will($this->returnValue($view_storage));
+      ->willReturn($view_storage);
     $this->container->set('entity_type.manager', $entity_type_manager);
 
     $definitions = [
diff --git a/web/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml b/web/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml
index 76e057276..a88029eac 100644
--- a/web/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml
+++ b/web/core/modules/views/tests/themes/views_test_checkboxes_theme/views_test_checkboxes_theme.info.yml
@@ -1,5 +1,5 @@
 name: Views test checkboxes theme
 type: theme
-base theme: stable
+base theme: stable9
 description: Theme for testing Views rendering of checkboxes.
 version: VERSION
diff --git a/web/core/modules/views/tests/themes/views_test_theme/views_test_theme.info.yml b/web/core/modules/views/tests/themes/views_test_theme/views_test_theme.info.yml
index 4c1a29d7e..899b96d54 100644
--- a/web/core/modules/views/tests/themes/views_test_theme/views_test_theme.info.yml
+++ b/web/core/modules/views/tests/themes/views_test_theme/views_test_theme.info.yml
@@ -1,5 +1,5 @@
 name: Views test theme
 type: theme
-base theme: stable
+base theme: stable9
 description: Theme for testing Views functionality.
 version: VERSION
diff --git a/web/core/modules/views/views.api.php b/web/core/modules/views/views.api.php
index 3c4b2ad14..49eb06513 100644
--- a/web/core/modules/views/views.api.php
+++ b/web/core/modules/views/views.api.php
@@ -613,7 +613,7 @@ function hook_field_views_data_alter(array &$data, \Drupal\field\FieldStorageCon
 function hook_field_views_data_views_data_alter(array &$data, \Drupal\field\FieldStorageConfigInterface $field) {
   $field_name = $field->getName();
   $data_key = 'field_data_' . $field_name;
-  $entity_type_id = $field->entity_type;
+  $entity_type_id = $field->getTargetEntityTypeId();
   $entity_type = \Drupal::entityTypeManager()->getDefinition($entity_type_id);
   $pseudo_field_name = 'reverse_' . $field_name . '_' . $entity_type_id;
   [$label] = views_entity_field_label($entity_type_id, $field_name);
@@ -661,7 +661,7 @@ function hook_views_query_substitutions(ViewExecutable $view) {
   // Example from views_views_query_substitutions().
   return [
     '***CURRENT_VERSION***' => \Drupal::VERSION,
-    '***CURRENT_TIME***' => REQUEST_TIME,
+    '***CURRENT_TIME***' => \Drupal::time()->getRequestTime(),
     '***LANGUAGE_language_content***' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId(),
     PluginBase::VIEWS_QUERY_LANGUAGE_SITE_DEFAULT => \Drupal::languageManager()->getDefaultLanguage()->getId(),
   ];
diff --git a/web/core/modules/views/views.module b/web/core/modules/views/views.module
index 9e03548ee..5f511d33b 100644
--- a/web/core/modules/views/views.module
+++ b/web/core/modules/views/views.module
@@ -225,8 +225,7 @@ function views_theme($existing, $type, $theme, $path) {
 }
 
 /**
- * A theme preprocess function to automatically allow view-based node
- * templates if called from a view.
+ * Allows view-based node templates if called from a view.
  *
  * The 'modules/node.views.inc' file is a better place for this, but
  * we haven't got a chance to load that file before Drupal builds the
@@ -262,8 +261,7 @@ function views_theme_suggestions_node_alter(array &$suggestions, array $variable
 }
 
 /**
- * A theme preprocess function to automatically allow view-based node
- * templates if called from a view.
+ * Allows view-based comment templates if called from a view.
  */
 function views_preprocess_comment(&$variables) {
   // The view data is added to the comment in
@@ -291,7 +289,11 @@ function views_theme_suggestions_comment_alter(array &$suggestions, array $varia
  */
 function views_theme_suggestions_container_alter(array &$suggestions, array $variables) {
   if (!empty($variables['element']['#type']) && $variables['element']['#type'] == 'more_link' && !empty($variables['element']['#view']) && $variables['element']['#view'] instanceof ViewExecutable) {
-    $suggestions = array_merge($suggestions, $variables['element']['#view']->buildThemeFunctions('container__more_link'));
+    $suggestions = array_merge(
+      $suggestions,
+      // Theme suggestions use the reverse order compared to #theme hooks.
+      array_reverse($variables['element']['#view']->buildThemeFunctions('container__more_link'))
+    );
   }
 }
 
diff --git a/web/core/modules/views/views.services.yml b/web/core/modules/views/views.services.yml
index 1521a5671..591cd6c96 100644
--- a/web/core/modules/views/views.services.yml
+++ b/web/core/modules/views/views.services.yml
@@ -84,7 +84,7 @@ services:
     class: Drupal\views\Plugin\views\query\MysqlDateSql
     arguments: ['@database']
     tags:
-       - { name: backend_overridable }
+      - { name: backend_overridable }
   pgsql.views.date_sql:
     class: Drupal\views\Plugin\views\query\PostgresqlDateSql
     arguments: ['@database']
diff --git a/web/core/modules/views/views.theme.inc b/web/core/modules/views/views.theme.inc
index 499d860ef..d2cb65e40 100644
--- a/web/core/modules/views/views.theme.inc
+++ b/web/core/modules/views/views.theme.inc
@@ -956,7 +956,7 @@ function template_preprocess_views_view_opml(&$variables) {
   }
   $variables['title'] = $title;
   $variables['items'] = $items;
-  $variables['updated'] = gmdate(DATE_RFC2822, REQUEST_TIME);
+  $variables['updated'] = gmdate(DATE_RFC2822, \Drupal::time()->getRequestTime());
 
   // During live preview we don't want to output the header since the contents
   // of the feed are being displayed inside a normal HTML page.
diff --git a/web/core/modules/views/views.views.inc b/web/core/modules/views/views.views.inc
index de7977332..2f88006d1 100644
--- a/web/core/modules/views/views.views.inc
+++ b/web/core/modules/views/views.views.inc
@@ -22,14 +22,14 @@ function views_views_data() {
   $data['views']['table']['group'] = t('Global');
   $data['views']['table']['join'] = [
   // #global is a special flag which allows a table to appear all the time.
-  '#global' => [],
+    '#global' => [],
   ];
 
   $data['views']['random'] = [
-  'title' => t('Random'),
-  'help' => t('Randomize the display order.'),
-  'sort' => [
-    'id' => 'random',
+    'title' => t('Random'),
+    'help' => t('Randomize the display order.'),
+    'sort' => [
+      'id' => 'random',
     ],
   ];
 
@@ -116,7 +116,7 @@ function views_views_data() {
   ];
 
   $data['views']['combine'] = [
-   'title' => t('Combine fields filter'),
+    'title' => t('Combine fields filter'),
     'help' => t('Combine multiple fields together and search by them.'),
     'filter' => [
       'id' => 'combine',
diff --git a/web/core/modules/views/views.views_execution.inc b/web/core/modules/views/views.views_execution.inc
index 60b1adc04..3647f52ab 100644
--- a/web/core/modules/views/views.views_execution.inc
+++ b/web/core/modules/views/views.views_execution.inc
@@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\PluginBase;
 function views_views_query_substitutions(ViewExecutable $view) {
   $substitutions = [
     '***CURRENT_VERSION***' => \Drupal::VERSION,
-    '***CURRENT_TIME***' => REQUEST_TIME,
+    '***CURRENT_TIME***' => \Drupal::time()->getRequestTime(),
   ] + PluginBase::queryLanguageSubstitutions();
 
   return $substitutions;
diff --git a/web/core/modules/views_ui/admin.inc b/web/core/modules/views_ui/admin.inc
index 52c540a58..92f2d7d91 100644
--- a/web/core/modules/views_ui/admin.inc
+++ b/web/core/modules/views_ui/admin.inc
@@ -182,7 +182,7 @@ function views_ui_add_ajax_wrapper($element, FormStateInterface $form_state) {
 /**
  * Updates a part of the add view form via AJAX.
  *
- * @return
+ * @return array
  *   The part of the form that has changed.
  */
 function views_ui_ajax_update_form($form, FormStateInterface $form_state) {
@@ -200,9 +200,7 @@ function views_ui_nojs_submit($form, FormStateInterface $form_state) {
 }
 
 /**
- * Add a <select> dropdown for a given section, allowing the user to
- * change whether this info is stored on the default display or on
- * the current display.
+ * Adds an element to select either the default display or the current display.
  */
 function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_state, $section) {
   $view = $form_state->get('view');
@@ -222,8 +220,8 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta
 
   // Add the "2 of 3" progress indicator.
   if ($form_progress = $view->getFormProgress()) {
-    $form['progress']['#markup'] = '<div id="views-progress-indicator" class="views-progress-indicator">' . t('@current of @total', ['@current' => $form_progress['current'], '@total' => $form_progress['total']]) . '</div>';
-    $form['progress']['#weight'] = -1001;
+    $arguments = $form['#title']->getArguments() + ['@current' => $form_progress['current'], '@total' => $form_progress['total']];
+    $form['#title'] = t('Configure @type @current of @total: @item', $arguments);
   }
 
   // The dropdown should not be added when :
@@ -269,8 +267,7 @@ function views_ui_standard_display_dropdown(&$form, FormStateInterface $form_sta
 }
 
 /**
- * Create the menu path for one of our standard AJAX forms based upon known
- * information about the form.
+ * Creates the menu path for a standard AJAX form given the form state.
  *
  * @return \Drupal\Core\Url
  *   The URL object pointing to the form URL.
diff --git a/web/core/modules/views_ui/css/views_ui.admin.theme.css b/web/core/modules/views_ui/css/views_ui.admin.theme.css
index 565132721..63112b3cd 100644
--- a/web/core/modules/views_ui/css/views_ui.admin.theme.css
+++ b/web/core/modules/views_ui/css/views_ui.admin.theme.css
@@ -632,23 +632,6 @@ td.group-title {
 .views-ui-dialog .views-override > * {
   margin: 0;
 }
-.views-ui-dialog .views-progress-indicator {
-  position: absolute;
-  top: 32px;
-  right: 10px; /* LTR */
-  color: #fff;
-  font-size: 11px;
-}
-[dir="rtl"] .views-ui-dialog .views-progress-indicator {
-  right: auto;
-  left: 10px;
-}
-.views-ui-dialog .views-progress-indicator:before {
-  content: "\003C\00A0";
-}
-.views-ui-dialog .views-progress-indicator:after {
-  content: "\00A0\003E";
-}
 .views-ui-dialog details .item-list {
   padding-left: 2em; /* LTR */
 }
diff --git a/web/core/modules/views_ui/js/ajax.js b/web/core/modules/views_ui/js/ajax.js
index 2d83544b4..fdc461f86 100644
--- a/web/core/modules/views_ui/js/ajax.js
+++ b/web/core/modules/views_ui/js/ajax.js
@@ -4,13 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.AjaxCommands.prototype.viewsHighlight = function (ajax, response, status) {
     $('.hilited').removeClass('hilited');
     $(response.selector).addClass('hilited');
   };
-
   Drupal.AjaxCommands.prototype.viewsSetForm = function (ajax, response, status) {
     var $form = $('.js-views-ui-dialog form');
     var $submitButtons = $(once('views-ajax-submit', $form.find('input[type=submit].js-form-submit, button.js-form-submit')));
@@ -29,21 +27,17 @@
       ajaxForm.$form = $form;
     });
   };
-
   Drupal.AjaxCommands.prototype.viewsShowButtons = function (ajax, response, status) {
     $('div.views-edit-view div.form-actions').removeClass('js-hide');
-
     if (response.changed) {
       $('div.views-edit-view div.view-changed.messages').removeClass('js-hide');
     }
   };
-
   Drupal.AjaxCommands.prototype.viewsTriggerPreview = function (ajax, response, status) {
     if ($('input#edit-displays-live-preview').is(':checked')) {
       $('#preview-submit').trigger('click');
     }
   };
-
   Drupal.AjaxCommands.prototype.viewsReplaceTitle = function (ajax, response, status) {
     var doc = document;
     var oldTitle = doc.title;
@@ -54,11 +48,9 @@
       item.textContent = response.title;
     });
   };
-
   Drupal.theme.tableDragChangedWarning = function () {
     return [];
   };
-
   Drupal.behaviors.livePreview = {
     attach: function attach(context) {
       $(once('views-ajax', 'input#edit-displays-live-preview', context)).on('click', function () {
@@ -74,7 +66,6 @@
         var href = $(this).attr('href');
         var displayId = href.substr(11);
         var viewsPreviewId = document.querySelector('#views-live-preview #preview-display-id');
-
         if (viewsPreviewId) {
           viewsPreviewId.value = displayId;
         }
@@ -95,27 +86,21 @@
         var elementSettings = baseElementSettings;
         elementSettings.base = $link.attr('id');
         elementSettings.element = link;
-
         if ($link.attr('href')) {
           elementSettings.url = $link.attr('href');
         }
-
         Drupal.ajax(elementSettings);
       });
       once('views-ajax', 'div#views-live-preview a').forEach(function (link) {
         var $link = $(link);
-
         if (!$link.attr('href')) {
           return true;
         }
-
         var elementSettings = baseElementSettings;
         elementSettings.url = $link.attr('href');
-
         if (Drupal.Views.getPath(elementSettings.url).substring(0, 21) !== 'admin/structure/views') {
           return true;
         }
-
         elementSettings.wrapper = 'views-preview-wrapper';
         elementSettings.method = 'replaceWith';
         elementSettings.base = link.id;
@@ -130,11 +115,9 @@
         });
         var elementSettings = baseElementSettings;
         elementSettings.url = $(submit.form).attr('action');
-
         if (Drupal.Views.getPath(elementSettings.url).substring(0, 21) !== 'admin/structure/views') {
           return true;
         }
-
         elementSettings.wrapper = 'views-preview-wrapper';
         elementSettings.method = 'replaceWith';
         elementSettings.event = 'click';
diff --git a/web/core/modules/views_ui/js/dialog.views.js b/web/core/modules/views_ui/js/dialog.views.js
index 625f4798a..f25c2bce4 100644
--- a/web/core/modules/views_ui/js/dialog.views.js
+++ b/web/core/modules/views_ui/js/dialog.views.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   function handleDialogResize(e) {
     var $modal = $(e.currentTarget);
@@ -12,7 +11,6 @@
     var $scroll = $modal.find('[data-drupal-views-scroll]');
     var offset = 0;
     var modalHeight;
-
     if ($scroll.length) {
       $modal.closest('.views-ui-dialog').addClass('views-ui-dialog-scroll');
       $scroll.css({
@@ -29,7 +27,6 @@
       $scroll.css('overflow', 'auto');
     }
   }
-
   Drupal.behaviors.viewsModalContent = {
     attach: function attach(context) {
       $(once('viewsDialog', 'body')).on('dialogContentResize.viewsDialog', '.ui-dialog-content', handleDialogResize);
diff --git a/web/core/modules/views_ui/js/views-admin.js b/web/core/modules/views_ui/js/views-admin.js
index 2d1a3656f..26a212cc2 100644
--- a/web/core/modules/views_ui/js/views-admin.js
+++ b/web/core/modules/views_ui/js/views-admin.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.viewsUi = {};
   Drupal.behaviors.viewsUiEditView = {
@@ -21,7 +20,6 @@
       var replace = '-';
       var suffix;
       var $fields = $context.find('[id^="edit-page-title"], [id^="edit-block-title"], [id^="edit-page-link-properties-title"]');
-
       if ($fields.length) {
         if (!this.fieldsFiller) {
           this.fieldsFiller = new Drupal.viewsUi.FormFieldFiller($fields);
@@ -29,9 +27,7 @@
           this.fieldsFiller.rebind($fields);
         }
       }
-
       var $pathField = $context.find('[id^="edit-page-path"]');
-
       if ($pathField.length) {
         if (!this.pathFiller) {
           this.pathFiller = new Drupal.viewsUi.FormFieldFiller($pathField, exclude, replace);
@@ -39,9 +35,7 @@
           this.pathFiller.rebind($pathField);
         }
       }
-
       var $feedField = $context.find('[id^="edit-page-feed-properties-path"]');
-
       if ($feedField.length) {
         if (!this.feedFiller) {
           suffix = '.xml';
@@ -52,7 +46,6 @@
       }
     }
   };
-
   Drupal.viewsUi.FormFieldFiller = function ($target, exclude, replace, suffix) {
     this.source = $('#edit-label');
     this.target = $target;
@@ -60,18 +53,14 @@
     this.replace = replace || '';
     this.suffix = suffix || '';
     var self = this;
-
     this.populate = function () {
       return self._populate.call(self);
     };
-
     this.unbind = function () {
       return self._unbind.call(self);
     };
-
     this.bind();
   };
-
   $.extend(Drupal.viewsUi.FormFieldFiller.prototype, {
     bind: function bind() {
       this.unbind();
@@ -80,11 +69,9 @@
     },
     getTransliterated: function getTransliterated() {
       var from = this.source.length ? this.source[0].value : '';
-
       if (this.exclude) {
         from = from.toLowerCase().replace(this.exclude, this.replace);
       }
-
       return from;
     },
     _populate: function _populate() {
@@ -108,17 +95,14 @@
     attach: function attach(context) {
       var $context = $(context);
       var $form = $context;
-
       if (!$context.is('form[id^="views-ui-add-handler-form"]')) {
         $form = $context.find('form[id^="views-ui-add-handler-form"]');
       }
-
       if (once('views-ui-add-handler-form', $form).length) {
         new Drupal.viewsUi.AddItemForm($form);
       }
     }
   };
-
   Drupal.viewsUi.AddItemForm = function ($form) {
     this.$form = $form;
     this.$form.find('.views-filterable-options :checkbox').on('click', $.proxy(this.handleCheck, this));
@@ -126,17 +110,14 @@
     this.$selected_div.hide();
     this.checkedItems = [];
   };
-
   Drupal.viewsUi.AddItemForm.prototype.handleCheck = function (event) {
     var $target = $(event.target);
     var label = $target.closest('td').next().html().trim();
-
     if ($target.is(':checked')) {
       this.$selected_div.show().css('display', 'block');
       this.checkedItems.push(label);
     } else {
       var position = $.inArray(label, this.checkedItems);
-
       for (var i = 0; i < this.checkedItems.length; i++) {
         if (i === position) {
           this.checkedItems.splice(i, 1);
@@ -144,27 +125,21 @@
           break;
         }
       }
-
       if (this.checkedItems.length === 0) {
         this.$selected_div.hide();
       }
     }
-
     this.refreshCheckedItems();
   };
-
   Drupal.viewsUi.AddItemForm.prototype.refreshCheckedItems = function () {
     this.$selected_div.find('.views-selected-options').html(this.checkedItems.join(', ')).trigger('dialogContentResize');
   };
-
   Drupal.behaviors.viewsUiRenderAddViewButton = {
     attach: function attach(context) {
       var menu = once('views-ui-render-add-view-button', '#views-display-menu-tabs', context);
-
       if (!menu.length) {
         return;
       }
-
       var $menu = $(menu);
       var $addDisplayDropdown = $("<li class=\"add\"><a href=\"#\"><span class=\"icon add\"></span>".concat(Drupal.t('Add'), "</a><ul class=\"action-list\" style=\"display:none;\"></ul></li>"));
       var $displayButtons = $menu.nextAll('input.add-display').detach();
@@ -182,34 +157,28 @@
       $('li.add', $menu).on('mouseleave', function (event) {
         var $this = $(this);
         var $trigger = $this.children('a[href="#"]');
-
         if ($this.children('.action-list').is(':visible')) {
           Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu($trigger);
         }
       });
     }
   };
-
   Drupal.behaviors.viewsUiRenderAddViewButton.toggleMenu = function ($trigger) {
     $trigger.parent().toggleClass('open');
     $trigger.next().slideToggle('fast');
   };
-
   Drupal.behaviors.viewsUiSearchOptions = {
     attach: function attach(context) {
       var $context = $(context);
       var $form = $context;
-
       if (!$context.is('form[id^="views-ui-add-handler-form"]')) {
         $form = $context.find('form[id^="views-ui-add-handler-form"]');
       }
-
       if (once('views-ui-filter-options', $form).length) {
         new Drupal.viewsUi.OptionsSearch($form);
       }
     }
   };
-
   Drupal.viewsUi.OptionsSearch = function ($form) {
     this.$form = $form;
     this.$form.on('click', 'td.title', function (event) {
@@ -228,7 +197,6 @@
       }
     });
   };
-
   $.extend(Drupal.viewsUi.OptionsSearch.prototype, {
     getOptions: function getOptions($allOptions) {
       var $title;
@@ -236,7 +204,6 @@
       var $option;
       var options = [];
       var length = $allOptions.length;
-
       for (var i = 0; i < length; i++) {
         $option = $($allOptions[i]);
         $title = $option.find('.title');
@@ -246,7 +213,6 @@
           $div: $option
         };
       }
-
       return options;
     },
     handleFilter: function handleFilter(event) {
@@ -257,17 +223,13 @@
         function hasWord(word) {
           return option.searchText.indexOf(word) !== -1;
         }
-
         var found = true;
-
         if (search) {
           found = words.every(hasWord);
         }
-
         if (found && group !== 'all') {
           found = option.$div.hasClass(group);
         }
-
         option.$div.toggle(found);
       });
       $(event.target).trigger('dialogContentResize');
@@ -276,25 +238,20 @@
   Drupal.behaviors.viewsUiPreview = {
     attach: function attach(context) {
       var $contextualFiltersBucket = $(context).find('.views-display-column .views-ui-display-tab-bucket.argument');
-
       if ($contextualFiltersBucket.length === 0) {
         return;
       }
-
       var $contextualFilters = $contextualFiltersBucket.find('.views-display-setting a');
-
       if ($contextualFilters.length) {
         $('#preview-args').parent().show();
       } else {
         $('#preview-args').parent().hide();
       }
-
       if ($(once('edit-displays-live-preview', '#edit-displays-live-preview')).is(':checked')) {
         $(once('edit-displays-live-preview', '#preview-submit')).trigger('click');
       }
     }
   };
-
   Drupal.viewsUi.RearrangeFilterHandler = function ($table, $operator) {
     this.table = $table;
     this.operator = $operator;
@@ -303,24 +260,20 @@
     this.addGroupButton = $('#views-add-group');
     this.removeGroupButtons = $table.find('.views-remove-group');
     this.insertAddRemoveFilterGroupLinks();
-
     if (this.hasGroupOperator) {
       this.dropdowns = this.duplicateGroupsOperator();
       this.syncGroupsOperators();
     }
-
     this.modifyTableDrag();
     this.redrawOperatorLabels();
     $(once('views-rearrange-filter-handler', $table.find('.views-group-title select'))).on('change.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
     $(once('views-rearrange-filter-handler', $table.find('a.views-groups-remove-link'))).on('click.views-rearrange-filter-handler', $.proxy(this, 'updateRowspans')).on('click.views-rearrange-filter-handler', $.proxy(this, 'redrawOperatorLabels'));
   };
-
   $.extend(Drupal.viewsUi.RearrangeFilterHandler.prototype, {
     insertAddRemoveFilterGroupLinks: function insertAddRemoveFilterGroupLinks() {
       $(once('views-rearrange-filter-handler', $("<ul class=\"action-links\"><li><a id=\"views-add-group-link\" href=\"#\">".concat(this.addGroupButton[0].value, "</a></li></ul>")).prependTo(this.table.parent()))).find('#views-add-group-link').on('click.views-rearrange-filter-handler', $.proxy(this, 'clickAddGroupButton'));
       var length = this.removeGroupButtons.length;
       var i;
-
       for (i = 0; i < length; i++) {
         var $removeGroupButton = $(this.removeGroupButtons[i]);
         var buttonId = $removeGroupButton.attr('id');
@@ -341,11 +294,9 @@
       var newRow;
       var titleRow;
       var titleRows = once('duplicateGroupsOperator', 'tr.views-group-title');
-
       if (!titleRows.length) {
         return this.operator;
       }
-
       this.operator.find('label').add('div.description').addClass('visually-hidden');
       this.operator.find('select').addClass('form-select');
       var dropdowns = this.operator;
@@ -354,7 +305,6 @@
       newRow.find('td').append(this.operator);
       newRow.insertBefore(titleRow);
       var length = titleRows.length;
-
       for (var i = 2; i < length; i++) {
         titleRow = $(titleRows[i]);
         var fakeOperator = this.operator.clone();
@@ -364,14 +314,12 @@
         newRow.insertBefore(titleRow);
         dropdowns.add(fakeOperator);
       }
-
       return dropdowns;
     },
     syncGroupsOperators: function syncGroupsOperators() {
       if (this.dropdowns.length < 2) {
         return;
       }
-
       this.dropdowns.on('change', $.proxy(this, 'operatorChangeHandler'));
     },
     operatorChangeHandler: function operatorChangeHandler(event) {
@@ -384,41 +332,31 @@
     modifyTableDrag: function modifyTableDrag() {
       var tableDrag = Drupal.tableDrag['views-rearrange-filters'];
       var filterHandler = this;
-
       tableDrag.row.prototype.onSwap = function () {
         if (filterHandler.hasGroupOperator) {
           var thisRow = $(this.group);
           var previousRow = thisRow.prev('tr');
-
           if (previousRow.length && !previousRow.hasClass('group-message') && !previousRow.hasClass('draggable')) {
             var next = thisRow.next();
-
             if (next.is('tr')) {
               this.swap('after', next);
             }
           }
-
           filterHandler.updateRowspans();
         }
-
         filterHandler.redrawOperatorLabels();
       };
-
       tableDrag.onDrop = function () {
         var changeMarker = $(this.oldRowElement).find('.tabledrag-changed');
-
         if (changeMarker.length) {
           var operatorLabel = changeMarker.prevAll('.views-operator-label');
-
           if (operatorLabel.length) {
             operatorLabel.insertAfter(changeMarker);
           }
         }
-
         var groupRow = $(this.rowObject.element).prevAll('tr.group-message').get(0);
         var groupName = groupRow.className.replace(/([^ ]+[ ]+)*group-([^ ]+)-message([ ]+[^ ]+)*/, '$2');
         var groupField = $('select.views-group-select', this.rowObject.element);
-
         if (!groupField.is(".views-group-select-".concat(groupName))) {
           var oldGroupName = groupField.attr('class').replace(/([^ ]+[ ]+)*views-group-select-([^ ]+)([ ]+[^ ]+)*/, '$2');
           groupField.removeClass("views-group-select-".concat(oldGroupName)).addClass("views-group-select-".concat(groupName));
@@ -430,13 +368,11 @@
       for (var i = 0; i < this.draggableRows.length; i++) {
         var $draggableRow = $(this.draggableRows[i]);
         var $firstCell = $draggableRow.find('td').eq(0);
-
         if ($firstCell.length) {
           var operatorValue = $draggableRow.prevAll('.views-group-title').find('option:selected').html();
           var operatorLabel = "<span class=\"views-operator-label\">".concat(operatorValue, "</span>");
           var $nextRow = $draggableRow.nextAll(':visible').eq(0);
           var $existingOperatorLabel = $firstCell.find('.views-operator-label');
-
           if ($nextRow.hasClass('draggable')) {
             if ($existingOperatorLabel.length) {
               $existingOperatorLabel.replaceWith(operatorLabel);
@@ -456,10 +392,8 @@
       var $operatorCell;
       var rows = $(this.table).find('tr');
       var length = rows.length;
-
       for (var i = 0; i < length; i++) {
         $row = $(rows[i]);
-
         if ($row.hasClass('views-group-title')) {
           $operatorCell = $row.find('td.group-operator');
           draggableCount = 0;
@@ -477,7 +411,6 @@
   Drupal.behaviors.viewsFilterConfigSelectAll = {
     attach: function attach(context) {
       var selectAll = once('filterConfigSelectAll', '.js-form-item-options-value-all', context);
-
       if (selectAll.length) {
         var $selectAll = $(selectAll);
         var $selectAllCheckbox = $selectAll.find('input[type=checkbox]');
@@ -509,7 +442,6 @@
   Drupal.behaviors.viewsUiChangeDefaultWidget = {
     attach: function attach(context) {
       var $context = $(context);
-
       function changeDefaultWidget(event) {
         if ($(event.target).prop('checked')) {
           $context.find('input.default-radios').parent().hide();
@@ -521,11 +453,9 @@
           $context.find('input.default-radios').parent().show();
         }
       }
-
       $context.find('input[name="options[group_info][multiple]"]').on('change', changeDefaultWidget).trigger('change');
     }
   };
-
   Drupal.viewsUi.Checkboxifier = function (button) {
     this.$button = $(button);
     this.$parent = this.$button.parent('div.views-expose, div.views-grouped');
@@ -534,11 +464,9 @@
     this.$parent.find('.exposed-description, .grouped-description').hide();
     this.$input.on('click', $.proxy(this, 'clickHandler'));
   };
-
   Drupal.viewsUi.Checkboxifier.prototype.clickHandler = function (e) {
     this.$button.trigger('click').trigger('submit');
   };
-
   Drupal.behaviors.viewsUiOverrideSelect = {
     attach: function attach(context) {
       once('views-ui-override-button-text', '[data-drupal-selector="edit-override-dropdown"]', context).forEach(function (dropdown) {
@@ -553,7 +481,6 @@
           if (!submit) {
             return;
           }
-
           if (this.value === 'default') {
             submit.value = Drupal.t('Apply (all displays)');
           } else if (this.value === 'default_revert') {
@@ -561,7 +488,6 @@
           } else {
             submit.value = Drupal.t('Apply (this display)');
           }
-
           var $dialog = $context.closest('.ui-dialog-content');
           $dialog.trigger('dialogButtonsChange');
         }).trigger('change');
@@ -590,10 +516,8 @@
       if (typeof Drupal.tableDrag === 'undefined' || typeof Drupal.tableDrag['views-rearrange-filters'] === 'undefined') {
         return;
       }
-
       var table = once('views-rearrange-filters', '#views-rearrange-filters', context);
       var operator = once('views-rearrange-filters', '.js-form-item-filter-groups-operator', context);
-
       if (table.length) {
         new Drupal.viewsUi.RearrangeFilterHandler($(table), $(operator));
       }
diff --git a/web/core/modules/views_ui/js/views_ui.listing.js b/web/core/modules/views_ui/js/views_ui.listing.js
index f98f50d63..be53dd355 100644
--- a/web/core/modules/views_ui/js/views_ui.listing.js
+++ b/web/core/modules/views_ui/js/views_ui.listing.js
@@ -4,36 +4,25 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 (function ($, Drupal) {
   Drupal.behaviors.viewTableFilterByText = {
     attach: function attach(context, settings) {
       var _once = once('views-filter-text', 'input.views-filter-text'),
-          _once2 = _slicedToArray(_once, 1),
-          input = _once2[0];
-
+        _once2 = _slicedToArray(_once, 1),
+        input = _once2[0];
       if (!input) {
         return;
       }
-
       var $table = $(input.getAttribute('data-table'));
       var $rows;
-
       function filterViewList(e) {
         var query = e.target.value.toLowerCase();
-
         function showViewRow(index, row) {
           var sources = row.querySelectorAll('[data-drupal-selector="views-table-filter-text-source"]');
           var sourcesConcat = '';
@@ -43,14 +32,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
           var textMatch = sourcesConcat.toLowerCase().indexOf(query) !== -1;
           $(row).closest('tr').toggle(textMatch);
         }
-
         if (query.length >= 2) {
           $rows.each(showViewRow);
         } else {
           $rows.show();
         }
       }
-
       if ($table.length) {
         $rows = $table.find('tbody tr');
         $(input).on('keyup', filterViewList);
diff --git a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
index 3a7336ce8..c00d4696b 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ConfigHandler.php
@@ -78,6 +78,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
       }
       else {
         $types = ViewExecutable::getHandlerTypes();
+        $form['#title'] = $this->t('Configure @type: @item', ['@type' => $types[$type]['lstitle'], '@item' => $handler->adminLabel()]);
 
         // If this item can come from the default display, show a dropdown
         // that lets the user choose which display the changes should apply to.
@@ -150,8 +151,6 @@ public function buildForm(array $form, FormStateInterface $form_state, Request $
           ];
         }
 
-        $form['#title'] = $this->t('Configure @type: @item', ['@type' => $types[$type]['lstitle'], '@item' => $handler->adminLabel()]);
-
         if (!empty($handler->definition['help'])) {
           $form['options']['form_description'] = [
             '#markup' => $handler->definition['help'],
diff --git a/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php b/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php
index bbb7266d8..b3f8b517c 100644
--- a/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/EditDetails.php
@@ -51,10 +51,10 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#default_value' => $view->get('langcode'),
     ];
     $form['details']['description'] = [
-       '#type' => 'textfield',
-       '#title' => $this->t('Administrative description'),
-       '#default_value' => $view->get('description'),
-     ];
+      '#type' => 'textfield',
+      '#title' => $this->t('Administrative description'),
+      '#default_value' => $view->get('description'),
+    ];
     $form['details']['tag'] = [
       '#type' => 'textfield',
       '#title' => $this->t('Administrative tags'),
diff --git a/web/core/modules/views_ui/src/ViewEditForm.php b/web/core/modules/views_ui/src/ViewEditForm.php
index 48b42b0c2..61a02c0b1 100644
--- a/web/core/modules/views_ui/src/ViewEditForm.php
+++ b/web/core/modules/views_ui/src/ViewEditForm.php
@@ -605,8 +605,8 @@ public function getDisplayDetails($view, $display) {
     $build['columns']['second']['header'] = $this->getFormBucket($view, 'header', $display);
     $build['columns']['second']['footer'] = $this->getFormBucket($view, 'footer', $display);
     $build['columns']['second']['empty'] = $this->getFormBucket($view, 'empty', $display);
-    $build['columns']['third']['arguments'] = $this->getFormBucket($view, 'argument', $display);
     $build['columns']['third']['relationships'] = $this->getFormBucket($view, 'relationship', $display);
+    $build['columns']['third']['arguments'] = $this->getFormBucket($view, 'argument', $display);
 
     return $build;
   }
diff --git a/web/core/modules/views_ui/src/ViewUI.php b/web/core/modules/views_ui/src/ViewUI.php
index 0dfaec0f4..74bf8f323 100644
--- a/web/core/modules/views_ui/src/ViewUI.php
+++ b/web/core/modules/views_ui/src/ViewUI.php
@@ -4,6 +4,7 @@
 
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Timer;
+use Drupal\Component\Utility\Xss;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
@@ -23,6 +24,7 @@
 /**
  * Stores UI related temporary settings.
  */
+#[\AllowDynamicProperties]
 class ViewUI implements ViewEntityInterface {
 
   /**
@@ -121,8 +123,9 @@ class ViewUI implements ViewEntityInterface {
   ];
 
   /**
-   * Whether the config is being created, updated or deleted through the
-   * import process.
+   * Whether the config is being synced through the import process.
+   *
+   * This is the case with create, update or delete.
    *
    * @var bool
    */
@@ -135,6 +138,11 @@ class ViewUI implements ViewEntityInterface {
    */
   private $isUninstalling = FALSE;
 
+  /**
+   * The entity type.
+   */
+  protected $entityType;
+
   /**
    * Constructs a View UI object.
    *
@@ -269,9 +277,10 @@ public function standardCancel($form, FormStateInterface $form_state) {
   }
 
   /**
-   * Provide a standard set of Apply/Cancel/OK buttons for the forms. Also provide
-   * a hidden op operator because the forms plugin doesn't seem to properly
-   * provide which button was clicked.
+   * Provides a standard set of Apply/Cancel/OK buttons for the forms.
+   *
+   * This will also provide a hidden op operator because the forms plugin
+   * doesn't seem to properly provide which button was clicked.
    *
    * TODO: Is the hidden op operator still here somewhere, or is that part of the
    * docblock outdated?
@@ -373,8 +382,9 @@ public function getOverrideValues($form, FormStateInterface $form_state) {
   }
 
   /**
-   * Add another form to the stack; clicking 'apply' will go to this form
-   * rather than closing the ajax popup.
+   * Adds another form to the stack.
+   *
+   * Clicking 'apply' will go to this form rather than closing the ajax popup.
    */
   public function addFormToStack($key, $display_id, $type, $id = NULL, $top = FALSE, $rebuild_keys = FALSE) {
     // Reset the cache of IDs. Drupal rather aggressively prevents ID
@@ -536,7 +546,6 @@ public function renderPreview($display_id, $args = []) {
     $errors = $executable->validate();
     $executable->destroy();
     if (empty($errors)) {
-      $this->ajax = TRUE;
       $executable->live_preview = TRUE;
 
       // AJAX happens via HTTP POST but everything expects exposed data to
@@ -673,9 +682,9 @@ public function renderPreview($display_id, $args = []) {
                 [
                   'data' => [
                     '#prefix' => '<pre>',
-                     'queries' => $queries,
-                     '#suffix' => '</pre>',
-                    ],
+                    'queries' => $queries,
+                    '#suffix' => '</pre>',
+                  ],
                 ],
               ];
             }
@@ -691,6 +700,7 @@ public function renderPreview($display_id, $args = []) {
               [
                 'data' => [
                   '#markup' => $executable->getTitle(),
+                  '#allowed_tags' => Xss::getHtmlTagList(),
                 ],
               ],
             ];
@@ -830,7 +840,7 @@ public function renderPreview($display_id, $args = []) {
   /**
    * Get the user's current progress through the form stack.
    *
-   * @return
+   * @return array|bool
    *   FALSE if the user is not currently in a multiple-form stack. Otherwise,
    *   an associative array with the following keys:
    *   - current: The number of the current form on the stack.
diff --git a/web/core/modules/views_ui/tests/src/Functional/ArgumentValidatorTest.php b/web/core/modules/views_ui/tests/src/Functional/ArgumentValidatorTest.php
index f2f7a1e45..2c26cc7e3 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ArgumentValidatorTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ArgumentValidatorTest.php
@@ -45,8 +45,7 @@ public function testSpecifyValidation() {
   }
 
   /**
-   * Saves the test_argument view with changes made to the argument handler
-   * both with and without specify_validation turned on.
+   * Saves the test_argument view with changes made to the argument handler.
    *
    * @param bool $specify_validation
    *   The form validation.
diff --git a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
index d3bc819d1..7d13dbbc8 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
@@ -25,6 +25,9 @@ class DefaultViewsTest extends UITestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
index 032cb5843..36991c2f5 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
@@ -16,6 +16,9 @@ class DisplayPathTest extends UITestBase {
 
   use AssertPageCacheContextsAndTagsTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/DuplicateTest.php b/web/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
index c461c839a..1b17ab4a1 100644
--- a/web/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
@@ -14,6 +14,9 @@ class DuplicateTest extends UITestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
@@ -39,7 +42,7 @@ public function testDuplicateView() {
     $this->drupalGet('admin/structure/views/view/' . $random_view['id'] . '/duplicate');
     $this->submitForm($view, 'Duplicate');
 
-    // Assert that the page url is correct.
+    // Assert that the page URL is correct.
     $this->assertSession()->addressEquals('admin/structure/views/view/' . $view['id']);
 
     // Assert that the page title is correctly displayed.
diff --git a/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php b/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
index 85f66cd1f..0e805d642 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
@@ -44,6 +44,9 @@ class ExposedFormUITest extends UITestBase {
    */
   protected $groupFormUiErrors = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php b/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
index 9c0ed2b23..1c030b5cd 100644
--- a/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
@@ -14,6 +14,9 @@ class OverrideDisplaysTest extends UITestBase {
    */
   protected $defaultTheme = 'stark';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php b/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php
index 5f941da22..7dc135a9b 100644
--- a/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/PreviewTest.php
@@ -14,7 +14,13 @@ class PreviewTest extends UITestBase {
    *
    * @var array
    */
-  public static $testViews = ['test_preview', 'test_preview_error', 'test_pager_full', 'test_mini_pager', 'test_click_sort'];
+  public static $testViews = [
+    'test_preview',
+    'test_preview_error',
+    'test_pager_full',
+    'test_mini_pager',
+    'test_click_sort',
+  ];
 
   /**
    * {@inheritdoc}
@@ -171,4 +177,28 @@ public function testPreviewError() {
     $this->assertSession()->pageTextContains('Unable to preview due to validation errors.');
   }
 
+  /**
+   * Tests HTML is filtered from the view title when previewing.
+   */
+  public function testPreviewTitle() {
+    // Update the view and change title with html tags.
+    \Drupal::configFactory()->getEditable('views.view.test_preview')
+      ->set('display.default.display_options.title', '<strong>Test preview title</strong>')
+      ->save();
+
+    $this->drupalGet('admin/structure/views/view/test_preview/edit');
+    $this->assertSession()->statusCodeEquals(200);
+    $this->submitForm([], 'Update preview');
+    $this->assertSession()->pageTextContains('Test preview title');
+    // Ensure allowed HTML tags are still displayed.
+    $this->assertCount(2, $this->xpath('//div[@id="views-live-preview"]//strong[text()=:text]', [':text' => 'Test preview title']));
+
+    // Ensure other tags are filtered.
+    \Drupal::configFactory()->getEditable('views.view.test_preview')
+      ->set('display.default.display_options.title', '<b>Test preview title</b>')
+      ->save();
+    $this->submitForm([], 'Update preview');
+    $this->assertCount(0, $this->xpath('//div[@id="views-live-preview"]//b[text()=:text]', [':text' => 'Test preview title']));
+  }
+
 }
diff --git a/web/core/modules/views_ui/tests/src/Functional/RedirectTest.php b/web/core/modules/views_ui/tests/src/Functional/RedirectTest.php
index 4c9bc18e6..6350cb928 100644
--- a/web/core/modules/views_ui/tests/src/Functional/RedirectTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/RedirectTest.php
@@ -37,7 +37,7 @@ public function testRedirect() {
     $this->assertSession()->addressEquals($random_destination);
 
     // Setup a view with a certain page display path. If you change the path
-    // but have the old url in the destination the user should be redirected to
+    // but have the old URL in the destination the user should be redirected to
     // the new path.
     $view_name = 'test_redirect_view';
     $new_path = $this->randomMachineName();
diff --git a/web/core/modules/views_ui/tests/src/Functional/ReportTest.php b/web/core/modules/views_ui/tests/src/Functional/ReportTest.php
index bc91ec584..b362b1a7e 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ReportTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ReportTest.php
@@ -24,7 +24,7 @@ class ReportTest extends UITestBase {
   /**
    * Stores an admin user used by the different tests.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\Entity\User
    */
   protected $adminUser;
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
index 8256af296..f926e63b9 100644
--- a/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/SettingsTest.php
@@ -14,7 +14,7 @@ class SettingsTest extends UITestBase {
   /**
    * Stores an admin user used by the different tests.
    *
-   * @var \Drupal\user\User
+   * @var \Drupal\user\Entity\User
    */
   protected $adminUser;
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php b/web/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php
index edc9a6db6..534d0409c 100644
--- a/web/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php
@@ -42,6 +42,9 @@ class TranslatedViewTest extends UITestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp($import_test_views = TRUE, $modules = []): void {
     parent::setUp($import_test_views, $modules);
 
diff --git a/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php b/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
index 72817fb07..c28580b32 100644
--- a/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
+++ b/web/core/modules/views_ui/tests/src/Functional/ViewsUITourTest.php
@@ -38,6 +38,9 @@ class ViewsUITourTest extends TourTestBase {
    */
   protected static $modules = ['views_ui', 'tour', 'language', 'locale'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->adminUser = $this->drupalCreateUser([
@@ -108,10 +111,10 @@ public function testViewsUiTourTipsTranslated() {
    */
   public function createTranslation($source, $langcode) {
     return $this->localeStorage->createTranslation([
-        'lid' => $source->lid,
-        'language' => $langcode,
-        'translation' => $this->randomMachineName(100),
-      ])->save();
+      'lid' => $source->lid,
+      'language' => $langcode,
+      'translation' => $this->randomMachineName(100),
+    ])->save();
   }
 
 }
diff --git a/web/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php b/web/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
deleted file mode 100644
index 778e0acab..000000000
--- a/web/core/modules/views_ui/tests/src/FunctionalJavascript/LibraryCachingTest.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-namespace Drupal\Tests\views_ui\FunctionalJavascript;
-
-use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
-
-/**
- * Tests the JavaScript library caching on consecutive requests.
- *
- * @group views_ui
- */
-class LibraryCachingTest extends WebDriverTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = ['node', 'views', 'views_ui'];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'stark';
-
-  /**
-   * Tests if the Views UI dialogs open on consecutive requests.
-   */
-  public function testConsecutiveDialogRequests() {
-    $admin_user = $this->drupalCreateUser([
-      'administer site configuration',
-      'administer views',
-      'administer nodes',
-      'access content overview',
-    ]);
-
-    // Disable automatic live preview to make the sequence of calls clearer.
-    \Drupal::configFactory()->getEditable('views.settings')->set('ui.always_live_preview', FALSE)->save();
-    $this->drupalLogin($admin_user);
-
-    $this->drupalGet('admin/structure/views/view/content');
-    $page = $this->getSession()->getPage();
-
-    // Use the 'Add' link for fields to open a dialog. This will load the proper
-    // dialog libraries.
-    $add_link = $page->findById('views-add-field');
-    $this->assertTrue($add_link->isVisible(), 'Add fields button found.');
-    $add_link->click();
-    $this->assertJsCondition("jQuery('.ui-dialog-titlebar').length > 0");
-    // Close the dialog and open it again. No no libraries will be loaded, but a
-    // cache entry will be made for not loading any libraries.
-    $page->pressButton('Close');
-    $add_link->click();
-    $this->assertJsCondition("jQuery('.ui-dialog-titlebar').length > 0");
-    $page->pressButton('Close');
-
-    // Reload the page.
-    $this->drupalGet('admin/structure/views/view/content');
-    $page = $this->getSession()->getPage();
-
-    // Now use the 'Update preview' button to load libraries.
-    $preview = $page->findById('preview-submit');
-    // The first click will load all the libraries.
-    $preview->click();
-    $this->assertJsCondition("jQuery('.ajax-progress').length === 0");
-    // The second click will not load any new libraries.
-    $preview->click();
-    $this->assertJsCondition("jQuery('.ajax-progress').length === 0");
-    // Check to see if the dialogs still open.
-    $add_link = $page->findById('views-add-field');
-    $add_link->click();
-    $this->assertJsCondition("jQuery('.ui-dialog-titlebar').length > 0");
-    $page->pressButton('Close');
-  }
-
-}
diff --git a/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php b/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
index c0d3eea41..b576cb7b0 100644
--- a/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
+++ b/web/core/modules/views_ui/tests/src/Unit/ViewListBuilderTest.php
@@ -90,10 +90,11 @@ public function testBuildRowEntityList() {
       ->getMock();
     $page_display->expects($this->any())
       ->method('getPath')
-      ->will($this->onConsecutiveCalls(
-        $this->returnValue('test_page'),
-        $this->returnValue('<object>malformed_path</object>'),
-        $this->returnValue('<script>alert("placeholder_page/%")</script>')));
+      ->willReturnOnConsecutiveCalls(
+        'test_page',
+        '<object>malformed_path</object>',
+        '<script>alert("placeholder_page/%")</script>',
+      );
 
     $embed_display = $this->getMockBuilder('Drupal\views\Plugin\views\display\Embed')
       ->onlyMethods(['initDisplay'])
diff --git a/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php b/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
index 480b67953..36b4933a6 100644
--- a/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
+++ b/web/core/modules/views_ui/tests/src/Unit/ViewUIObjectTest.php
@@ -85,7 +85,7 @@ public function testIsLocked() {
     $account = $this->createMock('Drupal\Core\Session\AccountInterface');
     $account->expects($this->exactly(2))
       ->method('id')
-      ->will($this->returnValue(1));
+      ->willReturn(1);
 
     $container = new ContainerBuilder();
     $container->set('current_user', $account);
@@ -114,10 +114,6 @@ public function testIsLocked() {
    * Tests serialization of the ViewUI object.
    */
   public function testSerialization() {
-    // Set a container so the DependencySerializationTrait has it.
-    $container = new ContainerBuilder();
-    \Drupal::setContainer($container);
-
     $storage = new View([], 'view');
     $executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
       ->disableOriginalConstructor()
diff --git a/web/core/modules/views_ui/views_ui.module b/web/core/modules/views_ui/views_ui.module
index 04c07663e..33dbb6b3c 100644
--- a/web/core/modules/views_ui/views_ui.module
+++ b/web/core/modules/views_ui/views_ui.module
@@ -5,6 +5,7 @@
  * Provide structure for the administrative interface to Views.
  */
 
+use Drupal\Component\Utility\Xss;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
 use Drupal\views\ViewExecutable;
@@ -135,6 +136,7 @@ function views_ui_preprocess_views_view(&$variables) {
   if (!empty($view->live_preview)) {
     $variables['title'] = [
       '#markup' => $view->getTitle(),
+      '#allowed_tags' => Xss::getHtmlTagList(),
     ];
   }
 
diff --git a/web/core/modules/workflows/src/WorkflowTypeInterface.php b/web/core/modules/workflows/src/WorkflowTypeInterface.php
index fc2051e64..37901e5ad 100644
--- a/web/core/modules/workflows/src/WorkflowTypeInterface.php
+++ b/web/core/modules/workflows/src/WorkflowTypeInterface.php
@@ -244,7 +244,7 @@ public function hasTransition($transition_id);
   public function getTransitions(array $transition_ids = NULL);
 
   /**
-   * Gets the transition IDs for a state for the provided direction.
+   * Gets the transitions for a state for the provided direction.
    *
    * @param $state_id
    *   The state to get transitions for.
@@ -253,8 +253,9 @@ public function getTransitions(array $transition_ids = NULL);
    *   TransitionInterface::DIRECTION_FROM. Possible values are:
    *   TransitionInterface::DIRECTION_FROM or TransitionInterface::DIRECTION_TO.
    *
-   * @return array
-   *   The transition IDs for a state for the provided direction.
+   * @return \Drupal\workflows\TransitionInterface[]
+   *   An array of the transition objects for the state in the given direction,
+   *   keyed by transition ID.
    *
    * @see \Drupal\workflows\TransitionInterface::DIRECTION_FROM
    * @see \Drupal\workflows\TransitionInterface::DIRECTION_TO
diff --git a/web/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php b/web/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php
index 09f391d50..2cb7d012f 100644
--- a/web/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php
+++ b/web/core/modules/workspaces/src/EventSubscriber/WorkspaceRequestSubscriber.php
@@ -93,7 +93,7 @@ public function onKernelRequest(RequestEvent $event) {
   }
 
   /**
-   * {@inheritDoc}
+   * {@inheritdoc}
    */
   public static function getSubscribedEvents() {
     // Use a priority of 190 in order to run after the generic core subscriber.
diff --git a/web/core/modules/workspaces/src/WorkspaceManager.php b/web/core/modules/workspaces/src/WorkspaceManager.php
index f97ff343c..fdb47d697 100644
--- a/web/core/modules/workspaces/src/WorkspaceManager.php
+++ b/web/core/modules/workspaces/src/WorkspaceManager.php
@@ -240,8 +240,8 @@ public function switchToLive() {
    */
   protected function doSwitchWorkspace($workspace) {
     // If the current user doesn't have access to view the workspace, they
-    // shouldn't be allowed to switch to it.
-    if ($workspace && !$workspace->access('view')) {
+    // shouldn't be allowed to switch to it, except in CLI processes.
+    if ($workspace && PHP_SAPI !== 'cli' && !$workspace->access('view')) {
       $this->logger->error('Denied access to view workspace %workspace_label for user %uid', [
         '%workspace_label' => $workspace->label(),
         '%uid' => $this->currentUser->id(),
diff --git a/web/core/modules/workspaces/src/WorkspaceRepository.php b/web/core/modules/workspaces/src/WorkspaceRepository.php
index 535c83366..d939cafdf 100644
--- a/web/core/modules/workspaces/src/WorkspaceRepository.php
+++ b/web/core/modules/workspaces/src/WorkspaceRepository.php
@@ -116,6 +116,7 @@ public function loadTree() {
       }
       $graph = (new Graph($graph))->searchAndSort();
 
+      $this->tree = [];
       foreach (array_keys($tree) as $workspace_id) {
         $this->tree[$workspace_id] = [
           'depth' => count($graph[$workspace_id]['paths']),
diff --git a/web/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php b/web/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
index 19dc0e166..71803e50d 100644
--- a/web/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
+++ b/web/core/modules/workspaces/tests/src/Kernel/WorkspaceCRUDTest.php
@@ -323,4 +323,12 @@ public function testDeletingWorkspaceWithChildren() {
     $this->assertNull(Workspace::load('stage'));
   }
 
+  /**
+   * Tests loading the workspace tree when there are no workspaces available.
+   */
+  public function testEmptyWorkspaceTree() {
+    $tree = \Drupal::service('workspaces.repository')->loadTree();
+    $this->assertSame([], $tree);
+  }
+
 }
diff --git a/web/core/modules/workspaces/workspaces.info.yml b/web/core/modules/workspaces/workspaces.info.yml
index 6ca68a80d..3a0623efd 100644
--- a/web/core/modules/workspaces/workspaces.info.yml
+++ b/web/core/modules/workspaces/workspaces.info.yml
@@ -6,4 +6,4 @@ package: Core (Experimental)
 lifecycle: experimental
 configure: entity.workspace.collection
 dependencies:
- - drupal:user
+  - drupal:user
diff --git a/web/core/package.json b/web/core/package.json
index 87584b307..4f9f00172 100644
--- a/web/core/package.json
+++ b/web/core/package.json
@@ -25,7 +25,7 @@
     "test:nightwatch": "cross-env BABEL_ENV=development node -r dotenv-safe/config -r @babel/register ./node_modules/.bin/nightwatch --config ./tests/Drupal/Nightwatch/nightwatch.conf.js",
     "prettier": "prettier --write \"./**/*.es6.js\" \"./tests/Drupal/Nightwatch/**/*.js\" \"./modules/ckeditor5/js/ckeditor5_plugins/**/*.js\"",
     "spellcheck": "cspell",
-    "spellcheck:make-drupal-dict": "rm -f misc/cspell/dictionary.txt && touch misc/cspell/dictionary.txt && yarn -s spellcheck:core --unique --wordsOnly | tr '[:upper:]' '[:lower:]' | tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/dictionary.txt",
+    "spellcheck:make-drupal-dict": "rm -f misc/cspell/dictionary.txt && touch misc/cspell/dictionary.txt && yarn -s spellcheck:core --unique --wordsOnly | perl -Mopen=locale -pe '$_=lc$_' | tr -d \\\\\\\\ | LC_ALL=C sort -u -o misc/cspell/dictionary.txt",
     "spellcheck:core": "cspell \"**/*\" \".*\" \"../composer/**/*\" \"../composer.json\"",
     "vendor-update": "node ./scripts/js/vendor-update.js",
     "watch:ckeditor5": "webpack --config ./modules/ckeditor5/webpack.config.js --watch",
@@ -39,38 +39,36 @@
     "@babel/core": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/register": "^7.7.7",
-    "@ckeditor/ckeditor5-alignment": "~35.3.2",
-    "@ckeditor/ckeditor5-basic-styles": "~35.3.2",
-    "@ckeditor/ckeditor5-block-quote": "~35.3.2",
-    "@ckeditor/ckeditor5-code-block": "~35.3.2",
-    "@ckeditor/ckeditor5-dev-utils": "~30.4.0",
-    "@ckeditor/ckeditor5-editor-classic": "~35.3.2",
-    "@ckeditor/ckeditor5-editor-decoupled": "~35.3.2",
-    "@ckeditor/ckeditor5-essentials": "~35.3.2",
-    "@ckeditor/ckeditor5-heading": "~35.3.2",
-    "@ckeditor/ckeditor5-horizontal-line": "~35.3.2",
-    "@ckeditor/ckeditor5-html-support": "~35.3.2",
-    "@ckeditor/ckeditor5-image": "~35.3.2",
-    "@ckeditor/ckeditor5-indent": "~35.3.2",
-    "@ckeditor/ckeditor5-language": "~35.3.2",
-    "@ckeditor/ckeditor5-link": "~35.3.2",
-    "@ckeditor/ckeditor5-list": "~35.3.2",
-    "@ckeditor/ckeditor5-paste-from-office": "~35.3.2",
-    "@ckeditor/ckeditor5-remove-format": "~35.3.2",
-    "@ckeditor/ckeditor5-source-editing": "~35.3.2",
-    "@ckeditor/ckeditor5-special-characters": "~35.3.2",
-    "@ckeditor/ckeditor5-style": "~35.3.2",
-    "@ckeditor/ckeditor5-table": "~35.3.2",
+    "@ckeditor/ckeditor5-alignment": "~35.4.0",
+    "@ckeditor/ckeditor5-basic-styles": "~35.4.0",
+    "@ckeditor/ckeditor5-block-quote": "~35.4.0",
+    "@ckeditor/ckeditor5-code-block": "~35.4.0",
+    "@ckeditor/ckeditor5-editor-classic": "~35.4.0",
+    "@ckeditor/ckeditor5-editor-decoupled": "~35.4.0",
+    "@ckeditor/ckeditor5-essentials": "~35.4.0",
+    "@ckeditor/ckeditor5-heading": "~35.4.0",
+    "@ckeditor/ckeditor5-horizontal-line": "~35.4.0",
+    "@ckeditor/ckeditor5-html-support": "~35.4.0",
+    "@ckeditor/ckeditor5-image": "~35.4.0",
+    "@ckeditor/ckeditor5-indent": "~35.4.0",
+    "@ckeditor/ckeditor5-language": "~35.4.0",
+    "@ckeditor/ckeditor5-link": "~35.4.0",
+    "@ckeditor/ckeditor5-list": "~35.4.0",
+    "@ckeditor/ckeditor5-paste-from-office": "~35.4.0",
+    "@ckeditor/ckeditor5-remove-format": "~35.4.0",
+    "@ckeditor/ckeditor5-source-editing": "~35.4.0",
+    "@ckeditor/ckeditor5-special-characters": "~35.4.0",
+    "@ckeditor/ckeditor5-style": "~35.4.0",
+    "@ckeditor/ckeditor5-table": "~35.4.0",
     "@drupal/once": "1.0.x",
     "@popperjs/core": "2.11.x",
     "babel-plugin-add-header-comment": "^1.0.3",
     "backbone": "1.4.x",
     "chalk": "^4.1.0",
     "chokidar": "^3.3.1",
-    "chromedriver": "^98.0.1",
-    "ckeditor5": "~35.3.2",
+    "ckeditor5": "~35.4.0",
     "cross-env": "^7.0.2",
-    "cspell": "^5.0.0",
+    "cspell": "^6.0.0",
     "css.escape": "1.5.x",
     "dotenv-safe": "^8.2.0",
     "es6-promise": "4.2.x",
@@ -80,43 +78,42 @@
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jquery": "^1.5.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-yml": "^0.14.0",
+    "eslint-plugin-yml": "^1.2.0",
     "farbtastic": "https://github.com/mattfarina/farbtastic/archive/1.3u.tar.gz",
-    "glob": "^7.1.2",
+    "glob": "^8.0.3",
     "joyride": "https://github.com/zurb/joyride/archive/refs/heads/v2.1.tar.gz",
-    "jquery": "3.6.x",
+    "jquery": "~3.6.3",
     "jquery-form": "4.3.x",
     "jquery-once": "2.2.x",
     "jquery-ui": "1.13.x",
     "js-cookie": "3.0.x",
-    "jsdom": "^19.0.0",
+    "jsdom": "^20.0.0",
     "loadjs": "4.2.x",
     "minimist": "^1.2.2",
     "mkdirp": "^1.0.4",
     "nightwatch": "^1.6.3",
     "normalize.css": "8.0.x",
     "picturefill": "3.0.x",
-    "postcss": "^7.0.18",
-    "postcss-calc": "^7.0.1",
-    "postcss-header": "^2.0.0",
-    "postcss-import": "^12.0.1",
-    "postcss-preset-env": "^6.7.0",
-    "postcss-pxtorem": "^5.1.1",
-    "postcss-url": "^8.0.0",
+    "postcss": "^8.4.18",
+    "postcss-calc": "^8.2.4",
+    "postcss-header": "^3.0.3",
+    "postcss-import": "^15.0.0",
+    "postcss-preset-env": "^7.8.2",
+    "postcss-pxtorem": "^6.0.0",
+    "postcss-url": "^10.1.3",
     "prettier": "^2.1.2",
-    "raw-loader": "^4.0.2",
     "shepherd.js": "9.1.x",
     "sortablejs": "1.15.x",
     "stylelint": "^14.0.1",
     "stylelint-checkstyle-formatter": "^0.1.2",
-    "stylelint-config-standard": "^23.0.0",
+    "stylelint-config-standard": "^29.0.0",
     "stylelint-order": "^5.0.0",
-    "tabbable": "5.3.x",
+    "tabbable": "~5.3.3",
     "terser": "^5.14.2",
     "terser-webpack-plugin": "^5.3.3",
-    "underscore": "1.13.x",
-    "webpack": "^5.51.1",
-    "webpack-cli": "^4.4.0"
+    "underscore": "~1.13.4",
+    "webpack": "^5.77.0",
+    "webpack-cli": "^5.0.0"
   },
   "//": "'development is the default environment, and legacy is for transpiling the old jQuery codebase",
   "babel": {
diff --git a/web/core/phpcs.xml.dist b/web/core/phpcs.xml.dist
index c8a0dbdf8..af39457f6 100644
--- a/web/core/phpcs.xml.dist
+++ b/web/core/phpcs.xml.dist
@@ -28,9 +28,7 @@
 
   <!-- Drupal sniffs -->
   <rule ref="Drupal.Arrays.Array">
-    <!-- Sniff for these errors: CommaLastItem -->
-    <exclude name="Drupal.Arrays.Array.ArrayClosingIndentation"/>
-    <exclude name="Drupal.Arrays.Array.ArrayIndentation"/>
+    <!-- Sniff for these errors: ArrayClosingIndentation, ArrayIndentation, CommaLastItem -->
     <exclude name="Drupal.Arrays.Array.LongLineDeclaration"/>
   </rule>
   <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/>
@@ -71,7 +69,6 @@
     <exclude name="Drupal.Commenting.FunctionComment.Missing"/>
     <exclude name="Drupal.Commenting.FunctionComment.MissingParamType"/>
     <exclude name="Drupal.Commenting.FunctionComment.MissingReturnComment"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingReturnType"/>
     <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
     <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
   </rule>
@@ -163,6 +160,9 @@
     <!-- Setting severity to 0 to completely disable an error message in this sniff, without excluding the whole sniff -->
     <!-- See https://github.com/squizlabs/PHP_CodeSniffer/wiki/Configuration-Options#changing-the-default-severity-levels -->
     <severity>0</severity>
+    <rule ref="DrupalPractice.Objects.GlobalFunction">
+       <include-pattern>*/Plugin/*</include-pattern>
+    </rule>
   </rule>
   <rule ref="DrupalPractice.Commenting.ExpectedException"/>
   <rule ref="DrupalPractice.General.ExceptionT"/>
diff --git a/web/core/postcss.config.js b/web/core/postcss.config.js
deleted file mode 100644
index 1c61d3b31..000000000
--- a/web/core/postcss.config.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = ctx => ({
-  map: !ctx.env || ctx.env !== 'production' ? { inline: false } : false,
-  plugins: [
-    require('postcss-custom-properties')({
-      preserve: false,
-      // Breaks style lint and unnecessary if preserve set to false.
-      // exportTo: 'dist-css/variables.css',
-      importFrom: [
-        './themes/claro/css/src/base/variables.css'
-      ]
-    }),
-    require("postcss-calc"),
-    require('autoprefixer')({
-      cascade: false
-    }),
-    require('postcss-header')({
-      header: `DO NOT EDIT THIS FILE.\nSee the following change record for more information,\nhttps://www.drupal.org/node/3084859\n@preserve`,
-    }),
-  ]
-});
diff --git a/web/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml b/web/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml
index 1294ccd21..34ec5b99a 100644
--- a/web/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml
+++ b/web/core/profiles/demo_umami/config/install/core.entity_form_display.node.article.default.yml
@@ -20,7 +20,7 @@ mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 1
+    weight: 2
     region: content
     settings:
       rows: 9
@@ -36,14 +36,14 @@ content:
     third_party_settings: {  }
   field_media_image:
     type: media_library_widget
-    weight: 5
+    weight: 1
     region: content
     settings:
       media_types: {  }
     third_party_settings: {  }
   field_tags:
     type: entity_reference_autocomplete_tags
-    weight: 3
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS
@@ -53,7 +53,7 @@ content:
     third_party_settings: {  }
   langcode:
     type: language_select
-    weight: 2
+    weight: 3
     region: content
     settings:
       include_locked: true
diff --git a/web/core/profiles/demo_umami/config/install/editor.editor.basic_html.yml b/web/core/profiles/demo_umami/config/install/editor.editor.basic_html.yml
index 62138b876..bea27d77b 100644
--- a/web/core/profiles/demo_umami/config/install/editor.editor.basic_html.yml
+++ b/web/core/profiles/demo_umami/config/install/editor.editor.basic_html.yml
@@ -4,42 +4,52 @@ dependencies:
   config:
     - filter.format.basic_html
   module:
-    - ckeditor
+    - ckeditor5
 format: basic_html
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
-        -
-          name: Formatting
-          items:
-            - Bold
-            - Italic
-        -
-          name: Linking
-          items:
-            - DrupalLink
-            - DrupalUnlink
-        -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
-        -
-          name: Media
-          items:
-            - Blockquote
-            - DrupalMediaLibrary
-        -
-          name: 'Block Formatting'
-          items:
-            - Format
-        -
-          name: Tools
-          items:
-            - Source
-  plugins: {}
+    items:
+      - bold
+      - italic
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalMedia
+      - '|'
+      - heading
+      - '|'
+      - sourceEditing
+      - '|'
+  plugins:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_sourceEditing:
+      allowed_tags:
+        - '<cite>'
+        - '<dl>'
+        - '<dt>'
+        - '<dd>'
+        - '<a hreflang>'
+        - '<blockquote cite>'
+        - '<ul type>'
+        - '<ol type start>'
+        - '<h2 id>'
+        - '<h3 id>'
+        - '<h4 id>'
+        - '<h5 id>'
+        - '<h6 id>'
+        - '<img src alt data-entity-type data-entity-uuid data-align data-caption width height>'
+        - '<drupal-media data-view-mode title>'
 image_upload:
   status: false
   scheme: public
diff --git a/web/core/profiles/demo_umami/config/install/editor.editor.full_html.yml b/web/core/profiles/demo_umami/config/install/editor.editor.full_html.yml
index 0f40656b7..7862acf65 100644
--- a/web/core/profiles/demo_umami/config/install/editor.editor.full_html.yml
+++ b/web/core/profiles/demo_umami/config/install/editor.editor.full_html.yml
@@ -4,50 +4,42 @@ dependencies:
   config:
     - filter.format.full_html
   module:
-    - ckeditor
+    - ckeditor5
 format: full_html
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
-        -
-          name: Formatting
-          items:
-            - Bold
-            - Italic
-            - Strike
-            - Superscript
-            - Subscript
-            - '-'
-            - RemoveFormat
-        -
-          name: Linking
-          items:
-            - DrupalLink
-            - DrupalUnlink
-        -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
-        -
-          name: Media
-          items:
-            - Blockquote
-            - DrupalMediaLibrary
-            - Table
-            - HorizontalRule
-        -
-          name: 'Block Formatting'
-          items:
-            - Format
-        -
-          name: Tools
-          items:
-            - ShowBlocks
-            - Source
-  plugins: {}
+    items:
+      - bold
+      - italic
+      - strikethrough
+      - superscript
+      - subscript
+      - removeFormat
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalMedia
+      - insertTable
+      - horizontalLine
+      - '|'
+      - heading
+      - '|'
+      - sourceEditing
+  plugins:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_sourceEditing:
+      allowed_tags: {  }
 image_upload:
   status: true
   scheme: public
diff --git a/web/core/profiles/demo_umami/config/install/filter.format.basic_html.yml b/web/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
index 6e647a233..e3249c856 100644
--- a/web/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
+++ b/web/core/profiles/demo_umami/config/install/filter.format.basic_html.yml
@@ -16,7 +16,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title>'
+      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <img src alt height width data-entity-type data-entity-uuid data-align data-caption> <drupal-media data-entity-type data-entity-uuid data-view-mode data-align data-caption alt title>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_align:
diff --git a/web/core/profiles/demo_umami/config/install/rdf.mapping.node.article.yml b/web/core/profiles/demo_umami/config/install/rdf.mapping.node.article.yml
deleted file mode 100644
index 3277bd4f0..000000000
--- a/web/core/profiles/demo_umami/config/install/rdf.mapping.node.article.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.article
-  module:
-    - node
-id: node.article
-targetEntityType: node
-bundle: article
-types:
-  - 'schema:Article'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-  field_image:
-    properties:
-      - 'schema:image'
-  field_tags:
-    properties:
-      - 'schema:about'
diff --git a/web/core/profiles/demo_umami/config/install/rdf.mapping.node.page.yml b/web/core/profiles/demo_umami/config/install/rdf.mapping.node.page.yml
deleted file mode 100644
index c5152369b..000000000
--- a/web/core/profiles/demo_umami/config/install/rdf.mapping.node.page.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.page
-  module:
-    - node
-id: node.page
-targetEntityType: node
-bundle: page
-types:
-  - 'schema:WebPage'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
diff --git a/web/core/profiles/demo_umami/config/install/rdf.mapping.taxonomy_term.tags.yml b/web/core/profiles/demo_umami/config/install/rdf.mapping.taxonomy_term.tags.yml
deleted file mode 100644
index 46b43f15f..000000000
--- a/web/core/profiles/demo_umami/config/install/rdf.mapping.taxonomy_term.tags.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.tags
-  module:
-    - taxonomy
-id: taxonomy_term.tags
-targetEntityType: taxonomy_term
-bundle: tags
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
diff --git a/web/core/profiles/demo_umami/config/install/user.role.author.yml b/web/core/profiles/demo_umami/config/install/user.role.author.yml
index c9d34695e..53860ff03 100644
--- a/web/core/profiles/demo_umami/config/install/user.role.author.yml
+++ b/web/core/profiles/demo_umami/config/install/user.role.author.yml
@@ -2,6 +2,9 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_view_display.node.article.full
+    - core.entity_view_display.node.page.full
+    - core.entity_view_display.node.recipe.full
     - node.type.article
     - node.type.page
     - node.type.recipe
@@ -12,6 +15,7 @@ dependencies:
     - content_moderation
     - contextual
     - file
+    - layout_builder
     - node
     - path
     - system
@@ -28,6 +32,10 @@ permissions:
   - 'access toolbar'
   - 'cancel account'
   - 'change own username'
+  - 'configure editable article node layout overrides'
+  - 'configure editable page node layout overrides'
+  - 'configure editable recipe node layout overrides'
+  - 'create and edit custom blocks'
   - 'create article content'
   - 'create page content'
   - 'create recipe content'
diff --git a/web/core/profiles/demo_umami/config/install/user.role.editor.yml b/web/core/profiles/demo_umami/config/install/user.role.editor.yml
index 40d5f651e..0a0558c76 100644
--- a/web/core/profiles/demo_umami/config/install/user.role.editor.yml
+++ b/web/core/profiles/demo_umami/config/install/user.role.editor.yml
@@ -2,6 +2,9 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_view_display.node.article.full
+    - core.entity_view_display.node.page.full
+    - core.entity_view_display.node.recipe.full
     - node.type.article
     - node.type.page
     - node.type.recipe
@@ -13,6 +16,7 @@ dependencies:
     - content_translation
     - contextual
     - file
+    - layout_builder
     - node
     - path
     - shortcut
@@ -33,6 +37,10 @@ permissions:
   - 'administer shortcuts'
   - 'cancel account'
   - 'change own username'
+  - 'configure editable article node layout overrides'
+  - 'configure editable page node layout overrides'
+  - 'configure editable recipe node layout overrides'
+  - 'create and edit custom blocks'
   - 'create content translations'
   - 'create terms in recipe_category'
   - 'create terms in tags'
diff --git a/web/core/profiles/demo_umami/demo_umami.info.yml b/web/core/profiles/demo_umami/demo_umami.info.yml
index 471e21d8e..c1ca1838a 100644
--- a/web/core/profiles/demo_umami/demo_umami.info.yml
+++ b/web/core/profiles/demo_umami/demo_umami.info.yml
@@ -8,7 +8,7 @@ install:
   - big_pipe
   - block
   - breakpoint
-  - ckeditor
+  - ckeditor5
   - config
   - contextual
   - contact
@@ -34,7 +34,6 @@ install:
   - toolbar
   - field_ui
   - file
-  - rdf
   - views
   - views_ui
   - tour
diff --git a/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php b/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
index f1d17a6cb..172e87768 100644
--- a/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
+++ b/web/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php
@@ -88,6 +88,11 @@ class InstallHelper implements ContainerInjectionInterface {
    */
   protected $nodeIdMap;
 
+  /**
+   * The module's path.
+   */
+  protected $module_path;
+
   /**
    * Constructs a new InstallHelper object.
    *
diff --git a/web/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php b/web/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
index 89f6a6a20..d82bede72 100644
--- a/web/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
+++ b/web/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php
@@ -91,8 +91,7 @@ protected function assertDefaultConfig(StorageInterface $default_config_storage,
   }
 
   /**
-   * Tests that the users can log in with the admin password selected at
-   * install.
+   * Tests that the users can log in with the admin password entered at install.
    */
   public function testUser() {
     $password = $this->rootUser->pass_raw;
@@ -128,6 +127,12 @@ public function testEditNodesByAdmin() {
     $node = reset($nodes);
     $this->drupalGet($node->toUrl('edit-form'));
     $webassert->statusCodeEquals('200');
+
+    $this->submitForm([], 'Preview');
+    $webassert->statusCodeEquals('200');
+    $this->assertSession()->elementsCount('css', 'h1', 1);
+    $this->clickLink('Back to content editing');
+
     $this->submitForm([], "Save");
     $webassert->pageTextContains('Recipe Deep mediterranean quiche has been updated.');
   }
diff --git a/web/core/profiles/demo_umami/themes/umami/css/base.css b/web/core/profiles/demo_umami/themes/umami/css/base.css
index 53443d5b5..32f675429 100644
--- a/web/core/profiles/demo_umami/themes/umami/css/base.css
+++ b/web/core/profiles/demo_umami/themes/umami/css/base.css
@@ -3,6 +3,52 @@
  * This is the base CSS file, for styling elements.
  */
 
+@font-face {
+  font-family: "Source Sans Pro";
+  src:
+    local("Source Sans Pro"),
+    url("../fonts/source-sans-pro-v21-latin-regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Source Sans Pro";
+  src:
+    local("Source Sans Pro"),
+    url("../fonts/source-sans-pro-v21-latin-italic.woff2") format("woff2");
+  font-weight: 400;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Source Sans Pro";
+  src:
+    local("Source Sans Pro"),
+    url("../fonts/source-sans-pro-v21-latin-700.woff2") format("woff2");
+  font-weight: 700;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: "Source Sans Pro";
+  src:
+    local("Source Sans Pro"),
+    url("../fonts/source-sans-pro-v21-latin-700italic.woff2") format("woff2");
+  font-weight: 700;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: "Scope One";
+  src:
+    local("Scope One"),
+    local("ScopeOne-Regular"),
+    url("../fonts/scope-one-v14-latin-regular.woff2") format("woff2");
+  font-weight: 400;
+  font-style: normal;
+}
+
 html {
   box-sizing: border-box;
 }
@@ -34,7 +80,7 @@ body {
   margin: 0;
   color: #464646;
   background: #fbf5ee;
-  font-family: "Open Sans", Verdana, sans-serif;
+  font-family: "Source Sans Pro", Verdana, sans-serif;
   font-size: 1rem;
   line-height: 1.5rem;
 }
diff --git a/web/core/profiles/demo_umami/themes/umami/css/components/tour/tour.theme.css b/web/core/profiles/demo_umami/themes/umami/css/components/tour/tour.theme.css
index 64ee4f64f..484cf8ed5 100644
--- a/web/core/profiles/demo_umami/themes/umami/css/components/tour/tour.theme.css
+++ b/web/core/profiles/demo_umami/themes/umami/css/components/tour/tour.theme.css
@@ -7,6 +7,7 @@
 }
 
 .shepherd-cancel-icon {
+  border: solid 2px transparent;
   line-height: 1;
 }
 
diff --git a/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js b/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js
index 0b9d95999..0ca2409c5 100644
--- a/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js
+++ b/web/core/profiles/demo_umami/themes/umami/js/classy/media_embed_ckeditor.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.mediaEmbedPreviewError = function () {
     return "<div class=\"media-embed-error media-embed-error--preview-error\">".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
diff --git a/web/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.js b/web/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.js
index 0705b50f5..7c00bff28 100644
--- a/web/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.js
+++ b/web/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.js
@@ -4,16 +4,13 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function () {
   var toggler = document.querySelector('[data-drupal-selector="menu-main-toggle"]');
   var menu = document.querySelector('[data-drupal-selector="menu-main"]');
-
   function toggleMenu() {
     toggler.classList.toggle('menu-main-toggle--active');
     menu.classList.toggle('menu-main--active');
     return false;
   }
-
   toggler.addEventListener('click', toggleMenu);
 })();
\ No newline at end of file
diff --git a/web/core/profiles/demo_umami/themes/umami/layouts/oneplusfourgrid_section/layout--oneplusfourgrid-section.html.twig b/web/core/profiles/demo_umami/themes/umami/layouts/oneplusfourgrid_section/layout--oneplusfourgrid-section.html.twig
index 5345bcae8..40fc3e770 100644
--- a/web/core/profiles/demo_umami/themes/umami/layouts/oneplusfourgrid_section/layout--oneplusfourgrid-section.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/layouts/oneplusfourgrid_section/layout--oneplusfourgrid-section.html.twig
@@ -4,6 +4,7 @@
  * Default theme implementation to display a one plus four grid layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  *
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig
index 407f8403f..db3f9f808 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig
index fd3311be9..114d7c4de 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/classy/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig
deleted file mode 100644
index acc62df16..000000000
--- a/web/core/profiles/demo_umami/themes/umami/templates/classy/misc/rdf-metadata.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
-/**
- * @file
- * Theme override for empty spans with RDF attributes.
- *
- * The XHTML+RDFa doctype allows either <span></span> or <span /> syntax to
- * be used, but for maximum browser compatibility, W3C recommends the
- * former when serving pages using the text/html media type, see
- * http://www.w3.org/TR/xhtml1/#C_3.
- *
- * Available variables:
- * - metadata: Each item within corresponds to its own set of attributes,
- *   and therefore, needs its own 'attributes' element.
- *
- * @see template_preprocess_rdf_metadata()
- */
-#}
-{% for attributes in metadata %}
-  <span{{ attributes.addClass('rdf-meta', 'hidden') }}></span>
-{% endfor %}
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig
index 9b13cd684..d23cc297b 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig
index e90416b9c..489dd0c2e 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/components/footer-promo-block/block--bundle--footer-promo-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/components/help-block/block--help.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/components/help-block/block--help.html.twig
index 20e2a4a9a..a924817e4 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/components/help-block/block--help.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/components/help-block/block--help.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/block--umami-main-menu.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/block--umami-main-menu.html.twig
index 51174d43c..ad21956c3 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/block--umami-main-menu.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/components/navigation/block--umami-main-menu.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/profiles/demo_umami/themes/umami/templates/components/search/block--search-form-block.html.twig b/web/core/profiles/demo_umami/themes/umami/templates/components/search/block--search-form-block.html.twig
index 01599d5f7..29e828c12 100644
--- a/web/core/profiles/demo_umami/themes/umami/templates/components/search/block--search-form-block.html.twig
+++ b/web/core/profiles/demo_umami/themes/umami/templates/components/search/block--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: A list HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template. Includes:
diff --git a/web/core/profiles/demo_umami/themes/umami/umami.info.yml b/web/core/profiles/demo_umami/themes/umami/umami.info.yml
index 28b4f51b0..f19837ed7 100644
--- a/web/core/profiles/demo_umami/themes/umami/umami.info.yml
+++ b/web/core/profiles/demo_umami/themes/umami/umami.info.yml
@@ -8,8 +8,6 @@ libraries:
   - core/normalize
   - umami/global
   - umami/messages
-  - umami/webfonts-open-sans
-  - umami/webfonts-scope-one
 
 libraries-override:
   layout_builder/twocol_section:
@@ -48,6 +46,8 @@ libraries-extend:
     - umami/classy.media_library
   user/drupal.user:
     - umami/user
+  node/drupal.node.preview:
+    - umami/drupal.node.preview
 
 regions:
   pre_header: Pre-header
@@ -64,6 +64,3 @@ regions:
   bottom: Bottom
   page_top: 'Page top' # Needed by Drupal Core
   page_bottom: 'Page bottom' # Needed by Drupal Core
-
-ckeditor_stylesheets:
-  - css/classy/components/media-embed-error.css
diff --git a/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml b/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml
index 310b14f13..f91a631c6 100644
--- a/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml
+++ b/web/core/profiles/demo_umami/themes/umami/umami.libraries.yml
@@ -84,26 +84,6 @@ user:
     component:
       css/components/user/user.css: { weight: -10 }
 
-webfonts-open-sans:
-  remote: https://fonts.google.com
-  license:
-    name: Apache License, Version 2.0
-    url: http://www.apache.org/licenses/LICENSE-2.0
-    gpl-compatible: false
-  css:
-    theme:
-      'https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700,700i': { type: external, minified: true }
-
-webfonts-scope-one:
-  remote: https://fonts.google.com
-  license:
-    name: SIL Open Font License, Version 1.1
-    url: http://scripts.sil.org/OFL_web
-    gpl-compatible: false
-  css:
-    theme:
-      'https://fonts.googleapis.com/css?family=Scope+One': { type: external, minified: true }
-
 view-mode-card:
   css:
     theme:
@@ -129,10 +109,10 @@ view-mode-card-common-alt:
 
 demo-umami-tour:
   css:
-   theme:
+    theme:
       css/components/tour/tour.theme.css: {}
   dependencies:
-    - seven/tour-styling
+    - claro/tour-styling
 
 oneplusfourgrid_section:
   css:
@@ -243,3 +223,9 @@ classy.search-results:
   css:
     component:
       css/classy/components/search-results.css: {}
+
+drupal.node.preview:
+  version: VERSION
+  css:
+    theme:
+      css/components/content/node-preview.css: {}
diff --git a/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml b/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
index a0333f736..15cc3308b 100644
--- a/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
+++ b/web/core/profiles/standard/config/install/core.entity_form_display.node.article.default.yml
@@ -20,7 +20,7 @@ mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 1
+    weight: 2
     region: content
     settings:
       rows: 9
@@ -42,7 +42,7 @@ content:
     third_party_settings: {  }
   field_image:
     type: image_image
-    weight: 4
+    weight: 1
     region: content
     settings:
       progress_indicator: throbber
diff --git a/web/core/profiles/standard/config/install/editor.editor.basic_html.yml b/web/core/profiles/standard/config/install/editor.editor.basic_html.yml
index cafc88e22..63ecbc5a3 100644
--- a/web/core/profiles/standard/config/install/editor.editor.basic_html.yml
+++ b/web/core/profiles/standard/config/install/editor.editor.basic_html.yml
@@ -4,42 +4,55 @@ dependencies:
   config:
     - filter.format.basic_html
   module:
-    - ckeditor
+    - ckeditor5
 format: basic_html
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
-        -
-          name: Formatting
-          items:
-            - Bold
-            - Italic
-        -
-          name: Linking
-          items:
-            - DrupalLink
-            - DrupalUnlink
-        -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
-        -
-          name: Media
-          items:
-            - Blockquote
-            - DrupalImage
-        -
-          name: 'Block Formatting'
-          items:
-            - Format
-        -
-          name: Tools
-          items:
-            - Source
-  plugins: {}
+    items:
+      - bold
+      - italic
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalInsertImage
+      - '|'
+      - heading
+      - code
+      - '|'
+      - sourceEditing
+  plugins:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_sourceEditing:
+      allowed_tags:
+        - '<cite>'
+        - '<dl>'
+        - '<dt>'
+        - '<dd>'
+        - '<a hreflang>'
+        - '<blockquote cite>'
+        - '<ul type>'
+        - '<ol start type>'
+        - '<h2 id>'
+        - '<h3 id>'
+        - '<h4 id>'
+        - '<h5 id>'
+        - '<h6 id>'
+    ckeditor5_list:
+      reversed: false
+      startIndex: true
+    ckeditor5_imageResize:
+      allow_resize: true
 image_upload:
   status: true
   scheme: public
diff --git a/web/core/profiles/standard/config/install/editor.editor.full_html.yml b/web/core/profiles/standard/config/install/editor.editor.full_html.yml
index a423369d1..931bada87 100644
--- a/web/core/profiles/standard/config/install/editor.editor.full_html.yml
+++ b/web/core/profiles/standard/config/install/editor.editor.full_html.yml
@@ -4,50 +4,48 @@ dependencies:
   config:
     - filter.format.full_html
   module:
-    - ckeditor
+    - ckeditor5
 format: full_html
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
-        -
-          name: Formatting
-          items:
-            - Bold
-            - Italic
-            - Strike
-            - Superscript
-            - Subscript
-            - '-'
-            - RemoveFormat
-        -
-          name: Linking
-          items:
-            - DrupalLink
-            - DrupalUnlink
-        -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
-        -
-          name: Media
-          items:
-            - Blockquote
-            - DrupalImage
-            - Table
-            - HorizontalRule
-        -
-          name: 'Block Formatting'
-          items:
-            - Format
-        -
-          name: Tools
-          items:
-            - ShowBlocks
-            - Source
-  plugins: {}
+    items:
+      - bold
+      - italic
+      - strikethrough
+      - superscript
+      - subscript
+      - removeFormat
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalInsertImage
+      - insertTable
+      - horizontalLine
+      - '|'
+      - heading
+      - codeBlock
+      - '|'
+      - sourceEditing
+  plugins:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_sourceEditing:
+      allowed_tags: {  }
+    ckeditor5_list:
+      reversed: true
+      startIndex: true
+    ckeditor5_imageResize:
+      allow_resize: true
 image_upload:
   status: true
   scheme: public
diff --git a/web/core/profiles/standard/config/install/filter.format.basic_html.yml b/web/core/profiles/standard/config/install/filter.format.basic_html.yml
index 92224c23c..7bf4073c9 100644
--- a/web/core/profiles/standard/config/install/filter.format.basic_html.yml
+++ b/web/core/profiles/standard/config/install/filter.format.basic_html.yml
@@ -15,7 +15,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<a href hreflang> <em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption>'
+      allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <a hreflang href> <blockquote cite> <ul type> <ol start type> <strong> <em> <code> <li> <img src alt data-entity-uuid data-entity-type height width data-caption data-align>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_align:
diff --git a/web/core/profiles/standard/config/install/rdf.mapping.comment.comment.yml b/web/core/profiles/standard/config/install/rdf.mapping.comment.comment.yml
deleted file mode 100644
index f0d587a66..000000000
--- a/web/core/profiles/standard/config/install/rdf.mapping.comment.comment.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - comment.type.comment
-  module:
-    - comment
-id: comment.comment
-targetEntityType: comment
-bundle: comment
-types:
-  - 'schema:Comment'
-fieldMappings:
-  subject:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  comment_body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
diff --git a/web/core/profiles/standard/config/install/rdf.mapping.node.article.yml b/web/core/profiles/standard/config/install/rdf.mapping.node.article.yml
deleted file mode 100644
index 724275981..000000000
--- a/web/core/profiles/standard/config/install/rdf.mapping.node.article.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.article
-  module:
-    - node
-id: node.article
-targetEntityType: node
-bundle: article
-types:
-  - 'schema:Article'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-  comment:
-    properties:
-      - 'schema:comment'
-    mapping_type: rel
-  comment_count:
-    properties:
-      - 'schema:interactionCount'
-    datatype_callback:
-      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
-      arguments:
-        interaction_type: UserComments
-  field_image:
-    properties:
-      - 'schema:image'
-  field_tags:
-    properties:
-      - 'schema:about'
diff --git a/web/core/profiles/standard/config/install/rdf.mapping.node.page.yml b/web/core/profiles/standard/config/install/rdf.mapping.node.page.yml
deleted file mode 100644
index dd6535c30..000000000
--- a/web/core/profiles/standard/config/install/rdf.mapping.node.page.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - node.type.page
-  module:
-    - node
-id: node.page
-targetEntityType: node
-bundle: page
-types:
-  - 'schema:WebPage'
-fieldMappings:
-  title:
-    properties:
-      - 'schema:name'
-  created:
-    properties:
-      - 'schema:dateCreated'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  changed:
-    properties:
-      - 'schema:dateModified'
-    datatype_callback:
-      callable: 'Drupal\rdf\CommonDataConverter::dateIso8601Value'
-  body:
-    properties:
-      - 'schema:text'
-  uid:
-    properties:
-      - 'schema:author'
-    mapping_type: rel
-  comment_count:
-    properties:
-      - 'schema:interactionCount'
-    datatype_callback:
-      callable: 'Drupal\rdf\SchemaOrgDataConverter::interactionCount'
-      arguments:
-        interaction_type: UserComments
diff --git a/web/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml b/web/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
deleted file mode 100644
index 46b43f15f..000000000
--- a/web/core/profiles/standard/config/install/rdf.mapping.taxonomy_term.tags.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - taxonomy.vocabulary.tags
-  module:
-    - taxonomy
-id: taxonomy_term.tags
-targetEntityType: taxonomy_term
-bundle: tags
-types:
-  - 'schema:Thing'
-fieldMappings:
-  name:
-    properties:
-      - 'schema:name'
-  description:
-    properties:
-      - 'schema:description'
diff --git a/web/core/profiles/standard/standard.info.yml b/web/core/profiles/standard/standard.info.yml
index e6af5c213..34accc8bd 100644
--- a/web/core/profiles/standard/standard.info.yml
+++ b/web/core/profiles/standard/standard.info.yml
@@ -7,7 +7,7 @@ install:
   - history
   - block
   - breakpoint
-  - ckeditor
+  - ckeditor5
   - config
   - comment
   - contextual
@@ -31,7 +31,6 @@ install:
   - toolbar
   - field_ui
   - file
-  - rdf
   - views
   - views_ui
   - tour
diff --git a/web/core/profiles/standard/tests/src/Functional/StandardTest.php b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
index 77737d686..232a7ee69 100644
--- a/web/core/profiles/standard/tests/src/Functional/StandardTest.php
+++ b/web/core/profiles/standard/tests/src/Functional/StandardTest.php
@@ -2,7 +2,9 @@
 
 namespace Drupal\Tests\standard\Functional;
 
+use Drupal\ckeditor5\Plugin\Editor\CKEditor5;
 use Drupal\Component\Utility\Html;
+use Drupal\editor\Entity\Editor;
 use Drupal\media\Entity\MediaType;
 use Drupal\media\Plugin\media\Source\Image;
 use Drupal\Tests\SchemaCheckTestTrait;
@@ -13,6 +15,7 @@
 use Drupal\Tests\BrowserTestBase;
 use Drupal\Tests\RequirementsPageTrait;
 use Drupal\user\Entity\Role;
+use Symfony\Component\Validator\ConstraintViolation;
 
 /**
  * Tests Standard installation profile expectations.
@@ -106,10 +109,29 @@ public function testStandard() {
       $this->assertConfigSchema($typed_config, $name, $config->get());
     }
 
+    // Validate all configuration.
+    // @todo Generalize in https://www.drupal.org/project/drupal/issues/2164373
+    foreach (Editor::loadMultiple() as $editor) {
+      // Currently only text editors using CKEditor 5 can be validated.
+      if ($editor->getEditor() !== 'ckeditor5') {
+        continue;
+      }
+
+      $this->assertSame([], array_map(
+        function (ConstraintViolation $v) {
+          return (string) $v->getMessage();
+        },
+        iterator_to_array(CKEditor5::validatePair(
+          $editor,
+          $editor->getFilterFormat()
+        ))
+      ));
+    }
+
     // Ensure that configuration from the Standard profile is not reused when
     // enabling a module again since it contains configuration that can not be
     // installed. For example, editor.editor.basic_html is editor configuration
-    // that depends on the ckeditor module. The ckeditor module can not be
+    // that depends on the CKEditor 5 module. The CKEditor 5 module can not be
     // installed before the editor module since it depends on the editor module.
     // The installer does not have this limitation since it ensures that all of
     // the install profiles dependencies are installed before creating the
@@ -122,7 +144,7 @@ public function testStandard() {
       $filter->removeFilter('editor_file_reference');
       $filter->save();
     }
-    \Drupal::service('module_installer')->uninstall(['editor', 'ckeditor']);
+    \Drupal::service('module_installer')->uninstall(['editor', 'ckeditor5']);
     $this->rebuildContainer();
     \Drupal::service('module_installer')->install(['editor']);
     /** @var \Drupal\contact\ContactFormInterface $contact_form */
diff --git a/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/tests/src/Kernel/SystemListingCrossProfileCompatibleTest.php b/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/tests/src/Kernel/SystemListingCrossProfileCompatibleTest.php
index e20f39e2f..c3b9e5605 100644
--- a/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/tests/src/Kernel/SystemListingCrossProfileCompatibleTest.php
+++ b/web/core/profiles/testing/modules/drupal_system_listing_compatible_test/tests/src/Kernel/SystemListingCrossProfileCompatibleTest.php
@@ -5,8 +5,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Verifies that tests in installation profile modules are found and may use
- * another profile for running tests.
+ * Verifies that tests in installation profile modules are found.
  *
  * @group drupal_system_listing_compatible_test
  */
diff --git a/web/core/profiles/testing_install_profile_all_dependencies/testing_install_profile_all_dependencies.info.yml b/web/core/profiles/testing_install_profile_all_dependencies/testing_install_profile_all_dependencies.info.yml
index 64495e648..99d15b17a 100644
--- a/web/core/profiles/testing_install_profile_all_dependencies/testing_install_profile_all_dependencies.info.yml
+++ b/web/core/profiles/testing_install_profile_all_dependencies/testing_install_profile_all_dependencies.info.yml
@@ -8,4 +8,4 @@ dependencies:
   - drupal:dblog
 install: []
 themes:
-  - classy
+  - starterkit_theme
diff --git a/web/core/profiles/testing_install_profile_dependencies/testing_install_profile_dependencies.info.yml b/web/core/profiles/testing_install_profile_dependencies/testing_install_profile_dependencies.info.yml
index cb884f3aa..4ba88d8fe 100644
--- a/web/core/profiles/testing_install_profile_dependencies/testing_install_profile_dependencies.info.yml
+++ b/web/core/profiles/testing_install_profile_dependencies/testing_install_profile_dependencies.info.yml
@@ -8,4 +8,4 @@ dependencies:
 install:
   - ban
 themes:
-  - classy
+  - starterkit_theme
diff --git a/web/core/scripts/css/compile.js b/web/core/scripts/css/compile.js
index 810e3ea38..0196d3c59 100644
--- a/web/core/scripts/css/compile.js
+++ b/web/core/scripts/css/compile.js
@@ -9,6 +9,7 @@ const postcssUrl = require('postcss-url');
 const postcssPresetEnv = require('postcss-preset-env');
 // cspell:ignore pxtorem
 const postcssPixelsToRem = require('postcss-pxtorem');
+const stylelint = require('stylelint');
 
 module.exports = (filePath, callback) => {
   // Transform the file.
@@ -78,7 +79,13 @@ module.exports = (filePath, callback) => {
     ])
     .process(css, { from: filePath })
     .then(result => {
-      callback(result.css);
+      return stylelint.lint({
+        code: result.css,
+        fix: true
+      });
+    })
+    .then(result => {
+      callback(result.output);
     })
     .catch(error => {
       log(chalk.red(error));
diff --git a/web/core/scripts/dev/commit-code-check.sh b/web/core/scripts/dev/commit-code-check.sh
index d1a2bb776..949aa4d8e 100755
--- a/web/core/scripts/dev/commit-code-check.sh
+++ b/web/core/scripts/dev/commit-code-check.sh
@@ -72,29 +72,31 @@ if [[ "$DRUPALCI" == "1" ]]; then
   green=""
   reset=""
   DRUPAL_VERSION=$(php -r "include 'vendor/autoload.php'; print preg_replace('#\.[0-9]+-dev#', '.x', \Drupal::VERSION);")
+  GIT="sudo -u www-data git"
 else
   red=$(tput setaf 1 && tput bold)
   green=$(tput setaf 2)
   reset=$(tput sgr0)
+  GIT="git"
 fi
 
 # Gets list of files to check.
 if [[ "$BRANCH" != "" ]]; then
-  FILES=$(git diff --name-only $BRANCH HEAD);
+  FILES=$($GIT diff --name-only $BRANCH HEAD);
 elif [[ "$CACHED" == "0" ]]; then
   # For DrupalCI patch testing or when running without --cached or --branch,
   # list of all changes in the working directory.
-  FILES=$(git ls-files --other --modified --exclude-standard --exclude=vendor)
+  FILES=$($GIT ls-files --other --modified --exclude-standard --exclude=vendor)
 else
   # Check staged files only.
-  if git rev-parse --verify HEAD >/dev/null 2>&1
+  if $GIT rev-parse --verify HEAD >/dev/null 2>&1
   then
     AGAINST=HEAD
   else
     # Initial commit: diff against an empty tree object
     AGAINST=4b825dc642cb6eb9a060e54bf8d69288fbee4904
   fi
-  FILES=$(git diff --cached --name-only $AGAINST);
+  FILES=$($GIT diff --cached --name-only $AGAINST);
 fi
 
 if [[ "$FILES" == "" ]] && [[ "$DRUPALCI" == "1" ]]; then
@@ -102,10 +104,10 @@ if [[ "$FILES" == "" ]] && [[ "$DRUPALCI" == "1" ]]; then
   # need to diff against the Drupal branch or tag related to the Drupal version.
   printf "Creating list of files to check by comparing branch to %s\n" "$DRUPAL_VERSION"
   # On DrupalCI there's a merge commit so we can compare to HEAD~1.
-  FILES=$(git diff --name-only HEAD~1 HEAD);
+  FILES=$($GIT diff --name-only HEAD~1 HEAD);
 fi
 
-TOP_LEVEL=$(git rev-parse --show-toplevel)
+TOP_LEVEL=$($GIT rev-parse --show-toplevel)
 
 # This variable will be set to one when the file core/phpcs.xml.dist is changed.
 PHPCS_XML_DIST_FILE_CHANGED=0
@@ -123,6 +125,12 @@ ESLINT_CONFIG_PASSING_FILE_CHANGED=0
 #  - core/.stylelintrc.json
 STYLELINT_CONFIG_FILE_CHANGED=0
 
+# This variable will be set to one when JavaScript packages files are changed.
+# changed:
+#  - core/package.json
+#  - core/yarn.lock
+JAVASCRIPT_PACKAGES_CHANGED=0
+
 # This variable will be set when a Drupal-specific CKEditor 5 plugin has changed
 # it is used to make sure the compiled JS is valid.
 CKEDITOR5_PLUGINS_CHANGED=0
@@ -148,6 +156,7 @@ for FILE in $FILES; do
   if [[ $FILE == "core/package.json" || $FILE == "core/yarn.lock" ]]; then
     ESLINT_CONFIG_PASSING_FILE_CHANGED=1;
     STYLELINT_CONFIG_FILE_CHANGED=1;
+    JAVASCRIPT_PACKAGES_CHANGED=1;
   fi;
 
   if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.js$ ]] && [[ $FILE =~ ^core/modules/ckeditor5/js/build || $FILE =~ ^core/modules/ckeditor5/js/ckeditor5_plugins ]]; then
@@ -205,10 +214,10 @@ printf "\n"
 printf -- '-%.0s' {1..100}
 printf "\n"
 
-# When the file core/phpcs.xml.dist has been changed, then PHPCS must check all files.
-if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]]; then
+# Run PHPCS on all files on DrupalCI or when phpcs files are changed.
+if [[ $PHPCS_XML_DIST_FILE_CHANGED == "1" ]] || [[ "$DRUPALCI" == "1" ]]; then
   # Test all files with phpcs rules.
-  vendor/bin/phpcs -ps --standard="$TOP_LEVEL/core/phpcs.xml.dist"
+  vendor/bin/phpcs -ps --parallel=$(nproc) --standard="$TOP_LEVEL/core/phpcs.xml.dist"
   PHPCS=$?
   if [ "$PHPCS" -ne "0" ]; then
     # If there are failures set the status to a number other than 0.
@@ -281,6 +290,25 @@ if [[ "$DRUPALCI" == "1" ]] && [[ $CKEDITOR5_PLUGINS_CHANGED == "1" ]]; then
   printf "\n"
 fi
 
+# When JavaScript packages change, then rerun all JavaScript style checks.
+if [[ "$JAVASCRIPT_PACKAGES_CHANGED" == "1" ]]; then
+  cd "$TOP_LEVEL/core"
+  yarn run build:css --check
+  CORRECTCSS=$?
+  if [ "$CORRECTCSS" -ne "0" ]; then
+    FINAL_STATUS=1
+    printf "\n${red}ERROR: The compiled CSS from the PCSS files"
+    printf "\n       does not match the current CSS files. Some added"
+    printf "\n       or updated JavaScript package made changes."
+    printf "\n       Recompile the CSS with: yarn run build:css${reset}\n\n"
+  fi
+  cd $TOP_LEVEL
+  # Add a separator line to make the output easier to read.
+  printf "\n"
+  printf -- '-%.0s' {1..100}
+  printf "\n"
+fi
+
 for FILE in $FILES; do
   STATUS=0;
   # Print a line to separate spellcheck output from per file output.
@@ -317,7 +345,7 @@ for FILE in $FILES; do
   ############################################################################
   ### PHP AND YAML FILES
   ############################################################################
-  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.(inc|install|module|php|profile|test|theme|yml)$ ]] && [[ $PHPCS_XML_DIST_FILE_CHANGED == "0" ]]; then
+  if [[ -f "$TOP_LEVEL/$FILE" ]] && [[ $FILE =~ \.(inc|install|module|php|profile|test|theme|yml)$ ]] && [[ $PHPCS_XML_DIST_FILE_CHANGED == "0" ]] && [[ "$DRUPALCI" == "0" ]]; then
     # Test files with phpcs rules.
     vendor/bin/phpcs "$TOP_LEVEL/$FILE" --standard="$TOP_LEVEL/core/phpcs.xml.dist"
     PHPCS=$?
@@ -390,7 +418,7 @@ for FILE in $FILES; do
     else
       # If there is no .es6.js file then there should be unless the .js is
       # not really Drupal's.
-      if ! [[ "$FILE" =~ ^core/assets/vendor ]] && ! [[ "$FILE" =~ ^core/modules/ckeditor5/js/build ]] && ! [[ "$FILE" =~ ^core/scripts/js ]] && ! [[ "$FILE" =~ ^core/scripts/css ]] && ! [[ "$FILE" =~ core/postcss.config.js ]] && ! [[ "$FILE" =~ webpack.config.js$ ]] && ! [[ -f "$TOP_LEVEL/$BASENAME.es6.js" ]] && ! [[ "$FILE" =~ core/modules/ckeditor5/tests/modules/ckeditor5_test/js/build/layercake.js ]]; then
+      if ! [[ "$FILE" =~ ^core/assets/vendor ]] && ! [[ "$FILE" =~ ^core/modules/ckeditor5/js/build ]] && ! [[ "$FILE" =~ ^core/scripts/js ]] && ! [[ "$FILE" =~ ^core/scripts/css ]] && ! [[ "$FILE" =~ webpack.config.js$ ]] && ! [[ -f "$TOP_LEVEL/$BASENAME.es6.js" ]] && ! [[ "$FILE" =~ core/modules/ckeditor5/tests/modules/ckeditor5_test/js/build/layercake.js ]]; then
         printf "${red}FAILURE${reset} $FILE does not have a corresponding $BASENAME.es6.js\n"
         STATUS=1
       fi
@@ -441,9 +469,13 @@ for FILE in $FILES; do
       yarn run build:css --check --file "$TOP_LEVEL/$BASENAME.pcss.css"
       CORRECTCSS=$?
       if [ "$CORRECTCSS" -ne "0" ]; then
-        # No need to write any output the yarn run command will do this for
-        # us.
+        # If the CSS does not match the PCSS, set the status to a number other
+        # than 0.
         STATUS=1
+        printf "\n${red}ERROR: The compiled CSS from"
+        printf "\n       ${BASENAME}.pcss.css"
+        printf "\n       does not match its CSS file. Recompile the CSS with:"
+        printf "\n       yarn run build:css${reset}\n\n"
       fi
       cd $TOP_LEVEL
     fi
diff --git a/web/core/scripts/generate-proxy-class.php b/web/core/scripts/generate-proxy-class.php
index 2664739be..a06293d5f 100644
--- a/web/core/scripts/generate-proxy-class.php
+++ b/web/core/scripts/generate-proxy-class.php
@@ -3,7 +3,14 @@
 
 /**
  * @file
- * A command line application to generate proxy classes.
+ * A script to generate proxy classes for lazy services.
+ *
+ * For help, type this command from the root directory of an installed Drupal
+ * site: php core/scripts/generate-proxy-class.php -h generate-proxy-class
+ *
+ * @ingroup container
+ *
+ * @see lazy_services
  */
 
 use Drupal\Core\Command\GenerateProxyClassApplication;
diff --git a/web/core/scripts/js/vendor-update.js b/web/core/scripts/js/vendor-update.js
index 56f79e075..abfd1f247 100644
--- a/web/core/scripts/js/vendor-update.js
+++ b/web/core/scripts/js/vendor-update.js
@@ -173,9 +173,14 @@ const assetsFolder = `${coreFolder}/assets/vendor`;
         { from: 'dist/umd/popper.min.js.map', to: 'popper.min.js.map' },
       ],
     },
+    {
+      pack: 'shepherd.js',
+      library: 'shepherd',
+    },
     {
       pack: 'shepherd.js',
       folder: 'shepherd',
+      library: 'internal.shepherd',
       files: [
         { from: 'dist/js/shepherd.min.js', to: 'shepherd.min.js' },
         { from: 'dist/js/shepherd.min.js.map', to: 'shepherd.min.js.map' },
diff --git a/web/core/scripts/run-tests.sh b/web/core/scripts/run-tests.sh
index c93271a58..59149f587 100755
--- a/web/core/scripts/run-tests.sh
+++ b/web/core/scripts/run-tests.sh
@@ -2,7 +2,12 @@
 
 /**
  * @file
- * This script runs Drupal tests from command line.
+ * Script for running tests on DrupalCI.
+ *
+ * This script is intended for use only by drupal.org's testing. In general,
+ * tests should be run directly with phpunit.
+ *
+ * @internal
  */
 
 use Drupal\Component\FileSystem\FileSystem;
@@ -172,8 +177,8 @@ simpletest_script_reporter_timer_stop();
 
 // Ensure all test locks are released once finished. If tests are run with a
 // concurrency of 1 the each test will clean up its own lock. Test locks are
-// not released if using a higher concurrency to ensure each test method has
-// unique fixtures.
+// not released if using a higher concurrency to ensure each test has unique
+// fixtures.
 TestDatabase::releaseAllTestLocks();
 
 // Display results before database is cleared.
@@ -275,9 +280,6 @@ All arguments are long options.
               (e.g., 'node')
 
   --class     Run tests identified by specific class names, instead of group names.
-              A specific test method can be added, for example,
-              'Drupal\book\Tests\BookTest::testBookExport'. This argument must
-              be last on the command line.
 
   --file      Run tests identified by specific file names, instead of group names.
               Specify the path and the extension
@@ -548,7 +550,11 @@ function simpletest_script_init() {
   if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
     // Ensure that any and all environment variables are changed to https://.
     foreach ($_SERVER as $key => $value) {
-      $_SERVER[$key] = str_replace('http://', 'https://', $_SERVER[$key]);
+      // Some values are NULL. Non-NULL values which are falsy will not contain
+      // text to replace.
+      if ($value) {
+        $_SERVER[$key] = str_replace('http://', 'https://', $value);
+      }
     }
   }
 
@@ -607,7 +613,7 @@ function simpletest_script_setup_database($new = FALSE) {
     // Remove a possibly existing default connection (from settings.php).
     Database::removeConnection('default');
     try {
-      $databases['default']['default'] = Database::convertDbUrlToConnectionInfo($args['dburl'], DRUPAL_ROOT);
+      $databases['default']['default'] = Database::convertDbUrlToConnectionInfo($args['dburl'], DRUPAL_ROOT, TRUE);
     }
     catch (\InvalidArgumentException $e) {
       simpletest_script_print_error('Invalid --dburl. Reason: ' . $e->getMessage());
diff --git a/web/core/scripts/transliteration_data.php.txt b/web/core/scripts/transliteration_data.php.txt
deleted file mode 100644
index 6a9d881c0..000000000
--- a/web/core/scripts/transliteration_data.php.txt
+++ /dev/null
@@ -1,664 +0,0 @@
-<?php
-
-/**
- * @file
- * Unifies formats of transliteration data from various sources.
- *
- * A few notes about this script:
- * - The functions in this file are NOT SECURE, because they use PHP functions
- *   like eval(). Absolutely do not run this script unless you trust the data
- *   files used for input.
- * - You will need to change the name of this file to remove the .txt extension
- *   before running it (it has been given this name so that you cannot run it
- *   by mistake). When you do that, move it out of your web root as well so
- *   that it cannot be run via a URL, and run the script via the PHP command
- *   at a command prompt.
- * - This script, depending on which portions of it you run, depends on having
- *   input data from various sources in sub-directories below where this file
- *   is located. The data inputs are as follows:
- *   - Existing Drupal Core transliteration data: Sub-directory 'data'; comes
- *     from core/lib/Drupal/Component/Transliteration/data
- *   - Midgardmvc data: Sub-directory 'utf8_to_ascii_db'; download from
- *     https://github.com/bergie/midgardmvc_helper_urlize/downloads
- *   - CPAN Text-Unidecode data: Sub-directory 'Unidecode'; download from
- *     http://search.cpan.org/~sburke/Text-Unidecode-0.04/lib/Text/Unidecode.pm
- *   - Node.js project: Sub-directory 'unidecoder_data'; download from
- *     https://github.com/bitwalker/stringex/downloads
- *   - JUnidecode project: Sub-directory 'junidecode'; download source from
- *     http://www.ippatsuman.com/projects/junidecode/index.html
- * - You will also need to make directory 'outdata' to hold output.
- * - If you plan to use the 'intl' data, you will also need to have the PECL
- *   packages 'yaml' and 'intl' installed.  See
- *   http://php.net/manual/install.pecl.downloads.php for generic PECL
- *   package installation instructions. The following commands on Ubuntu Linux
- *   will install yaml and intl packages:
- *   @code
- *   sudo apt-get install libyaml-dev
- *   sudo pecl install yaml
- *   sudo apt-get install php5-intl
- *   sudo apt-get install libicu-dev
- *   sudo pecl install intl
- *   @endcode
- *   After running these commands, you will need to make sure
- *   'extension=intl.so' and 'extension=yaml.so' are added to the php.ini file
- *   that is in use for the PHP command-line command.
- * - When you have collected all of the data and installed the required
- *   packages, you will need to find the specific commands below that you want
- *   to use and un-comment them. The preferred data source for Drupal Core is
- *   the PECL 'intl' package, and the line that needs to be un-commented in
- *   order to make a Drupal Core patch is:
- *   @code
- *   patch_drupal('outdata');
- *   @endcode
- * - The functions are documented in more detail in their headers where they
- *   are defined. Many have parameters that you can use to change the output.
- */
-
-// Commands to read various data sources:
-// $data = read_drupal_data();
-// $data = read_midgard_data();
-// $data = read_cpan_data();
-// $data = read_nodejs_data();
-// $data = read_intl_data();
-// $data = read_junidecode_data();
-
-// After running a read_*_data() function, you can print out the data
-// (it will make a LOT of output):
-// print_r($data);
-
-// Command to read in all of data sources and output in CSV format, explaining
-// the differences:
-// read_all_to_csv();
-
-// Command to patch Drupal Core data, using the intl data set, and put the
-// resulting changed data files in the 'outdata' directory:
-patch_drupal('outdata');
-
-/**
- * Reads in all transliteration data and outputs differences in CSV format.
- *
- * Each data set is compared to the Drupal Core reference data set, and the
- * differences are noted. The data must be in the locations noted in the
- * file header above. The CSV output has several columns. The first one is the
- * Unicode character code. The next columns contain the transliteration of
- * that character in each of the data sets. The last column, tells what the
- * differences are between the Drupal Core reference set and the other data
- * sets:
- * - missing: The target set is missing data that the Drupal set has.
- * - provided: The target set has provided data that Drupal does not have.
- * - case: The target and Drupal set output differ only in upper/lower case.
- * - different: The target and Drupal set output differ in more than just case.
- *
- * @param bool $print_all
- *   TRUE to print all data; FALSE (default) to print just data where there
- *   are differences between the Drupal set and other data sources.
- * @param bool $print_missing
- *   TRUE to print cases where one of the non-Drupal sets is missing information
- *   and that is the only difference; FALSE (default) to include these rows.
- */
-function read_all_to_csv($print_all = FALSE, $print_missing = FALSE) {
-  $data = array();
-  $types = array('drupal', 'midgard', 'cpan', 'nodejs', 'junidecode', 'intl');
-
-  // Alternatively, if you just want to compare a couple of data sets, you can
-  // uncomment and edit the following line:
-  // $types = array('drupal', 'intl');
-
-  // Read in all the data.
-  foreach ($types as $type) {
-    $data[$type] = call_user_func('read_' . $type . '_data');
-  }
-
-  // Print CSV header row.
-  print "character,";
-  print implode(',', $types);
-  print ",why\n";
-
-  // Go through all the banks of character data.
-  for ($bank = 0; $bank < 256; $bank++) {
-
-    // Go through characters in bank; skip pure ASCII characters.
-    $start = ($bank == 0) ? 0x80 : 0;
-    for ($chr = $start; $chr < 256; $chr++) {
-
-      // Gather the data together for this character.
-      $row = array();
-      foreach ($types as $type) {
-        $row[$type] = (isset($data[$type][$bank][$chr]) && is_string($data[$type][$bank][$chr])) ? $data[$type][$bank][$chr] : '';
-      }
-
-      // Only print if there are differences or we are printing all data.
-      $print = $print_all;
-      $ref = $row['drupal'];
-      $why = array();
-      foreach ($types as $type) {
-        // Try to characterize what the differences are.
-        if ($row[$type] != $ref) {
-          if ($row[$type] == '') {
-            $why['missing'] = 'missing';
-            if ($print_missing) {
-              $print = TRUE;
-            }
-          }
-          elseif ($ref == '') {
-            $why['provided'] = 'provided';
-            $print = TRUE;
-          }
-          elseif ($row[$type] == strtolower($ref) || $row[$type] == strtoupper($ref)) {
-            $why['case'] = 'case';
-            $print = TRUE;
-          }
-          else {
-            $why['different'] = 'different';
-            $print = TRUE;
-          }
-        }
-      }
-
-      // Print the data line.
-      if ($print) {
-        print '0x' . sprintf('%04x', 256 * $bank + $chr) . ',';
-        foreach ($row as $out) {
-          print '"' . addcslashes($out, '"') . '", ';
-        }
-        print implode(':', $why);
-        print "\n";
-      }
-    }
-  }
-}
-
-/**
- * Reads in 'intl' transliteration data and writes out changed Drupal files.
- *
- * Writes out the Drupal data files that would have to change to make our data
- * match the intl data set.
- *
- * @param string $outdir
- *   Directory to put the patched data files in (under where the script is
- *   being run).
- */
-function patch_drupal($outdir) {
-  $data = array();
-
-  // Note that this is hard-wired below. Changing this line will have no
-  // effect except to break this function.
-  $types = array('drupal', 'intl');
-
-  // Read in all the data.
-  foreach ($types as $type) {
-    $data[$type] = call_user_func('read_' . $type . '_data');
-  }
-
-  // Go through all the banks of character data.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $print_bank = FALSE;
-
-    // Go through characters in bank; skip pure ASCII characters.
-    $start = ($bank == 0) ? 0x80 : 0;
-    $newdata = array();
-    for ($chr = 0; $chr < 256; $chr++) {
-      // Fill up the start of the ASCII range.
-      if ($chr < $start) {
-        $newdata[$chr] = chr($chr);
-        continue;
-      }
-
-      // Figure out what characters we actually have.
-      $drupal = isset($data['drupal'][$bank][$chr]) ? $data['drupal'][$bank][$chr] : NULL;
-      // Note that for intl, we only want to keep the transliteration if it
-      // has something other than '' in it.
-      $intl = isset($data['intl'][$bank][$chr]) && $data['intl'][$bank][$chr] != '' ? $data['intl'][$bank][$chr] : NULL;
-      // Make sure we have something in the Drupal data set, in case we need
-      // to print.
-      $newdata[$chr] = $drupal;
-
-      if (!isset($intl)) {
-        continue;
-      }
-      if (!isset($drupal) || $drupal != $intl) {
-        $print_bank = TRUE;
-        $newdata[$chr] = $intl;
-      }
-    }
-
-    // If we found a difference, output a data file.
-    if ($print_bank) {
-      write_data_file($newdata, $bank, $outdir);
-    }
-  }
-}
-
-/**
- * Reads in the Drupal Core generic transliteration data set.
- *
- * The data is expected to be in files xNN.php in directory 'data' under
- * this file's directory.
- *
- * @return array
- *   Nested array of transliteration data. Outer keys are the first two
- *   bytes of Unicode characters (or 0 for base ASCII characters). The next
- *   level is the other two bytes, and the values are the transliterations.
- *
- * @see PhpTransliteration::readGenericData()
- */
-function read_drupal_data() {
-  $dir = __DIR__ . '/data';
-  $out = array();
-
-  // Read data files.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $base = array();
-    $file = $dir . '/x' . sprintf('%02x', $bank) . '.php';
-    if (is_file($file)) {
-      include($file);
-    }
-    $out[$bank] = $base;
-  }
-
-  return $out;
-}
-
-/**
- * Reads in the MidgardMVC transliteration data.
- *
- * The data is expected to be in files xNN.php in directory utf8_to_ascii_db
- * under the directory where this file resides. It can be downloaded from
- * https://github.com/bergie/midgardmvc_helper_urlize/downloads.
- *
- * @return array
- *   Nested array of transliteration data. Outer keys are the first two
- *   bytes of Unicode characters (or 0 for base ASCII characters). The next
- *   level is the other two bytes, and the values are the transliterations.
- */
-function read_midgard_data() {
-  $dir = __DIR__ . '/utf8_to_ascii_db';
-  $out = array();
-
-  // Read data files.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $UTF8_TO_ASCII = array($bank => array());
-    $file = $dir . '/x' . sprintf('%02x', $bank) . '.php';
-    if (is_file($file)) {
-      include($file);
-    }
-    $base = $UTF8_TO_ASCII[$bank];
-
-    // For unknown characters, these files have '[?]' in them. Replace with
-    // NULL for compatibility with our data.
-    $base = array_map('_replace_question_with_null', $base);
-    $out[$bank] = $base;
-  }
-
-  return $out;
-}
-
-/**
- * Reads in the CPAN Text::Unidecode data set.
- *
- * The data is expected to be in files xNN.pm in directory 'Unidecode' under
- * this file's directory. It can be downloaded from
- * http://search.cpan.org/~sburke/Text-Unidecode-0.04/lib/Text/Unidecode.pm.
- *
- * @return array
- *   Nested array of transliteration data. Outer keys are the first two
- *   bytes of Unicode characters (or 0 for base ASCII characters). The next
- *   level is the other two bytes, and the values are the transliterations.
- */
-function read_cpan_data() {
-  $dir = __DIR__ . '/Unidecode';
-  $out = array();
-
-  // Read data files.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $base = array();
-    $file = $dir . '/x' . sprintf('%02x', $bank) . '.pm';
-    if (is_file($file)) {
-      $base = _cpan_read_file($file);
-    }
-    $out[$bank] = $base;
-  }
-
-  return $out;
-}
-
-/**
- * Reads in the data in a single file from the Text::Unidecode CPAN project.
- *
- * @param string $file
- *   File to read from.
- *
- * @return array
- *   Data read from the file.
- *
- * @see read_cpan_data()
- */
-function _cpan_read_file($file) {
-
-  $contents = file($file);
-  $save = '';
-  foreach ($contents as $line) {
-    // Discard lines starting with # or $. The first line seems to have a
-    // comment starting with #, the second has a Perl line like
-    // $Text::Unidecode::Char[0x04] = [, -- and we do not want either.
-    if (preg_match('|^\s*[#\$]|', $line)) {
-      continue;
-    }
-
-    // Discard lines ending with semi-colons, which we also don't want
-    // (there seem to be two of these lines at the end of the files).
-    if (preg_match('|;\s*$|', $line)) {
-      continue;
-    }
-
-    // Replace '[?]' with nothing (that means "don't know how to
-    // transliterate"). In some files, this is encoded as qq{[?]} or
-    // qq{[?] } instead.
-    $line = str_replace('qq{[?]}', 'NULL', $line);
-    $line = str_replace('qq{[?] }', 'NULL', $line);
-    $line = str_replace("'[?]'", 'NULL', $line);
-
-    // Replace qq{} with either "" or '' or nothing, depending on what is
-    // inside it.
-    $line = str_replace('qq{\{}', "'{'", $line);
-    $line = str_replace('qq{\}}', "'}'", $line);
-    $line = str_replace('qq{\} }', "'} '", $line);
-    $line = str_replace("qq{\\\\}", '"\\\\"', $line);
-    $line = str_replace("qq{\\", "qq{'", $line);
-    $line = str_replace("qq{\"'}", "\"\\\"'\"", $line);
-    $line = preg_replace('|qq\{([^\'\}]+)\}|', "'$1'", $line);
-    $line = preg_replace('|qq\{([^\}]+)\}|', '"$1"', $line);
-
-    $save .= $line;
-  }
-
-  // Now we should have a string that looks like:
-  // 'a', 'b', ...
-  // Evaluate as an array.
-  $save = 'return array(' . $save . ');';
-
-  $data = @eval($save);
-  if (isset($data) && is_array($data)) {
-    $data = array_map('_replace_hex_with_character', $data);
-  }
-  else {
-    // There was a problem, so throw an error and exit.
-    print "Problem in evaluating $file\n";
-    print $save;
-    eval($save);
-    exit();
-  }
-
-  // For unknown characters, these files may still have '[?]' in them. Replace
-  // with NULL for compatibility with our data.
-  $data = array_map('_replace_question_with_null', $data);
-
-  return $data;
-}
-
-/**
- * Reads in the Node.js transliteration data.
- *
- * The data is expected to be in files xNN.yml in directory unidecoder_data
- * under the directory where this file resides. It can be downloaded from
- * https://github.com/bitwalker/stringex/downloads. You also need the PECL
- * 'yaml' extension installed for this function to work.
- *
- * @return array
- *   Nested array of transliteration data. Outer keys are the first two
- *   bytes of Unicode characters (or 0 for base ASCII characters). The next
- *   level is the other two bytes, and the values are the transliterations.
- */
-function read_nodejs_data() {
-  $dir = __DIR__ . '/unidecoder_data';
-  $out = array();
-
-  // Read data files.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $base = array();
-    $file = $dir . '/x' . sprintf('%02x', $bank) . '.yml';
-    if (is_file($file)) {
-      $base = yaml_parse_file($file);
-      // For unknown characters, these files have '[?]' in them. Replace with
-      // NULL for compatibility with our data.
-      $base = array_map('_replace_question_with_null', $base);
-    }
-    $out[$bank] = $base;
-  }
-
-  return $out;
-}
-
-/**
- * Loads the PECL 'intl' Transliterator class's transliteration data.
- *
- * You need to have the PECL 'intl' package installed for this to work.
- *
- * @return array
- *   Nested array of transliteration data. Outer keys are the first two
- *   bytes of Unicode characters (or 0 for base ASCII characters). The next
- *   level is the other two bytes, and the values are the transliterations.
- */
-function read_intl_data() {
-  // In order to transliterate, you first have to create a transliterator
-  // object. This needs a list of transliteration operations. You can get a
-  // list of available operations with:
-  //   print_r(Transliterator::listIDs()); exit();
-  // And a few of these are documented on
-  // http://userguide.icu-project.org/transforms/general and
-  // http://www.unicode.org/reports/tr15/ (for normalizations).
-  // There are also maps to the Unicode characters at:
-  //  http://www.unicode.org/roadmaps/bmp/
-  //  http://www.unicode.org/charts/nameslist/
-  $ops = '';
-
-  // The first step in any transform: separate out accents and remove them.
-  $ops .= 'NFD; [:Nonspacing Mark:] Remove; NFC;';
-
-  // Then you need to do a bunch of language-specific or script-specific
-  // transliterations. Here is hopefully a representative set. There are
-  // quite a few scripts that don't appear to have rules currently, such
-  // as Ethiopian.
-  $ops .= 'Greek-Latin; ';
-  $ops .= 'Cyrillic-Latin; ';
-  $ops .= 'Armenian-Latin; ';
-  $ops .= 'Hebrew-Latin; ';
-  $ops .= 'Arabic-Latin; ';
-  $ops .= 'Syriac-Latin; ';
-  $ops .= 'Thaana-Latin; ';
-  $ops .= 'Devanagari-Latin; ';
-  $ops .= 'Bengali-Latin; ';
-  $ops .= 'Gurmukhi-Latin; ';
-  $ops .= 'Gujarati-Latin; ';
-  $ops .= 'Oriya-Latin; ';
-  $ops .= 'Tamil-Latin; ';
-  $ops .= 'Telugu-Latin; ';
-  $ops .= 'Kannada-Latin; ';
-  $ops .= 'Malayalam-Latin; ';
-  $ops .= 'Thai-Latin; ';
-  $ops .= 'Georgian-Latin; ';
-  $ops .= 'Hangul-Latin; ';
-  $ops .= 'Mongolian-Latin/BGN; ';
-  $ops .= 'Jamo-Latin; ';
-  $ops .= 'Katakana-Latin; ';
-  $ops .= 'Any-Latin; ';
-
-  // Finally, after transforming to Latin, transform to ASCII.
-  $ops .= 'Latin-ASCII; ';
-
-  // Remove any remaining accents and recompose.
-  $ops .= 'NFD; [:Nonspacing Mark:] Remove; NFC;';
-
-  $trans = Transliterator::create($ops);
-  $out = array();
-
-  // Transliterate all possible characters.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $data = array();
-    for ($chr = 0; $chr < 256; $chr++) {
-      // Skip the UTF-16 and "private use" ranges completely.
-      $OK = ($bank <= 0xd8 || $bank > 0xf8);
-
-      $result = $OK ? $trans->transliterate(mb_convert_encoding(pack('n', 256 * $bank + $chr), 'UTF-8', 'UTF-16BE')) : '';
-
-      // See if we have managed to transliterate this to ASCII or not. If not,
-      // return NULL instead of this character.
-      $max = chr(127);
-      foreach (preg_split('//u', $result, 0, PREG_SPLIT_NO_EMPTY) as $character) {
-        if ($character > $max) {
-          $OK = $OK && FALSE;
-          break;
-        }
-      }
-      $data[$chr] = ($OK) ? $result : NULL;
-    }
-    $out[$bank] = $data;
-  }
-
-  return $out;
-}
-
-/**
- * Reads in the JUnidecode data set.
- *
- * The data is expected to be in files XNN.java in directory 'junidecode' under
- * this file's directory. It can be downloaded from
- * http://www.ippatsuman.com/projects/junidecode/index.html
- *
- * @return array
- *   Nested array of transliteration data. Outer keys are the first two
- *   bytes of Unicode characters (or 0 for base ASCII characters). The next
- *   level is the other two bytes, and the values are the transliterations.
- */
-function read_junidecode_data() {
-  $dir = __DIR__ . '/junidecode';
-  $out = array();
-
-  // Read data files.
-  for ($bank = 0; $bank < 256; $bank++) {
-    $base = array();
-    $file = $dir . '/X' . sprintf('%02x', $bank) . '.java';
-    if (is_file($file)) {
-      $base = _junidecode_read_file($file);
-    }
-    $out[$bank] = $base;
-  }
-
-  return $out;
-}
-
-/**
- * Reads in the data in a single file from the JUnidecode project.
- *
- * @param string $file
- *   File to read from.
- *
- * @return array
- *   Data read from the file.
- *
- * @see read_junidecode_data()
- */
-function _junidecode_read_file($file) {
-  $contents = file($file);
-  $save = '';
-  foreach ($contents as $line) {
-    // Discard lines starting with * or / or package or class or public or },
-    // to get rid of comments and Java code.
-    if (preg_match('|^\s*[\*/\}]|', $line)) {
-      continue;
-    }
-    if (preg_match('/^\s*package|public|class/', $line)) {
-      continue;
-    }
-
-    // Some of the lines look like this:
-    //      new String("" + (char) 0x00), // 0x00
-    // Transform to be '0x00,'
-    $line = preg_replace('|^\s*new\s+String\s*\(\s*""\s*\+\s*\(char\)\s+0x([0-9]+).*$|', '0x$1,', $line);
-
-    // Strings are in double quotes, yet many have \' in them.
-    $line = str_replace("\'", "'", $line);
-
-    // Everything else should probably be OK -- the lines are like:
-    //  "Ie", // 0x00
-    $save .= $line;
-  }
-
-  // Evaluate as an array.
-  $save = 'return array(' . $save . ');';
-
-  $data = @eval($save);
-  if (isset($data) && is_array($data)) {
-    $data = array_map('_replace_hex_with_character', $data);
-    $data = array_map('_replace_question_with_null', $data);
-  }
-  else {
-    // There was a problem, so throw an error and exit.
-    print "Problem in evaluating $file\n";
-    print $save;
-    eval($save);
-    exit();
-  }
-
-  return $data;
-}
-
-/**
- * Callback for array_map(): Returns $data, with '[?]' replaced with NULL.
- */
-function _replace_question_with_null($data) {
-  return ($data == '[?]' || $data == '[?] ') ? NULL : $data;
-}
-
-/**
- * Callback for array_map(): Replaces '\xNN' with the actual character.
- */
-function _replace_hex_with_character($item) {
-  if (strpos($item, '\x') === 0) {
-    $item = eval($item);
-  }
-  return $item;
-}
-
-/**
- * Writes a data file out in the standard Drupal Core data format.
- *
- * @param array $data
- *   Array of data to write out.
- * @param string $bank
- *   Bank of characters it belongs to.
- * @param string $dir
- *   Output directory.
- */
-function write_data_file($data, $bank, $outdir) {
-  $dir = __DIR__ . '/' . $outdir;
-  $file = $dir . '/x' . sprintf('%02x', $bank) . '.php';
-
-  $out = '';
-  $out .= "<?php\n\n/**\n * @file\n * Generic transliteration data for the PhpTransliteration class.\n */\n\n\$base = array(\n";
-
-  // The 00 file skips the ASCII range
-  $start = 0;
-  if ($bank == 0) {
-    $start = 0x80;
-    $out .= "  // Note: to save memory plain ASCII mappings have been left out.\n";
-  }
-
-  for ($line = $start; $line <= 0xf0; $line += 0x10) {
-    $out .= '  0x' . sprintf('%02X', $line) . ' =>';
-    $elems = array_values(array_slice($data, $line, 16));
-    for ($i = 0; $i < 16; $i++ ) {
-      if (isset($elems[$i])) {
-        $out .= " '" . addcslashes($elems[$i], "'\\") . "',";
-      }
-      else {
-        $out .= ' NULL,';
-      }
-    }
-    $out .= "\n";
-  }
-
-  $out .= ");\n";
-
-  file_put_contents($file, $out);
-}
diff --git a/web/core/tests/Drupal/BuildTests/Composer/LegacyScriptsTest.php b/web/core/tests/Drupal/BuildTests/Composer/LegacyScriptsTest.php
index a7a73aa47..b26aa0ff9 100644
--- a/web/core/tests/Drupal/BuildTests/Composer/LegacyScriptsTest.php
+++ b/web/core/tests/Drupal/BuildTests/Composer/LegacyScriptsTest.php
@@ -8,6 +8,7 @@
 
 /**
  * @group Composer
+ * @group legacy
  * @requires externalCommand composer
  * @coversDefaultClass \Drupal\Core\Composer\Composer
  */
diff --git a/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php b/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
index 7aad3dd79..413b4d25c 100644
--- a/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
+++ b/web/core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
@@ -4,7 +4,7 @@
 
 use Composer\Json\JsonFile;
 use Composer\Semver\VersionParser;
-use Drupal\BuildTests\Framework\BuildTestBase;
+use Drupal\BuildTests\Composer\ComposerBuildTestBase;
 use Drupal\Composer\Composer;
 
 /**
@@ -25,7 +25,7 @@
  *
  * @requires externalCommand composer
  */
-class ComposerProjectTemplatesTest extends BuildTestBase {
+class ComposerProjectTemplatesTest extends ComposerBuildTestBase {
 
   /**
    * The minimum stability requirement for dependencies.
@@ -143,7 +143,7 @@ public function testMinimumStabilityStrictness() {
    */
   public function testVerifyTemplateTestProviderIsAccurate() {
     $root = $this->getDrupalRoot();
-    $data = $this->provideTemplateCreateProject($root);
+    $data = $this->provideTemplateCreateProject();
 
     // Find all the templates.
     $template_files = Composer::composerSubprojectPaths($root, 'Template');
@@ -297,26 +297,6 @@ public function testTemplateCreateProject($project, $package_dir, $docroot_dir)
     }
   }
 
-  /**
-   * Assert that the VERSION constant in Drupal.php is the expected value.
-   *
-   * @param string $expectedVersion
-   *   The expected version.
-   * @param string $dir
-   *   The path to the site root.
-   *
-   * @internal
-   */
-  protected function assertDrupalVersion(string $expectedVersion, string $dir): void {
-    $drupal_php_path = $dir . '/core/lib/Drupal.php';
-    $this->assertFileExists($drupal_php_path);
-
-    // Read back the Drupal version that was set and assert it matches expectations.
-    $this->executeCommand("php -r 'include \"$drupal_php_path\"; print \Drupal::VERSION;'");
-    $this->assertCommandSuccessful();
-    $this->assertCommandOutputContains($expectedVersion);
-  }
-
   /**
    * Creates a test package that points to the templates.
    *
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php
index 894ffdca1..921771a49 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxFormPageCacheTest.php
@@ -19,7 +19,7 @@ class AjaxFormPageCacheTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
index 9aeb22034..6ee481524 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/AjaxTest.php
@@ -22,10 +22,10 @@ class AjaxTest extends WebDriverTestBase {
   protected $defaultTheme = 'stark';
 
   public function testAjaxWithAdminRoute() {
-    \Drupal::service('theme_installer')->install(['stable', 'claro']);
+    \Drupal::service('theme_installer')->install(['stable9', 'claro']);
     $theme_config = \Drupal::configFactory()->getEditable('system.theme');
     $theme_config->set('admin', 'claro');
-    $theme_config->set('default', 'stable');
+    $theme_config->set('default', 'stable9');
     $theme_config->save();
 
     $account = $this->drupalCreateUser(['view the administration theme']);
@@ -39,11 +39,11 @@ public function testAjaxWithAdminRoute() {
 
     // Now click the modal, which should also use the admin theme.
     $this->drupalGet('ajax-test/dialog');
-    $assert->pageTextNotContains('Current theme: stable');
+    $assert->pageTextNotContains('Current theme: stable9');
     $this->clickLink('Link 8 (ajax)');
     $assert->assertWaitOnAjaxRequest();
 
-    $assert->pageTextContains('Current theme: stable');
+    $assert->pageTextContains('Current theme: stable9');
     $assert->pageTextNotContains('Current theme: claro');
   }
 
@@ -153,6 +153,51 @@ public function testInsertAjaxResponse() {
     $this->assertInsert('empty', $expected, $custom_wrapper_new_content);
   }
 
+  /**
+   * Tests that jQuery's global Ajax events are triggered at the correct time.
+   */
+  public function testGlobalEvents() {
+    $session = $this->getSession();
+    $assert = $this->assertSession();
+    $expected_event_order = implode('', ['ajaxSuccess', 'ajaxComplete', 'ajaxStop']);
+
+    $this->drupalGet('ajax-test/global-events');
+
+    // Ensure that a non-Drupal Ajax request triggers the expected events, in
+    // the correct order, a single time.
+    $session->executeScript('jQuery.get(Drupal.url("core/COPYRIGHT.txt"))');
+    $assert->assertWaitOnAjaxRequest();
+    $assert->elementTextEquals('css', '#test_global_events_log', $expected_event_order);
+    $assert->elementTextEquals('css', '#test_global_events_log2', $expected_event_order);
+
+    // Ensure that an Ajax request to a Drupal Ajax response, but that was not
+    // initiated with Drupal.Ajax(), triggers the expected events, in the
+    // correct order, a single time. We expect $expected_event_order to appear
+    // twice in each log element, because Drupal Ajax response commands (such
+    // as the one to clear the log element) are only executed for requests
+    // initiated with Drupal.Ajax(), and these elements already contain the
+    // text that was added above.
+    $session->executeScript('jQuery.get(Drupal.url("ajax-test/global-events/clear-log"))');
+    $assert->assertWaitOnAjaxRequest();
+    $assert->elementTextEquals('css', '#test_global_events_log', str_repeat($expected_event_order, 2));
+    $assert->elementTextEquals('css', '#test_global_events_log2', str_repeat($expected_event_order, 2));
+
+    // Ensure that a Drupal Ajax request triggers the expected events, in the
+    // correct order, a single time.
+    // - We expect the first log element to list the events exactly once,
+    //   because the Ajax response clears it, and we expect the events to be
+    //   triggered after the commands are executed.
+    // - We expect the second log element to list the events exactly three
+    //   times, because it already contains the two from the code that was
+    //   already executed above. This additional log element that isn't cleared
+    //   by the response's command ensures that the events weren't triggered
+    //   additional times before the response commands were executed.
+    $this->click('#test_global_events_drupal_ajax_link');
+    $assert->assertWaitOnAjaxRequest();
+    $assert->elementTextEquals('css', '#test_global_events_log', $expected_event_order);
+    $assert->elementTextEquals('css', '#test_global_events_log2', str_repeat($expected_event_order, 3));
+  }
+
   /**
    * Assert insert.
    *
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
index ef9c6d9b0..0a843954b 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/DialogTest.php
@@ -21,7 +21,7 @@ class DialogTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tests sending non-JS and AJAX requests to open and manipulate modals.
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php
index de386436d..a39cb068b 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/ElementValidationTest.php
@@ -19,7 +19,7 @@ class ElementValidationTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tries to post an Ajax change to a form that has a validated element.
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php
index fbd979c4e..d436179b4 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Ajax/MultiFormTest.php
@@ -8,8 +8,7 @@
 use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
 
 /**
- * Tests that AJAX-enabled forms work when multiple instances of the same form
- * are on a page.
+ * Tests AJAX-enabled forms when multiple instances of the form are on a page.
  *
  * @group Ajax
  */
@@ -92,20 +91,21 @@ public function testMultiForm() {
     // page update, ensure the same as above.
 
     for ($i = 0; $i < 2; $i++) {
-      $forms = $page->find('xpath', $form_xpath);
+      $forms = $page->findAll('xpath', $form_xpath);
       foreach ($forms as $offset => $form) {
         $button = $form->findButton('Add another item');
         $this->assertNotNull($button, 'Add Another Item button exists');
         $button->press();
 
-        // Wait for page update.
-        $this->assertSession()->assertWaitOnAjaxRequest();
+        // Wait for field to be added with ajax.
+        $this->assertNotEmpty($page->waitFor(10, function () use ($form, $i) {
+          return $form->findField('field_ajax_test[' . ($i + 1) . '][value]');
+        }));
 
-        // After AJAX request and response page will update.
-        $page_updated = $session->getPage();
-        $field = $page_updated->findAll('xpath', '.' . $field_xpath);
-        $this->assertCount($i + 2, $field[0]->find('xpath', '.' . $field_items_xpath_suffix), 'Found the correct number of field items after an AJAX submission.');
-        $this->assertNotNull($field[0]->find('xpath', '.' . $button_xpath_suffix), 'Found the "add more" button after an AJAX submission.');
+        // After AJAX request and response verify the correct number of text
+        // fields (including title), as well as the "Add another item" button.
+        $this->assertCount($i + 3, $form->findAll('css', 'input[type="text"]'), 'Found the correct number of field items after an AJAX submission.');
+        $this->assertNotEmpty($form->findButton('Add another item'), 'Found the "add more" button after an AJAX submission.');
         $this->assertSession()->pageContainsNoDuplicateId();
       }
     }
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php
index 35f7016cc..85a171b2a 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/BrowserWithJavascriptTest.php
@@ -110,7 +110,7 @@ public function testEscapingAssertions() {
    * @param string|\Drupal\Core\Url $path
    *   Drupal path or URL to load into Mink controlled browser.
    * @param array $options
-   *   (optional) Options to be forwarded to the url generator.
+   *   (optional) Options to be forwarded to the URL generator.
    * @param string[] $headers
    *   An array containing additional HTTP request headers, the array keys are
    *   the header names and the array values the header values. This is useful
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/FormGroupingElementsTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/FormGroupingElementsTest.php
index e4cfcb9be..488e07d20 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/FormGroupingElementsTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/FormGroupingElementsTest.php
@@ -135,4 +135,33 @@ public function testDetailsChildVisibility() {
     $this->assertEquals('true', $summary->getAttribute('aria-pressed'));
   }
 
+  /**
+   * Confirms tabs containing a field with a validation error are open.
+   */
+  public function testVerticalTabValidationVisibility() {
+    $page = $this->getSession()->getPage();
+    $assert_session = $this->assertSession();
+
+    $this->drupalGet('form-test/group-vertical-tabs');
+    $page->clickLink('Second group element');
+    $input_field = $assert_session->waitForField('element_2');
+    $this->assertNotNull($input_field);
+
+    // Enter a value that will trigger a validation error.
+    $input_field->setValue('bad');
+
+    // Switch to a tab that does not have the error-causing field.
+    $page->clickLink('First group element');
+    $this->assertNotNull($assert_session->waitForElementVisible('css', '#edit-meta'));
+
+    // Submit the form.
+    $page->pressButton('Save');
+
+    // Confirm there is an error.
+    $assert_session->waitForText('there was an error');
+
+    // Confirm the tab containing the field with error is open.
+    $this->assertNotNull($assert_session->waitForElementVisible('css', '[name="element_2"].error'));
+  }
+
 }
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/JavascriptStatesTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/JavascriptStatesTest.php
index 259a7e146..966143359 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/JavascriptStatesTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Core/Form/JavascriptStatesTest.php
@@ -8,6 +8,11 @@
 /**
  * Tests the state of elements based on another elements.
  *
+ * The form being tested is JavascriptStatesForm provided by the 'form_test'
+ * module under 'system' (core/modules/system/tests/module/form_test).
+ *
+ * @see Drupal\form_test\Form\JavascriptStatesForm
+ *
  * @group javascript
  */
 class JavascriptStatesTest extends WebDriverTestBase {
@@ -25,7 +30,7 @@ class JavascriptStatesTest extends WebDriverTestBase {
   /**
    * {@inheritdoc}
    */
-  protected function setUp():void {
+  protected function setUp(): void {
     parent::setUp();
     // Add text formats.
     $filtered_html_format = FilterFormat::create([
@@ -63,6 +68,7 @@ public function testJavascriptStates() {
     $this->doRadiosTriggerTests();
     $this->doSelectTriggerTests();
     $this->doMultipleTriggerTests();
+    $this->doNestedTriggerTests();
   }
 
   /**
@@ -93,6 +99,53 @@ protected function doCheckboxTriggerTests() {
     $text_format_invisible_format = $page->findField('text_format_invisible_when_checkbox_trigger_checked[format]');
     $this->assertNotEmpty($text_format_invisible_format);
 
+    $checkboxes_all_checked_element_value1 = $page->findField('checkboxes_all_checked_when_checkbox_trigger_checked[value1]');
+    $this->assertNotEmpty($checkboxes_all_checked_element_value1);
+    $checkboxes_all_checked_element_value2 = $page->findField('checkboxes_all_checked_when_checkbox_trigger_checked[value2]');
+    $this->assertNotEmpty($checkboxes_all_checked_element_value2);
+    $checkboxes_all_checked_element_value3 = $page->findField('checkboxes_all_checked_when_checkbox_trigger_checked[value3]');
+    $this->assertNotEmpty($checkboxes_all_checked_element_value3);
+
+    $checkboxes_some_checked_element_value1 = $page->findField('checkboxes_some_checked_when_checkbox_trigger_checked[value1]');
+    $this->assertNotEmpty($checkboxes_some_checked_element_value1);
+    $checkboxes_some_checked_element_value2 = $page->findField('checkboxes_some_checked_when_checkbox_trigger_checked[value2]');
+    $this->assertNotEmpty($checkboxes_some_checked_element_value2);
+    $checkboxes_some_checked_element_value3 = $page->findField('checkboxes_some_checked_when_checkbox_trigger_checked[value3]');
+    $this->assertNotEmpty($checkboxes_some_checked_element_value3);
+
+    $checkboxes_all_disabled_element_value1 = $page->findField('checkboxes_all_disabled_when_checkbox_trigger_checked[value1]');
+    $this->assertNotEmpty($checkboxes_all_disabled_element_value1);
+    $checkboxes_all_disabled_element_value2 = $page->findField('checkboxes_all_disabled_when_checkbox_trigger_checked[value2]');
+    $this->assertNotEmpty($checkboxes_all_disabled_element_value2);
+    $checkboxes_all_disabled_element_value3 = $page->findField('checkboxes_all_disabled_when_checkbox_trigger_checked[value3]');
+    $this->assertNotEmpty($checkboxes_all_disabled_element_value3);
+
+    $checkboxes_some_disabled_element_value1 = $page->findField('checkboxes_some_disabled_when_checkbox_trigger_checked[value1]');
+    $this->assertNotEmpty($checkboxes_some_disabled_element_value1);
+    $checkboxes_some_disabled_element_value2 = $page->findField('checkboxes_some_disabled_when_checkbox_trigger_checked[value2]');
+    $this->assertNotEmpty($checkboxes_some_disabled_element_value2);
+    $checkboxes_some_disabled_element_value3 = $page->findField('checkboxes_some_disabled_when_checkbox_trigger_checked[value3]');
+
+    $radios_checked_element = $page->findField('radios_checked_when_checkbox_trigger_checked');
+    $this->assertNotEmpty($radios_checked_element);
+
+    // We want to select the specific radio buttons, not the whole radios field itself.
+    $radios_all_disabled_value1 = $this->xpath('//input[@name=:name][@value=:value]', [':name' => 'radios_all_disabled_when_checkbox_trigger_checked', ':value' => 'value1']);
+    $this->assertCount(1, $radios_all_disabled_value1);
+    // We want to access the radio button directly for the rest of the test, so
+    // take it out of the array we got back from xpath().
+    $radios_all_disabled_value1 = reset($radios_all_disabled_value1);
+    $radios_all_disabled_value2 = $this->xpath('//input[@name=:name][@value=:value]', [':name' => 'radios_all_disabled_when_checkbox_trigger_checked', ':value' => 'value2']);
+    $this->assertCount(1, $radios_all_disabled_value2);
+    $radios_all_disabled_value2 = reset($radios_all_disabled_value2);
+
+    $radios_some_disabled_value1 = $this->xpath('//input[@name=:name][@value=:value]', [':name' => 'radios_some_disabled_when_checkbox_trigger_checked', ':value' => 'value1']);
+    $this->assertCount(1, $radios_some_disabled_value1);
+    $radios_some_disabled_value1 = reset($radios_some_disabled_value1);
+    $radios_some_disabled_value2 = $this->xpath('//input[@name=:name][@value=:value]', [':name' => 'radios_some_disabled_when_checkbox_trigger_checked', ':value' => 'value2']);
+    $this->assertCount(1, $radios_some_disabled_value2);
+    $radios_some_disabled_value2 = reset($radios_some_disabled_value2);
+
     // Verify initial state.
     $this->assertTrue($textfield_invisible_element->isVisible());
     $this->assertFalse($details->hasAttribute('open'));
@@ -103,6 +156,24 @@ protected function doCheckboxTriggerTests() {
     $this->assertFalse($checkbox_visible_element->isVisible());
     $this->assertTrue($text_format_invisible_value->isVisible());
     $this->assertTrue($text_format_invisible_format->isVisible());
+    $this->assertFalse($checkboxes_all_checked_element_value1->isChecked());
+    $this->assertFalse($checkboxes_all_checked_element_value2->isChecked());
+    $this->assertFalse($checkboxes_all_checked_element_value3->isChecked());
+    $this->assertFalse($checkboxes_some_checked_element_value1->isChecked());
+    $this->assertFalse($checkboxes_some_checked_element_value2->isChecked());
+    $this->assertFalse($checkboxes_some_checked_element_value3->isChecked());
+    $this->assertFalse($checkboxes_all_disabled_element_value1->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_all_disabled_element_value2->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_all_disabled_element_value3->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value1->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value2->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value3->hasAttribute('disabled'));
+    $this->assertFalse($radios_checked_element->isChecked());
+    $this->assertEquals(NULL, $radios_checked_element->getValue());
+    $this->assertFalse($radios_all_disabled_value1->hasAttribute('disabled'));
+    $this->assertFalse($radios_all_disabled_value2->hasAttribute('disabled'));
+    $this->assertFalse($radios_some_disabled_value1->hasAttribute('disabled'));
+    $this->assertFalse($radios_some_disabled_value2->hasAttribute('disabled'));
 
     // Change state: check the checkbox.
     $trigger->check();
@@ -116,6 +187,61 @@ protected function doCheckboxTriggerTests() {
     $this->assertTrue($checkbox_visible_element->isVisible());
     $this->assertFalse($text_format_invisible_value->isVisible());
     $this->assertFalse($text_format_invisible_format->isVisible());
+    // All 3 of the other set should be checked.
+    $this->assertTrue($checkboxes_all_checked_element_value1->isChecked());
+    $this->assertTrue($checkboxes_all_checked_element_value2->isChecked());
+    $this->assertTrue($checkboxes_all_checked_element_value3->isChecked());
+    // Value 1 and 3 should now be checked.
+    $this->assertTrue($checkboxes_some_checked_element_value1->isChecked());
+    $this->assertTrue($checkboxes_some_checked_element_value3->isChecked());
+    // Only value 2 should remain unchecked.
+    $this->assertFalse($checkboxes_some_checked_element_value2->isChecked());
+    // All 3 of these should be disabled.
+    $this->assertTrue($checkboxes_all_disabled_element_value1->hasAttribute('disabled'));
+    $this->assertTrue($checkboxes_all_disabled_element_value2->hasAttribute('disabled'));
+    $this->assertTrue($checkboxes_all_disabled_element_value3->hasAttribute('disabled'));
+    // Only values 1 and 3 should be disabled, 2 should still be enabled.
+    $this->assertTrue($checkboxes_some_disabled_element_value1->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value2->hasAttribute('disabled'));
+    $this->assertTrue($checkboxes_some_disabled_element_value3->hasAttribute('disabled'));
+    $this->assertEquals('value1', $radios_checked_element->getValue());
+    // Both of these should now be disabled.
+    $this->assertTrue($radios_all_disabled_value1->hasAttribute('disabled'));
+    $this->assertTrue($radios_all_disabled_value2->hasAttribute('disabled'));
+    // Only value1 should be disabled, value 2 should remain enabled.
+    $this->assertTrue($radios_some_disabled_value1->hasAttribute('disabled'));
+    $this->assertFalse($radios_some_disabled_value2->hasAttribute('disabled'));
+
+    // Change state: uncheck the checkbox.
+    $trigger->uncheck();
+    // Verify triggered state, which should match the initial state.
+    $this->assertTrue($textfield_invisible_element->isVisible());
+    $this->assertFalse($details->hasAttribute('open'));
+    $this->assertFalse($textfield_in_details->isVisible());
+    $this->assertFalse($textfield_required_element->hasAttribute('required'));
+    $this->assertFalse($checkbox_checked_element->isChecked());
+    $this->assertTrue($checkbox_unchecked_element->isChecked());
+    $this->assertFalse($checkbox_visible_element->isVisible());
+    $this->assertTrue($text_format_invisible_value->isVisible());
+    $this->assertTrue($text_format_invisible_format->isVisible());
+    $this->assertFalse($checkboxes_all_checked_element_value1->isChecked());
+    $this->assertFalse($checkboxes_all_checked_element_value2->isChecked());
+    $this->assertFalse($checkboxes_all_checked_element_value3->isChecked());
+    $this->assertFalse($checkboxes_some_checked_element_value1->isChecked());
+    $this->assertFalse($checkboxes_some_checked_element_value2->isChecked());
+    $this->assertFalse($checkboxes_some_checked_element_value3->isChecked());
+    $this->assertFalse($checkboxes_all_disabled_element_value1->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_all_disabled_element_value2->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_all_disabled_element_value3->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value1->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value2->hasAttribute('disabled'));
+    $this->assertFalse($checkboxes_some_disabled_element_value3->hasAttribute('disabled'));
+    $this->assertFalse($radios_checked_element->isChecked());
+    $this->assertEquals(NULL, $radios_checked_element->getValue());
+    $this->assertFalse($radios_all_disabled_value1->hasAttribute('disabled'));
+    $this->assertFalse($radios_all_disabled_value2->hasAttribute('disabled'));
+    $this->assertFalse($radios_some_disabled_value1->hasAttribute('disabled'));
+    $this->assertFalse($radios_some_disabled_value2->hasAttribute('disabled'));
   }
 
   /**
@@ -322,4 +448,30 @@ protected function doMultipleTriggerTests() {
     $this->assertTrue($item_visible_value2_and_textfield->isVisible());
   }
 
+  /**
+   * Tests states of radios element triggered by other radios element.
+   */
+  protected function doNestedTriggerTests() {
+    $this->drupalGet('form-test/javascript-states-form');
+    $page = $this->getSession()->getPage();
+
+    // Find trigger and target elements.
+    $radios_opposite1 = $page->findField('radios_opposite1');
+    $this->assertNotEmpty($radios_opposite1);
+    $radios_opposite2 = $page->findField('radios_opposite2');
+    $this->assertNotEmpty($radios_opposite2);
+
+    // Verify initial state.
+    $this->assertEquals('0', $radios_opposite1->getValue());
+    $this->assertEquals('1', $radios_opposite2->getValue());
+
+    // Set $radios_opposite2 value to 0, $radios_opposite1 value should be 1.
+    $radios_opposite2->setValue('0');
+    $this->assertEquals('1', $radios_opposite1->getValue());
+
+    // Set $radios_opposite1 value to 1, $radios_opposite2 value should be 0.
+    $radios_opposite1->setValue('0');
+    $this->assertEquals('1', $radios_opposite2->getValue());
+  }
+
 }
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php b/web/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php
index b89b5a4b9..827155caf 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/DrupalSelenium2Driver.php
@@ -44,32 +44,6 @@ public function setCookie($name, $value = NULL) {
     $this->getWebDriverSession()->setCookie($cookieArray);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function attachFile($xpath, $path) {
-    $element = $this->getWebDriverSession()->element('xpath', $xpath);
-
-    if ('input' !== strtolower($element->name()) || 'file' !== strtolower($element->attribute('type'))) {
-      $message = 'Impossible to %s the element with XPath "%s" as it is not a %s input';
-
-      throw new DriverException(sprintf($message, 'attach a file on', $xpath, 'file'));
-    }
-
-    // Upload the file to Selenium and use the remote path. This will
-    // ensure that Selenium always has access to the file, even if it runs
-    // as a remote instance.
-    try {
-      $remotePath = $this->uploadFileAndGetRemoteFilePath($path);
-    }
-    catch (\Exception $e) {
-      // File could not be uploaded to remote instance. Use the local path.
-      $remotePath = $path;
-    }
-
-    $element->postValue(['value' => [$remotePath]]);
-  }
-
   /**
    * Uploads a file to the Selenium instance and returns the remote path.
    *
@@ -171,20 +145,23 @@ public function setValue($xpath, $value) {
         // \Behat\Mink\Driver\Selenium2Driver::setValue() will call .blur() on
         // the element, modify that to trigger the "input" and "change" events
         // instead. They indicate the value has changed, rather than implying
-        // user focus changes.
+        // user focus changes. This script only runs when Drupal javascript has
+        // been loaded.
         $this->executeJsOnXpath($xpath, <<<JS
-var node = {{ELEMENT}};
-var original = node.blur;
-node.blur = function() {
-  node.dispatchEvent(new Event("input", {bubbles:true}));
-  node.dispatchEvent(new Event("change", {bubbles:true}));
-  // Do not wait for the debounce, which only triggers the 'formUpdated` event
-  // up to once every 0.3 seconds. In tests, no humans are typing, hence there
-  // is no need to debounce.
-  // @see Drupal.behaviors.formUpdated
-  node.dispatchEvent(new Event("formUpdated", {bubbles:true}));
-  node.blur = original;
-};
+if (typeof Drupal !== 'undefined') {
+  var node = {{ELEMENT}};
+  var original = node.blur;
+  node.blur = function() {
+    node.dispatchEvent(new Event("input", {bubbles:true}));
+    node.dispatchEvent(new Event("change", {bubbles:true}));
+    // Do not wait for the debounce, which only triggers the 'formUpdated` event
+    // up to once every 0.3 seconds. In tests, no humans are typing, hence there
+    // is no need to debounce.
+    // @see Drupal.behaviors.formUpdated
+    node.dispatchEvent(new Event("formUpdated", {bubbles:true}));
+    node.blur = original;
+  };
+}
 JS);
         parent::setValue($xpath, $value);
         return TRUE;
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
index 54db00235..bcae27f02 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/EntityReference/EntityReferenceAutocompleteWidgetTest.php
@@ -127,13 +127,12 @@ public function testEntityReferenceAutocompleteWidget() {
 
     // Change the size of the result set via the UI.
     $this->drupalLogin($this->createUser([
-        'access content',
-        'administer content types',
-        'administer node fields',
-        'administer node form display',
-        'create page content',
-      ]
-    ));
+      'access content',
+      'administer content types',
+      'administer node fields',
+      'administer node form display',
+      'create page content',
+    ]));
     $this->drupalGet('/admin/structure/types/manage/page/form-display');
     $assert_session->pageTextContains('Autocomplete suggestion list size: 1');
     // Click on the widget settings button to open the widget settings form.
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php b/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
index 9db43998c..5136f5119 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/JSWebAssert.php
@@ -159,8 +159,7 @@ private function waitForHelper(int $timeout, callable $callback) {
   }
 
   /**
-   * Waits for a button (input[type=submit|image|button|reset], button) with
-   * specified locator and returns it.
+   * Waits for the button specified by the locator and returns it.
    *
    * @param string $locator
    *   The button ID, value or alt string.
diff --git a/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php b/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
index f7c688c79..7ed125d0b 100644
--- a/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
+++ b/web/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php
@@ -116,10 +116,10 @@ public function testJsWebAssert() {
     $this->assertEquals(TRUE, $result->isVisible());
 
     $this->drupalGet('js_webassert_test_page');
-    $result = $assert_session->waitForElementVisible('named', ['id', 'test_text']);
-    $this->assertSame('test_text', $result->getAttribute('id'));
     // Ensure that the javascript has replaced the element 1100 times.
-    $assert_session->pageTextContains('New Text!! 1100');
+    $assert_session->waitForText('New Text!! 1100');
+    $result = $page->find('named', ['id', 'test_text']);
+    $this->assertSame('test_text', $result->getAttribute('id'));
   }
 
 }
diff --git a/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php b/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
index 25bf18878..6ac0ffaf3 100644
--- a/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
+++ b/web/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
@@ -4,7 +4,6 @@
 
 use Behat\Mink\Element\NodeElement;
 use Behat\Mink\Exception\ExpectationException;
-use Behat\Mink\Selector\Xpath\Escaper;
 use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Xss;
 use Drupal\KernelTests\AssertLegacyTrait as BaseAssertLegacyTrait;
@@ -759,7 +758,7 @@ protected function assertFieldsByValue($fields, $value = NULL, $message = '') {
             // Input element with correct value.
             $found = TRUE;
           }
-          elseif ($field->find('xpath', '//option[@value = ' . (new Escaper())->escapeLiteral($value) . ' and @selected = "selected"]')) {
+          elseif ($field->find('xpath', '//option[@value = ' . $value . ' and @selected = "selected"]')) {
             // Select element with an option.
             $found = TRUE;
           }
diff --git a/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php b/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
index 1e2c619c1..37070cf72 100644
--- a/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Bootstrap/UncaughtExceptionTest.php
@@ -95,8 +95,8 @@ public function testUncaughtFatalError() {
     $fatal_error = [
       '%type' => 'TypeError',
       '@message' => PHP_VERSION_ID >= 80000 ?
-        'Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}(): Argument #1 ($test) must be of type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 65' :
-        'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 65',
+      'Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}(): Argument #1 ($test) must be of type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 65' :
+      'Argument 1 passed to Drupal\error_test\Controller\ErrorTestController::Drupal\error_test\Controller\{closure}() must be of the type array, string given, called in ' . \Drupal::root() . '/core/modules/system/tests/modules/error_test/src/Controller/ErrorTestController.php on line 65',
       '%function' => 'Drupal\error_test\Controller\ErrorTestController->Drupal\error_test\Controller\{closure}()',
     ];
     $this->drupalGet('error-test/generate-fatals');
@@ -265,7 +265,7 @@ public function testLoggerException() {
     $this->assertStringContainsString('Failed to log error', $errors[0], 'The error handling logs when an error could not be logged to the logger.');
 
     $expected_path = \Drupal::root() . '/core/modules/system/tests/modules/error_service_test/src/MonkeysInTheControlRoom.php';
-    $expected_line = 62;
+    $expected_line = 67;
     $expected_entry = "Failed to log error: Exception: Deforestation in Drupal\\error_service_test\\MonkeysInTheControlRoom->handle() (line {$expected_line} of {$expected_path})";
     $this->assertStringContainsString($expected_entry, $errors[0], 'Original error logged to the PHP error log when an exception is thrown by a logger');
 
diff --git a/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
index ab224eca4..45349d6ca 100644
--- a/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php
@@ -37,7 +37,7 @@ class BrowserTestBaseTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Tests basic page test.
@@ -69,7 +69,7 @@ public function testGoTo() {
     $js_settings = $this->getDrupalSettings();
     $this->assertSame('azAZ09();.,\\\/-_{}', $js_settings['test-setting']);
 
-    // Test drupalGet with a url object.
+    // Test drupalGet with a URL object.
     $url = Url::fromRoute('test_page_test.render_title');
     $this->drupalGet($url);
     $this->assertSession()->statusCodeEquals(200);
diff --git a/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormFieldValidationFilteringTest.php b/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormFieldValidationFilteringTest.php
index 38d752895..edaf6d3bb 100644
--- a/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormFieldValidationFilteringTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Entity/ContentEntityFormFieldValidationFilteringTest.php
@@ -53,7 +53,7 @@ class ContentEntityFormFieldValidationFilteringTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php b/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php
index efc12765f..fe09c9406 100644
--- a/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Entity/DeleteMultipleFormTest.php
@@ -34,7 +34,7 @@ class DeleteMultipleFormTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php b/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php
index e71060bc1..91ad6e08d 100644
--- a/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Entity/EntityBundleListCacheTest.php
@@ -27,7 +27,7 @@ class EntityBundleListCacheTest extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * {@inheritdoc}
diff --git a/web/core/tests/Drupal/FunctionalTests/FolderTest.php b/web/core/tests/Drupal/FunctionalTests/FolderTest.php
index a8196ebd9..923849e56 100644
--- a/web/core/tests/Drupal/FunctionalTests/FolderTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/FolderTest.php
@@ -5,8 +5,8 @@
 use Drupal\Tests\BrowserTestBase;
 
 /**
- * This test will check BrowserTestBase's treatment of hook_install during
- * setUp.
+ * Tests BrowserTestBase's treatment of hook_install() during setup.
+ *
  * Image module is used for test.
  *
  * @group browsertestbase
diff --git a/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php b/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
index b26bf668f..c9959dcd4 100644
--- a/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
+++ b/web/core/tests/Drupal/FunctionalTests/Image/ToolkitTestBase.php
@@ -52,6 +52,9 @@ abstract class ToolkitTestBase extends BrowserTestBase {
    */
   protected $image;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
@@ -82,8 +85,7 @@ protected function getImage() {
   }
 
   /**
-   * Assert that all of the specified image toolkit operations were called
-   * exactly once, other values result in failure.
+   * Tests that only allowed image toolkit operations are called.
    *
    * @param $expected
    *   Array with string containing with the operation name, e.g. 'load',
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php
index 7e1915411..e8f77bd94 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileExistingSettingsTest.php
@@ -38,7 +38,7 @@ protected function prepareEnvironment() {
       'distribution' => [
         'name' => 'My Distribution',
         'install' => [
-          'theme' => 'bartik',
+          'theme' => 'olivero',
         ],
       ],
     ];
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php
index d8efca525..68a9cd148 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTest.php
@@ -32,7 +32,7 @@ protected function prepareEnvironment() {
       'distribution' => [
         'name' => 'My Distribution',
         'install' => [
-          'theme' => 'bartik',
+          'theme' => 'claro',
           'finish_url' => '/root-user',
         ],
       ],
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
index a83452e33..2f7e08a92 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationQueryTest.php
@@ -43,7 +43,7 @@ protected function prepareEnvironment() {
         'name' => 'My Distribution',
         'langcode' => $this->langcode,
         'install' => [
-          'theme' => 'bartik',
+          'theme' => 'claro',
         ],
       ],
     ];
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
index bcbb1a9cb..7cd986461 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/DistributionProfileTranslationTest.php
@@ -45,7 +45,7 @@ protected function prepareEnvironment() {
         'name' => 'My Distribution',
         'langcode' => $this->langcode,
         'install' => [
-          'theme' => 'bartik',
+          'theme' => 'claro',
         ],
       ],
     ];
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php
index ee6caea94..53a615b57 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingDatabaseSettingsTest.php
@@ -5,8 +5,7 @@
 use Drupal\Core\Database\Database;
 
 /**
- * Tests the installer with an existing settings file with database connection
- * info.
+ * Tests installation with database information in an existing settings file.
  *
  * @group Installer
  */
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingInstallationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingInstallationTest.php
index 663bad70f..8906a2fa4 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingInstallationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerExistingInstallationTest.php
@@ -15,8 +15,7 @@ class InstallerExistingInstallationTest extends InstallerTestBase {
   protected $defaultTheme = 'stark';
 
   /**
-   * Verifies that Drupal can't be reinstalled while an existing installation is
-   * available.
+   * Tests that Drupal fails to install when there is an existing installation.
    */
   public function testInstaller() {
     // Verify that Drupal can't be immediately reinstalled.
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSiteConfigProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSiteConfigProfileTest.php
index 097d84518..c09bf838e 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSiteConfigProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerSiteConfigProfileTest.php
@@ -3,8 +3,7 @@
 namespace Drupal\FunctionalTests\Installer;
 
 /**
- * Verifies that the installer defaults to the existing site email address and
- * timezone, if they were provided by the install profile.
+ * Verifies that the installer uses the profile's site configuration.
  *
  * @group Installer
  */
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php
index af85b7e7f..12a2f0ddc 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTest.php
@@ -53,7 +53,7 @@ public function testInstaller() {
   protected function setUpLanguage() {
     // Test that \Drupal\Core\Render\BareHtmlPageRenderer adds assets and
     // metatags as expected to the first page of the installer.
-    $this->assertSession()->responseContains("core/themes/seven/css/components/buttons.css");
+    $this->assertSession()->responseContains("css/components/button.css");
     $this->assertSession()->responseContains('<meta charset="utf-8" />');
 
     // Assert that the expected title is present.
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
index f4382e5d4..c48d53ad0 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/InstallerTranslationTest.php
@@ -15,7 +15,7 @@ class InstallerTranslationTest extends InstallerTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'classy';
+  protected $defaultTheme = 'starterkit_theme';
 
   /**
    * Overrides the language code in which to install Drupal.
@@ -66,7 +66,7 @@ protected function setUpSettings() {
 
     // Ensure that the error message translation is working.
     // cSpell:disable
-    $this->assertSession()->responseContains('Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/8/install">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter.');
+    $this->assertSession()->responseContains('Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/installing-drupal">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter.');
     $this->assertSession()->responseContains('<strong>CREATE</strong> ein Test-Tabelle auf Ihrem Datenbankserver mit dem Befehl <em class="placeholder">CREATE TABLE {drupal_install_test} (id int NOT NULL PRIMARY KEY)</em> fehlgeschlagen.');
     // cSpell:enable
 
@@ -107,7 +107,7 @@ public function testInstaller() {
     $this->drupalGet('admin/config/development/performance');
     $this->submitForm($edit, 'Save configuration');
     $this->drupalGet('<front>');
-    $this->assertSession()->responseContains('classy/css/components/action-links.css');
+    $this->assertSession()->responseContains('starterkit_theme/css/components/action-links.css');
 
     // Verify the strings from the translation files were imported.
     $test_samples = ['Save and continue', 'Anonymous'];
@@ -163,8 +163,8 @@ protected function getPo($langcode) {
 msgid "Anonymous"
 msgstr "Anonymous $langcode"
 
-msgid "Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/8/install">installation handbook</a>, or contact your hosting provider."
-msgstr "Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/8/install">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter."
+msgid "Resolve all issues below to continue the installation. For help configuring your database server, see the <a href="https://www.drupal.org/docs/installing-drupal">installation handbook</a>, or contact your hosting provider."
+msgstr "Beheben Sie alle Probleme unten, um die Installation fortzusetzen. Informationen zur Konfiguration der Datenbankserver finden Sie in der <a href="https://www.drupal.org/docs/installing-drupal">Installationshandbuch</a>, oder kontaktieren Sie Ihren Hosting-Anbieter."
 
 msgid "Failed to <strong>CREATE</strong> a test table on your database server with the command %query. The server reports the following message: %error.<p>Are you sure the configured username has the necessary permissions to create tables in the database?</p>"
 msgstr "<strong>CREATE</strong> ein Test-Tabelle auf Ihrem Datenbankserver mit dem Befehl %query fehlgeschlagen."
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php
index ca71d7fb0..b7754682d 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/MultipleDistributionsProfileTest.php
@@ -37,7 +37,7 @@ protected function prepareEnvironment() {
         'distribution' => [
           'name' => $name,
           'install' => [
-            'theme' => 'bartik',
+            'theme' => 'claro',
           ],
         ],
       ];
@@ -57,7 +57,7 @@ protected function setUpLanguage() {
     // Verify that the distribution name appears.
     $this->assertSession()->pageTextContains('distribution_one');
     // Verify that the requested theme is used.
-    $this->assertSession()->responseContains('bartik');
+    $this->assertSession()->responseContains('claro');
     // Verify that the "Choose profile" step does not appear.
     $this->assertSession()->pageTextNotContains('profile');
 
diff --git a/web/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php b/web/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
index 432cb723c..d49f373af 100644
--- a/web/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Installer/StandardInstallerTest.php
@@ -29,7 +29,7 @@ public function testInstaller() {
   protected function setUpSite() {
     // Test that the correct theme is being used.
     $this->assertSession()->responseNotContains('olivero');
-    $this->assertSession()->responseContains('themes/seven/css/theme/install-page.css');
+    $this->assertSession()->responseContains('css/theme/install-page.css');
     parent::setUpSite();
   }
 
diff --git a/web/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php b/web/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
index 2c9277229..5d4c3d9df 100644
--- a/web/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Libraries/JqueryUiLibraryAssetsTest.php
@@ -288,7 +288,7 @@ public function testLibraryAssetLoadingOrder($library) {
    * Confirms jQuery UI assets load as expected.
    *
    * Compares the jQuery assets that currently load against a list of the assets
-   * that loaded prior to the the deprecation of all remaining core jQuery UI
+   * that loaded prior to the deprecation of all remaining core jQuery UI
    * libraries.
    *
    * While this is similar to testLibraryAssetLoadingOrder(), it is a separate
diff --git a/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php b/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php
index c74cc0856..fbda2983f 100644
--- a/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/MailCaptureTest.php
@@ -7,8 +7,10 @@
 use Drupal\Core\Test\AssertMailTrait;
 
 /**
- * Tests the SimpleTest email capturing logic, the assertMail assertion and the
- * drupalGetMails function.
+ * Tests the collection of emails during testing.
+ *
+ * The test mail collector, test.mail.collector, intercepts any email sent
+ * during a test so it does not leave the test server.
  *
  * @group browsertestbase
  */
diff --git a/web/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php b/web/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php
index f9fe087ac..ccbd44277 100644
--- a/web/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php
+++ b/web/core/tests/Drupal/FunctionalTests/Menu/MenuActiveTrail403Test.php
@@ -49,7 +49,7 @@ protected function setUp(): void {
     $this->drupalPlaceBlock(
       'system_menu_block:' . $this->menu,
       [
-       'level' => 2,
+        'level' => 2,
       ]
     );
 
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
index 6b4e9e72b..0f9fdf167 100644
--- a/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/PathEncodedTest.php
@@ -7,7 +7,7 @@
 use Drupal\Tests\Traits\Core\PathAliasTestTrait;
 
 /**
- * Tests url generation and routing for route paths with encoded characters.
+ * Tests URL generation and routing for route paths with encoded characters.
  *
  * @group path
  * @group routing
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php
index 9f9d4885c..fc81b90d2 100644
--- a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingLanguageTest.php
@@ -40,6 +40,9 @@ class RouteCachingLanguageTest extends BrowserTestBase {
    */
   protected $webUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php
index 9b80da30b..dff4c0a58 100644
--- a/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Routing/RouteCachingNonPathLanguageNegotiationTest.php
@@ -35,6 +35,9 @@ class RouteCachingNonPathLanguageNegotiationTest extends BrowserTestBase {
    */
   protected $adminUser;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php
deleted file mode 100644
index 86cf7de9e..000000000
--- a/web/core/tests/Drupal/FunctionalTests/Theme/BartikTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Drupal\FunctionalTests\Theme;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests the Bartik theme.
- *
- * @group bartik
- */
-class BartikTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'bartik';
-
-  /**
-   * Tests that the Bartik theme always adds its message CSS files.
-   *
-   * @see bartik.libraries.yml
-   * @see classy.info.yml
-   */
-  public function testRegressionMissingMessagesCss() {
-    $this->drupalGet('');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains('bartik/css/components/messages.css');
-    $this->assertSession()->responseContains('bartik/css/classy/components/messages.css');
-  }
-
-}
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/ClaroLayoutBuilderTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/ClaroLayoutBuilderTest.php
index c2569bcff..c20e08b44 100644
--- a/web/core/tests/Drupal/FunctionalTests/Theme/ClaroLayoutBuilderTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Theme/ClaroLayoutBuilderTest.php
@@ -24,6 +24,7 @@ class ClaroLayoutBuilderTest extends BrowserTestBase {
     'layout_builder',
     'layout_builder_views_test',
     'layout_test',
+    'field_ui',
     'block',
     'block_test',
     'node',
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php
index 7af61a150..a36ac3279 100644
--- a/web/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Theme/ClaroTest.php
@@ -57,15 +57,13 @@ public function testConfigSchema() {
   }
 
   /**
-   * Tests that the Claro theme can be uninstalled, despite being experimental.
-   *
-   * @todo Remove in https://www.drupal.org/project/drupal/issues/3066007
+   * Tests that the Claro theme can be uninstalled.
    */
   public function testIsUninstallable() {
     $this->drupalLogin($this->drupalCreateUser(['access administration pages', 'administer themes']));
 
     $this->drupalGet('admin/appearance');
-    $this->cssSelect('a[title="Install Seven as default theme"]')[0]->click();
+    $this->cssSelect('a[title="Install <strong>Test theme</strong> as default theme"]')[0]->click();
     $this->cssSelect('a[title="Uninstall Claro theme"]')[0]->click();
     $this->assertSession()->pageTextContains('The Claro theme has been uninstalled.');
   }
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/ClassyTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/ClassyTest.php
deleted file mode 100644
index 9aabc6167..000000000
--- a/web/core/tests/Drupal/FunctionalTests/Theme/ClassyTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\FunctionalTests\Theme;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests the classy theme.
- *
- * @group classy
- */
-class ClassyTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'classy';
-
-  /**
-   * Tests that the Classy theme always adds its message CSS.
-   *
-   * @see classy.info.yml
-   */
-  public function testRegressionMissingMessagesCss() {
-    $this->drupalGet('');
-    $this->assertSession()->statusCodeEquals(200);
-    $this->assertSession()->responseContains('classy/css/components/messages.css');
-  }
-
-}
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php
index 4a0e8d09d..b31b9bafb 100644
--- a/web/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php
+++ b/web/core/tests/Drupal/FunctionalTests/Theme/OliveroTest.php
@@ -124,7 +124,7 @@ public function testIsUninstallable() {
     ]));
 
     $this->drupalGet('admin/appearance');
-    $this->cssSelect('a[title="Install Bartik as default theme"]')[0]->click();
+    $this->cssSelect('a[title="Install <strong>Test theme</strong> as default theme"]')[0]->click();
     $this->cssSelect('a[title="Uninstall Olivero theme"]')[0]->click();
     $this->assertSession()->pageTextContains('The Olivero theme has been uninstalled.');
   }
diff --git a/web/core/tests/Drupal/FunctionalTests/Theme/SevenLayoutBuilderTest.php b/web/core/tests/Drupal/FunctionalTests/Theme/SevenLayoutBuilderTest.php
deleted file mode 100644
index 4fd04e89b..000000000
--- a/web/core/tests/Drupal/FunctionalTests/Theme/SevenLayoutBuilderTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Drupal\FunctionalTests\Theme;
-
-use Drupal\Tests\BrowserTestBase;
-
-/**
- * Tests the Seven theme.
- *
- * @group seven
- */
-class SevenLayoutBuilderTest extends BrowserTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected $defaultTheme = 'seven';
-
-  /**
-   * {@inheritdoc}
-   */
-  protected static $modules = [
-    'views',
-    'layout_builder',
-    'layout_builder_views_test',
-    'layout_test',
-    'block',
-    'block_test',
-    'node',
-    'layout_builder_test',
-  ];
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    $this->drupalPlaceBlock('page_title_block', ['region' => 'header']);
-    $this->drupalPlaceBlock('local_tasks_block', ['region' => 'header']);
-
-    // Create two nodes.
-    $this->createContentType([
-      'type' => 'bundle_with_section_field',
-      'name' => 'Bundle with section field',
-    ]);
-    $this->createNode([
-      'type' => 'bundle_with_section_field',
-      'title' => 'The first node title',
-      'body' => [
-        [
-          'value' => 'The first node body',
-        ],
-      ],
-    ]);
-    $this->createNode([
-      'type' => 'bundle_with_section_field',
-      'title' => 'The second node title',
-      'body' => [
-        [
-          'value' => 'The second node body',
-        ],
-      ],
-    ]);
-  }
-
-  /**
-   * Tests the layout builder has expected contextual links with Seven.
-   *
-   * @see seven.theme
-   */
-  public function testContextualLinks() {
-    $assert_session = $this->assertSession();
-    $page = $this->getSession()->getPage();
-
-    $this->drupalLogin($this->drupalCreateUser([
-      'configure any layout',
-      'administer node display',
-      'administer node fields',
-      'access contextual links',
-    ]));
-
-    $field_ui_prefix = 'admin/structure/types/manage/bundle_with_section_field';
-
-    // From the manage display page, go to manage the layout.
-    $this->drupalGet("$field_ui_prefix/display/default");
-    $assert_session->linkNotExists('Manage layout');
-    $assert_session->fieldDisabled('layout[allow_custom]');
-
-    $this->submitForm(['layout[enabled]' => TRUE], 'Save');
-    $assert_session->linkExists('Manage layout');
-    $this->clickLink('Manage layout');
-
-    // Add a new block.
-    $assert_session->linkExists('Add block');
-    $this->clickLink('Add block');
-    $assert_session->linkExists('Powered by Drupal');
-    $this->clickLink('Powered by Drupal');
-    $page->fillField('settings[label]', 'This is the label');
-    $page->checkField('settings[label_display]');
-    $page->pressButton('Add block');
-
-    // Test that the block has the contextual class applied and the container
-    // for contextual links.
-    $assert_session->elementExists('css', 'div.block-system-powered-by-block.contextual-region div[data-contextual-id]');
-
-    // Ensure other blocks do not have contextual links.
-    $assert_session->elementExists('css', 'div.block-page-title-block');
-    $assert_session->elementNotExists('css', 'div.block-page-title-block.contextual-region div[data-contextual-id]');
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/AssertContentTrait.php b/web/core/tests/Drupal/KernelTests/AssertContentTrait.php
index 40d17a2ec..54befb6ea 100644
--- a/web/core/tests/Drupal/KernelTests/AssertContentTrait.php
+++ b/web/core/tests/Drupal/KernelTests/AssertContentTrait.php
@@ -488,8 +488,7 @@ protected function assertEscaped($raw, $message = '', $group = 'Other'): void {
   }
 
   /**
-   * Passes if the raw text IS NOT found escaped on the loaded page, fail
-   * otherwise.
+   * Passes if raw text IS NOT found escaped on loaded page, fail otherwise.
    *
    * Raw text refers to the raw HTML that the page generated.
    *
diff --git a/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php b/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
index 5d27fd0a9..970cb4850 100644
--- a/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
+++ b/web/core/tests/Drupal/KernelTests/Config/DefaultConfigTest.php
@@ -124,16 +124,16 @@ protected function assertExtensionConfig(string $name, string $type): void {
       $modules_to_install = array_merge($modules_to_install, $dependency->getDependencies('module'));
       $themes_to_install = array_merge($themes_to_install, $dependency->getDependencies('theme'));
     }
-    // Remove core because that cannot be installed.
-    $modules_to_install = array_diff(array_unique($modules_to_install), ['core']);
+    // Remove core and standard because they cannot be installed.
+    $modules_to_install = array_diff(array_unique($modules_to_install), ['core', 'standard']);
     $this->container->get('module_installer')->install($modules_to_install);
     $this->container->get('theme_installer')->install(array_unique($themes_to_install));
 
-    // Test configuration in the module's config/install directory.
-    $this->doTestsOnConfigStorage($extension_config_storage, $name);
+    // Test configuration in the extension's config/install directory.
+    $this->doTestsOnConfigStorage($extension_config_storage, $name, $type);
 
-    // Test configuration in the module's config/optional directory.
-    $this->doTestsOnConfigStorage($optional_config_storage, $name);
+    // Test configuration in the extension's config/optional directory.
+    $this->doTestsOnConfigStorage($optional_config_storage, $name, $type);
   }
 
   /**
@@ -187,10 +187,12 @@ public function moduleListDataProvider() {
    *
    * @param \Drupal\Core\Config\StorageInterface $default_config_storage
    *   The default config storage to test.
-   * @param string $module
-   *   The module that is being tested.
+   * @param string $extension
+   *   The extension that is being tested.
+   * @param string $type
+   *   The extension type to test.
    */
-  protected function doTestsOnConfigStorage(StorageInterface $default_config_storage, $module) {
+  protected function doTestsOnConfigStorage(StorageInterface $default_config_storage, $extension, string $type = 'module') {
     /** @var \Drupal\Core\Config\ConfigManagerInterface $config_manager */
     $config_manager = $this->container->get('config.manager');
 
@@ -224,9 +226,17 @@ protected function doTestsOnConfigStorage(StorageInterface $default_config_stora
         $this->assertNull($this->assertConfigDiff($result, $config_name, static::$skippedConfig));
       }
       else {
-        $info = $this->container->get('extension.list.module')->getExtensionInfo($module);
+        $data = $default_config_storage->read($config_name);
+        $dependency = new ConfigEntityDependency($config_name, $data);
+        if ($dependency->hasDependency('module', 'standard')) {
+          // Skip configuration with a dependency on the standard profile. Such
+          // configuration has probably been removed from the standard profile
+          // and needs its own test.
+          continue;
+        }
+        $info = $this->container->get("extension.list.$type")->getExtensionInfo($extension);
         if (!isset($info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER]) || $info[ExtensionLifecycle::LIFECYCLE_IDENTIFIER] !== ExtensionLifecycle::EXPERIMENTAL) {
-          $this->fail("$config_name provided by $module does not exist after installing all dependencies");
+          $this->fail("$config_name provided by $extension does not exist after installing all dependencies");
         }
       }
     }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Action/EmailActionTest.php b/web/core/tests/Drupal/KernelTests/Core/Action/EmailActionTest.php
index 81d8aad89..f71fcd34a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Action/EmailActionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Action/EmailActionTest.php
@@ -31,6 +31,8 @@ protected function setUp(): void {
    * Tests the email action plugin.
    */
   public function testEmailAction() {
+    $this->config('system.site')->set('mail', 'test@example.com')->save();
+
     /** @var \Drupal\Core\Action\ActionManager $plugin_manager */
     $plugin_manager = $this->container->get('plugin.manager.action');
     $configuration = [
diff --git a/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php b/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
index 414b5677d..307c5e049 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Asset/AttachedAssetsTest.php
@@ -419,14 +419,14 @@ public function testAlter() {
    * @see common_test_library_info_alter()
    */
   public function testLibraryAlter() {
-    // Verify that common_test altered the title of Farbtastic.
+    // Verify that common_test altered the title of loadjs.
     /** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
     $library_discovery = \Drupal::service('library.discovery');
-    $library = $library_discovery->getLibraryByName('core', 'jquery.farbtastic');
+    $library = $library_discovery->getLibraryByName('core', 'loadjs');
     $this->assertEquals('0.0', $library['version'], 'Registered libraries were altered.');
 
     // common_test_library_info_alter() also added a dependency on jQuery Form.
-    $build['#attached']['library'][] = 'core/jquery.farbtastic';
+    $build['#attached']['library'][] = 'core/loadjs';
     $assets = AttachedAssets::createFromRenderArray($build);
     $js = $this->assetResolver->getJsAssets($assets, FALSE)[1];
     $js_render_array = \Drupal::service('asset.js.collection_renderer')->render($js);
@@ -462,8 +462,8 @@ public function testDynamicLibrary() {
   public function testLibraryNameConflicts() {
     /** @var \Drupal\Core\Asset\LibraryDiscoveryInterface $library_discovery */
     $library_discovery = \Drupal::service('library.discovery');
-    $farbtastic = $library_discovery->getLibraryByName('common_test', 'jquery.farbtastic');
-    $this->assertEquals('0.1', $farbtastic['version'], 'Alternative libraries can be added to the page.');
+    $loadjs = $library_discovery->getLibraryByName('common_test', 'loadjs');
+    $this->assertEquals('0.1', $loadjs['version'], 'Alternative libraries can be added to the page.');
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
index 82d9d3c67..ee9c3b72b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php
@@ -31,7 +31,7 @@ class LibraryDiscoveryIntegrationTest extends KernelTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    $this->container->get('theme_installer')->install(['test_theme', 'classy']);
+    $this->container->get('theme_installer')->install(['test_theme', 'starterkit_theme']);
     $this->libraryDiscovery = $this->container->get('library.discovery');
   }
 
@@ -44,8 +44,9 @@ public function testHookLibraryInfoByTheme() {
     $this->activateTheme('test_theme');
     $this->assertNotEmpty($this->libraryDiscovery->getLibraryByName('test_theme', 'kitten'));
 
-    // Now make classy the active theme and assert that library is not added.
-    $this->activateTheme('classy');
+    // Now make starterkit_theme the active theme and assert that library is not
+    // added.
+    $this->activateTheme('starterkit_theme');
     $this->assertFalse($this->libraryDiscovery->getLibraryByName('test_theme', 'kitten'));
   }
 
@@ -53,13 +54,14 @@ public function testHookLibraryInfoByTheme() {
    * Tests that libraries-override are applied to library definitions.
    */
   public function testLibrariesOverride() {
-    // Assert some classy libraries that will be overridden or removed.
-    $this->activateTheme('classy');
-    $this->assertAssetInLibrary('core/themes/classy/css/components/button.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('core/themes/classy/css/components/collapse-processed.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('core/themes/classy/css/components/container-inline.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('core/themes/classy/css/components/details.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('core/themes/classy/css/components/dialog.css', 'classy', 'dialog', 'css');
+    // Assert some starterkit_theme libraries that will be overridden or
+    // removed.
+    $this->activateTheme('starterkit_theme');
+    $this->assertAssetInLibrary('core/themes/starterkit_theme/css/components/button.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('core/themes/starterkit_theme/css/components/collapse-processed.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('core/themes/starterkit_theme/css/components/container-inline.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('core/themes/starterkit_theme/css/components/details.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('core/themes/starterkit_theme/css/components/dialog.css', 'starterkit_theme', 'dialog', 'css');
 
     // Confirmatory assert on core library to be removed.
     $this->assertNotEmpty($this->libraryDiscovery->getLibraryByName('core', 'drupal.progress'), 'Confirmatory test on "core/drupal.progress"');
@@ -70,17 +72,18 @@ public function testLibrariesOverride() {
     // Assert that entire library was correctly overridden.
     $this->assertEquals($this->libraryDiscovery->getLibraryByName('core', 'drupal.collapse'), $this->libraryDiscovery->getLibraryByName('test_theme', 'collapse'), 'Entire library correctly overridden.');
 
-    // Assert that classy library assets were correctly overridden or removed.
-    $this->assertNoAssetInLibrary('core/themes/classy/css/components/button.css', 'classy', 'base', 'css');
-    $this->assertNoAssetInLibrary('core/themes/classy/css/components/collapse-processed.css', 'classy', 'base', 'css');
-    $this->assertNoAssetInLibrary('core/themes/classy/css/components/container-inline.css', 'classy', 'base', 'css');
-    $this->assertNoAssetInLibrary('core/themes/classy/css/components/details.css', 'classy', 'base', 'css');
-    $this->assertNoAssetInLibrary('core/themes/classy/css/components/dialog.css', 'classy', 'dialog', 'css');
+    // Assert that starterkit_theme library assets were correctly overridden or
+    // removed.
+    $this->assertNoAssetInLibrary('core/themes/starterkit_theme/css/components/button.css', 'starterkit_theme', 'base', 'css');
+    $this->assertNoAssetInLibrary('core/themes/starterkit_theme/css/components/collapse-processed.css', 'starterkit_theme', 'base', 'css');
+    $this->assertNoAssetInLibrary('core/themes/starterkit_theme/css/components/container-inline.css', 'starterkit_theme', 'base', 'css');
+    $this->assertNoAssetInLibrary('core/themes/starterkit_theme/css/components/details.css', 'starterkit_theme', 'base', 'css');
+    $this->assertNoAssetInLibrary('core/themes/starterkit_theme/css/components/dialog.css', 'starterkit_theme', 'dialog', 'css');
 
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme/css/my-button.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme/css/my-collapse-processed.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('themes/my_theme/css/my-container-inline.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('themes/my_theme/css/my-details.css', 'classy', 'base', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme/css/my-button.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme/css/my-collapse-processed.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('themes/my_theme/css/my-container-inline.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('themes/my_theme/css/my-details.css', 'starterkit_theme', 'base', 'css');
 
     // Assert that entire library was correctly removed.
     $this->assertFalse($this->libraryDiscovery->getLibraryByName('core', 'drupal.progress'), 'Entire library correctly removed.');
@@ -150,7 +153,7 @@ public function testLibrariesOverrideOtherAssetLibraryNames() {
     $this->assertAssetInLibrary('//my-server/my_theme/js/overridden.js', 'core', 'drupal.displace', 'js');
 
     // Assert an absolute URI.
-    $this->assertAssetInLibrary('http://example.com/my_theme/css/farbtastic.css', 'core', 'jquery.farbtastic', 'css');
+    $this->assertAssetInLibrary('http://example.com/my_theme/js/loadjs.min.js', 'core', 'loadjs', 'js');
   }
 
   /**
@@ -163,32 +166,46 @@ public function testBaseThemeLibrariesOverrideInSubTheme() {
     // Assert that libraries-override specified in the base theme still applies
     // in the sub theme.
     $this->assertNoAssetInLibrary('core/misc/dialog/dialog.js', 'core', 'drupal.dialog', 'js');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/farbtastic.css', 'core', 'jquery.farbtastic', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_basetheme/js/loadjs.min.js', 'core', 'loadjs', 'js');
   }
 
   /**
    * Tests libraries-extend.
    */
   public function testLibrariesExtend() {
-    // Activate classy themes and verify the libraries are not extended.
-    $this->activateTheme('classy');
-    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_1.css', 'classy', 'book-navigation', 'css');
-    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/js/extend_1.js', 'classy', 'book-navigation', 'js');
-    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_2.css', 'classy', 'book-navigation', 'css');
-
-    // Activate the theme that extends the book-navigation library in classy.
+    // Simulate starterkit_theme defining the book-navigation library.
+    // @see theme_test_library_info_alter()
+    $this->container->get('state')
+      ->set('theme_test_library_info_alter starterkit_theme', [
+        'book-navigation' => [
+          'css' => [
+            'component' => [
+              'css/components/book-navigation.css' => [],
+            ],
+          ],
+        ],
+      ]);
+
+    // Activate starterkit_theme and verify the libraries are not extended.
+    $this->activateTheme('starterkit_theme');
+    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_1.css', 'starterkit_theme', 'book-navigation', 'css');
+    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/js/extend_1.js', 'starterkit_theme', 'book-navigation', 'js');
+    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_2.css', 'starterkit_theme', 'book-navigation', 'css');
+
+    // Activate the theme that extends the book-navigation library in
+    // starterkit_theme.
     $this->activateTheme('test_theme_libraries_extend');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_1.css', 'classy', 'book-navigation', 'css');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/js/extend_1.js', 'classy', 'book-navigation', 'js');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_2.css', 'classy', 'book-navigation', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_1.css', 'starterkit_theme', 'book-navigation', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/js/extend_1.js', 'starterkit_theme', 'book-navigation', 'js');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_theme_libraries_extend/css/extend_2.css', 'starterkit_theme', 'book-navigation', 'css');
 
     // Activate a sub theme and confirm that it inherits the library assets
     // extended in the base theme as well as its own.
-    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/base-libraries-extend.css', 'classy', 'base', 'css');
-    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_subtheme/css/sub-libraries-extend.css', 'classy', 'base', 'css');
+    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/base-libraries-extend.css', 'starterkit_theme', 'base', 'css');
+    $this->assertNoAssetInLibrary('core/modules/system/tests/themes/test_subtheme/css/sub-libraries-extend.css', 'starterkit_theme', 'base', 'css');
     $this->activateTheme('test_subtheme');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/base-libraries-extend.css', 'classy', 'base', 'css');
-    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_subtheme/css/sub-libraries-extend.css', 'classy', 'base', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_basetheme/css/base-libraries-extend.css', 'starterkit_theme', 'base', 'css');
+    $this->assertAssetInLibrary('core/modules/system/tests/themes/test_subtheme/css/sub-libraries-extend.css', 'starterkit_theme', 'base', 'css');
 
     // Activate test theme that extends with a non-existent library. An
     // exception should be thrown.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php b/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
index 36d2942b2..026f8d326 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Asset/ResolvedLibraryDefinitionsFilesMatchTest.php
@@ -60,11 +60,9 @@ class ResolvedLibraryDefinitionsFilesMatchTest extends KernelTestBase {
    * @var string[]
    */
   protected $allThemes = [
-    'bartik',
-    'classy',
+    'claro',
     'olivero',
-    'seven',
-    'stable',
+    'stable9',
     'stark',
   ];
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php
index 1b62d8945..e476ce54f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/DatabaseBackendTest.php
@@ -28,7 +28,7 @@ class DatabaseBackendTest extends GenericCacheBackendUnitTestBase {
   /**
    * Creates a new instance of DatabaseBackend.
    *
-   * @return
+   * @return \Drupal\Core\Cache\DatabaseBackend
    *   A new DatabaseBackend object.
    */
   protected function createCacheBackend($bin) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
index 8380cf433..e5a5379db 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/GenericCacheBackendUnitTestBase.php
@@ -101,6 +101,9 @@ protected function getCacheBackend($bin = NULL) {
     return $this->cachebackends[$bin];
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     $this->cachebackends = [];
     $this->defaultValue = $this->randomMachineName(10);
@@ -110,6 +113,9 @@ protected function setUp() {
     $this->setUpCacheBackend();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function tearDown() {
     // Destruct the registered backend, each test will get a fresh instance,
     // properly emptying it here ensure that on persistent data backends they
@@ -433,8 +439,18 @@ public function testSetMultiple() {
   }
 
   /**
-   * Tests Drupal\Core\Cache\CacheBackendInterface::delete() and
-   * Drupal\Core\Cache\CacheBackendInterface::deleteMultiple().
+   * @covers \Drupal\Core\Cache\ApcuBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\BackendChain::deleteMultiple
+   * @covers \Drupal\Core\Cache\ChainedFastBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\DatabaseBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\MemoryBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\PhpBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\ApcuBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\BackendChain::deleteMultiple
+   * @covers \Drupal\Core\Cache\ChainedFastBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\DatabaseBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\MemoryBackend::deleteMultiple
+   * @covers \Drupal\Core\Cache\PhpBackend::deleteMultiple
    */
   public function testDeleteMultiple() {
     $backend = $this->getCacheBackend();
@@ -500,8 +516,18 @@ public function testDeleteAll() {
   }
 
   /**
-   * Tests Drupal\Core\Cache\CacheBackendInterface::invalidate() and
-   * Drupal\Core\Cache\CacheBackendInterface::invalidateMultiple().
+   * @covers \Drupal\Core\Cache\ApcuBackend::getMultiple
+   * @covers \Drupal\Core\Cache\BackendChain::getMultiple
+   * @covers \Drupal\Core\Cache\ChainedFastBackend::getMultiple
+   * @covers \Drupal\Core\Cache\DatabaseBackend::getMultiple
+   * @covers \Drupal\Core\Cache\MemoryBackend::getMultiple
+   * @covers \Drupal\Core\Cache\PhpBackend::getMultiple
+   * @covers \Drupal\Core\Cache\ApcuBackend::invalidateMultiple
+   * @covers \Drupal\Core\Cache\BackendChain::invalidateMultiple
+   * @covers \Drupal\Core\Cache\ChainedFastBackend::invalidateMultiple
+   * @covers \Drupal\Core\Cache\DatabaseBackend::invalidateMultiple
+   * @covers \Drupal\Core\Cache\MemoryBackend::invalidateMultiple
+   * @covers \Drupal\Core\Cache\PhpBackend::invalidateMultiple
    */
   public function testInvalidate() {
     $backend = $this->getCacheBackend();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php
index 4518532cf..ad6da4930 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/MemoryBackendTest.php
@@ -14,7 +14,7 @@ class MemoryBackendTest extends GenericCacheBackendUnitTestBase {
   /**
    * Creates a new instance of MemoryBackend.
    *
-   * @return
+   * @return \Drupal\Core\Cache\CacheBackendInterface
    *   A new MemoryBackend object.
    */
   protected function createCacheBackend($bin) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/Cache/PhpBackendTest.php b/web/core/tests/Drupal/KernelTests/Core/Cache/PhpBackendTest.php
index 486d2d43f..b35a3b94f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Cache/PhpBackendTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Cache/PhpBackendTest.php
@@ -14,8 +14,8 @@ class PhpBackendTest extends GenericCacheBackendUnitTestBase {
   /**
    * Creates a new instance of MemoryBackend.
    *
-   * @return
-   *   A new MemoryBackend object.
+   * @return \Drupal\Core\Cache\CacheBackendInterface
+   *   A new PhpBackend object.
    */
   protected function createCacheBackend($bin) {
     $backend = new PhpBackend($bin, \Drupal::service('cache_tags.invalidator.checksum'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php b/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php
index f595cfcab..77e70784e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Common/SizeTest.php
@@ -6,8 +6,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Parse a predefined amount of bytes and compare the output with the expected
- * value.
+ * Tests format_size().
  *
  * @group Common
  */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php b/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php
index b8b0fdd42..403036fe8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Common/XssUnitTest.php
@@ -6,8 +6,11 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Confirm that \Drupal\Component\Utility\Xss::filter() and check_url() work
- * correctly, including invalid multi-byte sequences.
+ * Tests XSS filtering.
+ *
+ * @see \Drupal\Component\Utility\Xss::filter()
+ * @see \Drupal\Component\Utility\UrlHelper::filterBadProtocol
+ * @see \Drupal\Component\Utility\UrlHelper::stripDangerousProtocols
  *
  * @group Common
  */
@@ -20,6 +23,9 @@ class XssUnitTest extends KernelTestBase {
    */
   protected static $modules = ['filter', 'system'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
index 277a8f908..3d125cf4d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
@@ -18,6 +18,9 @@ class ConfigEntityNormalizeTest extends KernelTestBase {
    */
   protected static $modules = ['config_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(static::$modules);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
index 91887ecc5..325d5cd66 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStorageTest.php
@@ -6,8 +6,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests sync and importing config entities with IDs and UUIDs that match
- * existing config.
+ * Tests configuration entity storage.
  *
  * @group config
  */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigExportStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigExportStorageTest.php
index d5d1fc6da..22f22c5b2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigExportStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigExportStorageTest.php
@@ -18,6 +18,9 @@ class ConfigExportStorageTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'config_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system', 'config_test']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
index 2f8a5c4da..c65a9004b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRecreateTest.php
@@ -28,6 +28,9 @@ class ConfigImportRecreateTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'field', 'text', 'user', 'node'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -51,7 +54,8 @@ protected function setUp(): void {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
index b4ec44cac..5dffd1c93 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
@@ -63,7 +63,8 @@ protected function setUp(): void {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
index a3bbf767e..9ef75f587 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterMissingContentTest.php
@@ -34,6 +34,9 @@ class ConfigImporterMissingContentTest extends KernelTestBase {
     'config_import_test',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installSchema('system', 'sequences');
@@ -62,7 +65,8 @@ protected function setUp(): void {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
   }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
index 63d216975..cfd981259 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php
@@ -27,6 +27,9 @@ class ConfigImporterTest extends KernelTestBase {
    */
   protected static $modules = ['config_test', 'system', 'config_import_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -54,8 +57,7 @@ public function testNoImport() {
   }
 
   /**
-   * Tests that trying to import from an empty sync configuration directory
-   * fails.
+   * Tests that trying to import from empty sync configuration directory fails.
    */
   public function testEmptyImportFails() {
     $this->expectException(ConfigImporterException::class);
@@ -604,7 +606,7 @@ public function testUnmetDependency() {
     $config_entity_data = $sync->read('config_test.dynamic.dotted.default');
     $config_entity_data['dependencies'] = ['module' => ['unknown', 'dblog']];
     $sync->write('config_test.dynamic.dotted.module', $config_entity_data);
-    $config_entity_data['dependencies'] = ['theme' => ['unknown', 'seven']];
+    $config_entity_data['dependencies'] = ['theme' => ['unknown', 'stark']];
     $sync->write('config_test.dynamic.dotted.theme', $config_entity_data);
     $config_entity_data['dependencies'] = ['config' => ['unknown', 'unknown2']];
     $sync->write('config_test.dynamic.dotted.config', $config_entity_data);
@@ -623,7 +625,7 @@ public function testUnmetDependency() {
         'Configuration <em class="placeholder">config_test.dynamic.dotted.config</em> depends on configuration (<em class="placeholder">unknown, unknown2</em>) that will not exist after import.',
         'Configuration <em class="placeholder">config_test.dynamic.dotted.existing</em> depends on the <em class="placeholder">config_test.dynamic.dotted.deleted</em> configuration that will not exist after import.',
         'Configuration <em class="placeholder">config_test.dynamic.dotted.module</em> depends on modules (<em class="placeholder">unknown, Database Logging</em>) that will not be installed after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Seven</em>) that will not be installed after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Stark</em>) that will not be installed after import.',
         'Configuration <em class="placeholder">unknown.config</em> depends on the <em class="placeholder">unknown</em> extension that will not be installed after import.',
       ];
       $this->assertEquals(implode(PHP_EOL, $expected), $e->getMessage());
@@ -631,7 +633,7 @@ public function testUnmetDependency() {
       $expected = [
         'Configuration <em class="placeholder">config_test.dynamic.dotted.config</em> depends on configuration (<em class="placeholder">unknown, unknown2</em>) that will not exist after import.',
         'Configuration <em class="placeholder">config_test.dynamic.dotted.module</em> depends on modules (<em class="placeholder">unknown, Database Logging</em>) that will not be installed after import.',
-        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Seven</em>) that will not be installed after import.',
+        'Configuration <em class="placeholder">config_test.dynamic.dotted.theme</em> depends on themes (<em class="placeholder">unknown, Stark</em>) that will not be installed after import.',
       ];
       foreach ($expected as $expected_message) {
         $this->assertContainsEquals($expected_message, $error_log, $expected_message);
@@ -684,6 +686,37 @@ public function testRequiredModuleValidation() {
     }
   }
 
+  /**
+   * Tests installing a base themes and sub themes during configuration import.
+   *
+   * @see \Drupal\Core\EventSubscriber\ConfigImportSubscriber
+   */
+  public function testInstallBaseAndSubThemes() {
+    $sync = $this->container->get('config.storage.sync');
+    $extensions = $sync->read('core.extension');
+    $extensions['theme']['test_basetheme'] = 0;
+    $extensions['theme']['test_subtheme'] = 0;
+    $extensions['theme']['test_subsubtheme'] = 0;
+    $sync->write('core.extension', $extensions);
+    $config_importer = $this->configImporter();
+    $config_importer->import();
+    $this->assertTrue($this->container->get('theme_handler')->themeExists('test_basetheme'));
+    $this->assertTrue($this->container->get('theme_handler')->themeExists('test_subsubtheme'));
+    $this->assertTrue($this->container->get('theme_handler')->themeExists('test_subtheme'));
+
+    // Test uninstalling them.
+    $extensions = $sync->read('core.extension');
+    unset($extensions['theme']['test_basetheme']);
+    unset($extensions['theme']['test_subsubtheme']);
+    unset($extensions['theme']['test_subtheme']);
+    $sync->write('core.extension', $extensions);
+    $config_importer = $this->configImporter();
+    $config_importer->import();
+    $this->assertFalse($this->container->get('theme_handler')->themeExists('test_basetheme'));
+    $this->assertFalse($this->container->get('theme_handler')->themeExists('test_subsubtheme'));
+    $this->assertFalse($this->container->get('theme_handler')->themeExists('test_subtheme'));
+  }
+
   /**
    * Tests install profile validation during configuration import.
    *
@@ -819,11 +852,53 @@ public function testInvalidStep() {
   public function testCustomStep() {
     $this->assertFalse(\Drupal::isConfigSyncing(), 'Before an import \Drupal::isConfigSyncing() returns FALSE');
     $context = [];
-    $this->configImporter()->doSyncStep([self::class, 'customStep'], $context);
+    $this->configImporter()->doSyncStep(\Closure::fromCallable([self::class, 'customStep']), $context);
     $this->assertTrue($context['is_syncing'], 'Inside a custom step \Drupal::isConfigSyncing() returns TRUE');
     $this->assertFalse(\Drupal::isConfigSyncing(), 'After an valid custom step \Drupal::isConfigSyncing() returns FALSE');
   }
 
+  /**
+   * Tests that uninstall a theme in config import correctly imports all config.
+   */
+  public function testUninstallThemeIncrementsCount(): void {
+    $theme_installer = $this->container->get('theme_installer');
+    // Install our theme.
+    $theme = 'test_basetheme';
+    $theme_installer->install([$theme]);
+
+    $this->assertTrue($this->container->get('theme_handler')->themeExists($theme));
+
+    $sync = $this->container->get('config.storage.sync');
+
+    // Update 2 pieces of config in sync.
+    $systemSiteName = 'system.site';
+    $system = $sync->read($systemSiteName);
+    $system['name'] = 'Foo';
+    $sync->write($systemSiteName, $system);
+
+    $cronName = 'system.cron';
+    $cron = $sync->read($cronName);
+    $this->assertEquals(1, $cron['logging']);
+    $cron['logging'] = 0;
+    $sync->write($cronName, $cron);
+
+    // Uninstall the theme in sync.
+    $extensions = $sync->read('core.extension');
+    unset($extensions['theme'][$theme]);
+    $sync->write('core.extension', $extensions);
+
+    $this->configImporter()->import();
+
+    // The theme should be uninstalled.
+    $this->assertFalse($this->container->get('theme_handler')->themeExists($theme));
+
+    // Both pieces of config should be updated.
+    \Drupal::configFactory()->reset($systemSiteName);
+    \Drupal::configFactory()->reset($cronName);
+    $this->assertEquals('Foo', $this->config($systemSiteName)->get('name'));
+    $this->assertEquals(0, $this->config($cronName)->get('logging'));
+  }
+
   /**
    * Helper method to test custom config installer steps.
    *
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
index a2063274a..8e5f2e81d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigInstallTest.php
@@ -227,8 +227,7 @@ public function testDependencyChecking() {
   }
 
   /**
-   * Tests imported configuration entities with and without language
-   * information.
+   * Tests imported configuration entities with/without language information.
    */
   public function testLanguage() {
     $this->installModules(['config_test_language']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
index 528a068c9..6c11d41c8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverrideTest.php
@@ -18,6 +18,9 @@ class ConfigOverrideTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'config_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system']);
@@ -38,7 +41,7 @@ public function testConfOverride() {
     // contain these values.
     $overrides['config_test.system']['foo'] = 'overridden';
     $overrides['config_test.system']['baz'] = 'injected';
-    $overrides['config_test.system']['404'] = 'derp';
+    $overrides['config_test.system']['404'] = 'something';
     $GLOBALS['config'] = $overrides;
 
     $this->installConfig(['config_test']);
@@ -93,7 +96,7 @@ public function testConfOverride() {
     $sync = $this->container->get('config.storage.sync');
     $expected_new_data = [
       'foo' => 'barbar',
-      '404' => 'herpderp',
+      '404' => 'try again',
     ];
     $sync->write('config_test.system', $expected_new_data);
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
index 7ad448779..b5ca02e95 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ConfigOverridesPriorityTest.php
@@ -6,8 +6,13 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests that language, module and settings.php are applied in the correct
- * order.
+ * Tests that config overrides are applied in the correct order.
+ *
+ * Overrides should be applied in the following order, from lowest priority
+ * to highest:
+ * - Language overrides.
+ * - Module overrides.
+ * - settings.php overrides.
  *
  * @group config
  */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
index 32c13c720..dd7c480d1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/DefaultConfigTest.php
@@ -46,22 +46,6 @@ class DefaultConfigTest extends KernelTestBase {
     'tour.tour.tour-test-legacy-location',
   ];
 
-  /**
-   * Themes which provide default configuration and need enabling.
-   *
-   * If a theme provides default configuration but does not have a schema
-   * because it can rely on schemas added by system_config_schema_info_alter()
-   * then this test needs to enable it.
-   *
-   * @var array
-   */
-  protected $themes = ['seven'];
-
-  protected function setUp(): void {
-    parent::setUp();
-    \Drupal::service('theme_installer')->install($this->themes);
-  }
-
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ExportStorageManagerTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ExportStorageManagerTest.php
index a5e2b3ead..cd8486a67 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ExportStorageManagerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ExportStorageManagerTest.php
@@ -82,7 +82,7 @@ public function testGetStorageLock() {
     $lock->expects($this->exactly(2))
       ->method('acquire')
       ->with(ExportStorageManager::LOCK_NAME)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $lock->expects($this->once())
       ->method('wait')
       ->with(ExportStorageManager::LOCK_NAME);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/ImportStorageTransformerTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/ImportStorageTransformerTest.php
index 9e637c9c7..a843e9a38 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/ImportStorageTransformerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/ImportStorageTransformerTest.php
@@ -69,7 +69,7 @@ public function testTransformLocked() {
     $lock->expects($this->exactly(2))
       ->method('acquire')
       ->with(ImportStorageTransformer::LOCK_NAME)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $lock->expects($this->once())
       ->method('wait')
       ->with(ImportStorageTransformer::LOCK_NAME);
@@ -100,7 +100,7 @@ public function testTransformWhileImporting() {
     $lock->expects($this->once())
       ->method('lockMayBeAvailable')
       ->with(ConfigImporter::LOCK_NAME)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     // The import transformer under test.
     $transformer = new ImportStorageTransformer(
diff --git a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
index ae15eeefd..1374f5975 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Config/Storage/CachedStorageTest.php
@@ -27,6 +27,9 @@ class CachedStorageTest extends ConfigStorageTestBase {
    */
   protected $fileStorage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Create a directory.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
index c62739cd4..0e6e03dc1 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionTest.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
-use Drupal\Core\Database\DatabaseExceptionWrapper;
 use Drupal\Core\Database\Query\Condition;
 use Drupal\Core\Database\StatementWrapper;
 
@@ -202,21 +201,6 @@ public function testPrefixArrayOption() {
     $this->assertArrayNotHasKey('extra_prefix', $foo_connection->getConnectionOptions());
   }
 
-  /**
-   * Ensure that you cannot execute multiple statements on MySQL.
-   */
-  public function testMultipleStatementsForNewPhp() {
-    // This just tests mysql, as other PDO integrations don't allow disabling
-    // multiple statements.
-    if (Database::getConnection()->databaseType() !== 'mysql') {
-      $this->markTestSkipped("This test only runs for MySQL");
-    }
-
-    // Disable the protection at the PHP level.
-    $this->expectException(DatabaseExceptionWrapper::class);
-    Database::getConnection('default', 'default')->query('SELECT * FROM {test}; SELECT * FROM {test_people}', [], ['allow_delimiter_in_query' => TRUE]);
-  }
-
   /**
    * Ensure that you cannot execute multiple statements in a query.
    */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
deleted file mode 100644
index 9b88592c7..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/ConnectionUnitTest.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-use Drupal\Component\Render\FormattableMarkup;
-use Drupal\Core\Database\Database;
-use Drupal\KernelTests\KernelTestBase;
-
-/**
- * Tests management of database connections.
- *
- * @group Database
- */
-class ConnectionUnitTest extends KernelTestBase {
-
-  /**
-   * A target connection identifier to be used for testing.
-   */
-  const TEST_TARGET_CONNECTION = 'DatabaseConnectionUnitTest';
-
-  /**
-   * The default database connection used for testing.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $connection;
-
-  /**
-   * A database connection used for monitoring processes.
-   *
-   * @var \Drupal\Core\Database\Connection
-   */
-  protected $monitor;
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    $this->connection = Database::getConnection();
-
-    // Create an additional connection to monitor the connections being opened
-    // and closed in this test.
-    $connection_info = Database::getConnectionInfo();
-    Database::addConnectionInfo('default', 'monitor', $connection_info['default']);
-    $this->monitor = Database::getConnection('monitor');
-  }
-
-  /**
-   * Returns a set of queries specific for the database in testing.
-   */
-  protected function getQuery() {
-    if ($this->connection->databaseType() == 'pgsql') {
-      return [
-        'connection_id' => 'SELECT pg_backend_pid()',
-        'processlist' => 'SELECT pid FROM pg_stat_activity',
-        'show_tables' => 'SELECT * FROM pg_catalog.pg_tables',
-      ];
-    }
-    else {
-      return [
-        'connection_id' => 'SELECT CONNECTION_ID()',
-        'processlist' => 'SHOW PROCESSLIST',
-        'show_tables' => 'SHOW TABLES',
-      ];
-    }
-  }
-
-  /**
-   * Adds a new database connection info to Database.
-   */
-  protected function addConnection() {
-    // Add a new target to the connection, by cloning the current connection.
-    $connection_info = Database::getConnectionInfo();
-    Database::addConnectionInfo('default', static::TEST_TARGET_CONNECTION, $connection_info['default']);
-
-    // Verify that the new target exists.
-    $info = Database::getConnectionInfo();
-    // New connection info found.
-    $this->assertSame($connection_info['default'], $info[static::TEST_TARGET_CONNECTION]);
-  }
-
-  /**
-   * Returns the connection ID of the current test connection.
-   *
-   * @return int
-   */
-  protected function getConnectionId() {
-    return (int) Database::getConnection(static::TEST_TARGET_CONNECTION)->query($this->getQuery()['connection_id'])->fetchField();
-  }
-
-  /**
-   * Asserts that a connection ID exists.
-   *
-   * @param int $id
-   *   The connection ID to verify.
-   *
-   * @internal
-   */
-  protected function assertConnection(int $id): void {
-    $list = $this->monitor->query($this->getQuery()['processlist'])->fetchAllKeyed(0, 0);
-    $this->assertTrue(isset($list[$id]), new FormattableMarkup('Connection ID @id found.', ['@id' => $id]));
-  }
-
-  /**
-   * Asserts that a connection ID does not exist.
-   *
-   * @param int $id
-   *   The connection ID to verify.
-   *
-   * @internal
-   */
-  protected function assertNoConnection(int $id): void {
-    $list = $this->monitor->query($this->getQuery()['processlist'])->fetchAllKeyed(0, 0);
-    $this->assertFalse(isset($list[$id]), new FormattableMarkup('Connection ID @id not found.', ['@id' => $id]));
-  }
-
-  /**
-   * Tests Database::closeConnection() without query.
-   *
-   * @todo getConnectionId() executes a query.
-   */
-  public function testOpenClose() {
-    // Do not run this test for an SQLite database.
-    $database_type = $this->connection->databaseType();
-    if ($database_type != 'mysql' && $database_type != 'pgsql') {
-      $this->markTestSkipped("This tests only runs on MySQL and PostgreSQL");
-    }
-
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionId();
-    Database::getConnection(static::TEST_TARGET_CONNECTION);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Close the connection.
-    Database::closeConnection(static::TEST_TARGET_CONNECTION);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests Database::closeConnection() with a query.
-   */
-  public function testOpenQueryClose() {
-    // Do not run this test for an SQLite database.
-    $database_type = $this->connection->databaseType();
-    if ($database_type != 'mysql' && $database_type != 'pgsql') {
-      $this->markTestSkipped("This tests only runs on MySQL and PostgreSQL");
-    }
-
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionId();
-    Database::getConnection(static::TEST_TARGET_CONNECTION);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Execute a query.
-    Database::getConnection(static::TEST_TARGET_CONNECTION)->query($this->getQuery()['show_tables']);
-
-    // Close the connection.
-    Database::closeConnection(static::TEST_TARGET_CONNECTION);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests Database::closeConnection() with a query and custom prefetch method.
-   */
-  public function testOpenQueryPrefetchClose() {
-    // Do not run this test for an SQLite database.
-    $database_type = $this->connection->databaseType();
-    if ($database_type != 'mysql' && $database_type != 'pgsql') {
-      $this->markTestSkipped("This tests only runs on MySQL and PostgreSQL");
-    }
-
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionId();
-    Database::getConnection(static::TEST_TARGET_CONNECTION);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Execute a query.
-    Database::getConnection(static::TEST_TARGET_CONNECTION)->query($this->getQuery()['show_tables'])->fetchCol();
-
-    // Close the connection.
-    Database::closeConnection(static::TEST_TARGET_CONNECTION);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests Database::closeConnection() with a select query.
-   */
-  public function testOpenSelectQueryClose() {
-    // Do not run this test for an SQLite database.
-    $database_type = $this->connection->databaseType();
-    if ($database_type != 'mysql' && $database_type != 'pgsql') {
-      $this->markTestSkipped("This tests only runs on MySQL and PostgreSQL");
-    }
-
-    // Add and open a new connection.
-    $this->addConnection();
-    $id = $this->getConnectionId();
-    Database::getConnection(static::TEST_TARGET_CONNECTION);
-
-    // Verify that there is a new connection.
-    $this->assertConnection($id);
-
-    // Create a table.
-    $name = 'foo';
-    Database::getConnection(static::TEST_TARGET_CONNECTION)->schema()->createTable($name, [
-      'fields' => [
-        'name' => [
-          'type' => 'varchar',
-          'length' => 255,
-        ],
-      ],
-    ]);
-
-    // Execute a query.
-    Database::getConnection(static::TEST_TARGET_CONNECTION)->select('foo', 'f')
-      ->fields('f', ['name'])
-      ->execute()
-      ->fetchAll();
-
-    // Drop the table.
-    Database::getConnection(static::TEST_TARGET_CONNECTION)->schema()->dropTable($name);
-
-    // Close the connection.
-    Database::closeConnection(static::TEST_TARGET_CONNECTION);
-    // Wait 20ms to give the database engine sufficient time to react.
-    usleep(20000);
-
-    // Verify that we are back to the original connection count.
-    $this->assertNoConnection($id);
-  }
-
-  /**
-   * Tests pdo options override.
-   */
-  public function testConnectionOpen() {
-    $reflection = new \ReflectionObject($this->connection);
-    $connection_property = $reflection->getProperty('connection');
-    $connection_property->setAccessible(TRUE);
-    // Skip this test when a database driver does not implement PDO.
-    // An alternative database driver that does not implement PDO
-    // should implement its own connection test.
-    if (get_class($connection_property->getValue($this->connection)) !== 'PDO') {
-      $this->markTestSkipped('Ignored PDO connection unit test for this driver because it does not implement PDO.');
-    }
-    $error_mode = $connection_property->getValue($this->connection)
-      ->getAttribute(\PDO::ATTR_ERRMODE);
-    // Ensure the default error mode is set to exception.
-    $this->assertSame(\PDO::ERRMODE_EXCEPTION, $error_mode);
-
-    $connection_info = Database::getConnectionInfo();
-    $connection_info['default']['pdo'][\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_SILENT;
-    Database::addConnectionInfo('test', 'default', $connection_info['default']);
-    $test_connection = Database::getConnection('default', 'test');
-
-    $reflection = new \ReflectionObject($test_connection);
-    $connection_property = $reflection->getProperty('connection');
-    $connection_property->setAccessible(TRUE);
-    $error_mode = $connection_property->getValue($test_connection)
-      ->getAttribute(\PDO::ATTR_ERRMODE);
-    // Ensure PDO connection options can be overridden.
-    $this->assertSame(\PDO::ERRMODE_SILENT, $error_mode);
-
-    Database::removeConnection('test');
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php
index d7af19f1c..af2bbcf05 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php
@@ -62,41 +62,6 @@ public function testHandleQueryExceptionDeprecation(): void {
     Database::getConnection()->query($stmt);
   }
 
-  /**
-   * Tests Connection::prepareStatement exceptions on execution.
-   *
-   * Core database drivers use PDO emulated statements or the StatementPrefetch
-   * class, which defer the statement check to the moment of the execution.
-   */
-  public function testPrepareStatementFailOnExecution() {
-    $this->expectException(\PDOException::class);
-    $stmt = Database::getConnection()->prepareStatement('bananas', []);
-    $stmt->execute();
-  }
-
-  /**
-   * Tests Connection::prepareStatement exceptions on preparation.
-   *
-   * Core database drivers use PDO emulated statements or the StatementPrefetch
-   * class, which defer the statement check to the moment of the execution. In
-   * order to test a failure at preparation time, we have to force the
-   * connection not to emulate statement preparation. Still, this is only valid
-   * for the MySql driver.
-   */
-  public function testPrepareStatementFailOnPreparation() {
-    $driver = Database::getConnection()->driver();
-    if ($driver !== 'mysql') {
-      $this->markTestSkipped("MySql tests can not run for driver '$driver'.");
-    }
-
-    $connection_info = Database::getConnectionInfo('default');
-    $connection_info['default']['pdo'][\PDO::ATTR_EMULATE_PREPARES] = FALSE;
-    Database::addConnectionInfo('default', 'foo', $connection_info['default']);
-    $foo_connection = Database::getConnection('foo', 'default');
-    $this->expectException(DatabaseExceptionWrapper::class);
-    $stmt = $foo_connection->prepareStatement('bananas', []);
-  }
-
   /**
    * Tests Connection::prepareStatement with throw_exception option set.
    *
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
index ce73c29bf..82a9210fd 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
@@ -13,6 +13,9 @@
  */
 abstract class DatabaseTestBase extends KernelTestBase {
 
+  use DatabaseTestSchemaDataTrait;
+  use DatabaseTestSchemaInstallTrait;
+
   protected static $modules = ['database_test'];
 
   /**
@@ -22,24 +25,14 @@ abstract class DatabaseTestBase extends KernelTestBase {
    */
   protected $connection;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
     $this->connection = Database::getConnection();
-    $this->installSchema('database_test', [
-      'test',
-      'test_classtype',
-      'test_people',
-      'test_people_copy',
-      'test_one_blob',
-      'test_two_blobs',
-      'test_task',
-      'test_null',
-      'test_serialized',
-      'TEST_UPPERCASE',
-      'select',
-      'virtual',
-    ]);
-    self::addSampleData();
+    $this->installSampleSchema();
+    $this->addSampleData();
   }
 
   /**
@@ -49,126 +42,16 @@ public function ensureSampleDataNull() {
     $this->connection->insert('test_null')
       ->fields(['name', 'age'])
       ->values([
-      'name' => 'Kermit',
-      'age' => 25,
-    ])
-      ->values([
-      'name' => 'Fozzie',
-      'age' => NULL,
-    ])
-      ->values([
-      'name' => 'Gonzo',
-      'age' => 27,
-    ])
-      ->execute();
-  }
-
-  /**
-   * Sets up our sample data.
-   */
-  public static function addSampleData() {
-    $connection = Database::getConnection();
-
-    // We need the IDs, so we can't use a multi-insert here.
-    $john = $connection->insert('test')
-      ->fields([
-        'name' => 'John',
+        'name' => 'Kermit',
         'age' => 25,
-        'job' => 'Singer',
-      ])
-      ->execute();
-
-    $george = $connection->insert('test')
-      ->fields([
-        'name' => 'George',
-        'age' => 27,
-        'job' => 'Singer',
-      ])
-      ->execute();
-
-    $connection->insert('test')
-      ->fields([
-        'name' => 'Ringo',
-        'age' => 28,
-        'job' => 'Drummer',
-      ])
-      ->execute();
-
-    $paul = $connection->insert('test')
-      ->fields([
-        'name' => 'Paul',
-        'age' => 26,
-        'job' => 'Songwriter',
-      ])
-      ->execute();
-
-    $connection->insert('test_classtype')
-      ->fields([
-        'classname' => 'Drupal\Tests\system\Functional\Database\FakeRecord',
-        'name' => 'Kay',
-        'age' => 26,
-        'job' => 'Web Developer',
-      ])
-      ->execute();
-
-    $connection->insert('test_people')
-      ->fields([
-        'name' => 'Meredith',
-        'age' => 30,
-        'job' => 'Speaker',
-      ])
-      ->execute();
-
-    $connection->insert('test_task')
-      ->fields(['pid', 'task', 'priority'])
-      ->values([
-        'pid' => $john,
-        'task' => 'eat',
-        'priority' => 3,
-      ])
-      ->values([
-        'pid' => $john,
-        'task' => 'sleep',
-        'priority' => 4,
-      ])
-      ->values([
-        'pid' => $john,
-        'task' => 'code',
-        'priority' => 1,
       ])
       ->values([
-        'pid' => $george,
-        'task' => 'sing',
-        'priority' => 2,
+        'name' => 'Fozzie',
+        'age' => NULL,
       ])
       ->values([
-        'pid' => $george,
-        'task' => 'sleep',
-        'priority' => 2,
-      ])
-      ->values([
-        'pid' => $paul,
-        'task' => 'found new band',
-        'priority' => 1,
-      ])
-      ->values([
-        'pid' => $paul,
-        'task' => 'perform at superbowl',
-        'priority' => 3,
-      ])
-      ->execute();
-
-    $connection->insert('select')
-      ->fields([
-        'id' => 1,
-        'update' => 'Update value 1',
-      ])
-      ->execute();
-
-    $connection->insert('virtual')
-      ->fields([
-        'id' => 1,
-        'function' => 'Function value 1',
+        'name' => 'Gonzo',
+        'age' => 27,
       ])
       ->execute();
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
deleted file mode 100644
index 869f85ebc..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/LargeQueryTest.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-use Drupal\Component\Utility\Environment;
-use Drupal\Core\Database\Database;
-use Drupal\Core\Database\DatabaseException;
-
-/**
- * Tests handling of large queries.
- *
- * @group Database
- */
-class LargeQueryTest extends DatabaseTestBase {
-
-  /**
-   * Tests truncation of messages when max_allowed_packet exception occurs.
-   */
-  public function testMaxAllowedPacketQueryTruncating() {
-    // Only run this test for the 'mysql' driver.
-    $driver = $this->connection->driver();
-    if ($driver !== 'mysql') {
-      $this->markTestSkipped("MySql tests can not run for driver '$driver'.");
-    }
-    // The max_allowed_packet value is configured per database instance.
-    // Retrieve the max_allowed_packet value from the current instance and
-    // check if PHP is configured with sufficient allowed memory to be able
-    // to generate a query larger than max_allowed_packet.
-    $max_allowed_packet = $this->connection->query('SELECT @@global.max_allowed_packet')->fetchField();
-    if (!Environment::checkMemoryLimit($max_allowed_packet + (16 * 1024 * 1024))) {
-      $this->markTestSkipped('The configured max_allowed_packet exceeds the php memory limit. Therefore the test is skipped.');
-    }
-
-    $long_name = str_repeat('a', $max_allowed_packet + 1);
-    try {
-      $this->connection->query('SELECT [name] FROM {test} WHERE [name] = :name', [':name' => $long_name]);
-      $this->fail("An exception should be thrown for queries larger than 'max_allowed_packet'");
-    }
-    catch (DatabaseException $e) {
-      // Close and re-open the connection. Otherwise we will run into error
-      // 2006 "MySQL server had gone away" afterwards.
-      Database::closeConnection();
-      Database::getConnection();
-      // Got a packet bigger than 'max_allowed_packet' bytes exception thrown.
-      $this->assertEquals(1153, $e->getPrevious()->errorInfo[1]);
-      // 'max_allowed_packet' exception message truncated.
-      // Use strlen() to count the bytes exactly, not the unicode chars.
-      $this->assertLessThanOrEqual($max_allowed_packet, strlen($e->getMessage()));
-    }
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
index 1badabf54..7858169af 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/LoggingTest.php
@@ -163,7 +163,7 @@ public function testContribDriverLog($driver_namespace, $stack, array $expected_
       ->getMock();
     $log->expects($this->once())
       ->method('getDebugBacktrace')
-      ->will($this->returnValue($stack));
+      ->willReturn($stack);
     Database::addConnectionInfo('test', 'default', ['driver' => 'mysql', 'namespace' => $driver_namespace]);
 
     $result = $log->findCaller($stack);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/MysqlDriverLegacyTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/MysqlDriverLegacyTest.php
deleted file mode 100644
index 549c1986c..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/MysqlDriverLegacyTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-use Drupal\Core\Database\Driver\mysql\Connection;
-use Drupal\Core\Database\Driver\mysql\ExceptionHandler;
-use Drupal\Core\Database\Driver\mysql\Install\Tasks;
-use Drupal\Core\Database\Driver\mysql\Insert;
-use Drupal\Core\Database\Driver\mysql\Schema;
-use Drupal\Core\Database\Driver\mysql\Upsert;
-use Drupal\Tests\Core\Database\Stub\StubPDO;
-
-/**
- * Tests the deprecations of the MySQL database driver classes in Core.
- *
- * @group legacy
- * @group Database
- */
-class MysqlDriverLegacyTest extends DatabaseTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-    if ($this->connection->driver() !== 'mysql') {
-      $this->markTestSkipped('Only test the deprecation message for the MySQL database driver classes in Core.');
-    }
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\mysql\Install\Tasks
-   */
-  public function testDeprecationInstallTasks() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\mysql\Install\Tasks is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The MySQL database driver has been moved to the mysql module. See https://www.drupal.org/node/3129492');
-    $tasks = new Tasks();
-    $this->assertInstanceOf(Tasks::class, $tasks);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\mysql\Connection
-   */
-  public function testDeprecationConnection() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\mysql\Connection is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The MySQL database driver has been moved to the mysql module. See https://www.drupal.org/node/3129492');
-    // @todo https://www.drupal.org/project/drupal/issues/3251084 Remove setting
-    // the $options parameter.
-    $options['init_commands']['sql_mode'] = '';
-    $connection = new Connection($this->createMock(StubPDO::class), $options);
-    $this->assertInstanceOf(Connection::class, $connection);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\mysql\ExceptionHandler
-   */
-  public function testDeprecationExceptionHandler() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\mysql\ExceptionHandler is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The MySQL database driver has been moved to the mysql module. See https://www.drupal.org/node/3129492');
-    $handler = new ExceptionHandler();
-    $this->assertInstanceOf(ExceptionHandler::class, $handler);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\mysql\Insert
-   */
-  public function testDeprecationInsert() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\mysql\Insert is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The MySQL database driver has been moved to the mysql module. See https://www.drupal.org/node/3129492');
-    $insert = new Insert($this->connection, 'test');
-    $this->assertInstanceOf(Insert::class, $insert);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\mysql\Schema
-   */
-  public function testDeprecationSchema() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\mysql\Schema is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The MySQL database driver has been moved to the mysql module. See https://www.drupal.org/node/3129492');
-    $schema = new Schema($this->connection);
-    $this->assertInstanceOf(Schema::class, $schema);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\mysql\Upsert
-   */
-  public function testDeprecationUpsert() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\mysql\Upsert is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The MySQL database driver has been moved to the mysql module. See https://www.drupal.org/node/3129492');
-    $upsert = new Upsert($this->connection, 'test');
-    $this->assertInstanceOf(Upsert::class, $upsert);
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
index 3dfe5866b..4da2cb3bf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/NextIdTest.php
@@ -2,8 +2,6 @@
 
 namespace Drupal\KernelTests\Core\Database;
 
-use Drupal\Core\Database\Database;
-
 /**
  * Tests the sequences API.
  *
@@ -40,37 +38,4 @@ public function testDbNextId() {
     $this->assertEquals(1001, $result, 'Sequence provides a larger number than the existing ID.');
   }
 
-  /**
-   * Tests that sequences table clear up works when a connection is closed.
-   *
-   * @see \Drupal\mysql\Driver\Database\mysql\Connection::__destruct()
-   */
-  public function testDbNextIdClosedConnection() {
-    // Only run this test for the 'mysql' driver.
-    $driver = $this->connection->driver();
-    if ($driver !== 'mysql') {
-      $this->markTestSkipped("MySql tests can not run for driver '$driver'.");
-    }
-    // Create an additional connection to test closing the connection.
-    $connection_info = Database::getConnectionInfo();
-    Database::addConnectionInfo('default', 'next_id', $connection_info['default']);
-
-    // Get a few IDs to ensure there the clean up needs to run and there is more
-    // than one row.
-    Database::getConnection('next_id')->nextId();
-    Database::getConnection('next_id')->nextId();
-
-    // At this point the sequences table should contain unnecessary rows.
-    $count = $this->connection->select('sequences')->countQuery()->execute()->fetchField();
-    $this->assertGreaterThan(1, $count);
-
-    // Close the connection.
-    Database::closeConnection('next_id');
-
-    // Test that \Drupal\mysql\Driver\Database\mysql\Connection::__destruct()
-    // successfully trims the sequences table if the connection is closed.
-    $count = $this->connection->select('sequences')->countQuery()->execute()->fetchField();
-    $this->assertEquals(1, $count);
-  }
-
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/PgsqlDriverLegacyTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/PgsqlDriverLegacyTest.php
deleted file mode 100644
index 273e1f960..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/PgsqlDriverLegacyTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-use Drupal\Core\Database\Driver\pgsql\Connection;
-use Drupal\Core\Database\Driver\pgsql\Delete;
-use Drupal\Core\Database\Driver\pgsql\Install\Tasks;
-use Drupal\Core\Database\Driver\pgsql\Insert;
-use Drupal\Core\Database\Driver\pgsql\Schema;
-use Drupal\Core\Database\Driver\pgsql\Select;
-use Drupal\Core\Database\Driver\pgsql\Truncate;
-use Drupal\Core\Database\Driver\pgsql\Update;
-use Drupal\Core\Database\Driver\pgsql\Upsert;
-use Drupal\Tests\Core\Database\Stub\StubPDO;
-
-/**
- * Tests the deprecations of the PostgreSQL database driver classes in Core.
- *
- * @group legacy
- * @group Database
- */
-class PgsqlDriverLegacyTest extends DatabaseTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-    if ($this->connection->driver() !== 'pgsql') {
-      $this->markTestSkipped('Only test the deprecation message for the PostgreSQL database driver classes in Core.');
-    }
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Install\Tasks
-   */
-  public function testDeprecationInstallTasks() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Install\Tasks is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $tasks = new Tasks();
-    $this->assertInstanceOf(Tasks::class, $tasks);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Connection
-   */
-  public function testDeprecationConnection() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Connection is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $connection = new Connection($this->createMock(StubPDO::class), []);
-    $this->assertInstanceOf(Connection::class, $connection);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Delete
-   */
-  public function testDeprecationDelete() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Delete is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $delete = new Delete($this->connection, 'test');
-    $this->assertInstanceOf(Delete::class, $delete);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Insert
-   */
-  public function testDeprecationInsert() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Insert is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $insert = new Insert($this->connection, 'test');
-    $this->assertInstanceOf(Insert::class, $insert);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Schema
-   */
-  public function testDeprecationSchema() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Schema is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $schema = new Schema($this->connection);
-    $this->assertInstanceOf(Schema::class, $schema);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Select
-   */
-  public function testDeprecationSelect() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Select is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $select = new Select($this->connection, 'test');
-    $this->assertInstanceOf(Select::class, $select);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Truncate
-   */
-  public function testDeprecationTruncate() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Truncate is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $truncate = new Truncate($this->connection, 'test');
-    $this->assertInstanceOf(Truncate::class, $truncate);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Update
-   */
-  public function testDeprecationUpdate() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Update is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $update = new Update($this->connection, 'test');
-    $this->assertInstanceOf(Update::class, $update);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\pgsql\Upsert
-   */
-  public function testDeprecationUpsert() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\pgsql\Upsert is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The PostgreSQL database driver has been moved to the pgsql module. See https://www.drupal.org/node/3129492');
-    $upsert = new Upsert($this->connection, 'test');
-    $this->assertInstanceOf(Upsert::class, $upsert);
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php
deleted file mode 100644
index 2afec6de8..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/PrefixInfoTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-use Drupal\Core\Database\Database;
-
-/**
- * Tests that the prefix info for a database schema is correct.
- *
- * @group Database
- */
-class PrefixInfoTest extends DatabaseTestBase {
-
-  /**
-   * Tests that DatabaseSchema::getPrefixInfo() returns the right database.
-   *
-   * We are testing if the return array of the method
-   * \Drupal\mysql\Driver\Database\mysql\Schema::getPrefixInfo(). This return
-   * array is a keyed array with info about amongst other things the database.
-   * The other two by Drupal core supported databases do not have this variable
-   * set in the return array.
-   */
-  public function testGetPrefixInfo() {
-    // Only run this test for the 'mysql' driver.
-    $driver = $this->connection->driver();
-    if ($driver !== 'mysql') {
-      $this->markTestSkipped("MySql tests can not run for driver '$driver'.");
-    }
-    $connection_info = Database::getConnectionInfo('default');
-
-    // Copy the default connection info to the 'extra' key.
-    Database::addConnectionInfo('extra', 'default', $connection_info['default']);
-
-    $db1_connection = Database::getConnection('default', 'default');
-    $db1_schema = $db1_connection->schema();
-    $db2_connection = Database::getConnection('default', 'extra');
-
-    // Get the prefix info for the first database.
-    $method = new \ReflectionMethod($db1_schema, 'getPrefixInfo');
-    $method->setAccessible(TRUE);
-    $db1_info = $method->invoke($db1_schema);
-
-    // We change the database after opening the connection, so as to prevent
-    // connecting to a non-existent database.
-    $reflection = new \ReflectionObject($db2_connection);
-    $property = $reflection->getProperty('connectionOptions');
-    $property->setAccessible(TRUE);
-    $connection_info['default']['database'] = 'foobar';
-    $property->setValue($db2_connection, $connection_info['default']);
-
-    // For testing purposes, we also change the database info.
-    $reflection_class = new \ReflectionClass(Database::class);
-    $property = $reflection_class->getProperty('databaseInfo');
-    $property->setAccessible(TRUE);
-    $info = $property->getValue();
-    $info['extra']['default']['database'] = 'foobar';
-    $property->setValue(NULL, $info);
-
-    $extra_info = Database::getConnectionInfo('extra');
-    $this->assertSame('foobar', $extra_info['default']['database']);
-    $db2_schema = $db2_connection->schema();
-    $db2_info = $method->invoke($db2_schema);
-
-    // Each target connection has a different database.
-    $this->assertNotSame($db2_info['database'], $db1_info['database']);
-    // The new profile has a different database.
-    $this->assertSame('foobar', $db2_info['database']);
-
-    Database::removeConnection('extra');
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/ReservedWordTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/ReservedWordTest.php
index 9bc296c8e..c541f466d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/ReservedWordTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/ReservedWordTest.php
@@ -80,4 +80,30 @@ public function testSelectReservedWordAliasAllFields() {
     $this->assertSame('27', $record->age);
   }
 
+  /**
+   * Tests SELECT query with GROUP BY clauses on fields with reserved names.
+   */
+  public function testGroupBy() {
+    $this->connection->insert('select')
+      ->fields([
+        'id' => 2,
+        'update' => 'Update value 1',
+      ])
+      ->execute();
+
+    // Using aliases.
+    $query = $this->connection->select('select', 's');
+    $query->addExpression('COUNT([id])', 'num');
+    $query->addField('s', 'update');
+    $query->groupBy('s.update');
+    $this->assertSame('2', $query->execute()->fetchAssoc()['num']);
+
+    // Not using aliases.
+    $query = $this->connection->select('select');
+    $query->addExpression('COUNT([id])', 'num');
+    $query->addField('select', 'update');
+    $query->groupBy('update');
+    $this->assertSame('2', $query->execute()->fetchAssoc()['num']);
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
index 87fa76586..98b6c13d2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
@@ -6,8 +6,6 @@
 use Drupal\Core\Database\Database;
 use Drupal\Core\Database\IntegrityConstraintViolationException;
 use Drupal\Core\Database\SchemaException;
-use Drupal\Core\Database\SchemaObjectDoesNotExistException;
-use Drupal\Core\Database\SchemaObjectExistsException;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Tests\Core\Database\SchemaIntrospectionTestTrait;
@@ -353,139 +351,6 @@ public function testIntrospectIndexSchema() {
     $this->assertEquals($table_specification, $index_schema);
   }
 
-  /**
-   * Tests that indexes on string fields are limited to 191 characters on MySQL.
-   *
-   * @see \Drupal\mysql\Driver\Database\mysql\Schema::getNormalizedIndexes()
-   */
-  public function testIndexLength() {
-    if ($this->connection->databaseType() !== 'mysql') {
-      $this->markTestSkipped("The '{$this->connection->databaseType()}' database type does not support setting column length for indexes.");
-    }
-
-    $table_specification = [
-      'fields' => [
-        'id'  => [
-          'type' => 'int',
-          'default' => NULL,
-        ],
-        'test_field_text'  => [
-          'type' => 'text',
-          'not null' => TRUE,
-        ],
-        'test_field_string_long'  => [
-          'type' => 'varchar',
-          'length' => 255,
-          'not null' => TRUE,
-        ],
-        'test_field_string_ascii_long'  => [
-          'type' => 'varchar_ascii',
-          'length' => 255,
-        ],
-        'test_field_string_short'  => [
-          'type' => 'varchar',
-          'length' => 128,
-          'not null' => TRUE,
-        ],
-      ],
-      'indexes' => [
-        'test_regular' => [
-          'test_field_text',
-          'test_field_string_long',
-          'test_field_string_ascii_long',
-          'test_field_string_short',
-        ],
-        'test_length' => [
-          ['test_field_text', 128],
-          ['test_field_string_long', 128],
-          ['test_field_string_ascii_long', 128],
-          ['test_field_string_short', 128],
-        ],
-        'test_mixed' => [
-          ['test_field_text', 200],
-          'test_field_string_long',
-          ['test_field_string_ascii_long', 200],
-          'test_field_string_short',
-        ],
-      ],
-    ];
-    $this->schema->createTable('test_table_index_length', $table_specification);
-
-    // Ensure expected exception thrown when adding index with missing info.
-    $expected_exception_message = "MySQL needs the 'test_field_text' field specification in order to normalize the 'test_regular' index";
-    $missing_field_spec = $table_specification;
-    unset($missing_field_spec['fields']['test_field_text']);
-    try {
-      $this->schema->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $missing_field_spec);
-      $this->fail('SchemaException not thrown when adding index with missing information.');
-    }
-    catch (SchemaException $e) {
-      $this->assertEquals($expected_exception_message, $e->getMessage());
-    }
-
-    // Add a separate index.
-    $this->schema->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $table_specification);
-    $table_specification_with_new_index = $table_specification;
-    $table_specification_with_new_index['indexes']['test_separate'] = [['test_field_text', 200]];
-
-    // Ensure that the exceptions of addIndex are thrown as expected.
-    try {
-      $this->schema->addIndex('test_table_index_length', 'test_separate', [['test_field_text', 200]], $table_specification);
-      $this->fail('\Drupal\Core\Database\SchemaObjectExistsException exception missed.');
-    }
-    catch (SchemaObjectExistsException $e) {
-      // Expected exception; just continue testing.
-    }
-
-    try {
-      $this->schema->addIndex('test_table_non_existing', 'test_separate', [['test_field_text', 200]], $table_specification);
-      $this->fail('\Drupal\Core\Database\SchemaObjectDoesNotExistException exception missed.');
-    }
-    catch (SchemaObjectDoesNotExistException $e) {
-      // Expected exception; just continue testing.
-    }
-
-    // Get index information.
-    $results = $this->connection->query('SHOW INDEX FROM {test_table_index_length}');
-    $expected_lengths = [
-      'test_regular' => [
-        'test_field_text' => 191,
-        'test_field_string_long' => 191,
-        'test_field_string_ascii_long' => NULL,
-        'test_field_string_short' => NULL,
-      ],
-      'test_length' => [
-        'test_field_text' => 128,
-        'test_field_string_long' => 128,
-        'test_field_string_ascii_long' => 128,
-        'test_field_string_short' => NULL,
-      ],
-      'test_mixed' => [
-        'test_field_text' => 191,
-        'test_field_string_long' => 191,
-        'test_field_string_ascii_long' => 200,
-        'test_field_string_short' => NULL,
-      ],
-      'test_separate' => [
-        'test_field_text' => 191,
-      ],
-    ];
-
-    // Count the number of columns defined in the indexes.
-    $column_count = 0;
-    foreach ($table_specification_with_new_index['indexes'] as $index) {
-      foreach ($index as $field) {
-        $column_count++;
-      }
-    }
-    $test_count = 0;
-    foreach ($results as $result) {
-      $this->assertEquals($expected_lengths[$result->Key_name][$result->Column_name], $result->Sub_part, 'Index length matches expected value.');
-      $test_count++;
-    }
-    $this->assertEquals($column_count, $test_count, 'Number of tests matches expected value.');
-  }
-
   /**
    * Tests inserting data into an existing table.
    *
@@ -1473,19 +1338,4 @@ public function testDefaultAfterAlter() {
     $this->assertSame('default value', $result->column7);
   }
 
-  /**
-   * @covers \Drupal\Core\Database\Driver\pgsql\Schema::extensionExists
-   */
-  public function testPgsqlExtensionExists() {
-    if ($this->connection->databaseType() !== 'pgsql') {
-      $this->markTestSkipped("This test only runs for PostgreSQL.");
-    }
-
-    // Test the method for a non existing extension.
-    $this->assertFalse($this->schema->extensionExists('non_existing_extension'));
-
-    // Test the method for an existing extension.
-    $this->assertTrue($this->schema->extensionExists('pg_trgm'));
-  }
-
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
index 281f3d4d5..9a57bb226 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectComplexTest.php
@@ -82,6 +82,10 @@ public function testGroupBy() {
     $task_field = $query->addField('t', 'task');
     $query->orderBy($count_field);
     $query->groupBy($task_field);
+
+    $this->assertMatchesRegularExpression("/ORDER BY .*[^\w\s]num[^\w\s]/", (string) $query);
+    $this->assertMatchesRegularExpression("/GROUP BY .*[^\w\s]task[^\w\s]/", (string) $query);
+
     $result = $query->execute();
 
     $num_records = 0;
@@ -180,10 +184,12 @@ public function testRangeUndo() {
   public function testDistinct() {
     $query = $this->connection->select('test_task');
     $query->addField('test_task', 'task');
+    $query->orderBy('task');
     $query->distinct();
-    $query_result = $query->countQuery()->execute()->fetchField();
+    $query_result = $query->execute()->fetchAll(\PDO::FETCH_COLUMN);
 
-    $this->assertEquals(6, $query_result, 'Returned the correct number of rows.');
+    $expected_result = ['code', 'eat', 'found new band', 'perform at superbowl', 'sing', 'sleep'];
+    $this->assertEquals($query_result, $expected_result, 'Returned the correct result.');
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
index 6e14f6d4a..d3664762b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/SelectSubqueryTest.php
@@ -97,8 +97,7 @@ public function testConditionSubquerySelect() {
   }
 
   /**
-   * Tests that we can use a subquery with a relational operator in a WHERE
-   * clause.
+   * Tests we can use a subquery with a relational operator in a WHERE clause.
    */
   public function testConditionSubquerySelect2() {
     // Create a subquery, which is just a normal query object.
@@ -119,8 +118,7 @@ public function testConditionSubquerySelect2() {
   }
 
   /**
-   * Tests that we can use 2 subqueries with a relational operator in a WHERE
-   * clause.
+   * Tests we can use 2 subqueries with a relational operator in a WHERE clause.
    */
   public function testConditionSubquerySelect3() {
     // Create subquery 1, which is just a normal query object.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SqlModeTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SqlModeTest.php
deleted file mode 100644
index 49dd61373..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SqlModeTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-/**
- * Tests compatibility of the MySQL driver with various sql_mode options.
- *
- * @group Database
- */
-class SqlModeTest extends DatabaseTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-
-    if ($this->connection->databaseType() !== 'mysql') {
-      $this->markTestSkipped("Skipping test since sql_mode is a MySQL-only feature.");
-    }
-  }
-
-  /**
-   * Tests quoting identifiers in queries.
-   */
-  public function testQuotingIdentifiers() {
-    // Use SQL-reserved words for both the table and column names.
-    $query = $this->connection->query('SELECT [update] FROM {select}');
-    $this->assertEquals('Update value 1', $query->fetchObject()->update);
-    $this->assertStringContainsString('SELECT `update` FROM `', $query->getQueryString());
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getDatabaseConnectionInfo() {
-    $info = parent::getDatabaseConnectionInfo();
-
-    // This runs during setUp(), so is not yet skipped for non MySQL databases.
-    // We defer skipping the test to later in setUp(), so that that can be
-    // based on databaseType() rather than 'driver', but here all we have to go
-    // on is 'driver'.
-    if ($info['default']['driver'] === 'mysql') {
-      $info['default']['init_commands']['sql_mode'] = "SET sql_mode = ''";
-    }
-
-    return $info;
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/SqliteDriverLegacyTest.php b/web/core/tests/Drupal/KernelTests/Core/Database/SqliteDriverLegacyTest.php
deleted file mode 100644
index f3a34c738..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Database/SqliteDriverLegacyTest.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Database;
-
-use Drupal\Core\Database\Driver\sqlite\Connection;
-use Drupal\Core\Database\Driver\sqlite\Install\Tasks;
-use Drupal\Core\Database\Driver\sqlite\Insert;
-use Drupal\Core\Database\Driver\sqlite\Schema;
-use Drupal\Core\Database\Driver\sqlite\Select;
-use Drupal\Core\Database\Driver\sqlite\Statement;
-use Drupal\Core\Database\Driver\sqlite\Truncate;
-use Drupal\Core\Database\Driver\sqlite\Upsert;
-use Drupal\Tests\Core\Database\Stub\StubPDO;
-
-/**
- * Tests the deprecations of the SQLite database driver classes in Core.
- *
- * @group legacy
- * @group Database
- */
-class SqliteDriverLegacyTest extends DatabaseTestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp(): void {
-    parent::setUp();
-    if ($this->connection->driver() !== 'sqlite') {
-      $this->markTestSkipped('Only test the deprecation message for the SQLite database driver classes in Core.');
-    }
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Install\Tasks
-   */
-  public function testDeprecationInstallTasks() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Install\Tasks is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $tasks = new Tasks();
-    $this->assertInstanceOf(Tasks::class, $tasks);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Connection
-   */
-  public function testDeprecationConnection() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Connection is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $connection = new Connection($this->createMock(StubPDO::class), []);
-    $this->assertInstanceOf(Connection::class, $connection);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Insert
-   */
-  public function testDeprecationInsert() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Insert is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $insert = new Insert($this->connection, 'test');
-    $this->assertInstanceOf(Insert::class, $insert);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Schema
-   */
-  public function testDeprecationSchema() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Schema is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $schema = new Schema($this->connection);
-    $this->assertInstanceOf(Schema::class, $schema);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Select
-   */
-  public function testDeprecationSelect() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Select is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $select = new Select($this->connection, 'test');
-    $this->assertInstanceOf(Select::class, $select);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Statement
-   */
-  public function testDeprecationStatement() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Statement is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $statement = new Statement($this->createMock(StubPDO::class), $this->connection, '', []);
-    $this->assertInstanceOf(Statement::class, $statement);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Truncate
-   */
-  public function testDeprecationTruncate() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Truncate is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $truncate = new Truncate($this->connection, 'test');
-    $this->assertInstanceOf(Truncate::class, $truncate);
-  }
-
-  /**
-   * @covers Drupal\Core\Database\Driver\sqlite\Upsert
-   */
-  public function testDeprecationUpsert() {
-    $this->expectDeprecation('\Drupal\Core\Database\Driver\sqlite\Upsert is deprecated in drupal:9.4.0 and is removed from drupal:11.0.0. The SQLite database driver has been moved to the sqlite module. See https://www.drupal.org/node/3129492');
-    $upsert = new Upsert($this->connection, 'test');
-    $this->assertInstanceOf(Upsert::class, $upsert);
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
index bee4cd224..03f764aa9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/BundleConstraintValidatorTest.php
@@ -21,6 +21,9 @@ class BundleConstraintValidatorTest extends KernelTestBase {
 
   protected static $modules = ['node', 'field', 'text', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
index c40a4bebd..f8f329613 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
@@ -49,6 +49,9 @@ class ConfigEntityQueryTest extends KernelTestBase {
    */
   protected $entities;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
index 8196ffb55..d9e78f313 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/ContentEntityNullStorageTest.php
@@ -64,7 +64,8 @@ public function testDeleteThroughImport() {
       $this->container->get('module_installer'),
       $this->container->get('theme_handler'),
       $this->container->get('string_translation'),
-      $this->container->get('extension.list.module')
+      $this->container->get('extension.list.module'),
+      $this->container->get('extension.list.theme')
     );
 
     // Delete the contact message in sync.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
index abe9dd70e..27076dc4c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/Element/EntityAutocompleteElementFormTest.php
@@ -207,14 +207,8 @@ public function testValidEntityAutocompleteElement() {
         'single_autocreate' => 'single - autocreated entity label',
         'single_autocreate_specific_uid' => 'single - autocreated entity label with specific uid',
         'tags' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[1]),
-        'tags_autocreate' =>
-          $this->getAutocompleteInput($this->referencedEntities[0])
-          . ', tags - autocreated entity label, '
-          . $this->getAutocompleteInput($this->referencedEntities[1]),
-        'tags_autocreate_specific_uid' =>
-          $this->getAutocompleteInput($this->referencedEntities[0])
-          . ', tags - autocreated entity label with specific uid, '
-          . $this->getAutocompleteInput($this->referencedEntities[1]),
+        'tags_autocreate' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', tags - autocreated entity label, ' . $this->getAutocompleteInput($this->referencedEntities[1]),
+        'tags_autocreate_specific_uid' => $this->getAutocompleteInput($this->referencedEntities[0]) . ', tags - autocreated entity label with specific uid, ' . $this->getAutocompleteInput($this->referencedEntities[1]),
         'single_string_id' => $this->getAutocompleteInput($this->referencedEntities[2]),
         'tags_string_id' => $this->getAutocompleteInput($this->referencedEntities[2]) . ', ' . $this->getAutocompleteInput($this->referencedEntities[3]),
       ]);
@@ -382,8 +376,7 @@ public function testEntityAutocompleteIdInput() {
   }
 
   /**
-   * Returns an entity label in the format needed by the EntityAutocomplete
-   * element.
+   * Returns an entity label in format needed by the EntityAutocomplete element.
    *
    * @param \Drupal\Core\Entity\EntityInterface $entity
    *   A Drupal entity.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
index daa74a9aa..56ebe9845 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityAccessControlHandlerTest.php
@@ -156,16 +156,16 @@ public function testDefaultEntityAccess() {
     // Set up a non-admin user that is allowed to view test entities.
     \Drupal::currentUser()->setAccount($this->createUser(['uid' => 2], ['view test entity']));
     $entity = EntityTest::create([
-        'name' => 'forbid_access',
-      ]);
+      'name' => 'forbid_access',
+    ]);
 
     // The user is denied access to the entity.
     $this->assertEntityAccess([
-        'create' => FALSE,
-        'update' => FALSE,
-        'delete' => FALSE,
-        'view' => FALSE,
-      ], $entity);
+      'create' => FALSE,
+      'update' => FALSE,
+      'delete' => FALSE,
+      'view' => FALSE,
+    ], $entity);
   }
 
   /**
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
index e1f3497cb..af596e697 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityApiTest.php
@@ -211,7 +211,7 @@ public function testEntityStorageExceptionHandling() {
       $this->fail('Entity presave EntityStorageException thrown but not caught.');
     }
     catch (EntityStorageException $e) {
-      $this->assertEquals(1, $e->getcode(), 'Entity presave EntityStorageException caught.');
+      $this->assertEquals(1, $e->getCode(), 'Entity presave EntityStorageException caught.');
     }
 
     $entity = EntityTest::create(['name' => 'test2']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
index a77b0eb5f..ff9c257fb 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityCrudHookTest.php
@@ -16,6 +16,8 @@
 use Drupal\file\Entity\File;
 
 /**
+ * Tests entity CRUD via hooks.
+ *
  * Tests the invocation of hooks when creating, inserting, loading, updating or
  * deleting an entity.
  *
@@ -52,6 +54,9 @@ class EntityCrudHookTest extends EntityKernelTestBase {
 
   protected $ids = [];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
index 9420cfa72..261763b14 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityDefinitionUpdateTest.php
@@ -243,6 +243,26 @@ public function testUninstallEntityTypeWithoutInCodeDefinition() {
     $this->deleteEntityType();
 
     // Now uninstall it and check that the tables have been removed.
+    $this->assertTrue($this->database->schema()->tableExists('entity_test_update'), 'Base table for entity_test_update exists before uninstalling it.');
+    $this->entityDefinitionUpdateManager->uninstallEntityType($entity_type);
+    $this->assertFalse($this->database->schema()->tableExists('entity_test_update'), 'Base table for entity_test_update does not exist anymore.');
+  }
+
+  /**
+   * Tests uninstalling a revisionable entity type that doesn't exist in code.
+   *
+   * @covers ::uninstallEntityType
+   */
+  public function testUninstallRevisionableEntityTypeWithoutInCodeDefinition() {
+    $this->updateEntityTypeToRevisionable(TRUE);
+    $entity_type = $this->entityDefinitionUpdateManager->getEntityType('entity_test_update');
+
+    // Remove the entity type definition. This is the same thing as removing the
+    // code that defines it.
+    $this->deleteEntityType();
+
+    // Now uninstall it and check that the tables have been removed.
+    $this->assertTrue($this->database->schema()->tableExists('entity_test_update'), 'Base table for entity_test_update exists before uninstalling it.');
     $this->entityDefinitionUpdateManager->uninstallEntityType($entity_type);
     $this->assertFalse($this->database->schema()->tableExists('entity_test_update'), 'Base table for entity_test_update does not exist anymore.');
   }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
index 93d07c4d2..dace56e49 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldDefaultValueTest.php
@@ -19,6 +19,9 @@ class EntityFieldDefaultValueTest extends EntityKernelTestBase {
    */
   protected $uuid;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Initiate the generator object.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
index 7c701f1b2..36ccfe8ed 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php
@@ -53,6 +53,9 @@ class EntityFieldTest extends EntityKernelTestBase {
    */
   protected $entityFieldText;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -590,8 +593,7 @@ protected function doTestDataStructureInterfaces($entity_type) {
   }
 
   /**
-   * Recursive helper for getting all contained strings,
-   * i.e. properties of type string.
+   * Gets all contained strings recursively.
    */
   public function getContainedStrings(TypedDataInterface $wrapper, $depth, array &$strings) {
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
index d5300e932..2e061cdd7 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityKernelTestBase.php
@@ -55,6 +55,9 @@ abstract class EntityKernelTestBase extends KernelTestBase {
    */
   protected $state;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
index 22a10ae17..efeb109d7 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityLanguageTestBase.php
@@ -41,6 +41,9 @@ abstract class EntityLanguageTestBase extends EntityKernelTestBase {
 
   protected static $modules = ['language', 'entity_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
index 55359e088..6d1d101da 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityNonRevisionableTranslatableFieldTest.php
@@ -21,6 +21,9 @@ class EntityNonRevisionableTranslatableFieldTest extends EntityKernelTestBase {
     'content_translation',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
index 275d9274a..42ea455a4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryAggregateTest.php
@@ -34,6 +34,9 @@ class EntityQueryAggregateTest extends EntityKernelTestBase {
    */
   protected $queryResult;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
index b0983c757..036c45318 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryRelationshipTest.php
@@ -59,6 +59,9 @@ class EntityQueryRelationshipTest extends EntityKernelTestBase {
    */
   protected $queryResults;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -77,7 +80,7 @@ protected function setUp(): void {
     $handler_settings = [
       'target_bundles' => [
         $vocabulary->id() => $vocabulary->id(),
-       ],
+      ],
       'auto_create' => TRUE,
     ];
     $this->createEntityReferenceField('entity_test', 'test_bundle', $this->fieldName, NULL, 'taxonomy_term', 'default', $handler_settings);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
index bf35a517f..427fea001 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityQueryTest.php
@@ -62,6 +62,9 @@ class EntityQueryTest extends EntityKernelTestBase {
    */
   protected $storage;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -98,24 +101,34 @@ protected function setUp(): void {
       $bundles[] = $bundle;
     }
     // Each unit is a list of field name, langcode and a column-value array.
-    $units[] = [$figures, 'en', [
+    $units[] = [$figures, 'en',
+      [
         'color' => 'red',
         'shape' => 'triangle',
       ],
     ];
-    $units[] = [$figures, 'en', [
+    $units[] = [
+      $figures,
+      'en',
+      [
         'color' => 'blue',
         'shape' => 'circle',
       ],
     ];
     // To make it easier to test sorting, the greetings get formats according
     // to their langcode.
-    $units[] = [$greetings, 'tr', [
+    $units[] = [
+      $greetings,
+      'tr',
+      [
         'value' => 'merhaba',
         'format' => 'format-tr',
       ],
     ];
-    $units[] = [$greetings, 'pl', [
+    $units[] = [
+      $greetings,
+      'pl',
+      [
         'value' => 'siema',
         'format' => 'format-pl',
       ],
@@ -178,7 +191,7 @@ public function testEntityQuery() {
       ->condition("$figures.color", 'red')
       ->sort('id');
     $count_query = clone $query;
-    $this->assertEquals(12, $count_query->count()->execute());
+    $this->assertSame(12, $count_query->count()->execute());
     $this->queryResults = $query->execute();
     // Now bit 0 (1, 3, 5, 7, 9, 11, 13, 15) or bit 2 (4, 5, 6, 7, 12, 13, 14,
     // 15) needs to be set.
@@ -438,7 +451,7 @@ public function testSort() {
     // 13 red  tr
     // 15 red  tr
     $count_query = clone $query;
-    $this->assertEquals(15, $count_query->count()->execute());
+    $this->assertSame(15, $count_query->count()->execute());
     $this->queryResults = $query->execute();
     $this->assertResult(8, 12, 4, 2, 3, 10, 11, 14, 15, 6, 7, 1, 9, 13, 5);
 
@@ -467,7 +480,7 @@ public function testSort() {
       ->sort("$greetings.format", 'DESC')
       ->sort('id', 'DESC');
     $count_query = clone $query;
-    $this->assertEquals(15, $count_query->count()->execute());
+    $this->assertSame(15, $count_query->count()->execute());
     $this->queryResults = $query->execute();
     $this->assertResult(15, 13, 7, 5, 11, 9, 3, 1, 14, 6, 10, 2, 12, 4, 8);
   }
@@ -563,7 +576,7 @@ public function testCount() {
       ->exists("$field_name.color")
       ->count()
       ->execute();
-    $this->assertEquals(0, $count);
+    $this->assertSame(0, $count);
   }
 
   /**
@@ -608,7 +621,7 @@ public function testConditionCount() {
       ->condition($this->figures . '.shape', 'triangle');
 
     // We added 2 conditions so count should be 2.
-    $this->assertEquals(2, $and_condition_group->count());
+    $this->assertSame(2, $and_condition_group->count());
 
     // Add an OR condition group with 2 conditions in it.
     $or_condition_group = $query->orConditionGroup()
@@ -616,7 +629,7 @@ public function testConditionCount() {
       ->condition($this->figures . '.shape', 'triangle');
 
     // We added 2 conditions so count should be 2.
-    $this->assertEquals(2, $or_condition_group->count());
+    $this->assertSame(2, $or_condition_group->count());
   }
 
   /**
@@ -1200,8 +1213,9 @@ public function testPendingRevisions() {
   }
 
   /**
-   * Tests against SQL inject of condition field. This covers a
-   * database driver's EntityQuery\Condition class.
+   * Tests SQL inject of condition field.
+   *
+   * This covers a database driver's EntityQuery\Condition class.
    */
   public function testInjectionInCondition() {
     $this->expectException(\Exception::class);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
index 52d88d3af..62a81d3b8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityReferenceSelection/EntityReferenceSelectionSortTest.php
@@ -23,6 +23,9 @@ class EntityReferenceSelectionSortTest extends EntityKernelTestBase {
    */
   protected static $modules = ['node'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
index 080840f56..e791d17c4 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
@@ -245,11 +245,10 @@ protected function doTestMultilingualProperties($entity_type) {
     $storage = $this->container->get('entity_type.manager')
       ->getStorage($entity_type);
     $storage->create([
-        'user_id' => $properties[$langcode]['user_id'],
-        'name' => 'some name',
-        $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
-      ])
-      ->save();
+      'user_id' => $properties[$langcode]['user_id'],
+      'name' => 'some name',
+      $langcode_key => LanguageInterface::LANGCODE_NOT_SPECIFIED,
+    ])->save();
 
     $entities = $storage->loadMultiple();
     $this->assertCount(3, $entities, new FormattableMarkup('%entity_type: Three entities were created.', ['%entity_type' => $entity_type]));
@@ -828,8 +827,7 @@ public function testFieldEntityReference() {
   }
 
   /**
-   * Tests if entity translation statuses are correct after removing two
-   * translation.
+   * Tests that translation statuses are correct after removing translations.
    */
   public function testDeleteEntityTranslation() {
     $entity_type = 'entity_test_mul';
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
index 122231b2b..8e2a87d9f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypeConstraintValidatorTest.php
@@ -20,6 +20,9 @@ class EntityTypeConstraintValidatorTest extends EntityKernelTestBase {
 
   protected static $modules = ['node', 'field', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->typedData = $this->container->get('typed_data_manager');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
index 99d61a608..d4f0fe685 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityTypedDataDefinitionTest.php
@@ -37,6 +37,9 @@ class EntityTypedDataDefinitionTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'filter', 'text', 'node', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
index 86f116702..4de7e82a5 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/EntityUUIDTest.php
@@ -9,6 +9,9 @@
  */
 class EntityUUIDTest extends EntityKernelTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
index 47039429f..99057a2fd 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Entity/FieldSqlStorageTest.php
@@ -71,6 +71,9 @@ class FieldSqlStorageTest extends EntityKernelTestBase {
    */
   protected $tableMapping;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
index 07a20d1fa..356a50d7a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php
@@ -64,8 +64,7 @@ public function testModuleImplementsAlter() {
   }
 
   /**
-   * Tests what happens if hook_module_implements_alter() adds a non-existing
-   * function to the implementations.
+   * Tests adding a non-existing function to hook_module_implements_alter().
    *
    * @see \Drupal\Core\Extension\ModuleHandler::buildImplementationInfo()
    * @see module_test_module_implements_alter()
diff --git a/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php b/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
index 02b155534..c3d2e21f9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Field/FieldAccessTest.php
@@ -38,6 +38,9 @@ class FieldAccessTest extends KernelTestBase {
    */
   protected $activeUid;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Install field configuration.
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
index adca42d66..29048c036 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php
@@ -113,8 +113,7 @@ public function testFileCheckDirectoryHandling() {
   }
 
   /**
-   * This will take a directory and path, and find a valid filepath that is not
-   * taken by another file.
+   * Tests the file paths of newly created files.
    */
   public function testFileCreateNewFilepath() {
     // First we test against an imaginary file that does not exist in a
@@ -138,6 +137,8 @@ public function testFileCreateNewFilepath() {
   }
 
   /**
+   * Tests the destination file path.
+   *
    * This will test the filepath for a destination based on passed flags and
    * whether or not the file exists.
    *
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
index ae15cde0c..5d8838798 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php
@@ -6,8 +6,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Base class for file tests that adds some additional file specific
- * assertions and helper functions.
+ * Provides file-specific assertions and helper functions.
  */
 abstract class FileTestBase extends KernelTestBase {
 
@@ -153,11 +152,11 @@ public function assertDirectoryPermissions($directory, $expected_mode, $message
   /**
    * Create a directory and assert it exists.
    *
-   * @param $path
+   * @param string $path
    *   Optional string with a directory path. If none is provided, a random
    *   name in the site's files directory will be used.
    *
-   * @return
+   * @return string
    *   The path to the directory.
    */
   public function createDirectory($path = NULL) {
@@ -183,7 +182,7 @@ public function createDirectory($path = NULL) {
    *   Optional string indicating the stream scheme to use. Drupal core includes
    *   public, private, and temporary. The public wrapper is the default.
    *
-   * @return
+   * @return string
    *   File URI.
    */
   public function createUri($filepath = NULL, $contents = NULL, $scheme = NULL) {
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php b/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php
index 15541a42b..b810e0963 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php
@@ -60,8 +60,8 @@ public function testFileMimeTypeDetection() {
         1 => 'image/jpeg',
       ],
       'extensions' => [
-         'jar' => 0,
-         'jpg' => 1,
+        'jar' => 0,
+        'jpg' => 1,
       ],
     ];
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
index ac4a726dd..7073ef314 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php
@@ -50,6 +50,9 @@ class NameMungingTest extends FileTestBase {
    */
   protected $nameWithUcExt;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->badExtension = 'foo';
@@ -81,8 +84,7 @@ public function testMungeNullByte() {
   }
 
   /**
-   * If the system.file.allow_insecure_uploads setting evaluates to true, the file should
-   * come out untouched, no matter how evil the filename.
+   * Test munging with system.file.allow_insecure_uploads set to true.
    */
   public function testMungeIgnoreInsecure() {
     $this->config('system.file')->set('allow_insecure_uploads', 1)->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteRecursiveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteRecursiveTest.php
index 9749e73d4..af86fcbaa 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteRecursiveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteRecursiveTest.php
@@ -30,6 +30,9 @@ class RemoteFileDeleteRecursiveTest extends FileDeleteRecursiveTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteTest.php
index 9cda8b075..25c762a26 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDeleteTest.php
@@ -30,6 +30,9 @@ class RemoteFileDeleteTest extends FileDeleteTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
index 83b1210eb..60b62f6b9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileDirectoryTest.php
@@ -30,6 +30,9 @@ class RemoteFileDirectoryTest extends DirectoryTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileMoveTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileMoveTest.php
index 4a366c63d..6e20642bd 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileMoveTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileMoveTest.php
@@ -30,6 +30,9 @@ class RemoteFileMoveTest extends FileMoveTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileSaveDataTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileSaveDataTest.php
index 3b9ea35a1..a54b46019 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileSaveDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileSaveDataTest.php
@@ -30,6 +30,9 @@ class RemoteFileSaveDataTest extends FileSaveDataTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
index b8d6fc25b..8ec2ded87 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileScanDirectoryTest.php
@@ -31,6 +31,9 @@ class RemoteFileScanDirectoryTest extends ScanDirectoryTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php
index c49e36294..9913ee63d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php
@@ -30,6 +30,9 @@ class RemoteFileUnmanagedCopyTest extends FileCopyTest {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyRemoteStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->config('system.file')->set('default_scheme', 'dummy-remote')->save();
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php b/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
index a703fe9aa..2d1fa47c9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php
@@ -153,8 +153,7 @@ public function testOptionRecurse() {
   }
 
   /**
-   * Check that the min_depth options lets us ignore files in the starting
-   * directory.
+   * Tests the min_depth option of scanDirectory().
    *
    * @covers ::scanDirectory
    */
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php b/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
index 70a7d1762..c706cb30f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php
@@ -37,6 +37,9 @@ class StreamWrapperTest extends FileTestBase {
    */
   protected $classname = 'Drupal\file_test\StreamWrapper\DummyStreamWrapper';
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php b/web/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
index d6f2d00dc..57111ee2f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/File/UrlTransformRelativeTest.php
@@ -6,7 +6,7 @@
 use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Tests url transform to relative.
+ * Tests URL transform to relative.
  *
  * @group Utility
  */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php b/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php
index 6b8fd87df..fe8d614c8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php
@@ -9,8 +9,10 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests \Drupal::formBuilder()->setCache() and
- * \Drupal::formBuilder()->getCache().
+ * Tests FormBuilder caching.
+ *
+ * @covers \Drupal\Core\Form\FormBuilder::getCache
+ * @covers \Drupal\Core\Form\FormBuilder::setCache
  *
  * @group Form
  */
@@ -38,6 +40,9 @@ class FormCacheTest extends KernelTestBase {
    */
   protected $formState;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Http/BlockInterestCohortTest.php b/web/core/tests/Drupal/KernelTests/Core/Http/BlockInterestCohortTest.php
deleted file mode 100644
index d1267ae5a..000000000
--- a/web/core/tests/Drupal/KernelTests/Core/Http/BlockInterestCohortTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Drupal\KernelTests\Core\Http;
-
-use Drupal\Core\Site\Settings;
-use Drupal\KernelTests\KernelTestBase;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Event\ResponseEvent;
-use Symfony\Component\HttpKernel\HttpKernelInterface;
-
-/**
- * Tests the Permissions-Policy header added by FinishResponseSubscriber.
- *
- * @group Http
- */
-class BlockInterestCohortTest extends KernelTestBase {
-
-  /**
-   * Tests that FLoC is blocked by default.
-   */
-  public function testDefaultBlocking() {
-    $request = Request::create('/');
-    $response = \Drupal::service('http_kernel')->handle($request);
-
-    $this->assertSame('interest-cohort=()', $response->headers->get('Permissions-Policy'));
-  }
-
-  /**
-   * Tests that an existing interest-cohort policy is not overwritten.
-   */
-  public function testExistingInterestCohortPolicy() {
-    $headers['Permissions-Policy'] = 'interest-cohort=*';
-
-    $kernel = \Drupal::service('http_kernel');
-    $request = Request::create('/');
-    $response = new Response('', 200, $headers);
-    $event = new ResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
-    \Drupal::service('finish_response_subscriber')->onRespond($event);
-
-    $this->assertSame($headers['Permissions-Policy'], $response->headers->get('Permissions-Policy'));
-  }
-
-  /**
-   * Tests that an existing header is not modified.
-   */
-  public function testExistingPolicyHeader() {
-    $headers['Permissions-Policy'] = 'geolocation=()';
-
-    $kernel = \Drupal::service('http_kernel');
-    $request = Request::create('/');
-    $response = new Response('', 200, $headers);
-    $event = new ResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST, $response);
-    \Drupal::service('finish_response_subscriber')->onRespond($event);
-
-    $this->assertSame($headers['Permissions-Policy'], $response->headers->get('Permissions-Policy'));
-  }
-
-  /**
-   * Tests that FLoC blocking is ignored for subrequests.
-   */
-  public function testSubrequestBlocking() {
-    $request = Request::create('/');
-    $response = \Drupal::service('http_kernel')->handle($request, HttpKernelInterface::SUB_REQUEST);
-
-    $this->assertFalse($response->headers->has('Permissions-Policy'));
-  }
-
-  /**
-   * Tests that FLoC blocking can be disabled in settings.php.
-   */
-  public function testDisableBlockSetting() {
-    $settings = Settings::getAll();
-    $settings['block_interest_cohort'] = FALSE;
-    new Settings($settings);
-
-    $request = Request::create('/');
-    $response = \Drupal::service('http_kernel')->handle($request);
-
-    $this->assertFalse($response->headers->has('Permissions-Policy'));
-  }
-
-}
diff --git a/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php b/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
index 8db248859..aadbe9b99 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Image/ToolkitGdTest.php
@@ -270,6 +270,8 @@ public function providerTestImageFiles(): array {
   }
 
   /**
+   * Tests height, width and color for the corners for the final images.
+   *
    * Since PHP can't visually check that our images have been manipulated
    * properly, build a list of expected color values for each of the corners and
    * the expected height and widths for the final images.
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
index 9f5237100..463629914 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php
@@ -19,6 +19,9 @@ class DatabaseStorageExpirableTest extends StorageTestBase {
    */
   protected static $modules = ['system'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->factory = 'keyvalue.expirable';
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
index a8a023911..669a835b0 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php
@@ -39,12 +39,12 @@ public function testGarbageCollection() {
     for ($i = 0; $i <= 3; $i++) {
       $connection->merge('key_value_expire')
         ->keys([
-            'name' => 'key_' . $i,
-            'collection' => $collection,
-          ])
+          'name' => 'key_' . $i,
+          'collection' => $collection,
+        ])
         ->fields([
-            'expire' => REQUEST_TIME - 1,
-          ])
+          'expire' => REQUEST_TIME - 1,
+        ])
         ->execute();
     }
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
index 913851b67..36a19d19d 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/KeyValueContentEntityStorageTest.php
@@ -139,7 +139,7 @@ public function testCRUD() {
     $this->assertTrue($same_id->isNew());
     try {
       $same_id->save();
-      $this->fail('Not possible to overwrite an entity entity.');
+      $this->fail('Not possible to overwrite an entity.');
     }
     catch (EntityStorageException $e) {
       // Expected exception; just continue testing.
diff --git a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
index 4fc7c53ac..aa599187a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/KeyValueStore/StorageTestBase.php
@@ -30,6 +30,9 @@ abstract class StorageTestBase extends KernelTestBase {
    */
   protected $factory = 'keyvalue';
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Lock/LockTest.php b/web/core/tests/Drupal/KernelTests/Core/Lock/LockTest.php
index 24bd451fc..faebfc7e9 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Lock/LockTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Lock/LockTest.php
@@ -19,6 +19,9 @@ class LockTest extends KernelTestBase {
    */
   protected $lock;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->lock = new DatabaseLockBackend($this->container->get('database'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/ParamConverter/EntityConverterLatestRevisionTest.php b/web/core/tests/Drupal/KernelTests/Core/ParamConverter/EntityConverterLatestRevisionTest.php
index 9e06a63b2..739c68012 100644
--- a/web/core/tests/Drupal/KernelTests/Core/ParamConverter/EntityConverterLatestRevisionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/ParamConverter/EntityConverterLatestRevisionTest.php
@@ -189,4 +189,66 @@ public function testConvertNonRevisionableEntityType() {
     $this->assertEquals($entity->id(), $converted->id());
   }
 
+  /**
+   * Tests an entity route parameter having 'bundle' definition property.
+   *
+   * @covers ::convert
+   */
+  public function testRouteParamWithBundleDefinition(): void {
+    $entity1 = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'type' => 'foo',
+    ]);
+    $entity1->save();
+    $entity2 = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'type' => 'bar',
+    ]);
+    $entity2->save();
+    $entity3 = EntityTestMulRev::create([
+      'name' => $this->randomString(),
+      'type' => 'baz',
+    ]);
+    $entity3->save();
+
+    $definition = [
+      'type' => 'entity:entity_test_mulrev',
+      'bundle' => [
+        'foo',
+        'bar',
+      ],
+      'load_latest_revision' => TRUE,
+    ];
+
+    // An entity whose bundle is in the definition list is converted.
+    $converted = $this->converter->convert($entity1->id(), $definition, 'qux', []);
+    $this->assertSame($entity1->id(), $converted->id());
+
+    // An entity whose bundle is in the definition list is converted.
+    $converted = $this->converter->convert($entity2->id(), $definition, 'qux', []);
+    $this->assertSame($entity2->id(), $converted->id());
+
+    // An entity whose bundle is missed from definition is not converted.
+    $converted = $this->converter->convert($entity3->id(), $definition, 'qux', []);
+    $this->assertNull($converted);
+
+    // A non-existing entity returns NULL.
+    $converted = $this->converter->convert('some-non-existing-entity-id', $definition, 'qux', []);
+    $this->assertNull($converted);
+
+    $definition = [
+      'type' => 'entity:entity_test_mulrev',
+    ];
+
+    // Check that all entities are returned when 'bundle' is not defined.
+    $converted = $this->converter->convert($entity1->id(), $definition, 'qux', []);
+    $this->assertSame($entity1->id(), $converted->id());
+    $converted = $this->converter->convert($entity2->id(), $definition, 'qux', []);
+    $this->assertSame($entity2->id(), $converted->id());
+    $converted = $this->converter->convert($entity3->id(), $definition, 'qux', []);
+    $this->assertSame($entity3->id(), $converted->id());
+    $converted = $this->converter->convert('some-non-existing-entity-id', $definition, 'qux', []);
+    $this->assertNull($converted);
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
index be6ec023e..efbbd9113 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php
@@ -9,8 +9,7 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * Tests that the Request Path Condition, provided by the system module, is
- * working properly.
+ * Tests system.module's request path condition.
  *
  * @group Plugin
  */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
index fc976a250..fe747c01f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/AnnotatedClassDiscoveryTest.php
@@ -3,6 +3,7 @@
 namespace Drupal\KernelTests\Core\Plugin\Discovery;
 
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
  * Tests that plugins are correctly discovered using annotated classes.
@@ -11,6 +12,9 @@
  */
 class AnnotatedClassDiscoveryTest extends DiscoveryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->expectedDefinitions = [
@@ -26,7 +30,7 @@ protected function setUp(): void {
         'label' => 'Banana',
         'color' => 'yellow',
         'uses' => [
-          'bread' => t('Banana bread'),
+          'bread' => new TranslatableMarkup('Banana bread'),
           'loaf' => [
             'singular' => '@count loaf',
             'plural' => '@count loaves',
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
index 47d22fd67..0e29ab12a 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomAnnotationClassDiscoveryTest.php
@@ -12,6 +12,9 @@
  */
 class CustomAnnotationClassDiscoveryTest extends DiscoveryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
index 001a727a2..c65f0e14f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/CustomDirectoryAnnotatedClassDiscoveryTest.php
@@ -3,15 +3,18 @@
 namespace Drupal\KernelTests\Core\Plugin\Discovery;
 
 use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
 
 /**
- * Tests that plugins in a custom directory are correctly discovered using
- * annotated classes.
+ * Tests discovery of annotated plugins in a custom directory.
  *
  * @group Plugin
  */
 class CustomDirectoryAnnotatedClassDiscoveryTest extends DiscoveryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -40,7 +43,7 @@ protected function setUp(): void {
         'label' => 'Banana',
         'color' => 'yellow',
         'uses' => [
-          'bread' => t('Banana bread'),
+          'bread' => new TranslatableMarkup('Banana bread'),
           'loaf' => [
             'singular' => '@count loaf',
             'plural' => '@count loaves',
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php
index 9a1b9e691..c8e285a85 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/Discovery/StaticDiscoveryTest.php
@@ -11,6 +11,9 @@
  */
 class StaticDiscoveryTest extends DiscoveryTestBase {
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->expectedDefinitions = [
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php
index 3011a3fcc..827b25086 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/InspectionTest.php
@@ -3,7 +3,7 @@
 namespace Drupal\KernelTests\Core\Plugin;
 
 /**
- * Tests that plugins implementing PluginInspectionInterface are inspectable.
+ * Tests that plugins implementing PluginInspectionInterface can be inspected.
  *
  * @group Plugin
  */
diff --git a/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
index a8df05585..0b4bcedfc 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Plugin/PluginTestBase.php
@@ -29,6 +29,9 @@ abstract class PluginTestBase extends KernelTestBase {
   protected $defaultsTestPluginManager;
   protected $defaultsTestPluginExpectedDefinitions;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
index 73c8c010e..d2f36d7b7 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/RenderElementTypesTest.php
@@ -20,6 +20,9 @@ class RenderElementTypesTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'router_test'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
index e1960708c..4cc179350 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php
@@ -63,8 +63,10 @@ public function testThemeTableNoStickyHeaders() {
   }
 
   /**
-   * Tests that the table header is printed correctly even if there are no rows,
-   * and that the empty text is displayed correctly.
+   * Tests the display of the table header.
+   *
+   * Tests are performed when the there are no rows and that the empty text is
+   * displayed correctly.
    */
   public function testThemeTableWithEmptyMessage() {
     $header = [
@@ -81,9 +83,9 @@ public function testThemeTableWithEmptyMessage() {
       '#empty' => 'Empty row.',
     ];
 
-    // Enable the Classy theme.
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    // Enable the Starterkit theme.
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
 
     $this->render($table);
     $this->removeWhiteSpace();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Render/ElementInfoIntegrationTest.php b/web/core/tests/Drupal/KernelTests/Core/Render/ElementInfoIntegrationTest.php
index 7d83fe3c0..f98234938 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Render/ElementInfoIntegrationTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Render/ElementInfoIntegrationTest.php
@@ -17,7 +17,7 @@ class ElementInfoIntegrationTest extends KernelTestBase {
   protected function setUp(): void {
     parent::setUp();
 
-    $this->container->get('theme_installer')->install(['test_theme', 'classy']);
+    $this->container->get('theme_installer')->install(['test_theme', 'starterkit_theme']);
   }
 
   /**
@@ -33,7 +33,7 @@ public function testElementInfoByTheme() {
     /** @var \Drupal\Core\Render\ElementInfoManagerInterface $element_info */
     $element_info = $this->container->get('plugin.manager.element_info');
 
-    $theme_manager->setActiveTheme($theme_initializer->getActiveThemeByName('classy'));
+    $theme_manager->setActiveTheme($theme_initializer->getActiveThemeByName('starterkit_theme'));
     $this->assertEquals(60, $element_info->getInfo('textfield')['#size']);
 
     $theme_manager->setActiveTheme($theme_initializer->getActiveThemeByName('test_theme'));
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
index e9ed287c5..4efddf25c 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/MatcherDumperTest.php
@@ -33,6 +33,9 @@ class MatcherDumperTest extends KernelTestBase {
    */
   protected $state;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php b/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
index 065143a42..2f20d227e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php
@@ -87,6 +87,9 @@ class RouteProviderTest extends KernelTestBase {
    */
   protected $cacheTagsInvalidator;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->fixtures = new RoutingFixtures();
@@ -111,6 +114,9 @@ public function register(ContainerBuilder $container) {
     }
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function tearDown(): void {
     $this->fixtures->dropTables(Database::getConnection());
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Test/EnvironmentCleanerTest.php b/web/core/tests/Drupal/KernelTests/Core/Test/EnvironmentCleanerTest.php
index 86de3b3b5..a4baff08e 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Test/EnvironmentCleanerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Test/EnvironmentCleanerTest.php
@@ -22,7 +22,7 @@ public function testDoCleanTemporaryDirectories() {
       'sites' => [
         'simpletest' => [
           'delete_dir' => [
-            'delete.me' => 'I am a gonner.',
+            'delete.me' => 'I am gone.',
           ],
           'delete_me.too' => 'delete this file.',
         ],
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/BaseThemeRequiredTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/BaseThemeRequiredTest.php
index 3bfd15948..34feaea53 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/BaseThemeRequiredTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/BaseThemeRequiredTest.php
@@ -41,7 +41,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests opting out of Stable by setting the base theme to false.
+   * Tests opting out of Stable 9 by setting the base theme to false.
    */
   public function testWildWest() {
     $this->themeInstaller->install(['test_wild_west']);
@@ -49,7 +49,7 @@ public function testWildWest() {
     $theme = $this->themeManager->getActiveTheme();
     /** @var \Drupal\Core\Theme\ActiveTheme $base_theme */
     $base_themes = $theme->getBaseThemeExtensions();
-    $this->assertEmpty($base_themes, 'No base theme is set when a theme has opted out of using Stable.');
+    $this->assertEmpty($base_themes, 'No base theme is set when a theme has opted out of using Stable 9.');
   }
 
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ConfigImportThemeInstallTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ConfigImportThemeInstallTest.php
index f967b432b..dfe1773b3 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ConfigImportThemeInstallTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ConfigImportThemeInstallTest.php
@@ -19,6 +19,9 @@ class ConfigImportThemeInstallTest extends KernelTestBase {
    */
   protected static $modules = ['system'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system']);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
index c2c10e7e4..e26287297 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ConfirmClassyCopiesTest.php
@@ -13,6 +13,7 @@
  * location.
  *
  * @group Theme
+ * @group legacy
  */
 class ConfirmClassyCopiesTest extends KernelTestBase {
 
@@ -179,7 +180,6 @@ public function providerTestClassyCopies() {
             'file-managed-file.html.twig',
             'text-format-wrapper.html.twig',
             'filter-caption.html.twig',
-            'rdf-metadata.html.twig',
             'help-section.html.twig',
             'progress-bar.html.twig',
             'form-element-label.html.twig',
@@ -714,7 +714,7 @@ protected function getClassyHash($type, $file) {
       ],
       'js' => [
         'media_embed_ckeditor.theme.es6.js' => 'd9fa9e008aff8d4fb0401083bab0a1ad',
-        'media_embed_ckeditor.theme.js' => 'f8e192b79f25d2b61a6ff43b9733ec72',
+        'media_embed_ckeditor.theme.js' => '8abd200fde0284ff70026eb7cc8e412c',
       ],
       'images' => [
         'application-octet-stream.png' => 'fef73511632890590b5ae0a13c99e4bf',
@@ -842,10 +842,10 @@ protected function getClassyHash($type, $file) {
         'views-view-grid.html.twig' => '8f4ea66bf949530d31a79a44f3d87650',
         'views-view-rss.html.twig' => 'f4e49d0d8df01019245c51ff2a4259c2',
         'block--system-branding-block.html.twig' => '558d83af4c06e78f46790e0e18295588',
-        'block--search-form-block.html.twig' => '7fef4c274e4487ba887fdeaa41acb5ca',
-        'block.html.twig' => '9b68163e596c63921119ff8f20c6f157',
+        'block--search-form-block.html.twig' => '4e9d433b954dcea12b307f9edcbbe764',
+        'block.html.twig' => 'c1bce6c31368c08f6f93c687e872f055',
         'block--local-actions-block.html.twig' => '6afe8adb14d3f37ec374400fecd5b809',
-        'block--system-menu-block.html.twig' => '242f41ff8a0f71bbccece61bf8e29e2f',
+        'block--system-menu-block.html.twig' => '084931fef1422cf11a38170702677b0f',
         'block--local-tasks-block.html.twig' => 'd462897ef5c9b6935ce801de122bce30',
       ],
     ];
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php
index c315722c1..509b6dea7 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php
@@ -33,6 +33,9 @@ class ImageTest extends KernelTestBase {
    */
   protected $testImages;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php
index d6df9261f..f8e3c08aa 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php
@@ -20,9 +20,9 @@ class MessageTest extends KernelTestBase {
    * Tests setting messages output.
    */
   public function testMessages() {
-    // Enable the Classy theme.
-    \Drupal::service('theme_installer')->install(['classy']);
-    $this->config('system.theme')->set('default', 'classy')->save();
+    // Enable the Starterkit theme.
+    \Drupal::service('theme_installer')->install(['starterkit_theme']);
+    $this->config('system.theme')->set('default', 'starterkit_theme')->save();
 
     \Drupal::messenger()->addError('An error occurred');
     \Drupal::messenger()->addStatus('But then something nice happened');
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php
index 5cfa3ca27..2a335bf42 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryLegacyTest.php
@@ -33,7 +33,7 @@ public function testMultipleSubThemes() {
     \Drupal::service('module_installer')->install(['theme_legacy_test']);
     \Drupal::service('theme_installer')->install(['test_basetheme']);
 
-    $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_basetheme');
+    $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), \Drupal::service('extension.list.module'), 'test_basetheme');
     $registry_base_theme->setThemeManager(\Drupal::theme());
 
     $preprocess_functions = $registry_base_theme->get()['theme_test_function_suggestions']['preprocess functions'];
@@ -51,7 +51,7 @@ public function testSuggestionPreprocessFunctions() {
     $theme_handler = \Drupal::service('theme_handler');
     \Drupal::service('theme_installer')->install(['test_legacy_theme']);
 
-    $registry_deprecated_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_legacy_theme');
+    $registry_deprecated_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), \Drupal::service('extension.list.module'), 'test_legacy_theme');
     $registry_deprecated_theme->setThemeManager(\Drupal::theme());
 
     $expected_preprocess_functions = [
@@ -65,4 +65,12 @@ public function testSuggestionPreprocessFunctions() {
     $this->assertSame($expected_preprocess_functions, $preprocess_functions, 'Suggestion implemented as a function correctly inherits preprocess functions.');
   }
 
+  /**
+   * Tests the order of registry parameters.
+   */
+  public function testRegistryConstructorParameters() {
+    $this->expectDeprecation('Calling Registry::__construct() without the $runtime_cache as an instance of CacheBackendInterface or the $module_list as an instance of ModuleExtensionList is deprecated in drupal:9.5.0 and is required in drupal:10.0.0. See https://www.drupal.org/node/3285131');
+    new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), \Drupal::service('theme_handler'), \Drupal::service('theme.initialization'), 'test_legacy_theme', \Drupal::service('cache.bootstrap'), \Drupal::service('extension.list.module'));
+  }
+
 }
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
index 3b3a0829a..321f940e2 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php
@@ -74,11 +74,11 @@ public function testMultipleSubThemes() {
     $module_list = $this->container->get('extension.list.module');
     assert($module_list instanceof ModuleExtensionList);
 
-    $registry_subsub_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_subsubtheme', NULL, $module_list);
+    $registry_subsub_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $module_list, 'test_subsubtheme');
     $registry_subsub_theme->setThemeManager(\Drupal::theme());
-    $registry_sub_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_subtheme', NULL, $module_list);
+    $registry_sub_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $module_list, 'test_subtheme');
     $registry_sub_theme->setThemeManager(\Drupal::theme());
-    $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_basetheme', NULL, $module_list);
+    $registry_base_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $module_list, 'test_basetheme');
     $registry_base_theme->setThemeManager(\Drupal::theme());
 
     $preprocess_functions = $registry_subsub_theme->get()['theme_test_template_test']['preprocess functions'];
@@ -112,7 +112,7 @@ public function testSuggestionPreprocessFunctions() {
 
     $extension_list = $this->container->get('extension.list.module');
     assert($extension_list instanceof ModuleExtensionList);
-    $registry_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_theme', NULL, $extension_list);
+    $registry_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $extension_list, 'test_theme');
     $registry_theme->setThemeManager(\Drupal::theme());
 
     $suggestions = ['__kitten', '__flamingo'];
@@ -154,7 +154,7 @@ public function testThemeRegistryAlterByTheme() {
 
     $extension_list = $this->container->get('extension.list.module');
     assert($extension_list instanceof ModuleExtensionList);
-    $registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_theme', NULL, $extension_list);
+    $registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $extension_list, 'test_theme');
     $registry->setThemeManager(\Drupal::theme());
     $this->assertEquals('value', $registry->get()['theme_test_template_test']['variables']['additional']);
   }
@@ -244,7 +244,7 @@ public function testThemeTemplatesRegisteredByModules() {
 
     $extension_list = \Drupal::service('extension.list.module');
     assert($extension_list instanceof ModuleExtensionList);
-    $registry_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), 'test_theme', NULL, $extension_list);
+    $registry_theme = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $theme_handler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), $extension_list, 'test_theme');
     $registry_theme->setThemeManager(\Drupal::theme());
 
     $expected = [
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
index 4df70246c..725898baf 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9LibraryOverrideTest.php
@@ -51,6 +51,10 @@ public function testStable9LibraryOverrides() {
         if (in_array("$extension/$library_name", $this->librariesToSkip)) {
           continue;
         }
+        // Skip internal libraries.
+        if (substr($library_name, 0, 9) === 'internal.') {
+          continue;
+        }
         $library_after = $libraries_after[$extension][$library_name];
 
         // Check that all the CSS assets are overridden.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9TemplateOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9TemplateOverrideTest.php
index 17d32822e..80d98e711 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9TemplateOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/Stable9TemplateOverrideTest.php
@@ -24,6 +24,8 @@ class Stable9TemplateOverrideTest extends KernelTestBase {
    * @var string[]
    */
   protected $templatesToSkip = [
+    // This is an internal template. See the file docblock.
+    'ckeditor5-settings-toolbar',
     // Registered as a template in the views_theme() function in views.module
     // but an actual template does not exist.
     'views-form-views-form',
@@ -87,7 +89,7 @@ protected function installAllModules() {
    * Ensures that Stable 9 overrides all relevant core templates.
    */
   public function testStable9TemplateOverrides() {
-    $registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $this->themeHandler, \Drupal::service('theme.initialization'), 'stable9', NULL, \Drupal::service('extension.list.module'));
+    $registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $this->themeHandler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), \Drupal::service('extension.list.module'), 'stable9');
     $registry->setThemeManager(\Drupal::theme());
 
     $registry_full = $registry->get();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php
index 0eff0e529..0c213868b 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/StableLibraryOverrideTest.php
@@ -6,6 +6,7 @@
  * Tests Stable's library overrides.
  *
  * @group Theme
+ * @group legacy
  */
 class StableLibraryOverrideTest extends StableLibraryOverrideTestBase {
 
@@ -37,16 +38,6 @@ class StableLibraryOverrideTest extends StableLibraryOverrideTestBase {
    */
   protected $allModules;
 
-  /**
-   * A list of libraries to skip checking, in the format extension/library_name.
-   *
-   * @var string[]
-   */
-  protected $librariesToSkip = [
-    // This is a deprecated library that will trigger warnings.
-    'image/quickedit.inPlaceEditor.image',
-  ];
-
   /**
    * {@inheritdoc}
    */
@@ -89,6 +80,10 @@ public function testStableLibraryOverrides() {
         if (in_array("$extension/$library_name", $this->librariesToSkip)) {
           continue;
         }
+        // Skip internal libraries.
+        if (substr($library_name, 0, 9) === 'internal.') {
+          continue;
+        }
         $library_after = $libraries_after[$extension][$library_name];
 
         // Check that all the CSS assets are overridden.
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php
index 66112bebb..20b38446f 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/StableTemplateOverrideTest.php
@@ -10,6 +10,7 @@
  * Tests Stable's template overrides.
  *
  * @group Theme
+ * @group legacy
  */
 class StableTemplateOverrideTest extends KernelTestBase {
 
@@ -24,6 +25,10 @@ class StableTemplateOverrideTest extends KernelTestBase {
    * @var string[]
    */
   protected $templatesToSkip = [
+    // This is an internal template. See the file docblock.
+    'ckeditor5-settings-toolbar',
+    // Registered as a template in the views_theme() function in views.module
+    // but an actual template does not exist.
     'views-form-views-form',
   ];
 
@@ -85,7 +90,7 @@ protected function installAllModules() {
    * Ensures that Stable overrides all relevant core templates.
    */
   public function testStableTemplateOverrides() {
-    $registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $this->themeHandler, \Drupal::service('theme.initialization'), 'stable', NULL, \Drupal::service('extension.list.module'));
+    $registry = new Registry($this->root, \Drupal::cache(), \Drupal::lock(), \Drupal::moduleHandler(), $this->themeHandler, \Drupal::service('theme.initialization'), \Drupal::service('cache.bootstrap'), \Drupal::service('extension.list.module'), 'stable');
     $registry->setThemeManager(\Drupal::theme());
 
     $registry_full = $registry->get();
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
index 7aae9c169..fbdd45b36 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeInstallerTest.php
@@ -34,6 +34,9 @@ public function register(ContainerBuilder $container) {
       ->register('router.dumper', 'Drupal\Core\Routing\NullMatcherDumper');
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->installConfig(['system']);
@@ -230,7 +233,7 @@ public function testInstallThemeWithMetModuleDependencies() {
    */
   public function testUninstallDefault() {
     $name = 'stark';
-    $other_name = 'bartik';
+    $other_name = 'olivero';
     $this->themeInstaller()->install([$name, $other_name]);
     $this->config('system.theme')->set('default', $name)->save();
 
@@ -257,7 +260,7 @@ public function testUninstallDefault() {
    */
   public function testUninstallAdmin() {
     $name = 'stark';
-    $other_name = 'bartik';
+    $other_name = 'olivero';
     $this->themeInstaller()->install([$name, $other_name]);
     $this->config('system.theme')->set('admin', $name)->save();
 
@@ -391,7 +394,7 @@ public function testUninstallNotInstalled() {
    * @see module_test_system_info_alter()
    */
   public function testThemeInfoAlter() {
-    $name = 'seven';
+    $name = 'stark';
     $this->container->get('state')->set('module_test.hook_system_info_alter', TRUE);
 
     $this->themeInstaller()->install([$name]);
diff --git a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
index f5ce5cfec..3c04cefba 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php
@@ -27,6 +27,9 @@ class ThemeSettingsTest extends KernelTestBase {
    */
   protected $availableThemes;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     // Theme settings rely on System module's system.theme.global configuration.
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php
index b4c76848f..023d0a233 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/AllowedValuesConstraintValidatorTest.php
@@ -20,6 +20,9 @@ class AllowedValuesConstraintValidatorTest extends KernelTestBase {
    */
   protected $typedData;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->typedData = $this->container->get('typed_data_manager');
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php
index 405503888..0d9d06d79 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/ComplexDataConstraintValidatorTest.php
@@ -7,8 +7,7 @@
 use Drupal\KernelTests\KernelTestBase;
 
 /**
- * Tests ComplexData validation constraint with both valid and invalid values
- * for a key.
+ * Tests ComplexData validation with both valid and invalid values.
  *
  * @group Validation
  */
@@ -21,6 +20,9 @@ class ComplexDataConstraintValidatorTest extends KernelTestBase {
    */
   protected $typedData;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->typedData = $this->container->get('typed_data_manager');
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
index d0e7bada1..f1a62beef 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataDefinitionTest.php
@@ -26,6 +26,9 @@ class TypedDataDefinitionTest extends KernelTestBase {
    */
   protected $typedDataManager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->typedDataManager = $this->container->get('typed_data_manager');
diff --git a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
index a87004ead..60e0a9ae8 100644
--- a/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/TypedData/TypedDataTest.php
@@ -40,6 +40,9 @@ class TypedDataTest extends KernelTestBase {
    */
   protected static $modules = ['system', 'field', 'file', 'user'];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/KernelTests/Core/Validation/UniqueFieldConstraintTest.php b/web/core/tests/Drupal/KernelTests/Core/Validation/UniqueFieldConstraintTest.php
index 2b5782c54..11ba97548 100644
--- a/web/core/tests/Drupal/KernelTests/Core/Validation/UniqueFieldConstraintTest.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Validation/UniqueFieldConstraintTest.php
@@ -85,7 +85,7 @@ public function testEntityWithStringIdWithViolation($id) {
     $message = new FormattableMarkup('A @entity_type with @field_name %value already exists.', [
       '%value' => $value,
       '@entity_type' => $entity->getEntityType()->getSingularLabel(),
-      '@field_name' => 'name',
+      '@field_name' => 'Name',
     ]);
 
     // Check that the validation has created the appropriate violation.
diff --git a/web/core/tests/Drupal/KernelTests/KernelTestBase.php b/web/core/tests/Drupal/KernelTests/KernelTestBase.php
index b4b97883f..90092cb36 100644
--- a/web/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -12,6 +12,7 @@
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Entity\Sql\SqlEntityStorageInterface;
 use Drupal\Core\Extension\ExtensionDiscovery;
+use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Site\Settings;
 use Drupal\Core\Test\TestDatabase;
@@ -194,6 +195,13 @@ abstract class KernelTestBase extends TestCase implements ServiceProviderInterfa
    */
   protected $configImporter;
 
+  /**
+   * The key_value service that must persist between container rebuilds.
+   *
+   * @var \Drupal\Core\KeyValueStore\KeyValueMemoryFactory
+   */
+  protected $keyValue;
+
   /**
    * The app root.
    *
@@ -454,7 +462,7 @@ protected function getDatabaseConnectionInfo() {
       throw new \Exception('There is no database connection so no tests can be run. You must provide a SIMPLETEST_DB environment variable to run PHPUnit based functional tests outside of run-tests.sh. See https://www.drupal.org/node/2116263#skipped-tests for more information.');
     }
     else {
-      $database = Database::convertDbUrlToConnectionInfo($db_url, $this->root);
+      $database = Database::convertDbUrlToConnectionInfo($db_url, $this->root, TRUE);
       Database::addConnectionInfo('default', 'default', $database);
     }
 
@@ -543,12 +551,14 @@ public function register(ContainerBuilder $container) {
       ->register('lock', 'Drupal\Core\Lock\NullLockBackend');
     $container
       ->register('cache_factory', 'Drupal\Core\Cache\MemoryBackendFactory');
-    $container
-      ->register('keyvalue.memory', 'Drupal\Core\KeyValueStore\KeyValueMemoryFactory')
-      // Must persist container rebuilds, or all data would vanish otherwise.
-      ->addTag('persist');
-    $container
-      ->setAlias('keyvalue', 'keyvalue.memory');
+
+    // Use memory for key value storages to avoid database queries. Store the
+    // key value factory on the test object so that key value storages persist
+    // container rebuilds, otherwise all state data would vanish.
+    if (!isset($this->keyValue)) {
+      $this->keyValue = new KeyValueMemoryFactory();
+    }
+    $container->set('keyvalue', $this->keyValue);
 
     // Set the default language on the minimal container.
     $container->setParameter('language.default_values', Language::$defaultValues);
@@ -701,7 +711,12 @@ protected function installConfig($modules) {
       if (!$this->container->get('module_handler')->moduleExists($module)) {
         throw new \LogicException("$module module is not enabled.");
       }
-      $this->container->get('config.installer')->installDefaultConfig('module', $module);
+      try {
+        $this->container->get('config.installer')->installDefaultConfig('module', $module);
+      }
+      catch (\Exception $e) {
+        throw new \Exception(sprintf('Exception when installing config for module %s, message was: %s', $module, $e->getMessage()), 0, $e);
+      }
     }
   }
 
@@ -983,27 +998,6 @@ private static function getModulesToEnable($class) {
     return call_user_func_array('array_merge_recursive', $modules);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected function prepareTemplate(\Text_Template $template) {
-    $bootstrap_globals = '';
-
-    // Fix missing bootstrap.php when $preserveGlobalState is FALSE.
-    // @see https://github.com/sebastianbergmann/phpunit/pull/797
-    $bootstrap_globals .= '$__PHPUNIT_BOOTSTRAP = ' . var_export($GLOBALS['__PHPUNIT_BOOTSTRAP'], TRUE) . ";\n";
-
-    // Avoid repetitive test namespace discoveries to improve performance.
-    // @see /core/tests/bootstrap.php
-    $bootstrap_globals .= '$namespaces = ' . var_export($GLOBALS['namespaces'], TRUE) . ";\n";
-
-    $template->setVar([
-      'constants' => '',
-      'included_files' => '',
-      'globals' => $bootstrap_globals,
-    ]);
-  }
-
   /**
    * Prevents serializing any properties.
    *
diff --git a/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php b/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
index 942e9f537..b0bb73a22 100644
--- a/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
+++ b/web/core/tests/Drupal/KernelTests/KernelTestBaseTest.php
@@ -316,10 +316,11 @@ protected function tearDown(): void {
     if ($connection->databaseType() === 'sqlite') {
       $result = $connection->query("SELECT name FROM " . $this->databasePrefix .
         ".sqlite_master WHERE type = :type AND name LIKE :table_name AND name NOT LIKE :pattern", [
-        ':type' => 'table',
-        ':table_name' => '%',
-        ':pattern' => 'sqlite_%',
-      ])->fetchAllKeyed(0, 0);
+          ':type' => 'table',
+          ':table_name' => '%',
+          ':pattern' => 'sqlite_%',
+        ]
+      )->fetchAllKeyed(0, 0);
       $this->assertEmpty($result, 'All test tables have been removed.');
     }
     else {
diff --git a/web/core/tests/Drupal/KernelTests/RouteProvider.php b/web/core/tests/Drupal/KernelTests/RouteProvider.php
index f075dbae0..c63a17abf 100644
--- a/web/core/tests/Drupal/KernelTests/RouteProvider.php
+++ b/web/core/tests/Drupal/KernelTests/RouteProvider.php
@@ -12,6 +12,11 @@ class RouteProvider implements PreloadableRouteProviderInterface {
 
   use \Drupal\Core\DependencyInjection\DependencySerializationTrait;
 
+  /**
+   * The route provider service.
+   */
+  protected $service;
+
   /**
    * Loads the real route provider from the container and rebuilds the router.
    *
diff --git a/web/core/tests/Drupal/Nightwatch/Tests/statesTest.js b/web/core/tests/Drupal/Nightwatch/Tests/statesTest.js
index 2ae6d41de..622005ebe 100644
--- a/web/core/tests/Drupal/Nightwatch/Tests/statesTest.js
+++ b/web/core/tests/Drupal/Nightwatch/Tests/statesTest.js
@@ -21,4 +21,28 @@ module.exports = {
       .waitForElementNotVisible('input[name="textfield"]', 1000)
       .assert.noDeprecationErrors();
   },
+  'Test number trigger with spinner widget': (browser) => {
+    browser
+      .drupalRelativeURL('/form-test/javascript-states-form')
+      .waitForElementVisible('body', 1000)
+      .waitForElementNotVisible(
+        '#edit-item-visible-when-number-trigger-filled-by-spinner',
+        1000,
+      )
+      .execute(
+        // eslint-disable-next-line func-names, prefer-arrow-callback, no-shadow
+        function () {
+          // Emulate usage of the spinner browser widget on number inputs
+          // on modern browsers.
+          const numberTrigger = document.getElementById('edit-number-trigger');
+          numberTrigger.value = 1;
+          numberTrigger.dispatchEvent(new Event('change'));
+        },
+      );
+
+    browser.waitForElementVisible(
+      '#edit-item-visible-when-number-trigger-filled-by-spinner',
+      1000,
+    );
+  },
 };
diff --git a/web/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js b/web/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js
index cbcd97aa5..02146df2f 100644
--- a/web/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js
+++ b/web/core/tests/Drupal/Nightwatch/Tests/tabbableShimTest.js
@@ -305,7 +305,7 @@ module.exports = {
       );
     });
     browser.assert.deprecationErrorExists(
-      'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 10.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730',
+      'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 11.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730',
     );
     browser.drupalLogAndEnd({ onlyOnError: false });
   },
@@ -338,7 +338,7 @@ module.exports = {
       );
     });
     browser.assert.deprecationErrorExists(
-      'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 10.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730',
+      'The :tabbable selector is deprecated in Drupal 9.2.0 and will be removed in Drupal 11.0.0. Use the core/tabbable library instead. See https://www.drupal.org/node/3183730',
     );
     browser.drupalLogAndEnd({ onlyOnError: false });
   },
diff --git a/web/core/tests/Drupal/Nightwatch/globals.js b/web/core/tests/Drupal/Nightwatch/globals.js
index 9abe233e1..a892a4fcb 100644
--- a/web/core/tests/Drupal/Nightwatch/globals.js
+++ b/web/core/tests/Drupal/Nightwatch/globals.js
@@ -2,7 +2,6 @@ import { spawn } from 'child_process';
 import path from 'path';
 import fs from 'fs';
 import mkdirp from 'mkdirp';
-import chromedriver from 'chromedriver';
 import nightwatchSettings from './nightwatch.conf';
 
 export const commandAsWebserver = (command) => {
@@ -16,18 +15,6 @@ export const drupalDbPrefix = null;
 export const drupalSitePath = null;
 
 module.exports = {
-  before: (done) => {
-    if (JSON.parse(process.env.DRUPAL_TEST_CHROMEDRIVER_AUTOSTART)) {
-      chromedriver.start();
-    }
-    done();
-  },
-  after: (done) => {
-    if (JSON.parse(process.env.DRUPAL_TEST_CHROMEDRIVER_AUTOSTART)) {
-      chromedriver.stop();
-    }
-    done();
-  },
   afterEach: (browser, done) => {
     // Writes the console log - used by the "logAndEnd" command.
     if (
diff --git a/web/core/tests/Drupal/Nightwatch/nightwatch.conf.js b/web/core/tests/Drupal/Nightwatch/nightwatch.conf.js
index 58bdfd841..8767b0ad7 100644
--- a/web/core/tests/Drupal/Nightwatch/nightwatch.conf.js
+++ b/web/core/tests/Drupal/Nightwatch/nightwatch.conf.js
@@ -82,7 +82,9 @@ module.exports = {
       webdriver: {
         start_process: process.env.DRUPAL_TEST_CHROMEDRIVER_AUTOSTART,
         port: process.env.DRUPAL_TEST_WEBDRIVER_PORT,
-        server_path: 'node_modules/.bin/chromedriver',
+        cli_args: process.env.DRUPAL_TEST_WEBDRIVER_CLI_ARGS
+          ? process.env.DRUPAL_TEST_WEBDRIVER_CLI_ARGS.split(' ')
+          : [],
       },
       desiredCapabilities: {
         browserName: 'chrome',
diff --git a/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php b/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
index f43eec027..a20074a32 100644
--- a/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
+++ b/web/core/tests/Drupal/TestSite/Commands/TestSiteInstallCommand.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Filesystem\Filesystem;
 
 /**
  * Command to create a test Drupal site.
@@ -30,6 +31,35 @@ class TestSiteInstallCommand extends Command {
     changeDatabasePrefix as protected changeDatabasePrefixTrait;
   }
 
+  /**
+   * The theme to install as the default for testing.
+   *
+   * Defaults to the install profile's default theme, if it specifies any.
+   */
+  protected $defaultTheme;
+
+  /**
+   * The base URL.
+   */
+  protected $baseUrl;
+
+  /**
+   * The original array of shutdown function callbacks.
+   */
+  protected $originalShutdownCallbacks = [];
+
+  /**
+   * The translation file directory for the test environment.
+   *
+   * This is set in BrowserTestBase::prepareEnvironment().
+   */
+  protected $translationFilesDirectory;
+
+  /**
+   * The config importer that can be used in a test.
+   */
+  protected $configImporter;
+
   /**
    * The install profile to use.
    *
@@ -91,6 +121,18 @@ protected function execute(InputInterface $input, OutputInterface $output) {
     // Manage site fixture.
     $this->setup($input->getOption('install-profile'), $class_name, $input->getOption('langcode'));
 
+    // Make sure there is an entry in sites.php for the new site.
+    $fs = new Filesystem();
+    if (!$fs->exists($root . '/sites/sites.php')) {
+      $fs->copy($root . '/sites/example.sites.php', $root . '/sites/sites.php');
+    }
+    $parsed = parse_url($base_url);
+    $port = $parsed['port'] ?? 80;
+    $host = $parsed['host'] ?? 'localhost';
+    // Remove 'sites/' from the beginning of the path.
+    $site_path = substr($this->siteDirectory, 6);
+    $fs->appendToFile($root . '/sites/sites.php', "\$sites['$port.$host'] = '$site_path';");
+
     $user_agent = drupal_generate_test_ua($this->databasePrefix);
     if ($input->getOption('json')) {
       $output->writeln(json_encode([
diff --git a/web/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php b/web/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php
index cb8c119d5..240293812 100644
--- a/web/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php
+++ b/web/core/tests/Drupal/TestSite/Commands/TestSiteUserLoginCommand.php
@@ -22,7 +22,7 @@ class TestSiteUserLoginCommand extends Command {
   /**
    * The class loader to use for installation and initialization of setup.
    *
-   * @var \Symfony\Component\Classloader\Classloader
+   * @var \Composer\Autoload\ClassLoader
    */
   protected $classLoader;
 
diff --git a/web/core/tests/Drupal/Tests/BrowserTestBase.php b/web/core/tests/Drupal/Tests/BrowserTestBase.php
index 4c452d005..f04dd5185 100644
--- a/web/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/web/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -320,9 +320,11 @@ protected function getDefaultDriverInstance() {
   }
 
   /**
-   * Get the Mink driver args from an environment variable, if it is set. Can
-   * be overridden in a derived class so it is possible to use a different
-   * value for a subset of tests, e.g. the JavaScript tests.
+   * Gets the Mink driver args from an environment variable.
+   *
+   * The environment variable can be overridden in a derived class so it is
+   * possible to use a different value for a subset of tests, e.g. the
+   * JavaScript tests.
    *
    * @return string|false
    *   The JSON-encoded argument string. False if it is not set.
diff --git a/web/core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php b/web/core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php
index 9e66b6b76..eb6c32dcc 100644
--- a/web/core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php
+++ b/web/core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php
@@ -20,7 +20,8 @@ public function testFindFile() {
 
     // The full path is returned therefore only tests with
     // assertStringEndsWith() so the test is portable.
-    $this->assertStringEndsWith('core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php', $finder->findFile(ClassFinderTest::class));
+    $expected_path = str_replace('/', DIRECTORY_SEPARATOR, 'core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php');
+    $this->assertStringEndsWith($expected_path, $finder->findFile(ClassFinderTest::class));
     $class = 'Not\\A\\Class';
     $this->assertNull($finder->findFile($class));
 
@@ -30,7 +31,7 @@ public function testFindFile() {
     $loader->register();
     $this->assertEquals(__FILE__, $finder->findFile($class));
     // This shouldn't prevent us from finding the original file.
-    $this->assertStringEndsWith('core/tests/Drupal/Tests/Component/ClassFinder/ClassFinderTest.php', $finder->findFile(ClassFinderTest::class));
+    $this->assertStringEndsWith($expected_path, $finder->findFile(ClassFinderTest::class));
 
     // Clean up the additional autoloader after the test.
     $loader->unregister();
diff --git a/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
index 0366c06b7..9cec9bd72 100644
--- a/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
@@ -182,8 +182,7 @@ public function testDateTimestamp($input, array $initial, array $transform) {
   }
 
   /**
-   * Assertion helper for testTimestamp and testDateTimestamp since they need
-   * different dataProviders.
+   * Asserts a DateTimePlus value.
    *
    * @param \Drupal\Component\Datetime\DateTimePlus $date
    *   DateTimePlus to test.
@@ -291,7 +290,9 @@ public function testDateTimezone($input, $timezone, $expected_timezone, $message
   }
 
   /**
-   * Tests DrupalDateTime with a datetime object.
+   * Tests that DrupalDateTime can detect the correct timezone to use.
+   *
+   * But only when the DrupalDateTime is constructed from a datetime object.
    */
   public function testDateTimezoneWithDateTimeObject() {
     // Create a date object with another date object.
diff --git a/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php b/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
index eeb933e0d..dcde1b24b 100644
--- a/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DependencyInjection/ContainerTest.php
@@ -10,6 +10,7 @@
 use Drupal\Component\Utility\Crypt;
 use Drupal\Tests\PhpUnitCompatibilityTrait;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
@@ -24,13 +25,13 @@
  * @group DependencyInjection
  */
 class ContainerTest extends TestCase {
-
+  use ExpectDeprecationTrait;
   use PhpUnitCompatibilityTrait;
 
   /**
    * The tested container.
    *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface
+   * @var \Drupal\Component\DependencyInjection\ContainerInterface
    */
   protected $container;
 
@@ -88,8 +89,7 @@ public function testGetParameter() {
   }
 
   /**
-   * Tests that Container::getParameter() works properly for non-existing
-   * parameters.
+   * Tests that Container::getParameter() works for non-existing parameters.
    *
    * @covers ::getParameter
    * @covers ::getParameterAlternatives
@@ -685,6 +685,24 @@ public function testResolveServicesAndParametersForRawArgument() {
     $this->assertEquals(['ccc'], $this->container->get('service_with_raw_argument')->getArguments());
   }
 
+  /**
+   * @covers \Drupal\Component\DependencyInjection\ServiceIdHashTrait::getServiceIdMappings
+   * @covers \Drupal\Component\DependencyInjection\ServiceIdHashTrait::generateServiceIdHash
+   *
+   * @group legacy
+   */
+  public function testGetServiceIdMappings() {
+    $this->expectDeprecation("Drupal\Component\DependencyInjection\ServiceIdHashTrait::generateServiceIdHash() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942");
+    $this->expectDeprecation("Drupal\Component\DependencyInjection\ServiceIdHashTrait::getServiceIdMappings() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942");
+    $this->assertEquals([], $this->container->getServiceIdMappings());
+    $s1 = $this->container->get('other.service');
+    $s2 = $this->container->get('late.service');
+    $this->assertEquals([
+      $this->container->generateServiceIdHash($s1) => 'other.service',
+      $this->container->generateServiceIdHash($s2) => 'late.service',
+    ], $this->container->getServiceIdMappings());
+  }
+
   /**
    * Gets a mock container definition.
    *
diff --git a/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php b/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
index 345f44019..73779a04c 100644
--- a/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DependencyInjection/Dumper/OptimizedPhpArrayDumperTest.php
@@ -10,6 +10,7 @@
   use Drupal\Component\Utility\Crypt;
   use Drupal\Tests\PhpUnitCompatibilityTrait;
   use PHPUnit\Framework\TestCase;
+  use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
   use Symfony\Component\DependencyInjection\Definition;
   use Symfony\Component\DependencyInjection\Reference;
   use Symfony\Component\DependencyInjection\Parameter;
@@ -26,6 +27,7 @@
   class OptimizedPhpArrayDumperTest extends TestCase {
 
     use PhpUnitCompatibilityTrait;
+    use ExpectDeprecationTrait;
 
     /**
      * The container builder instance.
@@ -346,16 +348,6 @@ public function getDefinitionsDataProvider() {
         'arguments_expected' => $this->getCollection([$this->getParameterCall('llama_parameter')]),
       ] + $base_service_definition;
 
-      // Test objects that have _serviceId property.
-      $drupal_service = new \stdClass();
-      $drupal_service->_serviceId = 'bar';
-
-      $service_definitions[] = [
-        'arguments' => [$drupal_service],
-        'arguments_count' => 1,
-        'arguments_expected' => $this->getCollection([$this->getServiceCall('bar')]),
-      ] + $base_service_definition;
-
       // Test getMethodCalls.
       $calls = [
         ['method', $this->getCollection([])],
@@ -366,8 +358,8 @@ public function getDefinitionsDataProvider() {
       ] + $base_service_definition;
 
       $service_definitions[] = [
-          'shared' => FALSE,
-        ] + $base_service_definition;
+        'shared' => FALSE,
+      ] + $base_service_definition;
 
       // Test factory.
       $service_definitions[] = [
@@ -518,11 +510,11 @@ public function testGetServiceDefinitionWithReferenceToAlias($public) {
         $service_definition = $this->getPrivateServiceCall('bar', $bar_definition_php_array, TRUE);
       }
       $data = [
-         'class' => '\stdClass',
-         'arguments' => $this->getCollection([
-           $service_definition,
-         ]),
-         'arguments_count' => 1,
+        'class' => '\stdClass',
+        'arguments' => $this->getCollection([
+          $service_definition,
+        ]),
+        'arguments_count' => 1,
       ];
       $this->assertEquals($this->serializeDefinition($data), $dump['services']['foo'], 'Expected definition matches dump.');
     }
@@ -589,6 +581,37 @@ public function testGetServiceDefinitionForObject() {
       $this->dumper->getArray();
     }
 
+    /**
+     * Tests that the correct RuntimeException is thrown for dumping an object.
+     *
+     * @covers ::dumpValue
+     * @group legacy
+     */
+    public function testGetServiceDefinitionForObjectServiceId() {
+      $service = new \stdClass();
+      $service->_serviceId = 'foo';
+
+      $services['foo'] = new Definition('\stdClass');
+      $services['bar'] = new Definition('\stdClass');
+      $services['bar']->addArgument($service);
+      foreach ($services as $s) {
+        $s->setPublic(TRUE);
+      }
+
+      $this->containerBuilder->getDefinitions()->willReturn($services);
+      $this->containerBuilder->getDefinition('foo')->willReturn($services['foo']);
+      $this->containerBuilder->getDefinition('bar')->willReturn($services['bar']);
+      $this->expectDeprecation('_serviceId is deprecated in drupal:9.5.0 and is removed from drupal:11.0.0. Use \Drupal\Core\DrupalKernelInterface::getServiceIdMapping() instead. See https://www.drupal.org/node/3292540');
+      $a = $this->dumper->getArray();
+      $this->assertEquals(
+        $this->serializeDefinition([
+          'class' => '\stdClass',
+          // Legacy code takes care of converting _serviceId into this.
+          'arguments' => $this->getCollection([$this->getServiceCall('foo')]),
+          'arguments_count' => 1,
+        ]), $a['services']['bar']);
+    }
+
     /**
      * Tests that the correct RuntimeException is thrown for dumping a resource.
      *
@@ -702,6 +725,8 @@ protected function getRaw($value) {
 }
 
 /**
+ * Defines a dummy ExpressionLanguage component.
+ *
  * As Drupal Core does not ship with ExpressionLanguage component we need to
  * define a dummy, else it cannot be tested.
  */
diff --git a/web/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php b/web/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php
index 710a2770e..3d1be4721 100644
--- a/web/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Discovery/YamlDirectoryDiscoveryTest.php
@@ -80,18 +80,19 @@ public function testDiscovery() {
     $discovery = new YamlDirectoryDiscovery($directories, 'test');
     $data = $discovery->findAll();
 
-    $this->assertSame(['id' => 'item1', 'name' => 'test1 item 1', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/subdir1/item_1.test.yml'], $data['test_1']['item1']);
-    $this->assertSame(['id' => 'item2', 'name' => 'test1 item 2', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/subdir2/item_2.test.yml'], $data['test_1']['item2']);
+    // The file path is dependent on the operating system, so we adjust the directory separator.
+    $this->assertSame(['id' => 'item1', 'name' => 'test1 item 1', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/subdir1' . DIRECTORY_SEPARATOR . 'item_1.test.yml'], $data['test_1']['item1']);
+    $this->assertSame(['id' => 'item2', 'name' => 'test1 item 2', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/subdir2' . DIRECTORY_SEPARATOR . 'item_2.test.yml'], $data['test_1']['item2']);
     $this->assertCount(2, $data['test_1']);
 
-    $this->assertSame(['id' => 'item3', 'name' => 'test2 item 3', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_2/subdir1/item_3.test.yml'], $data['test_2']['item3']);
+    $this->assertSame(['id' => 'item3', 'name' => 'test2 item 3', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_2/subdir1' . DIRECTORY_SEPARATOR . 'item_3.test.yml'], $data['test_2']['item3']);
     $this->assertCount(1, $data['test_2']);
 
     $this->assertArrayNotHasKey('test_3', $data, 'test_3 provides 0 items');
 
-    $this->assertSame(['id' => 'item4', 'name' => 'test4 item 4', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1/item_4.test.yml'], $data['test_4']['item4']);
-    $this->assertSame(['id' => 'item5', 'name' => 'test4 item 5', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1/item_5.test.yml'], $data['test_4']['item5']);
-    $this->assertSame(['id' => 'item6', 'name' => 'test4 item 6', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1/item_6.test.yml'], $data['test_4']['item6']);
+    $this->assertSame(['id' => 'item4', 'name' => 'test4 item 4', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1' . DIRECTORY_SEPARATOR . 'item_4.test.yml'], $data['test_4']['item4']);
+    $this->assertSame(['id' => 'item5', 'name' => 'test4 item 5', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1' . DIRECTORY_SEPARATOR . 'item_5.test.yml'], $data['test_4']['item5']);
+    $this->assertSame(['id' => 'item6', 'name' => 'test4 item 6', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_4/subdir1' . DIRECTORY_SEPARATOR . 'item_6.test.yml'], $data['test_4']['item6']);
     $this->assertCount(3, $data['test_4']);
   }
 
@@ -113,7 +114,7 @@ public function testDiscoveryAlternateId() {
     $discovery = new YamlDirectoryDiscovery($directories, 'test', 'alt_id');
     $data = $discovery->findAll();
 
-    $this->assertSame(['alt_id' => 'item1', 'id' => 'ignored', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1/item_1.test.yml'], $data['test_1']['item1']);
+    $this->assertSame(['alt_id' => 'item1', 'id' => 'ignored', YamlDirectoryDiscovery::FILE_KEY => 'vfs://modules/test_1' . DIRECTORY_SEPARATOR . 'item_1.test.yml'], $data['test_1']['item1']);
     $this->assertCount(1, $data['test_1']);
   }
 
@@ -125,7 +126,7 @@ public function testDiscoveryAlternateId() {
    */
   public function testDiscoveryNoIdException() {
     $this->expectException(DiscoveryException::class);
-    $this->expectExceptionMessage('The vfs://modules/test_1/item_1.test.yml contains no data in the identifier key \'id\'');
+    $this->expectExceptionMessage('The vfs://modules/test_1' . DIRECTORY_SEPARATOR . 'item_1.test.yml contains no data in the identifier key \'id\'');
     vfsStream::setup('modules', NULL, [
       'test_1' => [
         'item_1.test.yml' => "",
@@ -146,7 +147,7 @@ public function testDiscoveryNoIdException() {
    */
   public function testDiscoveryInvalidYamlException() {
     $this->expectException(DiscoveryException::class);
-    $this->expectExceptionMessage('The vfs://modules/test_1/item_1.test.yml contains invalid YAML');
+    $this->expectExceptionMessage('The vfs://modules/test_1' . DIRECTORY_SEPARATOR . 'item_1.test.yml contains invalid YAML');
     vfsStream::setup('modules', NULL, [
       'test_1' => [
         'item_1.test.yml' => "id: invalid\nfoo : [bar}",
diff --git a/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php b/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
index 74cd216fe..11855926a 100644
--- a/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
+++ b/web/core/tests/Drupal/Tests/Component/DrupalComponentTest.php
@@ -97,8 +97,8 @@ protected function assertNoCoreUsage(string $class_path): void {
     $contents = file_get_contents($class_path);
     preg_match_all('/^.*Drupal\\\Core.*$/m', $contents, $matches);
     $matches = array_filter($matches[0], function ($line) {
-      // Filter references to @see as they don't really matter.
-      return strpos($line, '@see') === FALSE;
+      // Filter references that don't really matter.
+      return preg_match('/@see|E_USER_DEPRECATED|expectDeprecation/', $line) === 0;
     });
     $this->assertEmpty($matches, "Checking for illegal reference to 'Drupal\\Core' namespace in $class_path");
   }
diff --git a/web/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php b/web/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
index f60e2b9a4..9596dfab6 100644
--- a/web/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
+++ b/web/core/tests/Drupal/Tests/Component/EventDispatcher/ContainerAwareEventDispatcherTest.php
@@ -40,11 +40,17 @@ class ContainerAwareEventDispatcherTest extends TestCase {
   private $dispatcher;
   private $listener;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->dispatcher = $this->createEventDispatcher();
     $this->listener = new TestEventListener();
   }
 
+  /**
+   * {@inheritdoc}
+   */
   protected function tearDown(): void {
     $this->dispatcher = NULL;
     $this->listener = NULL;
diff --git a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
index b57f05918..c21bc5bf3 100644
--- a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheFactoryTest.php
@@ -152,7 +152,7 @@ public function configurationDataProvider() {
       ],
       ['class' => '\stdClass'],
       $class,
-  ];
+    ];
 
     return $data;
   }
diff --git a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php
index 60ec81e03..30edddb32 100644
--- a/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php
+++ b/web/core/tests/Drupal/Tests/Component/FileCache/FileCacheTest.php
@@ -41,11 +41,11 @@ protected function setUp(): void {
    */
   public function testGet() {
     // Test a cache miss.
-    $result = $this->fileCache->get(__DIR__ . '/Fixtures/no-llama-42.yml');
+    $result = $this->fileCache->get(__DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'no-llama-42.yml');
     $this->assertNull($result);
 
     // Test a cache hit.
-    $filename = __DIR__ . '/Fixtures/llama-42.txt';
+    $filename = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'llama-42.txt';
     $realpath = realpath($filename);
     $cid = 'prefix:test:' . $realpath;
     $data = [
@@ -68,11 +68,11 @@ public function testGet() {
    */
   public function testGetMultiple() {
     // Test a cache miss.
-    $result = $this->fileCache->getMultiple([__DIR__ . '/Fixtures/no-llama-42.yml']);
+    $result = $this->fileCache->getMultiple([__DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'no-llama-42.yml']);
     $this->assertEmpty($result);
 
     // Test a cache hit.
-    $filename = __DIR__ . '/Fixtures/llama-42.txt';
+    $filename = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'llama-42.txt';
     $realpath = realpath($filename);
     $cid = 'prefix:test:' . $realpath;
     $data = [
@@ -87,7 +87,7 @@ public function testGetMultiple() {
     $this->assertEquals([$filename => 42], $result);
 
     // Test a static cache hit.
-    $file2 = __DIR__ . '/Fixtures/llama-23.txt';
+    $file2 = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'llama-23.txt';
     $this->fileCache->set($file2, 23);
 
     $result = $this->fileCache->getMultiple([$filename, $file2]);
@@ -102,7 +102,7 @@ public function testGetMultiple() {
    * @covers ::set
    */
   public function testSet() {
-    $filename = __DIR__ . '/Fixtures/llama-23.txt';
+    $filename = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'llama-23.txt';
     $realpath = realpath($filename);
     $cid = 'prefix:test:' . $realpath;
     $data = [
@@ -123,7 +123,7 @@ public function testSet() {
    * @covers ::delete
    */
   public function testDelete() {
-    $filename = __DIR__ . '/Fixtures/llama-23.txt';
+    $filename = __DIR__ . DIRECTORY_SEPARATOR . 'Fixtures' . DIRECTORY_SEPARATOR . 'llama-23.txt';
     $realpath = realpath($filename);
     $cid = 'prefix:test:' . $realpath;
 
diff --git a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
index cd68de55a..60a78af85 100644
--- a/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
+++ b/web/core/tests/Drupal/Tests/Component/PhpStorage/MTimeProtectedFileStorageBase.php
@@ -34,6 +34,11 @@ abstract class MTimeProtectedFileStorageBase extends PhpStorageTestBase {
    */
   protected $settings;
 
+  /**
+   * The expected test results for the security test.
+   */
+  protected $expected;
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php b/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php
index fc285287e..cf7502ec7 100644
--- a/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Render/FormattableMarkupTest.php
@@ -52,6 +52,29 @@ public function testCount() {
     $this->assertEquals(strlen($string), $formattable_string->count());
   }
 
+  /**
+   * @covers ::__toString
+   * @dataProvider providerTestNullPlaceholder
+   * @group legacy
+   */
+  public function testNullPlaceholder(string $expected, string $string, array $arguments, string $expected_deprecation): void {
+    $this->expectDeprecation($expected_deprecation);
+    $this->assertEquals($expected, (string) new FormattableMarkup($string, $arguments));
+  }
+
+  /**
+   * Data provider for FormattableMarkupTest::testNullPlaceholder().
+   *
+   * @return array
+   */
+  public function providerTestNullPlaceholder() {
+    return [
+      ['', '@empty', ['@empty' => NULL], 'Deprecated NULL placeholder value for key (@empty) in: "@empty". This will throw a PHP error in drupal:11.0.0. See https://www.drupal.org/node/3318826'],
+      ['', ':empty', [':empty' => NULL], 'Deprecated NULL placeholder value for key (:empty) in: ":empty". This will throw a PHP error in drupal:11.0.0. See https://www.drupal.org/node/3318826'],
+      ['<em class="placeholder"></em>', '%empty', ['%empty' => NULL], 'Deprecated NULL placeholder value for key (%%empty) in: "%%empty". This will throw a PHP error in drupal:11.0.0. See https://www.drupal.org/node/3318826'],
+    ];
+  }
+
   /**
    * Custom error handler that saves the last error.
    *
diff --git a/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php b/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php
index f4f1d0ab1..515629329 100644
--- a/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Serialization/YamlTest.php
@@ -20,6 +20,9 @@ class YamlTest extends TestCase {
    */
   protected $mockParser;
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     parent::setUp();
     $this->mockParser = $this->getMockBuilder('\stdClass')
@@ -28,6 +31,9 @@ public function setUp(): void {
     YamlParserProxy::setMock($this->mockParser);
   }
 
+  /**
+   * {@inheritdoc}
+   */
   public function tearDown(): void {
     YamlParserProxy::setMock(NULL);
     parent::tearDown();
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php b/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php
index f8e31cce9..4d8150a34 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/BytesTest.php
@@ -79,6 +79,7 @@ public function providerTestToNumber(): array {
       ['23476892 bytes', 23476892.0],
       // 76 MB.
       ['76MRandomStringThatShouldBeIgnoredByParseSize.', 79691776.0],
+      // cspell:ignore giggabyte
       // 76.24 GB (with typo).
       ['76.24 Giggabyte', 81862076662.0],
       ['1.5', 2.0],
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php b/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
index 3f2ab9de2..a333cdab5 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/HtmlTest.php
@@ -7,6 +7,7 @@
 use Drupal\Component\Utility\Html;
 use Drupal\Component\Utility\Random;
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 
 /**
  * Tests \Drupal\Component\Utility\Html.
@@ -17,6 +18,8 @@
  */
 class HtmlTest extends TestCase {
 
+  use ExpectDeprecationTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -405,6 +408,19 @@ public function providerTestTransformRootRelativeUrlsToAbsoluteAssertion() {
     ];
   }
 
+  /**
+   * Test deprecations.
+   *
+   * @group legacy
+   */
+  public function testDeprecations(): void {
+    $this->expectDeprecation('Passing NULL to Drupal\Component\Utility\Html::decodeEntities is deprecated in drupal:9.5.0 and will trigger a PHP error from drupal:11.0.0. Pass a string instead. See https://www.drupal.org/node/3318826');
+    $this->assertSame('', Html::decodeEntities(NULL));
+
+    $this->expectDeprecation('Passing NULL to Drupal\Component\Utility\Html::escape is deprecated in drupal:9.5.0 and will trigger a PHP error from drupal:11.0.0. Pass a string instead. See https://www.drupal.org/node/3318826');
+    $this->assertSame('', Html::escape(NULL));
+  }
+
 }
 
 /**
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php b/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
index 6e52b8d5d..35c0be969 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/NestedArrayTest.php
@@ -33,7 +33,7 @@ protected function setUp(): void {
 
     // Create a form structure with a nested element.
     $this->form['details']['element'] = [
-     '#value' => 'Nested element',
+      '#value' => 'Nested element',
     ];
 
     // Set up parent array.
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php b/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
index c4d76e460..4544a3228 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/UrlHelperTest.php
@@ -82,7 +82,7 @@ public function providerTestValidAbsoluteData() {
    * @covers ::isValid
    *
    * @param string $url
-   *   The url to test.
+   *   The URL to test.
    * @param string $scheme
    *   The scheme to test.
    */
@@ -113,7 +113,7 @@ public function providerTestInvalidAbsolute() {
    * @covers ::isValid
    *
    * @param string $url
-   *   The url to test.
+   *   The URL to test.
    * @param string $scheme
    *   The scheme to test.
    */
@@ -147,7 +147,7 @@ public function providerTestValidRelativeData() {
    * @covers ::isValid
    *
    * @param string $url
-   *   The url to test.
+   *   The URL to test.
    * @param string $prefix
    *   The prefix to test.
    */
@@ -178,7 +178,7 @@ public function providerTestInvalidRelativeData() {
    * @covers ::isValid
    *
    * @param string $url
-   *   The url to test.
+   *   The URL to test.
    * @param string $prefix
    *   The prefix to test.
    */
@@ -230,7 +230,7 @@ public static function providerTestFilterQueryParameters() {
   }
 
   /**
-   * Tests url parsing.
+   * Tests URL parsing.
    *
    * @dataProvider providerTestParse
    * @covers ::parse
@@ -478,7 +478,7 @@ public static function providerTestFilterBadProtocol() {
   }
 
   /**
-   * Tests dangerous url protocol filtering.
+   * Tests dangerous URL protocol filtering.
    *
    * @dataProvider providerTestStripDangerousProtocols
    * @covers ::setAllowedProtocols
@@ -560,12 +560,12 @@ protected function dataEnhanceWithPrefix(array $urls) {
    * Tests detecting external urls that point to local resources.
    *
    * @param string $url
-   *   The external url to test.
+   *   The external URL to test.
    * @param string $base_url
-   *   The base url.
+   *   The base URL.
    * @param bool $expected
    *   TRUE if an external URL points to this installation as determined by the
-   *   base url.
+   *   base URL.
    *
    * @covers ::externalIsLocal
    * @dataProvider providerTestExternalIsLocal
@@ -575,7 +575,7 @@ public function testExternalIsLocal($url, $base_url, $expected) {
   }
 
   /**
-   * Provider for local external url detection.
+   * Provider for local external URL detection.
    *
    * @see \Drupal\Tests\Component\Utility\UrlHelperTest::testExternalIsLocal()
    */
@@ -612,12 +612,12 @@ public function providerTestExternalIsLocal() {
   }
 
   /**
-   * Tests invalid url arguments.
+   * Tests invalid URL arguments.
    *
    * @param string $url
-   *   The url to test.
+   *   The URL to test.
    * @param string $base_url
-   *   The base url.
+   *   The base URL.
    *
    * @covers ::externalIsLocal
    * @dataProvider providerTestExternalIsLocalInvalid
@@ -628,7 +628,7 @@ public function testExternalIsLocalInvalid($url, $base_url) {
   }
 
   /**
-   * Provides invalid argument data for local external url detection.
+   * Provides invalid argument data for local external URL detection.
    *
    * @see \Drupal\Tests\Component\Utility\UrlHelperTest::testExternalIsLocalInvalid()
    */
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php b/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php
index f66dd6e46..b736fb205 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/VariableTest.php
@@ -162,8 +162,9 @@ public function providerTestExport() {
         new \stdClass(),
       ],
       [
-        // A not-stdClass object.
-        "Drupal\Tests\Component\Utility\StubVariableTestClass::__set_state(array(\n))",
+        // A not-stdClass object. Since PHP 8.2 exported namespace is prefixed,
+        // see https://github.com/php/php-src/pull/8233 for reasons.
+        (PHP_VERSION_ID >= 80200 ? '\\' : '') . "Drupal\Tests\Component\Utility\StubVariableTestClass::__set_state(array(\n))",
         new StubVariableTestClass(),
       ],
     ];
diff --git a/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php b/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
index 07874b4f0..2a3634709 100644
--- a/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
+++ b/web/core/tests/Drupal/Tests/Component/Utility/XssTest.php
@@ -506,8 +506,8 @@ public function testAttribute($value, $expected, $message, $allowed_tags = NULL)
   public function providerTestAttributes() {
     return [
       [
-        '<img src="http://example.com/foo.jpg" title="Example: title" alt="Example: alt">',
-        '<img src="http://example.com/foo.jpg" title="Example: title" alt="Example: alt">',
+        '<img src="http://example.com/foo.jpg" title="Example: title" alt="Example: alt" class="md:block">',
+        '<img src="http://example.com/foo.jpg" title="Example: title" alt="Example: alt" class="md:block">',
         'Image tag with alt and title attribute',
         ['img'],
       ],
@@ -535,6 +535,42 @@ public function providerTestAttributes() {
         'Link tag with numeric data attribute',
         ['a'],
       ],
+      [
+        '<img src= onmouseover="script(\'alert\');">',
+        '<img>',
+        'Image tag with malformed SRC',
+        ['img'],
+      ],
+      [
+        'Body"></iframe><img/src="x"/onerror="alert(document.domain)"/><"',
+        'Body"&gt;<img />&lt;"',
+        'Image tag with malformed SRC',
+        ['img'],
+      ],
+      [
+        '<img/src="x"/onerror="alert(document.domain)"/>',
+        '<img />',
+        'Image tag with malformed SRC',
+        ['img'],
+      ],
+      [
+        '<del datetime="1789-08-22T12:30:00.1-04:00">deleted text</del>',
+        '<del datetime="1789-08-22T12:30:00.1-04:00">deleted text</del>',
+        'Del with datetime attribute',
+        ['del'],
+      ],
+      [
+        '<ins datetime="1986-01-28 11:38:00.010">inserted text</ins>',
+        '<ins datetime="1986-01-28 11:38:00.010">inserted text</ins>',
+        'Ins with datetime attribute',
+        ['ins'],
+      ],
+      [
+        '<time datetime="1978-11-19T05:00:00Z">#DBD</time>',
+        '<time datetime="1978-11-19T05:00:00Z">#DBD</time>',
+        'Time with datetime attribute',
+        ['time'],
+      ],
     ];
   }
 
diff --git a/web/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php b/web/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php
index 12d45b4fe..c393593eb 100644
--- a/web/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php
+++ b/web/core/tests/Drupal/Tests/Composer/Plugin/VendorHardening/VendorHardeningPluginTest.php
@@ -22,6 +22,9 @@ class VendorHardeningPluginTest extends TestCase {
   use PhpUnitWarnings;
   use PhpUnitCompatibilityTrait;
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     parent::setUp();
     vfsStream::setup('vendor', NULL, [
diff --git a/web/core/tests/Drupal/Tests/ConfigTestTrait.php b/web/core/tests/Drupal/Tests/ConfigTestTrait.php
index 139f7f362..7ecc54177 100644
--- a/web/core/tests/Drupal/Tests/ConfigTestTrait.php
+++ b/web/core/tests/Drupal/Tests/ConfigTestTrait.php
@@ -37,7 +37,8 @@ protected function configImporter() {
         $this->container->get('module_installer'),
         $this->container->get('theme_handler'),
         $this->container->get('string_translation'),
-        $this->container->get('extension.list.module')
+        $this->container->get('extension.list.module'),
+        $this->container->get('extension.list.theme')
       );
     }
     // Always recalculate the changelist when called.
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
index 9db016cba..8a3a71da0 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
@@ -363,7 +363,7 @@ public function testCheckNamedRouteWithUpcastedValues() {
     $this->routeProvider->expects($this->any())
       ->method('getRouteByName')
       ->with('test_route_1')
-      ->will($this->returnValue($route));
+      ->willReturn($route);
 
     $map[] = ['test_route_1', ['value' => 'example'], '/test-route-1/example'];
 
@@ -371,7 +371,7 @@ public function testCheckNamedRouteWithUpcastedValues() {
     $this->paramConverter->expects($this->atLeastOnce())
       ->method('convert')
       ->with(['value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_1', RouteObjectInterface::ROUTE_OBJECT => $route])
-      ->will($this->returnValue(['value' => 'upcasted_value']));
+      ->willReturn(['value' => 'upcasted_value']);
 
     $this->setupAccessArgumentsResolverFactory($this->exactly(2))
       ->with($this->callback(function ($route_match) {
@@ -383,10 +383,10 @@ public function testCheckNamedRouteWithUpcastedValues() {
     $access_check = $this->createMock('Drupal\Tests\Core\Access\TestAccessCheckInterface');
     $access_check->expects($this->atLeastOnce())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $access_check->expects($this->atLeastOnce())
       ->method('access')
-      ->will($this->returnValue(AccessResult::forbidden()));
+      ->willReturn(AccessResult::forbidden());
 
     $this->container->set('test_access', $access_check);
     $this->container->setParameter('dynamic_access_check_services', ['test_access']);
@@ -412,7 +412,7 @@ public function testCheckNamedRouteWithDefaultValue() {
     $this->routeProvider->expects($this->any())
       ->method('getRouteByName')
       ->with('test_route_1')
-      ->will($this->returnValue($route));
+      ->willReturn($route);
 
     $map[] = ['test_route_1', ['value' => 'example'], '/test-route-1/example'];
 
@@ -420,7 +420,7 @@ public function testCheckNamedRouteWithDefaultValue() {
     $this->paramConverter->expects($this->atLeastOnce())
       ->method('convert')
       ->with(['value' => 'example', RouteObjectInterface::ROUTE_NAME => 'test_route_1', RouteObjectInterface::ROUTE_OBJECT => $route])
-      ->will($this->returnValue(['value' => 'upcasted_value']));
+      ->willReturn(['value' => 'upcasted_value']);
 
     $this->setupAccessArgumentsResolverFactory($this->exactly(2))
       ->with($this->callback(function ($route_match) {
@@ -432,10 +432,10 @@ public function testCheckNamedRouteWithDefaultValue() {
     $access_check = $this->createMock('Drupal\Tests\Core\Access\TestAccessCheckInterface');
     $access_check->expects($this->atLeastOnce())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $access_check->expects($this->atLeastOnce())
       ->method('access')
-      ->will($this->returnValue(AccessResult::forbidden()));
+      ->willReturn(AccessResult::forbidden());
 
     $this->container->set('test_access', $access_check);
     $this->container->setParameter('dynamic_access_check_services', ['test_access']);
@@ -482,12 +482,12 @@ public function testCheckException($return_value) {
 
     $route_provider->expects($this->any())
       ->method('getRouteByName')
-      ->will($this->returnValue($route));
+      ->willReturn($route);
 
     $this->paramConverter = $this->createMock('Drupal\Core\ParamConverter\ParamConverterManagerInterface');
     $this->paramConverter->expects($this->any())
       ->method('convert')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->setupAccessArgumentsResolverFactory();
 
@@ -497,7 +497,7 @@ public function testCheckException($return_value) {
     $access_check = $this->createMock('Drupal\Tests\Core\Access\TestAccessCheckInterface');
     $access_check->expects($this->any())
       ->method('access')
-      ->will($this->returnValue($return_value));
+      ->willReturn($return_value);
     $container->set('test_incorrect_value', $access_check);
 
     $access_manager = new AccessManager($route_provider, $this->paramConverter, $this->argumentsResolverFactory, $this->currentUser, $this->checkProvider);
@@ -543,9 +543,9 @@ protected function setupAccessArgumentsResolverFactory($constraint = NULL) {
         $resolver = $this->createMock('Drupal\Component\Utility\ArgumentsResolverInterface');
         $resolver->expects($this->any())
           ->method('getArguments')
-          ->will($this->returnCallback(function ($callable) use ($route_match) {
+          ->willReturnCallback(function ($callable) use ($route_match) {
             return [$route_match->getRouteObject()];
-          }));
+          });
 
         return $resolver;
       });
diff --git a/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php b/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
index dbe8008b0..24ca0617f 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/AccessResultTest.php
@@ -462,7 +462,7 @@ public function testCacheContexts() {
     $account->expects($this->any())
       ->method('hasPermission')
       ->with('may herd llamas')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $contexts = ['user.permissions'];
 
     // Verify the object when using the ::allowedIfHasPermission() convenience
@@ -514,7 +514,7 @@ public function testCacheTags() {
     $node = $this->createMock('\Drupal\node\NodeInterface');
     $node->expects($this->any())
       ->method('getCacheTags')
-      ->will($this->returnValue(['node:20011988']));
+      ->willReturn(['node:20011988']);
     $node->expects($this->any())
       ->method('getCacheMaxAge')
       ->willReturn(600);
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
index a52d335f1..ff804a242 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CsrfAccessCheckTest.php
@@ -31,10 +31,13 @@ class CsrfAccessCheckTest extends UnitTestCase {
   /**
    * The mock route match.
    *
-   * @var \Drupal\Core\RouteMatch\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Routing\RouteMatchInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $routeMatch;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator')
       ->disableOriginalConstructor()
@@ -52,11 +55,11 @@ public function testAccessTokenPass() {
     $this->csrfToken->expects($this->once())
       ->method('validate')
       ->with('test_query', 'test-path/42')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->routeMatch->expects($this->once())
       ->method('getRawParameters')
-      ->will($this->returnValue(['node' => 42]));
+      ->willReturn(['node' => 42]);
 
     $route = new Route('/test-path/{node}', [], ['_csrf_token' => 'TRUE']);
     $request = Request::create('/test-path/42?token=test_query');
@@ -71,11 +74,11 @@ public function testCsrfTokenInvalid() {
     $this->csrfToken->expects($this->once())
       ->method('validate')
       ->with('test_query', 'test-path')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->routeMatch->expects($this->once())
       ->method('getRawParameters')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $route = new Route('/test-path', [], ['_csrf_token' => 'TRUE']);
     $request = Request::create('/test-path?token=test_query');
@@ -90,11 +93,11 @@ public function testCsrfTokenMissing() {
     $this->csrfToken->expects($this->once())
       ->method('validate')
       ->with('', 'test-path')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->routeMatch->expects($this->once())
       ->method('getRawParameters')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $route = new Route('/test-path', [], ['_csrf_token' => 'TRUE']);
     $request = Request::create('/test-path');
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
index 8db48fe84..118e5c041 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CsrfTokenGeneratorTest.php
@@ -67,12 +67,12 @@ protected function setupDefaultExpectations() {
     $key = Crypt::randomBytesBase64();
     $this->privateKey->expects($this->any())
       ->method('get')
-      ->will($this->returnValue($key));
+      ->willReturn($key);
 
     $seed = Crypt::randomBytesBase64();
     $this->sessionMetadata->expects($this->any())
       ->method('getCsrfTokenSeed')
-      ->will($this->returnValue($seed));
+      ->willReturn($seed);
   }
 
   /**
@@ -97,11 +97,11 @@ public function testGenerateSeedOnGet() {
     $key = Crypt::randomBytesBase64();
     $this->privateKey->expects($this->any())
       ->method('get')
-      ->will($this->returnValue($key));
+      ->willReturn($key);
 
     $this->sessionMetadata->expects($this->once())
       ->method('getCsrfTokenSeed')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->sessionMetadata->expects($this->once())
       ->method('setCsrfTokenSeed')
diff --git a/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
index 33509635e..1218df686 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/CustomAccessCheckTest.php
@@ -72,15 +72,15 @@ public function testAccess() {
     $resolver0 = $this->createMock('Drupal\Component\Utility\ArgumentsResolverInterface');
     $resolver0->expects($this->once())
       ->method('getArguments')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $resolver1 = $this->createMock('Drupal\Component\Utility\ArgumentsResolverInterface');
     $resolver1->expects($this->once())
       ->method('getArguments')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $resolver2 = $this->createMock('Drupal\Component\Utility\ArgumentsResolverInterface');
     $resolver2->expects($this->once())
       ->method('getArguments')
-      ->will($this->returnValue(['parameter' => 'TRUE']));
+      ->willReturn(['parameter' => 'TRUE']);
 
     $this->argumentsResolverFactory->expects($this->exactly(3))
       ->method('getArgumentsResolver')
diff --git a/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php b/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
index cadd623b5..b76cbff4e 100644
--- a/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Access/RouteProcessorCsrfTest.php
@@ -28,6 +28,9 @@ class RouteProcessorCsrfTest extends UnitTestCase {
    */
   protected $processor;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->csrfToken = $this->getMockBuilder('Drupal\Core\Access\CsrfTokenGenerator')
       ->disableOriginalConstructor()
diff --git a/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php b/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php
index 2e2b93532..bf3c858fd 100644
--- a/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseTest.php
@@ -22,6 +22,9 @@ class AjaxResponseTest extends UnitTestCase {
    */
   protected $ajaxResponse;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->ajaxResponse = new AjaxResponse();
   }
@@ -36,15 +39,15 @@ public function testCommands() {
     $command_one = $this->createMock('Drupal\Core\Ajax\CommandInterface');
     $command_one->expects($this->once())
       ->method('render')
-      ->will($this->returnValue(['command' => 'one']));
+      ->willReturn(['command' => 'one']);
     $command_two = $this->createMock('Drupal\Core\Ajax\CommandInterface');
     $command_two->expects($this->once())
       ->method('render')
-      ->will($this->returnValue(['command' => 'two']));
+      ->willReturn(['command' => 'two']);
     $command_three = $this->createMock('Drupal\Core\Ajax\CommandInterface');
     $command_three->expects($this->once())
       ->method('render')
-      ->will($this->returnValue(['command' => 'three']));
+      ->willReturn(['command' => 'three']);
 
     $this->ajaxResponse->addCommand($command_one);
     $this->ajaxResponse->addCommand($command_two);
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php b/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
index f0f3cbf93..f9f58764d 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
@@ -86,9 +86,6 @@ protected function setUp(): void {
     $active_theme = $this->getMockBuilder('\Drupal\Core\Theme\ActiveTheme')
       ->disableOriginalConstructor()
       ->getMock();
-    $active_theme->expects($this->any())
-      ->method('getName')
-      ->willReturn('bartik');
     $this->themeManager->expects($this->any())
       ->method('getActiveTheme')
       ->willReturn($active_theme);
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
index 40efadf4e..867e680a8 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionGrouperUnitTest.php
@@ -19,6 +19,9 @@ class CssCollectionGrouperUnitTest extends UnitTestCase {
    */
   protected $grouper;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -86,7 +89,7 @@ public function testGrouper() {
         'type' => 'file',
         'weight' => 0.001,
         'preprocess' => TRUE,
-        'data' => 'core/themes/bartik/css/base/elements.css',
+        'data' => 'core/themes/example/css/base/elements.css',
         'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'elements.css',
       ],
@@ -96,7 +99,7 @@ public function testGrouper() {
         'type' => 'file',
         'weight' => 0.003,
         'preprocess' => TRUE,
-        'data' => 'core/themes/bartik/css/print.css',
+        'data' => 'core/themes/example/css/print.css',
         'browsers' => ['IE' => TRUE, '!IE' => TRUE],
         'basename' => 'print.css',
       ],
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerUnitTest.php
index a27ce0619..cf7305b55 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssCollectionOptimizerUnitTest.php
@@ -31,6 +31,9 @@ class CssCollectionOptimizerUnitTest extends UnitTestCase {
    */
   protected $optimizer;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $mock_grouper = $this->createMock(AssetCollectionGrouperInterface::class);
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
index 494c3ebbb..156392594 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php
@@ -28,10 +28,13 @@ class CssOptimizerUnitTest extends UnitTestCase {
   /**
    * The file URL generator mock.
    *
-   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $fileUrlGenerator;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $this->fileUrlGenerator = $this->createMock(FileUrlGeneratorInterface::class);
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
index f9c7ae651..f380e385f 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDependencyResolverTest.php
@@ -60,7 +60,7 @@ protected function setUp(): void {
     $this->libraryDiscovery->expects($this->any())
       ->method('getLibrariesByExtension')
       ->with('test')
-      ->will($this->returnValue($this->libraryData));
+      ->willReturn($this->libraryData);
     $this->libraryDependencyResolver = new LibraryDependencyResolver($this->libraryDiscovery);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
index b2d369846..70c22d868 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryCollectorTest.php
@@ -150,7 +150,7 @@ public function testDestruct() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with($lock_key)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->cache->expects($this->exactly(2))
       ->method('get')
       ->with('library_info:kitten_theme')
diff --git a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
index e355bc053..e21bf5f47 100644
--- a/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Asset/LibraryDiscoveryParserTest.php
@@ -119,7 +119,7 @@ public function testBuildByExtensionSimple() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_module')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -149,7 +149,7 @@ public function testBuildByExtensionWithTheme() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_theme')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -176,7 +176,7 @@ public function testBuildByExtensionWithMissingLibraryFile() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_module')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files_not_existing';
     $path = substr($path, strlen($this->root) + 1);
@@ -197,7 +197,7 @@ public function testInvalidLibrariesFile() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('invalid_file')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -219,7 +219,7 @@ public function testBuildByExtensionWithOnlyDependencies() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_module_only_dependencies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -241,7 +241,7 @@ public function testBuildByExtensionWithMissingInformation() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_module_missing_information')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -264,7 +264,7 @@ public function testVersion() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('versions')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -297,7 +297,7 @@ public function testExternalLibraries() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('external')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -323,7 +323,7 @@ public function testDefaultCssWeights() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('css_weights')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -364,7 +364,7 @@ public function testJsWithPositiveWeight() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('js_positive_weight')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -386,7 +386,7 @@ public function testLibraryWithCssJsSetting() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('css_js_settings')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -419,7 +419,7 @@ public function testLibraryWithDependencies() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('dependencies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -445,10 +445,10 @@ public function testLibraryWithDataTypes() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('data_types')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->streamWrapperManager->expects($this->atLeastOnce())
       ->method('isValidUri')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -483,7 +483,7 @@ public function testLibraryWithJavaScript() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('js')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -509,7 +509,7 @@ public function testLibraryThirdPartyWithMissingLicense() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('licenses_missing_information')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -532,7 +532,7 @@ public function testLibraryWithLicenses() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('licenses')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -651,7 +651,7 @@ public function testLibraryOverride() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_module')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $libraries = $this->libraryDiscoveryParser->buildByExtension('example_module');
     $library = $libraries['example'];
@@ -704,7 +704,7 @@ public function testLibraryOverrideDeprecated() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('deprecated')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->libraryDiscoveryParser->buildByExtension('deprecated');
   }
@@ -729,7 +729,7 @@ public function testCssAssert($extension, $exception_message) {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with($extension)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -761,7 +761,7 @@ public function testNonCoreLibrariesFound() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_contrib_module')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -773,7 +773,7 @@ public function testNonCoreLibrariesFound() {
     $this->librariesDirectoryFileFinder->expects($this->once())
       ->method('find')
       ->with('third_party_library/css/example.css')
-      ->will($this->returnValue('sites/example.com/libraries/third_party_library/css/example.css'));
+      ->willReturn('sites/example.com/libraries/third_party_library/css/example.css');
 
     $libraries = $this->libraryDiscoveryParser->buildByExtension('example_contrib_module');
     $library = $libraries['third_party_library'];
@@ -792,7 +792,7 @@ public function testNonCoreLibrariesNotFound() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('example_contrib_module')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
@@ -807,7 +807,7 @@ public function testNonCoreLibrariesNotFound() {
     $this->librariesDirectoryFileFinder->expects($this->once())
       ->method('find')
       ->with('third_party_library/css/example.css')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $libraries = $this->libraryDiscoveryParser->buildByExtension('example_contrib_module');
     $library = $libraries['third_party_library'];
@@ -827,7 +827,7 @@ public function testEmptyLibraryFile() {
     $this->moduleHandler->expects($this->atLeastOnce())
       ->method('moduleExists')
       ->with('empty')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $path = __DIR__ . '/library_test_files';
     $path = substr($path, strlen($this->root) + 1);
diff --git a/web/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php b/web/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php
index d580d8204..6e0ac7c92 100644
--- a/web/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Authentication/AuthenticationManagerTest.php
@@ -49,7 +49,7 @@ public function testDefaultFilter($applies, $has_route, $auth_option, $provider_
   /**
    * @covers ::applyFilter
    */
-  public function testApplyFilterWithFilterprovider() {
+  public function testApplyFilterWithFilterProvider() {
     $auth_provider = $this->createMock('Drupal\Tests\Core\Authentication\TestAuthenticationProviderInterface');
     $auth_provider->expects($this->once())
       ->method('appliesToRoutedRequest')
diff --git a/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php b/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
index 234434f54..b0e600c0b 100644
--- a/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Breadcrumb/BreadcrumbManagerTest.php
@@ -86,7 +86,7 @@ public function testBuildWithSingleBuilder() {
 
     $builder->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $builder->expects($this->once())
       ->method('build')
@@ -122,7 +122,7 @@ public function testBuildWithMultipleApplyingBuilders() {
     $this->breadcrumb->addCacheContexts(['baz'])->addCacheTags(['qux']);
     $builder2->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $builder2->expects($this->once())
       ->method('build')
       ->willReturn($this->breadcrumb);
@@ -150,7 +150,7 @@ public function testBuildWithOneNotApplyingBuilders() {
     $builder1 = $this->createMock('Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface');
     $builder1->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $builder1->expects($this->never())
       ->method('build');
 
@@ -160,7 +160,7 @@ public function testBuildWithOneNotApplyingBuilders() {
     $this->breadcrumb->addCacheContexts(['baz'])->addCacheTags(['qux']);
     $builder2->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $builder2->expects($this->once())
       ->method('build')
       ->willReturn($this->breadcrumb);
@@ -188,10 +188,10 @@ public function testBuildWithInvalidBreadcrumbResult() {
     $builder = $this->createMock('Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface');
     $builder->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $builder->expects($this->once())
       ->method('build')
-      ->will($this->returnValue('invalid_result'));
+      ->willReturn('invalid_result');
 
     $this->breadcrumbManager->addBuilder($builder, 0);
     $this->expectException(\UnexpectedValueException::class);
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php b/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
index 10a209e88..9be88bbcb 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/BackendChainImplementationUnitTest.php
@@ -43,6 +43,9 @@ class BackendChainImplementationUnitTest extends UnitTestCase {
    */
   protected $thirdBackend;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -192,8 +195,7 @@ public function testGetMultipleHasPropagated() {
   }
 
   /**
-   * Tests that the delete all operation is propagated to all backends in the
-   * chain.
+   * Tests that the delete all operation is propagated to all chained backends.
    */
   public function testDeleteAllPropagation() {
     // Set both expiring and permanent keys.
@@ -210,8 +212,7 @@ public function testDeleteAllPropagation() {
   }
 
   /**
-   * Tests that the delete tags operation is propagated to all backends
-   * in the chain.
+   * Tests that the delete tags operation is propagated to all chained backends.
    */
   public function testDeleteTagsPropagation() {
     // Create two cache entries with the same tag and tag value.
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
index 2c7c041a6..4debf2836 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheCollectorTest.php
@@ -119,7 +119,7 @@ public function testGetFromCache() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with($this->cid)
-      ->will($this->returnValue($cache));
+      ->willReturn($cache);
     $this->assertTrue($this->collector->has($key));
     $this->assertEquals($value, $this->collector->get($key));
     $this->assertEquals(0, $this->collector->getCacheMisses());
@@ -175,7 +175,7 @@ public function testUpdateCache() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with($this->cid, FALSE);
@@ -204,7 +204,7 @@ public function testUpdateCacheLockFail() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->cacheBackend->expects($this->never())
       ->method('set');
 
@@ -244,7 +244,7 @@ public function testUpdateCacheInvalidatedConflict() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->cacheBackend->expects($this->once())
       ->method('delete')
       ->with($this->cid);
@@ -272,7 +272,7 @@ public function testUpdateCacheMerge() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $cache = (object) [
       'data' => ['other key' => 'other value'],
       'created' => (int) $_SERVER['REQUEST_TIME'] + 1,
@@ -280,7 +280,7 @@ public function testUpdateCacheMerge() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with($this->cid)
-      ->will($this->returnValue($cache));
+      ->willReturn($cache);
     $this->cacheBackend->expects($this->once())
       ->method('set')
       ->with($this->cid, ['other key' => 'other value', $key => $value], Cache::PERMANENT, []);
@@ -311,7 +311,7 @@ public function testUpdateCacheDelete() {
         [$this->cid],
         [$this->cid, TRUE],
       )
-      ->will($this->returnValue($cache));
+      ->willReturn($cache);
 
     $this->collector->delete($key);
 
@@ -320,7 +320,7 @@ public function testUpdateCacheDelete() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with($this->cid . ':Drupal\Core\Cache\CacheCollector')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->cacheBackend->expects($this->once())
       ->method('set')
       ->with($this->cid, [], Cache::PERMANENT, []);
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
index 2876d7177..c67dc843d 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheFactoryTest.php
@@ -33,7 +33,7 @@ public function testCacheFactoryWithDefaultSettings() {
     $builtin_default_backend_factory->expects($this->once())
       ->method('get')
       ->with('render')
-      ->will($this->returnValue($render_bin));
+      ->willReturn($render_bin);
 
     $actual_bin = $cache_factory->get('render');
     $this->assertSame($render_bin, $actual_bin);
@@ -63,7 +63,7 @@ public function testCacheFactoryWithCustomizedDefaultBackend() {
     $custom_default_backend_factory->expects($this->once())
       ->method('get')
       ->with('render')
-      ->will($this->returnValue($render_bin));
+      ->willReturn($render_bin);
 
     $actual_bin = $cache_factory->get('render');
     $this->assertSame($render_bin, $actual_bin);
@@ -99,7 +99,7 @@ public function testCacheFactoryWithDefaultBinBackend() {
     $custom_default_backend_factory->expects($this->once())
       ->method('get')
       ->with('render')
-      ->will($this->returnValue($render_bin));
+      ->willReturn($render_bin);
 
     $actual_bin = $cache_factory->get('render');
     $this->assertSame($render_bin, $actual_bin);
@@ -139,7 +139,7 @@ public function testCacheFactoryWithSpecifiedPerBinBackend() {
     $custom_render_backend_factory->expects($this->once())
       ->method('get')
       ->with('render')
-      ->will($this->returnValue($render_bin));
+      ->willReturn($render_bin);
 
     $actual_bin = $cache_factory->get('render');
     $this->assertSame($render_bin, $actual_bin);
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php b/web/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
index 2d939a75a..ff12edabe 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/CacheableMetadataTest.php
@@ -129,7 +129,7 @@ public function providerSetCacheMaxAge() {
       [300, FALSE],
       [[], TRUE],
       [8.0, TRUE],
-   ];
+    ];
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php b/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
index 8f203b0f1..ac5fb40a3 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/ChainedFastBackendTest.php
@@ -43,7 +43,7 @@ public function testGetDoesNotHitConsistentBackend() {
     $timestamp_item = (object) ['cid' => $timestamp_cid, 'data' => (int) $_SERVER['REQUEST_TIME'] - 60];
     $consistent_cache->expects($this->once())
       ->method('get')->with($timestamp_cid)
-      ->will($this->returnValue($timestamp_item));
+      ->willReturn($timestamp_item);
     $consistent_cache->expects($this->never())
       ->method('getMultiple');
 
@@ -82,19 +82,19 @@ public function testFallThroughToConsistentCache() {
     $consistent_cache->expects($this->once())
       ->method('get')
       ->with($timestamp_item->cid)
-      ->will($this->returnValue($timestamp_item));
+      ->willReturn($timestamp_item);
 
     // We should get a call for the cache item on the consistent backend.
     $consistent_cache->expects($this->once())
       ->method('getMultiple')
       ->with([$cache_item->cid])
-      ->will($this->returnValue([$cache_item->cid => $cache_item]));
+      ->willReturn([$cache_item->cid => $cache_item]);
 
     // We should get a call for the cache item on the fast backend.
     $fast_cache->expects($this->once())
       ->method('getMultiple')
       ->with([$cache_item->cid])
-      ->will($this->returnValue([$cache_item->cid => $cache_item]));
+      ->willReturn([$cache_item->cid => $cache_item]);
 
     // We should get a call to set the cache item on the fast backend.
     $fast_cache->expects($this->once())
diff --git a/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php b/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php
index d4c67fe02..794f645e2 100644
--- a/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Cache/Context/SessionCacheContextTest.php
@@ -34,6 +34,9 @@ class SessionCacheContextTest extends UnitTestCase {
    */
   protected $session;
 
+  /**
+   * {@inheritdoc}
+   */
   public function setUp(): void {
     $this->request = new Request();
 
@@ -54,7 +57,7 @@ public function testSameContextForSameSession() {
     $session_id = 'aSebeZ52bbM6SvADurQP89SFnEpxY6j8';
     $this->session->expects($this->exactly(2))
       ->method('getId')
-      ->will($this->returnValue($session_id));
+      ->willReturn($session_id);
 
     $context1 = $cache_context->getContext();
     $context2 = $cache_context->getContext();
diff --git a/web/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php b/web/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php
index 23f5e899b..d5dba42a3 100644
--- a/web/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Command/GenerateThemeTest.php
@@ -45,7 +45,7 @@ public function setUp(): void {
    * @return \Symfony\Component\Process\Process
    *   The PHP process
    */
-  private function generateThemeFromStarterkit() : Process {
+  private function generateThemeFromStarterkit($env = NULL) : Process {
     $install_command = [
       $this->php,
       'core/scripts/drupal',
@@ -54,7 +54,7 @@ private function generateThemeFromStarterkit() : Process {
       '--name="Test custom starterkit theme"',
       '--description="Custom theme generated from a starterkit theme"',
     ];
-    $process = new Process($install_command, NULL);
+    $process = new Process($install_command, NULL, $env);
     $process->setTimeout(60);
     return $process;
   }
@@ -262,20 +262,23 @@ public function testContribStarterkitDevSnapshotWithGitNotInstalled(): void {
 SH;
     file_put_contents($unavailableGitPath . '/git', $bash);
     chmod($unavailableGitPath . '/git', 0755);
-    $oldPath = getenv('PATH');
-    putenv('PATH=' . $unavailableGitPath . ':' . getenv('PATH'));
     // Confirm that 'git' is no longer available.
-    $output = [];
-    exec('git --help', $output, $status);
-    $this->assertEquals(127, $status);
-
-    $process = $this->generateThemeFromStarterkit();
+    $env = [
+      'PATH' => $unavailableGitPath . ':' . getenv('PATH'),
+      'COLUMNS' => 80,
+    ];
+    $process = new Process([
+      'git',
+      '--help',
+    ], NULL, $env);
+    $process->run();
+    $this->assertEquals(127, $process->getExitCode(), 'Fake git used by process.');
+
+    $process = $this->generateThemeFromStarterkit($env);
     $result = $process->run();
     $this->assertEquals("[ERROR] The source theme starterkit_theme has a development version number     \n         (7.x-dev). Determining a specific commit is not possible because git is\n         not installed. Either install git or use a tagged release to generate a\n         theme.", trim($process->getOutput()), $process->getErrorOutput());
     $this->assertSame(1, $result);
     $this->assertFileDoesNotExist($this->getWorkspaceDirectory() . "/themes/test_custom_theme");
-
-    putenv('PATH=' . $oldPath . ':' . getenv('PATH'));
   }
 
   /**
@@ -349,12 +352,12 @@ public function testStarterKitFlag(): void {
       '--name="Test custom starterkit theme"',
       '--description="Custom theme generated from a starterkit theme"',
       '--starterkit',
-      'bartik',
+      'olivero',
     ];
     $process = new Process($install_command, NULL);
     $process->setTimeout(60);
     $result = $process->run();
-    $this->assertStringContainsString('Theme source theme bartik is not a valid starter kit.', trim($process->getErrorOutput()));
+    $this->assertStringContainsString('Theme source theme olivero is not a valid starter kit.', trim($process->getErrorOutput()));
     $this->assertSame(1, $result);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php b/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php
index 80f7d4c7b..8c963af1c 100644
--- a/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Common/DiffArrayTest.php
@@ -26,6 +26,9 @@ class DiffArrayTest extends UnitTestCase {
    */
   protected $array2;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php b/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
index 825b74b61..053d30fa6 100644
--- a/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Condition/ConditionAccessResolverTraitTest.php
@@ -34,25 +34,25 @@ public function providerTestResolveConditions() {
     $condition_true = $this->createMock('Drupal\Core\Condition\ConditionInterface');
     $condition_true->expects($this->any())
       ->method('execute')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $condition_false = $this->createMock('Drupal\Core\Condition\ConditionInterface');
     $condition_false->expects($this->any())
       ->method('execute')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $condition_exception = $this->createMock('Drupal\Core\Condition\ConditionInterface');
     $condition_exception->expects($this->any())
       ->method('execute')
       ->will($this->throwException(new ContextException()));
     $condition_exception->expects($this->atLeastOnce())
       ->method('isNegated')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $condition_negated = $this->createMock('Drupal\Core\Condition\ConditionInterface');
     $condition_negated->expects($this->any())
       ->method('execute')
       ->will($this->throwException(new ContextException()));
     $condition_negated->expects($this->atLeastOnce())
       ->method('isNegated')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $conditions = [];
     $data[] = [$conditions, 'and', TRUE];
diff --git a/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php b/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
index 8c1b18dbc..a33c05187 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/CachedStorageTest.php
@@ -29,7 +29,7 @@ public function testListAllStaticCache() {
     $storage->expects($this->once())
       ->method('listAll')
       ->with($prefix)
-      ->will($this->returnValue($response));
+      ->willReturn($response);
 
     $cache = new NullBackend(__FUNCTION__);
 
diff --git a/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php b/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
index d7b6ee5f0..825b0d3a2 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/ConfigTest.php
@@ -54,6 +54,9 @@ class ConfigTest extends UnitTestCase {
    */
   protected $cacheTagsInvalidator;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->storage = $this->createMock('Drupal\Core\Config\StorageInterface');
     $this->eventDispatcher = $this->createMock('Symfony\Contracts\EventDispatcher\EventDispatcherInterface');
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
index ccdd71975..dcb0e2b31 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityBaseUnitTest.php
@@ -15,6 +15,7 @@
 use Drupal\Core\Extension\ThemeHandlerInterface;
 use Drupal\Core\Language\Language;
 use Drupal\Core\Plugin\DefaultLazyPluginCollection;
+use Drupal\Core\Test\TestKernel;
 use Drupal\Tests\Core\Config\Entity\Fixtures\ConfigEntityBaseWithPluginCollections;
 use Drupal\Tests\Core\Plugin\Fixtures\TestConfigurablePlugin;
 use Drupal\Tests\UnitTestCase;
@@ -123,7 +124,7 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Config\Entity\ConfigEntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue($this->provider));
+      ->willReturn($this->provider);
     $this->entityType->expects($this->any())
       ->method('getConfigPrefix')
       ->willReturn('test_provider.' . $this->entityTypeId);
@@ -132,7 +133,7 @@ protected function setUp(): void {
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->uuid = $this->createMock('\Drupal\Component\Uuid\UuidInterface');
 
@@ -140,7 +141,7 @@ protected function setUp(): void {
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with('en')
-      ->will($this->returnValue(new Language(['id' => 'en'])));
+      ->willReturn(new Language(['id' => 'en']));
 
     $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidatorInterface');
 
@@ -190,16 +191,16 @@ public function testPreSaveDuringSync() {
 
     $query->expects($this->any())
       ->method('execute')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $query->expects($this->any())
       ->method('condition')
-      ->will($this->returnValue($query));
+      ->willReturn($query);
     $storage->expects($this->any())
       ->method('getQuery')
-      ->will($this->returnValue($query));
+      ->willReturn($query);
     $storage->expects($this->any())
       ->method('loadUnchanged')
-      ->will($this->returnValue($this->entity));
+      ->willReturn($this->entity);
 
     // Saving an entity will not reset the dependencies array during config
     // synchronization.
@@ -270,13 +271,13 @@ public function testCalculateDependenciesWithPluginCollections($definition, $exp
     $pluginCollection->expects($this->atLeastOnce())
       ->method('get')
       ->with($instance_id)
-      ->will($this->returnValue($instance));
+      ->willReturn($instance);
     $pluginCollection->addInstanceId($instance_id);
 
     // Return the mocked plugin collection.
     $this->entity->expects($this->once())
       ->method('getPluginCollections')
-      ->will($this->returnValue([$pluginCollection]));
+      ->willReturn([$pluginCollection]);
 
     $this->assertEquals($expected_dependencies, $this->entity->calculateDependencies()->getDependencies());
   }
@@ -357,9 +358,8 @@ public function testSleepWithPluginCollections() {
 
     // Also set up a container with the plugin manager so that we can assert
     // that the plugin manager itself is also not serialized.
-    $container = new ContainerBuilder();
-    $container->set('plugin.manager.foo', $plugin_manager);
-    \Drupal::setContainer($container);
+    $container = TestKernel::setContainerWithKernel();
+    $container->set('plugin.manager.foo', $plugin_manager->reveal());
 
     $entity_values = ['the_plugin_collection_config' => [$instance_id => ['foo' => 'original_value']]];
     $entity = new TestConfigEntityWithPluginCollections($entity_values, $this->entityTypeId);
@@ -486,12 +486,12 @@ public function testCreateDuplicate() {
     $this->entityType->expects($this->once())
       ->method('hasKey')
       ->with('uuid')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $new_uuid = '8607ef21-42bc-4913-978f-8c06207b0395';
     $this->uuid->expects($this->once())
       ->method('generate')
-      ->will($this->returnValue($new_uuid));
+      ->willReturn($new_uuid);
 
     $duplicate = $this->entity->createDuplicate();
     $this->assertInstanceOf('\Drupal\Core\Entity\EntityBase', $duplicate);
@@ -511,11 +511,11 @@ public function testSort() {
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue([
+      ->willReturn([
         'entity_keys' => [
           'label' => 'label',
         ],
-      ]));
+      ]);
 
     $entity_a = $this->createMock('\Drupal\Core\Config\Entity\ConfigEntityInterface');
     $entity_a->expects($this->atLeastOnce())
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
index b439b3db9..5ef06373c 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityTypeTest.php
@@ -49,6 +49,8 @@ protected function setUpConfigEntityType($definition) {
   }
 
   /**
+   * Tests when the prefix length exceeds the maximum defined prefix length.
+   *
    * Tests that we get an exception when the length of the config prefix that is
    * returned by getConfigPrefix() exceeds the maximum defined prefix length.
    *
@@ -68,6 +70,8 @@ public function testConfigPrefixLengthExceeds() {
   }
 
   /**
+   * Tests when the prefix length is valid.
+   *
    * Tests that a valid config prefix returned by getConfigPrefix()
    * does not throw an exception and is formatted as expected.
    *
diff --git a/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php
index 03ec70375..0d411f915 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/Entity/EntityDisplayModeBaseUnitTest.php
@@ -56,7 +56,7 @@ protected function setUp(): void {
     $this->entityInfo = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityInfo->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('entity'));
+      ->willReturn('entity');
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
 
@@ -78,7 +78,7 @@ public function testCalculateDependencies() {
     $target_entity_type = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $target_entity_type->expects($this->any())
       ->method('getProvider')
-      ->will($this->returnValue('test_module'));
+      ->willReturn('test_module');
     $values = ['targetEntityType' => $target_entity_type_id];
 
     $this->entityTypeManager->expects($this->exactly(2))
diff --git a/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php b/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php
index b8f92f0bf..25a75d342 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/ImmutableConfigTest.php
@@ -19,6 +19,9 @@ class ImmutableConfigTest extends UnitTestCase {
    */
   protected $config;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
     $storage = $this->createMock('Drupal\Core\Config\StorageInterface');
diff --git a/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php b/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
index d79e7e195..f20d9f89b 100644
--- a/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Config/StorageComparerTest.php
@@ -3,7 +3,9 @@
 namespace Drupal\Tests\Core\Config;
 
 use Drupal\Component\Uuid\Php;
+use Drupal\Core\Config\MemoryStorage;
 use Drupal\Core\Config\StorageComparer;
+use Drupal\Core\Config\StorageInterface;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -36,9 +38,20 @@ class StorageComparerTest extends UnitTestCase {
    */
   protected $configData;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->sourceStorage = $this->createMock('Drupal\Core\Config\StorageInterface');
     $this->targetStorage = $this->createMock('Drupal\Core\Config\StorageInterface');
+
+    $this->sourceStorage->expects($this->atLeastOnce())
+      ->method('getCollectionName')
+      ->will($this->returnValue(StorageInterface::DEFAULT_COLLECTION));
+    $this->targetStorage->expects($this->atLeastOnce())
+      ->method('getCollectionName')
+      ->will($this->returnValue(StorageInterface::DEFAULT_COLLECTION));
+
     $this->storageComparer = new StorageComparer($this->sourceStorage, $this->targetStorage);
   }
 
@@ -98,22 +111,22 @@ public function testCreateChangelistNoChange() {
     $config_files = array_keys($config_data);
     $this->sourceStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue($config_files));
+      ->willReturn($config_files);
     $this->targetStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue($config_files));
+      ->willReturn($config_files);
     $this->sourceStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($config_data));
+      ->willReturn($config_data);
     $this->targetStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($config_data));
+      ->willReturn($config_data);
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->storageComparer->createChangelist();
     $this->assertEmpty($this->storageComparer->getChangelist('create'));
@@ -132,22 +145,22 @@ public function testCreateChangelistCreate() {
 
     $this->sourceStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($source_data)));
+      ->willReturn(array_keys($source_data));
     $this->targetStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($target_data)));
+      ->willReturn(array_keys($target_data));
     $this->sourceStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($source_data));
+      ->willReturn($source_data);
     $this->targetStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($target_data));
+      ->willReturn($target_data);
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->storageComparer->createChangelist();
     $expected = [
@@ -171,22 +184,22 @@ public function testCreateChangelistDelete() {
 
     $this->sourceStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($source_data)));
+      ->willReturn(array_keys($source_data));
     $this->targetStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($target_data)));
+      ->willReturn(array_keys($target_data));
     $this->sourceStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($source_data));
+      ->willReturn($source_data);
     $this->targetStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($target_data));
+      ->willReturn($target_data);
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->storageComparer->createChangelist();
     $expected = [
@@ -210,22 +223,22 @@ public function testCreateChangelistUpdate() {
 
     $this->sourceStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($source_data)));
+      ->willReturn(array_keys($source_data));
     $this->targetStorage->expects($this->once())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($target_data)));
+      ->willReturn(array_keys($target_data));
     $this->sourceStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($source_data));
+      ->willReturn($source_data);
     $this->targetStorage->expects($this->once())
       ->method('readMultiple')
-      ->will($this->returnValue($target_data));
+      ->willReturn($target_data);
     $this->sourceStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->targetStorage->expects($this->once())
       ->method('getAllCollectionNames')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->storageComparer->createChangelist();
     $expected = [
@@ -238,4 +251,56 @@ public function testCreateChangelistUpdate() {
     $this->assertEmpty($this->storageComparer->getChangelist('delete'));
   }
 
+  /**
+   * @covers ::createChangelist
+   */
+  public function testDifferentCollections() {
+    $source = new MemoryStorage();
+    $target = new MemoryStorage();
+
+    $this->generateRandomData($source, 's');
+    $this->generateRandomData($target, 't');
+
+    // Use random collections for source and target.
+    $collections = $source->getAllCollectionNames();
+    $source = $source->createCollection($collections[array_rand($collections)]);
+    $collections = $target->getAllCollectionNames();
+    $target = $target->createCollection($collections[array_rand($collections)]);
+
+    $comparer = new StorageComparer($source, $target);
+    $comparer->createChangelist();
+
+    foreach (array_merge([StorageInterface::DEFAULT_COLLECTION], $source->getAllCollectionNames(), $target->getAllCollectionNames()) as $collection) {
+      $expected = [
+        'create' => $source->createCollection($collection)->listAll(),
+        'update' => [],
+        'delete' => $target->createCollection($collection)->listAll(),
+        'rename' => [],
+      ];
+
+      $this->assertEqualsCanonicalizing($expected, $comparer->getChangelist(NULL, $collection));
+    }
+  }
+
+  /**
+   * Generate random data in a config storage.
+   *
+   * @param \Drupal\Core\Config\StorageInterface $storage
+   *   The storage to populate with random data.
+   * @param string $prefix
+   *   The prefix for random names to make sure they are unique.
+   */
+  protected function generateRandomData(StorageInterface $storage, string $prefix = '') {
+    $generator = $this->getRandomGenerator();
+    for ($i = 0; $i < rand(2, 10); $i++) {
+      $storage->write($prefix . $this->randomMachineName(), (array) $generator->object());
+    }
+    for ($i = 0; $i < rand(1, 5); $i++) {
+      $collection = $storage->createCollection($prefix . $this->randomMachineName());
+      for ($i = 0; $i < rand(2, 10); $i++) {
+        $collection->write($prefix . $this->randomMachineName(), (array) $generator->object());
+      }
+    }
+  }
+
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php b/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
index 2e156c45d..89c22fa21 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/ControllerBaseTest.php
@@ -18,6 +18,9 @@ class ControllerBaseTest extends UnitTestCase {
    */
   protected $controllerBase;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->controllerBase = $this->getMockForAbstractClass('Drupal\Core\Controller\ControllerBase');
   }
@@ -39,7 +42,7 @@ public function testGetConfig() {
     $container->expects($this->once())
       ->method('get')
       ->with('config.factory')
-      ->will($this->returnValue($config_factory));
+      ->willReturn($config_factory);
     \Drupal::setContainer($container);
 
     $config_method = new \ReflectionMethod('Drupal\Core\Controller\ControllerBase', 'config');
diff --git a/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php b/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
index 3c26a0565..c1c4c364b 100644
--- a/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Controller/TitleResolverTest.php
@@ -48,6 +48,9 @@ class TitleResolverTest extends UnitTestCase {
    */
   protected $titleResolver;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->controllerResolver = $this->createMock('\Drupal\Core\Controller\ControllerResolverInterface');
     $this->translationManager = $this->createMock('\Drupal\Core\StringTranslation\TranslationInterface');
@@ -67,6 +70,17 @@ public function testStaticTitle() {
     $this->assertEquals(new TranslatableMarkup('static title', [], [], $this->translationManager), $this->titleResolver->getTitle($request, $route));
   }
 
+  /**
+   * Tests a static title of '0'.
+   *
+   * @see \Drupal\Core\Controller\TitleResolver::getTitle()
+   */
+  public function testStaticTitleZero() {
+    $request = new Request();
+    $route = new Route('/test-route', ['_title' => '0', '_title_context' => '0']);
+    $this->assertEquals(new TranslatableMarkup('0', [], ['context' => '0'], $this->translationManager), $this->titleResolver->getTitle($request, $route));
+  }
+
   /**
    * Tests a static title with a context.
    *
@@ -103,21 +117,24 @@ public function providerTestStaticTitleWithParameter() {
   }
 
   /**
-   * Tests a static title with a NULL value parameter.
+   * Tests a static title with a non-scalar value parameter.
    *
    * @see \Drupal\Core\Controller\TitleResolver::getTitle()
    */
-  public function testStaticTitleWithNullValueParameter() {
-    $raw_variables = new ParameterBag(['test' => NULL, 'test2' => 'value']);
+  public function testStaticTitleWithNullAndArrayValueParameter() {
+    $raw_variables = new ParameterBag(['test1' => NULL, 'test2' => ['foo' => 'bar'], 'test3' => 'value']);
     $request = new Request();
     $request->attributes->set('_raw_variables', $raw_variables);
 
-    $route = new Route('/test-route', ['_title' => 'static title %test @test']);
+    $route = new Route('/test-route', ['_title' => 'static title %test1 @test1 %test2 @test2 %test3 @test3']);
     $translatable_markup = $this->titleResolver->getTitle($request, $route);
-    $this->assertSame('', $translatable_markup->getArguments()['@test']);
-    $this->assertSame('', $translatable_markup->getArguments()['%test']);
-    $this->assertSame('value', $translatable_markup->getArguments()['@test2']);
-    $this->assertSame('value', $translatable_markup->getArguments()['%test2']);
+    $arguments = $translatable_markup->getArguments();
+    $this->assertNotContains('@test1', $arguments);
+    $this->assertNotContains('%test1', $arguments);
+    $this->assertNotContains('@test2', $arguments);
+    $this->assertNotContains('%test2', $arguments);
+    $this->assertSame('value', $translatable_markup->getArguments()['@test3']);
+    $this->assertSame('value', $translatable_markup->getArguments()['%test3']);
   }
 
   /**
@@ -133,11 +150,11 @@ public function testDynamicTitle() {
     $this->controllerResolver->expects($this->once())
       ->method('getControllerFromDefinition')
       ->with('Drupal\Tests\Core\Controller\TitleCallback::example')
-      ->will($this->returnValue($callable));
+      ->willReturn($callable);
     $this->argumentResolver->expects($this->once())
       ->method('getArguments')
       ->with($request, $callable)
-      ->will($this->returnValue(['example']));
+      ->willReturn(['example']);
 
     $this->assertEquals('test example', $this->titleResolver->getTitle($request, $route));
   }
diff --git a/web/core/tests/Drupal/Tests/Core/CronTest.php b/web/core/tests/Drupal/Tests/Core/CronTest.php
index 835eb74fa..52c2d09a7 100644
--- a/web/core/tests/Drupal/Tests/Core/CronTest.php
+++ b/web/core/tests/Drupal/Tests/Core/CronTest.php
@@ -2,6 +2,8 @@
 
 namespace Drupal\Tests\Core;
 
+use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Config\ImmutableConfig;
 use Drupal\Core\Cron;
 use Drupal\Core\KeyValueStore\KeyValueMemoryFactory;
 use Drupal\Core\Queue\DelayedRequeueException;
@@ -64,14 +66,8 @@ protected function setUp(): void {
 
     // Create a mock logger to set a flag in the resulting state.
     $logger = $this->prophesize('Drupal\Core\Logger\LoggerChannelInterface');
-    // Safely ignore the cron re-run message when failing to acquire a lock.
-    //
-    // We don't need to run regular cron tasks, and we're still implicitly
-    // testing that queues are being processed.
-    //
-    // This argument will need to be updated to match the message text in
-    // Drupal\Core\Cron::run() should the original text ever be updated.
-    $logger->warning(Argument::exact('Attempting to re-run cron while it is already running.'))->shouldBeCalled();
+    // Safely ignore the cron success message.
+    $logger->info('Cron run completed.')->shouldBeCalled();
     // Set a flag to track when a message is logged by adding a callback
     // function for each logging method.
     foreach (get_class_methods(LoggerInterface::class) as $logger_method) {
@@ -87,11 +83,18 @@ protected function setUp(): void {
     // Create a mock time service.
     $time = $this->prophesize('Drupal\Component\Datetime\TimeInterface');
 
+    // Create a mock config factory and config object.
+    $config_factory = $this->prophesize(ConfigFactoryInterface::class);
+    $config = $this->prophesize(ImmutableConfig::class);
+    $config->get('logging')->willReturn(FALSE);
+    $config_factory->get('system.cron')->willReturn($config->reveal());
+
     // Build the container using the resulting mock objects.
     \Drupal::setContainer(new ContainerBuilder());
     \Drupal::getContainer()->set('logger.factory', $logger_factory->reveal());
     \Drupal::getContainer()->set('datetime.time', $time->reveal());
     \Drupal::getContainer()->set('state', $this->state);
+    \Drupal::getContainer()->set('config.factory', $config_factory->reveal());
 
     // Create mock objects for constructing the Cron class.
     $module_handler = $this->prophesize('Drupal\Core\Extension\ModuleHandlerInterface');
@@ -99,11 +102,9 @@ protected function setUp(): void {
     $queue_worker_manager = $this->prophesize('Drupal\Core\Queue\QueueWorkerManagerInterface');
     $state = $this->prophesize('Drupal\Core\State\StateInterface');
     $account_switcher = $this->prophesize('Drupal\Core\Session\AccountSwitcherInterface');
-
-    // Create a lock that will always fail when attempting to acquire; we're
-    // only interested in testing ::processQueues(), not the other stuff.
     $lock_backend = $this->prophesize('Drupal\Core\Lock\LockBackendInterface');
-    $lock_backend->acquire(Argument::exact('cron'), Argument::cetera())->willReturn(FALSE);
+    $lock_backend->acquire('cron', Argument::cetera())->willReturn(TRUE);
+    $lock_backend->release('cron')->shouldBeCalled();
 
     // Create a queue worker definition for testing purposes.
     $queue_worker = $this->randomMachineName();
diff --git a/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php b/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php
index 1eb469399..bf61c2467 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/DatabaseTest.php
@@ -4,7 +4,6 @@
 
 use Composer\Autoload\ClassLoader;
 use Drupal\Core\Database\Database;
-use Drupal\Core\Site\Settings;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -57,10 +56,8 @@ protected function setUp(): void {
    * @covers ::findDriverAutoloadDirectory
    * @dataProvider providerFindDriverAutoloadDirectory
    */
-  public function testFindDriverAutoloadDirectory($expected, $namespace) {
-    new Settings(['extension_discovery_scan_tests' => TRUE]);
-    // The only module that provides a driver in core is a test module.
-    $this->assertSame($expected, Database::findDriverAutoloadDirectory($namespace, $this->root));
+  public function testFindDriverAutoloadDirectory($expected, $namespace, $include_test_drivers) {
+    $this->assertSame($expected, Database::findDriverAutoloadDirectory($namespace, $this->root, $include_test_drivers));
   }
 
   /**
@@ -70,9 +67,9 @@ public function testFindDriverAutoloadDirectory($expected, $namespace) {
    */
   public function providerFindDriverAutoloadDirectory() {
     return [
-      'core mysql' => ['core/modules/mysql/src/Driver/Database/mysql/', 'Drupal\mysql\Driver\Database\mysql'],
-      'D8 custom fake' => [FALSE, 'Drupal\Driver\Database\corefake'],
-      'module mysql' => ['core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/', 'Drupal\driver_test\Driver\Database\DrivertestMysql'],
+      'core mysql' => ['core/modules/mysql/src/Driver/Database/mysql/', 'Drupal\mysql\Driver\Database\mysql', FALSE],
+      'D8 custom fake' => [FALSE, 'Drupal\Driver\Database\corefake', TRUE],
+      'module mysql' => ['core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/', 'Drupal\driver_test\Driver\Database\DrivertestMysql', TRUE],
     ];
   }
 
@@ -81,10 +78,9 @@ public function providerFindDriverAutoloadDirectory() {
    * @dataProvider providerFindDriverAutoloadDirectoryException
    */
   public function testFindDriverAutoloadDirectoryException($expected_message, $namespace, $include_tests) {
-    new Settings(['extension_discovery_scan_tests' => $include_tests]);
     $this->expectException(\RuntimeException::class);
     $this->expectExceptionMessage($expected_message);
-    Database::findDriverAutoloadDirectory($namespace, $this->root);
+    Database::findDriverAutoloadDirectory($namespace, $this->root, $include_tests);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Database/RowCountExceptionTest.php b/web/core/tests/Drupal/Tests/Core/Database/RowCountExceptionTest.php
index 593054d19..1026ab70d 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/RowCountExceptionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/RowCountExceptionTest.php
@@ -15,7 +15,7 @@ class RowCountExceptionTest extends UnitTestCase {
   /**
    * The default exception message.
    */
-  private const DEFAULT_EXCEPTION_MESSAGE = "rowCount() is supported for DELETE, INSERT, or UPDATE statements performed with structured query builders only, since they would not be portable across database engines otherwise. If the query builders are not sufficient, use a prepareStatement() with an \$allow_row_count argument set to TRUE, execute() the Statement and get the number of affected rows via rowCount().";
+  private const DEFAULT_EXCEPTION_MESSAGE = "rowCount() is supported for DELETE, INSERT, or UPDATE statements performed with structured query builders only, since they would not be portable across database engines otherwise. If the query builders are not sufficient, use a prepareStatement() with an \$allow_row_count argument set to TRUE, execute() the Statement and get the number of matched rows via rowCount().";
 
   /**
    * Data provider for ::testExceptionMessage()
diff --git a/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php b/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
index 1f0737579..47be399e4 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/Stub/StubConnection.php
@@ -52,6 +52,13 @@ public function __construct(\PDO $connection, array $connection_options, $identi
     parent::__construct($connection, $connection_options);
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function open(array &$connection_options = []) {
+    return new \stdClass();
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php b/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
index fb1c9dde8..091449fd5 100644
--- a/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Database/UrlConversionTest.php
@@ -3,7 +3,6 @@
 namespace Drupal\Tests\Core\Database;
 
 use Drupal\Core\Database\Database;
-use Drupal\Core\Site\Settings;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -39,8 +38,6 @@ protected function setUp(): void {
       ->with('site.path')
       ->willReturn('');
     \Drupal::setContainer($container);
-
-    new Settings(['extension_discovery_scan_tests' => TRUE]);
   }
 
   /**
@@ -48,8 +45,8 @@ protected function setUp(): void {
    *
    * @dataProvider providerConvertDbUrlToConnectionInfo
    */
-  public function testDbUrlToConnectionConversion($url, $database_array) {
-    $result = Database::convertDbUrlToConnectionInfo($url, $this->root);
+  public function testDbUrlToConnectionConversion($url, $database_array, $include_test_drivers) {
+    $result = Database::convertDbUrlToConnectionInfo($url, $this->root, $include_test_drivers);
     $this->assertEquals($database_array, $result);
   }
 
@@ -76,6 +73,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\mysql\Driver\Database\mysql',
           'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/',
         ],
+        FALSE,
       ],
       'SQLite, relative to root, without prefix' => [
         'sqlite://localhost/test_database',
@@ -86,6 +84,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\sqlite\Driver\Database\sqlite',
           'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/',
         ],
+        FALSE,
       ],
       'MySql with prefix' => [
         'mysql://test_user:test_pass@test_host:3306/test_database#bar',
@@ -100,6 +99,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\mysql\Driver\Database\mysql',
           'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/',
         ],
+        FALSE,
       ],
       'SQLite, relative to root, with prefix' => [
         'sqlite://localhost/test_database#foo',
@@ -111,6 +111,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\sqlite\Driver\Database\sqlite',
           'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/',
         ],
+        FALSE,
       ],
       'SQLite, absolute path, without prefix' => [
         'sqlite://localhost//baz/test_database',
@@ -121,6 +122,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\sqlite\Driver\Database\sqlite',
           'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/',
         ],
+        FALSE,
       ],
       'MySQL contrib test driver without prefix' => [
         'DrivertestMysql://test_user:test_pass@test_host:3306/test_database?module=driver_test',
@@ -134,6 +136,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestMysql',
           'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/',
         ],
+        TRUE,
       ],
       'MySQL contrib test driver with prefix' => [
         'DrivertestMysql://test_user:test_pass@test_host:3306/test_database?module=driver_test#bar',
@@ -148,6 +151,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestMysql',
           'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestMysql/',
         ],
+        TRUE,
       ],
       'PostgreSQL contrib test driver without prefix' => [
         'DrivertestPgsql://test_user:test_pass@test_host:5432/test_database?module=driver_test',
@@ -161,6 +165,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestPgsql',
           'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/',
         ],
+        TRUE,
       ],
       'PostgreSQL contrib test driver with prefix' => [
         'DrivertestPgsql://test_user:test_pass@test_host:5432/test_database?module=driver_test#bar',
@@ -175,6 +180,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\driver_test\Driver\Database\DrivertestPgsql',
           'autoload' => 'core/modules/system/tests/modules/driver_test/src/Driver/Database/DrivertestPgsql/',
         ],
+        TRUE,
       ],
       'MySql with a custom query parameter' => [
         'mysql://test_user:test_pass@test_host:3306/test_database?extra=value',
@@ -188,6 +194,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\mysql\Driver\Database\mysql',
           'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/',
         ],
+        FALSE,
       ],
       'MySql with the module name mysql' => [
         'mysql://test_user:test_pass@test_host:3306/test_database?module=mysql',
@@ -201,6 +208,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\mysql\Driver\Database\mysql',
           'autoload' => 'core/modules/mysql/src/Driver/Database/mysql/',
         ],
+        FALSE,
       ],
       'PostgreSql without the module name set' => [
         'pgsql://test_user:test_pass@test_host/test_database',
@@ -213,6 +221,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\pgsql\Driver\Database\pgsql',
           'autoload' => 'core/modules/pgsql/src/Driver/Database/pgsql/',
         ],
+        FALSE,
       ],
       'PostgreSql with the module name pgsql' => [
         'pgsql://test_user:test_pass@test_host/test_database?module=pgsql',
@@ -225,6 +234,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\pgsql\Driver\Database\pgsql',
           'autoload' => 'core/modules/pgsql/src/Driver/Database/pgsql/',
         ],
+        FALSE,
       ],
       'SQLite, relative to root, without prefix and with the module name sqlite' => [
         'sqlite://localhost/test_database?module=sqlite',
@@ -235,6 +245,7 @@ public function providerConvertDbUrlToConnectionInfo() {
           'namespace' => 'Drupal\sqlite\Driver\Database\sqlite',
           'autoload' => 'core/modules/sqlite/src/Driver/Database/sqlite/',
         ],
+        FALSE,
       ],
     ];
   }
@@ -255,7 +266,7 @@ public function testGetInvalidArgumentExceptionInUrlConversion($url, $root, $exp
    *
    * @return array
    *   Array of arrays with the following elements:
-   *   - An invalid Url string.
+   *   - An invalid URL string.
    *   - Drupal root string.
    *   - The expected exception message.
    */
@@ -439,7 +450,7 @@ public function testDriverModuleDoesNotExist() {
     $url = 'mysql://test_user:test_pass@test_host:3306/test_database?module=does_not_exist';
     $this->expectException(\RuntimeException::class);
     $this->expectExceptionMessage("Cannot find the module 'does_not_exist' for the database driver namespace 'Drupal\does_not_exist\Driver\Database\mysql'");
-    Database::convertDbUrlToConnectionInfo($url, $this->root);
+    Database::convertDbUrlToConnectionInfo($url, $this->root, TRUE);
   }
 
   /**
@@ -449,7 +460,7 @@ public function testModuleDriverDoesNotExist() {
     $url = 'mysql://test_user:test_pass@test_host:3306/test_database?module=driver_test';
     $this->expectException(\RuntimeException::class);
     $this->expectExceptionMessage("Cannot find the database driver namespace 'Drupal\driver_test\Driver\Database\mysql' in module 'driver_test'");
-    Database::convertDbUrlToConnectionInfo($url, $this->root);
+    Database::convertDbUrlToConnectionInfo($url, $this->root, TRUE);
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php b/web/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php
index fde641bd4..9c1bd69b0 100644
--- a/web/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Datetime/DateHelperTest.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Datetime\DateHelper;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Language\Language;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -12,6 +13,36 @@
  */
 class DateHelperTest extends UnitTestCase {
 
+  /**
+   * The language manager.
+   *
+   * @var \Drupal\Core\Language\LanguageManagerInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $languageManager;
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    $container = new ContainerBuilder();
+    $config = ['system.date' => ['first_day' => 'Sunday']];
+    $container->set('config.factory', $this->getConfigFactoryStub($config));
+
+    $this->languageManager = $this->createMock('\Drupal\Core\Language\LanguageManagerInterface');
+    $language = new Language(['langcode' => 'en']);
+    $this->languageManager->expects($this->any())
+      ->method('getDefaultLanguage')
+      ->will($this->returnValue($language));
+    $this->languageManager->expects($this->any())
+      ->method('getCurrentLanguage')
+      ->will($this->returnValue($language));
+    $container->set('language_manager', $this->languageManager);
+
+    \Drupal::setContainer($container);
+  }
+
   /**
    * @covers ::weekDaysOrdered
    * @dataProvider providerTestWeekDaysOrdered
@@ -128,4 +159,103 @@ public function providerTestWeekDaysOrdered() {
     return $data;
   }
 
+  /**
+   * @covers ::daysInMonth
+   */
+  public function testDaysInMonth() {
+    // @todo Consider deprecating passing NULL in
+    //   https://www.drupal.org/project/drupal/issues/3299788
+    // Passing NULL, FALSE, or an empty string should default to now. Just
+    // check these are NOT null to avoid copying the implementation here.
+    $this->assertNotNull(DateHelper::daysInMonth());
+    $this->assertNotNull(DateHelper::daysInMonth(FALSE));
+    $this->assertNotNull(DateHelper::daysInMonth(''));
+
+    // Pass nothing and expect to get NULL.
+    $this->assertNull(DateHelper::daysInMonth(0));
+    $this->assertNull(DateHelper::daysInMonth('0'));
+
+    $value = '2022-12-31 00:00:00';
+    $dateString = DateHelper::daysInMonth($value);
+    $this->assertEquals('31', $dateString);
+
+    $value = '2020-11-30 00:00:00';
+    $dateString = DateHelper::daysInMonth($value);
+    $this->assertEquals('30', $dateString);
+  }
+
+  /**
+   * @covers ::daysInYear
+   */
+  public function testDaysInYear() {
+    // Passing NULL, FALSE, or an empty string should default to now. Just
+    // check these are NOT null to avoid copying the implementation here.
+    $this->assertNotNull(DateHelper::daysInYear());
+    $this->assertNotNull(DateHelper::daysInYear(FALSE));
+    $this->assertNotNull(DateHelper::daysInYear(''));
+
+    // Pass nothing and expect to get NULL.
+    $this->assertNull(DateHelper::daysInYear(0));
+    $this->assertNull(DateHelper::daysInYear('0'));
+
+    $value = '2022-12-31 00:00:00';
+    $dateString = DateHelper::daysInYear($value);
+    $this->assertEquals('365', $dateString);
+
+    // 2020 is a leap year.
+    $value = '2020-11-30 00:00:00';
+    $dateString = DateHelper::daysInYear($value);
+    $this->assertEquals('366', $dateString);
+  }
+
+  /**
+   * @covers ::dayOfWeek
+   */
+  public function testDayOfWeek() {
+    // Passing NULL, FALSE, or an empty string should default to now. Just
+    // check these are NOT null to avoid copying the implementation here.
+    $this->assertNotNull(DateHelper::dayOfWeek());
+    $this->assertNotNull(DateHelper::dayOfWeek(FALSE));
+    $this->assertNotNull(DateHelper::dayOfWeek(''));
+
+    // Pass nothing and expect to get NULL.
+    $this->assertNull(DateHelper::dayOfWeek(0));
+    $this->assertNull(DateHelper::dayOfWeek('0'));
+
+    // December 31st 2022 is a Saturday.
+    $value = '2022-12-31 00:00:00';
+    $dateString = DateHelper::dayOfWeek($value);
+    $this->assertEquals('6', $dateString);
+
+    // November 30th 2020 is a Monday.
+    $value = '2020-11-30 00:00:00';
+    $dateString = DateHelper::dayOfWeek($value);
+    $this->assertEquals('1', $dateString);
+  }
+
+  /**
+   * @covers ::dayOfWeekName
+   */
+  public function testDayOfWeekName() {
+    // Passing NULL, FALSE, or an empty string should default to now. Just
+    // check these are NOT null to avoid copying the implementation here.
+    $this->assertNotNull(DateHelper::dayOfWeekName());
+    $this->assertNotNull(DateHelper::dayOfWeekName(FALSE));
+    $this->assertNotNull(DateHelper::dayOfWeekName(''));
+
+    // Pass nothing and expect to get NULL.
+    $this->assertNull(DateHelper::dayOfWeekName(0));
+    $this->assertNull(DateHelper::dayOfWeekName('0'));
+
+    // December 31st 2022 is a Saturday.
+    $value = '2022-12-31 00:00:00';
+    $dateString = DateHelper::dayOfWeekName($value);
+    $this->assertEquals('Sat', $dateString);
+
+    // November 30th 2020 is a Monday.
+    $value = '2020-11-30 00:00:00';
+    $dateString = DateHelper::dayOfWeekName($value);
+    $this->assertEquals('Mon', $dateString);
+  }
+
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php b/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
index 561f2b0d0..9668ff465 100644
--- a/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Datetime/DateTest.php
@@ -58,6 +58,9 @@ class DateTest extends UnitTestCase {
    */
   protected $dateFormatterStub;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -416,11 +419,11 @@ public function testFormattedDateDiff() {
   }
 
   /**
-   * Creates a UNIX timestamp given a date and time string in the format
-   * year-month-day hour:minute:seconds (e.g. 2013-12-11 10:09:08).
+   * Creates a UNIX timestamp given a date and time string.
    *
    * @param string $dateTimeString
-   *   The formatted date and time string.
+   *   The formatted date and time string. The format is year-month-day
+   *   hour:minute:seconds (e.g. 2013-12-11 10:09:08).
    *
    * @return int
    *   The UNIX timestamp.
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
index 680d124e9..85d20ed28 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Compiler/TaggedHandlersPassTest.php
@@ -324,9 +324,9 @@ public function testProcessWithExtraArguments() {
     $container
       ->register('handler1', __NAMESPACE__ . '\ValidHandler')
       ->addTag('consumer_id', [
-          'extra1' => 'extra1',
-          'extra2' => 'extra2',
-        ]);
+        'extra1' => 'extra1',
+        'extra2' => 'extra2',
+      ]);
 
     $handler_pass = new TaggedHandlersPass();
     $handler_pass->process($container);
@@ -401,8 +401,7 @@ public function testProcessWithIdAndExtraArguments() {
   }
 
   /**
-   * Tests consumer method with priority and extra parameters in different
-   * order.
+   * Tests consumer method with varying order of priority and extra parameters.
    *
    * @covers ::process
    */
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
index f8b82e2fb..74ed8ec31 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerBuilderTest.php
@@ -24,27 +24,6 @@ public function testGet() {
     $this->assertInstanceOf(BarClass::class, $result);
   }
 
-  /**
-   * @covers ::set
-   */
-  public function testSet() {
-    $container = new ContainerBuilder();
-    $class = new BarClass();
-    $container->set('bar', $class);
-    $this->assertEquals('bar', $class->_serviceId);
-  }
-
-  /**
-   * @covers ::set
-   */
-  public function testSetException() {
-    $container = new ContainerBuilder();
-    $class = new BarClass();
-    $this->expectException(\InvalidArgumentException::class);
-    $this->expectExceptionMessage('Service ID names must be lowercase: Bar');
-    $container->set('Bar', $class);
-  }
-
   /**
    * @covers ::setParameter
    */
@@ -55,16 +34,6 @@ public function testSetParameterException() {
     $container->setParameter('Buzz', 'buzz');
   }
 
-  /**
-   * @covers ::register
-   */
-  public function testRegisterException() {
-    $container = new ContainerBuilder();
-    $this->expectException(\InvalidArgumentException::class);
-    $this->expectExceptionMessage('Service ID names must be lowercase: Bar');
-    $container->register('Bar');
-  }
-
   /**
    * @covers ::register
    */
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
index df86cddc0..2d7bd078b 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/ContainerTest.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\DependencyInjection\Container;
 use Drupal\Tests\UnitTestCase;
-use Drupal\Tests\Core\DependencyInjection\Fixture\BarClass;
 
 /**
  * @coversDefaultClass \Drupal\Core\DependencyInjection\Container
@@ -21,15 +20,4 @@ public function testSerialize() {
     serialize($container);
   }
 
-  /**
-   * @covers ::set
-   */
-  public function testSet() {
-    $container = new Container();
-    $class = new BarClass();
-    $container->set('bar', $class);
-    // Ensure that _serviceId is set on the object.
-    $this->assertEquals('bar', $class->_serviceId);
-  }
-
 }
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
index 6c2446e8f..ca80fb128 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
@@ -7,8 +7,10 @@
 
 namespace Drupal\Tests\Core\DependencyInjection;
 
-use Drupal\Core\DependencyInjection\Container;
+use Drupal\Component\DependencyInjection\ReverseContainer;
+use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\DependencyInjection\DependencySerializationTrait;
+use Drupal\Core\Test\TestKernel;
 use Drupal\Tests\UnitTestCase;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -26,11 +28,9 @@ class DependencySerializationTest extends UnitTestCase {
   public function testSerialization() {
     // Create a pseudo service and dependency injected object.
     $service = new \stdClass();
-    $service->_serviceId = 'test_service';
-    $container = new Container();
+    $container = TestKernel::setContainerWithKernel();
     $container->set('test_service', $service);
-    $container->set('service_container', $container);
-    \Drupal::setContainer($container);
+    $this->assertSame($container, $container->get('service_container'));
 
     $dependencySerialization = new DependencySerializationTestDummy($service);
     $dependencySerialization->setContainer($container);
@@ -39,6 +39,7 @@ public function testSerialization() {
     /** @var \Drupal\Tests\Core\DependencyInjection\DependencySerializationTestDummy $dependencySerialization */
     $dependencySerialization = unserialize($string);
 
+    $this->assertTrue($container->has(ReverseContainer::class));
     $this->assertSame($service, $dependencySerialization->service);
     $this->assertSame($container, $dependencySerialization->container);
     $this->assertEmpty($dependencySerialization->getServiceIds());
@@ -48,14 +49,13 @@ public function testSerialization() {
    * @covers ::__sleep
    * @covers ::__wakeup
    */
-  public function testSerializationWithMissingService() {
+  public function testSerializationWithoutReverseContainer() {
+    $container = new ContainerBuilder();
+    \Drupal::setContainer($container);
     // Create a pseudo service and dependency injected object.
     $service = new \stdClass();
-    $service->_serviceId = 'test_service_not_existing';
-    $container = new Container();
     $container->set('test_service', $service);
-    $container->set('service_container', $container);
-    \Drupal::setContainer($container);
+    $this->assertSame($container, $container->get('service_container'));
 
     $dependencySerialization = new DependencySerializationTestDummy($service);
     $dependencySerialization->setContainer($container);
@@ -64,6 +64,8 @@ public function testSerializationWithMissingService() {
     /** @var \Drupal\Tests\Core\DependencyInjection\DependencySerializationTestDummy $dependencySerialization */
     $dependencySerialization = unserialize($string);
 
+    $this->assertFalse($container->has(ReverseContainer::class));
+    $this->assertSame($service, $dependencySerialization->service);
     $this->assertSame($container, $dependencySerialization->container);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
index 35c236b2d..4fc0a6487 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/BarClass.php
@@ -13,7 +13,7 @@ class BarClass {
   /**
    * Storage for a protected BazClass object.
    *
-   * @var Drupal\Tests\Core\DependencyInjection\Fixture\BazClass
+   * @var \Drupal\Tests\Core\DependencyInjection\Fixture\BazClass
    */
   protected $baz;
 
diff --git a/web/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php b/web/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php
index 52728239e..7354d304c 100644
--- a/web/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DependencyInjection/YamlFileLoaderTest.php
@@ -58,4 +58,118 @@ class: \Drupal\Core\ExampleClass
     $this->assertSame('Drupal\Core\ExampleClass', $builder->getDefinition('Drupal\Core\ExampleClass')->getClass());
   }
 
+  /**
+   * @dataProvider providerTestExceptions
+   */
+  public function testExceptions($yml, $message) {
+    vfsStream::setup('drupal', NULL, [
+      'modules' => [
+        'example' => [
+          'example.yml' => $yml,
+        ],
+      ],
+    ]);
+
+    $builder = new ContainerBuilder();
+    $yaml_file_loader = new YamlFileLoader($builder);
+
+    $this->expectException(\InvalidArgumentException::class);
+    $this->expectExceptionMessage($message);
+    $yaml_file_loader->load('vfs://drupal/modules/example/example.yml');
+  }
+
+  public function providerTestExceptions() {
+    return [
+      '_defaults must be an array' => [<<<YAML
+services:
+  _defaults: string
+YAML,
+        'Service "_defaults" key must be an array, "string" given in "vfs://drupal/modules/example/example.yml".',
+      ],
+      'invalid _defaults key' => [<<<YAML
+services:
+  _defaults:
+    invalid: string
+YAML,
+        'The configuration key "invalid" cannot be used to define a default value in "vfs://drupal/modules/example/example.yml". Allowed keys are "public", "tags", "autowire".',
+      ],
+      'default tags must be an array' => [<<<YAML
+services:
+  _defaults:
+    tags: string
+YAML,
+        'Parameter "tags" in "_defaults" must be an array in "vfs://drupal/modules/example/example.yml". Check your YAML syntax.',
+      ],
+      'default tags must have a name' => [<<<YAML
+services:
+  _defaults:
+    tags:
+      - {}
+YAML,
+        'A "tags" entry in "_defaults" is missing a "name" key in "vfs://drupal/modules/example/example.yml".',
+      ],
+      'default tag name must not be empty' => [<<<YAML
+services:
+  _defaults:
+    tags:
+      - ''
+YAML,
+        'The tag name in "_defaults" must be a non-empty string in "vfs://drupal/modules/example/example.yml".',
+      ],
+      'default tag name must be a string' => [<<<YAML
+services:
+  _defaults:
+    tags:
+      - 123
+YAML,
+        'The tag name in "_defaults" must be a non-empty string in "vfs://drupal/modules/example/example.yml".',
+      ],
+      'default tag attribute must be scalar' => [<<<YAML
+services:
+  _defaults:
+    tags:
+      - { name: tag, value: [] }
+YAML,
+        'Tag "tag", attribute "value" in "_defaults" must be of a scalar-type in "vfs://drupal/modules/example/example.yml". Check your YAML syntax.',
+      ],
+      'tags must be an array' => [<<<YAML
+services:
+  service:
+    tags: string
+YAML,
+        'Parameter "tags" must be an array for service "service" in "vfs://drupal/modules/example/example.yml". Check your YAML syntax.',
+      ],
+      'tags must have a name' => [<<<YAML
+services:
+  service:
+    tags:
+      - {}
+YAML,
+        'A "tags" entry is missing a "name" key for service "service" in "vfs://drupal/modules/example/example.yml".',
+      ],
+      'tag name must not be empty' => [<<<YAML
+services:
+  service:
+    tags:
+      - ''
+YAML,
+        'The tag name for service "service" in "vfs://drupal/modules/example/example.yml" must be a non-empty string.',
+      ],
+      'tag attribute must be scalar' => [<<<YAML
+services:
+  service:
+    tags:
+      - { name: tag, value: [] }
+YAML,
+        'A "tags" attribute must be of a scalar-type for service "service", tag "tag", attribute "value" in "vfs://drupal/modules/example/example.yml". Check your YAML syntax.',
+      ],
+      'service must be array or @service' => [<<<YAML
+services:
+  service: string
+YAML,
+        'A service definition must be an array or a string starting with "@" but string found for service "service" in vfs://drupal/modules/example/example.yml. Check your YAML syntax.',
+      ],
+    ];
+  }
+
 }
diff --git a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
index ac30f40b6..16b5b0d47 100644
--- a/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DrupalKernel/DrupalKernelTest.php
@@ -3,6 +3,8 @@
 namespace Drupal\Tests\Core\DrupalKernel;
 
 use Drupal\Core\DrupalKernel;
+use Drupal\Core\Test\TestKernel;
+use Drupal\Tests\Core\DependencyInjection\Fixture\BarClass;
 use Drupal\Tests\UnitTestCase;
 use org\bovigo\vfs\vfsStream;
 use Symfony\Component\HttpFoundation\Request;
@@ -136,6 +138,19 @@ public function testFindSitePath() {
     $this->assertEquals('sites/example', DrupalKernel::findSitePath($request, FALSE, $vfs_root->url('drupal_root')));
   }
 
+  /**
+   * @covers ::getServiceIdMapping
+   * @group legacy
+   */
+  public function testGetServiceIdMapping() {
+    $this->expectDeprecation("Drupal\Core\DrupalKernel::getServiceIdMapping() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942");
+    $this->expectDeprecation("Drupal\Core\DrupalKernel::collectServiceIdMapping() is deprecated in drupal:9.5.1 and is removed from drupal:11.0.0. Use the 'Drupal\Component\DependencyInjection\ReverseContainer' service instead. See https://www.drupal.org/node/3327942");
+    $service = new BarClass();
+    $container = TestKernel::setContainerWithKernel();
+    $container->set('bar', $service);
+    $this->assertEquals($container->get('kernel')->getServiceIdMapping()[$container->generateServiceIdHash($service)], 'bar');
+  }
+
 }
 
 /**
diff --git a/web/core/tests/Drupal/Tests/Core/DrupalTest.php b/web/core/tests/Drupal/Tests/Core/DrupalTest.php
index 4c2b8f2ad..560bd85d1 100644
--- a/web/core/tests/Drupal/Tests/Core/DrupalTest.php
+++ b/web/core/tests/Drupal/Tests/Core/DrupalTest.php
@@ -140,7 +140,7 @@ public function testKeyValueExpirable() {
     $keyvalue->expects($this->once())
       ->method('get')
       ->with('test_collection')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->setMockContainerService('keyvalue.expirable', $keyvalue);
 
     $this->assertNotNull(\Drupal::keyValueExpirable('test_collection'));
@@ -166,7 +166,7 @@ public function testConfig() {
     $config->expects($this->once())
       ->method('get')
       ->with('test_config')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->setMockContainerService('config.factory', $config);
 
     // Test \Drupal::config(), not $this->config().
@@ -185,7 +185,7 @@ public function testQueue() {
     $queue->expects($this->once())
       ->method('get')
       ->with('test_queue', TRUE)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->setMockContainerService('queue', $queue);
 
     $this->assertNotNull(\Drupal::queue('test_queue', TRUE));
@@ -215,7 +215,7 @@ public function testKeyValue() {
     $keyvalue->expects($this->once())
       ->method('get')
       ->with('test_collection')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->setMockContainerService('keyvalue', $keyvalue);
 
     $this->assertNotNull(\Drupal::keyValue('test_collection'));
@@ -447,10 +447,10 @@ protected function setMockContainerService($service_name, $return = NULL) {
       ->with($service_name);
 
     if (isset($return)) {
-      $expects->will($this->returnValue($return));
+      $expects->willReturn($return);
     }
     else {
-      $expects->will($this->returnValue(TRUE));
+      $expects->willReturn(TRUE);
     }
 
     \Drupal::setContainer($this->container);
diff --git a/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php b/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
index a250594ee..029f9f12c 100644
--- a/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Enhancer/EntityRevisionRouteEnhancerTest.php
@@ -16,7 +16,7 @@
 class EntityRevisionRouteEnhancerTest extends UnitTestCase {
 
   /**
-   * @var \Drupal\Core\Routing\RouteEnhancer\EntityRevisionRouteEnhancer
+   * @var \Drupal\Core\Routing\Enhancer\EntityRevisionRouteEnhancer
    */
   protected $routeEnhancer;
 
diff --git a/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php b/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
index 8b2969d70..d94abb2de 100644
--- a/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Enhancer/ParamConversionEnhancerTest.php
@@ -57,7 +57,7 @@ public function testEnhance() {
     $this->paramConverterManager->expects($this->once())
       ->method('convert')
       ->with($this->isType('array'))
-      ->will($this->returnValue($expected));
+      ->willReturn($expected);
 
     $result = $this->paramConversionEnhancer->enhance($defaults, new Request());
 
@@ -75,6 +75,7 @@ public function testEnhance() {
    */
   public function testCopyRawVariables() {
     $route = new Route('/test/{id}');
+    $route->setDefault('node_type', 'page');
     $defaults = [
       RouteObjectInterface::ROUTE_OBJECT => $route,
       'id' => '1',
@@ -90,7 +91,10 @@ public function testCopyRawVariables() {
 
         return $defaults;
       });
-    $expected = new ParameterBag(['id' => 1]);
+    $expected = new ParameterBag([
+      'id' => 1,
+      'node_type' => 'page',
+    ]);
     $result = $this->paramConversionEnhancer->enhance($defaults, new Request());
     $this->assertEquals($result['_raw_variables'], $expected);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php
index 56a4b27af..1b6e6646b 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityFormDisplayAccessControlHandlerTest.php
@@ -89,11 +89,11 @@ protected function setUp(): void {
     $this->anon
       ->expects($this->any())
       ->method('hasPermission')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->anon
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(0));
+      ->willReturn(0);
 
     $this->member = $this->createMock(AccountInterface::class);
     $this->member
@@ -105,7 +105,7 @@ protected function setUp(): void {
     $this->member
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(2));
+      ->willReturn(2);
 
     $this->parent_member = $this->createMock(AccountInterface::class);
     $this->parent_member
@@ -117,12 +117,12 @@ protected function setUp(): void {
     $this->parent_member
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(3));
+      ->willReturn(3);
 
     $entity_form_display_entity_type = $this->createMock(ConfigEntityTypeInterface::class);
     $entity_form_display_entity_type->expects($this->any())
       ->method('getAdminPermission')
-      ->will($this->returnValue('Llama'));
+      ->willReturn('Llama');
     $entity_form_display_entity_type
       ->expects($this->any())
       ->method('getKey')
@@ -131,20 +131,16 @@ protected function setUp(): void {
       ]);
     $entity_form_display_entity_type->expects($this->any())
       ->method('entityClassImplements')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $entity_form_display_entity_type->expects($this->any())
       ->method('getConfigPrefix')
       ->willReturn('');
 
     $this->moduleHandler = $this->createMock(ModuleHandlerInterface::class);
-    $this->moduleHandler
-      ->expects($this->any())
-      ->method('invokeAllWith')
-      ->will($this->returnValue([]));
     $this->moduleHandler
       ->expects($this->any())
       ->method('invokeAll')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $storage_access_control_handler = new EntityFormDisplayAccessControlHandler($entity_form_display_entity_type);
     $storage_access_control_handler->setModuleHandler($this->moduleHandler);
@@ -165,12 +161,12 @@ protected function setUp(): void {
     $entity_type_manager
       ->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue($entity_form_display_entity_type));
+      ->willReturn($entity_form_display_entity_type);
 
     $entity_field_manager = $this->createMock(EntityFieldManagerInterface::class);
     $entity_field_manager->expects($this->any())
       ->method('getFieldDefinitions')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $container = new Container();
     $container->set('entity_type.manager', $entity_type_manager);
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php
index c31a94587..2d3c3bab6 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Access/EntityViewDisplayAccessControlHandlerTest.php
@@ -28,7 +28,7 @@ protected function setUp(): void {
     $this->member
       ->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(2));
+      ->willReturn(2);
 
     $this->entity = new EntityViewDisplay([
       'targetEntityType' => 'foobar',
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php b/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
index ebcd51833..aae62e0e0 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/BaseFieldDefinitionTest.php
@@ -51,19 +51,19 @@ protected function setUp(): void {
 
     $field_type_manager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue([$this->fieldType => $this->fieldTypeDefinition]));
+      ->willReturn([$this->fieldType => $this->fieldTypeDefinition]);
     $field_type_manager->expects($this->any())
       ->method('getDefinition')
       ->with($this->fieldType)
-      ->will($this->returnValue($this->fieldTypeDefinition));
+      ->willReturn($this->fieldTypeDefinition);
     $field_type_manager->expects($this->any())
       ->method('getDefaultStorageSettings')
       ->with($this->fieldType)
-      ->will($this->returnValue($this->fieldTypeDefinition['storage_settings']));
+      ->willReturn($this->fieldTypeDefinition['storage_settings']);
     $field_type_manager->expects($this->any())
       ->method('getDefaultFieldSettings')
       ->with($this->fieldType)
-      ->will($this->returnValue($this->fieldTypeDefinition['field_settings']));
+      ->willReturn($this->fieldTypeDefinition['field_settings']);
 
     $container = new ContainerBuilder();
     $container->set('plugin.manager.field.field_type', $field_type_manager);
@@ -176,7 +176,7 @@ public function testFieldDefaultValue() {
       ->getMock();
     $data_definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\Core\Field\FieldItemBase'));
+      ->willReturn('Drupal\Core\Field\FieldItemBase');
     $definition->setItemDefinition($data_definition);
 
     // Set default value only with a literal.
@@ -223,7 +223,7 @@ public function testFieldInitialValue() {
       ->getMock();
     $data_definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\Core\Field\FieldItemBase'));
+      ->willReturn('Drupal\Core\Field\FieldItemBase');
     $definition->setItemDefinition($data_definition);
 
     // Set default value only with a literal.
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
index a5b2af859..f3060f6c3 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/ContentEntityBaseUnitTest.php
@@ -139,16 +139,16 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getKeys')
-      ->will($this->returnValue([
+      ->willReturn([
         'id' => 'id',
         'uuid' => 'uuid',
-    ]));
+      ]);
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityFieldManager = $this->createMock(EntityFieldManagerInterface::class);
 
@@ -159,35 +159,38 @@ protected function setUp(): void {
     $this->typedDataManager = $this->createMock(TypedDataManagerInterface::class);
     $this->typedDataManager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue(['class' => '\Drupal\Core\Entity\Plugin\DataType\EntityAdapter']));
+      ->willReturn(['class' => '\Drupal\Core\Entity\Plugin\DataType\EntityAdapter']);
 
     $english = new Language(['id' => 'en']);
     $not_specified = new Language(['id' => LanguageInterface::LANGCODE_NOT_SPECIFIED, 'locked' => TRUE]);
     $this->languageManager = $this->createMock('\Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getLanguages')
-      ->will($this->returnValue(['en' => $english, LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified]));
+      ->willReturn([
+        'en' => $english,
+        LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified,
+      ]);
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with('en')
-      ->will($this->returnValue($english));
+      ->willReturn($english);
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with(LanguageInterface::LANGCODE_NOT_SPECIFIED)
-      ->will($this->returnValue($not_specified));
+      ->willReturn($not_specified);
 
     $this->fieldTypePluginManager = $this->getMockBuilder('\Drupal\Core\Field\FieldTypePluginManager')
       ->disableOriginalConstructor()
       ->getMock();
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultStorageSettings')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultFieldSettings')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->fieldTypePluginManager->expects($this->any())
       ->method('createFieldItemList')
-      ->will($this->returnValue($this->createMock('Drupal\Core\Field\FieldItemListInterface')));
+      ->willReturn($this->createMock('Drupal\Core\Field\FieldItemListInterface'));
 
     $container = new ContainerBuilder();
     $container->set('entity_field.manager', $this->entityFieldManager);
@@ -207,7 +210,7 @@ protected function setUp(): void {
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldDefinitions')
       ->with($this->entityTypeId, $this->bundle)
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entity = $this->getMockForAbstractClass(ContentEntityBase::class, [$values, $this->entityTypeId, $this->bundle], '', TRUE, TRUE, TRUE, ['isNew']);
     $values['defaultLangcode'] = [LanguageInterface::LANGCODE_DEFAULT => LanguageInterface::LANGCODE_NOT_SPECIFIED];
@@ -228,7 +231,7 @@ public function testIsNewRevision() {
     $this->entityType->expects($this->exactly(2))
       ->method('getKey')
       ->with('revision')
-      ->will($this->returnValue('revision_id'));
+      ->willReturn('revision_id');
 
     $field_item_list = $this->getMockBuilder('\Drupal\Core\Field\FieldItemList')
       ->disableOriginalConstructor()
@@ -240,7 +243,7 @@ public function testIsNewRevision() {
     $this->fieldTypePluginManager->expects($this->any())
       ->method('createFieldItemList')
       ->with($this->entity, 'revision_id', NULL)
-      ->will($this->returnValue($field_item_list));
+      ->willReturn($field_item_list);
 
     $this->fieldDefinitions['revision_id']->getItemDefinition()->setClass(get_class($field_item));
 
@@ -257,7 +260,7 @@ public function testSetNewRevisionException() {
     $this->entityType->expects($this->once())
       ->method('hasKey')
       ->with('revision')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->expectException('LogicException');
     $this->expectExceptionMessage('Entity type ' . $this->entityTypeId . ' does not support revisions.');
     $this->entity->setNewRevision();
@@ -276,7 +279,7 @@ public function testIsDefaultRevision() {
     // The revision for a new entity should always be the default revision.
     $this->entity->expects($this->any())
       ->method('isNew')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entity->isDefaultRevision(FALSE);
     $this->assertTrue($this->entity->isDefaultRevision());
   }
@@ -296,14 +299,14 @@ public function testIsTranslatable() {
     $this->entityTypeBundleInfo->expects($this->any())
       ->method('getBundleInfo')
       ->with($this->entityTypeId)
-      ->will($this->returnValue([
+      ->willReturn([
         $this->bundle => [
           'translatable' => TRUE,
         ],
-      ]));
+      ]);
     $this->languageManager->expects($this->any())
       ->method('isMultilingual')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->assertSame('en', $this->entity->language()->getId());
     $this->assertFalse($this->entity->language()->isLocked());
     $this->assertTrue($this->entity->isTranslatable());
@@ -319,7 +322,7 @@ public function testIsTranslatable() {
   public function testIsTranslatableForMonolingual() {
     $this->languageManager->expects($this->any())
       ->method('isMultilingual')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->assertFalse($this->entity->isTranslatable());
   }
 
@@ -429,7 +432,7 @@ public function testValidate() {
       ->willReturnOnConsecutiveCalls($empty_violation_list, $non_empty_violation_list);
     $this->typedDataManager->expects($this->exactly(2))
       ->method('getValidator')
-      ->will($this->returnValue($validator));
+      ->willReturn($validator);
     $this->assertCount(0, $this->entity->validate());
     $this->assertCount(1, $this->entity->validate());
   }
@@ -450,10 +453,10 @@ public function testRequiredValidation() {
     $validator->expects($this->once())
       ->method('validate')
       ->with($this->entity->getTypedData())
-      ->will($this->returnValue($empty_violation_list));
+      ->willReturn($empty_violation_list);
     $this->typedDataManager->expects($this->any())
       ->method('getValidator')
-      ->will($this->returnValue($validator));
+      ->willReturn($validator);
 
     /** @var \Drupal\Core\Entity\EntityStorageInterface|\PHPUnit\Framework\MockObject\MockObject $storage */
     $storage = $this->createMock('\Drupal\Core\Entity\EntityStorageInterface');
@@ -466,7 +469,7 @@ public function testRequiredValidation() {
     $this->entityTypeManager->expects($this->any())
       ->method('getStorage')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     // Check that entities can be saved normally when validation is not
     // required.
@@ -511,7 +514,7 @@ public function testAccess() {
       ->willReturnOnConsecutiveCalls(TRUE, AccessResult::allowed());
     $this->entityTypeManager->expects($this->exactly(4))
       ->method('getAccessControlHandler')
-      ->will($this->returnValue($access));
+      ->willReturn($access);
     $this->assertTrue($this->entity->access($operation));
     $this->assertEquals(AccessResult::allowed(), $this->entity->access($operation, NULL, TRUE));
     $this->assertTrue($this->entity->access('create'));
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
index b8b83539a..4b3c19805 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityCreateAccessCheckTest.php
@@ -87,11 +87,11 @@ public function testAccess($entity_bundle, $requirement, $access, $expected, $ex
       $access_control_handler->expects($this->once())
         ->method('createAccess')
         ->with($entity_bundle)
-        ->will($this->returnValue($access_result));
+        ->willReturn($access_result);
 
       $this->entityTypeManager->expects($this->any())
         ->method('getAccessControlHandler')
-        ->will($this->returnValue($access_control_handler));
+        ->willReturn($access_control_handler);
     }
 
     $applies_check = new EntityCreateAccessCheck($this->entityTypeManager);
@@ -102,7 +102,7 @@ public function testAccess($entity_bundle, $requirement, $access, $expected, $ex
     $route->expects($this->any())
       ->method('getRequirement')
       ->with('_entity_create_access')
-      ->will($this->returnValue($requirement));
+      ->willReturn($requirement);
 
     $raw_variables = new ParameterBag();
     if ($entity_bundle) {
@@ -112,7 +112,7 @@ public function testAccess($entity_bundle, $requirement, $access, $expected, $ex
     $route_match = $this->createMock('Drupal\Core\Routing\RouteMatchInterface');
     $route_match->expects($this->any())
       ->method('getRawParameters')
-      ->will($this->returnValue($raw_variables));
+      ->willReturn($raw_variables);
 
     $account = $this->createMock('Drupal\Core\Session\AccountInterface');
     $this->assertEquals($expected_access_result, $applies_check->access($route, $route_match, $account));
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php
index df404f8e7..037d3a51d 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityFieldManagerTest.php
@@ -11,13 +11,12 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
-use Drupal\Core\Config\Entity\ConfigEntityStorageInterface;
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\ContentEntityTypeInterface;
 use Drupal\Core\Entity\EntityDisplayRepositoryInterface;
 use Drupal\Core\Entity\EntityFieldManager;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityLastInstalledSchemaRepositoryInterface;
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -195,16 +194,12 @@ protected function setUp(): void {
    *   (optional) An array of entity type definitions.
    */
   protected function setUpEntityTypeDefinitions($definitions = []) {
-    $class = $this->getMockClass(EntityInterface::class);
     foreach ($definitions as $key => $entity_type) {
       // \Drupal\Core\Entity\EntityTypeInterface::getLinkTemplates() is called
       // by \Drupal\Core\Entity\EntityTypeManager::processDefinition() so it must
       // always be mocked.
       $entity_type->getLinkTemplates()->willReturn([]);
 
-      // Give the entity type a legitimate class to return.
-      $entity_type->getClass()->willReturn($class);
-
       $definitions[$key] = $entity_type->reveal();
     }
 
@@ -247,8 +242,54 @@ public function testGetBaseFieldDefinitions() {
   public function testGetFieldDefinitions() {
     $field_definition = $this->setUpEntityWithFieldDefinition();
 
+    $bundle_field_definition = $this->prophesize()
+      ->willImplement(FieldDefinitionInterface::class)
+      ->willImplement(FieldStorageDefinitionInterface::class);
+
+    // Define bundle fields to be stored on the default Entity class.
+    $bundle_fields = [
+      'the_entity_id' => [
+        'test_entity_bundle' => [
+          'id_bundle' => $bundle_field_definition->reveal(),
+        ],
+        'test_entity_bundle_class' => [
+          'some_extra_field' => $bundle_field_definition->reveal(),
+        ],
+      ],
+    ];
+
+    // Define bundle fields to be stored on the bundle class.
+    $bundle_class_fields = [
+      'the_entity_id' => [
+        'test_entity_bundle_class' => [
+          'id_bundle_class' => $bundle_field_definition->reveal(),
+        ],
+      ],
+    ];
+
+    EntityTypeManagerTestEntity::$bundleFieldDefinitions = $bundle_fields;
+    EntityTypeManagerTestEntityBundle::$bundleClassFieldDefinitions = $bundle_class_fields;
+
+    // Test that only base fields are retrieved.
     $expected = ['id' => $field_definition];
+    $this->assertSame($expected, $this->entityFieldManager->getFieldDefinitions('test_entity_type', 'some_other_bundle'));
+
+    // Test that base fields and bundle fields from the default entity class are
+    // retrieved.
+    $expected = [
+      'id' => $field_definition,
+      'id_bundle' => $bundle_fields['the_entity_id']['test_entity_bundle']['id_bundle'],
+    ];
     $this->assertSame($expected, $this->entityFieldManager->getFieldDefinitions('test_entity_type', 'test_entity_bundle'));
+
+    // Test that base fields and bundle fields from the bundle class and
+    // entity class are retrieved
+    $expected = [
+      'id' => $field_definition,
+      'some_extra_field' => $bundle_fields['the_entity_id']['test_entity_bundle_class']['some_extra_field'],
+      'id_bundle_class' => $bundle_class_fields['the_entity_id']['test_entity_bundle_class']['id_bundle_class'],
+    ];
+    $this->assertSame($expected, $this->entityFieldManager->getFieldDefinitions('test_entity_type', 'test_entity_bundle_class'));
   }
 
   /**
@@ -575,8 +616,18 @@ protected function setUpEntityWithFieldDefinition($custom_invoke_all = FALSE, $f
     $this->entityType = $this->prophesize(EntityTypeInterface::class);
     $this->setUpEntityTypeDefinitions(['test_entity_type' => $this->entityType, 'base_field_override' => $override_entity_type]);
 
-    $storage = $this->prophesize(ConfigEntityStorageInterface::class);
+    $storage = $this->prophesize(EntityStorageInterface::class);
     $storage->loadMultiple(Argument::type('array'))->willReturn([]);
+
+    // By default, make the storage entity class lookup return the
+    // EntityTypeManagerTestEntity class
+    $storage->getEntityClass(NULL)->willReturn(EntityTypeManagerTestEntity::class);
+    $storage->getEntityClass(Argument::type('string'))->willReturn(EntityTypeManagerTestEntity::class);
+    // When using the "test_entity_bundle_class" bundle, return the
+    // EntityTypeManagerTestEntityBundle class
+    $storage->getEntityClass('test_entity_bundle_class')->willReturn(EntityTypeManagerTestEntityBundle::class);
+
+    $this->entityTypeManager->getStorage('test_entity_type')->willReturn($storage->reveal());
     $this->entityTypeManager->getStorage('base_field_override')->willReturn($storage->reveal());
 
     $this->entityType->getClass()->willReturn($entity_class);
@@ -864,3 +915,33 @@ public static function bundleFieldDefinitions(EntityTypeInterface $entity_type,
   }
 
 }
+
+/**
+ * Provides a bundle specific class with dummy static method implementations.
+ */
+abstract class EntityTypeManagerTestEntityBundle extends EntityTypeManagerTestEntity {
+
+  /**
+   * The bundle class field definitions.
+   *
+   * @var array[]
+   *   Keys are entity type IDs, values are arrays of which the keys are bundle
+   *   names and the values are field definitions.
+   */
+  public static $bundleClassFieldDefinitions = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function bundleFieldDefinitions(EntityTypeInterface $entity_type, $bundle, array $base_field_definitions) {
+    $definitions = parent::bundleFieldDefinitions($entity_type, $bundle, $base_field_definitions);
+
+    if (isset(static::$bundleClassFieldDefinitions[$entity_type->id()][$bundle])) {
+      $definitions += static::$bundleClassFieldDefinitions[$entity_type->id()][$bundle];
+    }
+
+    return $definitions;
+
+  }
+
+}
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
index 95a5809a6..56ae73b6f 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityFormBuilderTest.php
@@ -52,21 +52,21 @@ public function testGetForm() {
     $form_controller = $this->createMock('Drupal\Core\Entity\EntityFormInterface');
     $form_controller->expects($this->any())
       ->method('getFormId')
-      ->will($this->returnValue('the_form_id'));
+      ->willReturn('the_form_id');
     $this->entityTypeManager->expects($this->any())
       ->method('getFormObject')
       ->with('the_entity_type', 'default')
-      ->will($this->returnValue($form_controller));
+      ->willReturn($form_controller);
 
     $this->formBuilder->expects($this->once())
       ->method('buildForm')
       ->with($form_controller, $this->isInstanceOf('Drupal\Core\Form\FormStateInterface'))
-      ->will($this->returnValue('the form contents'));
+      ->willReturn('the form contents');
 
     $entity = $this->createMock('Drupal\Core\Entity\EntityInterface');
     $entity->expects($this->once())
       ->method('getEntityTypeId')
-      ->will($this->returnValue('the_entity_type'));
+      ->willReturn('the_entity_type');
 
     $this->assertSame('the form contents', $this->entityFormBuilder->getForm($entity));
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
index efa591ad3..b4cd60377 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityFormTest.php
@@ -56,10 +56,10 @@ public function testFormId($expected, $definition) {
 
     $entity->expects($this->any())
       ->method('getEntityType')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
     $entity->expects($this->any())
       ->method('bundle')
-      ->will($this->returnValue($definition['bundle']));
+      ->willReturn($definition['bundle']);
 
     $this->entityForm->setEntity($entity);
     $this->entityForm->setOperation($definition['operation']);
@@ -72,31 +72,41 @@ public function testFormId($expected, $definition) {
    */
   public function providerTestFormIds() {
     return [
-      ['node_article_form', [
+      [
+        'node_article_form',
+        [
           'entity_type' => 'node',
           'bundle' => 'article',
           'operation' => 'default',
         ],
       ],
-      ['node_article_delete_form', [
+      [
+        'node_article_delete_form',
+        [
           'entity_type' => 'node',
           'bundle' => 'article',
           'operation' => 'delete',
         ],
       ],
-      ['user_user_form', [
+      [
+        'user_user_form',
+        [
           'entity_type' => 'user',
           'bundle' => 'user',
           'operation' => 'default',
         ],
       ],
-      ['user_form', [
+      [
+        'user_form',
+        [
           'entity_type' => 'user',
           'bundle' => '',
           'operation' => 'default',
         ],
       ],
-      ['user_delete_form', [
+      [
+        'user_delete_form',
+        [
           'entity_type' => 'user',
           'bundle' => '',
           'operation' => 'delete',
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php
index 20624988f..757d5fbfb 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityLinkTest.php
@@ -90,7 +90,7 @@ public function testToLink($entity_label, $link_text, $expected_text, $link_rel
       ->expects($this->any())
       ->method('getDefinition')
       ->with($entity_type_id)
-      ->will($this->returnValue($entity_type));
+      ->willReturn($entity_type);
 
     /** @var \Drupal\Core\Entity\Entity $entity */
     $entity = $this->getMockForAbstractClass('Drupal\Core\Entity\EntityBase', [
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
index af87b302f..470a2cd69 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityListBuilderTest.php
@@ -107,7 +107,7 @@ public function testGetOperations() {
     $this->moduleHandler->expects($this->once())
       ->method('invokeAll')
       ->with('entity_operation', [$this->role])
-      ->will($this->returnValue($operations));
+      ->willReturn($operations);
     $this->moduleHandler->expects($this->once())
       ->method('alter')
       ->with('entity_operation');
@@ -116,10 +116,10 @@ public function testGetOperations() {
 
     $this->role->expects($this->any())
       ->method('access')
-      ->will($this->returnValue(AccessResult::allowed()));
+      ->willReturn(AccessResult::allowed());
     $this->role->expects($this->any())
       ->method('hasLinkTemplate')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $url = $this->getMockBuilder('\Drupal\Core\Url')
       ->disableOriginalConstructor()
       ->getMock();
@@ -128,7 +128,7 @@ public function testGetOperations() {
       ->with(['query' => ['destination' => '/foo/bar']]);
     $this->role->expects($this->any())
       ->method('toUrl')
-      ->will($this->returnValue($url));
+      ->willReturn($url);
 
     $this->redirectDestination->expects($this->atLeastOnce())
       ->method('getAsArray')
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index 829d2dfa9..6e5a2b3e4 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -444,23 +444,23 @@ protected function setupEntityTypes() {
     $definition = $this->createMock('Drupal\Core\Entity\EntityTypeInterface');
     $definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\Tests\Core\Entity\SimpleTestEntity'));
+      ->willReturn('Drupal\Tests\Core\Entity\SimpleTestEntity');
     $definition->expects($this->any())
       ->method('isRevisionable')
       ->willReturn(FALSE);
     $revisionable_definition = $this->createMock('Drupal\Core\Entity\EntityTypeInterface');
     $revisionable_definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\Tests\Core\Entity\SimpleTestEntity'));
+      ->willReturn('Drupal\Tests\Core\Entity\SimpleTestEntity');
     $revisionable_definition->expects($this->any())
       ->method('isRevisionable')
       ->willReturn(TRUE);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue([
+      ->willReturn([
         'entity_test' => $definition,
         'entity_test_rev' => $revisionable_definition,
-      ]));
+      ]);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->willReturnCallback(function ($entity_type) use ($definition, $revisionable_definition) {
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityStorageDeprecationTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityStorageDeprecationTest.php
index 1e38f467d..9a626137a 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityStorageDeprecationTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityStorageDeprecationTest.php
@@ -112,10 +112,10 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('Drupal\Core\Entity\ContentEntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
     $this->entityType->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('bogus_class'));
+      ->willReturn('bogus_class');
 
     $this->container = new ContainerBuilder();
     \Drupal::setContainer($this->container);
@@ -128,7 +128,7 @@ protected function setUp(): void {
     $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
-      ->will($this->returnValue(new Language(['langcode' => 'en'])));
+      ->willReturn(new Language(['langcode' => 'en']));
     $this->connection = $this->getMockBuilder('Drupal\Core\Database\Connection')
       ->disableOriginalConstructor()
       ->getMock();
@@ -147,19 +147,19 @@ protected function setUpEntityStorage() {
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getActiveDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldStorageDefinitions')
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getActiveFieldStorageDefinitions')
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entityStorage = new DeprecatedEntityStorage($this->entityType, $this->connection, $this->entityFieldManager, $this->cache, $this->languageManager, new MemoryCache(), $this->entityTypeBundleInfo, $this->entityTypeManager);
     $this->entityStorage->setModuleHandler($this->moduleHandler);
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
index 591f6ded7..831394074 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeBundleInfoTest.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Cache\Cache;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\CacheTagsInvalidatorInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeBundleInfo;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -112,16 +111,12 @@ protected function setUp(): void {
    *   (optional) An array of entity type definitions.
    */
   protected function setUpEntityTypeDefinitions($definitions = []) {
-    $class = $this->getMockClass(EntityInterface::class);
     foreach ($definitions as $key => $entity_type) {
       // \Drupal\Core\Entity\EntityTypeInterface::getLinkTemplates() is called
       // by \Drupal\Core\Entity\EntitTypeManager::processDefinition() so it must
       // always be mocked.
       $entity_type->getLinkTemplates()->willReturn([]);
 
-      // Give the entity type a legitimate class to return.
-      $entity_type->getClass()->willReturn($class);
-
       $definitions[$key] = $entity_type->reveal();
     }
 
@@ -194,11 +189,15 @@ public function testGetBundleInfo($entity_type_id, $expected) {
    */
   public function providerTestGetBundleInfo() {
     return [
-      ['apple', [
+      [
+        'apple',
+        [
           'apple' => ['label' => 'Apple'],
         ],
       ],
-      ['banana', [
+      [
+        'banana',
+        [
           'banana' => ['label' => 'Banana'],
         ],
       ],
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
index edb6240e1..f6a34fc4b 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeManagerTest.php
@@ -97,7 +97,7 @@ protected function setUp(): void {
    *   (optional) An array of entity type definitions.
    */
   protected function setUpEntityTypeDefinitions($definitions = []) {
-    $class = $this->getMockClass(EntityInterface::class);
+    $class = get_class($this->createMock(EntityInterface::class));
     foreach ($definitions as $key => $entity_type) {
       // \Drupal\Core\Entity\EntityTypeInterface::getLinkTemplates() is called
       // by \Drupal\Core\Entity\EntityTypeManager::processDefinition() so it must
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
index 356e573e4..cc71399e8 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeRepositoryTest.php
@@ -50,7 +50,6 @@ protected function setUp(): void {
    *   (optional) An array of entity type definitions.
    */
   protected function setUpEntityTypeDefinitions($definitions = []) {
-    $class = $this->getMockClass(EntityInterface::class);
     foreach ($definitions as $key => $entity_type) {
       // \Drupal\Core\Entity\EntityTypeInterface::getLinkTemplates() is called
       // by \Drupal\Core\Entity\EntityTypeManager::processDefinition() so it must
@@ -58,7 +57,7 @@ protected function setUpEntityTypeDefinitions($definitions = []) {
       $entity_type->getLinkTemplates()->willReturn([]);
 
       // Give the entity type a legitimate class to return.
-      $entity_type->getClass()->willReturn($class);
+      $entity_type->getClass()->willReturn(EntityInterface::class);
 
       $definitions[$key] = $entity_type->reveal();
     }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
index 3ffe64599..704679ba6 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityTypeTest.php
@@ -7,7 +7,6 @@
 use Drupal\Core\Entity\EntityType;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\StringTranslation\TranslatableMarkup;
-use Drupal\Core\StringTranslation\TranslationManager;
 use Drupal\Tests\UnitTestCase;
 
 /**
@@ -512,39 +511,4 @@ public function testIsSubClassOf() {
     $this->assertFalse($entity_type->isSubclassOf(\DateTimeInterface::class));
   }
 
-  /**
-   * Tests that the EntityType object can be serialized.
-   */
-  public function testIsSerializable() {
-    $entity_type = $this->setUpEntityType([]);
-
-    $translation_service = new UnserializableTranslationManager();
-    $translation_service->_serviceId = 'string_translation';
-
-    $entity_type->setStringTranslation($translation_service);
-    $entity_type = unserialize(serialize($entity_type));
-
-    $this->assertEquals('example_entity_type', $entity_type->id());
-  }
-
-}
-
-/**
- * Test class.
- */
-class UnserializableTranslationManager extends TranslationManager {
-
-  /**
-   * Constructs a UnserializableTranslationManager object.
-   */
-  public function __construct() {
-  }
-
-  /**
-   * @return array
-   */
-  public function __serialize(): array {
-    throw new \Exception();
-  }
-
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
index b37c34a34..864851279 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/EntityUnitTest.php
@@ -22,7 +22,7 @@ class EntityUnitTest extends UnitTestCase {
   /**
    * The entity under test.
    *
-   * @var \Drupal\Core\Entity\Entity|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Entity\EntityInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $entity;
 
@@ -102,7 +102,7 @@ protected function setUp(): void {
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->uuid = $this->createMock('\Drupal\Component\Uuid\UuidInterface');
 
@@ -110,7 +110,7 @@ protected function setUp(): void {
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with('en')
-      ->will($this->returnValue(new Language(['id' => 'en'])));
+      ->willReturn(new Language(['id' => 'en']));
 
     $this->cacheTagsInvalidator = $this->createMock('Drupal\Core\Cache\CacheTagsInvalidator');
 
@@ -172,18 +172,18 @@ public function testLabel() {
     $this->entityType->expects($this->atLeastOnce())
       ->method('getKey')
       ->with('label')
-      ->will($this->returnValue('label'));
+      ->willReturn('label');
 
     // Set a dummy property on the entity under test to test that the label can
     // be returned form a property if there is no callback.
     $this->entityTypeManager->expects($this->atLeastOnce())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue([
+      ->willReturn([
         'entity_keys' => [
           'label' => 'label',
         ],
-      ]));
+      ]);
     $this->entity->label = $property_label;
 
     $this->assertSame($property_label, $this->entity->label());
@@ -198,13 +198,13 @@ public function testAccess() {
     $access->expects($this->once())
       ->method('access')
       ->with($this->entity, $operation)
-      ->will($this->returnValue(AccessResult::allowed()));
+      ->willReturn(AccessResult::allowed());
     $access->expects($this->once())
       ->method('createAccess')
-      ->will($this->returnValue(AccessResult::allowed()));
+      ->willReturn(AccessResult::allowed());
     $this->entityTypeManager->expects($this->exactly(2))
       ->method('getAccessControlHandler')
-      ->will($this->returnValue($access));
+      ->willReturn($access);
 
     $this->assertEquals(AccessResult::allowed(), $this->entity->access($operation));
     $this->assertEquals(AccessResult::allowed(), $this->entity->access('create'));
@@ -260,12 +260,12 @@ public function testLoad() {
     $storage->expects($this->once())
       ->method('load')
       ->with(1)
-      ->will($this->returnValue($this->entity));
+      ->willReturn($this->entity);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     \Drupal::getContainer()->set('entity_type.repository', $entity_type_repository);
 
@@ -294,12 +294,12 @@ public function testLoadMultiple() {
     $storage->expects($this->once())
       ->method('loadMultiple')
       ->with([1])
-      ->will($this->returnValue([1 => $this->entity]));
+      ->willReturn([1 => $this->entity]);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     \Drupal::getContainer()->set('entity_type.repository', $entity_type_repository);
 
@@ -326,12 +326,12 @@ public function testCreate() {
     $storage->expects($this->once())
       ->method('create')
       ->with([])
-      ->will($this->returnValue($this->entity));
+      ->willReturn($this->entity);
 
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     \Drupal::getContainer()->set('entity_type.repository', $entity_type_repository);
 
@@ -352,7 +352,7 @@ public function testSave() {
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $this->entity->save();
   }
@@ -370,7 +370,7 @@ public function testDelete() {
     $this->entityTypeManager->expects($this->once())
       ->method('getStorage')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($storage));
+      ->willReturn($storage);
 
     $this->entity->delete();
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php b/web/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
index a857c6f25..1343dd9ab 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/FieldDefinitionTest.php
@@ -205,7 +205,7 @@ public function testFieldDefaultValue($factory_name) {
       ->getMock();
     $data_definition->expects($this->any())
       ->method('getClass')
-      ->will($this->returnValue('Drupal\Core\Field\FieldItemBase'));
+      ->willReturn('Drupal\Core\Field\FieldItemBase');
     $definition->setItemDefinition($data_definition);
 
     // Set default value only with a literal.
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 27784bce4..90b0f1c6c 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -100,14 +100,14 @@ protected function setUp(): void {
   protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
     $this->entityType->expects($this->atLeastOnce())
       ->method('getKey')
-      ->will($this->returnValueMap([
+      ->willReturnMap([
         ['id', 'id'],
         ['uuid', $uuid_key],
         ['langcode', 'langcode'],
-      ]));
+      ]);
     $this->entityType->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue('test_entity_type'));
+      ->willReturn('test_entity_type');
     $this->entityType->expects($this->any())
       ->method('getListCacheTags')
       ->willReturn(['test_entity_type_list']);
@@ -116,7 +116,7 @@ protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with('test_entity_type')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityFieldManager = $this->createMock(EntityFieldManagerInterface::class);
 
@@ -129,10 +129,10 @@ protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
     $language = new Language(['langcode' => 'en']);
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
-      ->will($this->returnValue($language));
+      ->willReturn($language);
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue($language));
+      ->willReturn($language);
 
     $this->entityStorage = new KeyValueEntityStorage($this->entityType, $this->keyValueStore, $this->uuidService, $this->languageManager, new MemoryCache());
     $this->entityStorage->setModuleHandler($this->moduleHandler);
@@ -152,7 +152,7 @@ protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
   public function testCreateWithPredefinedUuid() {
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($this->getMockEntity())));
+      ->willReturn(get_class($this->getMockEntity()));
     $this->setUpKeyValueEntityStorage();
 
     $this->moduleHandler->expects($this->exactly(2))
@@ -175,7 +175,7 @@ public function testCreateWithoutUuidKey() {
     // Set up the entity storage to expect no UUID key.
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($this->getMockEntity())));
+      ->willReturn(get_class($this->getMockEntity()));
     $this->setUpKeyValueEntityStorage(NULL);
 
     $this->moduleHandler->expects($this->exactly(2))
@@ -200,7 +200,7 @@ public function testCreate() {
     $entity = $this->getMockEntity('Drupal\Core\Entity\EntityBase', [], ['toArray']);
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($entity)));
+      ->willReturn(get_class($entity));
     $this->setUpKeyValueEntityStorage();
 
     $this->moduleHandler->expects($this->exactly(2))
@@ -208,7 +208,7 @@ public function testCreate() {
       ->withConsecutive(['test_entity_type_create'], ['entity_create']);
     $this->uuidService->expects($this->once())
       ->method('generate')
-      ->will($this->returnValue('bar'));
+      ->willReturn('bar');
 
     $entity = $this->entityStorage->create(['id' => 'foo']);
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
@@ -235,7 +235,7 @@ public function testSaveInsert(EntityInterface $entity) {
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->keyValueStore->expects($this->never())
       ->method('getMultiple');
     $this->keyValueStore->expects($this->never())
@@ -243,7 +243,7 @@ public function testSaveInsert(EntityInterface $entity) {
 
     $entity->expects($this->atLeastOnce())
       ->method('toArray')
-      ->will($this->returnValue($expected));
+      ->willReturn($expected);
 
     $this->moduleHandler->expects($this->exactly(4))
       ->method('invokeAll')
@@ -275,18 +275,18 @@ public function testSaveInsert(EntityInterface $entity) {
   public function testSaveUpdate(EntityInterface $entity) {
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($entity)));
+      ->willReturn(get_class($entity));
     $this->setUpKeyValueEntityStorage();
 
     $expected = ['id' => 'foo'];
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
       ->with(['foo'])
-      ->will($this->returnValue([['id' => 'foo']]));
+      ->willReturn([['id' => 'foo']]);
     $this->keyValueStore->expects($this->never())
       ->method('delete');
     $this->moduleHandler->expects($this->exactly(4))
@@ -323,12 +323,12 @@ public function testSaveConfigEntity() {
     $expected = ['id' => 'foo'];
     $entity->expects($this->atLeastOnce())
       ->method('toArray')
-      ->will($this->returnValue($expected));
+      ->willReturn($expected);
 
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->keyValueStore->expects($this->once())
       ->method('set')
       ->with('foo', $expected);
@@ -349,21 +349,21 @@ public function testSaveConfigEntity() {
   public function testSaveRenameConfigEntity(ConfigEntityInterface $entity) {
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($entity)));
+      ->willReturn(get_class($entity));
     $this->setUpKeyValueEntityStorage();
 
     $expected = ['id' => 'foo'];
     $entity->expects($this->once())
       ->method('toArray')
-      ->will($this->returnValue($expected));
+      ->willReturn($expected);
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
       ->with(['foo'])
-      ->will($this->returnValue([['id' => 'foo']]));
+      ->willReturn([['id' => 'foo']]);
     $this->keyValueStore->expects($this->once())
       ->method('delete')
       ->with('foo');
@@ -388,16 +388,16 @@ public function testSaveRenameConfigEntity(ConfigEntityInterface $entity) {
   public function testSaveContentEntity() {
     $this->entityType->expects($this->any())
       ->method('getKeys')
-      ->will($this->returnValue([
+      ->willReturn([
         'id' => 'id',
-      ]));
+      ]);
     $this->setUpKeyValueEntityStorage();
 
     $expected = ['id' => 'foo'];
     $this->keyValueStore->expects($this->exactly(2))
       ->method('has')
       ->with('foo')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->keyValueStore->expects($this->once())
       ->method('set')
       ->with('foo', $expected);
@@ -409,10 +409,10 @@ public function testSaveContentEntity() {
     ]);
     $entity->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue('foo'));
+      ->willReturn('foo');
     $entity->expects($this->once())
       ->method('toArray')
-      ->will($this->returnValue($expected));
+      ->willReturn($expected);
     $this->entityStorage->save($entity);
   }
 
@@ -446,7 +446,7 @@ public function testSaveDuplicate() {
     $entity->enforceIsNew();
     $this->keyValueStore->expects($this->once())
       ->method('has')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->keyValueStore->expects($this->never())
       ->method('set');
     $this->keyValueStore->expects($this->never())
@@ -464,13 +464,13 @@ public function testLoad() {
     $entity = $this->getMockEntity();
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($entity)));
+      ->willReturn(get_class($entity));
     $this->setUpKeyValueEntityStorage();
 
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
       ->with(['foo'])
-      ->will($this->returnValue([['id' => 'foo']]));
+      ->willReturn([['id' => 'foo']]);
     $entity = $this->entityStorage->load('foo');
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
     $this->assertSame('foo', $entity->id());
@@ -485,7 +485,7 @@ public function testLoadMissingEntity() {
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
       ->with(['foo'])
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $entity = $this->entityStorage->load('foo');
     $this->assertNull($entity);
   }
@@ -501,12 +501,12 @@ public function testLoadMultipleAll() {
     $expected['bar'] = $this->getMockEntity('Drupal\Core\Entity\EntityBase', [['id' => 'bar']]);
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class(reset($expected))));
+      ->willReturn(get_class(reset($expected)));
     $this->setUpKeyValueEntityStorage();
 
     $this->keyValueStore->expects($this->once())
       ->method('getAll')
-      ->will($this->returnValue([['id' => 'foo'], ['id' => 'bar']]));
+      ->willReturn([['id' => 'foo'], ['id' => 'bar']]);
     $entities = $this->entityStorage->loadMultiple();
     foreach ($entities as $id => $entity) {
       $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
@@ -525,14 +525,14 @@ public function testLoadMultipleIds() {
     $entity = $this->getMockEntity('Drupal\Core\Entity\EntityBase', [['id' => 'foo']]);
     $this->entityType->expects($this->once())
       ->method('getClass')
-      ->will($this->returnValue(get_class($entity)));
+      ->willReturn(get_class($entity));
     $this->setUpKeyValueEntityStorage();
 
     $expected[] = $entity;
     $this->keyValueStore->expects($this->once())
       ->method('getMultiple')
       ->with(['foo'])
-      ->will($this->returnValue([['id' => 'foo']]));
+      ->willReturn([['id' => 'foo']]);
     $entities = $this->entityStorage->loadMultiple(['foo']);
     foreach ($entities as $id => $entity) {
       $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
index cd1be3f9f..66862dedf 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/DefaultTableMappingTest.php
@@ -462,10 +462,10 @@ public function testGetDedicatedTableName($info, $expected_data_table, $expected
     $definition = $this->setUpDefinition($field_name, []);
     $definition->expects($this->any())
       ->method('getTargetEntityTypeId')
-      ->will($this->returnValue($entity_type_id));
+      ->willReturn($entity_type_id);
     $definition->expects($this->any())
       ->method('getUniqueStorageIdentifier')
-      ->will($this->returnValue($entity_type_id . '-' . $field_name));
+      ->willReturn($entity_type_id . '-' . $field_name);
 
     $this->entityType
       ->expects($this->any())
@@ -594,10 +594,10 @@ protected function setUpDefinition($name, array $column_names, $base_field = TRU
       ->willReturn($base_field);
     $definition->expects($this->any())
       ->method('getName')
-      ->will($this->returnValue($name));
+      ->willReturn($name);
     $definition->expects($this->any())
       ->method('getColumns')
-      ->will($this->returnValue(array_fill_keys($column_names, [])));
+      ->willReturn(array_fill_keys($column_names, []));
     return $definition;
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
index 7ae6eeba5..02b2c7e06 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageSchemaTest.php
@@ -86,7 +86,7 @@ protected function setUp(): void {
 
     $this->storage->expects($this->any())
       ->method('getBaseTable')
-      ->will($this->returnValue('entity_test'));
+      ->willReturn('entity_test');
 
     // Add an ID field. This also acts as a test for a simple, single-column
     // field.
@@ -388,7 +388,7 @@ public function testGetSchemaBase() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->assertNull(
       $this->storageSchema->onEntityTypeCreate($this->entityType)
@@ -422,11 +422,11 @@ public function testGetSchemaRevisionable() {
 
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->storage->expects($this->exactly(9))
       ->method('getRevisionTable')
-      ->will($this->returnValue('entity_test_revision'));
+      ->willReturn('entity_test_revision');
 
     $this->setUpStorageDefinition('revision_id', [
       'columns' => [
@@ -495,7 +495,7 @@ public function testGetSchemaRevisionable() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->storageSchema->onEntityTypeCreate($this->entityType);
   }
@@ -522,7 +522,7 @@ public function testGetSchemaTranslatable() {
 
     $this->storage->expects($this->any())
       ->method('getDataTable')
-      ->will($this->returnValue('entity_test_field_data'));
+      ->willReturn('entity_test_field_data');
 
     $this->setUpStorageDefinition('langcode', [
       'columns' => [
@@ -604,7 +604,7 @@ public function testGetSchemaTranslatable() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->assertNull(
       $this->storageSchema->onEntityTypeCreate($this->entityType)
@@ -640,14 +640,14 @@ public function testGetSchemaRevisionableTranslatable() {
 
     $this->entityType->expects($this->any())
       ->method('isRevisionable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->any())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->storage->expects($this->exactly(30))
       ->method('getRevisionTable')
-      ->will($this->returnValue('entity_test_revision'));
+      ->willReturn('entity_test_revision');
 
     $this->setUpStorageDefinition('revision_id', [
       'columns' => [
@@ -822,7 +822,7 @@ public function testGetSchemaRevisionableTranslatable() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->storageSchema->onEntityTypeCreate($this->entityType);
   }
@@ -888,20 +888,20 @@ public function testDedicatedTableSchema() {
     $field_storage
       ->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('shape'));
+      ->willReturn('shape');
     $field_storage
       ->expects($this->any())
       ->method('getTargetEntityTypeId')
-      ->will($this->returnValue($entity_type_id));
+      ->willReturn($entity_type_id);
     $field_storage
       ->expects($this->any())
       ->method('isMultiple')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->storageDefinitions['id']
       ->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('integer'));
+      ->willReturn('integer');
 
     $expected = [
       $entity_type_id . '__' . $field_name => [
@@ -975,8 +975,8 @@ public function testDedicatedTableSchema() {
           $field_name . '_color' => [[$field_name . '_color', 3]],
         ],
         'unique keys' => [
-           $field_name . '_area' => [$field_name . '_area'],
-           $field_name . '_shape' => [[$field_name . '_shape', 10]],
+          $field_name . '_area' => [$field_name . '_area'],
+          $field_name . '_shape' => [[$field_name . '_shape', 10]],
         ],
         'foreign keys' => [
           $field_name . '_color' => [
@@ -997,7 +997,7 @@ public function testDedicatedTableSchema() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->assertNull(
       $this->storageSchema->onFieldStorageDefinitionCreate($field_storage)
@@ -1049,20 +1049,20 @@ public function testDedicatedTableSchemaForEntityWithStringIdentifier() {
     $field_storage
       ->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('shape'));
+      ->willReturn('shape');
     $field_storage
       ->expects($this->any())
       ->method('getTargetEntityTypeId')
-      ->will($this->returnValue($entity_type_id));
+      ->willReturn($entity_type_id);
     $field_storage
       ->expects($this->any())
       ->method('isMultiple')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->storageDefinitions['id']
       ->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('string'));
+      ->willReturn('string');
 
     $expected = [
       $entity_type_id . '__' . $field_name => [
@@ -1142,7 +1142,7 @@ public function testDedicatedTableSchemaForEntityWithStringIdentifier() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->assertNull(
       $this->storageSchema->onFieldStorageDefinitionCreate($field_storage)
@@ -1316,7 +1316,7 @@ public function testRequiresEntityStorageSchemaChanges(ContentEntityTypeInterfac
     $table_mapping->setExtraColumns('entity_test', ['default_langcode']);
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     // Setup storage schema.
     if ($change_schema) {
@@ -1357,22 +1357,22 @@ protected function setUpStorageSchema(array $expected = []) {
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityType->id())
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getActiveDefinition')
       ->with($this->entityType->id())
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldStorageDefinitions')
       ->with($this->entityType->id())
-      ->will($this->returnValue($this->storageDefinitions));
+      ->willReturn($this->storageDefinitions);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getActiveFieldStorageDefinitions')
       ->with($this->entityType->id())
-      ->will($this->returnValue($this->storageDefinitions));
+      ->willReturn($this->storageDefinitions);
 
     $this->dbSchemaHandler = $this->getMockBuilder('Drupal\Core\Database\Schema')
       ->disableOriginalConstructor()
@@ -1403,7 +1403,7 @@ protected function setUpStorageSchema(array $expected = []) {
       ->getMock();
     $connection->expects($this->any())
       ->method('schema')
-      ->will($this->returnValue($this->dbSchemaHandler));
+      ->willReturn($this->dbSchemaHandler);
 
     $key_value = $this->createMock('Drupal\Core\KeyValueStore\KeyValueStoreInterface');
 
@@ -1423,7 +1423,7 @@ protected function setUpStorageSchema(array $expected = []) {
     $this->storageSchema
       ->expects($this->any())
       ->method('installedStorageSchema')
-      ->will($this->returnValue($key_value));
+      ->willReturn($key_value);
     $this->storageSchema
       ->expects($this->any())
       ->method('isTableEmpty')
@@ -1443,18 +1443,18 @@ public function setUpStorageDefinition($field_name, array $schema) {
     $this->storageDefinitions[$field_name] = $this->createMock('Drupal\Tests\Core\Field\TestBaseFieldDefinitionInterface');
     $this->storageDefinitions[$field_name]->expects($this->any())
       ->method('isBaseField')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     // getName() is called once for each table.
     $this->storageDefinitions[$field_name]->expects($this->any())
       ->method('getName')
-      ->will($this->returnValue($field_name));
+      ->willReturn($field_name);
     // getSchema() is called once for each table.
     $this->storageDefinitions[$field_name]->expects($this->any())
       ->method('getSchema')
-      ->will($this->returnValue($schema));
+      ->willReturn($schema);
     $this->storageDefinitions[$field_name]->expects($this->any())
       ->method('getColumns')
-      ->will($this->returnValue($schema['columns']));
+      ->willReturn($schema['columns']);
     // Add property definitions.
     if (!empty($schema['columns'])) {
       $property_definitions = [];
@@ -1462,11 +1462,11 @@ public function setUpStorageDefinition($field_name, array $schema) {
         $property_definitions[$column] = $this->createMock('Drupal\Core\TypedData\DataDefinitionInterface');
         $property_definitions[$column]->expects($this->any())
           ->method('isRequired')
-          ->will($this->returnValue(!empty($info['not null'])));
+          ->willReturn(!empty($info['not null']));
       }
       $this->storageDefinitions[$field_name]->expects($this->any())
         ->method('getPropertyDefinitions')
-        ->will($this->returnValue($property_definitions));
+        ->willReturn($property_definitions);
     }
   }
 
@@ -1520,7 +1520,7 @@ public function testonEntityTypeUpdateWithNewIndex() {
 
     $this->storageSchema->expects($this->any())
       ->method('getTableMapping')
-      ->will($this->returnValue($table_mapping));
+      ->willReturn($table_mapping);
 
     $this->storageSchema->expects($this->any())
       ->method('loadEntitySchemaData')
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
index 22999fa6e..298dd150d 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/Sql/SqlContentEntityStorageTest.php
@@ -117,7 +117,7 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('Drupal\Core\Entity\ContentEntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
 
     $this->container = new ContainerBuilder();
     \Drupal::setContainer($this->container);
@@ -130,7 +130,7 @@ protected function setUp(): void {
     $this->languageManager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getDefaultLanguage')
-      ->will($this->returnValue(new Language(['langcode' => 'en'])));
+      ->willReturn(new Language(['langcode' => 'en']));
     $this->connection = $this->getMockBuilder('Drupal\Core\Database\Connection')
       ->disableOriginalConstructor()
       ->getMock();
@@ -198,10 +198,10 @@ public function providerTestGetBaseTable() {
   public function testGetRevisionTable($revision_table, $expected) {
     $this->entityType->expects($this->any())
       ->method('isRevisionable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->once())
       ->method('getRevisionTable')
-      ->will($this->returnValue($revision_table));
+      ->willReturn($revision_table);
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
       ->willReturn([]);
@@ -239,10 +239,10 @@ public function providerTestGetRevisionTable() {
   public function testGetDataTable() {
     $this->entityType->expects($this->any())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->exactly(1))
       ->method('getDataTable')
-      ->will($this->returnValue('entity_test_field_data'));
+      ->willReturn('entity_test_field_data');
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
       ->willReturn([]);
@@ -269,16 +269,16 @@ public function testGetDataTable() {
   public function testGetRevisionDataTable($revision_data_table, $expected) {
     $this->entityType->expects($this->any())
       ->method('isRevisionable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->any())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->exactly(1))
       ->method('getDataTable')
-      ->will($this->returnValue('entity_test_field_data'));
+      ->willReturn('entity_test_field_data');
     $this->entityType->expects($this->once())
       ->method('getRevisionDataTable')
-      ->will($this->returnValue($revision_data_table));
+      ->willReturn($revision_data_table);
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
       ->willReturn([]);
@@ -316,10 +316,10 @@ public function providerTestGetRevisionDataTable() {
   public function testSetTableMapping() {
     $this->entityType->expects($this->any())
       ->method('isRevisionable')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->entityType->expects($this->any())
       ->method('isTranslatable')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
       ->willReturn([]);
@@ -336,13 +336,13 @@ public function testSetTableMapping() {
     $updated_entity_type = $this->createMock('Drupal\Core\Entity\ContentEntityTypeInterface');
     $updated_entity_type->expects($this->any())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
     $updated_entity_type->expects($this->any())
       ->method('isRevisionable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $updated_entity_type->expects($this->any())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $table_mapping = new DefaultTableMapping($updated_entity_type, []);
     $this->entityStorage->setTableMapping($table_mapping);
@@ -370,14 +370,14 @@ public function testOnEntityTypeCreate() {
     $this->fieldDefinitions = $this->mockFieldDefinitions(['id']);
     $this->fieldDefinitions['id']->expects($this->any())
       ->method('getColumns')
-      ->will($this->returnValue($columns));
+      ->willReturn($columns);
     $this->fieldDefinitions['id']->expects($this->once())
       ->method('getSchema')
-      ->will($this->returnValue(['columns' => $columns]));
+      ->willReturn(['columns' => $columns]);
 
     $this->entityType->expects($this->once())
       ->method('getKeys')
-      ->will($this->returnValue(['id' => 'id']));
+      ->willReturn(['id' => 'id']);
     $this->entityType->expects($this->any())
       ->method('hasKey')
       ->willReturnMap([
@@ -423,7 +423,7 @@ public function testOnEntityTypeCreate() {
 
     $this->connection->expects($this->once())
       ->method('schema')
-      ->will($this->returnValue($schema_handler));
+      ->willReturn($schema_handler);
 
     $storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
       ->setConstructorArgs([$this->entityType, $this->connection, $this->entityFieldManager, $this->cache, $this->languageManager, new MemoryCache(), $this->entityTypeBundleInfo, $this->entityTypeManager])
@@ -438,12 +438,12 @@ public function testOnEntityTypeCreate() {
     $schema_handler
       ->expects($this->any())
       ->method('installedStorageSchema')
-      ->will($this->returnValue($key_value));
+      ->willReturn($key_value);
 
     $storage
       ->expects($this->any())
       ->method('getStorageSchema')
-      ->will($this->returnValue($schema_handler));
+      ->willReturn($schema_handler);
 
     $storage->onEntityTypeCreate($this->entityType);
   }
@@ -592,7 +592,7 @@ public function testGetTableMappingRevisionable(array $entity_keys) {
 
     $this->entityType->expects($this->exactly(4))
       ->method('isRevisionable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->any())
       ->method('getKey')
       ->willReturnMap([
@@ -603,7 +603,7 @@ public function testGetTableMappingRevisionable(array $entity_keys) {
       ]);
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->setUpEntityStorage();
 
@@ -665,7 +665,7 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) {
 
       $this->entityType->expects($this->exactly(4))
         ->method('isRevisionable')
-        ->will($this->returnValue(TRUE));
+        ->willReturn(TRUE);
       $this->entityType->expects($this->any())
         ->method('getKey')
         ->willReturnMap([
@@ -677,7 +677,7 @@ public function testGetTableMappingRevisionableWithFields(array $entity_keys) {
 
       $this->entityType->expects($this->any())
         ->method('getRevisionMetadataKeys')
-        ->will($this->returnValue($revision_metadata_field_names));
+        ->willReturn($revision_metadata_field_names);
 
       $this->setUpEntityStorage();
 
@@ -716,10 +716,10 @@ public function testGetTableMappingTranslatable(array $entity_keys) {
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('getDataTable')
-      ->will($this->returnValue('entity_test_field_data'));
+      ->willReturn('entity_test_field_data');
     $this->entityType->expects($this->any())
       ->method('getKey')
       ->willReturnMap([
@@ -776,10 +776,10 @@ public function testGetTableMappingTranslatableWithFields(array $entity_keys) {
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('getDataTable')
-      ->will($this->returnValue('entity_test_field_data'));
+      ->willReturn('entity_test_field_data');
     $this->entityType->expects($this->any())
       ->method('getKey')
       ->willReturnMap([
@@ -843,13 +843,13 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys)
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isRevisionable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('isTranslatable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('getDataTable')
-      ->will($this->returnValue('entity_test_field_data'));
+      ->willReturn('entity_test_field_data');
     $this->entityType->expects($this->any())
       ->method('getKey')
       ->willReturnMap([
@@ -861,7 +861,7 @@ public function testGetTableMappingRevisionableTranslatable(array $entity_keys)
       ]);
     $this->entityType->expects($this->any())
       ->method('getRevisionMetadataKeys')
-      ->will($this->returnValue($revision_metadata_keys));
+      ->willReturn($revision_metadata_keys);
 
     $this->fieldDefinitions = $this->mockFieldDefinitions(array_values($revision_metadata_keys), ['isRevisionable' => TRUE]);
 
@@ -970,13 +970,13 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent
 
       $this->entityType->expects($this->atLeastOnce())
         ->method('isRevisionable')
-        ->will($this->returnValue(TRUE));
+        ->willReturn(TRUE);
       $this->entityType->expects($this->atLeastOnce())
         ->method('isTranslatable')
-        ->will($this->returnValue(TRUE));
+        ->willReturn(TRUE);
       $this->entityType->expects($this->atLeastOnce())
         ->method('getDataTable')
-        ->will($this->returnValue('entity_test_field_data'));
+        ->willReturn('entity_test_field_data');
       $this->entityType->expects($this->any())
         ->method('getKey')
         ->willReturnMap([
@@ -988,7 +988,7 @@ public function testGetTableMappingRevisionableTranslatableWithFields(array $ent
         ]);
       $this->entityType->expects($this->any())
         ->method('getRevisionMetadataKeys')
-        ->will($this->returnValue($revision_metadata_field_names));
+        ->willReturn($revision_metadata_field_names);
 
       $this->setUpEntityStorage();
 
@@ -1068,7 +1068,7 @@ public function testCreate() {
     $language = new Language(['id' => 'en']);
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue($language));
+      ->willReturn($language);
 
     $entity = $this->getMockBuilder('Drupal\Core\Entity\ContentEntityBase')
       ->disableOriginalConstructor()
@@ -1077,34 +1077,34 @@ public function testCreate() {
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
     $this->entityType->expects($this->atLeastOnce())
       ->method('getClass')
-      ->will($this->returnValue(get_class($entity)));
+      ->willReturn(get_class($entity));
     $this->entityType->expects($this->atLeastOnce())
       ->method('getKeys')
-      ->will($this->returnValue(['id' => 'id']));
+      ->willReturn(['id' => 'id']);
 
     // ContentEntityStorageBase iterates over the entity which calls this method
     // internally in ContentEntityBase::getProperties().
     $this->entityFieldManager->expects($this->once())
       ->method('getFieldDefinitions')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isRevisionable')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->entityTypeManager->expects($this->atLeastOnce())
       ->method('getDefinition')
       ->with($this->entityType->id())
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->setUpEntityStorage();
 
     $entity = $this->entityStorage->create();
     $entity->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue('foo'));
+      ->willReturn('foo');
 
     $this->assertInstanceOf('Drupal\Core\Entity\EntityInterface', $entity);
     $this->assertSame('foo', $entity->id());
@@ -1135,7 +1135,7 @@ protected function mockFieldDefinitions(array $field_names, $methods = []) {
       $definition
         ->expects($this->any())
         ->method($method)
-        ->will($this->returnValue($result));
+        ->willReturn($result);
     }
 
     // Assign field names to mock definitions.
@@ -1144,7 +1144,7 @@ protected function mockFieldDefinitions(array $field_names, $methods = []) {
       $field_definitions[$field_name]
         ->expects($this->any())
         ->method('getName')
-        ->will($this->returnValue($field_name));
+        ->willReturn($field_name);
     }
 
     return $field_definitions;
@@ -1160,19 +1160,19 @@ protected function setUpEntityStorage() {
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getActiveDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldStorageDefinitions')
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getActiveFieldStorageDefinitions')
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entityStorage = new SqlContentEntityStorage($this->entityType, $this->connection, $this->entityFieldManager, $this->cache, $this->languageManager, new MemoryCache(), $this->entityTypeBundleInfo, $this->entityTypeManager);
     $this->entityStorage->setModuleHandler($this->moduleHandler);
@@ -1192,19 +1192,19 @@ public function testLoadMultiplePersistentCached() {
       ->getMockForAbstractClass();
     $entity->expects($this->any())
       ->method('id')
-      ->will($this->returnValue($id));
+      ->willReturn($id);
 
     $this->entityType->expects($this->atLeastOnce())
       ->method('isPersistentlyCacheable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
 
     $this->cache->expects($this->once())
       ->method('getMultiple')
       ->with([$key])
-      ->will($this->returnValue([$key => (object) ['data' => $entity]]));
+      ->willReturn([$key => (object) ['data' => $entity]]);
     $this->cache->expects($this->never())
       ->method('set');
 
@@ -1227,14 +1227,14 @@ public function testLoadMultipleNoPersistentCache() {
       ->getMockForAbstractClass();
     $entity->expects($this->any())
       ->method('id')
-      ->will($this->returnValue($id));
+      ->willReturn($id);
 
     $this->entityType->expects($this->any())
       ->method('isPersistentlyCacheable')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
 
     // There should be no calls to the cache backend for an entity type without
     // persistent caching.
@@ -1245,7 +1245,7 @@ public function testLoadMultipleNoPersistentCache() {
 
     $this->entityTypeManager->expects($this->any())
       ->method('getActiveDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
       ->setConstructorArgs([$this->entityType, $this->connection, $this->entityFieldManager, $this->cache, $this->languageManager, new MemoryCache(), $this->entityTypeBundleInfo, $this->entityTypeManager])
@@ -1258,7 +1258,7 @@ public function testLoadMultipleNoPersistentCache() {
     $entity_storage->expects($this->once())
       ->method('getFromStorage')
       ->with([$id])
-      ->will($this->returnValue([$id => $entity]));
+      ->willReturn([$id => $entity]);
 
     $entities = $entity_storage->loadMultiple([$id]);
     $this->assertEquals($entity, $entities[$id]);
@@ -1278,14 +1278,14 @@ public function testLoadMultiplePersistentCacheMiss() {
       ->getMockForAbstractClass();
     $entity->expects($this->any())
       ->method('id')
-      ->will($this->returnValue($id));
+      ->willReturn($id);
 
     $this->entityType->expects($this->any())
       ->method('isPersistentlyCacheable')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->entityType->expects($this->atLeastOnce())
       ->method('id')
-      ->will($this->returnValue($this->entityTypeId));
+      ->willReturn($this->entityTypeId);
 
     // In case of a cache miss, the entity is loaded from the storage and then
     // set in the cache.
@@ -1293,7 +1293,7 @@ public function testLoadMultiplePersistentCacheMiss() {
     $this->cache->expects($this->once())
       ->method('getMultiple')
       ->with([$key])
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->cache->expects($this->once())
       ->method('setMultiple')
       ->with([
@@ -1305,7 +1305,7 @@ public function testLoadMultiplePersistentCacheMiss() {
 
     $this->entityTypeManager->expects($this->any())
       ->method('getActiveDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $entity_storage = $this->getMockBuilder('Drupal\Core\Entity\Sql\SqlContentEntityStorage')
       ->setConstructorArgs([$this->entityType, $this->connection, $this->entityFieldManager, $this->cache, $this->languageManager, new MemoryCache(), $this->entityTypeBundleInfo, $this->entityTypeManager])
@@ -1318,7 +1318,7 @@ public function testLoadMultiplePersistentCacheMiss() {
     $entity_storage->expects($this->once())
       ->method('getFromStorage')
       ->with([$id])
-      ->will($this->returnValue([$id => $entity]));
+      ->willReturn([$id => $entity]);
 
     $entities = $entity_storage->loadMultiple([$id]);
     $this->assertEquals($entity, $entities[$id]);
@@ -1355,19 +1355,19 @@ public function testHasData() {
 
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityTypeManager->expects($this->any())
       ->method('getActiveDefinition')
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldStorageDefinitions')
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entityFieldManager->expects($this->any())
       ->method('getActiveFieldStorageDefinitions')
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entityStorage = new SqlContentEntityStorage($this->entityType, $database, $this->entityFieldManager, $this->cache, $this->languageManager, new MemoryCache(), $this->entityTypeBundleInfo, $this->entityTypeManager);
 
@@ -1413,7 +1413,7 @@ public function testCleanIds() {
     $this->fieldDefinitions = $this->mockFieldDefinitions(['id']);
     $this->fieldDefinitions['id']->expects($this->any())
       ->method('getType')
-      ->will($this->returnValue('integer'));
+      ->willReturn('integer');
 
     $this->setUpEntityStorage();
 
@@ -1460,8 +1460,7 @@ protected function setUpModuleHandlerNoImplementations() {
 }
 
 /**
- * Provides an entity with dummy implementations of static methods, because
- * those cannot be mocked.
+ * Provides an entity with dummy implementations of static methods.
  */
 abstract class SqlContentEntityStorageTestEntityInterface implements EntityInterface {
 
diff --git a/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php b/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
index 67baf44dc..d515a5be6 100644
--- a/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Entity/TypedData/EntityAdapterUnitTest.php
@@ -133,16 +133,16 @@ protected function setUp(): void {
     $this->entityType = $this->createMock('\Drupal\Core\Entity\EntityTypeInterface');
     $this->entityType->expects($this->any())
       ->method('getKeys')
-      ->will($this->returnValue([
+      ->willReturn([
         'id' => 'id',
         'uuid' => 'uuid',
-    ]));
+      ]);
 
     $this->entityTypeManager = $this->createMock(EntityTypeManagerInterface::class);
     $this->entityTypeManager->expects($this->any())
       ->method('getDefinition')
       ->with($this->entityTypeId)
-      ->will($this->returnValue($this->entityType));
+      ->willReturn($this->entityType);
 
     $this->uuid = $this->createMock('\Drupal\Component\Uuid\UuidInterface');
 
@@ -150,7 +150,7 @@ protected function setUp(): void {
     $this->typedDataManager->expects($this->any())
       ->method('getDefinition')
       ->with('entity')
-      ->will($this->returnValue(['class' => '\Drupal\Core\Entity\Plugin\DataType\EntityAdapter']));
+      ->willReturn(['class' => '\Drupal\Core\Entity\Plugin\DataType\EntityAdapter']);
     $this->typedDataManager->expects($this->any())
       ->method('getDefaultConstraints')
       ->willReturn([]);
@@ -169,22 +169,22 @@ protected function setUp(): void {
     $this->languageManager = $this->createMock('\Drupal\Core\Language\LanguageManagerInterface');
     $this->languageManager->expects($this->any())
       ->method('getLanguages')
-      ->will($this->returnValue([LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified]));
+      ->willReturn([LanguageInterface::LANGCODE_NOT_SPECIFIED => $not_specified]);
 
     $this->languageManager->expects($this->any())
       ->method('getLanguage')
       ->with(LanguageInterface::LANGCODE_NOT_SPECIFIED)
-      ->will($this->returnValue($not_specified));
+      ->willReturn($not_specified);
 
     $this->fieldTypePluginManager = $this->getMockBuilder('\Drupal\Core\Field\FieldTypePluginManager')
       ->disableOriginalConstructor()
       ->getMock();
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultStorageSettings')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
     $this->fieldTypePluginManager->expects($this->any())
       ->method('getDefaultFieldSettings')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->fieldItemList = $this->createMock('\Drupal\Core\Field\FieldItemListInterface');
     $this->fieldTypePluginManager->expects($this->any())
@@ -209,7 +209,7 @@ protected function setUp(): void {
     $this->entityFieldManager->expects($this->any())
       ->method('getFieldDefinitions')
       ->with($this->entityTypeId, $this->bundle)
-      ->will($this->returnValue($this->fieldDefinitions));
+      ->willReturn($this->fieldDefinitions);
 
     $this->entity = $this->getMockForAbstractClass('\Drupal\Core\Entity\ContentEntityBase', [$values, $this->entityTypeId, $this->bundle]);
 
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
index 5367e6523..e8b190f13 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/CustomPageExceptionHtmlSubscriberTest.php
@@ -54,7 +54,7 @@ class CustomPageExceptionHtmlSubscriberTest extends UnitTestCase {
   /**
    * The tested custom page exception subscriber.
    *
-   * @var \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber|\Drupal\Tests\Core\EventSubscriber\TestCustomPageExceptionHtmlSubscriber
+   * @var \Drupal\Core\EventSubscriber\CustomPageExceptionHtmlSubscriber|\Drupal\Tests\Core\EventSubscriber\CustomPageExceptionHtmlSubscriberTest
    */
   protected $customPageSubscriber;
 
diff --git a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
index aff4ecc17..5bd7520a7 100644
--- a/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/EventSubscriber/ModuleRouteSubscriberTest.php
@@ -17,10 +17,13 @@ class ModuleRouteSubscriberTest extends UnitTestCase {
   /**
    * The mock module handler.
    *
-   * @var Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $moduleHandler;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface');
 
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php
index 70809aabb..d087b76b0 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ExtensionDiscoveryTest.php
@@ -127,6 +127,13 @@ protected function populateFilesystemStructure(array &$filesystem_structure) {
       'core/profiles/minimal/minimal.info.yml' => [
         'type' => 'profile',
       ],
+      'core/themes/test_theme/test_theme.info.yml' => [
+        'type' => 'theme',
+      ],
+      // Override the core instance of the 'test_theme' theme.
+      'sites/default/themes/test_theme/test_theme.info.yml' => [
+        'type' => 'theme',
+      ],
       // Override the core instance of the 'minimal' profile.
       'sites/default/profiles/minimal/minimal.info.yml' => [
         'type' => 'profile',
@@ -141,13 +148,6 @@ protected function populateFilesystemStructure(array &$filesystem_structure) {
       'core/modules/user/user.info.yml' => [],
       'profiles/other_profile/modules/other_profile_nested_module/other_profile_nested_module.info.yml' => [],
       'core/modules/system/system.info.yml' => [],
-      'core/themes/seven/seven.info.yml' => [
-        'type' => 'theme',
-      ],
-      // Override the core instance of the 'seven' theme.
-      'sites/default/themes/seven/seven.info.yml' => [
-        'type' => 'theme',
-      ],
       'modules/devel/devel.info.yml' => [],
       'modules/poorly_placed_theme/poorly_placed_theme.info.yml' => [
         'type' => 'theme',
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
index 355507a5f..6edf3f03e 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php
@@ -478,7 +478,7 @@ public function testWriteCache() {
     $this->cacheBackend
       ->expects($this->exactly(2))
       ->method('get')
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
     $this->cacheBackend
       ->expects($this->exactly(2))
       ->method('set')
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php
index a2571764b..d3b5e03ea 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ModuleRequiredByThemesUninstallValidatorTest.php
@@ -49,8 +49,8 @@ protected function setUp(): void {
    */
   public function testValidateNoThemeDependency() {
     $this->themeExtensionList->getAllInstalledInfo()->willReturn([
-      'stable' => [
-        'name' => 'Stable',
+      'stable9' => [
+        'name' => 'Stable 9',
         'dependencies' => [],
       ],
       'claro' => [
@@ -74,8 +74,8 @@ public function testValidateOneThemeDependency() {
     $theme = 'one_theme';
     $theme_name = 'One Theme';
     $this->themeExtensionList->getAllInstalledInfo()->willReturn([
-      'stable' => [
-        'name' => 'Stable',
+      'stable9' => [
+        'name' => 'Stable 9',
         'dependencies' => [],
       ],
       'claro' => [
@@ -115,8 +115,8 @@ public function testValidateTwoThemeDependencies() {
     $theme_name_1 = 'First Theme';
     $theme_name_2 = 'Second Theme';
     $this->themeExtensionList->getAllInstalledInfo()->willReturn([
-      'stable' => [
-        'name' => 'Stable',
+      'stable9' => [
+        'name' => 'Stable 9',
         'dependencies' => [],
       ],
       'claro' => [
diff --git a/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
index fcf69c16b..4435380e6 100644
--- a/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Extension/ThemeHandlerTest.php
@@ -64,7 +64,7 @@ protected function setUp(): void {
     $container->expects($this->any())
       ->method('get')
       ->with('class_loader')
-      ->will($this->returnValue($this->createMock(ClassLoader::class)));
+      ->willReturn($this->createMock(ClassLoader::class));
     \Drupal::setContainer($container);
   }
 
@@ -79,19 +79,19 @@ public function testRebuildThemeData() {
       ->willReturnSelf();
     $this->themeList->expects($this->once())
       ->method('getList')
-      ->will($this->returnValue([
-        'seven' => new Extension($this->root, 'theme', 'core/themes/seven/seven.info.yml', 'seven.theme'),
-      ]));
+      ->willReturn([
+        'stark' => new Extension($this->root, 'theme', 'core/themes/stark/stark.info.yml', 'stark.theme'),
+      ]);
 
     $theme_data = $this->themeHandler->rebuildThemeData();
     $this->assertCount(1, $theme_data);
-    $info = $theme_data['seven'];
+    $info = $theme_data['stark'];
 
     // Ensure some basic properties.
     $this->assertInstanceOf('Drupal\Core\Extension\Extension', $info);
-    $this->assertEquals('seven', $info->getName());
-    $this->assertEquals('core/themes/seven/seven.info.yml', $info->getPathname());
-    $this->assertEquals('core/themes/seven/seven.theme', $info->getExtensionPathname());
+    $this->assertEquals('stark', $info->getName());
+    $this->assertEquals('core/themes/stark/stark.info.yml', $info->getPathname());
+    $this->assertEquals('core/themes/stark/stark.theme', $info->getExtensionPathname());
 
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php b/web/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php
index 980e71532..1ef112f65 100644
--- a/web/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Field/BaseFieldDefinitionTestBase.php
@@ -36,7 +36,7 @@ protected function setUp() {
     $module_handler->expects($this->once())
       ->method('moduleExists')
       ->with($module_name)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $typed_data_manager = $this->createMock(TypedDataManagerInterface::class);
     $plugin_manager = new FieldTypePluginManager(
       $namespaces,
diff --git a/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php b/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
index 6cbac0d67..bff677cec 100644
--- a/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Field/FieldDefinitionListenerTest.php
@@ -6,7 +6,6 @@
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface;
 use Drupal\Core\Entity\EntityFieldManagerInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
@@ -78,16 +77,12 @@ protected function setUp(): void {
    *   (optional) An array of entity type definitions.
    */
   protected function setUpEntityTypeManager($definitions = []) {
-    $class = $this->getMockClass(EntityInterface::class);
     foreach ($definitions as $key => $entity_type) {
       // \Drupal\Core\Entity\EntityTypeInterface::getLinkTemplates() is called
       // by \Drupal\Core\Entity\EntityTypeManager::processDefinition() so it must
       // always be mocked.
       $entity_type->getLinkTemplates()->willReturn([]);
 
-      // Give the entity type a legitimate class to return.
-      $entity_type->getClass()->willReturn($class);
-
       $definitions[$key] = $entity_type->reveal();
     }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php b/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
index b213a2076..a49f269aa 100644
--- a/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Field/FieldItemListTest.php
@@ -47,7 +47,7 @@ public function testEquals($expected, FieldItemInterface $first_field_item = NUL
     $field_storage_definition = $this->createMock('Drupal\Core\Field\FieldStorageDefinitionInterface');
     $field_storage_definition->expects($this->any())
       ->method('getPropertyDefinitions')
-      ->will($this->returnValue($property_definitions));
+      ->willReturn($property_definitions);
     $field_definition = $this->createMock('Drupal\Core\Field\FieldDefinitionInterface');
     $field_definition->expects($this->any())
       ->method('getFieldStorageDefinition')
@@ -193,7 +193,7 @@ public function testHasAffectingChanges($expected, FieldItemInterface $first_fie
     $field_storage_definition = $this->createMock('Drupal\Core\Field\FieldStorageDefinitionInterface');
     $field_storage_definition->expects($this->any())
       ->method('getPropertyDefinitions')
-      ->will($this->returnValue($property_definitions));
+      ->willReturn($property_definitions);
 
     $field_definition = $this->createMock(FieldDefinitionInterface::class);
     $field_definition->expects($this->any())
@@ -251,7 +251,7 @@ public function testEqualsEmptyItems() {
     $field_storage_definition = $this->createMock('Drupal\Core\Field\FieldStorageDefinitionInterface');
     $field_storage_definition->expects($this->any())
       ->method('getPropertyDefinitions')
-      ->will($this->returnValue($property_definitions));
+      ->willReturn($property_definitions);
     $field_definition = $this->createMock('Drupal\Core\Field\FieldDefinitionInterface');
     $field_definition->expects($this->any())
       ->method('getFieldStorageDefinition')
diff --git a/web/core/tests/Drupal/Tests/Core/File/FileSystemTest.php b/web/core/tests/Drupal/Tests/Core/File/FileSystemTest.php
index aa4ec558a..acfb1d643 100644
--- a/web/core/tests/Drupal/Tests/Core/File/FileSystemTest.php
+++ b/web/core/tests/Drupal/Tests/Core/File/FileSystemTest.php
@@ -144,18 +144,6 @@ public function providerTestBasename() {
   protected function assertFilePermissions(int $expected_mode, string $uri, string $message = ''): void {
     // Mask out all but the last three octets.
     $actual_mode = fileperms($uri) & 0777;
-
-    // PHP on Windows has limited support for file permissions. Usually each of
-    // "user", "group" and "other" use one octal digit (3 bits) to represent the
-    // read/write/execute bits. On Windows, chmod() ignores the "group" and
-    // "other" bits, and fileperms() returns the "user" bits in all three
-    // positions. $expected_mode is updated to reflect this.
-    if (substr(PHP_OS, 0, 3) == 'WIN') {
-      // Reset the "group" and "other" bits.
-      $expected_mode = $expected_mode & 0700;
-      // Shift the "user" bits to the "group" and "other" positions also.
-      $expected_mode = $expected_mode | $expected_mode >> 3 | $expected_mode >> 6;
-    }
     $this->assertSame($expected_mode, $actual_mode, $message);
   }
 
@@ -166,6 +154,7 @@ protected function assertFilePermissions(int $expected_mode, string $uri, string
    */
   public function testInvalidUTF8() {
     vfsStream::setup('dir');
+    // cspell:disable-next-line
     $filename = "a\xFFsdf\x80€" . '.txt';
     $this->expectException(FileException::class);
     $this->expectExceptionMessage("Invalid filename '$filename'");
diff --git a/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php b/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php
index b7f78627f..f50abc125 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/ConfirmFormHelperTest.php
@@ -24,7 +24,7 @@ public function testCancelLinkTitle() {
     $form = $this->createMock('Drupal\Core\Form\ConfirmFormInterface');
     $form->expects($this->any())
       ->method('getCancelText')
-      ->will($this->returnValue($cancel_text));
+      ->willReturn($cancel_text);
 
     $link = ConfirmFormHelper::buildCancelLink($form, new Request());
     $this->assertSame($cancel_text, $link['#title']);
@@ -42,7 +42,7 @@ public function testCancelLinkRoute() {
     $form = $this->createMock('Drupal\Core\Form\ConfirmFormInterface');
     $form->expects($this->any())
       ->method('getCancelUrl')
-      ->will($this->returnValue($cancel_route));
+      ->willReturn($cancel_route);
     $link = ConfirmFormHelper::buildCancelLink($form, new Request());
     $this->assertEquals(Url::fromRoute($route_name), $link['#url']);
     $this->assertSame(['contexts' => ['url.query_args:destination']], $link['#cache']);
@@ -58,7 +58,7 @@ public function testCancelLinkRouteWithParams() {
     $form = $this->createMock('Drupal\Core\Form\ConfirmFormInterface');
     $form->expects($this->any())
       ->method('getCancelUrl')
-      ->will($this->returnValue($expected));
+      ->willReturn($expected);
     $link = ConfirmFormHelper::buildCancelLink($form, new Request());
     $this->assertEquals($expected, $link['#url']);
     $this->assertSame(['contexts' => ['url.query_args:destination']], $link['#cache']);
@@ -81,7 +81,7 @@ public function testCancelLinkRouteWithUrl() {
     $form = $this->createMock('Drupal\Core\Form\ConfirmFormInterface');
     $form->expects($this->any())
       ->method('getCancelUrl')
-      ->will($this->returnValue($cancel_route));
+      ->willReturn($cancel_route);
     $link = ConfirmFormHelper::buildCancelLink($form, new Request());
     $this->assertSame($cancel_route, $link['#url']);
     $this->assertSame(['contexts' => ['url.query_args:destination']], $link['#cache']);
diff --git a/web/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php b/web/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php
index 1f51ed6f4..2b66f9c24 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/EventSubscriber/FormAjaxSubscriberTest.php
@@ -221,8 +221,8 @@ public function testOnExceptionBrokenPostRequest() {
   public function testOnExceptionNestedException() {
     $form = ['#type' => 'form', '#build_id' => 'the_build_id'];
     $expected_form = $form + [
-        '#build_id_old' => 'the_build_id',
-      ];
+      '#build_id_old' => 'the_build_id',
+    ];
     $form_state = new FormState();
     $form_exception = new FormAjaxException($form, $form_state);
     $exception = new \Exception('', 0, $form_exception);
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
index ae287334b..ea6ad1899 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormBuilderTest.php
@@ -53,12 +53,25 @@ protected function setUp(): void {
 
   /**
    * Tests the getFormId() method with a string based form ID.
+   *
+   * @covers ::getFormId
    */
   public function testGetFormIdWithString() {
     $form_arg = 'foo';
     $form_state = new FormState();
     $this->expectException(\InvalidArgumentException::class);
-    $this->expectExceptionMessage('The form argument foo is not a valid form.');
+    $this->expectExceptionMessage('The form class foo could not be found or loaded.');
+    $this->formBuilder->getFormId($form_arg, $form_state);
+  }
+
+  /**
+   * @covers ::getFormId
+   */
+  public function testGetFormIdWithNonFormClass() {
+    $form_arg = __CLASS__;
+    $form_state = new FormState();
+    $this->expectException(\InvalidArgumentException::class);
+    $this->expectExceptionMessage("The form argument $form_arg must be an instance of \Drupal\Core\Form\FormInterface.");
     $this->formBuilder->getFormId($form_arg, $form_state);
   }
 
@@ -116,10 +129,10 @@ public function testGetFormIdWithBaseForm() {
     $form_arg = $this->createMock('Drupal\Core\Form\BaseFormIdInterface');
     $form_arg->expects($this->once())
       ->method('getFormId')
-      ->will($this->returnValue($expected_form_id));
+      ->willReturn($expected_form_id);
     $form_arg->expects($this->once())
       ->method('getBaseFormId')
-      ->will($this->returnValue($base_form_id));
+      ->willReturn($base_form_id);
 
     $form_state = new FormState();
     $form_id = $this->formBuilder->getFormId($form_arg, $form_state);
@@ -217,7 +230,7 @@ public function testHandleRedirectWithResponse() {
   public function testGetFormWithString() {
     $form_id = 'test_form_id';
     $this->expectException(\InvalidArgumentException::class);
-    $this->expectExceptionMessage('The form argument test_form_id is not a valid form.');
+    $this->expectExceptionMessage('The form class test_form_id could not be found or loaded.');
     $this->formBuilder->getForm($form_id);
   }
 
@@ -256,7 +269,7 @@ public function testGetFormWithClassString() {
   public function testBuildFormWithString() {
     $form_id = 'test_form_id';
     $this->expectException(\InvalidArgumentException::class);
-    $this->expectExceptionMessage('The form argument test_form_id is not a valid form.');
+    $this->expectExceptionMessage('The form class test_form_id could not be found or loaded.');
     $this->formBuilder->getForm($form_id);
   }
 
@@ -349,10 +362,10 @@ public function testRebuildForm() {
     $form_arg = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg->expects($this->exactly(2))
       ->method('getFormId')
-      ->will($this->returnValue($form_id));
+      ->willReturn($form_id);
     $form_arg->expects($this->exactly(4))
       ->method('buildForm')
-      ->will($this->returnValue($expected_form));
+      ->willReturn($expected_form);
 
     // Do an initial build of the form and track the build ID.
     $form_state = new FormState();
@@ -389,10 +402,10 @@ public function testRebuildFormOnGetRequest() {
     $form_arg = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg->expects($this->exactly(2))
       ->method('getFormId')
-      ->will($this->returnValue($form_id));
+      ->willReturn($form_id);
     $form_arg->expects($this->exactly(4))
       ->method('buildForm')
-      ->will($this->returnValue($expected_form));
+      ->willReturn($expected_form);
 
     // Do an initial build of the form and track the build ID.
     $form_state = new FormState();
@@ -429,10 +442,10 @@ public function testGetCache() {
     $form_arg = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg->expects($this->exactly(2))
       ->method('getFormId')
-      ->will($this->returnValue($form_id));
+      ->willReturn($form_id);
     $form_arg->expects($this->once())
       ->method('buildForm')
-      ->will($this->returnValue($expected_form));
+      ->willReturn($expected_form);
 
     // Do an initial build of the form and track the build ID.
     $form_state = (new FormState())
@@ -471,10 +484,10 @@ public function testUniqueHtmlId() {
     $form_arg = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg->expects($this->exactly(2))
       ->method('getFormId')
-      ->will($this->returnValue($form_id));
+      ->willReturn($form_id);
     $form_arg->expects($this->exactly(2))
       ->method('buildForm')
-      ->will($this->returnValue($expected_form));
+      ->willReturn($expected_form);
 
     $form_state = new FormState();
     $form = $this->simulateFormSubmission($form_id, $form_arg, $form_state);
@@ -497,17 +510,17 @@ public function testUniqueElementHtmlId() {
     $form_arg_1 = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg_1->expects($this->exactly(1))
       ->method('getFormId')
-      ->will($this->returnValue($form_id_1));
+      ->willReturn($form_id_1);
     $form_arg_1->expects($this->exactly(1))
       ->method('buildForm')
-      ->will($this->returnValue($expected_form));
+      ->willReturn($expected_form);
     $form_arg_2 = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg_2->expects($this->exactly(1))
       ->method('getFormId')
-      ->will($this->returnValue($form_id_2));
+      ->willReturn($form_id_2);
     $form_arg_2->expects($this->exactly(1))
       ->method('buildForm')
-      ->will($this->returnValue($expected_form));
+      ->willReturn($expected_form);
     $form_state = new FormState();
     $form_1 = $this->simulateFormSubmission($form_id_1, $form_arg_1, $form_state);
     $form_state = new FormState();
@@ -890,10 +903,10 @@ public function testFormTokenCacheability($token, $is_authenticated, $expected_f
     $form_arg = $this->createMock('Drupal\Core\Form\FormInterface');
     $form_arg->expects($this->once())
       ->method('getFormId')
-      ->will($this->returnValue($form_id));
+      ->willReturn($form_id);
     $form_arg->expects($this->once())
       ->method('buildForm')
-      ->will($this->returnValue($form));
+      ->willReturn($form);
 
     $form_state = new FormState();
     $built_form = $this->formBuilder->buildForm($form_arg, $form_state);
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
index a50b728b9..f55722f84 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormSubmitterTest.php
@@ -80,7 +80,7 @@ public function testHandleFormSubmissionWithResponses($class, $form_state_key) {
       ->getMock();
     $response->expects($this->any())
       ->method('prepare')
-      ->will($this->returnValue($response));
+      ->willReturn($response);
 
     $form_state = (new FormState())
       ->setSubmitted()
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php b/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
index 9798acf47..068e78ab8 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormTestBase.php
@@ -217,12 +217,12 @@ protected function getMockForm($form_id, $expected_form = NULL, $count = 1) {
     $form = $this->createMock('Drupal\Core\Form\FormInterface');
     $form->expects($this->once())
       ->method('getFormId')
-      ->will($this->returnValue($form_id));
+      ->willReturn($form_id);
 
     if ($expected_form) {
       $form->expects($this->exactly($count))
         ->method('buildForm')
-        ->will($this->returnValue($expected_form));
+        ->willReturn($expected_form);
     }
     return $form;
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php b/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
index 016d36916..eccceecc5 100644
--- a/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Form/FormValidatorTest.php
@@ -114,7 +114,7 @@ public function testValidateInvalidFormToken() {
     $request_stack->push($request);
     $this->csrfToken->expects($this->once())
       ->method('validate')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([$request_stack, $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
@@ -142,7 +142,7 @@ public function testValidateValidFormToken() {
     $request_stack = new RequestStack();
     $this->csrfToken->expects($this->once())
       ->method('validate')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $form_validator = $this->getMockBuilder('Drupal\Core\Form\FormValidator')
       ->setConstructorArgs([$request_stack, $this->getStringTranslationStub(), $this->csrfToken, $this->logger, $this->formErrorHandler])
diff --git a/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php b/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
index e0a15e2a8..ece030d51 100644
--- a/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Image/ImageTest.php
@@ -108,7 +108,7 @@ protected function getTestImage($load_expected = TRUE, array $stubs = []) {
 
     $this->toolkit->expects($this->any())
       ->method('getPluginId')
-      ->will($this->returnValue('gd'));
+      ->willReturn('gd');
 
     if (!$load_expected) {
       $this->toolkit->expects($this->never())
@@ -135,11 +135,11 @@ protected function getTestImageForOperation($class_name) {
 
     $this->toolkit->expects($this->any())
       ->method('getPluginId')
-      ->will($this->returnValue('gd'));
+      ->willReturn('gd');
 
     $this->toolkit->expects($this->any())
       ->method('getToolkitOperation')
-      ->will($this->returnValue($this->toolkitOperation));
+      ->willReturn($this->toolkitOperation);
 
     $this->image = new Image($this->toolkit, $this->source);
 
@@ -212,7 +212,7 @@ public function testSave() {
     $toolkit = $this->getToolkitMock();
     $toolkit->expects($this->once())
       ->method('save')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $image = new Image($toolkit, $this->image->getSource());
 
@@ -240,7 +240,7 @@ public function testSaveFails() {
     // This will fail if save() method isn't called on the toolkit.
     $this->toolkit->expects($this->once())
       ->method('save')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->assertFalse($this->image->save());
   }
@@ -254,7 +254,7 @@ public function testChmodFails() {
     $toolkit = $this->getToolkitMock();
     $toolkit->expects($this->once())
       ->method('save')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $image = new Image($toolkit, $this->image->getSource());
 
@@ -279,7 +279,7 @@ public function testChmodFails() {
    */
   public function testParseFileFails() {
     $toolkit = $this->getToolkitMock();
-    $image = new Image($toolkit, 'magic-foobars.png');
+    $image = new Image($toolkit, 'magic-foobar.png');
 
     $this->assertFalse($image->isValid());
     $this->assertFalse($image->save());
diff --git a/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php b/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
index a4c5aa5f0..f7e146f47 100644
--- a/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Language/LanguageUnitTest.php
@@ -63,7 +63,7 @@ public function testIsDefault() {
     $container->expects($this->any())
       ->method('get')
       ->with('language.default')
-      ->will($this->returnValue($language_default));
+      ->willReturn($language_default);
     \Drupal::setContainer($container);
 
     $language = new Language(['id' => $this->randomMachineName(2)]);
diff --git a/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php
index af9cc3875..30b147100 100644
--- a/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Layout/LayoutDefaultTest.php
@@ -30,6 +30,7 @@ public function testBuild($regions, $expected) {
       ],
     ]);
     $expected += [
+      '#in_preview' => FALSE,
       '#settings' => [
         'label' => '',
       ],
diff --git a/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php b/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
index 8074e53d9..be95c518a 100644
--- a/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Lock/LockBackendAbstractTest.php
@@ -17,6 +17,9 @@ class LockBackendAbstractTest extends UnitTestCase {
    */
   protected $lock;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->lock = $this->getMockForAbstractClass('Drupal\Core\Lock\LockBackendAbstract');
   }
@@ -28,7 +31,7 @@ public function testWaitFalse() {
     $this->lock->expects($this->any())
       ->method('lockMayBeAvailable')
       ->with($this->equalTo('test_name'))
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->assertFalse($this->lock->wait('test_name'));
   }
@@ -43,7 +46,7 @@ public function testWaitTrue() {
     $this->lock->expects($this->any())
       ->method('lockMayBeAvailable')
       ->with($this->equalTo('test_name'))
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->assertTrue($this->lock->wait('test_name', 1));
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php b/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
index 45c7bc423..e6c0b26e4 100644
--- a/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Logger/LoggerChannelTest.php
@@ -137,14 +137,14 @@ public function providerTestLog() {
     $account_mock = $this->createMock('Drupal\Core\Session\AccountInterface');
     $account_mock->expects($this->any())
       ->method('id')
-      ->will($this->returnValue(1));
+      ->willReturn(1);
 
     $request_mock = $this->getMockBuilder('Symfony\Component\HttpFoundation\Request')
       ->onlyMethods(['getClientIp'])
       ->getMock();
     $request_mock->expects($this->any())
       ->method('getClientIp')
-      ->will($this->returnValue('127.0.0.1'));
+      ->willReturn('127.0.0.1');
     $request_mock->headers = $this->createMock('Symfony\Component\HttpFoundation\ParameterBag');
 
     // No request or account.
diff --git a/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php b/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
index fae456308..814596df6 100644
--- a/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Mail/MailManagerTest.php
@@ -92,7 +92,7 @@ protected function setUp(): void {
     $this->discovery = $this->createMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
     $this->discovery->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($this->definitions));
+      ->willReturn($this->definitions);
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
index 05777e0c2..49a764680 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkDefaultTest.php
@@ -50,6 +50,9 @@ class ContextualLinkDefaultTest extends UnitTestCase {
    */
   protected $stringTranslation;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -69,7 +72,7 @@ public function testGetTitle() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example translated'));
+      ->willReturn('Example translated');
 
     $this->setupContextualLinkDefault();
     $this->assertEquals('Example translated', $this->contextualLinkDefault->getTitle());
@@ -84,7 +87,7 @@ public function testGetTitleWithContext() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example translated with context'));
+      ->willReturn('Example translated with context');
 
     $this->setupContextualLinkDefault();
     $this->assertEquals('Example translated with context', $this->contextualLinkDefault->getTitle());
@@ -99,7 +102,7 @@ public function testGetTitleWithTitleArguments() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example value'));
+      ->willReturn('Example value');
 
     $this->setupContextualLinkDefault();
     $request = new Request();
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php
index 5f9d56019..3dea04ef2 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/ContextualLinkManagerTest.php
@@ -62,11 +62,14 @@ class ContextualLinkManagerTest extends UnitTestCase {
    */
   protected $account;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $language_manager = $this->createMock(LanguageManagerInterface::class);
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(['id' => 'en'])));
+      ->willReturn(new Language(['id' => 'en']));
 
     $this->moduleHandler = $this->createMock(ModuleHandlerInterface::class);
     $this->moduleHandler->expects($this->any())
@@ -121,7 +124,7 @@ public function testGetContextualLinkPluginsByGroup() {
     ];
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     // Test with a non existing group.
     $result = $this->contextualLinkManager->getContextualLinkPluginsByGroup('group_non_existing');
@@ -156,7 +159,7 @@ public function testGetContextualLinkPluginsByGroupWithCache() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with('contextual_links_plugins:en:group1')
-      ->will($this->returnValue((object) ['data' => $definitions]));
+      ->willReturn((object) ['data' => $definitions]);
 
     $result = $this->contextualLinkManager->getContextualLinkPluginsByGroup('group1');
     $this->assertEquals($definitions, $result);
@@ -235,11 +238,11 @@ public function testGetContextualLinksArrayByGroup() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $this->accessManager->expects($this->any())
       ->method('checkNamedRoute')
-      ->will($this->returnValue(AccessResult::allowed()));
+      ->willReturn(AccessResult::allowed());
 
     $this->moduleHandler->expects($this->exactly(2))
       ->method('alter')
@@ -288,7 +291,7 @@ public function testGetContextualLinksArrayByGroupAccessCheck() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $this->accessManager->expects($this->any())
       ->method('checkNamedRoute')
@@ -320,7 +323,7 @@ public function testPluginDefinitionAlter() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $this->moduleHandler->expects($this->once())
       ->method('alter')
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php b/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
index 64da52d11..c2bf03a48 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/DefaultMenuLinkTreeManipulatorsTest.php
@@ -49,6 +49,13 @@ class DefaultMenuLinkTreeManipulatorsTest extends UnitTestCase {
    */
   protected $defaultMenuTreeManipulators;
 
+  /**
+   * Mock cache context manager.
+   *
+   * @var \Drupal\Core\Cache\Context\CacheContextsManager|\Prophecy\Prophecy\ObjectProphecy
+   */
+  protected $cacheContextManager;
+
   /**
    * The original menu tree build in mockTree().
    *
@@ -77,12 +84,9 @@ protected function setUp(): void {
 
     $this->defaultMenuTreeManipulators = new DefaultMenuLinkTreeManipulators($this->accessManager, $this->currentUser, $this->entityTypeManager);
 
-    $cache_contexts_manager = $this->prophesize(CacheContextsManager::class);
-    $cache_contexts_manager->assertValidTokens()->willReturn(TRUE);
-    $cache_contexts_manager->reveal();
-
+    $this->cacheContextManager = $this->prophesize(CacheContextsManager::class);
     $container = new Container();
-    $container->set('cache_contexts_manager', $cache_contexts_manager);
+    $container->set('cache_contexts_manager', $this->cacheContextManager->reveal());
     \Drupal::setContainer($container);
   }
 
@@ -163,6 +167,7 @@ public function testCheckAccess() {
     // performed. 9 routes, but 1 is external, 2 already have their 'access'
     // property set, and 1 is a child if an inaccessible menu link, so only 5
     // calls will be made.
+    $this->cacheContextManager->assertValidTokens(['user.permissions'])->shouldBeCalled()->willReturn(TRUE);
     $this->accessManager->expects($this->exactly(5))
       ->method('checkNamedRoute')
       ->willReturnMap([
@@ -187,6 +192,7 @@ public function testCheckAccess() {
 
     $this->mockTree();
     $this->originalTree[5]->subtree[7]->access = AccessResult::neutral();
+    $this->cacheContextManager->assertValidTokens(['user'])->shouldBeCalled()->willReturn(TRUE);
     $this->originalTree[8]->access = AccessResult::allowed()->cachePerUser();
 
     // Since \Drupal\Core\Menu\DefaultMenuLinkTreeManipulators::checkAccess()
@@ -250,6 +256,7 @@ public function testCheckAccessWithLinkToAnyPagePermission() {
       ->willReturn(TRUE);
 
     $this->mockTree();
+    $this->cacheContextManager->assertValidTokens(['user.permissions'])->shouldBeCalled()->willReturn(TRUE);
     $this->defaultMenuTreeManipulators->checkAccess($this->originalTree);
 
     $expected_access_result = AccessResult::allowed()->cachePerPermissions();
@@ -324,6 +331,8 @@ public function testCheckNodeAccess() {
       ->with('node')
       ->willReturn($storage);
 
+    $this->cacheContextManager->assertValidTokens(['user.permissions'])->shouldBeCalled()->willReturn(TRUE);
+    $this->cacheContextManager->assertValidTokens(['user.permissions', 'user.node_grants:view'])->shouldBeCalled()->willReturn(TRUE);
     $node_access_result = AccessResult::allowed()->cachePerPermissions()->addCacheContexts(['user.node_grants:view']);
 
     $tree = $this->defaultMenuTreeManipulators->checkNodeAccess($tree);
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
index 4aa764651..de7f2c5c1 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionDefaultTest.php
@@ -57,6 +57,9 @@ class LocalActionDefaultTest extends UnitTestCase {
    */
   protected $routeProvider;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -81,7 +84,7 @@ public function testGetTitle() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example translated'));
+      ->willReturn('Example translated');
 
     $this->setupLocalActionDefault();
     $this->assertEquals('Example translated', $this->localActionDefault->getTitle());
@@ -97,7 +100,7 @@ public function testGetTitleWithContext() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example translated with context'));
+      ->willReturn('Example translated with context');
 
     $this->setupLocalActionDefault();
     $this->assertEquals('Example translated with context', $this->localActionDefault->getTitle());
@@ -111,7 +114,7 @@ public function testGetTitleWithTitleArguments() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example value'));
+      ->willReturn('Example value');
 
     $this->setupLocalActionDefault();
     $request = new Request();
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
index 4bba2d232..7238bbfbe 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalActionManagerTest.php
@@ -146,7 +146,7 @@ public function testGetTitle() {
     $this->argumentResolver->expects($this->once())
       ->method('getArguments')
       ->with($this->request, [$local_action, 'getTitle'])
-      ->will($this->returnValue(['test']));
+      ->willReturn(['test']);
 
     $this->localActionManager->getTitle($local_action);
   }
@@ -159,31 +159,31 @@ public function testGetTitle() {
   public function testGetActionsForRoute($route_appears, array $plugin_definitions, array $expected_actions) {
     $this->discovery->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($plugin_definitions));
+      ->willReturn($plugin_definitions);
     $map = [];
     foreach ($plugin_definitions as $plugin_id => $plugin_definition) {
       $plugin = $this->createMock('Drupal\Core\Menu\LocalActionInterface');
       $plugin->expects($this->any())
         ->method('getRouteName')
-        ->will($this->returnValue($plugin_definition['route_name']));
+        ->willReturn($plugin_definition['route_name']);
       $plugin->expects($this->any())
         ->method('getRouteParameters')
-        ->will($this->returnValue($plugin_definition['route_parameters'] ?? []));
+        ->willReturn($plugin_definition['route_parameters'] ?? []);
       $plugin->expects($this->any())
         ->method('getTitle')
-        ->will($this->returnValue($plugin_definition['title']));
+        ->willReturn($plugin_definition['title']);
       $this->argumentResolver->expects($this->any())
         ->method('getArguments')
         ->with($this->request, [$plugin, 'getTitle'])
-        ->will($this->returnValue([]));
+        ->willReturn([]);
 
       $plugin->expects($this->any())
         ->method('getWeight')
-        ->will($this->returnValue($plugin_definition['weight']));
+        ->willReturn($plugin_definition['weight']);
       $this->argumentResolver->expects($this->any())
         ->method('getArguments')
         ->with($this->request, [$plugin, 'getTitle'])
-        ->will($this->returnValue([]));
+        ->willReturn([]);
       $map[] = [$plugin_id, [], $plugin];
     }
     $this->factory->expects($this->any())
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
index 5bc0a94c3..3bd8e91f8 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskDefaultTest.php
@@ -64,6 +64,9 @@ class LocalTaskDefaultTest extends UnitTestCase {
    */
   protected $routeProvider;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -91,7 +94,7 @@ public function testGetRouteParametersForStaticRoute() {
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
       ->with('test_route')
-      ->will($this->returnValue(new Route('/test-route')));
+      ->willReturn(new Route('/test-route'));
 
     $this->setupLocalTaskDefault();
 
@@ -111,7 +114,7 @@ public function testGetRouteParametersInPluginDefinitions() {
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
       ->with('test_route')
-      ->will($this->returnValue(new Route('/test-route/{parameter}')));
+      ->willReturn(new Route('/test-route/{parameter}'));
 
     $this->setupLocalTaskDefault();
 
@@ -131,7 +134,7 @@ public function testGetRouteParametersForDynamicRouteWithNonUpcastedParameters()
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
       ->with('test_route')
-      ->will($this->returnValue($route));
+      ->willReturn($route);
 
     $this->setupLocalTaskDefault();
 
@@ -154,7 +157,7 @@ public function testGetRouteParametersForDynamicRouteWithUpcastedParameters() {
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
       ->with('test_route')
-      ->will($this->returnValue($route));
+      ->willReturn($route);
 
     $this->setupLocalTaskDefault();
 
@@ -176,7 +179,7 @@ public function testGetRouteParametersForDynamicRouteWithUpcastedParametersEmpty
     $this->routeProvider->expects($this->once())
       ->method('getRouteByName')
       ->with('test_route')
-      ->will($this->returnValue($route));
+      ->willReturn($route);
 
     $this->setupLocalTaskDefault();
 
@@ -259,7 +262,7 @@ public function testGetTitle() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example translated'));
+      ->willReturn('Example translated');
 
     $this->setupLocalTaskDefault();
     $this->assertEquals('Example translated', $this->localTaskBase->getTitle());
@@ -274,7 +277,7 @@ public function testGetTitleWithContext() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example translated with context'));
+      ->willReturn('Example translated with context');
 
     $this->setupLocalTaskDefault();
     $this->assertEquals('Example translated with context', $this->localTaskBase->getTitle());
@@ -288,7 +291,7 @@ public function testGetTitleWithTitleArguments() {
     $this->stringTranslation->expects($this->once())
       ->method('translateString')
       ->with($this->pluginDefinition['title'])
-      ->will($this->returnValue('Example value'));
+      ->willReturn('Example value');
 
     $this->setupLocalTaskDefault();
     $this->assertEquals('Example value', $this->localTaskBase->getTitle());
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
index c60db3312..052a969ab 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskIntegrationTestBase.php
@@ -11,7 +11,7 @@
 /**
  * Defines a base unit test for testing existence of local tasks.
  *
- * @todo Add tests for access checking and url building,
+ * @todo Add tests for access checking and URL building,
  *   https://www.drupal.org/node/2112245.
  */
 abstract class LocalTaskIntegrationTestBase extends UnitTestCase {
@@ -109,7 +109,7 @@ protected function getLocalTaskManager($module_dirs, $route_name, $route_params)
     $factory = $this->createMock('Drupal\Component\Plugin\Factory\FactoryInterface');
     $factory->expects($this->any())
       ->method('createInstance')
-      ->will($this->returnValue($plugin_stub));
+      ->willReturn($plugin_stub);
     $property = new \ReflectionProperty('Drupal\Core\Menu\LocalTaskManager', 'factory');
     $property->setAccessible(TRUE);
     $property->setValue($manager, $factory);
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
index ae72ea1c8..8e6acbf0c 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/LocalTaskManagerTest.php
@@ -123,7 +123,7 @@ public function testGetLocalTasksForRouteSingleLevelTitle() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $mock_plugin = $this->createMock('Drupal\Core\Menu\LocalTaskInterface');
 
@@ -147,7 +147,7 @@ public function testGetLocalTasksForRouteForChild() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $mock_plugin = $this->createMock('Drupal\Core\Menu\LocalTaskInterface');
 
@@ -169,7 +169,7 @@ public function testGetLocalTaskForRouteWithEmptyCache() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $mock_plugin = $this->createMock('Drupal\Core\Menu\LocalTaskInterface');
     $this->setupFactory($mock_plugin);
@@ -212,7 +212,7 @@ public function testGetLocalTaskForRouteWithFilledCache() {
     $this->cacheBackend->expects($this->once())
       ->method('get')
       ->with('local_task_plugins:en:menu_local_task_test_tasks_view')
-      ->will($this->returnValue((object) ['data' => $result]));
+      ->willReturn((object) ['data' => $result]);
 
     $this->cacheBackend->expects($this->never())
       ->method('set');
@@ -235,7 +235,7 @@ public function testGetTitle() {
     $this->argumentResolver->expects($this->once())
       ->method('getArguments')
       ->with($this->request, [$menu_local_task, 'getTitle'])
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->manager->getTitle($menu_local_task);
   }
@@ -253,7 +253,7 @@ protected function setupLocalTaskManager() {
     $language_manager = $this->createMock('Drupal\Core\Language\LanguageManagerInterface');
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue(new Language(['id' => 'en'])));
+      ->willReturn(new Language(['id' => 'en']));
 
     $this->manager = new LocalTaskManager($this->argumentResolver, $request_stack, $this->routeMatch, $this->routeProvider, $module_handler, $this->cacheBackend, $language_manager, $this->accessManager, $this->account);
 
@@ -406,7 +406,7 @@ public function testGetTasksBuildWithCacheabilityMetadata() {
 
     $this->pluginDiscovery->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     // Set up some cacheability metadata and ensure its merged together.
     $definitions['menu_local_task_test_tasks_settings']['cache_tags'] = ['tag.example1'];
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php b/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
index ecf62a1fe..5fd32f96f 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/MenuActiveTrailTest.php
@@ -145,7 +145,7 @@ public function testGetActiveLink(Request $request, $links, $menu_name, $expecte
       $this->menuLinkManager->expects($this->exactly(2))
         ->method('loadLinksbyRoute')
         ->with('baby_llama')
-        ->will($this->returnValue($links));
+        ->willReturn($links);
     }
     // Test with menu name.
     $this->assertSame($expected_link, $this->menuActiveTrail->getActiveLink($menu_name));
@@ -169,7 +169,7 @@ public function testGetActiveTrailIds(Request $request, $links, $menu_name, $exp
       $this->menuLinkManager->expects($this->exactly(2))
         ->method('loadLinksbyRoute')
         ->with('baby_llama')
-        ->will($this->returnValue($links));
+        ->willReturn($links);
       if ($expected_link !== NULL) {
         $this->menuLinkManager->expects($this->exactly(2))
           ->method('getParentIds')
@@ -205,7 +205,7 @@ public function testGetCid() {
     $this->menuLinkManager->expects($this->any())
       ->method('loadLinksbyRoute')
       ->with('baby_llama')
-      ->will($this->returnValue($data[1]));
+      ->willReturn($data[1]);
 
     $expected_link = $data[3];
     $expected_trail = $data[4];
diff --git a/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php b/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php
index d1b13b043..a440d539d 100644
--- a/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Menu/StaticMenuLinkOverridesTest.php
@@ -121,7 +121,7 @@ public function testSaveOverride() {
     $config_factory = $this->createMock('Drupal\Core\Config\ConfigFactoryInterface');
     $config_factory->expects($this->once())
       ->method('getEditable')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
 
     $static_override = new StaticMenuLinkOverrides($config_factory);
 
@@ -148,7 +148,7 @@ public function testDeleteOverrides($ids, array $old_definitions, array $new_def
     $config->expects($this->once())
       ->method('get')
       ->with('definitions')
-      ->will($this->returnValue($old_definitions));
+      ->willReturn($old_definitions);
 
     // Only save if the definitions changes.
     $config->expects($old_definitions != $new_definitions ? $this->once() : $this->never())
@@ -161,7 +161,7 @@ public function testDeleteOverrides($ids, array $old_definitions, array $new_def
     $config_factory = $this->createMock('Drupal\Core\Config\ConfigFactoryInterface');
     $config_factory->expects($this->once())
       ->method('getEditable')
-      ->will($this->returnValue($config));
+      ->willReturn($config);
 
     $static_override = new StaticMenuLinkOverrides($config_factory);
 
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php
index 5583a56c2..03b66ce50 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/ChainRequestPolicyTest.php
@@ -27,6 +27,9 @@ class ChainRequestPolicyTest extends UnitTestCase {
    */
   protected $request;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->policy = new ChainRequestPolicy();
     $this->request = new Request();
@@ -52,7 +55,7 @@ public function testNullRuleChain() {
     $rule->expects($this->once())
       ->method('check')
       ->with($this->request)
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->policy->addPolicy($rule);
 
@@ -71,7 +74,7 @@ public function testChainExceptionOnInvalidReturnValue($return_value) {
     $rule->expects($this->once())
       ->method('check')
       ->with($this->request)
-      ->will($this->returnValue($return_value));
+      ->willReturn($return_value);
 
     $this->policy->addPolicy($rule);
 
@@ -108,7 +111,7 @@ public function testAllowIfAnyRuleReturnedAllow($return_values) {
       $rule->expects($this->once())
         ->method('check')
         ->with($this->request)
-        ->will($this->returnValue($return_value));
+        ->willReturn($return_value);
 
       $this->policy->addPolicy($rule);
     }
@@ -138,14 +141,14 @@ public function testStopChainOnFirstDeny() {
     $rule1->expects($this->once())
       ->method('check')
       ->with($this->request)
-      ->will($this->returnValue(RequestPolicyInterface::ALLOW));
+      ->willReturn(RequestPolicyInterface::ALLOW);
     $this->policy->addPolicy($rule1);
 
     $deny_rule = $this->createMock('Drupal\Core\PageCache\RequestPolicyInterface');
     $deny_rule->expects($this->once())
       ->method('check')
       ->with($this->request)
-      ->will($this->returnValue(RequestPolicyInterface::DENY));
+      ->willReturn(RequestPolicyInterface::DENY);
     $this->policy->addPolicy($deny_rule);
 
     $ignored_rule = $this->createMock('Drupal\Core\PageCache\RequestPolicyInterface');
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php
index 5a4ab748d..85ec70898 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/ChainResponsePolicyTest.php
@@ -35,6 +35,9 @@ class ChainResponsePolicyTest extends UnitTestCase {
    */
   protected $response;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->policy = new ChainResponsePolicy();
     $this->response = new Response();
@@ -61,7 +64,7 @@ public function testNullRuleChain() {
     $rule->expects($this->once())
       ->method('check')
       ->with($this->response, $this->request)
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
 
     $this->policy->addPolicy($rule);
 
@@ -80,7 +83,7 @@ public function testChainExceptionOnInvalidReturnValue($return_value) {
     $rule->expects($this->once())
       ->method('check')
       ->with($this->response, $this->request)
-      ->will($this->returnValue($return_value));
+      ->willReturn($return_value);
 
     $this->policy->addPolicy($rule);
 
@@ -119,7 +122,7 @@ public function testStopChainOnFirstDeny() {
     $deny_rule->expects($this->once())
       ->method('check')
       ->with($this->response, $this->request)
-      ->will($this->returnValue(ResponsePolicyInterface::DENY));
+      ->willReturn(ResponsePolicyInterface::DENY);
     $this->policy->addPolicy($deny_rule);
 
     $ignored_rule = $this->createMock('Drupal\Core\PageCache\ResponsePolicyInterface');
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php
index c4eff9468..2d1d1b23e 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/CommandLineOrUnsafeMethodTest.php
@@ -19,6 +19,9 @@ class CommandLineOrUnsafeMethodTest extends UnitTestCase {
    */
   protected $policy;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     // Note that it is necessary to partially mock the class under test in
     // order to disable the isCli-check.
@@ -36,7 +39,7 @@ protected function setUp(): void {
   public function testHttpMethod($expected_result, $method) {
     $this->policy->expects($this->once())
       ->method('isCli')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $request = Request::create('/', $method);
     $actual_result = $this->policy->check($request);
@@ -70,7 +73,7 @@ public function providerTestHttpMethod() {
   public function testIsCli() {
     $this->policy->expects($this->once())
       ->method('isCli')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $request = Request::create('/', 'GET');
     $actual_result = $this->policy->check($request);
diff --git a/web/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php b/web/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php
index 9f24716df..64970847c 100644
--- a/web/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PageCache/NoSessionOpenTest.php
@@ -27,6 +27,9 @@ class NoSessionOpenTest extends UnitTestCase {
    */
   protected $policy;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->sessionConfiguration = $this->createMock('Drupal\Core\Session\SessionConfigurationInterface');
     $this->policy = new NoSessionOpen($this->sessionConfiguration);
diff --git a/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php b/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
index d755a7839..b3858a136 100644
--- a/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
@@ -132,7 +132,7 @@ public function testSetRouteParameterConverters($path, $parameters = NULL, $expe
     $converter->expects($this->any())
       ->method('applies')
       ->with($this->anything(), 'id', $this->anything())
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->manager->addConverter($converter, 'applied');
 
     $route = new Route($path);
@@ -194,7 +194,7 @@ public function testConvert() {
     $converter->expects($this->any())
       ->method('convert')
       ->with(1, $this->isType('array'), 'id', $this->isType('array'))
-      ->will($this->returnValue('something_better!'));
+      ->willReturn('something_better!');
     $this->manager->addConverter($converter, 'test_convert');
 
     $result = $this->manager->convert($defaults);
@@ -240,7 +240,7 @@ public function testConvertMissingParam() {
     $converter->expects($this->any())
       ->method('convert')
       ->with(1, $this->isType('array'), 'id', $this->isType('array'))
-      ->will($this->returnValue(NULL));
+      ->willReturn(NULL);
     $this->manager->addConverter($converter, 'test_convert');
 
     $this->expectException(ParamNotConvertedException::class);
diff --git a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
index 14814b675..2737bd401 100644
--- a/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PathProcessor/PathProcessorTest.php
@@ -35,6 +35,9 @@ class PathProcessorTest extends UnitTestCase {
    */
   protected $languageManager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
 
     // Set up some languages to be used by the language-based path processor.
@@ -58,13 +61,13 @@ protected function setUp(): void {
       ->getMock();
     $language_manager->expects($this->any())
       ->method('getCurrentLanguage')
-      ->will($this->returnValue($languages['en']));
+      ->willReturn($languages['en']);
     $language_manager->expects($this->any())
       ->method('getLanguages')
-      ->will($this->returnValue($this->languages));
+      ->willReturn($this->languages);
     $language_manager->expects($this->any())
       ->method('getLanguageTypes')
-      ->will($this->returnValue([LanguageInterface::TYPE_INTERFACE]));
+      ->willReturn([LanguageInterface::TYPE_INTERFACE]);
 
     $this->languageManager = $language_manager;
   }
@@ -113,18 +116,18 @@ public function testProcessInbound() {
       ->getMock();
     $negotiator->expects($this->any())
       ->method('getNegotiationMethods')
-      ->will($this->returnValue([
+      ->willReturn([
         LanguageNegotiationUrl::METHOD_ID => [
           'class' => 'Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl',
           'weight' => 9,
         ],
-      ]));
+      ]);
     $method = new LanguageNegotiationUrl();
     $method->setConfig($config_factory_stub);
     $method->setLanguageManager($this->languageManager);
     $negotiator->expects($this->any())
       ->method('getNegotiationMethodInstance')
-      ->will($this->returnValue($method));
+      ->willReturn($method);
 
     // Create a user stub.
     $current_user = $this->getMockBuilder('Drupal\Core\Session\AccountInterface')
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php
index d18938374..b7ad7110e 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/CategorizingPluginManagerTraitTest.php
@@ -48,9 +48,9 @@ protected function setUp(): void {
    */
   public function testGetCategories() {
     $this->assertSame([
-        'fruits',
-        'vegetables',
-      ], array_values($this->pluginManager->getCategories()));
+      'fruits',
+      'vegetables',
+    ], array_values($this->pluginManager->getCategories()));
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
index 075cd51d9..04a8bed22 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/ContextHandlerTest.php
@@ -16,11 +16,11 @@
 use Drupal\Component\Plugin\Exception\MissingValueContextException;
 use Drupal\Core\Cache\NullBackend;
 use Drupal\Core\DependencyInjection\ClassResolverInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Plugin\Context\ContextDefinition;
 use Drupal\Core\Plugin\Context\ContextHandler;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
+use Drupal\Core\Test\TestKernel;
 use Drupal\Core\TypedData\TypedDataManager;
 use Drupal\Core\Validation\ConstraintManager;
 use Drupal\Tests\UnitTestCase;
@@ -63,7 +63,7 @@ protected function setUp(): void {
       new ConstraintManager($namespaces, $cache_backend, $module_handler->reveal())
     );
 
-    $container = new ContainerBuilder();
+    $container = TestKernel::setContainerWithKernel();
     $container->set('typed_data_manager', $type_data_manager);
     \Drupal::setContainer($container);
   }
@@ -90,7 +90,7 @@ public function providerTestCheckRequirements() {
     $context_any = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_any->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue(new ContextDefinition('any')));
+      ->willReturn(new ContextDefinition('any'));
 
     $requirement_specific = new ContextDefinition('string');
     $requirement_specific->setConstraints(['Blank' => []]);
@@ -98,18 +98,18 @@ public function providerTestCheckRequirements() {
     $context_constraint_mismatch = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_constraint_mismatch->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue(new ContextDefinition('foo')));
+      ->willReturn(new ContextDefinition('foo'));
     $context_datatype_mismatch = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_datatype_mismatch->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue(new ContextDefinition('fuzzy')));
+      ->willReturn(new ContextDefinition('fuzzy'));
 
     $context_definition_specific = new ContextDefinition('string');
     $context_definition_specific->setConstraints(['Blank' => []]);
     $context_specific = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_specific->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue($context_definition_specific));
+      ->willReturn($context_definition_specific);
 
     $data = [];
     $data[] = [[], [], TRUE];
@@ -148,21 +148,21 @@ public function providerTestGetMatchingContexts() {
     $context_any = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_any->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue(new ContextDefinition('any')));
+      ->willReturn(new ContextDefinition('any'));
     $context_constraint_mismatch = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_constraint_mismatch->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue(new ContextDefinition('foo')));
+      ->willReturn(new ContextDefinition('foo'));
     $context_datatype_mismatch = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_datatype_mismatch->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue(new ContextDefinition('fuzzy')));
+      ->willReturn(new ContextDefinition('fuzzy'));
     $context_definition_specific = new ContextDefinition('string');
     $context_definition_specific->setConstraints(['Blank' => []]);
     $context_specific = $this->createMock('Drupal\Core\Plugin\Context\ContextInterface');
     $context_specific->expects($this->atLeastOnce())
       ->method('getContextDefinition')
-      ->will($this->returnValue($context_definition_specific));
+      ->willReturn($context_definition_specific);
 
     $data = [];
     // No context will return no valid contexts.
@@ -191,7 +191,7 @@ public function testFilterPluginDefinitionsByContexts($has_context, $definitions
       $expected_context_definition = (new ContextDefinition('string'))->setConstraints(['Blank' => []]);
       $context->expects($this->atLeastOnce())
         ->method('getContextDefinition')
-        ->will($this->returnValue($expected_context_definition));
+        ->willReturn($expected_context_definition);
       $contexts = [$context];
     }
     else {
@@ -332,7 +332,7 @@ public function testApplyContextMapping() {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['hit' => $context_definition]));
+      ->willReturn(['hit' => $context_definition]);
     $plugin->expects($this->once())
       ->method('setContext')
       ->with('hit', $context_hit);
@@ -373,7 +373,7 @@ public function testApplyContextMappingMissingRequired() {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['hit' => $context_definition]));
+      ->willReturn(['hit' => $context_definition]);
     $plugin->expects($this->never())
       ->method('setContext');
 
@@ -410,7 +410,7 @@ public function testApplyContextMappingMissingNotRequired() {
       ->willReturn(['optional' => 'missing']);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['optional' => $context_definition]));
+      ->willReturn(['optional' => $context_definition]);
     $plugin->expects($this->never())
       ->method('setContext');
 
@@ -448,7 +448,7 @@ public function testApplyContextMappingNoValueRequired() {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['hit' => $context_definition]));
+      ->willReturn(['hit' => $context_definition]);
     $plugin->expects($this->never())
       ->method('setContext');
 
@@ -483,7 +483,7 @@ public function testApplyContextMappingNoValueNonRequired() {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['hit' => $context_definition]));
+      ->willReturn(['hit' => $context_definition]);
     $plugin->expects($this->never())
       ->method('setContext');
 
@@ -511,7 +511,7 @@ public function testApplyContextMappingConfigurableAssigned() {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['hit' => $context_definition]));
+      ->willReturn(['hit' => $context_definition]);
     $plugin->expects($this->once())
       ->method('setContext')
       ->with('hit', $context);
@@ -549,7 +549,7 @@ public function testApplyContextMappingConfigurableAssignedMiss() {
       ->willReturn([]);
     $plugin->expects($this->once())
       ->method('getContextDefinitions')
-      ->will($this->returnValue(['hit' => $context_definition]));
+      ->willReturn(['hit' => $context_definition]);
     $plugin->expects($this->never())
       ->method('setContext');
 
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
index 338812111..37799cdfe 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/DefaultPluginManagerTest.php
@@ -100,7 +100,7 @@ public function testDefaultPluginManagerWithDisabledModule() {
     $module_handler->expects($this->once())
       ->method('moduleExists')
       ->with('disabled_module')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $plugin_manager = new TestPluginManager($this->namespaces, $definitions, $module_handler, 'test_alter_hook', '\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
 
@@ -125,7 +125,7 @@ public function testDefaultPluginManagerWithObjects() {
     $module_handler->expects($this->once())
       ->method('moduleExists')
       ->with('disabled_module')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $plugin_manager = new TestPluginManager($this->namespaces, $definitions, $module_handler, 'test_alter_hook', '\Drupal\plugin_test\Plugin\plugin_test\fruit\FruitInterface');
 
@@ -184,7 +184,7 @@ public function testDefaultPluginManagerWithEmptyCache() {
       ->expects($this->once())
       ->method('get')
       ->with($cid)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $cache_backend
       ->expects($this->once())
       ->method('set')
@@ -209,7 +209,7 @@ public function testDefaultPluginManagerWithFilledCache() {
       ->expects($this->once())
       ->method('get')
       ->with($cid)
-      ->will($this->returnValue((object) ['data' => $this->expectedDefinitions]));
+      ->willReturn((object) ['data' => $this->expectedDefinitions]);
     $cache_backend
       ->expects($this->never())
       ->method('set');
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
index fbdec9e67..c47eba77f 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/ContainerDerivativeDiscoveryDecoratorTest.php
@@ -22,7 +22,7 @@ public function testGetDefinitions() {
     $example_container->expects($this->once())
       ->method('get')
       ->with($this->equalTo('example_service'))
-      ->will($this->returnValue($example_service));
+      ->willReturn($example_service);
 
     \Drupal::setContainer($example_container);
 
@@ -39,7 +39,7 @@ public function testGetDefinitions() {
     $discovery_main = $this->createMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
     $discovery_main->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new ContainerDerivativeDiscoveryDecorator($discovery_main);
     $definitions = $discovery->getDefinitions();
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
index 12bf5e343..8027421bc 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
@@ -44,7 +44,7 @@ public function testGetDerivativeFetcher() {
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
     $definitions = $discovery->getDefinitions();
@@ -70,7 +70,7 @@ public function testGetDerivativeFetcherWithAnnotationObjects() {
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
     $definitions = $discovery->getDefinitions();
@@ -100,7 +100,7 @@ public function testGetDeriverClassWithClassedDefinitions() {
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
     $definitions = $discovery->getDefinitions();
@@ -145,7 +145,7 @@ public function testNonExistentDerivativeFetcher() {
     ];
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
     $this->expectException(InvalidDeriverException::class);
@@ -167,7 +167,7 @@ public function testInvalidDerivativeFetcher() {
     ];
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
     $this->expectException(InvalidDeriverException::class);
@@ -202,7 +202,7 @@ public function testExistingDerivative() {
 
     $this->discoveryMain->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $discovery = new DerivativeDiscoveryDecorator($this->discoveryMain);
     $returned_definitions = $discovery->getDefinitions();
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
index b6d13d43d..0ac5cd773 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
@@ -40,11 +40,6 @@ protected function setUp(): void {
    * @see \Drupal\Core\Plugin\Discovery::getDefinitions()
    */
   public function testGetDefinitionsWithoutPlugins() {
-    $this->moduleHandler->expects($this->once())
-      ->method('invokeAllWith')
-      ->with('test_plugin')
-      ->will($this->returnValue([]));
-
     $this->assertCount(0, $this->hookDiscovery->getDefinitions());
   }
 
@@ -112,10 +107,6 @@ public function testGetDefinition() {
    * @see \Drupal\Core\Plugin\Discovery::getDefinition()
    */
   public function testGetDefinitionWithUnknownID() {
-    $this->moduleHandler->expects($this->once())
-      ->method('invokeAllWith')
-      ->will($this->returnValue([]));
-
     $this->expectException(PluginNotFoundException::class);
     $this->hookDiscovery->getDefinition('test_non_existent', TRUE);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
index 7712659ea..5717f75ca 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryDecoratorTest.php
@@ -33,6 +33,9 @@ class YamlDiscoveryDecoratorTest extends UnitTestCase {
     'decorated_2' => 'decorated_test_2',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
@@ -59,7 +62,7 @@ protected function setUp(): void {
     $decorated = $this->createMock('Drupal\Component\Plugin\Discovery\DiscoveryInterface');
     $decorated->expects($this->once())
       ->method('getDefinitions')
-      ->will($this->returnValue($definitions));
+      ->willReturn($definitions);
 
     $this->discoveryDecorator = new YamlDiscoveryDecorator($decorated, 'test', $directories);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
index b20dc52e6..fa12c88f2 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/Discovery/YamlDiscoveryTest.php
@@ -32,6 +32,9 @@ class YamlDiscoveryTest extends UnitTestCase {
     'test_2' => 'test_2_b',
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     parent::setUp();
 
diff --git a/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php b/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
index 1cfdcd01e..f35d1e054 100644
--- a/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Plugin/LazyPluginCollectionTestBase.php
@@ -43,11 +43,14 @@ abstract class LazyPluginCollectionTestBase extends UnitTestCase {
     'apple' => ['id' => 'apple', 'key' => 'value'],
   ];
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp() {
     $this->pluginManager = $this->createMock('Drupal\Component\Plugin\PluginManagerInterface');
     $this->pluginManager->expects($this->any())
       ->method('getDefinitions')
-      ->will($this->returnValue($this->getPluginDefinitions()));
+      ->willReturn($this->getPluginDefinitions());
 
   }
 
@@ -104,7 +107,7 @@ protected function getPluginMock($plugin_id, array $definition) {
     $mock = $this->createMock('Drupal\Component\Plugin\PluginInspectionInterface');
     $mock->expects($this->any())
       ->method('getPluginId')
-      ->will($this->returnValue($plugin_id));
+      ->willReturn($plugin_id);
     return $mock;
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php b/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
index b662bec50..932bf0a2f 100644
--- a/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/PrivateKeyTest.php
@@ -53,7 +53,7 @@ public function testGet() {
     $this->state->expects($this->once())
       ->method('get')
       ->with('system.private_key')
-      ->will($this->returnValue($this->key));
+      ->willReturn($this->key);
 
     $this->assertEquals($this->key, $this->privateKey->get());
   }
@@ -74,7 +74,7 @@ public function testSet() {
     $this->state->expects($this->once())
       ->method('set')
       ->with('system.private_key', $random_name)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->privateKey->set($random_name);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php b/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php
index 1c795c7db..da5f5694d 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/ElementTest.php
@@ -188,6 +188,29 @@ public function testIsEmpty(array $element, $expected) {
   public function providerTestIsEmpty() {
     return [
       [[], TRUE],
+      [['#attached' => []], FALSE],
+      [['#cache' => []], TRUE],
+      [['#weight' => []], TRUE],
+      // Variations.
+      [['#attached' => [], '#cache' => []], FALSE],
+      [['#attached' => [], '#weight' => []], FALSE],
+      [['#attached' => [], '#weight' => [], '#cache' => []], FALSE],
+      [['#cache' => [], '#weight' => []], TRUE],
+      [['#cache' => [], '#weight' => [], '#any_other_property' => []], FALSE],
+      [
+        [
+          '#attached' => [],
+          '#weight' => [],
+          '#cache' => [],
+          '#any_other_property' => [],
+        ],
+        FALSE,
+      ],
+      // Cover sorting.
+      [['#cache' => [], '#weight' => [], '#attached' => []], FALSE],
+      [['#cache' => [], '#weight' => []], TRUE],
+      [['#weight' => [], '#cache' => []], TRUE],
+
       [['#cache' => []], TRUE],
       [['#cache' => ['tags' => ['foo']]], TRUE],
       [['#cache' => ['contexts' => ['bar']]], TRUE],
diff --git a/web/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php
index 1c492dc43..35ab27829 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/PlaceholderGeneratorTest.php
@@ -38,9 +38,10 @@ public function testCreatePlaceholderGeneratesValidHtmlMarkup(array $element) {
   }
 
   /**
-   * Create an element with #lazy_builder callback. Between two renders, cache
-   * contexts nor tags sort change. Placeholder should generate same hash to not
-   * be rendered twice.
+   * Tests the creation of an element with a #lazy_builder callback.
+   *
+   * Between two renders neither the cache contexts nor tags sort should change.
+   * A placeholder should generate the same hash, so it is not rendered twice.
    *
    * @covers ::createPlaceholder
    */
@@ -50,10 +51,13 @@ public function testRenderPlaceholdersDifferentSortedContextsTags() {
     $tags_1 = ['current-temperature', 'foo'];
     $tags_2 = ['foo', 'current-temperature'];
     $test_element = [
-        '#cache' => [
-          'max-age' => Cache::PERMANENT,
-        ],
-        '#lazy_builder' => ['Drupal\Tests\Core\Render\PlaceholdersTest::callback', ['foo' => TRUE]],
+      '#cache' => [
+        'max-age' => Cache::PERMANENT,
+      ],
+      '#lazy_builder' => [
+        'Drupal\Tests\Core\Render\PlaceholdersTest::callback',
+        ['foo' => TRUE],
+      ],
     ];
 
     $test_element['#cache']['contexts'] = $contexts_1;
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
index a49ed7b26..721e033ca 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
@@ -185,7 +185,7 @@ public function providerTestContextBubblingEdgeCases() {
     // set of contexts are present point to the same cache item. Regardless of
     // the contexts' order. A sad necessity because PHP doesn't have sets.)
     $test_element = [
-     '#cache' => [
+      '#cache' => [
         'keys' => ['set_test'],
         'contexts' => [],
       ],
@@ -622,7 +622,7 @@ public function testOverWriteCacheKeys() {
     $data = [
       '#cache' => [
         'keys' => ['llama', 'bar'],
-       ],
+      ],
       '#pre_render' => [__NAMESPACE__ . '\\BubblingTest::bubblingCacheOverwritePrerender'],
     ];
     $this->expectException(\LogicException::class);
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index 4c815df3d..c59d43995 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -978,9 +978,10 @@ public function testNonArrayReturnFromLazyBuilder(): void {
   }
 
   /**
-   * Create an element with a child and subchild. Each element has the same
-   * #lazy_builder callback, but with different contexts. They don't modify
-   * markup, only attach additional drupalSettings.
+   * Tests the creation of an element with a child and a sub-child.
+   *
+   * Each element has the same #lazy_builder callback, but with different
+   * contexts. They don't modify markup, only attach additional drupalSettings.
    *
    * @covers ::render
    * @covers ::doRender
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php b/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
index ac69590e8..7a2a7eedf 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererTest.php
@@ -218,10 +218,11 @@ public function providerTestRenderBasic() {
     $data[] = [
       [
         '#markup' => 'foo',
-        '#pre_render' => [function ($elements) {
-          $elements['#markup'] .= '<script>alert("bar");</script>';
-          return $elements;
-        },
+        '#pre_render' => [
+          function ($elements) {
+            $elements['#markup'] .= '<script>alert("bar");</script>';
+            return $elements;
+          },
         ],
       ],
       'fooalert("bar");',
@@ -231,10 +232,11 @@ public function providerTestRenderBasic() {
       [
         '#markup' => 'foo',
         '#allowed_tags' => ['script'],
-        '#pre_render' => [function ($elements) {
-          $elements['#markup'] .= '<script>alert("bar");</script>';
-          return $elements;
-        },
+        '#pre_render' => [
+          function ($elements) {
+            $elements['#markup'] .= '<script>alert("bar");</script>';
+            return $elements;
+          },
         ],
       ],
       'foo<script>alert("bar");</script>',
@@ -244,10 +246,11 @@ public function providerTestRenderBasic() {
     $data[] = [
       [
         '#plain_text' => 'foo',
-        '#pre_render' => [function ($elements) {
-          $elements['#plain_text'] .= '<script>alert("bar");</script>';
-          return $elements;
-        },
+        '#pre_render' => [
+          function ($elements) {
+            $elements['#plain_text'] .= '<script>alert("bar");</script>';
+            return $elements;
+          },
         ],
       ],
       'foo&lt;script&gt;alert(&quot;bar&quot;);&lt;/script&gt;',
diff --git a/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index c2b0d327b..1321379a4 100644
--- a/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/web/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -109,6 +109,7 @@ abstract class RendererTestBase extends UnitTestCase {
       'contexts' => ['session', 'user'],
       'tags' => ['current-temperature'],
     ],
+    'debug' => FALSE,
   ];
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php b/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
index 3cbb2a9b8..3d1bcc495 100644
--- a/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/RouteProcessor/RouteProcessorManagerTest.php
@@ -21,6 +21,9 @@ class RouteProcessorManagerTest extends UnitTestCase {
    */
   protected $processorManager;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->processorManager = new RouteProcessorManager();
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php b/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
index 35bccddff..bf8fdbd73 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/AccessAwareRouterTest.php
@@ -66,7 +66,7 @@ protected function setupRouter() {
       ->getMock();
     $this->router->expects($this->once())
       ->method('matchRequest')
-      ->will($this->returnValue([RouteObjectInterface::ROUTE_OBJECT => $this->route]));
+      ->willReturn([RouteObjectInterface::ROUTE_OBJECT => $this->route]);
     $this->accessAwareRouter = new AccessAwareRouter($this->router, $this->accessManager, $this->currentUser);
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/LazyRouteCollectionTest.php b/web/core/tests/Drupal/Tests/Core/Routing/LazyRouteCollectionTest.php
index 162fed6eb..e14366406 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/LazyRouteCollectionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/LazyRouteCollectionTest.php
@@ -49,7 +49,7 @@ public function testGetIterator() {
     $this->routeProvider->expects($this->exactly(2))
       ->method('getRoutesByNames')
       ->with(NULL)
-      ->will($this->returnValue($this->testRoutes));
+      ->willReturn($this->testRoutes);
     $lazyRouteCollection = new LazyRouteCollection($this->routeProvider);
     $this->assertEquals($this->testRoutes, $lazyRouteCollection->getIterator());
     $this->assertEquals($this->testRoutes, $lazyRouteCollection->all());
@@ -62,7 +62,7 @@ public function testCount() {
     $this->routeProvider
       ->method('getRoutesByNames')
       ->with(NULL)
-      ->will($this->returnValue($this->testRoutes));
+      ->willReturn($this->testRoutes);
     $lazyRouteCollection = new LazyRouteCollection($this->routeProvider);
     $this->assertEquals(2, $lazyRouteCollection->count());
   }
@@ -77,7 +77,7 @@ public function testGetName() {
     $this->routeProvider
       ->method('getRouteByName')
       ->with('route_1')
-      ->will($this->returnValue($this->testRoutes['route_1']));
+      ->willReturn($this->testRoutes['route_1']);
     $lazyRouteCollection = new LazyRouteCollection($this->routeProvider);
     $this->assertEquals($lazyRouteCollection->get('route_1'), $this->testRoutes['route_1']);
 
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
index 66b00d5da..a767a0eb4 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RouteBuilderTest.php
@@ -77,6 +77,9 @@ class RouteBuilderTest extends UnitTestCase {
    */
   protected $checkProvider;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->dumper = $this->createMock('Drupal\Core\Routing\MatcherDumperInterface');
     $this->lock = $this->createMock('Drupal\Core\Lock\LockBackendInterface');
@@ -99,7 +102,7 @@ public function testRebuildLockingUnlocking() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('router_rebuild')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->lock->expects($this->once())
       ->method('release')
@@ -107,7 +110,7 @@ public function testRebuildLockingUnlocking() {
 
     $this->yamlDiscovery->expects($this->any())
       ->method('findAll')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->assertTrue($this->routeBuilder->rebuild());
   }
@@ -119,7 +122,7 @@ public function testRebuildBlockingLock() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('router_rebuild')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->lock->expects($this->once())
       ->method('wait')
@@ -143,14 +146,14 @@ public function testRebuildWithStaticModuleRoutes() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('router_rebuild')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $routing_fixtures = new RoutingFixtures();
     $routes = $routing_fixtures->staticSampleRouteCollection();
 
     $this->yamlDiscovery->expects($this->once())
       ->method('findAll')
-      ->will($this->returnValue(['test_module' => $routes]));
+      ->willReturn(['test_module' => $routes]);
 
     $route_collection = $routing_fixtures->sampleRouteCollection();
     foreach ($route_collection->all() as $route) {
@@ -191,18 +194,18 @@ public function testRebuildWithProviderBasedRoutes() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('router_rebuild')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->yamlDiscovery->expects($this->once())
       ->method('findAll')
-      ->will($this->returnValue([
+      ->willReturn([
         'test_module' => [
           'route_callbacks' => [
             '\Drupal\Tests\Core\Routing\TestRouteSubscriber::routesFromArray',
             'test_module.route_service:routesFromCollection',
           ],
         ],
-      ]));
+      ]);
 
     $container = new ContainerBuilder();
     $container->set('test_module.route_service', new TestRouteSubscriber());
@@ -258,7 +261,7 @@ public function testRebuildIfNeeded() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('router_rebuild')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->lock->expects($this->once())
       ->method('release')
@@ -266,7 +269,7 @@ public function testRebuildIfNeeded() {
 
     $this->yamlDiscovery->expects($this->any())
       ->method('findAll')
-      ->will($this->returnValue([]));
+      ->willReturn([]);
 
     $this->routeBuilder->setRebuildNeeded();
 
@@ -286,10 +289,10 @@ public function testRebuildWithOverriddenRouteClass() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('router_rebuild')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->yamlDiscovery->expects($this->once())
       ->method('findAll')
-      ->will($this->returnValue([
+      ->willReturn([
         'test_module' => [
           'test_route.override' => [
             'path' => '/test_route_override',
@@ -301,7 +304,7 @@ public function testRebuildWithOverriddenRouteClass() {
             'path' => '/test_route',
           ],
         ],
-      ]));
+      ]);
 
     $container = new ContainerBuilder();
     $container->set('test_module.route_service', new TestRouteSubscriber());
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php b/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
index da6117438..a5d75064e 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/RoutePreloaderTest.php
@@ -65,7 +65,7 @@ public function testOnAlterRoutesWithAdminRoutes() {
     $route_collection->add('test2', new Route('/admin/bar', ['_controller' => 'Drupal\ExampleController']));
     $event->expects($this->once())
       ->method('getRouteCollection')
-      ->will($this->returnValue($route_collection));
+      ->willReturn($route_collection);
 
     $this->state->expects($this->once())
       ->method('set')
@@ -88,7 +88,7 @@ public function testOnAlterRoutesWithAdminPathNoAdminRoute() {
     $route_collection->add('test4', new Route('/admin', ['_controller' => 'Drupal\ExampleController']));
     $event->expects($this->once())
       ->method('getRouteCollection')
-      ->will($this->returnValue($route_collection));
+      ->willReturn($route_collection);
 
     $this->state->expects($this->once())
       ->method('set')
@@ -126,7 +126,7 @@ public function testOnAlterRoutesWithNonAdminRoutes() {
 
     $event->expects($this->once())
       ->method('getRouteCollection')
-      ->will($this->returnValue($route_collection));
+      ->willReturn($route_collection);
 
     $this->state->expects($this->once())
       ->method('set')
@@ -146,7 +146,7 @@ public function testOnRequestNonHtml() {
     $request->setRequestFormat('non-html');
     $event->expects($this->any())
       ->method('getRequest')
-      ->will($this->returnValue($request));
+      ->willReturn($request);
 
     $this->routeProvider->expects($this->never())
       ->method('getRoutesByNames');
@@ -167,7 +167,7 @@ public function testOnRequestOnHtml() {
     $request->setRequestFormat('html');
     $event->expects($this->any())
       ->method('getRequest')
-      ->will($this->returnValue($request));
+      ->willReturn($request);
 
     $this->routeProvider->expects($this->once())
       ->method('preLoadRoutes')
@@ -175,7 +175,7 @@ public function testOnRequestOnHtml() {
     $this->state->expects($this->once())
       ->method('get')
       ->with('routing.non_admin_routes')
-      ->will($this->returnValue(['test2']));
+      ->willReturn(['test2']);
 
     $this->preloader->onRequest($event);
   }
diff --git a/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
index bd3268d86..7f210e683 100644
--- a/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Routing/UrlGeneratorTest.php
@@ -34,7 +34,7 @@ class UrlGeneratorTest extends UnitTestCase {
   protected $provider;
 
   /**
-   * The url generator to test.
+   * The URL generator to test.
    *
    * @var \Drupal\Core\Routing\UrlGenerator
    */
@@ -175,8 +175,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Return value callback for the getAliasByPath() method on the mock alias
-   * manager.
+   * Return value callback for getAliasByPath() on the mock alias manager.
    *
    * Ensures that by default the call to getAliasByPath() will return the first
    * argument that was passed in. We special-case the paths for which we wish it
@@ -452,8 +451,7 @@ public function testBaseURLGeneration() {
   }
 
   /**
-   * Tests that the 'scheme' route requirement is respected during url
-   * generation.
+   * Tests the 'scheme' route requirement during URL generation.
    */
   public function testUrlGenerationWithHttpsRequirement() {
     $url = $this->generator->generate('test_4', [], TRUE);
@@ -512,18 +510,19 @@ public function providerTestNoPath() {
    * Note: We use absolute covers to let
    * \Drupal\Tests\Core\Render\MetadataBubblingUrlGeneratorTest work.
    */
-  public function testGenerateWithPathProcessorChangingQueryParameter() {
+  public function testGenerateWithPathProcessorChangingOptions() {
     $path_processor = $this->createMock(OutboundPathProcessorInterface::CLASS);
     $path_processor->expects($this->atLeastOnce())
       ->method('processOutbound')
       ->willReturnCallback(function ($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
         $options['query'] = ['zoo' => 5];
+        $options['fragment'] = 'foo';
         return $path;
       });
     $this->processorManager->addOutbound($path_processor);
 
     $options = [];
-    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?zoo=5', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
+    $this->assertGenerateFromRoute('test_2', ['narf' => 5], $options, '/goodbye/cruel/world?zoo=5#foo', (new BubbleableMetadata())->setCacheMaxAge(Cache::PERMANENT));
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
index 8bd979a81..173659319 100644
--- a/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Session/PermissionsHashGeneratorTest.php
@@ -96,7 +96,7 @@ protected function setUp(): void {
       ->getMock();
     $this->account2->expects($this->any())
       ->method('getRoles')
-      ->will($this->returnValue($roles_1));
+      ->willReturn($roles_1);
     $this->account2->expects($this->any())
       ->method('id')
       ->willReturn(2);
@@ -109,7 +109,7 @@ protected function setUp(): void {
       ->getMock();
     $this->account3->expects($this->any())
       ->method('getRoles')
-      ->will($this->returnValue($roles_3));
+      ->willReturn($roles_3);
     $this->account3->expects($this->any())
       ->method('id')
       ->willReturn(3);
@@ -122,7 +122,7 @@ protected function setUp(): void {
       ->getMock();
     $this->account2Updated->expects($this->any())
       ->method('getRoles')
-      ->will($this->returnValue($roles_2_updated));
+      ->willReturn($roles_2_updated);
     $this->account2Updated->expects($this->any())
       ->method('id')
       ->willReturn(2);
@@ -135,7 +135,7 @@ protected function setUp(): void {
       ->getMock();
     $this->privateKey->expects($this->any())
       ->method('get')
-      ->will($this->returnValue($random));
+      ->willReturn($random);
     $this->cache = $this->getMockBuilder('Drupal\Core\Cache\CacheBackendInterface')
       ->disableOriginalConstructor()
       ->getMock();
@@ -178,7 +178,7 @@ public function testGeneratePersistentCache() {
     $this->staticCache->expects($this->once())
       ->method('get')
       ->with($expected_cid)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->staticCache->expects($this->once())
       ->method('set')
       ->with($expected_cid, $this->isType('string'));
@@ -186,7 +186,7 @@ public function testGeneratePersistentCache() {
     $this->cache->expects($this->once())
       ->method('get')
       ->with($expected_cid)
-      ->will($this->returnValue($mock_cache));
+      ->willReturn($mock_cache);
     $this->cache->expects($this->never())
       ->method('set');
 
@@ -206,7 +206,7 @@ public function testGenerateStaticCache() {
     $this->staticCache->expects($this->once())
       ->method('get')
       ->with($expected_cid)
-      ->will($this->returnValue($mock_cache));
+      ->willReturn($mock_cache);
     $this->staticCache->expects($this->never())
       ->method('set');
 
@@ -228,7 +228,7 @@ public function testGenerateNoCache() {
     $this->staticCache->expects($this->once())
       ->method('get')
       ->with($expected_cid)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->staticCache->expects($this->once())
       ->method('set')
       ->with($expected_cid, $this->isType('string'));
@@ -236,7 +236,7 @@ public function testGenerateNoCache() {
     $this->cache->expects($this->once())
       ->method('get')
       ->with($expected_cid)
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->cache->expects($this->once())
       ->method('set')
       ->with($expected_cid, $this->isType('string'));
diff --git a/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
index 236b31b39..92b156386 100644
--- a/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -117,7 +117,7 @@ protected function setUp(): void {
     $entity_type_manager->expects($this->any())
       ->method('getStorage')
       ->with($this->equalTo('user_role'))
-      ->will($this->returnValue($role_storage));
+      ->willReturn($role_storage);
     $container = new ContainerBuilder();
     $container->set('entity_type.manager', $entity_type_manager);
     \Drupal::setContainer($container);
diff --git a/web/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php b/web/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php
index 38e8b841c..5db4d7c9d 100644
--- a/web/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Session/WriteSafeSessionHandlerTest.php
@@ -27,6 +27,9 @@ class WriteSafeSessionHandlerTest extends UnitTestCase {
    */
   protected $sessionHandler;
 
+  /**
+   * {@inheritdoc}
+   */
   protected function setUp(): void {
     $this->wrappedSessionHandler = $this->createMock('SessionHandlerInterface');
     $this->sessionHandler = new WriteSafeSessionHandler($this->wrappedSessionHandler);
@@ -132,7 +135,7 @@ public function testSetSessionWritable() {
   public function testOtherMethods($method, $expected_result, $args) {
     $invocation = $this->wrappedSessionHandler->expects($this->exactly(2))
       ->method($method)
-      ->will($this->returnValue($expected_result));
+      ->willReturn($expected_result);
 
     // Set the parameter matcher.
     call_user_func_array([$invocation, 'with'], $args);
diff --git a/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php b/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
index 4e9a3ec6f..3e44e7481 100644
--- a/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Site/SettingsTest.php
@@ -322,6 +322,10 @@ public function providerTestRealDeprecatedSettings(): array {
         'twig_sandbox_whitelisted_prefixes',
         'The "twig_sandbox_whitelisted_prefixes" setting is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Use "twig_sandbox_allowed_prefixes" instead. See https://www.drupal.org/node/3162897.',
       ],
+      [
+        'block_interest_cohort',
+        'The "block_interest_cohort" setting is deprecated in drupal:9.5.0. This setting should be removed from the settings file, since its usage has been removed. See https://www.drupal.org/node/3320787.',
+      ],
     ];
   }
 
diff --git a/web/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php b/web/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php
index bd1137de8..c693ae6d0 100644
--- a/web/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php
+++ b/web/core/tests/Drupal/Tests/Core/StackMiddleware/NegotiationMiddlewareTest.php
@@ -125,7 +125,7 @@ public function testSetFormat() {
     $app = $this->createMock(MockedHttpKernelInterface::class);
     $app->expects($this->once())
       ->method('handle')
-      ->will($this->returnValue($this->createMock(Response::class)));
+      ->willReturn($this->createMock(Response::class));
 
     $content_negotiation = new StubNegotiationMiddleware($app);
 
diff --git a/web/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php b/web/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php
index 3586877c3..7a282b3d8 100644
--- a/web/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php
+++ b/web/core/tests/Drupal/Tests/Core/TempStore/PrivateTempStoreTest.php
@@ -127,7 +127,7 @@ public function testSetWithNoLockAvailable() {
     $this->lock->expects($this->exactly(2))
       ->method('acquire')
       ->with('1:test')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->lock->expects($this->once())
       ->method('wait')
       ->with('1:test');
@@ -148,7 +148,7 @@ public function testSet() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('1:test')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->lock->expects($this->never())
       ->method('wait');
     $this->lock->expects($this->once())
@@ -192,11 +192,11 @@ public function testDeleteLocking() {
     $this->keyValue->expects($this->once())
       ->method('get')
       ->with('1:test')
-      ->will($this->returnValue($this->ownObject));
+      ->willReturn($this->ownObject);
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('1:test')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->lock->expects($this->never())
       ->method('wait');
     $this->lock->expects($this->once())
@@ -219,11 +219,11 @@ public function testDeleteWithNoLockAvailable() {
     $this->keyValue->expects($this->once())
       ->method('get')
       ->with('1:test')
-      ->will($this->returnValue($this->ownObject));
+      ->willReturn($this->ownObject);
     $this->lock->expects($this->exactly(2))
       ->method('acquire')
       ->with('1:test')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->lock->expects($this->once())
       ->method('wait')
       ->with('1:test');
@@ -244,7 +244,7 @@ public function testDelete() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('1:test_2')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->keyValue->expects($this->exactly(3))
       ->method('get')
diff --git a/web/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php b/web/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php
index 97be1742b..df00faa22 100644
--- a/web/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php
+++ b/web/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php
@@ -7,11 +7,11 @@
 use Drupal\Core\KeyValueStore\KeyValueExpirableFactoryInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\TempStore\Lock;
+use Drupal\Core\Test\TestKernel;
 use Drupal\Core\TempStore\SharedTempStoreFactory;
 use Drupal\Tests\UnitTestCase;
 use Drupal\Core\TempStore\SharedTempStore;
 use Drupal\Core\TempStore\TempStoreException;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 
@@ -150,7 +150,7 @@ public function testSetWithNoLockAvailable() {
     $this->lock->expects($this->exactly(2))
       ->method('acquire')
       ->with('test')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->lock->expects($this->once())
       ->method('wait')
       ->with('test');
@@ -171,7 +171,7 @@ public function testSet() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('test')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->lock->expects($this->never())
       ->method('wait');
     $this->lock->expects($this->once())
@@ -194,7 +194,7 @@ public function testSetIfNotExists() {
     $this->keyValue->expects($this->once())
       ->method('setWithExpireIfNotExists')
       ->with('test', $this->ownObject, 604800)
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->assertTrue($this->tempStore->setIfNotExists('test', 'test_data'));
   }
@@ -207,7 +207,7 @@ public function testSetIfNotExists() {
   public function testSetIfOwnerWhenNotExists() {
     $this->keyValue->expects($this->once())
       ->method('setWithExpireIfNotExists')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->assertTrue($this->tempStore->setIfOwner('test', 'test_data'));
   }
@@ -220,12 +220,12 @@ public function testSetIfOwnerWhenNotExists() {
   public function testSetIfOwnerNoObject() {
     $this->keyValue->expects($this->once())
       ->method('setWithExpireIfNotExists')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->keyValue->expects($this->once())
       ->method('get')
       ->with('test')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->assertFalse($this->tempStore->setIfOwner('test', 'test_data'));
   }
@@ -239,11 +239,11 @@ public function testSetIfOwner() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('test')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->keyValue->expects($this->exactly(2))
       ->method('setWithExpireIfNotExists')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $this->keyValue->expects($this->exactly(2))
       ->method('get')
@@ -283,7 +283,7 @@ public function testDelete() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('test')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
     $this->lock->expects($this->never())
       ->method('wait');
     $this->lock->expects($this->once())
@@ -306,7 +306,7 @@ public function testDeleteWithNoLockAvailable() {
     $this->lock->expects($this->exactly(2))
       ->method('acquire')
       ->with('test')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
     $this->lock->expects($this->once())
       ->method('wait')
       ->with('test');
@@ -327,7 +327,7 @@ public function testDeleteIfOwner() {
     $this->lock->expects($this->once())
       ->method('acquire')
       ->with('test_2')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->keyValue->expects($this->exactly(3))
       ->method('get')
@@ -360,12 +360,10 @@ public function testSerialization() {
     $unserializable_request = new UnserializableRequest();
 
     $this->requestStack->push($unserializable_request);
-    $this->requestStack->_serviceId = 'request_stack';
 
-    $container = $this->prophesize(ContainerInterface::class);
-    $container->get('request_stack')->willReturn($this->requestStack);
-    $container->has('request_stack')->willReturn(TRUE);
-    \Drupal::setContainer($container->reveal());
+    $container = TestKernel::setContainerWithKernel();
+    $container->set('request_stack', $this->requestStack);
+    \Drupal::setContainer($container);
 
     $store = unserialize(serialize($this->tempStore));
     $this->assertInstanceOf(SharedTempStore::class, $store);
diff --git a/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php b/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
index 5852650fe..38836fccf 100644
--- a/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Template/TwigExtensionTest.php
@@ -34,7 +34,7 @@ class TwigExtensionTest extends UnitTestCase {
   protected $renderer;
 
   /**
-   * The url generator.
+   * The URL generator.
    *
    * @var \Drupal\Core\Routing\UrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
    */
@@ -64,7 +64,7 @@ class TwigExtensionTest extends UnitTestCase {
   /**
    * The file URL generator mock.
    *
-   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit_Framework_MockObject_MockObject
+   * @var \Drupal\Core\File\FileUrlGeneratorInterface|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $fileUrlGenerator;
 
@@ -307,12 +307,11 @@ public function providerTestRenderVar() {
   public function testEscapeWithGeneratedLink() {
     $loader = new FilesystemLoader();
     $twig = new Environment($loader, [
-        'debug' => TRUE,
-        'cache' => FALSE,
-        'autoescape' => 'html',
-        'optimizations' => 0,
-      ]
-    );
+      'debug' => TRUE,
+      'cache' => FALSE,
+      'autoescape' => 'html',
+      'optimizations' => 0,
+    ]);
 
     $twig->addExtension($this->systemUnderTest);
     $link = new GeneratedLink();
diff --git a/web/core/tests/Drupal/Tests/Core/Test/TestDiscoveryTest.php b/web/core/tests/Drupal/Tests/Core/Test/TestDiscoveryTest.php
index d8d034d3e..4ba0f39b5 100644
--- a/web/core/tests/Drupal/Tests/Core/Test/TestDiscoveryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Test/TestDiscoveryTest.php
@@ -483,14 +483,13 @@ public function testGetTestClassesWithSelectedTypes() {
   public function testGetTestsInProfiles() {
     $this->setupVfsWithTestClasses();
     $class_loader = $this->prophesize(ClassLoader::class);
-    $module_handler = $this->prophesize(ModuleHandlerInterface::class);
 
     $container = new Container();
     $container->set('kernel', new DrupalKernel('prod', new ClassLoader()));
     $container->setParameter('site.path', 'sites/default');
     \Drupal::setContainer($container);
 
-    $test_discovery = new TestDiscovery('vfs://drupal', $class_loader->reveal(), $module_handler->reveal());
+    $test_discovery = new TestDiscovery('vfs://drupal', $class_loader->reveal());
 
     $result = $test_discovery->getTestClasses('test_profile_module', ['PHPUnit-Kernel']);
     $expected = [
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php b/web/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php
index cb6535320..befd41cfe 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/AjaxBasePageNegotiatorTest.php
@@ -44,7 +44,7 @@ public function setUp(): void {
     parent::setUp();
 
     $this->tokenGenerator = $this->prophesize(CsrfTokenGenerator::class);
-    $config_factory = $this->getConfigFactoryStub(['system.theme' => ['default' => 'bartik']]);
+    $config_factory = $this->getConfigFactoryStub(['system.theme' => ['default' => 'stark']]);
     $this->requestStack = new RequestStack();
     $this->negotiator = new AjaxBasePageNegotiator($this->tokenGenerator->reveal(), $config_factory, $this->requestStack);
   }
@@ -66,8 +66,8 @@ public function providerTestApplies() {
     $data = [];
     $data['empty'] = [[], FALSE];
     $data['no_theme'] = [['ajax_page_state' => ['theme' => '', 'theme_token' => '']], FALSE];
-    $data['valid_theme_empty_theme_token'] = [['ajax_page_state' => ['theme' => 'seven', 'theme_token' => '']], TRUE];
-    $data['valid_theme_valid_theme_token'] = [['ajax_page_state' => ['theme' => 'seven', 'theme_token' => 'valid_theme_token']], TRUE];
+    $data['valid_theme_empty_theme_token'] = [['ajax_page_state' => ['theme' => 'claro', 'theme_token' => '']], TRUE];
+    $data['valid_theme_valid_theme_token'] = [['ajax_page_state' => ['theme' => 'claro', 'theme_token' => 'valid_theme_token']], TRUE];
     return $data;
   }
 
@@ -75,7 +75,7 @@ public function providerTestApplies() {
    * @covers ::determineActiveTheme
    */
   public function testDetermineActiveThemeValidToken() {
-    $theme = 'seven';
+    $theme = 'claro';
     $theme_token = 'valid_theme_token';
 
     $request = new Request([], ['ajax_page_state' => ['theme' => $theme, 'theme_token' => $theme_token]]);
@@ -92,7 +92,7 @@ public function testDetermineActiveThemeValidToken() {
    * @covers ::determineActiveTheme
    */
   public function testDetermineActiveThemeInvalidToken() {
-    $theme = 'seven';
+    $theme = 'claro';
     $theme_token = 'invalid_theme_token';
 
     $request = new Request([], ['ajax_page_state' => ['theme' => $theme, 'theme_token' => $theme_token]]);
@@ -109,7 +109,7 @@ public function testDetermineActiveThemeInvalidToken() {
    * @covers ::determineActiveTheme
    */
   public function testDetermineActiveThemeDefaultTheme() {
-    $theme = 'bartik';
+    $theme = 'stark';
     // When the theme is the system default, an empty string is provided as the
     // theme token. See system_js_settings_alter().
     $theme_token = '';
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/ClassyPreprocessUnchangedTest.php b/web/core/tests/Drupal/Tests/Core/Theme/ClassyPreprocessUnchangedTest.php
index 209f9f1e2..ae7416849 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/ClassyPreprocessUnchangedTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/ClassyPreprocessUnchangedTest.php
@@ -8,6 +8,9 @@
  * Confirms that classy.theme has not added new functionality.
  *
  * @group Theme
+ * @group legacy
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3110137
  */
 class ClassyPreprocessUnchangedTest extends UnitTestCase {
 
@@ -22,7 +25,7 @@ class ClassyPreprocessUnchangedTest extends UnitTestCase {
   public function testNoNewPreprocess() {
     $classy_theme_contents = file_get_contents($this->root . '/core/themes/classy/classy.theme');
     $hash = md5($classy_theme_contents);
-    $this->assertSame($hash, 'c42ff3a1291a258b42f0c44010cd28c7', "The file hash for classy.theme has changed. Any additions or changes to preprocess functions should be added to the themes that inherit Classy. \nIf the changes to classy.theme are not changes to preprocess functions, update the hash in this test to: '$hash' so it will pass.");
+    $this->assertSame('1a5f162bc900c45957aaa89959bcb607', $hash, "The file hash for classy.theme has changed. Any additions or changes to preprocess functions should be added to the themes that inherit Classy. \nIf the changes to classy.theme are not changes to preprocess functions, update the hash in this test to: '$hash' so it will pass.");
   }
 
 }
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php b/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
index ee018ae7f..8dafad672 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/ClassyTemplatesIdenticalToStableTest.php
@@ -8,6 +8,9 @@
  * Confirms that certain Classy templates have identical equivalents in Stable.
  *
  * @group Theme
+ * @group legacy
+ *
+ * @todo Remove in https://www.drupal.org/project/drupal/issues/3110137
  */
 class ClassyTemplatesIdenticalToStableTest extends UnitTestCase {
 
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php b/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php
index 31ccde9d1..2ec811b0d 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/RegistryLegacyTest.php
@@ -58,6 +58,13 @@ class RegistryLegacyTest extends UnitTestCase {
    */
   protected $themeInitialization;
 
+  /**
+   * The mocked cache backend.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $runtimeCache;
+
   /**
    * The theme manager.
    *
@@ -83,6 +90,7 @@ protected function setUp(): void {
     $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->themeHandler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $this->themeInitialization = $this->createMock('Drupal\Core\Theme\ThemeInitializationInterface');
+    $this->runtimeCache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
     $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface');
     $this->moduleList = $this->createMock(ModuleExtensionList::class);
 
@@ -155,8 +163,7 @@ protected function setupTheme() {
         $this->moduleHandler,
         $this->themeHandler,
         $this->themeInitialization,
-        NULL,
-        NULL,
+        $this->runtimeCache,
         $this->moduleList,
       ])
       ->getMock();
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php b/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
index f81a8f6d7..707c0b0bd 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/RegistryTest.php
@@ -16,7 +16,7 @@ class RegistryTest extends UnitTestCase {
   /**
    * The mocked theme registry.
    *
-   * @var \Drupal\Core\Theme\Registry|PHPUnit\Framework\MockObject\MockObject
+   * @var \Drupal\Core\Theme\Registry|\PHPUnit\Framework\MockObject\MockObject
    */
   protected $registry;
 
@@ -55,6 +55,14 @@ class RegistryTest extends UnitTestCase {
    */
   protected $themeInitialization;
 
+  /**
+   * The mocked cache backend.
+   *
+   * @var \Drupal\Core\Cache\CacheBackendInterface|\PHPUnit\Framework\MockObject\MockObject
+   */
+  protected $runtimeCache;
+
+
   /**
    * The theme manager.
    *
@@ -87,6 +95,7 @@ protected function setUp(): void {
     $this->moduleHandler = $this->createMock('Drupal\Core\Extension\ModuleHandlerInterface');
     $this->themeHandler = $this->createMock('Drupal\Core\Extension\ThemeHandlerInterface');
     $this->themeInitialization = $this->createMock('Drupal\Core\Theme\ThemeInitializationInterface');
+    $this->runtimeCache = $this->createMock('Drupal\Core\Cache\CacheBackendInterface');
     $this->themeManager = $this->createMock('Drupal\Core\Theme\ThemeManagerInterface');
     $this->moduleList = $this->createMock(ModuleExtensionList::class);
     $this->setupTheme();
@@ -487,7 +496,7 @@ public function providerTestPostProcessExtension() {
   protected function setupTheme() {
     $this->registry = $this->getMockBuilder(Registry::class)
       ->onlyMethods(['getPath'])
-      ->setConstructorArgs([$this->root, $this->cache, $this->lock, $this->moduleHandler, $this->themeHandler, $this->themeInitialization, NULL, NULL, $this->moduleList])
+      ->setConstructorArgs([$this->root, $this->cache, $this->lock, $this->moduleHandler, $this->themeHandler, $this->themeInitialization, $this->runtimeCache, $this->moduleList])
       ->getMock();
     $this->registry->expects($this->any())
       ->method('getPath')
diff --git a/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php b/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
index 84a597034..f0d372f10 100644
--- a/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Theme/ThemeNegotiatorTest.php
@@ -62,10 +62,10 @@ public function testDetermineActiveTheme() {
     $negotiator = $this->createMock('Drupal\Core\Theme\ThemeNegotiatorInterface');
     $negotiator->expects($this->once())
       ->method('determineActiveTheme')
-      ->will($this->returnValue('example_test'));
+      ->willReturn('example_test');
     $negotiator->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $this->container->set('test_negotiator', $negotiator);
 
@@ -73,7 +73,7 @@ public function testDetermineActiveTheme() {
 
     $this->themeAccessCheck->expects($this->any())
       ->method('checkAccess')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->createThemeNegotiator($negotiators)->determineActiveTheme($route_match);
@@ -92,10 +92,10 @@ public function testDetermineActiveThemeWithPriority() {
     $negotiator = $this->createMock('Drupal\Core\Theme\ThemeNegotiatorInterface');
     $negotiator->expects($this->once())
       ->method('determineActiveTheme')
-      ->will($this->returnValue('example_test'));
+      ->willReturn('example_test');
     $negotiator->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $negotiators['test_negotiator_1'] = $negotiator;
 
@@ -113,7 +113,7 @@ public function testDetermineActiveThemeWithPriority() {
 
     $this->themeAccessCheck->expects($this->any())
       ->method('checkAccess')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->createThemeNegotiator(array_keys($negotiators))->determineActiveTheme($route_match);
@@ -132,20 +132,20 @@ public function testDetermineActiveThemeWithAccessCheck() {
     $negotiator = $this->createMock('Drupal\Core\Theme\ThemeNegotiatorInterface');
     $negotiator->expects($this->once())
       ->method('determineActiveTheme')
-      ->will($this->returnValue('example_test'));
+      ->willReturn('example_test');
     $negotiator->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $negotiators['test_negotiator_1'] = $negotiator;
 
     $negotiator = $this->createMock('Drupal\Core\Theme\ThemeNegotiatorInterface');
     $negotiator->expects($this->once())
       ->method('determineActiveTheme')
-      ->will($this->returnValue('example_test2'));
+      ->willReturn('example_test2');
     $negotiator->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $negotiators['test_negotiator_2'] = $negotiator;
 
@@ -179,17 +179,17 @@ public function testDetermineActiveThemeWithNotApplyingNegotiator() {
       ->method('determineActiveTheme');
     $negotiator->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(FALSE));
+      ->willReturn(FALSE);
 
     $negotiators['test_negotiator_1'] = $negotiator;
 
     $negotiator = $this->createMock('Drupal\Core\Theme\ThemeNegotiatorInterface');
     $negotiator->expects($this->once())
       ->method('determineActiveTheme')
-      ->will($this->returnValue('example_test2'));
+      ->willReturn('example_test2');
     $negotiator->expects($this->once())
       ->method('applies')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $negotiators['test_negotiator_2'] = $negotiator;
 
@@ -199,7 +199,7 @@ public function testDetermineActiveThemeWithNotApplyingNegotiator() {
 
     $this->themeAccessCheck->expects($this->any())
       ->method('checkAccess')
-      ->will($this->returnValue(TRUE));
+      ->willReturn(TRUE);
 
     $route_match = new RouteMatch('test_route', new Route('/test-route'), [], []);
     $theme = $this->createThemeNegotiator(array_keys($negotiators))->determineActiveTheme($route_match);
diff --git a/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php b/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
index 06e698304..530066718 100644
--- a/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/TypedData/RecursiveContextualValidatorTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\Tests\Core\TypedData\RecursiveContextualValidatorTest.
- */
-
 namespace Drupal\Tests\Core\TypedData;
 
 use Drupal\Core\Cache\NullBackend;
@@ -258,7 +253,7 @@ public function testValidatePropertyWithInvalidObjects($object) {
   public function providerTestValidatePropertyWithInvalidObjects() {
     $data = [];
     $data[] = [new \stdClass()];
-    $data[] = [new TestClass()];
+    $data[] = [new class() {}];
 
     $data[] = [$this->createMock('Drupal\Core\TypedData\TypedDataInterface')];
 
@@ -334,7 +329,7 @@ protected function buildExampleTypedDataWithProperties($subkey_value = NULL) {
       ],
       'key_with_properties' => [
         'value' => $subkey_value ?: ['subkey1' => 'subvalue1', 'subkey2' => 'subvalue2'],
-        ],
+      ],
     ];
     $tree['properties']['key_with_properties']['properties']['subkey1'] = ['value' => $tree['properties']['key_with_properties']['value']['subkey1']];
     $tree['properties']['key_with_properties']['properties']['subkey2'] = ['value' => $tree['properties']['key_with_properties']['value']['subkey2']];
@@ -343,7 +338,3 @@ protected function buildExampleTypedDataWithProperties($subkey_value = NULL) {
   }
 
 }
-
-class TestClass {
-
-}
diff --git a/web/core/tests/Drupal/Tests/Core/UrlTest.php b/web/core/tests/Drupal/Tests/Core/UrlTest.php
index 45fbd0f33..10586c8d7 100644
--- a/web/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/web/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -118,7 +118,7 @@ protected function setUp(): void {
   }
 
   /**
-   * Tests creating a Url from a request.
+   * Tests creating a URL from a request.
    */
   public function testUrlFromRequest() {
     $this->router->expects($this->exactly(3))
@@ -129,15 +129,15 @@ public function testUrlFromRequest() {
         [$this->getRequestConstraint('/node/2/edit')],
       )
       ->willReturnOnConsecutiveCalls([
-          RouteObjectInterface::ROUTE_NAME => 'view.frontpage.page_1',
-          '_raw_variables' => new ParameterBag(),
-        ], [
-          RouteObjectInterface::ROUTE_NAME => 'node_view',
-          '_raw_variables' => new ParameterBag(['node' => '1']),
-        ], [
-          RouteObjectInterface::ROUTE_NAME => 'node_edit',
-          '_raw_variables' => new ParameterBag(['node' => '2']),
-        ]);
+        RouteObjectInterface::ROUTE_NAME => 'view.frontpage.page_1',
+        '_raw_variables' => new ParameterBag(),
+      ], [
+        RouteObjectInterface::ROUTE_NAME => 'node_view',
+        '_raw_variables' => new ParameterBag(['node' => '1']),
+      ], [
+        RouteObjectInterface::ROUTE_NAME => 'node_edit',
+        '_raw_variables' => new ParameterBag(['node' => '2']),
+      ]);
 
     $urls = [];
     foreach ($this->map as $index => $values) {
@@ -265,7 +265,7 @@ public function testCreateFromRequest() {
     $this->router->expects($this->once())
       ->method('matchRequest')
       ->with($request)
-      ->will($this->returnValue($attributes));
+      ->willReturn($attributes);
 
     $url = Url::createFromRequest($request);
     $expected = new Url('the_route_name', ['color' => 'chartreuse']);
@@ -357,14 +357,14 @@ public function testGetInternalPath($urls) {
     $map[] = ['node_view', ['node' => '1'], '/node/1'];
     $map[] = ['node_edit', ['node' => '2'], '/node/2/edit'];
 
-    foreach ($urls as $index => $url) {
-      // Clone the url so that there is no leak of internal state into the
+    foreach ($urls as $url) {
+      // Clone the URL so that there is no leak of internal state into the
       // other ones.
       $url = clone $url;
       $url_generator = $this->createMock('Drupal\Core\Routing\UrlGeneratorInterface');
       $url_generator->expects($this->once())
         ->method('getPathFromRoute')
-        ->will($this->returnValueMap($map, $index));
+        ->willReturnMap($map);
       $url->setUrlGenerator($url_generator);
 
       $url->getInternalPath();
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php b/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
index 540442693..0338a6517 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -28,7 +28,7 @@ class LinkGeneratorTest extends UnitTestCase {
   protected $linkGenerator;
 
   /**
-   * The mocked url generator.
+   * The mocked URL generator.
    *
    * @var \PHPUnit\Framework\MockObject\MockObject
    */
@@ -90,7 +90,7 @@ protected function setUp(): void {
    */
   public function providerTestGenerateHrefs() {
     return [
-      // Test that the url returned by the URL generator is used.
+      // Test that the URL returned by the URL generator is used.
       ['test_route_1', [], FALSE, '/test-route-1'],
         // Test that $parameters is passed to the URL generator.
       ['test_route_2', ['value' => 'example'], FALSE, '/test-route-2/example'],
@@ -120,7 +120,7 @@ public function testGenerateHrefs($route_name, array $parameters, $absolute, $ex
     $result = $this->linkGenerator->generate('Test', $url);
     $this->assertLink([
       'attributes' => ['href' => $expected_url],
-      ], $result);
+    ], $result);
   }
 
   /**
@@ -274,7 +274,7 @@ public function testGenerateExternal() {
   }
 
   /**
-   * Tests the generate() method with a url containing double quotes.
+   * Tests the generate() method with a URL containing double quotes.
    *
    * @covers ::generate
    */
@@ -628,7 +628,7 @@ public function testGenerateWithAlterHook() {
   public function testGenerateTwice() {
     $this->urlGenerator->expects($this->any())
       ->method('generateFromRoute')
-      ->will($this->returnValue((new GeneratedUrl())->setGeneratedUrl('/')));
+      ->willReturn((new GeneratedUrl())->setGeneratedUrl('/'));
 
     $url = Url::fromRoute('<front>', [], ['attributes' => ['class' => ['foo', 'bar']]]);
     $url->setUrlGenerator($this->urlGenerator);
diff --git a/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php b/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
index fdfa71055..ae62e7c4e 100644
--- a/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
+++ b/web/core/tests/Drupal/Tests/Core/Utility/TokenTest.php
@@ -114,12 +114,12 @@ public function testGetInfo() {
 
     $this->language->expects($this->atLeastOnce())
       ->method('getId')
-      ->will($this->returnValue($this->randomMachineName()));
+      ->willReturn($this->randomMachineName());
 
     $this->languageManager->expects($this->once())
       ->method('getCurrentLanguage')
       ->with(LanguageInterface::TYPE_CONTENT)
-      ->will($this->returnValue($this->language));
+      ->willReturn($this->language);
 
     // The persistent cache must only be hit once, after which the info is
     // cached statically.
@@ -132,7 +132,7 @@ public function testGetInfo() {
     $this->moduleHandler->expects($this->once())
       ->method('invokeAll')
       ->with('token_info')
-      ->will($this->returnValue($token_info));
+      ->willReturn($token_info);
     $this->moduleHandler->expects($this->once())
       ->method('alter')
       ->with('token_info', $token_info);
diff --git a/web/core/tests/Drupal/Tests/DocumentElement.php b/web/core/tests/Drupal/Tests/DocumentElement.php
index 5d6def89c..6632caea8 100644
--- a/web/core/tests/Drupal/Tests/DocumentElement.php
+++ b/web/core/tests/Drupal/Tests/DocumentElement.php
@@ -10,7 +10,7 @@
 use Behat\Mink\Element\Element;
 use Behat\Mink\Element\TraversableElement;
 use Drupal\FunctionalJavascriptTests\WebDriverCurlService;
-use WebDriver\Exception\CurlExec;
+use WebDriver\Exception;
 
 /**
  * Document element.
@@ -100,7 +100,7 @@ public function waitFor($timeout, $callback) {
       try {
         return call_user_func($callback, $element);
       }
-      catch (CurlExec $e) {
+      catch (Exception $e) {
         return NULL;
       }
     };
diff --git a/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php b/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
index a89ea6fa8..fc6e9b039 100644
--- a/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
+++ b/web/core/tests/Drupal/Tests/Listeners/DeprecationListenerTrait.php
@@ -142,6 +142,10 @@ public static function getSkippedDeprecations() {
       // Drupal date library deprecated.
       'The "core/drupal.date" asset library is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3258267',
       "Drupal\Core\Render\Element\Date::processDate() is deprecated in drupal:9.4.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3258267",
+      'The "core/popperjs" asset library is deprecated in Drupal 9.5.0 and will be removed in Drupal 10.0.0. There is no replacement. See https://www.drupal.org/node/3307518',
+      // The CKEditor 4 asset library is deprecated.
+      'The "core/ckeditor" asset library is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3304481',
+      'Theme "core" is extending a deprecated library. The "core/ckeditor" asset library is deprecated in drupal:9.5.0 and is removed from drupal:10.0.0. There is no replacement. See https://www.drupal.org/node/3304481',
     ];
   }
 
@@ -160,6 +164,10 @@ protected function registerErrorHandler() {
       if (($type === E_USER_DEPRECATED || $type === E_DEPRECATED) && static::isDeprecationSkipped($msg)) {
         return;
       }
+      // Drupal 9 uses PHP syntax that's deprecated in PHP 8.2.
+      if (PHP_VERSION_ID >= 80200 && $type === E_DEPRECATED) {
+        return;
+      }
       return call_user_func($this->previousHandler, $type, $msg, $file, $line, $context);
     };
 
diff --git a/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php b/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
index a312bb145..fcb63ccd4 100644
--- a/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
+++ b/web/core/tests/Drupal/Tests/Scripts/TestSiteApplicationTest.php
@@ -87,10 +87,6 @@ public function testInstallWithFileWithNoClass() {
   public function testInstallWithNonSetupClass() {
     $this->markTestIncomplete('Fix this test in https://www.drupal.org/project/drupal/issues/2962157.');
 
-    // Create a connection to the DB configured in SIMPLETEST_DB.
-    $connection = Database::getConnection('default', $this->addTestDatabase(''));
-    $table_count = count($connection->schema()->findTables('%'));
-
     // Use __FILE__ to test absolute paths.
     $command_line = $this->php . ' core/scripts/test-site.php install --setup-file "' . __FILE__ . '" --db-url "' . getenv('SIMPLETEST_DB') . '"';
     $process = Process::fromShellCommandline($command_line, $this->root, ['COLUMNS' => PHP_INT_MAX]);
@@ -98,8 +94,6 @@ public function testInstallWithNonSetupClass() {
 
     $this->assertStringContainsString('The class Drupal\Tests\Scripts\TestSiteApplicationTest contained in', $process->getErrorOutput());
     $this->assertStringContainsString('needs to implement \Drupal\TestSite\TestSetupInterface', $process->getErrorOutput());
-    $this->assertSame(1, $process->getExitCode());
-    $this->assertCount($table_count, $connection->schema()->findTables('%'), 'No additional tables created in the database');
   }
 
   /**
diff --git a/web/core/tests/Drupal/Tests/TestFileCreationTrait.php b/web/core/tests/Drupal/Tests/TestFileCreationTrait.php
index 5bc40fc5e..5f401975d 100644
--- a/web/core/tests/Drupal/Tests/TestFileCreationTrait.php
+++ b/web/core/tests/Drupal/Tests/TestFileCreationTrait.php
@@ -48,8 +48,9 @@ trait TestFileCreationTrait {
    *   (optional) File size in bytes to match. Defaults to NULL, which will not
    *   filter the returned list by size.
    *
-   * @return array[]
-   *   List of files in public:// that match the filter(s).
+   * @return object[]
+   *   List of files in public:// that match the filter(s). Each file is an
+   *   object with 'uri', 'filename', and 'name' properties.
    */
   protected function getTestFiles($type, $size = NULL) {
     /** @var \Drupal\Core\File\FileSystemInterface $file_system */
diff --git a/web/core/tests/Drupal/Tests/UiHelperTrait.php b/web/core/tests/Drupal/Tests/UiHelperTrait.php
index cd0b7dea7..2dce64fbf 100644
--- a/web/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/web/core/tests/Drupal/Tests/UiHelperTrait.php
@@ -305,7 +305,7 @@ public function assertSession($name = NULL) {
    * @param string|\Drupal\Core\Url $path
    *   Drupal path or URL to load into Mink controlled browser.
    * @param array $options
-   *   (optional) Options to be forwarded to the url generator.
+   *   (optional) Options to be forwarded to the URL generator.
    * @param string[] $headers
    *   An array containing additional HTTP request headers, the array keys are
    *   the header names and the array values the header values. This is useful
@@ -361,7 +361,7 @@ protected function drupalGet($path, array $options = [], array $headers = []) {
    * Builds an absolute URL from a system path or a URL object.
    *
    * @param string|\Drupal\Core\Url $path
-   *   A system path or a URL.
+   *   A system path or a URL object.
    * @param array $options
    *   Options to be passed to Url::fromUri().
    *
diff --git a/web/core/tests/Drupal/Tests/UnitTestCase.php b/web/core/tests/Drupal/Tests/UnitTestCase.php
index fed556fe3..e6b0da2fe 100644
--- a/web/core/tests/Drupal/Tests/UnitTestCase.php
+++ b/web/core/tests/Drupal/Tests/UnitTestCase.php
@@ -200,13 +200,13 @@ public function getConfigStorageStub(array $configs) {
     $config_storage = $this->createMock('Drupal\Core\Config\NullStorage');
     $config_storage->expects($this->any())
       ->method('listAll')
-      ->will($this->returnValue(array_keys($configs)));
+      ->willReturn(array_keys($configs));
 
     foreach ($configs as $name => $config) {
       $config_storage->expects($this->any())
         ->method('read')
         ->with($this->equalTo($name))
-        ->will($this->returnValue($config));
+        ->willReturn($config);
     }
     return $config_storage;
   }
@@ -252,7 +252,7 @@ protected function getContainerWithCacheTagsInvalidator(CacheTagsInvalidatorInte
     $container->expects($this->any())
       ->method('get')
       ->with('cache_tags.invalidator')
-      ->will($this->returnValue($cache_tags_validator));
+      ->willReturn($cache_tags_validator);
 
     \Drupal::setContainer($container);
     return $container;
diff --git a/web/core/tests/Drupal/Tests/WebAssert.php b/web/core/tests/Drupal/Tests/WebAssert.php
index 8e887d200..8c9f096f9 100644
--- a/web/core/tests/Drupal/Tests/WebAssert.php
+++ b/web/core/tests/Drupal/Tests/WebAssert.php
@@ -233,7 +233,7 @@ public function optionExists($select, $option, TraversableElement $container = N
       throw new ElementNotFoundException($this->session->getDriver(), 'select', 'id|name|label|value', $select);
     }
 
-    $option_field = $select_field->find('named', ['option', $option]);
+    $option_field = $select_field->find('named_exact', ['option', $option]);
 
     if ($option_field === NULL) {
       throw new ElementNotFoundException($this->session->getDriver(), 'select', 'id|name|label|value', $option);
@@ -269,7 +269,7 @@ public function optionNotExists($select, $option, TraversableElement $container
       throw new ElementNotFoundException($this->session->getDriver(), 'select', 'id|name|label|value', $select);
     }
 
-    $option_field = $select_field->find('named', ['option', $option]);
+    $option_field = $select_field->find('named_exact', ['option', $option]);
 
     $this->assert($option_field === NULL, sprintf('An option "%s" exists in select "%s", but it should not.', $option, $select));
   }
@@ -1237,9 +1237,12 @@ protected function buildStatusMessageSelector(string $message = NULL, string $ty
         $aria_label = 'Warning message';
     }
 
-    if ($message && $aria_label) {
-      $selector = $this->buildXPathQuery($selector . '//div[contains(@aria-label, :aria_label) and contains(., :message)]', [
+    if ($message && $aria_label && $type) {
+      $selector = $this->buildXPathQuery($selector . '//div[(contains(@aria-label, :aria_label) or contains(@aria-labelledby, :type)) and contains(., :message)]', [
+        // Value of the 'aria-label' attribute, used in Seven and Bartik
         ':aria_label' => $aria_label,
+        // Value of the 'aria-labelledby' attribute, used in Claro and Olivero.
+        ':type' => $type,
         ':message' => $message,
       ]);
     }
diff --git a/web/core/tests/bootstrap.php b/web/core/tests/bootstrap.php
index 5f5b494cf..caede102d 100644
--- a/web/core/tests/bootstrap.php
+++ b/web/core/tests/bootstrap.php
@@ -179,3 +179,42 @@ class_alias('\Drupal\Tests\DocumentElement', '\Behat\Mink\Element\DocumentElemen
 // thrown if an assert fails, but this call does not turn runtime assertions on
 // if they weren't on already.
 Handle::register();
+
+// Drupal 9 uses PHP syntax that's deprecated in PHP 8.2. Therefore, for
+// PHP 8.2, the error handler registered in
+// \Drupal\Tests\Listeners\DeprecationListenerTrait::registerErrorHandler()
+// ignores E_DEPRECATED errors. However, that error handler is not used
+// during:
+// - The execution of data providers.
+// - The child process of tests that are executed in a separate (isolated)
+//   process, such as kernel tests.
+//
+// To silence E_DEPRECATED errors during the above, re-register the error
+// handler that has already been set by symfony/phpunit-bridge/bootstrap.php,
+// but constrain it to not get called for E_DEPRECATED errors. It is still
+// useful for E_USER_DEPRECATED and other error types.
+if (PHP_VERSION_ID >= 80200) {
+  // Get the current error handler without changing it.
+  $error_handler = set_error_handler(NULL);
+  restore_error_handler();
+
+  if ($error_handler) {
+    // Replace the current error handler with the same one, but filter out
+    // E_DEPRECATED errors.
+    restore_error_handler();
+    set_error_handler($error_handler, E_ALL & ~E_DEPRECATED);
+
+    // The above results in PHP's built-in error handler getting called for
+    // E_DEPRECATED errors. Silence those errors too. Note that
+    // \PHPUnit\TextUI\TestRunner::handleConfiguration() can get called twice
+    // (once before running data providers, then again before running tests),
+    // whereas tests/bootstrap.php is included via include_once(), so the 2nd
+    // handleConfiguration() call can reset error_reporting to the value in
+    // phpunit.xml. However, that's okay, because for those cases, the error
+    // handler registered in
+    // \Drupal\Tests\Listeners\DeprecationListenerTrait::registerErrorHandler()
+    // is in use, and it ignores E_DEPRECATED errors for PHP 8.2 regardless of
+    // the error_reporting value.
+    error_reporting(error_reporting() & ~E_DEPRECATED);
+  }
+}
diff --git a/web/core/tests/fixtures/test_stable/test_stable.info.yml b/web/core/tests/fixtures/test_stable/test_stable.info.yml
index ede1ac5a0..0c8aeb253 100644
--- a/web/core/tests/fixtures/test_stable/test_stable.info.yml
+++ b/web/core/tests/fixtures/test_stable/test_stable.info.yml
@@ -1,4 +1,5 @@
 name: Test Stable
 type: theme
-description: A theme to test that stable is set as the default.
+base theme: stable9
+description: A theme to test that stable 9 is set as the default.
 version: VERSION
diff --git a/web/core/themes/bartik/bartik.info.yml b/web/core/themes/bartik/bartik.info.yml
index 0789d8eae..7bb584c80 100644
--- a/web/core/themes/bartik/bartik.info.yml
+++ b/web/core/themes/bartik/bartik.info.yml
@@ -13,6 +13,8 @@
 # changes.
 name: Bartik
 type: theme
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/node/3223395#s-bartik
 base theme: false
 description: 'A flexible, recolorable theme with many regions and a responsive, mobile-first layout.'
 package: Core
diff --git a/web/core/themes/bartik/color/preview.js b/web/core/themes/bartik/color/preview.js
index e626e7d8e..7c5ca3d52 100644
--- a/web/core/themes/bartik/color/preview.js
+++ b/web/core/themes/bartik/color/preview.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, drupalSettings) {
   Drupal.color = {
     logoChanged: false,
@@ -13,11 +12,9 @@
         $('.color-preview .color-preview-logo img').attr('src', drupalSettings.color.logo);
         this.logoChanged = true;
       }
-
       if (drupalSettings.color.logo === null) {
         $('div').remove('.color-preview-logo');
       }
-
       var $colorPreview = $form.find('.color-preview');
       var $colorPalette = $form.find('.js-color-palette');
       $colorPreview.css('backgroundColor', $colorPalette.find('input[name="palette[bg]"]')[0].value);
diff --git a/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js b/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js
index 0b9d95999..0ca2409c5 100644
--- a/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js
+++ b/web/core/themes/bartik/js/classy/media_embed_ckeditor.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.mediaEmbedPreviewError = function () {
     return "<div class=\"media-embed-error media-embed-error--preview-error\">".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
diff --git a/web/core/themes/bartik/templates/block--search-form-block.html.twig b/web/core/themes/bartik/templates/block--search-form-block.html.twig
index 1f9adf0d3..892b8c650 100644
--- a/web/core/themes/bartik/templates/block--search-form-block.html.twig
+++ b/web/core/themes/bartik/templates/block--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - content_attributes: A list of HTML attributes applied to the main content
  * - attributes: A list HTML attributes populated by modules, intended to
diff --git a/web/core/themes/bartik/templates/block--system-menu-block.html.twig b/web/core/themes/bartik/templates/block--system-menu-block.html.twig
index aea280820..bd5fdb62e 100644
--- a/web/core/themes/bartik/templates/block--system-menu-block.html.twig
+++ b/web/core/themes/bartik/templates/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/bartik/templates/block.html.twig b/web/core/themes/bartik/templates/block.html.twig
index 9d8be22ee..8790ee10e 100644
--- a/web/core/themes/bartik/templates/block.html.twig
+++ b/web/core/themes/bartik/templates/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/claro/claro.info.yml b/web/core/themes/claro/claro.info.yml
index 6032f10bc..123c211cb 100644
--- a/web/core/themes/claro/claro.info.yml
+++ b/web/core/themes/claro/claro.info.yml
@@ -105,7 +105,7 @@ libraries-override:
   views_ui/admin.styling:
     css:
       component:
-          css/views_ui.admin.css: css/components/views_ui.admin.css
+        css/views_ui.admin.css: css/components/views_ui.admin.css
       theme:
         css/views_ui.admin.theme.css: css/theme/views_ui.admin.theme.css
 
diff --git a/web/core/themes/claro/claro.libraries.yml b/web/core/themes/claro/claro.libraries.yml
index 88f9c2fac..c65a5a484 100644
--- a/web/core/themes/claro/claro.libraries.yml
+++ b/web/core/themes/claro/claro.libraries.yml
@@ -265,7 +265,7 @@ vertical-tabs:
     component:
       css/components/vertical-tabs.css: {}
   js:
-     js/vertical-tabs.js: {}
+    js/vertical-tabs.js: {}
   dependencies:
     - claro/global-styling
 
diff --git a/web/core/themes/claro/claro.theme b/web/core/themes/claro/claro.theme
index d7c49a793..14540dd20 100644
--- a/web/core/themes/claro/claro.theme
+++ b/web/core/themes/claro/claro.theme
@@ -326,6 +326,27 @@ function claro_preprocess_maintenance_page(&$variables) {
   $variables['#attached']['library'][] = 'claro/maintenance-page';
 }
 
+/**
+ * Implements hook_theme_suggestions_maintenance_page_alter().
+ */
+function claro_theme_suggestions_maintenance_page_alter(&$suggestions) {
+  try {
+    $is_front = \Drupal::service('path.matcher')->isFrontPage();
+  }
+  catch (Exception $e) {
+    // An exception could mean that the database is offline. This scenario
+    // should also be rendered using the frontpage template.
+    $is_front = TRUE;
+  }
+
+  if ($is_front) {
+    // Add theme suggestion for maintenance page rendered as front page. This
+    // allows separating different applications such as update.php from the
+    // actual maintenance page.
+    $suggestions[] = 'maintenance_page__front';
+  }
+}
+
 /**
  * Implements hook_preprocess_HOOK() for details.
  *
@@ -1532,7 +1553,9 @@ function claro_form_views_ui_config_item_form_alter(array &$form, FormStateInter
     // needed or require refactoring in https://drupal.org/node/3164890
     unset($form['options']['clear_markup_start']);
     unset($form['options']['clear_markup_end']);
-    $form['options']['expose_button']['#prefix'] = str_replace('clearfix', '', $form['options']['expose_button']['#prefix']);
+    if (isset($form['options']['expose_button']['#prefix'])) {
+      $form['options']['expose_button']['#prefix'] = str_replace('clearfix', '', $form['options']['expose_button']['#prefix']);
+    }
     if (isset($form['options']['group_button']['#prefix'])) {
       $form['options']['group_button']['#prefix'] = str_replace('clearfix', '', $form['options']['group_button']['#prefix']);
     }
diff --git a/web/core/themes/claro/css/base/print.css b/web/core/themes/claro/css/base/print.css
index 997203eda..783a62b52 100644
--- a/web/core/themes/claro/css/base/print.css
+++ b/web/core/themes/claro/css/base/print.css
@@ -6,13 +6,15 @@
  */
 @media print {
   * {
-    /* Black prints faster */
-    /* https://github.com/h5bp/main.css/blob/main/dist/_print.css#L14 */
     color: #000 !important;
     background-color: transparent !important;
     box-shadow: none !important;
     text-shadow: none !important;
   }
+  * {
+    /* Black prints faster */
+    /* https://github.com/h5bp/main.css/blob/main/dist/_print.css#L14 */
+  }
   body {
     padding-top: 0;
   }
diff --git a/web/core/themes/claro/css/base/variables.css b/web/core/themes/claro/css/base/variables.css
index 5914f295a..211b7f287 100644
--- a/web/core/themes/claro/css/base/variables.css
+++ b/web/core/themes/claro/css/base/variables.css
@@ -9,7 +9,15 @@
    * Color Palette.
    */
   /* Secondary. */
-  /* Variations. */ /* 5% darker than base. */ /* 10% darker than base. */ /* 5% darker than base. */ /* 10% darker than base. */ /* 2% darker than base. */ /* 5% darker than base. */ /* 5% darker than base. */ /* 10% darker than base. */
+  /* Variations. */
+  /* 5% darker than base. */
+  /* 10% darker than base. */
+  /* 5% darker than base. */
+  /* 10% darker than base. */
+  /* 2% darker than base. */
+  /* 5% darker than base. */
+  /* 5% darker than base. */
+  /* 10% darker than base. */
   /* Gray variations. */
   /* Blue variations. */
   /* Red variations. */
@@ -18,10 +26,27 @@
    */
   /*
    * Typography.
-   */ /* 18px */ /* 1rem = 16px if font root is 100% ands browser defaults are used. */ /* ~32px */ /* ~29px */ /* ~26px */ /* ~23px */ /* ~20px */ /* 18px */ /* ~14px */ /* ~13px */ /* ~11px */
+   */
+  /* 18px */
+  /* 1rem = 16px if font root is 100% ands browser defaults are used. */
+  /* ~36px */
+  /* ~32px */
+  /* ~29px */
+  /* ~26px */
+  /* ~23px */
+  /* ~20px */
+  /* 18px */
+  /* ~14px */
+  /* ~13px */
+  /* ~11px */
   /**
    * Spaces.
-   */ /* 3 * 16px = 48px */ /* 1.5 * 16px = 24px */ /* 1 * 16px = 16px */ /* 0.75 * 16px = 12px */ /* 0.5 * 16px = 8px */
+   */
+  /* 3 * 16px = 48px */
+  /* 1.5 * 16px = 24px */
+  /* 1 * 16px = 16px */
+  /* 0.75 * 16px = 12px */
+  /* 0.5 * 16px = 8px */
   /*
    * Common.
    */
@@ -30,7 +55,15 @@
    */
   /*
    * Inputs.
-   */ /* Davy's gray with 0.6 opacity. */ /* Light gray with 0.3 opacity on white bg. */ /* Old silver with 0.5 opacity on white bg. */ /* (1/8)em ~ 2px */ /* (1/16)em ~ 1px */ /* Font size is too big to use 1rem for extrasmall line-height */ /* 7px inside the form element label. */ /* 8px with the checkbox width of 19px */
+   */
+  /* Davy's gray with 0.6 opacity. */
+  /* Light gray with 0.3 opacity on white bg. */
+  /* Old silver with 0.5 opacity on white bg. */
+  /* (1/8)em ~ 2px */
+  /* (1/16)em ~ 1px */
+  /* Font size is too big to use 1rem for extrasmall line-height */
+  /* 7px inside the form element label. */
+  /* 8px with the checkbox width of 19px */
   /*
    * Details.
    */
@@ -39,7 +72,9 @@
    */
   /**
    * jQuery.UI dropdown.
-   */ /* Light gray with 0.8 opacity. */ /* Text color with 0.1 opacity. */
+   */
+  /* Light gray with 0.8 opacity. */
+  /* Text color with 0.1 opacity. */
   /**
    * jQuery.UI dialog.
    */
@@ -48,7 +83,8 @@
    */
   /**
    * Tabledrag icon size.
-   */ /* 17px */
+   */
+  /* 17px */
   /**
    * Ajax progress.
    */
diff --git a/web/core/themes/claro/css/base/variables.pcss.css b/web/core/themes/claro/css/base/variables.pcss.css
index 7aa8438e6..1327d9a2e 100644
--- a/web/core/themes/claro/css/base/variables.pcss.css
+++ b/web/core/themes/claro/css/base/variables.pcss.css
@@ -84,6 +84,7 @@
   --line-height-heading: 1.3;
   --line-height-form-label: calc(18rem / 16); /* 18px */
   --font-size-base: 1rem; /* 1rem = 16px if font root is 100% ands browser defaults are used. */
+  --font-size-xl: 2.25rem; /* ~36px */
   --font-size-h1: 2.027rem; /* ~32px */
   --font-size-h2: 1.802rem; /* ~29px */
   --font-size-h3: 1.602rem; /* ~26px */
diff --git a/web/core/themes/claro/css/components/accordion.pcss.css b/web/core/themes/claro/css/components/accordion.pcss.css
index d7fcaa657..85600d7e4 100644
--- a/web/core/themes/claro/css/components/accordion.pcss.css
+++ b/web/core/themes/claro/css/components/accordion.pcss.css
@@ -16,26 +16,26 @@
 .accordion__item {
   margin: 0 -1px;
   border-radius: 0;
-}
 
-.accordion__item:first-child {
-  margin-top: -1px;
-  border-top-left-radius: var(--details-accordion-border-size-radius);
-  border-top-right-radius: var(--details-accordion-border-size-radius);
-}
+  &:first-child {
+    margin-top: -1px;
+    border-top-left-radius: var(--details-accordion-border-size-radius);
+    border-top-right-radius: var(--details-accordion-border-size-radius);
+  }
 
-.accordion__item + .accordion__item {
-  margin-top: -1px;
-}
+  & + .accordion__item {
+    margin-top: -1px;
+  }
 
-.accordion__item:last-child {
-  margin-bottom: -1px;
-  border-bottom-right-radius: var(--details-accordion-border-size-radius);
-  border-bottom-left-radius: var(--details-accordion-border-size-radius);
-}
+  &:last-child {
+    margin-bottom: -1px;
+    border-bottom-right-radius: var(--details-accordion-border-size-radius);
+    border-bottom-left-radius: var(--details-accordion-border-size-radius);
+  }
 
-.accordion__item .claro-details__summary .summary {
-  display: block;
-  color: var(--color-gray-800);
-  font-weight: normal;
+  & .claro-details__summary .summary {
+    display: block;
+    color: var(--color-gray-800);
+    font-weight: normal;
+  }
 }
diff --git a/web/core/themes/claro/css/components/action-link.css b/web/core/themes/claro/css/components/action-link.css
index 55a26fc0a..9dbb8c80b 100644
--- a/web/core/themes/claro/css/components/action-link.css
+++ b/web/core/themes/claro/css/components/action-link.css
@@ -246,6 +246,8 @@
 @media (forced-colors: active) {
   .action-link--icon-plus::before {
     background: linktext !important;
+  }
+  .action-link--icon-plus::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg height='16' stroke='%23d72222' stroke-width='2' width='16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M3 8h10M8 3v10'/%3e%3c/svg%3e");
@@ -291,6 +293,8 @@
 @media (forced-colors: active) {
   .action-link--icon-trash::before {
     background: linktext !important;
+  }
+  .action-link--icon-trash::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg height='16' width='16' fill='%23d72222' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M14.9 2.9c-.1-.4-.2-.6-.2-.6-.1-.4-.4-.4-.8-.5l-2.3-.3c-.3 0-.3 0-.4-.3-.4-.7-.5-1.2-.9-1.2H5.7c-.4 0-.5.5-.9 1.3-.1.2-.1.2-.4.3l-2.3.3c-.4 0-.7.1-.8.4 0 0-.1.2-.2.5-.1.6-.2.5.3.5h13.2c.5 0 .4.1.3-.4zm-1.5 1.8H2.6c-.7 0-.8.1-.7.6l.8 10.1c.1.5.1.6.8.6h9.1c.6 0 .7-.1.8-.6l.8-10.1c0-.5-.1-.6-.8-.6z'/%3e%3c/svg%3e");
@@ -336,6 +340,8 @@
 @media (forced-colors: active) {
   .action-link--icon-ex::before {
     background: linktext !important;
+  }
+  .action-link--icon-ex::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg height='16' stroke='%23d72222' stroke-width='1.5' width='16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M13 3L3 13M13 13L3 3'/%3e%3c/svg%3e");
@@ -381,6 +387,8 @@
 @media (forced-colors: active) {
   .action-link--icon-checkmark::before {
     background: linktext !important;
+  }
+  .action-link--icon-checkmark::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg fill='none' height='16' stroke='%23d72222' stroke-width='2' width='16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M2 8.571L5.6 12 14 4'/%3e%3c/svg%3e");
@@ -426,6 +434,8 @@
 @media (forced-colors: active) {
   .action-link--icon-cog::before {
     background: linktext !important;
+  }
+  .action-link--icon-cog::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg height='16' fill='%23D72222' width='16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M15.426 9.249a7.29 7.29 0 00.076-.998c0-.36-.035-.71-.086-1.056l-2.275-.293a5.039 5.039 0 00-.498-1.201l1.396-1.808a7.3 7.3 0 00-1.459-1.452l-1.807 1.391a5.058 5.058 0 00-1.2-.499l-.292-2.252C8.943 1.033 8.604 1 8.252 1s-.694.033-1.032.082l-.291 2.251a5.076 5.076 0 00-1.2.499L3.924 2.441a7.3 7.3 0 00-1.459 1.452L3.86 5.701a5.076 5.076 0 00-.499 1.2l-2.276.294A7.35 7.35 0 001 8.251c0 .34.031.671.077.998l2.285.295c.115.426.284.826.499 1.2L2.444 12.58c.411.55.896 1.038 1.443 1.452l1.842-1.42c.374.215.774.383 1.2.498l.298 2.311c.337.047.677.08 1.025.08s.688-.033 1.021-.08l.299-2.311a5.056 5.056 0 001.201-.498l1.842 1.42a7.326 7.326 0 001.443-1.452l-1.416-1.837c.215-.373.383-.773.498-1.199zm-7.174 1.514a2.54 2.54 0 110-5.082 2.542 2.542 0 010 5.082z'/%3e%3c/svg%3e");
@@ -471,6 +481,8 @@
 @media (forced-colors: active) {
   .action-link--icon-show::before {
     background: linktext !important;
+  }
+  .action-link--icon-show::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg fill-rule='evenodd' height='16' width='16' fill='%23D72222' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M8 3C4.364 3 1.258 5.073 0 8c1.258 2.927 4.364 5 8 5s6.742-2.073 8-5c-1.258-2.927-4.364-5-8-5zm0 8a3 3 0 100-6 3 3 0 000 6z'/%3e%3c/svg%3e");
@@ -516,6 +528,8 @@
 @media (forced-colors: active) {
   .action-link--icon-hide::before {
     background: linktext !important;
+  }
+  .action-link--icon-hide::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg fill-rule='evenodd' height='16' fill='%23D72222' width='16' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M2.01 1.696L2 1.707 14.072 13.78l-.696.697-2.078-2.078A9.232 9.232 0 018 13c-3.636 0-6.742-2.073-8-5 .647-1.505 1.783-2.784 3.228-3.672L1 2.1l.707-.707zM5 8c0-.546.146-1.058.4-1.5l4.1 4.1A3 3 0 015 8zM5.151 3.444l1.76 1.76a3 3 0 013.885 3.885l2.344 2.344C14.41 10.561 15.41 9.375 16 8c-1.258-2.927-4.364-5-8-5-.999 0-1.958.156-2.849.444z'/%3e%3c/svg%3e");
@@ -561,6 +575,8 @@
 @media (forced-colors: active) {
   .action-link--icon-key::before {
     background: linktext !important;
+  }
+  .action-link--icon-key::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg width='15' height='14' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M13.727 6.714A4.239 4.239 0 008.9 5.896L3.001 0H0v2h1v1.618L1.378 4H3v1h1v1.622h1.622l.864.862L5.5 8.5l.992.99a4.227 4.227 0 001.223 3.234 4.264 4.264 0 006.012 0 4.253 4.253 0 000-6.01zm-.829 5.182a1.653 1.653 0 11-2.338-2.338 1.653 1.653 0 112.338 2.338z' fill='%23d72222'/%3e%3c/svg%3e");
@@ -606,6 +622,8 @@
 @media (forced-colors: active) {
   .action-link--icon-questionmark::before {
     background: linktext !important;
+  }
+  .action-link--icon-questionmark::before {
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg width='15' height='14' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M7.002 0a7 7 0 100 14 7 7 0 000-14zm3 5c0 .551-.16 1.085-.477 1.586l-.158.22c-.07.093-.189.241-.361.393a9.67 9.67 0 01-.545.447l-.203.189-.141.129-.096.17L8 8.369v.63H5.999v-.704c.026-.396.078-.73.204-.999a2.83 2.83 0 01.439-.688l.225-.21-.01-.015.176-.14.137-.128c.186-.139.357-.277.516-.417l.148-.18A.948.948 0 008.002 5 1.001 1.001 0 006 5H4a3 3 0 016.002 0zm-1.75 6.619a.627.627 0 01-.625.625h-1.25a.627.627 0 01-.626-.625v-1.238c0-.344.281-.625.626-.625h1.25c.344 0 .625.281.625.625v1.238z' fill='%23d72222'/%3e%3c/svg%3e");
diff --git a/web/core/themes/claro/css/components/breadcrumb.css b/web/core/themes/claro/css/components/breadcrumb.css
index 096dcd2bd..74c54ceef 100644
--- a/web/core/themes/claro/css/components/breadcrumb.css
+++ b/web/core/themes/claro/css/components/breadcrumb.css
@@ -34,16 +34,16 @@
 .breadcrumb__item + .breadcrumb__item::before {
   display: inline-block;
   padding: 0 0.75rem;
-  content: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' height='8' width='5'%3e%3cpath fill='currentColor' d='M1.207.647L.5 1.354 3.146 4 .5 6.647l.707.707L4.561 4z'/%3e%3c/svg%3e")
+  content: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' height='8' width='5'%3e%3cpath fill='currentColor' d='M1.207.647L.5 1.354 3.146 4 .5 6.647l.707.707L4.561 4z'/%3e%3c/svg%3e");
 }
 
 [dir="rtl"] .breadcrumb__item + .breadcrumb__item::before {
-    transform: scaleX(-1)
+  transform: scaleX(-1);
 }
 
 @media (forced-colors: active) {
 
-.breadcrumb__item + .breadcrumb__item::before {
+  .breadcrumb__item + .breadcrumb__item::before {
     width: 0.3125rem; /* Width and height of the SVG. */
     height: 0.5rem;
     content: "";
@@ -55,9 +55,9 @@
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-position: center;
-    mask-position: center
-}
+    mask-position: center;
   }
+}
 
 .breadcrumb__link:hover,
 .breadcrumb__link:focus {
diff --git a/web/core/themes/claro/css/components/button.css b/web/core/themes/claro/css/components/button.css
index c771c90c6..a062aca39 100644
--- a/web/core/themes/claro/css/components/button.css
+++ b/web/core/themes/claro/css/components/button.css
@@ -35,6 +35,10 @@
  * dropbutton.css or action-links.css as well.
  */
 
+.button {
+  border: 1px solid transparent !important;
+}
+
 .button {
   display: inline-block;
   margin: 1rem 0.75rem 1rem 0; /* LTR */
@@ -42,8 +46,7 @@
   cursor: pointer;
   text-align: center;
   text-decoration: none;
-  color: #232429;
-  border: 1px solid transparent !important;  /* 2 */
+  color: #232429;  /* 2 */
   border-radius: 2px;
   background-color: #d3d4d9;
   font-size: 1rem;
diff --git a/web/core/themes/claro/css/components/details.css b/web/core/themes/claro/css/components/details.css
index 8ef373e51..300590d76 100644
--- a/web/core/themes/claro/css/components/details.css
+++ b/web/core/themes/claro/css/components/details.css
@@ -44,6 +44,18 @@
   border-radius: 2px;
   background-color: #fff;
   box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+
+  /*
+   * The following width and min-width values ensure that the <details> element
+   * does not shift widths when opening, in the event that a parent table
+   * element constrains the width. This can happen when toggling the
+   * "lazy-load" option within an image field.
+   */
+}
+
+td .claro-details {
+  width: min-content;
+  min-width: 100%;
 }
 
 .claro-details--accordion-item,
@@ -199,7 +211,7 @@
 
 /* stylelint-disable-next-line unit-allowed-list */
 
-@media not all and (min-resolution: 0.001dpcm) {
+@media not all and (-webkit-min-device-pixel-ratio: 0), not all and (min-resolution: 0.001dpcm) {
   @supports (-webkit-appearance: none) {
     .claro-details__summary::before {
       transition: none;
@@ -353,7 +365,7 @@
 
 /* stylelint-disable-next-line unit-allowed-list */
 
-@media not all and (min-resolution: 0.001dpcm) {
+@media not all and (-webkit-min-device-pixel-ratio: 0), not all and (min-resolution: 0.001dpcm) {
   @supports (-webkit-appearance: none) {
     .claro-details__summary::after {
       transition: none;
diff --git a/web/core/themes/claro/css/components/details.pcss.css b/web/core/themes/claro/css/components/details.pcss.css
index 6e1e5dc73..a8610b1a1 100644
--- a/web/core/themes/claro/css/components/details.pcss.css
+++ b/web/core/themes/claro/css/components/details.pcss.css
@@ -45,6 +45,17 @@
   border-radius: var(--details-border-size-radius);
   background-color: var(--color-white);
   box-shadow: var(--details-box-shadow);
+
+  /*
+   * The following width and min-width values ensure that the <details> element
+   * does not shift widths when opening, in the event that a parent table
+   * element constrains the width. This can happen when toggling the
+   * "lazy-load" option within an image field.
+   */
+  @nest td & {
+    width: min-content;
+    min-width: 100%;
+  }
 }
 
 .claro-details--accordion-item,
diff --git a/web/core/themes/claro/css/components/dialog.css b/web/core/themes/claro/css/components/dialog.css
index 70a69cac6..a7ac580d4 100644
--- a/web/core/themes/claro/css/components/dialog.css
+++ b/web/core/themes/claro/css/components/dialog.css
@@ -164,10 +164,10 @@
 }
 
 #drupal-off-canvas .form-type--boolean {
-    margin-left: 0;
-  }
+  margin-left: 0;
+}
 
 #drupal-off-canvas .form-item .form-item__description {
-    color: #f3f4f9;
-    font-size: 0.75rem;
-  }
+  color: #f3f4f9;
+  font-size: 0.75rem;
+}
diff --git a/web/core/themes/claro/css/components/dropbutton.css b/web/core/themes/claro/css/components/dropbutton.css
index 0f95a28dd..15d9a3fba 100644
--- a/web/core/themes/claro/css/components/dropbutton.css
+++ b/web/core/themes/claro/css/components/dropbutton.css
@@ -66,6 +66,19 @@
   height: 3rem;
 }
 
+.js .dropbutton-widget {
+  border-radius: 2px;
+  background-color: #d3d4d9;
+}
+
+[dir="ltr"] .js .dropbutton-action {
+  border-right: 1px solid white;
+}
+
+[dir="rtl"] .js .dropbutton-action {
+  border-left: 1px solid white;
+}
+
 /* Variants. */
 
 .js.no-touchevents .dropbutton--small {
@@ -113,6 +126,10 @@
  * Dropbutton toggler.
  */
 
+.dropbutton__toggle {
+  border: 1px solid transparent !important;
+}
+
 .dropbutton__toggle {
   position: absolute;
   z-index: 3;
@@ -120,8 +137,7 @@
   right: 0; /* LTR */
   bottom: 0;
   width: 3rem;
-  height: 3rem;
-  border: 1px solid transparent !important; /* 1 */
+  height: 3rem; /* 1 */
   border-radius: 0 2px 2px 0; /* LTR */
   background: #d3d4d9;
   font-size: 1px; /* iOS Safari sets a minimum button-width based on font-size. */
@@ -231,6 +247,10 @@
  * Duplicates base button styles.
  */
 
+.dropbutton__item:first-of-type > * {
+  border: 1px solid transparent !important;
+}
+
 .dropbutton__item:first-of-type > * {
   display: inline-block;
   margin: 0;
@@ -238,8 +258,7 @@
   cursor: pointer;
   text-align: center;
   text-decoration: none;
-  color: #232429;
-  border: 1px solid transparent !important; /* 1 */
+  color: #232429; /* 1 */
   border-radius: 2px;
   background-color: #d3d4d9;
   font-size: 1rem;
@@ -355,13 +374,17 @@
   max-width: 12.5rem;
 }
 
+.dropbutton__item:first-of-type ~ .dropbutton__item > a,
+.dropbutton__item:first-of-type ~ .dropbutton__item > .button {
+  border: 1px solid transparent !important;
+}
+
 .dropbutton__item:first-of-type ~ .dropbutton__item > a,
 .dropbutton__item:first-of-type ~ .dropbutton__item > .button {
   position: relative;
   padding: calc(1rem - 1px);
   text-decoration: none;
-  color: #55565b;
-  border: 1px solid transparent !important; /* 1 */
+  color: #55565b; /* 1 */
   border-radius: 2px;
   background: #fff;
   box-shadow: 0;
@@ -423,6 +446,9 @@
 }
 
 .dropbutton__item:first-of-type ~ .dropbutton__item > *:focus {
-  border-color: #26a769 !important; /* 1 */
+  border-color: #26a769 !important;
+}
+
+.dropbutton__item:first-of-type ~ .dropbutton__item > *:focus { /* 1 */
   box-shadow: inset 0 0 0 1px #26a769, 0 0 0 1px #26a769;
 }
diff --git a/web/core/themes/claro/css/components/dropbutton.pcss.css b/web/core/themes/claro/css/components/dropbutton.pcss.css
index 10f2312dc..3c0c5ed10 100644
--- a/web/core/themes/claro/css/components/dropbutton.pcss.css
+++ b/web/core/themes/claro/css/components/dropbutton.pcss.css
@@ -74,6 +74,15 @@
   height: var(--dropbutton-toggle-size);
 }
 
+.js .dropbutton-widget {
+  border-radius: var(--button-border-radius-size);
+  background-color: var(--button-bg-color);
+}
+
+.js .dropbutton-action {
+  border-inline-end: var(--dropbutton-border-size) solid white;
+}
+
 /* Variants. */
 .js.no-touchevents .dropbutton--small {
   height: var(--dropbutton-small-toggle-size);
diff --git a/web/core/themes/claro/css/components/form--password-confirm.css b/web/core/themes/claro/css/components/form--password-confirm.css
index dd7a54c4c..172da7ef6 100644
--- a/web/core/themes/claro/css/components/form--password-confirm.css
+++ b/web/core/themes/claro/css/components/form--password-confirm.css
@@ -146,12 +146,12 @@
 }
 
 @media (forced-colors: active) {
-    .password-strength__bar.is-weak,
-    .password-strength__bar.is-fair,
-    .password-strength__bar.is-good,
-    .password-strength__bar.is-strong {
-      background-color: canvastext;
-    }
+  .password-strength__bar.is-weak,
+  .password-strength__bar.is-fair,
+  .password-strength__bar.is-good,
+  .password-strength__bar.is-strong {
+    background-color: canvastext;
+  }
 
   .is-initial .password-strength__bar {
     border-color: transparent;
diff --git a/web/core/themes/claro/css/components/form--select.css b/web/core/themes/claro/css/components/form--select.css
index 0ed4e1a9b..ce52d9b71 100644
--- a/web/core/themes/claro/css/components/form--select.css
+++ b/web/core/themes/claro/css/components/form--select.css
@@ -61,18 +61,19 @@
     padding-right: calc(1rem - 1px);
     background-image: none;
     -webkit-appearance: listbox;
-    appearance: listbox /* Default <select> appearance value for modern browsers. */
+    appearance: listbox; /* Default <select> appearance value for modern browsers. */
 
     /* Lets browser set <select> appearance to whatever the browser's default is. */
   }
-    @supports ((-webkit-appearance: revert) or (appearance: revert)) {
-  .form-element--type-select,
-  .form-element--type-select:focus,
-  .form-element--type-select[disabled] {
+
+  @supports ((-webkit-appearance: revert) or (appearance: revert)) {
+    .form-element--type-select,
+    .form-element--type-select:focus,
+    .form-element--type-select[disabled] {
       -webkit-appearance: revert;
-      appearance: revert
-  }
+      appearance: revert;
     }
+  }
 }
 
 /* Necessary for Internet Explorer to show chevron. */
@@ -81,11 +82,13 @@
   .form-element--type-select,
   .form-element--type-select:focus,
   .form-element--type-select[disabled] {
-    padding-right: calc(1rem - 1px)
+    padding-right: calc(1rem - 1px);
 
     /* Re-enable default chevron for Internet Explorer. */
   }
-    .form-element--type-select::-ms-expand, .form-element--type-select:focus::-ms-expand, .form-element--type-select[disabled]::-ms-expand {
-      display: block;
-    }
+  .form-element--type-select::-ms-expand,
+  .form-element--type-select:focus::-ms-expand,
+  .form-element--type-select[disabled]::-ms-expand {
+    display: block;
+  }
 }
diff --git a/web/core/themes/claro/css/components/jquery.ui/theme.css b/web/core/themes/claro/css/components/jquery.ui/theme.css
index 241e39d2f..77bacb8cc 100644
--- a/web/core/themes/claro/css/components/jquery.ui/theme.css
+++ b/web/core/themes/claro/css/components/jquery.ui/theme.css
@@ -61,13 +61,11 @@
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled {
   opacity: 0.35;
-  filter: alpha(opacity=35);
 }
 
 .ui-priority-secondary,
 .ui-widget-content .ui-priority-secondary {
   opacity: 0.7;
-  filter: alpha(opacity=70);
 }
 
 /**
diff --git a/web/core/themes/claro/css/components/jquery.ui/theme.pcss.css b/web/core/themes/claro/css/components/jquery.ui/theme.pcss.css
index d116f569a..60a3bee0a 100644
--- a/web/core/themes/claro/css/components/jquery.ui/theme.pcss.css
+++ b/web/core/themes/claro/css/components/jquery.ui/theme.pcss.css
@@ -49,12 +49,10 @@
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled {
   opacity: 0.35;
-  filter: alpha(opacity=35);
 }
 .ui-priority-secondary,
 .ui-widget-content .ui-priority-secondary {
   opacity: 0.7;
-  filter: alpha(opacity=70);
 }
 
 /**
diff --git a/web/core/themes/claro/css/components/messages.css b/web/core/themes/claro/css/components/messages.css
index 979a2bc0e..ab251c872 100644
--- a/web/core/themes/claro/css/components/messages.css
+++ b/web/core/themes/claro/css/components/messages.css
@@ -25,10 +25,11 @@
 }
 
 .messages {
+  overflow: auto; /* Required to prevent text clipping. */
   box-sizing: border-box;
   margin-top: 1rem;
   margin-bottom: 1rem;
-  padding: 1.5rem 1.5rem 2rem calc(1.5rem - 0.3125rem); /* LTR */
+  padding: 1.5rem 1.5rem 2rem 1.1875rem; /* LTR */
   color: #fff;
   border-width: 0 0 0 5px; /* LTR */
   border-style: solid;
@@ -38,7 +39,7 @@
 }
 
 [dir="rtl"] .messages {
-  padding-right: calc(1.5rem - 0.3125rem);
+  padding-right: 1.1875rem;
   padding-left: 1.5rem;
   border-right-width: 5px;
   border-left-width: 0;
diff --git a/web/core/themes/claro/css/components/messages.pcss.css b/web/core/themes/claro/css/components/messages.pcss.css
index e03745f17..4aa23e4ad 100644
--- a/web/core/themes/claro/css/components/messages.pcss.css
+++ b/web/core/themes/claro/css/components/messages.pcss.css
@@ -34,6 +34,7 @@
 }
 
 .messages {
+  overflow: auto; /* Required to prevent text clipping. */
   box-sizing: border-box;
   margin-top: var(--space-m);
   margin-bottom: var(--space-m);
diff --git a/web/core/themes/claro/css/components/pager.css b/web/core/themes/claro/css/components/pager.css
index 24fd33ce8..e9ba912dd 100644
--- a/web/core/themes/claro/css/components/pager.css
+++ b/web/core/themes/claro/css/components/pager.css
@@ -13,7 +13,9 @@
 :root {
   /**
   * Pager.
-  */ /* --space-m × 2 */ /* 2px */
+  */
+  /* --space-m × 2 */
+  /* 2px */
 }
 
 .pager {
diff --git a/web/core/themes/claro/css/components/system-admin--modules.css b/web/core/themes/claro/css/components/system-admin--modules.css
index bebd428bd..09c2bdb01 100644
--- a/web/core/themes/claro/css/components/system-admin--modules.css
+++ b/web/core/themes/claro/css/components/system-admin--modules.css
@@ -21,6 +21,9 @@
 
 .modules-table-filter .form-item__description {
   position: absolute !important;
+}
+
+.modules-table-filter .form-item__description {
   overflow: hidden;
   clip: rect(1px, 1px, 1px, 1px);
   width: 1px;
diff --git a/web/core/themes/claro/css/components/system-status-report.css b/web/core/themes/claro/css/components/system-status-report.css
index 32ab40233..4649e77d8 100644
--- a/web/core/themes/claro/css/components/system-status-report.css
+++ b/web/core/themes/claro/css/components/system-status-report.css
@@ -31,7 +31,7 @@
   background-color: transparent;
 }
 
-.system-status-report__entry h3 {
+.system-status-report__entry__value h3 {
   margin-top: 0.625rem;
   margin-bottom: 0.625rem;
   font-size: 1.231em;
diff --git a/web/core/themes/claro/css/components/system-status-report.pcss.css b/web/core/themes/claro/css/components/system-status-report.pcss.css
index e9906e95b..e1e082d61 100644
--- a/web/core/themes/claro/css/components/system-status-report.pcss.css
+++ b/web/core/themes/claro/css/components/system-status-report.pcss.css
@@ -22,7 +22,7 @@
 .system-status-report__entry--warning {
   background-color: transparent;
 }
-.system-status-report__entry h3 {
+.system-status-report__entry__value h3 {
   margin-top: 10px;
   margin-bottom: 10px;
   font-size: 1.231em;
diff --git a/web/core/themes/claro/css/components/tabledrag.css b/web/core/themes/claro/css/components/tabledrag.css
index adfb1c71d..a77cac2b0 100644
--- a/web/core/themes/claro/css/components/tabledrag.css
+++ b/web/core/themes/claro/css/components/tabledrag.css
@@ -293,7 +293,7 @@ body.drag {
 
 /* stylelint-disable-next-line unit-allowed-list */
 
-@media not all and (min-resolution: 0.001dpcm) {
+@media not all and (-webkit-min-device-pixel-ratio: 0), not all and (min-resolution: 0.001dpcm) {
   @supports (-webkit-appearance: none) {
     .tabledrag-cell-content .tree {
       overflow: visible;
@@ -310,13 +310,16 @@ body.drag {
  * Indentation.
  */
 
+.indentation {
+  background: none !important;
+}
+
 .indentation {
   position: relative;
   left: -0.25rem; /* LTR */
   float: left; /* LTR */
   width: 1.5625rem; /* 25px */
   height: 1.5625rem; /* 25px */
-  background: none !important;
   line-height: 0;
 }
 
diff --git a/web/core/themes/claro/css/components/tables.css b/web/core/themes/claro/css/components/tables.css
index 31ab3b8d7..5caee41d1 100644
--- a/web/core/themes/claro/css/components/tables.css
+++ b/web/core/themes/claro/css/components/tables.css
@@ -98,18 +98,18 @@ _:-ms-fullscreen, /* Only IE 11 */
   content: "";
   opacity: 0.5;
   background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
-  background-size: contain
+  background-size: contain;
 }
 
 @media (forced-colors: active) {
 
-.sortable-heading > a::after {
+  .sortable-heading > a::after {
     opacity: 1;
     background: linktext;
     -webkit-mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
-    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%
-}
+    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
   }
+}
 
 /* stylelint-disable-next-line selector-type-no-unknown */
 
@@ -124,17 +124,17 @@ _:-ms-fullscreen, /* Only IE 11 */
 [dir="rtl"] .sortable-heading > a::after {
   right: auto;
   left: 1rem;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e")
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
 
-[dir="rtl"] .sortable-heading > a::after {
+  [dir="rtl"] .sortable-heading > a::after {
     background: linktext;
     -webkit-mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
-    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%
-}
+    mask: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 50% 50%;
   }
+}
 
 /* stylelint-disable-next-line selector-type-no-unknown */
 
@@ -243,6 +243,19 @@ td > .ajax-new-content > .form-item > .form-element {
   width: 100%;
 }
 
+td > .form-item > .form-element--type-select,
+td > .ajax-new-content > .form-item > .form-element--type-select {
+  width: auto;
+}
+
+@supports (min-width: max-content) {
+  td > .form-item > .form-element--type-select,
+  td > .ajax-new-content > .form-item > .form-element--type-select {
+    width: max-content;
+    min-width: 100%;
+  }
+}
+
 /* Win over table-file-multiple-widget. */
 
 th.is-disabled.is-disabled {
diff --git a/web/core/themes/claro/css/components/tables.pcss.css b/web/core/themes/claro/css/components/tables.pcss.css
index 146017b09..483654dcf 100644
--- a/web/core/themes/claro/css/components/tables.pcss.css
+++ b/web/core/themes/claro/css/components/tables.pcss.css
@@ -195,6 +195,19 @@ td > .ajax-new-content > .form-item > .form-element {
   width: 100%;
 }
 
+td > .form-item > .form-element--type-select,
+td > .ajax-new-content > .form-item > .form-element--type-select {
+  width: auto;
+}
+
+@supports (min-width: max-content) {
+  td > .form-item > .form-element--type-select,
+  td > .ajax-new-content > .form-item > .form-element--type-select {
+    width: max-content;
+    min-width: 100%;
+  }
+}
+
 /* Win over table-file-multiple-widget. */
 th.is-disabled.is-disabled {
   color: var(--input--disabled-fg-color);
diff --git a/web/core/themes/claro/css/components/tablesort-indicator.css b/web/core/themes/claro/css/components/tablesort-indicator.css
index edbe0e4e5..236b96c8b 100644
--- a/web/core/themes/claro/css/components/tablesort-indicator.css
+++ b/web/core/themes/claro/css/components/tablesort-indicator.css
@@ -19,21 +19,21 @@
   margin-top: -0.5rem; /* -8px */
   opacity: 0.5;
   background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e") no-repeat 0 50%;
-  background-size: auto
+  background-size: auto;
 }
 
 @media (forced-colors: active) {
 
-.tablesort {
+  .tablesort {
     background: linktext;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
     mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M1.75.25v1.5h10.5V.25zm0 3v1.5h7.5v-1.5zm0 3v1.5h4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-position: 0 50%;
-    mask-position: 0 50%
-}
+    mask-position: 0 50%;
   }
+}
 
 /* stylelint-disable-next-line selector-type-no-unknown */
 
@@ -48,21 +48,21 @@ _:-ms-fullscreen, /* Only IE 11 */
 [dir="rtl"] .tablesort {
   right: auto;
   left: 1rem; /* 16px */
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e")
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
 
-[dir="rtl"] .tablesort {
+  [dir="rtl"] .tablesort {
     background: linktext;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
     mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='8'%3e%3cpath d='M12.25.25v1.5H1.75V.25zm0 3v1.5h-7.5v-1.5zm0 3v1.5h-4.5v-1.5z' fill='%23000f33'/%3e%3c/svg%3e");
     -webkit-mask-repeat: no-repeat;
     mask-repeat: no-repeat;
     -webkit-mask-position: 0 50%;
-    mask-position: 0 50%
-}
+    mask-position: 0 50%;
   }
+}
 
 /* stylelint-disable-next-line selector-type-no-unknown */
 
@@ -76,31 +76,31 @@ _:-ms-fullscreen, /* Only IE 11 */
 .tablesort--asc,
 [dir="rtl"] .tablesort--asc {
   opacity: 1;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e")
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
 
-.tablesort--asc,
-[dir="rtl"] .tablesort--asc {
+  .tablesort--asc,
+  [dir="rtl"] .tablesort--asc {
     background: linktext;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e");
-    mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e")
-}
+    mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M5 .44L.719 4.718 1.78 5.78 4.25 3.313v7.937h1.5V3.312l2.469 2.47L9.28 4.718 5 .439z' fill='%23003ecc'/%3e%3c/svg%3e");
   }
+}
 
 .tablesort--desc,
 [dir="rtl"] .tablesort--desc {
   opacity: 1;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e")
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e");
 }
 
 @media (forced-colors: active) {
 
-.tablesort--desc,
-[dir="rtl"] .tablesort--desc {
+  .tablesort--desc,
+  [dir="rtl"] .tablesort--desc {
     background: linktext;
     -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e");
-    mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e")
-}
+    mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='14' height='16' viewBox='0 0 10 12'%3e%3cpath d='M4.25.75v7.938l-2.469-2.47L.72 7.282 5 11.561l4.281-4.28L8.22 6.22 5.75 8.687V.75h-1.5z' fill='%23003ecc'/%3e%3c/svg%3e");
   }
+}
diff --git a/web/core/themes/claro/css/components/tabs.css b/web/core/themes/claro/css/components/tabs.css
index 5bc2d3d87..d298c61b3 100644
--- a/web/core/themes/claro/css/components/tabs.css
+++ b/web/core/themes/claro/css/components/tabs.css
@@ -12,7 +12,9 @@
 :root {
   /**
   * Tabs.
-  */ /* 48px */ /* 40px */
+  */
+  /* 48px */
+  /* 40px */
 }
 
 .tabs-wrapper > nav {
@@ -67,9 +69,9 @@
 }
 
 .tabs__link:focus {
-  min-height: calc(3rem + 2px);
+  min-height: calc(3.1875rem - 1px);
   margin: -1px;
-  padding-left: calc(1.5rem - 2px); /* LTR */
+  padding-left: calc(1.3125rem + 1px); /* LTR */
   text-decoration: none;
   color: #55565b;
   border: 3px solid #26a769;
@@ -79,7 +81,7 @@
 }
 
 [dir="rtl"] .tabs__link:focus {
-  padding-right: calc(1.5rem - 2px);
+  padding-right: calc(1.3125rem + 1px);
   padding-left: 1.5rem;
 }
 
diff --git a/web/core/themes/claro/css/components/toolbar.module.css b/web/core/themes/claro/css/components/toolbar.module.css
index dbd346b5e..a7f24223c 100644
--- a/web/core/themes/claro/css/components/toolbar.module.css
+++ b/web/core/themes/claro/css/components/toolbar.module.css
@@ -25,6 +25,7 @@
   font-size: small;
   line-height: 1;
 }
+
 @media print {
   #toolbar-administration {
     display: none;
@@ -225,6 +226,7 @@ body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
   margin-left: 240px; /* LTR */
   margin-left: 15rem; /* LTR */
 }
+
 @media print {
   body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
     margin-left: 0;
@@ -235,6 +237,7 @@ body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
   margin-right: 15rem;
   margin-left: auto;
 }
+
 @media print {
   [dir="rtl"] body.toolbar-tray-open.toolbar-vertical.toolbar-fixed {
     margin-right: 0;
diff --git a/web/core/themes/claro/css/components/vertical-tabs.css b/web/core/themes/claro/css/components/vertical-tabs.css
index 24c1e47d9..ccaa8c901 100644
--- a/web/core/themes/claro/css/components/vertical-tabs.css
+++ b/web/core/themes/claro/css/components/vertical-tabs.css
@@ -130,7 +130,7 @@
   position: relative;
   display: block;
   margin-top: -1px;
-  padding: 0.75rem 0.75rem 0.75rem calc(1.5rem - 0.25rem); /* LTR */
+  padding: 0.75rem 0.75rem 0.75rem 1.25rem; /* LTR */
   text-decoration: none;
   word-wrap: break-word;
   -webkit-hyphens: auto;
@@ -143,7 +143,7 @@
 }
 
 [dir="rtl"] .vertical-tabs__menu-link {
-  padding-right: calc(1.5rem - 0.25rem);
+  padding-right: 1.25rem;
   padding-left: 0.75rem;
   border-width: 1px 4px 1px 0;
   border-radius: 0 2px 2px 0;
diff --git a/web/core/themes/claro/css/components/views-ui.css b/web/core/themes/claro/css/components/views-ui.css
index e9c1ce35e..fdc522c17 100644
--- a/web/core/themes/claro/css/components/views-ui.css
+++ b/web/core/themes/claro/css/components/views-ui.css
@@ -105,15 +105,17 @@ details.fieldset-no-legend {
   line-height: 1.3125rem;
 }
 
-.views-ui-dialog .form-element--type-select {
-  padding-right: calc(2rem + 2px);
-  background-position: 100% 56%;
+[dir="ltr"] .views-ui-dialog .form-element--type-select {
+  padding-right: calc(2rem - 1px);
 }
 
-/**
- * Elements must communicate width to table rendering.
- * @todo revisit in https://drupal.org/node/3135457
- */
+[dir="rtl"] .views-ui-dialog .form-element--type-select {
+  padding-left: calc(2rem - 1px);
+}
+
+.views-ui-dialog .form-element--type-select {
+  background-position-y: 56%;
+}
 
 .views-ui-dialog td .form-element {
   width: auto;
diff --git a/web/core/themes/claro/css/components/views-ui.pcss.css b/web/core/themes/claro/css/components/views-ui.pcss.css
index b29b16b2f..1b06e88c8 100644
--- a/web/core/themes/claro/css/components/views-ui.pcss.css
+++ b/web/core/themes/claro/css/components/views-ui.pcss.css
@@ -92,13 +92,9 @@ details.fieldset-no-legend {
   line-height: var(--input-line-height--small);
 }
 .views-ui-dialog .form-element--type-select {
-  padding-right: calc((var(--space-m) * 2) + var(--input-border-size) * 2);
-  background-position: 100% 56%;
+  padding-inline-end: calc(2rem - var(--input-border-size));
+  background-position-y: 56%;
 }
-/**
- * Elements must communicate width to table rendering.
- * @todo revisit in https://drupal.org/node/3135457
- */
 .views-ui-dialog td .form-element {
   width: auto;
 }
diff --git a/web/core/themes/claro/css/theme/ckeditor-editor.css b/web/core/themes/claro/css/theme/ckeditor-editor.css
index 658c9ac7a..434b97805 100644
--- a/web/core/themes/claro/css/theme/ckeditor-editor.css
+++ b/web/core/themes/claro/css/theme/ckeditor-editor.css
@@ -9,7 +9,8 @@
  * CKEditor appearance overrides.
  */
 :root { /* 1px */
-  /* Inner border size must be based on chrome border size. */ /* 1px */
+  /* Inner border size must be based on chrome border size. */
+  /* 1px */
   /* Inner border radius must be based on chrome border radius and size. */
 }
 .cke.cke_chrome {
diff --git a/web/core/themes/claro/css/theme/install-page.css b/web/core/themes/claro/css/theme/install-page.css
index 830f5b305..fd89c78e6 100644
--- a/web/core/themes/claro/css/theme/install-page.css
+++ b/web/core/themes/claro/css/theme/install-page.css
@@ -4,6 +4,7 @@
  * https://www.drupal.org/node/3084859
  * @preserve
  */
+
 /**
  * @file
  * Installation styling.
@@ -11,37 +12,37 @@
  * Unfortunately we have to make our styling quite strong, to override the
  * .maintenance-page styling.
  */
+
 .install-page {
   min-height: 100%;
-  background-color: #1275b2;
-  background-image:
-    url(../../images/noise-low.png),
-    radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
-  background-repeat: repeat;
-  background-position: left top, 50% 50%; /* LTR */
-}
-[dir="rtl"] .install-page {
-  background-position: right top, 50% 50%;
+  background-color: #dedfe4;
 }
+
 /**
  * Password widget
  */
+
 .install-page .password-parent,
 .install-page .confirm-parent {
   width: auto;
 }
+
 .install-page .form-item .password-suggestions {
   float: none;
   width: auto;
 }
+
 .install-page table td {
   word-break: break-all;
 }
+
 .install-page .site-version {
   vertical-align: super;
-  color: #595959;
+  color: #919297;
   font-size: 0.5em;
+  font-weight: 500;
 }
+
 @media all and (max-width: 63.125rem) and (min-width: 48em) {
   .install-page .password-strength,
   .install-page .confirm-parent {
diff --git a/web/core/themes/claro/css/theme/install-page.pcss.css b/web/core/themes/claro/css/theme/install-page.pcss.css
index b616b418d..c765c633b 100644
--- a/web/core/themes/claro/css/theme/install-page.pcss.css
+++ b/web/core/themes/claro/css/theme/install-page.pcss.css
@@ -5,20 +5,12 @@
  * Unfortunately we have to make our styling quite strong, to override the
  * .maintenance-page styling.
  */
+
+@import "../base/variables.pcss.css";
+
 .install-page {
   min-height: 100%;
-  background-color: #1275b2;
-  background-image:
-    url(../../images/noise-low.png),
-    -webkit-radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
-  background-image:
-    url(../../images/noise-low.png),
-    radial-gradient(hsl(203, 80%, 45%), hsl(203, 80%, 32%));
-  background-repeat: repeat;
-  background-position: left top, 50% 50%; /* LTR */
-}
-[dir="rtl"] .install-page {
-  background-position: right top, 50% 50%;
+  background-color: var(--color-gray-100);
 }
 
 /**
@@ -38,8 +30,9 @@
 
 .install-page .site-version {
   vertical-align: super;
-  color: #595959;
+  color: var(--color-gray-500);
   font-size: 0.5em;
+  font-weight: 500;
 }
 
 @media all and (max-width: 1010px) and (min-width: 48em) {
diff --git a/web/core/themes/claro/css/theme/maintenance-page.css b/web/core/themes/claro/css/theme/maintenance-page.css
index 8018df618..e4a307e43 100644
--- a/web/core/themes/claro/css/theme/maintenance-page.css
+++ b/web/core/themes/claro/css/theme/maintenance-page.css
@@ -8,6 +8,8 @@
 /**
  * @file
  * Maintenance theming.
+ *
+ * These styles affect the installation UI, maintenance page, and the database update UI.
  */
 
 .maintenance-page {
@@ -15,17 +17,37 @@
   background-color: #dedfe4;
 }
 
-.title {
-  margin-top: 0;
+h1,
+h2 {
+  font-size: 1.602rem;
+}
+
+h3 {
+  font-size: 1.424rem;
 }
 
 .site-name {
-  margin-top: 1rem;
+  margin-top: 0.75rem;
   word-wrap: break-word;
+  color: #232429;
+  font-size: 2.25rem;
+}
+
+.site-name--subtle {
+  margin-top: 0.75rem;
   color: #55565b;
   font-size: 1.424rem;
 }
 
+.title {
+  margin-top: 0;
+  font-size: 1.602rem;
+}
+
+.title--broad {
+  font-size: 2.027rem;
+}
+
 .site-name,
 .title {
   margin-bottom: 1.5rem;
@@ -33,17 +55,22 @@
 
 .content {
   margin-bottom: 1rem;
+  color: #232429;
+}
+
+.content--subtle {
   color: #55565b;
 }
 
 .site-name,
 .title,
 .content {
-  max-width: 32rem;
+  max-width: 34rem;
 }
 
 /**
- * Task list & step indicator
+ * Task list & step indicator.
+ * Shows on both the install screen and the database update page.
  */
 
 @media all and (max-width: 48em) { /* 768px */
@@ -61,9 +88,6 @@
     right: auto;
     left: 0.5em;
   }
-  .task-list {
-    display: none;
-  }
 }
 
 @media all and (min-width: 48em) { /* 768px */
@@ -71,49 +95,44 @@
     display: none;
   }
   .task-list {
-    margin-left: 0; /* LTR */
-    padding-bottom: 1em;
-    padding-left: 0; /* LTR */
+    margin-left: -3rem; /* LTR */
+    padding: 0;
     list-style-type: none;
+    counter-reset: steps;
+    font-weight: bold;
   }
   [dir="rtl"] .task-list {
-    margin-right: 0;
-    padding-right: 0;
+    margin-right: -3rem;
+    margin-left: 0;
   }
   .task-list li {
-    padding: 0.5em 1em 0.5em 3.85em; /* LTR */
-    color: #1a1a1a;
+    padding: 1rem 1rem 1rem 3rem; /* LTR */
+    counter-increment: steps;
+    color: #232429;
+    border-radius: 0 2rem 2rem 0 /* LTR */;
+    font-weight: 500;
   }
   [dir="rtl"] .task-list li {
-    padding: 0.5em 3.85em 0.5em 1em;
+    padding: 1rem 3rem 1rem 1rem;
+    border-radius: 2rem 0 0 2rem;
   }
-  .task-list .is-active {
-    position: relative;
-    background: #ebeae4;
-    font-weight: normal;
+  .task-list li:before {
+    margin-right: 0.375rem;
+    content: counter(steps);
   }
-  .task-list .is-active:after {
-    position: absolute;
-    top: 50%;
-    left: 100%; /* LTR */
-    width: 0;
-    height: 0;
-    margin-top: -1.269em;
-    content: " ";
-    pointer-events: none;
-    border: solid transparent;
-    border-width: 1.269em;
-    border-color: rgba(235, 234, 228, 0);
-    border-left-color: #ebeae4; /* LTR */
-  }
-  [dir="rtl"] .task-list .is-active:after {
-    right: 100%;
-    left: auto;
-    border-right-color: #ebeae4;
-    border-left-color: transparent;
+  [dir="rtl"] .task-list li:before {
+    margin-right: 0;
+    margin-left: 0.375rem;
+  }
+
+  .task-list .is-active {
+    color: #003ecc;
+    border: 1px solid transparent; /* Required for forced-colors mode. */
+    background: #e5edff;
+    font-weight: 500;
   }
   .task-list .done {
-    color: #adadad;
+    color: #75767b;
   }
 }
 
@@ -126,12 +145,13 @@
   margin-right: 1.25em;
   margin-left: 1.25em;
   padding: 3rem;
+  border: 1px solid transparent; /* Required for forced-colors mode. */
   border-radius: 0.5rem;
   background: #fff;
   box-shadow: 0 14px 30px rgba(0, 0, 0, 0.1);
 }
 
-.layout-container:after { /* no reason for a clearfix in the markup */
+.layout-container:after { /* No reason for a clearfix in the markup. */
   display: table;
   clear: both;
   content: "";
@@ -142,6 +162,10 @@
     margin: 1.25em;
     padding: 1rem 1.5rem;
   }
+
+  .layout-sidebar-first {
+    display: none;
+  }
 }
 
 @media all and (min-width: 48em) { /* 768px */
@@ -174,8 +198,10 @@
     padding: 0.9375rem;
   }
   [dir="rtl"] ul {
-    margin-right: 0; /* Overrides default [dir="rtl"] ul margin */
+    margin-right: 0; /* Overrides default [dir="rtl"] ul margin. */
   }
+
+  /* Positioning sidebar & content. */
   .layout-sidebar-first {
     float: left; /* LTR */
     width: 35%;
@@ -183,19 +209,22 @@
   [dir="rtl"] .layout-sidebar-first {
     float: right;
   }
-  /* Positioning sidebar & content */
-  main {
+
+  .main-content {
     float: left; /* LTR */
     clear: none;
     box-sizing: border-box;
     width: 65%;
     padding-left: 3.85em; /* LTR */
   }
-  [dir="rtl"] main {
+  [dir="rtl"] .main-content {
     float: right;
     padding-right: 3.85em;
     padding-left: 0;
   }
+  .main-content--attached {
+    padding-left: 0;
+  }
 }
 
 /**
@@ -218,3 +247,32 @@
   padding-right: 3em;
   padding-left: 1em;
 }
+
+/**
+ * Updates list customization for update page.
+ */
+
+.update-results {
+  overflow: auto; /* Required to prevent text clipping. */
+  margin-top: 0;
+  padding: 0.75rem;
+  border: 1px solid #dedfe4;
+  border-radius: 2px;
+  background: #f3f4f9;
+}
+
+.update-results > h3:first-child {
+  margin-top: 0;
+}
+
+.update-results .failure strong {
+  color: #dc2323;
+}
+
+.item-list > h3 {
+  font-size: 1.266rem;
+}
+
+.item-list > ul {
+  margin-left: 0;
+}
diff --git a/web/core/themes/claro/css/theme/maintenance-page.pcss.css b/web/core/themes/claro/css/theme/maintenance-page.pcss.css
index aebab641a..c68827ffc 100644
--- a/web/core/themes/claro/css/theme/maintenance-page.pcss.css
+++ b/web/core/themes/claro/css/theme/maintenance-page.pcss.css
@@ -1,6 +1,8 @@
 /**
  * @file
  * Maintenance theming.
+ *
+ * These styles affect the installation UI, maintenance page, and the database update UI.
  */
 
 @import "../base/variables.pcss.css";
@@ -10,17 +12,35 @@
   background-color: var(--color-gray-100);
 }
 
-.title {
-  margin-top: 0;
+h1,
+h2 {
+  font-size: var(--font-size-h3);
+}
+
+h3 {
+  font-size: var(--font-size-h4);
 }
 
 .site-name {
-  margin-top: var(--space-m);
+  margin-top: var(--space-s);
   word-wrap: break-word;
+  color: var(--color-gray);
+  font-size: var(--font-size-xl);
+}
+.site-name--subtle {
+  margin-top: var(--space-s);
   color: var(--color-gray-800);
   font-size: var(--font-size-h4);
 }
 
+.title {
+  margin-top: 0;
+  font-size: var(--font-size-h3);
+}
+.title--broad {
+  font-size: var(--font-size-h1);
+}
+
 .site-name,
 .title {
   margin-bottom: var(--space-l);
@@ -28,17 +48,21 @@
 
 .content {
   margin-bottom: var(--space-m);
+  color: var(--color-gray);
+}
+.content--subtle {
   color: var(--color-gray-800);
 }
 
 .site-name,
 .title,
 .content {
-  max-width: 512px;
+  max-width: 34rem;
 }
 
 /**
- * Task list & step indicator
+ * Task list & step indicator.
+ * Shows on both the install screen and the database update page.
  */
 @media all and (max-width: 48em) { /* 768px */
   header[role="banner"] {
@@ -55,9 +79,6 @@
     right: auto;
     left: 0.5em;
   }
-  .task-list {
-    display: none;
-  }
 }
 
 @media all and (min-width: 48em) { /* 768px */
@@ -65,49 +86,44 @@
     display: none;
   }
   .task-list {
-    margin-left: 0; /* LTR */
-    padding-bottom: 1em;
-    padding-left: 0; /* LTR */
+    margin-left: -3rem; /* LTR */
+    padding: 0;
     list-style-type: none;
+    counter-reset: steps;
+    font-weight: bold;
   }
   [dir="rtl"] .task-list {
-    margin-right: 0;
-    padding-right: 0;
+    margin-right: -3rem;
+    margin-left: 0;
   }
   .task-list li {
-    padding: 0.5em 1em 0.5em 3.85em; /* LTR */
-    color: #1a1a1a;
+    padding: 1rem 1rem 1rem 3rem; /* LTR */
+    counter-increment: steps;
+    color: var(--color-gray);
+    border-radius: 0 2rem 2rem 0 /* LTR */;
+    font-weight: 500;
   }
   [dir="rtl"] .task-list li {
-    padding: 0.5em 3.85em 0.5em 1em;
+    padding: 1rem 3rem 1rem 1rem;
+    border-radius: 2rem 0 0 2rem;
   }
-  .task-list .is-active {
-    position: relative;
-    background: #ebeae4;
-    font-weight: normal;
+  .task-list li:before {
+    margin-right: 0.375rem;
+    content: counter(steps);
   }
-  .task-list .is-active:after {
-    position: absolute;
-    top: 50%;
-    left: 100%; /* LTR */
-    width: 0;
-    height: 0;
-    margin-top: -1.269em;
-    content: " ";
-    pointer-events: none;
-    border: solid transparent;
-    border-width: 1.269em;
-    border-color: rgba(235, 234, 228, 0);
-    border-left-color: #ebeae4; /* LTR */
-  }
-  [dir="rtl"] .task-list .is-active:after {
-    right: 100%;
-    left: auto;
-    border-right-color: #ebeae4;
-    border-left-color: transparent;
+  [dir="rtl"] .task-list li:before {
+    margin-right: 0;
+    margin-left: 0.375rem;
+  }
+
+  .task-list .is-active {
+    color: var(--color-absolutezero);
+    border: 1px solid transparent; /* Required for forced-colors mode. */
+    background: var(--color-bgblue-active);
+    font-weight: 500;
   }
   .task-list .done {
-    color: #adadad;
+    color: var(--color-gray-700);
   }
 }
 
@@ -119,11 +135,12 @@
   margin-right: 1.25em;
   margin-left: 1.25em;
   padding: var(--space-xl);
+  border: 1px solid transparent; /* Required for forced-colors mode. */
   border-radius: 8px;
   background: #fff;
   box-shadow: var(--shadow-z3);
 }
-.layout-container:after { /* no reason for a clearfix in the markup */
+.layout-container:after { /* No reason for a clearfix in the markup. */
   display: table;
   clear: both;
   content: "";
@@ -134,6 +151,10 @@
     margin: 1.25em;
     padding: var(--space-m) var(--space-l);
   }
+
+  .layout-sidebar-first {
+    display: none;
+  }
 }
 
 @media all and (min-width: 48em) { /* 768px */
@@ -166,8 +187,10 @@
     padding: 15px;
   }
   [dir="rtl"] ul {
-    margin-right: 0; /* Overrides default [dir="rtl"] ul margin */
+    margin-right: 0; /* Overrides default [dir="rtl"] ul margin. */
   }
+
+  /* Positioning sidebar & content. */
   .layout-sidebar-first {
     float: left; /* LTR */
     width: 35%;
@@ -175,19 +198,22 @@
   [dir="rtl"] .layout-sidebar-first {
     float: right;
   }
-  /* Positioning sidebar & content */
-  main {
+
+  .main-content {
     float: left; /* LTR */
     clear: none;
     box-sizing: border-box;
     width: 65%;
     padding-left: 3.85em; /* LTR */
   }
-  [dir="rtl"] main {
+  [dir="rtl"] .main-content {
     float: right;
     padding-right: 3.85em;
     padding-left: 0;
   }
+  .main-content--attached {
+    padding-left: 0;
+  }
 }
 
 /**
@@ -207,3 +233,28 @@
   padding-right: 3em;
   padding-left: 1em;
 }
+
+/**
+ * Updates list customization for update page.
+ */
+.update-results {
+  overflow: auto; /* Required to prevent text clipping. */
+  margin-top: 0;
+  padding: var(--space-s);
+  border: 1px solid var(--color-gray-100);
+  border-radius: var(--base-border-radius);
+  background: var(--color-gray-050);
+}
+.update-results > h3:first-child {
+  margin-top: 0;
+}
+.update-results .failure strong {
+  color: var(--color-maximumred);
+}
+
+.item-list > h3 {
+  font-size: var(--font-size-h5);
+}
+.item-list > ul {
+  margin-left: 0;
+}
diff --git a/web/core/themes/claro/css/theme/media-library.css b/web/core/themes/claro/css/theme/media-library.css
index 7bc9c3acb..6972186cc 100644
--- a/web/core/themes/claro/css/theme/media-library.css
+++ b/web/core/themes/claro/css/theme/media-library.css
@@ -70,7 +70,7 @@
   position: relative;
   display: block;
   margin-top: -1px;
-  padding: 0.75rem 0.75rem 0.75rem calc(1.5rem - 0.25rem); /* LTR */
+  padding: 0.75rem 0.75rem 0.75rem 1.25rem; /* LTR */
   text-decoration: none;
   word-wrap: break-word;
   -webkit-hyphens: auto;
@@ -83,7 +83,7 @@
 }
 
 [dir="rtl"] .media-library-menu__link {
-  padding-right: calc(1.5rem - 0.25rem);
+  padding-right: 1.25rem;
   padding-left: 0.75rem;
   border-width: 1px 4px 1px 0;
   border-radius: 0 2px 2px 0;
@@ -260,10 +260,10 @@
 
 @media all and (-ms-high-contrast: active), (-ms-high-contrast: none) {
   .ui-dialog > .ui-dialog-content {
-    padding-right: calc(0.75rem - 0.4375rem);
+    padding-right: calc(0.5625rem - 4px);
   }
   [dir="rtl"] .ui-dialog > .ui-dialog-content {
-    padding-left: calc(0.75rem - 0.4375rem);
+    padding-left: calc(0.5625rem - 4px);
   }
 }
 
@@ -802,8 +802,11 @@
 }
 
 .media-library-item__edit {
-  /* !important to override button class border. */
   border: 1px solid #d3d4d9 !important;
+}
+
+.media-library-item__edit {
+  /* !important to override button class border. */
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cg fill='%23545560'%3e%3cpath d='M14.545 3.042l-1.586-1.585a1.003 1.003 0 00-1.414 0L10.252 2.75l3 3 1.293-1.293a1.004 1.004 0 000-1.415zM5.25 13.751l-3-3 6.998-6.998 3 3zM.908 14.775c-.087.262.055.397.316.312l2.001-.667-1.65-1.646-.667 2.001z'/%3e%3c/g%3e%3c/svg%3e");
   background-repeat: no-repeat;
   background-position: center;
@@ -821,8 +824,17 @@
 .media-library-item__remove.button:disabled:active,
 .media-library-item__remove.button:hover,
 .media-library-item__remove.button:focus {
-  /* !important to override button class border. */
   border: 1px solid #d3d4d9 !important;
+}
+
+.media-library-item__remove,
+.media-library-item__remove.button,
+.media-library-item__remove.button:first-child,
+.media-library-item__remove.button:disabled,
+.media-library-item__remove.button:disabled:active,
+.media-library-item__remove.button:hover,
+.media-library-item__remove.button:focus {
+  /* !important to override button class border. */
   background-image: url("data:image/svg+xml,%3csvg width='16' height='16' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M2.344 2.343l11.313 11.313M2.344 13.657L13.657 2.343' stroke='%2355565B' stroke-width='3'/%3e%3c/svg%3e");
   background-repeat: no-repeat;
   background-position: center;
@@ -832,8 +844,13 @@
 .media-library-item__remove:active,
 .media-library-item__remove.button:active,
 .media-library-item__remove.button:disabled:active {
-  /* !important to override button class border. */
   border-color: #003ecc !important;
+}
+
+.media-library-item__remove:active,
+.media-library-item__remove.button:active,
+.media-library-item__remove.button:disabled:active {
+  /* !important to override button class border. */
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16'%3e%3cpath fill='%23ffffff' d='M3.51 13.925c.194.194.512.195.706.001l3.432-3.431c.194-.194.514-.194.708 0l3.432 3.431c.192.194.514.193.707-.001l1.405-1.417c.191-.195.189-.514-.002-.709l-3.397-3.4c-.192-.193-.192-.514-.002-.708l3.401-3.43c.189-.195.189-.515 0-.709l-1.407-1.418c-.195-.195-.513-.195-.707-.001l-3.43 3.431c-.195.194-.516.194-.708 0l-3.432-3.431c-.195-.195-.512-.194-.706.001l-1.407 1.417c-.194.195-.194.515 0 .71l3.403 3.429c.193.195.193.514-.001.708l-3.4 3.399c-.194.195-.195.516-.001.709l1.406 1.419z'/%3e%3c/svg%3e");
 }
 
diff --git a/web/core/themes/claro/css/theme/toolbar.theme.css b/web/core/themes/claro/css/theme/toolbar.theme.css
index 3fc152aee..87342e4b8 100644
--- a/web/core/themes/claro/css/theme/toolbar.theme.css
+++ b/web/core/themes/claro/css/theme/toolbar.theme.css
@@ -90,7 +90,8 @@
 .toolbar .toolbar-tray-horizontal .toolbar-tray {
   background-color: #f5f5f5;
 }
-.toolbar-tray a {
+.toolbar-tray a,
+.toolbar-tray a:visited {
   padding: 1em 1.3333em;
   cursor: pointer;
   text-decoration: none;
diff --git a/web/core/themes/claro/css/theme/toolbar.theme.pcss.css b/web/core/themes/claro/css/theme/toolbar.theme.pcss.css
index 578d98eeb..d7986a07a 100644
--- a/web/core/themes/claro/css/theme/toolbar.theme.pcss.css
+++ b/web/core/themes/claro/css/theme/toolbar.theme.pcss.css
@@ -88,7 +88,8 @@
 .toolbar .toolbar-tray-horizontal .toolbar-tray {
   background-color: #f5f5f5;
 }
-.toolbar-tray a {
+.toolbar-tray a,
+.toolbar-tray a:visited {
   padding: 1em 1.3333em;
   cursor: pointer;
   text-decoration: none;
diff --git a/web/core/themes/claro/css/theme/views_ui.admin.theme.css b/web/core/themes/claro/css/theme/views_ui.admin.theme.css
index 6f421f175..cf416bd2f 100644
--- a/web/core/themes/claro/css/theme/views_ui.admin.theme.css
+++ b/web/core/themes/claro/css/theme/views_ui.admin.theme.css
@@ -324,7 +324,7 @@ td.group-title {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
-  padding: 0.75rem 0.75rem calc(0.75rem - 0.3125rem);
+  padding: 0.75rem 0.75rem 0.4375rem;
   border-bottom: 1px solid rgba(212, 212, 218, 0.8);
   background-color: #f3f4f9;
 }
@@ -596,29 +596,6 @@ td.group-title {
   margin: 0 0.75rem 0.75rem 0;
 }
 
-.views-ui-dialog .views-progress-indicator {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  right: 4rem; /* LTR */
-  color: #fff;
-  font-size: 0.702rem;
-  line-height: 4rem;
-}
-
-[dir="rtl"] .views-ui-dialog .views-progress-indicator {
-  right: auto;
-  left: 4rem;
-}
-
-.views-ui-dialog .views-progress-indicator:before {
-  content: "\003C\00A0";
-}
-
-.views-ui-dialog .views-progress-indicator:after {
-  content: "\00A0\003E";
-}
-
 .views-ui-dialog .tabledrag-toggle-weight-wrapper {
   margin: 0 0 1rem 0;
 }
diff --git a/web/core/themes/claro/css/theme/views_ui.admin.theme.pcss.css b/web/core/themes/claro/css/theme/views_ui.admin.theme.pcss.css
index f36d2eef7..bc3bb252e 100644
--- a/web/core/themes/claro/css/theme/views_ui.admin.theme.pcss.css
+++ b/web/core/themes/claro/css/theme/views_ui.admin.theme.pcss.css
@@ -490,27 +490,6 @@ td.group-title {
   margin: 0 var(--space-s) var(--space-s) 0;
 }
 
-.views-ui-dialog .views-progress-indicator {
-  position: absolute;
-  z-index: 1;
-  top: 0;
-  right: var(--jui-dialog-close-button-reserved-space); /* LTR */
-  color: var(--jui-dialog-title-color);
-  font-size: var(--font-size-xxs);
-  line-height: var(--jui-dialog-close-button-reserved-space);
-}
-[dir="rtl"] .views-ui-dialog .views-progress-indicator {
-  right: auto;
-  left: var(--jui-dialog-close-button-reserved-space);
-}
-
-.views-ui-dialog .views-progress-indicator:before {
-  content: "\003C\00A0";
-}
-.views-ui-dialog .views-progress-indicator:after {
-  content: "\00A0\003E";
-}
-
 .views-ui-dialog .tabledrag-toggle-weight-wrapper {
   margin: 0 0 var(--space-m) 0;
 }
diff --git a/web/core/themes/claro/js/ajax.js b/web/core/themes/claro/js/ajax.js
index c6c9054bd..9b8a71cc1 100644
--- a/web/core/themes/claro/js/ajax.js
+++ b/web/core/themes/claro/js/ajax.js
@@ -4,18 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.ajaxProgressIndicatorFullscreen = function () {
     return '<div class="ajax-progress ajax-progress--fullscreen"><div class="ajax-progress__throbber ajax-progress__throbber--fullscreen">&nbsp;</div></div>';
   };
-
   Drupal.theme.ajaxProgressThrobber = function (message) {
     var messageMarkup = typeof message === 'string' ? Drupal.theme('ajaxProgressMessage', message) : '';
     var throbber = '<div class="ajax-progress__throbber">&nbsp;</div>';
     return "<div class=\"ajax-progress ajax-progress--throbber\">".concat(throbber).concat(messageMarkup, "</div>");
   };
-
   Drupal.theme.ajaxProgressMessage = function (message) {
     return "<div class=\"ajax-progress__message\">".concat(message, "</div>");
   };
diff --git a/web/core/themes/claro/js/autocomplete.js b/web/core/themes/claro/js/autocomplete.js
index 79db89081..ad4e850e8 100644
--- a/web/core/themes/claro/js/autocomplete.js
+++ b/web/core/themes/claro/js/autocomplete.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, once) {
   Drupal.behaviors.claroAutoCompete = {
     attach: function attach(context) {
@@ -12,18 +11,15 @@
         var $input = $(value);
         var timeout = 400;
         var classRemoveTimeout;
-
         var classRemove = function classRemove($autoCompleteElem) {
           $autoCompleteElem.removeClass('is-autocompleting');
           $autoCompleteElem.siblings('[data-drupal-selector="autocomplete-message"]').addClass('hidden');
         };
-
         $input.on('input autocompletesearch autocompleteresponses', function (event) {
           if (event && event.type && event.type === 'autocompletesearch') {
             $(event.target).addClass('is-autocompleting');
             $(event.target).siblings('[data-drupal-selector="autocomplete-message"]').removeClass('hidden');
           }
-
           clearTimeout(classRemoveTimeout);
           classRemoveTimeout = setTimeout(classRemove, timeout, $(event.target));
         });
diff --git a/web/core/themes/claro/js/checkbox.js b/web/core/themes/claro/js/checkbox.js
index 90d825cbe..639314c74 100644
--- a/web/core/themes/claro/js/checkbox.js
+++ b/web/core/themes/claro/js/checkbox.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.checkbox = function () {
     return '<input type="checkbox" class="form-checkbox form-boolean form-boolean--type-checkbox"/>';
diff --git a/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js b/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js
index 0b9d95999..0ca2409c5 100644
--- a/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js
+++ b/web/core/themes/claro/js/classy/media_embed_ckeditor.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.mediaEmbedPreviewError = function () {
     return "<div class=\"media-embed-error media-embed-error--preview-error\">".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
diff --git a/web/core/themes/claro/js/details.js b/web/core/themes/claro/js/details.js
index 853c99163..3a7d2bc05 100644
--- a/web/core/themes/claro/js/details.js
+++ b/web/core/themes/claro/js/details.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Modernizr, Drupal) {
   Drupal.behaviors.claroDetails = {
     attach: function attach(context) {
@@ -20,10 +19,8 @@
       if (Modernizr.details || !Drupal.CollapsibleDetails.instances.length) {
         return;
       }
-
       $(once('claroDetailsToggleShim', 'details .details-title', context)).on('keypress', function (event) {
         var keyCode = event.keyCode || event.charCode;
-
         if (keyCode === 32) {
           $(event.target).closest('summary').trigger('click');
           event.preventDefault();
@@ -31,11 +28,9 @@
       });
     }
   };
-
   Drupal.theme.detailsSummarizedContentWrapper = function () {
     return "<span class=\"claro-details__summary-summary\"></span>";
   };
-
   Drupal.theme.detailsSummarizedContentText = function (text) {
     return text || '';
   };
diff --git a/web/core/themes/claro/js/dropbutton.js b/web/core/themes/claro/js/dropbutton.js
index 39bb562b7..eee12c852 100644
--- a/web/core/themes/claro/js/dropbutton.js
+++ b/web/core/themes/claro/js/dropbutton.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.dropbuttonToggle = function (options) {
     return "<li class=\"dropbutton-toggle\"><button type=\"button\" class=\"dropbutton__toggle\"><span class=\"visually-hidden\">".concat(options.title, "</span></button></li>");
diff --git a/web/core/themes/claro/js/media-library.ui.js b/web/core/themes/claro/js/media-library.ui.js
index 2a8e8a08b..84c3f89da 100644
--- a/web/core/themes/claro/js/media-library.ui.js
+++ b/web/core/themes/claro/js/media-library.ui.js
@@ -4,34 +4,27 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal, window) {
   Drupal.behaviors.MediaLibraryItemSelectionClaro = {
     attach: function attach() {
       if (!once('media-library-selection-info-claro-event', 'html').length) {
         return;
       }
-
       $(window).on('dialog:aftercreate', function (event, dialog, $element, settings) {
         var moveCounter = function moveCounter($selectedCount, $buttonPane) {
           var $moveSelectedCount = $selectedCount.detach();
           $buttonPane.prepend($moveSelectedCount);
         };
-
         var $buttonPane = $element.closest('.media-library-widget-modal').find('.ui-dialog-buttonpane');
-
         if (!$buttonPane.length) {
           return;
         }
-
         var $selectedCount = $buttonPane.find('.js-media-library-selected-count');
-
         if ($selectedCount.length) {
           moveCounter($selectedCount, $buttonPane);
         } else {
           var selectedCountObserver = new MutationObserver(function () {
             var $selectedCountFind = $buttonPane.find('.js-media-library-selected-count');
-
             if ($selectedCountFind.length) {
               moveCounter($selectedCountFind, $buttonPane);
               selectedCountObserver.disconnect();
diff --git a/web/core/themes/claro/js/messages.js b/web/core/themes/claro/js/messages.js
index 10eb94445..7c704af9c 100644
--- a/web/core/themes/claro/js/messages.js
+++ b/web/core/themes/claro/js/messages.js
@@ -4,12 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.message = function (_ref, _ref2) {
     var text = _ref.text;
     var type = _ref2.type,
-        id = _ref2.id;
+      id = _ref2.id;
     var messagesTypes = Drupal.Message.getMessageTypeLabels();
     var messageWrapper = document.createElement('div');
     messageWrapper.setAttribute('class', "messages messages--".concat(type));
diff --git a/web/core/themes/claro/js/mobile.install.js b/web/core/themes/claro/js/mobile.install.js
index 095fd1177..3ab8e2065 100644
--- a/web/core/themes/claro/js/mobile.install.js
+++ b/web/core/themes/claro/js/mobile.install.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function () {
   function findActiveStep(steps) {
     for (var i = 0; i < steps.length; i++) {
@@ -12,17 +11,13 @@
         return i + 1;
       }
     }
-
     if (steps[steps.length - 1].className === 'done') {
       return steps.length;
     }
-
     return 0;
   }
-
   function installStepsSetup() {
     var steps = document.querySelectorAll('.task-list li');
-
     if (steps.length) {
       var header = document.querySelector('header[role="banner"]');
       var stepIndicator = document.createElement('div');
@@ -31,7 +26,6 @@
       header.appendChild(stepIndicator);
     }
   }
-
   if (document.addEventListener) {
     document.addEventListener('DOMContentLoaded', installStepsSetup);
   }
diff --git a/web/core/themes/claro/js/nav-tabs.js b/web/core/themes/claro/js/nav-tabs.js
index 92e465583..47b97a3d6 100644
--- a/web/core/themes/claro/js/nav-tabs.js
+++ b/web/core/themes/claro/js/nav-tabs.js
@@ -4,39 +4,32 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   function init(tab) {
     var $tab = $(tab);
     var $target = $tab.find('[data-drupal-nav-tabs-target]');
     var $active = $target.find('.js-active-tab');
-
     var openMenu = function openMenu() {
       $target.toggleClass('is-open');
     };
-
     var toggleOrder = function toggleOrder(reset) {
       var current = $active.index();
       var original = $active.data('original-order');
-
       if (original === 0 || reset === (current === original)) {
         return;
       }
-
       var siblings = {
         first: '[data-original-order="0"]',
         previous: "[data-original-order=\"".concat(original - 1, "\"]")
       };
       var $first = $target.find(siblings.first);
       var $previous = $target.find(siblings.previous);
-
       if (reset && current !== original) {
         $active.insertAfter($previous);
       } else if (!reset && current === original) {
         $active.insertBefore($first);
       }
     };
-
     var toggleCollapsed = function toggleCollapsed() {
       if (window.matchMedia('(min-width: 48em)').matches) {
         if ($tab.hasClass('is-horizontal') && !$tab.attr('data-width')) {
@@ -46,7 +39,6 @@
           });
           $tab.attr('data-width', width);
         }
-
         var isHorizontal = $tab.attr('data-width') <= $tab.outerWidth();
         $tab.toggleClass('is-horizontal', isHorizontal);
         toggleOrder(isHorizontal);
@@ -54,7 +46,6 @@
         toggleOrder(false);
       }
     };
-
     $tab.addClass('position-container is-horizontal-enabled');
     $target.find('.js-tab').each(function (index, element) {
       var $item = $(element);
@@ -63,7 +54,6 @@
     $tab.on('click.tabs', '[data-drupal-nav-tabs-trigger]', openMenu);
     $(window).on('resize.tabs', Drupal.debounce(toggleCollapsed, 150)).trigger('resize.tabs');
   }
-
   Drupal.behaviors.navTabs = {
     attach: function attach(context) {
       once('nav-tabs', '[data-drupal-nav-tabs].is-collapsible', context).forEach(init);
diff --git a/web/core/themes/claro/js/responsive-details.js b/web/core/themes/claro/js/responsive-details.js
index ec59b2afa..fe45fd32e 100644
--- a/web/core/themes/claro/js/responsive-details.js
+++ b/web/core/themes/claro/js/responsive-details.js
@@ -4,19 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.responsiveDetails = {
     attach: function attach(context) {
       var details = once('responsive-details', 'details', context);
-
       if (!details.length) {
         return;
       }
-
       var $details = $(details);
       var $summaries = $details.find('> summary');
-
       function detailsToggle(matches) {
         if (matches) {
           $details.attr('open', true);
@@ -28,11 +24,9 @@
           $summaries.off('.details-open');
         }
       }
-
       function handleDetailsMQ(event) {
         detailsToggle(event.matches);
       }
-
       var mql = window.matchMedia('(min-width:48em)');
       mql.addListener(handleDetailsMQ);
       detailsToggle(mql.matches);
diff --git a/web/core/themes/claro/js/tabledrag.js b/web/core/themes/claro/js/tabledrag.js
index 3beafe0c7..272d33aa9 100644
--- a/web/core/themes/claro/js/tabledrag.js
+++ b/web/core/themes/claro/js/tabledrag.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.claroTableDrag = {
     attach: function attach(context, settings) {
@@ -14,7 +13,6 @@
         var $targetElem = $firstCell.find('.js-tabledrag-cell-content');
         $targetElem.eq(0).find('> .tabledrag-cell-content__item > .js-tabledrag-handle, > .tabledrag-cell-content__item > .js-indentation').prependTo($targetElem);
       };
-
       Object.keys(settings.tableDrag || {}).forEach(function (base) {
         once('claroTabledrag', $(context).find("#".concat(base)).find('> tr.draggable, > tbody > tr.draggable')).forEach(createItemWrapBoundaries);
       });
@@ -24,7 +22,6 @@
     markChanged: function markChanged() {
       var marker = $(Drupal.theme('tableDragChangedMarker')).addClass('js-tabledrag-changed-marker');
       var cell = $(this.element).find('td:first-of-type');
-
       if (cell.find('.js-tabledrag-changed-marker').length === 0) {
         cell.find('.js-tabledrag-handle').after(marker);
       }
@@ -53,7 +50,6 @@
     toggleButtonContent: function toggleButtonContent(show) {
       var classes = ['action-link', 'action-link--extrasmall', 'tabledrag-toggle-weight'];
       var text = '';
-
       if (show) {
         classes.push('action-link--icon-hide');
         text = Drupal.t('Hide row weights');
@@ -61,7 +57,6 @@
         classes.push('action-link--icon-show');
         text = Drupal.t('Show row weights');
       }
-
       return "<span class=\"".concat(classes.join(' '), "\">").concat(text, "</a>");
     },
     tableDragCellContentWrapper: function tableDragCellContentWrapper() {
diff --git a/web/core/themes/claro/js/user.theme.js b/web/core/themes/claro/js/user.theme.js
index f2e3b141d..e402aa36a 100644
--- a/web/core/themes/claro/js/user.theme.js
+++ b/web/core/themes/claro/js/user.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Object.assign(Drupal.user.password.css, {
     passwordWeak: 'is-weak',
@@ -14,20 +13,17 @@
     confirmEmpty: 'is-confirm-empty',
     confirmFilled: 'is-confirm-filled'
   });
-
   Drupal.theme.passwordConfirmMessage = function (_ref) {
     var confirmTitle = _ref.confirmTitle;
     var confirmTextWrapper = '<span class="password-match-message__text" data-drupal-selector="password-match-status-text"></span>';
     return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-match-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
   };
-
   Drupal.theme.passwordStrength = function (_ref2) {
     var strengthTitle = _ref2.strengthTitle;
     var strengthBar = '<div class="password-strength__bar" data-drupal-selector="password-strength-indicator"></div>';
     var strengthText = '<span class="password-strength__text" data-drupal-selector="password-strength-text"></span>';
     return "\n      <div class=\"password-strength\">\n        <div class=\"password-strength__track\" data-drupal-selector=\"password-strength-meter\">".concat(strengthBar, "</div>\n        <div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-strength__title\">").concat(strengthTitle, " ").concat(strengthText, "</div>\n      </div>\n    ");
   };
-
   Drupal.theme.passwordSuggestions = function (_ref3, tips) {
     var hasWeaknesses = _ref3.hasWeaknesses;
     return "<div class=\"password-suggestions\">".concat(tips.length ? "".concat(hasWeaknesses, "<ul class=\"password-suggestions__tips\"><li class=\"password-suggestions__tip\">").concat(tips.join('</li><li class="password-suggestions__tip">'), "</li></ul>") : '', "</div>");
diff --git a/web/core/themes/claro/js/vertical-tabs.js b/web/core/themes/claro/js/vertical-tabs.js
index 55cbf419c..e814b01af 100644
--- a/web/core/themes/claro/js/vertical-tabs.js
+++ b/web/core/themes/claro/js/vertical-tabs.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.theme.verticalTab = function (settings) {
     var tab = {};
diff --git a/web/core/themes/claro/templates/admin/update-version.html.twig b/web/core/themes/claro/templates/admin/update-version.html.twig
index 00fef397b..042c9ba4f 100644
--- a/web/core/themes/claro/templates/admin/update-version.html.twig
+++ b/web/core/themes/claro/templates/admin/update-version.html.twig
@@ -32,11 +32,6 @@
     </div>
     <div class="layout-column layout-column--half">
       <ul class="project-update__version-links">
-        {% if version.core_compatible is not defined or version.core_compatible %}
-          <li class="project-update__download-link">
-            <a href="{{ version.download_link }}">{{ 'Download'|t }}</a>
-          </li>
-        {% endif %}
         <li class="project-update__release-notes-link">
           <a href="{{ version.release_link }}">{{ 'Release notes'|t }}</a>
         </li>
diff --git a/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig b/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig
index 667202fb6..d1cda724b 100644
--- a/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig
+++ b/web/core/themes/claro/templates/classy/block/block--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: A list HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template. Includes:
diff --git a/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig b/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig
index 407f8403f..db3f9f808 100644
--- a/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig
+++ b/web/core/themes/claro/templates/classy/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/claro/templates/classy/block/block.html.twig b/web/core/themes/claro/templates/classy/block/block.html.twig
index fd3311be9..114d7c4de 100644
--- a/web/core/themes/claro/templates/classy/block/block.html.twig
+++ b/web/core/themes/claro/templates/classy/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/claro/templates/install-page.html.twig b/web/core/themes/claro/templates/install-page.html.twig
index c51fe6369..bd22c5a94 100644
--- a/web/core/themes/claro/templates/install-page.html.twig
+++ b/web/core/themes/claro/templates/install-page.html.twig
@@ -13,7 +13,7 @@
 
   <header role="banner">
     {% if site_name %}
-      <h1 class="page-title">
+      <h1 class="site-name">
         {{ site_name }}
         {% if site_version %}
           <span class="site-version">{{ site_version }}</span>
@@ -28,9 +28,9 @@
     </aside>{# /.layout-sidebar-first #}
   {% endif %}
 
-  <main role="main">
+  <main role="main" class="main-content">
     {% if title %}
-      <h2 class="heading-a">{{ title }}</h2>
+      <h2 class="heading-c">{{ title }}</h2>
     {% endif %}
     {{ page.highlighted }}
     {{ page.content }}
diff --git a/web/core/themes/claro/templates/maintenance-page.html.twig b/web/core/themes/claro/templates/maintenance-page.html.twig
index 49e809cd8..9bbb9a0e0 100644
--- a/web/core/themes/claro/templates/maintenance-page.html.twig
+++ b/web/core/themes/claro/templates/maintenance-page.html.twig
@@ -1,12 +1,16 @@
 {#
 /**
  * @file
- * Claro's theme implementation to display a single Drupal page while offline.
+ * Claro's theme implementation for maintenance page.
+ *
+ * This template is used for rendering non-frontpage maintenance pages. An
+ * example of this is /update.php.
  *
  * All available variables are mirrored in page.html.twig.
  * Some may be blank but they are provided for consistency.
  *
  * @see template_preprocess_maintenance_page()
+ * @see maintenance-page--front.html.twig
  */
 #}
 <div class="layout-container">
@@ -23,7 +27,7 @@
     </aside>{# /.layout-sidebar-first #}
   {% endif %}
 
-  <main role="main">
+  <main role="main" class="main-content">
     {% if title %}
       <h1 class="title">{{ title }}</h1>
     {% endif %}
diff --git a/web/core/themes/claro/templates/menu-local-tasks.html.twig b/web/core/themes/claro/templates/menu-local-tasks.html.twig
index aca461197..4197254f0 100644
--- a/web/core/themes/claro/templates/menu-local-tasks.html.twig
+++ b/web/core/themes/claro/templates/menu-local-tasks.html.twig
@@ -21,7 +21,7 @@
 {% endif %}
 {% if secondary %}
   <h2 id="secondary-tabs-title" class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
-  <nav role="navigation" class="tabs-wrapper tabs-wrapper--secondary is-horizontal" aria-labelledby="secondary-tabs-title">
-    <ul class="tabs tabs--secondary clearfix">{{ secondary }}</ul>
+  <nav role="navigation" class="tabs-wrapper tabs-wrapper--secondary is-horizontal is-collapsible" aria-labelledby="secondary-tabs-title" data-drupal-nav-tabs>
+    <ul class="tabs tabs--secondary clearfix" data-drupal-nav-tabs-target>{{ secondary }}</ul>
   </nav>
 {% endif %}
diff --git a/web/core/themes/classy/classy.info.yml b/web/core/themes/classy/classy.info.yml
index 3f3998166..c6d0c3055 100644
--- a/web/core/themes/classy/classy.info.yml
+++ b/web/core/themes/classy/classy.info.yml
@@ -1,6 +1,8 @@
 name: Classy
 type: theme
 base theme: stable
+lifecycle: deprecated
+lifecycle_link: https://drupal.org/node/3223395#s-classy
 description: 'A base theme with sensible default CSS classes added. Learn how to use Classy as a base theme in the <a href="https://www.drupal.org/docs/8/theming">Drupal 8 Theming Guide</a>.'
 package: Core
 version: VERSION
diff --git a/web/core/themes/classy/classy.theme b/web/core/themes/classy/classy.theme
index b0161f848..d961a7be5 100644
--- a/web/core/themes/classy/classy.theme
+++ b/web/core/themes/classy/classy.theme
@@ -53,6 +53,8 @@ function classy_preprocess_image_widget(array &$variables) {
 }
 
 /**
+ * Classy theme is deprecated.
+ *
  * No changes that impact functionality should be made to this file, as Classy
  * will be deprecated in Drupal 9. Changes should instead be made in the core
  * themes Bartik, Seven, Claro and/or Umami.
diff --git a/web/core/themes/classy/js/media_embed_ckeditor.theme.js b/web/core/themes/classy/js/media_embed_ckeditor.theme.js
index 0b9d95999..0ca2409c5 100644
--- a/web/core/themes/classy/js/media_embed_ckeditor.theme.js
+++ b/web/core/themes/classy/js/media_embed_ckeditor.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.mediaEmbedPreviewError = function () {
     return "<div class=\"media-embed-error media-embed-error--preview-error\">".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
diff --git a/web/core/themes/classy/templates/block/block--search-form-block.html.twig b/web/core/themes/classy/templates/block/block--search-form-block.html.twig
index 667202fb6..d1cda724b 100644
--- a/web/core/themes/classy/templates/block/block--search-form-block.html.twig
+++ b/web/core/themes/classy/templates/block/block--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: A list HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template. Includes:
diff --git a/web/core/themes/classy/templates/block/block--system-menu-block.html.twig b/web/core/themes/classy/templates/block/block--system-menu-block.html.twig
index 407f8403f..db3f9f808 100644
--- a/web/core/themes/classy/templates/block/block--system-menu-block.html.twig
+++ b/web/core/themes/classy/templates/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/classy/templates/block/block.html.twig b/web/core/themes/classy/templates/block/block.html.twig
index fd3311be9..114d7c4de 100644
--- a/web/core/themes/classy/templates/block/block.html.twig
+++ b/web/core/themes/classy/templates/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/olivero/css/base/base.css b/web/core/themes/olivero/css/base/base.css
index 318abf73e..f9ff624ce 100644
--- a/web/core/themes/olivero/css/base/base.css
+++ b/web/core/themes/olivero/css/base/base.css
@@ -17,7 +17,7 @@
 }
 
 html {
-  font-family: "metropolis", sans-serif;
+  font-family: metropolis, sans-serif;
   font-size: 100%;
   font-weight: normal;
   font-style: normal;
@@ -29,31 +29,31 @@ body {
   color: #313637;
   background-color: #f7f9fa;
   background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='50' height='84' viewBox='0 0 50 84'%3e  %3cpath opacity='0.05' fill='%230e6ba6' d='M25,61.7C25,68.5,19.4,74,12.5,74S0,68.5,0,61.7c0-5.7,3.9-9.6,7.4-12.9c2.3-2.2,4.5-4.4,5.1-6.8c0.7,2.4,2.8,4.6,5.1,6.8C21.1,52.2,25,56,25,61.7z M42.6,6.8c-2.3-2.2-4.5-4.4-5.1-6.8c-0.7,2.4-2.9,4.6-5.1,6.8C28.9,10.2,25,14,25,19.7C25,26.5,30.6,32,37.5,32S50,26.5,50,19.7C50,14,46.1,10.2,42.6,6.8z'/%3e%3c/svg%3e");
-  background-position: top left /* LTR */
+  background-position: top left; /* LTR */
 }
 
 body.is-fixed {
-    position: fixed;
-    overflow: hidden;
-    width: 100%;
-  }
+  position: fixed;
+  overflow: hidden;
+  width: 100%;
+}
 
 [dir="rtl"] body {
   background-position: top right;
 }
 
 a {
-  color: #0d77b5
+  color: #0d77b5;
 }
 
 a:hover {
-    color: #2494db;
-  }
+  color: #2494db;
+}
 
 a:focus {
-    outline: solid 2px currentColor;
-    outline-offset: 2px;
-  }
+  outline: solid 2px currentColor;
+  outline-offset: 2px;
+}
 
 button {
   font-family: inherit;
@@ -74,43 +74,43 @@ audio {
 h1 {
   letter-spacing: -0.01em;
   font-size: 1.75rem;
-  line-height: 2.25rem
+  line-height: 2.25rem;
 }
 
 @media (min-width: 43.75rem) {
 
-h1 {
+  h1 {
     font-size: 3.75rem;
-    line-height: 4.5rem
-}
+    line-height: 4.5rem;
   }
+}
 
 h2 {
   letter-spacing: -0.01em;
   font-size: 1.5rem;
-  line-height: 2.25rem
+  line-height: 2.25rem;
 }
 
 @media (min-width: 43.75rem) {
 
-h2 {
+  h2 {
     font-size: 2.25rem;
-    line-height: 3.375rem
-}
+    line-height: 3.375rem;
   }
+}
 
 h3 {
   font-size: 1.25rem;
-  line-height: 1.6875rem
+  line-height: 1.6875rem;
 }
 
 @media (min-width: 43.75rem) {
 
-h3 {
+  h3 {
     font-size: 1.5rem;
-    line-height: 2.25rem
-}
+    line-height: 2.25rem;
   }
+}
 
 h4 {
   font-size: 1.125rem;
@@ -136,22 +136,22 @@ h6 {
   margin-top: 1.125rem;
   margin-bottom: 1.125rem;
   color: #0d1214;
-  font-family: "metropolis", sans-serif;
-  font-weight: bold
+  font-family: metropolis, sans-serif;
+  font-weight: bold;
 }
 
 @media (min-width: 43.75rem) {
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
     margin-top: 2.25rem;
-    margin-bottom: 2.25rem
-}
+    margin-bottom: 2.25rem;
   }
+}
 
 [dir="ltr"] ul {
   margin-left: 1.5em;
diff --git a/web/core/themes/olivero/css/base/utility.css b/web/core/themes/olivero/css/base/utility.css
index cd22028e8..1cc7a2b63 100644
--- a/web/core/themes/olivero/css/base/utility.css
+++ b/web/core/themes/olivero/css/base/utility.css
@@ -19,41 +19,41 @@
 */
 
 .ie11-autorow > *:nth-child(1) {
-    -ms-grid-row: 1;
-  }
+  -ms-grid-row: 1;
+}
 
 .ie11-autorow > *:nth-child(2) {
-    -ms-grid-row: 2;
-  }
+  -ms-grid-row: 2;
+}
 
 .ie11-autorow > *:nth-child(3) {
-    -ms-grid-row: 3;
-  }
+  -ms-grid-row: 3;
+}
 
 .ie11-autorow > *:nth-child(4) {
-    -ms-grid-row: 4;
-  }
+  -ms-grid-row: 4;
+}
 
 .ie11-autorow > *:nth-child(5) {
-    -ms-grid-row: 5;
-  }
+  -ms-grid-row: 5;
+}
 
 .ie11-autorow > *:nth-child(6) {
-    -ms-grid-row: 6;
-  }
+  -ms-grid-row: 6;
+}
 
 .ie11-autorow > *:nth-child(7) {
-    -ms-grid-row: 7;
-  }
+  -ms-grid-row: 7;
+}
 
 .ie11-autorow > *:nth-child(8) {
-    -ms-grid-row: 8;
-  }
+  -ms-grid-row: 8;
+}
 
 .ie11-autorow > *:nth-child(9) {
-    -ms-grid-row: 9;
-  }
+  -ms-grid-row: 9;
+}
 
 .ie11-autorow > *:nth-child(10) {
-    -ms-grid-row: 10;
-  }
+  -ms-grid-row: 10;
+}
diff --git a/web/core/themes/olivero/css/base/variables.css b/web/core/themes/olivero/css/base/variables.css
index 6297dd946..95bda2c61 100644
--- a/web/core/themes/olivero/css/base/variables.css
+++ b/web/core/themes/olivero/css/base/variables.css
@@ -42,7 +42,9 @@
     as they are processed by postcss/postcss-custom-properties (for IE11 compatibility),
     which does not support that functionality. Therefore, we need a separate custom
     property for each breakpoint. 😭
-  */ /* Approximate width of a scrollbar. Doesn't have to be perfect. */
+  */
+
+  /* Approximate width of a scrollbar. Doesn't have to be perfect. */
 
   /* Grid gap across various breakpoints. */
 
@@ -54,7 +56,51 @@
 
   /* Width of a grid column at various breakpoints */
 
-  /* Layout helpers */ /* Black */ /* Black 1 */ /* Black 2 */ /* Black 3 */ /* Gray Dark */ /* Gray Dark 2 */ /* Gray medium */ /* Gray medium 1 */ /* Gray medium 2 */ /* Black 4 */ /* Gray light */ /* Gray light 1 */ /* Gray light 2 */ /* Blue dark */ /* Blue dark 2 */ /* Blue medium */ /* Blue bright */ /* Blue bright 5 */ /* White */ /* Red */ /* Gold */ /* Green */
+  /* Layout helpers */
+
+  /* Black */
+
+  /* Black 1 */
+
+  /* Black 2 */
+
+  /* Black 3 */
+
+  /* Gray Dark */
+
+  /* Gray Dark 2 */
+
+  /* Gray medium */
+
+  /* Gray medium 1 */
+
+  /* Gray medium 2 */
+
+  /* Black 4 */
+
+  /* Gray light */
+
+  /* Gray light 1 */
+
+  /* Gray light 2 */
+
+  /* Blue dark */
+
+  /* Blue dark 2 */
+
+  /* Blue medium */
+
+  /* Blue bright */
+
+  /* Blue bright 5 */
+
+  /* White */
+
+  /* Red */
+
+  /* Gold */
+
+  /* Green */
 
   /* Header */
 
diff --git a/web/core/themes/olivero/css/components/action-links.css b/web/core/themes/olivero/css/components/action-links.css
index 35a25715c..ea135764e 100644
--- a/web/core/themes/olivero/css/components/action-links.css
+++ b/web/core/themes/olivero/css/components/action-links.css
@@ -9,42 +9,42 @@
  * Styles for action links.
 */
 [dir="ltr"] .action-links {
-  margin-left: 0
+  margin-left: 0;
 }
 [dir="rtl"] .action-links {
-  margin-right: 0
+  margin-right: 0;
 }
 [dir="ltr"] .action-links {
-  margin-right: 0
+  margin-right: 0;
 }
 [dir="rtl"] .action-links {
-  margin-left: 0
+  margin-left: 0;
 }
 [dir="ltr"] .action-links {
-  padding-left: 0
+  padding-left: 0;
 }
 [dir="rtl"] .action-links {
-  padding-right: 0
+  padding-right: 0;
 }
 [dir="ltr"] .action-links {
-  padding-right: 0
+  padding-right: 0;
 }
 [dir="rtl"] .action-links {
-  padding-left: 0
+  padding-left: 0;
 }
 .action-links {
   margin-top: 0;
   margin-bottom: 0;
   padding-top: 0;
   padding-bottom: 0;
-  list-style: none
+  list-style: none;
 }
 .action-links li {
-    display: inline-block
-  }
+  display: inline-block;
+}
 .action-links li a {
-      color: #0d77b5;
-    }
+  color: #0d77b5;
+}
 .action-links-item {
   display: inline-block;
 }
diff --git a/web/core/themes/olivero/css/components/ajax-progress.module.css b/web/core/themes/olivero/css/components/ajax-progress.module.css
index b5292e05f..4efd9d6ab 100644
--- a/web/core/themes/olivero/css/components/ajax-progress.module.css
+++ b/web/core/themes/olivero/css/components/ajax-progress.module.css
@@ -89,26 +89,26 @@
   border: 1px solid #afb8be;
   border-radius: 3.5rem;
   background-color: #fff;
-  box-shadow: 0 0.25rem 0.625rem rgba(34, 35, 48, 0.1) /* LTR */
+  box-shadow: 0 0.25rem 0.625rem rgba(34, 35, 48, 0.1); /* LTR */
 }
 
 [dir="ltr"] .ajax-progress-fullscreen:before {
-    left: 50%;
+  left: 50%;
 }
 
 [dir="rtl"] .ajax-progress-fullscreen:before {
-    right: 50%;
+  right: 50%;
 }
 
 .ajax-progress-fullscreen:before {
-    position: absolute;
-    top: 50%;
-    width: 1.75rem;
-    height: 1.75rem;
-    margin: -0.875rem;
-    content: "";
-    border-width: 3px;
-  }
+  position: absolute;
+  top: 50%;
+  width: 1.75rem;
+  height: 1.75rem;
+  margin: -0.875rem;
+  content: "";
+  border-width: 3px;
+}
 
 [dir="rtl"] .ajax-progress-fullscreen {
   box-shadow: 0 -0.25rem 0.625rem rgba(34, 35, 48, 0.1);
diff --git a/web/core/themes/olivero/css/components/autocomplete-loading.module.css b/web/core/themes/olivero/css/components/autocomplete-loading.module.css
index 4ba078a72..2b86c6a03 100644
--- a/web/core/themes/olivero/css/components/autocomplete-loading.module.css
+++ b/web/core/themes/olivero/css/components/autocomplete-loading.module.css
@@ -23,33 +23,33 @@ html[dir="rtl"].js .form-autocomplete {
 
 html.js .form-autocomplete {
   background-color: #fff;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18.8' viewBox='0 0 18 18.8'%3e  %3cpath fill='%237e96a7' d='M17.8,17.4l-3.6-3.6c1.4-1.5,2.2-3.4,2.2-5.6c0-4.5-3.7-8.2-8.2-8.2S0,3.7,0,8.2s3.7,8.2,8.2,8.2c1.8,0,3.4-0.6,4.7-1.5l3.7,3.7c0.3,0.3,0.8,0.3,1.2,0C18.1,18.3,18.1,17.7,17.8,17.4z M8.2,14.7c-3.6,0-6.5-2.9-6.5-6.5s2.9-6.5,6.5-6.5s6.5,2.9,6.5,6.5S11.8,14.7,8.2,14.7z'/%3e%3c/svg%3e");
+  background-image: url("../../images/magnifying-glass.svg");
   background-repeat: no-repeat;
-  background-position: right 18px center  /* LTR */
+  background-position: right 18px center;  /* LTR */
 }
 
 html.js .form-autocomplete:disabled {
-    background-color: #f1f4f7;
-  }
+  background-color: #f1f4f7;
+}
 
 html.js .form-autocomplete.ui-autocomplete-loading {
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 10 10'%3e  %3cstyle type='text/css'%3e%40keyframes s%7b0%25%7btransform:rotate(0deg) translate(-50%25,-50%25)%7d50%25%7btransform:rotate(430deg) translate(-50%25,-50%25);stroke-dashoffset:20%7d100%25%7btransform:rotate(720deg) translate(-50%25,-50%25)%7d%7dellipse%7banimation:s 1s linear infinite%7d%3c/style%3e  %3cg transform='translate(5 5)'%3e    %3cellipse fill='none' ry='4' rx='4' cy='5' cx='5' stroke='%237e96a7' stroke-width='1' stroke-dashoffset='6.125' stroke-dasharray='25' transform='translate(-5 -5)'/%3e  %3c/g%3e%3c/svg%3e") no-repeat right 1.125rem center;
-  }
+  background: url("../../images/throbber.svg") no-repeat right 1.125rem center;
+}
 
 html.js[dir="rtl"] .form-autocomplete {
   background-color: #fff;
-  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18.8' viewBox='0 0 18 18.8'%3e  %3cpath fill='%237e96a7' d='M17.8,17.4l-3.6-3.6c1.4-1.5,2.2-3.4,2.2-5.6c0-4.5-3.7-8.2-8.2-8.2S0,3.7,0,8.2s3.7,8.2,8.2,8.2c1.8,0,3.4-0.6,4.7-1.5l3.7,3.7c0.3,0.3,0.8,0.3,1.2,0C18.1,18.3,18.1,17.7,17.8,17.4z M8.2,14.7c-3.6,0-6.5-2.9-6.5-6.5s2.9-6.5,6.5-6.5s6.5,2.9,6.5,6.5S11.8,14.7,8.2,14.7z'/%3e%3c/svg%3e");
+  background-image: url("../../images/magnifying-glass.svg");
   background-repeat: no-repeat;
-  background-position: left 18px center
+  background-position: left 18px center;
 }
 
 html.js[dir="rtl"] .form-autocomplete:disabled {
-    background-color: #f1f4f7;
-  }
+  background-color: #f1f4f7;
+}
 
 html.js[dir="rtl"] .form-autocomplete.ui-autocomplete-loading {
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 10 10'%3e  %3cstyle type='text/css'%3e%40keyframes s%7b0%25%7btransform:rotate(0deg) translate(-50%25,-50%25)%7d50%25%7btransform:rotate(430deg) translate(-50%25,-50%25);stroke-dashoffset:20%7d100%25%7btransform:rotate(720deg) translate(-50%25,-50%25)%7d%7dellipse%7banimation:s 1s linear infinite%7d%3c/style%3e  %3cg transform='translate(5 5)'%3e    %3cellipse fill='none' ry='4' rx='4' cy='5' cx='5' stroke='%237e96a7' stroke-width='1' stroke-dashoffset='6.125' stroke-dasharray='25' transform='translate(-5 -5)'/%3e  %3c/g%3e%3c/svg%3e") no-repeat left 1.125rem center;
-  }
+  background: url("../../images/throbber.svg") no-repeat left 1.125rem center;
+}
 
 /* IE11 does not animate inline SVG. */
 
diff --git a/web/core/themes/olivero/css/components/book.css b/web/core/themes/olivero/css/components/book.css
index 9a7d297b2..544d807bf 100644
--- a/web/core/themes/olivero/css/components/book.css
+++ b/web/core/themes/olivero/css/components/book.css
@@ -53,101 +53,101 @@
 }
 
 .book-pager__item {
-  display: inline-block
+  display: inline-block;
 }
 
 @media (min-width: 31.25rem) {
 
-.book-pager__item {
-    flex: 0 0 33.33%
-}
+  .book-pager__item {
+    flex: 0 0 33.33%;
   }
+}
 
 @media (min-width: 31.25rem) {
 
-.book-pager__item--center {
-    text-align: center
-}
+  .book-pager__item--center {
+    text-align: center;
   }
+}
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .book-pager__item--next {
+  [dir="ltr"] .book-pager__item--next {
     margin-left: auto;
   }
 
-[dir="rtl"] .book-pager__item--next {
+  [dir="rtl"] .book-pager__item--next {
     margin-right: auto;
   }
 
-[dir="ltr"] .book-pager__item--next {
+  [dir="ltr"] .book-pager__item--next {
     text-align: right;
   }
 
-[dir="rtl"] .book-pager__item--next {
+  [dir="rtl"] .book-pager__item--next {
     text-align: left;
   }
-  }
+}
 
 .book-pager__link {
   display: inline-flex;
   align-items: center;
   text-decoration: none;
   color: #0d77b5;
-  font-family: "Lora", "georgia", serif;
+  font-family: Lora, georgia, serif;
   font-size: 1.125rem;
   font-weight: 600;
 }
 
 [dir="ltr"] .book-pager__link--previous:before {
-    margin-right: 0.25em;
+  margin-right: 0.25em;
 }
 
 [dir="rtl"] .book-pager__link--previous:before {
-    margin-left: 0.25em;
+  margin-left: 0.25em;
 }
 
 [dir="ltr"] .book-pager__link--previous:before {
-    border-left: solid 3px currentColor;
+  border-left: solid 0.1875rem currentColor;
 }
 
 [dir="rtl"] .book-pager__link--previous:before {
-    border-right: solid 3px currentColor;
+  border-right: solid 0.1875rem currentColor;
 }
 
 .book-pager__link--previous:before {
-    display: block;
-    width: 0.5625rem;
-    height: 0.5625rem;
-    content: "";
-    transform: rotate(-45deg);
-    border-top: solid 3px currentColor;
-  }
+  display: block;
+  width: 0.5625rem;
+  height: 0.5625rem;
+  content: "";
+  transform: rotate(-45deg);
+  border-top: solid 0.1875rem currentColor;
+}
 
 [dir="ltr"] .book-pager__link--next:after {
-    margin-left: 0.25em;
+  margin-left: 0.25em;
 }
 
 [dir="rtl"] .book-pager__link--next:after {
-    margin-right: 0.25em;
+  margin-right: 0.25em;
 }
 
 [dir="ltr"] .book-pager__link--next:after {
-    border-left: solid 3px currentColor;
+  border-left: solid 0.1875rem currentColor;
 }
 
 [dir="rtl"] .book-pager__link--next:after {
-    border-right: solid 3px currentColor;
+  border-right: solid 0.1875rem currentColor;
 }
 
 .book-pager__link--next:after {
-    display: block;
-    width: 0.5625rem;
-    height: 0.5625rem;
-    content: "";
-    transform: rotate(135deg);
-    border-top: solid 3px currentColor;
-  }
+  display: block;
+  width: 0.5625rem;
+  height: 0.5625rem;
+  content: "";
+  transform: rotate(135deg);
+  border-top: solid 0.1875rem currentColor;
+}
 
 [dir="ltr"] .book-navigation__menu {
   margin-left: 0;
@@ -214,9 +214,9 @@
 }
 
 [dir="rtl"] .book-pager__link--previous:before {
-    transform: rotate(45deg);
-  }
+  transform: rotate(45deg);
+}
 
 [dir="rtl"] .book-pager__link--next:after {
-    transform: rotate(-135deg);
-  }
+  transform: rotate(-135deg);
+}
diff --git a/web/core/themes/olivero/css/components/breadcrumb.css b/web/core/themes/olivero/css/components/breadcrumb.css
index 8d77a65b0..689c7d0f9 100644
--- a/web/core/themes/olivero/css/components/breadcrumb.css
+++ b/web/core/themes/olivero/css/components/breadcrumb.css
@@ -14,68 +14,68 @@
   position: relative;
   font-size: 0.875rem;
   font-weight: bold;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 
   /* Shadow on the right side of breadcrumbs for narrow screens. */
 }
 
 [dir="ltr"] .breadcrumb:after {
-    right: -1.125rem
+  right: -1.125rem;
 }
 
 [dir="rtl"] .breadcrumb:after {
-    left: -1.125rem
+  left: -1.125rem;
 }
 
 .breadcrumb:after {
-    position: absolute;
-    top: 0;
-    width: 3.375rem;
-    height: 2.25rem;
-    content: "";
-    background: linear-gradient(to left, #fff 0%, rgba(255, 255, 255, 0) 100%) /* LTR */
-  }
+  position: absolute;
+  top: 0;
+  width: 3.375rem;
+  height: 2.25rem;
+  content: "";
+  background: linear-gradient(to left, #fff 0%, rgba(255, 255, 255, 0) 100%); /* LTR */
+}
 
 @media (min-width: 62.5rem) {
 
-.breadcrumb:after {
-      content: none
+  .breadcrumb:after {
+    content: none;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.breadcrumb {
-    position: static
-}
+  .breadcrumb {
+    position: static;
   }
+}
 
 [dir="rtl"] .breadcrumb:after {
   background: linear-gradient(to right, #fff 0%, rgba(255, 255, 255, 0) 100%);
 }
 
 [dir="ltr"] .breadcrumb__content {
-  margin-left: -0.5625rem
+  margin-left: -0.5625rem;
 }
 
 [dir="rtl"] .breadcrumb__content {
-  margin-right: -0.5625rem
+  margin-right: -0.5625rem;
 }
 
 [dir="ltr"] .breadcrumb__content {
-  margin-right: -1.125rem
+  margin-right: -1.125rem;
 }
 
 [dir="rtl"] .breadcrumb__content {
-  margin-left: -1.125rem
+  margin-left: -1.125rem;
 }
 
 [dir="ltr"] .breadcrumb__content {
-  padding-left: 0.5625rem
+  padding-left: 0.5625rem;
 }
 
 [dir="rtl"] .breadcrumb__content {
-  padding-right: 0.5625rem
+  padding-right: 0.5625rem;
 }
 
 .breadcrumb__content {
@@ -84,50 +84,50 @@
   margin-bottom: -0.5625rem;
   padding-top: 0.5625rem;
   padding-bottom: 0.5625rem;
-  -webkit-overflow-scrolling: touch
+  -webkit-overflow-scrolling: touch;
 }
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .breadcrumb__content {
-    margin-right: 0
+  [dir="ltr"] .breadcrumb__content {
+    margin-right: 0;
   }
 
-[dir="rtl"] .breadcrumb__content {
-    margin-left: 0
-  }
+  [dir="rtl"] .breadcrumb__content {
+    margin-left: 0;
   }
+}
 
 [dir="ltr"] .breadcrumb__list {
-  margin-left: -1.125rem
+  margin-left: -1.125rem;
 }
 
 [dir="rtl"] .breadcrumb__list {
-  margin-right: -1.125rem
+  margin-right: -1.125rem;
 }
 
 [dir="ltr"] .breadcrumb__list {
-  margin-right: -1.125rem
+  margin-right: -1.125rem;
 }
 
 [dir="rtl"] .breadcrumb__list {
-  margin-left: -1.125rem
+  margin-left: -1.125rem;
 }
 
 [dir="ltr"] .breadcrumb__list {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .breadcrumb__list {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .breadcrumb__list {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .breadcrumb__list {
-  padding-left: 0
+  padding-left: 0;
 }
 
 .breadcrumb__list {
@@ -138,91 +138,91 @@
   padding-top: 0;
   padding-bottom: 1.125rem;
   list-style: none;
-  white-space: nowrap
+  white-space: nowrap;
 }
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .breadcrumb__list {
-    margin-left: 0
+  [dir="ltr"] .breadcrumb__list {
+    margin-left: 0;
   }
 
-[dir="rtl"] .breadcrumb__list {
-    margin-right: 0
+  [dir="rtl"] .breadcrumb__list {
+    margin-right: 0;
   }
 
-[dir="ltr"] .breadcrumb__list {
-    margin-right: 0
+  [dir="ltr"] .breadcrumb__list {
+    margin-right: 0;
   }
 
-[dir="rtl"] .breadcrumb__list {
-    margin-left: 0
+  [dir="rtl"] .breadcrumb__list {
+    margin-left: 0;
   }
 
-[dir="ltr"] .breadcrumb__list {
-    padding-left: 0
+  [dir="ltr"] .breadcrumb__list {
+    padding-left: 0;
   }
 
-[dir="rtl"] .breadcrumb__list {
-    padding-right: 0
+  [dir="rtl"] .breadcrumb__list {
+    padding-right: 0;
   }
 
-.breadcrumb__list {
+  .breadcrumb__list {
     overflow: visible;
     padding-bottom: 0;
-    white-space: normal
-}
+    white-space: normal;
   }
+}
 
 .breadcrumb__item {
-  display: inline-block
+  display: inline-block;
 }
 
 [dir="ltr"] .breadcrumb__item:nth-child(n+2):before {
-    margin-left: 1rem;
-    margin-right: 1.25rem
+  margin-right: 1.25rem;
+  margin-left: 1rem;
 }
 
 [dir="rtl"] .breadcrumb__item:nth-child(n+2):before {
-    margin-right: 1rem;
-    margin-left: 1.25rem
+  margin-right: 1rem;
+  margin-left: 1.25rem;
 }
 
 [dir="ltr"] .breadcrumb__item:nth-child(n+2):before {
-    border-right: 2px solid #5d7585
+  border-right: 2px solid #5d7585;
 }
 
 [dir="rtl"] .breadcrumb__item:nth-child(n+2):before {
-    border-left: 2px solid #5d7585
+  border-left: 2px solid #5d7585;
 }
 
 .breadcrumb__item:nth-child(n+2):before {
-    display: inline-block;
-    width: 0.5rem;
-    height: 0.5rem;
-    content: "";
-    transform: rotate(45deg); /* LTR */
-    border-top: 2px solid #5d7585;
-  }
+  display: inline-block;
+  width: 0.5rem;
+  height: 0.5rem;
+  content: "";
+  transform: rotate(45deg); /* LTR */
+  border-top: 2px solid #5d7585;
+}
 
 [dir="ltr"] .breadcrumb__item:last-child {
-    margin-right: 3.375rem
+  margin-right: 3.375rem;
 }
 
 [dir="rtl"] .breadcrumb__item:last-child {
-    margin-left: 3.375rem
+  margin-left: 3.375rem;
 }
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .breadcrumb__item:last-child {
-      margin-right: 0
+  [dir="ltr"] .breadcrumb__item:last-child {
+    margin-right: 0;
   }
 
-[dir="rtl"] .breadcrumb__item:last-child {
-      margin-left: 0
+  [dir="rtl"] .breadcrumb__item:last-child {
+    margin-left: 0;
   }
-    }
+}
 
 [dir="rtl"] .breadcrumb__item:nth-child(n+2):before {
   transform: rotate(-45deg);
@@ -230,10 +230,10 @@
 
 .breadcrumb__link {
   text-decoration: none;
-  color: #0d77b5
+  color: #0d77b5;
 }
 
 .breadcrumb__link:hover,
-  .breadcrumb__link:focus {
-    text-decoration: underline;
-  }
+.breadcrumb__link:focus {
+  text-decoration: underline;
+}
diff --git a/web/core/themes/olivero/css/components/button.css b/web/core/themes/olivero/css/components/button.css
index 3446248b9..e1a417aa6 100644
--- a/web/core/themes/olivero/css/components/button.css
+++ b/web/core/themes/olivero/css/components/button.css
@@ -11,19 +11,19 @@
  */
 
 [dir="ltr"] .button {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .button {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .button {
-  margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 [dir="rtl"] .button {
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 .button {
@@ -32,9 +32,9 @@
   margin-top: 1.125rem;
   margin-bottom: 1.125rem;
   padding-top: 1.125rem;
+  padding-right: 1.6875rem;
   padding-bottom: 1.125rem;
   padding-left: 1.6875rem;
-  padding-right: 1.6875rem;
   cursor: pointer;
   text-align: center;
   text-decoration: none;
@@ -42,79 +42,76 @@
   border: solid 2px #0d77b5;
   border-radius: 0.1875rem;
   background-color: #fff;
-  font-family: "metropolis", sans-serif;
+  font-family: metropolis, sans-serif;
   font-size: 1.125rem;
   font-weight: 700;
   -webkit-appearance: none;
   appearance: none;
-  -webkit-font-smoothing: antialiased
+  -webkit-font-smoothing: antialiased;
 }
 
 .button:hover,
-  .button:focus {
-    text-decoration: none;
-    color: #0f6292;
-    border: solid 2px #0f6292;
-    background: none;
-    font-weight: 700;
-  }
+.button:focus {
+  text-decoration: none;
+  color: #0f6292;
+  border: solid 2px #0f6292;
+  background: none;
+  font-weight: 700;
+}
 
 .button:focus {
-    outline: 2px solid #53b0eb;
-    outline-offset: 2px;
-  }
+  outline: 2px solid #53b0eb;
+  outline-offset: 2px;
+}
 
 .button:active {
-    color: #0d77b5;
-    border-color: #0d77b5;
-  }
+  color: #0d77b5;
+  border-color: #0d77b5;
+}
 
 .button:disabled,
-  .button.is-disabled {
-    cursor: default;
-    color: #d7e1e8;
-    border-color: #d7e1e8;
-  }
-
-.button {
+.button.is-disabled {
+  cursor: default;
+  color: #d7e1e8;
+  border-color: #d7e1e8;
+}
 
-  /*
+/*
     IE11 doesn't work properly on button elements so we only do
     inline-flex on modern browsers.
   */
-}
 
 @supports (display: inline-flex) {
 
-.button {
+  .button {
     display: inline-flex;
     align-items: center;
 
     /* Top padding accounts for font not being vertically centered within line-height. */
     padding-top: 1px;
+    padding-right: 1.6875rem;
     padding-bottom: 0;
     padding-left: 1.6875rem;
-    padding-right: 1.6875rem;
-    line-height: 1.125rem
-}
+    line-height: 1.125rem;
   }
+}
 
 /* No margin if is part of a menu. */
 
 [dir="ltr"] .menu .button {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .menu .button {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .menu .button {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .menu .button {
-  margin-left: 0
+  margin-left: 0;
 }
 
 .menu .button {
@@ -125,65 +122,65 @@
 .button--small {
   height: 2.8125rem;
   padding-top: 0.84375rem;
+  padding-right: 1.125rem;
   padding-bottom: 0.84375rem;
   padding-left: 1.125rem;
-  padding-right: 1.125rem;
   font-size: 1rem;
   line-height: normal;
 }
 
 .button--primary {
   color: #fff;
-  background-color: #0d77b5
+  background-color: #0d77b5;
 }
 
 .button--primary:hover,
-  .button--primary:focus {
-    color: #fff;
-    border-color: #0f6292;
-    background-color: #0f6292;
-  }
+.button--primary:focus {
+  color: #fff;
+  border-color: #0f6292;
+  background-color: #0f6292;
+}
 
 .button--primary:active {
-    color: #fff;
-    background-color: #0d77b5;
-  }
+  color: #fff;
+  background-color: #0d77b5;
+}
 
 .button--primary:disabled,
-  .button--primary.is-disabled {
-    color: #fff;
-    background-color: #d7e1e8;
-  }
+.button--primary.is-disabled {
+  color: #fff;
+  background-color: #d7e1e8;
+}
 
 .button--icon-back {
   display: inline-flex;
-  align-items: center
+  align-items: center;
 }
 
 [dir="ltr"] .button--icon-back:before {
-    margin-right: 0.5em
+  margin-right: 0.5em;
 }
 
 [dir="rtl"] .button--icon-back:before {
-    margin-left: 0.5em
+  margin-left: 0.5em;
 }
 
 [dir="ltr"] .button--icon-back:before {
-    border-left: solid 2px currentColor
+  border-left: solid 2px currentColor;
 }
 
 [dir="rtl"] .button--icon-back:before {
-    border-right: solid 2px currentColor
+  border-right: solid 2px currentColor;
 }
 
 .button--icon-back:before {
-    display: block;
-    width: 0.5em;
-    height: 0.5em;
-    content: "";
-    transform: rotate(45deg); /* LTR */
-    border-bottom: solid 2px currentColor;
-  }
+  display: block;
+  width: 0.5em;
+  height: 0.5em;
+  content: "";
+  transform: rotate(45deg); /* LTR */
+  border-bottom: solid 2px currentColor;
+}
 
 [dir="rtl"] .button--icon-back:before {
   transform: rotate(-45deg);
diff --git a/web/core/themes/olivero/css/components/cke-dialog.css b/web/core/themes/olivero/css/components/cke-dialog.css
index 4fedd5060..fbd6f2c02 100644
--- a/web/core/themes/olivero/css/components/cke-dialog.css
+++ b/web/core/themes/olivero/css/components/cke-dialog.css
@@ -12,9 +12,9 @@
 
 select.cke_dialog_ui_input_select {
   -webkit-appearance: menulist;
-  appearance: menulist
+  appearance: menulist;
 }
 
 select.cke_dialog_ui_input_select::-ms-expand {
-    display: block;
-  }
+  display: block;
+}
diff --git a/web/core/themes/olivero/css/components/comments.css b/web/core/themes/olivero/css/components/comments.css
index 9f3085ef0..e62d37642 100644
--- a/web/core/themes/olivero/css/components/comments.css
+++ b/web/core/themes/olivero/css/components/comments.css
@@ -11,12 +11,12 @@
  */
 
 .comment--level-1 {
-  border-top: 2px solid #e7edf1
+  border-top: 2px solid #e7edf1;
 }
 
 .comment--level-1 ~ .comment--level-1 {
-    margin-top: 2.25rem;
-  }
+  margin-top: 2.25rem;
+}
 
 .comments__title {
   display: flex;
@@ -25,35 +25,35 @@
 }
 
 [dir="ltr"] .comments__count {
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 [dir="rtl"] .comments__count {
-  margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 [dir="ltr"] .comments__count {
-  margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 [dir="rtl"] .comments__count {
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 [dir="ltr"] .comments__count {
-  padding-left: 0.3125rem
+  padding-left: 0.3125rem;
 }
 
 [dir="rtl"] .comments__count {
-  padding-right: 0.3125rem
+  padding-right: 0.3125rem;
 }
 
 [dir="ltr"] .comments__count {
-  padding-right: 0.3125rem
+  padding-right: 0.3125rem;
 }
 
 [dir="rtl"] .comments__count {
-  padding-left: 0.3125rem
+  padding-left: 0.3125rem;
 }
 
 .comments__count {
@@ -69,87 +69,84 @@
   border-radius: 2px;
   background-color: #0d77b5;
   font-size: 0.6875rem;
-  line-height: 1.3125rem
+  line-height: 1.3125rem;
 }
 
 [dir="ltr"] .comments__count:after {
-    left: 0.5rem
+  left: 0.5rem;
 }
 
 [dir="rtl"] .comments__count:after {
-    right: 0.5rem
+  right: 0.5rem;
 }
 
 [dir="ltr"] .comments__count:after {
-    border-right: 8px solid transparent
+  border-right: 0.5rem solid transparent;
 }
 
 [dir="rtl"] .comments__count:after {
-    border-left: 8px solid transparent
+  border-left: 0.5rem solid transparent;
 }
 
 .comments__count:after {
-    position: absolute;
-    bottom: -0.4375rem;
-    width: 0;
-    height: 0;
-    content: "";
-    border-top: 7px solid #0d77b5;
-  }
+  position: absolute;
+  bottom: -0.4375rem;
+  width: 0;
+  height: 0;
+  content: "";
+  border-top: 0.4375rem solid #0d77b5;
+}
 
 .comment-form {
   padding-bottom: 2.25rem;
 }
 
 [dir="ltr"] .add-comment__form {
-  padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .add-comment__form {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .comment {
-  padding-left: 3.375rem
+  padding-left: 3.375rem;
 }
 
 [dir="rtl"] .comment {
-  padding-right: 3.375rem
+  padding-right: 3.375rem;
 }
 
 .comment {
   position: relative;
-  padding-top: 2.25rem
+  padding-top: 2.25rem;
 }
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .comment {
-    padding-left: 0
+  [dir="ltr"] .comment {
+    padding-left: 0;
   }
 
-[dir="rtl"] .comment {
-    padding-right: 0
-  }
+  [dir="rtl"] .comment {
+    padding-right: 0;
   }
+}
 
 .comment__text-content {
-  font-size: 1rem
+  font-size: 1rem;
 }
 
 .comment__text-content blockquote {
-    font-size: 1.3125rem;
-    line-height: 2.25rem;
-  }
-
-.comment__text-content {
-
-  /* Override for .field:not(:last-child) */
+  font-size: 1.3125rem;
+  line-height: 2.25rem;
 }
 
+/* Override for .field:not(:last-child) */
+
 .comment__text-content:not(:last-child) {
-    margin-bottom: 0;
-  }
+  margin-bottom: 0;
+}
 
 .comment__links {
   margin-top: 1.125rem;
@@ -160,25 +157,25 @@
   text-decoration: none;
   font-size: 0.875rem;
   font-weight: bold;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 .comment__links-link:hover {
-    text-decoration: underline;
-  }
+  text-decoration: underline;
+}
 
 .add-comment__picture-wrapper {
   top: 2.25rem;
 }
 
-[dir="ltr"] .add-comment__picture,[dir="ltr"] 
-.comment__picture {
-  left: 0
+[dir="ltr"] .add-comment__picture,
+[dir="ltr"] .comment__picture {
+  left: 0;
 }
 
-[dir="rtl"] .add-comment__picture,[dir="rtl"] 
-.comment__picture {
-  right: 0
+[dir="rtl"] .add-comment__picture,
+[dir="rtl"] .comment__picture {
+  right: 0;
 }
 
 .add-comment__picture,
@@ -188,187 +185,190 @@
   width: 2.25rem;
   height: 2.25rem;
   border-radius: 50%;
-  background-color: #e7edf1
+  background-color: #e7edf1;
 }
 
-.add-comment__picture *:not(img), .comment__picture *:not(img) {
-    display: inherit;
-    width: inherit;
-    height: inherit;
-  }
+.add-comment__picture *:not(img),
+.comment__picture *:not(img) {
+  display: inherit;
+  width: inherit;
+  height: inherit;
+}
 
-.add-comment__picture img, .comment__picture img {
-    width: 100%;
-    height: 100%;
-    object-fit: cover
+.add-comment__picture img,
+.comment__picture img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
 
-    /* @TODO: create image-style for profile's avatar to have image squared by default. */
-  }
+  /* @TODO: create image-style for profile's avatar to have image squared by default. */
+}
 
 @media all and (-ms-high-contrast: active), (-ms-high-contrast: none) {
 
-.add-comment__picture img, .comment__picture img {
-      position: absolute;
-      /* stylelint-disable csstools/use-logical */
-      top: 50%;
-      left: 50%;
-      /* stylelint-enable csstools/use-logical */
-      width: 100%;
-      height: auto;
-      transform: translate(-50%, -50%)
+  .add-comment__picture img,
+  .comment__picture img {
+    position: absolute;
+    /* stylelint-disable csstools/use-logical */
+    top: 50%;
+    left: 50%;
+    /* stylelint-enable csstools/use-logical */
+    width: 100%;
+    height: auto;
+    transform: translate(-50%, -50%);
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .add-comment__picture,[dir="ltr"] 
-.comment__picture {
-    left: -5.625rem
+  [dir="ltr"] .add-comment__picture,
+  [dir="ltr"] .comment__picture {
+    left: -5.625rem;
   }
 
-[dir="rtl"] .add-comment__picture,[dir="rtl"] 
-.comment__picture {
-    right: -5.625rem
+  [dir="rtl"] .add-comment__picture,
+  [dir="rtl"] .comment__picture {
+    right: -5.625rem;
   }
 
-.add-comment__picture,
-.comment__picture {
+  .add-comment__picture,
+  .comment__picture {
     width: 3.375rem;
-    height: 3.375rem
-}
+    height: 3.375rem;
   }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .indented .comment__picture {
-    left: -4.5rem
+  [dir="ltr"] .indented .comment__picture {
+    left: -4.5rem;
   }
 
-[dir="rtl"] .indented .comment__picture {
-    right: -4.5rem
+  [dir="rtl"] .indented .comment__picture {
+    right: -4.5rem;
   }
 
-.indented .comment__picture {
+  .indented .comment__picture {
     width: 2.25rem;
-    height: 2.25rem
-}
+    height: 2.25rem;
   }
+}
 
 .comment__meta * {
-    display: inline;
-  }
+  display: inline;
+}
 
 [dir="ltr"] .comment__author {
-  margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 [dir="rtl"] .comment__author {
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 .comment__author {
-  font-family: "metropolis", sans-serif;
+  font-family: metropolis, sans-serif;
   font-size: 1rem;
   font-weight: 700;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 .comment__author a {
-    text-decoration: none;
-  }
+  text-decoration: none;
+}
 
 .comment__time {
   margin: 0;
   color: #6e7172;
-  font-family: "metropolis", sans-serif;
+  font-family: metropolis, sans-serif;
   font-size: 0.875rem;
   line-height: 1.125rem;
 }
 
 [dir="ltr"] .indented {
-  margin-left: 2.25rem
+  margin-left: 2.25rem;
 }
 
 [dir="rtl"] .indented {
-  margin-right: 2.25rem
+  margin-right: 2.25rem;
 }
 
 [dir="ltr"] .indented > .comment:not(:last-of-type):not(.has-children):before {
-    left: -3.375rem
+  left: -3.375rem;
 }
 
 [dir="rtl"] .indented > .comment:not(:last-of-type):not(.has-children):before {
-    right: -3.375rem
+  right: -3.375rem;
 }
 
 [dir="ltr"] .indented > .comment:not(:last-of-type):not(.has-children):before {
-    border-left: solid 1px #e7edf1
+  border-left: solid 1px #e7edf1;
 }
 
 [dir="rtl"] .indented > .comment:not(:last-of-type):not(.has-children):before {
-    border-right: solid 1px #e7edf1
+  border-right: solid 1px #e7edf1;
 }
 
 .indented > .comment:not(:last-of-type):not(.has-children):before {
-    position: absolute;
-    top: 2.25rem; /* Comment's padding-top */
-    width: 0;
-    height: 100%;
-    content: ""
-  }
+  position: absolute;
+  top: 2.25rem; /* Comment's padding-top */
+  width: 0;
+  height: 100%;
+  content: "";
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .indented > .comment:not(:last-of-type):not(.has-children):before {
-      left: -3.375rem
+  [dir="ltr"] .indented > .comment:not(:last-of-type):not(.has-children):before {
+    left: -3.375rem;
   }
 
-[dir="rtl"] .indented > .comment:not(:last-of-type):not(.has-children):before {
-      right: -3.375rem
+  [dir="rtl"] .indented > .comment:not(:last-of-type):not(.has-children):before {
+    right: -3.375rem;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .indented {
-    margin-left: 4.5rem
+  [dir="ltr"] .indented {
+    margin-left: 4.5rem;
   }
 
-[dir="rtl"] .indented {
-    margin-right: 4.5rem
-  }
+  [dir="rtl"] .indented {
+    margin-right: 4.5rem;
   }
+}
 
 [dir="ltr"] .show-hide-btn {
-  margin-left: 3.375rem
+  margin-left: 3.375rem;
 }
 
 [dir="rtl"] .show-hide-btn {
-  margin-right: 3.375rem
+  margin-right: 3.375rem;
 }
 
 [dir="ltr"] .show-hide-btn {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .show-hide-btn {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="ltr"] .show-hide-btn {
-  padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .show-hide-btn {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .show-hide-btn {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .show-hide-btn {
-  padding-left: 0
+  padding-left: 0;
 }
 
 .show-hide-btn {
@@ -384,24 +384,24 @@
   font-weight: 600;
   line-height: 1.125rem;
   -webkit-appearance: none;
-  appearance: none
+  appearance: none;
 }
 
 .show-hide-btn[aria-expanded="true"]:after {
-    content: "\0020 -";
-  }
+  content: "\0020 -";
+}
 
 .show-hide-btn[aria-expanded="false"]:after {
-    content: "\0020 +";
-  }
+  content: "\0020 +";
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .show-hide-btn {
-    margin-left: 0
+  [dir="ltr"] .show-hide-btn {
+    margin-left: 0;
   }
 
-[dir="rtl"] .show-hide-btn {
-    margin-right: 0
-  }
+  [dir="rtl"] .show-hide-btn {
+    margin-right: 0;
   }
+}
diff --git a/web/core/themes/olivero/css/components/content-moderation.css b/web/core/themes/olivero/css/components/content-moderation.css
index 59cecb989..84f220471 100644
--- a/web/core/themes/olivero/css/components/content-moderation.css
+++ b/web/core/themes/olivero/css/components/content-moderation.css
@@ -11,147 +11,195 @@
  */
 
 [dir="ltr"] .entity-moderation-form {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .entity-moderation-form {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .entity-moderation-form {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="rtl"] .entity-moderation-form {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 .entity-moderation-form {
   flex-direction: column;
   border: 1px solid #e7edf1;
-  background-color: #f7f9fa
+  background-color: #f7f9fa;
 }
 
 .entity-moderation-form select,
-  .entity-moderation-form input:not([type="submit"]) {
-    background-color: #fff;
-  }
+.entity-moderation-form input:not([type="submit"]) {
+  background-color: #fff;
+}
 
 @media (min-width: 43.75rem) {
 
-.entity-moderation-form {
-    flex-direction: row
-}
+  .entity-moderation-form {
+    flex-direction: row;
   }
+}
 
 [dir="ltr"] .entity-moderation-form__item {
-  margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 [dir="rtl"] .entity-moderation-form__item {
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 .entity-moderation-form__item {
-  flex-basis: 0
+  flex-basis: 0;
 }
 
 [dir="ltr"] .entity-moderation-form__item:last-child {
-    margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .entity-moderation-form__item:last-child {
-    margin-left: 0
+  margin-left: 0;
 }
 
 .entity-moderation-form__item:last-child {
-    align-self: flex-start
-  }
+  align-self: flex-start;
+}
 
 @media (min-width: 43.75rem) {
 
-.entity-moderation-form__item:last-child {
-      align-self: flex-end
+  .entity-moderation-form__item:last-child {
+    align-self: flex-end;
   }
-    }
+}
 
-[dir="ltr"] .layout--content-narrow .entity-moderation-form,[dir="ltr"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="ltr"]  .layout--content-medium .entity-moderation-form,[dir="ltr"]  .layout--pass--content-medium > * .entity-moderation-form {
-    margin-left: 0
+[dir="ltr"] .layout--content-narrow .entity-moderation-form,
+[dir="ltr"] .layout--pass--content-narrow > * .entity-moderation-form,
+[dir="ltr"] .layout--content-medium .entity-moderation-form,
+[dir="ltr"] .layout--pass--content-medium > * .entity-moderation-form {
+  margin-left: 0;
 }
 
-[dir="rtl"] .layout--content-narrow .entity-moderation-form,[dir="rtl"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="rtl"]  .layout--content-medium .entity-moderation-form,[dir="rtl"]  .layout--pass--content-medium > * .entity-moderation-form {
-    margin-right: 0
+[dir="rtl"] .layout--content-narrow .entity-moderation-form,
+[dir="rtl"] .layout--pass--content-narrow > * .entity-moderation-form,
+[dir="rtl"] .layout--content-medium .entity-moderation-form,
+[dir="rtl"] .layout--pass--content-medium > * .entity-moderation-form {
+  margin-right: 0;
 }
 
-.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
-    width: 100%
-  }
+.layout--content-narrow .entity-moderation-form,
+.layout--pass--content-narrow > * .entity-moderation-form,
+.layout--content-medium .entity-moderation-form,
+.layout--pass--content-medium > * .entity-moderation-form {
+  width: 100%;
+}
 
 @supports (width: max-content) {
 
-.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
-      width: max-content
+  .layout--content-narrow .entity-moderation-form,
+  .layout--pass--content-narrow > * .entity-moderation-form,
+  .layout--content-medium .entity-moderation-form,
+  .layout--pass--content-medium > * .entity-moderation-form {
+    width: max-content;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .layout--content-narrow .entity-moderation-form,[dir="ltr"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="ltr"]  .layout--content-medium .entity-moderation-form,[dir="ltr"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-left: -14.28571vw
+  [dir="ltr"] .layout--content-narrow .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="ltr"] .layout--content-medium .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-left: -14.28571vw;
   }
 
-[dir="rtl"] .layout--content-narrow .entity-moderation-form,[dir="rtl"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="rtl"]  .layout--content-medium .entity-moderation-form,[dir="rtl"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-right: -14.28571vw
+  [dir="rtl"] .layout--content-narrow .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="rtl"] .layout--content-medium .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-right: -14.28571vw;
   }
 
-.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
-      width: calc(100vw - 2.25rem);
-      margin-top: 2.25rem;
-      margin-bottom: 4.5rem
+  .layout--content-narrow .entity-moderation-form,
+  .layout--pass--content-narrow > * .entity-moderation-form,
+  .layout--content-medium .entity-moderation-form,
+  .layout--pass--content-medium > * .entity-moderation-form {
+    width: calc(100vw - 2.25rem);
+    margin-top: 2.25rem;
+    margin-bottom: 4.5rem;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .layout--content-narrow .entity-moderation-form,[dir="ltr"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="ltr"]  .layout--content-medium .entity-moderation-form,[dir="ltr"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-left: calc(-7.14286vw - -1.07143px)
+  [dir="ltr"] .layout--content-narrow .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="ltr"] .layout--content-medium .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .layout--content-narrow .entity-moderation-form,[dir="rtl"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="rtl"]  .layout--content-medium .entity-moderation-form,[dir="rtl"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-right: calc(-7.14286vw - -1.07143px)
+  [dir="rtl"] .layout--content-narrow .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="rtl"] .layout--content-medium .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-right: calc(-7.14286vw - -0.06696rem);
   }
 
-.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
-      width: calc(85.71429vw - 3.05357rem)
+  .layout--content-narrow .entity-moderation-form,
+  .layout--pass--content-narrow > * .entity-moderation-form,
+  .layout--content-medium .entity-moderation-form,
+  .layout--pass--content-medium > * .entity-moderation-form {
+    width: calc(85.71429vw - 3.05357rem);
   }
-    }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .layout--content-narrow .entity-moderation-form,[dir="ltr"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="ltr"]  .layout--content-medium .entity-moderation-form,[dir="ltr"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-left: calc(-7.14286vw - -0.62946rem)
+  [dir="ltr"] .layout--content-narrow .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="ltr"] .layout--content-medium .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .layout--content-narrow .entity-moderation-form,[dir="rtl"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="rtl"]  .layout--content-medium .entity-moderation-form,[dir="rtl"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-right: calc(-7.14286vw - -0.62946rem)
+  [dir="rtl"] .layout--content-narrow .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="rtl"] .layout--content-medium .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-right: calc(-7.14286vw - -0.62946rem);
   }
 
-.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
-      width: calc(85.71429vw - 9.80357rem)
+  .layout--content-narrow .entity-moderation-form,
+  .layout--pass--content-narrow > * .entity-moderation-form,
+  .layout--content-medium .entity-moderation-form,
+  .layout--pass--content-medium > * .entity-moderation-form {
+    width: calc(85.71429vw - 9.80357rem);
   }
-    }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .layout--content-narrow .entity-moderation-form,[dir="ltr"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="ltr"]  .layout--content-medium .entity-moderation-form,[dir="ltr"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-left: 0
+  [dir="ltr"] .layout--content-narrow .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="ltr"] .layout--content-medium .entity-moderation-form,
+  [dir="ltr"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-left: 0;
   }
 
-[dir="rtl"] .layout--content-narrow .entity-moderation-form,[dir="rtl"]  .layout--pass--content-narrow > * .entity-moderation-form,[dir="rtl"]  .layout--content-medium .entity-moderation-form,[dir="rtl"]  .layout--pass--content-medium > * .entity-moderation-form {
-      margin-right: 0
+  [dir="rtl"] .layout--content-narrow .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-narrow > * .entity-moderation-form,
+  [dir="rtl"] .layout--content-medium .entity-moderation-form,
+  [dir="rtl"] .layout--pass--content-medium > * .entity-moderation-form {
+    margin-right: 0;
   }
 
-.layout--content-narrow .entity-moderation-form, .layout--pass--content-narrow > * .entity-moderation-form, .layout--content-medium .entity-moderation-form, .layout--pass--content-medium > * .entity-moderation-form {
-      width: 60.91071rem
+  .layout--content-narrow .entity-moderation-form,
+  .layout--pass--content-narrow > * .entity-moderation-form,
+  .layout--content-medium .entity-moderation-form,
+  .layout--pass--content-medium > * .entity-moderation-form {
+    width: 60.91071rem;
   }
-    }
+}
diff --git a/web/core/themes/olivero/css/components/details.css b/web/core/themes/olivero/css/components/details.css
index 31bfc4138..eb68c7cb9 100644
--- a/web/core/themes/olivero/css/components/details.css
+++ b/web/core/themes/olivero/css/components/details.css
@@ -58,13 +58,13 @@
 
 /* Arrow icon */
 
-[dir="ltr"] .olivero-details__summary:before,[dir="ltr"] 
-.collapse-processed > .olivero-details__summary .details-title:before {
+[dir="ltr"] .olivero-details__summary:before,
+[dir="ltr"] .collapse-processed > .olivero-details__summary .details-title:before {
   left: 0.84375rem;
 }
 
-[dir="rtl"] .olivero-details__summary:before,[dir="rtl"] 
-.collapse-processed > .olivero-details__summary .details-title:before {
+[dir="rtl"] .olivero-details__summary:before,
+[dir="rtl"] .collapse-processed > .olivero-details__summary .details-title:before {
   right: 0.84375rem;
 }
 
@@ -82,9 +82,9 @@
 }
 
 [dir="rtl"] .olivero-details__summary:before,
-  [dir="rtl"] .collapse-processed > .olivero-details__summary .details-title:before {
-    transform: translateY(-50%) rotate(-135deg);
-  }
+[dir="rtl"] .collapse-processed > .olivero-details__summary .details-title:before {
+  transform: translateY(-50%) rotate(-135deg);
+}
 
 /* Pseudo-selector to manage focus styles */
 
@@ -158,16 +158,16 @@
 
 .collapse-processed > .olivero-details__summary {
   padding-top: 0;
-  padding-bottom: 0
+  padding-bottom: 0;
 }
 
 .collapse-processed > .olivero-details__summary:before {
-    content: none;
-  }
+  content: none;
+}
 
 .collapse-processed > .olivero-details__summary:after {
-    content: none;
-  }
+  content: none;
+}
 
 [dir="ltr"] .collapse-processed > .olivero-details__summary .details-title {
   padding-left: 2.25rem;
@@ -217,32 +217,32 @@
 /* Details content wrapper */
 
 .olivero-details__wrapper {
-  margin: 1.125rem
+  margin: 1.125rem;
 }
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .olivero-details__wrapper {
+  [dir="ltr"] .olivero-details__wrapper {
     margin-left: 2.25rem;
   }
 
-[dir="rtl"] .olivero-details__wrapper {
+  [dir="rtl"] .olivero-details__wrapper {
     margin-right: 2.25rem;
   }
 
-[dir="ltr"] .olivero-details__wrapper {
+  [dir="ltr"] .olivero-details__wrapper {
     margin-right: 2.25rem;
   }
 
-[dir="rtl"] .olivero-details__wrapper {
+  [dir="rtl"] .olivero-details__wrapper {
     margin-left: 2.25rem;
   }
 
-.olivero-details__wrapper {
+  .olivero-details__wrapper {
     margin-top: 1.6875rem;
-    margin-bottom: 1.6875rem
-}
+    margin-bottom: 1.6875rem;
   }
+}
 
 /* Description */
 
diff --git a/web/core/themes/olivero/css/components/dropbutton.css b/web/core/themes/olivero/css/components/dropbutton.css
index 5222a7dc5..aabdab951 100644
--- a/web/core/themes/olivero/css/components/dropbutton.css
+++ b/web/core/themes/olivero/css/components/dropbutton.css
@@ -28,15 +28,15 @@
   position: relative;
   width: 12.5rem;
   height: 1.6875rem;
-  border-radius: 0.1875rem
+  border-radius: 0.1875rem;
 }
 
 @supports (width: max-content) {
 
-.dropbutton-widget {
-    width: max-content
-}
+  .dropbutton-widget {
+    width: max-content;
   }
+}
 
 [dir="ltr"] .dropbutton-single .dropbutton-widget {
   padding-right: 0;
@@ -90,106 +90,106 @@
   cursor: pointer;
   border-color: transparent;
   border-radius: 0 0.1875rem 0.1875rem 0; /* LTR */
-  background: #e3e3e5
+  background: #e3e3e5;
 }
 
 .dropbutton-toggle button:focus {
-    outline: solid 2px #0d77b5;
-    outline-offset: -2px;
-  }
+  outline: solid 2px #0d77b5;
+  outline-offset: -2px;
+}
 
 .dropbutton-toggle button:before {
-    display: block;
-    width: 0.5625rem;
-    height: 0.5625rem;
-    content: "";
-    transform: translateY(-25%) rotate(45deg);
-    border-right: solid 2px #0d77b5;
-    border-bottom: solid 2px #0d77b5;
-  }
+  display: block;
+  width: 0.5625rem;
+  height: 0.5625rem;
+  content: "";
+  transform: translateY(-25%) rotate(45deg);
+  border-right: solid 2px #0d77b5;
+  border-bottom: solid 2px #0d77b5;
+}
 
 [dir="rtl"] .dropbutton-toggle button {
   border-radius: 0.1875rem 0 0 0.1875rem;
 }
 
 [dir="ltr"] .dropbutton-action:first-child {
-    margin-right: 2px;
+  margin-right: 2px;
 }
 
 [dir="rtl"] .dropbutton-action:first-child {
-    margin-left: 2px;
+  margin-left: 2px;
 }
 
 .dropbutton-action:first-child {
-    border: solid 1px transparent;
-    border-radius: 0.1875rem 0 0 0.1875rem; /* LTR */
-    background: #e3e3e5;
-  }
+  border: solid 1px transparent;
+  border-radius: 0.1875rem 0 0 0.1875rem; /* LTR */
+  background: #e3e3e5;
+}
 
 .dropbutton-action a {
-    display: flex;
-    align-items: center;
-    margin-bottom: -2px; /* Account for borders. */
-    padding: 0 0.5625rem;
-    text-decoration: none;
-    color: #313637;
-    font-weight: 600
-  }
+  display: flex;
+  align-items: center;
+  margin-bottom: -2px; /* Account for borders. */
+  padding: 0 0.5625rem;
+  text-decoration: none;
+  color: #313637;
+  font-weight: 600;
+}
 
 .dropbutton-action a:focus {
-      border: solid 2px #0d77b5;
-      outline: 0
+  border: solid 2px #0d77b5;
+  outline: 0;
 
-      /* Negate specific IE rules. */
-    }
+  /* Negate specific IE rules. */
+}
 
 @supports (outline-offset: -2px) {
 
-.dropbutton-action a:focus {
-        border: 0;
-        outline: solid 2px #0d77b5;
-        outline-offset: -1px /* Overlap parent container by 1px. */
-    }
-      }
+  .dropbutton-action a:focus {
+    border: 0;
+    outline: solid 2px #0d77b5;
+    outline-offset: -1px; /* Overlap parent container by 1px. */
+  }
+}
 
 .dropbutton-single .dropbutton-action:first-child {
-    border-right: solid 1px transparent; /* LTR */
-    border-radius: 0.1875rem;
-  }
+  border-right: solid 1px transparent; /* LTR */
+  border-radius: 0.1875rem;
+}
 
 .dropbutton-single .dropbutton-action a {
-    justify-content: center;
-  }
+  justify-content: center;
+}
 
 [dir="rtl"] .dropbutton-action:first-child {
-    border: solid 1px transparent;
-    border-radius: 0 0.1875rem 0.1875rem 0;
-  }
+  border: solid 1px transparent;
+  border-radius: 0 0.1875rem 0.1875rem 0;
+}
 
 [dir="rtl"] .dropbutton-single .dropbutton-action:first-child {
-    border: solid 1px transparent;
-  }
+  border: solid 1px transparent;
+}
 
 .secondary-action {
   visibility: hidden;
   width: calc(100% + 1.6875rem);
   border-right: 1px solid #e3e3e5;
   border-left: 1px solid #e3e3e5;
-  background: #fff
+  background: #fff;
 }
 
 .secondary-action:last-child {
-    border-bottom: 1px solid #e3e3e5;
-  }
+  border-bottom: 1px solid #e3e3e5;
+}
 
 .dropbutton-wrapper.open .dropbutton-toggle button:before {
-    transform: translateY(25%) rotate(225deg);
-  }
+  transform: translateY(25%) rotate(225deg);
+}
 
 .dropbutton-wrapper.open .dropbutton-widget {
-    border-radius: 0.1875rem 0.1875rem 0 0;
-  }
+  border-radius: 0.1875rem 0.1875rem 0 0;
+}
 
 .dropbutton-wrapper.open .secondary-action {
-    visibility: visible;
-  }
+  visibility: visible;
+}
diff --git a/web/core/themes/olivero/css/components/embedded-media.css b/web/core/themes/olivero/css/components/embedded-media.css
index b3e564fba..4d2f7c10f 100644
--- a/web/core/themes/olivero/css/components/embedded-media.css
+++ b/web/core/themes/olivero/css/components/embedded-media.css
@@ -35,35 +35,35 @@ figcaption {
   padding-bottom: 0.5625rem;
   color: #313637;
   background: #f7f9fa;
-  font-family: "Lora", "georgia", serif;
+  font-family: Lora, georgia, serif;
   font-size: 0.875rem;
   font-style: italic;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] figcaption {
+  [dir="ltr"] figcaption {
     padding-left: 1.125rem;
   }
 
-[dir="rtl"] figcaption {
+  [dir="rtl"] figcaption {
     padding-right: 1.125rem;
   }
 
-[dir="ltr"] figcaption {
+  [dir="ltr"] figcaption {
     padding-right: 1.125rem;
   }
 
-[dir="rtl"] figcaption {
+  [dir="rtl"] figcaption {
     padding-left: 1.125rem;
   }
 
-figcaption {
+  figcaption {
     padding-top: 1.125rem;
-    padding-bottom: 1.125rem
-}
+    padding-bottom: 1.125rem;
   }
+}
 
 [dir="ltr"] .align-right {
   margin-left: 0;
@@ -85,95 +85,95 @@ figcaption {
   float: none; /* Override core's align.module.css. */
   max-width: 100%;
   margin-top: 3.375rem;
-  margin-bottom: 3.375rem
+  margin-bottom: 3.375rem;
 }
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .align-right {
+  [dir="ltr"] .align-right {
     float: right;
   }
 
-[dir="rtl"] .align-right {
+  [dir="rtl"] .align-right {
     float: left;
   }
 
-[dir="ltr"] .align-right {
+  [dir="ltr"] .align-right {
     margin-left: 1.125rem;
   }
 
-[dir="rtl"] .align-right {
+  [dir="rtl"] .align-right {
     margin-right: 1.125rem;
   }
 
-[dir="ltr"] .align-right {
+  [dir="ltr"] .align-right {
     margin-right: 0;
   }
 
-[dir="rtl"] .align-right {
+  [dir="rtl"] .align-right {
     margin-left: 0;
   }
 
-.align-right {
+  .align-right {
     max-width: 50%;
     margin-top: 1.125rem;
-    margin-bottom: 1.125rem
-}
+    margin-bottom: 1.125rem;
   }
+}
 
 /* Pull out of grid if nested in content narrow layout. */
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .layout--content-narrow .align-right,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-right {
+  [dir="ltr"] .layout--content-narrow .align-right,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-right {
     margin-right: -7.14286vw;
   }
 
-[dir="rtl"] .layout--content-narrow .align-right,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-right {
+  [dir="rtl"] .layout--content-narrow .align-right,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-right {
     margin-left: -7.14286vw;
   }
-  }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .layout--content-narrow .align-right,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-right {
-    margin-right: calc(-14.28571vw - -2.14286px);
+  [dir="ltr"] .layout--content-narrow .align-right,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-right {
+    margin-right: calc(-14.28571vw - -0.13393rem);
   }
 
-[dir="rtl"] .layout--content-narrow .align-right,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-right {
-    margin-left: calc(-14.28571vw - -2.14286px);
-  }
+  [dir="rtl"] .layout--content-narrow .align-right,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-right {
+    margin-left: calc(-14.28571vw - -0.13393rem);
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .layout--content-narrow .align-right,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-right {
+  [dir="ltr"] .layout--content-narrow .align-right,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-right {
     margin-right: calc(-21.42857vw - -1.88839rem);
   }
 
-[dir="rtl"] .layout--content-narrow .align-right,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-right {
+  [dir="rtl"] .layout--content-narrow .align-right,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-right {
     margin-left: calc(-21.42857vw - -1.88839rem);
   }
-  }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .layout--content-narrow .align-right,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-right {
+  [dir="ltr"] .layout--content-narrow .align-right,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-right {
     margin-right: -17.59821rem;
   }
 
-[dir="rtl"] .layout--content-narrow .align-right,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-right {
+  [dir="rtl"] .layout--content-narrow .align-right,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-right {
     margin-left: -17.59821rem;
   }
-  }
+}
 
 [dir="ltr"] .align-left {
   margin-left: 0;
@@ -195,101 +195,101 @@ figcaption {
   float: none; /* Override core's align.module.css. */
   max-width: 100%;
   margin-top: 3.375rem;
-  margin-bottom: 3.375rem
+  margin-bottom: 3.375rem;
 }
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .align-left {
+  [dir="ltr"] .align-left {
     float: left;
   }
 
-[dir="rtl"] .align-left {
+  [dir="rtl"] .align-left {
     float: right;
   }
 
-[dir="ltr"] .align-left {
+  [dir="ltr"] .align-left {
     margin-left: 0;
   }
 
-[dir="rtl"] .align-left {
+  [dir="rtl"] .align-left {
     margin-right: 0;
   }
 
-[dir="ltr"] .align-left {
+  [dir="ltr"] .align-left {
     margin-right: 2.25rem;
   }
 
-[dir="rtl"] .align-left {
+  [dir="rtl"] .align-left {
     margin-left: 2.25rem;
   }
 
-.align-left {
+  .align-left {
     max-width: 50%;
     margin-top: 1.125rem;
-    margin-bottom: 1.125rem /* Extra right margins in case of aligning next to lists. */
-}
+    margin-bottom: 1.125rem; /* Extra right margins in case of aligning next to lists. */
   }
+}
 
 /* Pull out of grid if nested in content narrow layout. */
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .layout--content-narrow .align-left,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-left {
+  [dir="ltr"] .layout--content-narrow .align-left,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-left {
     margin-left: -7.14286vw;
   }
 
-[dir="rtl"] .layout--content-narrow .align-left,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-left {
+  [dir="rtl"] .layout--content-narrow .align-left,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-left {
     margin-right: -7.14286vw;
   }
-  }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .layout--content-narrow .align-left,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-left {
-    margin-left: calc(-7.14286vw - -1.07143px);
+  [dir="ltr"] .layout--content-narrow .align-left,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-left {
+    margin-left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .layout--content-narrow .align-left,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-left {
-    margin-right: calc(-7.14286vw - -1.07143px);
-  }
+  [dir="rtl"] .layout--content-narrow .align-left,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-left {
+    margin-right: calc(-7.14286vw - -0.06696rem);
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .layout--content-narrow .align-left,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-left {
+  [dir="ltr"] .layout--content-narrow .align-left,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-left {
     margin-left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .layout--content-narrow .align-left,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-left {
+  [dir="rtl"] .layout--content-narrow .align-left,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-left {
     margin-right: calc(-7.14286vw - -0.62946rem);
   }
-  }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .layout--content-narrow .align-left,[dir="ltr"] 
-.layout--pass--content-narrow > * .align-left {
+  [dir="ltr"] .layout--content-narrow .align-left,
+  [dir="ltr"] .layout--pass--content-narrow > * .align-left {
     margin-left: -5.86607rem;
   }
 
-[dir="rtl"] .layout--content-narrow .align-left,[dir="rtl"] 
-.layout--pass--content-narrow > * .align-left {
+  [dir="rtl"] .layout--content-narrow .align-left,
+  [dir="rtl"] .layout--pass--content-narrow > * .align-left {
     margin-right: -5.86607rem;
   }
-  }
+}
 
 .align-center img,
 .align-center video,
 .align-center audio {
-  margin-left: auto;
   margin-right: auto;
+  margin-left: auto;
 }
 
 .media-oembed-content {
diff --git a/web/core/themes/olivero/css/components/feed.css b/web/core/themes/olivero/css/components/feed.css
index b631f7634..096c7a775 100644
--- a/web/core/themes/olivero/css/components/feed.css
+++ b/web/core/themes/olivero/css/components/feed.css
@@ -14,12 +14,12 @@
   display: flex;
   align-items: center;
   text-decoration: none;
-  color: #5d7585
+  color: #5d7585;
 }
 
 .feed-icon:hover {
-    color: #2494db;
-  }
+  color: #2494db;
+}
 
 .feed-icon__label {
   flex-shrink: 0;
@@ -29,11 +29,11 @@
 }
 
 [dir="ltr"] .feed-icon__icon {
-  margin-left: 0.5625rem
+  margin-left: 0.5625rem;
 }
 
 [dir="rtl"] .feed-icon__icon {
-  margin-right: 0.5625rem
+  margin-right: 0.5625rem;
 }
 
 .feed-icon__icon {
@@ -44,10 +44,10 @@
   width: 1.6875rem;
   height: 1.6875rem;
   color: #fff;
-  background-color: #2494db
+  background-color: #2494db;
 }
 
 .feed-icon__icon svg {
-    vertical-align: top;
-    fill: currentColor;
-  }
+  vertical-align: top;
+  fill: currentColor;
+}
diff --git a/web/core/themes/olivero/css/components/field.css b/web/core/themes/olivero/css/components/field.css
index 858940c64..57036ac4f 100644
--- a/web/core/themes/olivero/css/components/field.css
+++ b/web/core/themes/olivero/css/components/field.css
@@ -15,43 +15,43 @@
 }
 
 .node--view-mode-teaser .field {
-  margin-bottom: 1.125rem
+  margin-bottom: 1.125rem;
 }
 
 .node--view-mode-teaser .field:last-child {
-    margin-bottom: 0;
-  }
+  margin-bottom: 0;
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser .field {
-    margin-bottom: 2.25rem
-}
+  .node--view-mode-teaser .field {
+    margin-bottom: 2.25rem;
   }
+}
 
 .field__label {
   font-weight: bold;
 }
 
-[dir="ltr"] .field--label-inline .field__label,[dir="ltr"] 
-.field--label-inline .field__items {
+[dir="ltr"] .field--label-inline .field__label,
+[dir="ltr"] .field--label-inline .field__items {
   float: left;
 }
 
-[dir="rtl"] .field--label-inline .field__label,[dir="rtl"] 
-.field--label-inline .field__items {
+[dir="rtl"] .field--label-inline .field__label,
+[dir="rtl"] .field--label-inline .field__items {
   float: right;
 }
 
-[dir="ltr"] .field--label-inline .field__label,[dir="ltr"] 
-.field--label-inline > .field__item,[dir="ltr"] 
-.field--label-inline .field__items {
+[dir="ltr"] .field--label-inline .field__label,
+[dir="ltr"] .field--label-inline > .field__item,
+[dir="ltr"] .field--label-inline .field__items {
   padding-right: 0.5em;
 }
 
-[dir="rtl"] .field--label-inline .field__label,[dir="rtl"] 
-.field--label-inline > .field__item,[dir="rtl"] 
-.field--label-inline .field__items {
+[dir="rtl"] .field--label-inline .field__label,
+[dir="rtl"] .field--label-inline > .field__item,
+[dir="rtl"] .field--label-inline .field__items {
   padding-left: 0.5em;
 }
 
diff --git a/web/core/themes/olivero/css/components/fieldset.css b/web/core/themes/olivero/css/components/fieldset.css
index 679eb821d..a5dc57b62 100644
--- a/web/core/themes/olivero/css/components/fieldset.css
+++ b/web/core/themes/olivero/css/components/fieldset.css
@@ -81,16 +81,16 @@ _:-ms-fullscreen,
   background-color: #5d7585;
   font-size: 1.125rem;
   font-weight: 700;
-  line-height: 1.6875rem
+  line-height: 1.6875rem;
 }
 
 .fieldset__legend + * {
-    clear: left;
-  }
+  clear: left;
+}
 
 .fieldset__legend .fieldset__label.form-required:after {
-        background-image: url("data:image/svg+xml,%3Csvg height='16' width='16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m0 7.562 1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325l1.113 3.437c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575-2.081-.402-4.058-.856-5.93-1.356' fill='%23ffffff'/%3E%3C/svg%3E%0A");
-      }
+  background-image: url("data:image/svg+xml,%3Csvg height='16' width='16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m0 7.562 1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325l1.113 3.437c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575-2.081-.402-4.058-.856-5.93-1.356' fill='%23ffffff'/%3E%3C/svg%3E%0A");
+}
 
 .fieldset__legend--composite {
   margin-top: 2px;
@@ -161,15 +161,15 @@ _:-ms-fullscreen,
   background-position: left top; /* LTR */
   background-size: 1.125rem 1.125rem;
   font-size: 0.875rem;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 @media screen and (-ms-high-contrast: active) {
 
-.fieldset__error-message {
-    background-image: url("data:image/svg+xml,%3Csvg width='18' height='18' viewBox='0 0 18 18' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23ffffff' d='M9 0C4.03125 0 0 4.03125 0 9C0 13.9688 4.03125 18 9 18C13.9687 18 18 13.9688 18 9C18 4.03125 13.9687 0 9 0ZM10.5 14.6133C10.5 14.8242 10.3359 15 10.1367 15H7.88672C7.67578 15 7.5 14.8242 7.5 14.6133V12.3867C7.5 12.1758 7.67578 12 7.88672 12H10.1367C10.3359 12 10.5 12.1758 10.5 12.3867V14.6133ZM10.4766 10.582C10.4648 10.7461 10.2891 10.875 10.0781 10.875H7.91016C7.6875 10.875 7.51172 10.7461 7.51172 10.582L7.3125 3.30469C7.3125 3.22266 7.34766 3.14063 7.42969 3.09375C7.5 3.03516 7.60547 3 7.71094 3H10.2891C10.3945 3 10.5 3.03516 10.5703 3.09375C10.6523 3.14063 10.6875 3.22266 10.6875 3.30469L10.4766 10.582Z'/%3E%3C/svg%3E")
-}
+  .fieldset__error-message {
+    background-image: url("data:image/svg+xml,%3Csvg width='18' height='18' viewBox='0 0 18 18' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23ffffff' d='M9 0C4.03125 0 0 4.03125 0 9C0 13.9688 4.03125 18 9 18C13.9687 18 18 13.9688 18 9C18 4.03125 13.9687 0 9 0ZM10.5 14.6133C10.5 14.8242 10.3359 15 10.1367 15H7.88672C7.67578 15 7.5 14.8242 7.5 14.6133V12.3867C7.5 12.1758 7.67578 12 7.88672 12H10.1367C10.3359 12 10.5 12.1758 10.5 12.3867V14.6133ZM10.4766 10.582C10.4648 10.7461 10.2891 10.875 10.0781 10.875H7.91016C7.6875 10.875 7.51172 10.7461 7.51172 10.582L7.3125 3.30469C7.3125 3.22266 7.34766 3.14063 7.42969 3.09375C7.5 3.03516 7.60547 3 7.71094 3H10.2891C10.3945 3 10.5 3.03516 10.5703 3.09375C10.6523 3.14063 10.6875 3.22266 10.6875 3.30469L10.4766 10.582Z'/%3E%3C/svg%3E");
   }
+}
 
 [dir="rtl"] .fieldset__error-message {
   background-position: left top;
diff --git a/web/core/themes/olivero/css/components/footer.css b/web/core/themes/olivero/css/components/footer.css
index e4e4119f0..ebdaf9dac 100644
--- a/web/core/themes/olivero/css/components/footer.css
+++ b/web/core/themes/olivero/css/components/footer.css
@@ -13,46 +13,46 @@
 .site-footer {
   position: relative; /* stack above left social bar */
   color: #9ea0a1;
-  background: linear-gradient(180deg, #0c0d0e 0%, #171e23 100%)
+  background: linear-gradient(180deg, #0c0d0e 0%, #171e23 100%);
 }
 
 [dir="ltr"] .site-footer .menu {
-    margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .site-footer .menu {
-    margin-right: 0
+  margin-right: 0;
 }
 
 .site-footer .menu {
-    list-style: none
-  }
+  list-style: none;
+}
 
 [dir="ltr"] .site-footer .menu ul {
-      margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 [dir="rtl"] .site-footer .menu ul {
-      margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 .site-footer .menu li {
-      margin-bottom: 0.5625rem;
-    }
+  margin-bottom: 0.5625rem;
+}
 
 .site-footer a {
-    color: inherit
-  }
+  color: inherit;
+}
 
 .site-footer a:hover {
-      text-decoration: none;
-    }
+  text-decoration: none;
+}
 
 @media (min-width: 75rem) {
   [dir="ltr"] body:not(.is-always-mobile-nav) .site-footer {
-    border-left: solid 90px #000
+    border-left: solid 5.625rem #000;
   }
   [dir="rtl"] body:not(.is-always-mobile-nav) .site-footer {
-    border-right: solid 90px #000
+    border-right: solid 5.625rem #000;
   }
 }
diff --git a/web/core/themes/olivero/css/components/form-boolean.css b/web/core/themes/olivero/css/components/form-boolean.css
index c4d5e7d8e..add02aab7 100644
--- a/web/core/themes/olivero/css/components/form-boolean.css
+++ b/web/core/themes/olivero/css/components/form-boolean.css
@@ -24,99 +24,108 @@ input[type="radio"] {
   background-position: 50% 50%;
   background-size: 1.125rem 1.125rem;
   -webkit-appearance: none;
-  appearance: none
+  appearance: none;
 }
 
-input[type="checkbox"]:focus, input[type="radio"]:focus {
-    border: solid 2px #2494db;
-    outline: solid 2px #2494db
-  }
+input[type="checkbox"]:focus,
+input[type="radio"]:focus {
+  border: solid 2px #2494db;
+  outline: solid 2px #2494db;
+}
 
 @supports (outline-style: double) {
 
-input[type="checkbox"]:focus, input[type="radio"]:focus {
-      border-width: 1px;
-      outline-width: 6px;
-      outline-style: double;
-      outline-offset: -1px
+  input[type="checkbox"]:focus,
+  input[type="radio"]:focus {
+    border-width: 1px;
+    outline-width: 6px;
+    outline-style: double;
+    outline-offset: -1px;
   }
-    }
+}
 
-input[type="checkbox"]:hover, input[type="radio"]:hover {
-    border-color: #53b0eb;
-  }
+input[type="checkbox"]:hover,
+input[type="radio"]:hover {
+  border-color: #53b0eb;
+}
 
-input[type="checkbox"][disabled], input[type="radio"][disabled] {
-    background-color: #f1f4f7
-  }
+input[type="checkbox"][disabled],
+input[type="radio"][disabled] {
+  background-color: #f1f4f7;
+}
 
-input[type="checkbox"][disabled]:hover, input[type="radio"][disabled]:hover {
-      border-color: #7e96a7;
-    }
+input[type="checkbox"][disabled]:hover,
+input[type="radio"][disabled]:hover {
+  border-color: #7e96a7;
+}
 
-input[type="checkbox"][disabled]:checked, input[type="radio"][disabled]:checked {
-      border-width: 1px;
-    }
+input[type="checkbox"][disabled]:checked,
+input[type="radio"][disabled]:checked {
+  border-width: 1px;
+}
 
-input[type="checkbox"]:checked, input[type="radio"]:checked {
-    border-width: 2px;
-  }
+input[type="checkbox"]:checked,
+input[type="radio"]:checked {
+  border-width: 2px;
+}
 
-input[type="checkbox"].error, input[type="radio"].error {
-    border: solid 2px #e33f1e
-  }
+input.error[type="checkbox"],
+input.error[type="radio"] {
+  border: solid 2px #e33f1e;
+}
 
-input[type="checkbox"].error:focus, input[type="radio"].error:focus {
-      outline-color: #e33f1e;
-      outline-offset: -2px;
-    }
+input.error[type="checkbox"]:focus,
+input.error[type="radio"]:focus {
+  outline-color: #e33f1e;
+  outline-offset: -2px;
+}
 
-input[type="checkbox"],
-input[type="radio"] {
+/* Specific pseudo-element to apply red borders for IE11 bool elements in case of error */
 
-  /* Specific pseudo-element to apply red borders for IE11 bool elements in case of error */
+input.error[type="checkbox"]::-ms-check,
+input.error[type="radio"]::-ms-check {
+  border: 1px solid #e33f1e;
 }
 
-input[type="checkbox"].error::-ms-check, input[type="radio"].error::-ms-check {
-    border: 1px solid #e33f1e;
-  }
-
-[dir="ltr"] input[type="checkbox"] + label,[dir="ltr"]  input[type="radio"] + label {
-    padding-left: 0.5625rem
+[dir="ltr"] input[type="checkbox"] + label,
+[dir="ltr"] input[type="radio"] + label {
+  padding-left: 0.5625rem;
 }
 
-[dir="rtl"] input[type="checkbox"] + label,[dir="rtl"]  input[type="radio"] + label {
-    padding-right: 0.5625rem
+[dir="rtl"] input[type="checkbox"] + label,
+[dir="rtl"] input[type="radio"] + label {
+  padding-right: 0.5625rem;
 }
 
-input[type="checkbox"] + label, input[type="radio"] + label {
-    display: inline-block;
-  }
+input[type="checkbox"] + label,
+input[type="radio"] + label {
+  display: inline-block;
+}
 
 input[type="checkbox"]:checked {
-    background-image: url("data:image/svg+xml,%3Csvg width='17px' height='13px' viewBox='0 0 17 13' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cpath d='M14.8232,0.176777 C14.9209,0.0791457 15.0791,0.0791455 15.1768,0.176777 L16.9445,1.94454 C17.0422,2.04217 17.0422,2.20047 16.9445,2.2981 L6.23744,13.0052 C6.13981,13.1028 5.98151,13.1028 5.88388,13.0052 L0.176777,7.2981 C0.0791456,7.20047 0.0791456,7.04218 0.176777,6.94454 L1.94454,5.17678 C2.04217,5.07915 2.20047,5.07915 2.2981,5.17678 L5.88388,8.76256 C5.98151,8.86019 6.13981,8.86019 6.23744,8.76256 L14.8232,0.176777 Z' id='Path' fill='%232494DB' fill-rule='nonzero'%3E%3C/path%3E%3C/svg%3E");
-  }
+  background-image: url("data:image/svg+xml,%3Csvg width='17px' height='13px' viewBox='0 0 17 13' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3E%3Cpath d='M14.8232,0.176777 C14.9209,0.0791457 15.0791,0.0791455 15.1768,0.176777 L16.9445,1.94454 C17.0422,2.04217 17.0422,2.20047 16.9445,2.2981 L6.23744,13.0052 C6.13981,13.1028 5.98151,13.1028 5.88388,13.0052 L0.176777,7.2981 C0.0791456,7.20047 0.0791456,7.04218 0.176777,6.94454 L1.94454,5.17678 C2.04217,5.07915 2.20047,5.07915 2.2981,5.17678 L5.88388,8.76256 C5.98151,8.86019 6.13981,8.86019 6.23744,8.76256 L14.8232,0.176777 Z' id='Path' fill='%232494DB' fill-rule='nonzero'%3E%3C/path%3E%3C/svg%3E");
+}
 
 input[type="radio"] {
-  border-radius: 50%
+  border-radius: 50%;
 }
 
 input[type="radio"]:checked {
-    background-image: url("data:image/svg+xml,%3Csvg width='17' height='17' viewBox='0 0 17 17' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='8.5' cy='8.5' r='8.5' fill='%232494DB'/%3E%3C/svg%3E%0A");
-    background-size: 1.0625rem;
-  }
+  background-image: url("data:image/svg+xml,%3Csvg width='17' height='17' viewBox='0 0 17 17' xmlns='http://www.w3.org/2000/svg'%3E%3Ccircle cx='8.5' cy='8.5' r='8.5' fill='%232494DB'/%3E%3C/svg%3E%0A");
+  background-size: 1.0625rem;
+}
 
 input[type="radio"]:focus {
-    border-width: 2px;
-    border-color: #2494db;
-    outline-color: transparent;
-    box-shadow: 0 0 0 2px white, 0 0 0 4px #2494db;
-  }
+  border-width: 2px;
+  border-color: #2494db;
+  outline-color: transparent;
+  box-shadow: 0 0 0 2px white, 0 0 0 4px #2494db;
+}
 
-input[type="radio"].error:focus {
-    outline-color: transparent;
-    box-shadow: 0 0 0 2px white, 0 0 0 4px #e33f1e;
-  }
+input.error[type="radio"]:focus {
+  outline-color: transparent;
+  box-shadow: 0 0 0 2px white, 0 0 0 4px #e33f1e;
+}
 
 .form-type-boolean {
   margin-top: 1.125rem;
diff --git a/web/core/themes/olivero/css/components/form-select.css b/web/core/themes/olivero/css/components/form-select.css
index 0071ce7b1..835fd7c0f 100644
--- a/web/core/themes/olivero/css/components/form-select.css
+++ b/web/core/themes/olivero/css/components/form-select.css
@@ -11,19 +11,19 @@
  */
 
 [dir="ltr"] select {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] select {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] select {
-  padding-right: 3.375rem
+  padding-right: 3.375rem;
 }
 
 [dir="rtl"] select {
-  padding-left: 3.375rem
+  padding-left: 3.375rem;
 }
 
 select {
@@ -35,121 +35,113 @@ select {
   border: 1px solid #7e96a7;
   border-radius: 0.1875rem;
   background-color: #fff;
-  background-image: url("data:image/svg+xml,%3csvg width='18' height='11' viewBox='0 0 18 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3e%3cpath d='M18 1.49699C18 1.35271 17.9279 1.19038 17.8196 1.08216L16.9178 0.18036C16.8096 0.0721439 16.6473 0 16.503 0C16.3587 0 16.1964 0.0721439 16.0882 0.18036L9 7.26854L1.91182 0.18036C1.80361 0.0721439 1.64128 0 1.49699 0C1.33467 0 1.19038 0.0721439 1.08216 0.18036L0.180361 1.08216C0.0721442 1.19038 0 1.35271 0 1.49699C0 1.64128 0.0721442 1.80361 0.180361 1.91182L8.58517 10.3166C8.69339 10.4248 8.85571 10.497 9 10.497C9.14429 10.497 9.30661 10.4248 9.41483 10.3166L17.8196 1.91182C17.9279 1.80361 18 1.64128 18 1.49699Z' fill='%235D7585'/%3e%3c/svg%3e");
+  background-image: url("../../images/chevron-down.svg");
   background-repeat: no-repeat;
   background-position: right 18px center; /* LTR */
   font-family: inherit;
   font-size: inherit;
   -webkit-appearance: none;
-  appearance: none
+  appearance: none;
 }
 
 select:focus {
-    border: solid 2px #2494db;
-    outline: solid 2px #2494db
-  }
+  border: solid 2px #2494db;
+  outline: solid 2px #2494db;
+}
 
 @supports (outline-style: double) {
 
-select:focus {
-      border-width: 1px;
-      outline-width: 6px;
-      outline-style: double;
-      outline-offset: -1px
+  select:focus {
+    border-width: 1px;
+    outline-width: 6px;
+    outline-style: double;
+    outline-offset: -1px;
   }
-    }
-
-select {
-
-  /* Hides default chevron within Internet Explorer. */
 }
 
+/* Hides default chevron within Internet Explorer. */
+
 select::-ms-expand {
-    display: none;
-  }
+  display: none;
+}
 
 select[disabled] {
-    color: #7e96a7;
-    background-color: #f1f4f7;
-  }
+  color: #7e96a7;
+  background-color: #f1f4f7;
+}
 
 select.error {
-    border: solid 2px #e33f1e
-  }
+  border: solid 2px #e33f1e;
+}
 
 select.error:focus {
-      outline-color: #e33f1e;
-    }
+  outline-color: #e33f1e;
+}
 
 select[multiple] {
-    height: auto;
-    padding: 0.5625rem;
-    background-image: none;
-    line-height: 1 /* Needed by non-Chromium based MS Edge browsers. */
-  }
+  height: auto;
+  padding: 0.5625rem;
+  background-image: none;
+  line-height: 1; /* Needed by non-Chromium based MS Edge browsers. */
+}
 
 select[multiple] option {
-      padding: 0.5625rem;
-    }
+  padding: 0.5625rem;
+}
 
 select.form-element--small {
-    height: 2.8125rem;
-  }
-
-select {
-
-  /* Necessary to show chevron in forced colors mode in modern browsers. */
+  height: 2.8125rem;
 }
 
+/* Necessary to show chevron in forced colors mode in modern browsers. */
+
 @media (forced-colors: active) {
 
-[dir="ltr"] select {
-    padding-right: 1.125rem
+  [dir="ltr"] select {
+    padding-right: 1.125rem;
   }
 
-[dir="rtl"] select {
-    padding-left: 1.125rem
+  [dir="rtl"] select {
+    padding-left: 1.125rem;
   }
 
-select {
+  select {
     background-image: none;
     -webkit-appearance: listbox;
-    appearance: listbox /* Default <select> appearance value for modern browsers. */
+    appearance: listbox; /* Default <select> appearance value for modern browsers. */
 
     /* Lets browser set <select> appearance to whatever the browser's default is. */
-}
-    @supports ((-webkit-appearance: revert) or (appearance: revert)) {
+  }
 
-select {
+  @supports ((-webkit-appearance: revert) or (appearance: revert)) {
+
+    select {
       -webkit-appearance: revert;
-      appearance: revert
-}
+      appearance: revert;
     }
   }
-
-select {
-
-  /* Necessary for Internet Explorer to show chevron. */
 }
 
+/* Necessary for Internet Explorer to show chevron. */
+
 @media screen and (-ms-high-contrast: active) {
 
-[dir="ltr"] select {
-    padding-right: 0
+  [dir="ltr"] select {
+    padding-right: 0;
   }
 
-[dir="rtl"] select {
-    padding-left: 0
+  [dir="rtl"] select {
+    padding-left: 0;
   }
 
-select {
+  select {
 
     /* Re-enable default chevron for Internet Explorer. */
-}
-    select::-ms-expand {
-      display: block;
-    }
   }
+  select::-ms-expand {
+    display: block;
+  }
+}
 
 [dir="rtl"] select {
   background-position: left 18px center;
diff --git a/web/core/themes/olivero/css/components/form-text.css b/web/core/themes/olivero/css/components/form-text.css
index 46ff3d96c..fc5e14e6e 100644
--- a/web/core/themes/olivero/css/components/form-text.css
+++ b/web/core/themes/olivero/css/components/form-text.css
@@ -36,95 +36,205 @@ textarea {
   font-family: inherit;
   font-size: inherit;
   -webkit-appearance: none;
-  appearance: none
+  appearance: none;
 }
 
-[type="color"]:focus, [type="date"]:focus, [type="datetime-local"]:focus, [type="email"]:focus, [type="file"]:focus, [type="month"]:focus, [type="number"]:focus, [type="password"]:focus, [type="search"]:focus, [type="tel"]:focus, [type="text"]:focus, [type="time"]:focus, [type="url"]:focus, [type="week"]:focus, textarea:focus {
-    border: solid 2px #2494db;
-    outline: solid 2px #2494db
-  }
+[type="color"]:focus,
+[type="date"]:focus,
+[type="datetime-local"]:focus,
+[type="email"]:focus,
+[type="file"]:focus,
+[type="month"]:focus,
+[type="number"]:focus,
+[type="password"]:focus,
+[type="search"]:focus,
+[type="tel"]:focus,
+[type="text"]:focus,
+[type="time"]:focus,
+[type="url"]:focus,
+[type="week"]:focus,
+textarea:focus {
+  border: solid 2px #2494db;
+  outline: solid 2px #2494db;
+}
 
 @supports (outline-style: double) {
 
-[type="color"]:focus, [type="date"]:focus, [type="datetime-local"]:focus, [type="email"]:focus, [type="file"]:focus, [type="month"]:focus, [type="number"]:focus, [type="password"]:focus, [type="search"]:focus, [type="tel"]:focus, [type="text"]:focus, [type="time"]:focus, [type="url"]:focus, [type="week"]:focus, textarea:focus {
-      border-width: 1px;
-      outline-width: 6px;
-      outline-style: double;
-      outline-offset: -1px
+  [type="color"]:focus,
+  [type="date"]:focus,
+  [type="datetime-local"]:focus,
+  [type="email"]:focus,
+  [type="file"]:focus,
+  [type="month"]:focus,
+  [type="number"]:focus,
+  [type="password"]:focus,
+  [type="search"]:focus,
+  [type="tel"]:focus,
+  [type="text"]:focus,
+  [type="time"]:focus,
+  [type="url"]:focus,
+  [type="week"]:focus,
+  textarea:focus {
+    border-width: 1px;
+    outline-width: 6px;
+    outline-style: double;
+    outline-offset: -1px;
   }
-    }
+}
 
-[type="color"]::-ms-clear, [type="date"]::-ms-clear, [type="datetime-local"]::-ms-clear, [type="email"]::-ms-clear, [type="file"]::-ms-clear, [type="month"]::-ms-clear, [type="number"]::-ms-clear, [type="password"]::-ms-clear, [type="search"]::-ms-clear, [type="tel"]::-ms-clear, [type="text"]::-ms-clear, [type="time"]::-ms-clear, [type="url"]::-ms-clear, [type="week"]::-ms-clear, textarea::-ms-clear {
-    display: none;
-  }
+[type="color"]::-ms-clear,
+[type="date"]::-ms-clear,
+[type="datetime-local"]::-ms-clear,
+[type="email"]::-ms-clear,
+[type="file"]::-ms-clear,
+[type="month"]::-ms-clear,
+[type="number"]::-ms-clear,
+[type="password"]::-ms-clear,
+[type="search"]::-ms-clear,
+[type="tel"]::-ms-clear,
+[type="text"]::-ms-clear,
+[type="time"]::-ms-clear,
+[type="url"]::-ms-clear,
+[type="week"]::-ms-clear,
+textarea::-ms-clear {
+  display: none;
+}
 
-[type="color"][disabled], [type="date"][disabled], [type="datetime-local"][disabled], [type="email"][disabled], [type="file"][disabled], [type="month"][disabled], [type="number"][disabled], [type="password"][disabled], [type="search"][disabled], [type="tel"][disabled], [type="text"][disabled], [type="time"][disabled], [type="url"][disabled], [type="week"][disabled], textarea[disabled] {
-    color: #7e96a7;
-    background-color: #f1f4f7;
-  }
+[type="color"][disabled],
+[type="date"][disabled],
+[type="datetime-local"][disabled],
+[type="email"][disabled],
+[type="file"][disabled],
+[type="month"][disabled],
+[type="number"][disabled],
+[type="password"][disabled],
+[type="search"][disabled],
+[type="tel"][disabled],
+[type="text"][disabled],
+[type="time"][disabled],
+[type="url"][disabled],
+[type="week"][disabled],
+textarea[disabled] {
+  color: #7e96a7;
+  background-color: #f1f4f7;
+}
 
-[type="color"].error, [type="date"].error, [type="datetime-local"].error, [type="email"].error, [type="file"].error, [type="month"].error, [type="number"].error, [type="password"].error, [type="search"].error, [type="tel"].error, [type="text"].error, [type="time"].error, [type="url"].error, [type="week"].error, textarea.error {
-    border: solid 2px #e33f1e
-  }
+.error[type="color"],
+.error[type="date"],
+.error[type="datetime-local"],
+.error[type="email"],
+.error[type="file"],
+.error[type="month"],
+.error[type="number"],
+.error[type="password"],
+.error[type="search"],
+.error[type="tel"],
+.error[type="text"],
+.error[type="time"],
+.error[type="url"],
+.error[type="week"],
+textarea.error {
+  border: solid 2px #e33f1e;
+}
 
-[type="color"].error:focus, [type="date"].error:focus, [type="datetime-local"].error:focus, [type="email"].error:focus, [type="file"].error:focus, [type="month"].error:focus, [type="number"].error:focus, [type="password"].error:focus, [type="search"].error:focus, [type="tel"].error:focus, [type="text"].error:focus, [type="time"].error:focus, [type="url"].error:focus, [type="week"].error:focus, textarea.error:focus {
-      outline-color: #e33f1e;
-      outline-offset: -2px;
-    }
+.error[type="color"]:focus,
+.error[type="date"]:focus,
+.error[type="datetime-local"]:focus,
+.error[type="email"]:focus,
+.error[type="file"]:focus,
+.error[type="month"]:focus,
+.error[type="number"]:focus,
+.error[type="password"]:focus,
+.error[type="search"]:focus,
+.error[type="tel"]:focus,
+.error[type="text"]:focus,
+.error[type="time"]:focus,
+.error[type="url"]:focus,
+.error[type="week"]:focus,
+textarea.error:focus {
+  outline-color: #e33f1e;
+  outline-offset: -2px;
+}
 
-[type="color"].error + .ck-editor > .ck-editor__main, [type="date"].error + .ck-editor > .ck-editor__main, [type="datetime-local"].error + .ck-editor > .ck-editor__main, [type="email"].error + .ck-editor > .ck-editor__main, [type="file"].error + .ck-editor > .ck-editor__main, [type="month"].error + .ck-editor > .ck-editor__main, [type="number"].error + .ck-editor > .ck-editor__main, [type="password"].error + .ck-editor > .ck-editor__main, [type="search"].error + .ck-editor > .ck-editor__main, [type="tel"].error + .ck-editor > .ck-editor__main, [type="text"].error + .ck-editor > .ck-editor__main, [type="time"].error + .ck-editor > .ck-editor__main, [type="url"].error + .ck-editor > .ck-editor__main, [type="week"].error + .ck-editor > .ck-editor__main, textarea.error + .ck-editor > .ck-editor__main {
-      border: solid 2px #e33f1e;
-    }
+.error[type="color"] + .ck-editor > .ck-editor__main,
+.error[type="date"] + .ck-editor > .ck-editor__main,
+.error[type="datetime-local"] + .ck-editor > .ck-editor__main,
+.error[type="email"] + .ck-editor > .ck-editor__main,
+.error[type="file"] + .ck-editor > .ck-editor__main,
+.error[type="month"] + .ck-editor > .ck-editor__main,
+.error[type="number"] + .ck-editor > .ck-editor__main,
+.error[type="password"] + .ck-editor > .ck-editor__main,
+.error[type="search"] + .ck-editor > .ck-editor__main,
+.error[type="tel"] + .ck-editor > .ck-editor__main,
+.error[type="text"] + .ck-editor > .ck-editor__main,
+.error[type="time"] + .ck-editor > .ck-editor__main,
+.error[type="url"] + .ck-editor > .ck-editor__main,
+.error[type="week"] + .ck-editor > .ck-editor__main,
+textarea.error + .ck-editor > .ck-editor__main {
+  border: solid 2px #e33f1e;
+}
 
-[type="color"].form-element--small, [type="date"].form-element--small, [type="datetime-local"].form-element--small, [type="email"].form-element--small, [type="file"].form-element--small, [type="month"].form-element--small, [type="number"].form-element--small, [type="password"].form-element--small, [type="search"].form-element--small, [type="tel"].form-element--small, [type="text"].form-element--small, [type="time"].form-element--small, [type="url"].form-element--small, [type="week"].form-element--small, textarea.form-element--small {
-    min-height: 2.8125rem;
-  }
+.form-element--small[type="color"],
+.form-element--small[type="date"],
+.form-element--small[type="datetime-local"],
+.form-element--small[type="email"],
+.form-element--small[type="file"],
+.form-element--small[type="month"],
+.form-element--small[type="number"],
+.form-element--small[type="password"],
+.form-element--small[type="search"],
+.form-element--small[type="tel"],
+.form-element--small[type="text"],
+.form-element--small[type="time"],
+.form-element--small[type="url"],
+.form-element--small[type="week"],
+textarea.form-element--small {
+  min-height: 2.8125rem;
+}
 
 @media (min-width: 31.25rem) {
 
-[type="color"],
-[type="date"],
-[type="datetime-local"],
-[type="email"],
-[type="file"],
-[type="month"],
-[type="number"],
-[type="password"],
-[type="search"],
-[type="tel"],
-[type="text"],
-[type="time"],
-[type="url"],
-[type="week"],
-textarea {
-    width: auto
-}
+  [type="color"],
+  [type="date"],
+  [type="datetime-local"],
+  [type="email"],
+  [type="file"],
+  [type="month"],
+  [type="number"],
+  [type="password"],
+  [type="search"],
+  [type="tel"],
+  [type="text"],
+  [type="time"],
+  [type="url"],
+  [type="week"],
+  textarea {
+    width: auto;
   }
-
-[type="date"] {
-  /* Ensure that date field isn't larger than other fields. */
 }
 
+/* Ensure that date field isn't larger than other fields. */
+
 [dir="ltr"] [type="date"]::-webkit-datetime-edit-fields-wrapper {
-    padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] [type="date"]::-webkit-datetime-edit-fields-wrapper {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] [type="date"]::-webkit-datetime-edit-fields-wrapper {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] [type="date"]::-webkit-datetime-edit-fields-wrapper {
-    padding-left: 0
+  padding-left: 0;
 }
 
 [type="date"]::-webkit-datetime-edit-fields-wrapper {
-    padding-top: 0;
-    padding-bottom: 0;
-  }
+  padding-top: 0;
+  padding-bottom: 0;
+}
 
 [type="file"] {
   height: auto;
diff --git a/web/core/themes/olivero/css/components/form.css b/web/core/themes/olivero/css/components/form.css
index 694cc81e1..f7f658fb5 100644
--- a/web/core/themes/olivero/css/components/form.css
+++ b/web/core/themes/olivero/css/components/form.css
@@ -103,33 +103,33 @@ tr .form-item,
   display: inline-block;
   width: 0.5rem;
   height: 0.5rem;
-  margin-left: 0.3em;
   margin-right: 0.3em;
+  margin-left: 0.3em;
   content: "";
   vertical-align: text-top;
   /* Use a background image to prevent screen readers from announcing the text. */
   background-image: url("data:image/svg+xml,%3Csvg height='16' width='16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m0 7.562 1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325l1.113 3.437c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575-2.081-.402-4.058-.856-5.93-1.356' fill='%232494DB'/%3E%3C/svg%3E%0A");
   background-repeat: no-repeat;
-  background-size: 0.5rem 0.5rem
+  background-size: 0.5rem 0.5rem;
 }
 
 @media screen and (-ms-high-contrast: active) {
 
-.form-item__label.form-required::after,
-.fieldset__label.form-required::after,
-.required-mark::after {
-    background-image: url("data:image/svg+xml,%3Csvg height='16' width='16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m0 7.562 1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325l1.113 3.437c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575-2.081-.402-4.058-.856-5.93-1.356' fill='%23ffffff'/%3E%3C/svg%3E%0A")
-}
+  .form-item__label.form-required::after,
+  .fieldset__label.form-required::after,
+  .required-mark::after {
+    background-image: url("data:image/svg+xml,%3Csvg height='16' width='16' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='m0 7.562 1.114-3.438c2.565.906 4.43 1.688 5.59 2.35-.306-2.921-.467-4.93-.484-6.027h3.511c-.05 1.597-.234 3.6-.558 6.003 1.664-.838 3.566-1.613 5.714-2.325l1.113 3.437c-2.05.678-4.06 1.131-6.028 1.356.984.856 2.372 2.381 4.166 4.575l-2.906 2.059c-.935-1.274-2.041-3.009-3.316-5.206-1.194 2.275-2.244 4.013-3.147 5.206l-2.856-2.059c1.872-2.307 3.211-3.832 4.017-4.575-2.081-.402-4.058-.856-5.93-1.356' fill='%23ffffff'/%3E%3C/svg%3E%0A");
   }
+}
 
 /**
  * Form item description.
  */
 
 .form-item__description {
+  max-width: 60ch;
   margin-top: 0.5625rem;
   margin-bottom: 0.5625rem;
-  max-width: 60ch;
   font-size: 0.875rem;
   line-height: 1.125rem;
 }
@@ -159,15 +159,15 @@ tr .form-item,
   background-position: left top; /* LTR */
   background-size: 1.125rem 1.125rem;
   font-size: 0.875rem;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 @media screen and (-ms-high-contrast: active) {
 
-.form-item--error-message {
-    background-image: url("data:image/svg+xml,%3Csvg width='18' height='18' viewBox='0 0 18 18' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23ffffff' d='M9 0C4.03125 0 0 4.03125 0 9C0 13.9688 4.03125 18 9 18C13.9687 18 18 13.9688 18 9C18 4.03125 13.9687 0 9 0ZM10.5 14.6133C10.5 14.8242 10.3359 15 10.1367 15H7.88672C7.67578 15 7.5 14.8242 7.5 14.6133V12.3867C7.5 12.1758 7.67578 12 7.88672 12H10.1367C10.3359 12 10.5 12.1758 10.5 12.3867V14.6133ZM10.4766 10.582C10.4648 10.7461 10.2891 10.875 10.0781 10.875H7.91016C7.6875 10.875 7.51172 10.7461 7.51172 10.582L7.3125 3.30469C7.3125 3.22266 7.34766 3.14063 7.42969 3.09375C7.5 3.03516 7.60547 3 7.71094 3H10.2891C10.3945 3 10.5 3.03516 10.5703 3.09375C10.6523 3.14063 10.6875 3.22266 10.6875 3.30469L10.4766 10.582Z'/%3E%3C/svg%3E")
-}
+  .form-item--error-message {
+    background-image: url("data:image/svg+xml,%3Csvg width='18' height='18' viewBox='0 0 18 18' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23ffffff' d='M9 0C4.03125 0 0 4.03125 0 9C0 13.9688 4.03125 18 9 18C13.9687 18 18 13.9688 18 9C18 4.03125 13.9687 0 9 0ZM10.5 14.6133C10.5 14.8242 10.3359 15 10.1367 15H7.88672C7.67578 15 7.5 14.8242 7.5 14.6133V12.3867C7.5 12.1758 7.67578 12 7.88672 12H10.1367C10.3359 12 10.5 12.1758 10.5 12.3867V14.6133ZM10.4766 10.582C10.4648 10.7461 10.2891 10.875 10.0781 10.875H7.91016C7.6875 10.875 7.51172 10.7461 7.51172 10.582L7.3125 3.30469C7.3125 3.22266 7.34766 3.14063 7.42969 3.09375C7.5 3.03516 7.60547 3 7.71094 3H10.2891C10.3945 3 10.5 3.03516 10.5703 3.09375C10.6523 3.14063 10.6875 3.22266 10.6875 3.30469L10.4766 10.582Z'/%3E%3C/svg%3E");
   }
+}
 
 [dir="rtl"] .form-item--error-message {
   background-position: right top;
@@ -214,15 +214,15 @@ tr .form-item,
   min-width: 1px;
 }
 
-[dir="ltr"] .form-item--editor-format .form-item__label,[dir="ltr"] 
-.form-item--editor-format .form-item__prefix,[dir="ltr"] 
-.form-item--editor-format .form-item__suffix {
+[dir="ltr"] .form-item--editor-format .form-item__label,
+[dir="ltr"] .form-item--editor-format .form-item__prefix,
+[dir="ltr"] .form-item--editor-format .form-item__suffix {
   margin-right: 0.5625rem;
 }
 
-[dir="rtl"] .form-item--editor-format .form-item__label,[dir="rtl"] 
-.form-item--editor-format .form-item__prefix,[dir="rtl"] 
-.form-item--editor-format .form-item__suffix {
+[dir="rtl"] .form-item--editor-format .form-item__label,
+[dir="rtl"] .form-item--editor-format .form-item__prefix,
+[dir="rtl"] .form-item--editor-format .form-item__suffix {
   margin-left: 0.5625rem;
 }
 
@@ -237,16 +237,16 @@ tr .form-item,
  */
 
 .form--inline > * {
-    display: inline-block;
-    margin-top: 0.5625rem;
-    margin-bottom: 0;
-    vertical-align: top; /* Ensure proper alignment if description is present. */
-  }
+  display: inline-block;
+  margin-top: 0.5625rem;
+  margin-bottom: 0;
+  vertical-align: top; /* Ensure proper alignment if description is present. */
+}
 
 .form--inline .form-item__label {
-    margin: 0;
-  }
+  margin: 0;
+}
 
 .form--inline .form-actions {
-    margin-top: 1.6875rem;
-  }
+  margin-top: 1.6875rem;
+}
diff --git a/web/core/themes/olivero/css/components/forum.css b/web/core/themes/olivero/css/components/forum.css
index 9226d4e52..bb2d36d8c 100644
--- a/web/core/themes/olivero/css/components/forum.css
+++ b/web/core/themes/olivero/css/components/forum.css
@@ -11,8 +11,8 @@
  */
 
 .forum table {
-    width: 100%;
-  }
+  width: 100%;
+}
 
 .forum__name--link,
 .forum__last-reply a,
diff --git a/web/core/themes/olivero/css/components/header-buttons-mobile.css b/web/core/themes/olivero/css/components/header-buttons-mobile.css
index 58793fda1..8fb37de4d 100644
--- a/web/core/themes/olivero/css/components/header-buttons-mobile.css
+++ b/web/core/themes/olivero/css/components/header-buttons-mobile.css
@@ -11,37 +11,37 @@
  */
 
 [dir="ltr"] .mobile-buttons {
-  margin-left: auto
+  margin-left: auto;
 }
 
 [dir="rtl"] .mobile-buttons {
-  margin-right: auto
+  margin-right: auto;
 }
 
 .mobile-buttons {
-  margin-top: 0.5625rem
+  margin-top: 0.5625rem;
 }
 
 @media (min-width: 31.25rem) {
 
-.mobile-buttons {
-    margin-top: 2.25rem
-}
+  .mobile-buttons {
+    margin-top: 2.25rem;
   }
+}
 
 @media (min-width: 43.75rem) {
 
-.mobile-buttons {
-    margin-top: 4.5rem
-}
+  .mobile-buttons {
+    margin-top: 4.5rem;
   }
+}
 
 @media (min-width: 75rem) {
 
-.mobile-buttons {
-    margin-top: 6.75rem
-}
+  .mobile-buttons {
+    margin-top: 6.75rem;
   }
+}
 
 @media (min-width: 75rem) {
   body:not(.is-always-mobile-nav) .mobile-buttons {
diff --git a/web/core/themes/olivero/css/components/header-navigation.css b/web/core/themes/olivero/css/components/header-navigation.css
index 66b4f1ddf..72dc9bd9b 100644
--- a/web/core/themes/olivero/css/components/header-navigation.css
+++ b/web/core/themes/olivero/css/components/header-navigation.css
@@ -11,27 +11,27 @@
  */
 
 [dir="ltr"] .header-nav {
-  left: 100%
+  left: 100%;
 }
 
 [dir="rtl"] .header-nav {
-  right: 100%
+  right: 100%;
 }
 
 [dir="ltr"] .header-nav {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .header-nav {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .header-nav {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="rtl"] .header-nav {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 .header-nav {
@@ -57,68 +57,65 @@
    * use padding because that would enable the button to scroll out of the
    * viewport on short screens.
    */
-  border-top: solid #fff 54px;
+  border-top: solid #fff 3.375rem;
   background-color: #fff;
-  box-shadow: 0 0 72px rgba(0, 0, 0, 0.1)
+  box-shadow: 0 0 72px rgba(0, 0, 0, 0.1);
 }
 
 .header-nav.is-active {
-    visibility: visible;
-    transform: translateX(-100%); /* LTR */
-  }
+  visibility: visible;
+  transform: translateX(-100%); /* LTR */
+}
 
 @supports (flex-basis: max-content) {
 
-.header-nav {
-    flex-basis: max-content
-}
+  .header-nav {
+    flex-basis: max-content;
   }
+}
 
 @media (min-width: 31.25rem) {
 
-.header-nav {
-    border-top-width: 90px
-}
+  .header-nav {
+    border-top-width: 90px;
   }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .header-nav {
-    padding-left: 3.375rem
+  [dir="ltr"] .header-nav {
+    padding-left: 3.375rem;
   }
 
-[dir="rtl"] .header-nav {
-    padding-right: 3.375rem
+  [dir="rtl"] .header-nav {
+    padding-right: 3.375rem;
   }
 
-.header-nav {
+  .header-nav {
     padding-bottom: 3.375rem;
-    border-top-width: 126px
-}
+    border-top-width: 126px;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.header-nav {
+  .header-nav {
     -ms-grid-column: 5;
     -ms-grid-column-span: 9;
-    grid-column: 5 / 14
-}
+    grid-column: 5 / 14;
   }
+}
 
-.header-nav {
-
-  /*
+/*
    * Ensure top border has the same color as the background when in forced colors.
    */
-}
 
 @media (forced-colors: active) {
 
-.header-nav {
-    border-top-color: canvas
-}
+  .header-nav {
+    border-top-color: canvas;
   }
+}
 
 /*
  * Only apply transition styles when JS is loaded. This
@@ -132,54 +129,54 @@ html.js .header-nav {
 /* Toolbar is fixed, and tray is vertical. */
 
 body.toolbar-vertical .header-nav {
-  border-top-width: 93px
+  border-top-width: 93px;
 }
 
 @media (min-width: 31.25rem) {
 
-body.toolbar-vertical .header-nav {
-    border-top-width: 129px
-}
+  body.toolbar-vertical .header-nav {
+    border-top-width: 129px;
   }
+}
 
 /* Toolbar is fixed, and tray is vertical or toolbar is horizontal and tray is closed. */
 
 @media (min-width: 43.75rem) {
 
-body.toolbar-vertical .header-nav,
-body.toolbar-horizontal.toolbar-fixed .header-nav {
-    border-top-width: 165px
-}
+  body.toolbar-vertical .header-nav,
+  body.toolbar-horizontal.toolbar-fixed .header-nav {
+    border-top-width: 165px;
   }
+}
 
 /* Toolbar is horizontal fixed, and tray is open. */
 
 @media (min-width: 43.75rem) {
 
-body.toolbar-horizontal.toolbar-fixed.toolbar-tray-open .header-nav {
-    border-top-width: 205px
-}
+  body.toolbar-horizontal.toolbar-fixed.toolbar-tray-open .header-nav {
+    border-top-width: 205px;
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] body:not(.is-always-mobile-nav) .header-nav {
-    padding-left: 0
+  [dir="ltr"] body:not(.is-always-mobile-nav) .header-nav {
+    padding-left: 0;
   }
 
-[dir="rtl"] body:not(.is-always-mobile-nav) .header-nav {
-    padding-right: 0
+  [dir="rtl"] body:not(.is-always-mobile-nav) .header-nav {
+    padding-right: 0;
   }
 
-[dir="ltr"] body:not(.is-always-mobile-nav) .header-nav {
-    padding-right: 0
+  [dir="ltr"] body:not(.is-always-mobile-nav) .header-nav {
+    padding-right: 0;
   }
 
-[dir="rtl"] body:not(.is-always-mobile-nav) .header-nav {
-    padding-left: 0
+  [dir="rtl"] body:not(.is-always-mobile-nav) .header-nav {
+    padding-left: 0;
   }
 
-body:not(.is-always-mobile-nav) .header-nav {
+  body:not(.is-always-mobile-nav) .header-nav {
     position: static;
     display: flex;
     visibility: visible;
@@ -197,77 +194,72 @@ body:not(.is-always-mobile-nav) .header-nav {
     transition: transform 0.2s;
     transform: none;
     border-top: 0;
-    box-shadow: none
-}
+    box-shadow: none;
   }
-
-body.is-always-mobile-nav {
-  /* Toolbar is fixed, and tray is vertical or toolbar is horizontal and tray is closed. */
 }
 
+/* Toolbar is fixed, and tray is vertical or toolbar is horizontal and tray is closed. */
+
 @media (min-width: 75rem) {
 
-body.is-always-mobile-nav.toolbar-vertical .header-nav,
+  body.is-always-mobile-nav.toolbar-vertical .header-nav,
   body.is-always-mobile-nav.toolbar-horizontal.toolbar-fixed .header-nav {
-      border-top-width: 237px
+    border-top-width: 237px;
   }
-    }
-
-body.is-always-mobile-nav {
-
-  /* Toolbar is horizontal fixed, and tray is open. */
 }
 
+/* Toolbar is horizontal fixed, and tray is open. */
+
 @media (min-width: 75rem) {
 
-body.is-always-mobile-nav.toolbar-horizontal.toolbar-fixed.toolbar-tray-open .header-nav {
-      border-top-width: 277px
+  body.is-always-mobile-nav.toolbar-horizontal.toolbar-fixed.toolbar-tray-open .header-nav {
+    border-top-width: 277px;
   }
-    }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] body.is-always-mobile-nav .header-nav {
-      padding-right: 1.125rem
+  [dir="ltr"] body.is-always-mobile-nav .header-nav {
+    padding-right: 1.125rem;
   }
 
-[dir="rtl"] body.is-always-mobile-nav .header-nav {
-      padding-left: 1.125rem
+  [dir="rtl"] body.is-always-mobile-nav .header-nav {
+    padding-left: 1.125rem;
   }
 
-body.is-always-mobile-nav .header-nav {
-      overflow: auto;
-      max-width: calc(50vw - 4.40625rem);
-      transition: transform 0.2s, visibility 0.2s;
-      border-top-width: 198px
+  body.is-always-mobile-nav .header-nav {
+    overflow: auto;
+    max-width: calc(50vw - 4.40625rem);
+    transition: transform 0.2s, visibility 0.2s;
+    border-top-width: 198px;
   }
-    }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] body.is-always-mobile-nav .header-nav {
-      padding-right: calc(100vw - 88.875rem)
+  [dir="ltr"] body.is-always-mobile-nav .header-nav {
+    padding-right: calc(100vw - 88.875rem);
   }
 
-[dir="rtl"] body.is-always-mobile-nav .header-nav {
-      padding-left: calc(100vw - 88.875rem)
+  [dir="rtl"] body.is-always-mobile-nav .header-nav {
+    padding-left: calc(100vw - 88.875rem);
   }
 
-body.is-always-mobile-nav .header-nav {
-      max-width: calc(100vw - 48.9375rem)
+  body.is-always-mobile-nav .header-nav {
+    max-width: calc(100vw - 48.9375rem);
   }
-    }
+}
 
 [dir="rtl"] .header-nav.is-active {
   transform: translateX(100%);
 }
 
 [dir="ltr"] .header-nav-overlay {
-  left: 0
+  left: 0;
 }
 
 [dir="rtl"] .header-nav-overlay {
-  right: 0
+  right: 0;
 }
 
 .header-nav-overlay {
@@ -278,16 +270,16 @@ body.is-always-mobile-nav .header-nav {
   width: 100%;
   height: 100vh;
   opacity: 0.2;
-  background: #0d77b5
+  background: #0d77b5;
 }
 
 @media (forced-colors: active) {
 
-.header-nav-overlay {
-    background: canvastext
-}
+  .header-nav-overlay {
+    background: canvastext;
   }
+}
 
 .is-overlay-active .header-nav-overlay {
-    display: block
+  display: block;
 }
diff --git a/web/core/themes/olivero/css/components/header-search-narrow.css b/web/core/themes/olivero/css/components/header-search-narrow.css
index ad768feeb..0151eb59d 100644
--- a/web/core/themes/olivero/css/components/header-search-narrow.css
+++ b/web/core/themes/olivero/css/components/header-search-narrow.css
@@ -11,299 +11,290 @@
  */
 
 .block-search-narrow {
-  margin-left: -1.125rem;
   margin-right: -1.125rem;
   margin-bottom: 2.25rem;
-  background: #000
+  margin-left: -1.125rem;
+  background: #000;
 }
 
 .block-search-narrow .search-block-form {
-    display: flex;
-  }
+  display: flex;
+}
 
 .block-search-narrow .form-item {
-    flex-grow: 1;
-    margin: 0;
-  }
+  flex-grow: 1;
+  margin: 0;
+}
 
 .block-search-narrow .form-actions {
-    margin: 0;
-  }
+  margin: 0;
+}
 
 [dir="ltr"] .block-search-narrow input[type="search"] {
-    padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .block-search-narrow input[type="search"] {
-    padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .block-search-narrow input[type="search"] {
-    padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="rtl"] .block-search-narrow input[type="search"] {
-    padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 .block-search-narrow input[type="search"] {
-    width: calc(100% + 2.25rem);
-    height: 3.375rem;
-    padding-top: 0;
-    padding-bottom: 0;
-    transition: background-size 0.4s;
-    color: #fff;
-    border: solid 1px transparent;
-    background-color: transparent;
-    background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
-    background-repeat: no-repeat;
-    background-position: bottom left; /* LTR */
-    background-size: 0% 0.3125rem;
-    box-shadow: none;
-    font-family: "Lora", "georgia", serif;
-    font-size: 1rem;
-    -webkit-appearance: none
-  }
+  width: calc(100% + 2.25rem);
+  height: 3.375rem;
+  padding-top: 0;
+  padding-bottom: 0;
+  transition: background-size 0.4s;
+  color: #fff;
+  border: solid 1px transparent;
+  background-color: transparent;
+  background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
+  background-repeat: no-repeat;
+  background-position: bottom left; /* LTR */
+  background-size: 0% 0.3125rem;
+  box-shadow: none;
+  font-family: Lora, georgia, serif;
+  font-size: 1rem;
+  -webkit-appearance: none;
+}
 
 .block-search-narrow input[type="search"]::-ms-clear {
-      width: 2.5rem;
-      opacity: 0.5;
-    }
+  width: 2.5rem;
+  opacity: 0.5;
+}
 
 .block-search-narrow input[type="search"]:focus {
-      outline: solid 4px transparent;
-      outline-offset: -4px;
-      background-size: 100% 0.3125rem
+  outline: solid 4px transparent;
+  outline-offset: -4px;
+  background-size: 100% 0.3125rem;
 
-      /*
+  /*
         We normally indicate focus by animating background-image width. This isn't
         available in IE11 when in Windows high contrast mode.
       */
-    }
+}
 
 @media screen and (-ms-high-contrast: active) {
 
-.block-search-narrow input[type="search"]:focus {
-        border-bottom-width: 5px
-    }
-      }
+  .block-search-narrow input[type="search"]:focus {
+    border-bottom-width: 5px;
+  }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .block-search-narrow input[type="search"] {
-      padding-left: 2.25rem
+  [dir="ltr"] .block-search-narrow input[type="search"] {
+    padding-left: 2.25rem;
   }
 
-[dir="rtl"] .block-search-narrow input[type="search"] {
-      padding-right: 2.25rem
+  [dir="rtl"] .block-search-narrow input[type="search"] {
+    padding-right: 2.25rem;
   }
 
-[dir="ltr"] .block-search-narrow input[type="search"] {
-      padding-right: 2.25rem
+  [dir="ltr"] .block-search-narrow input[type="search"] {
+    padding-right: 2.25rem;
   }
 
-[dir="rtl"] .block-search-narrow input[type="search"] {
-      padding-left: 2.25rem
+  [dir="rtl"] .block-search-narrow input[type="search"] {
+    padding-left: 2.25rem;
   }
 
-.block-search-narrow input[type="search"] {
-      height: 4.5rem
+  .block-search-narrow input[type="search"] {
+    height: 4.5rem;
   }
-    }
+}
 
 [dir="ltr"] .block-search-narrow .search-form__submit {
-    margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .block-search-narrow .search-form__submit {
-    margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .block-search-narrow .search-form__submit {
-    margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .block-search-narrow .search-form__submit {
-    margin-left: 0
+  margin-left: 0;
 }
 
 [dir="ltr"] .block-search-narrow .search-form__submit {
-    padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .block-search-narrow .search-form__submit {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .block-search-narrow .search-form__submit {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .block-search-narrow .search-form__submit {
-    padding-left: 0
+  padding-left: 0;
 }
 
 .block-search-narrow .search-form__submit {
-    position: relative;
-    overflow: hidden;
-    -ms-grid-row-align: stretch;
-    align-self: stretch;
-    width: 3.375rem;
-    height: auto;
-    margin-top: 0;
-    margin-bottom: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-    cursor: pointer;
-    border-color: transparent;
-    background-color: transparent
-
-    /*
-      When in Windows high contrast mode, FF will will not output either background
+  position: relative;
+  overflow: hidden;
+  -ms-grid-row-align: stretch;
+  align-self: stretch;
+  width: 3.375rem;
+  height: auto;
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  cursor: pointer;
+  border-color: transparent;
+  background-color: transparent;
+
+  /*
+      When in Windows high contrast mode, FF will not output either background
       images or SVGs that are nested directly within a <button> element, so we add a <span>.
     */
-  }
+}
 
 [dir="ltr"] .block-search-narrow .search-form__submit .icon--search {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .block-search-narrow .search-form__submit .icon--search {
-      right: 0
+  right: 0;
 }
 
 .block-search-narrow .search-form__submit .icon--search {
-      position: absolute;
-      top: 0;
-      display: block;
-      width: 100%; /* Width of the SVG background image. */
-      height: 100%;
-      pointer-events: none;
-      background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
-      background-repeat: no-repeat;
-      background-position: center;
-      background-size: auto
-    }
+  position: absolute;
+  top: 0;
+  display: block;
+  width: 100%; /* Width of the SVG background image. */
+  height: 100%;
+  pointer-events: none;
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: auto;
+}
 
 [dir="ltr"] .block-search-narrow .search-form__submit .icon--search:after {
-        left: 0
+  left: 0;
 }
 
 [dir="rtl"] .block-search-narrow .search-form__submit .icon--search:after {
-        right: 0
+  right: 0;
 }
 
 .block-search-narrow .search-form__submit .icon--search:after {
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        height: 0;
-        content: "";
-        transition: transform 0.2s;
-        transform: scaleX(0);
-        transform-origin: left; /* LTR */
-        border-top: solid 5px #2494db;
-      }
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 0;
+  content: "";
+  transition: transform 0.2s;
+  transform: scaleX(0);
+  transform-origin: left; /* LTR */
+  border-top: solid 0.3125rem #2494db;
+}
 
 @media (forced-colors: active) {
 
-.block-search-narrow .search-form__submit .icon--search {
-        background: buttontext;
-        -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
-        mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
-        -webkit-mask-repeat: no-repeat;
-        mask-repeat: no-repeat;
-        -webkit-mask-position: center;
-        mask-position: center
-    }
-      }
+  .block-search-narrow .search-form__submit .icon--search {
+    background: buttontext;
+    -webkit-mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
+    mask-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
+    -webkit-mask-repeat: no-repeat;
+    mask-repeat: no-repeat;
+    -webkit-mask-position: center;
+    mask-position: center;
+  }
+}
 
 .block-search-narrow .search-form__submit:focus {
-      outline: solid 4px transparent;
-      outline-offset: -4px;
-      box-shadow: none
-    }
+  outline: solid 4px transparent;
+  outline-offset: -4px;
+  box-shadow: none;
+}
 
 .block-search-narrow .search-form__submit:focus span:after {
-        transform: scaleX(1);
-      }
+  transform: scaleX(1);
+}
 
 @media screen and (-ms-high-contrast: active) {
 
-.block-search-narrow .search-form__submit:focus {
-        border-bottom-width: 9px
-    }
+  .block-search-narrow .search-form__submit:focus {
+    border-bottom-width: 9px;
+  }
 
-        .block-search-narrow .search-form__submit:focus span:after {
-          content: none;
-        }
-      }
+  .block-search-narrow .search-form__submit:focus span:after {
+    content: none;
+  }
+}
 
 @media (min-width: 43.75rem) {
 
-.block-search-narrow .search-form__submit {
-      width: 5rem
+  .block-search-narrow .search-form__submit {
+    width: 5rem;
   }
-    }
+}
 
 @media screen and (-ms-high-contrast: active) {
-
-.block-search-narrow .search-form__submit {
-      /* IE11's high contrast show will not show the background image, so we show the text. */
+  /* IE11's high contrast show will not show the background image, so we show the text. */
+  .block-search-narrow .search-form__submit .visually-hidden {
+    position: static;
+    overflow: visible;
+    clip: auto;
+    width: auto;
+    height: auto;
+    text-align: center;
   }
-      .block-search-narrow .search-form__submit .visually-hidden {
-        position: static;
-        overflow: visible;
-        clip: auto;
-        width: auto;
-        height: auto;
-        text-align: center;
-      }
 
-.block-search-narrow .search-form__submit {
-
-      /* Edge's high contrast does show the background image, so we hide it. */
+  /* Edge's high contrast does show the background image, so we hide it. */
+  .block-search-narrow .search-form__submit .icon--search {
+    display: none;
   }
-      .block-search-narrow .search-form__submit .icon--search {
-        display: none;
-      }
-    }
-
-.block-search-narrow {
-
-  /* 500px is the width of the primary nav at mobile. */
 }
 
+/* 500px is the width of the primary nav at mobile. */
+
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .block-search-narrow {
-    margin-left: 0
+  [dir="ltr"] .block-search-narrow {
+    margin-left: 0;
   }
 
-[dir="rtl"] .block-search-narrow {
-    margin-right: 0
+  [dir="rtl"] .block-search-narrow {
+    margin-right: 0;
   }
 
-[dir="ltr"] .block-search-narrow {
-    margin-right: 0
+  [dir="ltr"] .block-search-narrow {
+    margin-right: 0;
   }
 
-[dir="rtl"] .block-search-narrow {
-    margin-left: 0
-  }
+  [dir="rtl"] .block-search-narrow {
+    margin-left: 0;
   }
+}
 
 @media (min-width: 75rem) {
 
-body:not(.is-always-mobile-nav) .block-search-narrow {
-    display: none
-}
+  body:not(.is-always-mobile-nav) .block-search-narrow {
+    display: none;
   }
+}
 
 [dir="rtl"] .block-search-narrow input[type="search"] {
-    background-position: bottom right;
-  }
+  background-position: bottom right;
+}
 
 [dir="rtl"] .block-search-narrow .search-form__submit .icon--search:after {
-    transform-origin: right;
-  }
+  transform-origin: right;
+}
diff --git a/web/core/themes/olivero/css/components/header-search-narrow.pcss.css b/web/core/themes/olivero/css/components/header-search-narrow.pcss.css
index eeb52f0b5..5debf388d 100644
--- a/web/core/themes/olivero/css/components/header-search-narrow.pcss.css
+++ b/web/core/themes/olivero/css/components/header-search-narrow.pcss.css
@@ -85,7 +85,7 @@
     background-color: transparent;
 
     /*
-      When in Windows high contrast mode, FF will will not output either background
+      When in Windows high contrast mode, FF will not output either background
       images or SVGs that are nested directly within a <button> element, so we add a <span>.
     */
     & .icon--search {
diff --git a/web/core/themes/olivero/css/components/header-search-wide.css b/web/core/themes/olivero/css/components/header-search-wide.css
index 58cb8e760..ac1cda614 100644
--- a/web/core/themes/olivero/css/components/header-search-wide.css
+++ b/web/core/themes/olivero/css/components/header-search-wide.css
@@ -57,11 +57,11 @@
 }
 
 [dir="ltr"] .block-search-wide__wrapper {
-  border-left: solid 90px #313637;
+  border-left: solid 5.625rem #313637;
 }
 
 [dir="rtl"] .block-search-wide__wrapper {
-  border-right: solid 90px #313637;
+  border-right: solid 5.625rem #313637;
 }
 
 .block-search-wide__wrapper {
@@ -80,220 +80,214 @@
   padding-top: 0;
   padding-bottom: 0;
   transition: all 0.2s;
-  background: #000
+  background: #000;
 }
 
 .block-search-wide__wrapper.is-active {
-    visibility: visible;
-    max-height: 9rem;
-  }
+  visibility: visible;
+  max-height: 9rem;
+}
 
 .block-search-wide__wrapper form {
-    display: flex;
-    -ms-grid-column: 1;
-    -ms-grid-column-span: 13;
-    grid-column: 1 / 14;
-  }
+  display: flex;
+  -ms-grid-column: 1;
+  -ms-grid-column-span: 13;
+  grid-column: 1 / 14;
+}
 
 [dir="ltr"] .block-search-wide__wrapper input[type="search"] {
-    padding-left: 13.5rem;
+  padding-left: 13.5rem;
 }
 
 [dir="rtl"] .block-search-wide__wrapper input[type="search"] {
-    padding-right: 13.5rem;
+  padding-right: 13.5rem;
 }
 
 [dir="ltr"] .block-search-wide__wrapper input[type="search"] {
-    padding-right: 0;
+  padding-right: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper input[type="search"] {
-    padding-left: 0;
+  padding-left: 0;
 }
 
 .block-search-wide__wrapper input[type="search"] {
-    width: calc(100% + 2.25rem);
-    height: 9rem;
-    padding-top: 0;
-    padding-bottom: 0;
-    transition: background-size 0.4s;
-    color: #fff;
-    border: solid 1px transparent;
-    box-shadow: none;
-    font-family: "Lora", "georgia", serif;
-    font-size: 2rem;
-    -webkit-appearance: none
-  }
+  width: calc(100% + 2.25rem);
+  height: 9rem;
+  padding-top: 0;
+  padding-bottom: 0;
+  transition: background-size 0.4s;
+  color: #fff;
+  border: solid 1px transparent;
+  box-shadow: none;
+  font-family: Lora, georgia, serif;
+  font-size: 2rem;
+  -webkit-appearance: none;
+}
 
 .block-search-wide__wrapper input[type="search"]::-ms-clear {
-      width: 2.5rem;
-      opacity: 0.5;
-    }
+  width: 2.5rem;
+  opacity: 0.5;
+}
 
 .block-search-wide__wrapper input[type="search"]:focus {
-      outline: solid 4px transparent;
-      outline-offset: -4px
+  outline: solid 4px transparent;
+  outline-offset: -4px;
 
-      /*
+  /*
         We normally indicate focus by animating background-image width. This isn't
         available in IE11 when in Windows high contrast mode.
       */
-    }
+}
 
 @media screen and (-ms-high-contrast: active) {
 
-.block-search-wide__wrapper input[type="search"]:focus {
-        border-bottom-width: 9px
-    }
-      }
+  .block-search-wide__wrapper input[type="search"]:focus {
+    border-bottom-width: 9px;
+  }
+}
 
 .block-search-wide__wrapper .form-item-keys {
-    flex-grow: 1;
-    margin: 0;
-  }
+  flex-grow: 1;
+  margin: 0;
+}
 
 .block-search-wide__wrapper .form-actions {
-    display: flex;
-    margin: 0;
-  }
+  display: flex;
+  margin: 0;
+}
 
 [dir="ltr"] .block-search-wide__wrapper .search-form__submit {
-    margin-left: 0;
+  margin-left: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit {
-    margin-right: 0;
+  margin-right: 0;
 }
 
 [dir="ltr"] .block-search-wide__wrapper .search-form__submit {
-    margin-right: 0;
+  margin-right: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit {
-    margin-left: 0;
+  margin-left: 0;
 }
 
 [dir="ltr"] .block-search-wide__wrapper .search-form__submit {
-    padding-left: 0;
+  padding-left: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit {
-    padding-right: 0;
+  padding-right: 0;
 }
 
 [dir="ltr"] .block-search-wide__wrapper .search-form__submit {
-    padding-right: 0;
+  padding-right: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit {
-    padding-left: 0;
+  padding-left: 0;
 }
 
 .block-search-wide__wrapper .search-form__submit {
-    position: relative;
-    overflow: hidden;
-    -ms-grid-row-align: stretch;
-    align-self: stretch;
-    width: 6.25rem;
-    height: auto;
-    margin-top: 0;
-    margin-bottom: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-    cursor: pointer;
-    border-color: transparent;
-    background-color: transparent
-
-    /*
-      When in Windows high contrast mode, FF will will not output either background
+  position: relative;
+  overflow: hidden;
+  -ms-grid-row-align: stretch;
+  align-self: stretch;
+  width: 6.25rem;
+  height: auto;
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  cursor: pointer;
+  border-color: transparent;
+  background-color: transparent;
+
+  /*
+      When in Windows high contrast mode, FF will not output either background
       images or SVGs that are nested directly within a <button> element, so we add a <span>.
     */
-  }
+}
 
 [dir="ltr"] .block-search-wide__wrapper .search-form__submit .icon--search {
-      right: 0;
+  right: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit .icon--search {
-      left: 0;
+  left: 0;
 }
 
 .block-search-wide__wrapper .search-form__submit .icon--search {
-      position: absolute;
-      top: 0;
-      display: block;
-      width: 1.5rem; /* Width of the SVG background image. */
-      height: 100%;
-      pointer-events: none;
-      background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
-      background-repeat: no-repeat;
-      background-position: center;
-      background-size: contain
-    }
+  position: absolute;
+  top: 0;
+  display: block;
+  width: 1.5rem; /* Width of the SVG background image. */
+  height: 100%;
+  pointer-events: none;
+  background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='26' height='27.2' viewBox='0 0 26 27.2'%3e  %3cpath fill='%23fff' d='M25.8,25.5l-5.3-5.3c2.1-2.1,3.4-5.1,3.4-8.3C23.9,5.3,18.5,0,11.9,0C5.3,0,0,5.3,0,11.9c0,6.6,5.3,11.9,11.9,11.9c2.6,0,5.1-0.9,7-2.3l5.4,5.4c0.4,0.4,1,0.4,1.4,0C26.1,26.6,26.1,25.9,25.8,25.5z M11.9,21.9c-5.5,0-9.9-4.4-9.9-9.9S6.4,2,11.9,2c5.5,0,9.9,4.4,9.9,9.9S17.4,21.9,11.9,21.9z'/%3e%3c/svg%3e");
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: contain;
+}
 
 [dir="ltr"] .block-search-wide__wrapper .search-form__submit .icon--search:after {
-        left: 0;
+  left: 0;
 }
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit .icon--search:after {
-        right: 0;
+  right: 0;
 }
 
 .block-search-wide__wrapper .search-form__submit .icon--search:after {
-        position: absolute;
-        bottom: 0;
-        width: 100%;
-        height: 0;
-        content: "";
-        transition: transform 0.2s;
-        transform: scaleX(0);
-        transform-origin: left;
-        border-top: solid 9px #2494db;
-      }
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 0;
+  content: "";
+  transition: transform 0.2s;
+  transform: scaleX(0);
+  transform-origin: left;
+  border-top: solid 0.5625rem #2494db;
+}
 
 .block-search-wide__wrapper .search-form__submit:focus {
-      outline: solid 4px transparent;
-      outline-offset: -4px;
-      box-shadow: none
-    }
+  outline: solid 4px transparent;
+  outline-offset: -4px;
+  box-shadow: none;
+}
 
 .block-search-wide__wrapper .search-form__submit:focus span:after {
-        transform: scaleX(1);
-      }
+  transform: scaleX(1);
+}
 
 @media screen and (-ms-high-contrast: active) {
 
-.block-search-wide__wrapper .search-form__submit:focus {
-        border-bottom-width: 9px
-    }
+  .block-search-wide__wrapper .search-form__submit:focus {
+    border-bottom-width: 9px;
+  }
 
-        .block-search-wide__wrapper .search-form__submit:focus span:after {
-          content: none;
-        }
-      }
+  .block-search-wide__wrapper .search-form__submit:focus span:after {
+    content: none;
+  }
+}
 
 @media screen and (-ms-high-contrast: active) {
-
-.block-search-wide__wrapper .search-form__submit {
-      /* IE11's high contrast show will not show the background image, so we show the text. */
+  /* IE11's high contrast show will not show the background image, so we show the text. */
+  .block-search-wide__wrapper .search-form__submit .visually-hidden {
+    position: static;
+    overflow: visible;
+    clip: auto;
+    width: auto;
+    height: auto;
+    text-align: center;
   }
-      .block-search-wide__wrapper .search-form__submit .visually-hidden {
-        position: static;
-        overflow: visible;
-        clip: auto;
-        width: auto;
-        height: auto;
-        text-align: center;
-      }
-
-.block-search-wide__wrapper .search-form__submit {
 
-      /* Edge's high contrast does show the background image, so we hide it. */
+  /* Edge's high contrast does show the background image, so we hide it. */
+  .block-search-wide__wrapper .search-form__submit .icon--search {
+    display: none;
   }
-      .block-search-wide__wrapper .search-form__submit .icon--search {
-        display: none;
-      }
-    }
+}
 
 [dir="ltr"] .block-search-wide__container {
   padding-right: 2.25rem;
@@ -318,13 +312,13 @@
 /* Override specificity from container-inline.module.css */
 
 .container-inline .block-search-wide__container {
-    display: block;
-  }
+  display: block;
+}
 
 .container-inline .block-search-wide__grid {
-    display: -ms-grid;
-    display: grid;
-  }
+  display: -ms-grid;
+  display: grid;
+}
 
 .block-search-wide__button {
   position: relative;
@@ -335,83 +329,83 @@
   color: #0d1214; /* Affects SVG search icon. */
   border: 0;
   background: transparent;
-  -webkit-appearance: none
+  -webkit-appearance: none;
 }
 
 .block-search-wide__button:focus {
-    position: relative;
-    outline: 0
-  }
+  position: relative;
+  outline: 0;
+}
 
 .block-search-wide__button:focus:after {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      width: 80%;
-      height: 3.375rem;
-      content: "";
-      transform: translate(-50%, -50%);
-      border: solid 2px #2494db;
-      border-radius: 0.25rem;
-    }
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 80%;
+  height: 3.375rem;
+  content: "";
+  transform: translate(-50%, -50%);
+  border: solid 2px #2494db;
+  border-radius: 0.25rem;
+}
 
 .block-search-wide__button[aria-expanded="true"] {
-    background: #000
-  }
+  background: #000;
+}
 
 .block-search-wide__button[aria-expanded="true"]:focus:after {
-      border-color: #fff;
-    }
+  border-color: #fff;
+}
 
 .block-search-wide__button[aria-expanded="true"] .block-search-wide__button-close:before,
-      .block-search-wide__button[aria-expanded="true"] .block-search-wide__button-close:after {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 1.6875rem;
-        height: 0;
-        content: "";
-        border-top: solid 2px #fff;
-      }
+.block-search-wide__button[aria-expanded="true"] .block-search-wide__button-close:after {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 1.6875rem;
+  height: 0;
+  content: "";
+  border-top: solid 2px #fff;
+}
 
 .block-search-wide__button[aria-expanded="true"] .block-search-wide__button-close:before {
-        transform: translate(-50%, -50%) rotate(-45deg);
-      }
+  transform: translate(-50%, -50%) rotate(-45deg);
+}
 
 .block-search-wide__button[aria-expanded="true"] .block-search-wide__button-close:after {
-        transform: translate(-50%, -50%) rotate(45deg);
-      }
+  transform: translate(-50%, -50%) rotate(45deg);
+}
 
 .block-search-wide__button[aria-expanded="true"] svg {
-      display: none;
-    }
+  display: none;
+}
 
 [dir="ltr"] .block-search-wide__button svg {
-    margin-left: auto;
+  margin-left: auto;
 }
 
 [dir="rtl"] .block-search-wide__button svg {
-    margin-right: auto;
+  margin-right: auto;
 }
 
 [dir="ltr"] .block-search-wide__button svg {
-    margin-right: auto;
+  margin-right: auto;
 }
 
 [dir="rtl"] .block-search-wide__button svg {
-    margin-left: auto;
+  margin-left: auto;
 }
 
 @media (forced-colors: active) {
 
-.block-search-wide__button {
-    background: ButtonFace
-}
+  .block-search-wide__button {
+    background: ButtonFace;
+  }
 
-    .block-search-wide__button path {
-      fill: ButtonText;
-    }
+  .block-search-wide__button path {
+    fill: ButtonText;
   }
+}
 
 /* Provide rudimentary access to site search if JS is disabled. */
 
@@ -427,25 +421,25 @@ html:not(.js) .search-block-form:focus-within .block-search-wide__wrapper {
   background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
   background-repeat: no-repeat;
   background-position: bottom left; /* LTR */
-  background-size: 0% 0.625rem
+  background-size: 0% 0.625rem;
 }
 
 [dir] .block-search-wide__wrapper input[type="search"]:focus {
-    background-size: 100% 0.5625rem;
-  }
+  background-size: 100% 0.5625rem;
+}
 
 [dir="rtl"] .block-search-wide__wrapper input[type="search"] {
-    background-position: bottom right;
-  }
+  background-position: bottom right;
+}
 
 [dir="rtl"] .block-search-wide__wrapper .search-form__submit .icon--search:after {
-    transform-origin: right;
-  }
+  transform-origin: right;
+}
 
 @media (min-width: 75rem) {
 
-body:not(.is-always-mobile-nav) .block-search-wide__wrapper,
+  body:not(.is-always-mobile-nav) .block-search-wide__wrapper,
   body:not(.is-always-mobile-nav) .block-search-wide__button {
-      display: block
+    display: block;
   }
-    }
+}
diff --git a/web/core/themes/olivero/css/components/header-search-wide.pcss.css b/web/core/themes/olivero/css/components/header-search-wide.pcss.css
index cd1911a99..fc130ba0a 100644
--- a/web/core/themes/olivero/css/components/header-search-wide.pcss.css
+++ b/web/core/themes/olivero/css/components/header-search-wide.pcss.css
@@ -102,7 +102,7 @@
     background-color: transparent;
 
     /*
-      When in Windows high contrast mode, FF will will not output either background
+      When in Windows high contrast mode, FF will not output either background
       images or SVGs that are nested directly within a <button> element, so we add a <span>.
     */
     & .icon--search {
diff --git a/web/core/themes/olivero/css/components/header-site-branding.css b/web/core/themes/olivero/css/components/header-site-branding.css
index 66ab2f0ea..23bb17166 100644
--- a/web/core/themes/olivero/css/components/header-site-branding.css
+++ b/web/core/themes/olivero/css/components/header-site-branding.css
@@ -11,29 +11,29 @@
  */
 
 [dir="ltr"] .site-branding {
+  margin-right: 1.125rem;
   margin-left: -1.125rem;
-  margin-right: 1.125rem
 }
 
 [dir="rtl"] .site-branding {
   margin-right: -1.125rem;
-  margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 [dir="ltr"] .site-branding {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .site-branding {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .site-branding {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="rtl"] .site-branding {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 .site-branding {
@@ -46,71 +46,71 @@
   padding-bottom: 0.5625rem;
 
   /* @todo - #0d7ab8 isn't currently a variable. */
-  background-image: linear-gradient(160deg, #2494db 0%, #0d7ab8 78.66%)
+  background-image: linear-gradient(160deg, #2494db 0%, #0d7ab8 78.66%);
 }
 
 @media (min-width: 31.25rem) {
 
-.site-branding {
-    min-height: 4.5rem
-}
+  .site-branding {
+    min-height: 4.5rem;
   }
+}
 
 @media (min-width: 43.75rem) {
 
-.site-branding {
+  .site-branding {
     min-height: 6.75rem;
-    padding-bottom: 1.125rem
-}
+    padding-bottom: 1.125rem;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.site-branding {
-    min-width: calc(14.28571vw + 0.99107rem)
-}
+  .site-branding {
+    min-width: calc(14.28571vw + 0.99107rem);
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .site-branding {
-    margin-left: -2.25rem
+  [dir="ltr"] .site-branding {
+    margin-left: -2.25rem;
   }
 
-[dir="rtl"] .site-branding {
-    margin-right: -2.25rem
+  [dir="rtl"] .site-branding {
+    margin-right: -2.25rem;
   }
 
-[dir="ltr"] .site-branding {
-    padding-left: 2.25rem
+  [dir="ltr"] .site-branding {
+    padding-left: 2.25rem;
   }
 
-[dir="rtl"] .site-branding {
-    padding-right: 2.25rem
+  [dir="rtl"] .site-branding {
+    padding-right: 2.25rem;
   }
 
-[dir="ltr"] .site-branding {
-    padding-right: 2.25rem
+  [dir="ltr"] .site-branding {
+    padding-right: 2.25rem;
   }
 
-[dir="rtl"] .site-branding {
-    padding-left: 2.25rem
+  [dir="rtl"] .site-branding {
+    padding-left: 2.25rem;
   }
 
-.site-branding {
+  .site-branding {
     min-width: calc(14.28571vw + 0.99107rem);
     min-height: 11.25rem;
     padding-top: 0;
-    padding-bottom: 0
-}
+    padding-bottom: 0;
   }
+}
 
 @media (min-width: 90rem) {
 
-.site-branding {
-    min-width: 13.98214rem
-}
+  .site-branding {
+    min-width: 13.98214rem;
   }
+}
 
 [dir="rtl"] .site-branding {
   background-image: linear-gradient(-160deg, #2494db 0%, #0d7ab8 78.66%);
@@ -126,96 +126,96 @@
 
 .site-branding__inner {
   display: flex;
-  align-items: center
+  align-items: center;
 }
 
 .site-branding__inner a {
-    text-decoration: none;
-  }
+  text-decoration: none;
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .site-branding__inner {
-    padding-left: 0
+  [dir="ltr"] .site-branding__inner {
+    padding-left: 0;
   }
 
-[dir="rtl"] .site-branding__inner {
-    padding-right: 0
+  [dir="rtl"] .site-branding__inner {
+    padding-right: 0;
   }
 
-[dir="ltr"] .site-branding__inner {
-    padding-right: 0
+  [dir="ltr"] .site-branding__inner {
+    padding-right: 0;
   }
 
-[dir="rtl"] .site-branding__inner {
-    padding-left: 0
+  [dir="rtl"] .site-branding__inner {
+    padding-left: 0;
   }
 
-.site-branding__inner {
+  .site-branding__inner {
     height: 6.75rem;
     padding-top: 0.5625rem;
-    padding-bottom: 0.5625rem
-}
+    padding-bottom: 0.5625rem;
   }
+}
 
 .site-branding__logo {
   flex-shrink: 0;
-  max-width: 100%
+  max-width: 100%;
 }
 
 .site-branding__logo img {
-    width: auto;
-    max-width: 100%;
-    max-height: 2.25rem
-  }
+  width: auto;
+  max-width: 100%;
+  max-height: 2.25rem;
+}
 
 @media (min-width: 31.25rem) {
 
-.site-branding__logo img {
-      max-height: 3.375rem
+  .site-branding__logo img {
+    max-height: 3.375rem;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.site-branding__logo img {
-      max-height: 4.5rem
+  .site-branding__logo img {
+    max-height: 4.5rem;
   }
-    }
+}
 
 @media (min-width: 75rem) {
 
-.site-branding__logo img {
-      max-height: 5.625rem
+  .site-branding__logo img {
+    max-height: 5.625rem;
   }
-    }
+}
 
 .site-branding__text {
   color: #fff;
   font-size: 1.125rem;
-  font-weight: bold
+  font-weight: bold;
 }
 
 .site-branding__text a {
-    color: inherit;
-  }
+  color: inherit;
+}
 
 @media (min-width: 43.75rem) {
 
-.site-branding__text {
+  .site-branding__text {
     font-size: 1.75rem;
-    line-height: 1.75rem
-}
+    line-height: 1.75rem;
   }
+}
 
 @media (min-width: 75rem) {
 
-.site-branding__text {
+  .site-branding__text {
     letter-spacing: 0.02em;
     font-size: 2rem;
-    line-height: 2.25rem
-}
+    line-height: 2.25rem;
   }
+}
 
 .site-branding--bg-gray .site-branding__text,
 .site-branding--bg-white .site-branding__text {
@@ -223,9 +223,9 @@
 }
 
 [dir="ltr"] .site-branding__logo + .site-branding__text {
-  margin-left: 0.75rem
+  margin-left: 0.75rem;
 }
 
 [dir="rtl"] .site-branding__logo + .site-branding__text {
-  margin-right: 0.75rem
+  margin-right: 0.75rem;
 }
diff --git a/web/core/themes/olivero/css/components/header-sticky-toggle.css b/web/core/themes/olivero/css/components/header-sticky-toggle.css
index 1bcb87ec3..262997f28 100644
--- a/web/core/themes/olivero/css/components/header-sticky-toggle.css
+++ b/web/core/themes/olivero/css/components/header-sticky-toggle.css
@@ -14,12 +14,12 @@
  */
 
 .sticky-header-toggle {
-  display: none
+  display: none;
 }
 
 @media (min-width: 75rem) {
 
-.sticky-header-toggle {
+  .sticky-header-toggle {
     display: flex;
     flex-shrink: 0;
     align-items: center;
@@ -30,31 +30,31 @@
     opacity: 0;
     border: 0;
     outline: 0;
-    background-color: #2494db
-}
+    background-color: #2494db;
+  }
 
-    .sticky-header-toggle:focus {
-      cursor: pointer;
-      pointer-events: auto;
-      opacity: 1;
-      outline: solid 2px #fff;
-      outline-offset: -4px;
-    }
+  .sticky-header-toggle:focus {
+    cursor: pointer;
+    pointer-events: auto;
+    opacity: 1;
+    outline: solid 2px #fff;
+    outline-offset: -4px;
   }
+}
 
 @media (min-width: 75rem) {
 
-body:not(.is-always-mobile-nav) .is-fixed .sticky-header-toggle {
-    visibility: visible
-}
+  body:not(.is-always-mobile-nav) .is-fixed .sticky-header-toggle {
+    visibility: visible;
   }
+}
 
 @media (min-width: 75rem) {
 
-body.is-always-mobile-nav .sticky-header-toggle {
-    visibility: hidden
-}
+  body.is-always-mobile-nav .sticky-header-toggle {
+    visibility: hidden;
   }
+}
 
 .sticky-header-toggle__icon {
   position: relative;
@@ -62,67 +62,67 @@ body.is-always-mobile-nav .sticky-header-toggle {
   height: 1.3125rem;
   transition: opacity 0.2s;
   pointer-events: none;
-  transform-style: preserve-3d
+  transform-style: preserve-3d;
 }
 
 .sticky-header-toggle__icon > span {
-    display: block;
-    height: 0;
-    /* Intentionally not using CSS logical properties. */
-    border-top: solid 3px #fff
-  }
+  display: block;
+  height: 0;
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 3px #fff;
+}
 
 [dir="ltr"] .sticky-header-toggle__icon > span:nth-child(1) {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .sticky-header-toggle__icon > span:nth-child(1) {
-      right: 0
+  right: 0;
 }
 
 .sticky-header-toggle__icon > span:nth-child(1) {
-      position: absolute;
-      top: 0;
-      width: 100%;
-      height: 0;
-      transition: transform 0.2s;
-      background-color: #fff;
-    }
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 0;
+  transition: transform 0.2s;
+  background-color: #fff;
+}
 
 [dir="ltr"] .sticky-header-toggle__icon > span:nth-child(2) {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .sticky-header-toggle__icon > span:nth-child(2) {
-      right: 0
+  right: 0;
 }
 
 .sticky-header-toggle__icon > span:nth-child(2) {
-      position: absolute;
-      top: 0.5625rem;
-      width: 100%;
-      height: 0;
-      transition: opacity 0.2s;
-      background-color: #fff;
-    }
+  position: absolute;
+  top: 0.5625rem;
+  width: 100%;
+  height: 0;
+  transition: opacity 0.2s;
+  background-color: #fff;
+}
 
 [dir="ltr"] .sticky-header-toggle__icon > span:nth-child(3) {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .sticky-header-toggle__icon > span:nth-child(3) {
-      right: 0
+  right: 0;
 }
 
 .sticky-header-toggle__icon > span:nth-child(3) {
-      position: absolute;
-      top: auto;
-      bottom: 0;
-      width: 100%;
-      height: 0;
-      transition: transform 0.2s;
-      background-color: #fff;
-    }
+  position: absolute;
+  top: auto;
+  bottom: 0;
+  width: 100%;
+  height: 0;
+  transition: transform 0.2s;
+  background-color: #fff;
+}
 
 .is-fixed .sticky-header-toggle {
   cursor: pointer;
@@ -131,15 +131,15 @@ body.is-always-mobile-nav .sticky-header-toggle {
 }
 
 [aria-checked="true"] .sticky-header-toggle__icon > span:nth-child(1) {
-    top: 0.5625rem;
-    transform: rotate(-45deg);
-  }
+  top: 0.5625rem;
+  transform: rotate(-45deg);
+}
 
 [aria-checked="true"] .sticky-header-toggle__icon > span:nth-child(2) {
-    opacity: 0;
-  }
+  opacity: 0;
+}
 
 [aria-checked="true"] .sticky-header-toggle__icon > span:nth-child(3) {
-    top: 0.5625rem;
-    transform: rotate(45deg);
-  }
+  top: 0.5625rem;
+  transform: rotate(45deg);
+}
diff --git a/web/core/themes/olivero/css/components/hero.css b/web/core/themes/olivero/css/components/hero.css
index 6c29fe1d6..e6ef9c292 100644
--- a/web/core/themes/olivero/css/components/hero.css
+++ b/web/core/themes/olivero/css/components/hero.css
@@ -13,63 +13,63 @@
 .hero__content {
   -ms-grid-column: 1;
   -ms-grid-column-span: 6;
-  grid-column: 1 / 7
+  grid-column: 1 / 7;
 }
 
 @media (min-width: 43.75rem) {
 
-.hero__content { /* 700px */
+  .hero__content { /* 700px */
     -ms-grid-column: 3;
     -ms-grid-column-span: 10;
-    grid-column: 3 / 13
-}
+    grid-column: 3 / 13;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.hero__content {
+  .hero__content {
     -ms-grid-column: 3;
     -ms-grid-column-span: 8;
-    grid-column: 3 / 11
-}
+    grid-column: 3 / 11;
   }
+}
 
 .hero__img {
   -ms-grid-column: 1;
   -ms-grid-column-span: 6;
   grid-column: 1 / 7;
   margin-top: 2.25rem;
-  margin-bottom: 2.25rem
+  margin-bottom: 2.25rem;
 }
 
 .hero__img img {
-    width: 100%;
-  }
+  width: 100%;
+}
 
 @media (min-width: 31.25rem) {
 
-.hero__img {
+  .hero__img {
     margin-top: 3.375rem;
-    margin-bottom: 3.375rem
-}
+    margin-bottom: 3.375rem;
   }
+}
 
 @media (min-width: 43.75rem) {
 
-.hero__img {
+  .hero__img {
     -ms-grid-column: 1;
     -ms-grid-column-span: 14;
     grid-column: 1 / 15;
     margin-top: 4.5rem;
-    margin-bottom: 4.5rem
-}
+    margin-bottom: 4.5rem;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.hero__img {
+  .hero__img {
     -ms-grid-column: 2;
     -ms-grid-column-span: 12;
-    grid-column: 2 / 14
-}
+    grid-column: 2 / 14;
   }
+}
diff --git a/web/core/themes/olivero/css/components/links.css b/web/core/themes/olivero/css/components/links.css
index c6f355291..644fd554d 100644
--- a/web/core/themes/olivero/css/components/links.css
+++ b/web/core/themes/olivero/css/components/links.css
@@ -11,54 +11,54 @@
  */
 
 [dir="ltr"] .links.inline {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .links.inline {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .links.inline {
-  padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .links.inline {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .links.inline {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .links.inline {
-  padding-left: 0
+  padding-left: 0;
 }
 
 .links.inline {
   padding-top: 0;
   padding-bottom: 0;
-  list-style: none
+  list-style: none;
 }
 
 .links.inline > * {
-    display: inline
-  }
+  display: inline;
+}
 
 [dir="ltr"] .links.inline > *:not(:last-child) {
-      padding-right: 1em
+  padding-right: 1em;
 }
 
 [dir="rtl"] .links.inline > *:not(:last-child) {
-      padding-left: 1em
+  padding-left: 1em;
 }
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .node--type-book .links.inline {
-    text-align: right
+  [dir="ltr"] .node--type-book .links.inline {
+    text-align: right;
   }
 
-[dir="rtl"] .node--type-book .links.inline {
-    text-align: left
-  }
+  [dir="rtl"] .node--type-book .links.inline {
+    text-align: left;
   }
+}
diff --git a/web/core/themes/olivero/css/components/maintenance-page.css b/web/core/themes/olivero/css/components/maintenance-page.css
index 921860501..2086af1d5 100644
--- a/web/core/themes/olivero/css/components/maintenance-page.css
+++ b/web/core/themes/olivero/css/components/maintenance-page.css
@@ -12,15 +12,15 @@
 
 @media (min-width: 75rem) {
 
-.maintenance-page .site-header__initial {
-      flex-shrink: 0;
-      width: 5.625rem
+  .maintenance-page .site-header__initial {
+    flex-shrink: 0;
+    width: 5.625rem;
   }
-    }
+}
 
 .maintenance-page .main-content {
-    min-height: 80vh;
-  }
+  min-height: 80vh;
+}
 
 .maintenance-page-icon {
   display: block;
diff --git a/web/core/themes/olivero/css/components/messages.css b/web/core/themes/olivero/css/components/messages.css
index 48ccb74f3..13909efcb 100644
--- a/web/core/themes/olivero/css/components/messages.css
+++ b/web/core/themes/olivero/css/components/messages.css
@@ -56,21 +56,18 @@
   padding-bottom: 1.125rem;
   color: #fff;
   outline: solid 1px transparent;
-  background-color: #0d1214
+  background-color: #0d1214;
 }
 
 .messages * {
-    color: inherit;
-  }
-
-.messages {
-
-  /* Additional specificity to override contrib modules. */
+  color: inherit;
 }
 
+/* Additional specificity to override contrib modules. */
+
 .messages.messages-list__item {
-    background-image: none;
-  }
+  background-image: none;
+}
 
 [dir="ltr"] .messages__list {
   margin-left: 0;
@@ -133,15 +130,15 @@
 }
 
 .messages__header {
-  flex-shrink: 0
+  flex-shrink: 0;
 }
 
 [dir="ltr"] .messages__header.no-icon {
-    margin-right: 0;
+  margin-right: 0;
 }
 
 [dir="rtl"] .messages__header.no-icon {
-    margin-left: 0;
+  margin-left: 0;
 }
 
 .messages__content {
@@ -190,38 +187,38 @@
   border: 0;
   background: none;
   -webkit-appearance: none;
-  appearance: none
+  appearance: none;
 }
 
 .messages__close:before,
-  .messages__close:after {
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    display: block;
-    width: 2.0625rem;
-    height: 0;
-    content: "";
-    border-top: solid 2px #7e96a7;
-  }
+.messages__close:after {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  display: block;
+  width: 2.0625rem;
+  height: 0;
+  content: "";
+  border-top: solid 2px #7e96a7;
+}
 
 .messages__close:before {
-    transform: translate(-50%, -50%) rotate(45deg);
-  }
+  transform: translate(-50%, -50%) rotate(45deg);
+}
 
 .messages__close:after {
-    transform: translate(-50%, -50%) rotate(-45deg);
-  }
+  transform: translate(-50%, -50%) rotate(-45deg);
+}
 
 .messages__close:hover::before,
-    .messages__close:hover::after {
-      border-color: #fff;
-    }
+.messages__close:hover::after {
+  border-color: #fff;
+}
 
 .messages__close:focus {
-    outline: 2px solid #53b0eb;
-    outline-offset: 2px;
-  }
+  outline: 2px solid #53b0eb;
+  outline-offset: 2px;
+}
 
 .messages__icon svg {
   vertical-align: top;
@@ -252,11 +249,11 @@
 }
 
 [dir="ltr"] .js-form-managed-file .messages {
-  border-left: solid 6px #e33f1e;
+  border-left: solid 0.375rem #e33f1e;
 }
 
 [dir="rtl"] .js-form-managed-file .messages {
-  border-right: solid 6px #e33f1e;
+  border-right: solid 0.375rem #e33f1e;
 }
 
 .js-form-managed-file .messages {
diff --git a/web/core/themes/olivero/css/components/navigation/menu-sidebar.css b/web/core/themes/olivero/css/components/navigation/menu-sidebar.css
index 15ed877fd..026d3ab85 100644
--- a/web/core/themes/olivero/css/components/navigation/menu-sidebar.css
+++ b/web/core/themes/olivero/css/components/navigation/menu-sidebar.css
@@ -11,76 +11,74 @@
  */
 
 .menu--sidebar {
-  list-style: none
+  list-style: none;
 }
 
 .menu--sidebar .menu {
-    list-style: none;
-  }
+  list-style: none;
+}
 
 .menu--sidebar .menu--level-1 {
-    margin: 0;
-  }
+  margin: 0;
+}
 
 [dir="ltr"] .menu--sidebar .menu__link {
-    padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .menu--sidebar .menu__link {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .menu--sidebar .menu__link {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .menu--sidebar .menu__link {
-    padding-left: 0
+  padding-left: 0;
 }
 
 .menu--sidebar .menu__link {
-    position: relative;
-    display: block;
-    padding-top: 0.84375rem;
-    padding-bottom: 0.84375rem;
-    font-family: "Lora", "georgia", serif;
-    font-size: 1.125rem
-
-    /* Bottom divider line. */
-  }
+  position: relative;
+  display: block;
+  padding-top: 0.84375rem;
+  padding-bottom: 0.84375rem;
+  font-family: Lora, georgia, serif;
+  font-size: 1.125rem;
+
+  /* Bottom divider line. */
+}
 
 [dir="ltr"] .menu--sidebar .menu__link:after {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .menu--sidebar .menu__link:after {
-      right: 0
+  right: 0;
 }
 
 .menu--sidebar .menu__link:after {
-      position: absolute;
-      bottom: 0;
-      width: 4.5rem;
-      height: 0;
-      content: "";
-      border-top: solid 2px #e7edf1;
-    }
+  position: absolute;
+  bottom: 0;
+  width: 4.5rem;
+  height: 0;
+  content: "";
+  border-top: solid 2px #e7edf1;
+}
 
 .menu--sidebar .menu__link--link {
-    text-decoration: none;
-    color: #0d1214;
-    font-weight: 600
-  }
+  text-decoration: none;
+  color: #0d1214;
+  font-weight: 600;
+}
 
 .menu--sidebar .menu__link--link:hover {
-      color: #2494db;
-    }
+  color: #2494db;
+}
 
-.menu--sidebar {
+/* No bottom divider line for last menu item. */
 
-  /* No bottom divider line for last menu item. */
+.menu--sidebar .menu__item--level-1:last-child > .menu__link:last-child:after,
+.menu--sidebar .menu__item--level-1:last-child > .menu__item--level-2:last-child > .menu__link:last-child:after {
+  content: none;
 }
-
-.menu--sidebar .menu__item--level-1:last-child > .menu__link:last-child:after, .menu--sidebar .menu__item--level-1:last-child > .menu__item--level-2:last-child > .menu__link:last-child:after {
-      content: none;
-    }
diff --git a/web/core/themes/olivero/css/components/navigation/nav-button-mobile.css b/web/core/themes/olivero/css/components/navigation/nav-button-mobile.css
index fce80bc64..a8ba864d3 100644
--- a/web/core/themes/olivero/css/components/navigation/nav-button-mobile.css
+++ b/web/core/themes/olivero/css/components/navigation/nav-button-mobile.css
@@ -11,35 +11,35 @@
  */
 
 [dir="ltr"] .mobile-nav-button {
-  margin-left: auto
+  margin-left: auto;
 }
 
 [dir="rtl"] .mobile-nav-button {
-  margin-right: auto
+  margin-right: auto;
 }
 
 [dir="ltr"] .mobile-nav-button {
-  margin-right: -0.375rem
+  margin-right: -0.375rem;
 }
 
 [dir="rtl"] .mobile-nav-button {
-  margin-left: -0.375rem
+  margin-left: -0.375rem;
 }
 
 [dir="ltr"] .mobile-nav-button {
-  padding-left: 0.375rem
+  padding-left: 0.375rem;
 }
 
 [dir="rtl"] .mobile-nav-button {
-  padding-right: 0.375rem
+  padding-right: 0.375rem;
 }
 
 [dir="ltr"] .mobile-nav-button {
-  padding-right: 0.375rem
+  padding-right: 0.375rem;
 }
 
 [dir="rtl"] .mobile-nav-button {
-  padding-left: 0.375rem
+  padding-left: 0.375rem;
 }
 
 .mobile-nav-button {
@@ -57,32 +57,32 @@
   border: none;
   background: transparent;
   -webkit-appearance: none;
-  appearance: none
+  appearance: none;
 }
 
 .mobile-nav-button:focus {
-    outline: solid 2px #0d77b5;
-  }
+  outline: solid 2px #0d77b5;
+}
 
 .mobile-nav-button:active {
-    color: inherit; /* Override Safari's default UA styles. */
-  }
+  color: inherit; /* Override Safari's default UA styles. */
+}
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .mobile-nav-button {
-    padding-left: 1.125rem
+  [dir="ltr"] .mobile-nav-button {
+    padding-left: 1.125rem;
   }
 
-[dir="rtl"] .mobile-nav-button {
-    padding-right: 1.125rem
+  [dir="rtl"] .mobile-nav-button {
+    padding-right: 1.125rem;
   }
 
-.mobile-nav-button {
+  .mobile-nav-button {
     display: inline-flex;
-    width: auto
-}
+    width: auto;
   }
+}
 
 /* Text that says "menu". */
 
@@ -93,20 +93,20 @@
   clip: rect(1px, 1px, 1px, 1px);
   width: 1px;
   height: 1px;
-  word-wrap: normal
+  word-wrap: normal;
 }
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .mobile-nav-button__label {
-    margin-right: 0.75rem
+  [dir="ltr"] .mobile-nav-button__label {
+    margin-right: 0.75rem;
   }
 
-[dir="rtl"] .mobile-nav-button__label {
-    margin-left: 0.75rem
+  [dir="rtl"] .mobile-nav-button__label {
+    margin-left: 0.75rem;
   }
 
-.mobile-nav-button__label {
+  .mobile-nav-button__label {
     position: static;
     overflow: visible;
     clip: auto;
@@ -114,65 +114,65 @@
     height: auto;
     letter-spacing: 0.05em;
     font-size: 0.875rem;
-    font-weight: 600
-}
+    font-weight: 600;
   }
+}
 
 .mobile-nav-button__icon {
   position: relative;
   display: block;
   width: 2.25rem;
   height: 0;
-  border-top: solid 3px #2494db
+  border-top: solid 3px #2494db;
 }
 
 [dir="ltr"] .mobile-nav-button__icon:before {
-    left: 0
+  left: 0;
 }
 
 [dir="rtl"] .mobile-nav-button__icon:before {
-    right: 0
+  right: 0;
 }
 
 .mobile-nav-button__icon:before {
-    position: absolute;
-    top: -0.6875rem;
-    width: 100%;
-    height: 0;
-    content: "";
-    transition: all 0.2s;
-    border-top: solid 3px #2494db;
-  }
+  position: absolute;
+  top: -0.6875rem;
+  width: 100%;
+  height: 0;
+  content: "";
+  transition: all 0.2s;
+  border-top: solid 3px #2494db;
+}
 
 [dir="ltr"] .mobile-nav-button__icon:after {
-    left: 0
+  left: 0;
 }
 
 [dir="rtl"] .mobile-nav-button__icon:after {
-    right: 0
+  right: 0;
 }
 
 .mobile-nav-button__icon:after {
-    position: absolute;
-    top: auto;
-    bottom: -0.5rem;
-    width: 100%;
-    height: 0;
-    content: "";
-    transition: all 0.2s;
-    border-top: solid 3px #2494db;
-  }
+  position: absolute;
+  top: auto;
+  bottom: -0.5rem;
+  width: 100%;
+  height: 0;
+  content: "";
+  transition: all 0.2s;
+  border-top: solid 3px #2494db;
+}
 
 .mobile-nav-button[aria-expanded="true"] .mobile-nav-button__icon {
-  border-top: 0
+  border-top: 0;
 }
 
 .mobile-nav-button[aria-expanded="true"] .mobile-nav-button__icon:before {
-    top: 0;
-    transform: rotate(-45deg);
-  }
+  top: 0;
+  transform: rotate(-45deg);
+}
 
 .mobile-nav-button[aria-expanded="true"] .mobile-nav-button__icon:after {
-    top: 0;
-    transform: rotate(45deg);
-  }
+  top: 0;
+  transform: rotate(45deg);
+}
diff --git a/web/core/themes/olivero/css/components/navigation/nav-primary-button.css b/web/core/themes/olivero/css/components/navigation/nav-primary-button.css
index 5f83bb161..04de7b8b2 100644
--- a/web/core/themes/olivero/css/components/navigation/nav-primary-button.css
+++ b/web/core/themes/olivero/css/components/navigation/nav-primary-button.css
@@ -11,19 +11,19 @@
  */
 
 [dir="ltr"] .primary-nav__button-toggle {
-  padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .primary-nav__button-toggle {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .primary-nav__button-toggle {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .primary-nav__button-toggle {
-  padding-left: 0
+  padding-left: 0;
 }
 
 .primary-nav__button-toggle {
@@ -38,129 +38,126 @@
   text-indent: -62.4375rem;
   border: 0;
   background: transparent;
-  -webkit-appearance: none
+  -webkit-appearance: none;
 }
 
 .primary-nav__button-toggle:focus {
-    outline: auto 2px #2494db;
-    outline-offset: 2px;
-  }
+  outline: auto 2px #2494db;
+  outline-offset: 2px;
+}
 
 .primary-nav__button-toggle .icon--menu-toggle {
-    position: absolute;
-    /* stylelint-disable csstools/use-logical */
-    top: 50%;
-    left: 50%;
-    /* stylelint-enable csstools/use-logical */
-    width: 1rem;
-    height: 1rem;
-    transition: background-color 0.2s;
-    transform: translate(-50%, -50%);
-    border-radius: 2px
-  }
+  position: absolute;
+  /* stylelint-disable csstools/use-logical */
+  top: 50%;
+  left: 50%;
+  /* stylelint-enable csstools/use-logical */
+  width: 1rem;
+  height: 1rem;
+  transition: background-color 0.2s;
+  transform: translate(-50%, -50%);
+  border-radius: 2px;
+}
 
 .primary-nav__button-toggle .icon--menu-toggle:before,
-    .primary-nav__button-toggle .icon--menu-toggle:after {
-      position: absolute;
-      /* stylelint-disable csstools/use-logical */
-      top: 50%;
-      left: 50%;
-      /* stylelint-enable csstools/use-logical */
-      width: 1.125rem;
-      height: 0;
-      content: "";
-      transform: translate(-50%, -50%);
-      /* Intentionally not using CSS logical properties. */
-      border-top: solid 3px #2494db;
-    }
+.primary-nav__button-toggle .icon--menu-toggle:after {
+  position: absolute;
+  /* stylelint-disable csstools/use-logical */
+  top: 50%;
+  left: 50%;
+  /* stylelint-enable csstools/use-logical */
+  width: 1.125rem;
+  height: 0;
+  content: "";
+  transform: translate(-50%, -50%);
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 3px #2494db;
+}
 
 .primary-nav__button-toggle .icon--menu-toggle:after {
-      transition: opacity 0.2s;
-      transform: translate(-50%, -50%) rotate(90deg);
-    }
+  transition: opacity 0.2s;
+  transform: translate(-50%, -50%) rotate(90deg);
+}
 
 .primary-nav__button-toggle[aria-expanded="true"] .icon--menu-toggle:after {
-    opacity: 0;
-  }
-
-.primary-nav__button-toggle {
+  opacity: 0;
+}
 
-  /* aria-hidden attribute is removed by JS. Button is non-functional
+/* aria-hidden attribute is removed by JS. Button is non-functional
      until JS is enabled.
   */
-}
 
 .primary-nav__button-toggle[aria-hidden="true"] {
-    pointer-events: none;
-  }
+  pointer-events: none;
+}
 
 @media (min-width: 75rem) {
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
-      margin-right: -2.25rem
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
+    margin-right: -2.25rem;
   }
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
-      margin-left: -2.25rem
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
+    margin-left: -2.25rem;
   }
-    body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
-      flex-shrink: 0;
-      -ms-grid-row-align: stretch;
-      align-self: stretch;
-      width: 2.75rem;
-      height: auto;
-      margin-top: 0
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__button-toggle:focus {
-        border: 0;
-        outline: 0
-      }
-
-        body:not(.is-always-mobile-nav) .primary-nav__button-toggle:focus .icon--menu-toggle {
-          border: solid 2px #0d77b5;
-        }
-
-      body:not(.is-always-mobile-nav) .primary-nav__button-toggle:active {
-        /* Necessary for Safari. */
-        color: currentColor;
-      }
-
-      body:not(.is-always-mobile-nav) .primary-nav__button-toggle[aria-expanded="true"] .icon--menu-toggle:after {
-        opacity: 0.8;
-      }
-
-      [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
-        left: 0.1875rem
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle {
+    flex-shrink: 0;
+    -ms-grid-row-align: stretch;
+    align-self: stretch;
+    width: 2.75rem;
+    height: auto;
+    margin-top: 0;
   }
 
-      [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
-        right: 0.1875rem
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle:focus {
+    border: 0;
+    outline: 0;
   }
 
-      body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
-        width: 1.125rem;
-        transform: translateY(-50%);
-        border-radius: 0.25rem;
-        background-color: #fff
-      }
-
-        body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle:before {
-          content: none;
-        }
-
-        body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle:after {
-          /* stylelint-disable csstools/use-logical */
-          top: calc(50% - 2px);
-          left: 0.1875rem;
-          /* stylelint-enable csstools/use-logical */
-          width: 0.5rem;
-          height: 0.5rem;
-          content: "";
-          transform: translateY(-50%) rotate(45deg);
-          opacity: 0.8;
-          /* Intentionally not using CSS logical properties. */
-          border-top: none;
-          border-right: solid 2px currentColor;
-          border-bottom: solid 2px currentColor;
-          background: transparent;
-        }
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle:focus .icon--menu-toggle {
+    border: solid 2px #0d77b5;
   }
+
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle:active {
+    /* Necessary for Safari. */
+    color: currentColor;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle[aria-expanded="true"] .icon--menu-toggle:after {
+    opacity: 0.8;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
+    left: 0.1875rem;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
+    right: 0.1875rem;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle {
+    width: 1.125rem;
+    transform: translateY(-50%);
+    border-radius: 0.25rem;
+    background-color: #fff;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle:before {
+    content: none;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__button-toggle .icon--menu-toggle:after {
+    /* stylelint-disable csstools/use-logical */
+    top: calc(50% - 2px);
+    left: 0.1875rem;
+    /* stylelint-enable csstools/use-logical */
+    width: 0.5rem;
+    height: 0.5rem;
+    content: "";
+    transform: translateY(-50%) rotate(45deg);
+    opacity: 0.8;
+    /* Intentionally not using CSS logical properties. */
+    border-top: none;
+    border-right: solid 2px currentColor;
+    border-bottom: solid 2px currentColor;
+    background: transparent;
+  }
+}
diff --git a/web/core/themes/olivero/css/components/navigation/nav-primary-no-js.css b/web/core/themes/olivero/css/components/navigation/nav-primary-no-js.css
index 831a7cebb..36e24ddae 100644
--- a/web/core/themes/olivero/css/components/navigation/nav-primary-no-js.css
+++ b/web/core/themes/olivero/css/components/navigation/nav-primary-no-js.css
@@ -10,206 +10,202 @@
  * Styles for primary navigation when JavaScript is disabled.
  */
 
-html:not(.js) {
-  /**
+/**
    * Mobile styles for primary navigation when JS is disabled.
    */
-}
 
 @media (max-width: 75rem) {
-    html:not(.js) .primary-nav__menu--level-1 {
-      column-width: 18.75rem;
-      grid-column-gap: 2.25rem;
-    }
+  html:not(.js) .primary-nav__menu--level-1 {
+    column-width: 18.75rem;
+    column-gap: 2.25rem;
+  }
 
-    html:not(.js) .primary-nav__menu-item {
-      page-break-inside: avoid;
-      break-inside: avoid;
-    }
+  html:not(.js) .primary-nav__menu-item {
+    page-break-inside: avoid;
+    break-inside: avoid;
+  }
+
+  html:not(.js) .site-header__inner__container {
+    flex-wrap: wrap;
+  }
 
-    html:not(.js) .site-header__inner__container {
-      flex-wrap: wrap;
-    }
+  html:not(.js) .mobile-buttons {
+    display: none;
+  }
 
-    html:not(.js) .mobile-buttons {
-      display: none;
-    }
+  html[dir="ltr"]:not(.js) .header-nav {
+    margin-left: 2.25rem;
+  }
 
-    html[dir="ltr"]:not(.js) .header-nav {
-      margin-left: 2.25rem;
+  html[dir="rtl"]:not(.js) .header-nav {
+    margin-right: 2.25rem;
   }
 
-    html[dir="rtl"]:not(.js) .header-nav {
-      margin-right: 2.25rem;
+  html[dir="ltr"]:not(.js) .header-nav {
+    margin-right: 2.25rem;
   }
 
-    html[dir="ltr"]:not(.js) .header-nav {
-      margin-right: 2.25rem;
+  html[dir="rtl"]:not(.js) .header-nav {
+    margin-left: 2.25rem;
   }
 
-    html[dir="rtl"]:not(.js) .header-nav {
-      margin-left: 2.25rem;
+  html[dir="ltr"]:not(.js) .header-nav {
+    padding-left: 2.25rem;
   }
 
-    html[dir="ltr"]:not(.js) .header-nav {
-      padding-left: 2.25rem;
+  html[dir="rtl"]:not(.js) .header-nav {
+    padding-right: 2.25rem;
   }
 
-    html[dir="rtl"]:not(.js) .header-nav {
-      padding-right: 2.25rem;
+  html[dir="ltr"]:not(.js) .header-nav {
+    padding-right: 2.25rem;
   }
 
-    html[dir="ltr"]:not(.js) .header-nav {
-      padding-right: 2.25rem;
+  html[dir="rtl"]:not(.js) .header-nav {
+    padding-left: 2.25rem;
   }
 
-    html[dir="rtl"]:not(.js) .header-nav {
-      padding-left: 2.25rem;
+  html:not(.js) .header-nav {
+    border: solid 1px #e7edf1 !important;
   }
 
-    html:not(.js) .header-nav {
-      position: static;
-      visibility: visible;
-      flex-basis: 100%;
-      width: 100%;
-      max-width: none;
-      margin-top: 2.25rem;
-      margin-bottom: 0;
-      padding-top: 2.25rem;
-      padding-bottom: 0;
-      transform: none;
-      border: solid 1px #e7edf1 !important;
-      box-shadow: 0 0 36px #d7e1e8;
-    }
+  html:not(.js) .header-nav {
+    position: static;
+    visibility: visible;
+    flex-basis: 100%;
+    width: 100%;
+    max-width: none;
+    margin-top: 2.25rem;
+    margin-bottom: 0;
+    padding-top: 2.25rem;
+    padding-bottom: 0;
+    transform: none;
+    box-shadow: 0 0 36px #d7e1e8;
+  }
 
-    html[dir="ltr"]:not(.js) .primary-nav__menu--level-2 {
-      border-left: 0;
+  html[dir="ltr"]:not(.js) .primary-nav__menu--level-2 {
+    border-left: 0;
   }
 
-    html[dir="rtl"]:not(.js) .primary-nav__menu--level-2 {
-      border-right: 0;
+  html[dir="rtl"]:not(.js) .primary-nav__menu--level-2 {
+    border-right: 0;
   }
 
-    html:not(.js) .primary-nav__button-toggle {
-      display: none;
-    }
-      html:not(.js) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
-      html:not(.js) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-        content: none;
-      }
+  html:not(.js) .primary-nav__button-toggle {
+    display: none;
+  }
+  html:not(.js) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
+  html:not(.js) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+    content: none;
   }
+}
 
 @media (min-width: 75rem) {
-
-html:not(.js) {
-    /**
+  /**
      * Styles for 'always on mobile navigation' when JS is disabled.
      */
-}
-      html:not(.js) body.is-always-mobile-nav .primary-nav__menu--level-1 {
-        column-width: 18.75rem;
-        grid-column-gap: 2.25rem;
-      }
+  html:not(.js) body.is-always-mobile-nav .primary-nav__menu--level-1 {
+    column-width: 18.75rem;
+    column-gap: 2.25rem;
+  }
 
-      html:not(.js) body.is-always-mobile-nav .primary-nav__menu-item {
-        page-break-inside: avoid;
-        break-inside: avoid;
-      }
+  html:not(.js) body.is-always-mobile-nav .primary-nav__menu-item {
+    page-break-inside: avoid;
+    break-inside: avoid;
+  }
 
-      html:not(.js) body.is-always-mobile-nav .site-header__inner__container {
-        flex-wrap: wrap;
-      }
+  html:not(.js) body.is-always-mobile-nav .site-header__inner__container {
+    flex-wrap: wrap;
+  }
 
-      html:not(.js) body.is-always-mobile-nav .mobile-buttons {
-        display: none;
-      }
+  html:not(.js) body.is-always-mobile-nav .mobile-buttons {
+    display: none;
+  }
 
-      html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
-        margin-left: 2.25rem;
+  html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
+    margin-left: 2.25rem;
   }
 
-      html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
-        margin-right: 2.25rem;
+  html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
+    margin-right: 2.25rem;
   }
 
-      html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
-        margin-right: 2.25rem;
+  html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
+    margin-right: 2.25rem;
   }
 
-      html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
-        margin-left: 2.25rem;
+  html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
+    margin-left: 2.25rem;
   }
 
-      html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
-        padding-left: 2.25rem;
+  html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
+    padding-left: 2.25rem;
   }
 
-      html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
-        padding-right: 2.25rem;
+  html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
+    padding-right: 2.25rem;
   }
 
-      html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
-        padding-right: 2.25rem;
+  html[dir="ltr"]:not(.js) body.is-always-mobile-nav .header-nav {
+    padding-right: 2.25rem;
   }
 
-      html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
-        padding-left: 2.25rem;
+  html[dir="rtl"]:not(.js) body.is-always-mobile-nav .header-nav {
+    padding-left: 2.25rem;
   }
 
-      html:not(.js) body.is-always-mobile-nav .header-nav {
-        position: static;
-        visibility: visible;
-        flex-basis: 100%;
-        width: 100%;
-        max-width: none;
-        margin-top: 2.25rem;
-        margin-bottom: 0;
-        padding-top: 2.25rem;
-        padding-bottom: 0;
-        transform: none;
-        border: solid 1px #e7edf1 !important;
-        box-shadow: 0 0 36px #d7e1e8;
-      }
+  html:not(.js) body.is-always-mobile-nav .header-nav {
+    border: solid 1px #e7edf1 !important;
+  }
 
-      html[dir="ltr"]:not(.js) body.is-always-mobile-nav .primary-nav__menu--level-2 {
-        border-left: 0;
+  html:not(.js) body.is-always-mobile-nav .header-nav {
+    position: static;
+    visibility: visible;
+    flex-basis: 100%;
+    width: 100%;
+    max-width: none;
+    margin-top: 2.25rem;
+    margin-bottom: 0;
+    padding-top: 2.25rem;
+    padding-bottom: 0;
+    transform: none;
+    box-shadow: 0 0 36px #d7e1e8;
   }
 
-      html[dir="rtl"]:not(.js) body.is-always-mobile-nav .primary-nav__menu--level-2 {
-        border-right: 0;
+  html[dir="ltr"]:not(.js) body.is-always-mobile-nav .primary-nav__menu--level-2 {
+    border-left: 0;
   }
 
-      html:not(.js) body.is-always-mobile-nav .primary-nav__button-toggle {
-        display: none;
-      }
-        html:not(.js) body.is-always-mobile-nav .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
-        html:not(.js) body.is-always-mobile-nav .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-          content: none;
-        }
+  html[dir="rtl"]:not(.js) body.is-always-mobile-nav .primary-nav__menu--level-2 {
+    border-right: 0;
+  }
 
-html:not(.js) {
+  html:not(.js) body.is-always-mobile-nav .primary-nav__button-toggle {
+    display: none;
+  }
+  html:not(.js) body.is-always-mobile-nav .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
+  html:not(.js) body.is-always-mobile-nav .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+    content: none;
+  }
 
-    /**
+  /**
      * Styles for traditional dropdown primary navigation when JS is disabled.
      */
-}
-        html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:hover .primary-nav__menu--level-2,
-        html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:hover .primary-nav__menu-🥕 {
-          visibility: visible;
-          transform: translate(-50%, 0);
-          opacity: 1;
-        }
-    html:not(.js) body:not(.is-always-mobile-nav) {
-
-      /*
+  html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:hover .primary-nav__menu--level-2,
+  html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:hover .primary-nav__menu-🥕 {
+    visibility: visible;
+    transform: translate(-50%, 0);
+    opacity: 1;
+  }
+
+  /*
        * Cannot combine the focus-within pseudo selector with other selectors,
        * because it will break IE11 and earlier versions of MS Edge.
        */
-    }
-        html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:focus-within .primary-nav__menu--level-2,
-        html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:focus-within .primary-nav__menu-🥕 {
-          visibility: visible;
-          transform: translate(-50%, 0);
-          opacity: 1;
-        }
+  html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:focus-within .primary-nav__menu--level-2,
+  html:not(.js) body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:focus-within .primary-nav__menu-🥕 {
+    visibility: visible;
+    transform: translate(-50%, 0);
+    opacity: 1;
   }
+}
diff --git a/web/core/themes/olivero/css/components/navigation/nav-primary-wide.css b/web/core/themes/olivero/css/components/navigation/nav-primary-wide.css
index 9b5ef1b5c..7e430fa43 100644
--- a/web/core/themes/olivero/css/components/navigation/nav-primary-wide.css
+++ b/web/core/themes/olivero/css/components/navigation/nav-primary-wide.css
@@ -11,299 +11,288 @@
  */
 
 @media (min-width: 75rem) {
-    body:not(.is-always-mobile-nav) .primary-nav__menu-item {
-      flex-wrap: nowrap /* Ensure that sub navigation toggle button doesn't wrap underneath link. */
-    }
-        body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--link,
-        body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--nolink {
-          flex-basis: auto;
-        }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children {
-
-        /* Remove hover state if submenu exists. */
-      }
-        body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--level-1 .primary-nav__menu-link-inner:after {
-          content: none;
-        }
-
-    body:not(.is-always-mobile-nav) .primary-nav__menu-link {
-      letter-spacing: 0.02em;
-      font-size: 1rem;
-      line-height: 1.6875rem
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu-link:focus {
-        position: relative;
-        outline: 0
-      }
-
-        body:not(.is-always-mobile-nav) .primary-nav__menu-link:focus:before {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          width: calc(100% + 1.125rem);
-          height: 3.375rem;
-          content: "";
-          transform: translate(-50%, -50%);
-          border: solid 2px #2494db;
-          border-radius: 0.25rem;
-        }
-      [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
-        padding-right: 0.5625rem;
-    }
-      [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
-        padding-left: 0.5625rem;
-    }
-      body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
-        overflow: visible /* Necessary to view icon in IE11 */
-      }
-
-        body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:focus:before {
-          width: calc(100% + 1.6875rem);
-          content: "";
-        }
-
-        body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before {
-          content: none;
-        }
-      body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
-
-        /* Chevron icon for desktop navigation. */
-      }
-        [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-          left: calc(100% - 0.1875rem);
-    }
-        [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-          right: calc(100% - 0.1875rem);
-    }
-        body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-          position: absolute;
-          top: 50%;
-          width: 0.5rem;
-          height: 0.5rem;
-          margin-top: -2px;
-          transform: translateY(-50%) rotate(45deg);
-          /* Intentionally not using CSS logical properties. */
-          border-top: 0;
-          border-right: solid 2px currentColor;
-          border-bottom: solid 2px currentColor;
-        }
-
-        body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children[aria-expanded="true"]:after {
-          opacity: 1;
-        }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
-      padding-left: 0;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
-      padding-right: 0;
-    }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
-      padding-right: 0;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
-      padding-left: 0;
-    }
-
-    body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
-      padding-top: 2.25rem;
-      padding-bottom: 2.25rem
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner:after {
-        transform-origin: center;
-        border-top-width: 9px;
-      }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-1 {
-      margin-right: 1.125rem;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-1 {
-      margin-left: 1.125rem;
-    }
-
-    body:not(.is-always-mobile-nav) .primary-nav__menu--level-1 {
-      display: flex;
-      align-items: stretch;
-    }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
-      margin-left: 0;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
-      margin-right: 0;
-    }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
-      margin-right: 0;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
-      margin-left: 0;
-    }
-
-    body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
-      position: relative; /* Anchor secondary menu */
-      display: flex;
-      align-items: center;
-      width: max-content;
-      max-width: 12.5rem;
-      margin-top: 0;
-      margin-bottom: 0
-    }
-
-      [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:not(:last-child) {
-        margin-right: 2.25rem;
-    }
-
-      [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:not(:last-child) {
-        margin-left: 2.25rem;
-    }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      margin-left: 0;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      margin-right: 0;
-    }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      padding-left: 2.25rem;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      padding-right: 2.25rem;
-    }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      padding-right: 2.25rem;
-    }
-
-    [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      padding-left: 2.25rem;
-    }
-
-    body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
-      position: absolute;
-      z-index: 105; /* Appear above search container. */
-      top: calc(100% - 0.5625rem);
-      left: 50%;
-      visibility: hidden;
-      overflow: auto;
-      width: 15.625rem;
-      /**
+  body:not(.is-always-mobile-nav) .primary-nav__menu-item {
+    flex-wrap: nowrap; /* Ensure that sub navigation toggle button doesn't wrap underneath link. */
+  }
+  body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--link,
+  body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--nolink {
+    flex-basis: auto;
+  }
+
+  /* Remove hover state if submenu exists. */
+  body:not(.is-always-mobile-nav) .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--level-1 .primary-nav__menu-link-inner:after {
+    content: none;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link {
+    letter-spacing: 0.02em;
+    font-size: 1rem;
+    line-height: 1.6875rem;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link:focus {
+    position: relative;
+    outline: 0;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link:focus:before {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: calc(100% + 1.125rem);
+    height: 3.375rem;
+    content: "";
+    transform: translate(-50%, -50%);
+    border: solid 2px #2494db;
+    border-radius: 0.25rem;
+  }
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
+    padding-right: 0.5625rem;
+  }
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
+    padding-left: 0.5625rem;
+  }
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
+    overflow: visible; /* Necessary to view icon in IE11 */
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:focus:before {
+    width: calc(100% + 1.6875rem);
+    content: "";
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before {
+    content: none;
+  }
+
+  /* Chevron icon for desktop navigation. */
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+    left: calc(100% - 0.1875rem);
+  }
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+    right: calc(100% - 0.1875rem);
+  }
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+    position: absolute;
+    top: 50%;
+    width: 0.5rem;
+    height: 0.5rem;
+    margin-top: -2px;
+    transform: translateY(-50%) rotate(45deg);
+    /* Intentionally not using CSS logical properties. */
+    border-top: 0;
+    border-right: solid 2px currentColor;
+    border-bottom: solid 2px currentColor;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--button.primary-nav__menu-link--has-children[aria-expanded="true"]:after {
+    opacity: 1;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
+    padding-left: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
+    padding-right: 0;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
+    padding-right: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
+    padding-left: 0;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner {
+    padding-top: 2.25rem;
+    padding-bottom: 2.25rem;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link-inner:after {
+    transform-origin: center;
+    border-top-width: 9px;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-1 {
+    margin-right: 1.125rem;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-1 {
+    margin-left: 1.125rem;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu--level-1 {
+    display: flex;
+    align-items: stretch;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
+    margin-left: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
+    margin-right: 0;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
+    margin-right: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
+    margin-left: 0;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1 {
+    position: relative; /* Anchor secondary menu */
+    display: flex;
+    align-items: center;
+    width: max-content;
+    max-width: 12.5rem;
+    margin-top: 0;
+    margin-bottom: 0;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:not(:last-child) {
+    margin-right: 2.25rem;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-item--level-1:not(:last-child) {
+    margin-left: 2.25rem;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    margin-left: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    margin-right: 0;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    padding-left: 2.25rem;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    padding-right: 2.25rem;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    padding-right: 2.25rem;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    padding-left: 2.25rem;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    position: absolute;
+    z-index: 105; /* Appear above search container. */
+    top: calc(100% - 0.5625rem);
+    left: 50%;
+    visibility: hidden;
+    overflow: auto;
+    width: 15.625rem;
+    /**
        * Ensure that long level-2 menus will never overflow viewport (focused
        * elements should always be in viewport per accessibility guidelines).
        */
-      max-height: calc(100vh - 12.375rem);
-      margin-top: 0;
-      padding-top: 3.375rem;
-      padding-bottom: 3.375rem;
-      transition: none;
-      transform: translate(-50%, -1.25rem);
-      opacity: 0;
-      /* Intentionally not using CSS logical properties. */
-      border-top: solid #2494db 9px;
-      border-right: solid 1px transparent; /* Transparent borders useful for Windows High Contrast mode. */
-      border-bottom: solid 1px transparent;
-      border-left: solid 1px transparent;
-      border-radius: 0 0 2px 2px;
-      background: #fff;
-      box-shadow: 0 1px 36px rgba(0, 0, 0, 0.08)
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu--level-2.is-active-menu-parent {
-        visibility: visible;
-        margin-top: 0;
-        transform: translate(-50%, 0);
-        opacity: 1;
-      }
-
-    body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 {
-      display: block
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2:focus:before {
-        top: 0;
-        left: -0.5625rem;
-        height: 100%;
-        transform: none;
-      }
-
-      [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
-        padding-left: 0;
-    }
-
-      [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
-        padding-right: 0;
-    }
-
-      [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
-        padding-right: 0;
-    }
-
-      [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
-        padding-left: 0;
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
-        padding-top: 0.5625rem;
-        padding-bottom: 0.5625rem
-      }
-
-        body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner:after {
-          transform-origin: left;
-          border-top-width: 3px;
-        }
-
-body:not(.is-always-mobile-nav) {
+    max-height: calc(100vh - 12.375rem);
+    margin-top: 0;
+    padding-top: 3.375rem;
+    padding-bottom: 3.375rem;
+    transition: none;
+    transform: translate(-50%, -1.25rem);
+    opacity: 0;
+    /* Intentionally not using CSS logical properties. */
+    border-top: solid #2494db 9px;
+    border-right: solid 1px transparent; /* Transparent borders useful for Windows High Contrast mode. */
+    border-bottom: solid 1px transparent;
+    border-left: solid 1px transparent;
+    border-radius: 0 0 2px 2px;
+    background: #fff;
+    box-shadow: 0 1px 36px rgba(0, 0, 0, 0.08);
+  }
 
-    /**
+  body:not(.is-always-mobile-nav) .primary-nav__menu--level-2.is-active-menu-parent {
+    visibility: visible;
+    margin-top: 0;
+    transform: translate(-50%, 0);
+    opacity: 1;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 {
+    display: block;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2:focus:before {
+    top: 0;
+    left: -0.5625rem;
+    height: 100%;
+    transform: none;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
+    padding-left: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
+    padding-right: 0;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
+    padding-right: 0;
+  }
+
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
+    padding-left: 0;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner {
+    padding-top: 0.5625rem;
+    padding-bottom: 0.5625rem;
+  }
+
+  body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner:after {
+    transform-origin: left;
+    border-top-width: 3px;
+  }
+
+  /**
      * Arrow is placed outside of submenu because the submenu has the
      * `overflow: hidden` CSS rule applied.
      */
-}
-    body:not(.is-always-mobile-nav) .primary-nav__menu-🥕 {
-      position: absolute;
-      z-index: 105; /* Match level 2 menus. */
-      top: calc(100% - 1.125rem);
-      left: 50%;
-      visibility: hidden;
-      width: 0;
-      height: 0;
-      transform: translate(-50%, -1.25rem);
-      opacity: 0;
-      /* Intentionally not using CSS logical properties. */
-      border-right: solid 10px transparent;
-      border-bottom: solid 10px #2494db;
-      border-left: solid 10px transparent
-    }
-
-      body:not(.is-always-mobile-nav) .primary-nav__menu-🥕.is-active-menu-parent {
-        visibility: visible;
-        transform: translate(-50%, 0);
-        opacity: 1;
-      }
-
-body:not(.is-always-mobile-nav) {
+  body:not(.is-always-mobile-nav) .primary-nav__menu-🥕 {
+    position: absolute;
+    z-index: 105; /* Match level 2 menus. */
+    top: calc(100% - 1.125rem);
+    left: 50%;
+    visibility: hidden;
+    width: 0;
+    height: 0;
+    transform: translate(-50%, -1.25rem);
+    opacity: 0;
+    /* Intentionally not using CSS logical properties. */
+    border-right: solid 10px transparent;
+    border-bottom: solid 10px #2494db;
+    border-left: solid 10px transparent;
+  }
 
-    /**
+  body:not(.is-always-mobile-nav) .primary-nav__menu-🥕.is-active-menu-parent {
+    visibility: visible;
+    transform: translate(-50%, 0);
+    opacity: 1;
+  }
+
+  /**
      * When ensuring that long menus don't overflow viewport, we can give a
      * little extra room when the toolbar is fixed (and is shorter).
      */
-}
-    body:not(.is-always-mobile-nav) .is-fixed .primary-nav__menu--level-2 {
-      max-height: calc(100vh - 7.875rem);
-    }
+  body:not(.is-always-mobile-nav) .is-fixed .primary-nav__menu--level-2 {
+    max-height: calc(100vh - 7.875rem);
   }
+}
 
 /*
  * Take into account Drupal's admin toolbars when ensuring that long level-2
@@ -311,27 +300,25 @@ body:not(.is-always-mobile-nav) {
  */
 
 @media (min-width: 75rem) {
-  body:not(.is-always-mobile-nav) {
-    /* Toolbar is fixed, and tray is vertical or toolbar is horizontal and tray is closed. */
+  /* Toolbar is fixed, and tray is vertical or toolbar is horizontal and tray is closed. */
+  body.toolbar-vertical:not(.is-always-mobile-nav) .primary-nav__menu--level-2,
+  body.toolbar-horizontal.toolbar-fixed:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    max-height: calc(100vh - 14.8125rem);
   }
-      body:not(.is-always-mobile-nav).toolbar-vertical .primary-nav__menu--level-2, body:not(.is-always-mobile-nav).toolbar-horizontal.toolbar-fixed .primary-nav__menu--level-2 {
-        max-height: calc(100vh - 14.8125rem);
-      }
 
-      body:not(.is-always-mobile-nav).toolbar-vertical .is-fixed .primary-nav__menu--level-2, body:not(.is-always-mobile-nav).toolbar-horizontal.toolbar-fixed .is-fixed .primary-nav__menu--level-2 {
-        max-height: calc(100vh - 10.3125rem);
-      }
-  body:not(.is-always-mobile-nav) {
+  body.toolbar-vertical:not(.is-always-mobile-nav) .is-fixed .primary-nav__menu--level-2,
+  body.toolbar-horizontal.toolbar-fixed:not(.is-always-mobile-nav) .is-fixed .primary-nav__menu--level-2 {
+    max-height: calc(100vh - 10.3125rem);
+  }
 
-    /* Toolbar is horizontal fixed, and tray is open. */
+  /* Toolbar is horizontal fixed, and tray is open. */
+  body.toolbar-horizontal.toolbar-fixed.toolbar-tray-open:not(.is-always-mobile-nav) .primary-nav__menu--level-2 {
+    max-height: calc(100vh - 17.3125rem);
   }
-      body:not(.is-always-mobile-nav).toolbar-horizontal.toolbar-fixed.toolbar-tray-open .primary-nav__menu--level-2 {
-        max-height: calc(100vh - 17.3125rem);
-      }
 
-      body:not(.is-always-mobile-nav).toolbar-horizontal.toolbar-fixed.toolbar-tray-open .is-fixed .primary-nav__menu--level-2 {
-        max-height: calc(100vh - 12.8125rem);
-      }
+  body.toolbar-horizontal.toolbar-fixed.toolbar-tray-open:not(.is-always-mobile-nav) .is-fixed .primary-nav__menu--level-2 {
+    max-height: calc(100vh - 12.8125rem);
+  }
 }
 
 /*
@@ -340,14 +327,14 @@ body:not(.is-always-mobile-nav) {
  */
 
 @media (min-width: 75rem) {
-    html.js body:not(.is-always-mobile-nav) .primary-nav__menu--level-2,
-    html.js body:not(.is-always-mobile-nav) .primary-nav__menu-🥕 {
-      transition: visibility 0.2s, transform 0.2s, opacity 0.2s;
-    }
+  html.js body:not(.is-always-mobile-nav) .primary-nav__menu--level-2,
+  html.js body:not(.is-always-mobile-nav) .primary-nav__menu-🥕 {
+    transition: visibility 0.2s, transform 0.2s, opacity 0.2s;
   }
+}
 
 @media (min-width: 75rem) {
-        [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner:after {
-          transform-origin: right;
-        }
-    }
+  [dir="rtl"] body:not(.is-always-mobile-nav) .primary-nav__menu-link--level-2 .primary-nav__menu-link-inner:after {
+    transform-origin: right;
+  }
+}
diff --git a/web/core/themes/olivero/css/components/navigation/nav-primary.css b/web/core/themes/olivero/css/components/navigation/nav-primary.css
index c66931d62..4cff2ccc2 100644
--- a/web/core/themes/olivero/css/components/navigation/nav-primary.css
+++ b/web/core/themes/olivero/css/components/navigation/nav-primary.css
@@ -16,24 +16,24 @@
 }
 
 .primary-nav__menu-item {
-  margin-bottom: 0.5625rem
+  margin-bottom: 0.5625rem;
 }
 
 .primary-nav__menu-item:last-child {
-    margin-bottom: 0;
-  }
+  margin-bottom: 0;
+}
 
 .primary-nav__menu-item.primary-nav__menu-item--has-children {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-between
-  }
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
 
 .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--link,
-    .primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--nolink {
-      /* Ensure that long text doesn't make the mobile expand button wrap. */
-      flex-basis: calc(100% - 3.375rem);
-    }
+.primary-nav__menu-item.primary-nav__menu-item--has-children .primary-nav__menu-link--nolink {
+  /* Ensure that long text doesn't make the mobile expand button wrap. */
+  flex-basis: calc(100% - 3.375rem);
+}
 
 .primary-nav__menu-link {
   flex-grow: 1;
@@ -41,17 +41,17 @@
   color: #0d1214;
   font-size: 1.75rem;
   font-weight: bold;
-  line-height: 2.25rem
+  line-height: 2.25rem;
 }
 
 .primary-nav__menu-link:hover {
-    color: inherit;
-  }
+  color: inherit;
+}
 
 .primary-nav__menu-link:focus {
-    outline: auto 2px #2494db;
-    outline-offset: 2px;
-  }
+  outline: auto 2px #2494db;
+  outline-offset: 2px;
+}
 
 [dir="ltr"] .primary-nav__menu-link--nolink {
   padding-left: 0;
@@ -106,51 +106,51 @@
   padding-bottom: 0;
   cursor: pointer;
   border: 0;
-  background: transparent
+  background: transparent;
 
   /* Plus icon for mobile navigation. */
 }
 
 [dir="ltr"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
-    padding-right: 3.375rem;
+  padding-right: 3.375rem;
 }
 
 [dir="rtl"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children {
-    padding-left: 3.375rem;
+  padding-left: 3.375rem;
 }
 
 .primary-nav__menu-link--button.primary-nav__menu-link--has-children { /* Ensure text does not overlap icon. */
-  }
+}
 
-[dir="ltr"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,[dir="ltr"] 
-    .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-      right: 0.5625rem;
+[dir="ltr"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
+[dir="ltr"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+  right: 0.5625rem;
 }
 
-[dir="rtl"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,[dir="rtl"] 
-    .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-      left: 0.5625rem;
+[dir="rtl"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
+[dir="rtl"] .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+  left: 0.5625rem;
 }
 
 .primary-nav__menu-link--button.primary-nav__menu-link--has-children:before,
-    .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-      position: absolute;
-      top: 1.625rem; /* Visually align button with menu link text. */
-      width: 1.125rem;
-      height: 0;
-      content: "";
-      /* Intentionally not using CSS logical properties. */
-      border-top: solid 3px #2494db;
-    }
+.primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
+  position: absolute;
+  top: 1.625rem; /* Visually align button with menu link text. */
+  width: 1.125rem;
+  height: 0;
+  content: "";
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 3px #2494db;
+}
 
 .primary-nav__menu-link--button.primary-nav__menu-link--has-children:after {
-      transition: opacity 0.2s;
-      transform: rotate(90deg);
-    }
+  transition: opacity 0.2s;
+  transform: rotate(90deg);
+}
 
 .primary-nav__menu-link--button.primary-nav__menu-link--has-children[aria-expanded="true"]:after {
-      opacity: 0;
-    }
+  opacity: 0;
+}
 
 [dir="ltr"] .primary-nav__menu-link-inner {
   padding-left: 0;
@@ -173,33 +173,33 @@
   display: inline-flex;
   align-items: center;
   padding-top: 0.5625rem;
-  padding-bottom: 0.5625rem
+  padding-bottom: 0.5625rem;
 }
 
 [dir="ltr"] .primary-nav__menu-link-inner:after {
-    left: 0;
+  left: 0;
 }
 
 [dir="rtl"] .primary-nav__menu-link-inner:after {
-    right: 0;
+  right: 0;
 }
 
 .primary-nav__menu-link-inner:after {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 0;
-    content: "";
-    transition: transform 0.2s;
-    transform: scaleX(0);
-    transform-origin: left;
-    /* Intentionally not using CSS logical properties. */
-    border-top: solid 5px #2494db;
-  }
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 0;
+  content: "";
+  transition: transform 0.2s;
+  transform: scaleX(0);
+  transform-origin: left;
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 5px #2494db;
+}
 
 .primary-nav__menu-link:hover .primary-nav__menu-link-inner:after {
-      transform: scaleX(1)
-  }
+  transform: scaleX(1);
+}
 
 /*
   Top level specific styles.
@@ -271,11 +271,11 @@
 }
 
 [dir="ltr"] .primary-nav__menu--level-2 {
-  border-left: solid 18px #2494db;
+  border-left: solid 1.125rem #2494db;
 }
 
 [dir="rtl"] .primary-nav__menu--level-2 {
-  border-right: solid 18px #2494db;
+  border-right: solid 1.125rem #2494db;
 }
 
 .primary-nav__menu--level-2 {
@@ -286,34 +286,34 @@
   margin-top: 0;
   margin-bottom: 0;
   transition: opacity 0.2s, visibility 0.2s, max-height 0.2s;
-  opacity: 0
+  opacity: 0;
 }
 
 .primary-nav__menu--level-2.is-active-menu-parent {
-    visibility: visible;
-    max-height: none;
-    margin-top: 1.6875rem;
-    opacity: 1;
-  }
+  visibility: visible;
+  max-height: none;
+  margin-top: 1.6875rem;
+  opacity: 1;
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .primary-nav__menu--level-2 {
+  [dir="ltr"] .primary-nav__menu--level-2 {
     margin-left: -3.375rem;
   }
 
-[dir="rtl"] .primary-nav__menu--level-2 {
+  [dir="rtl"] .primary-nav__menu--level-2 {
     margin-right: -3.375rem;
   }
 
-[dir="ltr"] .primary-nav__menu--level-2 {
+  [dir="ltr"] .primary-nav__menu--level-2 {
     padding-left: 3.375rem;
   }
 
-[dir="rtl"] .primary-nav__menu--level-2 {
+  [dir="rtl"] .primary-nav__menu--level-2 {
     padding-right: 3.375rem;
   }
-  }
+}
 
 /*
  * Olivero doesn't officially support nested tertiary submenus, but this
@@ -333,11 +333,11 @@
 }
 
 html:not(.js) .primary-nav__menu--level-2 {
-    visibility: visible;
-    max-height: none;
-    opacity: 1;
-  }
+  visibility: visible;
+  max-height: none;
+  opacity: 1;
+}
 
 [dir="rtl"] .primary-nav__menu-link-inner:after {
-      transform-origin: right;
-    }
+  transform-origin: right;
+}
diff --git a/web/core/themes/olivero/css/components/navigation/nav-secondary.css b/web/core/themes/olivero/css/components/navigation/nav-secondary.css
index 5ccab88c1..646ca0c25 100644
--- a/web/core/themes/olivero/css/components/navigation/nav-secondary.css
+++ b/web/core/themes/olivero/css/components/navigation/nav-secondary.css
@@ -66,15 +66,15 @@
 
   /* @todo should this be scoped to desktop nav? */
   width: max-content;
-  max-width: 12.5rem
+  max-width: 12.5rem;
 }
 
 [dir="ltr"] .secondary-nav__menu-item:not(:last-child) {
-    margin-right: 1.6875rem;
+  margin-right: 1.6875rem;
 }
 
 [dir="rtl"] .secondary-nav__menu-item:not(:last-child) {
-    margin-left: 1.6875rem;
+  margin-left: 1.6875rem;
 }
 
 .secondary-nav__menu-link {
@@ -83,85 +83,85 @@
   align-items: center;
   height: 2.25rem;
   text-decoration: none;
-  color: inherit
+  color: inherit;
 }
 
 .secondary-nav__menu-link:after {
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 0;
-    content: "";
-    transition: opacity 0.2s, transform 0.2s;
-    transform: translateY(0.3125rem);
-    opacity: 0;
-    /* Intentionally not using CSS logical properties. */
-    border-top: solid 2px currentColor;
-  }
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 0;
+  content: "";
+  transition: opacity 0.2s, transform 0.2s;
+  transform: translateY(0.3125rem);
+  opacity: 0;
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 2px currentColor;
+}
 
 .secondary-nav__menu-link:hover:after {
-      transform: translateY(0);
-      opacity: 0.8;
-    }
+  transform: translateY(0);
+  opacity: 0.8;
+}
 
 @media (min-width: 75rem) {
-    [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav {
-      margin-left: 1.125rem;
+  [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav {
+    margin-left: 1.125rem;
+  }
+  [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav {
+    margin-right: 1.125rem;
   }
-    [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav {
-      margin-right: 1.125rem;
+  [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav {
+    padding-left: 2.25rem;
   }
-    [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav {
-      padding-left: 2.25rem;
+  [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav {
+    padding-right: 2.25rem;
   }
-    [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav {
-      padding-right: 2.25rem;
+  body:not(.is-always-mobile-nav) .secondary-nav {
+    position: relative;
+    display: flex;
   }
-    body:not(.is-always-mobile-nav) .secondary-nav {
-      position: relative;
-      display: flex
-    }
 
-      [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav:before {
-        left: 0;
+  [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav:before {
+    left: 0;
   }
 
-      [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav:before {
-        right: 0;
+  [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav:before {
+    right: 0;
   }
 
-      body:not(.is-always-mobile-nav) .secondary-nav:before {
-        position: absolute;
-        top: 50%;
-        width: 2px;
-        height: 2.25rem;
-        content: "";
-        transform: translateY(-50%);
-        background-color: #d7e1e8;
-      }
-
-    [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav__menu-item:not(:last-child) {
-      margin-right: 2.25rem;
+  body:not(.is-always-mobile-nav) .secondary-nav:before {
+    position: absolute;
+    top: 50%;
+    width: 2px;
+    height: 2.25rem;
+    content: "";
+    transform: translateY(-50%);
+    background-color: #d7e1e8;
+  }
+
+  [dir="ltr"] body:not(.is-always-mobile-nav) .secondary-nav__menu-item:not(:last-child) {
+    margin-right: 2.25rem;
   }
 
-    [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav__menu-item:not(:last-child) {
-      margin-left: 2.25rem;
+  [dir="rtl"] body:not(.is-always-mobile-nav) .secondary-nav__menu-item:not(:last-child) {
+    margin-left: 2.25rem;
+  }
+  body:not(.is-always-mobile-nav) .secondary-nav__menu-link:focus {
+    position: relative;
+    outline: 0;
   }
-      body:not(.is-always-mobile-nav) .secondary-nav__menu-link:focus {
-        position: relative;
-        outline: 0
-      }
-
-        body:not(.is-always-mobile-nav) .secondary-nav__menu-link:focus:before {
-          position: absolute;
-          top: 50%;
-          left: 50%;
-          width: calc(100% + 1.125rem);
-          height: 3.375rem;
-          content: "";
-          transform: translate(-50%, -50%);
-          border: solid 2px #2494db;
-          border-radius: 0.25rem;
-        }
+
+  body:not(.is-always-mobile-nav) .secondary-nav__menu-link:focus:before {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: calc(100% + 1.125rem);
+    height: 3.375rem;
+    content: "";
+    transform: translate(-50%, -50%);
+    border: solid 2px #2494db;
+    border-radius: 0.25rem;
   }
+}
diff --git a/web/core/themes/olivero/css/components/navigation/wide-nav-expand.css b/web/core/themes/olivero/css/components/navigation/wide-nav-expand.css
index b0e008279..068f7ec62 100644
--- a/web/core/themes/olivero/css/components/navigation/wide-nav-expand.css
+++ b/web/core/themes/olivero/css/components/navigation/wide-nav-expand.css
@@ -11,12 +11,12 @@
  */
 
 .wide-nav-expand {
-  display: none
+  display: none;
 }
 
 @media (min-width: 75rem) {
 
-.wide-nav-expand {
+  .wide-nav-expand {
     display: flex;
     visibility: hidden;
     flex-shrink: 0;
@@ -28,28 +28,28 @@
     pointer-events: auto;
     color: #fff;
     border: 0;
-    background-color: #2494db
-}
+    background-color: #2494db;
+  }
 
-    .wide-nav-expand:focus {
-      outline: solid 2px currentColor;
-      outline-offset: -4px;
-    }
+  .wide-nav-expand:focus {
+    outline: solid 2px currentColor;
+    outline-offset: -4px;
   }
+}
 
 @media (min-width: 75rem) {
 
-body:not(.is-always-mobile-nav) .is-fixed .wide-nav-expand {
-    visibility: visible
-}
+  body:not(.is-always-mobile-nav) .is-fixed .wide-nav-expand {
+    visibility: visible;
   }
+}
 
 @media (min-width: 75rem) {
 
-body.is-always-mobile-nav .wide-nav-expand {
-    visibility: hidden
-}
+  body.is-always-mobile-nav .wide-nav-expand {
+    visibility: hidden;
   }
+}
 
 .wide-nav-expand__icon {
   position: relative;
@@ -58,82 +58,82 @@ body.is-always-mobile-nav .wide-nav-expand {
   transition: opacity 0.2s;
   pointer-events: none;
   opacity: 0;
-  transform-style: preserve-3d
+  transform-style: preserve-3d;
 }
 
 .wide-nav-expand__icon > span {
-    display: block;
-    height: 0;
-    /* Intentionally not using CSS logical properties. */
-    border-top: solid 3px currentColor
-  }
+  display: block;
+  height: 0;
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 3px currentColor;
+}
 
 [dir="ltr"] .wide-nav-expand__icon > span:nth-child(1) {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .wide-nav-expand__icon > span:nth-child(1) {
-      right: 0
+  right: 0;
 }
 
 .wide-nav-expand__icon > span:nth-child(1) {
-      position: absolute;
-      top: 0;
-      width: 100%;
-      height: 0;
-      transition: transform 0.2s;
-      background-color: currentColor;
-    }
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 0;
+  transition: transform 0.2s;
+  background-color: currentColor;
+}
 
 [dir="ltr"] .wide-nav-expand__icon > span:nth-child(2) {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .wide-nav-expand__icon > span:nth-child(2) {
-      right: 0
+  right: 0;
 }
 
 .wide-nav-expand__icon > span:nth-child(2) {
-      position: absolute;
-      top: 0.5625rem;
-      width: 100%;
-      height: 0;
-      transition: opacity 0.2s;
-      background-color: currentColor;
-    }
+  position: absolute;
+  top: 0.5625rem;
+  width: 100%;
+  height: 0;
+  transition: opacity 0.2s;
+  background-color: currentColor;
+}
 
 [dir="ltr"] .wide-nav-expand__icon > span:nth-child(3) {
-      left: 0
+  left: 0;
 }
 
 [dir="rtl"] .wide-nav-expand__icon > span:nth-child(3) {
-      right: 0
+  right: 0;
 }
 
 .wide-nav-expand__icon > span:nth-child(3) {
-      position: absolute;
-      top: auto;
-      bottom: 0;
-      width: 100%;
-      height: 0;
-      transition: transform 0.2s;
-      background-color: currentColor;
-    }
+  position: absolute;
+  top: auto;
+  bottom: 0;
+  width: 100%;
+  height: 0;
+  transition: transform 0.2s;
+  background-color: currentColor;
+}
 
 .is-fixed .wide-nav-expand__icon {
   opacity: 1;
 }
 
 [aria-expanded="true"] .wide-nav-expand__icon > span:nth-child(1) {
-    top: 0.5625rem;
-    transform: rotate(-45deg);
-  }
+  top: 0.5625rem;
+  transform: rotate(-45deg);
+}
 
 [aria-expanded="true"] .wide-nav-expand__icon > span:nth-child(2) {
-    opacity: 0;
-  }
+  opacity: 0;
+}
 
 [aria-expanded="true"] .wide-nav-expand__icon > span:nth-child(3) {
-    top: 0.5625rem;
-    transform: rotate(45deg);
-  }
+  top: 0.5625rem;
+  transform: rotate(45deg);
+}
diff --git a/web/core/themes/olivero/css/components/node-teaser.css b/web/core/themes/olivero/css/components/node-teaser.css
index 09b63b683..78de8d23a 100644
--- a/web/core/themes/olivero/css/components/node-teaser.css
+++ b/web/core/themes/olivero/css/components/node-teaser.css
@@ -12,212 +12,212 @@
 
 .node--view-mode-teaser {
   position: relative; /* Anchor after pseudo-element. */
-  margin-bottom: 1.6875rem
+  margin-bottom: 1.6875rem;
 }
 
 .node--view-mode-teaser:after {
-    position: absolute;
-    bottom: 0;
-    width: 3.375rem;
-    height: 0;
-    content: "";
-    /* Intentionally not using CSS logical properties. */
-    border-top: solid 2px #e7edf1;
-  }
+  position: absolute;
+  bottom: 0;
+  width: 3.375rem;
+  height: 0;
+  content: "";
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 2px #e7edf1;
+}
 
 .node--view-mode-teaser .node__meta {
-    margin-bottom: 1.125rem
-  }
+  margin-bottom: 1.125rem;
+}
 
 .node--view-mode-teaser .node__meta a {
-      color: #0d77b5;
-      font-weight: bold;
-    }
+  color: #0d77b5;
+  font-weight: bold;
+}
 
 .node--view-mode-teaser .node__top-wrapper {
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    margin: 0
-  }
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  margin: 0;
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser .node__top-wrapper {
-      position: relative /* Anchor the image */
+  .node--view-mode-teaser .node__top-wrapper {
+    position: relative; /* Anchor the image */
   }
-    }
+}
 
 [dir="ltr"] .node--view-mode-teaser .primary-image {
-    margin-right: 1.125rem
+  margin-right: 1.125rem;
 }
 
 [dir="rtl"] .node--view-mode-teaser .primary-image {
-    margin-left: 1.125rem
+  margin-left: 1.125rem;
 }
 
 .node--view-mode-teaser .primary-image {
-    flex-shrink: 0;
-    margin: 0;
-    margin-bottom: 1.125rem
+  flex-shrink: 0;
+  margin: 0;
+  margin-bottom: 1.125rem;
 
-    /* Ensure title does not wrap under image until necessary. */
-  }
+  /* Ensure title does not wrap under image until necessary. */
+}
 
 .node--view-mode-teaser .primary-image + .node__title {
-      flex-basis: calc(100% - 5.0625rem)
-    }
+  flex-basis: calc(100% - 5.0625rem);
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser .primary-image + .node__title {
-        flex-basis: auto
-    }
-      }
+  .node--view-mode-teaser .primary-image + .node__title {
+    flex-basis: auto;
+  }
+}
 
 .node--view-mode-teaser .primary-image a {
-      display: block;
-    }
+  display: block;
+}
 
 .node--view-mode-teaser .primary-image img {
-      width: 3.9375rem;
-      height: 3.9375rem;
-      object-fit: cover;
-      border-radius: 50%
-    }
+  width: 3.9375rem;
+  height: 3.9375rem;
+  object-fit: cover;
+  border-radius: 50%;
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser .primary-image img {
-        width: calc(7.14286vw - 2.31696rem);
-        height: calc(7.14286vw - 2.31696rem)
-    }
-      }
+  .node--view-mode-teaser .primary-image img {
+    width: calc(7.14286vw - 2.31696rem);
+    height: calc(7.14286vw - 2.31696rem);
+  }
+}
 
 @media (min-width: 75rem) {
 
-.node--view-mode-teaser .primary-image img {
-        width: calc(7.14286vw - 2.87946rem);
-        height: calc(7.14286vw - 2.87946rem)
-    }
-      }
+  .node--view-mode-teaser .primary-image img {
+    width: calc(7.14286vw - 2.87946rem);
+    height: calc(7.14286vw - 2.87946rem);
+  }
+}
 
 @media (min-width: 90rem) {
 
-.node--view-mode-teaser .primary-image img {
-        width: 3.61607rem;
-        height: 3.61607rem
-    }
-      }
+  .node--view-mode-teaser .primary-image img {
+    width: 3.61607rem;
+    height: 3.61607rem;
+  }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .node--view-mode-teaser .primary-image {
-      left: calc(-7.14286vw - -1.07143px)
+  [dir="ltr"] .node--view-mode-teaser .primary-image {
+    left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .node--view-mode-teaser .primary-image {
-      right: calc(-7.14286vw - -1.07143px)
+  [dir="rtl"] .node--view-mode-teaser .primary-image {
+    right: calc(-7.14286vw - -0.06696rem);
   }
 
-.node--view-mode-teaser .primary-image {
-      position: absolute;
-      top: 0;
-      margin: 0
+  .node--view-mode-teaser .primary-image {
+    position: absolute;
+    top: 0;
+    margin: 0;
   }
-    }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .node--view-mode-teaser .primary-image {
-      left: calc(-7.14286vw - -0.62946rem)
+  [dir="ltr"] .node--view-mode-teaser .primary-image {
+    left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .node--view-mode-teaser .primary-image {
-      right: calc(-7.14286vw - -0.62946rem)
+  [dir="rtl"] .node--view-mode-teaser .primary-image {
+    right: calc(-7.14286vw - -0.62946rem);
   }
-    }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .node--view-mode-teaser .primary-image {
-      left: -5.86607rem
+  [dir="ltr"] .node--view-mode-teaser .primary-image {
+    left: -5.86607rem;
   }
 
-[dir="rtl"] .node--view-mode-teaser .primary-image {
-      right: -5.86607rem
+  [dir="rtl"] .node--view-mode-teaser .primary-image {
+    right: -5.86607rem;
   }
-    }
+}
 
 .node--view-mode-teaser .node__title {
-    margin: 0;
-    margin-bottom: 1.125rem;
-    color: #0d1214;
-    font-size: 1.5rem;
-    line-height: 1.6875rem
-  }
+  margin: 0;
+  margin-bottom: 1.125rem;
+  color: #0d1214;
+  font-size: 1.5rem;
+  line-height: 1.6875rem;
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser .node__title {
-      font-size: 2.25rem;
-      line-height: 3.375rem
+  .node--view-mode-teaser .node__title {
+    font-size: 2.25rem;
+    line-height: 3.375rem;
   }
-    }
+}
 
 [dir="ltr"] .node--view-mode-teaser .field--tag-ref {
-    margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .node--view-mode-teaser .field--tag-ref {
-    margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .node--view-mode-teaser .field--tag-ref {
-    margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .node--view-mode-teaser .field--tag-ref {
-    margin-left: 0
+  margin-left: 0;
 }
 
 [dir="ltr"] .node--view-mode-teaser .field--tag-ref {
-    padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .node--view-mode-teaser .field--tag-ref {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .node--view-mode-teaser .field--tag-ref {
-    padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .node--view-mode-teaser .field--tag-ref {
-    padding-left: 0
+  padding-left: 0;
 }
 
 .node--view-mode-teaser .field--tag-ref {
-    margin-top: 1.125rem;
-    margin-bottom: 0;
-    padding-top: 0;
-    padding-bottom: 0;
-    background-color: transparent
-  }
+  margin-top: 1.125rem;
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  background-color: transparent;
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser .field--tag-ref {
-      margin-top: 2.25rem
+  .node--view-mode-teaser .field--tag-ref {
+    margin-top: 2.25rem;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.node--view-mode-teaser {
-    margin-bottom: 3.375rem
-}
+  .node--view-mode-teaser {
+    margin-bottom: 3.375rem;
   }
+}
 
 .views-row:last-child .node--view-mode-teaser {
   margin-bottom: 0;
diff --git a/web/core/themes/olivero/css/components/node.css b/web/core/themes/olivero/css/components/node.css
index 6fe21a532..b98bd9da6 100644
--- a/web/core/themes/olivero/css/components/node.css
+++ b/web/core/themes/olivero/css/components/node.css
@@ -16,26 +16,26 @@
   margin-bottom: 1.125rem;
   color: #6e7172;
   font-size: 0.875rem;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 .node__meta a {
-    font-weight: bold;
-  }
+  font-weight: bold;
+}
 
 @media (min-width: 31.25rem) {
 
-.node__meta {
-    margin-bottom: 2.25rem
-}
+  .node__meta {
+    margin-bottom: 2.25rem;
   }
+}
 
 [dir="ltr"] .node__author-image img {
-  margin-right: 0.5625rem
+  margin-right: 0.5625rem;
 }
 
 [dir="rtl"] .node__author-image img {
-  margin-left: 0.5625rem
+  margin-left: 0.5625rem;
 }
 
 .node__author-image img {
@@ -46,36 +46,36 @@
 }
 
 .node__title a {
-    padding-bottom: 0.1875rem;
-    transition: background-size 0.2s, color 0.2s;
-    text-decoration: none;
-    color: #0d1214;
-    background-color: transparent;
-    background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
-    background-repeat: no-repeat;
-    background-position: bottom left; /* LTR */
-    background-size: 0 0.1875rem
-  }
+  padding-bottom: 0.1875rem;
+  transition: background-size 0.2s, color 0.2s;
+  text-decoration: none;
+  color: #0d1214;
+  background-color: transparent;
+  background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
+  background-repeat: no-repeat;
+  background-position: bottom left; /* LTR */
+  background-size: 0 0.1875rem;
+}
 
 .node__title a:hover,
-    .node__title a:focus {
-      color: #0d77b5;
-    }
+.node__title a:focus {
+  color: #0d77b5;
+}
 
 [dir="rtl"] .node__title {
   background-position: bottom right;
 }
 
 .node__content {
-  padding-bottom: 1.6875rem
+  padding-bottom: 1.6875rem;
 }
 
 @media (min-width: 62.5rem) {
 
-.node__content {
-    padding-bottom: 3.375rem
-}
+  .node__content {
+    padding-bottom: 3.375rem;
   }
+}
 
 .node--unpublished {
   /* There is no variable for the color - #fff4f4. */
diff --git a/web/core/themes/olivero/css/components/off-canvas.css b/web/core/themes/olivero/css/components/off-canvas.css
index 2054b7516..cb67c0ee2 100644
--- a/web/core/themes/olivero/css/components/off-canvas.css
+++ b/web/core/themes/olivero/css/components/off-canvas.css
@@ -11,114 +11,96 @@
  */
 
 [dir="ltr"] #drupal-off-canvas .form-type-boolean {
-    margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] #drupal-off-canvas .form-type-boolean {
-    margin-right: 0
+  margin-right: 0;
 }
 
 #drupal-off-canvas .form-type-boolean {
-    line-height: 1.125rem
-  }
+  line-height: 1.125rem;
+}
 
 #drupal-off-canvas .form-type-boolean input[type="checkbox"],
-    #drupal-off-canvas .form-type-boolean input[type="radio"] {
-      float: none;
-      width: 0.84375rem;
-      height: 0.84375rem;
-      transform: none;
-      vertical-align: middle;
-    }
+#drupal-off-canvas .form-type-boolean input[type="radio"] {
+  float: none;
+  width: 0.84375rem;
+  height: 0.84375rem;
+  transform: none;
+  vertical-align: middle;
+}
 
 [dir="ltr"] #drupal-off-canvas .form-type-boolean .form-item__description {
-      margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] #drupal-off-canvas .form-type-boolean .form-item__description {
-      margin-right: 0
+  margin-right: 0;
 }
 
-#drupal-off-canvas {
-
-  /* Necessary for Safari. */
-}
+/* Necessary for Safari. */
 
 #drupal-off-canvas .olivero-details {
-    border-top: solid 1px rgba(255, 255, 255, 0.25);
-    border-bottom: solid 1px rgba(255, 255, 255, 0.25);
-    box-shadow: none;
-  }
+  border-top: solid 1px rgba(255, 255, 255, 0.25);
+  border-bottom: solid 1px rgba(255, 255, 255, 0.25);
+  box-shadow: none;
+}
 
 #drupal-off-canvas .olivero-details__wrapper {
-    padding: 1.25rem;
-  }
-
-#drupal-off-canvas {
-
-  /* Necessary for Safari. */
+  padding: 1.25rem;
 }
 
+/* Necessary for Safari. */
+
 #drupal-off-canvas .olivero-details__summary {
-    display: block;
-    list-style: disc outside none;
-    list-style: initial
-  }
+  display: block;
+  list-style: disc outside none;
+  list-style: initial;
+}
 
 #drupal-off-canvas .olivero-details__summary:focus {
-      outline: solid 1px rgba(255, 255, 255, 0.25);
-    }
+  outline: solid 1px rgba(255, 255, 255, 0.25);
+}
 
 #drupal-off-canvas .olivero-details__summary:before {
-      content: none;
-    }
+  content: none;
+}
 
 #drupal-off-canvas .olivero-details__summary::-webkit-details-marker {
-      display: inline-block;
-    }
-
-#drupal-off-canvas .olivero-details__summary {
+  display: inline-block;
+}
 
-    /* Necessary for IE11. */
-  }
+/* Necessary for IE11. */
 
 #drupal-off-canvas .olivero-details__summary .details-title:before {
-      content: none;
-    }
-
-#drupal-off-canvas .olivero-details__summary {
+  content: none;
+}
 
-    /* Necessary for Firefox. */
-  }
+/* Necessary for Firefox. */
 
 @supports (list-style-type: disclosure-closed) {
 
-#drupal-off-canvas .olivero-details__summary {
-      display: list-item;
-      list-style-position: inside;
-      list-style-type: disclosure-closed
+  #drupal-off-canvas .olivero-details__summary {
+    display: list-item;
+    list-style-position: inside;
+    list-style-type: disclosure-closed;
   }
-    }
-
-#drupal-off-canvas {
-
-  /* Necessary for Firefox. */
 }
 
+/* Necessary for Firefox. */
+
 @supports (list-style-type: disclosure-open) {
 
-#drupal-off-canvas .olivero-details[open] .olivero-details__summary {
-      list-style-type: disclosure-open
+  #drupal-off-canvas .olivero-details[open] .olivero-details__summary {
+    list-style-type: disclosure-open;
   }
-    }
-
-#drupal-off-canvas {
-
-  /* Necessary for Safari. */
 }
 
+/* Necessary for Safari. */
+
 #drupal-off-canvas div {
-    display: block;
-    color: #ddd;
-    font-size: 0.875rem;
-  }
+  display: block;
+  color: #ddd;
+  font-size: 0.875rem;
+}
diff --git a/web/core/themes/olivero/css/components/pager.css b/web/core/themes/olivero/css/components/pager.css
index c95a05a90..16ad7f058 100644
--- a/web/core/themes/olivero/css/components/pager.css
+++ b/web/core/themes/olivero/css/components/pager.css
@@ -54,16 +54,16 @@
   height: 2.8125rem;
   cursor: default;
   color: #6e7172;
-  background-color: #fff
+  background-color: #fff;
 }
 
 @media (min-width: 31.25rem) {
 
-.pager__item {
+  .pager__item {
     width: 3.375rem;
-    height: 3.375rem
-}
+    height: 3.375rem;
   }
+}
 
 [dir="rtl"] .pager__item--control {
   transform: scaleX(-1);
@@ -74,23 +74,21 @@
   background-color: #0d77b5;
 }
 
-.pager__item--control path {
-    /* IE11 Specific. */
-  }
+/* IE11 Specific. */
 
 @media (-ms-high-contrast: active) {
 
-.pager__item--control path {
-      fill: currentColor
+  .pager__item--control path {
+    fill: currentColor;
   }
-    }
+}
 
 @media (forced-colors: active) {
 
-.pager__item--control path {
-      fill: linktext
+  .pager__item--control path {
+    fill: linktext;
   }
-    }
+}
 
 .pager__link {
   display: flex;
diff --git a/web/core/themes/olivero/css/components/powered-by-block.css b/web/core/themes/olivero/css/components/powered-by-block.css
index 478d23fd0..01c4a4620 100644
--- a/web/core/themes/olivero/css/components/powered-by-block.css
+++ b/web/core/themes/olivero/css/components/powered-by-block.css
@@ -13,45 +13,45 @@
 .block-system-powered-by-block {
   letter-spacing: 0.02em;
   font-size: 0.875rem;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 .block-system-powered-by-block a {
-    text-decoration: underline
-  }
+  text-decoration: underline;
+}
 
 .block-system-powered-by-block a:hover,
-    .block-system-powered-by-block a:focus {
-      text-decoration: none;
-    }
+.block-system-powered-by-block a:focus {
+  text-decoration: none;
+}
 
 [dir="ltr"] .block-system-powered-by-block .drupal-logo {
-    margin-left: 0.28125rem
+  margin-left: 0.28125rem;
 }
 
 [dir="rtl"] .block-system-powered-by-block .drupal-logo {
-    margin-right: 0.28125rem
+  margin-right: 0.28125rem;
 }
 
 .block-system-powered-by-block .drupal-logo {
-    display: inline-block;
-    margin-top: -0.28125rem;
-  }
+  display: inline-block;
+  margin-top: -0.28125rem;
+}
 
 .block-system-powered-by-block svg {
-    width: 0.875rem; /* 14 */
-    height: 1.1875rem; /* 19 */
-    vertical-align: top
-  }
+  width: 0.875rem; /* 14 */
+  height: 1.1875rem; /* 19 */
+  vertical-align: top;
+}
 
 .block-system-powered-by-block svg path {
-      fill: currentColor;
-    }
+  fill: currentColor;
+}
 
 .site-footer .block-system-powered-by-block a {
-    color: #fff;
-  }
+  color: #fff;
+}
 
 .site-footer .block-system-powered-by-block svg path {
-    fill: #fff;
-  }
+  fill: #fff;
+}
diff --git a/web/core/themes/olivero/css/components/search-results.css b/web/core/themes/olivero/css/components/search-results.css
index 54a2a8bcc..43631b0c0 100644
--- a/web/core/themes/olivero/css/components/search-results.css
+++ b/web/core/themes/olivero/css/components/search-results.css
@@ -11,49 +11,49 @@
  */
 
 [dir="ltr"] .search-results {
-  padding-left: 0
+  padding-left: 0;
 }
 
 [dir="rtl"] .search-results {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="ltr"] .search-results {
-  padding-right: 0
+  padding-right: 0;
 }
 
 [dir="rtl"] .search-results {
-  padding-left: 0
+  padding-left: 0;
 }
 
 .search-results {
   margin-bottom: 2.25rem;
   padding-top: 0;
   padding-bottom: 0;
-  list-style: none
+  list-style: none;
 }
 
 @media (min-width: 43.75rem) {
 
-.search-results {
-    margin-bottom: 3.375rem
-}
+  .search-results {
+    margin-bottom: 3.375rem;
   }
+}
 
 [dir="ltr"] .search-result__title {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .search-result__title {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .search-result__title {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .search-result__title {
-  margin-left: 0
+  margin-left: 0;
 }
 
 .search-result__title {
@@ -61,47 +61,47 @@
   margin-bottom: 0;
   color: #0d1214;
   font-size: 1.25rem;
-  line-height: 1.6875rem
+  line-height: 1.6875rem;
 }
 
 .search-result__title a {
-    padding-bottom: 0.1875rem;
-    transition: background-size 0.2s, color 0.2s;
-    text-decoration: none;
-    background-color: transparent;
-    background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
-    background-repeat: no-repeat;
-    background-position: bottom left; /* LTR */
-    background-size: 0 0.1875rem
-  }
+  padding-bottom: 0.1875rem;
+  transition: background-size 0.2s, color 0.2s;
+  text-decoration: none;
+  background-color: transparent;
+  background-image: linear-gradient(#2494db, #2494db); /* Two values are needed for IE11 support. */
+  background-repeat: no-repeat;
+  background-position: bottom left; /* LTR */
+  background-size: 0 0.1875rem;
+}
 
 .search-result__title a:hover {
-      color: #0d77b5;
-    }
+  color: #0d77b5;
+}
 
 @media (min-width: 62.5rem) {
 
-.search-result__title {
+  .search-result__title {
     margin-bottom: 1.125rem;
     font-size: 1.875rem;
-    line-height: 3.375rem
-}
+    line-height: 3.375rem;
   }
+}
 
 [dir="rtl"] .search-result__title a {
   background-position: bottom right;
 }
 
 .search-result__snippet {
-  padding-bottom: 1.5625rem
+  padding-bottom: calc(1.6875rem - 2px);
 }
 
 @media (min-width: 62.5rem) {
 
-.search-result__snippet {
-    padding-bottom: 3.375rem
-}
+  .search-result__snippet {
+    padding-bottom: 3.375rem;
   }
+}
 
 .search-result__meta {
   display: flex;
@@ -109,36 +109,36 @@
   margin-bottom: 1.125rem;
   color: #6e7172;
   font-size: 0.875rem;
-  line-height: 1.125rem
+  line-height: 1.125rem;
 }
 
 .search-result__meta a {
-    color: #0d77b5;
-    font-weight: bold;
-  }
+  color: #0d77b5;
+  font-weight: bold;
+}
 
 .search-results__item {
   position: relative; /* Anchor after pseudo-element. */
-  margin-bottom: 1.6875rem
+  margin-bottom: 1.6875rem;
 }
 
 .search-results__item:after {
-    position: absolute;
-    bottom: 0;
-    width: 3.375rem;
-    height: 0;
-    content: "";
-    /* Intentionally not using CSS logical properties. */
-    border-top: solid 2px #e7edf1;
-  }
+  position: absolute;
+  bottom: 0;
+  width: 3.375rem;
+  height: 0;
+  content: "";
+  /* Intentionally not using CSS logical properties. */
+  border-top: solid 2px #e7edf1;
+}
 
 .search-results__item:last-child {
-    margin-bottom: 0;
-  }
+  margin-bottom: 0;
+}
 
 @media (min-width: 62.5rem) {
 
-.search-results__item {
-    margin-bottom: 3.375rem
-}
+  .search-results__item {
+    margin-bottom: 3.375rem;
   }
+}
diff --git a/web/core/themes/olivero/css/components/site-header.css b/web/core/themes/olivero/css/components/site-header.css
index 38914e416..55defcf0e 100644
--- a/web/core/themes/olivero/css/components/site-header.css
+++ b/web/core/themes/olivero/css/components/site-header.css
@@ -16,17 +16,17 @@
    * Ensure mobile site header is always above other elements including
    * contextual links, quick-edit, and Tour.
    */
-  z-index: 101
+  z-index: 101;
 }
 
 @media (min-width: 75rem) {
 
-.site-header {
+  .site-header {
     /* Necessary to keep the content from jumping up when header transitions to fixed. */
     min-height: 11.25rem;
-    border-bottom: solid 1px transparent /* Will show in Windows high contrast mode. */
-}
+    border-bottom: solid 1px transparent; /* Will show in Windows high contrast mode. */
   }
+}
 
 .site-header__initial {
   position: relative;
@@ -41,35 +41,32 @@
 .site-header__fixable {
   display: flex;
   align-items: flex-end;
-  transition: all 0.5s
+  transition: all 0.5s;
 }
 
 @media (min-width: 75rem) {
-      .site-header__fixable.is-fixed:not(.is-expanded) {
-        pointer-events: none;
-      }
-    }
+  .site-header__fixable.is-fixed:not(.is-expanded) {
+    pointer-events: none;
+  }
+}
 
 @media (min-width: 75rem) {
-    body:not(.is-always-mobile-nav) .site-header__fixable.is-fixed {
-      position: fixed;
-      z-index: 102; /* Appear above body content that is position: relative */
-      top: -4.5rem;
-      max-width: 98.125rem;
-    }
-  body:not(.is-always-mobile-nav) {
-
-    /* Toolbar is fixed, and tray is either vertical or closed and horizontal. */
+  body:not(.is-always-mobile-nav) .site-header__fixable.is-fixed {
+    position: fixed;
+    z-index: 102; /* Appear above body content that is position: relative */
+    top: -4.5rem;
+    max-width: 98.125rem;
   }
-      body:not(.is-always-mobile-nav).toolbar-vertical.toolbar-fixed .site-header__fixable.is-fixed, body:not(.is-always-mobile-nav).toolbar-horizontal.toolbar-fixed .site-header__fixable.is-fixed {
-        top: -2.0625rem;
-      }
-  body:not(.is-always-mobile-nav) {
-    /* Toolbar is fixed, and tray is open and horizontal. */
+
+  /* Toolbar is fixed, and tray is either vertical or closed and horizontal. */
+  body.toolbar-vertical.toolbar-fixed:not(.is-always-mobile-nav) .site-header__fixable.is-fixed,
+  body.toolbar-horizontal.toolbar-fixed:not(.is-always-mobile-nav) .site-header__fixable.is-fixed {
+    top: -2.0625rem;
+  }
+  /* Toolbar is fixed, and tray is open and horizontal. */
+  body.toolbar-horizontal.toolbar-fixed.toolbar-tray-open:not(.is-always-mobile-nav) .site-header__fixable.is-fixed {
+    top: 0.4375rem;
   }
-    body:not(.is-always-mobile-nav).toolbar-horizontal.toolbar-fixed.toolbar-tray-open .site-header__fixable.is-fixed {
-      top: 0.4375rem;
-    }
 }
 
 .site-header__inner {
@@ -86,41 +83,41 @@
 
 @media (min-width: 75rem) {
 
-html.js body:not(.is-always-mobile-nav) .site-header__inner {
-    transition: opacity 0.3s, transform 0.3s, box-shadow 0.3s
-}
+  html.js body:not(.is-always-mobile-nav) .site-header__inner {
+    transition: opacity 0.3s, transform 0.3s, box-shadow 0.3s;
   }
+}
 
 @media (min-width: 75rem) {
 
-.site-header__fixable.is-expanded .site-header__inner {
-    box-shadow: -36px 1px 36px rgba(0, 0, 0, 0.08) /* LTR */
-}
+  .site-header__fixable.is-expanded .site-header__inner {
+    box-shadow: -36px 1px 36px rgba(0, 0, 0, 0.08); /* LTR */
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="rtl"] .site-header__fixable.is-expanded .site-header__inner {
-    box-shadow: 36px 1px 36px rgba(0, 0, 0, 0.08)
-}
+  [dir="rtl"] .site-header__fixable.is-expanded .site-header__inner {
+    box-shadow: 36px 1px 36px rgba(0, 0, 0, 0.08);
   }
+}
 
 /* Hide the desktop nav when it's fixed and not active. */
 
 @media (min-width: 75rem) {
 
-body:not(.is-always-mobile-nav) .site-header__fixable.is-fixed:not(.is-expanded) .site-header__inner {
+  body:not(.is-always-mobile-nav) .site-header__fixable.is-fixed:not(.is-expanded) .site-header__inner {
     transform: translateX(-101%); /* LTR */
-    opacity: 0
-}
+    opacity: 0;
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="rtl"] body:not(.is-always-mobile-nav) .site-header__fixable.is-fixed:not(.is-expanded) .site-header__inner {
-    transform: translateX(101%)
-}
+  [dir="rtl"] body:not(.is-always-mobile-nav) .site-header__fixable.is-fixed:not(.is-expanded) .site-header__inner {
+    transform: translateX(101%);
   }
+}
 
 .site-header__inner__container {
   display: flex;
diff --git a/web/core/themes/olivero/css/components/skip-link.css b/web/core/themes/olivero/css/components/skip-link.css
index 258a7271f..1b1587551 100644
--- a/web/core/themes/olivero/css/components/skip-link.css
+++ b/web/core/themes/olivero/css/components/skip-link.css
@@ -13,19 +13,19 @@
  */
 
 [dir="ltr"] .skip-link {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .skip-link {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .skip-link {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="rtl"] .skip-link {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 .skip-link {
@@ -37,20 +37,23 @@
   text-decoration: none;
   color: #fff;
   outline: 0;
-  background-color: #0d1214
+  background-color: #0d1214;
 }
 
 .skip-link:hover {
-    text-decoration: underline;
-    color: #fff;
-  }
+  text-decoration: underline;
+  color: #fff;
+}
 
 .skip-link:after {
-    content: "\0020	➔";
-  }
+  content: "\0020	➔";
+}
 
 .skip-link.focusable:focus {
-  position: absolute !important; /* Override position from module file. */
+  position: absolute !important;
+}
+
+.skip-link.focusable:focus { /* Override position from module file. */
   z-index: 503;
   width: 100%;
   height: 2.5rem;
diff --git a/web/core/themes/olivero/css/components/table.css b/web/core/themes/olivero/css/components/table.css
index dd6b748b6..c11ea88c8 100644
--- a/web/core/themes/olivero/css/components/table.css
+++ b/web/core/themes/olivero/css/components/table.css
@@ -20,167 +20,221 @@
   color: #313637;
   border: 0;
   border-collapse: collapse;
-  font-family: "metropolis", sans-serif;
+  font-family: metropolis, sans-serif;
   font-size: 1rem;
-  line-height: 1.6875rem
-}
-
-[dir="ltr"] .forum table caption,[dir="ltr"]  .text-content table caption,[dir="ltr"]  .views-table caption,[dir="ltr"]  .draggable-table caption {
-    text-align: left
-}
-
-[dir="rtl"] .forum table caption,[dir="rtl"]  .text-content table caption,[dir="rtl"]  .views-table caption,[dir="rtl"]  .draggable-table caption {
-    text-align: right
-}
-
-.forum table caption, .text-content table caption, .views-table caption, .draggable-table caption {
-    margin-bottom: 1.125rem;
-    color: #313637;
-    font-family: "Lora", "georgia", serif;
-    font-size: 0.875rem;
-    font-style: italic;
-    line-height: 1.125rem;
-  }
-
-.forum table tr:last-child td, .text-content table tr:last-child td, .views-table tr:last-child td, .draggable-table tr:last-child td {
-        border-bottom: 0;
-      }
-
-[dir="ltr"] .forum table td,[dir="ltr"] 
-  .forum table th,[dir="ltr"] 
-  .text-content table td,[dir="ltr"] 
-  .text-content table th,[dir="ltr"] 
-  .views-table td,[dir="ltr"] 
-  .views-table th,[dir="ltr"] 
-  .draggable-table td,[dir="ltr"] 
-  .draggable-table th {
-    padding-left: 0
-}
-
-[dir="rtl"] .forum table td,[dir="rtl"] 
-  .forum table th,[dir="rtl"] 
-  .text-content table td,[dir="rtl"] 
-  .text-content table th,[dir="rtl"] 
-  .views-table td,[dir="rtl"] 
-  .views-table th,[dir="rtl"] 
-  .draggable-table td,[dir="rtl"] 
-  .draggable-table th {
-    padding-right: 0
-}
-
-[dir="ltr"] .forum table td,[dir="ltr"] 
-  .forum table th,[dir="ltr"] 
-  .text-content table td,[dir="ltr"] 
-  .text-content table th,[dir="ltr"] 
-  .views-table td,[dir="ltr"] 
-  .views-table th,[dir="ltr"] 
-  .draggable-table td,[dir="ltr"] 
-  .draggable-table th {
-    padding-right: 1.125rem
-}
-
-[dir="rtl"] .forum table td,[dir="rtl"] 
-  .forum table th,[dir="rtl"] 
-  .text-content table td,[dir="rtl"] 
-  .text-content table th,[dir="rtl"] 
-  .views-table td,[dir="rtl"] 
-  .views-table th,[dir="rtl"] 
-  .draggable-table td,[dir="rtl"] 
-  .draggable-table th {
-    padding-left: 1.125rem
+  line-height: 1.6875rem;
 }
 
-.forum table td,
-  .forum table th,
-  .text-content table td,
-  .text-content table th,
-  .views-table td,
-  .views-table th,
-  .draggable-table td,
-  .draggable-table th {
-    padding-top: 1.125rem;
-    padding-bottom: 1.125rem;
-    vertical-align: top;
-  }
+[dir="ltr"] .forum table caption,
+[dir="ltr"] .text-content table caption,
+[dir="ltr"] .views-table caption,
+[dir="ltr"] .draggable-table caption {
+  text-align: left;
+}
+
+[dir="rtl"] .forum table caption,
+[dir="rtl"] .text-content table caption,
+[dir="rtl"] .views-table caption,
+[dir="rtl"] .draggable-table caption {
+  text-align: right;
+}
+
+.forum table caption,
+.text-content table caption,
+.views-table caption,
+.draggable-table caption {
+  margin-bottom: 1.125rem;
+  color: #313637;
+  font-family: Lora, georgia, serif;
+  font-size: 0.875rem;
+  font-style: italic;
+  line-height: 1.125rem;
+}
+
+.forum table tr:last-child td,
+.text-content table tr:last-child td,
+.views-table tr:last-child td,
+.draggable-table tr:last-child td {
+  border-bottom: 0;
+}
+
+[dir="ltr"] .forum table td,
+[dir="ltr"] .text-content table td,
+[dir="ltr"] .views-table td,
+[dir="ltr"] .draggable-table td,
+[dir="ltr"] .forum table th,
+[dir="ltr"] .text-content table th,
+[dir="ltr"] .views-table th,
+[dir="ltr"] .draggable-table th {
+  padding-left: 0;
+}
+
+[dir="rtl"] .forum table td,
+[dir="rtl"] .text-content table td,
+[dir="rtl"] .views-table td,
+[dir="rtl"] .draggable-table td,
+[dir="rtl"] .forum table th,
+[dir="rtl"] .text-content table th,
+[dir="rtl"] .views-table th,
+[dir="rtl"] .draggable-table th {
+  padding-right: 0;
+}
 
-[dir="ltr"] .forum table th,[dir="ltr"]  .text-content table th,[dir="ltr"]  .views-table th,[dir="ltr"]  .draggable-table th {
-    margin-left: 0
+[dir="ltr"] .forum table td,
+[dir="ltr"] .text-content table td,
+[dir="ltr"] .views-table td,
+[dir="ltr"] .draggable-table td,
+[dir="ltr"] .forum table th,
+[dir="ltr"] .text-content table th,
+[dir="ltr"] .views-table th,
+[dir="ltr"] .draggable-table th {
+  padding-right: 1.125rem;
 }
 
-[dir="rtl"] .forum table th,[dir="rtl"]  .text-content table th,[dir="rtl"]  .views-table th,[dir="rtl"]  .draggable-table th {
-    margin-right: 0
+[dir="rtl"] .forum table td,
+[dir="rtl"] .text-content table td,
+[dir="rtl"] .views-table td,
+[dir="rtl"] .draggable-table td,
+[dir="rtl"] .forum table th,
+[dir="rtl"] .text-content table th,
+[dir="rtl"] .views-table th,
+[dir="rtl"] .draggable-table th {
+  padding-left: 1.125rem;
 }
 
-[dir="ltr"] .forum table th,[dir="ltr"]  .text-content table th,[dir="ltr"]  .views-table th,[dir="ltr"]  .draggable-table th {
-    margin-right: 0
+.forum table td,
+.text-content table td,
+.views-table td,
+.draggable-table td,
+.forum table th,
+.text-content table th,
+.views-table th,
+.draggable-table th {
+  padding-top: 1.125rem;
+  padding-bottom: 1.125rem;
+  vertical-align: top;
+}
+
+[dir="ltr"] .forum table th,
+[dir="ltr"] .text-content table th,
+[dir="ltr"] .views-table th,
+[dir="ltr"] .draggable-table th {
+  margin-left: 0;
 }
 
-[dir="rtl"] .forum table th,[dir="rtl"]  .text-content table th,[dir="rtl"]  .views-table th,[dir="rtl"]  .draggable-table th {
-    margin-left: 0
+[dir="rtl"] .forum table th,
+[dir="rtl"] .text-content table th,
+[dir="rtl"] .views-table th,
+[dir="rtl"] .draggable-table th {
+  margin-right: 0;
 }
 
-[dir="ltr"] .forum table th,[dir="ltr"]  .text-content table th,[dir="ltr"]  .views-table th,[dir="ltr"]  .draggable-table th {
-    text-align: left
+[dir="ltr"] .forum table th,
+[dir="ltr"] .text-content table th,
+[dir="ltr"] .views-table th,
+[dir="ltr"] .draggable-table th {
+  margin-right: 0;
 }
 
-[dir="rtl"] .forum table th,[dir="rtl"]  .text-content table th,[dir="rtl"]  .views-table th,[dir="rtl"]  .draggable-table th {
-    text-align: right
+[dir="rtl"] .forum table th,
+[dir="rtl"] .text-content table th,
+[dir="rtl"] .views-table th,
+[dir="rtl"] .draggable-table th {
+  margin-left: 0;
 }
 
-.forum table th, .text-content table th, .views-table th, .draggable-table th {
-    margin-top: 0;
-    margin-bottom: 0;
-    letter-spacing: 0.02em;
-    color: #0d1214;
-    border-bottom: 2px solid #2494db;
-    font-family: "metropolis", sans-serif;
-    font-size: 0.875rem;
-    line-height: 1.125rem
+[dir="ltr"] .forum table th,
+[dir="ltr"] .text-content table th,
+[dir="ltr"] .views-table th,
+[dir="ltr"] .draggable-table th {
+  text-align: left;
+}
 
-    /**
+[dir="rtl"] .forum table th,
+[dir="rtl"] .text-content table th,
+[dir="rtl"] .views-table th,
+[dir="rtl"] .draggable-table th {
+  text-align: right;
+}
+
+.forum table th,
+.text-content table th,
+.views-table th,
+.draggable-table th {
+  margin-top: 0;
+  margin-bottom: 0;
+  letter-spacing: 0.02em;
+  color: #0d1214;
+  border-bottom: 2px solid #2494db;
+  font-family: metropolis, sans-serif;
+  font-size: 0.875rem;
+  line-height: 1.125rem;
+
+  /**
      * Fixes for styles injected by CKEditor
      */
-  }
+}
 
-[dir="ltr"] .forum table th.text-align-left,[dir="ltr"]  .text-content table th.text-align-left,[dir="ltr"]  .views-table th.text-align-left,[dir="ltr"]  .draggable-table th.text-align-left {
-      text-align: left
+[dir="ltr"] .forum table th.text-align-left,
+[dir="ltr"] .text-content table th.text-align-left,
+[dir="ltr"] .views-table th.text-align-left,
+[dir="ltr"] .draggable-table th.text-align-left {
+  text-align: left;
 }
 
-[dir="rtl"] .forum table th.text-align-left,[dir="rtl"]  .text-content table th.text-align-left,[dir="rtl"]  .views-table th.text-align-left,[dir="rtl"]  .draggable-table th.text-align-left {
-      text-align: right
+[dir="rtl"] .forum table th.text-align-left,
+[dir="rtl"] .text-content table th.text-align-left,
+[dir="rtl"] .views-table th.text-align-left,
+[dir="rtl"] .draggable-table th.text-align-left {
+  text-align: right;
 }
 
-[dir="ltr"] .forum table th.text-align-right,[dir="ltr"]  .text-content table th.text-align-right,[dir="ltr"]  .views-table th.text-align-right,[dir="ltr"]  .draggable-table th.text-align-right {
-      text-align: right
+[dir="ltr"] .forum table th.text-align-right,
+[dir="ltr"] .text-content table th.text-align-right,
+[dir="ltr"] .views-table th.text-align-right,
+[dir="ltr"] .draggable-table th.text-align-right {
+  text-align: right;
 }
 
-[dir="rtl"] .forum table th.text-align-right,[dir="rtl"]  .text-content table th.text-align-right,[dir="rtl"]  .views-table th.text-align-right,[dir="rtl"]  .draggable-table th.text-align-right {
-      text-align: left
+[dir="rtl"] .forum table th.text-align-right,
+[dir="rtl"] .text-content table th.text-align-right,
+[dir="rtl"] .views-table th.text-align-right,
+[dir="rtl"] .draggable-table th.text-align-right {
+  text-align: left;
 }
 
-.forum table th.text-align-center, .text-content table th.text-align-center, .views-table th.text-align-center, .draggable-table th.text-align-center {
-      text-align: center;
-    }
+.forum table th.text-align-center,
+.text-content table th.text-align-center,
+.views-table th.text-align-center,
+.draggable-table th.text-align-center {
+  text-align: center;
+}
 
-.forum table th.text-align-justify, .text-content table th.text-align-justify, .views-table th.text-align-justify, .draggable-table th.text-align-justify {
-      text-align: justify;
-    }
+.forum table th.text-align-justify,
+.text-content table th.text-align-justify,
+.views-table th.text-align-justify,
+.draggable-table th.text-align-justify {
+  text-align: justify;
+}
 
-.forum table td, .text-content table td, .views-table td, .draggable-table td {
-    white-space: normal;
-    border-bottom: 2px solid #98abb9;
-  }
+.forum table td,
+.text-content table td,
+.views-table td,
+.draggable-table td {
+  white-space: normal;
+  border-bottom: 2px solid #98abb9;
+}
 
 .forum table th.checkbox,
-  .forum table td.checkbox,
-  .text-content table th.checkbox,
-  .text-content table td.checkbox,
-  .views-table th.checkbox,
-  .views-table td.checkbox,
-  .draggable-table th.checkbox,
-  .draggable-table td.checkbox {
-    text-align: center;
-  }
+.text-content table th.checkbox,
+.views-table th.checkbox,
+.draggable-table th.checkbox,
+.forum table td.checkbox,
+.text-content table td.checkbox,
+.views-table td.checkbox,
+.draggable-table td.checkbox {
+  text-align: center;
+}
 
 .draggable-table {
   width: 100%;
@@ -197,7 +251,7 @@
 .sticky-header {
   z-index: 0;
   margin: 0;
-  border-bottom: 4px solid #2494db;
+  border-bottom: 0.25rem solid #2494db;
 }
 
 /* Properly align VBO checkboxes. */
diff --git a/web/core/themes/olivero/css/components/tabs.css b/web/core/themes/olivero/css/components/tabs.css
index 18f516e17..0ac9a61b2 100644
--- a/web/core/themes/olivero/css/components/tabs.css
+++ b/web/core/themes/olivero/css/components/tabs.css
@@ -5,28 +5,28 @@
  * @preserve
  */
 [dir="ltr"] .tabs {
-  margin-left: 0
+  margin-left: 0;
 }
 [dir="rtl"] .tabs {
-  margin-right: 0
+  margin-right: 0;
 }
 [dir="ltr"] .tabs {
-  margin-right: 0
+  margin-right: 0;
 }
 [dir="rtl"] .tabs {
-  margin-left: 0
+  margin-left: 0;
 }
 [dir="ltr"] .tabs {
-  padding-left: 0
+  padding-left: 0;
 }
 [dir="rtl"] .tabs {
-  padding-right: 0
+  padding-right: 0;
 }
 [dir="ltr"] .tabs {
-  padding-right: 0
+  padding-right: 0;
 }
 [dir="rtl"] .tabs {
-  padding-left: 0
+  padding-left: 0;
 }
 .tabs {
   display: flex;
@@ -36,52 +36,55 @@
   margin-bottom: 0;
   padding-top: 0;
   padding-bottom: 0;
-  list-style: none
+  list-style: none;
 }
+
 @media (min-width: 43.75rem) {
-.tabs {
+  .tabs {
     flex-direction: row;
-    flex-wrap: wrap
-}
+    flex-wrap: wrap;
   }
+}
 .tabs__tab {
   display: none;
   margin: 0;
-  margin-bottom: -1px
+  margin-bottom: -1px;
 }
 .tabs__tab.is-active {
-    display: flex;
-  }
+  display: flex;
+}
+
 @media (min-width: 43.75rem) {
-.tabs__tab {
+  .tabs__tab {
     display: flex;
     margin: 0;
-    margin-bottom: -1px
-}
+    margin-bottom: -1px;
   }
+}
 html:not(.js) .tabs__tab,
 .tabs.is-expanded .tabs__tab {
   display: flex;
 }
 .tabs--secondary .tabs__tab {
-  display: block
+  display: block;
 }
+
 @media (min-width: 43.75rem) {
-.tabs--secondary .tabs__tab {
-    display: flex
-}
+  .tabs--secondary .tabs__tab {
+    display: flex;
   }
+}
 [dir="ltr"] .tabs__link {
-  padding-left: 1.6875rem
+  padding-left: 1.6875rem;
 }
 [dir="rtl"] .tabs__link {
-  padding-right: 1.6875rem
+  padding-right: 1.6875rem;
 }
 [dir="ltr"] .tabs__link {
-  padding-right: 1.6875rem
+  padding-right: 1.6875rem;
 }
 [dir="rtl"] .tabs__link {
-  padding-left: 1.6875rem
+  padding-left: 1.6875rem;
 }
 .tabs__link {
   display: flex;
@@ -99,16 +102,17 @@ html:not(.js) .tabs__tab,
   font-size: 0.875rem;
 }
 .tabs--secondary .tabs__link {
-  text-transform: none
+  text-transform: none;
 }
+
 @media (min-width: 43.75rem) {
-.tabs--secondary .tabs__link {
+  .tabs--secondary .tabs__link {
     border-top-color: transparent;
     border-right-color: transparent;
     border-left-color: transparent;
-    background-color: transparent
-}
+    background-color: transparent;
   }
+}
 .tabs__link:focus {
   position: relative;
   outline: solid 3px #2494db;
@@ -120,56 +124,57 @@ html:not(.js) .tabs__tab,
 .tabs__link.is-active {
   position: relative;
   color: #0d1214;
-  font-weight: 600
+  font-weight: 600;
 }
 [dir="ltr"] .tabs__link.is-active:after {
-    left: -1px
+  left: -1px;
 }
 [dir="rtl"] .tabs__link.is-active:after {
-    right: -1px
+  right: -1px;
 }
 [dir="ltr"] .tabs__link.is-active:after {
-    border-left: 6px solid #2494db
+  border-left: 0.375rem solid #2494db;
 }
 [dir="rtl"] .tabs__link.is-active:after {
-    border-right: 6px solid #2494db
+  border-right: 0.375rem solid #2494db;
 }
 .tabs__link.is-active:after {
-    position: absolute;
-    bottom: -1px;
-    height: calc(100% + 2px);
-    content: "";
-  }
+  position: absolute;
+  bottom: -1px;
+  height: calc(100% + 2px);
+  content: "";
+}
+
 @media (min-width: 43.75rem) {
-    [dir="ltr"] .tabs__link.is-active:after {
-      left: 0
+  [dir="ltr"] .tabs__link.is-active:after {
+    left: 0;
   }
-    [dir="rtl"] .tabs__link.is-active:after {
-      right: 0
+  [dir="rtl"] .tabs__link.is-active:after {
+    right: 0;
   }
-    [dir="ltr"] .tabs__link.is-active:after {
-      border-left: 0
+  [dir="ltr"] .tabs__link.is-active:after {
+    border-left: 0;
   }
-    [dir="rtl"] .tabs__link.is-active:after {
-      border-right: 0
+  [dir="rtl"] .tabs__link.is-active:after {
+    border-right: 0;
   }
-    .tabs__link.is-active:after {
-      width: 100%;
-      height: auto;
-      border-top: 6px solid #2494db;
-    }
+  .tabs__link.is-active:after {
+    width: 100%;
+    height: auto;
+    border-top: 0.375rem solid #2494db;
   }
+}
 [dir="ltr"] .tabs__trigger {
-  margin-left: -1px
+  margin-left: -1px;
 }
 [dir="rtl"] .tabs__trigger {
-  margin-right: -1px
+  margin-right: -1px;
 }
 [dir="ltr"] .tabs__trigger {
-  margin-right: 0
+  margin-right: 0;
 }
 [dir="rtl"] .tabs__trigger {
-  margin-left: 0
+  margin-left: 0;
 }
 .tabs__trigger {
   display: flex;
@@ -180,21 +185,22 @@ html:not(.js) .tabs__tab,
   margin-bottom: 0;
   cursor: pointer;
   border: solid 1px #e7edf1;
-  background-color: #f7f9fa
+  background-color: #f7f9fa;
 }
 .tabs__trigger:hover {
-    background-color: #e7edf1;
-  }
+  background-color: #e7edf1;
+}
 .tabs__trigger:focus {
-    position: relative;
-    border-color: #2494db;
-    outline: none;
-  }
-@media (min-width: 43.75rem) {
-.tabs__trigger {
-    display: none
+  position: relative;
+  border-color: #2494db;
+  outline: none;
 }
+
+@media (min-width: 43.75rem) {
+  .tabs__trigger {
+    display: none;
   }
+}
 html:not(.js) .tabs__trigger {
   display: none;
 }
@@ -203,38 +209,38 @@ html:not(.js) .tabs__trigger {
   display: block;
   width: 1.125rem;
   height: 0.625rem;
-  margin-top: -2px
+  margin-top: -2px;
 }
 [dir="ltr"] .tabs__trigger-icon > span {
-    left: 0
+  left: 0;
 }
 [dir="rtl"] .tabs__trigger-icon > span {
-    right: 0
+  right: 0;
 }
 .tabs__trigger-icon > span {
-    position: absolute;
-    display: block;
-    width: 100%;
-    transition: transform 0.2s, opacity 0.2s, top 0.2s;
-    border-top: solid 2px #2494db
-  }
+  position: absolute;
+  display: block;
+  width: 100%;
+  transition: transform 0.2s, opacity 0.2s, top 0.2s;
+  border-top: solid 2px #2494db;
+}
 .tabs__trigger-icon > span:nth-child(1) {
-      top: 0;
-    }
+  top: 0;
+}
 .tabs__trigger-icon > span:nth-child(2) {
-      top: calc(50% + 1px);
-    }
+  top: calc(50% + 1px);
+}
 .tabs__trigger-icon > span:nth-child(3) {
-      top: calc(100% + 2px);
-    }
+  top: calc(100% + 2px);
+}
 .tabs__trigger[aria-expanded="true"] .tabs__trigger-icon > span:nth-child(1) {
-      top: calc(50% + 1px);
-      transform: rotate(45deg);
-    }
+  top: calc(50% + 1px);
+  transform: rotate(45deg);
+}
 .tabs__trigger[aria-expanded="true"] .tabs__trigger-icon > span:nth-child(2) {
-      opacity: 0;
-    }
+  opacity: 0;
+}
 .tabs__trigger[aria-expanded="true"] .tabs__trigger-icon > span:nth-child(3) {
-      top: calc(50% + 1px);
-      transform: rotate(-45deg);
-    }
+  top: calc(50% + 1px);
+  transform: rotate(-45deg);
+}
diff --git a/web/core/themes/olivero/css/components/tags.css b/web/core/themes/olivero/css/components/tags.css
index 8920ed2d4..33b690ec5 100644
--- a/web/core/themes/olivero/css/components/tags.css
+++ b/web/core/themes/olivero/css/components/tags.css
@@ -12,7 +12,7 @@
 
 .field--tags {
   display: flex;
-  font-family: "metropolis", sans-serif;
+  font-family: metropolis, sans-serif;
 }
 
 [dir="ltr"] .field--tags__label {
@@ -29,19 +29,19 @@
   color: #6e7172;
   font-size: 0.875rem;
   font-weight: 600;
-  line-height: 1.6
+  line-height: 1.6;
 }
 
 .field--tags__label:after {
-    content: ":";
-  }
+  content: ":";
+}
 
 @media (min-width: 43.75rem) {
 
-.field--tags__label {
-    line-height: 2
-}
+  .field--tags__label {
+    line-height: 2;
   }
+}
 
 [dir="ltr"] .field--label-inline .field--tags__label {
   padding-left: 0;
@@ -147,25 +147,25 @@
 }
 
 [dir="ltr"] .node--view-mode-full .field--tags {
-    padding-left: 2.25rem;
+  padding-left: 2.25rem;
 }
 
 [dir="rtl"] .node--view-mode-full .field--tags {
-    padding-right: 2.25rem;
+  padding-right: 2.25rem;
 }
 
 [dir="ltr"] .node--view-mode-full .field--tags {
-    padding-right: 2.25rem;
+  padding-right: 2.25rem;
 }
 
 [dir="rtl"] .node--view-mode-full .field--tags {
-    padding-left: 2.25rem;
+  padding-left: 2.25rem;
 }
 
 .node--view-mode-full .field--tags {
-    margin-top: 4.5rem;
-    margin-bottom: 4.5rem;
-    padding-top: 1.6875rem;
-    padding-bottom: 1.6875rem;
-    background-color: #f7f9fa;
-  }
+  margin-top: 4.5rem;
+  margin-bottom: 4.5rem;
+  padding-top: 1.6875rem;
+  padding-bottom: 1.6875rem;
+  background-color: #f7f9fa;
+}
diff --git a/web/core/themes/olivero/css/components/text-content.css b/web/core/themes/olivero/css/components/text-content.css
index 81ea18f74..8c297c29d 100644
--- a/web/core/themes/olivero/css/components/text-content.css
+++ b/web/core/themes/olivero/css/components/text-content.css
@@ -13,8 +13,8 @@
 .text-content,
 .cke_editable {
   color: #313637;
-  font-family: "Lora", "georgia", serif;
-  line-height: 1.6875rem
+  font-family: Lora, georgia, serif;
+  line-height: 1.6875rem;
 
   /*
     @todo
@@ -26,205 +26,233 @@
   */
 }
 
-.text-content a:not(.button), .cke_editable a:not(.button) {
-    color: #0d77b5;
-    -webkit-text-decoration-color: #0d77b5;
-    text-decoration-color: #0d77b5;
-    text-decoration-thickness: 2px;
-    word-wrap: break-word
-  }
+.text-content a:not(.button),
+.cke_editable a:not(.button) {
+  word-wrap: break-word;
+  color: #0d77b5;
+  text-decoration-color: #0d77b5;
+  text-decoration-thickness: 2px;
+}
 
 @supports (box-shadow: none) {
 
-.text-content a:not(.button), .cke_editable a:not(.button) {
-      transition: box-shadow 0.3s cubic-bezier(0.55, 0.085, 0, 0.99);
-      text-decoration: none;
-      box-shadow: inset 0 -2px 0 0 #2494db
+  .text-content a:not(.button),
+  .cke_editable a:not(.button) {
+    transition: box-shadow 0.3s cubic-bezier(0.55, 0.085, 0, 0.99);
+    text-decoration: none;
+    box-shadow: inset 0 -2px 0 0 #2494db;
   }
 
-      .text-content a:not(.button):hover, .cke_editable a:not(.button):hover {
-        text-decoration: underline;
-        color: #000;
-
-        /* @todo - #d9ecfa isn't currently a variable. */
-        box-shadow: inset 0 -2em 0 0 #d9ecfa;
-        -webkit-text-decoration-color: #d9ecfa;
-        text-decoration-color: #d9ecfa;
-      }
-    }
+  .text-content a:not(.button):hover,
+  .cke_editable a:not(.button):hover {
+    text-decoration: underline;
+    color: #000;
 
-.text-content p, .cke_editable p {
-    margin-top: 1.125rem;
-    margin-bottom: 1.125rem
+    /* @todo - #d9ecfa isn't currently a variable. */
+    box-shadow: inset 0 -2em 0 0 #d9ecfa;
+    text-decoration-color: #d9ecfa;
   }
+}
 
-.text-content p:first-child, .cke_editable p:first-child {
-      margin-top: 0;
-    }
+.text-content p,
+.cke_editable p {
+  margin-top: 1.125rem;
+  margin-bottom: 1.125rem;
+}
+
+.text-content p:first-child,
+.cke_editable p:first-child {
+  margin-top: 0;
+}
 
-.text-content p:last-child, .cke_editable p:last-child {
-      margin-bottom: 0;
-    }
+.text-content p:last-child,
+.cke_editable p:last-child {
+  margin-bottom: 0;
+}
 
 @media (min-width: 43.75rem) {
 
-.text-content p, .cke_editable p {
-      margin-top: 2.25rem;
-      margin-bottom: 2.25rem
+  .text-content p,
+  .cke_editable p {
+    margin-top: 2.25rem;
+    margin-bottom: 2.25rem;
   }
-    }
+}
 
-.text-content code, .cke_editable code {
-    background-color: #f7f9fa;
-  }
+.text-content code,
+.cke_editable code {
+  background-color: #f7f9fa;
+}
 
-[dir="ltr"] .text-content pre code,[dir="ltr"]  .cke_editable pre code {
-    padding-left: 1.125rem
+[dir="ltr"] .text-content pre code,
+[dir="ltr"] .cke_editable pre code {
+  padding-left: 1.125rem;
 }
 
-[dir="rtl"] .text-content pre code,[dir="rtl"]  .cke_editable pre code {
-    padding-right: 1.125rem
+[dir="rtl"] .text-content pre code,
+[dir="rtl"] .cke_editable pre code {
+  padding-right: 1.125rem;
 }
 
-[dir="ltr"] .text-content pre code,[dir="ltr"]  .cke_editable pre code {
-    padding-right: 1.125rem
+[dir="ltr"] .text-content pre code,
+[dir="ltr"] .cke_editable pre code {
+  padding-right: 1.125rem;
 }
 
-[dir="rtl"] .text-content pre code,[dir="rtl"]  .cke_editable pre code {
-    padding-left: 1.125rem
+[dir="rtl"] .text-content pre code,
+[dir="rtl"] .cke_editable pre code {
+  padding-left: 1.125rem;
 }
 
-.text-content pre code, .cke_editable pre code {
-    display: block;
-    overflow: auto;
-    padding-top: 1.125rem;
-    padding-bottom: 1.125rem;
-    color: #6e7172;
-  }
+.text-content pre code,
+.cke_editable pre code {
+  display: block;
+  overflow: auto;
+  padding-top: 1.125rem;
+  padding-bottom: 1.125rem;
+  color: #6e7172;
+}
 
-[dir="ltr"] .text-content blockquote,[dir="ltr"]  .cke_editable blockquote {
-    margin-left: 0
+[dir="ltr"] .text-content blockquote,
+[dir="ltr"] .cke_editable blockquote {
+  margin-left: 0;
 }
 
-[dir="rtl"] .text-content blockquote,[dir="rtl"]  .cke_editable blockquote {
-    margin-right: 0
+[dir="rtl"] .text-content blockquote,
+[dir="rtl"] .cke_editable blockquote {
+  margin-right: 0;
 }
 
-[dir="ltr"] .text-content blockquote,[dir="ltr"]  .cke_editable blockquote {
-    margin-right: 0
+[dir="ltr"] .text-content blockquote,
+[dir="ltr"] .cke_editable blockquote {
+  margin-right: 0;
 }
 
-[dir="rtl"] .text-content blockquote,[dir="rtl"]  .cke_editable blockquote {
-    margin-left: 0
+[dir="rtl"] .text-content blockquote,
+[dir="rtl"] .cke_editable blockquote {
+  margin-left: 0;
 }
 
-[dir="ltr"] .text-content blockquote,[dir="ltr"]  .cke_editable blockquote {
-    padding-left: 2.25rem
+[dir="ltr"] .text-content blockquote,
+[dir="ltr"] .cke_editable blockquote {
+  padding-left: 2.25rem;
 }
 
-[dir="rtl"] .text-content blockquote,[dir="rtl"]  .cke_editable blockquote {
-    padding-right: 2.25rem
+[dir="rtl"] .text-content blockquote,
+[dir="rtl"] .cke_editable blockquote {
+  padding-right: 2.25rem;
 }
 
-.text-content blockquote, .cke_editable blockquote {
-    position: relative;
-    margin-top: 2.25rem;
-    margin-bottom: 2.25rem;
-    letter-spacing: -0.01em;
-    font-family: "Lora", "georgia", serif;
-    font-size: 1.3125rem;
-    line-height: 2.25rem
-  }
+.text-content blockquote,
+.cke_editable blockquote {
+  position: relative;
+  margin-top: 2.25rem;
+  margin-bottom: 2.25rem;
+  letter-spacing: -0.01em;
+  font-family: Lora, georgia, serif;
+  font-size: 1.3125rem;
+  line-height: 2.25rem;
+}
 
-[dir="ltr"] .text-content blockquote:before,[dir="ltr"]  .cke_editable blockquote:before {
-      left: 0
+[dir="ltr"] .text-content blockquote:before,
+[dir="ltr"] .cke_editable blockquote:before {
+  left: 0;
 }
 
-[dir="rtl"] .text-content blockquote:before,[dir="rtl"]  .cke_editable blockquote:before {
-      right: 0
+[dir="rtl"] .text-content blockquote:before,
+[dir="rtl"] .cke_editable blockquote:before {
+  right: 0;
 }
 
-.text-content blockquote:before, .cke_editable blockquote:before {
-      position: absolute;
-      top: 0;
-      content: "\201C";
-      color: #53b0eb;
-      font-size: 3.375rem;
-    }
+.text-content blockquote:before,
+.cke_editable blockquote:before {
+  position: absolute;
+  top: 0;
+  content: "\201C";
+  color: #53b0eb;
+  font-size: 3.375rem;
+}
 
-[dir="ltr"] .text-content blockquote:after,[dir="ltr"]  .cke_editable blockquote:after {
-      left: 0
+[dir="ltr"] .text-content blockquote:after,
+[dir="ltr"] .cke_editable blockquote:after {
+  left: 0;
 }
 
-[dir="rtl"] .text-content blockquote:after,[dir="rtl"]  .cke_editable blockquote:after {
-      right: 0
+[dir="rtl"] .text-content blockquote:after,
+[dir="rtl"] .cke_editable blockquote:after {
+  right: 0;
 }
 
-[dir="ltr"] .text-content blockquote:after,[dir="ltr"]  .cke_editable blockquote:after {
-      margin-left: 0.25rem
+[dir="ltr"] .text-content blockquote:after,
+[dir="ltr"] .cke_editable blockquote:after {
+  margin-left: 0.25rem;
 }
 
-[dir="rtl"] .text-content blockquote:after,[dir="rtl"]  .cke_editable blockquote:after {
-      margin-right: 0.25rem
+[dir="rtl"] .text-content blockquote:after,
+[dir="rtl"] .cke_editable blockquote:after {
+  margin-right: 0.25rem;
 }
 
-.text-content blockquote:after, .cke_editable blockquote:after {
-      position: absolute;
-      bottom: 0;
-      width: 0.5625rem;
-      height: calc(100% - 1.875rem);
-      content: "";
-      background: #f7f9fa;
-    }
+.text-content blockquote:after,
+.cke_editable blockquote:after {
+  position: absolute;
+  bottom: 0;
+  width: 0.5625rem;
+  height: calc(100% - 1.875rem);
+  content: "";
+  background: #f7f9fa;
+}
 
 @media (min-width: 43.75rem) {
 
-.text-content blockquote, .cke_editable blockquote {
-      font-size: 2rem;
-      line-height: 3.375rem
+  .text-content blockquote,
+  .cke_editable blockquote {
+    font-size: 2rem;
+    line-height: 3.375rem;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.text-content blockquote, .cke_editable blockquote {
-      font-size: 2.5rem;
-      line-height: 3.9375rem
+  .text-content blockquote,
+  .cke_editable blockquote {
+    font-size: 2.5rem;
+    line-height: 3.9375rem;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.text-content,
-.cke_editable {
+  .text-content,
+  .cke_editable {
     font-size: 1.125rem;
-    line-height: 2.25rem
-}
+    line-height: 2.25rem;
   }
+}
 
 /**
  * Special colors for footer that has a dark background.
  */
 
 .site-footer .text-content {
-  color: inherit
+  color: inherit;
 }
 
 .site-footer .text-content * {
-    color: inherit;
-  }
+  color: inherit;
+}
 
 .site-footer .text-content a {
-    text-decoration: underline;
-    color: #fff;
-    box-shadow: none
-  }
+  text-decoration: underline;
+  color: #fff;
+  box-shadow: none;
+}
 
 .site-footer .text-content a:hover {
-      text-decoration: none;
-      color: #fff;
-      box-shadow: none;
-    }
+  text-decoration: none;
+  color: #fff;
+  box-shadow: none;
+}
 
 /**
  * Decrease font-size for blockquote placed in sidebar region.
@@ -232,8 +260,8 @@
 
 @media (min-width: 62.5rem) {
 
-.region--sidebar .text-content blockquote {
+  .region--sidebar .text-content blockquote {
     font-size: 1.5rem;
-    line-height: 2.25rem
-}
+    line-height: 2.25rem;
   }
+}
diff --git a/web/core/themes/olivero/css/components/vertical-tabs.css b/web/core/themes/olivero/css/components/vertical-tabs.css
index 588be625d..6685aeebb 100644
--- a/web/core/themes/olivero/css/components/vertical-tabs.css
+++ b/web/core/themes/olivero/css/components/vertical-tabs.css
@@ -12,25 +12,25 @@
 
 @media (min-width: 62.5rem) {
 
-.vertical-tabs {
-    display: flex
-}
+  .vertical-tabs {
+    display: flex;
   }
+}
 
 [dir="ltr"] .vertical-tabs__menu {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .vertical-tabs__menu {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .vertical-tabs__menu {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .vertical-tabs__menu {
-  margin-left: 0
+  margin-left: 0;
 }
 
 .vertical-tabs__menu {
@@ -40,35 +40,35 @@
   list-style: none;
   border-width: 1px;
   border-style: solid;
-  border-color: #e7edf1
+  border-color: #e7edf1;
 }
 
 @media (min-width: 62.5rem) {
 
-.vertical-tabs__menu {
+  .vertical-tabs__menu {
     width: 15rem;
-    border-width: 1px 0 1px 1px
-}
+    border-width: 1px 0 1px 1px;
   }
+}
 
 .vertical-tabs__panes {
-  margin-top: -1px
+  margin-top: -1px;
 }
 
 @media (min-width: 62.5rem) {
 
-.vertical-tabs__panes {
+  .vertical-tabs__panes {
     width: calc(100% - 15rem);
-    margin-top: 0
-}
+    margin-top: 0;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.vertical-tabs__pane {
-    min-height: 100%
-}
+  .vertical-tabs__pane {
+    min-height: 100%;
   }
+}
 
 .vertical-tabs__pane.olivero-details {
   margin: 0;
@@ -85,19 +85,19 @@
 }
 
 [dir="ltr"] .vertical-tabs__menu-item a {
-  padding-left: 0.84375rem
+  padding-left: 0.84375rem;
 }
 
 [dir="rtl"] .vertical-tabs__menu-item a {
-  padding-right: 0.84375rem
+  padding-right: 0.84375rem;
 }
 
 [dir="ltr"] .vertical-tabs__menu-item a {
-  padding-right: 0.84375rem
+  padding-right: 0.84375rem;
 }
 
 [dir="rtl"] .vertical-tabs__menu-item a {
-  padding-left: 0.84375rem
+  padding-left: 0.84375rem;
 }
 
 .vertical-tabs__menu-item a {
@@ -106,37 +106,37 @@
   padding-bottom: 0.5625rem;
   text-decoration: none;
   color: #0f6292;
-  background-color: #e7edf1
+  background-color: #e7edf1;
 }
 
 .vertical-tabs__menu-item a:focus,
-  .vertical-tabs__menu-item a:hover,
-  .vertical-tabs__menu-item a:active {
-    background-color: #f7f9fa;
-  }
+.vertical-tabs__menu-item a:hover,
+.vertical-tabs__menu-item a:active {
+  background-color: #f7f9fa;
+}
 
 .vertical-tabs__menu-item.is-selected {
-  background-color: #fff
+  background-color: #fff;
 }
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .vertical-tabs__menu-item.is-selected {
-    margin-right: -1px
-}
+  [dir="ltr"] .vertical-tabs__menu-item.is-selected {
+    margin-right: -1px;
+  }
 
-[dir="rtl"] .vertical-tabs__menu-item.is-selected {
-    margin-left: -1px
-}
+  [dir="rtl"] .vertical-tabs__menu-item.is-selected {
+    margin-left: -1px;
+  }
 
-[dir="ltr"] .vertical-tabs__menu-item.is-selected {
-    padding-right: 1px
-}
+  [dir="ltr"] .vertical-tabs__menu-item.is-selected {
+    padding-right: 1px;
+  }
 
-[dir="rtl"] .vertical-tabs__menu-item.is-selected {
-    padding-left: 1px
-}
+  [dir="rtl"] .vertical-tabs__menu-item.is-selected {
+    padding-left: 1px;
   }
+}
 
 .vertical-tabs__menu-item.is-selected a {
   background-color: transparent;
diff --git a/web/core/themes/olivero/css/components/wide-image.css b/web/core/themes/olivero/css/components/wide-image.css
index 868a0ad1c..ec265428a 100644
--- a/web/core/themes/olivero/css/components/wide-image.css
+++ b/web/core/themes/olivero/css/components/wide-image.css
@@ -11,134 +11,134 @@
  */
 
 [dir="ltr"] .wide-image {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .wide-image {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .wide-image {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .wide-image {
-  margin-left: 0
+  margin-left: 0;
 }
 
 .wide-image {
   margin-top: 0.5625rem;
-  margin-bottom: 2.25rem
+  margin-bottom: 2.25rem;
 }
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .wide-image {
-    margin-left: -7.14286vw
+  [dir="ltr"] .wide-image {
+    margin-left: -7.14286vw;
   }
 
-[dir="rtl"] .wide-image {
-    margin-right: -7.14286vw
+  [dir="rtl"] .wide-image {
+    margin-right: -7.14286vw;
   }
 
-.wide-image {
+  .wide-image {
     width: calc(100vw - 2.25rem);
     margin-top: 2.25rem;
-    margin-bottom: 4.5rem
-}
+    margin-bottom: 4.5rem;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .wide-image {
-    margin-left: calc(-7.14286vw - -1.07143px)
+  [dir="ltr"] .wide-image {
+    margin-left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .wide-image {
-    margin-right: calc(-7.14286vw - -1.07143px)
+  [dir="rtl"] .wide-image {
+    margin-right: calc(-7.14286vw - -0.06696rem);
   }
 
-.wide-image {
-    width: calc(85.71429vw - 3.05357rem)
-}
+  .wide-image {
+    width: calc(85.71429vw - 3.05357rem);
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .wide-image {
-    margin-left: calc(-7.14286vw - -0.62946rem)
+  [dir="ltr"] .wide-image {
+    margin-left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .wide-image {
-    margin-right: calc(-7.14286vw - -0.62946rem)
+  [dir="rtl"] .wide-image {
+    margin-right: calc(-7.14286vw - -0.62946rem);
   }
 
-.wide-image {
-    width: calc(85.71429vw - 9.80357rem)
-}
+  .wide-image {
+    width: calc(85.71429vw - 9.80357rem);
   }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .wide-image {
-    margin-left: -5.86607rem
+  [dir="ltr"] .wide-image {
+    margin-left: -5.86607rem;
   }
 
-[dir="rtl"] .wide-image {
-    margin-right: -5.86607rem
+  [dir="rtl"] .wide-image {
+    margin-right: -5.86607rem;
   }
 
-.wide-image {
-    width: 68.14286rem
-}
+  .wide-image {
+    width: 68.14286rem;
   }
+}
 
 /* Ensure that image doesn't overlap sidebar. */
 
 @media (min-width: 62.5rem) {
 
-.sidebar-grid .wide-image {
-    width: calc(64.28571vw - 2.85268rem)
-}
+  .sidebar-grid .wide-image {
+    width: calc(64.28571vw - 2.85268rem);
   }
+}
 
 @media (min-width: 75rem) {
 
-.sidebar-grid .wide-image {
-    width: calc(64.28571vw - 7.91518rem)
-}
+  .sidebar-grid .wide-image {
+    width: calc(64.28571vw - 7.91518rem);
   }
+}
 
 @media (min-width: 81.25rem) {
 
-.sidebar-grid .wide-image {
-    width: calc(71.42857vw - 8.54464rem)
-}
+  .sidebar-grid .wide-image {
+    width: calc(71.42857vw - 8.54464rem);
   }
+}
 
 @media (min-width: 90rem) {
 
-.sidebar-grid .wide-image {
-    width: 56.41071rem
-}
+  .sidebar-grid .wide-image {
+    width: 56.41071rem;
   }
+}
 
 /* Ensure that image doesn't overlap layout builder sections when editing layouts. */
 
 [dir="ltr"] .layout-builder .wide-image {
-  margin-left: 0
+  margin-left: 0;
 }
 
 [dir="rtl"] .layout-builder .wide-image {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="ltr"] .layout-builder .wide-image {
-  margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .layout-builder .wide-image {
-  margin-left: 0
+  margin-left: 0;
 }
 
 .layout-builder .wide-image {
diff --git a/web/core/themes/olivero/css/layout/grid.css b/web/core/themes/olivero/css/layout/grid.css
index 028cefda8..ba88f06c0 100644
--- a/web/core/themes/olivero/css/layout/grid.css
+++ b/web/core/themes/olivero/css/layout/grid.css
@@ -17,23 +17,23 @@
   grid-template-rows: 1fr;
   -ms-grid-columns: (minmax(0, 1fr))[6];
   grid-template-columns: repeat(6, minmax(0, 1fr));
-  grid-column-gap: 1.125rem
+  grid-column-gap: 1.125rem;
 
   /* .grid-full classes nested 3 or more deep go full width. */
 }
 
 .grid-full .grid-full .grid-full {
-    display: block;
-  }
+  display: block;
+}
 
 @media (min-width: 43.75rem) {
 
-.grid-full {
+  .grid-full {
     -ms-grid-columns: (minmax(0, 1fr))[14];
     grid-template-columns: repeat(14, minmax(0, 1fr));
-    grid-column-gap: 2.25rem
-}
+    grid-column-gap: 2.25rem;
   }
+}
 
 /*
   If the .grid-full is nested within the following, apply the appropriate number of columns.
@@ -43,21 +43,21 @@
 
 @media (min-width: 43.75rem) {
 
-.layout--content-narrow .grid-full,
-.layout--pass--content-narrow > * .grid-full {
+  .layout--content-narrow .grid-full,
+  .layout--pass--content-narrow > * .grid-full {
     -ms-grid-columns: (minmax(0, 1fr))[ 12 ];
-    grid-template-columns: repeat(12, minmax(0, 1fr))
-}
+    grid-template-columns: repeat(12, minmax(0, 1fr));
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--content-narrow .grid-full,
-.layout--pass--content-narrow > * .grid-full {
+  .layout--content-narrow .grid-full,
+  .layout--pass--content-narrow > * .grid-full {
     -ms-grid-columns: (minmax(0, 1fr))[ 8 ];
-    grid-template-columns: repeat(8, minmax(0, 1fr))
-}
+    grid-template-columns: repeat(8, minmax(0, 1fr));
   }
+}
 
 /*
   If the .grid-full is nested within the following, apply the appropriate number of columns.
@@ -67,18 +67,18 @@
 
 @media (min-width: 43.75rem) {
 
-.layout--content-medium .grid-full,
-.layout--pass--content-medium > * .grid-full {
+  .layout--content-medium .grid-full,
+  .layout--pass--content-medium > * .grid-full {
     -ms-grid-columns: (minmax(0, 1fr))[ 12 ];
-    grid-template-columns: repeat(12, minmax(0, 1fr))
-}
+    grid-template-columns: repeat(12, minmax(0, 1fr));
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--content-medium .grid-full,
-.layout--pass--content-medium > * .grid-full {
+  .layout--content-medium .grid-full,
+  .layout--pass--content-medium > * .grid-full {
     -ms-grid-columns: (minmax(0, 1fr))[ 10 ];
-    grid-template-columns: repeat(10, minmax(0, 1fr))
-}
+    grid-template-columns: repeat(10, minmax(0, 1fr));
   }
+}
diff --git a/web/core/themes/olivero/css/layout/layout-builder-fourcol-section.css b/web/core/themes/olivero/css/layout/layout-builder-fourcol-section.css
index b996a99ba..a53fd65b1 100644
--- a/web/core/themes/olivero/css/layout/layout-builder-fourcol-section.css
+++ b/web/core/themes/olivero/css/layout/layout-builder-fourcol-section.css
@@ -12,90 +12,84 @@
 
 .layout--fourcol-section {
   display: flex;
-  flex-wrap: wrap
+  flex-wrap: wrap;
 }
 
 .layout--fourcol-section > .layout__region {
-    flex: 1 0 100%;
-    margin-bottom: 1.125rem
-  }
+  flex: 1 0 100%;
+  margin-bottom: 1.125rem;
+}
 
 @media (min-width: 43.75rem) {
 
-.layout--fourcol-section > .layout__region {
-      flex-basis: calc(50% - 1.125rem);
-      flex-grow: 0;
-      flex-shrink: 0;
-      margin-bottom: 0
+  .layout--fourcol-section > .layout__region {
+    flex-basis: calc(50% - 1.125rem);
+    flex-grow: 0;
+    flex-shrink: 0;
+    margin-bottom: 0;
   }
-    }
-
-.layout--fourcol-section {
-
-  /* Two column layout. */
 }
 
+/* Two column layout. */
+
 @media (min-width: 43.75rem) {
-    .layout--fourcol-section > .layout__region--first,
-    .layout--fourcol-section > .layout__region--second {
-      margin-bottom: 2.25rem;
-    }
-
-    [dir="ltr"] .layout--fourcol-section > .layout__region--first,[dir="ltr"] 
-    .layout--fourcol-section > .layout__region--third {
-      margin-right: 1.125rem
+  .layout--fourcol-section > .layout__region--first,
+  .layout--fourcol-section > .layout__region--second {
+    margin-bottom: 2.25rem;
   }
 
-    [dir="rtl"] .layout--fourcol-section > .layout__region--first,[dir="rtl"] 
-    .layout--fourcol-section > .layout__region--third {
-      margin-left: 1.125rem
+  [dir="ltr"] .layout--fourcol-section > .layout__region--first,
+  [dir="ltr"] .layout--fourcol-section > .layout__region--third {
+    margin-right: 1.125rem;
   }
 
-    [dir="ltr"] .layout--fourcol-section > .layout__region--second,[dir="ltr"] 
-    .layout--fourcol-section > .layout__region--fourth {
-      margin-left: 1.125rem
+  [dir="rtl"] .layout--fourcol-section > .layout__region--first,
+  [dir="rtl"] .layout--fourcol-section > .layout__region--third {
+    margin-left: 1.125rem;
   }
 
-    [dir="rtl"] .layout--fourcol-section > .layout__region--second,[dir="rtl"] 
-    .layout--fourcol-section > .layout__region--fourth {
-      margin-right: 1.125rem
-  }
+  [dir="ltr"] .layout--fourcol-section > .layout__region--second,
+  [dir="ltr"] .layout--fourcol-section > .layout__region--fourth {
+    margin-left: 1.125rem;
   }
 
-.layout--fourcol-section {
-
-  /* Four column layout. */
+  [dir="rtl"] .layout--fourcol-section > .layout__region--second,
+  [dir="rtl"] .layout--fourcol-section > .layout__region--fourth {
+    margin-right: 1.125rem;
+  }
 }
 
-@media (min-width: 62.5rem) {
-    .layout--fourcol-section > .layout__region {
-      flex-basis: calc(25% - 1.6875rem);
-    }
+/* Four column layout. */
 
-    .layout--fourcol-section > .layout__region--first,
-    .layout--fourcol-section > .layout__region--second {
-      margin-bottom: 0;
-    }
+@media (min-width: 62.5rem) {
+  .layout--fourcol-section > .layout__region {
+    flex-basis: calc(25% - 1.6875rem);
+  }
 
-    [dir="ltr"] .layout--fourcol-section > .layout__region--first {
-      margin-right: 1.125rem
+  .layout--fourcol-section > .layout__region--first,
+  .layout--fourcol-section > .layout__region--second {
+    margin-bottom: 0;
   }
 
-    [dir="rtl"] .layout--fourcol-section > .layout__region--first {
-      margin-left: 1.125rem
+  [dir="ltr"] .layout--fourcol-section > .layout__region--first {
+    margin-right: 1.125rem;
   }
 
-    .layout--fourcol-section > .layout__region--second,
-    .layout--fourcol-section > .layout__region--third {
-      margin-left: 1.125rem;
-      margin-right: 1.125rem;
-    }
+  [dir="rtl"] .layout--fourcol-section > .layout__region--first {
+    margin-left: 1.125rem;
+  }
 
-    [dir="ltr"] .layout--fourcol-section > .layout__region--fourth {
-      margin-left: 1.125rem
+  .layout--fourcol-section > .layout__region--second,
+  .layout--fourcol-section > .layout__region--third {
+    margin-right: 1.125rem;
+    margin-left: 1.125rem;
   }
 
-    [dir="rtl"] .layout--fourcol-section > .layout__region--fourth {
-      margin-right: 1.125rem
+  [dir="ltr"] .layout--fourcol-section > .layout__region--fourth {
+    margin-left: 1.125rem;
   }
+
+  [dir="rtl"] .layout--fourcol-section > .layout__region--fourth {
+    margin-right: 1.125rem;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/layout-builder-threecol-section.css b/web/core/themes/olivero/css/layout/layout-builder-threecol-section.css
index d95f04b8f..166c3dfcc 100644
--- a/web/core/themes/olivero/css/layout/layout-builder-threecol-section.css
+++ b/web/core/themes/olivero/css/layout/layout-builder-threecol-section.css
@@ -12,70 +12,70 @@
 
 .layout--threecol-section {
   display: flex;
-  flex-wrap: wrap
+  flex-wrap: wrap;
 }
 
 .layout--threecol-section > .layout__region {
-    flex: 1 0 100%;
-    margin-bottom: 1.125rem
-  }
+  flex: 1 0 100%;
+  margin-bottom: 1.125rem;
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--threecol-section > .layout__region {
-      flex-grow: 0;
-      flex-shrink: 0;
-      margin-bottom: 0
+  .layout--threecol-section > .layout__region {
+    flex-grow: 0;
+    flex-shrink: 0;
+    margin-bottom: 0;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
-    [dir="ltr"] .layout--threecol-section > .layout__region--first {
-      margin-right: 1.125rem
+  [dir="ltr"] .layout--threecol-section > .layout__region--first {
+    margin-right: 1.125rem;
   }
-    [dir="rtl"] .layout--threecol-section > .layout__region--first {
-      margin-left: 1.125rem
+  [dir="rtl"] .layout--threecol-section > .layout__region--first {
+    margin-left: 1.125rem;
   }
 
-    .layout--threecol-section > .layout__region--second {
-      margin-left: 1.125rem;
-      margin-right: 1.125rem;
-    }
+  .layout--threecol-section > .layout__region--second {
+    margin-right: 1.125rem;
+    margin-left: 1.125rem;
+  }
 
-    [dir="ltr"] .layout--threecol-section > .layout__region--third {
-      margin-left: 1.125rem
+  [dir="ltr"] .layout--threecol-section > .layout__region--third {
+    margin-left: 1.125rem;
   }
 
-    [dir="rtl"] .layout--threecol-section > .layout__region--third {
-      margin-right: 1.125rem
+  [dir="rtl"] .layout--threecol-section > .layout__region--third {
+    margin-right: 1.125rem;
+  }
+  .layout--threecol-section--25-50-25 > .layout__region--first,
+  .layout--threecol-section--25-50-25 > .layout__region--third {
+    flex-basis: calc(25% - 1.125rem);
   }
-    .layout--threecol-section--25-50-25 > .layout__region--first,
-    .layout--threecol-section--25-50-25 > .layout__region--third {
-      flex-basis: calc(25% - 1.125rem);
-    }
 
-    .layout--threecol-section--25-50-25 > .layout__region--second {
-      flex-basis: calc(50% - 2.25rem);
-    }
-    .layout--threecol-section--25-25-50 > .layout__region--first,
-    .layout--threecol-section--25-25-50 > .layout__region--second {
-      flex-basis: calc(25% - 1.125rem);
-    }
+  .layout--threecol-section--25-50-25 > .layout__region--second {
+    flex-basis: calc(50% - 2.25rem);
+  }
+  .layout--threecol-section--25-25-50 > .layout__region--first,
+  .layout--threecol-section--25-25-50 > .layout__region--second {
+    flex-basis: calc(25% - 1.125rem);
+  }
 
-    .layout--threecol-section--25-25-50 > .layout__region--third {
-      flex-basis: calc(50% - 2.25rem);
-    }
-    .layout--threecol-section--50-25-25 > .layout__region--first {
-      flex-basis: calc(50% - 2.25rem);
-    }
+  .layout--threecol-section--25-25-50 > .layout__region--third {
+    flex-basis: calc(50% - 2.25rem);
+  }
+  .layout--threecol-section--50-25-25 > .layout__region--first {
+    flex-basis: calc(50% - 2.25rem);
+  }
 
-    .layout--threecol-section--50-25-25 > .layout__region--second,
-    .layout--threecol-section--50-25-25 > .layout__region--third {
-      flex-basis: calc(25% - 1.125rem);
-    }
-    .layout--threecol-section--33-34-33 > .layout__region--first,
-    .layout--threecol-section--33-34-33 > .layout__region--second,
-    .layout--threecol-section--33-34-33 > .layout__region--third {
-      flex-basis: calc(33.33% - 1.50075rem);
-    }
+  .layout--threecol-section--50-25-25 > .layout__region--second,
+  .layout--threecol-section--50-25-25 > .layout__region--third {
+    flex-basis: calc(25% - 1.125rem);
+  }
+  .layout--threecol-section--33-34-33 > .layout__region--first,
+  .layout--threecol-section--33-34-33 > .layout__region--second,
+  .layout--threecol-section--33-34-33 > .layout__region--third {
+    flex-basis: calc(33.33% - 1.50075rem);
+  }
 }
diff --git a/web/core/themes/olivero/css/layout/layout-builder-twocol-section.css b/web/core/themes/olivero/css/layout/layout-builder-twocol-section.css
index 3016c821e..e87f40e5b 100644
--- a/web/core/themes/olivero/css/layout/layout-builder-twocol-section.css
+++ b/web/core/themes/olivero/css/layout/layout-builder-twocol-section.css
@@ -12,127 +12,127 @@
 
 .layout--twocol-section {
   display: flex;
-  flex-wrap: wrap
+  flex-wrap: wrap;
 }
 
 .layout--twocol-section > .layout__region {
-    flex: 1 0 100%;
-    margin-bottom: 1.125rem
-  }
+  flex: 1 0 100%;
+  margin-bottom: 1.125rem;
+}
 
 @media (min-width: 43.75rem) {
 
-.layout--twocol-section > .layout__region {
-      flex-grow: 0;
-      flex-shrink: 0;
-      margin-bottom: 0
+  .layout--twocol-section > .layout__region {
+    flex-grow: 0;
+    flex-shrink: 0;
+    margin-bottom: 0;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
-    [dir="ltr"] .layout--twocol-section--50-50 > .layout__region--first {
-      margin-right: 1.125rem
+  [dir="ltr"] .layout--twocol-section--50-50 > .layout__region--first {
+    margin-right: 1.125rem;
   }
-    [dir="rtl"] .layout--twocol-section--50-50 > .layout__region--first {
-      margin-left: 1.125rem
+  [dir="rtl"] .layout--twocol-section--50-50 > .layout__region--first {
+    margin-left: 1.125rem;
+  }
+  .layout--twocol-section--50-50 > .layout__region--first {
+    flex-basis: calc(50% - 1.125rem);
   }
-    .layout--twocol-section--50-50 > .layout__region--first {
-      flex-basis: calc(50% - 1.125rem);
-    }
 
-    [dir="ltr"] .layout--twocol-section--50-50 > .layout__region--second {
-      margin-left: 1.125rem
+  [dir="ltr"] .layout--twocol-section--50-50 > .layout__region--second {
+    margin-left: 1.125rem;
   }
 
-    [dir="rtl"] .layout--twocol-section--50-50 > .layout__region--second {
-      margin-right: 1.125rem
+  [dir="rtl"] .layout--twocol-section--50-50 > .layout__region--second {
+    margin-right: 1.125rem;
   }
 
-    .layout--twocol-section--50-50 > .layout__region--second {
-      flex-basis: calc(50% - 1.125rem);
-    }
-    [dir="ltr"] .layout--twocol-section--33-67 > .layout__region--first {
-      margin-right: 0.74993rem
+  .layout--twocol-section--50-50 > .layout__region--second {
+    flex-basis: calc(50% - 1.125rem);
+  }
+  [dir="ltr"] .layout--twocol-section--33-67 > .layout__region--first {
+    margin-right: 0.74993rem;
+  }
+  [dir="rtl"] .layout--twocol-section--33-67 > .layout__region--first {
+    margin-left: 0.74993rem;
   }
-    [dir="rtl"] .layout--twocol-section--33-67 > .layout__region--first {
-      margin-left: 0.74993rem
+  .layout--twocol-section--33-67 > .layout__region--first {
+    flex-basis: calc(33.33% - 0.74993rem);
   }
-    .layout--twocol-section--33-67 > .layout__region--first {
-      flex-basis: calc(33.33% - 0.74993rem);
-    }
 
-    [dir="ltr"] .layout--twocol-section--33-67 > .layout__region--second {
-      margin-left: 1.49985rem
+  [dir="ltr"] .layout--twocol-section--33-67 > .layout__region--second {
+    margin-left: 1.49985rem;
   }
 
-    [dir="rtl"] .layout--twocol-section--33-67 > .layout__region--second {
-      margin-right: 1.49985rem
+  [dir="rtl"] .layout--twocol-section--33-67 > .layout__region--second {
+    margin-right: 1.49985rem;
   }
 
-    .layout--twocol-section--33-67 > .layout__region--second {
-      flex-basis: calc(66.66% - 1.49985rem);
-    }
-    [dir="ltr"] .layout--twocol-section--67-33 > .layout__region--first {
-      margin-right: 1.49985rem
+  .layout--twocol-section--33-67 > .layout__region--second {
+    flex-basis: calc(66.66% - 1.49985rem);
   }
-    [dir="rtl"] .layout--twocol-section--67-33 > .layout__region--first {
-      margin-left: 1.49985rem
+  [dir="ltr"] .layout--twocol-section--67-33 > .layout__region--first {
+    margin-right: 1.49985rem;
+  }
+  [dir="rtl"] .layout--twocol-section--67-33 > .layout__region--first {
+    margin-left: 1.49985rem;
+  }
+  .layout--twocol-section--67-33 > .layout__region--first {
+    flex-basis: calc(66.66% - 1.49985rem);
   }
-    .layout--twocol-section--67-33 > .layout__region--first {
-      flex-basis: calc(66.66% - 1.49985rem);
-    }
 
-    [dir="ltr"] .layout--twocol-section--67-33 > .layout__region--second {
-      margin-left: 0.74993rem
+  [dir="ltr"] .layout--twocol-section--67-33 > .layout__region--second {
+    margin-left: 0.74993rem;
   }
 
-    [dir="rtl"] .layout--twocol-section--67-33 > .layout__region--second {
-      margin-right: 0.74993rem
+  [dir="rtl"] .layout--twocol-section--67-33 > .layout__region--second {
+    margin-right: 0.74993rem;
   }
 
-    .layout--twocol-section--67-33 > .layout__region--second {
-      flex-basis: calc(33.33% - 0.74993rem);
-    }
-    [dir="ltr"] .layout--twocol-section--25-75 > .layout__region--first {
-      margin-right: 0.5625rem
+  .layout--twocol-section--67-33 > .layout__region--second {
+    flex-basis: calc(33.33% - 0.74993rem);
+  }
+  [dir="ltr"] .layout--twocol-section--25-75 > .layout__region--first {
+    margin-right: 0.5625rem;
+  }
+  [dir="rtl"] .layout--twocol-section--25-75 > .layout__region--first {
+    margin-left: 0.5625rem;
   }
-    [dir="rtl"] .layout--twocol-section--25-75 > .layout__region--first {
-      margin-left: 0.5625rem
+  .layout--twocol-section--25-75 > .layout__region--first {
+    flex-basis: calc(25% - 0.5625rem);
   }
-    .layout--twocol-section--25-75 > .layout__region--first {
-      flex-basis: calc(25% - 0.5625rem);
-    }
 
-    [dir="ltr"] .layout--twocol-section--25-75 > .layout__region--second {
-      margin-left: 1.6875rem
+  [dir="ltr"] .layout--twocol-section--25-75 > .layout__region--second {
+    margin-left: 1.6875rem;
   }
 
-    [dir="rtl"] .layout--twocol-section--25-75 > .layout__region--second {
-      margin-right: 1.6875rem
+  [dir="rtl"] .layout--twocol-section--25-75 > .layout__region--second {
+    margin-right: 1.6875rem;
   }
 
-    .layout--twocol-section--25-75 > .layout__region--second {
-      flex-basis: calc(75% - 1.6875rem);
-    }
-    [dir="ltr"] .layout--twocol-section--75-25 > .layout__region--first {
-      margin-right: 1.6875rem
+  .layout--twocol-section--25-75 > .layout__region--second {
+    flex-basis: calc(75% - 1.6875rem);
   }
-    [dir="rtl"] .layout--twocol-section--75-25 > .layout__region--first {
-      margin-left: 1.6875rem
+  [dir="ltr"] .layout--twocol-section--75-25 > .layout__region--first {
+    margin-right: 1.6875rem;
+  }
+  [dir="rtl"] .layout--twocol-section--75-25 > .layout__region--first {
+    margin-left: 1.6875rem;
+  }
+  .layout--twocol-section--75-25 > .layout__region--first {
+    flex-basis: calc(75% - 1.6875rem);
   }
-    .layout--twocol-section--75-25 > .layout__region--first {
-      flex-basis: calc(75% - 1.6875rem);
-    }
 
-    [dir="ltr"] .layout--twocol-section--75-25 > .layout__region--second {
-      margin-left: 0.5625rem
+  [dir="ltr"] .layout--twocol-section--75-25 > .layout__region--second {
+    margin-left: 0.5625rem;
   }
 
-    [dir="rtl"] .layout--twocol-section--75-25 > .layout__region--second {
-      margin-right: 0.5625rem
+  [dir="rtl"] .layout--twocol-section--75-25 > .layout__region--second {
+    margin-right: 0.5625rem;
   }
 
-    .layout--twocol-section--75-25 > .layout__region--second {
-      flex-basis: calc(25% - 0.5625rem);
-    }
+  .layout--twocol-section--75-25 > .layout__region--second {
+    flex-basis: calc(25% - 0.5625rem);
+  }
 }
diff --git a/web/core/themes/olivero/css/layout/layout-content-medium.css b/web/core/themes/olivero/css/layout/layout-content-medium.css
index ceb1489a9..c7a09fc6d 100644
--- a/web/core/themes/olivero/css/layout/layout-content-medium.css
+++ b/web/core/themes/olivero/css/layout/layout-content-medium.css
@@ -15,28 +15,28 @@
   -ms-grid-column: 1;
   -ms-grid-column-span: 6;
   grid-column: 1 / 7;
-  width: 100%
+  width: 100%;
 }
 
 @media (min-width: 43.75rem) {
 
-.layout--content-medium,
-.layout--pass--content-medium > * {
+  .layout--content-medium,
+  .layout--pass--content-medium > * {
     -ms-grid-column: 2;
     -ms-grid-column-span: 12;
-    grid-column: 2 / 14
-}
+    grid-column: 2 / 14;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--content-medium,
-.layout--pass--content-medium > * {
+  .layout--content-medium,
+  .layout--pass--content-medium > * {
     -ms-grid-column: 3;
     -ms-grid-column-span: 10;
-    grid-column: 3 / 13
-}
+    grid-column: 3 / 13;
   }
+}
 
 /*
   If .layout--content-medium is nested within itself, or an element that's inheriting the
@@ -46,24 +46,24 @@
 
 @media (min-width: 43.75rem) {
 
-.layout--pass--content-medium > * .layout--content-medium,
-  .layout--pass--content-medium > * .layout--pass--content-medium > *,
+  .layout--pass--content-medium > * .layout--content-medium,
   .layout--content-medium .layout--content-medium,
+  .layout--pass--content-medium > * .layout--pass--content-medium > *,
   .layout--content-medium .layout--pass--content-medium > * {
-      -ms-grid-column: 1;
-      -ms-grid-column-span: 12;
-      grid-column: 1 / 13
+    -ms-grid-column: 1;
+    -ms-grid-column-span: 12;
+    grid-column: 1 / 13;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--pass--content-medium > * .layout--content-medium,
-  .layout--pass--content-medium > * .layout--pass--content-medium > *,
+  .layout--pass--content-medium > * .layout--content-medium,
   .layout--content-medium .layout--content-medium,
+  .layout--pass--content-medium > * .layout--pass--content-medium > *,
   .layout--content-medium .layout--pass--content-medium > * {
-      -ms-grid-column: 1;
-      -ms-grid-column-span: 10;
-      grid-column: 1 / 11
+    -ms-grid-column: 1;
+    -ms-grid-column-span: 10;
+    grid-column: 1 / 11;
   }
-    }
+}
diff --git a/web/core/themes/olivero/css/layout/layout-content-narrow.css b/web/core/themes/olivero/css/layout/layout-content-narrow.css
index 65517b1db..abaa2261b 100644
--- a/web/core/themes/olivero/css/layout/layout-content-narrow.css
+++ b/web/core/themes/olivero/css/layout/layout-content-narrow.css
@@ -15,28 +15,28 @@
   -ms-grid-column: 1;
   -ms-grid-column-span: 6;
   grid-column: 1 / 7;
-  width: 100%
+  width: 100%;
 }
 
 @media (min-width: 43.75rem) {
 
-.layout--content-narrow,
-.layout--pass--content-narrow > * {
+  .layout--content-narrow,
+  .layout--pass--content-narrow > * {
     -ms-grid-column: 2;
     -ms-grid-column-span: 12;
-    grid-column: 2 / 14
-}
+    grid-column: 2 / 14;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--content-narrow,
-.layout--pass--content-narrow > * {
+  .layout--content-narrow,
+  .layout--pass--content-narrow > * {
     -ms-grid-column: 3;
     -ms-grid-column-span: 8;
-    grid-column: 3 / 11
-}
+    grid-column: 3 / 11;
   }
+}
 
 /*
   If .layout--content-narrow is nested within any of the following, allocate the appropriate
@@ -49,35 +49,35 @@
 
 @media (min-width: 43.75rem) {
 
-.layout--content-narrow .layout--content-narrow,
-  .layout--content-narrow .layout--pass--content-narrow > *,
+  .layout--content-narrow .layout--content-narrow,
   .layout--pass--content-narrow > * .layout--content-narrow,
-  .layout--pass--content-narrow > * .layout--pass--content-narrow > *,
   .layout--content-medium .layout--content-narrow,
-  .layout--content-medium .layout--pass--content-narrow > *,
   .layout--pass--content-medium > * .layout--content-narrow,
+  .layout--content-narrow .layout--pass--content-narrow > *,
+  .layout--pass--content-narrow > * .layout--pass--content-narrow > *,
+  .layout--content-medium .layout--pass--content-narrow > *,
   .layout--pass--content-medium > * .layout--pass--content-narrow > * {
-      -ms-grid-column: 1;
-      -ms-grid-column-span: 12;
-      grid-column: 1 / 13
+    -ms-grid-column: 1;
+    -ms-grid-column-span: 12;
+    grid-column: 1 / 13;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--content-narrow .layout--content-narrow,
-  .layout--content-narrow .layout--pass--content-narrow > *,
+  .layout--content-narrow .layout--content-narrow,
   .layout--pass--content-narrow > * .layout--content-narrow,
-  .layout--pass--content-narrow > * .layout--pass--content-narrow > *,
   .layout--content-medium .layout--content-narrow,
-  .layout--content-medium .layout--pass--content-narrow > *,
   .layout--pass--content-medium > * .layout--content-narrow,
+  .layout--content-narrow .layout--pass--content-narrow > *,
+  .layout--pass--content-narrow > * .layout--pass--content-narrow > *,
+  .layout--content-medium .layout--pass--content-narrow > *,
   .layout--pass--content-medium > * .layout--pass--content-narrow > * {
-      -ms-grid-column: 1;
-      -ms-grid-column-span: 8;
-      grid-column: 1 / 9
+    -ms-grid-column: 1;
+    -ms-grid-column-span: 8;
+    grid-column: 1 / 9;
   }
-    }
+}
 
 /*
   Special grid-breaking treatment for text-content elements that
@@ -86,195 +86,300 @@
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:before,[dir="ltr"]  .layout--content-narrow .text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          left: -7.14286vw
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    left: -7.14286vw;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:before,[dir="rtl"]  .layout--content-narrow .text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          right: -7.14286vw
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    right: -7.14286vw;
   }
-        }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:before,[dir="ltr"]  .layout--content-narrow .text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          left: calc(-7.14286vw - -1.07143px)
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:before,[dir="rtl"]  .layout--content-narrow .text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          right: calc(-7.14286vw - -1.07143px)
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    right: calc(-7.14286vw - -0.06696rem);
   }
-        }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:before,[dir="ltr"]  .layout--content-narrow .text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          left: calc(-7.14286vw - -0.62946rem)
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:before,[dir="rtl"]  .layout--content-narrow .text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          right: calc(-7.14286vw - -0.62946rem)
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    right: calc(-7.14286vw - -0.62946rem);
   }
-        }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:before,[dir="ltr"]  .layout--content-narrow .text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          left: -5.86607rem
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:before,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    left: -5.86607rem;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:before,[dir="rtl"]  .layout--content-narrow .text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:before,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:before {
-          right: -5.86607rem
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:before,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:before,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:before {
+    right: -5.86607rem;
   }
-        }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:after,[dir="ltr"]  .layout--content-narrow .text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          left: -7.14286vw
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    left: -7.14286vw;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:after,[dir="rtl"]  .layout--content-narrow .text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          right: -7.14286vw
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    right: -7.14286vw;
   }
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:after,[dir="ltr"]  .layout--content-narrow .text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          margin-left: 2px
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    margin-left: 2px;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:after,[dir="rtl"]  .layout--content-narrow .text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          margin-right: 2px
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    margin-right: 2px;
   }
 
-.layout--content-narrow.text-content blockquote:after, .layout--content-narrow .text-content blockquote:after, .layout--pass--content-narrow > *.text-content blockquote:after, .layout--pass--content-narrow > * .text-content blockquote:after {
-          width: 1.125rem;
-          height: calc(100% - 2.8125rem)
-      }
-        }
+  .layout--content-narrow.text-content blockquote:after,
+  .layout--pass--content-narrow > *.text-content blockquote:after,
+  .layout--content-narrow .text-content blockquote:after,
+  .layout--pass--content-narrow > * .text-content blockquote:after {
+    width: 1.125rem;
+    height: calc(100% - 2.8125rem);
+  }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:after,[dir="ltr"]  .layout--content-narrow .text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          left: calc(-7.14286vw - -1.07143px)
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:after,[dir="rtl"]  .layout--content-narrow .text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          right: calc(-7.14286vw - -1.07143px)
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    right: calc(-7.14286vw - -0.06696rem);
   }
-        }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:after,[dir="ltr"]  .layout--content-narrow .text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          left: calc(-7.14286vw - -0.62946rem)
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:after,[dir="rtl"]  .layout--content-narrow .text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          right: calc(-7.14286vw - -0.62946rem)
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    right: calc(-7.14286vw - -0.62946rem);
   }
-        }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote:after,[dir="ltr"]  .layout--content-narrow .text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          left: -5.86607rem
+  [dir="ltr"] .layout--content-narrow.text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote:after,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    left: -5.86607rem;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote:after,[dir="rtl"]  .layout--content-narrow .text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote:after,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote:after {
-          right: -5.86607rem
+  [dir="rtl"] .layout--content-narrow.text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote:after,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote:after,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote:after {
+    right: -5.86607rem;
   }
-        }
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content blockquote,[dir="ltr"]  .layout--content-narrow .text-content blockquote,[dir="ltr"]  .layout--pass--content-narrow > *.text-content blockquote,[dir="ltr"]  .layout--pass--content-narrow > * .text-content blockquote {
-        padding-left: 0
+  [dir="ltr"] .layout--content-narrow.text-content blockquote,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content blockquote,
+  [dir="ltr"] .layout--content-narrow .text-content blockquote,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content blockquote {
+    padding-left: 0;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content blockquote,[dir="rtl"]  .layout--content-narrow .text-content blockquote,[dir="rtl"]  .layout--pass--content-narrow > *.text-content blockquote,[dir="rtl"]  .layout--pass--content-narrow > * .text-content blockquote {
-        padding-right: 0
+  [dir="rtl"] .layout--content-narrow.text-content blockquote,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content blockquote,
+  [dir="rtl"] .layout--content-narrow .text-content blockquote,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content blockquote {
+    padding-right: 0;
   }
 
-.layout--content-narrow.text-content blockquote, .layout--content-narrow .text-content blockquote, .layout--pass--content-narrow > *.text-content blockquote, .layout--pass--content-narrow > * .text-content blockquote {
-        width: calc(71.42857vw - 2.25rem);
-        margin-top: 3.375rem;
-        margin-bottom: 3.375rem
-    }
-      }
+  .layout--content-narrow.text-content blockquote,
+  .layout--pass--content-narrow > *.text-content blockquote,
+  .layout--content-narrow .text-content blockquote,
+  .layout--pass--content-narrow > * .text-content blockquote {
+    width: calc(71.42857vw - 2.25rem);
+    margin-top: 3.375rem;
+    margin-bottom: 3.375rem;
+  }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout--content-narrow.text-content blockquote, .layout--content-narrow .text-content blockquote, .layout--pass--content-narrow > *.text-content blockquote, .layout--pass--content-narrow > * .text-content blockquote {
-        width: calc(71.42857vw - 2.91964rem)
-    }
-      }
+  .layout--content-narrow.text-content blockquote,
+  .layout--pass--content-narrow > *.text-content blockquote,
+  .layout--content-narrow .text-content blockquote,
+  .layout--pass--content-narrow > * .text-content blockquote {
+    width: calc(71.42857vw - 2.91964rem);
+  }
+}
 
 @media (min-width: 75rem) {
 
-.layout--content-narrow.text-content blockquote, .layout--content-narrow .text-content blockquote, .layout--pass--content-narrow > *.text-content blockquote, .layout--pass--content-narrow > * .text-content blockquote {
-        width: calc(71.42857vw - 8.54464rem)
-    }
-      }
+  .layout--content-narrow.text-content blockquote,
+  .layout--pass--content-narrow > *.text-content blockquote,
+  .layout--content-narrow .text-content blockquote,
+  .layout--pass--content-narrow > * .text-content blockquote {
+    width: calc(71.42857vw - 8.54464rem);
+  }
+}
 
 @media (min-width: 90rem) {
 
-.layout--content-narrow.text-content blockquote, .layout--content-narrow .text-content blockquote, .layout--pass--content-narrow > *.text-content blockquote, .layout--pass--content-narrow > * .text-content blockquote {
-        width: 56.41071rem
-    }
-      }
+  .layout--content-narrow.text-content blockquote,
+  .layout--pass--content-narrow > *.text-content blockquote,
+  .layout--content-narrow .text-content blockquote,
+  .layout--pass--content-narrow > * .text-content blockquote {
+    width: 56.41071rem;
+  }
+}
 
 @media (min-width: 43.75rem) {
 
-.layout--content-narrow.text-content pre, .layout--content-narrow .text-content pre, .layout--pass--content-narrow > *.text-content pre, .layout--pass--content-narrow > * .text-content pre {
-        margin-top: 3.375rem;
-        margin-bottom: 3.375rem
-    }
-      }
+  .layout--content-narrow.text-content pre,
+  .layout--pass--content-narrow > *.text-content pre,
+  .layout--content-narrow .text-content pre,
+  .layout--pass--content-narrow > * .text-content pre {
+    margin-top: 3.375rem;
+    margin-bottom: 3.375rem;
+  }
+}
 
 @media (min-width: 62.5rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content pre,[dir="ltr"]  .layout--content-narrow .text-content pre,[dir="ltr"]  .layout--pass--content-narrow > *.text-content pre,[dir="ltr"]  .layout--pass--content-narrow > * .text-content pre {
-        margin-left: calc(-7.14286vw - -1.07143px)
+  [dir="ltr"] .layout--content-narrow.text-content pre,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content pre,
+  [dir="ltr"] .layout--content-narrow .text-content pre,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content pre {
+    margin-left: calc(-7.14286vw - -0.06696rem);
   }
 
-[dir="rtl"] .layout--content-narrow.text-content pre,[dir="rtl"]  .layout--content-narrow .text-content pre,[dir="rtl"]  .layout--pass--content-narrow > *.text-content pre,[dir="rtl"]  .layout--pass--content-narrow > * .text-content pre {
-        margin-right: calc(-7.14286vw - -1.07143px)
+  [dir="rtl"] .layout--content-narrow.text-content pre,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content pre,
+  [dir="rtl"] .layout--content-narrow .text-content pre,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content pre {
+    margin-right: calc(-7.14286vw - -0.06696rem);
   }
 
-.layout--content-narrow.text-content pre, .layout--content-narrow .text-content pre, .layout--pass--content-narrow > *.text-content pre, .layout--pass--content-narrow > * .text-content pre {
-        width: calc(85.71429vw - 3.05357rem)
-    }
-      }
+  .layout--content-narrow.text-content pre,
+  .layout--pass--content-narrow > *.text-content pre,
+  .layout--content-narrow .text-content pre,
+  .layout--pass--content-narrow > * .text-content pre {
+    width: calc(85.71429vw - 3.05357rem);
+  }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content pre,[dir="ltr"]  .layout--content-narrow .text-content pre,[dir="ltr"]  .layout--pass--content-narrow > *.text-content pre,[dir="ltr"]  .layout--pass--content-narrow > * .text-content pre {
-        margin-left: calc(-7.14286vw - -0.62946rem)
+  [dir="ltr"] .layout--content-narrow.text-content pre,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content pre,
+  [dir="ltr"] .layout--content-narrow .text-content pre,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content pre {
+    margin-left: calc(-7.14286vw - -0.62946rem);
   }
 
-[dir="rtl"] .layout--content-narrow.text-content pre,[dir="rtl"]  .layout--content-narrow .text-content pre,[dir="rtl"]  .layout--pass--content-narrow > *.text-content pre,[dir="rtl"]  .layout--pass--content-narrow > * .text-content pre {
-        margin-right: calc(-7.14286vw - -0.62946rem)
+  [dir="rtl"] .layout--content-narrow.text-content pre,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content pre,
+  [dir="rtl"] .layout--content-narrow .text-content pre,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content pre {
+    margin-right: calc(-7.14286vw - -0.62946rem);
   }
 
-.layout--content-narrow.text-content pre, .layout--content-narrow .text-content pre, .layout--pass--content-narrow > *.text-content pre, .layout--pass--content-narrow > * .text-content pre {
-        width: calc(85.71429vw - 9.80357rem)
-    }
-      }
+  .layout--content-narrow.text-content pre,
+  .layout--pass--content-narrow > *.text-content pre,
+  .layout--content-narrow .text-content pre,
+  .layout--pass--content-narrow > * .text-content pre {
+    width: calc(85.71429vw - 9.80357rem);
+  }
+}
 
 @media (min-width: 90rem) {
 
-[dir="ltr"] .layout--content-narrow.text-content pre,[dir="ltr"]  .layout--content-narrow .text-content pre,[dir="ltr"]  .layout--pass--content-narrow > *.text-content pre,[dir="ltr"]  .layout--pass--content-narrow > * .text-content pre {
-        margin-left: -5.86607rem
+  [dir="ltr"] .layout--content-narrow.text-content pre,
+  [dir="ltr"] .layout--pass--content-narrow > *.text-content pre,
+  [dir="ltr"] .layout--content-narrow .text-content pre,
+  [dir="ltr"] .layout--pass--content-narrow > * .text-content pre {
+    margin-left: -5.86607rem;
   }
 
-[dir="rtl"] .layout--content-narrow.text-content pre,[dir="rtl"]  .layout--content-narrow .text-content pre,[dir="rtl"]  .layout--pass--content-narrow > *.text-content pre,[dir="rtl"]  .layout--pass--content-narrow > * .text-content pre {
-        margin-right: -5.86607rem
+  [dir="rtl"] .layout--content-narrow.text-content pre,
+  [dir="rtl"] .layout--pass--content-narrow > *.text-content pre,
+  [dir="rtl"] .layout--content-narrow .text-content pre,
+  [dir="rtl"] .layout--pass--content-narrow > * .text-content pre {
+    margin-right: -5.86607rem;
   }
 
-.layout--content-narrow.text-content pre, .layout--content-narrow .text-content pre, .layout--pass--content-narrow > *.text-content pre, .layout--pass--content-narrow > * .text-content pre {
-        width: 68.14286rem
-    }
-      }
+  .layout--content-narrow.text-content pre,
+  .layout--pass--content-narrow > *.text-content pre,
+  .layout--content-narrow .text-content pre,
+  .layout--pass--content-narrow > * .text-content pre {
+    width: 68.14286rem;
+  }
+}
 
 /**
  * <pre> and <blockquote> elements should not break containers and overflow
@@ -282,12 +387,12 @@
  */
 
 .sidebar-grid .layout--content-narrow.text-content blockquote,
-      .sidebar-grid .layout--content-narrow.text-content pre,
-      .sidebar-grid .layout--content-narrow .text-content blockquote,
-      .sidebar-grid .layout--content-narrow .text-content pre,
-      .sidebar-grid .layout--pass--content-narrow > *.text-content blockquote,
-      .sidebar-grid .layout--pass--content-narrow > *.text-content pre,
-      .sidebar-grid .layout--pass--content-narrow > * .text-content blockquote,
-      .sidebar-grid .layout--pass--content-narrow > * .text-content pre {
-        width: auto;
-      }
+.sidebar-grid .layout--pass--content-narrow > *.text-content blockquote,
+.sidebar-grid .layout--content-narrow .text-content blockquote,
+.sidebar-grid .layout--pass--content-narrow > * .text-content blockquote,
+.sidebar-grid .layout--content-narrow.text-content pre,
+.sidebar-grid .layout--pass--content-narrow > *.text-content pre,
+.sidebar-grid .layout--content-narrow .text-content pre,
+.sidebar-grid .layout--pass--content-narrow > * .text-content pre {
+  width: auto;
+}
diff --git a/web/core/themes/olivero/css/layout/layout-discovery-section-layout.css b/web/core/themes/olivero/css/layout/layout-discovery-section-layout.css
index 0ddcb86cf..b26508ebf 100644
--- a/web/core/themes/olivero/css/layout/layout-discovery-section-layout.css
+++ b/web/core/themes/olivero/css/layout/layout-discovery-section-layout.css
@@ -11,19 +11,19 @@
  */
 
 .layout {
-  margin-bottom: 1.125rem
+  margin-bottom: 1.125rem;
 }
 
 @media (min-width: 43.75rem) {
 
-.layout {
-    margin-bottom: 2.25rem
-}
+  .layout {
+    margin-bottom: 2.25rem;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.layout {
-    margin-bottom: 3.375rem
-}
+  .layout {
+    margin-bottom: 3.375rem;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/layout-footer.css b/web/core/themes/olivero/css/layout/layout-footer.css
index 810cafb92..270b9738d 100644
--- a/web/core/themes/olivero/css/layout/layout-footer.css
+++ b/web/core/themes/olivero/css/layout/layout-footer.css
@@ -22,42 +22,46 @@
 
 .site-footer__inner {
   padding-top: 2.25rem;
-  padding-bottom: 2.25rem
+  padding-bottom: 2.25rem;
 }
 
 @media (min-width: 75rem) {
 
-.site-footer__inner {
+  .site-footer__inner {
     padding-top: 4.5rem;
-    padding-bottom: 14.625rem
-}
+    padding-bottom: 14.625rem;
   }
+}
 
-.region--footer_top__inner > *, .region--footer_bottom__inner > * {
-    margin-bottom: 2.25rem
-  }
+.region--footer_top__inner > *,
+.region--footer_bottom__inner > * {
+  margin-bottom: 2.25rem;
+}
 
 @media (min-width: 43.75rem) {
 
-.region--footer_top__inner > *, .region--footer_bottom__inner > * {
-      flex: 1;
-      margin-bottom: 0
+  .region--footer_top__inner > *,
+  .region--footer_bottom__inner > * {
+    flex: 1;
+    margin-bottom: 0;
   }
 
-      [dir="ltr"] .region--footer_top__inner > *:not(:last-child),[dir="ltr"]  .region--footer_bottom__inner > *:not(:last-child) {
-        margin-right: 2.25rem;
+  [dir="ltr"] .region--footer_top__inner > *:not(:last-child),
+  [dir="ltr"] .region--footer_bottom__inner > *:not(:last-child) {
+    margin-right: 2.25rem;
   }
 
-      [dir="rtl"] .region--footer_top__inner > *:not(:last-child),[dir="rtl"]  .region--footer_bottom__inner > *:not(:last-child) {
-        margin-left: 2.25rem;
+  [dir="rtl"] .region--footer_top__inner > *:not(:last-child),
+  [dir="rtl"] .region--footer_bottom__inner > *:not(:last-child) {
+    margin-left: 2.25rem;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.region--footer_top__inner,
-.region--footer_bottom__inner {
+  .region--footer_top__inner,
+  .region--footer_bottom__inner {
     display: flex;
-    flex-wrap: wrap
-}
+    flex-wrap: wrap;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/layout-sidebar.css b/web/core/themes/olivero/css/layout/layout-sidebar.css
index f71663c48..438d82933 100644
--- a/web/core/themes/olivero/css/layout/layout-sidebar.css
+++ b/web/core/themes/olivero/css/layout/layout-sidebar.css
@@ -11,75 +11,75 @@
  */
 
 .sidebar-grid > .site-main {
-    -ms-grid-column: 1;
-    -ms-grid-column-span: 6;
-    grid-column: 1 / 7;
-    align-self: flex-start;
-    -ms-grid-row-align: start
-  }
+  -ms-grid-column: 1;
+  -ms-grid-column-span: 6;
+  grid-column: 1 / 7;
+  align-self: flex-start;
+  -ms-grid-row-align: start;
+}
 
 @media (min-width: 43.75rem) {
 
-.sidebar-grid > .site-main {
-      -ms-grid-column: 1;
-      -ms-grid-column-span: 14;
-      grid-column: 1 / 15
+  .sidebar-grid > .site-main {
+    -ms-grid-column: 1;
+    -ms-grid-column-span: 14;
+    grid-column: 1 / 15;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.sidebar-grid > .site-main {
-      display: -ms-grid;
-      display: grid;
-      -ms-grid-columns: (minmax(0, 1fr))[8];
-      grid-template-columns: repeat(8, minmax(0, 1fr));
-      -ms-grid-column: 3;
-      -ms-grid-column-span: 8;
-      grid-column: 3 / 11
+  .sidebar-grid > .site-main {
+    display: -ms-grid;
+    display: grid;
+    -ms-grid-columns: (minmax(0, 1fr))[8];
+    grid-template-columns: repeat(8, minmax(0, 1fr));
+    -ms-grid-column: 3;
+    -ms-grid-column-span: 8;
+    grid-column: 3 / 11;
   }
 
-      .sidebar-grid > .site-main > .region--content-above,
-      .sidebar-grid > .site-main > .region--content {
-        -ms-grid-columns: (minmax(0, 1fr))[8];
-        grid-template-columns: repeat(8, minmax(0, 1fr));
-        -ms-grid-column: 1;
-        -ms-grid-column-span: 8;
-        grid-column: 1 / 9;
-      }
-
-      .sidebar-grid > .site-main .layout--content-narrow,
-      .sidebar-grid > .site-main .layout--pass--content-narrow > *,
-      .sidebar-grid > .site-main .layout--content-medium,
-      .sidebar-grid > .site-main .layout--pass--content-medium > * {
-        -ms-grid-column: 1;
-        -ms-grid-column-span: 8;
-        grid-column: 1 / 9;
-      }
-    }
+  .sidebar-grid > .site-main > .region--content-above,
+  .sidebar-grid > .site-main > .region--content {
+    -ms-grid-columns: (minmax(0, 1fr))[8];
+    grid-template-columns: repeat(8, minmax(0, 1fr));
+    -ms-grid-column: 1;
+    -ms-grid-column-span: 8;
+    grid-column: 1 / 9;
+  }
 
-.sidebar-grid .region--sidebar {
-    -ms-grid-row: 2;
+  .sidebar-grid > .site-main .layout--content-narrow,
+  .sidebar-grid > .site-main .layout--pass--content-narrow > *,
+  .sidebar-grid > .site-main .layout--content-medium,
+  .sidebar-grid > .site-main .layout--pass--content-medium > * {
     -ms-grid-column: 1;
-    -ms-grid-column-span: 6;
-    grid-column: 1 / 7
+    -ms-grid-column-span: 8;
+    grid-column: 1 / 9;
   }
+}
+
+.sidebar-grid .region--sidebar {
+  -ms-grid-row: 2;
+  -ms-grid-column: 1;
+  -ms-grid-column-span: 6;
+  grid-column: 1 / 7;
+}
 
 @media (min-width: 43.75rem) {
 
-.sidebar-grid .region--sidebar {
-      -ms-grid-column: 3;
-      -ms-grid-column-span: 10;
-      grid-column: 3 / 13
+  .sidebar-grid .region--sidebar {
+    -ms-grid-column: 3;
+    -ms-grid-column-span: 10;
+    grid-column: 3 / 13;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.sidebar-grid .region--sidebar {
-      -ms-grid-row: 1;
-      -ms-grid-column: 12;
-      -ms-grid-column-span: 3;
-      grid-column: 12 / 15
+  .sidebar-grid .region--sidebar {
+    -ms-grid-row: 1;
+    -ms-grid-column: 12;
+    -ms-grid-column-span: 3;
+    grid-column: 12 / 15;
   }
-    }
+}
diff --git a/web/core/themes/olivero/css/layout/layout-views-grid-horizontal.css b/web/core/themes/olivero/css/layout/layout-views-grid-horizontal.css
index 0e2c47eb9..b6fd80977 100644
--- a/web/core/themes/olivero/css/layout/layout-views-grid-horizontal.css
+++ b/web/core/themes/olivero/css/layout/layout-views-grid-horizontal.css
@@ -12,562 +12,532 @@
 
 .views-view-grid--horizontal {
   display: flex;
-  flex-wrap: wrap
+  flex-wrap: wrap;
 }
 
 [dir="ltr"] .views-view-grid--horizontal.cols-1 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-1 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-1 > * {
-      flex-basis: 100%;
-    }
+  flex-basis: 100%;
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-2 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-2 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-2 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-2 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-2 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-2 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-2 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-2 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
+  .views-view-grid--horizontal.cols-2 > * {
+    flex-basis: calc(50% - 0.5625rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-2 > *:nth-child(2n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-2 > *:nth-child(2n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-2 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-2 > *:nth-child(2n) {
+    margin-left: 0;
   }
-      }
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-3 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-3 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-3 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-3 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-3 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-3 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-3 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-3 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
-          margin-right: 0
+  .views-view-grid--horizontal.cols-3 > * {
+    flex-basis: calc(50% - 0.5625rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-3 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 
-      /* 3 column layout. */
-    }
+/* 3 column layout. */
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--horizontal.cols-3 > * {
-        flex-basis: calc(33.33333% - 0.75rem)
-    }
+  .views-view-grid--horizontal.cols-3 > * {
+    flex-basis: calc(33.33333% - 0.75rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
-          margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
-          margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-3 > *:nth-child(2n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-3 > *:nth-child(3n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-3 > *:nth-child(3n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-3 > *:nth-child(3n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-3 > *:nth-child(3n) {
+    margin-left: 0;
   }
-      }
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-4 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-4 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-4 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 43.75rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-4 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-4 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-4 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-4 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-4 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
-          margin-right: 0
+  .views-view-grid--horizontal.cols-4 > * {
+    flex-basis: calc(50% - 0.5625rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-4 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 
-      /* 4 column layout. */
-    }
+/* 4 column layout. */
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--horizontal.cols-4 > * {
-        flex-basis: calc(25% - 0.84375rem)
-    }
+  .views-view-grid--horizontal.cols-4 > * {
+    flex-basis: calc(25% - 0.84375rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
-          margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
-          margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-4 > *:nth-child(2n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-4 > *:nth-child(4n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-4 > *:nth-child(4n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-4 > *:nth-child(4n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-4 > *:nth-child(4n) {
+    margin-left: 0;
   }
-      }
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-5 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-5 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-5 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-5 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-5 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-5 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-5 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-5 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
-          margin-right: 0
+  .views-view-grid--horizontal.cols-5 > * {
+    flex-basis: calc(50% - 0.5625rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-5 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 
-      /* 3 column layout. */
-    }
+/* 3 column layout. */
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--horizontal.cols-5 > * {
-        flex-basis: calc(33.33333% - 0.75rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
-          margin-right: 1.125rem
+  .views-view-grid--horizontal.cols-5 > * {
+    flex-basis: calc(33.33333% - 0.75rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
-          margin-left: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
-          margin-right: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(2n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-5 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
+    margin-left: 0;
+  }
+}
 
-      /* 5 column layout. */
-    }
+/* 5 column layout. */
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--horizontal.cols-5 > * {
-        flex-basis: calc(20% - 0.9rem)
-    }
+  .views-view-grid--horizontal.cols-5 > * {
+    flex-basis: calc(20% - 0.9rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
-          margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
-          margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(3n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(5n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-5 > *:nth-child(5n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(5n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-5 > *:nth-child(5n) {
+    margin-left: 0;
   }
-      }
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-6 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-6 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-6 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-6 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-6 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-6 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-6 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-6 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
-          margin-right: 0
+  .views-view-grid--horizontal.cols-6 > * {
+    flex-basis: calc(50% - 0.5625rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-6 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 
-      /* 3 column layout. */
-    }
+/* 3 column layout. */
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--horizontal.cols-6 > * {
-        flex-basis: calc(33.33333% - 0.75rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
-          margin-right: 1.125rem
+  .views-view-grid--horizontal.cols-6 > * {
+    flex-basis: calc(33.33333% - 0.75rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
-          margin-left: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
-          margin-right: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(2n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-6 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
+    margin-left: 0;
+  }
+}
 
-      /* 6 column layout. */
-    }
+/* 6 column layout. */
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--horizontal.cols-6 > * {
-        flex-basis: calc(16.66667% - 0.9375rem)
-    }
+  .views-view-grid--horizontal.cols-6 > * {
+    flex-basis: calc(16.66667% - 0.9375rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
-          margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
-          margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(3n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(6n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-6 > *:nth-child(6n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(6n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-6 > *:nth-child(6n) {
+    margin-left: 0;
   }
-      }
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-7 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-7 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-7 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-7 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-7 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-7 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-7 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-7 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
-          margin-right: 0
+  .views-view-grid--horizontal.cols-7 > * {
+    flex-basis: calc(50% - 0.5625rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-7 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 
-      /* 3 column layout. */
-    }
+/* 3 column layout. */
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--horizontal.cols-7 > * {
-        flex-basis: calc(33.33333% - 0.75rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
-          margin-right: 1.125rem
+  .views-view-grid--horizontal.cols-7 > * {
+    flex-basis: calc(33.33333% - 0.75rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
-          margin-left: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
-          margin-right: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(2n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-7 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
+    margin-left: 0;
+  }
+}
 
-      /* 7 column layout. */
-    }
+/* 7 column layout. */
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--horizontal.cols-7 > * {
-        flex-basis: calc(14.28571% - 0.96429rem)
-    }
+  .views-view-grid--horizontal.cols-7 > * {
+    flex-basis: calc(14.28571% - 0.96429rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
-          margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
-          margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(3n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(7n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-7 > *:nth-child(7n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(7n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-7 > *:nth-child(7n) {
+    margin-left: 0;
   }
-      }
+}
 
 [dir="ltr"] .views-view-grid--horizontal.cols-8 > * {
-      margin-right: 0
+  margin-right: 0;
 }
 
 [dir="rtl"] .views-view-grid--horizontal.cols-8 > * {
-      margin-left: 0
+  margin-left: 0;
 }
 
 .views-view-grid--horizontal.cols-8 > * {
-      flex-basis: 100%
+  flex-basis: 100%;
 
-      /* 2 column layout. */
-    }
+  /* 2 column layout. */
+}
 
 @media (min-width: 31.25rem) {
 
-[dir="ltr"] .views-view-grid--horizontal.cols-8 > * {
-        margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-8 > * {
+    margin-right: 1.125rem;
   }
 
-[dir="rtl"] .views-view-grid--horizontal.cols-8 > * {
-        margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-8 > * {
+    margin-left: 1.125rem;
   }
 
-.views-view-grid--horizontal.cols-8 > * {
-        flex-basis: calc(50% - 0.5625rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
-          margin-right: 0
+  .views-view-grid--horizontal.cols-8 > * {
+    flex-basis: calc(50% - 0.5625rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-8 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 
-      /* 4 column layout. */
-    }
+/* 4 column layout. */
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--horizontal.cols-8 > * {
-        flex-basis: calc(25% - 0.84375rem)
-    }
-
-        [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
-          margin-right: 1.125rem
+  .views-view-grid--horizontal.cols-8 > * {
+    flex-basis: calc(25% - 0.84375rem);
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
-          margin-left: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
-          margin-right: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(2n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
-          margin-left: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
+    margin-right: 0;
   }
-      }
 
-.views-view-grid--horizontal.cols-8 > * {
+  [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
+    margin-left: 0;
+  }
+}
 
-      /* 8 column layout. */
-    }
+/* 8 column layout. */
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--horizontal.cols-8 > * {
-        flex-basis: calc(12.5% - 0.98438rem)
-    }
+  .views-view-grid--horizontal.cols-8 > * {
+    flex-basis: calc(12.5% - 0.98438rem);
+  }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
-          margin-right: 1.125rem
+  [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
+    margin-right: 1.125rem;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
-          margin-left: 1.125rem
+  [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(4n) {
+    margin-left: 1.125rem;
   }
 
-        [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(8n) {
-          margin-right: 0
+  [dir="ltr"] .views-view-grid--horizontal.cols-8 > *:nth-child(8n) {
+    margin-right: 0;
   }
 
-        [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(8n) {
-          margin-left: 0
+  [dir="rtl"] .views-view-grid--horizontal.cols-8 > *:nth-child(8n) {
+    margin-left: 0;
   }
-      }
+}
 
 .views-view-grid--horizontal > * {
-    flex-grow: 0;
-    flex-shrink: 0;
-    margin-bottom: 1.125rem;
-  }
+  flex-grow: 0;
+  flex-shrink: 0;
+  margin-bottom: 1.125rem;
+}
diff --git a/web/core/themes/olivero/css/layout/layout-views-grid-vertical.css b/web/core/themes/olivero/css/layout/layout-views-grid-vertical.css
index 75cb14b93..d3f9e180d 100644
--- a/web/core/themes/olivero/css/layout/layout-views-grid-vertical.css
+++ b/web/core/themes/olivero/css/layout/layout-views-grid-vertical.css
@@ -12,137 +12,137 @@
 
 .views-view-grid--vertical {
   margin-bottom: -1.125rem; /* Offset the bottom row's padding. */
-  grid-column-gap: 1.125rem
+  column-gap: 1.125rem;
 }
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-2 {
-      column-count: 2
+  .views-view-grid--vertical.cols-2 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-3 {
-      column-count: 2
+  .views-view-grid--vertical.cols-3 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--vertical.cols-3 {
-      column-count: 3
+  .views-view-grid--vertical.cols-3 {
+    column-count: 3;
   }
-    }
+}
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-4 {
-      column-count: 2
+  .views-view-grid--vertical.cols-4 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--vertical.cols-4 {
-      column-count: 3
+  .views-view-grid--vertical.cols-4 {
+    column-count: 3;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--vertical.cols-4 {
-      column-count: 4
+  .views-view-grid--vertical.cols-4 {
+    column-count: 4;
   }
-    }
+}
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-5 {
-      column-count: 2
+  .views-view-grid--vertical.cols-5 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--vertical.cols-5 {
-      column-count: 3
+  .views-view-grid--vertical.cols-5 {
+    column-count: 3;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--vertical.cols-5 {
-      column-count: 5
+  .views-view-grid--vertical.cols-5 {
+    column-count: 5;
   }
-    }
+}
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-6 {
-      column-count: 2
+  .views-view-grid--vertical.cols-6 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--vertical.cols-6 {
-      column-count: 3
+  .views-view-grid--vertical.cols-6 {
+    column-count: 3;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--vertical.cols-6 {
-      column-count: 6
+  .views-view-grid--vertical.cols-6 {
+    column-count: 6;
   }
-    }
+}
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-7 {
-      column-count: 2
+  .views-view-grid--vertical.cols-7 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--vertical.cols-7 {
-      column-count: 3
+  .views-view-grid--vertical.cols-7 {
+    column-count: 3;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--vertical.cols-7 {
-      column-count: 7
+  .views-view-grid--vertical.cols-7 {
+    column-count: 7;
   }
-    }
+}
 
 @media (min-width: 31.25rem) {
 
-.views-view-grid--vertical.cols-8 {
-      column-count: 2
+  .views-view-grid--vertical.cols-8 {
+    column-count: 2;
   }
-    }
+}
 
 @media (min-width: 43.75rem) {
 
-.views-view-grid--vertical.cols-8 {
-      column-count: 4
+  .views-view-grid--vertical.cols-8 {
+    column-count: 4;
   }
-    }
+}
 
 @media (min-width: 62.5rem) {
 
-.views-view-grid--vertical.cols-8 {
-      column-count: 8
+  .views-view-grid--vertical.cols-8 {
+    column-count: 8;
   }
-    }
+}
 
 .views-view-grid--vertical .views-view-grid__item > * {
-      padding-bottom: 1.125rem;
-      page-break-inside: avoid;
-      break-inside: avoid;
-    }
+  padding-bottom: 1.125rem;
+  page-break-inside: avoid;
+  break-inside: avoid;
+}
diff --git a/web/core/themes/olivero/css/layout/layout.css b/web/core/themes/olivero/css/layout/layout.css
index f647a0d36..86e8d6f20 100644
--- a/web/core/themes/olivero/css/layout/layout.css
+++ b/web/core/themes/olivero/css/layout/layout.css
@@ -13,17 +13,17 @@
 .container {
   width: 100%;
   max-width: 84.375rem;
+  padding-right: 1.125rem;
   padding-left: 1.125rem;
-  padding-right: 1.125rem
 }
 
 @media (min-width: 75rem) {
 
-.container {
+  .container {
+    padding-right: 2.25rem;
     padding-left: 2.25rem;
-    padding-right: 2.25rem
-}
   }
+}
 
 .page-wrapper {
   max-width: 98.125rem;
@@ -37,42 +37,42 @@
 
 .layout-main-wrapper {
   position: relative;
-  z-index: 1;
+  z-index: 2; /* Ensure dropdown is not cut off by footer. */
 }
 
 /* Contains the social sidebar, and the primary content area. */
 
 @media (min-width: 75rem) {
 
-.layout-main {
+  .layout-main {
     display: flex;
     flex-direction: row-reverse;
-    flex-wrap: wrap
-}
+    flex-wrap: wrap;
   }
+}
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .main-content {
-    margin-right: auto
+  [dir="ltr"] .main-content {
+    margin-right: auto;
   }
 
-[dir="rtl"] .main-content {
-    margin-left: auto
+  [dir="rtl"] .main-content {
+    margin-left: auto;
   }
 
-.main-content {
-    width: calc(100% - 5.625rem)
-}
+  .main-content {
+    width: calc(100% - 5.625rem);
   }
+}
 
 .main-content__container {
-  padding-top: 3.375rem
+  padding-top: 3.375rem;
 }
 
 @media (min-width: 43.75rem) {
 
-.main-content__container {
-    padding-top: 5.625rem
-}
+  .main-content__container {
+    padding-top: 5.625rem;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/layout.pcss.css b/web/core/themes/olivero/css/layout/layout.pcss.css
index 1ad22a48e..fb4adb80b 100644
--- a/web/core/themes/olivero/css/layout/layout.pcss.css
+++ b/web/core/themes/olivero/css/layout/layout.pcss.css
@@ -26,7 +26,7 @@
  */
 .layout-main-wrapper {
   position: relative;
-  z-index: 1;
+  z-index: 2; /* Ensure dropdown is not cut off by footer. */
 }
 
 /* Contains the social sidebar, and the primary content area. */
diff --git a/web/core/themes/olivero/css/layout/region-content-below.css b/web/core/themes/olivero/css/layout/region-content-below.css
index feee2289b..6fae198a0 100644
--- a/web/core/themes/olivero/css/layout/region-content-below.css
+++ b/web/core/themes/olivero/css/layout/region-content-below.css
@@ -12,58 +12,58 @@
 
 @media (min-width: 43.75rem) {
 
-.region--content-below {
+  .region--content-below {
     display: flex;
-    flex-wrap: wrap
-}
+    flex-wrap: wrap;
+  }
 
-    [dir="ltr"] .region--content-below > * {
-      margin-right: 2.25rem
-}
+  [dir="ltr"] .region--content-below > * {
+    margin-right: 2.25rem;
+  }
 
-    [dir="rtl"] .region--content-below > * {
-      margin-left: 2.25rem
-}
+  [dir="rtl"] .region--content-below > * {
+    margin-left: 2.25rem;
+  }
 
-    .region--content-below > * {
-      flex-basis: calc(50% - 1.125rem);
-      flex-grow: 1;
-      flex-shrink: 0
-    }
+  .region--content-below > * {
+    flex-basis: calc(50% - 1.125rem);
+    flex-grow: 1;
+    flex-shrink: 0;
+  }
 
-      [dir="ltr"] .region--content-below > *:nth-child(2n),[dir="ltr"] 
-      .region--content-below > *:last-child {
-        margin-right: 0
-}
+  [dir="ltr"] .region--content-below > *:nth-child(2n),
+  [dir="ltr"] .region--content-below > *:last-child {
+    margin-right: 0;
+  }
 
-      [dir="rtl"] .region--content-below > *:nth-child(2n),[dir="rtl"] 
-      .region--content-below > *:last-child {
-        margin-left: 0
-}
+  [dir="rtl"] .region--content-below > *:nth-child(2n),
+  [dir="rtl"] .region--content-below > *:last-child {
+    margin-left: 0;
   }
+}
 
 @media (min-width: 43.75rem) {
-    .region--content-below > * {
-      flex-basis: calc(33.33% - 1.50075rem)
-    }
+  .region--content-below > * {
+    flex-basis: calc(33.33% - 1.50075rem);
+  }
 
-      [dir="ltr"] .region--content-below > *:nth-child(2n),[dir="ltr"] 
-      .region--content-below > *:last-child {
-        margin-right: 2.25rem
-}
+  [dir="ltr"] .region--content-below > *:nth-child(2n),
+  [dir="ltr"] .region--content-below > *:last-child {
+    margin-right: 2.25rem;
+  }
 
-      [dir="rtl"] .region--content-below > *:nth-child(2n),[dir="rtl"] 
-      .region--content-below > *:last-child {
-        margin-left: 2.25rem
-}
+  [dir="rtl"] .region--content-below > *:nth-child(2n),
+  [dir="rtl"] .region--content-below > *:last-child {
+    margin-left: 2.25rem;
+  }
 
-      [dir="ltr"] .region--content-below > *:nth-child(3n),[dir="ltr"] 
-      .region--content-below > *:last-child {
-        margin-right: 0
-}
+  [dir="ltr"] .region--content-below > *:nth-child(3n),
+  [dir="ltr"] .region--content-below > *:last-child {
+    margin-right: 0;
+  }
 
-      [dir="rtl"] .region--content-below > *:nth-child(3n),[dir="rtl"] 
-      .region--content-below > *:last-child {
-        margin-left: 0
-}
+  [dir="rtl"] .region--content-below > *:nth-child(3n),
+  [dir="rtl"] .region--content-below > *:last-child {
+    margin-left: 0;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/region-content.css b/web/core/themes/olivero/css/layout/region-content.css
index 494a6f49b..8061f0d40 100644
--- a/web/core/themes/olivero/css/layout/region-content.css
+++ b/web/core/themes/olivero/css/layout/region-content.css
@@ -11,19 +11,19 @@
  */
 
 .region--content {
-  margin-bottom: 1.125rem
+  margin-bottom: 1.125rem;
 }
 
 @media (min-width: 43.75rem) {
 
-.region--content {
-    margin-bottom: 2.25rem
-}
+  .region--content {
+    margin-bottom: 2.25rem;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.region--content {
-    margin-bottom: 3.375rem
-}
+  .region--content {
+    margin-bottom: 3.375rem;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/region-hero.css b/web/core/themes/olivero/css/layout/region-hero.css
index 875812816..5f94b41fb 100644
--- a/web/core/themes/olivero/css/layout/region-hero.css
+++ b/web/core/themes/olivero/css/layout/region-hero.css
@@ -11,5 +11,5 @@
  */
 
 .region--hero > *:last-child {
-    margin-bottom: 0;
-  }
+  margin-bottom: 0;
+}
diff --git a/web/core/themes/olivero/css/layout/region-secondary-menu.css b/web/core/themes/olivero/css/layout/region-secondary-menu.css
index e187d2b19..0f989f73a 100644
--- a/web/core/themes/olivero/css/layout/region-secondary-menu.css
+++ b/web/core/themes/olivero/css/layout/region-secondary-menu.css
@@ -13,21 +13,21 @@
 .region--secondary-menu {
   display: flex;
   margin-top: 2.25rem;
-  margin-bottom: 2.25rem
+  margin-bottom: 2.25rem;
 }
 
 .region--secondary-menu > * {
-    margin-bottom: 0;
-  }
+  margin-bottom: 0;
+}
 
 @media (min-width: 75rem) {
-    body:not(.is-always-mobile-nav) .region--secondary-menu {
-      justify-content: flex-end;
-      margin: 0
+  body:not(.is-always-mobile-nav) .region--secondary-menu {
+    justify-content: flex-end;
+    margin: 0;
 
-      /* If the secondary nav is the first item within the header, it does not need left separator. */
-    }
-      body:not(.is-always-mobile-nav) .region--secondary-menu:first-child .secondary-nav:before {
-        content: none;
-      }
+    /* If the secondary nav is the first item within the header, it does not need left separator. */
   }
+  body:not(.is-always-mobile-nav) .region--secondary-menu:first-child .secondary-nav:before {
+    content: none;
+  }
+}
diff --git a/web/core/themes/olivero/css/layout/region.css b/web/core/themes/olivero/css/layout/region.css
index 4732ec894..0e3b47641 100644
--- a/web/core/themes/olivero/css/layout/region.css
+++ b/web/core/themes/olivero/css/layout/region.css
@@ -11,19 +11,19 @@
  */
 
 .region > * {
-  margin-bottom: 1.125rem
+  margin-bottom: 1.125rem;
 }
 
 @media (min-width: 43.75rem) {
 
-.region > * {
-    margin-bottom: 2.25rem
-}
+  .region > * {
+    margin-bottom: 2.25rem;
   }
+}
 
 @media (min-width: 62.5rem) {
 
-.region > * {
-    margin-bottom: 3.375rem
-}
+  .region > * {
+    margin-bottom: 3.375rem;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/social-bar.css b/web/core/themes/olivero/css/layout/social-bar.css
index bb2aa5a27..3a761b4b8 100644
--- a/web/core/themes/olivero/css/layout/social-bar.css
+++ b/web/core/themes/olivero/css/layout/social-bar.css
@@ -13,157 +13,157 @@
 
 @media (min-width: 75rem) {
 
-.social-bar {
+  .social-bar {
     flex-shrink: 0;
     width: 5.625rem;
-    background-color: #f7f9fa
-}
+    background-color: #f7f9fa;
   }
+}
 
 [dir="ltr"] .social-bar__inner {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 [dir="rtl"] .social-bar__inner {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="ltr"] .social-bar__inner {
-  padding-right: 1.125rem
+  padding-right: 1.125rem;
 }
 
 [dir="rtl"] .social-bar__inner {
-  padding-left: 1.125rem
+  padding-left: 1.125rem;
 }
 
 .social-bar__inner {
   position: relative;
   padding-top: 0.5625rem;
-  padding-bottom: 0.5625rem
+  padding-bottom: 0.5625rem;
 }
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .social-bar__inner {
-    padding-left: 0
-}
+  [dir="ltr"] .social-bar__inner {
+    padding-left: 0;
+  }
 
-[dir="rtl"] .social-bar__inner {
-    padding-right: 0
-}
+  [dir="rtl"] .social-bar__inner {
+    padding-right: 0;
+  }
 
-[dir="ltr"] .social-bar__inner {
-    padding-right: 0
-}
+  [dir="ltr"] .social-bar__inner {
+    padding-right: 0;
+  }
 
-[dir="rtl"] .social-bar__inner {
-    padding-left: 0
-}
+  [dir="rtl"] .social-bar__inner {
+    padding-left: 0;
+  }
 
-.social-bar__inner {
+  .social-bar__inner {
     position: relative;
     width: 5.625rem;
     padding-top: 5.625rem;
-    padding-bottom: 5.625rem
-}
+    padding-bottom: 5.625rem;
+  }
 
-    [dir="ltr"] .social-bar__inner.is-fixed {
-      left: 0
-}
+  [dir="ltr"] .social-bar__inner.is-fixed {
+    left: 0;
+  }
 
-    [dir="rtl"] .social-bar__inner.is-fixed {
-      right: 0
-}
+  [dir="rtl"] .social-bar__inner.is-fixed {
+    right: 0;
+  }
 
-    .social-bar__inner.is-fixed {
-      position: fixed;
-      top: 6.75rem;
-      height: calc(100vh - 6.75rem);
-    }
+  .social-bar__inner.is-fixed {
+    position: fixed;
+    top: 6.75rem;
+    height: calc(100vh - 6.75rem);
   }
+}
 
 .rotate > * {
-    margin-bottom: 2.25rem
-  }
+  margin-bottom: 2.25rem;
+}
 
 @media (min-width: 75rem) {
 
-.rotate > * {
-      display: flex;
-      align-items: center;
-      margin-bottom: 0
+  .rotate > * {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0;
   }
 
-      [dir="ltr"] .rotate > *:not(:first-child) {
-        margin-right: 2.25rem
-}
+  [dir="ltr"] .rotate > *:not(:first-child) {
+    margin-right: 2.25rem;
+  }
 
-      [dir="rtl"] .rotate > *:not(:first-child) {
-        margin-left: 2.25rem
+  [dir="rtl"] .rotate > *:not(:first-child) {
+    margin-left: 2.25rem;
+  }
 }
-    }
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .rotate .contextual {
-      left: 100%;
-      right: auto
-}
+  [dir="ltr"] .rotate .contextual {
+    right: auto;
+    left: 100%;
+  }
 
-[dir="rtl"] .rotate .contextual {
-      right: 100%;
-      left: auto
-}
+  [dir="rtl"] .rotate .contextual {
+    right: 100%;
+    left: auto;
+  }
 
-.rotate .contextual {
-      transform: rotate(90deg); /* LTR */
-      transform-origin: top left /* LTR */
+  .rotate .contextual {
+    transform: rotate(90deg); /* LTR */
+    transform-origin: top left; /* LTR */
   }
 
-      [dir="ltr"] .rotate .contextual .trigger {
-        float: left
-}
+  [dir="ltr"] .rotate .contextual .trigger {
+    float: left;
+  }
 
-      [dir="rtl"] .rotate .contextual .trigger {
-        float: right
+  [dir="rtl"] .rotate .contextual .trigger {
+    float: right;
+  }
 }
-    }
 
 @media (min-width: 75rem) {
 
-[dir="ltr"] .rotate {
-    left: 50%
-}
+  [dir="ltr"] .rotate {
+    left: 50%;
+  }
 
-[dir="rtl"] .rotate {
-    right: 50%
-}
+  [dir="rtl"] .rotate {
+    right: 50%;
+  }
 
-.rotate {
+  .rotate {
     position: absolute;
     display: flex;
     flex-direction: row-reverse;
     width: 100vh;
     transform: rotate(-90deg) translateX(-100%); /* LTR */
-    transform-origin: left /* LTR */
-}
+    transform-origin: left; /* LTR */
+  }
 
-    @supports (width: max-content) {
+  @supports (width: max-content) {
 
-.rotate {
-      width: max-content
-}
+    .rotate {
+      width: max-content;
     }
   }
+}
 
 @media (min-width: 75rem) {
-    [dir="rtl"] .rotate {
-      transform: rotate(90deg) translateX(100%);
-      transform-origin: right
-    }
+  [dir="rtl"] .rotate {
+    transform: rotate(90deg) translateX(100%);
+    transform-origin: right;
+  }
 
-      [dir="rtl"] .rotate .contextual {
-        transform: rotate(-90deg);
-        transform-origin: top right;
-      }
+  [dir="rtl"] .rotate .contextual {
+    transform: rotate(-90deg);
+    transform-origin: top right;
   }
+}
diff --git a/web/core/themes/olivero/css/layout/views.css b/web/core/themes/olivero/css/layout/views.css
index e7129ffb3..c6c536aac 100644
--- a/web/core/themes/olivero/css/layout/views.css
+++ b/web/core/themes/olivero/css/layout/views.css
@@ -11,16 +11,16 @@
  */
 
 .view > * {
-    margin-bottom: 2.25rem
-  }
+  margin-bottom: 2.25rem;
+}
 
 .view > *:last-child {
-      margin-bottom: 0;
-    }
+  margin-bottom: 0;
+}
 
 @media (min-width: 43.75rem) {
 
-.view > * {
-      margin-bottom: 3.375rem
+  .view > * {
+    margin-bottom: 3.375rem;
   }
-    }
+}
diff --git a/web/core/themes/olivero/js/checkbox.js b/web/core/themes/olivero/js/checkbox.js
index 90d825cbe..639314c74 100644
--- a/web/core/themes/olivero/js/checkbox.js
+++ b/web/core/themes/olivero/js/checkbox.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.checkbox = function () {
     return '<input type="checkbox" class="form-checkbox form-boolean form-boolean--type-checkbox"/>';
diff --git a/web/core/themes/olivero/js/comments.js b/web/core/themes/olivero/js/comments.js
index ba0af97b6..33f0adfaa 100644
--- a/web/core/themes/olivero/js/comments.js
+++ b/web/core/themes/olivero/js/comments.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once) {
   function init(comments) {
     comments.querySelectorAll('[data-drupal-selector="comment"]').forEach(function (comment) {
@@ -28,7 +27,6 @@
       });
     });
   }
-
   Drupal.behaviors.comments = {
     attach: function attach(context) {
       once('comments', '[data-drupal-selector="comments"]', context).forEach(init);
diff --git a/web/core/themes/olivero/js/message.theme.js b/web/core/themes/olivero/js/message.theme.js
index 5696e5523..4ffb802fd 100644
--- a/web/core/themes/olivero/js/message.theme.js
+++ b/web/core/themes/olivero/js/message.theme.js
@@ -4,12 +4,11 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.message = function (_ref, _ref2) {
     var text = _ref.text;
     var type = _ref2.type,
-        id = _ref2.id;
+      id = _ref2.id;
     var messagesTypes = Drupal.Message.getMessageTypeLabels();
     var messageWrapper = document.createElement('div');
     messageWrapper.setAttribute('class', "messages-list__item messages messages--".concat(type));
@@ -19,11 +18,9 @@
     messageWrapper.setAttribute('data-drupal-message-id', id);
     messageWrapper.setAttribute('data-drupal-message-type', type);
     var svg = '';
-
     if (['error', 'warning', 'status', 'info'].indexOf(type) > -1) {
       svg = '<div class="messages__icon"><svg width="32" height="32" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">';
     }
-
     if (type === 'error') {
       svg += '<path d="M0.117801 16.7381C0.202622 17.9153 0.292289 18.562 0.481317 19.3904C0.922384 21.3161 1.6785 23.0626 2.76178 24.6589C4.58178 27.3355 7.18213 29.3823 10.1993 30.5062C12.458 31.3467 14.942 31.6495 17.3461 31.3782C22.5831 30.7872 27.1246 27.6164 29.4875 22.9027C30.3769 21.132 30.8616 19.3929 31.0797 17.1983C31.1209 16.7768 31.1209 15.1733 31.0797 14.7518C30.8786 12.7195 30.4714 11.1693 29.7032 9.49549C28.3848 6.62269 26.1722 4.18589 23.4289 2.58235C19.4399 0.249712 14.5373 -0.171762 10.1993 1.44389C5.82985 3.07165 2.38372 6.62753 0.915114 11.0215C0.512822 12.223 0.289865 13.2863 0.161423 14.604C0.127495 14.9674 0.0959901 16.4425 0.117801 16.7381ZM4.02924 14.9577C4.2837 12.2108 5.46391 9.69412 7.40024 7.76115C9.15966 6.00743 11.3529 4.89319 13.8224 4.49352C14.4234 4.39905 14.8717 4.36514 15.6012 4.36271C16.6941 4.36271 17.4793 4.45718 18.5093 4.71636C19.2969 4.91257 20.0143 5.17902 20.7873 5.55931C21.2526 5.78943 21.9409 6.18183 21.9554 6.22786C21.9651 6.25692 5.90498 22.3093 5.86621 22.3093C5.82501 22.3093 5.46391 21.6916 5.21915 21.2071C4.51877 19.8071 4.10921 18.2956 4.005 16.7138C3.98077 16.336 3.99288 15.3453 4.02924 14.9577ZM25.3725 9.6384C25.4428 9.7038 25.816 10.3602 26.0341 10.8035C26.6618 12.0776 27.0301 13.359 27.1876 14.8366C27.2385 15.2968 27.2458 16.5225 27.2022 16.9561C27.0859 18.0776 26.8847 18.9786 26.526 19.9669C26.2377 20.7663 25.7748 21.6843 25.2998 22.394C23.8748 24.5232 21.7882 26.1364 19.3987 26.9576C18.1046 27.4009 16.985 27.585 15.5891 27.585C14.8232 27.585 14.4646 27.5607 13.786 27.4541C12.2568 27.2192 10.6574 26.6209 9.40685 25.8191L9.23237 25.7077L17.2879 17.6609C23.3562 11.598 25.3507 9.61903 25.3725 9.6384Z"/>';
     } else if (type === 'warning') {
@@ -33,11 +30,9 @@
     } else if (type === 'info') {
       svg += '<path d="M32,16c0,8.8-7.2,16-16,16S0,24.8,0,16C0,7.2,7.2,0,16,0S32,7.2,32,16z M16.4,5.3c-3.5,0-5.8,1.5-7.5,4.1c-0.2,0.3-0.2,0.8,0.2,1l2.2,1.7c0.3,0.3,0.8,0.2,1.1-0.1c1.2-1.5,1.9-2.3,3.7-2.3c1.3,0,2.9,0.8,2.9,2.1c0,1-0.8,1.5-2.1,2.2c-1.5,0.9-3.5,1.9-3.5,4.6v0.3c0,0.4,0.3,0.8,0.8,0.8h3.6c0.4,0,0.8-0.3,0.8-0.8v-0.1c0-1.8,5.4-1.9,5.4-6.9C23.9,8.1,20.1,5.3,16.4,5.3z M16,21.3c-1.6,0-3,1.3-3,3c0,1.6,1.3,3,3,3s3-1.3,3-3C19,22.6,17.6,21.3,16,21.3z"/>';
     }
-
     if (['error', 'warning', 'status', 'info'].indexOf(type) > -1) {
       svg += '</svg></div>';
     }
-
     messageWrapper.innerHTML = "\n    <div class=\"messages__container\" data-drupal-selector=\"messages-container\">\n      <div class=\"messages__header".concat(!svg ? ' no-icon' : '', "\">\n        <h2 class=\"visually-hidden\">").concat(messagesTypes[type], "</h2>\n        ").concat(svg, "\n      </div>\n      <div class=\"messages__content\">\n        ").concat(text, "\n      </div>\n    </div>\n    ");
     Drupal.olivero.closeMessage(messageWrapper);
     return messageWrapper;
diff --git a/web/core/themes/olivero/js/messages.js b/web/core/themes/olivero/js/messages.js
index 40339bf14..d373d6b9a 100644
--- a/web/core/themes/olivero/js/messages.js
+++ b/web/core/themes/olivero/js/messages.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once) {
   var closeMessage = function closeMessage(message) {
     var messageContainer = message.querySelector('[data-drupal-selector="messages-container"]');
@@ -23,7 +22,6 @@
       message.classList.add('hidden');
     });
   };
-
   Drupal.behaviors.messages = {
     attach: function attach(context) {
       once('messages', '[data-drupal-selector="messages"]', context).forEach(closeMessage);
diff --git a/web/core/themes/olivero/js/nav-resize.js b/web/core/themes/olivero/js/nav-resize.js
index 83b2d0b01..342f7bf64 100644
--- a/web/core/themes/olivero/js/nav-resize.js
+++ b/web/core/themes/olivero/js/nav-resize.js
@@ -4,19 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once) {
   function transitionToDesktopNavigation(navWrapper, navItem) {
     document.body.classList.remove('is-always-mobile-nav');
-
     if (navWrapper.clientHeight > navItem.clientHeight) {
       document.body.classList.add('is-always-mobile-nav');
     }
   }
-
   function checkIfDesktopNavigationWraps(entries) {
     var navItem = document.querySelector('.primary-nav__menu-item');
-
     if (Drupal.olivero.isDesktopNav() && entries[0].contentRect.height > navItem.clientHeight) {
       var navMediaQuery = window.matchMedia("(max-width: ".concat(window.innerWidth + 5, "px)"));
       document.body.classList.add('is-always-mobile-nav');
@@ -27,14 +23,12 @@
       });
     }
   }
-
   function init(primaryNav) {
     if ('ResizeObserver' in window) {
       var resizeObserver = new ResizeObserver(checkIfDesktopNavigationWraps);
       resizeObserver.observe(primaryNav);
     }
   }
-
   Drupal.behaviors.automaticMobileNav = {
     attach: function attach(context) {
       once('olivero-automatic-mobile-nav', '[data-drupal-selector="primary-nav-menu--level-1"]', context).forEach(init);
diff --git a/web/core/themes/olivero/js/navigation-utils.js b/web/core/themes/olivero/js/navigation-utils.js
index abdc3c5c5..480da4369 100644
--- a/web/core/themes/olivero/js/navigation-utils.js
+++ b/web/core/themes/olivero/js/navigation-utils.js
@@ -4,23 +4,18 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.olivero = {};
-
   function isDesktopNav() {
     var navButtons = document.querySelector('[data-drupal-selector="mobile-buttons"]');
     return navButtons ? window.getComputedStyle(navButtons).getPropertyValue('display') === 'none' : false;
   }
-
   Drupal.olivero.isDesktopNav = isDesktopNav;
   var stickyHeaderToggleButton = document.querySelector('[data-drupal-selector="sticky-header-toggle"]');
   var siteHeaderFixable = document.querySelector('[data-drupal-selector="site-header-fixable"]');
-
   function stickyHeaderIsEnabled() {
     return stickyHeaderToggleButton.getAttribute('aria-checked') === 'true';
   }
-
   function setStickyHeaderStorage(expandedState) {
     var now = new Date();
     var item = {
@@ -29,7 +24,6 @@
     };
     localStorage.setItem('Drupal.olivero.stickyHeaderState', JSON.stringify(item));
   }
-
   function toggleStickyHeaderState(pinnedState) {
     if (isDesktopNav()) {
       if (pinnedState === true) {
@@ -37,29 +31,23 @@
       } else {
         siteHeaderFixable.classList.remove('is-expanded');
       }
-
       stickyHeaderToggleButton.setAttribute('aria-checked', pinnedState);
       setStickyHeaderStorage(pinnedState);
     }
   }
-
   function getStickyHeaderStorage() {
     var stickyHeaderState = localStorage.getItem('Drupal.olivero.stickyHeaderState');
     if (!stickyHeaderState) return false;
     var item = JSON.parse(stickyHeaderState);
     var now = new Date();
-
     if (now.getTime() > item.expiry) {
       localStorage.removeItem('Drupal.olivero.stickyHeaderState');
       return false;
     }
-
     return item.value;
   }
-
   if ('IntersectionObserver' in window && 'IntersectionObserverEntry' in window && 'intersectionRatio' in window.IntersectionObserverEntry.prototype) {
     var fixableElements = document.querySelectorAll('[data-drupal-selector="site-header-fixable"], [data-drupal-selector="social-bar-inner"]');
-
     function toggleDesktopNavVisibility(entries) {
       if (!isDesktopNav()) return;
       entries.forEach(function (entry) {
@@ -74,23 +62,18 @@
         }
       });
     }
-
     function getRootMargin() {
       var rootMarginTop = 72;
       var _document = document,
-          body = _document.body;
-
+        body = _document.body;
       if (body.classList.contains('toolbar-fixed')) {
         rootMarginTop -= 39;
       }
-
       if (body.classList.contains('toolbar-horizontal') && body.classList.contains('toolbar-tray-open')) {
         rootMarginTop -= 40;
       }
-
       return "".concat(rootMarginTop, "px 0px 0px 0px");
     }
-
     function monitorNavPosition() {
       var primaryNav = document.querySelector('[data-drupal-selector="site-header"]');
       var options = {
@@ -98,34 +81,28 @@
         threshold: [0.999, 1]
       };
       var observer = new IntersectionObserver(toggleDesktopNavVisibility, options);
-
       if (primaryNav) {
         observer.observe(primaryNav);
       }
     }
-
     if (stickyHeaderToggleButton) {
       stickyHeaderToggleButton.addEventListener('click', function () {
         toggleStickyHeaderState(!stickyHeaderIsEnabled());
       });
     }
-
     var siteHeaderInner = document.querySelector('[data-drupal-selector="site-header-inner"]');
-
     if (siteHeaderInner) {
       siteHeaderInner.addEventListener('focusin', function () {
         if (isDesktopNav() && !stickyHeaderIsEnabled()) {
           var header = document.querySelector('[data-drupal-selector="site-header"]');
           var headerNav = header.querySelector('[data-drupal-selector="header-nav"]');
           var headerMargin = header.clientHeight - headerNav.clientHeight;
-
           if (window.scrollY > headerMargin) {
             window.scrollTo(0, headerMargin);
           }
         }
       });
     }
-
     monitorNavPosition();
     setStickyHeaderStorage(getStickyHeaderStorage());
     toggleStickyHeaderState(getStickyHeaderStorage());
diff --git a/web/core/themes/olivero/js/navigation.es6.js b/web/core/themes/olivero/js/navigation.es6.js
index 337ff1653..f791e7d67 100644
--- a/web/core/themes/olivero/js/navigation.es6.js
+++ b/web/core/themes/olivero/js/navigation.es6.js
@@ -147,7 +147,7 @@
         const navButton = context.querySelector(
           '[data-drupal-selector="mobile-nav-button"]',
         );
-        const body = context.querySelector('body');
+        const body = document.body;
         const overlay = context.querySelector(
           '[data-drupal-selector="header-nav-overlay"]',
         );
diff --git a/web/core/themes/olivero/js/navigation.js b/web/core/themes/olivero/js/navigation.js
index e3817cd38..a95502285 100644
--- a/web/core/themes/olivero/js/navigation.js
+++ b/web/core/themes/olivero/js/navigation.js
@@ -4,16 +4,13 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once, tabbable) {
   function isNavOpen(navWrapper) {
     return navWrapper.classList.contains('is-active');
   }
-
   function toggleNav(props, state) {
     var value = !!state;
     props.navButton.setAttribute('aria-expanded', value);
-
     if (value) {
       props.body.classList.add('is-overlay-active');
       props.body.classList.add('is-fixed');
@@ -24,7 +21,6 @@
       props.navWrapper.classList.remove('is-active');
     }
   }
-
   function init(props) {
     props.navButton.setAttribute('aria-controls', props.navWrapperId);
     props.navButton.setAttribute('aria-expanded', 'false');
@@ -52,7 +48,6 @@
         tabbableNavElements.unshift(props.navButton);
         var firstTabbableEl = tabbableNavElements[0];
         var lastTabbableEl = tabbableNavElements[tabbableNavElements.length - 1];
-
         if (e.shiftKey) {
           if (document.activeElement === firstTabbableEl && !props.olivero.isDesktopNav()) {
             lastTabbableEl.focus();
@@ -70,7 +65,6 @@
         props.body.classList.remove('is-overlay-active');
         props.body.classList.remove('is-fixed');
       }
-
       Drupal.olivero.closeAllSubNav();
     });
     props.navWrapper.addEventListener('click', function (e) {
@@ -79,18 +73,16 @@
       }
     });
   }
-
   Drupal.behaviors.oliveroNavigation = {
     attach: function attach(context) {
       var headerId = 'header';
       var header = once('navigation', "#".concat(headerId), context).shift();
       var navWrapperId = 'header-nav';
-
       if (header) {
         var navWrapper = header.querySelector("#".concat(navWrapperId));
         var olivero = Drupal.olivero;
         var navButton = context.querySelector('[data-drupal-selector="mobile-nav-button"]');
-        var body = context.querySelector('body');
+        var body = document.body;
         var overlay = context.querySelector('[data-drupal-selector="header-nav-overlay"]');
         init({
           olivero: olivero,
diff --git a/web/core/themes/olivero/js/search.js b/web/core/themes/olivero/js/search.js
index 00ae2a507..778a10a39 100644
--- a/web/core/themes/olivero/js/search.js
+++ b/web/core/themes/olivero/js/search.js
@@ -4,44 +4,35 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   var searchWideButtonSelector = '[data-drupal-selector="block-search-wide-button"]';
   var searchWideButton = document.querySelector(searchWideButtonSelector);
   var searchWideWrapperSelector = '[data-drupal-selector="block-search-wide-wrapper"]';
   var searchWideWrapper = document.querySelector(searchWideWrapperSelector);
-
   function searchIsVisible() {
     return searchWideWrapper.classList.contains('is-active');
   }
-
   Drupal.olivero.searchIsVisible = searchIsVisible;
-
   function watchForClickOut(e) {
     var clickInSearchArea = e.target.matches("\n      ".concat(searchWideWrapperSelector, ",\n      ").concat(searchWideWrapperSelector, " *,\n      ").concat(searchWideButtonSelector, ",\n      ").concat(searchWideButtonSelector, " *\n    "));
-
     if (!clickInSearchArea && searchIsVisible()) {
       toggleSearchVisibility(false);
     }
   }
-
   function watchForFocusOut(e) {
     if (e.relatedTarget) {
       var inSearchBar = e.relatedTarget.matches("".concat(searchWideWrapperSelector, ", ").concat(searchWideWrapperSelector, " *"));
       var inSearchButton = e.relatedTarget.matches("".concat(searchWideButtonSelector, ", ").concat(searchWideButtonSelector, " *"));
-
       if (!inSearchBar && !inSearchButton) {
         toggleSearchVisibility(false);
       }
     }
   }
-
   function watchForEscapeOut(e) {
     if (e.key === 'Escape' || e.key === 'Esc') {
       toggleSearchVisibility(false);
     }
   }
-
   function handleFocus() {
     if (searchIsVisible()) {
       searchWideWrapper.querySelector('input[type="search"]').focus();
@@ -49,13 +40,11 @@
       searchWideButton.focus();
     }
   }
-
   function toggleSearchVisibility(visibility) {
     searchWideButton.setAttribute('aria-expanded', visibility === true);
     searchWideWrapper.addEventListener('transitionend', handleFocus, {
       once: true
     });
-
     if (visibility === true) {
       Drupal.olivero.closeAllSubNav();
       searchWideWrapper.classList.add('is-active');
@@ -81,12 +70,10 @@
       });
     }
   }
-
   Drupal.olivero.toggleSearchVisibility = toggleSearchVisibility;
   Drupal.behaviors.searchWide = {
     attach: function attach(context) {
       var searchWideButtonEl = once('search-wide', searchWideButtonSelector, context).shift();
-
       if (searchWideButtonEl) {
         searchWideButtonEl.setAttribute('aria-expanded', searchIsVisible());
         searchWideButtonEl.addEventListener('click', function () {
diff --git a/web/core/themes/olivero/js/second-level-navigation.js b/web/core/themes/olivero/js/second-level-navigation.js
index 8575af8ec..ecd8aa477 100644
--- a/web/core/themes/olivero/js/second-level-navigation.js
+++ b/web/core/themes/olivero/js/second-level-navigation.js
@@ -4,16 +4,13 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   var isDesktopNav = Drupal.olivero.isDesktopNav;
   var secondLevelNavMenus = document.querySelectorAll('[data-drupal-selector="primary-nav-menu-item-has-children"]');
-
   function toggleSubNav(topLevelMenuItem, toState) {
     var buttonSelector = '[data-drupal-selector="primary-nav-submenu-toggle-button"]';
     var button = topLevelMenuItem.querySelector(buttonSelector);
     var state = toState !== undefined ? toState : button.getAttribute('aria-expanded') !== 'true';
-
     if (state) {
       if (isDesktopNav()) {
         secondLevelNavMenus.forEach(function (el) {
@@ -22,7 +19,6 @@
           el.querySelector('[data-drupal-selector="primary-nav-menu-🥕"]').classList.remove('is-active-menu-parent');
         });
       }
-
       button.setAttribute('aria-expanded', 'true');
       topLevelMenuItem.querySelector('[data-drupal-selector="primary-nav-menu--level-2"]').classList.add('is-active-menu-parent');
       topLevelMenuItem.querySelector('[data-drupal-selector="primary-nav-menu-🥕"]').classList.add('is-active-menu-parent');
@@ -33,20 +29,16 @@
       topLevelMenuItem.querySelector('[data-drupal-selector="primary-nav-menu-🥕"]').classList.remove('is-active-menu-parent');
     }
   }
-
   Drupal.olivero.toggleSubNav = toggleSubNav;
-
   function handleBlur(e) {
     if (!Drupal.olivero.isDesktopNav()) return;
     setTimeout(function () {
       var menuParentItem = e.target.closest('[data-drupal-selector="primary-nav-menu-item-has-children"]');
-
       if (!menuParentItem.contains(document.activeElement)) {
         toggleSubNav(menuParentItem, false);
       }
     }, 200);
   }
-
   secondLevelNavMenus.forEach(function (el) {
     var button = el.querySelector('[data-drupal-selector="primary-nav-submenu-toggle-button"]');
     button.removeAttribute('aria-hidden');
@@ -77,32 +69,26 @@
     });
     el.addEventListener('blur', handleBlur, true);
   });
-
   function closeAllSubNav() {
     secondLevelNavMenus.forEach(function (el) {
       if (el.contains(document.activeElement)) {
         el.querySelector('[data-drupal-selector="primary-nav-submenu-toggle-button"]').focus();
       }
-
       toggleSubNav(el, false);
     });
   }
-
   Drupal.olivero.closeAllSubNav = closeAllSubNav;
-
   function areAnySubNavsOpen() {
     var subNavsAreOpen = false;
     secondLevelNavMenus.forEach(function (el) {
       var button = el.querySelector('[data-drupal-selector="primary-nav-submenu-toggle-button"]');
       var state = button.getAttribute('aria-expanded') === 'true';
-
       if (state) {
         subNavsAreOpen = true;
       }
     });
     return subNavsAreOpen;
   }
-
   Drupal.olivero.areAnySubNavsOpen = areAnySubNavsOpen;
   document.addEventListener('keyup', function (e) {
     if (e.key === 'Escape' || e.key === 'Esc') {
diff --git a/web/core/themes/olivero/js/tabs.js b/web/core/themes/olivero/js/tabs.js
index 81d7475d1..ed784b093 100644
--- a/web/core/themes/olivero/js/tabs.js
+++ b/web/core/themes/olivero/js/tabs.js
@@ -4,17 +4,14 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal, once) {
   function init(el) {
     var tabs = el.querySelector('.tabs');
     var expandedClass = 'is-expanded';
     var activeTab = tabs.querySelector('.is-active');
-
     function isTabsMobileLayout() {
       return tabs.querySelector('.tabs__trigger').clientHeight > 0;
     }
-
     function handleTriggerClick(e) {
       if (!tabs.classList.contains(expandedClass)) {
         e.currentTarget.setAttribute('aria-expanded', 'true');
@@ -24,17 +21,14 @@
         tabs.classList.remove(expandedClass);
       }
     }
-
     if (isTabsMobileLayout() && !activeTab.matches('.tabs__tab:first-child')) {
       var newActiveTab = activeTab.cloneNode(true);
       var firstTab = tabs.querySelector('.tabs__tab:first-child');
       tabs.insertBefore(newActiveTab, firstTab);
       tabs.removeChild(activeTab);
     }
-
     tabs.querySelector('.tabs__trigger').addEventListener('click', handleTriggerClick);
   }
-
   Drupal.behaviors.primaryTabs = {
     attach: function attach(context) {
       once('olivero-tabs', '[data-drupal-nav-primary-tabs]', context).forEach(init);
diff --git a/web/core/themes/olivero/olivero.libraries.yml b/web/core/themes/olivero/olivero.libraries.yml
index 6434b7ce7..987cff753 100644
--- a/web/core/themes/olivero/olivero.libraries.yml
+++ b/web/core/themes/olivero/olivero.libraries.yml
@@ -3,7 +3,6 @@ global-styling:
   css:
     base:
       css/base/fonts.css: {}
-      css/base/variables.css: {}
       css/base/base.css: {}
       css/base/utility.css: {}
     layout:
diff --git a/web/core/themes/olivero/templates/block/block--page-title-block.html.twig b/web/core/themes/olivero/templates/block/block--page-title-block.html.twig
index 643617016..1cf7bcb0e 100644
--- a/web/core/themes/olivero/templates/block/block--page-title-block.html.twig
+++ b/web/core/themes/olivero/templates/block/block--page-title-block.html.twig
@@ -12,6 +12,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/olivero/templates/block/block--primary-menu--plugin-id--search-form-block.html.twig b/web/core/themes/olivero/templates/block/block--primary-menu--plugin-id--search-form-block.html.twig
index f6bb1414d..529b857ec 100644
--- a/web/core/themes/olivero/templates/block/block--primary-menu--plugin-id--search-form-block.html.twig
+++ b/web/core/themes/olivero/templates/block/block--primary-menu--plugin-id--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - content_attributes: A list of HTML attributes applied to the main content
  * - attributes: A list HTML attributes populated by modules, intended to
diff --git a/web/core/themes/olivero/templates/block/block--secondary-menu.html.twig b/web/core/themes/olivero/templates/block/block--secondary-menu.html.twig
index 6c6c77a9b..3c03dace1 100644
--- a/web/core/themes/olivero/templates/block/block--secondary-menu.html.twig
+++ b/web/core/themes/olivero/templates/block/block--secondary-menu.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/olivero/templates/block/block--system-menu-block.html.twig b/web/core/themes/olivero/templates/block/block--system-menu-block.html.twig
index 1b56b155d..9e9c25df6 100644
--- a/web/core/themes/olivero/templates/block/block--system-menu-block.html.twig
+++ b/web/core/themes/olivero/templates/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig b/web/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig
index 3b3f02d42..3f499f520 100644
--- a/web/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig
+++ b/web/core/themes/olivero/templates/block/block--system-powered-by-block.html.twig
@@ -14,7 +14,7 @@
   <span>
     {% trans %}Powered by{% endtrans %}
     <a href="https://www.drupal.org">{% trans %}Drupal{% endtrans %}</a>
-    <span class="drupal-logo" aria-label="{{ 'Drupal Logo'|t }}">
+    <span class="drupal-logo" role="img" aria-label="{{ 'Drupal Logo'|t }}">
       <svg width="14" height="19" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42.15 55.08" fill="none" aria-label="{{ 'Drupal Logo'|t }}" role="img">
         <path d="M29.75 11.73C25.87 7.86 22.18 4.16 21.08 0 20 4.16 16.28 7.86 12.4 11.73 6.59 17.54 0 24.12 0 34a21.08 21.08 0 1042.15 0c0-9.88-6.59-16.46-12.4-22.27zM10.84 35.92a14.13 14.13 0 00-1.65 2.62.54.54 0 01-.36.3h-.18c-.47 0-1-.92-1-.92-.14-.22-.27-.45-.4-.69l-.09-.19C5.94 34.25 7 30.28 7 30.28a17.42 17.42 0 012.52-5.41 31.53 31.53 0 012.28-3l1 1 4.72 4.82a.54.54 0 010 .72l-4.93 5.47zm10.48 13.81a7.29 7.29 0 01-5.4-12.14c1.54-1.83 3.42-3.63 5.46-6 2.42 2.58 4 4.35 5.55 6.29a3.08 3.08 0 01.32.48 7.15 7.15 0 011.3 4.12 7.23 7.23 0 01-7.23 7.25zM35 38.14a.84.84 0 01-.67.58h-.14a1.22 1.22 0 01-.68-.55 37.77 37.77 0 00-4.28-5.31l-1.93-2-6.41-6.65a54 54 0 01-3.84-3.94 1.3 1.3 0 00-.1-.15 3.84 3.84 0 01-.51-1v-.19a3.4 3.4 0 011-3c1.24-1.24 2.49-2.49 3.67-3.79 1.3 1.44 2.69 2.82 4.06 4.19a57.6 57.6 0 017.55 8.58A16 16 0 0135.65 34a14.55 14.55 0 01-.65 4.14z"/>
       </svg>
diff --git a/web/core/themes/olivero/templates/block/block.html.twig b/web/core/themes/olivero/templates/block/block.html.twig
index 647fb4e1f..6681e1ea8 100644
--- a/web/core/themes/olivero/templates/block/block.html.twig
+++ b/web/core/themes/olivero/templates/block/block.html.twig
@@ -12,6 +12,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/seven/css/base/elements.css b/web/core/themes/seven/css/base/elements.css
index 4da963a39..2599a0f58 100644
--- a/web/core/themes/seven/css/base/elements.css
+++ b/web/core/themes/seven/css/base/elements.css
@@ -30,9 +30,6 @@ summary,
   text-transform: uppercase;
   font-weight: bold;
 }
-.simpletest-results-form summary {
-  text-transform: none;
-}
 
 /**
  * Reusable heading classes are included to help modules change the styling of
diff --git a/web/core/themes/seven/css/components/form.css b/web/core/themes/seven/css/components/form.css
index b896da0bf..3fe0e7299 100644
--- a/web/core/themes/seven/css/components/form.css
+++ b/web/core/themes/seven/css/components/form.css
@@ -11,7 +11,7 @@ form {
  * elements in normalize.css 7.0.0.
  */
 button:not(.button),
-input:not([type="file"],.form-text, .form-textarea) {
+input:not([type="file"]):not(.form-text):not(.form-textarea) {
   line-height: 1.25em;
 }
 textarea,
diff --git a/web/core/themes/seven/css/components/jquery.ui/theme.css b/web/core/themes/seven/css/components/jquery.ui/theme.css
index 6c4dc4152..c23ca7338 100644
--- a/web/core/themes/seven/css/components/jquery.ui/theme.css
+++ b/web/core/themes/seven/css/components/jquery.ui/theme.css
@@ -43,12 +43,10 @@
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled {
   opacity: 0.35;
-  filter: alpha(opacity=35);
 }
 .ui-priority-secondary,
 .ui-widget-content .ui-priority-secondary {
   opacity: 0.7;
-  filter: alpha(opacity=70);
 }
 
 /**
@@ -331,7 +329,6 @@
  */
 .ui-widget-overlay {
   opacity: 0.7;
-  filter: alpha(opacity=70);
   background: #000;
 }
 
diff --git a/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js b/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js
index 0b9d95999..0ca2409c5 100644
--- a/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js
+++ b/web/core/themes/seven/js/classy/media_embed_ckeditor.theme.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.mediaEmbedPreviewError = function () {
     return "<div class=\"media-embed-error media-embed-error--preview-error\">".concat(Drupal.t('An error occurred while trying to preview the media. Please save your work and reload this page.'), "</div>");
diff --git a/web/core/themes/seven/js/mobile.install.js b/web/core/themes/seven/js/mobile.install.js
index 095fd1177..3ab8e2065 100644
--- a/web/core/themes/seven/js/mobile.install.js
+++ b/web/core/themes/seven/js/mobile.install.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function () {
   function findActiveStep(steps) {
     for (var i = 0; i < steps.length; i++) {
@@ -12,17 +11,13 @@
         return i + 1;
       }
     }
-
     if (steps[steps.length - 1].className === 'done') {
       return steps.length;
     }
-
     return 0;
   }
-
   function installStepsSetup() {
     var steps = document.querySelectorAll('.task-list li');
-
     if (steps.length) {
       var header = document.querySelector('header[role="banner"]');
       var stepIndicator = document.createElement('div');
@@ -31,7 +26,6 @@
       header.appendChild(stepIndicator);
     }
   }
-
   if (document.addEventListener) {
     document.addEventListener('DOMContentLoaded', installStepsSetup);
   }
diff --git a/web/core/themes/seven/js/nav-tabs.js b/web/core/themes/seven/js/nav-tabs.js
index 029a4be81..9d3f15072 100644
--- a/web/core/themes/seven/js/nav-tabs.js
+++ b/web/core/themes/seven/js/nav-tabs.js
@@ -4,41 +4,33 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   function init(tab) {
     var $tab = $(tab);
     var $target = $tab.find('[data-drupal-nav-tabs-target]');
     var isCollapsible = $tab.hasClass('is-collapsible');
-
     function openMenu(e) {
       $target.toggleClass('is-open');
     }
-
     function handleResize(e) {
       $tab.addClass('is-horizontal');
       var $tabs = $tab.find('.tabs');
       var isHorizontal = $tabs.outerHeight() <= $tabs.find('.tabs__tab').outerHeight();
       $tab.toggleClass('is-horizontal', isHorizontal);
-
       if (isCollapsible) {
         $tab.toggleClass('is-collapse-enabled', !isHorizontal);
       }
-
       if (isHorizontal) {
         $target.removeClass('is-open');
       }
     }
-
     $tab.addClass('position-container is-horizontal-enabled');
     $tab.on('click.tabs', '[data-drupal-nav-tabs-trigger]', openMenu);
     $(window).on('resize.tabs', Drupal.debounce(handleResize, 150)).trigger('resize.tabs');
   }
-
   Drupal.behaviors.navTabs = {
     attach: function attach(context, settings) {
       var notSmartPhone = window.matchMedia('(min-width: 300px)');
-
       if (notSmartPhone.matches) {
         once('nav-tabs', '[data-drupal-nav-tabs]', context).forEach(init);
       }
diff --git a/web/core/themes/seven/js/responsive-details.js b/web/core/themes/seven/js/responsive-details.js
index ec59b2afa..fe45fd32e 100644
--- a/web/core/themes/seven/js/responsive-details.js
+++ b/web/core/themes/seven/js/responsive-details.js
@@ -4,19 +4,15 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function ($, Drupal) {
   Drupal.behaviors.responsiveDetails = {
     attach: function attach(context) {
       var details = once('responsive-details', 'details', context);
-
       if (!details.length) {
         return;
       }
-
       var $details = $(details);
       var $summaries = $details.find('> summary');
-
       function detailsToggle(matches) {
         if (matches) {
           $details.attr('open', true);
@@ -28,11 +24,9 @@
           $summaries.off('.details-open');
         }
       }
-
       function handleDetailsMQ(event) {
         detailsToggle(event.matches);
       }
-
       var mql = window.matchMedia('(min-width:48em)');
       mql.addListener(handleDetailsMQ);
       detailsToggle(mql.matches);
diff --git a/web/core/themes/seven/seven.info.yml b/web/core/themes/seven/seven.info.yml
index 1ceb157b5..3da95f17f 100644
--- a/web/core/themes/seven/seven.info.yml
+++ b/web/core/themes/seven/seven.info.yml
@@ -13,6 +13,8 @@
 # changes.
 name: Seven
 type: theme
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/node/3223395#s-seven
 base theme: false
 description: 'The default administration theme for Drupal 8 was designed with clean lines, simple blocks, and sans-serif font to emphasize the tools and tasks at hand.'
 alt text: 'Default administration theme for Drupal 8 with simple blocks and clean lines.'
@@ -100,4 +102,3 @@ regions_hidden:
 
 ckeditor_stylesheets:
   - css/classy/components/media-embed-error.css
-ckeditor5-stylesheets: false
diff --git a/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig b/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig
index 667202fb6..d1cda724b 100644
--- a/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig
+++ b/web/core/themes/seven/templates/classy/block/block--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: A list HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template. Includes:
diff --git a/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig b/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig
index 407f8403f..db3f9f808 100644
--- a/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig
+++ b/web/core/themes/seven/templates/classy/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/seven/templates/classy/block/block.html.twig b/web/core/themes/seven/templates/classy/block/block.html.twig
index fd3311be9..114d7c4de 100644
--- a/web/core/themes/seven/templates/classy/block/block.html.twig
+++ b/web/core/themes/seven/templates/classy/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/stable/css/core/dialog/off-canvas.base.css b/web/core/themes/stable/css/core/dialog/off-canvas.base.css
index 3a8c6df99..21a766a4c 100644
--- a/web/core/themes/stable/css/core/dialog/off-canvas.base.css
+++ b/web/core/themes/stable/css/core/dialog/off-canvas.base.css
@@ -25,94 +25,94 @@
  */
 
 #drupal-off-canvas span,
-  #drupal-off-canvas applet,
-  #drupal-off-canvas object,
-  #drupal-off-canvas iframe,
-  #drupal-off-canvas h1,
-  #drupal-off-canvas h2,
-  #drupal-off-canvas h3,
-  #drupal-off-canvas h4,
-  #drupal-off-canvas h5,
-  #drupal-off-canvas h6,
-  #drupal-off-canvas p,
-  #drupal-off-canvas blockquote,
-  #drupal-off-canvas pre,
-  #drupal-off-canvas a,
-  #drupal-off-canvas abbr,
-  #drupal-off-canvas acronym,
-  #drupal-off-canvas address,
-  #drupal-off-canvas big,
-  #drupal-off-canvas button,
-  #drupal-off-canvas cite,
-  #drupal-off-canvas code,
-  #drupal-off-canvas del,
-  #drupal-off-canvas dfn,
-  #drupal-off-canvas em,
-  #drupal-off-canvas img,
-  #drupal-off-canvas ins,
-  #drupal-off-canvas kbd,
-  #drupal-off-canvas q,
-  #drupal-off-canvas s,
-  #drupal-off-canvas samp,
-  #drupal-off-canvas small,
-  #drupal-off-canvas strike,
-  #drupal-off-canvas strong,
-  #drupal-off-canvas sub,
-  #drupal-off-canvas sup,
-  #drupal-off-canvas tt,
-  #drupal-off-canvas var,
-  #drupal-off-canvas b,
-  #drupal-off-canvas u,
-  #drupal-off-canvas i,
-  #drupal-off-canvas center,
-  #drupal-off-canvas dl,
-  #drupal-off-canvas dt,
-  #drupal-off-canvas dd,
-  #drupal-off-canvas ol,
-  #drupal-off-canvas ul,
-  #drupal-off-canvas li,
-  #drupal-off-canvas fieldset,
-  #drupal-off-canvas form,
-  #drupal-off-canvas label,
-  #drupal-off-canvas legend,
-  #drupal-off-canvas table,
-  #drupal-off-canvas caption,
-  #drupal-off-canvas tbody,
-  #drupal-off-canvas tfoot,
-  #drupal-off-canvas thead,
-  #drupal-off-canvas tr,
-  #drupal-off-canvas th,
-  #drupal-off-canvas td,
-  #drupal-off-canvas article,
-  #drupal-off-canvas aside,
-  #drupal-off-canvas canvas,
-  #drupal-off-canvas details,
-  #drupal-off-canvas embed,
-  #drupal-off-canvas figure,
-  #drupal-off-canvas figcaption,
-  #drupal-off-canvas footer,
-  #drupal-off-canvas header,
-  #drupal-off-canvas hgroup,
-  #drupal-off-canvas main,
-  #drupal-off-canvas menu,
-  #drupal-off-canvas meter,
-  #drupal-off-canvas nav,
-  #drupal-off-canvas output,
-  #drupal-off-canvas progress,
-  #drupal-off-canvas ruby,
-  #drupal-off-canvas section,
-  #drupal-off-canvas summary,
-  #drupal-off-canvas time,
-  #drupal-off-canvas mark,
-  #drupal-off-canvas audio,
-  #drupal-off-canvas video,
-  #drupal-off-canvas input,
-  #drupal-off-canvas select,
-  #drupal-off-canvas textarea {
-    color: inherit;
-    background: inherit;
-    font-family: "Lucida Grande", "Lucida Sans Unicode", "liberation sans", sans-serif;
-  }
+#drupal-off-canvas applet,
+#drupal-off-canvas object,
+#drupal-off-canvas iframe,
+#drupal-off-canvas h1,
+#drupal-off-canvas h2,
+#drupal-off-canvas h3,
+#drupal-off-canvas h4,
+#drupal-off-canvas h5,
+#drupal-off-canvas h6,
+#drupal-off-canvas p,
+#drupal-off-canvas blockquote,
+#drupal-off-canvas pre,
+#drupal-off-canvas a,
+#drupal-off-canvas abbr,
+#drupal-off-canvas acronym,
+#drupal-off-canvas address,
+#drupal-off-canvas big,
+#drupal-off-canvas button,
+#drupal-off-canvas cite,
+#drupal-off-canvas code,
+#drupal-off-canvas del,
+#drupal-off-canvas dfn,
+#drupal-off-canvas em,
+#drupal-off-canvas img,
+#drupal-off-canvas ins,
+#drupal-off-canvas kbd,
+#drupal-off-canvas q,
+#drupal-off-canvas s,
+#drupal-off-canvas samp,
+#drupal-off-canvas small,
+#drupal-off-canvas strike,
+#drupal-off-canvas strong,
+#drupal-off-canvas sub,
+#drupal-off-canvas sup,
+#drupal-off-canvas tt,
+#drupal-off-canvas var,
+#drupal-off-canvas b,
+#drupal-off-canvas u,
+#drupal-off-canvas i,
+#drupal-off-canvas center,
+#drupal-off-canvas dl,
+#drupal-off-canvas dt,
+#drupal-off-canvas dd,
+#drupal-off-canvas ol,
+#drupal-off-canvas ul,
+#drupal-off-canvas li,
+#drupal-off-canvas fieldset,
+#drupal-off-canvas form,
+#drupal-off-canvas label,
+#drupal-off-canvas legend,
+#drupal-off-canvas table,
+#drupal-off-canvas caption,
+#drupal-off-canvas tbody,
+#drupal-off-canvas tfoot,
+#drupal-off-canvas thead,
+#drupal-off-canvas tr,
+#drupal-off-canvas th,
+#drupal-off-canvas td,
+#drupal-off-canvas article,
+#drupal-off-canvas aside,
+#drupal-off-canvas canvas,
+#drupal-off-canvas details,
+#drupal-off-canvas embed,
+#drupal-off-canvas figure,
+#drupal-off-canvas figcaption,
+#drupal-off-canvas footer,
+#drupal-off-canvas header,
+#drupal-off-canvas hgroup,
+#drupal-off-canvas main,
+#drupal-off-canvas menu,
+#drupal-off-canvas meter,
+#drupal-off-canvas nav,
+#drupal-off-canvas output,
+#drupal-off-canvas progress,
+#drupal-off-canvas ruby,
+#drupal-off-canvas section,
+#drupal-off-canvas summary,
+#drupal-off-canvas time,
+#drupal-off-canvas mark,
+#drupal-off-canvas audio,
+#drupal-off-canvas video,
+#drupal-off-canvas input,
+#drupal-off-canvas select,
+#drupal-off-canvas textarea {
+  color: inherit;
+  background: inherit;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "liberation sans", sans-serif;
+}
 
 /* Generic elements. */
 
@@ -274,13 +274,14 @@
 #drupal-off-canvas ol li {
   display: block;
   padding: 0.3125rem 0;
-  border-bottom: 1px solid #333
+  border-bottom: 1px solid #333;
 }
 
-#drupal-off-canvas ul li:last-child, #drupal-off-canvas ol li:last-child {
-    padding-bottom: 0;
-    border-bottom: none;
-  }
+#drupal-off-canvas ul li:last-child,
+#drupal-off-canvas ol li:last-child {
+  padding-bottom: 0;
+  border-bottom: none;
+}
 
 #drupal-off-canvas blockquote,
 #drupal-off-canvas code {
@@ -312,6 +313,9 @@
 
 #drupal-off-canvas .visually-hidden {
   position: absolute !important;
+}
+
+#drupal-off-canvas .visually-hidden {
   overflow: hidden;
   clip: rect(1px, 1px, 1px, 1px);
   width: 1px;
@@ -322,6 +326,10 @@
 #drupal-off-canvas .visually-hidden.focusable:active,
 #drupal-off-canvas .visually-hidden.focusable:focus {
   position: static !important;
+}
+
+#drupal-off-canvas .visually-hidden.focusable:active,
+#drupal-off-canvas .visually-hidden.focusable:focus {
   overflow: visible;
   clip: auto;
   width: auto;
diff --git a/web/core/themes/stable/css/core/dialog/off-canvas.reset.css b/web/core/themes/stable/css/core/dialog/off-canvas.reset.css
index de90b3bc0..d04068452 100644
--- a/web/core/themes/stable/css/core/dialog/off-canvas.reset.css
+++ b/web/core/themes/stable/css/core/dialog/off-canvas.reset.css
@@ -20,445 +20,441 @@
  */
 
 #drupal-off-canvas span,
-  #drupal-off-canvas applet,
-  #drupal-off-canvas object,
-  #drupal-off-canvas iframe,
-  #drupal-off-canvas h1,
-  #drupal-off-canvas h2,
-  #drupal-off-canvas h3,
-  #drupal-off-canvas h4,
-  #drupal-off-canvas h5,
-  #drupal-off-canvas h6,
-  #drupal-off-canvas p,
-  #drupal-off-canvas blockquote,
-  #drupal-off-canvas pre,
-  #drupal-off-canvas a,
-  #drupal-off-canvas abbr,
-  #drupal-off-canvas acronym,
-  #drupal-off-canvas address,
-  #drupal-off-canvas big,
-  #drupal-off-canvas button,
-  #drupal-off-canvas cite,
-  #drupal-off-canvas code,
-  #drupal-off-canvas del,
-  #drupal-off-canvas dfn,
-  #drupal-off-canvas em,
-  #drupal-off-canvas img,
-  #drupal-off-canvas ins,
-  #drupal-off-canvas kbd,
-  #drupal-off-canvas q,
-  #drupal-off-canvas s,
-  #drupal-off-canvas samp,
-  #drupal-off-canvas small,
-  #drupal-off-canvas strike,
-  #drupal-off-canvas strong,
-  #drupal-off-canvas sub,
-  #drupal-off-canvas sup,
-  #drupal-off-canvas tt,
-  #drupal-off-canvas var,
-  #drupal-off-canvas b,
-  #drupal-off-canvas u,
-  #drupal-off-canvas i,
-  #drupal-off-canvas center,
-  #drupal-off-canvas dl,
-  #drupal-off-canvas dt,
-  #drupal-off-canvas dd,
-  #drupal-off-canvas ol,
-  #drupal-off-canvas ul,
-  #drupal-off-canvas li,
-  #drupal-off-canvas fieldset,
-  #drupal-off-canvas form,
-  #drupal-off-canvas label,
-  #drupal-off-canvas legend,
-  #drupal-off-canvas table,
-  #drupal-off-canvas caption,
-  #drupal-off-canvas tbody,
-  #drupal-off-canvas tfoot,
-  #drupal-off-canvas thead,
-  #drupal-off-canvas tr,
-  #drupal-off-canvas th,
-  #drupal-off-canvas td,
-  #drupal-off-canvas article,
-  #drupal-off-canvas aside,
-  #drupal-off-canvas canvas,
-  #drupal-off-canvas details,
-  #drupal-off-canvas embed,
-  #drupal-off-canvas figure,
-  #drupal-off-canvas figcaption,
-  #drupal-off-canvas footer,
-  #drupal-off-canvas header,
-  #drupal-off-canvas hgroup,
-  #drupal-off-canvas main,
-  #drupal-off-canvas menu,
-  #drupal-off-canvas meter,
-  #drupal-off-canvas nav,
-  #drupal-off-canvas output,
-  #drupal-off-canvas progress,
-  #drupal-off-canvas ruby,
-  #drupal-off-canvas section,
-  #drupal-off-canvas summary,
-  #drupal-off-canvas time,
-  #drupal-off-canvas mark,
-  #drupal-off-canvas audio,
-  #drupal-off-canvas video,
-  #drupal-off-canvas input,
-  #drupal-off-canvas select,
-  #drupal-off-canvas textarea {
-    animation: none 0s ease 0s 1 normal none running;
-    -webkit-backface-visibility: visible;
-    backface-visibility: visible;
-    background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
-    border: medium none currentColor;
-    border-collapse: separate;
-    border-image: none;
-    border-radius: 0;
-    border-spacing: 0;
-    bottom: auto;
-    box-shadow: none;
-    box-sizing: content-box;
-    caption-side: top;
-    clear: none;
-    clip: auto;
-    color: #000;
-    columns: auto;
-    column-count: auto;
-    column-fill: balance;
-    grid-column-gap: normal;
-    column-rule: medium none currentColor;
-    column-span: 1;
-    column-width: auto;
-    content: normal;
-    counter-increment: none;
-    counter-reset: none;
-    cursor: auto;
-    direction: ltr;
-    display: inline;
-    empty-cells: show;
-    float: none;
-    font-family: serif;
-    font-size: medium;
-    font-style: normal;
-    font-feature-settings: normal;
-    font-variant: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: normal;
-    height: auto;
-    -webkit-hyphens: none;
-    -ms-hyphens: none;
-    hyphens: none;
-    left: auto;
-    letter-spacing: normal;
-    list-style: disc outside none;
-    margin: 0;
-    max-height: none;
-    max-width: none;
-    min-height: 0;
-    min-width: 0;
-    opacity: 1;
-    orphans: 2;
-    outline: medium none invert;
-    overflow: visible;
-    overflow-x: visible;
-    overflow-y: visible;
-    padding: 0;
-    page-break-after: auto;
-    page-break-before: auto;
-    page-break-inside: auto;
-    perspective: none;
-    perspective-origin: 50% 50%;
-    position: static;
-    right: auto;
-    tab-size: 8;
-    table-layout: auto;
-    text-align: left;
-    text-align-last: auto;
-    text-decoration: none;
-    text-indent: 0;
-    text-shadow: none;
-    text-transform: none;
-    top: auto;
-    transform: none;
-    transform-origin: 50% 50% 0;
-    transform-style: flat;
-    transition: none 0s ease 0s;
-    unicode-bidi: normal;
-    vertical-align: baseline;
-    visibility: visible;
-    white-space: normal;
-    widows: 2;
-    width: auto;
-    word-spacing: normal;
-    z-index: auto;
-    all: initial;
-    box-sizing: border-box;
-    text-shadow: none;
-    -webkit-font-smoothing: antialiased;
-    -webkit-tap-highlight-color: initial
-  }
+#drupal-off-canvas applet,
+#drupal-off-canvas object,
+#drupal-off-canvas iframe,
+#drupal-off-canvas h1,
+#drupal-off-canvas h2,
+#drupal-off-canvas h3,
+#drupal-off-canvas h4,
+#drupal-off-canvas h5,
+#drupal-off-canvas h6,
+#drupal-off-canvas p,
+#drupal-off-canvas blockquote,
+#drupal-off-canvas pre,
+#drupal-off-canvas a,
+#drupal-off-canvas abbr,
+#drupal-off-canvas acronym,
+#drupal-off-canvas address,
+#drupal-off-canvas big,
+#drupal-off-canvas button,
+#drupal-off-canvas cite,
+#drupal-off-canvas code,
+#drupal-off-canvas del,
+#drupal-off-canvas dfn,
+#drupal-off-canvas em,
+#drupal-off-canvas img,
+#drupal-off-canvas ins,
+#drupal-off-canvas kbd,
+#drupal-off-canvas q,
+#drupal-off-canvas s,
+#drupal-off-canvas samp,
+#drupal-off-canvas small,
+#drupal-off-canvas strike,
+#drupal-off-canvas strong,
+#drupal-off-canvas sub,
+#drupal-off-canvas sup,
+#drupal-off-canvas tt,
+#drupal-off-canvas var,
+#drupal-off-canvas b,
+#drupal-off-canvas u,
+#drupal-off-canvas i,
+#drupal-off-canvas center,
+#drupal-off-canvas dl,
+#drupal-off-canvas dt,
+#drupal-off-canvas dd,
+#drupal-off-canvas ol,
+#drupal-off-canvas ul,
+#drupal-off-canvas li,
+#drupal-off-canvas fieldset,
+#drupal-off-canvas form,
+#drupal-off-canvas label,
+#drupal-off-canvas legend,
+#drupal-off-canvas table,
+#drupal-off-canvas caption,
+#drupal-off-canvas tbody,
+#drupal-off-canvas tfoot,
+#drupal-off-canvas thead,
+#drupal-off-canvas tr,
+#drupal-off-canvas th,
+#drupal-off-canvas td,
+#drupal-off-canvas article,
+#drupal-off-canvas aside,
+#drupal-off-canvas canvas,
+#drupal-off-canvas details,
+#drupal-off-canvas embed,
+#drupal-off-canvas figure,
+#drupal-off-canvas figcaption,
+#drupal-off-canvas footer,
+#drupal-off-canvas header,
+#drupal-off-canvas hgroup,
+#drupal-off-canvas main,
+#drupal-off-canvas menu,
+#drupal-off-canvas meter,
+#drupal-off-canvas nav,
+#drupal-off-canvas output,
+#drupal-off-canvas progress,
+#drupal-off-canvas ruby,
+#drupal-off-canvas section,
+#drupal-off-canvas summary,
+#drupal-off-canvas time,
+#drupal-off-canvas mark,
+#drupal-off-canvas audio,
+#drupal-off-canvas video,
+#drupal-off-canvas input,
+#drupal-off-canvas select,
+#drupal-off-canvas textarea {
+  position: static;
+  z-index: auto;
+  top: auto;
+  right: auto;
+  bottom: auto;
+  left: auto;
+  display: inline;
+  visibility: visible;
+  float: none;
+  clear: none;
+  overflow: visible;
+  overflow-x: visible;
+  overflow-y: visible;
+  clip: auto;
+  box-sizing: content-box;
+  box-sizing: border-box;
+  width: auto;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
+  margin: 0;
+  padding: 0;
+  table-layout: auto;
+  columns: auto;
+  column-span: 1;
+  column-width: auto;
+  column-count: auto;
+  column-fill: balance;
+  column-gap: normal;
+  column-rule: medium none currentColor;
+  empty-cells: show;
+  caption-side: top;
+  border-spacing: 0;
+  list-style: disc outside none;
+  content: normal;
+  counter-reset: none;
+  counter-increment: none;
+  cursor: auto;
+  transition: none 0s ease 0s;
+  transform: none;
+  transform-origin: 50% 50% 0;
+  animation: none 0s ease 0s 1 normal none running;
+  text-align: left;
+  text-align-last: auto;
+  vertical-align: baseline;
+  white-space: normal;
+  text-decoration: none;
+  text-indent: 0;
+  letter-spacing: normal;
+  word-spacing: normal;
+  text-transform: none;
+  tab-size: 8;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+  direction: ltr;
+  unicode-bidi: normal;
+  orphans: 2;
+  widows: 2;
+  opacity: 1;
+  color: #000;
+  border: medium none currentColor;
+  border-collapse: separate;
+  border-radius: 0;
+  border-image: none;
+  outline: medium none invert;
+  background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
+  box-shadow: none;
+  text-shadow: none;
+  font-family: serif;
+  font-size: medium;
+  font-weight: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-stretch: normal;
+  line-height: normal;
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  page-break-after: auto;
+  page-break-before: auto;
+  page-break-inside: auto;
+  perspective: none;
+  perspective-origin: 50% 50%;
+  transform-style: flat;
+  all: initial;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: initial;
+}
 
 #drupal-off-canvas span:after,
-    #drupal-off-canvas span:before,
-    #drupal-off-canvas applet:after,
-    #drupal-off-canvas applet:before,
-    #drupal-off-canvas object:after,
-    #drupal-off-canvas object:before,
-    #drupal-off-canvas iframe:after,
-    #drupal-off-canvas iframe:before,
-    #drupal-off-canvas h1:after,
-    #drupal-off-canvas h1:before,
-    #drupal-off-canvas h2:after,
-    #drupal-off-canvas h2:before,
-    #drupal-off-canvas h3:after,
-    #drupal-off-canvas h3:before,
-    #drupal-off-canvas h4:after,
-    #drupal-off-canvas h4:before,
-    #drupal-off-canvas h5:after,
-    #drupal-off-canvas h5:before,
-    #drupal-off-canvas h6:after,
-    #drupal-off-canvas h6:before,
-    #drupal-off-canvas p:after,
-    #drupal-off-canvas p:before,
-    #drupal-off-canvas blockquote:after,
-    #drupal-off-canvas blockquote:before,
-    #drupal-off-canvas pre:after,
-    #drupal-off-canvas pre:before,
-    #drupal-off-canvas a:after,
-    #drupal-off-canvas a:before,
-    #drupal-off-canvas abbr:after,
-    #drupal-off-canvas abbr:before,
-    #drupal-off-canvas acronym:after,
-    #drupal-off-canvas acronym:before,
-    #drupal-off-canvas address:after,
-    #drupal-off-canvas address:before,
-    #drupal-off-canvas big:after,
-    #drupal-off-canvas big:before,
-    #drupal-off-canvas button:after,
-    #drupal-off-canvas button:before,
-    #drupal-off-canvas cite:after,
-    #drupal-off-canvas cite:before,
-    #drupal-off-canvas code:after,
-    #drupal-off-canvas code:before,
-    #drupal-off-canvas del:after,
-    #drupal-off-canvas del:before,
-    #drupal-off-canvas dfn:after,
-    #drupal-off-canvas dfn:before,
-    #drupal-off-canvas em:after,
-    #drupal-off-canvas em:before,
-    #drupal-off-canvas img:after,
-    #drupal-off-canvas img:before,
-    #drupal-off-canvas ins:after,
-    #drupal-off-canvas ins:before,
-    #drupal-off-canvas kbd:after,
-    #drupal-off-canvas kbd:before,
-    #drupal-off-canvas q:after,
-    #drupal-off-canvas q:before,
-    #drupal-off-canvas s:after,
-    #drupal-off-canvas s:before,
-    #drupal-off-canvas samp:after,
-    #drupal-off-canvas samp:before,
-    #drupal-off-canvas small:after,
-    #drupal-off-canvas small:before,
-    #drupal-off-canvas strike:after,
-    #drupal-off-canvas strike:before,
-    #drupal-off-canvas strong:after,
-    #drupal-off-canvas strong:before,
-    #drupal-off-canvas sub:after,
-    #drupal-off-canvas sub:before,
-    #drupal-off-canvas sup:after,
-    #drupal-off-canvas sup:before,
-    #drupal-off-canvas tt:after,
-    #drupal-off-canvas tt:before,
-    #drupal-off-canvas var:after,
-    #drupal-off-canvas var:before,
-    #drupal-off-canvas b:after,
-    #drupal-off-canvas b:before,
-    #drupal-off-canvas u:after,
-    #drupal-off-canvas u:before,
-    #drupal-off-canvas i:after,
-    #drupal-off-canvas i:before,
-    #drupal-off-canvas center:after,
-    #drupal-off-canvas center:before,
-    #drupal-off-canvas dl:after,
-    #drupal-off-canvas dl:before,
-    #drupal-off-canvas dt:after,
-    #drupal-off-canvas dt:before,
-    #drupal-off-canvas dd:after,
-    #drupal-off-canvas dd:before,
-    #drupal-off-canvas ol:after,
-    #drupal-off-canvas ol:before,
-    #drupal-off-canvas ul:after,
-    #drupal-off-canvas ul:before,
-    #drupal-off-canvas li:after,
-    #drupal-off-canvas li:before,
-    #drupal-off-canvas fieldset:after,
-    #drupal-off-canvas fieldset:before,
-    #drupal-off-canvas form:after,
-    #drupal-off-canvas form:before,
-    #drupal-off-canvas label:after,
-    #drupal-off-canvas label:before,
-    #drupal-off-canvas legend:after,
-    #drupal-off-canvas legend:before,
-    #drupal-off-canvas table:after,
-    #drupal-off-canvas table:before,
-    #drupal-off-canvas caption:after,
-    #drupal-off-canvas caption:before,
-    #drupal-off-canvas tbody:after,
-    #drupal-off-canvas tbody:before,
-    #drupal-off-canvas tfoot:after,
-    #drupal-off-canvas tfoot:before,
-    #drupal-off-canvas thead:after,
-    #drupal-off-canvas thead:before,
-    #drupal-off-canvas tr:after,
-    #drupal-off-canvas tr:before,
-    #drupal-off-canvas th:after,
-    #drupal-off-canvas th:before,
-    #drupal-off-canvas td:after,
-    #drupal-off-canvas td:before,
-    #drupal-off-canvas article:after,
-    #drupal-off-canvas article:before,
-    #drupal-off-canvas aside:after,
-    #drupal-off-canvas aside:before,
-    #drupal-off-canvas canvas:after,
-    #drupal-off-canvas canvas:before,
-    #drupal-off-canvas details:after,
-    #drupal-off-canvas details:before,
-    #drupal-off-canvas embed:after,
-    #drupal-off-canvas embed:before,
-    #drupal-off-canvas figure:after,
-    #drupal-off-canvas figure:before,
-    #drupal-off-canvas figcaption:after,
-    #drupal-off-canvas figcaption:before,
-    #drupal-off-canvas footer:after,
-    #drupal-off-canvas footer:before,
-    #drupal-off-canvas header:after,
-    #drupal-off-canvas header:before,
-    #drupal-off-canvas hgroup:after,
-    #drupal-off-canvas hgroup:before,
-    #drupal-off-canvas main:after,
-    #drupal-off-canvas main:before,
-    #drupal-off-canvas menu:after,
-    #drupal-off-canvas menu:before,
-    #drupal-off-canvas meter:after,
-    #drupal-off-canvas meter:before,
-    #drupal-off-canvas nav:after,
-    #drupal-off-canvas nav:before,
-    #drupal-off-canvas output:after,
-    #drupal-off-canvas output:before,
-    #drupal-off-canvas progress:after,
-    #drupal-off-canvas progress:before,
-    #drupal-off-canvas ruby:after,
-    #drupal-off-canvas ruby:before,
-    #drupal-off-canvas section:after,
-    #drupal-off-canvas section:before,
-    #drupal-off-canvas summary:after,
-    #drupal-off-canvas summary:before,
-    #drupal-off-canvas time:after,
-    #drupal-off-canvas time:before,
-    #drupal-off-canvas mark:after,
-    #drupal-off-canvas mark:before,
-    #drupal-off-canvas audio:after,
-    #drupal-off-canvas audio:before,
-    #drupal-off-canvas video:after,
-    #drupal-off-canvas video:before,
-    #drupal-off-canvas input:after,
-    #drupal-off-canvas input:before,
-    #drupal-off-canvas select:after,
-    #drupal-off-canvas select:before,
-    #drupal-off-canvas textarea:after,
-    #drupal-off-canvas textarea:before {
-      animation: none 0s ease 0s 1 normal none running;
-      -webkit-backface-visibility: visible;
-      backface-visibility: visible;
-      background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
-      border: medium none currentColor;
-      border-collapse: separate;
-      border-image: none;
-      border-radius: 0;
-      border-spacing: 0;
-      bottom: auto;
-      box-shadow: none;
-      box-sizing: content-box;
-      caption-side: top;
-      clear: none;
-      clip: auto;
-      color: #000;
-      columns: auto;
-      column-count: auto;
-      column-fill: balance;
-      grid-column-gap: normal;
-      column-rule: medium none currentColor;
-      column-span: 1;
-      column-width: auto;
-      content: normal;
-      counter-increment: none;
-      counter-reset: none;
-      cursor: auto;
-      direction: ltr;
-      display: inline;
-      empty-cells: show;
-      float: none;
-      font-family: serif;
-      font-size: medium;
-      font-style: normal;
-      font-feature-settings: normal;
-      font-variant: normal;
-      font-weight: normal;
-      font-stretch: normal;
-      line-height: normal;
-      height: auto;
-      -webkit-hyphens: none;
-      -ms-hyphens: none;
-      hyphens: none;
-      left: auto;
-      letter-spacing: normal;
-      list-style: disc outside none;
-      margin: 0;
-      max-height: none;
-      max-width: none;
-      min-height: 0;
-      min-width: 0;
-      opacity: 1;
-      orphans: 2;
-      outline: medium none invert;
-      overflow: visible;
-      overflow-x: visible;
-      overflow-y: visible;
-      padding: 0;
-      page-break-after: auto;
-      page-break-before: auto;
-      page-break-inside: auto;
-      perspective: none;
-      perspective-origin: 50% 50%;
-      position: static;
-      right: auto;
-      tab-size: 8;
-      table-layout: auto;
-      text-align: left;
-      text-align-last: auto;
-      text-decoration: none;
-      text-indent: 0;
-      text-shadow: none;
-      text-transform: none;
-      top: auto;
-      transform: none;
-      transform-origin: 50% 50% 0;
-      transform-style: flat;
-      transition: none 0s ease 0s;
-      unicode-bidi: normal;
-      vertical-align: baseline;
-      visibility: visible;
-      white-space: normal;
-      widows: 2;
-      width: auto;
-      word-spacing: normal;
-      z-index: auto;
-      all: initial;
-      box-sizing: border-box;
-      text-shadow: none;
-      -webkit-font-smoothing: antialiased;
-      -webkit-tap-highlight-color: initial;
-    }
+#drupal-off-canvas applet:after,
+#drupal-off-canvas object:after,
+#drupal-off-canvas iframe:after,
+#drupal-off-canvas h1:after,
+#drupal-off-canvas h2:after,
+#drupal-off-canvas h3:after,
+#drupal-off-canvas h4:after,
+#drupal-off-canvas h5:after,
+#drupal-off-canvas h6:after,
+#drupal-off-canvas p:after,
+#drupal-off-canvas blockquote:after,
+#drupal-off-canvas pre:after,
+#drupal-off-canvas a:after,
+#drupal-off-canvas abbr:after,
+#drupal-off-canvas acronym:after,
+#drupal-off-canvas address:after,
+#drupal-off-canvas big:after,
+#drupal-off-canvas button:after,
+#drupal-off-canvas cite:after,
+#drupal-off-canvas code:after,
+#drupal-off-canvas del:after,
+#drupal-off-canvas dfn:after,
+#drupal-off-canvas em:after,
+#drupal-off-canvas img:after,
+#drupal-off-canvas ins:after,
+#drupal-off-canvas kbd:after,
+#drupal-off-canvas q:after,
+#drupal-off-canvas s:after,
+#drupal-off-canvas samp:after,
+#drupal-off-canvas small:after,
+#drupal-off-canvas strike:after,
+#drupal-off-canvas strong:after,
+#drupal-off-canvas sub:after,
+#drupal-off-canvas sup:after,
+#drupal-off-canvas tt:after,
+#drupal-off-canvas var:after,
+#drupal-off-canvas b:after,
+#drupal-off-canvas u:after,
+#drupal-off-canvas i:after,
+#drupal-off-canvas center:after,
+#drupal-off-canvas dl:after,
+#drupal-off-canvas dt:after,
+#drupal-off-canvas dd:after,
+#drupal-off-canvas ol:after,
+#drupal-off-canvas ul:after,
+#drupal-off-canvas li:after,
+#drupal-off-canvas fieldset:after,
+#drupal-off-canvas form:after,
+#drupal-off-canvas label:after,
+#drupal-off-canvas legend:after,
+#drupal-off-canvas table:after,
+#drupal-off-canvas caption:after,
+#drupal-off-canvas tbody:after,
+#drupal-off-canvas tfoot:after,
+#drupal-off-canvas thead:after,
+#drupal-off-canvas tr:after,
+#drupal-off-canvas th:after,
+#drupal-off-canvas td:after,
+#drupal-off-canvas article:after,
+#drupal-off-canvas aside:after,
+#drupal-off-canvas canvas:after,
+#drupal-off-canvas details:after,
+#drupal-off-canvas embed:after,
+#drupal-off-canvas figure:after,
+#drupal-off-canvas figcaption:after,
+#drupal-off-canvas footer:after,
+#drupal-off-canvas header:after,
+#drupal-off-canvas hgroup:after,
+#drupal-off-canvas main:after,
+#drupal-off-canvas menu:after,
+#drupal-off-canvas meter:after,
+#drupal-off-canvas nav:after,
+#drupal-off-canvas output:after,
+#drupal-off-canvas progress:after,
+#drupal-off-canvas ruby:after,
+#drupal-off-canvas section:after,
+#drupal-off-canvas summary:after,
+#drupal-off-canvas time:after,
+#drupal-off-canvas mark:after,
+#drupal-off-canvas audio:after,
+#drupal-off-canvas video:after,
+#drupal-off-canvas input:after,
+#drupal-off-canvas select:after,
+#drupal-off-canvas textarea:after,
+#drupal-off-canvas span:before,
+#drupal-off-canvas applet:before,
+#drupal-off-canvas object:before,
+#drupal-off-canvas iframe:before,
+#drupal-off-canvas h1:before,
+#drupal-off-canvas h2:before,
+#drupal-off-canvas h3:before,
+#drupal-off-canvas h4:before,
+#drupal-off-canvas h5:before,
+#drupal-off-canvas h6:before,
+#drupal-off-canvas p:before,
+#drupal-off-canvas blockquote:before,
+#drupal-off-canvas pre:before,
+#drupal-off-canvas a:before,
+#drupal-off-canvas abbr:before,
+#drupal-off-canvas acronym:before,
+#drupal-off-canvas address:before,
+#drupal-off-canvas big:before,
+#drupal-off-canvas button:before,
+#drupal-off-canvas cite:before,
+#drupal-off-canvas code:before,
+#drupal-off-canvas del:before,
+#drupal-off-canvas dfn:before,
+#drupal-off-canvas em:before,
+#drupal-off-canvas img:before,
+#drupal-off-canvas ins:before,
+#drupal-off-canvas kbd:before,
+#drupal-off-canvas q:before,
+#drupal-off-canvas s:before,
+#drupal-off-canvas samp:before,
+#drupal-off-canvas small:before,
+#drupal-off-canvas strike:before,
+#drupal-off-canvas strong:before,
+#drupal-off-canvas sub:before,
+#drupal-off-canvas sup:before,
+#drupal-off-canvas tt:before,
+#drupal-off-canvas var:before,
+#drupal-off-canvas b:before,
+#drupal-off-canvas u:before,
+#drupal-off-canvas i:before,
+#drupal-off-canvas center:before,
+#drupal-off-canvas dl:before,
+#drupal-off-canvas dt:before,
+#drupal-off-canvas dd:before,
+#drupal-off-canvas ol:before,
+#drupal-off-canvas ul:before,
+#drupal-off-canvas li:before,
+#drupal-off-canvas fieldset:before,
+#drupal-off-canvas form:before,
+#drupal-off-canvas label:before,
+#drupal-off-canvas legend:before,
+#drupal-off-canvas table:before,
+#drupal-off-canvas caption:before,
+#drupal-off-canvas tbody:before,
+#drupal-off-canvas tfoot:before,
+#drupal-off-canvas thead:before,
+#drupal-off-canvas tr:before,
+#drupal-off-canvas th:before,
+#drupal-off-canvas td:before,
+#drupal-off-canvas article:before,
+#drupal-off-canvas aside:before,
+#drupal-off-canvas canvas:before,
+#drupal-off-canvas details:before,
+#drupal-off-canvas embed:before,
+#drupal-off-canvas figure:before,
+#drupal-off-canvas figcaption:before,
+#drupal-off-canvas footer:before,
+#drupal-off-canvas header:before,
+#drupal-off-canvas hgroup:before,
+#drupal-off-canvas main:before,
+#drupal-off-canvas menu:before,
+#drupal-off-canvas meter:before,
+#drupal-off-canvas nav:before,
+#drupal-off-canvas output:before,
+#drupal-off-canvas progress:before,
+#drupal-off-canvas ruby:before,
+#drupal-off-canvas section:before,
+#drupal-off-canvas summary:before,
+#drupal-off-canvas time:before,
+#drupal-off-canvas mark:before,
+#drupal-off-canvas audio:before,
+#drupal-off-canvas video:before,
+#drupal-off-canvas input:before,
+#drupal-off-canvas select:before,
+#drupal-off-canvas textarea:before {
+  position: static;
+  z-index: auto;
+  top: auto;
+  right: auto;
+  bottom: auto;
+  left: auto;
+  display: inline;
+  visibility: visible;
+  float: none;
+  clear: none;
+  overflow: visible;
+  overflow-x: visible;
+  overflow-y: visible;
+  clip: auto;
+  box-sizing: content-box;
+  box-sizing: border-box;
+  width: auto;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
+  margin: 0;
+  padding: 0;
+  table-layout: auto;
+  columns: auto;
+  column-span: 1;
+  column-width: auto;
+  column-count: auto;
+  column-fill: balance;
+  column-gap: normal;
+  column-rule: medium none currentColor;
+  empty-cells: show;
+  caption-side: top;
+  border-spacing: 0;
+  list-style: disc outside none;
+  content: normal;
+  counter-reset: none;
+  counter-increment: none;
+  cursor: auto;
+  transition: none 0s ease 0s;
+  transform: none;
+  transform-origin: 50% 50% 0;
+  animation: none 0s ease 0s 1 normal none running;
+  text-align: left;
+  text-align-last: auto;
+  vertical-align: baseline;
+  white-space: normal;
+  text-decoration: none;
+  text-indent: 0;
+  letter-spacing: normal;
+  word-spacing: normal;
+  text-transform: none;
+  tab-size: 8;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+  direction: ltr;
+  unicode-bidi: normal;
+  orphans: 2;
+  widows: 2;
+  opacity: 1;
+  color: #000;
+  border: medium none currentColor;
+  border-collapse: separate;
+  border-radius: 0;
+  border-image: none;
+  outline: medium none invert;
+  background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
+  box-shadow: none;
+  text-shadow: none;
+  font-family: serif;
+  font-size: medium;
+  font-weight: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-stretch: normal;
+  line-height: normal;
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  page-break-after: auto;
+  page-break-before: auto;
+  page-break-inside: auto;
+  perspective: none;
+  perspective-origin: 50% 50%;
+  transform-style: flat;
+  all: initial;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: initial;
+}
 
 /* Reset size and position on elements. */
 
@@ -797,7 +793,8 @@
   box-shadow: none;
 }
 
-#drupal-off-canvas input:-ms-input-placeholder, #drupal-off-canvas textarea:-ms-input-placeholder {
+#drupal-off-canvas input:-ms-input-placeholder,
+#drupal-off-canvas textarea:-ms-input-placeholder {
   color: gray;
 }
 
diff --git a/web/core/themes/stable/css/toolbar/toolbar.theme.css b/web/core/themes/stable/css/toolbar/toolbar.theme.css
index 0416c056a..bdc6c3f18 100644
--- a/web/core/themes/stable/css/toolbar/toolbar.theme.css
+++ b/web/core/themes/stable/css/toolbar/toolbar.theme.css
@@ -85,7 +85,8 @@
 .toolbar .toolbar-tray-horizontal .toolbar-tray {
   background-color: #f5f5f5;
 }
-.toolbar-tray a {
+.toolbar-tray a,
+.toolbar-tray a:visited {
   padding: 1em 1.3333em;
   cursor: pointer;
   text-decoration: none;
diff --git a/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css b/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css
index 39fc644fe..c83e8b4b5 100644
--- a/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css
+++ b/web/core/themes/stable/css/views_ui/views_ui.admin.theme.css
@@ -632,23 +632,6 @@ td.group-title {
 .views-ui-dialog .views-override > * {
   margin: 0;
 }
-.views-ui-dialog .views-progress-indicator {
-  position: absolute;
-  top: 32px;
-  right: 10px; /* LTR */
-  color: #fff;
-  font-size: 11px;
-}
-[dir="rtl"] .views-ui-dialog .views-progress-indicator {
-  right: auto;
-  left: 10px;
-}
-.views-ui-dialog .views-progress-indicator:before {
-  content: "\003C\00A0";
-}
-.views-ui-dialog .views-progress-indicator:after {
-  content: "\00A0\003E";
-}
 .views-ui-dialog details .item-list {
   padding-left: 2em; /* LTR */
 }
diff --git a/web/core/themes/stable/js/ajax.js b/web/core/themes/stable/js/ajax.js
index 2892ed913..c8f036d12 100644
--- a/web/core/themes/stable/js/ajax.js
+++ b/web/core/themes/stable/js/ajax.js
@@ -4,7 +4,6 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.ajaxProgressBar = function ($element) {
     return $element.addClass('ajax-progress ajax-progress-bar');
diff --git a/web/core/themes/stable/js/tour.js b/web/core/themes/stable/js/tour.js
index 20eda20a1..9ef78c578 100644
--- a/web/core/themes/stable/js/tour.js
+++ b/web/core/themes/stable/js/tour.js
@@ -4,34 +4,24 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 (function (Drupal) {
   Drupal.tour.convertToJoyrideMarkup = function (shepherdTour) {
     var changeTag = function changeTag(element, tag) {
       if (element) {
         var newTagElement = document.createElement(tag);
-
         _toConsumableArray(element.attributes).forEach(function (attr) {
           newTagElement.setAttribute(attr.name, attr.value);
         });
-
         newTagElement.innerHTML = element.innerHTML;
         element.parentNode.replaceChild(newTagElement, element);
       }
     };
-
     var shepherdElement = shepherdTour.currentStep.el;
     var shepherdContent = shepherdElement.querySelector('.shepherd-content');
     var shepherdCancel = shepherdElement.querySelector('.shepherd-cancel-icon');
@@ -51,7 +41,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     shepherdCancel.setAttribute('role', 'button');
     shepherdElement.setAttribute('data-index', shepherdTour.currentStep.options.index);
     shepherdElement.querySelector('footer').remove();
-
     if (shepherdElement.classList.contains('tip-uses-get-output')) {
       shepherdText.appendChild(shepherdNext);
       shepherdText.appendChild(shepherdCancel);
@@ -73,14 +62,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       changeTag(shepherdTitle, 'h2');
       shepherdText.outerHTML = shepherdText.innerHTML;
     }
-
     changeTag(shepherdElement.querySelector('.joyride-close-tip'), 'a');
     changeTag(shepherdElement.querySelector('.joyride-next-tip'), 'a');
     var shepherdArrow = shepherdElement.querySelector('.shepherd-arrow');
-
     if (shepherdArrow) {
       shepherdArrow.classList.add('joyride-nub');
-
       if (shepherdTour.currentStep.options.attachTo.on) {
         var stepToTipPosition = {
           bottom: 'top',
@@ -90,7 +76,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         };
         shepherdArrow.classList.add(stepToTipPosition[shepherdTour.currentStep.options.attachTo.on.split('-')[0]]);
       }
-
       changeTag(shepherdArrow, 'span');
     } else {
       var nub = document.createElement('span');
@@ -98,7 +83,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       nub.setAttribute('style', 'display: none;');
       shepherdElement.insertBefore(nub, shepherdElement.firstChild);
     }
-
     shepherdElement.querySelector('.joyride-next-tip').addEventListener('click', function (e) {
       e.preventDefault();
       shepherdTour.next();
diff --git a/web/core/themes/stable/js/user.theme.js b/web/core/themes/stable/js/user.theme.js
index 2c76f6f1d..f809f9157 100644
--- a/web/core/themes/stable/js/user.theme.js
+++ b/web/core/themes/stable/js/user.theme.js
@@ -4,12 +4,10 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.passwordConfirmMessage = function (translate) {
     return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm js-password-confirm js-password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(translate.confirmTitle, " <span data-drupal-selector=\"password-match-status-text\"></span></div>");
   };
-
   Drupal.theme.passwordStrength = function (_ref) {
     var strengthTitle = _ref.strengthTitle;
     var strengthIndicator = '<div class="password-strength__indicator js-password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
diff --git a/web/core/themes/stable/layouts/fourcol_section/layout--fourcol-section.html.twig b/web/core/themes/stable/layouts/fourcol_section/layout--fourcol-section.html.twig
index e610278c4..0dd0820a7 100644
--- a/web/core/themes/stable/layouts/fourcol_section/layout--fourcol-section.html.twig
+++ b/web/core/themes/stable/layouts/fourcol_section/layout--fourcol-section.html.twig
@@ -4,6 +4,7 @@
  * Theme override for a four-column 25%-25%-25%-25% layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/layouts/threecol_section/layout--threecol-section.html.twig b/web/core/themes/stable/layouts/threecol_section/layout--threecol-section.html.twig
index 123acfec3..a85b90c12 100644
--- a/web/core/themes/stable/layouts/threecol_section/layout--threecol-section.html.twig
+++ b/web/core/themes/stable/layouts/threecol_section/layout--threecol-section.html.twig
@@ -4,6 +4,7 @@
  * Theme override for a three-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/layouts/twocol_section/layout--twocol-section.html.twig b/web/core/themes/stable/layouts/twocol_section/layout--twocol-section.html.twig
index d047debe5..dc9ee5ccd 100644
--- a/web/core/themes/stable/layouts/twocol_section/layout--twocol-section.html.twig
+++ b/web/core/themes/stable/layouts/twocol_section/layout--twocol-section.html.twig
@@ -4,6 +4,7 @@
  * Theme override to display a two-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/stable.info.yml b/web/core/themes/stable/stable.info.yml
index 13f28498c..c65a43355 100644
--- a/web/core/themes/stable/stable.info.yml
+++ b/web/core/themes/stable/stable.info.yml
@@ -5,6 +5,8 @@ package: Core
 version: VERSION
 base theme: false
 hidden: true
+lifecycle: deprecated
+lifecycle_link: https://www.drupal.org/project/drupal/issues/3308890
 
 libraries-override:
   block/drupal.block.admin:
@@ -188,12 +190,22 @@ libraries-override:
       theme:
         css/quickedit.theme.css: css/quickedit/quickedit.theme.css
         css/quickedit.icons.theme.css: css/quickedit/quickedit.icons.theme.css
+  quickedit/quickedit.inPlaceEditor.formattedText:
+    css:
+      component:
+        css/editors/formattedText.ckeditor.css: css/quickedit/editors/formattedText.ckeditor.css
+        css/editors/formattedText.ckeditor5.css: css/quickedit/editors/formattedText.ckeditor5.css
   quickedit/quickedit.inPlaceEditor.image:
     css:
       component:
         css/editors/image.css: css/quickedit/editors/image.css
       theme:
         css/editors/image.theme.css: css/quickedit/editors/image.theme.css
+  quickedit/quickedit.ckeditor5-temporary-work-around:
+    # "Temporary work-around until https://www.drupal.org/project/drupal/issues/3196689 lands."
+    css:
+      theme:
+        css/editors/formattedText/ckeditor5.workaround.css: css/quickedit/editors/formattedText/ckeditor5.workaround.css
 
   settings_tray/drupal.settings_tray:
     css:
diff --git a/web/core/themes/stable/templates/admin/simpletest-result-summary.html.twig b/web/core/themes/stable/templates/admin/simpletest-result-summary.html.twig
deleted file mode 100644
index 552332562..000000000
--- a/web/core/themes/stable/templates/admin/simpletest-result-summary.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{#
-/**
- * @file
- * Theme override for simpletest result summaries.
- *
- * Available variables:
- * - label: An optional label to be rendered before the results.
- * - items: Pluralized summaries for each result type (number of passes, fails,
- *   exceptions, and debug messages).
- * - pass: The number of passes.
- * - fail: The number of fails.
- * - exception: The number of exceptions.
- * - debug: The number of debug messages.
- *
- * @see template_preprocess_simpletest_result_summary()
- */
-#}
-<div class="simpletest-{{ fail + exception == 0 ? 'pass' : 'fail' }}">
-  {{ label }} {{ items|join(', ') }}
-</div>
diff --git a/web/core/themes/stable/templates/block/block--system-menu-block.html.twig b/web/core/themes/stable/templates/block/block--system-menu-block.html.twig
index e78e1de7f..937c1865e 100644
--- a/web/core/themes/stable/templates/block/block--system-menu-block.html.twig
+++ b/web/core/themes/stable/templates/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/stable/templates/block/block.html.twig b/web/core/themes/stable/templates/block/block.html.twig
index dca6f48fb..e842e4045 100644
--- a/web/core/themes/stable/templates/block/block.html.twig
+++ b/web/core/themes/stable/templates/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/stable/templates/layout/layout--onecol.html.twig b/web/core/themes/stable/templates/layout/layout--onecol.html.twig
index 7fe5b121c..f3bda9290 100644
--- a/web/core/themes/stable/templates/layout/layout--onecol.html.twig
+++ b/web/core/themes/stable/templates/layout/layout--onecol.html.twig
@@ -4,6 +4,7 @@
  * Theme override to display a one-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/templates/layout/layout--threecol-25-50-25.html.twig b/web/core/themes/stable/templates/layout/layout--threecol-25-50-25.html.twig
index 715470bd0..6829a6e6f 100644
--- a/web/core/themes/stable/templates/layout/layout--threecol-25-50-25.html.twig
+++ b/web/core/themes/stable/templates/layout/layout--threecol-25-50-25.html.twig
@@ -7,6 +7,7 @@
  * additional areas for the top and the bottom.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/templates/layout/layout--threecol-33-34-33.html.twig b/web/core/themes/stable/templates/layout/layout--threecol-33-34-33.html.twig
index f0a541d49..43bfe2015 100644
--- a/web/core/themes/stable/templates/layout/layout--threecol-33-34-33.html.twig
+++ b/web/core/themes/stable/templates/layout/layout--threecol-33-34-33.html.twig
@@ -7,6 +7,7 @@
  * additional areas for the top and the bottom.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/templates/layout/layout--twocol-bricks.html.twig b/web/core/themes/stable/templates/layout/layout--twocol-bricks.html.twig
index 08a0b4792..0069dd132 100644
--- a/web/core/themes/stable/templates/layout/layout--twocol-bricks.html.twig
+++ b/web/core/themes/stable/templates/layout/layout--twocol-bricks.html.twig
@@ -7,6 +7,7 @@
  * the top, bottom and in the middle.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable/templates/layout/layout--twocol.html.twig b/web/core/themes/stable/templates/layout/layout--twocol.html.twig
index 4de66f048..c56c36c66 100644
--- a/web/core/themes/stable/templates/layout/layout--twocol.html.twig
+++ b/web/core/themes/stable/templates/layout/layout--twocol.html.twig
@@ -4,6 +4,7 @@
  * Theme override to display a two-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/css/core/dialog/off-canvas.base.css b/web/core/themes/stable9/css/core/dialog/off-canvas.base.css
index 3a8c6df99..21a766a4c 100644
--- a/web/core/themes/stable9/css/core/dialog/off-canvas.base.css
+++ b/web/core/themes/stable9/css/core/dialog/off-canvas.base.css
@@ -25,94 +25,94 @@
  */
 
 #drupal-off-canvas span,
-  #drupal-off-canvas applet,
-  #drupal-off-canvas object,
-  #drupal-off-canvas iframe,
-  #drupal-off-canvas h1,
-  #drupal-off-canvas h2,
-  #drupal-off-canvas h3,
-  #drupal-off-canvas h4,
-  #drupal-off-canvas h5,
-  #drupal-off-canvas h6,
-  #drupal-off-canvas p,
-  #drupal-off-canvas blockquote,
-  #drupal-off-canvas pre,
-  #drupal-off-canvas a,
-  #drupal-off-canvas abbr,
-  #drupal-off-canvas acronym,
-  #drupal-off-canvas address,
-  #drupal-off-canvas big,
-  #drupal-off-canvas button,
-  #drupal-off-canvas cite,
-  #drupal-off-canvas code,
-  #drupal-off-canvas del,
-  #drupal-off-canvas dfn,
-  #drupal-off-canvas em,
-  #drupal-off-canvas img,
-  #drupal-off-canvas ins,
-  #drupal-off-canvas kbd,
-  #drupal-off-canvas q,
-  #drupal-off-canvas s,
-  #drupal-off-canvas samp,
-  #drupal-off-canvas small,
-  #drupal-off-canvas strike,
-  #drupal-off-canvas strong,
-  #drupal-off-canvas sub,
-  #drupal-off-canvas sup,
-  #drupal-off-canvas tt,
-  #drupal-off-canvas var,
-  #drupal-off-canvas b,
-  #drupal-off-canvas u,
-  #drupal-off-canvas i,
-  #drupal-off-canvas center,
-  #drupal-off-canvas dl,
-  #drupal-off-canvas dt,
-  #drupal-off-canvas dd,
-  #drupal-off-canvas ol,
-  #drupal-off-canvas ul,
-  #drupal-off-canvas li,
-  #drupal-off-canvas fieldset,
-  #drupal-off-canvas form,
-  #drupal-off-canvas label,
-  #drupal-off-canvas legend,
-  #drupal-off-canvas table,
-  #drupal-off-canvas caption,
-  #drupal-off-canvas tbody,
-  #drupal-off-canvas tfoot,
-  #drupal-off-canvas thead,
-  #drupal-off-canvas tr,
-  #drupal-off-canvas th,
-  #drupal-off-canvas td,
-  #drupal-off-canvas article,
-  #drupal-off-canvas aside,
-  #drupal-off-canvas canvas,
-  #drupal-off-canvas details,
-  #drupal-off-canvas embed,
-  #drupal-off-canvas figure,
-  #drupal-off-canvas figcaption,
-  #drupal-off-canvas footer,
-  #drupal-off-canvas header,
-  #drupal-off-canvas hgroup,
-  #drupal-off-canvas main,
-  #drupal-off-canvas menu,
-  #drupal-off-canvas meter,
-  #drupal-off-canvas nav,
-  #drupal-off-canvas output,
-  #drupal-off-canvas progress,
-  #drupal-off-canvas ruby,
-  #drupal-off-canvas section,
-  #drupal-off-canvas summary,
-  #drupal-off-canvas time,
-  #drupal-off-canvas mark,
-  #drupal-off-canvas audio,
-  #drupal-off-canvas video,
-  #drupal-off-canvas input,
-  #drupal-off-canvas select,
-  #drupal-off-canvas textarea {
-    color: inherit;
-    background: inherit;
-    font-family: "Lucida Grande", "Lucida Sans Unicode", "liberation sans", sans-serif;
-  }
+#drupal-off-canvas applet,
+#drupal-off-canvas object,
+#drupal-off-canvas iframe,
+#drupal-off-canvas h1,
+#drupal-off-canvas h2,
+#drupal-off-canvas h3,
+#drupal-off-canvas h4,
+#drupal-off-canvas h5,
+#drupal-off-canvas h6,
+#drupal-off-canvas p,
+#drupal-off-canvas blockquote,
+#drupal-off-canvas pre,
+#drupal-off-canvas a,
+#drupal-off-canvas abbr,
+#drupal-off-canvas acronym,
+#drupal-off-canvas address,
+#drupal-off-canvas big,
+#drupal-off-canvas button,
+#drupal-off-canvas cite,
+#drupal-off-canvas code,
+#drupal-off-canvas del,
+#drupal-off-canvas dfn,
+#drupal-off-canvas em,
+#drupal-off-canvas img,
+#drupal-off-canvas ins,
+#drupal-off-canvas kbd,
+#drupal-off-canvas q,
+#drupal-off-canvas s,
+#drupal-off-canvas samp,
+#drupal-off-canvas small,
+#drupal-off-canvas strike,
+#drupal-off-canvas strong,
+#drupal-off-canvas sub,
+#drupal-off-canvas sup,
+#drupal-off-canvas tt,
+#drupal-off-canvas var,
+#drupal-off-canvas b,
+#drupal-off-canvas u,
+#drupal-off-canvas i,
+#drupal-off-canvas center,
+#drupal-off-canvas dl,
+#drupal-off-canvas dt,
+#drupal-off-canvas dd,
+#drupal-off-canvas ol,
+#drupal-off-canvas ul,
+#drupal-off-canvas li,
+#drupal-off-canvas fieldset,
+#drupal-off-canvas form,
+#drupal-off-canvas label,
+#drupal-off-canvas legend,
+#drupal-off-canvas table,
+#drupal-off-canvas caption,
+#drupal-off-canvas tbody,
+#drupal-off-canvas tfoot,
+#drupal-off-canvas thead,
+#drupal-off-canvas tr,
+#drupal-off-canvas th,
+#drupal-off-canvas td,
+#drupal-off-canvas article,
+#drupal-off-canvas aside,
+#drupal-off-canvas canvas,
+#drupal-off-canvas details,
+#drupal-off-canvas embed,
+#drupal-off-canvas figure,
+#drupal-off-canvas figcaption,
+#drupal-off-canvas footer,
+#drupal-off-canvas header,
+#drupal-off-canvas hgroup,
+#drupal-off-canvas main,
+#drupal-off-canvas menu,
+#drupal-off-canvas meter,
+#drupal-off-canvas nav,
+#drupal-off-canvas output,
+#drupal-off-canvas progress,
+#drupal-off-canvas ruby,
+#drupal-off-canvas section,
+#drupal-off-canvas summary,
+#drupal-off-canvas time,
+#drupal-off-canvas mark,
+#drupal-off-canvas audio,
+#drupal-off-canvas video,
+#drupal-off-canvas input,
+#drupal-off-canvas select,
+#drupal-off-canvas textarea {
+  color: inherit;
+  background: inherit;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", "liberation sans", sans-serif;
+}
 
 /* Generic elements. */
 
@@ -274,13 +274,14 @@
 #drupal-off-canvas ol li {
   display: block;
   padding: 0.3125rem 0;
-  border-bottom: 1px solid #333
+  border-bottom: 1px solid #333;
 }
 
-#drupal-off-canvas ul li:last-child, #drupal-off-canvas ol li:last-child {
-    padding-bottom: 0;
-    border-bottom: none;
-  }
+#drupal-off-canvas ul li:last-child,
+#drupal-off-canvas ol li:last-child {
+  padding-bottom: 0;
+  border-bottom: none;
+}
 
 #drupal-off-canvas blockquote,
 #drupal-off-canvas code {
@@ -312,6 +313,9 @@
 
 #drupal-off-canvas .visually-hidden {
   position: absolute !important;
+}
+
+#drupal-off-canvas .visually-hidden {
   overflow: hidden;
   clip: rect(1px, 1px, 1px, 1px);
   width: 1px;
@@ -322,6 +326,10 @@
 #drupal-off-canvas .visually-hidden.focusable:active,
 #drupal-off-canvas .visually-hidden.focusable:focus {
   position: static !important;
+}
+
+#drupal-off-canvas .visually-hidden.focusable:active,
+#drupal-off-canvas .visually-hidden.focusable:focus {
   overflow: visible;
   clip: auto;
   width: auto;
diff --git a/web/core/themes/stable9/css/core/dialog/off-canvas.reset.css b/web/core/themes/stable9/css/core/dialog/off-canvas.reset.css
index c92a48700..d9d6e1476 100644
--- a/web/core/themes/stable9/css/core/dialog/off-canvas.reset.css
+++ b/web/core/themes/stable9/css/core/dialog/off-canvas.reset.css
@@ -20,445 +20,441 @@
  */
 
 #drupal-off-canvas span,
-  #drupal-off-canvas applet,
-  #drupal-off-canvas object,
-  #drupal-off-canvas iframe,
-  #drupal-off-canvas h1,
-  #drupal-off-canvas h2,
-  #drupal-off-canvas h3,
-  #drupal-off-canvas h4,
-  #drupal-off-canvas h5,
-  #drupal-off-canvas h6,
-  #drupal-off-canvas p,
-  #drupal-off-canvas blockquote,
-  #drupal-off-canvas pre,
-  #drupal-off-canvas a,
-  #drupal-off-canvas abbr,
-  #drupal-off-canvas acronym,
-  #drupal-off-canvas address,
-  #drupal-off-canvas big,
-  #drupal-off-canvas button,
-  #drupal-off-canvas cite,
-  #drupal-off-canvas code,
-  #drupal-off-canvas del,
-  #drupal-off-canvas dfn,
-  #drupal-off-canvas em,
-  #drupal-off-canvas img,
-  #drupal-off-canvas ins,
-  #drupal-off-canvas kbd,
-  #drupal-off-canvas q,
-  #drupal-off-canvas s,
-  #drupal-off-canvas samp,
-  #drupal-off-canvas small,
-  #drupal-off-canvas strike,
-  #drupal-off-canvas strong,
-  #drupal-off-canvas sub,
-  #drupal-off-canvas sup,
-  #drupal-off-canvas tt,
-  #drupal-off-canvas var,
-  #drupal-off-canvas b,
-  #drupal-off-canvas u,
-  #drupal-off-canvas i,
-  #drupal-off-canvas center,
-  #drupal-off-canvas dl,
-  #drupal-off-canvas dt,
-  #drupal-off-canvas dd,
-  #drupal-off-canvas ol,
-  #drupal-off-canvas ul,
-  #drupal-off-canvas li,
-  #drupal-off-canvas fieldset,
-  #drupal-off-canvas form,
-  #drupal-off-canvas label,
-  #drupal-off-canvas legend,
-  #drupal-off-canvas table,
-  #drupal-off-canvas caption,
-  #drupal-off-canvas tbody,
-  #drupal-off-canvas tfoot,
-  #drupal-off-canvas thead,
-  #drupal-off-canvas tr,
-  #drupal-off-canvas th,
-  #drupal-off-canvas td,
-  #drupal-off-canvas article,
-  #drupal-off-canvas aside,
-  #drupal-off-canvas canvas,
-  #drupal-off-canvas details,
-  #drupal-off-canvas embed,
-  #drupal-off-canvas figure,
-  #drupal-off-canvas figcaption,
-  #drupal-off-canvas footer,
-  #drupal-off-canvas header,
-  #drupal-off-canvas hgroup,
-  #drupal-off-canvas main,
-  #drupal-off-canvas menu,
-  #drupal-off-canvas meter,
-  #drupal-off-canvas nav,
-  #drupal-off-canvas output,
-  #drupal-off-canvas progress,
-  #drupal-off-canvas ruby,
-  #drupal-off-canvas section,
-  #drupal-off-canvas summary,
-  #drupal-off-canvas time,
-  #drupal-off-canvas mark,
-  #drupal-off-canvas audio,
-  #drupal-off-canvas video,
-  #drupal-off-canvas input,
-  #drupal-off-canvas select,
-  #drupal-off-canvas textarea {
-    animation: none 0s ease 0s 1 normal none running;
-    -webkit-backface-visibility: visible;
-    backface-visibility: visible;
-    background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
-    border: medium none currentColor;
-    border-collapse: separate;
-    border-image: none;
-    border-radius: 0;
-    border-spacing: 0;
-    bottom: auto;
-    box-shadow: none;
-    box-sizing: content-box;
-    caption-side: top;
-    clear: none;
-    clip: auto;
-    color: #000;
-    columns: auto;
-    column-count: auto;
-    column-fill: balance;
-    grid-column-gap: normal;
-    column-rule: medium none currentColor;
-    column-span: 1;
-    column-width: auto;
-    content: normal;
-    counter-increment: none;
-    counter-reset: none;
-    cursor: auto;
-    direction: ltr;
-    display: inline;
-    empty-cells: show;
-    float: none;
-    font-family: serif;
-    font-size: medium;
-    font-style: normal;
-    font-feature-settings: normal;
-    font-variant: normal;
-    font-weight: normal;
-    font-stretch: normal;
-    line-height: normal;
-    height: auto;
-    -webkit-hyphens: none;
-    -ms-hyphens: none;
-    hyphens: none;
-    left: auto;
-    letter-spacing: normal;
-    list-style: disc outside none;
-    margin: 0;
-    max-height: none;
-    max-width: none;
-    min-height: 0;
-    min-width: 0;
-    opacity: 1;
-    orphans: 2;
-    outline: medium none invert;
-    overflow: visible;
-    overflow-x: visible;
-    overflow-y: visible;
-    padding: 0;
-    page-break-after: auto;
-    page-break-before: auto;
-    page-break-inside: auto;
-    perspective: none;
-    perspective-origin: 50% 50%;
-    position: static;
-    right: auto;
-    tab-size: 8;
-    table-layout: auto;
-    text-align: left;
-    text-align-last: auto;
-    text-decoration: none;
-    text-indent: 0;
-    text-shadow: none;
-    text-transform: none;
-    top: auto;
-    transform: none;
-    transform-origin: 50% 50% 0;
-    transform-style: flat;
-    transition: none 0s ease 0s;
-    unicode-bidi: normal;
-    vertical-align: baseline;
-    visibility: visible;
-    white-space: normal;
-    widows: 2;
-    width: auto;
-    word-spacing: normal;
-    z-index: auto;
-    all: initial;
-    box-sizing: border-box;
-    text-shadow: none;
-    -webkit-font-smoothing: antialiased;
-    -webkit-tap-highlight-color: initial
-  }
+#drupal-off-canvas applet,
+#drupal-off-canvas object,
+#drupal-off-canvas iframe,
+#drupal-off-canvas h1,
+#drupal-off-canvas h2,
+#drupal-off-canvas h3,
+#drupal-off-canvas h4,
+#drupal-off-canvas h5,
+#drupal-off-canvas h6,
+#drupal-off-canvas p,
+#drupal-off-canvas blockquote,
+#drupal-off-canvas pre,
+#drupal-off-canvas a,
+#drupal-off-canvas abbr,
+#drupal-off-canvas acronym,
+#drupal-off-canvas address,
+#drupal-off-canvas big,
+#drupal-off-canvas button,
+#drupal-off-canvas cite,
+#drupal-off-canvas code,
+#drupal-off-canvas del,
+#drupal-off-canvas dfn,
+#drupal-off-canvas em,
+#drupal-off-canvas img,
+#drupal-off-canvas ins,
+#drupal-off-canvas kbd,
+#drupal-off-canvas q,
+#drupal-off-canvas s,
+#drupal-off-canvas samp,
+#drupal-off-canvas small,
+#drupal-off-canvas strike,
+#drupal-off-canvas strong,
+#drupal-off-canvas sub,
+#drupal-off-canvas sup,
+#drupal-off-canvas tt,
+#drupal-off-canvas var,
+#drupal-off-canvas b,
+#drupal-off-canvas u,
+#drupal-off-canvas i,
+#drupal-off-canvas center,
+#drupal-off-canvas dl,
+#drupal-off-canvas dt,
+#drupal-off-canvas dd,
+#drupal-off-canvas ol,
+#drupal-off-canvas ul,
+#drupal-off-canvas li,
+#drupal-off-canvas fieldset,
+#drupal-off-canvas form,
+#drupal-off-canvas label,
+#drupal-off-canvas legend,
+#drupal-off-canvas table,
+#drupal-off-canvas caption,
+#drupal-off-canvas tbody,
+#drupal-off-canvas tfoot,
+#drupal-off-canvas thead,
+#drupal-off-canvas tr,
+#drupal-off-canvas th,
+#drupal-off-canvas td,
+#drupal-off-canvas article,
+#drupal-off-canvas aside,
+#drupal-off-canvas canvas,
+#drupal-off-canvas details,
+#drupal-off-canvas embed,
+#drupal-off-canvas figure,
+#drupal-off-canvas figcaption,
+#drupal-off-canvas footer,
+#drupal-off-canvas header,
+#drupal-off-canvas hgroup,
+#drupal-off-canvas main,
+#drupal-off-canvas menu,
+#drupal-off-canvas meter,
+#drupal-off-canvas nav,
+#drupal-off-canvas output,
+#drupal-off-canvas progress,
+#drupal-off-canvas ruby,
+#drupal-off-canvas section,
+#drupal-off-canvas summary,
+#drupal-off-canvas time,
+#drupal-off-canvas mark,
+#drupal-off-canvas audio,
+#drupal-off-canvas video,
+#drupal-off-canvas input,
+#drupal-off-canvas select,
+#drupal-off-canvas textarea {
+  position: static;
+  z-index: auto;
+  top: auto;
+  right: auto;
+  bottom: auto;
+  left: auto;
+  display: inline;
+  visibility: visible;
+  float: none;
+  clear: none;
+  overflow: visible;
+  overflow-x: visible;
+  overflow-y: visible;
+  clip: auto;
+  box-sizing: content-box;
+  box-sizing: border-box;
+  width: auto;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
+  margin: 0;
+  padding: 0;
+  table-layout: auto;
+  columns: auto;
+  column-span: 1;
+  column-width: auto;
+  column-count: auto;
+  column-fill: balance;
+  column-gap: normal;
+  column-rule: medium none currentColor;
+  empty-cells: show;
+  caption-side: top;
+  border-spacing: 0;
+  list-style: disc outside none;
+  content: normal;
+  counter-reset: none;
+  counter-increment: none;
+  cursor: auto;
+  transition: none 0s ease 0s;
+  transform: none;
+  transform-origin: 50% 50% 0;
+  animation: none 0s ease 0s 1 normal none running;
+  text-align: left;
+  text-align-last: auto;
+  vertical-align: baseline;
+  white-space: normal;
+  text-decoration: none;
+  text-indent: 0;
+  letter-spacing: normal;
+  word-spacing: normal;
+  text-transform: none;
+  tab-size: 8;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+  direction: ltr;
+  unicode-bidi: normal;
+  orphans: 2;
+  widows: 2;
+  opacity: 1;
+  color: #000;
+  border: medium none currentColor;
+  border-collapse: separate;
+  border-radius: 0;
+  border-image: none;
+  outline: medium none invert;
+  background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
+  box-shadow: none;
+  text-shadow: none;
+  font-family: serif;
+  font-size: medium;
+  font-weight: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-stretch: normal;
+  line-height: normal;
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  page-break-after: auto;
+  page-break-before: auto;
+  page-break-inside: auto;
+  perspective: none;
+  perspective-origin: 50% 50%;
+  transform-style: flat;
+  all: initial;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: initial;
+}
 
 #drupal-off-canvas span:after,
-    #drupal-off-canvas span:before,
-    #drupal-off-canvas applet:after,
-    #drupal-off-canvas applet:before,
-    #drupal-off-canvas object:after,
-    #drupal-off-canvas object:before,
-    #drupal-off-canvas iframe:after,
-    #drupal-off-canvas iframe:before,
-    #drupal-off-canvas h1:after,
-    #drupal-off-canvas h1:before,
-    #drupal-off-canvas h2:after,
-    #drupal-off-canvas h2:before,
-    #drupal-off-canvas h3:after,
-    #drupal-off-canvas h3:before,
-    #drupal-off-canvas h4:after,
-    #drupal-off-canvas h4:before,
-    #drupal-off-canvas h5:after,
-    #drupal-off-canvas h5:before,
-    #drupal-off-canvas h6:after,
-    #drupal-off-canvas h6:before,
-    #drupal-off-canvas p:after,
-    #drupal-off-canvas p:before,
-    #drupal-off-canvas blockquote:after,
-    #drupal-off-canvas blockquote:before,
-    #drupal-off-canvas pre:after,
-    #drupal-off-canvas pre:before,
-    #drupal-off-canvas a:after,
-    #drupal-off-canvas a:before,
-    #drupal-off-canvas abbr:after,
-    #drupal-off-canvas abbr:before,
-    #drupal-off-canvas acronym:after,
-    #drupal-off-canvas acronym:before,
-    #drupal-off-canvas address:after,
-    #drupal-off-canvas address:before,
-    #drupal-off-canvas big:after,
-    #drupal-off-canvas big:before,
-    #drupal-off-canvas button:after,
-    #drupal-off-canvas button:before,
-    #drupal-off-canvas cite:after,
-    #drupal-off-canvas cite:before,
-    #drupal-off-canvas code:after,
-    #drupal-off-canvas code:before,
-    #drupal-off-canvas del:after,
-    #drupal-off-canvas del:before,
-    #drupal-off-canvas dfn:after,
-    #drupal-off-canvas dfn:before,
-    #drupal-off-canvas em:after,
-    #drupal-off-canvas em:before,
-    #drupal-off-canvas img:after,
-    #drupal-off-canvas img:before,
-    #drupal-off-canvas ins:after,
-    #drupal-off-canvas ins:before,
-    #drupal-off-canvas kbd:after,
-    #drupal-off-canvas kbd:before,
-    #drupal-off-canvas q:after,
-    #drupal-off-canvas q:before,
-    #drupal-off-canvas s:after,
-    #drupal-off-canvas s:before,
-    #drupal-off-canvas samp:after,
-    #drupal-off-canvas samp:before,
-    #drupal-off-canvas small:after,
-    #drupal-off-canvas small:before,
-    #drupal-off-canvas strike:after,
-    #drupal-off-canvas strike:before,
-    #drupal-off-canvas strong:after,
-    #drupal-off-canvas strong:before,
-    #drupal-off-canvas sub:after,
-    #drupal-off-canvas sub:before,
-    #drupal-off-canvas sup:after,
-    #drupal-off-canvas sup:before,
-    #drupal-off-canvas tt:after,
-    #drupal-off-canvas tt:before,
-    #drupal-off-canvas var:after,
-    #drupal-off-canvas var:before,
-    #drupal-off-canvas b:after,
-    #drupal-off-canvas b:before,
-    #drupal-off-canvas u:after,
-    #drupal-off-canvas u:before,
-    #drupal-off-canvas i:after,
-    #drupal-off-canvas i:before,
-    #drupal-off-canvas center:after,
-    #drupal-off-canvas center:before,
-    #drupal-off-canvas dl:after,
-    #drupal-off-canvas dl:before,
-    #drupal-off-canvas dt:after,
-    #drupal-off-canvas dt:before,
-    #drupal-off-canvas dd:after,
-    #drupal-off-canvas dd:before,
-    #drupal-off-canvas ol:after,
-    #drupal-off-canvas ol:before,
-    #drupal-off-canvas ul:after,
-    #drupal-off-canvas ul:before,
-    #drupal-off-canvas li:after,
-    #drupal-off-canvas li:before,
-    #drupal-off-canvas fieldset:after,
-    #drupal-off-canvas fieldset:before,
-    #drupal-off-canvas form:after,
-    #drupal-off-canvas form:before,
-    #drupal-off-canvas label:after,
-    #drupal-off-canvas label:before,
-    #drupal-off-canvas legend:after,
-    #drupal-off-canvas legend:before,
-    #drupal-off-canvas table:after,
-    #drupal-off-canvas table:before,
-    #drupal-off-canvas caption:after,
-    #drupal-off-canvas caption:before,
-    #drupal-off-canvas tbody:after,
-    #drupal-off-canvas tbody:before,
-    #drupal-off-canvas tfoot:after,
-    #drupal-off-canvas tfoot:before,
-    #drupal-off-canvas thead:after,
-    #drupal-off-canvas thead:before,
-    #drupal-off-canvas tr:after,
-    #drupal-off-canvas tr:before,
-    #drupal-off-canvas th:after,
-    #drupal-off-canvas th:before,
-    #drupal-off-canvas td:after,
-    #drupal-off-canvas td:before,
-    #drupal-off-canvas article:after,
-    #drupal-off-canvas article:before,
-    #drupal-off-canvas aside:after,
-    #drupal-off-canvas aside:before,
-    #drupal-off-canvas canvas:after,
-    #drupal-off-canvas canvas:before,
-    #drupal-off-canvas details:after,
-    #drupal-off-canvas details:before,
-    #drupal-off-canvas embed:after,
-    #drupal-off-canvas embed:before,
-    #drupal-off-canvas figure:after,
-    #drupal-off-canvas figure:before,
-    #drupal-off-canvas figcaption:after,
-    #drupal-off-canvas figcaption:before,
-    #drupal-off-canvas footer:after,
-    #drupal-off-canvas footer:before,
-    #drupal-off-canvas header:after,
-    #drupal-off-canvas header:before,
-    #drupal-off-canvas hgroup:after,
-    #drupal-off-canvas hgroup:before,
-    #drupal-off-canvas main:after,
-    #drupal-off-canvas main:before,
-    #drupal-off-canvas menu:after,
-    #drupal-off-canvas menu:before,
-    #drupal-off-canvas meter:after,
-    #drupal-off-canvas meter:before,
-    #drupal-off-canvas nav:after,
-    #drupal-off-canvas nav:before,
-    #drupal-off-canvas output:after,
-    #drupal-off-canvas output:before,
-    #drupal-off-canvas progress:after,
-    #drupal-off-canvas progress:before,
-    #drupal-off-canvas ruby:after,
-    #drupal-off-canvas ruby:before,
-    #drupal-off-canvas section:after,
-    #drupal-off-canvas section:before,
-    #drupal-off-canvas summary:after,
-    #drupal-off-canvas summary:before,
-    #drupal-off-canvas time:after,
-    #drupal-off-canvas time:before,
-    #drupal-off-canvas mark:after,
-    #drupal-off-canvas mark:before,
-    #drupal-off-canvas audio:after,
-    #drupal-off-canvas audio:before,
-    #drupal-off-canvas video:after,
-    #drupal-off-canvas video:before,
-    #drupal-off-canvas input:after,
-    #drupal-off-canvas input:before,
-    #drupal-off-canvas select:after,
-    #drupal-off-canvas select:before,
-    #drupal-off-canvas textarea:after,
-    #drupal-off-canvas textarea:before {
-      animation: none 0s ease 0s 1 normal none running;
-      -webkit-backface-visibility: visible;
-      backface-visibility: visible;
-      background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
-      border: medium none currentColor;
-      border-collapse: separate;
-      border-image: none;
-      border-radius: 0;
-      border-spacing: 0;
-      bottom: auto;
-      box-shadow: none;
-      box-sizing: content-box;
-      caption-side: top;
-      clear: none;
-      clip: auto;
-      color: #000;
-      columns: auto;
-      column-count: auto;
-      column-fill: balance;
-      grid-column-gap: normal;
-      column-rule: medium none currentColor;
-      column-span: 1;
-      column-width: auto;
-      content: normal;
-      counter-increment: none;
-      counter-reset: none;
-      cursor: auto;
-      direction: ltr;
-      display: inline;
-      empty-cells: show;
-      float: none;
-      font-family: serif;
-      font-size: medium;
-      font-style: normal;
-      font-feature-settings: normal;
-      font-variant: normal;
-      font-weight: normal;
-      font-stretch: normal;
-      line-height: normal;
-      height: auto;
-      -webkit-hyphens: none;
-      -ms-hyphens: none;
-      hyphens: none;
-      left: auto;
-      letter-spacing: normal;
-      list-style: disc outside none;
-      margin: 0;
-      max-height: none;
-      max-width: none;
-      min-height: 0;
-      min-width: 0;
-      opacity: 1;
-      orphans: 2;
-      outline: medium none invert;
-      overflow: visible;
-      overflow-x: visible;
-      overflow-y: visible;
-      padding: 0;
-      page-break-after: auto;
-      page-break-before: auto;
-      page-break-inside: auto;
-      perspective: none;
-      perspective-origin: 50% 50%;
-      position: static;
-      right: auto;
-      tab-size: 8;
-      table-layout: auto;
-      text-align: left;
-      text-align-last: auto;
-      text-decoration: none;
-      text-indent: 0;
-      text-shadow: none;
-      text-transform: none;
-      top: auto;
-      transform: none;
-      transform-origin: 50% 50% 0;
-      transform-style: flat;
-      transition: none 0s ease 0s;
-      unicode-bidi: normal;
-      vertical-align: baseline;
-      visibility: visible;
-      white-space: normal;
-      widows: 2;
-      width: auto;
-      word-spacing: normal;
-      z-index: auto;
-      all: initial;
-      box-sizing: border-box;
-      text-shadow: none;
-      -webkit-font-smoothing: antialiased;
-      -webkit-tap-highlight-color: initial;
-    }
+#drupal-off-canvas applet:after,
+#drupal-off-canvas object:after,
+#drupal-off-canvas iframe:after,
+#drupal-off-canvas h1:after,
+#drupal-off-canvas h2:after,
+#drupal-off-canvas h3:after,
+#drupal-off-canvas h4:after,
+#drupal-off-canvas h5:after,
+#drupal-off-canvas h6:after,
+#drupal-off-canvas p:after,
+#drupal-off-canvas blockquote:after,
+#drupal-off-canvas pre:after,
+#drupal-off-canvas a:after,
+#drupal-off-canvas abbr:after,
+#drupal-off-canvas acronym:after,
+#drupal-off-canvas address:after,
+#drupal-off-canvas big:after,
+#drupal-off-canvas button:after,
+#drupal-off-canvas cite:after,
+#drupal-off-canvas code:after,
+#drupal-off-canvas del:after,
+#drupal-off-canvas dfn:after,
+#drupal-off-canvas em:after,
+#drupal-off-canvas img:after,
+#drupal-off-canvas ins:after,
+#drupal-off-canvas kbd:after,
+#drupal-off-canvas q:after,
+#drupal-off-canvas s:after,
+#drupal-off-canvas samp:after,
+#drupal-off-canvas small:after,
+#drupal-off-canvas strike:after,
+#drupal-off-canvas strong:after,
+#drupal-off-canvas sub:after,
+#drupal-off-canvas sup:after,
+#drupal-off-canvas tt:after,
+#drupal-off-canvas var:after,
+#drupal-off-canvas b:after,
+#drupal-off-canvas u:after,
+#drupal-off-canvas i:after,
+#drupal-off-canvas center:after,
+#drupal-off-canvas dl:after,
+#drupal-off-canvas dt:after,
+#drupal-off-canvas dd:after,
+#drupal-off-canvas ol:after,
+#drupal-off-canvas ul:after,
+#drupal-off-canvas li:after,
+#drupal-off-canvas fieldset:after,
+#drupal-off-canvas form:after,
+#drupal-off-canvas label:after,
+#drupal-off-canvas legend:after,
+#drupal-off-canvas table:after,
+#drupal-off-canvas caption:after,
+#drupal-off-canvas tbody:after,
+#drupal-off-canvas tfoot:after,
+#drupal-off-canvas thead:after,
+#drupal-off-canvas tr:after,
+#drupal-off-canvas th:after,
+#drupal-off-canvas td:after,
+#drupal-off-canvas article:after,
+#drupal-off-canvas aside:after,
+#drupal-off-canvas canvas:after,
+#drupal-off-canvas details:after,
+#drupal-off-canvas embed:after,
+#drupal-off-canvas figure:after,
+#drupal-off-canvas figcaption:after,
+#drupal-off-canvas footer:after,
+#drupal-off-canvas header:after,
+#drupal-off-canvas hgroup:after,
+#drupal-off-canvas main:after,
+#drupal-off-canvas menu:after,
+#drupal-off-canvas meter:after,
+#drupal-off-canvas nav:after,
+#drupal-off-canvas output:after,
+#drupal-off-canvas progress:after,
+#drupal-off-canvas ruby:after,
+#drupal-off-canvas section:after,
+#drupal-off-canvas summary:after,
+#drupal-off-canvas time:after,
+#drupal-off-canvas mark:after,
+#drupal-off-canvas audio:after,
+#drupal-off-canvas video:after,
+#drupal-off-canvas input:after,
+#drupal-off-canvas select:after,
+#drupal-off-canvas textarea:after,
+#drupal-off-canvas span:before,
+#drupal-off-canvas applet:before,
+#drupal-off-canvas object:before,
+#drupal-off-canvas iframe:before,
+#drupal-off-canvas h1:before,
+#drupal-off-canvas h2:before,
+#drupal-off-canvas h3:before,
+#drupal-off-canvas h4:before,
+#drupal-off-canvas h5:before,
+#drupal-off-canvas h6:before,
+#drupal-off-canvas p:before,
+#drupal-off-canvas blockquote:before,
+#drupal-off-canvas pre:before,
+#drupal-off-canvas a:before,
+#drupal-off-canvas abbr:before,
+#drupal-off-canvas acronym:before,
+#drupal-off-canvas address:before,
+#drupal-off-canvas big:before,
+#drupal-off-canvas button:before,
+#drupal-off-canvas cite:before,
+#drupal-off-canvas code:before,
+#drupal-off-canvas del:before,
+#drupal-off-canvas dfn:before,
+#drupal-off-canvas em:before,
+#drupal-off-canvas img:before,
+#drupal-off-canvas ins:before,
+#drupal-off-canvas kbd:before,
+#drupal-off-canvas q:before,
+#drupal-off-canvas s:before,
+#drupal-off-canvas samp:before,
+#drupal-off-canvas small:before,
+#drupal-off-canvas strike:before,
+#drupal-off-canvas strong:before,
+#drupal-off-canvas sub:before,
+#drupal-off-canvas sup:before,
+#drupal-off-canvas tt:before,
+#drupal-off-canvas var:before,
+#drupal-off-canvas b:before,
+#drupal-off-canvas u:before,
+#drupal-off-canvas i:before,
+#drupal-off-canvas center:before,
+#drupal-off-canvas dl:before,
+#drupal-off-canvas dt:before,
+#drupal-off-canvas dd:before,
+#drupal-off-canvas ol:before,
+#drupal-off-canvas ul:before,
+#drupal-off-canvas li:before,
+#drupal-off-canvas fieldset:before,
+#drupal-off-canvas form:before,
+#drupal-off-canvas label:before,
+#drupal-off-canvas legend:before,
+#drupal-off-canvas table:before,
+#drupal-off-canvas caption:before,
+#drupal-off-canvas tbody:before,
+#drupal-off-canvas tfoot:before,
+#drupal-off-canvas thead:before,
+#drupal-off-canvas tr:before,
+#drupal-off-canvas th:before,
+#drupal-off-canvas td:before,
+#drupal-off-canvas article:before,
+#drupal-off-canvas aside:before,
+#drupal-off-canvas canvas:before,
+#drupal-off-canvas details:before,
+#drupal-off-canvas embed:before,
+#drupal-off-canvas figure:before,
+#drupal-off-canvas figcaption:before,
+#drupal-off-canvas footer:before,
+#drupal-off-canvas header:before,
+#drupal-off-canvas hgroup:before,
+#drupal-off-canvas main:before,
+#drupal-off-canvas menu:before,
+#drupal-off-canvas meter:before,
+#drupal-off-canvas nav:before,
+#drupal-off-canvas output:before,
+#drupal-off-canvas progress:before,
+#drupal-off-canvas ruby:before,
+#drupal-off-canvas section:before,
+#drupal-off-canvas summary:before,
+#drupal-off-canvas time:before,
+#drupal-off-canvas mark:before,
+#drupal-off-canvas audio:before,
+#drupal-off-canvas video:before,
+#drupal-off-canvas input:before,
+#drupal-off-canvas select:before,
+#drupal-off-canvas textarea:before {
+  position: static;
+  z-index: auto;
+  top: auto;
+  right: auto;
+  bottom: auto;
+  left: auto;
+  display: inline;
+  visibility: visible;
+  float: none;
+  clear: none;
+  overflow: visible;
+  overflow-x: visible;
+  overflow-y: visible;
+  clip: auto;
+  box-sizing: content-box;
+  box-sizing: border-box;
+  width: auto;
+  min-width: 0;
+  max-width: none;
+  height: auto;
+  min-height: 0;
+  max-height: none;
+  margin: 0;
+  padding: 0;
+  table-layout: auto;
+  columns: auto;
+  column-span: 1;
+  column-width: auto;
+  column-count: auto;
+  column-fill: balance;
+  column-gap: normal;
+  column-rule: medium none currentColor;
+  empty-cells: show;
+  caption-side: top;
+  border-spacing: 0;
+  list-style: disc outside none;
+  content: normal;
+  counter-reset: none;
+  counter-increment: none;
+  cursor: auto;
+  transition: none 0s ease 0s;
+  transform: none;
+  transform-origin: 50% 50% 0;
+  animation: none 0s ease 0s 1 normal none running;
+  text-align: left;
+  text-align-last: auto;
+  vertical-align: baseline;
+  white-space: normal;
+  text-decoration: none;
+  text-indent: 0;
+  letter-spacing: normal;
+  word-spacing: normal;
+  text-transform: none;
+  tab-size: 8;
+  -webkit-hyphens: none;
+  -ms-hyphens: none;
+  hyphens: none;
+  direction: ltr;
+  unicode-bidi: normal;
+  orphans: 2;
+  widows: 2;
+  opacity: 1;
+  color: #000;
+  border: medium none currentColor;
+  border-collapse: separate;
+  border-radius: 0;
+  border-image: none;
+  outline: medium none invert;
+  background: transparent none repeat 0 0 / auto auto padding-box border-box scroll;
+  box-shadow: none;
+  text-shadow: none;
+  font-family: serif;
+  font-size: medium;
+  font-weight: normal;
+  font-style: normal;
+  font-variant: normal;
+  font-stretch: normal;
+  line-height: normal;
+  -webkit-backface-visibility: visible;
+  backface-visibility: visible;
+  page-break-after: auto;
+  page-break-before: auto;
+  page-break-inside: auto;
+  perspective: none;
+  perspective-origin: 50% 50%;
+  transform-style: flat;
+  all: initial;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: initial;
+}
 
 /* Reset size and position on elements. */
 
diff --git a/web/core/themes/stable9/css/toolbar/toolbar.theme.css b/web/core/themes/stable9/css/toolbar/toolbar.theme.css
index 0416c056a..bdc6c3f18 100644
--- a/web/core/themes/stable9/css/toolbar/toolbar.theme.css
+++ b/web/core/themes/stable9/css/toolbar/toolbar.theme.css
@@ -85,7 +85,8 @@
 .toolbar .toolbar-tray-horizontal .toolbar-tray {
   background-color: #f5f5f5;
 }
-.toolbar-tray a {
+.toolbar-tray a,
+.toolbar-tray a:visited {
   padding: 1em 1.3333em;
   cursor: pointer;
   text-decoration: none;
diff --git a/web/core/themes/stable9/css/views_ui/views_ui.admin.theme.css b/web/core/themes/stable9/css/views_ui/views_ui.admin.theme.css
index 344e97401..c510ed458 100644
--- a/web/core/themes/stable9/css/views_ui/views_ui.admin.theme.css
+++ b/web/core/themes/stable9/css/views_ui/views_ui.admin.theme.css
@@ -632,23 +632,6 @@ td.group-title {
 .views-ui-dialog .views-override > * {
   margin: 0;
 }
-.views-ui-dialog .views-progress-indicator {
-  position: absolute;
-  top: 32px;
-  right: 10px; /* LTR */
-  color: #fff;
-  font-size: 11px;
-}
-[dir="rtl"] .views-ui-dialog .views-progress-indicator {
-  right: auto;
-  left: 10px;
-}
-.views-ui-dialog .views-progress-indicator:before {
-  content: "\003C\00A0";
-}
-.views-ui-dialog .views-progress-indicator:after {
-  content: "\00A0\003E";
-}
 .views-ui-dialog details .item-list {
   padding-left: 2em; /* LTR */
 }
diff --git a/web/core/themes/stable9/js/tour.js b/web/core/themes/stable9/js/tour.js
index 20eda20a1..9ef78c578 100644
--- a/web/core/themes/stable9/js/tour.js
+++ b/web/core/themes/stable9/js/tour.js
@@ -4,34 +4,24 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 (function (Drupal) {
   Drupal.tour.convertToJoyrideMarkup = function (shepherdTour) {
     var changeTag = function changeTag(element, tag) {
       if (element) {
         var newTagElement = document.createElement(tag);
-
         _toConsumableArray(element.attributes).forEach(function (attr) {
           newTagElement.setAttribute(attr.name, attr.value);
         });
-
         newTagElement.innerHTML = element.innerHTML;
         element.parentNode.replaceChild(newTagElement, element);
       }
     };
-
     var shepherdElement = shepherdTour.currentStep.el;
     var shepherdContent = shepherdElement.querySelector('.shepherd-content');
     var shepherdCancel = shepherdElement.querySelector('.shepherd-cancel-icon');
@@ -51,7 +41,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
     shepherdCancel.setAttribute('role', 'button');
     shepherdElement.setAttribute('data-index', shepherdTour.currentStep.options.index);
     shepherdElement.querySelector('footer').remove();
-
     if (shepherdElement.classList.contains('tip-uses-get-output')) {
       shepherdText.appendChild(shepherdNext);
       shepherdText.appendChild(shepherdCancel);
@@ -73,14 +62,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       changeTag(shepherdTitle, 'h2');
       shepherdText.outerHTML = shepherdText.innerHTML;
     }
-
     changeTag(shepherdElement.querySelector('.joyride-close-tip'), 'a');
     changeTag(shepherdElement.querySelector('.joyride-next-tip'), 'a');
     var shepherdArrow = shepherdElement.querySelector('.shepherd-arrow');
-
     if (shepherdArrow) {
       shepherdArrow.classList.add('joyride-nub');
-
       if (shepherdTour.currentStep.options.attachTo.on) {
         var stepToTipPosition = {
           bottom: 'top',
@@ -90,7 +76,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
         };
         shepherdArrow.classList.add(stepToTipPosition[shepherdTour.currentStep.options.attachTo.on.split('-')[0]]);
       }
-
       changeTag(shepherdArrow, 'span');
     } else {
       var nub = document.createElement('span');
@@ -98,7 +83,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
       nub.setAttribute('style', 'display: none;');
       shepherdElement.insertBefore(nub, shepherdElement.firstChild);
     }
-
     shepherdElement.querySelector('.joyride-next-tip').addEventListener('click', function (e) {
       e.preventDefault();
       shepherdTour.next();
diff --git a/web/core/themes/stable9/js/user.theme.js b/web/core/themes/stable9/js/user.theme.js
index 4324b8cc3..d0c5e29ce 100644
--- a/web/core/themes/stable9/js/user.theme.js
+++ b/web/core/themes/stable9/js/user.theme.js
@@ -4,14 +4,12 @@
 * https://www.drupal.org/node/2815083
 * @preserve
 **/
-
 (function (Drupal) {
   Drupal.theme.passwordConfirmMessage = function (_ref) {
     var confirmTitle = _ref.confirmTitle;
     var confirmTextWrapper = '<span data-drupal-selector="password-match-status-text"></span>';
     return "<div aria-live=\"polite\" aria-atomic=\"true\" class=\"password-confirm-message js-password-confirm-message\" data-drupal-selector=\"password-confirm-message\">".concat(confirmTitle, " ").concat(confirmTextWrapper, "</div>");
   };
-
   Drupal.theme.passwordStrength = function (_ref2) {
     var strengthTitle = _ref2.strengthTitle;
     var strengthIndicator = '<div class="password-strength__indicator js-password-strength__indicator" data-drupal-selector="password-strength-indicator"></div>';
diff --git a/web/core/themes/stable9/layouts/layout_builder/fourcol_section/layout--fourcol-section.html.twig b/web/core/themes/stable9/layouts/layout_builder/fourcol_section/layout--fourcol-section.html.twig
index e610278c4..0dd0820a7 100644
--- a/web/core/themes/stable9/layouts/layout_builder/fourcol_section/layout--fourcol-section.html.twig
+++ b/web/core/themes/stable9/layouts/layout_builder/fourcol_section/layout--fourcol-section.html.twig
@@ -4,6 +4,7 @@
  * Theme override for a four-column 25%-25%-25%-25% layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_builder/threecol_section/layout--threecol-section.html.twig b/web/core/themes/stable9/layouts/layout_builder/threecol_section/layout--threecol-section.html.twig
index 123acfec3..a85b90c12 100644
--- a/web/core/themes/stable9/layouts/layout_builder/threecol_section/layout--threecol-section.html.twig
+++ b/web/core/themes/stable9/layouts/layout_builder/threecol_section/layout--threecol-section.html.twig
@@ -4,6 +4,7 @@
  * Theme override for a three-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_builder/twocol_section/layout--twocol-section.html.twig b/web/core/themes/stable9/layouts/layout_builder/twocol_section/layout--twocol-section.html.twig
index d047debe5..dc9ee5ccd 100644
--- a/web/core/themes/stable9/layouts/layout_builder/twocol_section/layout--twocol-section.html.twig
+++ b/web/core/themes/stable9/layouts/layout_builder/twocol_section/layout--twocol-section.html.twig
@@ -4,6 +4,7 @@
  * Theme override to display a two-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_discovery/onecol/layout--onecol.html.twig b/web/core/themes/stable9/layouts/layout_discovery/onecol/layout--onecol.html.twig
index 7fe5b121c..f3bda9290 100644
--- a/web/core/themes/stable9/layouts/layout_discovery/onecol/layout--onecol.html.twig
+++ b/web/core/themes/stable9/layouts/layout_discovery/onecol/layout--onecol.html.twig
@@ -4,6 +4,7 @@
  * Theme override to display a one-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_discovery/threecol_25_50_25/layout--threecol-25-50-25.html.twig b/web/core/themes/stable9/layouts/layout_discovery/threecol_25_50_25/layout--threecol-25-50-25.html.twig
index 715470bd0..6829a6e6f 100644
--- a/web/core/themes/stable9/layouts/layout_discovery/threecol_25_50_25/layout--threecol-25-50-25.html.twig
+++ b/web/core/themes/stable9/layouts/layout_discovery/threecol_25_50_25/layout--threecol-25-50-25.html.twig
@@ -7,6 +7,7 @@
  * additional areas for the top and the bottom.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_discovery/threecol_33_34_33/layout--threecol-33-34-33.html.twig b/web/core/themes/stable9/layouts/layout_discovery/threecol_33_34_33/layout--threecol-33-34-33.html.twig
index f0a541d49..43bfe2015 100644
--- a/web/core/themes/stable9/layouts/layout_discovery/threecol_33_34_33/layout--threecol-33-34-33.html.twig
+++ b/web/core/themes/stable9/layouts/layout_discovery/threecol_33_34_33/layout--threecol-33-34-33.html.twig
@@ -7,6 +7,7 @@
  * additional areas for the top and the bottom.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_discovery/twocol/layout--twocol.html.twig b/web/core/themes/stable9/layouts/layout_discovery/twocol/layout--twocol.html.twig
index 4de66f048..c56c36c66 100644
--- a/web/core/themes/stable9/layouts/layout_discovery/twocol/layout--twocol.html.twig
+++ b/web/core/themes/stable9/layouts/layout_discovery/twocol/layout--twocol.html.twig
@@ -4,6 +4,7 @@
  * Theme override to display a two-column layout.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/layouts/layout_discovery/twocol_bricks/layout--twocol-bricks.html.twig b/web/core/themes/stable9/layouts/layout_discovery/twocol_bricks/layout--twocol-bricks.html.twig
index 08a0b4792..0069dd132 100644
--- a/web/core/themes/stable9/layouts/layout_discovery/twocol_bricks/layout--twocol-bricks.html.twig
+++ b/web/core/themes/stable9/layouts/layout_discovery/twocol_bricks/layout--twocol-bricks.html.twig
@@ -7,6 +7,7 @@
  * the top, bottom and in the middle.
  *
  * Available variables:
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content for this layout.
  * - attributes: HTML attributes for the layout <div>.
  */
diff --git a/web/core/themes/stable9/stable9.info.yml b/web/core/themes/stable9/stable9.info.yml
index 32595170a..3eb85fb6e 100644
--- a/web/core/themes/stable9/stable9.info.yml
+++ b/web/core/themes/stable9/stable9.info.yml
@@ -90,7 +90,7 @@ libraries-override:
         misc/vertical-tabs.css: css/core/vertical-tabs.css
 
   # Load version 3.0.3 of normalize.css for backwards compatibility.
-  core/normalize: stable/normalize
+  core/normalize: stable9/normalize
 
   dblog/drupal.dblog:
     css:
@@ -208,12 +208,22 @@ libraries-override:
       theme:
         css/quickedit.theme.css: css/quickedit/quickedit.theme.css
         css/quickedit.icons.theme.css: css/quickedit/quickedit.icons.theme.css
+  quickedit/quickedit.inPlaceEditor.formattedText:
+    css:
+      component:
+        css/editors/formattedText.ckeditor.css: css/quickedit/editors/formattedText.ckeditor.css
+        css/editors/formattedText.ckeditor5.css: css/quickedit/editors/formattedText.ckeditor5.css
   quickedit/quickedit.inPlaceEditor.image:
     css:
       component:
         css/editors/image.css: css/quickedit/editors/image.css
       theme:
         css/editors/image.theme.css: css/quickedit/editors/image.theme.css
+  quickedit/quickedit.ckeditor5-temporary-work-around:
+    # "Temporary work-around until https://www.drupal.org/project/drupal/issues/3196689 lands."
+    css:
+      theme:
+        css/editors/formattedText/ckeditor5.workaround.css: css/quickedit/editors/formattedText/ckeditor5.workaround.css
 
   settings_tray/drupal.settings_tray:
     css:
diff --git a/web/core/themes/stable9/templates/block/block--system-menu-block.html.twig b/web/core/themes/stable9/templates/block/block--system-menu-block.html.twig
index e78e1de7f..937c1865e 100644
--- a/web/core/themes/stable9/templates/block/block--system-menu-block.html.twig
+++ b/web/core/themes/stable9/templates/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/stable9/templates/block/block.html.twig b/web/core/themes/stable9/templates/block/block.html.twig
index dca6f48fb..e842e4045 100644
--- a/web/core/themes/stable9/templates/block/block.html.twig
+++ b/web/core/themes/stable9/templates/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/themes/stark/stark.breakpoints.yml b/web/core/themes/stark/stark.breakpoints.yml
index d1cdd9b4e..ceda77e76 100644
--- a/web/core/themes/stark/stark.breakpoints.yml
+++ b/web/core/themes/stark/stark.breakpoints.yml
@@ -3,7 +3,7 @@ stark.mobile:
   mediaQuery: '(min-width: 0px)'
   weight: 0
   multipliers:
-   - 1x
+    - 1x
 stark.narrow:
   label: narrow
   mediaQuery: 'all and (min-width: 480px) and (max-width: 959px)'
diff --git a/web/core/themes/starterkit_theme/templates/block/block--search-form-block.html.twig b/web/core/themes/starterkit_theme/templates/block/block--search-form-block.html.twig
index 667202fb6..d1cda724b 100644
--- a/web/core/themes/starterkit_theme/templates/block/block--search-form-block.html.twig
+++ b/web/core/themes/starterkit_theme/templates/block/block--search-form-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: A list HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template. Includes:
diff --git a/web/core/themes/starterkit_theme/templates/block/block--system-menu-block.html.twig b/web/core/themes/starterkit_theme/templates/block/block--system-menu-block.html.twig
index 407f8403f..db3f9f808 100644
--- a/web/core/themes/starterkit_theme/templates/block/block--system-menu-block.html.twig
+++ b/web/core/themes/starterkit_theme/templates/block/block--system-menu-block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: HTML attributes for the containing element.
  *   - id: A valid HTML ID and guaranteed unique.
diff --git a/web/core/themes/starterkit_theme/templates/block/block.html.twig b/web/core/themes/starterkit_theme/templates/block/block.html.twig
index fd3311be9..114d7c4de 100644
--- a/web/core/themes/starterkit_theme/templates/block/block.html.twig
+++ b/web/core/themes/starterkit_theme/templates/block/block.html.twig
@@ -11,6 +11,7 @@
  *   - label_display: The display settings for the label.
  *   - provider: The module or other provider that provided this block plugin.
  *   - Block plugin specific settings will also be stored here.
+ * - in_preview: Whether the plugin is being rendered in preview mode.
  * - content: The content of this block.
  * - attributes: array of HTML attributes populated by modules, intended to
  *   be added to the main container tag of this template.
diff --git a/web/core/yarn.lock b/web/core/yarn.lock
index 5dcab7054..3c75da134 100644
--- a/web/core/yarn.lock
+++ b/web/core/yarn.lock
@@ -10,165 +10,130 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
-  dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/code-frame@^7.18.6":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.17.0", "@babel/compat-data@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab"
-  integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw==
+"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30"
+  integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==
+
+"@babel/compat-data@^7.20.0":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
+  integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/core@^7.0.0", "@babel/core@^7.8.4":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.10.tgz#74ef0fbf56b7dfc3f198fc2d927f4f03e12f4b05"
-  integrity sha512-liKoppandF3ZcBnIYFjfSDHZLKdLHGJRkoWtG8zQyGJBQfIYobpnVGI5+pLBNtS6psFLDzyq8+h5HiVljW9PNA==
+"@babel/core@^7.0.0":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.10"
-    "@babel/helper-compilation-targets" "^7.17.10"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helpers" "^7.17.9"
-    "@babel/parser" "^7.17.10"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.10"
-    "@babel/types" "^7.17.10"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.10.tgz#c281fa35b0c349bbe9d02916f4ae08fc85ed7189"
-  integrity sha512-46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg==
+"@babel/generator@^7.20.1", "@babel/generator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
   dependencies:
-    "@babel/types" "^7.17.10"
-    "@jridgewell/gen-mapping" "^0.1.0"
-    jsesc "^2.5.1"
-
-"@babel/generator@^7.18.13":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.13.tgz#59550cbb9ae79b8def15587bdfbaa388c4abf212"
-  integrity sha512-CkPg8ySSPuHTYPJYo7IRALdqyjM9HCbt/3uOBEFbzyGVP6Mn8bwFPB0jX6982JVNBlYzM1nnPkfjuXSOPtQeEQ==
-  dependencies:
-    "@babel/types" "^7.18.13"
+    "@babel/types" "^7.20.5"
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
+"@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
   dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7", "@babel/helper-compilation-targets@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz#09c63106d47af93cf31803db6bc49fef354e2ebe"
-  integrity sha512-gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ==
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
   dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.20.2"
+    "@babel/compat-data" "^7.20.0"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz#71835d7fb9f38bd9f1378e40a4c0902fdc2ea49d"
-  integrity sha512-kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-member-expression-to-functions" "^7.17.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-
-"@babel/helper-create-regexp-features-plugin@^7.16.7", "@babel/helper-create-regexp-features-plugin@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
-
-"@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
-  dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+"@babel/helper-create-class-features-plugin@^7.18.6":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.20.2.tgz#3c08a5b5417c7f07b5cf3dfb6dc79cbec682e8c2"
+  integrity sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b"
+  integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.1.0"
+
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
 "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7", "@babel/helper-function-name@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12"
-  integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.17.0"
-
-"@babel/helper-function-name@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz#940e6084a55dee867d33b4e487da2676365e86b0"
-  integrity sha512-fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A==
+"@babel/helper-explode-assignable-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/template" "^7.18.6"
-    "@babel/types" "^7.18.9"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c"
+  integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/template" "^7.18.10"
+    "@babel/types" "^7.19.0"
 
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
@@ -177,86 +142,80 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-member-expression-to-functions@^7.16.7", "@babel/helper-member-expression-to-functions@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4"
-  integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw==
+"@babel/helper-member-expression-to-functions@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+"@babel/helper-module-imports@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-module-transforms@^7.16.7", "@babel/helper-module-transforms@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz#3943c7f777139e7954a5355c815263741a9c1cbd"
-  integrity sha512-VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw==
+"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-simple-access@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz#aaa473de92b7987c6dfa7ce9a7d9674724823367"
-  integrity sha512-txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78"
+  integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==
   dependencies:
-    "@babel/types" "^7.17.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.18.9"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/traverse" "^7.19.1"
+    "@babel/types" "^7.19.0"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
+  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.20.0"
 
 "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
@@ -265,53 +224,39 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
-"@babel/helper-string-parser@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
-  integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
+"@babel/helper-string-parser@^7.19.4":
+  version "7.19.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
+  integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
+"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
+  integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
-"@babel/helper-validator-identifier@^7.18.6":
+"@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
-  integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
-
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
-  dependencies:
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
-
-"@babel/helpers@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.9.tgz#b2af120821bfbe44f9907b1826e168e819375a1a"
-  integrity sha512-cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.9"
-    "@babel/types" "^7.17.0"
-
-"@babel/highlight@^7.16.7":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.9.tgz#61b2ee7f32ea0454612def4fccdae0de232b73e3"
-  integrity sha512-J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
+
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1"
+  integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==
+  dependencies:
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.0"
+    "@babel/types" "^7.19.0"
+
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
 
 "@babel/highlight@^7.18.6":
   version "7.18.6"
@@ -322,159 +267,155 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.16.7", "@babel/parser@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.10.tgz#873b16db82a8909e0fbd7f115772f4b739f6ce78"
-  integrity sha512-n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ==
-
-"@babel/parser@^7.18.10", "@babel/parser@^7.18.13", "@babel/parser@^7.18.9":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.13.tgz#5b2dd21cae4a2c5145f1fbd8ca103f9313d3b7e4"
-  integrity sha512-dgXcIfMuQ0kgzLB2b9tRZs7TTFFaGM2AbtA4fJgUUYukzGH4jwsS7hzQHEGs67jdehpm22vkgKwvbU+aEflgwg==
+"@babel/parser@^7.18.10", "@babel/parser@^7.20.1", "@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
+  integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+"@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
+  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+"@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.17.6":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
-  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.6"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
+  integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
-  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
+  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
   dependencies:
-    "@babel/compat-data" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.20.1"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-optional-chaining@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
+  integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -511,6 +452,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -574,287 +522,288 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-remap-async-to-generator" "^7.18.6"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-block-scoping@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.2.tgz#f59b1767e6385c663fd0bce655db6ca9c8b236ed"
+  integrity sha512-y5V15+04ry69OV2wULmwhEA6jwSWXO1TwAtIwiPXcvHcoOQUqpyMVd2bDsQJMW8AurjulIyUV8kDqtjSwHy1uQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
+  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.17.7":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz#49dc2675a7afa9a5e4c6bdee636061136c3408d1"
-  integrity sha512-XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
+  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-for-of@^7.18.8":
+  version "7.18.8"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-modules-amd@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz#274be1a2087beec0254d4abd4d86e52442e1e5b6"
-  integrity sha512-2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw==
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.17.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
 
-"@babel/plugin-transform-modules-systemjs@^7.17.8":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859"
-  integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.17.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.17.10":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz#715dbcfafdb54ce8bccd3d12e8917296a4ba66a4"
-  integrity sha512-v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.19.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888"
+  integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.17.0"
+    "@babel/helper-create-regexp-features-plugin" "^7.19.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-parameters@^7.20.1":
+  version "7.20.3"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.3.tgz#7b3468d70c3c5b62e46be0a47b6045d8590fb748"
+  integrity sha512-oZg/Fpx0YDrj13KsLyO8I/CX3Zdw7z0O9qOd95SqcoIzuqy/WTGWvePeHAnZCN54SfdyjHcb1S30gc8zlzlHcA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.17.9":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz#0a33c3a61cf47f45ed3232903683a0afd2d3460c"
-  integrity sha512-Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ==
+"@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
+  integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
   dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
     regenerator-transform "^0.15.0"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/preset-env@^7.0.0":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.17.10.tgz#a81b093669e3eb6541bb81a23173c5963c5de69c"
-  integrity sha512-YNgyBHZQpeoBSRBg0xixsZzfT58Ze1iZrajvv0lJc70qDDGuGfonEnMGfWeSY0mQ3JTuCWFbMkzFRVafOyJx4g==
-  dependencies:
-    "@babel/compat-data" "^7.17.10"
-    "@babel/helper-compilation-targets" "^7.17.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.17.6"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.17.3"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
+  dependencies:
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -864,44 +813,44 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.17.7"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.17.9"
-    "@babel/plugin-transform-modules-systemjs" "^7.17.8"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.10"
-    "@babel/plugin-transform-new-target" "^7.16.7"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.17.9"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
+    "@babel/plugin-transform-computed-properties" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.8"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.20.1"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.19.0"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.17.10"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.22.1"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
@@ -915,10 +864,10 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/register@^7.7.7", "@babel/register@^7.8.3":
-  version "7.17.7"
-  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.17.7.tgz#5eef3e0f4afc07e25e847720e7b987ae33f08d0b"
-  integrity sha512-fg56SwvXRifootQEDQAu1mKdjh5uthPzdO0N6t358FktfL4XjAVXuH58ULoiW8mesxiOgNIrxiImqEwv0+hRRA==
+"@babel/register@^7.7.7":
+  version "7.18.9"
+  resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.18.9.tgz#1888b24bc28d5cc41c412feb015e9ff6b96e439c"
+  integrity sha512-ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw==
   dependencies:
     clone-deep "^4.0.1"
     find-cache-dir "^2.0.0"
@@ -927,22 +876,13 @@
     source-map-support "^0.5.16"
 
 "@babel/runtime@^7.8.4":
-  version "7.17.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72"
-  integrity sha512-lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg==
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz#1148bb33ab252b165a06698fde7576092a78b4a9"
+  integrity sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.10"
 
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/template@^7.18.6":
+"@babel/template@^7.18.10":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
@@ -951,632 +891,721 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.13.0", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.10", "@babel/traverse@^7.17.3", "@babel/traverse@^7.17.9":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.10.tgz#1ee1a5ac39f4eac844e6cf855b35520e5eb6f8b5"
-  integrity sha512-VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw==
-  dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.10"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.17.9"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.10"
-    "@babel/types" "^7.17.10"
+"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8"
+  integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.1"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.1"
+    "@babel/types" "^7.20.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.18.9":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.13.tgz#5ab59ef51a997b3f10c4587d648b9696b6cb1a68"
-  integrity sha512-N6kt9X1jRMLPxxxPYWi7tgvJRH/rtoU+dbKAPDM44RFHiMH8igdsaSBgFeskhSl/kLWLDUvIh1RXCrTmg0/zvA==
+"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.18.13"
+    "@babel/generator" "^7.20.5"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-hoist-variables" "^7.18.6"
     "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.18.13"
-    "@babel/types" "^7.18.13"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.17.10", "@babel/types@^7.4.4":
-  version "7.17.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.10.tgz#d35d7b4467e439fcf06d195f8100e0fea7fc82c4"
-  integrity sha512-9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A==
+"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9":
-  version "7.18.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.13.tgz#30aeb9e514f4100f7c1cb6e5ba472b30e48f519a"
-  integrity sha512-ePqfTihzW0W6XAU+aMw2ykilisStJfDnsejDCXRchCcMJ4O0+8DhPXf2YUbZ6wjBlsEmZwLK/sPweWtu8hcJYQ==
+"@babel/types@^7.18.9", "@babel/types@^7.4.4":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.2.tgz#67ac09266606190f496322dbaff360fdaa5e7842"
+  integrity sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==
   dependencies:
-    "@babel/helper-string-parser" "^7.18.10"
-    "@babel/helper-validator-identifier" "^7.18.6"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@ckeditor/ckeditor5-alignment@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-35.3.2.tgz#223c8c275b2ab395b7ce6eff94c83eb42512d647"
-  integrity sha512-/j3WmRkfJ/v1fb8aKj4+YJagn6g9CeFNmUwPFVXYiLs1KPIoP+cH3k25teW5Xx69WOWObrgZ+H4n7TpLsxa4Uw==
+"@ckeditor/ckeditor5-alignment@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-alignment/-/ckeditor5-alignment-35.4.0.tgz#9912b25dddcbf8be47f160b5798bde84cd75b8ca"
+  integrity sha512-hRrP7b5VBsndwxzyNvUpGqTtUsCPDFRWSJq8vk9hk3f0AjioJZE0/rQA9U41dYKZdOKpTXBVrt+3DBMjObV6cQ==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-basic-styles@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-35.3.2.tgz#0c0df61cabaedf5fe3a7a39ee12b32a97b64f311"
-  integrity sha512-AIB94555CxlZDCpATYzF3o+Jvx4Wm/OVbMT4Z1TCcoRHS0AjmCR2ZaeQvw+RCoNhYim+O0oQwgDwfkjJsaXNCw==
+"@ckeditor/ckeditor5-basic-styles@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-basic-styles/-/ckeditor5-basic-styles-35.4.0.tgz#3b5270997511fc5d64051ee9f793e356ee1786a9"
+  integrity sha512-6JkoplYMwIHN1E/w3DoY0i95B41sbGwsNAtlvx6qaBvNKkLu4rRCtiBUJDnx8qZxxQXHih5ZOw8bUQHl4mt8hw==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-block-quote@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-35.3.2.tgz#1ed95c0b71bbabe62cae52013fcdddc26191b40d"
-  integrity sha512-6hBQ5+ltGxuYfg6mKjbk9PoHHkLAFAy7xCxQA9UeCD8rVI//ELTfTQAY/VBhzdNE6vhcSrnrxajZCFxANLTFrQ==
+"@ckeditor/ckeditor5-block-quote@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-block-quote/-/ckeditor5-block-quote-35.4.0.tgz#fa6cce133200243ddc61317cdeea9dd34ac63d7b"
+  integrity sha512-AXoJhSVwl/RSelmxqxMcLq0VUXubjEvMc32xvF6CyUkc/vlSkZec6noznXyVo0P5TXOxsFbzwFAdBOSFTFjD+A==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-clipboard@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-35.3.2.tgz#7428827a098498347995259c12a03850bf9e1cb0"
-  integrity sha512-0l+dN8CrAHMC085mohVfolhOdGLvwky6HoYoAlxPMe8n3zCFgQtlcolmj3cA8qrO7OvFDSl2YrtWfg8mb+BeSA==
+"@ckeditor/ckeditor5-clipboard@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-clipboard/-/ckeditor5-clipboard-35.4.0.tgz#8529fd45d06a7edea0f73cd0b5b3052f2272335c"
+  integrity sha512-B6rIQxvOrHvO9TZRC8JA0wKk+IfN880UJkYIg1qlhf9HFNVjdVbtHaiCsPD+TzGmQN3XHXfNjgjabGRIn0iZmw==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
-    "@ckeditor/ckeditor5-widget" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
+    "@ckeditor/ckeditor5-widget" "^35.4.0"
     lodash-es "^4.17.11"
 
-"@ckeditor/ckeditor5-code-block@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-code-block/-/ckeditor5-code-block-35.3.2.tgz#41f90f30ec35c584256035d857e949291c9ad5b8"
-  integrity sha512-ir6LoZeQVF3KbvumMj/pl7p2nyVe6DCbRHHcFR1ChoTbFCNJ5O8tnB3iFS8vrgP/zoVR6JEqyIVYtTtVTLTKOA==
+"@ckeditor/ckeditor5-code-block@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-code-block/-/ckeditor5-code-block-35.4.0.tgz#7b1d9de4c05c5c562a0247b0bc711117792913bf"
+  integrity sha512-En7FBmyyEj8zdt48fUJhlY023LAxEKoi1vUHsr7gK+3E8UKvzWdO2KkTvC2f4YB3rHXYkw8dK2WSJ2LIwID+Ng==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-core@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-core/-/ckeditor5-core-35.3.2.tgz#0c8efda8f3f998fa5170bedc16b346b516b856e8"
-  integrity sha512-OnrHf9i0D79DdIMIE98A9x0y4XCxGItcOXcTHd9s+jWFMtiAvQ37vDGrqgDlHW646RBBF0GAmxrmP4F9HzEeMA==
+"@ckeditor/ckeditor5-core@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-core/-/ckeditor5-core-35.4.0.tgz#39390445c8363a80d4ce0e45d93efa13b8523f6e"
+  integrity sha512-Rf0H7C4inCj/YC8aii0cT7TC/IuBIQ+tXmu9qd8/1BJ/rz1MCHXtBPApjTbFp33OE3aOFB5+NUaKt05k/dL3OA==
   dependencies:
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-dev-utils@^30.4.0", "@ckeditor/ckeditor5-dev-utils@~30.4.0":
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-dev-utils/-/ckeditor5-dev-utils-30.4.0.tgz#8165169fbe9fba2533034663b28a2eb54a77f946"
-  integrity sha512-FCuRQ5MzrJeWWKUULil6iI+ylzI0kZ2PqXBME66KZS9KIE7UEKabSAAJGmtc7xFCuGmbik6g2uAk3J0t+PWHjQ==
-  dependencies:
-    "@babel/parser" "^7.18.9"
-    "@babel/traverse" "^7.18.9"
-    "@ckeditor/ckeditor5-dev-webpack-plugin" "^30.4.0"
-    chalk "^3.0.0"
-    cli-cursor "^3.1.0"
-    cli-spinners "^2.6.1"
-    cssnano "^5.0.0"
-    del "^5.0.0"
-    escodegen "^1.9.0"
-    fs-extra "^8.1.0"
-    is-interactive "^1.0.0"
-    javascript-stringify "^1.6.0"
-    pofile "^1.0.9"
-    postcss "^8.4.12"
-    postcss-import "^14.1.0"
-    postcss-loader "^4.3.0"
-    postcss-mixins "^9.0.2"
-    postcss-nesting "^10.1.4"
-    raw-loader "^4.0.1"
-    shelljs "^0.8.1"
-    style-loader "^2.0.0"
-    terser-webpack-plugin "^4.2.3"
-    through2 "^3.0.1"
-    ts-loader "^9.3.0"
-
-"@ckeditor/ckeditor5-dev-webpack-plugin@^30.4.0":
-  version "30.4.0"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-dev-webpack-plugin/-/ckeditor5-dev-webpack-plugin-30.4.0.tgz#d2b46a5be3655bae199ba2adcb79cc47adba952b"
-  integrity sha512-wXux5YwysXvBw7ynBdt7M5c/0l2PRIpj/wTMK3yHSWo2pQAWMp76O3YNDbh2TdSSyNtFNj6OjCHd7e06lloL9w==
-  dependencies:
-    "@ckeditor/ckeditor5-dev-utils" "^30.4.0"
-    chalk "^4.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.4"
-    webpack-sources "^2.0.1"
-
-"@ckeditor/ckeditor5-editor-classic@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-35.3.2.tgz#f6b3638c887f61303bdeb87831dfe77d332d1eea"
-  integrity sha512-30rMzfTp3oMwmj4aDiDmISF0nTO4IVKp0yKvMDUfUCSTGGWBpOoCycBQbNLUG0Dn7ExUUHz6v9Wo07Efki3IYQ==
+"@ckeditor/ckeditor5-editor-classic@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-editor-classic/-/ckeditor5-editor-classic-35.4.0.tgz#6fa7e05fc7282ba9f7f31060d0b71e3cc73784a9"
+  integrity sha512-EqAqFD/5oPtDMU2AoH3eJaDplcS8MxfkiRQ5hzeC1JeIPT94w5FCHnB4SAkjLPDnlyZnBWOOYdZSuln2TRIbEw==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-editor-decoupled@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-editor-decoupled/-/ckeditor5-editor-decoupled-35.3.2.tgz#1484252f91b57ee55031f51958a40a46ddc7a360"
-  integrity sha512-DEdw+p/QvGEp+AXHZjXZkerZaMwdDXoydDlg3S7JmTrktdTZVf2gmkD4US+R0VQpdYxa4O9BF0MbzgH0YIEbhQ==
+"@ckeditor/ckeditor5-editor-decoupled@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-editor-decoupled/-/ckeditor5-editor-decoupled-35.4.0.tgz#61b70fdcfa8b8bf872c18ce693eebd26933654e5"
+  integrity sha512-+edFHimxt60u9XnD4AitZGU8+dshthvlftbpD8Qi3aXwZ9SuIoYdi3fe4ufRgtdkcJT2qLKWghyKPLatCqM1tg==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-engine@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-35.3.2.tgz#1f3d45a71670b0b85087d04d17e72f88bcd6761f"
-  integrity sha512-/H20Y6VlYxRyNiorRXF3VtbykQqgo+RbhMfzRQasC9TdrFyRaC3HW67Kq5bjeKoeoZweEM6Dziy8pnrMZlhecg==
+"@ckeditor/ckeditor5-engine@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-engine/-/ckeditor5-engine-35.4.0.tgz#cb0ed9f0c5a9ef00b24ffbd8d2100fff1e0e90cb"
+  integrity sha512-67QKtUGJeLM072h9qURvzczYGU3ecuxR9LLmM4dffnV+PBNQ9e8RDCY7PuuEP0pplmAUI6/XqoZJIbk6h7ZV3Q==
   dependencies:
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-enter@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-35.3.2.tgz#0109817aca29d6c18a180bd663240985e0ac2f4a"
-  integrity sha512-9bm4TbyIUu880FFVkNRUqSOYOs5R37CIB8BQZqV2T7cOI7L4RT0+hyXu+Zmg844WSD/+GtAZ+y0FlSi50Ze6oA==
+"@ckeditor/ckeditor5-enter@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-enter/-/ckeditor5-enter-35.4.0.tgz#c0f967dc3f48faeb07d839ac0426227e118ade56"
+  integrity sha512-y95RnA/Gw72e220PJKVwNbwPzX4SRs82/rXu1jVyJXty7CcEZqqfyRtW6odICAXr5eKI5XKgzFgpFYULL3D9Nw==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
 
-"@ckeditor/ckeditor5-essentials@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-35.3.2.tgz#d4cb0ffbc3f22bc9cff545d0053f5ac049e270d3"
-  integrity sha512-zgVqqkq+747mdYPEuQoH8xmNVmPv6sdcz5B8WBWFYrjriD4kvQIfD611osJ2k8Y2hNozpzAXXYPiZOa1UKPJ+w==
+"@ckeditor/ckeditor5-essentials@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-essentials/-/ckeditor5-essentials-35.4.0.tgz#4d56655886206b912e2178cb9440ce933ca96100"
+  integrity sha512-tTtTb4NYSQi99LPDzAVUnFhW6iTqSuaylkg0XnDvO2lVR3tAA27gOOjGqc8Ri9NMGGeZkFTvXpnVkXkFnDP2nQ==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-heading@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-35.3.2.tgz#74a7ed138babac6961812d750d8e17584a7e2fa3"
-  integrity sha512-cJ9iL875yd8kQ7XlzcrT1qP4RZBgkydhWT7ERVJtctvHBVARd0rOpzpax3w2eCVwufO0fQcjh154u3IHREKb/w==
+"@ckeditor/ckeditor5-heading@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-heading/-/ckeditor5-heading-35.4.0.tgz#86f6b8a01e0388e61dd687e56e631029f75f1a3d"
+  integrity sha512-cZwKzAg0USxaDZstQXKMkzrE+fOEr+6YFtXpHGrKgsaisI9xkuOWD40dZvLovTmENLGPopDkdfGewj8jscB9Kg==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-horizontal-line@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-horizontal-line/-/ckeditor5-horizontal-line-35.3.2.tgz#91a6a87a67cec9093062393d43ead894e30f8922"
-  integrity sha512-Ons9O3Tp6tjuI5jfT6Z3Ckb+wWesMlRl4xWcJ817mZI+qWPzLX8MkFPeOmguZERK2YtA2CjVxrlftvysob7qcw==
+"@ckeditor/ckeditor5-horizontal-line@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-horizontal-line/-/ckeditor5-horizontal-line-35.4.0.tgz#3bb18089a381622f19f3ba20e55dfe64a78f7ce8"
+  integrity sha512-3swvTiZP80SdIOjaXmvYD5EtuWUcjfyK5AQ+1AXPQ5PlsCJCOcm/6Q9I+ml9TWhevI3O+in5dW8ZXKudAiqlNQ==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-html-support@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-html-support/-/ckeditor5-html-support-35.3.2.tgz#4db535e54b79913f70801a209e53bb339a79b1d5"
-  integrity sha512-SZNg3OSqDsuV+YcfiFzUCMzkVkVuVhqzzErXYiA/uZf8SV3P68o+vQ98R9kBx6Xp9Gk4ifUz0eWYv1kmMK4K/Q==
+"@ckeditor/ckeditor5-html-support@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-html-support/-/ckeditor5-html-support-35.4.0.tgz#5de9de40dc59ab2c1b1f04be2ae77025ceb9c8da"
+  integrity sha512-h1iV/JQQwqYD6xaVvgIjvx+dat7eZ0jFksEsHhTaYSDX+Qzcr/rFFN3mocWsoaOsn3iZFylOo/dP0NjZm+Yxfw==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-image@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-image/-/ckeditor5-image-35.3.2.tgz#f68cbf10d894e2a54352a40bad853c14bf217b91"
-  integrity sha512-9rTVH3rZviXNgXCkutMg9Td6i9DIInp8JaRlNBOuIMc0iEjD+VEAIZ4eUMIMXeTeXF5jyNMcqbTSK/DwN1LAgg==
+"@ckeditor/ckeditor5-image@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-image/-/ckeditor5-image-35.4.0.tgz#16d6d7bf0a47bbd0de54666cabf366e53d071dcf"
+  integrity sha512-SQ+IiIB6SLhdhVy3gRKxxfBXpLikInvaP3ILOvPQlaC0Bt5ciJ3t/180zCBlbCvvRwIQNo4bYbZc5cI8UBIAaA==
   dependencies:
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    ckeditor5 "^35.3.2"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    ckeditor5 "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-indent@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-35.3.2.tgz#4dea269c3db0da09ac744b2294b00da3a14bfb40"
-  integrity sha512-0oiaDLcNTWVt8lXJFi25rZqKe/VQ4ZULeNc/mgm6W17N+3Ua0uAqORFVEJcccn6QDwmiyMP9LJp2k59e1VE97A==
+"@ckeditor/ckeditor5-indent@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-indent/-/ckeditor5-indent-35.4.0.tgz#045c88cd16a7a7a4888128d1c41bbea1352a3861"
+  integrity sha512-FNp5S6t/RlY4eARR4E/jzxqjAbsGMa+30ZKS9maTOCx0TDmvmjD0jvZc9+1fe/KzSBk9wtmHYOil1J+W66rKvw==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-language@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-language/-/ckeditor5-language-35.3.2.tgz#8e83c02b96051cefaf726a8daa8671da15c1ed4e"
-  integrity sha512-sQff1/nILRe2hjOkeQ5sbQ9k5ghttfDnK/LHXtVeYQjAF/IqeWdT8IkwUwLeYniHgNkVCxbkLwLllmBKp4HRoQ==
+"@ckeditor/ckeditor5-language@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-language/-/ckeditor5-language-35.4.0.tgz#976ee7b560de5ad327d717c66a622a1e6194a082"
+  integrity sha512-UtB7DMJSPGMRA2kLuPKdAU7Tra/qeoJMGzUR+eQbCX1oGLVckqYYh/URm02SJaV6y+okvWay0+fWPvVRudFMkQ==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-link@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-link/-/ckeditor5-link-35.3.2.tgz#77d8effdd08a3cd70d59229c82e3e16bb1d10c62"
-  integrity sha512-NM44sefnoHeXyUAETHgP4TywLWlSnS2HQaxSHF74EhB3sDNRE+GXiY8DHRd+pMWHvGksOhz9OJMgMIl8wnsRvQ==
+"@ckeditor/ckeditor5-link@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-link/-/ckeditor5-link-35.4.0.tgz#9b703d1d4ce39c214c0818efb0041735ba0426eb"
+  integrity sha512-aqHFwlnGyjW/fp/fklD1VupYLsfbvSwsh9RFGIdgJL4TuWnlhxR5JXCOAKyZtvCWpdyuKyqzEB8EV0NQAa+OMg==
   dependencies:
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    ckeditor5 "^35.3.2"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    ckeditor5 "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-list@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-list/-/ckeditor5-list-35.3.2.tgz#4218e1e3ee7133ba8b8b99973eea5f0af303ac01"
-  integrity sha512-PQ6DoINXkefhboEPF92TdjebItvza6dXemIbDwEwC9RhXL73IEsiqnTB5ThHobKNXhZJo+gGBlVHD2WzKMUwiQ==
+"@ckeditor/ckeditor5-list@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-list/-/ckeditor5-list-35.4.0.tgz#bf75bd23b2e571628be69526a72927928c3b811f"
+  integrity sha512-fPENWzEicpoXZsDmGR6EiR/j3Z4Q3KYAsBMsmWf8YwUlbM/hERt+V3yIB+LKdGQKbFrL6CWOA1JBB4tmmwd50A==
   dependencies:
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    ckeditor5 "^35.3.2"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-paragraph@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-35.3.2.tgz#22e7c1f44fc293eea110288370127082827231f5"
-  integrity sha512-1t0cEio8fW28pSw1J2kFKH6N7aiwx7H9NQ+GSfCufeSZcI/PUs+oWfehLcNswrdD4M77o+AZrc3BYrmxQYSLOw==
+"@ckeditor/ckeditor5-paragraph@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-paragraph/-/ckeditor5-paragraph-35.4.0.tgz#db6babd19eb37c66771b7355d0cd0880cb9b599c"
+  integrity sha512-8nhkEEFv1WClhH6q/HW8P596d+dlatSVc46kQ2+jGlYirL8P66tV/nK+OiE8z1d897oVr4QPGsqk2qGkRFUChw==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
 
-"@ckeditor/ckeditor5-paste-from-office@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-35.3.2.tgz#6336f80047bfb2ff573fa11a77aaf3e98bec589c"
-  integrity sha512-CHmhw9/deTS3o+4NqIEL41Yd2WXqP3z4VYR4DHZGK6iI2DKTrLcHU/ofz8fQHnU/7JqtiiZpPlZLnGRr3Yq6+Q==
+"@ckeditor/ckeditor5-paste-from-office@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-paste-from-office/-/ckeditor5-paste-from-office-35.4.0.tgz#fa93117b2ba66c74af6041479a3b0949d310eca2"
+  integrity sha512-Uav1z9t52+qcu1axykcZ/NeH7JnURuZF9l0o+Pq/sNg3zjzVqB92V5cvFXg9hXeod8LzxlNLHy1BR8ZWTHeKHQ==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-remove-format@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-35.3.2.tgz#f2af335238884bf945f77ac375c13d501a28a076"
-  integrity sha512-Izvyogfq/QUbE6I1Y4qA6qlhP6x40sFdpRhsFWx6ynPTgvR4id+b4GfbQ2Od+ETje32kmghJGlXoUMpn5uaCyg==
+"@ckeditor/ckeditor5-remove-format@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-remove-format/-/ckeditor5-remove-format-35.4.0.tgz#03552d0d173dc4c737284b13a39e6c8369efd6ff"
+  integrity sha512-M6A8f8EwPUd86OXgBaWnRw7u1ldVvaK7v+CprTRRnrOUasaeW1SvYgiYjqF9X5EYdhzrOoSSGC+B+ujkgm/ueQ==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-select-all@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-35.3.2.tgz#19aa0f25cad35c01cb5c4e0d8158c937fff4cbbc"
-  integrity sha512-MFfYGmXL1myexvXJyiFWI2eieEP2UcAmtyTE3NnFd3xV8dSVd59NRKT0gMQJFjVU/zflQCmNOqYYTGxpg7CROQ==
+"@ckeditor/ckeditor5-select-all@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-select-all/-/ckeditor5-select-all-35.4.0.tgz#b7c20e9f686e59497e84825c4786dd874e22d4e2"
+  integrity sha512-c+pIIY77SP6ux4/cyD7cCrllQAqtFVSnzNYdy7ygNPqljCGngCnpSV9xfCO/blFo6/zx2vsmzVGdRq3ArzGoMg==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
 
-"@ckeditor/ckeditor5-source-editing@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-source-editing/-/ckeditor5-source-editing-35.3.2.tgz#b5f996b7bc1548e275d704dbc80afaf4684e4398"
-  integrity sha512-dmzIIa6LykDsT8VLinSpyyWo/lBOQqi128IuuUHeQhAHrQFpYr2pCu/lkr9azlcK5xRvPC0tE1Wy8rQNS0X4aA==
+"@ckeditor/ckeditor5-source-editing@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-source-editing/-/ckeditor5-source-editing-35.4.0.tgz#5e0423666edbfa56b1a2cb4f660f07ca5e3f8e95"
+  integrity sha512-w2TrCUGQcWYdNwWG+QEVG4Z8du2BcOLDVtBRjSXef+o2tFDZKRwq7TlCYqCHYEuhDmFtiNV8YTFSVAcdTirpeA==
   dependencies:
-    "@ckeditor/ckeditor5-theme-lark" "^35.3.2"
-    ckeditor5 "^35.3.2"
+    "@ckeditor/ckeditor5-theme-lark" "^35.4.0"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-special-characters@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-special-characters/-/ckeditor5-special-characters-35.3.2.tgz#7bd4e59d09f64a0d9e0c2242584f24e53d57aac1"
-  integrity sha512-FMGqTeBMjENGTyfTF+ESwUZSFc5rYokGWrJXBgBeDFUH+gSY0m3WM+ZBWfjLW14ZTXbP5NeirdifojFpmHITwA==
+"@ckeditor/ckeditor5-special-characters@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-special-characters/-/ckeditor5-special-characters-35.4.0.tgz#f6c5d563dc35b21884ee5cd27c8e485bbb9ff8dc"
+  integrity sha512-HWFh/CKurVBVgz+cH+NLUe5VfhW3f4kGgOyEulCBsWEUWUICnCmai3eXRTxfzn+W6rTub6I2GxMEOolOpH861Q==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-style@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-style/-/ckeditor5-style-35.3.2.tgz#0a673e620a110287784d5de763610218ccc9b31f"
-  integrity sha512-xrWHqe/1CTcoVEBgUNyXqmD4I/WBF565pAuyLvj+8acfnbIFd9NkoEuA8LUOuVnwOHurcGksW4LkiYluu7CIzA==
+"@ckeditor/ckeditor5-style@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-style/-/ckeditor5-style-35.4.0.tgz#b702c5f8189f16efe60189f11cab5851e7130e43"
+  integrity sha512-aFhIb+FIvN+DYEZ0qDciyIWwWyOrWE3AUZ6UWsenjU5HXYFHYqxokRN/abKO1xmxBuNkmPk1fKT/tlJBGBUDjg==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
 
-"@ckeditor/ckeditor5-table@~35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-table/-/ckeditor5-table-35.3.2.tgz#daab88c10507e3838a6c5421cf65000206ba0860"
-  integrity sha512-BFY8NL6QBYQMjEWwtwTZSeE7QEfrTgbSAP7Ndxh+SshEgGNbH4D6ZaiC1A1OYb/ABqe+g7LXpG/O+2nGM9YkxA==
+"@ckeditor/ckeditor5-table@~35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-table/-/ckeditor5-table-35.4.0.tgz#0a93fedfd7640a7271faefcc95406e5f2fa966d2"
+  integrity sha512-u2g3CIqXO7ByrfFVqlHagPssta8hd/zSE37CjFuylc5KYVmMxcuh3TiFirKaladH92/3gjfnf+GWEC5X14mA8w==
   dependencies:
-    ckeditor5 "^35.3.2"
+    ckeditor5 "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-theme-lark@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-35.3.2.tgz#0b84e3960b37456d4a2d7497ff60540e90d1b631"
-  integrity sha512-3YZXJXUnX90A9Ju4fth9zVki2yDhTGRCCzZGKseM7BdJU7Drc8caQh5vTKjN8g9t4xZKCPsGPaeZ2Jk5Wd1f3Q==
+"@ckeditor/ckeditor5-theme-lark@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-theme-lark/-/ckeditor5-theme-lark-35.4.0.tgz#80b8d86625f9b230a9e91d99cbae19143c76345f"
+  integrity sha512-cf6pJN96KwKrs3KIvxrKR9pGMH2/I6MAFMyliN7O1MbauKeyC6cjwui41Yan10cWwpm6a6PeadyRbwQPa9HUaw==
   dependencies:
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
 
-"@ckeditor/ckeditor5-typing@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-35.3.2.tgz#6735a9ac62caa671fde33d1cfc4ba90f23ca6da2"
-  integrity sha512-cu5gSAKGHAUdKVA1p8NBppoBuQSbDFdTaBFE51ske+RQhFpMBQVyHzgxfsXb/Ui7f3fDw91eJLg8MtrChvDPsA==
+"@ckeditor/ckeditor5-typing@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-typing/-/ckeditor5-typing-35.4.0.tgz#b786032a541cfd102562eb07c21c62e0b6d502c6"
+  integrity sha512-Ad/PHWbVWcnAj9oevkkfLqf6CmvCFOti466uhvfOCKRNVf2+/xuGwleOGr8W6Lir/x/qav7ojFjKPKDxqbPXhA==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-ui@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-35.3.2.tgz#bf5d84541066064e7a2c9164bc8f85e04b395214"
-  integrity sha512-0NlDVRsC9H9dx9I54reolXp2O/4a31aV7vhubiIzVVNiHkOxzfUSNnzhOzeMP7pej6ZYt/jTqCtv0qy+35ByOQ==
+"@ckeditor/ckeditor5-ui@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-ui/-/ckeditor5-ui-35.4.0.tgz#76e59032aee6652c6bd717f30fc330a064b3451e"
+  integrity sha512-0SmYE+k1cYQPqyw2rQsPDV/RpudneBh1bNfiaTOz+rqViJIMe+TxiuK6Fz+znNZ05s0exr+ZHWvMttGqlVoQNw==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-undo@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-35.3.2.tgz#d5781c82d017fa58b55c5c893814a12a801633c6"
-  integrity sha512-1vjIytAE/VhCGrN3IrhEJHURrPHYxtBzUEgDWPwvGZhML8vG9+4PtEvfUF3+rDiI5c6CkcJ77phPIM6KM9z4ow==
+"@ckeditor/ckeditor5-undo@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-undo/-/ckeditor5-undo-35.4.0.tgz#f79b19be69b8b9ab57592cfe4ec4645b3728b773"
+  integrity sha512-0RhsK0f/pX/7KB/JXYTLiDOswmUTQ9EKIIuewAwr7LTsBf4Q309FZSFdbeTmc0wIyX33212Xh5xsi3LyG1VJRg==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
 
-"@ckeditor/ckeditor5-upload@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-35.3.2.tgz#347fe95165b3ccb53a47bc5d35255e4b3a03a136"
-  integrity sha512-/xq5foAuf+3xWDlzm3qLloEAVVYGlJ92LFyrMSmw3Kzu8Cu/yQR8wRscgXLQWa1MpzasYLl09N0hxBi9evtx7Q==
+"@ckeditor/ckeditor5-upload@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-upload/-/ckeditor5-upload-35.4.0.tgz#57944a4e824cdee37bb53d795dbe98055e11d748"
+  integrity sha512-+eJAluAc4mAFmx5FNuSGjkCYmbm0V9NpSleubAXEx2e+KNiLarPAnsolwRaAcYXcloNp4C9/l0D+lPEx7VRYtg==
   dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
 
-"@ckeditor/ckeditor5-utils@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-35.3.2.tgz#2366c9bbb22a082c792371d79dd9821247812b01"
-  integrity sha512-iw2361Ek9K8Dqu8JI60DcijSsDzHMZVCNiwxBCxDEywmEKod5hENwnwZvQM+C0CWBmshQCAXhy/dJ1YWTvGrsg==
+"@ckeditor/ckeditor5-utils@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-utils/-/ckeditor5-utils-35.4.0.tgz#c5c296a2c1883684e674b1a710fcc41b745e156b"
+  integrity sha512-sFjbb+1VYdLbELDLWVYk86WzVN7Lo3sXHbVhdr8+kc0Ufxdr3mTFHDAkiymFt2fs1FOB5gZyWJlJU+EeJnhKUw==
   dependencies:
     lodash-es "^4.17.15"
 
-"@ckeditor/ckeditor5-widget@^35.3.2":
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-35.3.2.tgz#c6dc031a2ae506c5ab5eb47119d5c515f56ae4bb"
-  integrity sha512-68T4X6hx9wKC8W5FZ1fcREFQu3O5GDRECZjSZ7xpPZU42ahzeolRVmGFeeRVl2ZgMMVp1YdE2tU4rXFQ8Uwk7Q==
-  dependencies:
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
-    "@ckeditor/ckeditor5-enter" "^35.3.2"
-    "@ckeditor/ckeditor5-typing" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
+"@ckeditor/ckeditor5-widget@^35.4.0":
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-widget/-/ckeditor5-widget-35.4.0.tgz#a80ed4c4f57a1198b47c4e93090f8ebe62f70ecb"
+  integrity sha512-SNYOXXWu7XV1BZET+ar0Cea25836vzNtUqXlDPwBx/jrmK86b8GMbFR99P2bUG0NvtIsH5cSk7XCmnxb4ZQ6wA==
+  dependencies:
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
+    "@ckeditor/ckeditor5-enter" "^35.4.0"
+    "@ckeditor/ckeditor5-typing" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
     lodash-es "^4.17.15"
 
-"@cspell/cspell-bundled-dicts@^5.20.0":
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-5.20.0.tgz#294106a2660baf825494535019a0d2230c3cc0c1"
-  integrity sha512-tCO32xVSuey4Tg8XuayBzcrCAfrAXL8J1PeYl26+/ZUl5zkAL4AuyL0Cf4e2PpeEomnUWP2y5noZLLbUeOIwnw==
-  dependencies:
-    "@cspell/dict-ada" "^2.0.0"
-    "@cspell/dict-aws" "^2.0.0"
-    "@cspell/dict-bash" "^2.0.2"
-    "@cspell/dict-companies" "^2.0.4"
-    "@cspell/dict-cpp" "^2.0.3"
-    "@cspell/dict-cryptocurrencies" "^2.0.0"
-    "@cspell/dict-csharp" "^2.0.1"
-    "@cspell/dict-css" "^2.0.0"
-    "@cspell/dict-dart" "^1.1.0"
-    "@cspell/dict-django" "^2.0.0"
-    "@cspell/dict-dotnet" "^2.0.1"
-    "@cspell/dict-elixir" "^2.0.1"
-    "@cspell/dict-en-gb" "^1.1.33"
-    "@cspell/dict-en_us" "^2.2.2"
-    "@cspell/dict-filetypes" "^2.0.1"
-    "@cspell/dict-fonts" "^2.0.0"
-    "@cspell/dict-fullstack" "^2.0.5"
-    "@cspell/dict-git" "^1.0.1"
-    "@cspell/dict-golang" "^2.0.0"
-    "@cspell/dict-haskell" "^2.0.0"
-    "@cspell/dict-html" "^3.0.1"
-    "@cspell/dict-html-symbol-entities" "^2.0.0"
-    "@cspell/dict-java" "^2.0.0"
-    "@cspell/dict-latex" "^2.0.0"
-    "@cspell/dict-lorem-ipsum" "^2.0.0"
-    "@cspell/dict-lua" "^2.0.0"
-    "@cspell/dict-node" "^2.0.1"
-    "@cspell/dict-npm" "^2.0.3"
-    "@cspell/dict-php" "^2.0.0"
-    "@cspell/dict-powershell" "^2.0.0"
-    "@cspell/dict-public-licenses" "^1.0.4"
-    "@cspell/dict-python" "^3.0.3"
-    "@cspell/dict-r" "^1.0.2"
-    "@cspell/dict-ruby" "^2.0.1"
-    "@cspell/dict-rust" "^2.0.0"
-    "@cspell/dict-scala" "^2.0.0"
-    "@cspell/dict-software-terms" "^2.1.5"
-    "@cspell/dict-swift" "^1.0.2"
-    "@cspell/dict-typescript" "^2.0.0"
-    "@cspell/dict-vue" "^2.0.2"
-
-"@cspell/cspell-pipe@^5.20.0":
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-5.20.0.tgz#964aa560c89ecdf4eea9145700ccd6ab4c235ed8"
-  integrity sha512-dGHf4XZgPlGqviYTD+5ZwSk3hpiywsuuDqnoPo9SeQ1xPon7uFVKsMiAAzvhGAkkBaKIBNP/nwPU0feYvLoCJg==
-
-"@cspell/cspell-types@^5.20.0":
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-5.20.0.tgz#4c9a47249e1ad534938f2f35fbba1221e7800570"
-  integrity sha512-p06/HAKgalqyGHfnowJvjO3SQHxuOzKdiJTUlUi8x1CrEk7PmZEHuORlt9tVVZ46Xf2qY9+QLeTtattlWPJ39A==
-
-"@cspell/dict-ada@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ada/-/dict-ada-2.0.0.tgz#5d31967cbd7a0d12f4b4de3fd5b09e59239cf78b"
-  integrity sha512-4gfJEYXVwz6IN2LBaT6QoUV4pqaR35i0z0u9O684vLuVczvNJIHa4vNaSEFBr9d6xxncUyqstgP9P73ajJjh9A==
+"@cspell/cspell-bundled-dicts@6.17.0":
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.17.0.tgz#3ded5c50e70d6066b6b64a4e4b841a20abc8b75b"
+  integrity sha512-BA5cg2mfESbF3Fm/fIGXgbm0LhD8HKxCCiQDRN9FLaj4c69QUgFpQ9LpzGPZEtNn2Pjl2Jn/BEXX27hgaURG9g==
+  dependencies:
+    "@cspell/dict-ada" "^4.0.0"
+    "@cspell/dict-aws" "^3.0.0"
+    "@cspell/dict-bash" "^4.1.0"
+    "@cspell/dict-companies" "^3.0.3"
+    "@cspell/dict-cpp" "^4.0.0"
+    "@cspell/dict-cryptocurrencies" "^3.0.1"
+    "@cspell/dict-csharp" "^4.0.2"
+    "@cspell/dict-css" "^4.0.0"
+    "@cspell/dict-dart" "^2.0.0"
+    "@cspell/dict-django" "^4.0.0"
+    "@cspell/dict-docker" "^1.1.3"
+    "@cspell/dict-dotnet" "^4.0.0"
+    "@cspell/dict-elixir" "^4.0.0"
+    "@cspell/dict-en-gb" "1.1.33"
+    "@cspell/dict-en_us" "^4.1.0"
+    "@cspell/dict-filetypes" "^3.0.0"
+    "@cspell/dict-fonts" "^3.0.0"
+    "@cspell/dict-fullstack" "^3.0.0"
+    "@cspell/dict-git" "^2.0.0"
+    "@cspell/dict-golang" "^5.0.0"
+    "@cspell/dict-haskell" "^4.0.0"
+    "@cspell/dict-html" "^4.0.1"
+    "@cspell/dict-html-symbol-entities" "^4.0.0"
+    "@cspell/dict-java" "^5.0.2"
+    "@cspell/dict-latex" "^3.0.0"
+    "@cspell/dict-lorem-ipsum" "^3.0.0"
+    "@cspell/dict-lua" "^3.0.0"
+    "@cspell/dict-node" "^4.0.1"
+    "@cspell/dict-npm" "^5.0.0"
+    "@cspell/dict-php" "^3.0.3"
+    "@cspell/dict-powershell" "^3.0.0"
+    "@cspell/dict-public-licenses" "^2.0.0"
+    "@cspell/dict-python" "^4.0.0"
+    "@cspell/dict-r" "^2.0.0"
+    "@cspell/dict-ruby" "^3.0.0"
+    "@cspell/dict-rust" "^3.0.0"
+    "@cspell/dict-scala" "^3.0.0"
+    "@cspell/dict-software-terms" "^3.0.5"
+    "@cspell/dict-sql" "^2.0.0"
+    "@cspell/dict-svelte" "^1.0.0"
+    "@cspell/dict-swift" "^2.0.0"
+    "@cspell/dict-typescript" "^3.0.1"
+    "@cspell/dict-vue" "^3.0.0"
+
+"@cspell/cspell-pipe@6.17.0":
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/@cspell/cspell-pipe/-/cspell-pipe-6.17.0.tgz#1f184bf8785c4365e1110530b887d8745fa95635"
+  integrity sha512-/VlX1cQtVBK9PFvSsaYVzV59i/2de9wrMSYDk+oGLXQzGBf5+5rPDZMJJ+QQkaexMdxoOXjCYTEXnNkPoVFyFA==
+
+"@cspell/cspell-service-bus@6.17.0":
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/@cspell/cspell-service-bus/-/cspell-service-bus-6.17.0.tgz#fc89c0e75a022c83135b4fdad0773cefda469a1e"
+  integrity sha512-HrzR23aeC/ykSOJvUr+uX6Dv7JLc5meNABLxauiC9jexOXFB3DKmo+DvJFerRDOGz6eYSwM0VXAR62OCHrWK/Q==
+
+"@cspell/cspell-types@6.17.0":
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/@cspell/cspell-types/-/cspell-types-6.17.0.tgz#48a31d929d275452a56e8286e2c95f64a89869f0"
+  integrity sha512-4FStDRqZVEP6oYtXqj1wUlF02EC5PN7giJ5f4YPeChwXyQBdZWUPQgEIKn0K9GIgKDMlKRo9tloAHVgtaZ+zOA==
+
+"@cspell/dict-ada@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-ada/-/dict-ada-4.0.0.tgz#172727272ff553c5782335eb2d8cf8eb1e2c11e4"
+  integrity sha512-M0n4ZYmpLOXbDD07Qb/Ekk0K5pX2C+mCuJ2ZxPgbTq9HGlrN43PmqrGJHWcgtVHE3fd1D4VxS85QcQP6r1Y+KQ==
 
-"@cspell/dict-aws@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-aws/-/dict-aws-2.0.0.tgz#9af72af4e59e96029dd4335271d87784843cb7dd"
-  integrity sha512-NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ==
+"@cspell/dict-aws@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-aws/-/dict-aws-3.0.0.tgz#7b2db82bb632c664c3d72b83267b93b9b0cafe60"
+  integrity sha512-O1W6nd5y3Z00AMXQMzfiYrIJ1sTd9fB1oLr+xf/UD7b3xeHeMeYE2OtcWbt9uyeHim4tk+vkSTcmYEBKJgS5bQ==
 
-"@cspell/dict-bash@^2.0.2":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-bash/-/dict-bash-2.0.2.tgz#8bc3e0a6c1b9c0df1bd9a1b7694c58d9843fd16b"
-  integrity sha512-ASIgI/LmV2TYrD4mtk+gm4XmUSTRomOyRt7NDWyBpEww/AeawC2O2NH6FosyUT6dUU3GaXt2wgJRN7R78n1SGg==
+"@cspell/dict-bash@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-bash/-/dict-bash-4.1.0.tgz#b795fcd7cdbf5009cf28f01a76b9958d6c7f44ed"
+  integrity sha512-8pFL03ZKejynfbsa2UZ3iZ7BrT1TAGTD8ZlK822ioAb7aoDvQhYao2Bjz5cXU0uk7CyrlgsSnYX94sLfqDfTxQ==
 
-"@cspell/dict-companies@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-2.0.4.tgz#2ba11418478d99d67a96004ea782a47a42c501a3"
-  integrity sha512-nLNVddo+iu4q/Mu03nkVTMnSPxBkoLyZ0MgpHJZWCqxVATbBkzoZNNNjsTkJhvkbrUIWydf8YW4U4wYY+kyh7Q==
+"@cspell/dict-companies@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-companies/-/dict-companies-3.0.3.tgz#06231a0d21fa1b9137edd1b0702a5da79bc0cacc"
+  integrity sha512-qBWdwA97HdnLbxPLOUTZ+/mg9eYhi14hM7PEUM1PZ004MEIxQHum0IQpypKAwP3teR1KEsyxEPHp8v24Dw45Zg==
 
-"@cspell/dict-cpp@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-cpp/-/dict-cpp-2.0.3.tgz#551bec166c4520f7ba36f8d263fb885d19f98db0"
-  integrity sha512-aWRvI3CQW2M3XeJpDVffItw/9n4hxsN5EPwyBa6Po6EnCxZZZLOqpieZk4JNz4pH0/xbnOX+sMMuSeKWr71r/w==
+"@cspell/dict-cpp@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-cpp/-/dict-cpp-4.0.0.tgz#e51be1865a70964be32c70c5a5fce28fb4cf46e2"
+  integrity sha512-NrCmer14tTSbPs1TwqyCjFEmWCBw0UFvAn4O3pdWuxktArHxRJ5vUQOoL2Gus2H9s3ihhOJZkcuJ47Kd21E7BQ==
 
-"@cspell/dict-cryptocurrencies@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-2.0.0.tgz#a74eecb42a46a96d08b6613fdb5c554529d3afff"
-  integrity sha512-nREysmmfOp7L2YCRAUufQahwD5/Punzb5AZ6eyg4zUamdRWHgBFphb5/9h2flt1vgdUfhc6hZcML21Ci7iXjaA==
+"@cspell/dict-cryptocurrencies@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-cryptocurrencies/-/dict-cryptocurrencies-3.0.1.tgz#de1c235d6427946b679d23aacff12fea94e6385b"
+  integrity sha512-Tdlr0Ahpp5yxtwM0ukC13V6+uYCI0p9fCRGMGZt36rWv8JQZHIuHfehNl7FB/Qc09NCF7p5ep0GXbL+sVTd/+w==
 
-"@cspell/dict-csharp@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-csharp/-/dict-csharp-2.0.1.tgz#86ec4fa42ba9a4cc57df28ec7a335b56bf751c5b"
-  integrity sha512-ZzAr+WRP2FUtXHZtfhe8f3j9vPjH+5i44Hcr5JqbWxmqciGoTbWBPQXwu9y+J4mbdC69HSWRrVGkNJ8rQk8pSw==
+"@cspell/dict-csharp@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-csharp/-/dict-csharp-4.0.2.tgz#e55659dbe594e744d86b1baf0f3397fe57b1e283"
+  integrity sha512-1JMofhLK+4p4KairF75D3A924m5ERMgd1GvzhwK2geuYgd2ZKuGW72gvXpIV7aGf52E3Uu1kDXxxGAiZ5uVG7g==
+
+"@cspell/dict-css@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-css/-/dict-css-4.0.0.tgz#b5ce2b1eeabc72e02770ad118885d43fc02af882"
+  integrity sha512-ieSeG9KAJGIr5eK0JRWqD5KXstPPUw6JUTmGWc7P/qiqj/sjmhWqWKEt7HhoSNcb8uQxAkAoxhrNpfbKzqnKAw==
 
-"@cspell/dict-css@^2.0.0":
+"@cspell/dict-dart@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-css/-/dict-css-2.0.0.tgz#91dca013f16b51144eaea160e144b830f2dad027"
-  integrity sha512-MrFyswFHnPh4H0u6IlV4eHy+ZCUrrHzeL161LyTOqCvaKpbZavMgNYXzZqTF9xafO0iLgwKrl+Gkclu1KVBg0Q==
+  resolved "https://registry.yarnpkg.com/@cspell/dict-dart/-/dict-dart-2.0.0.tgz#e4189e23a29270dcc92e994df31b520239785c42"
+  integrity sha512-p7vHszsu2uJt+F04gvNy1e5okypFfVEYHBWgpOV/Jrvs0F5A+gUzFTG2Ix9b1jkCigAULYKQkIGue+qlhSoK5Q==
 
-"@cspell/dict-dart@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dart/-/dict-dart-1.1.0.tgz#d79689493debdad231efe495bd1460bff1d2f577"
-  integrity sha512-bBqZINm+RVjMgUrAhRzv/xx3jc3dkIqO0higPbsK+63IAtMNY3EiQnEO4eapbU+qAhyvICY9hZQZXy5Ux4p+Pw==
+"@cspell/dict-django@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-django/-/dict-django-4.0.0.tgz#a472056db5f2eed1fd5a5d7f441530897197db57"
+  integrity sha512-k0npSzQrPQSqjR2XtumV14sv9waTRMUzPx0UfOuJZcnCCZY8ofPeqFYoku+O+9Kc9etFOziOxnScshKVDzYWOQ==
 
-"@cspell/dict-django@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-django/-/dict-django-2.0.0.tgz#a5f5f693a686e5873f9dfb547ee3b3142ef760b1"
-  integrity sha512-GkJdJv6cmzrKcmq2/oxTXjKF5uv71r4eTqnFmgPbNBW1t+G4VYpzOf0QrVQrhx2RC4DdW5XfcTf+iS0FxHOTmw==
+"@cspell/dict-docker@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-docker/-/dict-docker-1.1.3.tgz#a9772c3ad163788525eb41fb6e25f9020e5ef00f"
+  integrity sha512-Iz7EQGnLBgnnmzCC8iLQ7JssCCQlCjZLiCs0qhooETWLifob3nzsI9AVBh3gkYLhISLIIjBpfa4LTknskT7LzA==
 
-"@cspell/dict-dotnet@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-2.0.1.tgz#8ef56df758b63f0a2ba4d8681a427a6861ed34d5"
-  integrity sha512-b1n4crJRW0WZVf9Gp/52j/tDtjYiZ3N81fIyfqPlBrjsh/5AivfA697DYwQ2mr8ngNX7RsqRtYNQjealA1rEnQ==
+"@cspell/dict-dotnet@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-dotnet/-/dict-dotnet-4.0.0.tgz#0e0ba551885d4713833bb39b83a1211876150bb4"
+  integrity sha512-biZiTWyDqwVV2m+c17lLIliPDXPjOR1VwwmyMxvb3nFS84aP9x52SAVCf0w7Io1CIpUiY7XnG6/xeI7esYU78w==
 
-"@cspell/dict-elixir@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-2.0.1.tgz#1a9b422215b5edabb84568cfa5c0c70bc164a2ce"
-  integrity sha512-eTTTxZt1FqGkM780yFDxsGHvTbWqvlK8YISSccK8FyrB6ULW+uflQlNS5AnWg3uWKC48b7pQott+odYCsPJ+Ow==
+"@cspell/dict-elixir@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-elixir/-/dict-elixir-4.0.0.tgz#336dd133890dc84931dad63292927926f9bca986"
+  integrity sha512-0TqqdQjg/zu3wAjk2FQkZ87pPIS9tA9kl6he5NJB729ysrWhND/7aSPC48QrP46VZ+oFrvFZK8DC8ZlYs16cjQ==
 
-"@cspell/dict-en-gb@^1.1.33":
+"@cspell/dict-en-gb@1.1.33":
   version "1.1.33"
   resolved "https://registry.yarnpkg.com/@cspell/dict-en-gb/-/dict-en-gb-1.1.33.tgz#7f1fd90fc364a5cb77111b5438fc9fcf9cc6da0e"
   integrity sha512-tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g==
 
-"@cspell/dict-en_us@^2.2.2":
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-2.2.3.tgz#e22c9d402c6d4638960cc320369e45348a0cd8a2"
-  integrity sha512-JV+aD4mzTcF0T3sZB/PC91ByLqtKIxz21xLQNq0ZGM+cK+EbMLqfKTYjB72WkLZtqkjsPhQ2Bv5JtIlLCCXDIw==
+"@cspell/dict-en_us@^4.1.0":
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-en_us/-/dict-en_us-4.1.0.tgz#34823c87a6a9b21fc7aa198c060a82de804201a3"
+  integrity sha512-EnfxP/5U3kDhmTWcHV7Xs2Fxa9KAE5fbHm+4u8LGBOUZvSkZC5+ayjQ50CfEyTGuaI/946ITQYPRNxUZ7oqOiQ==
 
-"@cspell/dict-filetypes@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-filetypes/-/dict-filetypes-2.0.1.tgz#a77467dad8fee31c28d623f85a15ce6fca3e2fdc"
-  integrity sha512-bQ7K3U/3hKO2lpQjObf0veNP/n50qk5CVezSwApMBckf/sAVvDTR1RGAvYdr+vdQnkdQrk6wYmhbshXi0sLDVg==
+"@cspell/dict-filetypes@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-filetypes/-/dict-filetypes-3.0.0.tgz#3bb1ede3e28449f0d76024a7b918a556f210973a"
+  integrity sha512-Fiyp0z5uWaK0d2TfR9GMUGDKmUMAsOhGD5A0kHoqnNGswL2iw0KB0mFBONEquxU65fEnQv4R+jdM2d9oucujuA==
+
+"@cspell/dict-fonts@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-fonts/-/dict-fonts-3.0.0.tgz#af2755305fbd62fb55a8515989a29f6e58aff9c9"
+  integrity sha512-zTZni0AbwBVG1MKA0WpwPyIJPVF+gp6neXDQzHcu4RUnuQ4uDu0PVEuZjGHCJWwwFoR5JmkqZxVSg1y3ufJODA==
 
-"@cspell/dict-fonts@^2.0.0":
+"@cspell/dict-fullstack@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-fullstack/-/dict-fullstack-3.0.0.tgz#e03e0bf627f6d8946c156b824aa99d7ae8344800"
+  integrity sha512-BMQRTaeReLufjMwgWqqwPdrXQ7jkVGTv7/YvOLsHFZvcAP3eM7WqX+rvdXckLhJmuuzbceFRDKs5F/9Ig2x/tQ==
+
+"@cspell/dict-git@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fonts/-/dict-fonts-2.0.0.tgz#76e7781b44cdda6933144e15cba80e978c29bd15"
-  integrity sha512-AgkTalphfDPtKFPYmEExDcj8rRCh86xlOSXco8tehOEkYVYbksOk9XH0YVH34RFpy93YBd2nnVGLgyGVwagcPw==
+  resolved "https://registry.yarnpkg.com/@cspell/dict-git/-/dict-git-2.0.0.tgz#fa5cb298845da9c69efc01c6af07a99097718dc9"
+  integrity sha512-n1AxyX5Kgxij/sZFkxFJlzn3K9y/sCcgVPg/vz4WNJ4K9YeTsUmyGLA2OQI7d10GJeiuAo2AP1iZf2A8j9aj2w==
 
-"@cspell/dict-fullstack@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-fullstack/-/dict-fullstack-2.0.5.tgz#ffe416f90b0b30f1586e75432c0bc09b4c1faf96"
-  integrity sha512-jnLnHZ4HcCFNUfN+q7m0CUDtISNKat0Jahe1GgnAdEwzcozqKBhlGAjV7mQWPtKpqfJU61JakDnrxzqefAfZHw==
+"@cspell/dict-golang@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-golang/-/dict-golang-5.0.0.tgz#4691483b46ef43985d3b24b51cec89524af9cb9b"
+  integrity sha512-Cbx4mVHsGbr5D+wlT0yU3n/0c5iLvciU48rSOQR7SCAzu5mTXyM1mqRu6nqnRiMv6G6mO50EL2LCTq6RZrlIOg==
 
-"@cspell/dict-git@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-git/-/dict-git-1.0.1.tgz#9de5ab2532abcdc8b10bd83ccb1f5e5dae0b6067"
-  integrity sha512-Rk+eTof/9inF11lvxmkCRK+gODatA3qai8kSASv6OG/JfPvpj7fTHErx/rdgPw/LOTDUafnoTjTYmj7B2MOQXg==
+"@cspell/dict-haskell@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-haskell/-/dict-haskell-4.0.0.tgz#d63d863d420686c0f2502ca5ca10b251cccb1af2"
+  integrity sha512-U/DPpDoitGeUvduM9teDkDc1zs4Plgh0pNONDP3YbsEICErSlp1NfatD0i35Z6cR0C7I8uEe4gG2phG00zrSqw==
 
-"@cspell/dict-golang@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-golang/-/dict-golang-2.0.0.tgz#a392533780c9fc3dc959f1358d09f7a6c6d82656"
-  integrity sha512-rUeZJR/S/ZjAsOURtxsAO6xDQhL0IzF458ScahaeOqe0zVL3tx7tCLikCgT92NWPs3BNqmsZGqYSDbn/1KsSIA==
+"@cspell/dict-html-symbol-entities@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-4.0.0.tgz#4d86ac18a4a11fdb61dfb6f5929acd768a52564f"
+  integrity sha512-HGRu+48ErJjoweR5IbcixxETRewrBb0uxQBd6xFGcxbEYCX8CnQFTAmKI5xNaIt2PKaZiJH3ijodGSqbKdsxhw==
 
-"@cspell/dict-haskell@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-haskell/-/dict-haskell-2.0.0.tgz#9e7e58eba2b4633221650dcdcc43f73588b48119"
-  integrity sha512-cjX1Br+gSWqtcmJD/IMHz1UoP3pUaKIIKy/JfhEs7ANtRt6hhfEKe9dl2kQzDkkKt4pXol+YgdYxL/sVc/nLgQ==
+"@cspell/dict-html@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-4.0.1.tgz#bbda95c7b22f290028d0a164ad30892f8ef178da"
+  integrity sha512-q5fCzkoOz+8BW79qLrnANEDnG+Jb2WS2fXERxg9xwgKBXwXUxH8ttGVNhfkLpNWe/UMm00U1IZMnVGyYLNTO5w==
 
-"@cspell/dict-html-symbol-entities@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-html-symbol-entities/-/dict-html-symbol-entities-2.0.0.tgz#a25d39e62bd2dd7191ca5612714aa0a1b90ca10f"
-  integrity sha512-71S5wGCe7dq6C+zGDwsEAe5msub/irrLi6SExeG11a/EkpA3RKAEheDGPk0hOY4+vOcIFHaApxOjLTtgQfYWfA==
+"@cspell/dict-java@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-java/-/dict-java-5.0.2.tgz#be6f8e9ebc8fe7ec3287f31ac74836990ede7878"
+  integrity sha512-HWgdp8plZOdYjOkndwmgHGVxoewylZcl886PqSL6TMcDshyI0+2nePft31nIuALRvt7HL8IX++DM1uk4UfY4kg==
 
-"@cspell/dict-html@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-html/-/dict-html-3.0.1.tgz#d5d10ef9b62361d8250cf9fe8564606993faa9df"
-  integrity sha512-sbuFd+nSjgbrGf5eYwSddFhm1eLLePKWyH6Zn8Zb0OODrBK5e4vGn1/scI/MOH5a2IvNs8W9wp84uMBFJcQZtw==
+"@cspell/dict-latex@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-3.0.0.tgz#921ed324f841cc7d0d70ac469d9b9758b4b005e3"
+  integrity sha512-QsRWj+Jll4ueVbce8ofKa743oQ2exmbVNZN70MaMbmu8PSbjW2+Rj3OdExVStesANMj7qc20inS/TgPr8DrInQ==
 
-"@cspell/dict-java@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-java/-/dict-java-2.0.0.tgz#76252cee8f04e099ac6dae0f45f22257088060a7"
-  integrity sha512-9f5LDATlAiXRGqxLxgqbOLlQxuMW2zcN7tBgxwtN+4u90vM03ZUOR/gKIuDV/y0ZuAiWBIjA73cjk8DJ13Q1eA==
+"@cspell/dict-lorem-ipsum@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-3.0.0.tgz#c6347660fcab480b47bdcaec3b57e8c3abc4af68"
+  integrity sha512-msEV24qEpzWZs2kcEicqYlhyBpR0amfDkJOs+iffC07si9ftqtQ+yP3lf1VFLpgqw3SQh1M1vtU7RD4sPrNlcQ==
 
-"@cspell/dict-latex@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-latex/-/dict-latex-2.0.0.tgz#0b13b6522d305f5842833ec0179078d900714f65"
-  integrity sha512-H6RRwbHhQ9ARoO1R57SDqB+q/J5jUDdVnkdfukJkA+HNlJBhCcDuzGOIJqr+GBkJYDkF3obZ3LEOk2lUfT+Eyg==
+"@cspell/dict-lua@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-lua/-/dict-lua-3.0.0.tgz#f90898cfa19610c7e228b4d5ba8fdeed55b0f4cf"
+  integrity sha512-WOhSCgS5wMxkGQJ8siB90iTB9ElquJB7FeqYSbJqqs6cUwH8G7MM/CEDPL6h7vCo0+v3GuxQ8yKWDSUcUhz9Lg==
+
+"@cspell/dict-node@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-node/-/dict-node-4.0.1.tgz#9fe1dffa47c6fb536b2ab8f38e9a09b96591b888"
+  integrity sha512-4EmT5yZFitdwnG0hYEd+Ek19zzD81Bp+n7w0kglZKldS5AvapwW6GM/SAps5YMQQc5zZMi+bMgV7NIzapREqUg==
+
+"@cspell/dict-npm@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-5.0.0.tgz#10194709ed626c73c551730b97c701ab6077e237"
+  integrity sha512-eegoQrzfAl6yht+BgQu7YkqeKbVb3FsFIobW3pBE/c8TqEnfnxRHnS4/e80PA16rO9uJgSF5iKBxTbtEIGYvsg==
+
+"@cspell/dict-php@^3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-php/-/dict-php-3.0.3.tgz#5f29b924ddb69eb780ac75e8bbad21a3fd4dda00"
+  integrity sha512-7dvXdPTfbIF2xEob9w94/eV5SU8BkYoN0R7EQghXi0fcF7T1unK+JwDgfoEs6wqApB5aCVYwguiaj8HGX2IRIQ==
+
+"@cspell/dict-powershell@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-powershell/-/dict-powershell-3.0.0.tgz#b39fb6d918ac33317176f0d59ee85accbc1dbfcd"
+  integrity sha512-pkztY9Ak4oc33q+Qxcn9/CTOKo4N8YIRRE6v67WwQOncA5QIJfcOPUrjfR3Z8SpzElXhu3s9qtWWSqbCy6qmcA==
 
-"@cspell/dict-lorem-ipsum@^2.0.0":
+"@cspell/dict-public-licenses@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-lorem-ipsum/-/dict-lorem-ipsum-2.0.0.tgz#47f2a9ec24808cdf8417457ae8f5a588f33c338c"
-  integrity sha512-jKogAKtqvgPMleL6usyj3rZ0m8sVUR6drrD+wMnWSfdx1BmUyTsYiuh/mPEfLAebaYHELWSLQG3rDZRvV9Riqg==
+  resolved "https://registry.yarnpkg.com/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.0.tgz#fbe9b59ca530408d571ec1e92002195b5e64a64b"
+  integrity sha512-NdMHnS6xiYJKlzVoTV5CBhMiDpXMZ/PDcvXiOpxeR50xkjR18O/XFP4f4eDZpxGiBSUCMFRWf4JjILJ04Rpcfg==
+
+"@cspell/dict-python@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-4.0.0.tgz#b3b206b20d57fa05d6e4dc921ef4dacb74a79405"
+  integrity sha512-MC6CKbYOly3Ig25ZnhlCzPbE/QozqfQv4VYW6HcoMQ5IbHu33ddf2lzkZ89qTXlxsF5NT5qfZEkQYHYuhuL6AQ==
 
-"@cspell/dict-lua@^2.0.0":
+"@cspell/dict-r@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-lua/-/dict-lua-2.0.0.tgz#b96d0363a28ac7e0483ad03edb21705c4f951459"
-  integrity sha512-7WUEBEspSKtsq104WdIys1+DLqAxpJPzw74Py1TuE3fI5GvlzeSZkRFP2ya54GB2lCO4C3mq4M8EnitpibVDfw==
+  resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-2.0.0.tgz#f9138199d4f7a1903895ad0c49329a4159b6e571"
+  integrity sha512-rdt1cKc3VL2uXJ2X088gRhTFreN/MkJWK1jccW1EWdFHLzDwhKfrlAkoLCp0paD6HvmloLQ+eSR09D58DdsYfA==
 
-"@cspell/dict-node@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-node/-/dict-node-2.0.1.tgz#eda891ebdbce83f20829cb6c85cd209da8cf5cdd"
-  integrity sha512-ztBWzhvI+YaMehICSJ65cohhjQqoztxf9vrS3YckOiVGBFvUMaFVNdX9klQkvrLcS/O4+2PzoGeIEkmf99amLA==
+"@cspell/dict-ruby@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-3.0.0.tgz#32ce796a85930080acc4883e83f9d36ba7995a6c"
+  integrity sha512-sA98T8Y1Pmq3RStVkO14E8vTWkq6JUn8c8PldiMyYgV0yfQgwhQfFAzlSfF3Gg2B0VkIdqt2et2SPN7f9wp7fQ==
 
-"@cspell/dict-npm@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-npm/-/dict-npm-2.0.3.tgz#044d71c36cf322f2816a77978bfd5dc21698667c"
-  integrity sha512-K/rnVhmHkR3jfdo7o8P2NDKyMcpVe9pUBiFDY1y2C0YqZXIxCz1f5hObm/hxyO+Vbn5VLU3TKU5fZ5z3LspXOg==
+"@cspell/dict-rust@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-rust/-/dict-rust-3.0.0.tgz#8170fd9300bab7296822c908296f54acddc56a44"
+  integrity sha512-L1T1IBsYJZVDmfOGAbVLcpc6arWxRRCSJYvHSwEDBGrNuMyJ4jx/NvBEz5crcKf4vVKgwVlXgzQlJJZ8AVxU9w==
 
-"@cspell/dict-php@^2.0.0":
+"@cspell/dict-scala@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-3.0.0.tgz#4e74d4638208dd73beae718c3dc0eb8a171fa794"
+  integrity sha512-sIiCQDIMMnNns/fzD61z5npbh5pypaKq07Orqe0+eRfdQpika8iRSGUGFHVbtdd1JzB1DyTCV2e8OwdaQiXqJQ==
+
+"@cspell/dict-software-terms@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-3.0.5.tgz#59c34ad7c04f2b6f4e968348785921ff09fe5db2"
+  integrity sha512-xZVcX1zsIUbLvUc/RX+YgJRvbHaGMcdkRR+Vw8UoLjmhnT0yXWLds5uwRwAVjlQIrIcHylfDWuG70Cq5nmJHfA==
+
+"@cspell/dict-sql@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-php/-/dict-php-2.0.0.tgz#5d42f7df7c1da89fe19c2ccfe1bf61231d183990"
-  integrity sha512-29WgU77eTO985LvMHwPi1pcpfopfCWfTdffDyqya0JIfOSaFUrlYKzGPkE4mRxcz2G3hXsaM0SRvBNdIRwEdUg==
+  resolved "https://registry.yarnpkg.com/@cspell/dict-sql/-/dict-sql-2.0.0.tgz#945e0f46ed4d51794c1d0a5138e87fc1ce0e217d"
+  integrity sha512-J3X8VSgWpc/4McQEs138abtBw/SO3Z+vGaYi5X7XV1pKPBxjupHTTNQHSS/HWUDmVWj6fR3OV+ZGptcmvv3Clg==
 
-"@cspell/dict-powershell@^2.0.0":
+"@cspell/dict-svelte@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-svelte/-/dict-svelte-1.0.0.tgz#22875a1e7e73e39aaaae4e08f48cf5700eea6256"
+  integrity sha512-5mE1bPMv+0Zdv6fiaHw86kZ47FhqNy9waUyGOT/wSWf6M5lxCZ3ze15rDruit6/62DaYo7A4/1dgKxpRo6/ZBQ==
+
+"@cspell/dict-swift@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-powershell/-/dict-powershell-2.0.0.tgz#6e8ae7381b1928dfaf8f5a625f8fae6e8d93f224"
-  integrity sha512-6uvEhLiGmG3u9TFkM1TYcky6aL9Yk7Sk3KJwoTYBaQJY2KqrprgyQtW6yxIw9oU52VRHlq3KKvSAA9Q26+SIkQ==
+  resolved "https://registry.yarnpkg.com/@cspell/dict-swift/-/dict-swift-2.0.0.tgz#4b7742452ceb0c9cd55f5e7f261d58f4db9999c4"
+  integrity sha512-VStJ0fKPPNIXKmxJrbGH6vKNtJCwAnQatfSH0fVj+Unf3QHHlmuLKRG0cN0aVgEIolpRkxNXJcSB3CPbYr0Xhw==
 
-"@cspell/dict-public-licenses@^1.0.4":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-public-licenses/-/dict-public-licenses-1.0.4.tgz#13c2af357e7139bf3896eba58e0feb9f51053b3f"
-  integrity sha512-h4xULfVEDUeWyvp1OO19pcGDqWcBEQ7WGMp3QBHyYpjsamlzsyYYjCRSY2ZvpM7wruDmywSRFmRHJ/+uNFT7nA==
+"@cspell/dict-typescript@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-3.0.1.tgz#a72dac17f77d3fa628c674faa75f1baa39955e42"
+  integrity sha512-nKEtOpj+rJNIUK268/mCFDCIv1MWFdK1efm9YL4q1q3NHT+qCKhkXoA0eG8k4AaDIpsvebB8CgNIYFPxY92r4A==
 
-"@cspell/dict-python@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-python/-/dict-python-3.0.3.tgz#6c55ee768ffe93a828e607bcab437ccf78c494c6"
-  integrity sha512-Mt415KczTfqmLvKTgeV8FzMzpms9baTS0P5HfULTW+UxQtZeroviYyRM9TJPJKJSoI0ISu0GiIDgmYlV7+YPog==
+"@cspell/dict-vue@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@cspell/dict-vue/-/dict-vue-3.0.0.tgz#68ccb432ad93fcb0fd665352d075ae9a64ea9250"
+  integrity sha512-niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A==
+
+"@cspell/strong-weak-map@6.17.0":
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/@cspell/strong-weak-map/-/strong-weak-map-6.17.0.tgz#841ef99a4e0fdf9aacce36281829b87616b01478"
+  integrity sha512-fRghm6eoUEH7Uz57t0SEKJNm4lqODF2/DRiLd2ek7QkzUHKrCetre/5UrvdE78GIUyl0+8GLx9iFwo/XFa6dDA==
+
+"@csstools/postcss-cascade-layers@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz#8a997edf97d34071dd2e37ea6022447dd9e795ad"
+  integrity sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
+    postcss-selector-parser "^6.0.10"
+
+"@csstools/postcss-color-function@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz#2bd36ab34f82d0497cfacdc9b18d34b5e6f64b6b"
+  integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-font-format-keywords@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz#677b34e9e88ae997a67283311657973150e8b16a"
+  integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==
+  dependencies:
+    postcss-value-parser "^4.2.0"
 
-"@cspell/dict-r@^1.0.2":
+"@csstools/postcss-hwb-function@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-r/-/dict-r-1.0.2.tgz#4f21b240427e9bbaab8f82e0e20122d6b3cf7cee"
-  integrity sha512-Rp3d4sgD6izW9TW5yVI3D//3HTl9oOGBuzTvXRdoHksVPRvzIu2liVhj8MnQ3XIRe5Kc6IhLBAm6izuV2BpGwQ==
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz#ab54a9fce0ac102c754854769962f2422ae8aa8b"
+  integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==
+  dependencies:
+    postcss-value-parser "^4.2.0"
 
-"@cspell/dict-ruby@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz#1cbd4d8803428bd421a5562b2d2bb4b3bae80bce"
-  integrity sha512-qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ==
+"@csstools/postcss-ic-unit@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz#28237d812a124d1a16a5acc5c3832b040b303e58"
+  integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
+    postcss-value-parser "^4.2.0"
 
-"@cspell/dict-rust@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-rust/-/dict-rust-2.0.0.tgz#89acc6c251164b09c424d23abb5ee560a4484ee6"
-  integrity sha512-EWlQivTKXMU3TTcq/Pi6KPKTQADknasQ700UrxRPzxhwQ4sKVZ88GDu6VZJlsbFUz8Vko289KS6wjiox/7WpmQ==
+"@csstools/postcss-is-pseudo-class@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz#846ae6c0d5a1eaa878fce352c544f9c295509cd1"
+  integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
+    postcss-selector-parser "^6.0.10"
 
-"@cspell/dict-scala@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-scala/-/dict-scala-2.0.0.tgz#b8098103bb03a13406c1c79f1769052353aafac4"
-  integrity sha512-MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g==
+"@csstools/postcss-nested-calc@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz#d7e9d1d0d3d15cf5ac891b16028af2a1044d0c26"
+  integrity sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==
+  dependencies:
+    postcss-value-parser "^4.2.0"
 
-"@cspell/dict-software-terms@^2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-software-terms/-/dict-software-terms-2.1.5.tgz#4e2aa08839f37aa933cf1ac5196dbc7005bc8d3e"
-  integrity sha512-ylXWCsOJlYuucaMoHaHQLVaB8HeDrsCZ42a3jrTC/i6F/SF9I+4tBg4lMivd4w31bXBgILdbIvVHtWzJf+5m0A==
+"@csstools/postcss-normalize-display-values@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz#15da54a36e867b3ac5163ee12c1d7f82d4d612c3"
+  integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-oklab-function@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz#88cee0fbc8d6df27079ebd2fa016ee261eecf844"
+  integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
+    postcss-value-parser "^4.2.0"
 
-"@cspell/dict-swift@^1.0.2":
+"@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.3.0":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz#542292558384361776b45c85226b9a3a34f276fa"
+  integrity sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-stepped-value-functions@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz#f8772c3681cc2befed695e2b0b1d68e22f08c4f4"
+  integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-text-decoration-shorthand@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz#ea96cfbc87d921eca914d3ad29340d9bcc4c953f"
+  integrity sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-trigonometric-functions@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-swift/-/dict-swift-1.0.2.tgz#8d8f7f7a5c8d7cbcdb46fcf4526938ce9cb687a4"
-  integrity sha512-IrMcRO7AYB2qU5cj4ttZyEbd04DRNOG6Iha106qGGmn4P096m+Y7lOnSLJx/rZbD/cAT3Z/7i465Lr1J93j7yg==
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz#94d3e4774c36d35dcdc88ce091336cb770d32756"
+  integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
+  dependencies:
+    postcss-value-parser "^4.2.0"
 
-"@cspell/dict-typescript@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-typescript/-/dict-typescript-2.0.0.tgz#c1ce88dcb1b480623eb537670d11844047539a53"
-  integrity sha512-WFBahxsnD2y4Os14tE5Zxh31Ggn4DzGOAu3UoxYl1lLLxaszx4RH7LmAeFuznySboiaBeRBbpfJOjQA796O6VQ==
+"@csstools/postcss-unset-value@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz#c99bb70e2cdc7312948d1eb41df2412330b81f77"
+  integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
 
-"@cspell/dict-vue@^2.0.2":
+"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2":
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@cspell/dict-vue/-/dict-vue-2.0.2.tgz#8618b9f4825b3d80e1788082c19ac9c15832463e"
-  integrity sha512-/MB0RS0Gn01s4pgmjy0FvsLfr3RRMrRphEuvTRserNcM8XVtoIVAtrjig/Gg0DPwDrN8Clm0L1j7iQay6S8D0g==
-
-"@csstools/convert-colors@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
-  integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
+  resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36"
+  integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
 
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.7"
@@ -1588,34 +1617,34 @@
   resolved "https://registry.yarnpkg.com/@drupal/once/-/once-1.0.1.tgz#7c1ef480aec6d5fa4b5ae986afa5a607afc38482"
   integrity sha512-O8tQmNDBgSm3ADuFZ5OZlGxsrdsc+pEqd1NBoMpSzWwiOnWwC91tqDwnlX+mDh7sBJoJ+4vVwFh0NLUV4LPFvg==
 
-"@eslint/eslintrc@^1.2.2":
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.2.tgz#4989b9e8c0216747ee7cca314ae73791bb281aae"
-  integrity sha512-lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg==
+"@eslint/eslintrc@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95"
+  integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.1"
-    globals "^13.9.0"
+    espree "^9.4.0"
+    globals "^13.15.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@gar/promisify@^1.0.1":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
-  integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
-
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+"@humanwhocodes/config-array@^0.11.6":
+  version "0.11.7"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.7.tgz#38aec044c6c828f6ed51d5d7ae3d9b9faf6dbb0f"
+  integrity sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
@@ -1644,17 +1673,7 @@
   resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.6.tgz#4ac237f4dabc8dd93330386907b97591801f7352"
-  integrity sha512-R7xHtBSNm+9SyvpJkdQl+qrM3Hm2fea3Ef197M3mUug+v+yR+Rhfbs7PBtcBUVnIWJ4JcAdjvij+c8hXS9p5aw==
-
-"@jridgewell/set-array@^1.0.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.0.tgz#1179863356ac8fbea64a5a4bcde93a4871012c01"
-  integrity sha512-SfJxIxNVYLTsKwzB3MoOQ1yxf4w/E6MdkvTgrgAt1bfxjSrLUoHMKrDOykwN14q65waezZIdqDneUIPh4/sKxg==
-
-"@jridgewell/set-array@^1.0.1":
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
@@ -1667,17 +1686,12 @@
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@1.4.14":
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
   resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.12"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.12.tgz#7ed98f6fa525ffb7c56a2cbecb5f7bb91abd2baf"
-  integrity sha512-az/NhpIwP3K33ILr0T2bso+k2E/SLf8Yidd8mHl0n6sCQ4YdyC8qDhZA6kOPDNDBA56ZnIjngVl0U3jREA0BUA==
-
-"@jridgewell/trace-mapping@^0.3.14":
+"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.17"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
   integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
@@ -1685,14 +1699,6 @@
     "@jridgewell/resolve-uri" "3.1.0"
     "@jridgewell/sourcemap-codec" "1.4.14"
 
-"@jridgewell/trace-mapping@^0.3.9":
-  version "0.3.9"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
-  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
-  dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    "@jridgewell/sourcemap-codec" "^1.4.10"
-
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -1706,7 +1712,7 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
@@ -1714,31 +1720,10 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
-"@popperjs/core@2.11.x", "@popperjs/core@^2.11.4":
-  version "2.11.5"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
-  integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
-
-"@testim/chrome-version@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@testim/chrome-version/-/chrome-version-1.1.2.tgz#092005c5b77bd3bb6576a4677110a11485e11864"
-  integrity sha512-1c4ZOETSRpI0iBfIFUqU4KqwBAB2lHUAlBjZz/YqOHqwM9dTTzjV6Km0ZkiEiSCx/tLr1BtESIKyWWMww+RUqw==
+"@popperjs/core@2.11.x", "@popperjs/core@^2.11.5":
+  version "2.11.6"
+  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45"
+  integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==
 
 "@tootallnate/once@1":
   version "1.1.2"
@@ -1750,40 +1735,32 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
 "@types/eslint-scope@^3.7.3":
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
-  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+  version "3.7.4"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.2.tgz#48f2ac58ab9c631cb68845c3d956b28f79fad575"
-  integrity sha512-Z1nseZON+GEnFjJc04sv4NSALGjhFwy6K0HXt7qsn5ArfAKtb63dXNJHf+1YW6IpOIYRBGUbu3GwJdj8DGnCjA==
+  version "8.4.10"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.10.tgz#19731b9685c19ed1552da7052b6f668ed7eb64bb"
+  integrity sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.51":
+"@types/estree@*":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+  integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
+
+"@types/estree@^0.0.51":
   version "0.0.51"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
-"@types/glob@^7.1.1":
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb"
-  integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==
-  dependencies:
-    "@types/minimatch" "*"
-    "@types/node" "*"
-
 "@types/json-schema@*", "@types/json-schema@^7.0.8":
   version "7.0.11"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -1794,20 +1771,15 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/minimatch@*":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
-  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
-
 "@types/minimist@^1.2.0":
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
   integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
 
 "@types/node@*":
-  version "17.0.31"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.31.tgz#a5bb84ecfa27eec5e1c802c6bbf8139bdb163a5d"
-  integrity sha512-AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q==
+  version "18.11.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
+  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
@@ -1819,13 +1791,6 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/yauzl@^2.9.1":
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599"
-  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
-  dependencies:
-    "@types/node" "*"
-
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
@@ -1947,22 +1912,20 @@
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
-  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
+"@webpack-cli/configtest@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
+  integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
 
-"@webpack-cli/info@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
-  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
-  dependencies:
-    envinfo "^7.7.3"
+"@webpack-cli/info@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
+  integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
 
-"@webpack-cli/serve@^1.6.1":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
-  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
+"@webpack-cli/serve@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
+  integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -1974,48 +1937,43 @@
   resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.5, abab@^2.0.6:
+abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
   dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
 
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
-acorn-walk@^8.2.0:
+acorn-walk@^8.0.2, acorn-walk@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+acorn@^8.1.0, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0, acorn@^8.8.1:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
-acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.7.0:
+  version "8.8.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
   version "6.0.2"
@@ -2024,14 +1982,6 @@ agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-aggregate-error@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
-  integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
-  dependencies:
-    clean-stack "^2.0.0"
-    indent-string "^4.0.0"
-
 ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
@@ -2048,9 +1998,9 @@ ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
-  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.2.tgz#aecb20b50607acf2569b6382167b65a96008bb78"
+  integrity sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
@@ -2147,10 +2097,21 @@ array.prototype.flat@^1.2.5:
     es-abstract "^1.19.2"
     es-shim-unscopables "^1.0.0"
 
+array.prototype.reduce@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.4.tgz#8167e80089f78bff70a99e20bd4201d4663b0a6f"
+  integrity sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.2"
+    es-array-method-boxes-properly "^1.0.0"
+    is-string "^1.0.7"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
-  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 asn1@~0.2.3:
   version "0.2.6"
@@ -2162,7 +2123,7 @@ asn1@~0.2.3:
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
 assertion-error@1.1.0, assertion-error@^1.1.0:
   version "1.1.0"
@@ -2182,80 +2143,65 @@ astral-regex@^2.0.0:
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-autoprefixer@^9.6.1:
-  version "9.8.8"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
-  integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
+autoprefixer@^10.4.13:
+  version "10.4.13"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8"
+  integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
   dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001109"
+    browserslist "^4.21.4"
+    caniuse-lite "^1.0.30001426"
+    fraction.js "^4.2.0"
     normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    picocolors "^0.2.1"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
+    picocolors "^1.0.0"
+    postcss-value-parser "^4.2.0"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
-axios@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
-  dependencies:
-    follow-redirects "^1.14.4"
-
 babel-plugin-add-header-comment@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/babel-plugin-add-header-comment/-/babel-plugin-add-header-comment-1.0.3.tgz#511c4901062640d5a480b4ac3edd6944195850ec"
   integrity sha1-URxJAQYmQNWkgLSsPt1pRBlYUOw=
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
-  dependencies:
-    object.assign "^4.1.0"
-
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
-  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
-  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
-  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 backbone@1.4.x:
   version "1.4.1"
@@ -2277,15 +2223,10 @@ balanced-match@^2.0.0:
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
   dependencies:
     tweetnacl "^0.14.3"
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
 binary-extensions@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
@@ -2296,11 +2237,6 @@ bluebird@^3.5.0:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -2323,31 +2259,20 @@ braces@^3.0.2, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browser-stdout@1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.6.4:
-  version "4.20.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf"
-  integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg==
+browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
   dependencies:
-    caniuse-lite "^1.0.30001332"
-    electron-to-chromium "^1.4.118"
-    escalade "^3.1.1"
-    node-releases "^2.0.3"
-    picocolors "^1.0.0"
-
-buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -2359,30 +2284,6 @@ bytes@3.1.2:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
-cacache@^15.0.5:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2396,11 +2297,6 @@ callsites@^3.0.0, callsites@^3.1.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-css@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5"
-  integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==
-
 camelcase-keys@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
@@ -2415,25 +2311,15 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001332:
-  version "1.0.30001335"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001335.tgz#899254a0b70579e5a957c32dced79f0727c61f2a"
-  integrity sha512-ddP1Tgm7z2iIxu6QTtbZUv6HJxSaV/PZeSrWFZtbY4JZ69tOeNhBCl3HyRQgeNZKE5AOn1kpV7fhljigy0Ty3w==
+caniuse-lite@^1.0.30001400, caniuse-lite@^1.0.30001426:
+  version "1.0.30001434"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz#ec1ec1cfb0a93a34a0600d37903853030520a4e5"
+  integrity sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==
 
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chai-nightwatch@^0.4.0:
   version "0.4.2"
@@ -2482,56 +2368,33 @@ chokidar@^3.3.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
-  integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-
 chrome-trace-event@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-chromedriver@^98.0.1:
-  version "98.0.1"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-98.0.1.tgz#ccb1e36a003b4c6af0b184caa00fca8370d88f2a"
-  integrity sha512-/04KkHHE/K/lfwdPTQr5fxi1dWvM83p8T/IkYbyGK2PBlH7K49Dd71A9jrS+aWgXlZYkuHhbwiy2PA2QqZ5qQw==
-  dependencies:
-    "@testim/chrome-version" "^1.1.2"
-    axios "^0.24.0"
-    del "^6.0.0"
-    extract-zip "^2.0.1"
-    https-proxy-agent "^5.0.0"
-    proxy-from-env "^1.1.0"
-    tcp-port-used "^1.0.1"
-
 ci-info@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
   integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
 
-ckeditor5@^35.3.2, ckeditor5@~35.3.2:
-  version "35.3.2"
-  resolved "https://registry.yarnpkg.com/ckeditor5/-/ckeditor5-35.3.2.tgz#c5cf786fd09b439fa5b1639b79467f2744d39124"
-  integrity sha512-QQbXi3EbarHOdb8qgQ+EY8PhDYrtpRMQC3k3J9rhTZLQcVYYxMkFwlVtaN8TtxpLo00KGAV1+FticdBL7RqpXA==
-  dependencies:
-    "@ckeditor/ckeditor5-clipboard" "^35.3.2"
-    "@ckeditor/ckeditor5-core" "^35.3.2"
-    "@ckeditor/ckeditor5-engine" "^35.3.2"
-    "@ckeditor/ckeditor5-enter" "^35.3.2"
-    "@ckeditor/ckeditor5-paragraph" "^35.3.2"
-    "@ckeditor/ckeditor5-select-all" "^35.3.2"
-    "@ckeditor/ckeditor5-typing" "^35.3.2"
-    "@ckeditor/ckeditor5-ui" "^35.3.2"
-    "@ckeditor/ckeditor5-undo" "^35.3.2"
-    "@ckeditor/ckeditor5-upload" "^35.3.2"
-    "@ckeditor/ckeditor5-utils" "^35.3.2"
-    "@ckeditor/ckeditor5-widget" "^35.3.2"
-
-clean-stack@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
-  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+ckeditor5@^35.4.0, ckeditor5@~35.4.0:
+  version "35.4.0"
+  resolved "https://registry.yarnpkg.com/ckeditor5/-/ckeditor5-35.4.0.tgz#0ce67af211551b96856b780e3729481cadbb34df"
+  integrity sha512-vBEQVkFCbjYmEPVkyWsOqU44DOovUio6xBuCwroe4TuJLplqeRasCjFwB0DPknXQU8U0iM3Lh/QSKRyN92pw3Q==
+  dependencies:
+    "@ckeditor/ckeditor5-clipboard" "^35.4.0"
+    "@ckeditor/ckeditor5-core" "^35.4.0"
+    "@ckeditor/ckeditor5-engine" "^35.4.0"
+    "@ckeditor/ckeditor5-enter" "^35.4.0"
+    "@ckeditor/ckeditor5-paragraph" "^35.4.0"
+    "@ckeditor/ckeditor5-select-all" "^35.4.0"
+    "@ckeditor/ckeditor5-typing" "^35.4.0"
+    "@ckeditor/ckeditor5-ui" "^35.4.0"
+    "@ckeditor/ckeditor5-undo" "^35.4.0"
+    "@ckeditor/ckeditor5-upload" "^35.4.0"
+    "@ckeditor/ckeditor5-utils" "^35.4.0"
+    "@ckeditor/ckeditor5-widget" "^35.4.0"
 
 clear-module@^4.1.2:
   version "4.1.2"
@@ -2548,7 +2411,7 @@ cli-cursor@^3.1.0:
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-spinners@^2.2.0, cli-spinners@^2.6.1:
+cli-spinners@^2.2.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
   integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
@@ -2571,13 +2434,6 @@ clone-deep@^4.0.1:
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone-regexp@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f"
-  integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==
-  dependencies:
-    is-regexp "^2.0.0"
-
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -2600,22 +2456,22 @@ color-convert@^2.0.1:
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-colord@^2.9.1, colord@^2.9.2:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
-  integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
+colord@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
 colorette@^2.0.14:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+  version "2.0.19"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
+  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
@@ -2629,20 +2485,15 @@ commander@^2.20.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^7.0.0, commander@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
-  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
-
-commander@^9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.2.0.tgz#6e21014b2ed90d8b7c9647230d8b7a94a4a419a9"
-  integrity sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==
+commander@^9.4.1:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd"
+  integrity sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==
 
-comment-json@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.2.tgz#5fae70a94e0c8f84a077bd31df5aa5269252f293"
-  integrity sha512-H8T+kl3nZesZu41zO2oNXIJWojNeK3mHxCLrsBNu6feksBXsgb+PtYz5daP5P86A0F3sz3840KVYehr04enISQ==
+comment-json@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/comment-json/-/comment-json-4.2.3.tgz#50b487ebbf43abe44431f575ebda07d30d015365"
+  integrity sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==
   dependencies:
     array-timsort "^1.0.3"
     core-util-is "^1.0.3"
@@ -2653,12 +2504,12 @@ comment-json@^4.2.2:
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 configstore@^5.0.1:
   version "5.0.1"
@@ -2678,34 +2529,31 @@ confusing-browser-globals@^1.0.10:
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
 convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
+  integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.22.4"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.4.tgz#d700f451e50f1d7672dcad0ac85d910e6691e579"
-  integrity sha512-dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA==
+core-js-compat@^3.25.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
+  integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==
   dependencies:
-    browserslist "^4.20.3"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-util-is@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
 core-util-is@^1.0.3, core-util-is@~1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+cosmiconfig@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -2713,6 +2561,16 @@ cosmiconfig@^7.0.0, cosmiconfig@^7.0.1:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cosmiconfig@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97"
+  integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ==
+  dependencies:
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+
 cross-env@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
@@ -2734,213 +2592,146 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-cspell-gitignore@^5.20.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-5.20.0.tgz#0c4f405559383663a9c24fab5cf829e7b19abed5"
-  integrity sha512-oWzoHcaidX6jFON6vwiH3cA1HqkGmawD1DWt+fPWKrea9/SuTcvFxm+RbqO4DjwXEAMIczyPOWo+SCM0VbcCrA==
+cspell-dictionary@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-dictionary/-/cspell-dictionary-6.17.0.tgz#566bd4ccdf106096db08aa415f0004f03a710ceb"
+  integrity sha512-jUb/kIR2glYliRem11kCu7gaXUcHKp8L2G73LmzIULx+UKRgTa/100FXqm5lZUWnCaIznMmaA2QtutP+xYy5AQ==
   dependencies:
-    cspell-glob "^5.20.0"
+    "@cspell/cspell-pipe" "6.17.0"
+    "@cspell/cspell-types" "6.17.0"
+    cspell-trie-lib "6.17.0"
+    fast-equals "^4.0.3"
+    gensequence "^4.0.2"
+
+cspell-gitignore@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-gitignore/-/cspell-gitignore-6.17.0.tgz#39506eefb6cd289bda740d3f434b4d6dd48ff7b5"
+  integrity sha512-SDyPv6LqBebvoTKFP+ewh51gvmv1z8JDg7llumUFH2u1WoiMZBLLOL2pAa9UM0f6eEzBC1iS6nWQ+20VJx2yQA==
+  dependencies:
+    cspell-glob "6.17.0"
     find-up "^5.0.0"
 
-cspell-glob@^5.20.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-5.20.0.tgz#2bda5cc90bc6694ce2eb1a5aaee54196fc9b37a9"
-  integrity sha512-eyo8NYH4GapHxfilMarwvf1HIyGWT3gWuFlYkmQjYVx3KjzmfR1Y1x9S068wmwjp9kKCu9T6Vj71EGG+9R59Lw==
+cspell-glob@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-glob/-/cspell-glob-6.17.0.tgz#839698e94a29ee7ddd87a5324b1f404a267800b0"
+  integrity sha512-iKz2CvUU1HXuNJfxYRwSQFck3pCl9EhTx2qIR0lKf4gccCR89p44qxIR98nTbX1OF89lhfH6sUHtzkJ3nPWh+A==
   dependencies:
     micromatch "^4.0.5"
 
-cspell-io@^5.20.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-5.20.0.tgz#2f7fc676a068acc641f3bd77ddca7f72985b6ee5"
-  integrity sha512-wgqqpVIhtMh+/+3YfHt8cDfrD7OLF+xQlStlURj8AJwEJ0xu16zyI9S5zcig+83+0QyzuMdxfZiMgbdQxWEvOg==
+cspell-grammar@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-grammar/-/cspell-grammar-6.17.0.tgz#ab0b1539e310bdea35c54127d8e67b5af1c2361f"
+  integrity sha512-3B9QmKWOjAPzLYqesLP2niIbo6Yvb4rodjIwFXUvL3vmMZF4c9HFU/JVTTerLxrwh3DH8u6Mac52RzUurOJ15Q==
+  dependencies:
+    "@cspell/cspell-pipe" "6.17.0"
+    "@cspell/cspell-types" "6.17.0"
+
+cspell-io@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-io/-/cspell-io-6.17.0.tgz#2526b1344c98e9aaafa389b93a789730ba313c23"
+  integrity sha512-cofZlvKzXP3QytGM6OlREQIXLFcSdEKOFubSVHkRvAVX3IqeQnKo4oVF85C6McjwXTrJ1OH+SDP0vcpn6mKqTg==
+  dependencies:
+    "@cspell/cspell-service-bus" "6.17.0"
+    node-fetch "^2.6.7"
 
-cspell-lib@^5.20.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-5.20.0.tgz#0eb5797cb32ce03db7ad7e14649296c434e3d142"
-  integrity sha512-Fc7+3ExF2pNS8BsQTXSMkhR6ITbpyiMQf+y4ZH/aBml09+O6lrbj4j2tJx/oR4XvDEA8uQkV/5lMGdU+otC1KQ==
+cspell-lib@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-lib/-/cspell-lib-6.17.0.tgz#d69db480da63c665b3572809addebe75b0a51dbd"
+  integrity sha512-oZNkm0UhRa4nkoYPij23z7cbVXFPVHs7SdGC6IAVc71uz44nLNeC3e8+UnTErOU7nlROvjp9k3G90DEwej1TqQ==
   dependencies:
-    "@cspell/cspell-bundled-dicts" "^5.20.0"
-    "@cspell/cspell-pipe" "^5.20.0"
-    "@cspell/cspell-types" "^5.20.0"
+    "@cspell/cspell-bundled-dicts" "6.17.0"
+    "@cspell/cspell-pipe" "6.17.0"
+    "@cspell/cspell-types" "6.17.0"
+    "@cspell/strong-weak-map" "6.17.0"
     clear-module "^4.1.2"
-    comment-json "^4.2.2"
+    comment-json "^4.2.3"
     configstore "^5.0.1"
-    cosmiconfig "^7.0.1"
-    cspell-glob "^5.20.0"
-    cspell-io "^5.20.0"
-    cspell-trie-lib "^5.20.0"
-    fast-equals "^3.0.2"
+    cosmiconfig "^8.0.0"
+    cspell-dictionary "6.17.0"
+    cspell-glob "6.17.0"
+    cspell-grammar "6.17.0"
+    cspell-io "6.17.0"
+    cspell-trie-lib "6.17.0"
+    fast-equals "^4.0.3"
     find-up "^5.0.0"
     fs-extra "^10.1.0"
-    gensequence "^3.1.1"
+    gensequence "^4.0.2"
     import-fresh "^3.3.0"
     resolve-from "^5.0.0"
     resolve-global "^1.0.0"
-    vscode-languageserver-textdocument "^1.0.4"
-    vscode-uri "^3.0.3"
+    vscode-languageserver-textdocument "^1.0.7"
+    vscode-uri "^3.0.6"
 
-cspell-trie-lib@^5.20.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-5.20.0.tgz#3a13ba0477a36ecb16311e85b270bcc2b4300f37"
-  integrity sha512-ET95dJh+OJ04PdLI9dKqAa+dDu47tXcUxCR6uKiZ+qZ18v1Zl986s8q89m9c+xpo7Leqh0rF6Zsw3M9Cjy6Jhw==
+cspell-trie-lib@6.17.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell-trie-lib/-/cspell-trie-lib-6.17.0.tgz#2ac05778949d64c076e01d35f1ae491c1c259fb0"
+  integrity sha512-hmyZHhemWYLjjEDItAhgAF0tuL2iiQg+5PzUmELKIBSWEsmFdfxh1xWCmo1q0+vzVML+0Ms2cspiGyS9y/CF7A==
   dependencies:
-    "@cspell/cspell-pipe" "^5.20.0"
+    "@cspell/cspell-pipe" "6.17.0"
+    "@cspell/cspell-types" "6.17.0"
     fs-extra "^10.1.0"
-    gensequence "^3.1.1"
+    gensequence "^4.0.2"
 
-cspell@^5.0.0:
-  version "5.20.0"
-  resolved "https://registry.yarnpkg.com/cspell/-/cspell-5.20.0.tgz#580909fc1283aeda43f1c583188ea046417d340b"
-  integrity sha512-lXAS14ZlfJfOI3FgoAAfyl/AlTB8T+ayHmKrHxwuRRUvN4IBT4y8d7tdjWDj7/bsM4u5M5WrlAXg6vXH3Fg5bA==
+cspell@^6.0.0:
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/cspell/-/cspell-6.17.0.tgz#0f229268bd41bf80cb943a9d3daa9508868778eb"
+  integrity sha512-R1TXu1p2vON6rHXxZAUPbdf+v+ckPhWiEb3apq2PyxLSjzMiZDm2ThIwRcsQaMLLZyFOD+J3SHj0lZi1Qoaa8w==
   dependencies:
-    "@cspell/cspell-pipe" "^5.20.0"
+    "@cspell/cspell-pipe" "6.17.0"
     chalk "^4.1.2"
-    commander "^9.2.0"
-    cspell-gitignore "^5.20.0"
-    cspell-glob "^5.20.0"
-    cspell-lib "^5.20.0"
+    commander "^9.4.1"
+    cspell-gitignore "6.17.0"
+    cspell-glob "6.17.0"
+    cspell-lib "6.17.0"
     fast-json-stable-stringify "^2.1.0"
     file-entry-cache "^6.0.1"
     fs-extra "^10.1.0"
     get-stdin "^8.0.0"
-    glob "^8.0.1"
+    glob "^8.0.3"
     imurmurhash "^0.1.4"
-    semver "^7.3.7"
+    semver "^7.3.8"
     strip-ansi "^6.0.1"
-    vscode-uri "^3.0.3"
-
-css-blank-pseudo@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz#dfdefd3254bf8a82027993674ccf35483bfcb3c5"
-  integrity sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==
-  dependencies:
-    postcss "^7.0.5"
+    vscode-uri "^3.0.6"
 
-css-declaration-sorter@^6.2.2:
-  version "6.2.2"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz#bfd2f6f50002d6a3ae779a87d3a0c5d5b10e0f02"
-  integrity sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==
-
-css-functions-list@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.0.1.tgz#1460df7fb584d1692c30b105151dbb988c8094f9"
-  integrity sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==
-
-css-has-pseudo@^0.10.0:
-  version "0.10.0"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz#3c642ab34ca242c59c41a125df9105841f6966ee"
-  integrity sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==
-  dependencies:
-    postcss "^7.0.6"
-    postcss-selector-parser "^5.0.0-rc.4"
-
-css-prefers-color-scheme@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz#6f830a2714199d4f0d0d0bb8a27916ed65cff1f4"
-  integrity sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==
+css-blank-pseudo@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561"
+  integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==
   dependencies:
-    postcss "^7.0.5"
+    postcss-selector-parser "^6.0.9"
 
-css-select@^4.1.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
-  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.0.1"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
+css-functions-list@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b"
+  integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w==
 
-css-tree@^1.1.2, css-tree@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
+css-has-pseudo@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73"
+  integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==
   dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
+    postcss-selector-parser "^6.0.9"
 
-css-what@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
+css-prefers-color-scheme@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349"
+  integrity sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==
 
 css.escape@1.5.x:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
   integrity sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s=
 
-cssdb@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-4.4.0.tgz#3bf2f2a68c10f5c6a08abd92378331ee803cddb0"
-  integrity sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==
-
-cssesc@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
-  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
+cssdb@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.1.0.tgz#574f97235a83eb753a29f0b1f2cbacac0d628bb8"
+  integrity sha512-Sd99PrFgx28ez4GHu8yoQIufc/70h9oYowDf4EjeIKi8mac9whxRjhM3IaMr6EllP6KKKWtJrMfN6C7T9tIWvQ==
 
 cssesc@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^5.2.7:
-  version "5.2.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz#791e3603fb8f1b46717ac53b47e3c418e950f5f3"
-  integrity sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==
-  dependencies:
-    css-declaration-sorter "^6.2.2"
-    cssnano-utils "^3.1.0"
-    postcss-calc "^8.2.3"
-    postcss-colormin "^5.3.0"
-    postcss-convert-values "^5.1.0"
-    postcss-discard-comments "^5.1.1"
-    postcss-discard-duplicates "^5.1.0"
-    postcss-discard-empty "^5.1.1"
-    postcss-discard-overridden "^5.1.0"
-    postcss-merge-longhand "^5.1.4"
-    postcss-merge-rules "^5.1.1"
-    postcss-minify-font-values "^5.1.0"
-    postcss-minify-gradients "^5.1.1"
-    postcss-minify-params "^5.1.2"
-    postcss-minify-selectors "^5.2.0"
-    postcss-normalize-charset "^5.1.0"
-    postcss-normalize-display-values "^5.1.0"
-    postcss-normalize-positions "^5.1.0"
-    postcss-normalize-repeat-style "^5.1.0"
-    postcss-normalize-string "^5.1.0"
-    postcss-normalize-timing-functions "^5.1.0"
-    postcss-normalize-unicode "^5.1.0"
-    postcss-normalize-url "^5.1.0"
-    postcss-normalize-whitespace "^5.1.1"
-    postcss-ordered-values "^5.1.1"
-    postcss-reduce-initial "^5.1.0"
-    postcss-reduce-transforms "^5.1.0"
-    postcss-svgo "^5.1.0"
-    postcss-unique-selectors "^5.1.1"
-
-cssnano-utils@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
-  integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
-
-cssnano@^5.0.0:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.7.tgz#99858bef6c76c9240f0cdc9239570bc7db8368be"
-  integrity sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==
-  dependencies:
-    cssnano-preset-default "^5.2.7"
-    lilconfig "^2.0.3"
-    yaml "^1.10.2"
-
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
 cssom@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
@@ -2966,7 +2757,7 @@ cuint@^0.2.2:
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
   dependencies:
     assert-plus "^1.0.0"
 
@@ -2975,7 +2766,7 @@ data-uri-to-buffer@3:
   resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
   integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
 
-data-urls@^3.0.1:
+data-urls@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
   integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
@@ -2998,13 +2789,6 @@ debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4:
   dependencies:
     ms "2.1.2"
 
-debug@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
-  dependencies:
-    ms "2.1.2"
-
 debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -3020,9 +2804,9 @@ debug@^3.2.7:
     ms "^2.1.1"
 
 decamelize-keys@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
-  integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
+  integrity sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==
   dependencies:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
@@ -3030,12 +2814,12 @@ decamelize-keys@^1.1.0:
 decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+  integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decimal.js@^10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+decimal.js@^10.4.2:
+  version "10.4.2"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e"
+  integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA==
 
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
@@ -3062,7 +2846,7 @@ define-properties@^1.1.2, define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-degenerator@^3.0.1:
+degenerator@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/degenerator/-/degenerator-3.0.2.tgz#6a61fcc42a702d6e50ff6023fe17bff435f68235"
   integrity sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==
@@ -3072,38 +2856,10 @@ degenerator@^3.0.1:
     esprima "^4.0.0"
     vm2 "^3.9.8"
 
-del@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-5.1.0.tgz#d9487c94e367410e6eff2925ee58c0c84a75b3a7"
-  integrity sha512-wH9xOVHnczo9jN2IW68BabcecVPxacIA3g/7z6vhSU/4stOKQzeCRK0yD0A24WiAAUJmmVpWqrERcTxnLo3AnA==
-  dependencies:
-    globby "^10.0.1"
-    graceful-fs "^4.2.2"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.1"
-    p-map "^3.0.0"
-    rimraf "^3.0.0"
-    slash "^3.0.0"
-
-del@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
-  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
-  dependencies:
-    globby "^11.0.1"
-    graceful-fs "^4.2.4"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.2"
-    p-map "^4.0.0"
-    rimraf "^3.0.2"
-    slash "^3.0.0"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 depd@2.0.0:
   version "2.0.0"
@@ -3141,20 +2897,6 @@ doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
-dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
 domexception@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
@@ -3162,22 +2904,6 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
-domhandler@^4.2.0, domhandler@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
-domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
 dot-prop@^5.2.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -3205,22 +2931,22 @@ dotenv@^8.2.0:
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
 ejs@^3.1.6:
-  version "3.1.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.7.tgz#c544d9c7f715783dd92f0bddcf73a59e6962d006"
-  integrity sha512-BIar7R6abbUxDA3bfXrO4DSgwo8I+fB5/1zgujl3HLLjwd6+9iOnrT+t3grn2qbk9vOgBubXOFwX2m9axoFaGw==
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
+  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.118:
-  version "1.4.132"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.132.tgz#b64599eb018221e52e2e4129de103b03a413c55d"
-  integrity sha512-JYdZUw/1068NWN+SwXQ7w6Ue0bWYGihvSUNNQwurvcDV/SM7vSiGZ3NuFvFgoEiCs4kB8xs3cX2an3wB7d4TBw==
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3232,19 +2958,7 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
-  integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
-
-end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
-  dependencies:
-    once "^1.4.0"
-
-enhanced-resolve@^5.0.0:
+enhanced-resolve@^5.10.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
   integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
@@ -3252,18 +2966,10 @@ enhanced-resolve@^5.0.0:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enhanced-resolve@^5.9.2:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
-  integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
-  dependencies:
-    graceful-fs "^4.2.4"
-    tapable "^2.2.0"
-
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
 
 envinfo@^7.5.1, envinfo@^7.7.3:
   version "7.8.1"
@@ -3277,6 +2983,35 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
+es-abstract@^1.19.0, es-abstract@^1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
+  dependencies:
+    call-bind "^1.0.2"
+    es-to-primitive "^1.2.1"
+    function-bind "^1.1.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.1.1"
+    get-symbol-description "^1.0.0"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.3"
+    is-callable "^1.2.4"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.0"
+    object-keys "^1.1.1"
+    object.assign "^4.1.2"
+    regexp.prototype.flags "^1.4.3"
+    string.prototype.trimend "^1.0.5"
+    string.prototype.trimstart "^1.0.5"
+    unbox-primitive "^1.0.2"
+
 es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
   version "1.19.5"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.5.tgz#a2cb01eb87f724e815b278b0dd0d00f36ca9a7f1"
@@ -3303,6 +3038,11 @@ es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5:
     string.prototype.trimstart "^1.0.4"
     unbox-primitive "^1.0.1"
 
+es-array-method-boxes-properly@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e"
+  integrity sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==
+
 es-module-lexer@^0.9.0:
   version "0.9.3"
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
@@ -3337,14 +3077,14 @@ escalade@^3.1.1:
 escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.8.1, escodegen@^1.9.0:
+escodegen@^1.8.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
   integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
@@ -3424,21 +3164,21 @@ eslint-plugin-jquery@^1.5.1:
   integrity sha512-L7v1eaK5t80C0lvUXPFP9MKnBOqPSKhCOYyzy4LZ0+iK+TJwN8S9gAkzzP1AOhypRIwA88HF6phQ9C7jnOpW8w==
 
 eslint-plugin-prettier@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz#8b99d1e4b8b24a762472b4567992023619cb98e0"
-  integrity sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b"
+  integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-yml@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-0.14.0.tgz#110e1126ebe983d830e4ab8754e437f2279d2b72"
-  integrity sha512-+0+bBV/07txENbxfrHF9olGoLCHez64vmnOmjWOoLwmXOwfdaSRleBSPIi4nWQs7WwX8lm/fSLadOjbVEcsXQQ==
+eslint-plugin-yml@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-yml/-/eslint-plugin-yml-1.2.0.tgz#4574e5ab2fbaea5f2b278819b19ea273f8b58af0"
+  integrity sha512-v0jAU/F5SJg28zkpxwGpY04eGZMWFP6os8u2qaEAIRjSH2GqrNl0yBR5+sMHLU/026kAduxVbvLSqmT3Mu3O0g==
   dependencies:
     debug "^4.3.2"
     lodash "^4.17.21"
     natural-compare "^1.4.0"
-    yaml-eslint-parser "^0.5.0"
+    yaml-eslint-parser "^1.1.0"
 
 eslint-scope@5.1.1:
   version "5.1.1"
@@ -3474,12 +3214,14 @@ eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint@^8.9.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.14.0.tgz#62741f159d9eb4a79695b28ec4989fcdec623239"
-  integrity sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==
-  dependencies:
-    "@eslint/eslintrc" "^1.2.2"
-    "@humanwhocodes/config-array" "^0.9.2"
+  version "8.29.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.29.0.tgz#d74a88a20fb44d59c51851625bc4ee8d0ec43f87"
+  integrity sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==
+  dependencies:
+    "@eslint/eslintrc" "^1.3.3"
+    "@humanwhocodes/config-array" "^0.11.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
@@ -3489,38 +3231,40 @@ eslint@^8.9.0:
     eslint-scope "^7.1.1"
     eslint-utils "^3.0.0"
     eslint-visitor-keys "^3.3.0"
-    espree "^9.3.1"
+    espree "^9.4.0"
     esquery "^1.4.0"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.6.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.15.0"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
     regexpp "^3.2.0"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
-espree@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
-  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+espree@^9.4.0:
+  version "9.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd"
+  integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg==
   dependencies:
-    acorn "^8.7.0"
-    acorn-jsx "^5.3.1"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
     eslint-visitor-keys "^3.3.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
@@ -3562,48 +3306,15 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-execa@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
-  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^6.0.0"
-    human-signals "^2.1.0"
-    is-stream "^2.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^4.0.1"
-    onetime "^5.1.2"
-    signal-exit "^3.0.3"
-    strip-final-newline "^2.0.0"
-
-execall@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45"
-  integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==
-  dependencies:
-    clone-regexp "^2.1.0"
-
 extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-extract-zip@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
-  integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
-  dependencies:
-    debug "^4.1.1"
-    get-stream "^5.1.0"
-    yauzl "^2.10.0"
-  optionalDependencies:
-    "@types/yauzl" "^2.9.1"
-
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
 
 extsprintf@^1.2.0:
   version "1.4.1"
@@ -3624,15 +3335,15 @@ fast-diff@^1.1.2:
   resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
   integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
 
-fast-equals@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-3.0.2.tgz#77f80047b381b6cb747130463ccc144e24c44097"
-  integrity sha512-iY0fAmW7fzxHp22VCRLpOgWbsWsF+DJWi1jhc8w+VGlJUiS+KcGZV2A8t+Q9oTQwhG3L1W8Lu/oe3ZyOPdhZjw==
+fast-equals@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fast-equals/-/fast-equals-4.0.3.tgz#72884cc805ec3c6679b99875f6b7654f39f0e8c7"
+  integrity sha512-G3BSX9cfKttjr+2o1O22tYMLq0DPluZnYtq1rXumE1SpL/F/SLIfHx08WYQoWSIpeMYf8sRbJ8++71+v6Pnxfg==
 
-fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+fast-glob@^3.2.12, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -3648,27 +3359,20 @@ fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fastest-levenshtein@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+fastest-levenshtein@^1.0.12, fastest-levenshtein@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
 fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce"
+  integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==
   dependencies:
     reusify "^1.0.4"
 
-fd-slicer@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
-  dependencies:
-    pend "~1.2.0"
-
 file-entry-cache@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
@@ -3682,9 +3386,9 @@ file-uri-to-path@2:
   integrity sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==
 
 filelist@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.3.tgz#448607750376484932f67ef1b9ff07386b036c83"
-  integrity sha512-LwjCsruLWQULGYKy7TX0OPtrL9kLpojOFKc5VCTxdFTV7w5zbsgqVKfnkKG7Qgjtq50gKfO56hJv88OfcGb70Q==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
   dependencies:
     minimatch "^5.0.1"
 
@@ -3704,15 +3408,6 @@ find-cache-dir@^2.0.0:
     make-dir "^2.0.0"
     pkg-dir "^3.0.0"
 
-find-cache-dir@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
 find-up@3.0.0, find-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
@@ -3759,24 +3454,14 @@ flat@^4.1.0:
     is-buffer "~2.0.3"
 
 flatted@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
-
-flatten@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
-  integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
-
-follow-redirects@^1.14.4:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.0.tgz#06441868281c86d0dda4ad8bdaead2d02dca89d4"
-  integrity sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
+  integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
 
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
 form-data@^4.0.0:
   version "4.0.0"
@@ -3796,6 +3481,11 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
+fraction.js@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
+  integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+
 fs-extra@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
@@ -3814,17 +3504,10 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
-  integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-  dependencies:
-    minipass "^3.0.0"
-
 fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
   version "2.3.2"
@@ -3834,7 +3517,7 @@ fsevents@~2.3.2:
 ftp@^0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
-  integrity sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=
+  integrity sha512-faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ==
   dependencies:
     readable-stream "1.1.x"
     xregexp "2.0.0"
@@ -3844,15 +3527,25 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+function.prototype.name@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
 
-gensequence@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/gensequence/-/gensequence-3.1.1.tgz#95c1afc7c0680f92942c17f2d6f83f3d26ea97af"
-  integrity sha512-ys3h0hiteRwmY6BsvSttPmkhC0vEQHPJduANBRtH/dlDPZ0UBIb/dXy80IcckXyuQ6LKg+PloRqvGER9IS7F7g==
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
+gensequence@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/gensequence/-/gensequence-4.0.2.tgz#7c6147cf04451e9f6efe3872be9d46bb8d9c2603"
+  integrity sha512-mQiFskYFPFDSUpBJ/n3ebAV2Ufu6DZGvUPXzyWYzFfJr6/DyOOZVnjx6VTWE4y0RLvYWnc5tZq5sCjzEWhRjqQ==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -3864,7 +3557,16 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
+get-intrinsic@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -3878,18 +3580,6 @@ get-stdin@^8.0.0:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"
   integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==
 
-get-stream@^5.1.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
-  integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
-  dependencies:
-    pump "^3.0.0"
-
-get-stream@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
-  integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
-
 get-symbol-description@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
@@ -3913,7 +3603,7 @@ get-uri@3:
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
   dependencies:
     assert-plus "^1.0.0"
 
@@ -3924,7 +3614,7 @@ glob-parent@^5.1.2, glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@@ -3948,34 +3638,33 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+glob@^7.1.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.1.tgz#00308f5c035aa0b2a447cd37ead267ddff1577d3"
-  integrity sha512-cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow==
+glob@^8.0.3:
+  version "8.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
     minimatch "^5.0.1"
     once "^1.3.0"
-    path-is-absolute "^1.0.0"
 
 global-dirs@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
+  integrity sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==
   dependencies:
     ini "^1.3.4"
 
@@ -4000,28 +3689,14 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
-  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+globals@^13.15.0:
+  version "13.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.18.0.tgz#fb224daeeb2bb7d254cd2c640f003528b8d0c1dc"
+  integrity sha512-/mR4KI8Ps2spmoc0Ulu9L7agOF0du1CZNQ3dke8yItYlyKNmGrkONemBbd6V8UTc1Wgcqn21t3WYB7dbRmh6/A==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^10.0.1:
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543"
-  integrity sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==
-  dependencies:
-    "@types/glob" "^7.1.1"
-    array-union "^2.1.0"
-    dir-glob "^3.0.1"
-    fast-glob "^3.0.3"
-    glob "^7.1.3"
-    ignore "^5.1.1"
-    merge2 "^1.2.3"
-    slash "^3.0.0"
-
-globby@^11.0.1, globby@^11.1.0:
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -4036,13 +3711,18 @@ globby@^11.0.1, globby@^11.1.0:
 globjoin@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
-  integrity sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=
+  integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
   version "4.2.10"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -4051,7 +3731,7 @@ growl@1.10.5:
 har-schema@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-  integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
 
 har-validator@~5.1.3:
   version "5.1.5"
@@ -4074,7 +3754,7 @@ has-bigints@^1.0.1, has-bigints@^1.0.2:
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
@@ -4173,13 +3853,13 @@ http-proxy-agent@^5.0.0:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-proxy-agent@5, https-proxy-agent@^5.0.0:
+https-proxy-agent@5, https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -4187,11 +3867,6 @@ https-proxy-agent@5, https-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
-human-signals@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
-  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
-
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4206,10 +3881,10 @@ iconv-lite@0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-ignore@^5.1.1, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+ignore@^5.2.0, ignore@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.1.tgz#c2b1f76cb999ede1502f3a226a9310fdfe88d46c"
+  integrity sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==
 
 import-fresh@^3.0.0, import-fresh@^3.2.1, import-fresh@^3.3.0:
   version "3.3.0"
@@ -4235,32 +3910,22 @@ import-local@^3.0.2:
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexes-of@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-  integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
-
-infer-owner@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
-  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
-
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1:
+inherits@2, inherits@2.0.4, inherits@~2.0.1:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4279,30 +3944,20 @@ internal-slot@^1.0.3:
     has "^1.0.3"
     side-channel "^1.0.4"
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
-interpret@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
-  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
-
-ip-regex@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-4.3.0.tgz#687275ab0f57fa76978ff8f4dddc8a23d5990db5"
-  integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
 ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.8.tgz#ae05948f6b075435ed3307acce04629da8cdbf48"
+  integrity sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==
 
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
@@ -4336,10 +3991,10 @@ is-callable@^1.1.4, is-callable@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
-is-core-module@^2.5.0, is-core-module@^2.8.1:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69"
-  integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==
+is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-module@^2.9.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144"
+  integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==
   dependencies:
     has "^1.0.3"
 
@@ -4353,12 +4008,12 @@ is-date-object@^1.0.1:
 is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
@@ -4399,12 +4054,7 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
-is-path-inside@^3.0.1, is-path-inside@^3.0.2:
+is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
@@ -4412,7 +4062,7 @@ is-path-inside@^3.0.1, is-path-inside@^3.0.2:
 is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
-  integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
+  integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==
 
 is-plain-object@^2.0.4:
   version "2.0.4"
@@ -4439,11 +4089,6 @@ is-regex@^1.1.4:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-regexp@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d"
-  integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==
-
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
@@ -4451,11 +4096,6 @@ is-shared-array-buffer@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
-  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
-
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -4475,11 +4115,6 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-url@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
-  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
-
 is-weakref@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
@@ -4487,34 +4122,25 @@ is-weakref@^1.0.2:
   dependencies:
     call-bind "^1.0.2"
 
-is2@^2.0.6:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/is2/-/is2-2.0.7.tgz#d084e10cab3bd45d6c9dfde7a48599fcbb93fcac"
-  integrity sha512-4vBQoURAXC6hnLFxD4VW7uc04XiwTTl/8ydYJxKvPwkWQrSjInkuM5VZVg6BGr1/natq69zDuvO9lGpLClJqvA==
-  dependencies:
-    deep-is "^0.1.3"
-    ip-regex "^4.1.0"
-    is-url "^1.2.4"
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
 
 jake@^10.8.5:
   version "10.8.5"
@@ -4526,20 +4152,6 @@ jake@^10.8.5:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
-javascript-stringify@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"
-  integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=
-
-jest-worker@^26.5.0:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
 jest-worker@^27.4.5:
   version "27.5.1"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
@@ -4574,16 +4186,26 @@ jquery-ui@1.13.x:
   dependencies:
     jquery ">=1.8.0 <4.0.0"
 
-jquery@*, jquery@3.6.x, jquery@>=1.7.2, "jquery@>=1.8.0 <4.0.0":
+jquery@*, jquery@>=1.7.2, "jquery@>=1.8.0 <4.0.0":
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
+jquery@~3.6.3:
+  version "3.6.3"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz#23ed2ffed8a19e048814f13391a19afcdba160e6"
+  integrity sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==
+
 js-cookie@3.0.x:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414"
   integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==
 
+js-sdsl@^4.1.4:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
+  integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4607,39 +4229,38 @@ js-yaml@^4.1.0:
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdom@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a"
-  integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==
+jsdom@^20.0.0:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
+  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.5.0"
-    acorn-globals "^6.0.0"
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
     cssom "^0.5.0"
     cssstyle "^2.3.0"
-    data-urls "^3.0.1"
-    decimal.js "^10.3.1"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
     domexception "^4.0.0"
     escodegen "^2.0.0"
     form-data "^4.0.0"
     html-encoding-sniffer "^3.0.0"
     http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
     webidl-conversions "^7.0.0"
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^10.0.0"
-    ws "^8.2.3"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
     xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
@@ -4650,14 +4271,9 @@ jsesc@^2.5.1:
 jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -4680,12 +4296,12 @@ json-schema@0.4.0:
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
 json5@^1.0.1:
   version "1.0.2"
@@ -4694,7 +4310,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.2.1:
+json5@^2.2.1:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
   integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -4702,7 +4318,7 @@ json5@^2.1.2, json5@^2.2.1:
 jsonfile@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -4730,15 +4346,10 @@ kind-of@^6.0.2, kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klona@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
-
-known-css-properties@^0.25.0:
-  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.25.0.tgz#6ebc4d4b412f602e5cfbeb4086bd544e34c0a776"
-  integrity sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA==
+known-css-properties@^0.26.0:
+  version "0.26.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz#008295115abddc045a9f4ed7e2a84dc8b3a77649"
+  integrity sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==
 
 levn@^0.4.1:
   version "0.4.1"
@@ -4751,16 +4362,11 @@ levn@^0.4.1:
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lilconfig@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.5.tgz#19e57fd06ccc3848fd1891655b5a447092225b25"
-  integrity sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==
-
 lines-and-columns@^1.1.6:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
@@ -4771,15 +4377,6 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c"
-  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^2.1.2"
-
 loadjs@4.2.x:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/loadjs/-/loadjs-4.2.0.tgz#2a0336376397a6a43edf98c9ec3229ddd5abb6f6"
@@ -4887,7 +4484,7 @@ lodash.clone@3.0.3:
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.defaultsdeep@^4.6.1:
   version "4.6.1"
@@ -4913,11 +4510,6 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
-
 lodash.merge@^4.6.2:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
@@ -4926,12 +4518,7 @@ lodash.merge@^4.6.2:
 lodash.truncate@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
   version "4.17.21"
@@ -4974,7 +4561,7 @@ make-dir@^2.0.0, make-dir@^2.1.0:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2:
+make-dir@^3.0.0, make-dir@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
@@ -4984,7 +4571,7 @@ make-dir@^3.0.0, make-dir@^3.0.2:
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
-  integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
+  integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==
 
 map-obj@^4.0.0:
   version "4.3.0"
@@ -4996,11 +4583,6 @@ mathml-tag-names@^2.1.3:
   resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
   integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
 
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-
 meow@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
@@ -5024,12 +4606,12 @@ merge-stream@^2.0.0:
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
-merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1:
+merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^4.0.0, micromatch@^4.0.4, micromatch@^4.0.5:
+micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -5049,10 +4631,10 @@ mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.19:
   dependencies:
     mime-db "1.52.0"
 
-mime@^2.3.1:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
-  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+mime@~2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
+  integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -5071,7 +4653,7 @@ minimatch@3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.4, minimatch@^3.1.2:
+minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -5085,6 +4667,13 @@ minimatch@^5.0.1:
   dependencies:
     brace-expansion "^2.0.1"
 
+minimatch@~3.0.4:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1"
+  integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -5094,46 +4683,15 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.2.0, minimist@^1.2.2, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minipass-collect@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
-  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-flush@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
-  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass-pipeline@^1.2.2:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
-  integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
-  dependencies:
-    minipass "^3.0.0"
-
-minipass@^3.0.0, minipass@^3.1.1:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
-  dependencies:
-    yallist "^4.0.0"
-
-minizlib@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
-  integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-  dependencies:
-    minipass "^3.0.0"
-    yallist "^4.0.0"
+minimist@^1.2.2:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
+  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
 mkdirp@0.5.4:
   version "0.5.4"
@@ -5142,14 +4700,7 @@ mkdirp@0.5.4:
   dependencies:
     minimist "^1.2.5"
 
-mkdirp@^0.5.0:
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
-  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
-  dependencies:
-    minimist "^1.2.6"
-
-mkdirp@^1.0.3, mkdirp@^1.0.4:
+mkdirp@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
@@ -5213,7 +4764,7 @@ mute-stream@0.0.8:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.3.3:
+nanoid@^3.3.3, nanoid@^3.3.4:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
@@ -5221,14 +4772,14 @@ nanoid@^3.3.3:
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-netmask@^2.0.1:
+netmask@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/netmask/-/netmask-2.0.2.tgz#8b01a07644065d536383835823bc52004ebac5e7"
   integrity sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==
@@ -5268,10 +4819,17 @@ node-environment-flags@1.0.5:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
-node-releases@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.4.tgz#f38252370c43854dc48aa431c766c6c398f40476"
-  integrity sha512-gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ==
+node-fetch@^2.6.7:
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  dependencies:
+    whatwg-url "^5.0.0"
+
+node-releases@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
 normalize-package-data@^2.5.0:
   version "2.5.0"
@@ -5301,46 +4859,17 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
-
-normalize-selector@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
-  integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
-
-normalize-url@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
 normalize.css@8.0.x:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
   integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
 
-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
-  dependencies:
-    boolbase "^1.0.0"
-
-num2fraction@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
-  integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
-
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
+nwsapi@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
 oauth-sign@~0.9.0:
   version "0.9.0"
@@ -5367,7 +4896,7 @@ object.assign@4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.assign@^4.1.0, object.assign@^4.1.2:
+object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -5387,13 +4916,14 @@ object.entries@^1.1.5:
     es-abstract "^1.19.1"
 
 object.getownpropertydescriptors@^2.0.3:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e"
-  integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw==
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.4.tgz#7965e6437a57278b587383831a9b829455a4bc37"
+  integrity sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==
   dependencies:
+    array.prototype.reduce "^1.0.4"
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.1"
 
 object.values@^1.1.5:
   version "1.1.5"
@@ -5404,14 +4934,14 @@ object.values@^1.1.5:
     define-properties "^1.1.3"
     es-abstract "^1.19.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
-onetime@^5.1.0, onetime@^5.1.2:
+onetime@^5.1.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
@@ -5505,20 +5035,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
-p-map@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
-  integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
-  dependencies:
-    aggregate-error "^3.0.0"
-
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
@@ -5545,13 +5061,13 @@ pac-proxy-agent@^5.0.0:
     socks-proxy-agent "5"
 
 pac-resolver@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.0.tgz#1d717a127b3d7a9407a16d6e1b012b13b9ba8dc0"
-  integrity sha512-H+/A6KitiHNNW+bxBKREk2MCGSxljfqRX76NjummWEYIat7ldVXRU3dhRIE3iXZ0nvGBk6smv3nntxKkzRL8NA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-5.0.1.tgz#c91efa3a9af9f669104fa2f51102839d01cde8e7"
+  integrity sha512-cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q==
   dependencies:
-    degenerator "^3.0.1"
+    degenerator "^3.0.2"
     ip "^1.1.5"
-    netmask "^2.0.1"
+    netmask "^2.0.2"
 
 parent-module@^1.0.0:
   version "1.0.1"
@@ -5577,15 +5093,17 @@ parse-json@^5.0.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+parse5@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
+  dependencies:
+    entities "^4.4.0"
 
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
 
 path-exists@^4.0.0:
   version "4.0.0"
@@ -5595,9 +5113,9 @@ path-exists@^4.0.0:
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^3.0.0, path-key@^3.1.0:
+path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -5612,20 +5130,10 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pend@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
-
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
-
-picocolors@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
-  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+  integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
 picocolors@^1.0.0:
   version "1.0.0"
@@ -5645,7 +5153,7 @@ picturefill@3.0.x:
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^4.0.1:
   version "4.0.1"
@@ -5664,36 +5172,21 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+pkg-dir@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
-pofile@^1.0.9:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/pofile/-/pofile-1.1.3.tgz#e2c0d4052b9829f171b888bfb35c87791dbea297"
-  integrity sha512-sk96pUvpNwDV6PLrnhr68Uu1S5NohsxqLKz0GuracgrDo40BdF/r1RhHnjakUk6Q4Z0OKIybOQ7GevLKGN1iYw==
-
-postcss-attribute-case-insensitive@^4.0.1:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz#d93e46b504589e94ac7277b0463226c68041a880"
-  integrity sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^6.0.2"
-
-postcss-calc@^7.0.1:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e"
-  integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==
+postcss-attribute-case-insensitive@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz#03d761b24afc04c09e757e92ff53716ae8ea2741"
+  integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
   dependencies:
-    postcss "^7.0.27"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.0.2"
+    postcss-selector-parser "^6.0.10"
 
-postcss-calc@^8.2.3:
+postcss-calc@^8.2.4:
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
   integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
@@ -5701,602 +5194,300 @@ postcss-calc@^8.2.3:
     postcss-selector-parser "^6.0.9"
     postcss-value-parser "^4.2.0"
 
-postcss-color-functional-notation@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz#5efd37a88fbabeb00a2966d1e53d98ced93f74e0"
-  integrity sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-gray@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz#532a31eb909f8da898ceffe296fdc1f864be8547"
-  integrity sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==
-  dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-hex-alpha@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz#a8d9ca4c39d497c9661e374b9c51899ef0f87388"
-  integrity sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==
-  dependencies:
-    postcss "^7.0.14"
-    postcss-values-parser "^2.0.1"
-
-postcss-color-mod-function@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz#816ba145ac11cc3cb6baa905a75a49f903e4d31d"
-  integrity sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==
-  dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-color-rebeccapurple@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz#c7a89be872bb74e45b1e3022bfe5748823e6de77"
-  integrity sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-colormin@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a"
-  integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==
+postcss-clamp@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363"
+  integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==
   dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-    colord "^2.9.1"
     postcss-value-parser "^4.2.0"
 
-postcss-convert-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10"
-  integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==
+postcss-color-functional-notation@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz#21a909e8d7454d3612d1659e471ce4696f28caec"
+  integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-custom-media@^7.0.8:
-  version "7.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz#fffd13ffeffad73621be5f387076a28b00294e0c"
-  integrity sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==
-  dependencies:
-    postcss "^7.0.14"
-
-postcss-custom-properties@^8.0.11:
-  version "8.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz#2d61772d6e92f22f5e0d52602df8fae46fa30d97"
-  integrity sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==
-  dependencies:
-    postcss "^7.0.17"
-    postcss-values-parser "^2.0.1"
-
-postcss-custom-selectors@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz#64858c6eb2ecff2fb41d0b28c9dd7b3db4de7fba"
-  integrity sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
-
-postcss-dir-pseudo-class@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz#6e3a4177d0edb3abcc85fdb6fbb1c26dabaeaba2"
-  integrity sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
-
-postcss-discard-comments@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz#e90019e1a0e5b99de05f63516ce640bd0df3d369"
-  integrity sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==
-
-postcss-discard-duplicates@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
-  integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
-
-postcss-discard-empty@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
-  integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
-
-postcss-discard-overridden@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
-  integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
-
-postcss-double-position-gradients@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz#fc927d52fddc896cb3a2812ebc5df147e110522e"
-  integrity sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==
-  dependencies:
-    postcss "^7.0.5"
-    postcss-values-parser "^2.0.0"
-
-postcss-env-function@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-2.0.2.tgz#0f3e3d3c57f094a92c2baf4b6241f0b0da5365d7"
-  integrity sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-focus-visible@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e"
-  integrity sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-focus-within@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz#763b8788596cee9b874c999201cdde80659ef680"
-  integrity sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-font-variant@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz#42d4c0ab30894f60f98b17561eb5c0321f502641"
-  integrity sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-gap-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz#431c192ab3ed96a3c3d09f2ff615960f902c1715"
-  integrity sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-header@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-header/-/postcss-header-2.0.0.tgz#e7dbc95abeaa2dfb46b3106c1541c4845d3382da"
-  integrity sha512-h/2vrxf9YoLXji6qnbO79OH+UyTEc8BtqpYOrJn4E/rmPlLlt9ciAbHvQDPuhbBUtaFClcXBMWVejbwdpHYUpA==
-  dependencies:
-    "@babel/core" "^7.8.4"
-    "@babel/register" "^7.8.3"
-
-postcss-image-set-function@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz#28920a2f29945bed4c3198d7df6496d410d3f288"
-  integrity sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-import@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
-  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
-  dependencies:
-    postcss "^7.0.1"
-    postcss-value-parser "^3.2.3"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-import@^14.1.0:
-  version "14.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0"
-  integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
-  dependencies:
-    postcss-value-parser "^4.0.0"
-    read-cache "^1.0.0"
-    resolve "^1.1.7"
-
-postcss-initial@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"
-  integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-js@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00"
-  integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==
-  dependencies:
-    camelcase-css "^2.0.1"
-
-postcss-lab-function@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz#bb51a6856cd12289ab4ae20db1e3821ef13d7d2e"
-  integrity sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==
-  dependencies:
-    "@csstools/convert-colors" "^1.4.0"
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-loader@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
-  integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
-  dependencies:
-    cosmiconfig "^7.0.0"
-    klona "^2.0.4"
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    semver "^7.3.4"
-
-postcss-logical@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5"
-  integrity sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-media-minmax@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz#b75bb6cbc217c8ac49433e12f22048814a4f5ed5"
-  integrity sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-media-query-parser@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
-  integrity sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=
-
-postcss-merge-longhand@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz#0f46f8753989a33260efc47de9a0cdc571f2ec5c"
-  integrity sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==
+postcss-color-hex-alpha@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz#c66e2980f2fbc1a63f5b079663340ce8b55f25a5"
+  integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
   dependencies:
     postcss-value-parser "^4.2.0"
-    stylehacks "^5.1.0"
-
-postcss-merge-rules@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz#d327b221cd07540bcc8d9ff84446d8b404d00162"
-  integrity sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==
-  dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-    cssnano-utils "^3.1.0"
-    postcss-selector-parser "^6.0.5"
 
-postcss-minify-font-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
-  integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
+postcss-color-rebeccapurple@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz#63fdab91d878ebc4dd4b7c02619a0c3d6a56ced0"
+  integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-minify-gradients@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
-  integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==
+postcss-custom-media@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz#c8f9637edf45fef761b014c024cee013f80529ea"
+  integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
   dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-params@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz#77e250780c64198289c954884ebe3ee4481c3b1c"
-  integrity sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==
+postcss-custom-properties@^12.1.10:
+  version "12.1.10"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.10.tgz#624517179fd4cf50078a7a60f628d5782e7d4903"
+  integrity sha512-U3BHdgrYhCrwTVcByFHs9EOBoqcKq4Lf3kXwbTi4hhq0qWhl/pDWq2THbv/ICX/Fl9KqeHBb8OVrTf2OaYF07A==
   dependencies:
-    browserslist "^4.16.6"
-    cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-selectors@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c"
-  integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==
-  dependencies:
-    postcss-selector-parser "^6.0.5"
-
-postcss-mixins@^9.0.2:
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-mixins/-/postcss-mixins-9.0.2.tgz#098969dafd1b9a98e2973fde024bef9d2563f604"
-  integrity sha512-LaFjXcR+7LRji+Sc6DRn1mUw43+Y9Lyh5JjFTQDedlIi4W6REAesRXRJLlms5424vb0zerBfCVZzS2ZHRxGZOA==
+postcss-custom-selectors@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz#1ab4684d65f30fed175520f82d223db0337239d9"
+  integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
   dependencies:
-    fast-glob "^3.2.11"
-    postcss-js "^4.0.0"
-    postcss-simple-vars "^6.0.3"
-    sugarss "^4.0.1"
+    postcss-selector-parser "^6.0.4"
 
-postcss-nesting@^10.1.4:
-  version "10.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.4.tgz#80de9d1c2717bc44df918dd7f118929300192a7a"
-  integrity sha512-2ixdQ59ik/Gt1+oPHiI1kHdwEI8lLKEmui9B1nl6163ANLC+GewQn7fXMxJF2JSb4i2MKL96GU8fIiQztK4TTA==
+postcss-dir-pseudo-class@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz#2bf31de5de76added44e0a25ecf60ae9f7c7c26c"
+  integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
   dependencies:
     postcss-selector-parser "^6.0.10"
 
-postcss-nesting@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052"
-  integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==
-  dependencies:
-    postcss "^7.0.2"
-
-postcss-normalize-charset@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
-  integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
-
-postcss-normalize-display-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
-  integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-positions@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458"
-  integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-repeat-style@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398"
-  integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==
+postcss-double-position-gradients@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz#b96318fdb477be95997e86edd29c6e3557a49b91"
+  integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==
   dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-string@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
-  integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
+postcss-env-function@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.6.tgz#7b2d24c812f540ed6eda4c81f6090416722a8e7a"
+  integrity sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-timing-functions@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
-  integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
+postcss-focus-visible@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e"
+  integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==
   dependencies:
-    postcss-value-parser "^4.2.0"
+    postcss-selector-parser "^6.0.9"
 
-postcss-normalize-unicode@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75"
-  integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==
+postcss-focus-within@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20"
+  integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==
   dependencies:
-    browserslist "^4.16.6"
-    postcss-value-parser "^4.2.0"
+    postcss-selector-parser "^6.0.9"
 
-postcss-normalize-url@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
-  integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
+postcss-font-variant@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
+  integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
+
+postcss-gap-properties@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz#f7e3cddcf73ee19e94ccf7cb77773f9560aa2fff"
+  integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
+
+postcss-header@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-header/-/postcss-header-3.0.3.tgz#b25e54c86b3f58346e6ae1d7b852ae90be7c3dae"
+  integrity sha512-bmm/qVdphnJcHHLyL2efiPUaLRR6y0iMRYKWl06cfdvNEoXlPUBENL1vqBBn2uTnxYTYvWoec7o+bYnPRJAmMA==
+
+postcss-image-set-function@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz#08353bd756f1cbfb3b6e93182c7829879114481f"
+  integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
   dependencies:
-    normalize-url "^6.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-whitespace@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
-  integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
+postcss-import@^15.0.0:
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-15.0.1.tgz#5887da24440ef259324d65e08343437a43ff92b1"
+  integrity sha512-UGlvk8EgT7Gm/Ndf9xZHnzr8xm8P54N8CBWLtcY5alP+YxlEge/Rv78etQyevZs3qWTE9If13+Bo6zATBrPOpA==
   dependencies:
-    postcss-value-parser "^4.2.0"
+    postcss-value-parser "^4.0.0"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
 
-postcss-ordered-values@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz#0b41b610ba02906a3341e92cab01ff8ebc598adb"
-  integrity sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==
+postcss-initial@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
+  integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
+
+postcss-lab-function@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz#6fe4c015102ff7cd27d1bd5385582f67ebdbdc98"
+  integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==
   dependencies:
-    cssnano-utils "^3.1.0"
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-overflow-shorthand@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz#31ecf350e9c6f6ddc250a78f0c3e111f32dd4c30"
-  integrity sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==
-  dependencies:
-    postcss "^7.0.2"
+postcss-logical@^5.0.4:
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73"
+  integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==
 
-postcss-page-break@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-2.0.0.tgz#add52d0e0a528cabe6afee8b46e2abb277df46bf"
-  integrity sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==
-  dependencies:
-    postcss "^7.0.2"
+postcss-media-minmax@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5"
+  integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==
 
-postcss-place@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-4.0.1.tgz#e9f39d33d2dc584e46ee1db45adb77ca9d1dcc62"
-  integrity sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-values-parser "^2.0.0"
-
-postcss-preset-env@^6.7.0:
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.1.tgz#26563d2e9395d626a45a836450844540694bfcef"
-  integrity sha512-rlRkgX9t0v2On33n7TK8pnkcYOATGQSv48J2RS8GsXhqtg+xk6AummHP88Y5mJo0TLJelBjePvSjScTNkj3+qw==
-  dependencies:
-    autoprefixer "^9.6.1"
-    browserslist "^4.6.4"
-    caniuse-lite "^1.0.30000981"
-    css-blank-pseudo "^0.1.4"
-    css-has-pseudo "^0.10.0"
-    css-prefers-color-scheme "^3.1.1"
-    cssdb "^4.4.0"
-    postcss "^7.0.17"
-    postcss-attribute-case-insensitive "^4.0.1"
-    postcss-color-functional-notation "^2.0.1"
-    postcss-color-gray "^5.0.0"
-    postcss-color-hex-alpha "^5.0.3"
-    postcss-color-mod-function "^3.0.3"
-    postcss-color-rebeccapurple "^4.0.1"
-    postcss-custom-media "^7.0.8"
-    postcss-custom-properties "^8.0.11"
-    postcss-custom-selectors "^5.1.2"
-    postcss-dir-pseudo-class "^5.0.0"
-    postcss-double-position-gradients "^1.0.0"
-    postcss-env-function "^2.0.2"
-    postcss-focus-visible "^4.0.0"
-    postcss-focus-within "^3.0.0"
-    postcss-font-variant "^4.0.0"
-    postcss-gap-properties "^2.0.0"
-    postcss-image-set-function "^3.0.1"
-    postcss-initial "^3.0.0"
-    postcss-lab-function "^2.0.1"
-    postcss-logical "^3.0.0"
-    postcss-media-minmax "^4.0.0"
-    postcss-nesting "^7.0.0"
-    postcss-overflow-shorthand "^2.0.0"
-    postcss-page-break "^2.0.0"
-    postcss-place "^4.0.1"
-    postcss-pseudo-class-any-link "^6.0.0"
-    postcss-replace-overflow-wrap "^3.0.0"
-    postcss-selector-matches "^4.0.0"
-    postcss-selector-not "^4.0.0"
-
-postcss-pseudo-class-any-link@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz#2ed3eed393b3702879dec4a87032b210daeb04d1"
-  integrity sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==
-  dependencies:
-    postcss "^7.0.2"
-    postcss-selector-parser "^5.0.0-rc.3"
+postcss-media-query-parser@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+  integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==
 
-postcss-pxtorem@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-pxtorem/-/postcss-pxtorem-5.1.1.tgz#198a68c10f9ad2d42370ef66299d7b3168f8cffa"
-  integrity sha512-uvgIujL/pn0GbZ+rczESD2orHsbXrrCqi+q9wJO8PCk3ZGCoVVtu5hZTbtk+tbZHZP5UkTfCvqOrTZs9Ncqfsg==
+postcss-nesting@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.2.0.tgz#0b12ce0db8edfd2d8ae0aaf86427370b898890be"
+  integrity sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==
   dependencies:
-    postcss "^7.0.27"
+    "@csstools/selector-specificity" "^2.0.0"
+    postcss-selector-parser "^6.0.10"
 
-postcss-reduce-initial@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6"
-  integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==
+postcss-opacity-percentage@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145"
+  integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==
+
+postcss-overflow-shorthand@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz#7ed6486fec44b76f0eab15aa4866cda5d55d893e"
+  integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==
   dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
+    postcss-value-parser "^4.2.0"
 
-postcss-reduce-transforms@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
-  integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
+postcss-page-break@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
+  integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
+
+postcss-place@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.5.tgz#95dbf85fd9656a3a6e60e832b5809914236986c4"
+  integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-replace-overflow-wrap@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz#61b360ffdaedca84c7c918d2b0f0d0ea559ab01c"
-  integrity sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==
+postcss-preset-env@^7.8.2:
+  version "7.8.3"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz#2a50f5e612c3149cc7af75634e202a5b2ad4f1e2"
+  integrity sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==
+  dependencies:
+    "@csstools/postcss-cascade-layers" "^1.1.1"
+    "@csstools/postcss-color-function" "^1.1.1"
+    "@csstools/postcss-font-format-keywords" "^1.0.1"
+    "@csstools/postcss-hwb-function" "^1.0.2"
+    "@csstools/postcss-ic-unit" "^1.0.1"
+    "@csstools/postcss-is-pseudo-class" "^2.0.7"
+    "@csstools/postcss-nested-calc" "^1.0.0"
+    "@csstools/postcss-normalize-display-values" "^1.0.1"
+    "@csstools/postcss-oklab-function" "^1.1.1"
+    "@csstools/postcss-progressive-custom-properties" "^1.3.0"
+    "@csstools/postcss-stepped-value-functions" "^1.0.1"
+    "@csstools/postcss-text-decoration-shorthand" "^1.0.0"
+    "@csstools/postcss-trigonometric-functions" "^1.0.2"
+    "@csstools/postcss-unset-value" "^1.0.2"
+    autoprefixer "^10.4.13"
+    browserslist "^4.21.4"
+    css-blank-pseudo "^3.0.3"
+    css-has-pseudo "^3.0.4"
+    css-prefers-color-scheme "^6.0.3"
+    cssdb "^7.1.0"
+    postcss-attribute-case-insensitive "^5.0.2"
+    postcss-clamp "^4.1.0"
+    postcss-color-functional-notation "^4.2.4"
+    postcss-color-hex-alpha "^8.0.4"
+    postcss-color-rebeccapurple "^7.1.1"
+    postcss-custom-media "^8.0.2"
+    postcss-custom-properties "^12.1.10"
+    postcss-custom-selectors "^6.0.3"
+    postcss-dir-pseudo-class "^6.0.5"
+    postcss-double-position-gradients "^3.1.2"
+    postcss-env-function "^4.0.6"
+    postcss-focus-visible "^6.0.4"
+    postcss-focus-within "^5.0.4"
+    postcss-font-variant "^5.0.0"
+    postcss-gap-properties "^3.0.5"
+    postcss-image-set-function "^4.0.7"
+    postcss-initial "^4.0.1"
+    postcss-lab-function "^4.2.1"
+    postcss-logical "^5.0.4"
+    postcss-media-minmax "^5.0.0"
+    postcss-nesting "^10.2.0"
+    postcss-opacity-percentage "^1.1.2"
+    postcss-overflow-shorthand "^3.0.4"
+    postcss-page-break "^3.0.4"
+    postcss-place "^7.0.5"
+    postcss-pseudo-class-any-link "^7.1.6"
+    postcss-replace-overflow-wrap "^4.0.0"
+    postcss-selector-not "^6.0.1"
+    postcss-value-parser "^4.2.0"
+
+postcss-pseudo-class-any-link@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz#2693b221902da772c278def85a4d9a64b6e617ab"
+  integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==
   dependencies:
-    postcss "^7.0.2"
+    postcss-selector-parser "^6.0.10"
+
+postcss-pxtorem@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-pxtorem/-/postcss-pxtorem-6.0.0.tgz#f228a4d05d8a73f0642eabae950e2b19836366d7"
+  integrity sha512-ZRXrD7MLLjLk2RNGV6UA4f5Y7gy+a/j1EqjAfp9NdcNYVjUMvg5HTYduTjSkKBkRkfqbg/iKrjMO70V4g1LZeg==
+
+postcss-replace-overflow-wrap@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
+  integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
 postcss-resolve-nested-selector@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
-  integrity sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=
+  integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==
 
 postcss-safe-parser@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
   integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
-postcss-selector-matches@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
-  integrity sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
-
-postcss-selector-not@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz#263016eef1cf219e0ade9a913780fc1f48204cbf"
-  integrity sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==
-  dependencies:
-    balanced-match "^1.0.0"
-    postcss "^7.0.2"
-
-postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
-  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
+postcss-selector-not@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-6.0.1.tgz#8f0a709bf7d4b45222793fc34409be407537556d"
+  integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==
   dependencies:
-    cssesc "^2.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
+    postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  version "6.0.10"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
-  integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
+  version "6.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc"
+  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-simple-vars@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-simple-vars/-/postcss-simple-vars-6.0.3.tgz#e66516c7fe980da3498f4a8ad400b9c53861806c"
-  integrity sha512-fkNn4Zio8vN4vIig9IFdb8lVlxWnYR769RgvxCM6YWlFKie/nQaOcaMMMFz/s4gsfHW4/5bJW+i57zD67mQU7g==
-
 postcss-sorting@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-7.0.1.tgz#923b5268451cf2d93ebf8835e17a6537757049a5"
   integrity sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==
 
-postcss-svgo@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
-  integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    svgo "^2.7.0"
-
-postcss-unique-selectors@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
-  integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
-  dependencies:
-    postcss-selector-parser "^6.0.5"
-
-postcss-url@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-8.0.0.tgz#7b10059bd12929cdbb1971c60f61a0e5af86b4ca"
-  integrity sha512-E2cbOQ5aii2zNHh8F6fk1cxls7QVFZjLPSrqvmiza8OuXLzIpErij8BDS5Y3STPfJgpIMNCPEr8JlKQWEoozUw==
+postcss-url@^10.1.3:
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
+  integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==
   dependencies:
-    mime "^2.3.1"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.0"
-    postcss "^7.0.2"
-    xxhashjs "^0.2.1"
-
-postcss-value-parser@^3.2.3:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
-  integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
+    make-dir "~3.1.0"
+    mime "~2.5.2"
+    minimatch "~3.0.4"
+    xxhashjs "~0.2.2"
 
-postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
-  integrity sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==
-  dependencies:
-    flatten "^1.0.2"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.18, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
-  integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
-  dependencies:
-    picocolors "^0.2.1"
-    source-map "^0.6.1"
-
-postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.13:
+postcss@^8.3.11:
   version "8.4.13"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575"
   integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==
@@ -6305,6 +5496,15 @@ postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.13:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.18, postcss@^8.4.19:
+  version "8.4.19"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.19.tgz#61178e2add236b17351897c8bcc0b4c8ecab56fc"
+  integrity sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -6313,7 +5513,7 @@ prelude-ls@^1.2.1:
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
 prettier-linter-helpers@^1.0.0:
   version "1.0.0"
@@ -6323,14 +5523,9 @@ prettier-linter-helpers@^1.0.0:
     fast-diff "^1.1.2"
 
 prettier@^2.1.2:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
-  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
-
-promise-inflight@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9"
+  integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==
 
 proxy-agent@^5.0.0:
   version "5.0.0"
@@ -6346,23 +5541,15 @@ proxy-agent@^5.0.0:
     proxy-from-env "^1.0.0"
     socks-proxy-agent "^5.0.0"
 
-proxy-from-env@^1.0.0, proxy-from-env@^1.1.0:
+proxy-from-env@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
 psl@^1.1.28, psl@^1.1.33:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
-
-pump@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
-  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
@@ -6374,6 +5561,11 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad"
   integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==
 
+querystringify@^2.1.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -6401,18 +5593,10 @@ raw-body@^2.2.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@^4.0.1, raw-loader@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
-  integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
   dependencies:
     pify "^2.3.0"
 
@@ -6438,22 +5622,13 @@ read-pkg@^5.2.0:
 readable-stream@1.1.x:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+  integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@2 || 3":
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
@@ -6461,19 +5636,12 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
-rechoir@^0.7.0:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
-  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    resolve "^1.9.0"
+    resolve "^1.20.0"
 
 redent@^3.0.0:
   version "3.0.0"
@@ -6483,10 +5651,10 @@ redent@^3.0.0:
     indent-string "^4.0.0"
     strip-indent "^3.0.0"
 
-regenerate-unicode-properties@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
-  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
@@ -6495,10 +5663,10 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+regenerator-runtime@^0.13.10:
+  version "0.13.10"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee"
+  integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==
 
 regenerator-transform@^0.15.0:
   version "0.15.0"
@@ -6507,39 +5675,48 @@ regenerator-transform@^0.15.0:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
+
 regexpp@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+regexpu-core@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139"
+  integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==
   dependencies:
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
-regjsgen@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
-  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
 
-regjsparser@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
-  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
+  integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 request-promise-core@1.1.4:
   version "1.1.4"
@@ -6599,6 +5776,11 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -6623,7 +5805,16 @@ resolve-global@^1.0.0:
   dependencies:
     global-dirs "^0.1.1"
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0:
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0:
+  version "1.22.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
+  dependencies:
+    is-core-module "^2.9.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+resolve@^1.22.0:
   version "1.22.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
   integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
@@ -6645,7 +5836,7 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.0, rimraf@^3.0.2:
+rimraf@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
@@ -6659,29 +5850,24 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-buffer@~5.1.1:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
-  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
-
 "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
-schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
+schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
@@ -6695,30 +5881,18 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.4, semver@^7.3.5, semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@^7.3.4, semver@^7.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
     lru-cache "^6.0.0"
 
-serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
-  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
-  dependencies:
-    randombytes "^2.1.0"
-
 serialize-javascript@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
@@ -6729,7 +5903,7 @@ serialize-javascript@^6.0.0:
 set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 setprototypeof@1.2.0:
   version "1.2.0"
@@ -6755,21 +5929,12 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shelljs@^0.8.1:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
-  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shepherd.js@9.1.x:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-9.1.0.tgz#b843072a789bd9f2dbf256d10ac3715c54d113e4"
-  integrity sha512-AtUBBbaJn8bcttAomenf/a1p61bhnrGsVjZBuizJM5SohSVtJt1Tcdn8pLBljqNy7sn0vKpLuJt6XzfCD/7UeQ==
+  version "9.1.1"
+  resolved "https://registry.yarnpkg.com/shepherd.js/-/shepherd.js-9.1.1.tgz#07dcf5d6623ba52389db99a9041ca3f7f0d16e9f"
+  integrity sha512-JS1zE/OulfqahISHLn8P3moFXB4QFvK7HGH42T5WW1TMmHWd4Ke95k6NQTfYFC56OaI0j9Y1E+i6C+5ZftLORg==
   dependencies:
-    "@popperjs/core" "^2.11.4"
+    "@popperjs/core" "^2.11.5"
     deepmerge "^4.2.2"
     smoothscroll-polyfill "^0.4.4"
 
@@ -6782,7 +5947,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.2, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -6833,11 +5998,6 @@ sortablejs@1.15.x:
   resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.15.0.tgz#53230b8aa3502bb77a29e2005808ffdb4a5f7e2a"
   integrity sha512-bv9qgVMjUMf89wAvM6AxVvS/4MX3sPeN0+agqShejLU5z5GX4C75ow1O2e5k4L6XItUyAK3gH6AxSbXrOM5e8w==
 
-source-list-map@^2.0.0, source-list-map@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
-  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -6851,7 +6011,7 @@ source-map-support@^0.5.16, source-map-support@~0.5.20:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -6878,19 +6038,14 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-
-specificity@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.1.tgz#aab5e645012db08ba182e151165738d00887b019"
-  integrity sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779"
+  integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 sshpk@^1.7.0:
   version "1.17.0"
@@ -6907,18 +6062,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
 statuses@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
@@ -6927,7 +6070,7 @@ statuses@2.0.1:
 stealthy-require@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
+  integrity sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==
 
 "string-width@^1.0.2 || 2":
   version "2.1.1"
@@ -6955,7 +6098,7 @@ string-width@^4.2.3:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trimend@^1.0.4:
+string.prototype.trimend@^1.0.4, string.prototype.trimend@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
   integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
@@ -6964,7 +6107,7 @@ string.prototype.trimend@^1.0.4:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-string.prototype.trimstart@^1.0.4:
+string.prototype.trimstart@^1.0.4, string.prototype.trimstart@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
   integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
@@ -6973,22 +6116,15 @@ string.prototype.trimstart@^1.0.4:
     define-properties "^1.1.4"
     es-abstract "^1.19.5"
 
-string_decoder@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
-  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
-  dependencies:
-    safe-buffer "~5.2.0"
-
 string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
 
 strip-ansi@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
@@ -7011,11 +6147,6 @@ strip-bom@^3.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
   integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
 
-strip-final-newline@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
-  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -7026,33 +6157,17 @@ strip-indent@^3.0.0:
 strip-json-comments@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
+  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-style-loader@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c"
-  integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 style-search@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
-  integrity sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=
-
-stylehacks@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520"
-  integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==
-  dependencies:
-    browserslist "^4.16.6"
-    postcss-selector-parser "^6.0.4"
+  integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==
 
 stylelint-checkstyle-formatter@^0.1.2:
   version "0.1.2"
@@ -7061,17 +6176,17 @@ stylelint-checkstyle-formatter@^0.1.2:
   dependencies:
     lodash "^4.17.10"
 
-stylelint-config-recommended@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-6.0.0.tgz#fd2523a322836005ad9bf473d3e5534719c09f9d"
-  integrity sha512-ZorSSdyMcxWpROYUvLEMm0vSZud2uB7tX1hzBZwvVY9SV/uly4AvvJPPhCcymZL3fcQhEQG5AELmrxWqtmzacw==
+stylelint-config-recommended@^9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40"
+  integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ==
 
-stylelint-config-standard@^23.0.0:
-  version "23.0.0"
-  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-23.0.0.tgz#4ad58c74804c544cb4d30667c21a30ab14d1c17d"
-  integrity sha512-8PDlk+nWuc1T66nVaODTdVodN0pjuE5TBlopi39Lt9EM36YJsRhqttMyUhnS78oc/59Q6n8iw2GJB4QcoFqtRg==
+stylelint-config-standard@^29.0.0:
+  version "29.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz#4cc0e0f05512a39bb8b8e97853247d3a95d66fa2"
+  integrity sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg==
   dependencies:
-    stylelint-config-recommended "^6.0.0"
+    stylelint-config-recommended "^9.0.0"
 
 stylelint-order@^5.0.0:
   version "5.0.0"
@@ -7082,56 +6197,48 @@ stylelint-order@^5.0.0:
     postcss-sorting "^7.0.1"
 
 stylelint@^14.0.1:
-  version "14.8.2"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.8.2.tgz#801eef74fe6020611e6a515abb9fc7caeb125793"
-  integrity sha512-tjDfexCYfoPdl/xcDJ9Fv+Ko9cvzbDnmdiaqEn3ovXHXasi/hbkt5tSjsiReQ+ENqnz0eltaX/AOO+AlzVdcNA==
+  version "14.16.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.0.tgz#8e1a424f4b9852e59089f95de306734d70e5048b"
+  integrity sha512-X6uTi9DcxjzLV8ZUAjit1vsRtSwcls0nl07c9rqOPzvpA8IvTX/xWEkBRowS0ffevRrqkHa/ThDEu86u73FQDg==
   dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
     balanced-match "^2.0.0"
-    colord "^2.9.2"
-    cosmiconfig "^7.0.1"
-    css-functions-list "^3.0.1"
+    colord "^2.9.3"
+    cosmiconfig "^7.1.0"
+    css-functions-list "^3.1.0"
     debug "^4.3.4"
-    execall "^2.0.0"
-    fast-glob "^3.2.11"
-    fastest-levenshtein "^1.0.12"
+    fast-glob "^3.2.12"
+    fastest-levenshtein "^1.0.16"
     file-entry-cache "^6.0.1"
-    get-stdin "^8.0.0"
     global-modules "^2.0.0"
     globby "^11.1.0"
     globjoin "^0.1.4"
     html-tags "^3.2.0"
-    ignore "^5.2.0"
+    ignore "^5.2.1"
     import-lazy "^4.0.0"
     imurmurhash "^0.1.4"
     is-plain-object "^5.0.0"
-    known-css-properties "^0.25.0"
+    known-css-properties "^0.26.0"
     mathml-tag-names "^2.1.3"
     meow "^9.0.0"
     micromatch "^4.0.5"
     normalize-path "^3.0.0"
-    normalize-selector "^0.2.0"
     picocolors "^1.0.0"
-    postcss "^8.4.13"
+    postcss "^8.4.19"
     postcss-media-query-parser "^0.2.3"
     postcss-resolve-nested-selector "^0.1.1"
     postcss-safe-parser "^6.0.0"
-    postcss-selector-parser "^6.0.10"
+    postcss-selector-parser "^6.0.11"
     postcss-value-parser "^4.2.0"
     resolve-from "^5.0.0"
-    specificity "^0.4.1"
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
     style-search "^0.1.0"
-    supports-hyperlinks "^2.2.0"
+    supports-hyperlinks "^2.3.0"
     svg-tags "^1.0.0"
-    table "^6.8.0"
+    table "^6.8.1"
     v8-compile-cache "^2.3.0"
-    write-file-atomic "^4.0.1"
-
-sugarss@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-4.0.1.tgz#128a783ed71ee0fc3b489ce1f7d5a89bc1e24383"
-  integrity sha512-WCjS5NfuVJjkQzK10s8WOBY+hhDxxNt/N6ZaGwxFZ+wN3/lKKFSaaKUNecULcTTvE4urLcKaZFQD8vO0mOZujw==
+    write-file-atomic "^4.0.2"
 
 supports-color@6.0.0:
   version "6.0.0"
@@ -7161,10 +6268,10 @@ supports-color@^8.0.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-hyperlinks@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
+supports-hyperlinks@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624"
+  integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==
   dependencies:
     has-flag "^4.0.0"
     supports-color "^7.0.0"
@@ -7177,35 +6284,22 @@ supports-preserve-symlinks-flag@^1.0.0:
 svg-tags@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
-  integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
-
-svgo@^2.7.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
+  integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tabbable@5.3.x:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.2.tgz#66d6119ee8a533634c3f17deb0caa1c379e36ac7"
-  integrity sha512-6G/8EWRFx8CiSe2++/xHhXkmCRq2rHtDtZbQFHx34cvDfZzIBfvwG9zGUNTWMXWLCYvDj3aQqOzdl3oCxKuBkQ==
+tabbable@~5.3.3:
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.3.3.tgz#aac0ff88c73b22d6c3c5a50b1586310006b47fbf"
+  integrity sha512-QD9qKY3StfbZqWOPLp0++pOrAVb/HbUi5xCc8cUo4XjP19808oaMiDzn0leBY5mCespIBM0CIZePzZjgzR83kA==
 
-table@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca"
-  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
+table@^6.8.1:
+  version "6.8.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf"
+  integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -7218,41 +6312,6 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.0.2:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
-  dependencies:
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    minipass "^3.0.0"
-    minizlib "^2.1.1"
-    mkdirp "^1.0.3"
-    yallist "^4.0.0"
-
-tcp-port-used@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/tcp-port-used/-/tcp-port-used-1.0.2.tgz#9652b7436eb1f4cfae111c79b558a25769f6faea"
-  integrity sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==
-  dependencies:
-    debug "4.3.1"
-    is2 "^2.0.6"
-
-terser-webpack-plugin@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
-  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
-  dependencies:
-    cacache "^15.0.5"
-    find-cache-dir "^3.3.1"
-    jest-worker "^26.5.0"
-    p-limit "^3.0.2"
-    schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
-    source-map "^0.6.1"
-    terser "^5.3.4"
-    webpack-sources "^1.4.3"
-
 terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.3:
   version "5.3.6"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c"
@@ -7264,7 +6323,17 @@ terser-webpack-plugin@^5.1.3, terser-webpack-plugin@^5.3.3:
     serialize-javascript "^6.0.0"
     terser "^5.14.1"
 
-terser@^5.14.1, terser@^5.14.2, terser@^5.3.4:
+terser@^5.14.1:
+  version "5.15.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c"
+  integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
+terser@^5.14.2:
   version "5.16.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.1.tgz#5af3bc3d0f24241c7fb2024199d5c461a1075880"
   integrity sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==
@@ -7277,20 +6346,12 @@ terser@^5.14.1, terser@^5.14.2, terser@^5.3.4:
 text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
@@ -7312,14 +6373,15 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
 tr46@^3.0.0:
   version "3.0.0"
@@ -7328,21 +6390,16 @@ tr46@^3.0.0:
   dependencies:
     punycode "^2.1.1"
 
+tr46@~0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
   integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
-ts-loader@^9.3.0:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-9.3.1.tgz#fe25cca56e3e71c1087fe48dc67f4df8c59b22d4"
-  integrity sha512-OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.0.0"
-    micromatch "^4.0.0"
-    semver "^7.3.4"
-
 tsconfig-paths@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
@@ -7361,14 +6418,14 @@ tslib@^2.0.1:
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
@@ -7380,7 +6437,7 @@ type-check@^0.4.0, type-check@~0.4.0:
 type-check@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
@@ -7411,7 +6468,7 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-unbox-primitive@^1.0.1:
+unbox-primitive@^1.0.1, unbox-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
   integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
@@ -7421,11 +6478,16 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
-underscore@1.13.x, underscore@>=1.8.3:
+underscore@>=1.8.3:
   version "1.13.3"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.3.tgz#54bc95f7648c5557897e5e968d0f76bc062c34ee"
   integrity sha512-QvjkYpiD+dJJraRA8+dGAU4i7aBbb2s0S3jA45TFOvg2VgqvdCDd/3N6CqA8gluk1W91GLoXg5enMUx560QzuA==
 
+underscore@~1.13.4:
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
+  integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -7445,28 +6507,9 @@ unicode-match-property-value-ecmascript@^2.0.0:
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
-  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
-
-uniq@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-  integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 unique-string@^2.0.0:
   version "2.0.0"
@@ -7475,11 +6518,16 @@ unique-string@^2.0.0:
   dependencies:
     crypto-random-string "^2.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -7488,7 +6536,15 @@ universalify@^2.0.0:
 unpipe@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+
+update-browserslist-db@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
@@ -7497,17 +6553,25 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-util-deprecate@^1.0.1, util-deprecate@^1.0.2:
+url-parse@^1.5.3:
+  version "1.5.10"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
+util-deprecate@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache@^2.0.3, v8-compile-cache@^2.3.0:
+v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
   integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
@@ -7530,41 +6594,34 @@ verror@1.10.0:
     extsprintf "^1.2.0"
 
 vm2@^3.9.8:
-  version "3.9.13"
-  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.13.tgz#774a1a3d73b9b90b1aa45bcc5f25e349f2eef649"
-  integrity sha512-0rvxpB8P8Shm4wX2EKOiMp7H2zq+HUE/UwodY0pCZXs9IffIKZq6vUti5OgkVCTakKo9e/fgO4X1fkwfjWxE3Q==
+  version "3.9.12"
+  resolved "https://registry.yarnpkg.com/vm2/-/vm2-3.9.12.tgz#9bfa6d913a8b467861524e5a11c3b038cc967ec4"
+  integrity sha512-OMmRsKh1gmdosFzuqmj6O43hqIStqXA24YbwjtUTO0TkOBP8yLNHLplbr4odnAzEcMnm9lt2r3R8kTivn8urMg==
   dependencies:
     acorn "^8.7.0"
     acorn-walk "^8.2.0"
 
-vscode-languageserver-textdocument@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz#3cd56dd14cec1d09e86c4bb04b09a246cb3df157"
-  integrity sha512-/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ==
-
-vscode-uri@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.3.tgz#a95c1ce2e6f41b7549f86279d19f47951e4f4d84"
-  integrity sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==
+vscode-languageserver-textdocument@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.7.tgz#16df468d5c2606103c90554ae05f9f3d335b771b"
+  integrity sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
+vscode-uri@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.6.tgz#5e6e2e1a4170543af30151b561a41f71db1d6f91"
+  integrity sha512-fmL7V1eiDBFRRnu+gfRWTzyPpNIHJTc4mWnFkwBUmO9U3KPgJAmTx7oxi2bl/Rh6HLdU7+4C9wlj0k2E4AdKFQ==
 
-w3c-xmlserializer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"
-  integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
     xml-name-validator "^4.0.0"
 
-watchpack@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
-  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+watchpack@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -7576,27 +6633,33 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
+webidl-conversions@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
+
 webidl-conversions@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-cli@^4.4.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d"
-  integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==
+webpack-cli@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
+  integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.1.1"
-    "@webpack-cli/info" "^1.4.1"
-    "@webpack-cli/serve" "^1.6.1"
+    "@webpack-cli/configtest" "^2.0.1"
+    "@webpack-cli/info" "^2.0.1"
+    "@webpack-cli/serve" "^2.0.1"
     colorette "^2.0.14"
-    commander "^7.0.0"
-    execa "^5.0.0"
+    commander "^9.4.1"
+    cross-spawn "^7.0.3"
+    envinfo "^7.7.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
-    interpret "^2.2.0"
-    rechoir "^0.7.0"
+    interpret "^3.1.1"
+    rechoir "^0.8.0"
     webpack-merge "^5.7.3"
 
 webpack-merge@^5.7.3:
@@ -7607,55 +6670,39 @@ webpack-merge@^5.7.3:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
-  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  dependencies:
-    source-list-map "^2.0.0"
-    source-map "~0.6.1"
-
-webpack-sources@^2.0.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd"
-  integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==
-  dependencies:
-    source-list-map "^2.0.1"
-    source-map "^0.6.1"
-
 webpack-sources@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
-webpack@^5.51.1:
-  version "5.72.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.72.0.tgz#f8bc40d9c6bb489a4b7a8a685101d6022b8b6e28"
-  integrity sha512-qmSmbspI0Qo5ld49htys8GY9XhS9CGqFoHTsOVAnjBdg0Zn79y135R+k4IR4rKK6+eKaabMhJwiVB7xw0SJu5w==
+webpack@^5.77.0:
+  version "5.77.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.77.0.tgz#dea3ad16d7ea6b84aa55fa42f4eac9f30e7eb9b4"
+  integrity sha512-sbGNjBr5Ya5ss91yzjeJTLKyfiwo5C628AFjEa6WSXcZa4E+F57om3Cc8xLb1Jh0b243AWuSYRf3dn7HVeFQ9Q==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
     "@webassemblyjs/ast" "1.11.1"
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
+    acorn "^8.7.1"
     acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.9.2"
+    enhanced-resolve "^5.10.0"
     es-module-lexer "^0.9.0"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.9"
-    json-parse-better-errors "^1.0.2"
+    json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
     schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
+    watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
 whatwg-encoding@^2.0.0:
@@ -7670,14 +6717,6 @@ whatwg-mimetype@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da"
-  integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==
-  dependencies:
-    tr46 "^3.0.0"
-    webidl-conversions "^7.0.0"
-
 whatwg-url@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
@@ -7686,6 +6725,14 @@ whatwg-url@^11.0.0:
     tr46 "^3.0.0"
     webidl-conversions "^7.0.0"
 
+whatwg-url@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+  dependencies:
+    tr46 "~0.0.3"
+    webidl-conversions "^3.0.0"
+
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
@@ -7700,7 +6747,7 @@ which-boxed-primitive@^1.0.2:
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+  integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
 which@1.3.1, which@^1.3.1:
   version "1.3.1"
@@ -7745,7 +6792,7 @@ wrap-ansi@^5.1.0:
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write-file-atomic@^3.0.0:
   version "3.0.3"
@@ -7757,18 +6804,18 @@ write-file-atomic@^3.0.0:
     signal-exit "^3.0.2"
     typedarray-to-buffer "^3.1.5"
 
-write-file-atomic@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
-  integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
+write-file-atomic@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd"
+  integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-ws@^8.2.3:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.6.0.tgz#e5e9f1d9e7ff88083d0c0dd8281ea662a42c9c23"
-  integrity sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==
+ws@^8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 xdg-basedir@^4.0.0:
   version "4.0.0"
@@ -7788,9 +6835,9 @@ xmlchars@^2.2.0:
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
-  integrity sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=
+  integrity sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==
 
-xxhashjs@^0.2.1:
+xxhashjs@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
   integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
@@ -7812,20 +6859,25 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml-eslint-parser@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/yaml-eslint-parser/-/yaml-eslint-parser-0.5.0.tgz#01d4e4d992a820769ea85ef5fd526dfc20ebc6f5"
-  integrity sha512-nJeyLA3YHAzhBTZbRAbu3W6xrSCucyxExmA+ZDtEdUFpGllxAZpto2Zxo2IG0r0eiuEiBM4e+wiAdxTziTq94g==
+yaml-eslint-parser@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/yaml-eslint-parser/-/yaml-eslint-parser-1.1.0.tgz#62703e2f4afbe5a17d3fe297882740bf89504e78"
+  integrity sha512-b464Q1fYiX1oYx2kE8k4mEp6S9Prk+tfDsY/IPxQ0FCjEuj3AKko5Skf3/yQJeYTTDyjDE+aWIJemnv29HvEWQ==
   dependencies:
     eslint-visitor-keys "^3.0.0"
     lodash "^4.17.21"
-    yaml "^1.10.2"
+    yaml "^2.0.0"
 
-yaml@^1.10.0, yaml@^1.10.2:
+yaml@^1.10.0:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
+yaml@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.1.tgz#1e06fb4ca46e60d9da07e4f786ea370ed3c3cfec"
+  integrity sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==
+
 yargs-parser@13.1.2, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -7864,14 +6916,6 @@ yargs@13.3.2, yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yauzl@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
-  dependencies:
-    buffer-crc32 "~0.2.3"
-    fd-slicer "~1.1.0"
-
 yocto-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
diff --git a/web/robots.txt b/web/robots.txt
index 18f8df8e6..ebcd04b96 100644
--- a/web/robots.txt
+++ b/web/robots.txt
@@ -49,6 +49,8 @@ Disallow: /user/register
 Disallow: /user/password
 Disallow: /user/login
 Disallow: /user/logout
+Disallow: /media/oembed
+Disallow: /*/media/oembed
 # Paths (no clean URLs)
 Disallow: /index.php/admin/
 Disallow: /index.php/comment/reply/
@@ -59,3 +61,5 @@ Disallow: /index.php/user/password
 Disallow: /index.php/user/register
 Disallow: /index.php/user/login
 Disallow: /index.php/user/logout
+Disallow: /index.php/media/oembed
+Disallow: /index.php/*/media/oembed
diff --git a/web/sites/default/default.services.yml b/web/sites/default/default.services.yml
index cdeb41fc4..b4d27e05a 100644
--- a/web/sites/default/default.services.yml
+++ b/web/sites/default/default.services.yml
@@ -147,6 +147,14 @@ parameters:
       #
       # @default []
       tags: []
+    # Renderer cache debug:
+    #
+    # Allows cache debugging output for each rendered element.
+    #
+    # Enabling render cache debugging is not recommended in production
+    # environments.
+    # @default false
+    debug: false
   # Cacheability debugging:
   #
   # Responses with cacheability metadata (CacheableResponseInterface instances)
@@ -161,15 +169,15 @@ parameters:
   # @default false
   http.response.debug_cacheability_headers: false
   factory.keyvalue: {}
-    # Default key/value storage service to use.
-    # @default keyvalue.database
-    # default: keyvalue.database
-    # Collection-specific overrides.
-    # state: keyvalue.database
+  # Default key/value storage service to use.
+  # @default keyvalue.database
+  # default: keyvalue.database
+  # Collection-specific overrides.
+  # state: keyvalue.database
   factory.keyvalue.expirable: {}
-    # Default key/value expirable storage service to use.
-    # @default keyvalue.database.expirable
-    # default: keyvalue.database.expirable
+  # Default key/value expirable storage service to use.
+  # @default keyvalue.database.expirable
+  # default: keyvalue.database.expirable
   # Allowed protocols for URL generation.
   filter_protocols:
     - http
@@ -196,7 +204,8 @@ parameters:
     allowedHeaders: []
     # Specify allowed request methods, specify ['*'] to allow all possible ones.
     allowedMethods: []
-    # Configure requests allowed from specific origins.
+    # Configure requests allowed from specific origins. Do not include trailing
+    # slashes with URLs.
     allowedOrigins: ['*']
     # Sets the Access-Control-Expose-Headers header.
     exposedHeaders: false
diff --git a/web/sites/default/default.settings.php b/web/sites/default/default.settings.php
index f3dca008f..20d789369 100644
--- a/web/sites/default/default.settings.php
+++ b/web/sites/default/default.settings.php
@@ -138,6 +138,21 @@
  * request as needed.  The fourth line creates a new database with a name of
  * "extra".
  *
+ * For MySQL, MariaDB or equivalent databases the 'isolation_level' option can
+ * be set. The recommended transaction isolation level for Drupal sites is
+ * 'READ COMMITTED'. The 'REPEATABLE READ' option is supported but can result
+ * in deadlocks, the other two options are 'READ UNCOMMITTED' and 'SERIALIZABLE'.
+ * They are available but not supported; use them at your own risk. For more
+ * info:
+ * https://dev.mysql.com/doc/refman/5.7/en/innodb-transaction-isolation-levels.html
+ *
+ * On your settings.php, change the isolation level:
+ * @code
+ * $databases['default']['default']['init_commands'] = [
+ *   'isolation_level' => 'SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED',
+ * ];
+ * @endcode
+ *
  * You can optionally set a prefix for all database table names by using the
  * 'prefix' setting. If a prefix is specified, the table name will be prepended
  * with its value. Be sure to use valid database characters only, usually
@@ -343,10 +358,13 @@
 # $settings['reverse_proxy'] = TRUE;
 
 /**
- * Specify every reverse proxy IP address in your environment.
- * This setting is required if $settings['reverse_proxy'] is TRUE.
+ * Reverse proxy addresses.
+ *
+ * Specify every reverse proxy IP address in your environment, as an array of
+ * IPv4/IPv6 addresses or subnets in CIDR notation. This setting is required if
+ * $settings['reverse_proxy'] is TRUE.
  */
-# $settings['reverse_proxy_addresses'] = ['a.b.c.d', ...];
+# $settings['reverse_proxy_addresses'] = ['a.b.c.d', 'e.f.g.h/24', ...];
 
 /**
  * Reverse proxy trusted headers.
@@ -513,6 +531,25 @@
  */
 # $settings['file_additional_public_schemes'] = ['example'];
 
+/**
+ * File schemes whose paths should not be normalized:
+ *
+ * Normally, Drupal normalizes '/./' and '/../' segments in file URIs in order
+ * to prevent unintended file access. For example, 'private://css/../image.png'
+ * is normalized to 'private://image.png' before checking access to the file.
+ *
+ * On Windows, Drupal also replaces '\' with '/' in URIs for the local
+ * filesystem.
+ *
+ * If file URIs with one or more scheme should not be normalized like this, then
+ * list the schemes here. For example, if 'porcelain://china/./plate.png' should
+ * not be normalized to 'porcelain://china/plate.png', then add 'porcelain' to
+ * this array. In this case, make sure that the module providing the 'porcelain'
+ * scheme does not allow unintended file access when using '/../' to move up the
+ * directory tree.
+ */
+# $settings['file_sa_core_2023_005_schemes'] = ['porcelain'];
+
 /**
  * Private file path:
  *
@@ -576,7 +613,7 @@
  *
  * Note: This setting does not apply to installation and update pages.
  */
-# $settings['maintenance_theme'] = 'bartik';
+# $settings['maintenance_theme'] = 'claro';
 
 /**
  * PHP settings:
@@ -601,21 +638,6 @@
 # ini_set('pcre.backtrack_limit', 200000);
 # ini_set('pcre.recursion_limit', 200000);
 
-/**
- * Add Permissions-Policy header to disable Google FLoC.
- *
- * By default, Drupal sends the 'Permissions-Policy: interest-cohort=()' header
- * to disable Google's Federated Learning of Cohorts feature, introduced in
- * Chrome 89.
- *
- * See https://en.wikipedia.org/wiki/Federated_Learning_of_Cohorts for more
- * information about FLoC.
- *
- * If you don't wish to disable FLoC in Chrome, you can set this value
- * to FALSE.
- */
-# $settings['block_interest_cohort'] = TRUE;
-
 /**
  * Configuration overrides.
  *
@@ -641,33 +663,6 @@
 # $config['system.site']['name'] = 'My Drupal site';
 # $config['user.settings']['anonymous'] = 'Visitor';
 
-/**
- * Fast 404 pages:
- *
- * Drupal can generate fully themed 404 pages. However, some of these responses
- * are for images or other resource files that are not displayed to the user.
- * This can waste bandwidth, and also generate server load.
- *
- * The options below return a simple, fast 404 page for URLs matching a
- * specific pattern:
- * - $config['system.performance']['fast_404']['exclude_paths']: A regular
- *   expression to match paths to exclude, such as images generated by image
- *   styles, or dynamically-resized images. The default pattern provided below
- *   also excludes the private file system. If you need to add more paths, you
- *   can add '|path' to the expression.
- * - $config['system.performance']['fast_404']['paths']: A regular expression to
- *   match paths that should return a simple 404 page, rather than the fully
- *   themed 404 page. If you don't have any aliases ending in htm or html you
- *   can add '|s?html?' to the expression.
- * - $config['system.performance']['fast_404']['html']: The html to return for
- *   simple 404 pages.
- *
- * Remove the leading hash signs if you would like to alter this functionality.
- */
-# $config['system.performance']['fast_404']['exclude_paths'] = '/\/(?:styles)|(?:system\/files)\//';
-# $config['system.performance']['fast_404']['paths'] = '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i';
-# $config['system.performance']['fast_404']['html'] = '<!DOCTYPE html><html><head><title>404 Not Found</title></head><body><h1>Not Found</h1><p>The requested URL "@path" was not found on this server.</p></body></html>';
-
 /**
  * Load services definition file.
  */
@@ -777,6 +772,49 @@
  */
 $settings['migrate_node_migrate_type_classic'] = FALSE;
 
+/**
+ * The default settings for migration sources.
+ *
+ * These settings are used as the default settings on the Credential form at
+ * /upgrade/credentials.
+ *
+ * - migrate_source_version - The version of the source database. This can be
+ *   '6' or '7'. Defaults to '7'.
+ * - migrate_source_connection - The key in the $databases array for the source
+ *   site.
+ * - migrate_file_public_path - The location of the source Drupal 6 or Drupal 7
+ *   public files. This can be a local file directory containing the source
+ *   Drupal 6 or Drupal 7 site (e.g /var/www/docroot), or the site address
+ *   (e.g http://example.com).
+ * - migrate_file_private_path - The location of the source Drupal 7 private
+ *   files. This can be a local file directory containing the source Drupal 7
+ *   site (e.g /var/www/docroot), or empty to use the same value as Public
+ *   files directory.
+ *
+ * Sample configuration for a drupal 6 source site with the source files in a
+ * local directory.
+ *
+ * @code
+ * $settings['migrate_source_version'] = '6';
+ * $settings['migrate_source_connection'] = 'migrate';
+ * $settings['migrate_file_public_path'] = '/var/www/drupal6';
+ * @endcode
+ *
+ * Sample configuration for a drupal 7 source site with public source files on
+ * the source site and the private files in a local directory.
+ *
+ * @code
+ * $settings['migrate_source_version'] = '7';
+ * $settings['migrate_source_connection'] = 'migrate';
+ * $settings['migrate_file_public_path'] = 'https://drupal7.com';
+ * $settings['migrate_file_private_path'] = '/var/www/drupal7';
+ * @endcode
+ */
+# $settings['migrate_source_connection'] = '';
+# $settings['migrate_source_version'] = '';
+# $settings['migrate_file_public_path'] = '';
+# $settings['migrate_file_private_path'] = '';
+
 /**
  * Load local development override configuration, if available.
  *
diff --git a/web/sites/example.settings.local.php b/web/sites/example.settings.local.php
index 73671ab16..a9f1aca02 100644
--- a/web/sites/example.settings.local.php
+++ b/web/sites/example.settings.local.php
@@ -33,7 +33,7 @@
  * @see https://wiki.php.net/rfc/expectations
  */
 assert_options(ASSERT_ACTIVE, TRUE);
-\Drupal\Component\Assertion\Handle::register();
+assert_options(ASSERT_EXCEPTION, TRUE);
 
 /**
  * Enable local development services.
diff --git a/web/web.config b/web/web.config
index 79a0433c9..b769e45e3 100644
--- a/web/web.config
+++ b/web/web.config
@@ -22,7 +22,7 @@
     <rewrite>
       <rules>
         <rule name="Protect files and directories from prying eyes" stopProcessing="true">
-          <match url="\.(engine|inc|install|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format|composer\.(json|lock)|\.htaccess)$" />
+          <match url="\.(engine|inc|install|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml|svn-base)$|^(code-style\.pl|Entries.*|Repository|Root|Tag|Template|all-wcprops|entries|format|composer\.(json|lock)|\.htaccess|yarn.lock|package.json)$" />
           <action type="CustomResponse" statusCode="403" subStatusCode="0" statusReason="Forbidden" statusDescription="Access is forbidden." />
         </rule>